diff --git a/build-shared.sh b/build-shared.sh index 1e0e8bfda..9eb77cac5 100755 --- a/build-shared.sh +++ b/build-shared.sh @@ -203,7 +203,7 @@ fi SHAREDENABLE="--disable-shared " if [ "$ENABLESHARED" = "TRUE" ] then - SHAREDENABLE="--enable-shared -disable-native-texlive-build " + SHAREDENABLE="--enable-shared --disable-native-texlive-build --disable-static" if [ ! -r "$B-shared" ] then mkdir "$B-shared" @@ -248,6 +248,7 @@ TL_MAKE=$MAKE ../source/configure $CONFHOST $CONFBUILD $WARNINGFLAGS\ --disable-xetex \ --disable-ptex \ --disable-ipc \ + --disable-native-texlive-build \ --disable-dump-share \ --enable-web2c \ $LUA53ENABLE $JITENABLE \ @@ -258,6 +259,7 @@ TL_MAKE=$MAKE ../source/configure $CONFHOST $CONFBUILD $WARNINGFLAGS\ --without-system-freetype2 \ --without-system-gd \ --without-system-libpng \ + --without-system-poppler \ --without-system-teckit \ --without-system-zlib \ --without-system-t1lib \ diff --git a/build.sh b/build.sh index c472e6585..10c203f59 100755 --- a/build.sh +++ b/build.sh @@ -26,8 +26,6 @@ # --parallel : make -j 8 -l 8.0 # --nostrip : do not strip binary # --warnings= : enable compiler warnings -# --lua52 : build luatex with luatex 52 -# --nolua52 : don't build luatex with luatex 52 # --lua53 : build luatex with luatex 53 # --nolua53 : don't build luatex with luatex 53 # --mingw[32] : crosscompile for mingw32 @@ -69,8 +67,9 @@ else fi BUILDJIT=FALSE -BUILDLUA52=FALSE BUILDLUA53=TRUE +BUILDLUAHB=FALSE +BUILDJITHB=FALSE BUILDTAG= ONLY_MAKE=FALSE STRIP_LUATEX=TRUE @@ -104,15 +103,17 @@ until [ -z "$1" ]; do --debugopt ) STRIP_LUATEX=FALSE; WARNINGS=max ; CFLAGS="-O3 -g -ggdb3 $CFLAGS" ; CXXFLAGS="-O3 -g -ggdb3 $CXXFLAGS" ;; --host=* ) CONFHOST="$1" ;; --jit ) BUILDJIT=TRUE ;; - --lua52 ) BUILDLUA52=TRUE ;; + --jithb ) BUILDJITHB=TRUE ;; --lua53 ) BUILDLUA53=TRUE ;; + --luahb ) BUILDLUAHB=TRUE ;; --make ) ONLY_MAKE=TRUE ;; --mingw|--mingw32 ) MINGWCROSS32=TRUE ;; --mingw64 ) MINGWCROSS64=TRUE ;; --musl ) USEMUSL=TRUE ;; --nojit ) BUILDJIT=FALSE ;; - --nolua52 ) BUILDLUA52=FALSE ;; + --nojithb ) BUILDJITHB=FALSE ;; --nolua53 ) BUILDLUA53=FALSE ;; + --noluahb ) BUILDLUAHB=FALSE ;; --nostrip ) STRIP_LUATEX=FALSE ;; --parallel ) MAKE="$MAKE -j $JOBS_IF_PARALLEL -l $MAX_LOAD_IF_PARALLEL" ;; --stripbin=* ) STRIPBIN="$1" ;; @@ -128,12 +129,12 @@ STRIP=strip LUATEXEXEJIT=luajittex LUATEXEXE=luatex LUATEXEXE53=luatex - - +LUAHBTEXEXE=luahbtex +LUAHBTEXEXEJIT=luajithbtex case `uname` in - CYGWIN* ) LUATEXEXEJIT=luajittex.exe ; LUATEXEXE=luatex.exe ; LUATEXEXE53=luatex.exe ;; - MINGW* ) LUATEXEXEJIT=luajittex.exe ; LUATEXEXE=luatex.exe ; LUATEXEXE53=luatex.exe ;; + CYGWIN* ) LUATEXEXEJIT=luajittex.exe ; LUATEXEXE=luatex.exe ; LUATEXEXE53=luatex.exe ; LUAHBTEXEXEJIT=luajithbtex.exe ; LUAHBTEXEXE=luahbtex.exe ;; + MINGW* ) LUATEXEXEJIT=luajittex.exe ; LUATEXEXE=luatex.exe ; LUATEXEXE53=luatex.exe ; LUAHBTEXEXEJIT=luajithbtex.exe ; LUAHBTEXEXE=luahbtex.exe ;; Darwin ) STRIP="strip -u -r" ;; esac @@ -189,6 +190,8 @@ then LUATEXEXEJIT=luajittex.exe LUATEXEXE=luatex.exe LUATEXEXE53=luatex.exe + LUAHBTEXEXEJIT=luajithbtex.exe + LUAHBTEXEXE=luahbtex.exe RANLIB="${CONFHOST#--host=}-ranlib" STRIP="${CONFHOST#--host=}-strip" fi @@ -274,29 +277,38 @@ fi cd "$B" -JITENABLE="--enable-luajittex=no --enable-mfluajit=no" +JITENABLE="--enable-luajittex=no " if [ "$BUILDJIT" = "TRUE" ] then JITENABLE="--enable-luajittex --without-system-luajit " fi -BUILDLUA52=FALSE -LUA52ENABLE= -#if [ "$BUILDLUA52" = "TRUE" ] -#then -# LUA52ENABLE="--enable-luatex" -#fi +JITHBENABLE="--enable-luajithbtex=no " +if [ "$BUILDJITHB" = "TRUE" ] +then + JITHBENABLE="--enable-luajithbtex --without-system-luajit " +fi + +if [ "$BUILDJIT" = "FALSE" ] && [ "$BUILDJITHB" = "FALSE" ] +then + JITENABLE="$JITENABLE --enable-mfluajit=no " + JITHBENABLE="$JITHBENABLE --enable-mfluajit=no " +fi + -#LUA53ENABLE=--enable-luatex53 -BUILDLUA53=TRUE LUA53ENABLE=--enable-luatex -#if [ "$BUILDLUA53" = "FALSE" ] -#then -# LUA53ENABLE= -#fi +if [ "$BUILDLUA53" = "FALSE" ] +then + LUAHBENABLE="--enable-luahbtex=no " +fi + + +LUAHBENABLE=--enable-luahbtex=no +if [ "$BUILDHB" = "TRUE" ] +then + LUAHBENABLE="--enable-luahbtex" +fi -# --enable-dctdecoder=libjpeg --enable-libopenjpeg=openjpeg2 \ -# --enable-cxx-runtime-hack \ if [ "$ONLY_MAKE" = "FALSE" ] then @@ -309,9 +321,10 @@ TL_MAKE=$MAKE ../source/configure $TEXLIVEOPT $CONFHOST $CONFBUILD $WARNINGFLA --disable-xetex \ --disable-ipc \ --disable-dump-share \ + --disable-native-texlive-build \ --enable-coremp \ --enable-web2c \ - $LUA53ENABLE $JITENABLE \ + $LUA53ENABLE $JITENABLE $LUAHBENABLE $JITHBENABLE \ --without-system-cairo \ --without-system-pixman \ --without-system-ptexenc \ @@ -321,6 +334,7 @@ TL_MAKE=$MAKE ../source/configure $TEXLIVEOPT $CONFHOST $CONFBUILD $WARNINGFLA --without-system-freetype2 \ --without-system-gd \ --without-system-libpng \ + --without-system-poppler \ --without-system-teckit \ --without-system-zlib \ --without-system-t1lib \ @@ -333,36 +347,50 @@ TL_MAKE=$MAKE ../source/configure $TEXLIVEOPT $CONFHOST $CONFBUILD $WARNINGFLA fi -$MAKE + +$MAKE # the fact that these makes inside libs/ have to be done manually for the cross # compiler hints that something is wrong in the --enable/--disable switches above, # but I am too lazy to look up what is wrong exactly. # (perhaps more files needed to be copied from TL?) -(cd libs; $MAKE all ) -(cd libs/zziplib; $MAKE all ) -(cd libs/zlib; $MAKE all ) -(cd libs/libpng; $MAKE all ) -(cd texk; $MAKE web2c/Makefile) -(cd texk/kpathsea; $MAKE ) +(cd libs; $MAKE all ) +(cd libs/zziplib; $MAKE all ) +(cd libs/harfbuzz; $MAKE all ) +(cd libs/zlib; $MAKE all ) +(cd libs/libpng; $MAKE all ) +(cd texk; $MAKE all ) +(cd texk/kpathsea; $MAKE all ) if [ "$BUILDJIT" = "TRUE" ] then - (cd libs/luajit; $MAKE all ) - (cd texk/web2c; $MAKE $LUATEXEXEJIT) + (cd libs/luajit; $MAKE all ) + (cd texk/web2c; $MAKE $LUATEXEXEJIT ) +fi + +if [ "$BUILDJITHB" = "TRUE" ] +then + (cd libs/luajit; $MAKE all) + (cd texk/web2c; $MAKE $LUAHBTEXEXEJIT ) fi -# if [ "$BUILDLUA52" = "TRUE" ] -# then -# (cd texk/web2c; $MAKE $LUATEXEXE ) -# fi if [ "$BUILDLUA53" = "TRUE" ] then - (cd texk/web2c; $MAKE $LUATEXEXE53 ) + (cd texk/web2c; $MAKE $LUATEXEXE53 ) fi +if [ "$BUILDLUAHB" = "TRUE" ] +then + (cd texk/web2c; $MAKE $LUAHBTEXEXE ) +fi + + + + + + # go back cd .. @@ -372,14 +400,19 @@ then then $STRIP "$B"/texk/web2c/$LUATEXEXEJIT fi -# if [ "$BUILDLUA52" = "TRUE" ] -# then -# $STRIP "$B"/texk/web2c/$LUATEXEXE -# fi if [ "$BUILDLUA53" = "TRUE" ] then $STRIP "$B"/texk/web2c/$LUATEXEXE53 fi + if [ "$BUILDLUAHB" = "TRUE" ] + then + $STRIP "$B"/texk/web2c/$LUAHBTEXEXE + fi + if [ "$BUILDJITHB" = "TRUE" ] + then + $STRIP "$B"/texk/web2c/$LUAHBTEXEXEJIT + fi + else echo "lua(jit)tex binary not stripped" fi @@ -390,24 +423,22 @@ then fi # show the result +if [ "$BUILDLUA53" = "TRUE" ] +then ls -l "$B"/texk/web2c/$LUATEXEXE +fi +if [ "$BUILDLUAHB" = "TRUE" ] +then +ls -l "$B"/texk/web2c/$LUAHBTEXEXE +fi if [ "$BUILDJIT" = "TRUE" ] then ls -l "$B"/texk/web2c/$LUATEXEXEJIT fi -#if [ "$BUILDLUA52" = "TRUE" ] && [ "$BUILDLUA53" = "TRUE" ] -#then -# ls -l "$B"/texk/web2c/$LUATEXEXE -# ls -l "$B"/texk/web2c/$LUATEXEXE53 -#fi -#if [ "$BUILDLUA52" = "TRUE" ] && [ "$BUILDLUA53" = "FALSE" ] -#then -# ls -l "$B"/texk/web2c/$LUATEXEXE -#fi -#if [ "$BUILDLUA52" = "FALSE" ] && [ "$BUILDLUA53" = "TRUE" ] -#then -# mv "$B"/texk/web2c/$LUATEXEXE53 "$B"/texk/web2c/$LUATEXEXE -# ls -l "$B"/texk/web2c/$LUATEXEXE -#fi +if [ "$BUILDJITHB" = "TRUE" ] +then +ls -l "$B"/texk/web2c/$LUAHBTEXEXEJIT +fi + diff --git a/manual/luatex-backend.tex b/manual/luatex-backend.tex index 21cdd728c..e99a95ed2 100644 --- a/manual/luatex-backend.tex +++ b/manual/luatex-backend.tex @@ -1,1084 +1,1084 @@ -% language=uk - -\environment luatex-style - -\startcomponent luatex-backend - -\startchapter[reference=backend,title={The backend libraries}] - -\startsection[title={The \type {pdf} library}][library=pdf] - -\topicindex{backend} -\topicindex{\PDF} - -This library contains variables and functions that are related to the \PDF\ -backend. You can find more details about the expected values to setters in \in -{section} [backendprimitives]. - -\startsubsection[title={\type {mapfile}, \type {mapline}}] - -\topicindex{map files} -\topicindex{files+map} - -\startfunctioncall -pdf.mapfile( map file) -pdf.mapline( map line) -\stopfunctioncall - -These two functions can be used to replace primitives \orm {pdfmapfile} and -\orm {pdfmapline} inherited from \PDFTEX. They expect a string as only -parameter and have no return value. The first character in a map line can be -\type {-}, \type {+} or \type {=} which means as much as remove, add or replace -this line. They are not state setters but act immediately. - -\stopsubsection - -\startsubsection[title={\type {[set|get][catalog|info|names|trailer]}}] - -\topicindex{\PDF+trailer} -\topicindex{\PDF+catalog} -\topicindex{\PDF+info} - -\libindex{setcatalog} \libindex{getcatalog} -\libindex{setinfo} \libindex{getinfo} -\libindex{setnames} \libindex{getnames} -\libindex{settrailer} \libindex{gettrailer} - -These functions complement the corresponding \PDF\ backend token lists dealing -with metadata. The value types are strings and they are written to the \PDF\ -file directly after the token registers set at the \TEX\ end are written. - -\stopsubsection - -\startsubsection[title={\type {[set|get][pageattributes|pageresources|pagesattributes]}}] - -\libindex{setpageattributes} \libindex{getpageattributes} -\libindex{setpageresources} \libindex{getpageresources} -\libindex{setpagesattributes} \libindex{getpagesattributes} - -\topicindex{\PDF+page attributes} -\topicindex{\PDF+page resources} - -These functions complement the corresponding \PDF\ backend token lists dealing -with page resources. The variables have no interaction with the corresponding \PDF\ -backend token register. They are written to the \PDF\ file directly after the -token registers set at the \TEX\ end are written. - -\stopsubsection - -\startsubsection[title={\type {[set|get][xformattributes|xformresources]}}] - -\libindex{setxformattributes} \libindex{getxformattributes} -\libindex{setxformresources} \libindex{getxformresources} - -\topicindex{\PDF+xform attributes} -\topicindex{\PDF+xform resources} - -These functions complement the corresponding \PDF\ backend token lists dealing -with reuseable boxes and images. The variables have no interaction with the -corresponding \PDF\ backend token register. They are written to the \PDF\ -file directly after the token registers set at the \TEX\ end are written. - -\stopsubsection - -\startsubsection[title={\type {[set|get][major|minor]version}}] - -\topicindex{\PDF+version} - -\libindex{getmajorversion} \libindex{setmajorversion} -\libindex{getminorversion} \libindex{setminorversion} - -You can set both the major and minor version of the output. The major version is -normally~1 but when set to~2 some data will not be written to the file in order -to comply with the standard. What minor version you set depends on what \PDF\ -features you use. This is out of control of \LUATEX. - -\stopsubsection - -\startsubsection[title={\type {getcreationdate}}] - -\topicindex{\PDF+date} - -\libindex{getcreationdate} - -This function returns a string with the date in the format that ends up in the -\PDF\ file, in this case it's: {\tttf \cldcontext{pdf.getcreationdate()}}. - -\stopsubsection - -\startsubsection[title={\type {[set|get]inclusionerrorlevel} and \type {[set|get]ignoreunknownimages}}] - -\topicindex{\PDF+options} - -\libindex{getinclusionerrorlevel} \libindex{setinclusionerrorlevel} -\libindex{getignoreunknownimages} \libindex{setignoreunknownimages} - -These variable control how error in included image are treated. They are modeled -after the \PDFTEX\ equivalents. - -\stopsubsection - -\startsubsection[title={\type {[set|get]suppressoptionalinfo}, \type {[set|get]trailerid} -and \type {[set|get]omitcidset}}] - -\topicindex{\PDF+options} -\topicindex{\PDF+trailer} - -\libindex{getsuppressoptionalinfo} \libindex{setsuppressoptionalinfo} -\libindex{gettrailerid} \libindex{settrailerid} -\libindex{getomitcidset} \libindex{setomitcidset} -\libindex{getomitcharset} \libindex{setomitcharset} - -The optional info bitset (a number) determines what kind of info gets flushed. -By default we flush all. See \in {section} [sec:pdfextensions] for more details. - -You can set your own trailer id. This has to be string containing valid \PDF\ -array content with checksums. - -The cidset and charset flags (numbers) disables inclusion of a so called \type -{CIDSet} and \type {CharSet} entries, which can be handy when aiming at some of -the many \PDF\ substandards. - -\stopsubsection - -\startsubsection[title={\type {[set|get][obj|]compresslevel} and \type {[set|get]recompress}}] - -\topicindex{\PDF+compression} - -\libindex{getcompresslevel} \libindex{setcompresslevel} -\libindex{getobjcompresslevel} \libindex{setobjcompresslevel} -\libindex{getrecompress} \libindex{setrecompress} - -These functions set the level stream compression. When object compression is -enabled multiple objects will be packed in a compressed stream which saves space. -The minimum values are~0, the maxima are~9. - -When recompression is to~1 compressed objects will be decompressed and when -compresslevel is larger than zero they will then be recompressed. This is mostly -a debugging feature and should not be relied upon. - -\stopsubsection - -\startsubsection[title={\type {[set|get]gentounicode}}] - -\topicindex{\PDF+unicode} - -\libindex{getgentounicode} \libindex{setgentounicode} - -This flag enables tounicode generation (like in \PDFTEX). Normally the values are -provided by the font loader. - -\stopsubsection - -\startsubsection[title={\type {[set|get]decimaldigits}}] - -\topicindex{\PDF+precision} - -\libindex{getdecimaldigits} \libindex{setdecimaldigits} - -These two functions set the accuracy of floats written to the \PDF file. You can -set any value but the backend will not go below~3 and above~6. - -\stopsubsection - -\startsubsection[title={\type {[set|get]pkresolution}}] - -\topicindex{\PDF+resolution} - -\libindex{getpkresolution} \libindex{setpkresolution} - -These setter takes two arguments: the resolution and an optional zero or one that -indicates if this is a fixed one. The getter returns these two values. - -\stopsubsection - -\startsubsection[title={\type {getlast[obj|link|annot]} and \type {getretval}}] - -\topicindex{\PDF+objects} -\topicindex{\PDF+annotations} - -\libindex{getlastobj} \libindex{setlastobj} -\libindex{getlastlink} \libindex{setlastlink} -\libindex{getlastannot} \libindex{setlastannot} -\libindex{getretval} - -These status variables are similar to the ones traditionally used in the backend -interface at the \TEX\ end. - -\stopsubsection - -\startsubsection[title={\type {getmaxobjnum} and \type {getobjtype}, \type {getfontname}, -\type {getfontobjnum}, \type {getfontsize}, \type {getxformname}}] - -\libindex{getmaxobjnum} -\libindex{getobjtype} -\libindex{getfontname} -\libindex{getfontobjnum} -\libindex{getfontsize} -\libindex{getxformname} - -These introspective helpers are mostly used when you construct \PDF\ objects -yourself and need for instance information about a (to be) embedded font. - -\stopsubsection - -\startsubsection[title={\type {[set|get]origin}}] - -\topicindex{\PDF+positioning} - -\libindex{setorigin} \libindex{getorigin} - -This one is used to set the horizonal and|/|or vertical offset, a traditional -backend property. - -\starttyping -pdf.setorigin() -- sets both to 0pt -pdf.setorigin(tex.sp("1in")) -- sets both to 1in -pdf.setorigin(tex.sp("1in"),tex.sp("1in")) -\stoptyping - -The counterpart of this function returns two values. - -\stopsubsection - -\startsubsection[title={\type {[set|get]imageresolution}}] - -\topicindex{\PDF+resolution} - -\libindex{setimageresolution} \libindex{getimageresolution} - -These two functions relate to the imageresolution that is used when the image -itself doesn't provide a non|-|zero x or y resolution. - -\stopsubsection - -\startsubsection[title={\type {[set|get][link|dest|thread|xform]margin}}] - -\topicindex{\PDF+margins} - -\libindex{getlinkmargin} \libindex{setlinkmargin} -\libindex{getdestmargin} \libindex{setdestmargin} -\libindex{getthreadmargin} \libindex{setthreadmargin} -\libindex{getxformmargin} \libindex{setxformmargin} -\libindex{getmarginmargin} \libindex{setmarginmargin} - -These functions can be used to set and retrieve the margins that are added to the -natural bounding boxes of the respective objects. - -\stopsubsection - -\startsubsection[title={\type {get[pos|hpos|vpos]}}] - -\topicindex{\PDF+positions} - -\libindex{getpos} -\libindex{gethpos} -\libindex{getvpos} - -These functions get current location on the output page, measured from its lower -left corner. The values return scaled points as units. - -\starttyping -local h, v = pdf.getpos() -\stoptyping - -\stopsubsection - -\startsubsection[title={\type {[has|get]matrix}}] - -\topicindex{\PDF+matrix} - -\libindex{getmatrix} \libindex{hasmatrix} - -The current matrix transformation is available via the \type {getmatrix} command, -which returns 6 values: \type {sx}, \type {rx}, \type {ry}, \type {sy}, \type -{tx}, and \type {ty}. The \type {hasmatrix} function returns \type {true} when a -matrix is applied. - -\starttyping -if pdf.hasmatrix() then - local sx, rx, ry, sy, tx, ty = pdf.getmatrix() - -- do something useful or not -end -\stoptyping - -\stopsubsection - -\startsubsection[title={\type {print}}] - -\topicindex{\PDF+print to} - -\libindex{print} - -You can print a string to the \PDF\ document from within a \lpr {latelua} call. -This function is not to be used inside \prm {directlua} unless you know {\it -exactly} what you are doing. - -\startfunctioncall -pdf.print( s) -pdf.print( type, s) -\stopfunctioncall - -The optional parameter can be used to mimic the behavior of \PDF\ literals: the -\type {type} is \type {direct} or \type {page}. - -\stopsubsection - -\startsubsection[title={\type {immediateobj}}] - -\topicindex{\PDF+objects} - -\libindex{immediateobj} - -This function creates a \PDF\ object and immediately writes it to the \PDF\ file. -It is modelled after \PDFTEX's \prm {immediate} \orm {pdfobj} primitives. All -function variants return the object number of the newly generated object. - -\startfunctioncall - n = - pdf.immediateobj( objtext) - n = - pdf.immediateobj("file", filename) - n = - pdf.immediateobj("stream", streamtext, attrtext) - n = - pdf.immediateobj("streamfile", filename, attrtext) -\stopfunctioncall - -The first version puts the \type {objtext} raw into an object. Only the object -wrapper is automatically generated, but any internal structure (like \type {<< ->>} dictionary markers) needs to be provided by the user. The second version with -keyword \type {file} as first argument puts the contents of the file with name -\type {filename} raw into the object. The third version with keyword \type -{stream} creates a stream object and puts the \type {streamtext} raw into the -stream. The stream length is automatically calculated. The optional \type -{attrtext} goes into the dictionary of that object. The fourth version with -keyword \type {streamfile} does the same as the third one, it just reads the -stream data raw from a file. - -An optional first argument can be given to make the function use a previously -reserved \PDF\ object. - -\startfunctioncall - n = - pdf.immediateobj( n, objtext) - n = - pdf.immediateobj( n, "file", filename) - n = - pdf.immediateobj( n, "stream", streamtext, attrtext) - n = - pdf.immediateobj( n, "streamfile", filename, attrtext) -\stopfunctioncall - -\stopsubsection - -\startsubsection[title={\type{obj}}] - -\topicindex{\PDF+objects} - -\libindex{obj} - -This function creates a \PDF\ object, which is written to the \PDF\ file only -when referenced, e.g., by \type {refobj()}. - -All function variants return the object number of the newly generated object, and -there are two separate calling modes. The first mode is modelled after \PDFTEX's -\orm {pdfobj} primitive. - -\startfunctioncall - n = - pdf.obj( objtext) - n = - pdf.obj("file", filename) - n = - pdf.obj("stream", streamtext, attrtext) - n = - pdf.obj("streamfile", filename, attrtext) -\stopfunctioncall - -An optional first argument can be given to make the function use a previously -reserved \PDF\ object. - -\startfunctioncall - n = - pdf.obj( n, objtext) - n = - pdf.obj( n, "file", filename) - n = - pdf.obj( n, "stream", streamtext, attrtext) - n = - pdf.obj( n, "streamfile", filename, attrtext) -\stopfunctioncall - -The second mode accepts a single argument table with key--value pairs. - -\startfunctioncall - n = pdf.obj { - type = , - immediate = , - objnum = , - attr = , - compresslevel = , - objcompression = , - file = , - string = , - nolength = , -} -\stopfunctioncall - -The \type {type} field can have the values \type {raw} and \type {stream}, this -field is required, the others are optional (within constraints). When \type -{nolength} is set, there will be no \type {/Length} entry added to the -dictionary. - -Note: this mode makes \type{obj} look more flexible than it actually is: the -constraints from the separate parameter version still apply, so for example you -can't have both \type {string} and \type {file} at the same time. - -\stopsubsection - -\startsubsection[title={\type {refobj}}] - -\topicindex{\PDF+objects} - -\libindex{refobj} - -This function, the \LUA\ version of the \orm {pdfrefobj} primitive, references an -object by its object number, so that the object will be written to the \PDF\ file. - -\startfunctioncall -pdf.refobj( n) -\stopfunctioncall - -This function works in both the \prm {directlua} and \lpr {latelua} environment. -Inside \prm {directlua} a new whatsit node \quote {pdf_refobj} is created, which -will be marked for flushing during page output and the object is then written -directly after the page, when also the resources objects are written to the \PDF\ -file. Inside \lpr {latelua} the object will be marked for flushing. - -This function has no return values. - -\stopsubsection - -\startsubsection[title={\type {reserveobj}}] - -\topicindex{\PDF+objects} - -\libindex{reserveobj} - -This function creates an empty \PDF\ object and returns its number. - -\startfunctioncall - n = pdf.reserveobj() - n = pdf.reserveobj("annot") -\stopfunctioncall - -\stopsubsection - -\startsubsection[title={\type {getpageref}}] - -\topicindex{\PDF+pages} - -\libindex{getpageref} - -The object number of a page can be fetched with this function. This can be a -forward reference so when you ask for a future page, you do get a number back. - -\startfunctioncall - n = pdf.getpageref(123) -\stopfunctioncall - -\stopsubsection - -\startsubsection[title={\type {registerannot}}] - -\topicindex{\PDF+annotations} - -\libindex{registerannot} - -This function adds an object number to the \type {/Annots} array for the current -page without doing anything else. This function can only be used from within -\lpr {latelua}. - -\startfunctioncall -pdf.registerannot ( objnum) -\stopfunctioncall - -\stopsubsection - -\startsubsection[title={\type {newcolorstack}}] - -\topicindex{\PDF+color stack} - -\libindex{newcolorstack} - -This function allocates a new color stack and returns it's id. The arguments -are the same as for the similar backend extension primitive. - -\startfunctioncall -pdf.newcolorstack("0 g","page",true) -- page|direct|origin -\stopfunctioncall - -\stopsubsection - -\startsubsection[title={\type {setfontattributes}}] - -\topicindex{\PDF+fonts} - -\libindex{setfontattributes} - -This function will force some additional code into the font resource. It can for -instance be used to add a custom \type {ToUnicode} vector to a bitmap file. - -\startfunctioncall -pdf.setfontattributes( font id, pdf code) -\stopfunctioncall - -\stopsubsection - -\stopsection - -\startsection[title={The \type {pdfe} library}][library=pdfe] - -\startsubsection[title={Introduction}] - -\topicindex{\PDF+objects} - -\topicindex{\PDF+analyze} -\topicindex{\PDF+\type{pdfe}} - -The \type {pdfe} library replaces the \type {epdf} library and provides an -interface to \PDF\ files. It uses the same code as is used for \PDF\ image -inclusion. The \type {pplib} library by Paweł Jackowski replaces the \type -{poppler} (derived from \type {xpdf}) library. - -A \PDF\ file is basically a tree of objects and one descends into the tree via -dictionaries (key/value) and arrays (index/value). There are a few topmost -dictionaries that start at root that are accessed more directly. - -Although everything in \PDF\ is basically an object we only wrap a few in so -called userdata \LUA\ objects. - -\starttabulate -\BC \PDF \BC \LUA \NC \NR -\NC null \NC nil \NC \NR -\NC boolean \NC boolean \NC \NR -\NC integer \NC integer \NC \NR -\NC float \NC number \NC \NR -\NC name \NC string \NC \NR -\NC string \NC string \NC \NR -\NC array \NC array userdatum \NC \NR -\NC dictionary \NC dictionary userdatum \NC \NR -\NC stream \NC stream userdatum (with related dictionary) \NC \NR -\NC reference \NC reference userdatum \NC \NR -\stoptabulate - -The regular getters return these \LUA\ data types but one can also get more -detailed information. - -\stopsubsection - -\startsubsection[title={\type {open}, \type {new}, \type {getstatus}, \type {close}, \type {unencrypt}}] - -\libindex {open} -\libindex {new} -\libindex {new} -\libindex {getstatus} -\libindex {close} -\libindex {unencrypt} - -A document is loaded from a file or string - -\starttyping - = pdfe.open(filename) - = pdfe.new(somestring,somelength) -\stoptyping - -Such a document is closed with: - -\starttyping -pdfe.close() -\stoptyping - -You can check if a document opened well by: - -\starttyping -pdfe.getstatus() -\stoptyping - -The returned codes are: - -\starttabulate[|c|l|] -\DB value \BC explanation \NC \NR -\TB -\NC \type {-2} \NC the document failed to open \NC \NR -\NC \type {-1} \NC the document is (still) protected \NC \NR -\NC \type {0} \NC the document is not encrypted \NC \NR -\NC \type {2} \NC the document has been unencrypted \NC \NR -\LL -\stoptabulate - -An encrypted document can be unencrypted by the next command where instead of -either password you can give \type {nil}: - -\starttyping -pdfe.unencrypt(,userpassword,ownerpassword) -\stoptyping - -\stopsubsection - -\startsubsection[title={\type {getsize}, \type {getversion}, \type {getnofobjects}, \type {getnofpages}}] - -\libindex {getsize} -\libindex {getversion} -\libindex {getnofobjects} -\libindex {getnofpages} - -A successfully opened document can provide some information: - -\starttyping -bytes = getsize() -major, minor = getversion() -n = getnofobjects() -n = getnofpages() -bytes, waste = getnofpages() -\stoptyping - -\stopsubsection - -\startsubsection[title={\type {get[catalog|trailer|info]}}] - -\libindex {getcatalog} -\libindex {gettrailer} -\libindex {getinfo} - -For accessing the document structure you start with the so called catalog, a -dictionary: - -\starttyping - = pdfe.getcatalog() -\stoptyping - -The other two root dictionaries are accessed with: - -\starttyping - = pdfe.gettrailer() - = pdfe.getinfo() -\stoptyping - -\stopsubsection - -\startsubsection[title={\type {getpage}, \type {getbox}}] - -\libindex {getpage} -\libindex {getbox} - -A specific page can conveniently be reached with the next command, which -returns a dictionary. The first argument is to be a page dictionary. - -\starttyping - = pdfe.getpage(,pagenumber) -\stoptyping - -Another convenience command gives you the (bounding) box of a (normally page) -which can be inheritted from the document itself. An example of a valid box name -is \type {MediaBox}. - -\starttyping -pages = pdfe.getbox(,boxname) -\stoptyping - -\stopsubsection - -\startsubsection[title={\type {get[string|integer|number|boolean|name]}}] - -\libindex {getstring} -\libindex {getinteger} -\libindex {getnumber} -\libindex {getboolean} -\libindex {getname} - -Common values in dictionaries and arrays are strings, integers, floats, booleans -and names (which are also strings) and these are also normal \LUA\ objects: - -\starttyping -s = getstring (,index|key) -i = getinteger(,index|key) -n = getnumber (,index|key) -b = getboolean(,index|key) -n = getname (,index|key) -\stoptyping - -\stopsubsection - -\startsubsection[title={\type {get[from][dictionary|array|stream]}}] - -\libindex {getdictionary} \libindex {getfromdictionary} -\libindex {getarray} \libindex {getfromarray} -\libindex {getstream} \libindex {getfromstream} - -Normally you will use an index in an array and key in a dictionary but dictionaries -also accept an index. The size of an array or dictionary is available with the -usual \type {#} operator. - -\starttyping - = getdictionary(,index|key) - = getarray (,index|key) -, - = getstream (,index|key) -\stoptyping - -These commands return dictionaries, arrays and streams, which are dictionaries -with a blob of data attached. - -Before we come to an alternative access mode, we mention that the objects provide -access in a different way too, for instance this is valid: - -\starttyping -print(pdfe.open("foo.pdf").Catalog.Type) -\stoptyping - -At the topmost level there are \type {Catalog}, \type {Info}, \type {Trailer} -and \type {Pages}, so this is also okay: - -\starttyping -print(pdfe.open("foo.pdf").Pages[1]) -\stoptyping - -\stopsubsection - -\startsubsection[title={\type {[open|close|readfrom][whole|]stream}}] - -\libindex {openstream} -\libindex {closestream} -\libindex {readfromstream} -\libindex {readfromwholestream} - -Streams are sort of special. When your index or key hits a stream you get back a -stream object and dictionary object. The dictionary you can access in the usual -way and for the stream there are the following methods: - -\starttyping -okay = openstream(,[decode]) - closestream() -str, n = readfromstream() -str, n = readwholestream(,[decode]) -\stoptyping - -You either read in chunks, or you ask for the whole. When reading in chunks, you -need to open and close the stream yourself. The \type {n} value indicates the -length read. The \type {decode} parameter controls if the stream data gets -uncompressed. - -As with dictionaries, you can access fields in a stream dictionary in the usual -\LUA\ way too. You get the content when you \quote {call} the stream. You can -pass a boolean that indicates if the stream has to be decompressed. - -% pdfe.objectcodes = objectcodes -% pdfe.stringcodes = stringcodes -% pdfe.encryptioncodes = encryptioncodes - -\stopsubsection - -\startsubsection[title={\type {getfrom[dictionary|array]}}] - -\libindex {getfromdictionary} -\libindex {getfromarray} - -In addition to the interface described before, there is also a bit lower level -interface available. - -\starttyping -key, type, value, detail = getfromdictionary(,index) -type, value, detail = getfromarray(,index) -\stoptyping - -\starttabulate[|c|l|l|l|] -\DB type \BC meaning \BC value \BC detail \NC \NR -\NC \type {0} \NC none \NC nil \NC \NC \NR -\NC \type {1} \NC null \NC nil \NC \NC \NR -\NC \type {2} \NC boolean \NC boolean \NC \NC \NR -\NC \type {3} \NC boolean \NC integer \NC \NC \NR -\NC \type {4} \NC number \NC float \NC \NC \NR -\NC \type {5} \NC name \NC string \NC \NC \NR -\NC \type {6} \NC string \NC string \NC hex \NC \NR -\NC \type {7} \NC array \NC arrayobject \NC size \NC \NR -\NC \type {8} \NC dictionary \NC dictionaryobject \NC size \NC \NR -\NC \type {9} \NC stream \NC streamobject \NC dictionary size \NC \NR -\NC \type {10} \NC reference \NC integer \NC \NC \NR -\LL -\stoptabulate - -A \type {hex} string is (in the \PDF\ file) surrounded by \type {<>} while plain -strings are bounded by \type {<>}. - -\stopsubsection - -\startsubsection[title={\type {[dictionary|array]totable}}] - -\libindex {dictionarytotable} -\libindex {arraytotable} - -All entries in a dictionary or table can be fetched with the following commands -where the return values are a hashed or indexed table. - -\starttyping -hash = dictionarytotable() -list = arraytotable() -\stoptyping - -You can get a list of pages with: - -\starttyping -{ { , size, objnum }, ... } = pagestotable() -\stoptyping - -\stopsubsection - -\startsubsection[title={\type {getfromreference}}] - -\libindex {getfromreference} - -Because you can have unresolved references, a reference object can be resolved -with: - -\starttyping - = getfromreference() -\stoptyping - -So, you get back a new \type {pdfe} userdata object that you can query. - -\stopsubsection - -\stopsection - -\startsection[title={Memory streams}][library=pdfe] - -\topicindex{\PDF+memory streams} - -\libindex {new} - -The \type {pdfe.new} that takes three arguments: - -\starttabulate -\DB value \BC explanation \NC \NR -\TB -\NC \type {stream} \NC this is a (in low level \LUA\ speak) light userdata - object, i.e.\ a pointer to a sequence of bytes \NC \NR -\NC \type {length} \NC this is the length of the stream in bytes (the stream can - have embedded zeros) \NC \NR -\NC \type {name} \NC optional, this is a unique identifier that is used for - hashing the stream, so that multiple doesn't use more - memory \NC \NR -\LL -\stoptabulate - -The third argument is optional. When it is not given the function will return an -\type {pdfe} document object as with a regular file, otherwise it will return a -filename that can be used elsewhere (e.g.\ in the image library) to reference the -stream as pseudo file. - -Instead of a light userdata stream (which is actually fragile but handy when you -come from a library) you can also pass a \LUA\ string, in which case the given -length is (at most) the string length. - -The function returns an \type {pdfe} object and a string. The string can be used in -the \type {img} library instead of a filename. You need to prevent garbage -collection of the object when you use it as image (for instance by storing it -somewhere). - -Both the memory stream and it's use in the image library is experimental and can -change. In case you wonder where this can be used: when you use the swiglib -library for \type {graphicmagick}, it can return such a userdata object. This -permits conversion in memory and passing the result directly to the backend. This -might save some runtime in one|-|pass workflows. This feature is currently not -meant for production and we might come up with a better implementation. - -\stopsection - -\startsection[title={The \type {pdfscanner} library}][library=pdfscanner] - -\topicindex{\PDF+scanner} - -\libindex {scan} - -The \type {pdfscanner} library allows interpretation of \PDF\ content streams and -\type {/ToUnicode} (cmap) streams. You can get those streams from the \type -{pdfe} library, as explained in an earlier section. There is only a single -top|-|level function in this library: - -\startfunctioncall -pdfscanner.scan (, operatortable,
info) -pdfscanner.scan (,
operatortable,
info) -pdfscanner.scan (,
operatortable,
info) -\stopfunctioncall - -The first argument should be a \LUA\ string or a stream or array onject coming -from the \type {pdfe} library. The second argument, \type {operatortable}, should -be a \LUA\ table where the keys are \PDF\ operator name strings and the values -are \LUA\ functions (defined by you) that are used to process those operators. -The functions are called whenever the scanner finds one of these \PDF\ operators -in the content stream(s). The functions are called with two arguments: the \type -{scanner} object itself, and the \type {info} table that was passed are the third -argument to \type {pdfscanner.scan}. - -Internally, \type {pdfscanner.scan} loops over the \PDF\ operators in the -stream(s), collecting operands on an internal stack until it finds a \PDF\ -operator. If that \PDF\ operator's name exists in \type {operatortable}, then the -associated function is executed. After the function has run (or when there is no -function to execute) the internal operand stack is cleared in preparation for the -next operator, and processing continues. - -The \type {scanner} argument to the processing functions is needed because it -offers various methods to get the actual operands from the internal operand -stack. - -A simple example of processing a \PDF's document stream could look like this: - -\starttyping -local operatortable = { } - -operatortable.Do = function(scanner,info) - local resources = info.resources - if resources then - local val = scanner:pop() - local name = val[2] - local xobject = resources.XObject - print(info.space .. "Uses XObject " .. name) - local resources = xobject.Resources - if resources then - local newinfo = { - space = info.space .. " ", - resources = resources, - } - pdfscanner.scan(entry, operatortable, newinfo) - end - end -end - -local function Analyze(filename) - local doc = pdfe.open(filename) - if doc then - local pages = doc.Pages - for i=1,#pages do - local page = pages[i] - local info = { - space = " " , - resources = page.Resources, - } - print("Page " .. i) - -- pdfscanner.scan(page.Contents,operatortable,info) - pdfscanner.scan(page.Contents(),operatortable,info) - end - end -end - -Analyze("foo.pdf") -\stoptyping - -This example iterates over all the actual content in the \PDF, and prints out the -found \type {XObject} names. While the code demonstrates quite some of the \type -{pdfe} functions, let's focus on the type \type {pdfscanner} specific code -instead. - -From the bottom up, the following line runs the scanner with the \PDF\ page's -top|-|level content given in the first argument. - -The third argument, \type {info}, contains two entries: \type {space} is used to -indent the printed output, and \type {resources} is needed so that embedded \type -{XForms} can find their own content. - -The second argument, \type {operatortable} defines a processing function for a -single \PDF\ operator, \type {Do}. - -The function \type {Do} prints the name of the current \type {XObject}, and then -starts a new scanner for that object's content stream, under the condition that -the \type {XObject} is in fact a \type {/Form}. That nested scanner is called -with new \type {info} argument with an updated \type {space} value so that the -indentation of the output nicely nests, and with a new \type {resources} field -to help the next iteration down to properly process any other, embedded \type -{XObject}s. - -Of course, this is not a very useful example in practice, but for the purpose of -demonstrating \type {pdfscanner}, it is just long enough. It makes use of only -one \type {scanner} method: \type {scanner:pop()}. That function pops the top -operand of the internal stack, and returns a \LUA\ table where the object at index -one is a string representing the type of the operand, and object two is its -value. - -The list of possible operand types and associated \LUA\ value types is: - -\starttabulate[|l|l|] -\DB types \BC type \NC \NR -\TB -\NC \type{integer} \NC \NC \NR -\NC \type{real} \NC \NC \NR -\NC \type{boolean} \NC \NC \NR -\NC \type{name} \NC \NC \NR -\NC \type{operator} \NC \NC \NR -\NC \type{string} \NC \NC \NR -\NC \type{array} \NC
\NC \NR -\NC \type{dict} \NC
\NC \NR -\LL -\stoptabulate - -In case of \type {integer} or \type {real}, the value is always a \LUA\ (floating -point) number. In case of \type {name}, the leading slash is always stripped. - -In case of \type {string}, please bear in mind that \PDF\ actually supports -different types of strings (with different encodings) in different parts of the -\PDF\ document, so you may need to reencode some of the results; \type {pdfscanner} -always outputs the byte stream without reencoding anything. \type {pdfscanner} -does not differentiate between literal strings and hexadecimal strings (the -hexadecimal values are decoded), and it treats the stream data for inline images -as a string that is the single operand for \type {EI}. - -In case of \type {array}, the table content is a list of \type {pop} return -values and in case of \type {dict}, the table keys are \PDF\ name strings and the -values are \type {pop} return values. - -\libindex{pop} -\libindex{popnumber} -\libindex{popname} -\libindex{popstring} -\libindex{poparray} -\libindex{popdictionary} -\libindex{popboolean} -\libindex{done} - -There are a few more methods defined that you can ask \type {scanner}: - -\starttabulate[|l|p|] -\DB method \BC explanation \NC \NR -\TB -\NC \type{pop} \NC see above \NC \NR -\NC \type{popnumber} \NC return only the value of a \type {real} or \type {integer} \NC \NR -\NC \type{popname} \NC return only the value of a \type {name} \NC \NR -\NC \type{popstring} \NC return only the value of a \type {string} \NC \NR -\NC \type{poparray} \NC return only the value of a \type {array} \NC \NR -\NC \type{popdictionary} \NC return only the value of a \type {dict} \NC \NR -\NC \type{popboolean} \NC return only the value of a \type {boolean} \NC \NR -\NC \type{done} \NC abort further processing of this \type {scan()} call \NC \NR -\LL -\stoptabulate - -The \type {pop*} are convenience functions, and come in handy when you know the -type of the operands beforehand (which you usually do, in \PDF). For example, the -\type {Do} function could have used \type {local name = scanner:popname()} -instead, because the single operand to the \type {Do} operator is always a \PDF\ -name object. - -The \type {done} function allows you to abort processing of a stream once you -have learned everything you want to learn. This comes in handy while parsing -\type {/ToUnicode}, because there usually is trailing garbage that you are not -interested in. Without \type {done}, processing only ends at the end of the -stream, possibly wasting \CPU\ cycles. - -{\em We keep the older names \type {popNumber}, \type {popName}, \type -{popString}, \type {popArray}, \type {popDict} and \type {popBool} around.} - -\stopsection - -\stopchapter - -\stopcomponent +% language=uk + +\environment luatex-style + +\startcomponent luatex-backend + +\startchapter[reference=backend,title={The backend libraries}] + +\startsection[title={The \type {pdf} library}][library=pdf] + +\topicindex{backend} +\topicindex{\PDF} + +This library contains variables and functions that are related to the \PDF\ +backend. You can find more details about the expected values to setters in \in +{section} [backendprimitives]. + +\startsubsection[title={\type {mapfile}, \type {mapline}}] + +\topicindex{map files} +\topicindex{files+map} + +\startfunctioncall +pdf.mapfile( map file) +pdf.mapline( map line) +\stopfunctioncall + +These two functions can be used to replace primitives \orm {pdfmapfile} and +\orm {pdfmapline} inherited from \PDFTEX. They expect a string as only +parameter and have no return value. The first character in a map line can be +\type {-}, \type {+} or \type {=} which means as much as remove, add or replace +this line. They are not state setters but act immediately. + +\stopsubsection + +\startsubsection[title={\type {[set|get][catalog|info|names|trailer]}}] + +\topicindex{\PDF+trailer} +\topicindex{\PDF+catalog} +\topicindex{\PDF+info} + +\libindex{setcatalog} \libindex{getcatalog} +\libindex{setinfo} \libindex{getinfo} +\libindex{setnames} \libindex{getnames} +\libindex{settrailer} \libindex{gettrailer} + +These functions complement the corresponding \PDF\ backend token lists dealing +with metadata. The value types are strings and they are written to the \PDF\ +file directly after the token registers set at the \TEX\ end are written. + +\stopsubsection + +\startsubsection[title={\type {[set|get][pageattributes|pageresources|pagesattributes]}}] + +\libindex{setpageattributes} \libindex{getpageattributes} +\libindex{setpageresources} \libindex{getpageresources} +\libindex{setpagesattributes} \libindex{getpagesattributes} + +\topicindex{\PDF+page attributes} +\topicindex{\PDF+page resources} + +These functions complement the corresponding \PDF\ backend token lists dealing +with page resources. The variables have no interaction with the corresponding \PDF\ +backend token register. They are written to the \PDF\ file directly after the +token registers set at the \TEX\ end are written. + +\stopsubsection + +\startsubsection[title={\type {[set|get][xformattributes|xformresources]}}] + +\libindex{setxformattributes} \libindex{getxformattributes} +\libindex{setxformresources} \libindex{getxformresources} + +\topicindex{\PDF+xform attributes} +\topicindex{\PDF+xform resources} + +These functions complement the corresponding \PDF\ backend token lists dealing +with reuseable boxes and images. The variables have no interaction with the +corresponding \PDF\ backend token register. They are written to the \PDF\ +file directly after the token registers set at the \TEX\ end are written. + +\stopsubsection + +\startsubsection[title={\type {[set|get][major|minor]version}}] + +\topicindex{\PDF+version} + +\libindex{getmajorversion} \libindex{setmajorversion} +\libindex{getminorversion} \libindex{setminorversion} + +You can set both the major and minor version of the output. The major version is +normally~1 but when set to~2 some data will not be written to the file in order +to comply with the standard. What minor version you set depends on what \PDF\ +features you use. This is out of control of \LUATEX. + +\stopsubsection + +\startsubsection[title={\type {getcreationdate}}] + +\topicindex{\PDF+date} + +\libindex{getcreationdate} + +This function returns a string with the date in the format that ends up in the +\PDF\ file, in this case it's: {\tttf \cldcontext{pdf.getcreationdate()}}. + +\stopsubsection + +\startsubsection[title={\type {[set|get]inclusionerrorlevel} and \type {[set|get]ignoreunknownimages}}] + +\topicindex{\PDF+options} + +\libindex{getinclusionerrorlevel} \libindex{setinclusionerrorlevel} +\libindex{getignoreunknownimages} \libindex{setignoreunknownimages} + +These variable control how error in included image are treated. They are modeled +after the \PDFTEX\ equivalents. + +\stopsubsection + +\startsubsection[title={\type {[set|get]suppressoptionalinfo}, \type {[set|get]trailerid} +and \type {[set|get]omitcidset}}] + +\topicindex{\PDF+options} +\topicindex{\PDF+trailer} + +\libindex{getsuppressoptionalinfo} \libindex{setsuppressoptionalinfo} +\libindex{gettrailerid} \libindex{settrailerid} +\libindex{getomitcidset} \libindex{setomitcidset} +\libindex{getomitcharset} \libindex{setomitcharset} + +The optional info bitset (a number) determines what kind of info gets flushed. +By default we flush all. See \in {section} [sec:pdfextensions] for more details. + +You can set your own trailer id. This has to be string containing valid \PDF\ +array content with checksums. + +The cidset and charset flags (numbers) disables inclusion of a so called \type +{CIDSet} and \type {CharSet} entries, which can be handy when aiming at some of +the many \PDF\ substandards. + +\stopsubsection + +\startsubsection[title={\type {[set|get][obj|]compresslevel} and \type {[set|get]recompress}}] + +\topicindex{\PDF+compression} + +\libindex{getcompresslevel} \libindex{setcompresslevel} +\libindex{getobjcompresslevel} \libindex{setobjcompresslevel} +\libindex{getrecompress} \libindex{setrecompress} + +These functions set the level stream compression. When object compression is +enabled multiple objects will be packed in a compressed stream which saves space. +The minimum values are~0, the maxima are~9. + +When recompression is to~1 compressed objects will be decompressed and when +compresslevel is larger than zero they will then be recompressed. This is mostly +a debugging feature and should not be relied upon. + +\stopsubsection + +\startsubsection[title={\type {[set|get]gentounicode}}] + +\topicindex{\PDF+unicode} + +\libindex{getgentounicode} \libindex{setgentounicode} + +This flag enables tounicode generation (like in \PDFTEX). Normally the values are +provided by the font loader. + +\stopsubsection + +\startsubsection[title={\type {[set|get]decimaldigits}}] + +\topicindex{\PDF+precision} + +\libindex{getdecimaldigits} \libindex{setdecimaldigits} + +These two functions set the accuracy of floats written to the \PDF file. You can +set any value but the backend will not go below~3 and above~6. + +\stopsubsection + +\startsubsection[title={\type {[set|get]pkresolution}}] + +\topicindex{\PDF+resolution} + +\libindex{getpkresolution} \libindex{setpkresolution} + +These setter takes two arguments: the resolution and an optional zero or one that +indicates if this is a fixed one. The getter returns these two values. + +\stopsubsection + +\startsubsection[title={\type {getlast[obj|link|annot]} and \type {getretval}}] + +\topicindex{\PDF+objects} +\topicindex{\PDF+annotations} + +\libindex{getlastobj} \libindex{setlastobj} +\libindex{getlastlink} \libindex{setlastlink} +\libindex{getlastannot} \libindex{setlastannot} +\libindex{getretval} + +These status variables are similar to the ones traditionally used in the backend +interface at the \TEX\ end. + +\stopsubsection + +\startsubsection[title={\type {getmaxobjnum} and \type {getobjtype}, \type {getfontname}, +\type {getfontobjnum}, \type {getfontsize}, \type {getxformname}}] + +\libindex{getmaxobjnum} +\libindex{getobjtype} +\libindex{getfontname} +\libindex{getfontobjnum} +\libindex{getfontsize} +\libindex{getxformname} + +These introspective helpers are mostly used when you construct \PDF\ objects +yourself and need for instance information about a (to be) embedded font. + +\stopsubsection + +\startsubsection[title={\type {[set|get]origin}}] + +\topicindex{\PDF+positioning} + +\libindex{setorigin} \libindex{getorigin} + +This one is used to set the horizonal and|/|or vertical offset, a traditional +backend property. + +\starttyping +pdf.setorigin() -- sets both to 0pt +pdf.setorigin(tex.sp("1in")) -- sets both to 1in +pdf.setorigin(tex.sp("1in"),tex.sp("1in")) +\stoptyping + +The counterpart of this function returns two values. + +\stopsubsection + +\startsubsection[title={\type {[set|get]imageresolution}}] + +\topicindex{\PDF+resolution} + +\libindex{setimageresolution} \libindex{getimageresolution} + +These two functions relate to the imageresolution that is used when the image +itself doesn't provide a non|-|zero x or y resolution. + +\stopsubsection + +\startsubsection[title={\type {[set|get][link|dest|thread|xform]margin}}] + +\topicindex{\PDF+margins} + +\libindex{getlinkmargin} \libindex{setlinkmargin} +\libindex{getdestmargin} \libindex{setdestmargin} +\libindex{getthreadmargin} \libindex{setthreadmargin} +\libindex{getxformmargin} \libindex{setxformmargin} +\libindex{getmarginmargin} \libindex{setmarginmargin} + +These functions can be used to set and retrieve the margins that are added to the +natural bounding boxes of the respective objects. + +\stopsubsection + +\startsubsection[title={\type {get[pos|hpos|vpos]}}] + +\topicindex{\PDF+positions} + +\libindex{getpos} +\libindex{gethpos} +\libindex{getvpos} + +These functions get current location on the output page, measured from its lower +left corner. The values return scaled points as units. + +\starttyping +local h, v = pdf.getpos() +\stoptyping + +\stopsubsection + +\startsubsection[title={\type {[has|get]matrix}}] + +\topicindex{\PDF+matrix} + +\libindex{getmatrix} \libindex{hasmatrix} + +The current matrix transformation is available via the \type {getmatrix} command, +which returns 6 values: \type {sx}, \type {rx}, \type {ry}, \type {sy}, \type +{tx}, and \type {ty}. The \type {hasmatrix} function returns \type {true} when a +matrix is applied. + +\starttyping +if pdf.hasmatrix() then + local sx, rx, ry, sy, tx, ty = pdf.getmatrix() + -- do something useful or not +end +\stoptyping + +\stopsubsection + +\startsubsection[title={\type {print}}] + +\topicindex{\PDF+print to} + +\libindex{print} + +You can print a string to the \PDF\ document from within a \lpr {latelua} call. +This function is not to be used inside \prm {directlua} unless you know {\it +exactly} what you are doing. + +\startfunctioncall +pdf.print( s) +pdf.print( type, s) +\stopfunctioncall + +The optional parameter can be used to mimic the behavior of \PDF\ literals: the +\type {type} is \type {direct} or \type {page}. + +\stopsubsection + +\startsubsection[title={\type {immediateobj}}] + +\topicindex{\PDF+objects} + +\libindex{immediateobj} + +This function creates a \PDF\ object and immediately writes it to the \PDF\ file. +It is modelled after \PDFTEX's \prm {immediate} \orm {pdfobj} primitives. All +function variants return the object number of the newly generated object. + +\startfunctioncall + n = + pdf.immediateobj( objtext) + n = + pdf.immediateobj("file", filename) + n = + pdf.immediateobj("stream", streamtext, attrtext) + n = + pdf.immediateobj("streamfile", filename, attrtext) +\stopfunctioncall + +The first version puts the \type {objtext} raw into an object. Only the object +wrapper is automatically generated, but any internal structure (like \type {<< +>>} dictionary markers) needs to be provided by the user. The second version with +keyword \type {file} as first argument puts the contents of the file with name +\type {filename} raw into the object. The third version with keyword \type +{stream} creates a stream object and puts the \type {streamtext} raw into the +stream. The stream length is automatically calculated. The optional \type +{attrtext} goes into the dictionary of that object. The fourth version with +keyword \type {streamfile} does the same as the third one, it just reads the +stream data raw from a file. + +An optional first argument can be given to make the function use a previously +reserved \PDF\ object. + +\startfunctioncall + n = + pdf.immediateobj( n, objtext) + n = + pdf.immediateobj( n, "file", filename) + n = + pdf.immediateobj( n, "stream", streamtext, attrtext) + n = + pdf.immediateobj( n, "streamfile", filename, attrtext) +\stopfunctioncall + +\stopsubsection + +\startsubsection[title={\type{obj}}] + +\topicindex{\PDF+objects} + +\libindex{obj} + +This function creates a \PDF\ object, which is written to the \PDF\ file only +when referenced, e.g., by \type {refobj()}. + +All function variants return the object number of the newly generated object, and +there are two separate calling modes. The first mode is modelled after \PDFTEX's +\orm {pdfobj} primitive. + +\startfunctioncall + n = + pdf.obj( objtext) + n = + pdf.obj("file", filename) + n = + pdf.obj("stream", streamtext, attrtext) + n = + pdf.obj("streamfile", filename, attrtext) +\stopfunctioncall + +An optional first argument can be given to make the function use a previously +reserved \PDF\ object. + +\startfunctioncall + n = + pdf.obj( n, objtext) + n = + pdf.obj( n, "file", filename) + n = + pdf.obj( n, "stream", streamtext, attrtext) + n = + pdf.obj( n, "streamfile", filename, attrtext) +\stopfunctioncall + +The second mode accepts a single argument table with key--value pairs. + +\startfunctioncall + n = pdf.obj { + type = , + immediate = , + objnum = , + attr = , + compresslevel = , + objcompression = , + file = , + string = , + nolength = , +} +\stopfunctioncall + +The \type {type} field can have the values \type {raw} and \type {stream}, this +field is required, the others are optional (within constraints). When \type +{nolength} is set, there will be no \type {/Length} entry added to the +dictionary. + +Note: this mode makes \type{obj} look more flexible than it actually is: the +constraints from the separate parameter version still apply, so for example you +can't have both \type {string} and \type {file} at the same time. + +\stopsubsection + +\startsubsection[title={\type {refobj}}] + +\topicindex{\PDF+objects} + +\libindex{refobj} + +This function, the \LUA\ version of the \orm {pdfrefobj} primitive, references an +object by its object number, so that the object will be written to the \PDF\ file. + +\startfunctioncall +pdf.refobj( n) +\stopfunctioncall + +This function works in both the \prm {directlua} and \lpr {latelua} environment. +Inside \prm {directlua} a new whatsit node \quote {pdf_refobj} is created, which +will be marked for flushing during page output and the object is then written +directly after the page, when also the resources objects are written to the \PDF\ +file. Inside \lpr {latelua} the object will be marked for flushing. + +This function has no return values. + +\stopsubsection + +\startsubsection[title={\type {reserveobj}}] + +\topicindex{\PDF+objects} + +\libindex{reserveobj} + +This function creates an empty \PDF\ object and returns its number. + +\startfunctioncall + n = pdf.reserveobj() + n = pdf.reserveobj("annot") +\stopfunctioncall + +\stopsubsection + +\startsubsection[title={\type {getpageref}}] + +\topicindex{\PDF+pages} + +\libindex{getpageref} + +The object number of a page can be fetched with this function. This can be a +forward reference so when you ask for a future page, you do get a number back. + +\startfunctioncall + n = pdf.getpageref(123) +\stopfunctioncall + +\stopsubsection + +\startsubsection[title={\type {registerannot}}] + +\topicindex{\PDF+annotations} + +\libindex{registerannot} + +This function adds an object number to the \type {/Annots} array for the current +page without doing anything else. This function can only be used from within +\lpr {latelua}. + +\startfunctioncall +pdf.registerannot ( objnum) +\stopfunctioncall + +\stopsubsection + +\startsubsection[title={\type {newcolorstack}}] + +\topicindex{\PDF+color stack} + +\libindex{newcolorstack} + +This function allocates a new color stack and returns it's id. The arguments +are the same as for the similar backend extension primitive. + +\startfunctioncall +pdf.newcolorstack("0 g","page",true) -- page|direct|origin +\stopfunctioncall + +\stopsubsection + +\startsubsection[title={\type {setfontattributes}}] + +\topicindex{\PDF+fonts} + +\libindex{setfontattributes} + +This function will force some additional code into the font resource. It can for +instance be used to add a custom \type {ToUnicode} vector to a bitmap file. + +\startfunctioncall +pdf.setfontattributes( font id, pdf code) +\stopfunctioncall + +\stopsubsection + +\stopsection + +\startsection[title={The \type {pdfe} library}][library=pdfe] + +\startsubsection[title={Introduction}] + +\topicindex{\PDF+objects} + +\topicindex{\PDF+analyze} +\topicindex{\PDF+\type{pdfe}} + +The \type {pdfe} library replaces the \type {epdf} library and provides an +interface to \PDF\ files. It uses the same code as is used for \PDF\ image +inclusion. The \type {pplib} library by Paweł Jackowski replaces the \type +{poppler} (derived from \type {xpdf}) library. + +A \PDF\ file is basically a tree of objects and one descends into the tree via +dictionaries (key/value) and arrays (index/value). There are a few topmost +dictionaries that start at root that are accessed more directly. + +Although everything in \PDF\ is basically an object we only wrap a few in so +called userdata \LUA\ objects. + +\starttabulate +\BC \PDF \BC \LUA \NC \NR +\NC null \NC nil \NC \NR +\NC boolean \NC boolean \NC \NR +\NC integer \NC integer \NC \NR +\NC float \NC number \NC \NR +\NC name \NC string \NC \NR +\NC string \NC string \NC \NR +\NC array \NC array userdatum \NC \NR +\NC dictionary \NC dictionary userdatum \NC \NR +\NC stream \NC stream userdatum (with related dictionary) \NC \NR +\NC reference \NC reference userdatum \NC \NR +\stoptabulate + +The regular getters return these \LUA\ data types but one can also get more +detailed information. + +\stopsubsection + +\startsubsection[title={\type {open}, \type {new}, \type {getstatus}, \type {close}, \type {unencrypt}}] + +\libindex {open} +\libindex {new} +\libindex {new} +\libindex {getstatus} +\libindex {close} +\libindex {unencrypt} + +A document is loaded from a file or string + +\starttyping + = pdfe.open(filename) + = pdfe.new(somestring,somelength) +\stoptyping + +Such a document is closed with: + +\starttyping +pdfe.close() +\stoptyping + +You can check if a document opened well by: + +\starttyping +pdfe.getstatus() +\stoptyping + +The returned codes are: + +\starttabulate[|c|l|] +\DB value \BC explanation \NC \NR +\TB +\NC \type {-2} \NC the document failed to open \NC \NR +\NC \type {-1} \NC the document is (still) protected \NC \NR +\NC \type {0} \NC the document is not encrypted \NC \NR +\NC \type {2} \NC the document has been unencrypted \NC \NR +\LL +\stoptabulate + +An encrypted document can be unencrypted by the next command where instead of +either password you can give \type {nil}: + +\starttyping +pdfe.unencrypt(,userpassword,ownerpassword) +\stoptyping + +\stopsubsection + +\startsubsection[title={\type {getsize}, \type {getversion}, \type {getnofobjects}, \type {getnofpages}}] + +\libindex {getsize} +\libindex {getversion} +\libindex {getnofobjects} +\libindex {getnofpages} + +A successfully opened document can provide some information: + +\starttyping +bytes = getsize() +major, minor = getversion() +n = getnofobjects() +n = getnofpages() +bytes, waste = getnofpages() +\stoptyping + +\stopsubsection + +\startsubsection[title={\type {get[catalog|trailer|info]}}] + +\libindex {getcatalog} +\libindex {gettrailer} +\libindex {getinfo} + +For accessing the document structure you start with the so called catalog, a +dictionary: + +\starttyping + = pdfe.getcatalog() +\stoptyping + +The other two root dictionaries are accessed with: + +\starttyping + = pdfe.gettrailer() + = pdfe.getinfo() +\stoptyping + +\stopsubsection + +\startsubsection[title={\type {getpage}, \type {getbox}}] + +\libindex {getpage} +\libindex {getbox} + +A specific page can conveniently be reached with the next command, which +returns a dictionary. The first argument is to be a page dictionary. + +\starttyping + = pdfe.getpage(,pagenumber) +\stoptyping + +Another convenience command gives you the (bounding) box of a (normally page) +which can be inheritted from the document itself. An example of a valid box name +is \type {MediaBox}. + +\starttyping +pages = pdfe.getbox(,boxname) +\stoptyping + +\stopsubsection + +\startsubsection[title={\type {get[string|integer|number|boolean|name]}}] + +\libindex {getstring} +\libindex {getinteger} +\libindex {getnumber} +\libindex {getboolean} +\libindex {getname} + +Common values in dictionaries and arrays are strings, integers, floats, booleans +and names (which are also strings) and these are also normal \LUA\ objects: + +\starttyping +s = getstring (,index|key) +i = getinteger(,index|key) +n = getnumber (,index|key) +b = getboolean(,index|key) +n = getname (,index|key) +\stoptyping + +\stopsubsection + +\startsubsection[title={\type {get[from][dictionary|array|stream]}}] + +\libindex {getdictionary} \libindex {getfromdictionary} +\libindex {getarray} \libindex {getfromarray} +\libindex {getstream} \libindex {getfromstream} + +Normally you will use an index in an array and key in a dictionary but dictionaries +also accept an index. The size of an array or dictionary is available with the +usual \type {#} operator. + +\starttyping + = getdictionary(,index|key) + = getarray (,index|key) +, + = getstream (,index|key) +\stoptyping + +These commands return dictionaries, arrays and streams, which are dictionaries +with a blob of data attached. + +Before we come to an alternative access mode, we mention that the objects provide +access in a different way too, for instance this is valid: + +\starttyping +print(pdfe.open("foo.pdf").Catalog.Type) +\stoptyping + +At the topmost level there are \type {Catalog}, \type {Info}, \type {Trailer} +and \type {Pages}, so this is also okay: + +\starttyping +print(pdfe.open("foo.pdf").Pages[1]) +\stoptyping + +\stopsubsection + +\startsubsection[title={\type {[open|close|readfrom][whole|]stream}}] + +\libindex {openstream} +\libindex {closestream} +\libindex {readfromstream} +\libindex {readfromwholestream} + +Streams are sort of special. When your index or key hits a stream you get back a +stream object and dictionary object. The dictionary you can access in the usual +way and for the stream there are the following methods: + +\starttyping +okay = openstream(,[decode]) + closestream() +str, n = readfromstream() +str, n = readwholestream(,[decode]) +\stoptyping + +You either read in chunks, or you ask for the whole. When reading in chunks, you +need to open and close the stream yourself. The \type {n} value indicates the +length read. The \type {decode} parameter controls if the stream data gets +uncompressed. + +As with dictionaries, you can access fields in a stream dictionary in the usual +\LUA\ way too. You get the content when you \quote {call} the stream. You can +pass a boolean that indicates if the stream has to be decompressed. + +% pdfe.objectcodes = objectcodes +% pdfe.stringcodes = stringcodes +% pdfe.encryptioncodes = encryptioncodes + +\stopsubsection + +\startsubsection[title={\type {getfrom[dictionary|array]}}] + +\libindex {getfromdictionary} +\libindex {getfromarray} + +In addition to the interface described before, there is also a bit lower level +interface available. + +\starttyping +key, type, value, detail = getfromdictionary(,index) +type, value, detail = getfromarray(,index) +\stoptyping + +\starttabulate[|c|l|l|l|] +\DB type \BC meaning \BC value \BC detail \NC \NR +\NC \type {0} \NC none \NC nil \NC \NC \NR +\NC \type {1} \NC null \NC nil \NC \NC \NR +\NC \type {2} \NC boolean \NC boolean \NC \NC \NR +\NC \type {3} \NC boolean \NC integer \NC \NC \NR +\NC \type {4} \NC number \NC float \NC \NC \NR +\NC \type {5} \NC name \NC string \NC \NC \NR +\NC \type {6} \NC string \NC string \NC hex \NC \NR +\NC \type {7} \NC array \NC arrayobject \NC size \NC \NR +\NC \type {8} \NC dictionary \NC dictionaryobject \NC size \NC \NR +\NC \type {9} \NC stream \NC streamobject \NC dictionary size \NC \NR +\NC \type {10} \NC reference \NC integer \NC \NC \NR +\LL +\stoptabulate + +A \type {hex} string is (in the \PDF\ file) surrounded by \type {<>} while plain +strings are bounded by \type {<>}. + +\stopsubsection + +\startsubsection[title={\type {[dictionary|array]totable}}] + +\libindex {dictionarytotable} +\libindex {arraytotable} + +All entries in a dictionary or table can be fetched with the following commands +where the return values are a hashed or indexed table. + +\starttyping +hash = dictionarytotable() +list = arraytotable() +\stoptyping + +You can get a list of pages with: + +\starttyping +{ { , size, objnum }, ... } = pagestotable() +\stoptyping + +\stopsubsection + +\startsubsection[title={\type {getfromreference}}] + +\libindex {getfromreference} + +Because you can have unresolved references, a reference object can be resolved +with: + +\starttyping + = getfromreference() +\stoptyping + +So, you get back a new \type {pdfe} userdata object that you can query. + +\stopsubsection + +\stopsection + +\startsection[title={Memory streams}][library=pdfe] + +\topicindex{\PDF+memory streams} + +\libindex {new} + +The \type {pdfe.new} that takes three arguments: + +\starttabulate +\DB value \BC explanation \NC \NR +\TB +\NC \type {stream} \NC this is a (in low level \LUA\ speak) light userdata + object, i.e.\ a pointer to a sequence of bytes \NC \NR +\NC \type {length} \NC this is the length of the stream in bytes (the stream can + have embedded zeros) \NC \NR +\NC \type {name} \NC optional, this is a unique identifier that is used for + hashing the stream, so that multiple doesn't use more + memory \NC \NR +\LL +\stoptabulate + +The third argument is optional. When it is not given the function will return an +\type {pdfe} document object as with a regular file, otherwise it will return a +filename that can be used elsewhere (e.g.\ in the image library) to reference the +stream as pseudo file. + +Instead of a light userdata stream (which is actually fragile but handy when you +come from a library) you can also pass a \LUA\ string, in which case the given +length is (at most) the string length. + +The function returns an \type {pdfe} object and a string. The string can be used in +the \type {img} library instead of a filename. You need to prevent garbage +collection of the object when you use it as image (for instance by storing it +somewhere). + +Both the memory stream and it's use in the image library is experimental and can +change. In case you wonder where this can be used: when you use the swiglib +library for \type {graphicmagick}, it can return such a userdata object. This +permits conversion in memory and passing the result directly to the backend. This +might save some runtime in one|-|pass workflows. This feature is currently not +meant for production and we might come up with a better implementation. + +\stopsection + +\startsection[title={The \type {pdfscanner} library}][library=pdfscanner] + +\topicindex{\PDF+scanner} + +\libindex {scan} + +The \type {pdfscanner} library allows interpretation of \PDF\ content streams and +\type {/ToUnicode} (cmap) streams. You can get those streams from the \type +{pdfe} library, as explained in an earlier section. There is only a single +top|-|level function in this library: + +\startfunctioncall +pdfscanner.scan (,
operatortable,
info) +pdfscanner.scan (,
operatortable,
info) +pdfscanner.scan (,
operatortable,
info) +\stopfunctioncall + +The first argument should be a \LUA\ string or a stream or array onject coming +from the \type {pdfe} library. The second argument, \type {operatortable}, should +be a \LUA\ table where the keys are \PDF\ operator name strings and the values +are \LUA\ functions (defined by you) that are used to process those operators. +The functions are called whenever the scanner finds one of these \PDF\ operators +in the content stream(s). The functions are called with two arguments: the \type +{scanner} object itself, and the \type {info} table that was passed are the third +argument to \type {pdfscanner.scan}. + +Internally, \type {pdfscanner.scan} loops over the \PDF\ operators in the +stream(s), collecting operands on an internal stack until it finds a \PDF\ +operator. If that \PDF\ operator's name exists in \type {operatortable}, then the +associated function is executed. After the function has run (or when there is no +function to execute) the internal operand stack is cleared in preparation for the +next operator, and processing continues. + +The \type {scanner} argument to the processing functions is needed because it +offers various methods to get the actual operands from the internal operand +stack. + +A simple example of processing a \PDF's document stream could look like this: + +\starttyping +local operatortable = { } + +operatortable.Do = function(scanner,info) + local resources = info.resources + if resources then + local val = scanner:pop() + local name = val[2] + local xobject = resources.XObject + print(info.space .. "Uses XObject " .. name) + local resources = xobject.Resources + if resources then + local newinfo = { + space = info.space .. " ", + resources = resources, + } + pdfscanner.scan(entry, operatortable, newinfo) + end + end +end + +local function Analyze(filename) + local doc = pdfe.open(filename) + if doc then + local pages = doc.Pages + for i=1,#pages do + local page = pages[i] + local info = { + space = " " , + resources = page.Resources, + } + print("Page " .. i) + -- pdfscanner.scan(page.Contents,operatortable,info) + pdfscanner.scan(page.Contents(),operatortable,info) + end + end +end + +Analyze("foo.pdf") +\stoptyping + +This example iterates over all the actual content in the \PDF, and prints out the +found \type {XObject} names. While the code demonstrates quite some of the \type +{pdfe} functions, let's focus on the type \type {pdfscanner} specific code +instead. + +From the bottom up, the following line runs the scanner with the \PDF\ page's +top|-|level content given in the first argument. + +The third argument, \type {info}, contains two entries: \type {space} is used to +indent the printed output, and \type {resources} is needed so that embedded \type +{XForms} can find their own content. + +The second argument, \type {operatortable} defines a processing function for a +single \PDF\ operator, \type {Do}. + +The function \type {Do} prints the name of the current \type {XObject}, and then +starts a new scanner for that object's content stream, under the condition that +the \type {XObject} is in fact a \type {/Form}. That nested scanner is called +with new \type {info} argument with an updated \type {space} value so that the +indentation of the output nicely nests, and with a new \type {resources} field +to help the next iteration down to properly process any other, embedded \type +{XObject}s. + +Of course, this is not a very useful example in practice, but for the purpose of +demonstrating \type {pdfscanner}, it is just long enough. It makes use of only +one \type {scanner} method: \type {scanner:pop()}. That function pops the top +operand of the internal stack, and returns a \LUA\ table where the object at index +one is a string representing the type of the operand, and object two is its +value. + +The list of possible operand types and associated \LUA\ value types is: + +\starttabulate[|l|l|] +\DB types \BC type \NC \NR +\TB +\NC \type{integer} \NC \NC \NR +\NC \type{real} \NC \NC \NR +\NC \type{boolean} \NC \NC \NR +\NC \type{name} \NC \NC \NR +\NC \type{operator} \NC \NC \NR +\NC \type{string} \NC \NC \NR +\NC \type{array} \NC
\NC \NR +\NC \type{dict} \NC
\NC \NR +\LL +\stoptabulate + +In case of \type {integer} or \type {real}, the value is always a \LUA\ (floating +point) number. In case of \type {name}, the leading slash is always stripped. + +In case of \type {string}, please bear in mind that \PDF\ actually supports +different types of strings (with different encodings) in different parts of the +\PDF\ document, so you may need to reencode some of the results; \type {pdfscanner} +always outputs the byte stream without reencoding anything. \type {pdfscanner} +does not differentiate between literal strings and hexadecimal strings (the +hexadecimal values are decoded), and it treats the stream data for inline images +as a string that is the single operand for \type {EI}. + +In case of \type {array}, the table content is a list of \type {pop} return +values and in case of \type {dict}, the table keys are \PDF\ name strings and the +values are \type {pop} return values. + +\libindex{pop} +\libindex{popnumber} +\libindex{popname} +\libindex{popstring} +\libindex{poparray} +\libindex{popdictionary} +\libindex{popboolean} +\libindex{done} + +There are a few more methods defined that you can ask \type {scanner}: + +\starttabulate[|l|p|] +\DB method \BC explanation \NC \NR +\TB +\NC \type{pop} \NC see above \NC \NR +\NC \type{popnumber} \NC return only the value of a \type {real} or \type {integer} \NC \NR +\NC \type{popname} \NC return only the value of a \type {name} \NC \NR +\NC \type{popstring} \NC return only the value of a \type {string} \NC \NR +\NC \type{poparray} \NC return only the value of a \type {array} \NC \NR +\NC \type{popdictionary} \NC return only the value of a \type {dict} \NC \NR +\NC \type{popboolean} \NC return only the value of a \type {boolean} \NC \NR +\NC \type{done} \NC abort further processing of this \type {scan()} call \NC \NR +\LL +\stoptabulate + +The \type {pop*} are convenience functions, and come in handy when you know the +type of the operands beforehand (which you usually do, in \PDF). For example, the +\type {Do} function could have used \type {local name = scanner:popname()} +instead, because the single operand to the \type {Do} operator is always a \PDF\ +name object. + +The \type {done} function allows you to abort processing of a stream once you +have learned everything you want to learn. This comes in handy while parsing +\type {/ToUnicode}, because there usually is trailing garbage that you are not +interested in. Without \type {done}, processing only ends at the end of the +stream, possibly wasting \CPU\ cycles. + +{\em We keep the older names \type {popNumber}, \type {popName}, \type +{popString}, \type {popArray}, \type {popDict} and \type {popBool} around.} + +\stopsection + +\stopchapter + +\stopcomponent diff --git a/manual/luatex-callbacks.tex b/manual/luatex-callbacks.tex index b2b706ea9..9be3e3635 100644 --- a/manual/luatex-callbacks.tex +++ b/manual/luatex-callbacks.tex @@ -1,1149 +1,1165 @@ -% language=uk - -\environment luatex-style - -\startcomponent luatex-callbacks - -\startchapter[reference=callbacks,title={\LUA\ callbacks}] - -\startsection[title={Registering callbacks}][library=callback] - -\topicindex{callbacks} - -\libindex{register} -\libindex{list} -\libindex{find} - -This library has functions that register, find and list callbacks. Callbacks are -\LUA\ functions that are called in well defined places. There are two kind of -callbacks: those that mix with existing functionality, and those that (when -enabled) replace functionality. In mosty cases the second category is expected to -behave similar to the built in functionality because in a next step specific -data is expected. For instance, you can replace the hyphenation routine. The -function gets a list that can be hyphenated (or not). The final list should be -valid and is (normally) used for constructing a paragraph. Another function can -replace the ligature builder and|/|or kerner. Doing something else is possible -but in the end might not give the user the expected outcome. - -The first thing you need to do is registering a callback: - -\startfunctioncall -id, error = - callback.register( callback_name, func) -id, error = - callback.register( callback_name, nil) -id, error = - callback.register( callback_name, false) -\stopfunctioncall - -Here the \syntax {callback_name} is a predefined callback name, see below. The -function returns the internal \type {id} of the callback or \type {nil}, if the -callback could not be registered. In the latter case, \type {error} contains an -error message, otherwise it is \type {nil}. - -\LUATEX\ internalizes the callback function in such a way that it does not matter -if you redefine a function accidentally. - -Callback assignments are always global. You can use the special value \type {nil} -instead of a function for clearing the callback. - -For some minor speed gain, you can assign the boolean \type {false} to the -non|-|file related callbacks, doing so will prevent \LUATEX\ from executing -whatever it would execute by default (when no callback function is registered at -all). Be warned: this may cause all sorts of grief unless you know \notabene -{exactly} what you are doing! - -\startfunctioncall -
info = - callback.list() -\stopfunctioncall - -The keys in the table are the known callback names, the value is a boolean where -\type {true} means that the callback is currently set (active). - -\startfunctioncall - f = callback.find(callback_name) -\stopfunctioncall - -If the callback is not set, \type {find} returns \type {nil}. - -\stopsection - -\startsection[title={File discovery callbacks}][library=callback] - -The behaviour documented in this subsection is considered stable in the sense that -there will not be backward|-|incompatible changes any more. - -\subsection{\cbk {find_read_file} and \cbk {find_write_file}} - -Your callback function should have the following conventions: - -\startfunctioncall - actual_name = - function ( id_number, asked_name) -\stopfunctioncall - -Arguments: - -\startitemize - -\sym{id_number} - -This number is zero for the log or \prm {input} files. For \TEX's \prm {read} -or \prm {write} the number is incremented by one, so \type {\read0} becomes~1. - -\sym{asked_name} - -This is the user|-|supplied filename, as found by \prm {input}, \prm {openin} -or \prm {openout}. - -\stopitemize - -Return value: - -\startitemize - -\sym{actual_name} - -This is the filename used. For the very first file that is read in by \TEX, you -have to make sure you return an \type {actual_name} that has an extension and -that is suitable for use as \type {jobname}. If you don't, you will have to -manually fix the name of the log file and output file after \LUATEX\ is finished, -and an eventual format filename will become mangled. That is because these file -names depend on the jobname. - -You have to return \type {nil} if the file cannot be found. - -\stopitemize - -\subsection{\cbk {find_font_file}} - -\topicindex{callbacks+font files} - -Your callback function should have the following conventions: - -\startfunctioncall - actual_name = - function ( asked_name) -\stopfunctioncall - -The \type {asked_name} is an \OTF\ or \TFM\ font metrics file. - -Return \type {nil} if the file cannot be found. - -\subsection{\cbk {find_output_file}} - -\topicindex{callbacks+output file} - -Your callback function should have the following conventions: - -\startfunctioncall - actual_name = - function ( asked_name) -\stopfunctioncall - -The \type {asked_name} is the \PDF\ or \DVI\ file for writing. - -\subsection{\cbk {find_format_file}} - -\topicindex{callbacks+format file} - -Your callback function should have the following conventions: - -\startfunctioncall - actual_name = - function ( asked_name) -\stopfunctioncall - -The \type {asked_name} is a format file for reading (the format file for writing -is always opened in the current directory). - -\subsection{\cbk {find_vf_file}} - -\topicindex{callbacks+font files} - -Like \cbk {find_font_file}, but for virtual fonts. This applies to both \ALEPH's -\OVF\ files and traditional Knuthian \VF\ files. - -\subsection{\cbk {find_map_file}} - -\topicindex{callbacks+font files} - -Like \cbk {find_font_file}, but for map files. - -\subsection{\cbk {find_enc_file}} - -\topicindex{callbacks+font files} - -Like \cbk {find_font_file}, but for enc files. - -\subsection{\cbk {find_pk_file}} - -\topicindex{callbacks+font files} - -Like \cbk {find_font_file}, but for pk bitmap files. This callback takes two -arguments: \type {name} and \type {dpi}. In your callback you can decide to -look for: - -\starttyping -dpi/.pk -\stoptyping - -but other strategies are possible. It is up to you to find a \quote {reasonable} -bitmap file to go with that specification. - -\subsection{\cbk {find_data_file}} - -\topicindex{callbacks+data files} - -Like \cbk {find_font_file}, but for embedded files (\type {\pdfobj file '...'}). - -\subsection{\cbk {find_opentype_file}} - -\topicindex{callbacks+font files} - -Like \cbk {find_font_file}, but for \OPENTYPE\ font files. - -\subsection{\cbk {find_truetype_file} and \cbk {find_type1_file}} - -\topicindex{callbacks+font files} - -Your callback function should have the following conventions: - -\startfunctioncall - actual_name = - function ( asked_name) -\stopfunctioncall - -The \type {asked_name} is a font file. This callback is called while \LUATEX\ is -building its internal list of needed font files, so the actual timing may -surprise you. Your return value is later fed back into the matching \type -{read_file} callback. - -Strangely enough, \cbk {find_type1_file} is also used for \OPENTYPE\ (\OTF) -fonts. - -\subsection{\cbk {find_image_file}} - -\topicindex{callbacks+image files} - -Your callback function should have the following conventions: - -\startfunctioncall - actual_name = - function ( asked_name) -\stopfunctioncall - -The \type {asked_name} is an image file. Your return value is used to open a file -from the hard disk, so make sure you return something that is considered the name -of a valid file by your operating system. - -\subsection[iocallback]{File reading callbacks} - -The behavior documented in this subsection is considered stable in the sense that -there will not be backward-incompatible changes any more. - -\subsection{\cbk {open_read_file}} - -\topicindex{callbacks+opening files} - -Your callback function should have the following conventions: - -\startfunctioncall -
env = - function ( file_name) -\stopfunctioncall - -Argument: - -\startitemize - -\sym{file_name} - -The filename returned by a previous \cbk {find_read_file} or the return value of -\type {kpse.find_file()} if there was no such callback defined. - -\stopitemize - -Return value: - -\startitemize - -\sym{env} - -This is a table containing at least one required and one optional callback -function for this file. The required field is \type {reader} and the associated -function will be called once for each new line to be read, the optional one is -\type {close} that will be called once when \LUATEX\ is done with the file. - -\LUATEX\ never looks at the rest of the table, so you can use it to store your -private per|-|file data. Both the callback functions will receive the table as -their only argument. - -\stopitemize - -\subsubsection{\type {reader}} - -\topicindex{callbacks+reader} - -\LUATEX\ will run this function whenever it needs a new input line from the file. - -\startfunctioncall -function(
env) - return line -end -\stopfunctioncall - -Your function should return either a string or \type {nil}. The value \type {nil} -signals that the end of file has occurred, and will make \TEX\ call the optional -\type {close} function next. - -\subsubsection{\type {close}} - -\topicindex{callbacks+closing files} - -\LUATEX\ will run this optional function when it decides to close the file. - -\startfunctioncall -function(
env) -end -\stopfunctioncall - -Your function should not return any value. - -\subsection{General file readers} - -\topicindex{callbacks+readers} - -There is a set of callbacks for the loading of binary data files. These all use -the same interface: - -\startfunctioncall -function( name) - return success, data, data_size -end -\stopfunctioncall - -The \type {name} will normally be a full path name as it is returned by either -one of the file discovery callbacks or the internal version of \type -{kpse.find_file()}. - -\startitemize - -\sym{success} - -Return \type {false} when a fatal error occurred (e.g.\ when the file cannot be -found, after all). - -\sym{data} - -The bytes comprising the file. - -\sym{data_size} - -The length of the \type {data}, in bytes. - -\stopitemize - -Return an empty string and zero if the file was found but there was a -reading problem. - -The list of functions is: - -\starttabulate[|l|p|] -\DB function \BC usage \NC \NR -\TB -\NC \type{read_font_file} \NC ofm or tfm files \NC \NR -\NC \type{read_vf_file} \NC virtual fonts \NC \NR -\NC \type{read_map_file} \NC map files \NC \NR -\NC \type{read_enc_file} \NC encoding files \NC \NR -\NC \type{read_pk_file} \NC pk bitmap files \NC \NR -\NC \type{read_data_file} \NC embedded files (as is possible with \PDF\ objects) \NC \NR -\NC \type{read_truetype_file} \NC \TRUETYPE\ font files \NC \NR -\NC \type{read_type1_file} \NC \TYPEONE\ font files \NC \NR -\NC \type{read_opentype_file} \NC \OPENTYPE\ font files \NC \NR -\LL -\stoptabulate - -\stopsection - -\startsection[title={Data processing callbacks}][library=callback] - -\subsection{\cbk {process_input_buffer}} - -\topicindex{callbacks+input buffer} - -This callback allows you to change the contents of the line input buffer just -before \LUATEX\ actually starts looking at it. - -\startfunctioncall -function( buffer) - return adjusted_buffer -end -\stopfunctioncall - -If you return \type {nil}, \LUATEX\ will pretend like your callback never -happened. You can gain a small amount of processing time from that. This callback -does not replace any internal code. - -\subsection{\cbk {process_output_buffer}} - -\topicindex{callbacks+output buffer} - -This callback allows you to change the contents of the line output buffer just -before \LUATEX\ actually starts writing it to a file as the result of a \prm -{write} command. It is only called for output to an actual file (that is, -excluding the log, the terminal, and so called \prm {write} 18 calls). - -\startfunctioncall -function( buffer) - return adjusted_buffer -end -\stopfunctioncall - -If you return \type {nil}, \LUATEX\ will pretend like your callback never -happened. You can gain a small amount of processing time from that. This callback -does not replace any internal code. - -\subsection{\cbk {process_jobname}} - -\topicindex{callbacks+jobname} - -This callback allows you to change the jobname given by \prm {jobname} in \TEX\ -and \type {tex.jobname} in Lua. It does not affect the internal job name or the -name of the output or log files. - -\startfunctioncall -function( jobname) - return adjusted_jobname -end -\stopfunctioncall - -The only argument is the actual job name; you should not use \type {tex.jobname} -inside this function or infinite recursion may occur. If you return \type {nil}, -\LUATEX\ will pretend your callback never happened. This callback does not -replace any internal code. - -\stopsection - -\startsection[title={Node list processing callbacks}][library=callback] - -The description of nodes and node lists is in~\in{chapter}[nodes]. - -\subsection{\cbk {contribute_filter}} - -\topicindex{callbacks+contributions} - -This callback is called when \LUATEX\ adds contents to list: - -\startfunctioncall -function( extrainfo) -end -\stopfunctioncall - -The string reports the group code. From this you can deduce from -what list you can give a treat. - -\starttabulate[|l|p|] -\DB value \BC explanation \NC \NR -\TB -\NC \type{pre_box} \NC interline material is being added \NC \NR -\NC \type{pre_adjust} \NC \prm {vadjust} material is being added \NC \NR -\NC \type{box} \NC a typeset box is being added (always called) \NC \NR -\NC \type{adjust} \NC \prm {vadjust} material is being added \NC \NR -\LL -\stoptabulate - -\subsection{\cbk {buildpage_filter}} - -\topicindex{callbacks+building pages} - -This callback is called whenever \LUATEX\ is ready to move stuff to the main -vertical list. You can use this callback to do specialized manipulation of the -page building stage like imposition or column balancing. - -\startfunctioncall -function( extrainfo) -end -\stopfunctioncall - -The string \type {extrainfo} gives some additional information about what \TEX's -state is with respect to the \quote {current page}. The possible values for the -\cbk {buildpage_filter} callback are: - -\starttabulate[|l|p|] -\DB value \BC explanation \NC \NR -\TB -\NC \type{alignment} \NC a (partial) alignment is being added \NC \NR -\NC \type{after_output} \NC an output routine has just finished \NC \NR -\NC \type{new_graf} \NC the beginning of a new paragraph \NC \NR -\NC \type{vmode_par} \NC \prm {par} was found in vertical mode \NC \NR -\NC \type{hmode_par} \NC \prm {par} was found in horizontal mode \NC \NR -\NC \type{insert} \NC an insert is added \NC \NR -\NC \type{penalty} \NC a penalty (in vertical mode) \NC \NR -\NC \type{before_display} \NC immediately before a display starts \NC \NR -\NC \type{after_display} \NC a display is finished \NC \NR -\NC \type{end} \NC \LUATEX\ is terminating (it's all over) \NC \NR -\LL -\stoptabulate - -\subsection{\cbk {build_page_insert}} - -\topicindex{callbacks+inserts} - -This callback is called when the pagebuilder adds an insert. There is not much -control over this mechanism but this callback permits some last minute -manipulations of the spacing before an insert, something that might be handy when -for instance multiple inserts (types) are appended in a row. - -\startfunctioncall -function( n, i) - return register -end -\stopfunctioncall - -with - -\starttabulate[|l|p|] -\DB value \BC explanation \NC \NR -\TB -\NC \type{n} \NC the insert class \NC \NR -\NC \type{i} \NC the order of the insert \NC \NR -\LL -\stoptabulate - -The return value is a number indicating the skip register to use for the -prepended spacing. This permits for instance a different top space (when \type -{i} equals one) and intermediate space (when \type {i} is larger than one). Of -course you can mess with the insert box but you need to make sure that \LUATEX\ -is happy afterwards. - -\subsection{\cbk {pre_linebreak_filter}} - -\topicindex{callbacks+linebreaks} - -This callback is called just before \LUATEX\ starts converting a list of nodes -into a stack of \prm {hbox}es, after the addition of \prm {parfillskip}. - -\startfunctioncall -function( head, groupcode) - return true | false | newhead -end -\stopfunctioncall - -The string called \type {groupcode} identifies the nodelist's context within -\TEX's processing. The range of possibilities is given in the table below, but -not all of those can actually appear in \cbk {pre_linebreak_filter}, some are -for the \cbk {hpack_filter} and \cbk {vpack_filter} callbacks that will be -explained in the next two paragraphs. - -\starttabulate[|l|p|] -\DB value \BC explanation \NC \NR -\TB -\NC \type{} \NC main vertical list \NC \NR -\NC \type{hbox} \NC \prm {hbox} in horizontal mode \NC \NR -\NC \type{adjusted_hbox} \NC \prm {hbox} in vertical mode \NC \NR -\NC \type{vbox} \NC \prm {vbox} \NC \NR -\NC \type{vtop} \NC \prm {vtop} \NC \NR -\NC \type{align} \NC \prm {halign} or \prm {valign} \NC \NR -\NC \type{disc} \NC discretionaries \NC \NR -\NC \type{insert} \NC packaging an insert \NC \NR -\NC \type{vcenter} \NC \prm {vcenter} \NC \NR -\NC \type{local_box} \NC \lpr {localleftbox} or \lpr {localrightbox} \NC \NR -\NC \type{split_off} \NC top of a \prm {vsplit} \NC \NR -\NC \type{split_keep} \NC remainder of a \prm {vsplit} \NC \NR -\NC \type{align_set} \NC alignment cell \NC \NR -\NC \type{fin_row} \NC alignment row \NC \NR -\LL -\stoptabulate - -As for all the callbacks that deal with nodes, the return value can be one of -three things: - -\startitemize -\startitem - boolean \type {true} signals successful processing -\stopitem -\startitem - \type {} signals that the \quote {head} node should be replaced by the - returned node -\stopitem -\startitem - boolean \type {false} signals that the \quote {head} node list should be - ignored and flushed from memory -\stopitem -\stopitemize - -This callback does not replace any internal code. - -\subsection{\cbk {linebreak_filter}} - -\topicindex{callbacks+linebreaks} - -This callback replaces \LUATEX's line breaking algorithm. - -\startfunctioncall -function( head, is_display) - return newhead -end -\stopfunctioncall - -The returned node is the head of the list that will be added to the main vertical -list, the boolean argument is true if this paragraph is interrupted by a -following math display. - -If you return something that is not a \type {}, \LUATEX\ will apply the -internal linebreak algorithm on the list that starts at \type {}. -Otherwise, the \type {} you return is supposed to be the head of a list of -nodes that are all allowed in vertical mode, and at least one of those has to -represent a hbox. Failure to do so will result in a fatal error. - -Setting this callback to \type {false} is possible, but dangerous, because it is -possible you will end up in an unfixable \quote {deadcycles loop}. - -\subsection{\type {append_to_vlist_filter}} - -\topicindex{callbacks+contributions} - -This callback is called whenever \LUATEX\ adds a box to a vertical list: - -\startfunctioncall -function( box, locationcode, , - mirrored) - return list, prevdepth -end -\stopfunctioncall - -It is ok to return nothing in which case you also need to flush the box or deal -with it yourself. The prevdepth is also optional. Locations are \type {box}, -\type {alignment}, \type {equation}, \type {equation_number} and \type -{post_linebreak}. - -\subsection{\cbk {post_linebreak_filter}} - -\topicindex{callbacks+linebreaks} - -This callback is called just after \LUATEX\ has converted a list of nodes into a -stack of \prm {hbox}es. - -\startfunctioncall -function( head, groupcode) - return true | false | newhead -end -\stopfunctioncall - -This callback does not replace any internal code. - -\subsection{\cbk {hpack_filter}} - -\topicindex{callbacks+packing} - -This callback is called when \TEX\ is ready to start boxing some horizontal mode -material. Math items and line boxes are ignored at the moment. - -\startfunctioncall -function( head, groupcode, size, - packtype [, direction] [, attributelist]) - return true | false | newhead -end -\stopfunctioncall - -The \type {packtype} is either \type {additional} or \type {exactly}. If \type -{additional}, then the \type {size} is a \type {\hbox spread ...} argument. If -\type {exactly}, then the \type {size} is a \type {\hbox to ...}. In both cases, -the number is in scaled points. - -The \type {direction} is either one of the three-letter direction specifier -strings, or \type {nil}. - -This callback does not replace any internal code. - -\subsection{\cbk {vpack_filter}} - -\topicindex{callbacks+packing} - -This callback is called when \TEX\ is ready to start boxing some vertical mode -material. Math displays are ignored at the moment. - -This function is very similar to the \cbk {hpack_filter}. Besides the fact -that it is called at different moments, there is an extra variable that matches -\TEX's \prm {maxdepth} setting. - -\startfunctioncall -function( head, groupcode, size, packtype, - maxdepth [, direction] [, attributelist])) - return true | false | newhead -end -\stopfunctioncall - -This callback does not replace any internal code. - -\subsection{\type {hpack_quality}} - -\topicindex{callbacks+packing} - -This callback can be used to intercept the overfull messages that can result from -packing a horizontal list (as happens in the par builder). The function takes a -few arguments: - -\startfunctioncall -function( incident, detail, head, first, - last) - return whatever -end -\stopfunctioncall - -The incident is one of \type {overfull}, \type {underfull}, \type {loose} or -\type {tight}. The detail is either the amount of overflow in case of \type -{overfull}, or the badness otherwise. The head is the list that is constructed -(when protrusion or expansion is enabled, this is an intermediate list). -Optionally you can return a node, for instance an overfull rule indicator. That -node will be appended to the list (just like \TEX's own rule would). - -\subsection{\type {vpack_quality}} - -\topicindex{callbacks+packing} - -This callback can be used to intercept the overfull messages that can result from -packing a vertical list (as happens in the page builder). The function takes a -few arguments: - -\startfunctioncall -function( incident, detail, head, first, - last) -end -\stopfunctioncall - -The incident is one of \type {overfull}, \type {underfull}, \type {loose} or -\type {tight}. The detail is either the amount of overflow in case of \type -{overfull}, or the badness otherwise. The head is the list that is constructed. - -\subsection{\cbk {process_rule}} - -\topicindex{callbacks+rules} - -This is an experimental callback. It can be used with rules of subtype~4 -(user). The callback gets three arguments: the node, the width and the -height. The callback can use \type {pdf.print} to write code to the \PDF\ -file but beware of not messing up the final result. No checking is done. - -\subsection{\type {pre_output_filter}} - -\topicindex{callbacks+output} - -This callback is called when \TEX\ is ready to start boxing the box 255 for \prm -{output}. - -\startfunctioncall -function( head, groupcode, size, packtype, - maxdepth [, direction]) - return true | false | newhead -end -\stopfunctioncall - -This callback does not replace any internal code. - -\subsection{\cbk {hyphenate}} - -\topicindex{callbacks+hyphenation} - -\startfunctioncall -function( head, tail) -end -\stopfunctioncall - -No return values. This callback has to insert discretionary nodes in the node -list it receives. - -Setting this callback to \type {false} will prevent the internal discretionary -insertion pass. - -\subsection{\cbk {ligaturing}} - -\topicindex{callbacks+ligature building} - -\startfunctioncall -function( head, tail) -end -\stopfunctioncall - -No return values. This callback has to apply ligaturing to the node list it -receives. - -You don't have to worry about return values because the \type {head} node that is -passed on to the callback is guaranteed not to be a glyph_node (if need be, a -temporary node will be prepended), and therefore it cannot be affected by the -mutations that take place. After the callback, the internal value of the \quote -{tail of the list} will be recalculated. - -The \type {next} of \type {head} is guaranteed to be non-nil. - -The \type {next} of \type {tail} is guaranteed to be nil, and therefore the -second callback argument can often be ignored. It is provided for orthogonality, -and because it can sometimes be handy when special processing has to take place. - -Setting this callback to \type {false} will prevent the internal ligature -creation pass. - -You must not ruin the node list. For instance, the head normally is a local par node, -and the tail a glue. Messing too much can push \LUATEX\ into panic mode. - -\subsection{\cbk {kerning}} - -\topicindex{callbacks+kerning} - -\startfunctioncall -function( head, tail) -end -\stopfunctioncall - -No return values. This callback has to apply kerning between the nodes in the -node list it receives. See \cbk {ligaturing} for calling conventions. - -Setting this callback to \type {false} will prevent the internal kern insertion -pass. - -You must not ruin the node list. For instance, the head normally is a local par node, -and the tail a glue. Messing too much can push \LUATEX\ into panic mode. - -\subsection{\type {insert_local_par}} - -Each paragraph starts with a local par node that keeps track of for instance -the direction. You can hook a callback into the creator: - -\startfunctioncall -function( local_par, location) -end -\stopfunctioncall - -There is no return value and you should make sure that the node stays valid -as otherwise \TEX\ can get confused. - -\subsection{\cbk {mlist_to_hlist}} - -\topicindex{callbacks+math} - -This callback replaces \LUATEX's math list to node list conversion algorithm. - -\startfunctioncall -function( head, display_type, need_penalties) - return newhead -end -\stopfunctioncall - -The returned node is the head of the list that will be added to the vertical or -horizontal list, the string argument is either \quote {text} or \quote {display} -depending on the current math mode, the boolean argument is \type {true} if -penalties have to be inserted in this list, \type {false} otherwise. - -Setting this callback to \type {false} is bad, it will almost certainly result in -an endless loop. - -\stopsection - -\startsection[title={Information reporting callbacks}][library=callback] - -\subsection{\cbk {pre_dump}} - -\topicindex{callbacks+dump} - -\startfunctioncall -function() -end -\stopfunctioncall - -This function is called just before dumping to a format file starts. It does not -replace any code and there are neither arguments nor return values. - -\subsection{\cbk {start_run}} - -\topicindex{callbacks+job run} - -\startfunctioncall -function() -end -\stopfunctioncall - -This callback replaces the code that prints \LUATEX's banner. Note that for -successful use, this callback has to be set in the \LUA\ initialization script, -otherwise it will be seen only after the run has already started. - -\subsection{\cbk {stop_run}} - -\topicindex{callbacks+job run} - -\startfunctioncall -function() -end -\stopfunctioncall - -This callback replaces the code that prints \LUATEX's statistics and \quote -{output written to} messages. The engine can still do housekeeping and therefore -you should not rely on this hook for postprocessing the \PDF\ or log file. - -\subsection{\cbk {start_page_number}} - -\topicindex{callbacks+pages} - -\startfunctioncall -function() -end -\stopfunctioncall - -Replaces the code that prints the \type {[} and the page number at the begin of -\prm {shipout}. This callback will also override the printing of box information -that normally takes place when \prm {tracingoutput} is positive. - -\subsection{\cbk {stop_page_number}} - -\topicindex{callbacks+pages} - -\startfunctioncall -function() -end -\stopfunctioncall - -Replaces the code that prints the \type {]} at the end of \prm {shipout}. - -\subsection{\cbk {show_error_hook}} - -\topicindex{callbacks+errors} - -\startfunctioncall -function() -end -\stopfunctioncall - -This callback is run from inside the \TEX\ error function, and the idea is to -allow you to do some extra reporting on top of what \TEX\ already does (none of -the normal actions are removed). You may find some of the values in the \type -{status} table useful. This callback does not replace any internal code. - -\subsection{\cbk {show_error_message}} - -\topicindex{callbacks+errors} - -\startfunctioncall -function() -end -\stopfunctioncall - -This callback replaces the code that prints the error message. The usual -interaction after the message is not affected. - -\subsection{\cbk {show_lua_error_hook}} - -\topicindex{callbacks+errors} - -\startfunctioncall -function() -end -\stopfunctioncall - -This callback replaces the code that prints the extra \LUA\ error message. - -\subsection{\cbk {start_file}} - -\topicindex{callbacks+files} - -\startfunctioncall -function(category,filename) -end -\stopfunctioncall - -This callback replaces the code that prints \LUATEX's when a file is opened like -\type {(filename} for regular files. The category is a number: - -\starttabulate[|c|l|] -\DB value \BC meaning \NC \NR -\TB -\NC 1 \NC a normal data file, like a \TEX\ source \NC \NR -\NC 2 \NC a font map coupling font names to resources \NC \NR -\NC 3 \NC an image file (\type {png}, \type {pdf}, etc) \NC \NR -\NC 4 \NC an embedded font subset \NC \NR -\NC 5 \NC a fully embedded font \NC \NR -\LL -\stoptabulate - -\subsection{\cbk {stop_file}} - -\topicindex{callbacks+files} - -\startfunctioncall -function(category) -end -\stopfunctioncall - -This callback replaces the code that prints \LUATEX's when a file is closed like -the \type {)} for regular files. - -\subsection{\cbk {call_edit}} - -\topicindex{callbacks+editing} - -\startfunctioncall -function(filename,linenumber) -end -\stopfunctioncall - -This callback replaces the call to an external editor when \quote{E} is pressed -in reply to an error message. Processing will end immediately after the callback -returns control to the main program. - -\subsection{\cbk {finish_synctex}} - -\topicindex{callbacks+synctex} - -This callback can be used to wrap up alternative synctex methods. It kicks in -after the normal synctex finalizer (that happens to remove the synctex files -after a run when native synctex is not enabled). - -\subsection{\cbk {wrapup_run}} - -\topicindex{callbacks+wrapping up} - -This callback is called after the \PDF\ and log files are closed. Use it at your own -risk. - -\stopsection - -\startsection[title={\PDF\ related callbacks}][library=callback] - -\subsection{\cbk {finish_pdffile}} - -\topicindex{callbacks+\PDF\ file} - -\startfunctioncall -function() -end -\stopfunctioncall - -This callback is called when all document pages are already written to the \PDF\ -file and \LUATEX\ is about to finalize the output document structure. Its -intended use is final update of \PDF\ dictionaries such as \type {/Catalog} or -\type {/Info}. The callback does not replace any code. There are neither -arguments nor return values. - -\subsection{\cbk {finish_pdfpage}} - -\topicindex{callbacks+\PDF\ file} - -\startfunctioncall -function(shippingout) -end -\stopfunctioncall - -This callback is called after the \PDF\ page stream has been assembled and before -the page object gets finalized. - -\subsection{\cbk {page_objnum_provider}} - -\topicindex{callbacks+\PDF\ file} - -This is one that experts can use to juggle the page tree, a data structure -that determines the order in a \PDF\ file: - -\startfunctioncall -function(objnum) - return objnum -end -\stopfunctioncall - -We can for instance swap the first and last page: - -\starttyping -local n = 0 -callback.register("page_objnum_provider",function(objnum) - n = n + 1 - if n == 1 then - return pdf.getpageref(tex.count[0]) - elseif n == tex.count[0] then - return pdf.getpageref(1) - else - return objnum - end -end) -\stoptyping - -When you mess things up \unknown\ don't complain. - -\subsection{\cbk {process_pdf_image_content}} - -\topicindex{callbacks+image content} - -When a page from a \PDF\ file is embedded its page stream as well as related -objects are copied to the target file. However, it can be that the page stream -has operators that assume additional resources, for instance marked text. You can -decide to filter that for which \LUATEX\ provides a callback. Here is a simple -demonstration of use: - -\starttyping -pdf.setrecompress(1) - -callback.register("process_pdf_image_content",function(s) - print(s) - return s -end) -\stoptyping - -You need to explicitly enable recompression because otherwise the content stream -gets just passed on in its original compressed form. - -\stopsection - -\startsection[title={Font-related callbacks}][library=callback] - -\subsection{\cbk {define_font}} - -\topicindex{callbacks+fonts} - -\startfunctioncall -function( name, size, id) - return
font | id -end -\stopfunctioncall - -The string \type {name} is the filename part of the font specification, as given -by the user. - -The number \type {size} is a bit special: - -\startitemize[packed] -\startitem - If it is positive, it specifies an \quote{at size} in scaled points. -\stopitem -\startitem - If it is negative, its absolute value represents a \quote {scaled} setting - relative to the designsize of the font. -\stopitem -\stopitemize - -The \type {id} is the internal number assigned to the font. - -The internal structure of the \type {font} table that is to be returned is -explained in \in {chapter} [fonts]. That table is saved internally, so you can -put extra fields in the table for your later \LUA\ code to use. In alternative, -\type {retval} can be a previously defined fontid. This is useful if a previous -definition can be reused instead of creating a whole new font structure. - -Setting this callback to \type {false} is pointless as it will prevent font -loading completely but will nevertheless generate errors. - -\subsection{\cbk {glyph_not_found}} - -\topicindex{callbacks+fonts} - -This callback kicks in when the backend cannot insert a glyph. When no callback -is defined a message is written to the log. - -\startfunctioncall -function( id, char) - -- do something with font id and char code -end -\stopfunctioncall - -\stopsection - -\stopchapter - -\stopcomponent +% language=uk + +\environment luatex-style + +\startcomponent luatex-callbacks + +\startchapter[reference=callbacks,title={\LUA\ callbacks}] + +\startsection[title={Registering callbacks}][library=callback] + +\topicindex{callbacks} + +\libindex{register} +\libindex{list} +\libindex{find} + +This library has functions that register, find and list callbacks. Callbacks are +\LUA\ functions that are called in well defined places. There are two kind of +callbacks: those that mix with existing functionality, and those that (when +enabled) replace functionality. In mosty cases the second category is expected to +behave similar to the built in functionality because in a next step specific +data is expected. For instance, you can replace the hyphenation routine. The +function gets a list that can be hyphenated (or not). The final list should be +valid and is (normally) used for constructing a paragraph. Another function can +replace the ligature builder and|/|or kerner. Doing something else is possible +but in the end might not give the user the expected outcome. + +The first thing you need to do is registering a callback: + +\startfunctioncall +id, error = + callback.register( callback_name, func) +id, error = + callback.register( callback_name, nil) +id, error = + callback.register( callback_name, false) +\stopfunctioncall + +Here the \syntax {callback_name} is a predefined callback name, see below. The +function returns the internal \type {id} of the callback or \type {nil}, if the +callback could not be registered. In the latter case, \type {error} contains an +error message, otherwise it is \type {nil}. + +\LUATEX\ internalizes the callback function in such a way that it does not matter +if you redefine a function accidentally. + +Callback assignments are always global. You can use the special value \type {nil} +instead of a function for clearing the callback. + +For some minor speed gain, you can assign the boolean \type {false} to the +non|-|file related callbacks, doing so will prevent \LUATEX\ from executing +whatever it would execute by default (when no callback function is registered at +all). Be warned: this may cause all sorts of grief unless you know \notabene +{exactly} what you are doing! + +\startfunctioncall +
info = + callback.list() +\stopfunctioncall + +The keys in the table are the known callback names, the value is a boolean where +\type {true} means that the callback is currently set (active). + +\startfunctioncall + f = callback.find(callback_name) +\stopfunctioncall + +If the callback is not set, \type {find} returns \type {nil}. + +\stopsection + +\startsection[title={File discovery callbacks}][library=callback] + +The behaviour documented in this subsection is considered stable in the sense that +there will not be backward|-|incompatible changes any more. + +\subsection{\cbk {find_read_file} and \cbk {find_write_file}} + +Your callback function should have the following conventions: + +\startfunctioncall + actual_name = + function ( id_number, asked_name) +\stopfunctioncall + +Arguments: + +\startitemize + +\sym{id_number} + +This number is zero for the log or \prm {input} files. For \TEX's \prm {read} +or \prm {write} the number is incremented by one, so \type {\read0} becomes~1. + +\sym{asked_name} + +This is the user|-|supplied filename, as found by \prm {input}, \prm {openin} +or \prm {openout}. + +\stopitemize + +Return value: + +\startitemize + +\sym{actual_name} + +This is the filename used. For the very first file that is read in by \TEX, you +have to make sure you return an \type {actual_name} that has an extension and +that is suitable for use as \type {jobname}. If you don't, you will have to +manually fix the name of the log file and output file after \LUATEX\ is finished, +and an eventual format filename will become mangled. That is because these file +names depend on the jobname. + +You have to return \type {nil} if the file cannot be found. + +\stopitemize + +\subsection{\cbk {find_font_file}} + +\topicindex{callbacks+font files} + +Your callback function should have the following conventions: + +\startfunctioncall + actual_name = + function ( asked_name) +\stopfunctioncall + +The \type {asked_name} is an \OTF\ or \TFM\ font metrics file. + +Return \type {nil} if the file cannot be found. + +\subsection{\cbk {find_output_file}} + +\topicindex{callbacks+output file} + +Your callback function should have the following conventions: + +\startfunctioncall + actual_name = + function ( asked_name) +\stopfunctioncall + +The \type {asked_name} is the \PDF\ or \DVI\ file for writing. + +\subsection{\cbk {find_format_file}} + +\topicindex{callbacks+format file} + +Your callback function should have the following conventions: + +\startfunctioncall + actual_name = + function ( asked_name) +\stopfunctioncall + +The \type {asked_name} is a format file for reading (the format file for writing +is always opened in the current directory). + +\subsection{\cbk {find_vf_file}} + +\topicindex{callbacks+font files} + +Like \cbk {find_font_file}, but for virtual fonts. This applies to both \ALEPH's +\OVF\ files and traditional Knuthian \VF\ files. + +\subsection{\cbk {find_map_file}} + +\topicindex{callbacks+font files} + +Like \cbk {find_font_file}, but for map files. + +\subsection{\cbk {find_enc_file}} + +\topicindex{callbacks+font files} + +Like \cbk {find_font_file}, but for enc files. + +\subsection{\cbk {find_pk_file}} + +\topicindex{callbacks+font files} + +Like \cbk {find_font_file}, but for pk bitmap files. This callback takes two +arguments: \type {name} and \type {dpi}. In your callback you can decide to +look for: + +\starttyping +dpi/.pk +\stoptyping + +but other strategies are possible. It is up to you to find a \quote {reasonable} +bitmap file to go with that specification. + +\subsection{\cbk {find_data_file}} + +\topicindex{callbacks+data files} + +Like \cbk {find_font_file}, but for embedded files (\type {\pdfobj file '...'}). + +\subsection{\cbk {find_opentype_file}} + +\topicindex{callbacks+font files} + +Like \cbk {find_font_file}, but for \OPENTYPE\ font files. + +\subsection{\cbk {find_truetype_file} and \cbk {find_type1_file}} + +\topicindex{callbacks+font files} + +Your callback function should have the following conventions: + +\startfunctioncall + actual_name = + function ( asked_name) +\stopfunctioncall + +The \type {asked_name} is a font file. This callback is called while \LUATEX\ is +building its internal list of needed font files, so the actual timing may +surprise you. Your return value is later fed back into the matching \type +{read_file} callback. + +Strangely enough, \cbk {find_type1_file} is also used for \OPENTYPE\ (\OTF) +fonts. + +\subsection{\cbk {find_image_file}} + +\topicindex{callbacks+image files} + +Your callback function should have the following conventions: + +\startfunctioncall + actual_name = + function ( asked_name) +\stopfunctioncall + +The \type {asked_name} is an image file. Your return value is used to open a file +from the hard disk, so make sure you return something that is considered the name +of a valid file by your operating system. + +\stopsection + +\startsection[iocallback][title={File reading callbacks}] + +The behavior documented in this subsection is considered stable in the sense that +there will not be backward-incompatible changes any more. + +\subsection{\cbk {open_read_file}} + +\topicindex{callbacks+opening files} + +Your callback function should have the following conventions: + +\startfunctioncall +
env = + function ( file_name) +\stopfunctioncall + +Argument: + +\startitemize + +\sym{file_name} + +The filename returned by a previous \cbk {find_read_file} or the return value of +\type {kpse.find_file()} if there was no such callback defined. + +\stopitemize + +Return value: + +\startitemize + +\sym{env} + +This is a table containing at least one required and one optional callback +function for this file. The required field is \type {reader} and the associated +function will be called once for each new line to be read, the optional one is +\type {close} that will be called once when \LUATEX\ is done with the file. + +\LUATEX\ never looks at the rest of the table, so you can use it to store your +private per|-|file data. Both the callback functions will receive the table as +their only argument. + +\stopitemize + +\subsubsection{\type {reader}} + +\topicindex{callbacks+reader} + +\LUATEX\ will run this function whenever it needs a new input line from the file. + +\startfunctioncall +function(
env) + return line +end +\stopfunctioncall + +Your function should return either a string or \type {nil}. The value \type {nil} +signals that the end of file has occurred, and will make \TEX\ call the optional +\type {close} function next. + +\subsubsection{\type {close}} + +\topicindex{callbacks+closing files} + +\LUATEX\ will run this optional function when it decides to close the file. + +\startfunctioncall +function(
env) +end +\stopfunctioncall + +Your function should not return any value. + +\subsection{General file readers} + +\topicindex{callbacks+readers} + +There is a set of callbacks for the loading of binary data files. These all use +the same interface: + +\startfunctioncall +function( name) + return success, data, data_size +end +\stopfunctioncall + +The \type {name} will normally be a full path name as it is returned by either +one of the file discovery callbacks or the internal version of \type +{kpse.find_file()}. + +\startitemize + +\sym{success} + +Return \type {false} when a fatal error occurred (e.g.\ when the file cannot be +found, after all). + +\sym{data} + +The bytes comprising the file. + +\sym{data_size} + +The length of the \type {data}, in bytes. + +\stopitemize + +Return an empty string and zero if the file was found but there was a +reading problem. + +The list of functions is: + +\starttabulate[|l|p|] +\DB function \BC usage \NC \NR +\TB +\NC \type{read_font_file} \NC ofm or tfm files \NC \NR +\NC \type{read_vf_file} \NC virtual fonts \NC \NR +\NC \type{read_map_file} \NC map files \NC \NR +\NC \type{read_enc_file} \NC encoding files \NC \NR +\NC \type{read_pk_file} \NC pk bitmap files \NC \NR +\NC \type{read_data_file} \NC embedded files (as is possible with \PDF\ objects) \NC \NR +\NC \type{read_truetype_file} \NC \TRUETYPE\ font files \NC \NR +\NC \type{read_type1_file} \NC \TYPEONE\ font files \NC \NR +\NC \type{read_opentype_file} \NC \OPENTYPE\ font files \NC \NR +\LL +\stoptabulate + +\stopsection + +\startsection[title={Data processing callbacks}][library=callback] + +\subsection{\cbk {process_input_buffer}} + +\topicindex{callbacks+input buffer} + +This callback allows you to change the contents of the line input buffer just +before \LUATEX\ actually starts looking at it. + +\startfunctioncall +function( buffer) + return adjusted_buffer +end +\stopfunctioncall + +If you return \type {nil}, \LUATEX\ will pretend like your callback never +happened. You can gain a small amount of processing time from that. This callback +does not replace any internal code. + +\subsection{\cbk {process_output_buffer}} + +\topicindex{callbacks+output buffer} + +This callback allows you to change the contents of the line output buffer just +before \LUATEX\ actually starts writing it to a file as the result of a \prm +{write} command. It is only called for output to an actual file (that is, +excluding the log, the terminal, and so called \prm {write} 18 calls). + +\startfunctioncall +function( buffer) + return adjusted_buffer +end +\stopfunctioncall + +If you return \type {nil}, \LUATEX\ will pretend like your callback never +happened. You can gain a small amount of processing time from that. This callback +does not replace any internal code. + +\subsection{\cbk {process_jobname}} + +\topicindex{callbacks+jobname} + +This callback allows you to change the jobname given by \prm {jobname} in \TEX\ +and \type {tex.jobname} in Lua. It does not affect the internal job name or the +name of the output or log files. + +\startfunctioncall +function( jobname) + return adjusted_jobname +end +\stopfunctioncall + +The only argument is the actual job name; you should not use \type {tex.jobname} +inside this function or infinite recursion may occur. If you return \type {nil}, +\LUATEX\ will pretend your callback never happened. This callback does not +replace any internal code. + +\stopsection + +\startsection[title={Node list processing callbacks}][library=callback] + +The description of nodes and node lists is in~\in{chapter}[nodes]. + +\subsection{\cbk {contribute_filter}} + +\topicindex{callbacks+contributions} + +This callback is called when \LUATEX\ adds contents to list: + +\startfunctioncall +function( extrainfo) +end +\stopfunctioncall + +The string reports the group code. From this you can deduce from +what list you can give a treat. + +\starttabulate[|l|p|] +\DB value \BC explanation \NC \NR +\TB +\NC \type{pre_box} \NC interline material is being added \NC \NR +\NC \type{pre_adjust} \NC \prm {vadjust} material is being added \NC \NR +\NC \type{box} \NC a typeset box is being added (always called) \NC \NR +\NC \type{adjust} \NC \prm {vadjust} material is being added \NC \NR +\LL +\stoptabulate + +\subsection{\cbk {buildpage_filter}} + +\topicindex{callbacks+building pages} + +This callback is called whenever \LUATEX\ is ready to move stuff to the main +vertical list. You can use this callback to do specialized manipulation of the +page building stage like imposition or column balancing. + +\startfunctioncall +function( extrainfo) +end +\stopfunctioncall + +The string \type {extrainfo} gives some additional information about what \TEX's +state is with respect to the \quote {current page}. The possible values for the +\cbk {buildpage_filter} callback are: + +\starttabulate[|l|p|] +\DB value \BC explanation \NC \NR +\TB +\NC \type{alignment} \NC a (partial) alignment is being added \NC \NR +\NC \type{after_output} \NC an output routine has just finished \NC \NR +\NC \type{new_graf} \NC the beginning of a new paragraph \NC \NR +\NC \type{vmode_par} \NC \prm {par} was found in vertical mode \NC \NR +\NC \type{hmode_par} \NC \prm {par} was found in horizontal mode \NC \NR +\NC \type{insert} \NC an insert is added \NC \NR +\NC \type{penalty} \NC a penalty (in vertical mode) \NC \NR +\NC \type{before_display} \NC immediately before a display starts \NC \NR +\NC \type{after_display} \NC a display is finished \NC \NR +\NC \type{end} \NC \LUATEX\ is terminating (it's all over) \NC \NR +\LL +\stoptabulate + +\subsection{\cbk {build_page_insert}} + +\topicindex{callbacks+inserts} + +This callback is called when the pagebuilder adds an insert. There is not much +control over this mechanism but this callback permits some last minute +manipulations of the spacing before an insert, something that might be handy when +for instance multiple inserts (types) are appended in a row. + +\startfunctioncall +function( n, i) + return register +end +\stopfunctioncall + +with + +\starttabulate[|l|p|] +\DB value \BC explanation \NC \NR +\TB +\NC \type{n} \NC the insert class \NC \NR +\NC \type{i} \NC the order of the insert \NC \NR +\LL +\stoptabulate + +The return value is a number indicating the skip register to use for the +prepended spacing. This permits for instance a different top space (when \type +{i} equals one) and intermediate space (when \type {i} is larger than one). Of +course you can mess with the insert box but you need to make sure that \LUATEX\ +is happy afterwards. + +\subsection{\cbk {pre_linebreak_filter}} + +\topicindex{callbacks+linebreaks} + +This callback is called just before \LUATEX\ starts converting a list of nodes +into a stack of \prm {hbox}es, after the addition of \prm {parfillskip}. + +\startfunctioncall +function( head, groupcode) + return true | false | newhead +end +\stopfunctioncall + +The string called \type {groupcode} identifies the nodelist's context within +\TEX's processing. The range of possibilities is given in the table below, but +not all of those can actually appear in \cbk {pre_linebreak_filter}, some are +for the \cbk {hpack_filter} and \cbk {vpack_filter} callbacks that will be +explained in the next two paragraphs. + +\starttabulate[|l|p|] +\DB value \BC explanation \NC \NR +\TB +\NC \type{} \NC main vertical list \NC \NR +\NC \type{hbox} \NC \prm {hbox} in horizontal mode \NC \NR +\NC \type{adjusted_hbox} \NC \prm {hbox} in vertical mode \NC \NR +\NC \type{vbox} \NC \prm {vbox} \NC \NR +\NC \type{vtop} \NC \prm {vtop} \NC \NR +\NC \type{align} \NC \prm {halign} or \prm {valign} \NC \NR +\NC \type{disc} \NC discretionaries \NC \NR +\NC \type{insert} \NC packaging an insert \NC \NR +\NC \type{vcenter} \NC \prm {vcenter} \NC \NR +\NC \type{local_box} \NC \lpr {localleftbox} or \lpr {localrightbox} \NC \NR +\NC \type{split_off} \NC top of a \prm {vsplit} \NC \NR +\NC \type{split_keep} \NC remainder of a \prm {vsplit} \NC \NR +\NC \type{align_set} \NC alignment cell \NC \NR +\NC \type{fin_row} \NC alignment row \NC \NR +\LL +\stoptabulate + +As for all the callbacks that deal with nodes, the return value can be one of +three things: + +\startitemize +\startitem + boolean \type {true} signals successful processing +\stopitem +\startitem + \type {} signals that the \quote {head} node should be replaced by the + returned node +\stopitem +\startitem + boolean \type {false} signals that the \quote {head} node list should be + ignored and flushed from memory +\stopitem +\stopitemize + +This callback does not replace any internal code. + +\subsection{\cbk {linebreak_filter}} + +\topicindex{callbacks+linebreaks} + +This callback replaces \LUATEX's line breaking algorithm. + +\startfunctioncall +function( head, is_display) + return newhead +end +\stopfunctioncall + +The returned node is the head of the list that will be added to the main vertical +list, the boolean argument is true if this paragraph is interrupted by a +following math display. + +If you return something that is not a \type {}, \LUATEX\ will apply the +internal linebreak algorithm on the list that starts at \type {}. +Otherwise, the \type {} you return is supposed to be the head of a list of +nodes that are all allowed in vertical mode, and at least one of those has to +represent a hbox. Failure to do so will result in a fatal error. + +Setting this callback to \type {false} is possible, but dangerous, because it is +possible you will end up in an unfixable \quote {deadcycles loop}. + +\subsection{\type {append_to_vlist_filter}} + +\topicindex{callbacks+contributions} + +This callback is called whenever \LUATEX\ adds a box to a vertical list: + +\startfunctioncall +function( box, locationcode, , + mirrored) + return list, prevdepth +end +\stopfunctioncall + +It is ok to return nothing in which case you also need to flush the box or deal +with it yourself. The prevdepth is also optional. Locations are \type {box}, +\type {alignment}, \type {equation}, \type {equation_number} and \type +{post_linebreak}. + +\subsection{\cbk {post_linebreak_filter}} + +\topicindex{callbacks+linebreaks} + +This callback is called just after \LUATEX\ has converted a list of nodes into a +stack of \prm {hbox}es. + +\startfunctioncall +function( head, groupcode) + return true | false | newhead +end +\stopfunctioncall + +This callback does not replace any internal code. + +\subsection{\cbk {hpack_filter}} + +\topicindex{callbacks+packing} + +This callback is called when \TEX\ is ready to start boxing some horizontal mode +material. Math items and line boxes are ignored at the moment. + +\startfunctioncall +function( head, groupcode, size, + packtype [, direction] [, attributelist]) + return true | false | newhead +end +\stopfunctioncall + +The \type {packtype} is either \type {additional} or \type {exactly}. If \type +{additional}, then the \type {size} is a \type {\hbox spread ...} argument. If +\type {exactly}, then the \type {size} is a \type {\hbox to ...}. In both cases, +the number is in scaled points. + +The \type {direction} is either one of the three-letter direction specifier +strings, or \type {nil}. + +This callback does not replace any internal code. + +\subsection{\cbk {vpack_filter}} + +\topicindex{callbacks+packing} + +This callback is called when \TEX\ is ready to start boxing some vertical mode +material. Math displays are ignored at the moment. + +This function is very similar to the \cbk {hpack_filter}. Besides the fact +that it is called at different moments, there is an extra variable that matches +\TEX's \prm {maxdepth} setting. + +\startfunctioncall +function( head, groupcode, size, packtype, + maxdepth [, direction] [, attributelist])) + return true | false | newhead +end +\stopfunctioncall + +This callback does not replace any internal code. + +\subsection{\type {hpack_quality}} + +\topicindex{callbacks+packing} + +This callback can be used to intercept the overfull messages that can result from +packing a horizontal list (as happens in the par builder). The function takes a +few arguments: + +\startfunctioncall +function( incident, detail, head, first, + last) + return whatever +end +\stopfunctioncall + +The incident is one of \type {overfull}, \type {underfull}, \type {loose} or +\type {tight}. The detail is either the amount of overflow in case of \type +{overfull}, or the badness otherwise. The head is the list that is constructed +(when protrusion or expansion is enabled, this is an intermediate list). +Optionally you can return a node, for instance an overfull rule indicator. That +node will be appended to the list (just like \TEX's own rule would). + +\subsection{\type {vpack_quality}} + +\topicindex{callbacks+packing} + +This callback can be used to intercept the overfull messages that can result from +packing a vertical list (as happens in the page builder). The function takes a +few arguments: + +\startfunctioncall +function( incident, detail, head, first, + last) +end +\stopfunctioncall + +The incident is one of \type {overfull}, \type {underfull}, \type {loose} or +\type {tight}. The detail is either the amount of overflow in case of \type +{overfull}, or the badness otherwise. The head is the list that is constructed. + +\subsection{\cbk {process_rule}} + +\topicindex{callbacks+rules} + +This is an experimental callback. It can be used with rules of subtype~4 +(user). The callback gets three arguments: the node, the width and the +height. The callback can use \type {pdf.print} to write code to the \PDF\ +file but beware of not messing up the final result. No checking is done. + +\subsection{\type {pre_output_filter}} + +\topicindex{callbacks+output} + +This callback is called when \TEX\ is ready to start boxing the box 255 for \prm +{output}. + +\startfunctioncall +function( head, groupcode, size, packtype, + maxdepth [, direction]) + return true | false | newhead +end +\stopfunctioncall + +This callback does not replace any internal code. + +\subsection{\cbk {hyphenate}} + +\topicindex{callbacks+hyphenation} + +\startfunctioncall +function( head, tail) +end +\stopfunctioncall + +No return values. This callback has to insert discretionary nodes in the node +list it receives. + +Setting this callback to \type {false} will prevent the internal discretionary +insertion pass. + +\subsection{\cbk {ligaturing}} + +\topicindex{callbacks+ligature building} + +\startfunctioncall +function( head, tail) +end +\stopfunctioncall + +No return values. This callback has to apply ligaturing to the node list it +receives. + +You don't have to worry about return values because the \type {head} node that is +passed on to the callback is guaranteed not to be a glyph_node (if need be, a +temporary node will be prepended), and therefore it cannot be affected by the +mutations that take place. After the callback, the internal value of the \quote +{tail of the list} will be recalculated. + +The \type {next} of \type {head} is guaranteed to be non-nil. + +The \type {next} of \type {tail} is guaranteed to be nil, and therefore the +second callback argument can often be ignored. It is provided for orthogonality, +and because it can sometimes be handy when special processing has to take place. + +Setting this callback to \type {false} will prevent the internal ligature +creation pass. + +You must not ruin the node list. For instance, the head normally is a local par node, +and the tail a glue. Messing too much can push \LUATEX\ into panic mode. + +\subsection{\cbk {kerning}} + +\topicindex{callbacks+kerning} + +\startfunctioncall +function( head, tail) +end +\stopfunctioncall + +No return values. This callback has to apply kerning between the nodes in the +node list it receives. See \cbk {ligaturing} for calling conventions. + +Setting this callback to \type {false} will prevent the internal kern insertion +pass. + +You must not ruin the node list. For instance, the head normally is a local par node, +and the tail a glue. Messing too much can push \LUATEX\ into panic mode. + +\subsection{\type {insert_local_par}} + +Each paragraph starts with a local par node that keeps track of for instance +the direction. You can hook a callback into the creator: + +\startfunctioncall +function( local_par, location) +end +\stopfunctioncall + +There is no return value and you should make sure that the node stays valid +as otherwise \TEX\ can get confused. + +\subsection{\cbk {mlist_to_hlist}} + +\topicindex{callbacks+math} + +This callback replaces \LUATEX's math list to node list conversion algorithm. + +\startfunctioncall +function( head, display_type, need_penalties) + return newhead +end +\stopfunctioncall + +The returned node is the head of the list that will be added to the vertical or +horizontal list, the string argument is either \quote {text} or \quote {display} +depending on the current math mode, the boolean argument is \type {true} if +penalties have to be inserted in this list, \type {false} otherwise. + +Setting this callback to \type {false} is bad, it will almost certainly result in +an endless loop. + +\stopsection + +\startsection[title={Information reporting callbacks}][library=callback] + +\subsection{\cbk {pre_dump}} + +\topicindex{callbacks+dump} + +\startfunctioncall +function() +end +\stopfunctioncall + +This function is called just before dumping to a format file starts. It does not +replace any code and there are neither arguments nor return values. + +\subsection{\cbk {start_run}} + +\topicindex{callbacks+job run} + +\startfunctioncall +function() +end +\stopfunctioncall + +This callback replaces the code that prints \LUATEX's banner. Note that for +successful use, this callback has to be set in the \LUA\ initialization script, +otherwise it will be seen only after the run has already started. + +\subsection{\cbk {stop_run}} + +\topicindex{callbacks+job run} + +\startfunctioncall +function() +end +\stopfunctioncall + +This callback replaces the code that prints \LUATEX's statistics and \quote +{output written to} messages. The engine can still do housekeeping and therefore +you should not rely on this hook for postprocessing the \PDF\ or log file. + +\subsection{\cbk {start_page_number}} + +\topicindex{callbacks+pages} + +\startfunctioncall +function() +end +\stopfunctioncall + +Replaces the code that prints the \type {[} and the page number at the begin of +\prm {shipout}. This callback will also override the printing of box information +that normally takes place when \prm {tracingoutput} is positive. + +\subsection{\cbk {stop_page_number}} + +\topicindex{callbacks+pages} + +\startfunctioncall +function() +end +\stopfunctioncall + +Replaces the code that prints the \type {]} at the end of \prm {shipout}. + +\subsection{\cbk {show_error_hook}} + +\topicindex{callbacks+errors} + +\startfunctioncall +function() +end +\stopfunctioncall + +This callback is run from inside the \TEX\ error function, and the idea is to +allow you to do some extra reporting on top of what \TEX\ already does (none of +the normal actions are removed). You may find some of the values in the \type +{status} table useful. This callback does not replace any internal code. + +\subsection{\cbk {show_error_message}} + +\topicindex{callbacks+errors} + +\startfunctioncall +function() +end +\stopfunctioncall + +This callback replaces the code that prints the error message. The usual +interaction after the message is not affected. + +\subsection{\cbk {show_lua_error_hook}} + +\topicindex{callbacks+errors} + +\startfunctioncall +function() +end +\stopfunctioncall + +This callback replaces the code that prints the extra \LUA\ error message. + +\subsection{\cbk {start_file}} + +\topicindex{callbacks+files} + +\startfunctioncall +function(category,filename) +end +\stopfunctioncall + +This callback replaces the code that prints \LUATEX's when a file is opened like +\type {(filename} for regular files. The category is a number: + +\starttabulate[|c|l|] +\DB value \BC meaning \NC \NR +\TB +\NC 1 \NC a normal data file, like a \TEX\ source \NC \NR +\NC 2 \NC a font map coupling font names to resources \NC \NR +\NC 3 \NC an image file (\type {png}, \type {pdf}, etc) \NC \NR +\NC 4 \NC an embedded font subset \NC \NR +\NC 5 \NC a fully embedded font \NC \NR +\LL +\stoptabulate + +\subsection{\cbk {stop_file}} + +\topicindex{callbacks+files} + +\startfunctioncall +function(category) +end +\stopfunctioncall + +This callback replaces the code that prints \LUATEX's when a file is closed like +the \type {)} for regular files. + +\subsection{\cbk {call_edit}} + +\topicindex{callbacks+editing} + +\startfunctioncall +function(filename,linenumber) +end +\stopfunctioncall + +This callback replaces the call to an external editor when \quote{E} is pressed +in reply to an error message. Processing will end immediately after the callback +returns control to the main program. + +\subsection{\cbk {finish_synctex}} + +\topicindex{callbacks+synctex} + +This callback can be used to wrap up alternative synctex methods. It kicks in +after the normal synctex finalizer (that happens to remove the synctex files +after a run when native synctex is not enabled). + +\subsection{\cbk {wrapup_run}} + +\topicindex{callbacks+wrapping up} + +This callback is called after the \PDF\ and log files are closed. Use it at your own +risk. + +\stopsection + +\startsection[title={\PDF\ related callbacks}][library=callback] + +\subsection{\cbk {finish_pdffile}} + +\topicindex{callbacks+\PDF\ file} + +\startfunctioncall +function() +end +\stopfunctioncall + +This callback is called when all document pages are already written to the \PDF\ +file and \LUATEX\ is about to finalize the output document structure. Its +intended use is final update of \PDF\ dictionaries such as \type {/Catalog} or +\type {/Info}. The callback does not replace any code. There are neither +arguments nor return values. + +\subsection{\cbk {finish_pdfpage}} + +\topicindex{callbacks+\PDF\ file} + +\startfunctioncall +function(shippingout) +end +\stopfunctioncall + +This callback is called after the \PDF\ page stream has been assembled and before +the page object gets finalized. + +\subsection{\cbk {page_objnum_provider}} + +\topicindex{callbacks+\PDF\ file} + +This is one that experts can use to juggle the page tree, a data structure +that determines the order in a \PDF\ file: + +\startfunctioncall +function(objnum) + return objnum +end +\stopfunctioncall + +We can for instance swap the first and last page: + +\starttyping +local n = 0 +callback.register("page_objnum_provider",function(objnum) + n = n + 1 + if n == 1 then + return pdf.getpageref(tex.count[0]) + elseif n == tex.count[0] then + return pdf.getpageref(1) + else + return objnum + end +end) +\stoptyping + +When you mess things up \unknown\ don't complain. + +\subsection{\cbk {process_pdf_image_content}} + +\topicindex{callbacks+image content} + +When a page from a \PDF\ file is embedded its page stream as well as related +objects are copied to the target file. However, it can be that the page stream +has operators that assume additional resources, for instance marked text. You can +decide to filter that for which \LUATEX\ provides a callback. Here is a simple +demonstration of use: + +\starttyping +pdf.setrecompress(1) + +callback.register("process_pdf_image_content",function(s) + print(s) + return s +end) +\stoptyping + +You need to explicitly enable recompression because otherwise the content stream +gets just passed on in its original compressed form. + +\stopsection + +\startsection[title={Font-related callbacks}][library=callback] + +\subsection{\cbk {define_font}} + +\topicindex{callbacks+fonts} + +\startfunctioncall +function( name, size, id) + return
font | id +end +\stopfunctioncall + +The string \type {name} is the filename part of the font specification, as given +by the user. + +The number \type {size} is a bit special: + +\startitemize[packed] +\startitem + If it is positive, it specifies an \quote{at size} in scaled points. +\stopitem +\startitem + If it is negative, its absolute value represents a \quote {scaled} setting + relative to the designsize of the font. +\stopitem +\stopitemize + +The \type {id} is the internal number assigned to the font. + +The internal structure of the \type {font} table that is to be returned is +explained in \in {chapter} [fonts]. That table is saved internally, so you can +put extra fields in the table for your later \LUA\ code to use. In alternative, +\type {retval} can be a previously defined fontid. This is useful if a previous +definition can be reused instead of creating a whole new font structure. + +Setting this callback to \type {false} is pointless as it will prevent font +loading completely but will nevertheless generate errors. + +\subsection{\cbk {glyph_not_found} and \cbk {glyph_info}} + +\topicindex{callbacks+fonts} + +The \type {glyph_not_found} callback, when set, kicks in when the backend cannot +insert a glyph. When no callback is defined a message is written to the log. + +\startfunctioncall +function( id, char) + -- do something with font id and char code +end +\stopfunctioncall + +The \type {glyph_info} callback can be set to report a useful representation of a +glyph. + +\startfunctioncall +function( g) + -- return a string or nil +end +\stopfunctioncall + +When \type {nil} is returned the character code is printed, otherwise the +returned string is used. By default the \UTF\ representation is shown which is +not always that useful, especially when there is no real representation. Keep in +mind that setting this callback can change the log in an incompatible way. + +\stopsection + +\stopchapter + +\stopcomponent diff --git a/manual/luatex-contents.tex b/manual/luatex-contents.tex index 815ca4bbe..2582a81c7 100644 --- a/manual/luatex-contents.tex +++ b/manual/luatex-contents.tex @@ -1,19 +1,19 @@ -\environment luatex-style - -\startcomponent luatex-contents - -\starttitle[title=Contents] - -\start - - \definecolor[maincolor][black] - - \placelist - [chapter,section,subsection] - [criterium=text] - -\stop - -\stoptitle - -\stopcomponent +\environment luatex-style + +\startcomponent luatex-contents + +\starttitle[title=Contents] + +\start + + \definecolor[maincolor][black] + + \placelist + [chapter,section,subsection] + [criterium=text] + +\stop + +\stoptitle + +\stopcomponent diff --git a/manual/luatex-enhancements.tex b/manual/luatex-enhancements.tex index d6651507a..b81e1dbda 100644 --- a/manual/luatex-enhancements.tex +++ b/manual/luatex-enhancements.tex @@ -1,1371 +1,1371 @@ -% language=uk - -\environment luatex-style - -\startcomponent luatex-enhancements - -\startchapter[reference=enhancements,title={Basic \TEX\ enhancements}] - -\startsection[title={Introduction}] - -\startsubsection[title={Primitive behaviour}] - -From day one, \LUATEX\ has offered extra features compared to the superset of -\PDFTEX, which includes \ETEX, and \ALEPH. This has not been limited to the -possibility to execute \LUA\ code via \prm {directlua}, but \LUATEX\ also adds -functionality via new \TEX|-|side primitives or extensions to existing ones. - -When \LUATEX\ starts up in \quote {iniluatex} mode (\type {luatex -ini}), it -defines only the primitive commands known by \TEX82 and the one extra command -\prm {directlua}. As is fitting, a \LUA\ function has to be called to add the -extra primitives to the user environment. The simplest method to get access to -all of the new primitive commands is by adding this line to the format generation -file: - -\starttyping -\directlua { tex.enableprimitives('',tex.extraprimitives()) } -\stoptyping - -But be aware that the curly braces may not have the proper \prm {catcode} -assigned to them at this early time (giving a \quote {Missing number} error), so -it may be needed to put these assignments before the above line: - -\starttyping -\catcode `\{=1 -\catcode `\}=2 -\stoptyping - -More fine|-|grained primitives control is possible and you can look up the -details in \in {section} [luaprimitives]. For simplicity's sake, this manual -assumes that you have executed the \prm {directlua} command as given above. - -The startup behaviour documented above is considered stable in the sense that -there will not be backward|-|incompatible changes any more. We have promoted some -rather generic \PDFTEX\ primitives to core \LUATEX\ ones, and the few that we -inherited from \ALEPH\ (\OMEGA) are also promoted. Effectively this means that we -now only have the \type {tex}, \type {etex} and \type {luatex} sets left. - -In \in {Chapter} [modifications] we discuss several primitives that are derived -from \PDFTEX\ and \ALEPH\ (\OMEGA). Here we stick to real new ones. In the -chapters on fonts and math we discuss a few more new ones. - -\stopsubsection - -\startsubsection[title={Version information}] - -\startsubsubsection[title={\lpr {luatexbanner}, \lpr {luatexversion} and \lpr {luatexrevision}}] - -\topicindex{version} -\topicindex{banner} - -There are three new primitives to test the version of \LUATEX: - -\unexpanded\def\VersionHack#1% otherwise different luatex and luajittex runs - {\ctxlua{% - local banner = "\luatexbanner" - local banner = string.match(banner,"(.+)\letterpercent(") or banner - context(string.gsub(banner ,"jit",""))% - }} - -\starttabulate[|l|l|pl|] -\DB primitive \BC value - \BC explanation \NC \NR -\TB -\NC \lpr {luatexbanner} \NC \VersionHack{\luatexbanner} - \NC the banner reported on the command line \NC \NR -\NC \lpr {luatexversion} \NC \the\luatexversion - \NC a combination of major and minor number \NC \NR -\NC \lpr {luatexrevision} \NC \luatexrevision - \NC the revision number, the current value is \NC \NR -\LL -\stoptabulate - -The official \LUATEX\ version is defined as follows: - -\startitemize -\startitem - The major version is the integer result of \lpr {luatexversion} divided by - 100. The primitive is an \quote {internal variable}, so you may need to prefix - its use with \prm {the} depending on the context. -\stopitem -\startitem - The minor version is the two|-|digit result of \lpr {luatexversion} modulo 100. -\stopitem -\startitem - The revision is reported by \lpr {luatexrevision}. This primitive expands to - a positive integer. -\stopitem -\startitem - The full version number consists of the major version, minor version and - revision, separated by dots. -\stopitem -\stopitemize - -\stopsubsubsection - -\startsubsubsection[title={\lpr {formatname}}] - -\topicindex{format} - -The \lpr {formatname} syntax is identical to \prm {jobname}. In \INITEX, the -expansion is empty. Otherwise, the expansion is the value that \prm {jobname} had -during the \INITEX\ run that dumped the currently loaded format. You can use this -token list to provide your own version info. - -\stopsubsubsection - -\stopsubsection - -\stopsection - -\startsection[title={\UNICODE\ text support}] - -\startsubsection[title={Extended ranges}] - -\topicindex{\UNICODE} - -Text input and output is now considered to be \UNICODE\ text, so input characters -can use the full range of \UNICODE\ ($2^{20}+2^{16}-1 = \hbox{0x10FFFF}$). Later -chapters will talk of characters and glyphs. Although these are not -interchangeable, they are closely related. During typesetting, a character is -always converted to a suitable graphic representation of that character in a -specific font. However, while processing a list of to|-|be|-|typeset nodes, its -contents may still be seen as a character. Inside \LUATEX\ there is no clear -separation between the two concepts. Because the subtype of a glyph node can be -changed in \LUA\ it is up to the user. Subtypes larger than 255 indicate that -font processing has happened. - -A few primitives are affected by this, all in a similar fashion: each of them has -to accommodate for a larger range of acceptable numbers. For instance, \prm -{char} now accepts values between~0 and $1{,}114{,}111$. This should not be a -problem for well|-|behaved input files, but it could create incompatibilities for -input that would have generated an error when processed by older \TEX|-|based -engines. The affected commands with an altered initial (left of the equal sign) -or secondary (right of the equal sign) value are: \prm {char}, \prm {lccode}, -\prm {uccode}, \lpr {hjcode}, \prm {catcode}, \prm {sfcode}, \lpr {efcode}, \lpr -{lpcode}, \lpr {rpcode}, \prm {chardef}. - -As far as the core engine is concerned, all input and output to text files is -\UTF-8 encoded. Input files can be pre|-|processed using the \type {reader} -callback. This will be explained in \in {section} [iocallback]. Normalization of -the \UNICODE\ input is on purpose not built|-|in and can be handled by a macro -package during callback processing. We have made some practical choices and the -user has to live with those. - -Output in byte|-|sized chunks can be achieved by using characters just outside of -the valid \UNICODE\ range, starting at the value $1{,}114{,}112$ (0x110000). When -the time comes to print a character $c>=1{,}114{,}112$, \LUATEX\ will actually -print the single byte corresponding to $c$ minus 1{,}114{,}112. - -Output to the terminal uses \type {^^} notation for the lower control range -($c<32$), with the exception of \type {^^I}, \type {^^J} and \type {^^M}. These -are considered \quote {safe} and therefore printed as|-|is. You can disable -escaping with \type {texio.setescape(false)} in which case you get the normal -characters on the console. - -\stopsubsection - -\startsubsection[title={\lpr {Uchar}}] - -\topicindex{\UNICODE} - -The expandable command \lpr {Uchar} reads a number between~0 and $1{,}114{,}111$ -and expands to the associated \UNICODE\ character. - -\stopsubsection - -\startsubsection[title={Extended tables}] - -All traditional \TEX\ and \ETEX\ registers can be 16-bit numbers. The affected -commands are: - -\startfourcolumns -\startlines -\prm {count} -\prm {dimen} -\prm {skip} -\prm {muskip} -\prm {marks} -\prm {toks} -\prm {countdef} -\prm {dimendef} -\prm {skipdef} -\prm {muskipdef} -\prm {toksdef} -\prm {insert} -\prm {box} -\prm {unhbox} -\prm {unvbox} -\prm {copy} -\prm {unhcopy} -\prm {unvcopy} -\prm {wd} -\prm {ht} -\prm {dp} -\prm {setbox} -\prm {vsplit} -\stoplines -\stopfourcolumns - -Because font memory management has been rewritten, character properties in fonts -are no longer shared among font instances that originate from the same metric -file. Of course we share fonts in the backend when possible so that the resulting -\PDF\ file is as efficient as possible, but for instance also expansion and -protrusion no longer use copies as in \PDFTEX. - -\stopsubsection - -\stopsection - -\startsection[title={Attributes}] - -\startsubsection[title={Nodes}] - -\topicindex {nodes} - -When \TEX\ reads input it will interpret the stream according to the properties -of the characters. Some signal a macro name and trigger expansion, others open -and close groups, trigger math mode, etc. What's left over becomes the typeset -text. Internally we get linked list of nodes. Characters become \nod {glyph} -nodes that have for instance a \type {font} and \type {char} property and \typ -{\kern 10pt} becomes a \nod {kern} node with a \type {width} property. Spaces are -alien to \TEX\ as they are turned into \nod {glue} nodes. So, a simple paragraph -is mostly a mix of sequences of \nod {glyph} nodes (words) and \nod {glue} nodes -(spaces). - -The sequences of characters at some point are extended with \nod {disc} nodes -that relate to hyphenation. After that font logic can be applied and we get a -list where some characters can be replaced, for instance multiple characters can -become one ligature, and font kerns can be injected. This is driven by the -font properties. - -Boxes (like \prm {hbox} and \prm {vbox}) become \nod {hlist} or \nod {vlist} -nodes with \type {width}, \type {height}, \type {depth} and \type {shift} -properties and a pointer \type {list} to its actual content. Boxes can be -constructed explicitly or can be the result of subprocesses. For instance, when -lines are broken into paragraphs, the lines are a linked list of \nod {hlist} -nodes. - -So, to summarize: all that you enter as content eventually becomes a node, often -as part of a (nested) list structure. They have a relative small memory footprint -and carry only the minimal amount of information needed. In traditional \TEX\ a -character node only held the font and slot number, in \LUATEX\ we also store some -language related information, the expansion factor, etc. Now that we have access -to these nodes from \LUA\ it makes sense to be able to carry more information -with an node and this is where attributes kick in. - -\stopsubsection - -\startsubsection[title={Attribute registers}] - -\topicindex {attributes} - -Attributes are a completely new concept in \LUATEX. Syntactically, they behave a -lot like counters: attributes obey \TEX's nesting stack and can be used after -\prm {the} etc.\ just like the normal \prm {count} registers. - -\startsyntax -\attribute <16-bit number> <32-bit number>!crlf -\attributedef <16-bit number> -\stopsyntax - -Conceptually, an attribute is either \quote {set} or \quote {unset}. Unset -attributes have a special negative value to indicate that they are unset, that -value is the lowest legal value: \type {-"7FFFFFFF} in hexadecimal, a.k.a. -$-2147483647$ in decimal. It follows that the value \type {-"7FFFFFFF} cannot be -used as a legal attribute value, but you {\it can\/} assign \type {-"7FFFFFFF} to -\quote {unset} an attribute. All attributes start out in this \quote {unset} -state in \INITEX. - -Attributes can be used as extra counter values, but their usefulness comes mostly -from the fact that the numbers and values of all \quote {set} attributes are -attached to all nodes created in their scope. These can then be queried from any -\LUA\ code that deals with node processing. Further information about how to use -attributes for node list processing from \LUA\ is given in~\in {chapter}[nodes]. - -Attributes are stored in a sorted (sparse) linked list that are shared when -possible. This permits efficient testing and updating. You can define many -thousands of attributes but normally such a large number makes no sense and is -also not that efficient because each node carries a (possibly shared) link to a -list of currently set attributes. But they are a convenient extension and one of -the first extensions we implemented in \LUATEX. - -\stopsubsection - -\startsubsection[title={Box attributes}] - -\topicindex {attributes} -\topicindex {boxes} - -Nodes typically receive the list of attributes that is in effect when they are -created. This moment can be quite asynchronous. For example: in paragraph -building, the individual line boxes are created after the \prm {par} command has -been processed, so they will receive the list of attributes that is in effect -then, not the attributes that were in effect in, say, the first or third line of -the paragraph. - -Similar situations happen in \LUATEX\ regularly. A few of the more obvious -problematic cases are dealt with: the attributes for nodes that are created -during hyphenation, kerning and ligaturing borrow their attributes from their -surrounding glyphs, and it is possible to influence box attributes directly. - -When you assemble a box in a register, the attributes of the nodes contained in -the box are unchanged when such a box is placed, unboxed, or copied. In this -respect attributes act the same as characters that have been converted to -references to glyphs in fonts. For instance, when you use attributes to implement -color support, each node carries information about its eventual color. In that -case, unless you implement mechanisms that deal with it, applying a color to -already boxed material will have no effect. Keep in mind that this -incompatibility is mostly due to the fact that separate specials and literals are -a more unnatural approach to colors than attributes. - -It is possible to fine-tune the list of attributes that are applied to a \type -{hbox}, \type {vbox} or \type {vtop} by the use of the keyword \type {attr}. The -\type {attr} keyword(s) should come before a \type {to} or \type {spread}, if -that is also specified. An example is: - -\startbuffer[tex] -\attribute997=123 -\attribute998=456 -\setbox0=\hbox {Hello} -\setbox2=\hbox attr 999 = 789 attr 998 = -"7FFFFFFF{Hello} -\stopbuffer - -\startbuffer[lua] - for b=0,2,2 do - for a=997, 999 do - tex.sprint("box ", b, " : attr ",a," : ",tostring(tex.box[b] [a])) - tex.sprint("\\quad\\quad") - tex.sprint("list ",b, " : attr ",a," : ",tostring(tex.box[b].list[a])) - tex.sprint("\\par") - end - end -\stopbuffer - -\typebuffer[tex] - -Box 0 now has attributes 997 and 998 set while box 2 has attributes 997 and 999 -set while the nodes inside that box will all have attributes 997 and 998 set. -Assigning the maximum negative value causes an attribute to be ignored. - -To give you an idea of what this means at the \LUA\ end, take the following -code: - -\typebuffer[lua] - -Later we will see that you can access properties of a node. The boxes here are so -called \nod {hlist} nodes that have a field \type {list} that points to the -content. Because the attributes are a list themselves you can access them by -indexing the node (here we do that with \type {[a]}. Running this snippet gives: - -\start - \getbuffer[tex] - \startpacked \tt - \ctxluabuffer[lua] - \stoppacked -\stop - -Because some values are not set we need to apply the \type {tostring} function -here so that we get the word \type {nil}. - -\stopsubsection - -\stopsection - -\startsection[title={\LUA\ related primitives}] - -\startsubsection[title={\prm {directlua}}] - -In order to merge \LUA\ code with \TEX\ input, a few new primitives are needed. -The primitive \prm {directlua} is used to execute \LUA\ code immediately. The -syntax is - -\startsyntax -\directlua !crlf -\directlua <16-bit number> -\stopsyntax - -The \syntax {} is expanded fully, and then fed into the \LUA\ -interpreter. After reading and expansion has been applied to the \syntax -{}, the resulting token list is converted to a string as if it was -displayed using \type {\the\toks}. On the \LUA\ side, each \prm {directlua} block -is treated as a separate chunk. In such a chunk you can use the \type {local} -directive to keep your variables from interfering with those used by the macro -package. - -The conversion to and from a token list means that you normally can not use \LUA\ -line comments (starting with \type {--}) within the argument. As there typically -will be only one \quote {line} the first line comment will run on until the end -of the input. You will either need to use \TEX|-|style line comments (starting -with \%), or change the \TEX\ category codes locally. Another possibility is to -say: - -\starttyping -\begingroup -\endlinechar=10 -\directlua ... -\endgroup -\stoptyping - -Then \LUA\ line comments can be used, since \TEX\ does not replace line endings -with spaces. Of course such an approach depends on the macro package that you -use. - -The \syntax {<16-bit number>} designates a name of a \LUA\ chunk and is -taken from the \type {lua.name} array (see the documentation of the \type {lua} -table further in this manual). When a chunk name starts with a \type {@} it will -be displayed as a file name. This is a side effect of the way \LUA\ implements -error handling. - -The \prm {directlua} command is expandable. Since it passes \LUA\ code to the -\LUA\ interpreter its expansion from the \TEX\ viewpoint is usually empty. -However, there are some \LUA\ functions that produce material to be read by \TEX, -the so called print functions. The most simple use of these is \type -{tex.print( s)}. The characters of the string \type {s} will be placed on -the \TEX\ input buffer, that is, \quote {before \TEX's eyes} to be read by \TEX\ -immediately. For example: - -\startbuffer -\count10=20 -a\directlua{tex.print(tex.count[10]+5)}b -\stopbuffer - -\typebuffer - -expands to - -\getbuffer - -Here is another example: - -\startbuffer -$\pi = \directlua{tex.print(math.pi)}$ -\stopbuffer - -\typebuffer - -will result in - -\getbuffer - -Note that the expansion of \prm {directlua} is a sequence of characters, not of -tokens, contrary to all \TEX\ commands. So formally speaking its expansion is -null, but it places material on a pseudo-file to be immediately read by \TEX, as -\ETEX's \prm {scantokens}. For a description of print functions look at \in -{section} [sec:luaprint]. - -Because the \syntax {} is a chunk, the normal \LUA\ error handling -is triggered if there is a problem in the included code. The \LUA\ error messages -should be clear enough, but the contextual information is still pretty bad. -Often, you will only see the line number of the right brace at the end of the -code. - -While on the subject of errors: some of the things you can do inside \LUA\ code -can break up \LUATEX\ pretty bad. If you are not careful while working with the -node list interface, you may even end up with assertion errors from within the -\TEX\ portion of the executable. - -\stopsubsection - -\startsubsection[title={\lpr {latelua} and \lpr {lateluafunction}}] - -Contrary to \prm {directlua}, \lpr {latelua} stores \LUA\ code in a whatsit -that will be processed at the time of shipping out. Its intended use is a cross -between \PDF\ literals (often available as \orm {pdfliteral}) and the -traditional \TEX\ extension \prm {write}. Within the \LUA\ code you can print -\PDF\ statements directly to the \PDF\ file via \type {pdf.print}, or you can -write to other output streams via \type {texio.write} or simply using \LUA\ \IO\ -routines. - -\startsyntax -\latelua !crlf -\latelua <16-bit number> -\stopsyntax - -Expansion of macros in the final \type {} is delayed until just -before the whatsit is executed (like in \prm {write}). With regard to \PDF\ -output stream \lpr {latelua} behaves as \PDF\ page literals. The \syntax -{name } and \syntax {<16-bit number>} behave in the same way as -they do for \prm {directlua}. - -The \lpr {lateluafunction} primitive takes a number and is similar to \lpr -{luafunction} but gets delated to shipout time. It's just there for completeness. - -\stopsubsection - -\startsubsection[title={\lpr {luaescapestring}}] - -\topicindex {escaping} - -This primitive converts a \TEX\ token sequence so that it can be safely used as -the contents of a \LUA\ string: embedded backslashes, double and single quotes, -and newlines and carriage returns are escaped. This is done by prepending an -extra token consisting of a backslash with category code~12, and for the line -endings, converting them to \type {n} and \type {r} respectively. The token -sequence is fully expanded. - -\startsyntax -\luaescapestring -\stopsyntax - -Most often, this command is not actually the best way to deal with the -differences between \TEX\ and \LUA. In very short bits of \LUA\ code it is often -not needed, and for longer stretches of \LUA\ code it is easier to keep the code -in a separate file and load it using \LUA's \type {dofile}: - -\starttyping -\directlua { dofile('mysetups.lua') } -\stoptyping - -\stopsubsection - -\startsubsection[title={\lpr {luafunction}, \lpr {luafunctioncall} and \lpr {luadef}}] - -The \prm {directlua} commands involves tokenization of its argument (after -picking up an optional name or number specification). The tokenlist is then -converted into a string and given to \LUA\ to turn into a function that is -called. The overhead is rather small but when you have millions of calls it can -have some impact. For this reason there is a variant call available: \lpr -{luafunction}. This command is used as follows: - -\starttyping -\directlua { - local t = lua.get_functions_table() - t[1] = function() tex.print("!") end - t[2] = function() tex.print("?") end -} - -\luafunction1 -\luafunction2 -\stoptyping - -Of course the functions can also be defined in a separate file. There is no limit -on the number of functions apart from normal \LUA\ limitations. Of course there -is the limitation of no arguments but that would involve parsing and thereby give -no gain. The function, when called in fact gets one argument, being the index, so -in the following example the number \type {8} gets typeset. - -\starttyping -\directlua { - local t = lua.get_functions_table() - t[8] = function(slot) tex.print(slot) end -} -\stoptyping - -The \lpr {luafunctioncall} primitive does the same but is unexpandable, for -instance in an \prm {edef}. In addition \LUATEX\ provides a definer: - -\starttyping - \luadef\MyFunctionA 1 - \global\luadef\MyFunctionB 2 -\protected\global\luadef\MyFunctionC 3 -\stoptyping - -You should really use these commands with care. Some references get stored in -tokens and assume that the function is available when that token expands. On the -other hand, as we have tested this functionality in relative complex situations -normal usage should not give problems. - -\stopsubsection - -\startsubsection[title={\lpr {luabytecode} and \lpr {luabytecodecall}}] - -Analogue to the function callers discussed in the previous section we have byte -code callers. Again the call variant is unexpandable. - -\starttyping -\directlua { - lua.bytecode[9998] = function(s) - tex.sprint(s*token.scan_int()) - end - lua.bytecode[5555] = function(s) - tex.sprint(s*token.scan_dimen()) - end -} -\stoptyping - -This works with: - -\starttyping -\luabytecode 9998 5 \luabytecode 5555 5sp -\luabytecodecall9998 5 \luabytecodecall5555 5sp -\stoptyping - -The variable \type {s} in the code is the number of the byte code register that -can be used for diagnostic purposes. The advantage of bytecode registers over -function calls is that they are stored in the format (but without upvalues). - -\stopsubsection - -\stopsection - -\startsection[title={Catcode tables}] - -\startsubsection[title={Catcodes}] - -\topicindex {catcodes} - -Catcode tables are a new feature that allows you to switch to a predefined -catcode regime in a single statement. You can have a practically unlimited number -of different tables. This subsystem is backward compatible: if you never use the -following commands, your document will not notice any difference in behaviour -compared to traditional \TEX. The contents of each catcode table is independent -from any other catcode table, and its contents is stored and retrieved from the -format file. - -\stopsubsection - -\startsubsection[title={\lpr {catcodetable}}] - -\startsyntax -\catcodetable <15-bit number> -\stopsyntax - -The primitive \lpr {catcodetable} switches to a different catcode table. Such a -table has to be previously created using one of the two primitives below, or it -has to be zero. Table zero is initialized by \INITEX. - -\stopsubsection - -\startsubsection[title={\lpr {initcatcodetable}}] - -\startsyntax -\initcatcodetable <15-bit number> -\stopsyntax - -The primitive \lpr {initcatcodetable} creates a new table with catcodes -identical to those defined by \INITEX. The new catcode table is allocated -globally: it will not go away after the current group has ended. If the supplied -number is identical to the currently active table, an error is raised. The -initial values are: - -\starttabulate[|c|c|l|l|] -\DB catcode \BC character \BC equivalent \BC category \NC \NR -\TB -\NC 0 \NC \tttf \letterbackslash \NC \NC \type {escape} \NC \NR -\NC 5 \NC \tttf \letterhat\letterhat M \NC return \NC \type {car_ret} \NC \NR -\NC 9 \NC \tttf \letterhat\letterhat @ \NC null \NC \type {ignore} \NC \NR -\NC 10 \NC \tttf \NC space \NC \type {spacer} \NC \NR -\NC 11 \NC {\tttf a} \endash\ {\tttf z} \NC \NC \type {letter} \NC \NR -\NC 11 \NC {\tttf A} \endash\ {\tttf Z} \NC \NC \type {letter} \NC \NR -\NC 12 \NC everything else \NC \NC \type {other} \NC \NR -\NC 14 \NC \tttf \letterpercent \NC \NC \type {comment} \NC \NR -\NC 15 \NC \tttf \letterhat\letterhat ? \NC delete \NC \type {invalid_char} \NC \NR -\LL -\stoptabulate - -\stopsubsection - -\startsubsection[title={\lpr {savecatcodetable}}] - -\startsyntax -\savecatcodetable <15-bit number> -\stopsyntax - -\lpr {savecatcodetable} copies the current set of catcodes to a new table with -the requested number. The definitions in this new table are all treated as if -they were made in the outermost level. - -The new table is allocated globally: it will not go away after the current group -has ended. If the supplied number is the currently active table, an error is -raised. - -\stopsubsection - -\stopsection - -\startsection[title={Suppressing errors}] - -\startsubsection[title={\lpr {suppressfontnotfounderror}}] - -\topicindex {errors} - -If this integer parameter is non|-|zero, then \LUATEX\ will not complain about -font metrics that are not found. Instead it will silently skip the font -assignment, making the requested csname for the font \prm {ifx} equal to \prm -{nullfont}, so that it can be tested against that without bothering the user. - -\startsyntax -\suppressfontnotfounderror = 1 -\stopsyntax - -\stopsubsection - -\startsubsection[title={\lpr {suppresslongerror}}] - -\topicindex {errors} - -If this integer parameter is non|-|zero, then \LUATEX\ will not complain about -\prm {par} commands encountered in contexts where that is normally prohibited -(most prominently in the arguments of macros not defined as \prm {long}). - -\startsyntax -\suppresslongerror = 1 -\stopsyntax - -\stopsubsection - -\startsubsection[title={\lpr {suppressifcsnameerror}}] - -\topicindex {errors} - -If this integer parameter is non|-|zero, then \LUATEX\ will not complain about -non-expandable commands appearing in the middle of a \prm {ifcsname} expansion. -Instead, it will keep getting expanded tokens from the input until it encounters -an \prm {endcsname} command. If the input expansion is unbalanced with respect -to \prm {csname} \ldots \prm {endcsname} pairs, the \LUATEX\ process may hang -indefinitely. - -\startsyntax -\suppressifcsnameerror = 1 -\stopsyntax - -\stopsubsection - -\startsubsection[title={\lpr {suppressoutererror}}] - -\topicindex {errors} - -If this new integer parameter is non|-|zero, then \LUATEX\ will not complain -about \prm {outer} commands encountered in contexts where that is normally -prohibited. - -\startsyntax -\suppressoutererror = 1 -\stopsyntax - -\stopsubsection - -\startsubsection[title={\lpr {suppressmathparerror}}] - -\topicindex {errors} -\topicindex {math} - -The following setting will permit \prm {par} tokens in a math formula: - -\startsyntax -\suppressmathparerror = 1 -\stopsyntax - -So, the next code is valid then: - -\starttyping -$ x + 1 = - -a $ -\stoptyping - -\stopsubsection - -\startsubsection[title={\lpr {suppressprimitiveerror}}] - -\topicindex {errors} -\topicindex {primitives} - -When set to a non|-|zero value the following command will not issue an error: - -\startsyntax -\suppressprimitiveerror = 1 - -\primitive\notaprimitive -\stopsyntax - -\stopsubsection - -\stopsection - -\startsection[title={Fonts}] - -\startsubsection[title={Font syntax}] - -\topicindex {fonts} - -\LUATEX\ will accept a braced argument as a font name: - -\starttyping -\font\myfont = {cmr10} -\stoptyping - -This allows for embedded spaces, without the need for double quotes. Macro -expansion takes place inside the argument. - -\stopsubsection - -\startsubsection[title={\lpr {fontid} and \lpr {setfontid}}] - -\startsyntax -\fontid\font -\stopsyntax - -This primitive expands into a number. It is not a register so there is no need to -prefix with \prm {number} (and using \prm {the} gives an error). The currently -used font id is \fontid\font. Here are some more: - -\starttabulate[|l|c|c|] -\DB style \BC command \BC font id \NC \NR -\TB -\NC normal \NC \type {\tf} \NC \bf \fontid\font \NC \NR -\NC bold \NC \type {\bf} \NC \bf \fontid\font \NC \NR -\NC italic \NC \type {\it} \NC \it \fontid\font \NC \NR -\NC bold italic \NC \type {\bi} \NC \bi \fontid\font \NC \NR -\LL -\stoptabulate - -These numbers depend on the macro package used because each one has its own way -of dealing with fonts. They can also differ per run, as they can depend on the -order of loading fonts. For instance, when in \CONTEXT\ virtual math \UNICODE\ -fonts are used, we can easily get over a hundred ids in use. Not all ids have to -be bound to a real font, after all it's just a number. - -The primitive \lpr {setfontid} can be used to enable a font with the given id, -which of course needs to be a valid one. - -\stopsubsection - -\startsubsection[title={\lpr {noligs} and \lpr {nokerns}}] - -\topicindex {ligatures+suppress} -\topicindex {kerns+suppress} - -These primitives prohibit ligature and kerning insertion at the time when the -initial node list is built by \LUATEX's main control loop. You can enable these -primitives when you want to do node list processing of \quote {characters}, where -\TEX's normal processing would get in the way. - -\startsyntax -\noligs !crlf -\nokerns -\stopsyntax - -These primitives can also be implemented by overloading the ligature building and -kerning functions, i.e.\ by assigning dummy functions to their associated -callbacks. Keep in mind that when you define a font (using \LUA) you can also -omit the kern and ligature tables, which has the same effect as the above. - -\stopsubsection - -\startsubsection[title={\type{\nospaces}}] - -\topicindex {spaces+suppress} - -This new primitive can be used to overrule the usual \prm {spaceskip} related -heuristics when a space character is seen in a text flow. The value~\type{1} -triggers no injection while \type{2} results in injection of a zero skip. In \in -{figure} [fig:nospaces] we see the results for four characters separated by a -space. - -\startplacefigure[reference=fig:nospaces,title={The \lpr {nospaces} options.}] -\startcombination[3*2] - {\ruledhbox to 5cm{\vtop{\hsize 10mm\nospaces=0\relax x x x x \par}\hss}} {\type {0 / hsize 10mm}} - {\ruledhbox to 5cm{\vtop{\hsize 10mm\nospaces=1\relax x x x x \par}\hss}} {\type {1 / hsize 10mm}} - {\ruledhbox to 5cm{\vtop{\hsize 10mm\nospaces=2\relax x x x x \par}\hss}} {\type {2 / hsize 10mm}} - {\ruledhbox to 5cm{\vtop{\hsize 1mm\nospaces=0\relax x x x x \par}\hss}} {\type {0 / hsize 1mm}} - {\ruledhbox to 5cm{\vtop{\hsize 1mm\nospaces=1\relax x x x x \par}\hss}} {\type {1 / hsize 1mm}} - {\ruledhbox to 5cm{\vtop{\hsize 1mm\nospaces=2\relax x x x x \par}\hss}} {\type {2 / hsize 1mm}} -\stopcombination -\stopplacefigure - -\stopsubsection - -\stopsection - -\startsection[title={Tokens, commands and strings}] - -\startsubsection[title={\lpr {scantextokens}}] - -\topicindex {tokens+scanning} - -The syntax of \lpr {scantextokens} is identical to \prm {scantokens}. This -primitive is a slightly adapted version of \ETEX's \prm {scantokens}. The -differences are: - -\startitemize -\startitem - The last (and usually only) line does not have a \prm {endlinechar} - appended. -\stopitem -\startitem - \lpr {scantextokens} never raises an EOF error, and it does not execute - \prm {everyeof} tokens. -\stopitem -\startitem - There are no \quote {\unknown\ while end of file \unknown} error tests - executed. This allows the expansion to end on a different grouping level or - while a conditional is still incomplete. -\stopitem -\stopitemize - -\stopsubsection - -\startsubsection[title={\lpr {toksapp}, \lpr {tokspre}, \lpr {etoksapp}, \lpr {etokspre}, -\lpr {gtoksapp}, \lpr {gtokspre}, \lpr {xtoksapp}, \lpr {xtokspre}}] - -Instead of: - -\starttyping -\toks0\expandafter{\the\toks0 foo} -\stoptyping - -you can use: - -\starttyping -\etoksapp0{foo} -\stoptyping - -The \type {pre} variants prepend instead of append, and the \type {e} variants -expand the passed general text. The \type {g} and \type {x} variants are global. - -\stopsubsection - -\startsubsection[title={\prm {csstring}, \lpr {begincsname} and \lpr {lastnamedcs}}] - -These are somewhat special. The \prm {csstring} primitive is like -\prm {string} but it omits the leading escape character. This can be -somewhat more efficient than stripping it afterwards. - -The \lpr {begincsname} primitive is like \prm {csname} but doesn't create -a relaxed equivalent when there is no such name. It is equivalent to - -\starttyping -\ifcsname foo\endcsname - \csname foo\endcsname -\fi -\stoptyping - -The advantage is that it saves a lookup (don't expect much speedup) but more -important is that it avoids using the \prm {if} test. The \lpr {lastnamedcs} -is one that should be used with care. The above example could be written as: - -\starttyping -\ifcsname foo\endcsname - \lastnamedcs -\fi -\stoptyping - -This is slightly more efficient than constructing the string twice (deep down in -\LUATEX\ this also involves some \UTF8 juggling), but probably more relevant is -that it saves a few tokens and can make code a bit more readable. - -\stopsubsection - -\startsubsection[title={\lpr {clearmarks}}] - -\topicindex {marks} - -This primitive complements the \ETEX\ mark primitives and clears a mark class -completely, resetting all three connected mark texts to empty. It is an -immediate command. - -\startsyntax -\clearmarks <16-bit number> -\stopsyntax - -\stopsubsection - -\startsubsection[title={\lpr {alignmark} and \lpr {aligntab}}] - -The primitive \lpr {alignmark} duplicates the functionality of \type {#} inside -alignment preambles, while \lpr {aligntab} duplicates the functionality of \type -{&}. - -\stopsubsection - -\startsubsection[title={\lpr {letcharcode}}] - -This primitive can be used to assign a meaning to an active character, as in: - -\starttyping -\def\foo{bar} \letcharcode123=\foo -\stoptyping - -This can be a bit nicer than using the uppercase tricks (using the property of -\prm {uppercase} that it treats active characters special). - -\stopsubsection - -\startsubsection[title={\lpr {glet}}] - -This primitive is similar to: - -\starttyping -\protected\def\glet{\global\let} -\stoptyping - -but faster (only measurable with millions of calls) and probably more convenient -(after all we also have \type {\gdef}). - -\stopsubsection - -\startsubsection[title={\lpr {expanded}, \lpr {immediateassignment} and \lpr {immediateassigned}}] - -\topicindex {expansion} - -The \lpr {expanded} primitive takes a token list and expands it content which can -come in handy: it avoids a tricky mix of \prm {expandafter} and \prm {noexpand}. -You can compare it with what happens inside the body of an \prm {edef}. But this -kind of expansion it still doesn't expand some primitive operations. - -\startbuffer -\newcount\NumberOfCalls - -\def\TestMe{\advance\NumberOfCalls1 } - -\edef\Tested{\TestMe foo:\the\NumberOfCalls} -\edef\Tested{\TestMe foo:\the\NumberOfCalls} -\edef\Tested{\TestMe foo:\the\NumberOfCalls} - -\meaning\Tested -\stopbuffer - -\typebuffer - -The result is a macro that has the not expanded code in its body: - -\getbuffer - -Instead we can define \tex {TestMe} in a way that expands the assignment -immediately. You need of course to be aware of preventing look ahead interference -by using a space or \tex {relax} (often an expression works better as it doesn't -leave an \tex {relax}). - -\startbuffer -\def\TestMe{\immediateassignment\advance\NumberOfCalls1 } - -\edef\Tested{\TestMe foo:\the\NumberOfCalls} -\edef\Tested{\TestMe foo:\the\NumberOfCalls} -\edef\Tested{\TestMe foo:\the\NumberOfCalls} - -\meaning\Tested -\stopbuffer - -\typebuffer - -This time the counter gets updates and we don't see interference in the -resulting \tex {Tested} macro: - -\getbuffer - -Here is a somewhat silly example of expanded comparison: - -\startbuffer -\def\expandeddoifelse#1#2#3#4% - {\immediateassignment\edef\tempa{#1}% - \immediateassignment\edef\tempb{#2}% - \ifx\tempa\tempb - \immediateassignment\def\next{#3}% - \else - \immediateassignment\def\next{#4}% - \fi - \next} - -\edef\Tested - {(\expandeddoifelse{abc}{def}{yes}{nop}/% - \expandeddoifelse{abc}{abc}{yes}{nop})} - -\meaning\Tested -\stopbuffer - -\typebuffer - -It gives: - -\getbuffer - -A variant is: - -\starttyping -\def\expandeddoifelse#1#2#3#4% - {\immediateassigned{ - \edef\tempa{#1}% - \edef\tempb{#2}% - }% - \ifx\tempa\tempb - \immediateassignment\def\next{#3}% - \else - \immediateassignment\def\next{#4}% - \fi - \next} -\stoptyping - -The possible error messages are the same as using assignments in preambles of -alignments and after the \prm {accent} command. The supported assignments are the -so called prefixed commands (except box assignments). - -\stopsubsection - -\startsubsection[title={\lpr {ifcondition}}] - -\topicindex {conditions} - -This is a somewhat special one. When you write macros conditions need to be -properly balanced in order to let \TEX's fast branch skipping work well. This new -primitive is basically a no||op flagged as a condition so that the scanner can -recognize it as an if|-|test. However, when a real test takes place the work is -done by what follows, in the next example \tex {something}. - -\starttyping -\unexpanded\def\something#1#2% - {\edef\tempa{#1}% - \edef\tempb{#2} - \ifx\tempa\tempb} - -\ifcondition\something{a}{b}% - \ifcondition\something{a}{a}% - true 1 - \else - false 1 - \fi -\else - \ifcondition\something{a}{a}% - true 2 - \else - false 2 - \fi -\fi -\stoptyping - -If you are familiar with \METAPOST, this is a bit like \type {vardef} where the macro -has a return value. Here the return value is a test. - -\stopsubsection - -\stopsection - -\startsection[title={Boxes, rules and leaders}] - -\startsubsection[title={\lpr {outputbox}}] - -\topicindex {output} - -This integer parameter allows you to alter the number of the box that will be -used to store the page sent to the output routine. Its default value is 255, and -the acceptable range is from 0 to 65535. - -\startsyntax -\outputbox = 12345 -\stopsyntax - -\stopsubsection - -\startsubsection[title={\prm {vpack}, \prm {hpack} and \prm {tpack}}] - -These three primitives are like \prm {vbox}, \prm {hbox} and \prm {vtop} -but don't apply the related callbacks. - -\stopsubsection - -\startsubsection[title={\prm {vsplit}}] - -\topicindex {splitting} - -The \prm {vsplit} primitive has to be followed by a specification of the required -height. As alternative for the \type {to} keyword you can use \type {upto} to get -a split of the given size but result has the natural dimensions then. - -\stopsubsection - -\startsubsection[title={Images and reused box objects},reference=sec:imagedandforms] - -These two concepts are now core concepts and no longer whatsits. They are in fact -now implemented as rules with special properties. Normal rules have subtype~0, -saved boxes have subtype~1 and images have subtype~2. This has the positive side -effect that whenever we need to take content with dimensions into account, when -we look at rule nodes, we automatically also deal with these two types. - -The syntax of the \type {\save...resource} is the same as in \PDFTEX\ but you -should consider them to be backend specific. This means that a macro package -should treat them as such and check for the current output mode if applicable. - -\starttabulate[|l|p|] -\DB command \BC explanation \NC \NR -\TB -\NC \lpr {saveboxresource} \NC save the box as an object to be included later \NC \NR -\NC \lpr {saveimageresource} \NC save the image as an object to be included later \NC \NR -\NC \lpr {useboxresource} \NC include the saved box object here (by index) \NC \NR -\NC \lpr {useimageresource} \NC include the saved image object here (by index) \NC \NR -\NC \lpr {lastsavedboxresourceindex} \NC the index of the last saved box object \NC \NR -\NC \lpr {lastsavedimageresourceindex} \NC the index of the last saved image object \NC \NR -\NC \lpr {lastsavedimageresourcepages} \NC the number of pages in the last saved image object \NC \NR -\LL -\stoptabulate - -\LUATEX\ accepts optional dimension parameters for \type {\use...resource} in the -same format as for rules. With images, these dimensions are then used instead of -the ones given to \lpr {useimageresource} but the original dimensions are not -overwritten, so that a \lpr {useimageresource} without dimensions still -provides the image with dimensions defined by \lpr {saveimageresource}. These -optional parameters are not implemented for \lpr {saveboxresource}. - -\starttyping -\useimageresource width 20mm height 10mm depth 5mm \lastsavedimageresourceindex -\useboxresource width 20mm height 10mm depth 5mm \lastsavedboxresourceindex -\stoptyping - -The box resources are of course implemented in the backend and therefore we do -support the \type {attr} and \type {resources} keys that accept a token list. New -is the \type {type} key. When set to non|-|zero the \type {/Type} entry is -omitted. A value of 1 or 3 still writes a \type {/BBox}, while 2 or 3 will write -a \type {/Matrix}. - -\stopsubsection - -\startsubsection[title={\lpr {nohrule} and \lpr {novrule}}] - -\topicindex {rules} - -Because introducing a new keyword can cause incompatibilities, two new primitives -were introduced: \lpr {nohrule} and \lpr {novrule}. These can be used to -reserve space. This is often more efficient than creating an empty box with fake -dimensions. - -\stopsubsection - -\startsubsection[title={\lpr {gleaders}}] - -\topicindex {leaders} - -This type of leaders is anchored to the origin of the box to be shipped out. So -they are like normal \prm {leaders} in that they align nicely, except that the -alignment is based on the {\it largest\/} enclosing box instead of the {\it -smallest\/}. The \type {g} stresses this global nature. - -\stopsubsection - -\stopsection - -\startsection[title={Languages}] - -\startsubsection[title={\lpr {hyphenationmin}}] - -\topicindex {languages} -\topicindex {hyphenation} - -This primitive can be used to set the minimal word length, so setting it to a value -of~$5$ means that only words of 6 characters and more will be hyphenated, of course -within the constraints of the \prm {lefthyphenmin} and \prm {righthyphenmin} -values (as stored in the glyph node). This primitive accepts a number and stores -the value with the language. - -\stopsubsection - -\startsubsection[title={\prm {boundary}, \prm {noboundary}, \prm {protrusionboundary} and \prm {wordboundary}}] - -The \prm {noboundary} command is used to inject a whatsit node but now injects a normal -node with type \nod {boundary} and subtype~0. In addition you can say: - -\starttyping -x\boundary 123\relax y -\stoptyping - -This has the same effect but the subtype is now~1 and the value~123 is stored. -The traditional ligature builder still sees this as a cancel boundary directive -but at the \LUA\ end you can implement different behaviour. The added benefit of -passing this value is a side effect of the generalization. The subtypes~2 and~3 -are used to control protrusion and word boundaries in hyphenation and have -related primitives. - -\stopsubsection - -\stopsection - -\startsection[title={Control and debugging}] - -\startsubsection[title={Tracing}] - -\topicindex {tracing} - -If \prm {tracingonline} is larger than~2, the node list display will also print -the node number of the nodes. - -\stopsubsection - -\startsubsection[title={\lpr {outputmode}}] - -\topicindex {output} -\topicindex {backend} - -The \lpr {outputmode} variable tells \LUATEX\ what it has to produce: - -\starttabulate[|l|l|] -\DB value \BC output \NC \NR -\TB -\NC \type {0} \NC \DVI\ code \NC \NR -\NC \type {1} \NC \PDF\ code \NC \NR -\LL -\stoptabulate - -\stopsubsection - -\startsubsection[title={\lpr {draftmode}}] - -The value of the \lpr {draftmode} counter signals the backend if it should output -less. The \PDF\ backend accepts a value of~1, while the \DVI\ backend ignores the -value. This is no critical feature so we can remove it in future versions when it -can make the backend cleaner. - -\stopsubsection - -\stopsection - -\startsection[title={Files}] - -\startsubsection[title={File syntax}] - -\topicindex {files+names} - -\LUATEX\ will accept a braced argument as a file name: - -\starttyping -\input {plain} -\openin 0 {plain} -\stoptyping - -This allows for embedded spaces, without the need for double quotes. Macro -expansion takes place inside the argument. - -The \lpr {tracingfonts} primitive that has been inherited from \PDFTEX\ has -been adapted to support variants in reporting the font. The reason for this -extension is that a csname not always makes sense. The zero case is the default. - -\starttabulate[|l|l|] -\DB value \BC reported \NC \NR -\TB -\NC \type{0} \NC \type{\foo xyz} \NC \NR -\NC \type{1} \NC \type{\foo (bar)} \NC \NR -\NC \type{2} \NC \type{ xyz} \NC \NR -\NC \type{3} \NC \type{ xyz} \NC \NR -\NC \type{4} \NC \type{} \NC \NR -\NC \type{5} \NC \type{} \NC \NR -\NC \type{6} \NC \type{ xyz} \NC \NR -\LL -\stoptabulate - -\stopsubsection - -\startsubsection[title={Writing to file}] - -\topicindex {files+writing} - -You can now open upto 127 files with \prm {openout}. When no file is open -writes will go to the console and log. As a consequence a system command is -no longer possible but one can use \type {os.execute} to do the same. - -\stopsubsection - -\stopsection - -\startsection[title={Math}] - -\topicindex {math} - -We will cover math extensions in its own chapter because not only the font -subsystem and spacing model have been enhanced (thereby introducing many new -primitives) but also because some more control has been added to existing -functionality. Much of this relates to the different approaches of traditional -\TEX\ fonts and \OPENTYPE\ math. - -\stopsection - -\stopchapter - -\stopcomponent +% language=uk + +\environment luatex-style + +\startcomponent luatex-enhancements + +\startchapter[reference=enhancements,title={Basic \TEX\ enhancements}] + +\startsection[title={Introduction}] + +\startsubsection[title={Primitive behaviour}] + +From day one, \LUATEX\ has offered extra features compared to the superset of +\PDFTEX, which includes \ETEX, and \ALEPH. This has not been limited to the +possibility to execute \LUA\ code via \prm {directlua}, but \LUATEX\ also adds +functionality via new \TEX|-|side primitives or extensions to existing ones. + +When \LUATEX\ starts up in \quote {iniluatex} mode (\type {luatex -ini}), it +defines only the primitive commands known by \TEX82 and the one extra command +\prm {directlua}. As is fitting, a \LUA\ function has to be called to add the +extra primitives to the user environment. The simplest method to get access to +all of the new primitive commands is by adding this line to the format generation +file: + +\starttyping +\directlua { tex.enableprimitives('',tex.extraprimitives()) } +\stoptyping + +But be aware that the curly braces may not have the proper \prm {catcode} +assigned to them at this early time (giving a \quote {Missing number} error), so +it may be needed to put these assignments before the above line: + +\starttyping +\catcode `\{=1 +\catcode `\}=2 +\stoptyping + +More fine|-|grained primitives control is possible and you can look up the +details in \in {section} [luaprimitives]. For simplicity's sake, this manual +assumes that you have executed the \prm {directlua} command as given above. + +The startup behaviour documented above is considered stable in the sense that +there will not be backward|-|incompatible changes any more. We have promoted some +rather generic \PDFTEX\ primitives to core \LUATEX\ ones, and the few that we +inherited from \ALEPH\ (\OMEGA) are also promoted. Effectively this means that we +now only have the \type {tex}, \type {etex} and \type {luatex} sets left. + +In \in {Chapter} [modifications] we discuss several primitives that are derived +from \PDFTEX\ and \ALEPH\ (\OMEGA). Here we stick to real new ones. In the +chapters on fonts and math we discuss a few more new ones. + +\stopsubsection + +\startsubsection[title={Version information}] + +\startsubsubsection[title={\lpr {luatexbanner}, \lpr {luatexversion} and \lpr {luatexrevision}}] + +\topicindex{version} +\topicindex{banner} + +There are three new primitives to test the version of \LUATEX: + +\unexpanded\def\VersionHack#1% otherwise different luatex and luajittex runs + {\ctxlua{% + local banner = "\luatexbanner" + local banner = string.match(banner,"(.+)\letterpercent(") or banner + context(string.gsub(banner ,"jit",""))% + }} + +\starttabulate[|l|l|pl|] +\DB primitive \BC value + \BC explanation \NC \NR +\TB +\NC \lpr {luatexbanner} \NC \VersionHack{\luatexbanner} + \NC the banner reported on the command line \NC \NR +\NC \lpr {luatexversion} \NC \the\luatexversion + \NC a combination of major and minor number \NC \NR +\NC \lpr {luatexrevision} \NC \luatexrevision + \NC the revision number, the current value is \NC \NR +\LL +\stoptabulate + +The official \LUATEX\ version is defined as follows: + +\startitemize +\startitem + The major version is the integer result of \lpr {luatexversion} divided by + 100. The primitive is an \quote {internal variable}, so you may need to prefix + its use with \prm {the} depending on the context. +\stopitem +\startitem + The minor version is the two|-|digit result of \lpr {luatexversion} modulo 100. +\stopitem +\startitem + The revision is reported by \lpr {luatexrevision}. This primitive expands to + a positive integer. +\stopitem +\startitem + The full version number consists of the major version, minor version and + revision, separated by dots. +\stopitem +\stopitemize + +\stopsubsubsection + +\startsubsubsection[title={\lpr {formatname}}] + +\topicindex{format} + +The \lpr {formatname} syntax is identical to \prm {jobname}. In \INITEX, the +expansion is empty. Otherwise, the expansion is the value that \prm {jobname} had +during the \INITEX\ run that dumped the currently loaded format. You can use this +token list to provide your own version info. + +\stopsubsubsection + +\stopsubsection + +\stopsection + +\startsection[title={\UNICODE\ text support}] + +\startsubsection[title={Extended ranges}] + +\topicindex{\UNICODE} + +Text input and output is now considered to be \UNICODE\ text, so input characters +can use the full range of \UNICODE\ ($2^{20}+2^{16}-1 = \hbox{0x10FFFF}$). Later +chapters will talk of characters and glyphs. Although these are not +interchangeable, they are closely related. During typesetting, a character is +always converted to a suitable graphic representation of that character in a +specific font. However, while processing a list of to|-|be|-|typeset nodes, its +contents may still be seen as a character. Inside \LUATEX\ there is no clear +separation between the two concepts. Because the subtype of a glyph node can be +changed in \LUA\ it is up to the user. Subtypes larger than 255 indicate that +font processing has happened. + +A few primitives are affected by this, all in a similar fashion: each of them has +to accommodate for a larger range of acceptable numbers. For instance, \prm +{char} now accepts values between~0 and $1{,}114{,}111$. This should not be a +problem for well|-|behaved input files, but it could create incompatibilities for +input that would have generated an error when processed by older \TEX|-|based +engines. The affected commands with an altered initial (left of the equal sign) +or secondary (right of the equal sign) value are: \prm {char}, \prm {lccode}, +\prm {uccode}, \lpr {hjcode}, \prm {catcode}, \prm {sfcode}, \lpr {efcode}, \lpr +{lpcode}, \lpr {rpcode}, \prm {chardef}. + +As far as the core engine is concerned, all input and output to text files is +\UTF-8 encoded. Input files can be pre|-|processed using the \type {reader} +callback. This will be explained in \in {section} [iocallback]. Normalization of +the \UNICODE\ input is on purpose not built|-|in and can be handled by a macro +package during callback processing. We have made some practical choices and the +user has to live with those. + +Output in byte|-|sized chunks can be achieved by using characters just outside of +the valid \UNICODE\ range, starting at the value $1{,}114{,}112$ (0x110000). When +the time comes to print a character $c>=1{,}114{,}112$, \LUATEX\ will actually +print the single byte corresponding to $c$ minus 1{,}114{,}112. + +Output to the terminal uses \type {^^} notation for the lower control range +($c<32$), with the exception of \type {^^I}, \type {^^J} and \type {^^M}. These +are considered \quote {safe} and therefore printed as|-|is. You can disable +escaping with \type {texio.setescape(false)} in which case you get the normal +characters on the console. + +\stopsubsection + +\startsubsection[title={\lpr {Uchar}}] + +\topicindex{\UNICODE} + +The expandable command \lpr {Uchar} reads a number between~0 and $1{,}114{,}111$ +and expands to the associated \UNICODE\ character. + +\stopsubsection + +\startsubsection[title={Extended tables}] + +All traditional \TEX\ and \ETEX\ registers can be 16-bit numbers. The affected +commands are: + +\startfourcolumns +\startlines +\prm {count} +\prm {dimen} +\prm {skip} +\prm {muskip} +\prm {marks} +\prm {toks} +\prm {countdef} +\prm {dimendef} +\prm {skipdef} +\prm {muskipdef} +\prm {toksdef} +\prm {insert} +\prm {box} +\prm {unhbox} +\prm {unvbox} +\prm {copy} +\prm {unhcopy} +\prm {unvcopy} +\prm {wd} +\prm {ht} +\prm {dp} +\prm {setbox} +\prm {vsplit} +\stoplines +\stopfourcolumns + +Because font memory management has been rewritten, character properties in fonts +are no longer shared among font instances that originate from the same metric +file. Of course we share fonts in the backend when possible so that the resulting +\PDF\ file is as efficient as possible, but for instance also expansion and +protrusion no longer use copies as in \PDFTEX. + +\stopsubsection + +\stopsection + +\startsection[title={Attributes}] + +\startsubsection[title={Nodes}] + +\topicindex {nodes} + +When \TEX\ reads input it will interpret the stream according to the properties +of the characters. Some signal a macro name and trigger expansion, others open +and close groups, trigger math mode, etc. What's left over becomes the typeset +text. Internally we get linked list of nodes. Characters become \nod {glyph} +nodes that have for instance a \type {font} and \type {char} property and \typ +{\kern 10pt} becomes a \nod {kern} node with a \type {width} property. Spaces are +alien to \TEX\ as they are turned into \nod {glue} nodes. So, a simple paragraph +is mostly a mix of sequences of \nod {glyph} nodes (words) and \nod {glue} nodes +(spaces). + +The sequences of characters at some point are extended with \nod {disc} nodes +that relate to hyphenation. After that font logic can be applied and we get a +list where some characters can be replaced, for instance multiple characters can +become one ligature, and font kerns can be injected. This is driven by the +font properties. + +Boxes (like \prm {hbox} and \prm {vbox}) become \nod {hlist} or \nod {vlist} +nodes with \type {width}, \type {height}, \type {depth} and \type {shift} +properties and a pointer \type {list} to its actual content. Boxes can be +constructed explicitly or can be the result of subprocesses. For instance, when +lines are broken into paragraphs, the lines are a linked list of \nod {hlist} +nodes. + +So, to summarize: all that you enter as content eventually becomes a node, often +as part of a (nested) list structure. They have a relative small memory footprint +and carry only the minimal amount of information needed. In traditional \TEX\ a +character node only held the font and slot number, in \LUATEX\ we also store some +language related information, the expansion factor, etc. Now that we have access +to these nodes from \LUA\ it makes sense to be able to carry more information +with an node and this is where attributes kick in. + +\stopsubsection + +\startsubsection[title={Attribute registers}] + +\topicindex {attributes} + +Attributes are a completely new concept in \LUATEX. Syntactically, they behave a +lot like counters: attributes obey \TEX's nesting stack and can be used after +\prm {the} etc.\ just like the normal \prm {count} registers. + +\startsyntax +\attribute <16-bit number> <32-bit number>!crlf +\attributedef <16-bit number> +\stopsyntax + +Conceptually, an attribute is either \quote {set} or \quote {unset}. Unset +attributes have a special negative value to indicate that they are unset, that +value is the lowest legal value: \type {-"7FFFFFFF} in hexadecimal, a.k.a. +$-2147483647$ in decimal. It follows that the value \type {-"7FFFFFFF} cannot be +used as a legal attribute value, but you {\it can\/} assign \type {-"7FFFFFFF} to +\quote {unset} an attribute. All attributes start out in this \quote {unset} +state in \INITEX. + +Attributes can be used as extra counter values, but their usefulness comes mostly +from the fact that the numbers and values of all \quote {set} attributes are +attached to all nodes created in their scope. These can then be queried from any +\LUA\ code that deals with node processing. Further information about how to use +attributes for node list processing from \LUA\ is given in~\in {chapter}[nodes]. + +Attributes are stored in a sorted (sparse) linked list that are shared when +possible. This permits efficient testing and updating. You can define many +thousands of attributes but normally such a large number makes no sense and is +also not that efficient because each node carries a (possibly shared) link to a +list of currently set attributes. But they are a convenient extension and one of +the first extensions we implemented in \LUATEX. + +\stopsubsection + +\startsubsection[title={Box attributes}] + +\topicindex {attributes} +\topicindex {boxes} + +Nodes typically receive the list of attributes that is in effect when they are +created. This moment can be quite asynchronous. For example: in paragraph +building, the individual line boxes are created after the \prm {par} command has +been processed, so they will receive the list of attributes that is in effect +then, not the attributes that were in effect in, say, the first or third line of +the paragraph. + +Similar situations happen in \LUATEX\ regularly. A few of the more obvious +problematic cases are dealt with: the attributes for nodes that are created +during hyphenation, kerning and ligaturing borrow their attributes from their +surrounding glyphs, and it is possible to influence box attributes directly. + +When you assemble a box in a register, the attributes of the nodes contained in +the box are unchanged when such a box is placed, unboxed, or copied. In this +respect attributes act the same as characters that have been converted to +references to glyphs in fonts. For instance, when you use attributes to implement +color support, each node carries information about its eventual color. In that +case, unless you implement mechanisms that deal with it, applying a color to +already boxed material will have no effect. Keep in mind that this +incompatibility is mostly due to the fact that separate specials and literals are +a more unnatural approach to colors than attributes. + +It is possible to fine-tune the list of attributes that are applied to a \type +{hbox}, \type {vbox} or \type {vtop} by the use of the keyword \type {attr}. The +\type {attr} keyword(s) should come before a \type {to} or \type {spread}, if +that is also specified. An example is: + +\startbuffer[tex] +\attribute997=123 +\attribute998=456 +\setbox0=\hbox {Hello} +\setbox2=\hbox attr 999 = 789 attr 998 = -"7FFFFFFF{Hello} +\stopbuffer + +\startbuffer[lua] + for b=0,2,2 do + for a=997, 999 do + tex.sprint("box ", b, " : attr ",a," : ",tostring(tex.box[b] [a])) + tex.sprint("\\quad\\quad") + tex.sprint("list ",b, " : attr ",a," : ",tostring(tex.box[b].list[a])) + tex.sprint("\\par") + end + end +\stopbuffer + +\typebuffer[tex] + +Box 0 now has attributes 997 and 998 set while box 2 has attributes 997 and 999 +set while the nodes inside that box will all have attributes 997 and 998 set. +Assigning the maximum negative value causes an attribute to be ignored. + +To give you an idea of what this means at the \LUA\ end, take the following +code: + +\typebuffer[lua] + +Later we will see that you can access properties of a node. The boxes here are so +called \nod {hlist} nodes that have a field \type {list} that points to the +content. Because the attributes are a list themselves you can access them by +indexing the node (here we do that with \type {[a]}. Running this snippet gives: + +\start + \getbuffer[tex] + \startpacked \tt + \ctxluabuffer[lua] + \stoppacked +\stop + +Because some values are not set we need to apply the \type {tostring} function +here so that we get the word \type {nil}. + +\stopsubsection + +\stopsection + +\startsection[title={\LUA\ related primitives}] + +\startsubsection[title={\prm {directlua}}] + +In order to merge \LUA\ code with \TEX\ input, a few new primitives are needed. +The primitive \prm {directlua} is used to execute \LUA\ code immediately. The +syntax is + +\startsyntax +\directlua !crlf +\directlua <16-bit number> +\stopsyntax + +The \syntax {} is expanded fully, and then fed into the \LUA\ +interpreter. After reading and expansion has been applied to the \syntax +{}, the resulting token list is converted to a string as if it was +displayed using \type {\the\toks}. On the \LUA\ side, each \prm {directlua} block +is treated as a separate chunk. In such a chunk you can use the \type {local} +directive to keep your variables from interfering with those used by the macro +package. + +The conversion to and from a token list means that you normally can not use \LUA\ +line comments (starting with \type {--}) within the argument. As there typically +will be only one \quote {line} the first line comment will run on until the end +of the input. You will either need to use \TEX|-|style line comments (starting +with \%), or change the \TEX\ category codes locally. Another possibility is to +say: + +\starttyping +\begingroup +\endlinechar=10 +\directlua ... +\endgroup +\stoptyping + +Then \LUA\ line comments can be used, since \TEX\ does not replace line endings +with spaces. Of course such an approach depends on the macro package that you +use. + +The \syntax {<16-bit number>} designates a name of a \LUA\ chunk and is +taken from the \type {lua.name} array (see the documentation of the \type {lua} +table further in this manual). When a chunk name starts with a \type {@} it will +be displayed as a file name. This is a side effect of the way \LUA\ implements +error handling. + +The \prm {directlua} command is expandable. Since it passes \LUA\ code to the +\LUA\ interpreter its expansion from the \TEX\ viewpoint is usually empty. +However, there are some \LUA\ functions that produce material to be read by \TEX, +the so called print functions. The most simple use of these is \type +{tex.print( s)}. The characters of the string \type {s} will be placed on +the \TEX\ input buffer, that is, \quote {before \TEX's eyes} to be read by \TEX\ +immediately. For example: + +\startbuffer +\count10=20 +a\directlua{tex.print(tex.count[10]+5)}b +\stopbuffer + +\typebuffer + +expands to + +\getbuffer + +Here is another example: + +\startbuffer +$\pi = \directlua{tex.print(math.pi)}$ +\stopbuffer + +\typebuffer + +will result in + +\getbuffer + +Note that the expansion of \prm {directlua} is a sequence of characters, not of +tokens, contrary to all \TEX\ commands. So formally speaking its expansion is +null, but it places material on a pseudo-file to be immediately read by \TEX, as +\ETEX's \prm {scantokens}. For a description of print functions look at \in +{section} [sec:luaprint]. + +Because the \syntax {} is a chunk, the normal \LUA\ error handling +is triggered if there is a problem in the included code. The \LUA\ error messages +should be clear enough, but the contextual information is still pretty bad. +Often, you will only see the line number of the right brace at the end of the +code. + +While on the subject of errors: some of the things you can do inside \LUA\ code +can break up \LUATEX\ pretty bad. If you are not careful while working with the +node list interface, you may even end up with assertion errors from within the +\TEX\ portion of the executable. + +\stopsubsection + +\startsubsection[title={\lpr {latelua} and \lpr {lateluafunction}}] + +Contrary to \prm {directlua}, \lpr {latelua} stores \LUA\ code in a whatsit +that will be processed at the time of shipping out. Its intended use is a cross +between \PDF\ literals (often available as \orm {pdfliteral}) and the +traditional \TEX\ extension \prm {write}. Within the \LUA\ code you can print +\PDF\ statements directly to the \PDF\ file via \type {pdf.print}, or you can +write to other output streams via \type {texio.write} or simply using \LUA\ \IO\ +routines. + +\startsyntax +\latelua !crlf +\latelua <16-bit number> +\stopsyntax + +Expansion of macros in the final \type {} is delayed until just +before the whatsit is executed (like in \prm {write}). With regard to \PDF\ +output stream \lpr {latelua} behaves as \PDF\ page literals. The \syntax +{name } and \syntax {<16-bit number>} behave in the same way as +they do for \prm {directlua}. + +The \lpr {lateluafunction} primitive takes a number and is similar to \lpr +{luafunction} but gets delated to shipout time. It's just there for completeness. + +\stopsubsection + +\startsubsection[title={\lpr {luaescapestring}}] + +\topicindex {escaping} + +This primitive converts a \TEX\ token sequence so that it can be safely used as +the contents of a \LUA\ string: embedded backslashes, double and single quotes, +and newlines and carriage returns are escaped. This is done by prepending an +extra token consisting of a backslash with category code~12, and for the line +endings, converting them to \type {n} and \type {r} respectively. The token +sequence is fully expanded. + +\startsyntax +\luaescapestring +\stopsyntax + +Most often, this command is not actually the best way to deal with the +differences between \TEX\ and \LUA. In very short bits of \LUA\ code it is often +not needed, and for longer stretches of \LUA\ code it is easier to keep the code +in a separate file and load it using \LUA's \type {dofile}: + +\starttyping +\directlua { dofile('mysetups.lua') } +\stoptyping + +\stopsubsection + +\startsubsection[title={\lpr {luafunction}, \lpr {luafunctioncall} and \lpr {luadef}}] + +The \prm {directlua} commands involves tokenization of its argument (after +picking up an optional name or number specification). The tokenlist is then +converted into a string and given to \LUA\ to turn into a function that is +called. The overhead is rather small but when you have millions of calls it can +have some impact. For this reason there is a variant call available: \lpr +{luafunction}. This command is used as follows: + +\starttyping +\directlua { + local t = lua.get_functions_table() + t[1] = function() tex.print("!") end + t[2] = function() tex.print("?") end +} + +\luafunction1 +\luafunction2 +\stoptyping + +Of course the functions can also be defined in a separate file. There is no limit +on the number of functions apart from normal \LUA\ limitations. Of course there +is the limitation of no arguments but that would involve parsing and thereby give +no gain. The function, when called in fact gets one argument, being the index, so +in the following example the number \type {8} gets typeset. + +\starttyping +\directlua { + local t = lua.get_functions_table() + t[8] = function(slot) tex.print(slot) end +} +\stoptyping + +The \lpr {luafunctioncall} primitive does the same but is unexpandable, for +instance in an \prm {edef}. In addition \LUATEX\ provides a definer: + +\starttyping + \luadef\MyFunctionA 1 + \global\luadef\MyFunctionB 2 +\protected\global\luadef\MyFunctionC 3 +\stoptyping + +You should really use these commands with care. Some references get stored in +tokens and assume that the function is available when that token expands. On the +other hand, as we have tested this functionality in relative complex situations +normal usage should not give problems. + +\stopsubsection + +\startsubsection[title={\lpr {luabytecode} and \lpr {luabytecodecall}}] + +Analogue to the function callers discussed in the previous section we have byte +code callers. Again the call variant is unexpandable. + +\starttyping +\directlua { + lua.bytecode[9998] = function(s) + tex.sprint(s*token.scan_int()) + end + lua.bytecode[5555] = function(s) + tex.sprint(s*token.scan_dimen()) + end +} +\stoptyping + +This works with: + +\starttyping +\luabytecode 9998 5 \luabytecode 5555 5sp +\luabytecodecall9998 5 \luabytecodecall5555 5sp +\stoptyping + +The variable \type {s} in the code is the number of the byte code register that +can be used for diagnostic purposes. The advantage of bytecode registers over +function calls is that they are stored in the format (but without upvalues). + +\stopsubsection + +\stopsection + +\startsection[title={Catcode tables}] + +\startsubsection[title={Catcodes}] + +\topicindex {catcodes} + +Catcode tables are a new feature that allows you to switch to a predefined +catcode regime in a single statement. You can have a practically unlimited number +of different tables. This subsystem is backward compatible: if you never use the +following commands, your document will not notice any difference in behaviour +compared to traditional \TEX. The contents of each catcode table is independent +from any other catcode table, and its contents is stored and retrieved from the +format file. + +\stopsubsection + +\startsubsection[title={\lpr {catcodetable}}] + +\startsyntax +\catcodetable <15-bit number> +\stopsyntax + +The primitive \lpr {catcodetable} switches to a different catcode table. Such a +table has to be previously created using one of the two primitives below, or it +has to be zero. Table zero is initialized by \INITEX. + +\stopsubsection + +\startsubsection[title={\lpr {initcatcodetable}}] + +\startsyntax +\initcatcodetable <15-bit number> +\stopsyntax + +The primitive \lpr {initcatcodetable} creates a new table with catcodes +identical to those defined by \INITEX. The new catcode table is allocated +globally: it will not go away after the current group has ended. If the supplied +number is identical to the currently active table, an error is raised. The +initial values are: + +\starttabulate[|c|c|l|l|] +\DB catcode \BC character \BC equivalent \BC category \NC \NR +\TB +\NC 0 \NC \tttf \letterbackslash \NC \NC \type {escape} \NC \NR +\NC 5 \NC \tttf \letterhat\letterhat M \NC return \NC \type {car_ret} \NC \NR +\NC 9 \NC \tttf \letterhat\letterhat @ \NC null \NC \type {ignore} \NC \NR +\NC 10 \NC \tttf \NC space \NC \type {spacer} \NC \NR +\NC 11 \NC {\tttf a} \endash\ {\tttf z} \NC \NC \type {letter} \NC \NR +\NC 11 \NC {\tttf A} \endash\ {\tttf Z} \NC \NC \type {letter} \NC \NR +\NC 12 \NC everything else \NC \NC \type {other} \NC \NR +\NC 14 \NC \tttf \letterpercent \NC \NC \type {comment} \NC \NR +\NC 15 \NC \tttf \letterhat\letterhat ? \NC delete \NC \type {invalid_char} \NC \NR +\LL +\stoptabulate + +\stopsubsection + +\startsubsection[title={\lpr {savecatcodetable}}] + +\startsyntax +\savecatcodetable <15-bit number> +\stopsyntax + +\lpr {savecatcodetable} copies the current set of catcodes to a new table with +the requested number. The definitions in this new table are all treated as if +they were made in the outermost level. + +The new table is allocated globally: it will not go away after the current group +has ended. If the supplied number is the currently active table, an error is +raised. + +\stopsubsection + +\stopsection + +\startsection[title={Suppressing errors}] + +\startsubsection[title={\lpr {suppressfontnotfounderror}}] + +\topicindex {errors} + +If this integer parameter is non|-|zero, then \LUATEX\ will not complain about +font metrics that are not found. Instead it will silently skip the font +assignment, making the requested csname for the font \prm {ifx} equal to \prm +{nullfont}, so that it can be tested against that without bothering the user. + +\startsyntax +\suppressfontnotfounderror = 1 +\stopsyntax + +\stopsubsection + +\startsubsection[title={\lpr {suppresslongerror}}] + +\topicindex {errors} + +If this integer parameter is non|-|zero, then \LUATEX\ will not complain about +\prm {par} commands encountered in contexts where that is normally prohibited +(most prominently in the arguments of macros not defined as \prm {long}). + +\startsyntax +\suppresslongerror = 1 +\stopsyntax + +\stopsubsection + +\startsubsection[title={\lpr {suppressifcsnameerror}}] + +\topicindex {errors} + +If this integer parameter is non|-|zero, then \LUATEX\ will not complain about +non-expandable commands appearing in the middle of a \prm {ifcsname} expansion. +Instead, it will keep getting expanded tokens from the input until it encounters +an \prm {endcsname} command. If the input expansion is unbalanced with respect +to \prm {csname} \ldots \prm {endcsname} pairs, the \LUATEX\ process may hang +indefinitely. + +\startsyntax +\suppressifcsnameerror = 1 +\stopsyntax + +\stopsubsection + +\startsubsection[title={\lpr {suppressoutererror}}] + +\topicindex {errors} + +If this new integer parameter is non|-|zero, then \LUATEX\ will not complain +about \prm {outer} commands encountered in contexts where that is normally +prohibited. + +\startsyntax +\suppressoutererror = 1 +\stopsyntax + +\stopsubsection + +\startsubsection[title={\lpr {suppressmathparerror}}] + +\topicindex {errors} +\topicindex {math} + +The following setting will permit \prm {par} tokens in a math formula: + +\startsyntax +\suppressmathparerror = 1 +\stopsyntax + +So, the next code is valid then: + +\starttyping +$ x + 1 = + +a $ +\stoptyping + +\stopsubsection + +\startsubsection[title={\lpr {suppressprimitiveerror}}] + +\topicindex {errors} +\topicindex {primitives} + +When set to a non|-|zero value the following command will not issue an error: + +\startsyntax +\suppressprimitiveerror = 1 + +\primitive\notaprimitive +\stopsyntax + +\stopsubsection + +\stopsection + +\startsection[title={Fonts}] + +\startsubsection[title={Font syntax}] + +\topicindex {fonts} + +\LUATEX\ will accept a braced argument as a font name: + +\starttyping +\font\myfont = {cmr10} +\stoptyping + +This allows for embedded spaces, without the need for double quotes. Macro +expansion takes place inside the argument. + +\stopsubsection + +\startsubsection[title={\lpr {fontid} and \lpr {setfontid}}] + +\startsyntax +\fontid\font +\stopsyntax + +This primitive expands into a number. It is not a register so there is no need to +prefix with \prm {number} (and using \prm {the} gives an error). The currently +used font id is \fontid\font. Here are some more: + +\starttabulate[|l|c|c|] +\DB style \BC command \BC font id \NC \NR +\TB +\NC normal \NC \type {\tf} \NC \bf \fontid\font \NC \NR +\NC bold \NC \type {\bf} \NC \bf \fontid\font \NC \NR +\NC italic \NC \type {\it} \NC \it \fontid\font \NC \NR +\NC bold italic \NC \type {\bi} \NC \bi \fontid\font \NC \NR +\LL +\stoptabulate + +These numbers depend on the macro package used because each one has its own way +of dealing with fonts. They can also differ per run, as they can depend on the +order of loading fonts. For instance, when in \CONTEXT\ virtual math \UNICODE\ +fonts are used, we can easily get over a hundred ids in use. Not all ids have to +be bound to a real font, after all it's just a number. + +The primitive \lpr {setfontid} can be used to enable a font with the given id, +which of course needs to be a valid one. + +\stopsubsection + +\startsubsection[title={\lpr {noligs} and \lpr {nokerns}}] + +\topicindex {ligatures+suppress} +\topicindex {kerns+suppress} + +These primitives prohibit ligature and kerning insertion at the time when the +initial node list is built by \LUATEX's main control loop. You can enable these +primitives when you want to do node list processing of \quote {characters}, where +\TEX's normal processing would get in the way. + +\startsyntax +\noligs !crlf +\nokerns +\stopsyntax + +These primitives can also be implemented by overloading the ligature building and +kerning functions, i.e.\ by assigning dummy functions to their associated +callbacks. Keep in mind that when you define a font (using \LUA) you can also +omit the kern and ligature tables, which has the same effect as the above. + +\stopsubsection + +\startsubsection[title={\type{\nospaces}}] + +\topicindex {spaces+suppress} + +This new primitive can be used to overrule the usual \prm {spaceskip} related +heuristics when a space character is seen in a text flow. The value~\type{1} +triggers no injection while \type{2} results in injection of a zero skip. In \in +{figure} [fig:nospaces] we see the results for four characters separated by a +space. + +\startplacefigure[reference=fig:nospaces,title={The \lpr {nospaces} options.}] +\startcombination[3*2] + {\ruledhbox to 5cm{\vtop{\hsize 10mm\nospaces=0\relax x x x x \par}\hss}} {\type {0 / hsize 10mm}} + {\ruledhbox to 5cm{\vtop{\hsize 10mm\nospaces=1\relax x x x x \par}\hss}} {\type {1 / hsize 10mm}} + {\ruledhbox to 5cm{\vtop{\hsize 10mm\nospaces=2\relax x x x x \par}\hss}} {\type {2 / hsize 10mm}} + {\ruledhbox to 5cm{\vtop{\hsize 1mm\nospaces=0\relax x x x x \par}\hss}} {\type {0 / hsize 1mm}} + {\ruledhbox to 5cm{\vtop{\hsize 1mm\nospaces=1\relax x x x x \par}\hss}} {\type {1 / hsize 1mm}} + {\ruledhbox to 5cm{\vtop{\hsize 1mm\nospaces=2\relax x x x x \par}\hss}} {\type {2 / hsize 1mm}} +\stopcombination +\stopplacefigure + +\stopsubsection + +\stopsection + +\startsection[title={Tokens, commands and strings}] + +\startsubsection[title={\lpr {scantextokens}}] + +\topicindex {tokens+scanning} + +The syntax of \lpr {scantextokens} is identical to \prm {scantokens}. This +primitive is a slightly adapted version of \ETEX's \prm {scantokens}. The +differences are: + +\startitemize +\startitem + The last (and usually only) line does not have a \prm {endlinechar} + appended. +\stopitem +\startitem + \lpr {scantextokens} never raises an EOF error, and it does not execute + \prm {everyeof} tokens. +\stopitem +\startitem + There are no \quote {\unknown\ while end of file \unknown} error tests + executed. This allows the expansion to end on a different grouping level or + while a conditional is still incomplete. +\stopitem +\stopitemize + +\stopsubsection + +\startsubsection[title={\lpr {toksapp}, \lpr {tokspre}, \lpr {etoksapp}, \lpr {etokspre}, +\lpr {gtoksapp}, \lpr {gtokspre}, \lpr {xtoksapp}, \lpr {xtokspre}}] + +Instead of: + +\starttyping +\toks0\expandafter{\the\toks0 foo} +\stoptyping + +you can use: + +\starttyping +\etoksapp0{foo} +\stoptyping + +The \type {pre} variants prepend instead of append, and the \type {e} variants +expand the passed general text. The \type {g} and \type {x} variants are global. + +\stopsubsection + +\startsubsection[title={\prm {csstring}, \lpr {begincsname} and \lpr {lastnamedcs}}] + +These are somewhat special. The \prm {csstring} primitive is like +\prm {string} but it omits the leading escape character. This can be +somewhat more efficient than stripping it afterwards. + +The \lpr {begincsname} primitive is like \prm {csname} but doesn't create +a relaxed equivalent when there is no such name. It is equivalent to + +\starttyping +\ifcsname foo\endcsname + \csname foo\endcsname +\fi +\stoptyping + +The advantage is that it saves a lookup (don't expect much speedup) but more +important is that it avoids using the \prm {if} test. The \lpr {lastnamedcs} +is one that should be used with care. The above example could be written as: + +\starttyping +\ifcsname foo\endcsname + \lastnamedcs +\fi +\stoptyping + +This is slightly more efficient than constructing the string twice (deep down in +\LUATEX\ this also involves some \UTF8 juggling), but probably more relevant is +that it saves a few tokens and can make code a bit more readable. + +\stopsubsection + +\startsubsection[title={\lpr {clearmarks}}] + +\topicindex {marks} + +This primitive complements the \ETEX\ mark primitives and clears a mark class +completely, resetting all three connected mark texts to empty. It is an +immediate command. + +\startsyntax +\clearmarks <16-bit number> +\stopsyntax + +\stopsubsection + +\startsubsection[title={\lpr {alignmark} and \lpr {aligntab}}] + +The primitive \lpr {alignmark} duplicates the functionality of \type {#} inside +alignment preambles, while \lpr {aligntab} duplicates the functionality of \type +{&}. + +\stopsubsection + +\startsubsection[title={\lpr {letcharcode}}] + +This primitive can be used to assign a meaning to an active character, as in: + +\starttyping +\def\foo{bar} \letcharcode123=\foo +\stoptyping + +This can be a bit nicer than using the uppercase tricks (using the property of +\prm {uppercase} that it treats active characters special). + +\stopsubsection + +\startsubsection[title={\lpr {glet}}] + +This primitive is similar to: + +\starttyping +\protected\def\glet{\global\let} +\stoptyping + +but faster (only measurable with millions of calls) and probably more convenient +(after all we also have \type {\gdef}). + +\stopsubsection + +\startsubsection[title={\lpr {expanded}, \lpr {immediateassignment} and \lpr {immediateassigned}}] + +\topicindex {expansion} + +The \lpr {expanded} primitive takes a token list and expands it content which can +come in handy: it avoids a tricky mix of \prm {expandafter} and \prm {noexpand}. +You can compare it with what happens inside the body of an \prm {edef}. But this +kind of expansion it still doesn't expand some primitive operations. + +\startbuffer +\newcount\NumberOfCalls + +\def\TestMe{\advance\NumberOfCalls1 } + +\edef\Tested{\TestMe foo:\the\NumberOfCalls} +\edef\Tested{\TestMe foo:\the\NumberOfCalls} +\edef\Tested{\TestMe foo:\the\NumberOfCalls} + +\meaning\Tested +\stopbuffer + +\typebuffer + +The result is a macro that has the not expanded code in its body: + +\getbuffer + +Instead we can define \tex {TestMe} in a way that expands the assignment +immediately. You need of course to be aware of preventing look ahead interference +by using a space or \tex {relax} (often an expression works better as it doesn't +leave an \tex {relax}). + +\startbuffer +\def\TestMe{\immediateassignment\advance\NumberOfCalls1 } + +\edef\Tested{\TestMe foo:\the\NumberOfCalls} +\edef\Tested{\TestMe foo:\the\NumberOfCalls} +\edef\Tested{\TestMe foo:\the\NumberOfCalls} + +\meaning\Tested +\stopbuffer + +\typebuffer + +This time the counter gets updates and we don't see interference in the +resulting \tex {Tested} macro: + +\getbuffer + +Here is a somewhat silly example of expanded comparison: + +\startbuffer +\def\expandeddoifelse#1#2#3#4% + {\immediateassignment\edef\tempa{#1}% + \immediateassignment\edef\tempb{#2}% + \ifx\tempa\tempb + \immediateassignment\def\next{#3}% + \else + \immediateassignment\def\next{#4}% + \fi + \next} + +\edef\Tested + {(\expandeddoifelse{abc}{def}{yes}{nop}/% + \expandeddoifelse{abc}{abc}{yes}{nop})} + +\meaning\Tested +\stopbuffer + +\typebuffer + +It gives: + +\getbuffer + +A variant is: + +\starttyping +\def\expandeddoifelse#1#2#3#4% + {\immediateassigned{ + \edef\tempa{#1}% + \edef\tempb{#2}% + }% + \ifx\tempa\tempb + \immediateassignment\def\next{#3}% + \else + \immediateassignment\def\next{#4}% + \fi + \next} +\stoptyping + +The possible error messages are the same as using assignments in preambles of +alignments and after the \prm {accent} command. The supported assignments are the +so called prefixed commands (except box assignments). + +\stopsubsection + +\startsubsection[title={\lpr {ifcondition}}] + +\topicindex {conditions} + +This is a somewhat special one. When you write macros conditions need to be +properly balanced in order to let \TEX's fast branch skipping work well. This new +primitive is basically a no||op flagged as a condition so that the scanner can +recognize it as an if|-|test. However, when a real test takes place the work is +done by what follows, in the next example \tex {something}. + +\starttyping +\unexpanded\def\something#1#2% + {\edef\tempa{#1}% + \edef\tempb{#2} + \ifx\tempa\tempb} + +\ifcondition\something{a}{b}% + \ifcondition\something{a}{a}% + true 1 + \else + false 1 + \fi +\else + \ifcondition\something{a}{a}% + true 2 + \else + false 2 + \fi +\fi +\stoptyping + +If you are familiar with \METAPOST, this is a bit like \type {vardef} where the macro +has a return value. Here the return value is a test. + +\stopsubsection + +\stopsection + +\startsection[title={Boxes, rules and leaders}] + +\startsubsection[title={\lpr {outputbox}}] + +\topicindex {output} + +This integer parameter allows you to alter the number of the box that will be +used to store the page sent to the output routine. Its default value is 255, and +the acceptable range is from 0 to 65535. + +\startsyntax +\outputbox = 12345 +\stopsyntax + +\stopsubsection + +\startsubsection[title={\prm {vpack}, \prm {hpack} and \prm {tpack}}] + +These three primitives are like \prm {vbox}, \prm {hbox} and \prm {vtop} +but don't apply the related callbacks. + +\stopsubsection + +\startsubsection[title={\prm {vsplit}}] + +\topicindex {splitting} + +The \prm {vsplit} primitive has to be followed by a specification of the required +height. As alternative for the \type {to} keyword you can use \type {upto} to get +a split of the given size but result has the natural dimensions then. + +\stopsubsection + +\startsubsection[title={Images and reused box objects},reference=sec:imagedandforms] + +These two concepts are now core concepts and no longer whatsits. They are in fact +now implemented as rules with special properties. Normal rules have subtype~0, +saved boxes have subtype~1 and images have subtype~2. This has the positive side +effect that whenever we need to take content with dimensions into account, when +we look at rule nodes, we automatically also deal with these two types. + +The syntax of the \type {\save...resource} is the same as in \PDFTEX\ but you +should consider them to be backend specific. This means that a macro package +should treat them as such and check for the current output mode if applicable. + +\starttabulate[|l|p|] +\DB command \BC explanation \NC \NR +\TB +\NC \lpr {saveboxresource} \NC save the box as an object to be included later \NC \NR +\NC \lpr {saveimageresource} \NC save the image as an object to be included later \NC \NR +\NC \lpr {useboxresource} \NC include the saved box object here (by index) \NC \NR +\NC \lpr {useimageresource} \NC include the saved image object here (by index) \NC \NR +\NC \lpr {lastsavedboxresourceindex} \NC the index of the last saved box object \NC \NR +\NC \lpr {lastsavedimageresourceindex} \NC the index of the last saved image object \NC \NR +\NC \lpr {lastsavedimageresourcepages} \NC the number of pages in the last saved image object \NC \NR +\LL +\stoptabulate + +\LUATEX\ accepts optional dimension parameters for \type {\use...resource} in the +same format as for rules. With images, these dimensions are then used instead of +the ones given to \lpr {useimageresource} but the original dimensions are not +overwritten, so that a \lpr {useimageresource} without dimensions still +provides the image with dimensions defined by \lpr {saveimageresource}. These +optional parameters are not implemented for \lpr {saveboxresource}. + +\starttyping +\useimageresource width 20mm height 10mm depth 5mm \lastsavedimageresourceindex +\useboxresource width 20mm height 10mm depth 5mm \lastsavedboxresourceindex +\stoptyping + +The box resources are of course implemented in the backend and therefore we do +support the \type {attr} and \type {resources} keys that accept a token list. New +is the \type {type} key. When set to non|-|zero the \type {/Type} entry is +omitted. A value of 1 or 3 still writes a \type {/BBox}, while 2 or 3 will write +a \type {/Matrix}. + +\stopsubsection + +\startsubsection[title={\lpr {nohrule} and \lpr {novrule}}] + +\topicindex {rules} + +Because introducing a new keyword can cause incompatibilities, two new primitives +were introduced: \lpr {nohrule} and \lpr {novrule}. These can be used to +reserve space. This is often more efficient than creating an empty box with fake +dimensions. + +\stopsubsection + +\startsubsection[title={\lpr {gleaders}}] + +\topicindex {leaders} + +This type of leaders is anchored to the origin of the box to be shipped out. So +they are like normal \prm {leaders} in that they align nicely, except that the +alignment is based on the {\it largest\/} enclosing box instead of the {\it +smallest\/}. The \type {g} stresses this global nature. + +\stopsubsection + +\stopsection + +\startsection[title={Languages}] + +\startsubsection[title={\lpr {hyphenationmin}}] + +\topicindex {languages} +\topicindex {hyphenation} + +This primitive can be used to set the minimal word length, so setting it to a value +of~$5$ means that only words of 6 characters and more will be hyphenated, of course +within the constraints of the \prm {lefthyphenmin} and \prm {righthyphenmin} +values (as stored in the glyph node). This primitive accepts a number and stores +the value with the language. + +\stopsubsection + +\startsubsection[title={\prm {boundary}, \prm {noboundary}, \prm {protrusionboundary} and \prm {wordboundary}}] + +The \prm {noboundary} command is used to inject a whatsit node but now injects a normal +node with type \nod {boundary} and subtype~0. In addition you can say: + +\starttyping +x\boundary 123\relax y +\stoptyping + +This has the same effect but the subtype is now~1 and the value~123 is stored. +The traditional ligature builder still sees this as a cancel boundary directive +but at the \LUA\ end you can implement different behaviour. The added benefit of +passing this value is a side effect of the generalization. The subtypes~2 and~3 +are used to control protrusion and word boundaries in hyphenation and have +related primitives. + +\stopsubsection + +\stopsection + +\startsection[title={Control and debugging}] + +\startsubsection[title={Tracing}] + +\topicindex {tracing} + +If \prm {tracingonline} is larger than~2, the node list display will also print +the node number of the nodes. + +\stopsubsection + +\startsubsection[title={\lpr {outputmode}}] + +\topicindex {output} +\topicindex {backend} + +The \lpr {outputmode} variable tells \LUATEX\ what it has to produce: + +\starttabulate[|l|l|] +\DB value \BC output \NC \NR +\TB +\NC \type {0} \NC \DVI\ code \NC \NR +\NC \type {1} \NC \PDF\ code \NC \NR +\LL +\stoptabulate + +\stopsubsection + +\startsubsection[title={\lpr {draftmode}}] + +The value of the \lpr {draftmode} counter signals the backend if it should output +less. The \PDF\ backend accepts a value of~1, while the \DVI\ backend ignores the +value. This is no critical feature so we can remove it in future versions when it +can make the backend cleaner. + +\stopsubsection + +\stopsection + +\startsection[title={Files}] + +\startsubsection[title={File syntax}] + +\topicindex {files+names} + +\LUATEX\ will accept a braced argument as a file name: + +\starttyping +\input {plain} +\openin 0 {plain} +\stoptyping + +This allows for embedded spaces, without the need for double quotes. Macro +expansion takes place inside the argument. + +The \lpr {tracingfonts} primitive that has been inherited from \PDFTEX\ has +been adapted to support variants in reporting the font. The reason for this +extension is that a csname not always makes sense. The zero case is the default. + +\starttabulate[|l|l|] +\DB value \BC reported \NC \NR +\TB +\NC \type{0} \NC \type{\foo xyz} \NC \NR +\NC \type{1} \NC \type{\foo (bar)} \NC \NR +\NC \type{2} \NC \type{ xyz} \NC \NR +\NC \type{3} \NC \type{ xyz} \NC \NR +\NC \type{4} \NC \type{} \NC \NR +\NC \type{5} \NC \type{} \NC \NR +\NC \type{6} \NC \type{ xyz} \NC \NR +\LL +\stoptabulate + +\stopsubsection + +\startsubsection[title={Writing to file}] + +\topicindex {files+writing} + +You can now open upto 127 files with \prm {openout}. When no file is open +writes will go to the console and log. As a consequence a system command is +no longer possible but one can use \type {os.execute} to do the same. + +\stopsubsection + +\stopsection + +\startsection[title={Math}] + +\topicindex {math} + +We will cover math extensions in its own chapter because not only the font +subsystem and spacing model have been enhanced (thereby introducing many new +primitives) but also because some more control has been added to existing +functionality. Much of this relates to the different approaches of traditional +\TEX\ fonts and \OPENTYPE\ math. + +\stopsection + +\stopchapter + +\stopcomponent diff --git a/manual/luatex-export-titlepage.tex b/manual/luatex-export-titlepage.tex index db841a785..4417b5231 100644 --- a/manual/luatex-export-titlepage.tex +++ b/manual/luatex-export-titlepage.tex @@ -1,31 +1,31 @@ -\environment luatex-style - -\startcomponent luatex-export-titlepage - -\setupexport - [cssfile=extra-styles.css] - -\settaggedmetadata - [ title={LuaTeX Reference Manual}, - copyright={LuaTeX Development Team}, - version={\documentvariable{version}}, - status={\documentvariable{status}}, - snapshot={\documentvariable{snapshot}}, - date={\rawdate[weekday,day,month,year]}, - url={www.luatex.org}] - -\setupbackgrounds - [leftpage] - [setups=pagenumber:left] - -\setupbackgrounds - [rightpage] - [setups=pagenumber:right] - -\startpreamble - This document is derived from the original manual. When examples are given, - they assume processing by \LUATEX\ and therefore will not show up as - intended. The \PDF\ version is the real reference. -\stoppreamble - -\stopcomponent +\environment luatex-style + +\startcomponent luatex-export-titlepage + +\setupexport + [cssfile=extra-styles.css] + +\settaggedmetadata + [ title={LuaTeX Reference Manual}, + copyright={LuaTeX Development Team}, + version={\documentvariable{version}}, + status={\documentvariable{status}}, + snapshot={\documentvariable{snapshot}}, + date={\rawdate[weekday,day,month,year]}, + url={www.luatex.org}] + +\setupbackgrounds + [leftpage] + [setups=pagenumber:left] + +\setupbackgrounds + [rightpage] + [setups=pagenumber:right] + +\startpreamble + This document is derived from the original manual. When examples are given, + they assume processing by \LUATEX\ and therefore will not show up as + intended. The \PDF\ version is the real reference. +\stoppreamble + +\stopcomponent diff --git a/manual/luatex-firstpage.tex b/manual/luatex-firstpage.tex index e64cc6152..772fbb3fe 100644 --- a/manual/luatex-firstpage.tex +++ b/manual/luatex-firstpage.tex @@ -1,32 +1,32 @@ -\startcomponent luatex-firstpage - -\startstandardmakeup - - \start - \raggedleft - \definedfont[Bold*default at 48pt] - \setupinterlinespace - \blue \documentvariable{manual} \endgraf Reference \endgraf Manual \endgraf - \stop - - \vfill - - \definedfont[Bold*default at 12pt] - - \starttabulate[|l|l|] - \NC copyright \EQ Lua\TeX\ development team \NC \NR - \NC more info \EQ www.luatex.org \NC \NR - \NC version \EQ \currentdate \doifsomething{\documentvariable{snapshot}}{(snapshot \documentvariable{snapshot})} \NC \NR - \stoptabulate - -\stopstandardmakeup - -\setupbackgrounds - [leftpage] - [setups=pagenumber:left] - -\setupbackgrounds - [rightpage] - [setups=pagenumber:right] - -\stopcomponent +\startcomponent luatex-firstpage + +\startstandardmakeup + + \start + \raggedleft + \definedfont[Bold*default at 48pt] + \setupinterlinespace + \blue \documentvariable{manual} \endgraf Reference \endgraf Manual \endgraf + \stop + + \vfill + + \definedfont[Bold*default at 12pt] + + \starttabulate[|l|l|] + \NC copyright \EQ Lua\TeX\ development team \NC \NR + \NC more info \EQ www.luatex.org \NC \NR + \NC version \EQ \currentdate \doifsomething{\documentvariable{snapshot}}{(snapshot \documentvariable{snapshot})} \NC \NR + \stoptabulate + +\stopstandardmakeup + +\setupbackgrounds + [leftpage] + [setups=pagenumber:left] + +\setupbackgrounds + [rightpage] + [setups=pagenumber:right] + +\stopcomponent diff --git a/manual/luatex-fontloader.tex b/manual/luatex-fontloader.tex index e99ea1d2f..0a830ed00 100644 --- a/manual/luatex-fontloader.tex +++ b/manual/luatex-fontloader.tex @@ -1,1164 +1,1164 @@ -% language=uk - -\environment luatex-style - -\startcomponent luatex-fontloader - -\startchapter[reference=fontloader,title={The fontloader}] - -\topicindex {fonts+loading} - -The fontloader library is sort of independent of the rest in the sense that it -can load font into a \LUA\ table that then can be converted into a table suitable -for \TEX. The library is an adapted subset of \FONTFORGE\ and as such gives a -similar view on a font (which has advantages when you want to debug). We will not -discuss \OPENTYPE\ in detail here as the \MICROSOFT\ website offers enough -information about it. The tables returned by the loader are not that far from the -standard. We have no plans to extend the loader (it may even become an external -module at some time). - -\startsection[title={Getting quick information on a font}][library=fontloader] - -\topicindex {fonts+information} - -\libindex{info} - -When you want to locate font by name you need some basic information that is -hidden in the font files. For that reason we provide an efficient helper that -gets the basic information without loading all of the font. Normally this helper -is used to create a font (name) database. - -\startfunctioncall -
info = - fontloader.info( filename) -\stopfunctioncall - -This function returns either \type {nil}, or a \type {table}, or an array of -small tables (in the case of a \TRUETYPE\ collection). The returned table(s) will -contain some fairly interesting information items from the font(s) defined by the -file: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{fontname} \NC string \NC the \POSTSCRIPT\ name of the font\NC \NR -\NC \type{fullname} \NC string \NC the formal name of the font\NC \NR -\NC \type{familyname} \NC string \NC the family name this font belongs to\NC \NR -\NC \type{weight} \NC string \NC a string indicating the color value of the font\NC \NR -\NC \type{version} \NC string \NC the internal font version\NC \NR -\NC \type{italicangle} \NC float \NC the slant angle\NC \NR -\NC \type{units_per_em} \NC number \NC 1000 for \POSTSCRIPT-based fonts, usually 2048 for \TRUETYPE\NC \NR -\NC \type{pfminfo} \NC table \NC (see \in{section}[fontloaderpfminfotable])\NC \NR -\LL -\stoptabulate - -Getting information through this function is (sometimes much) more efficient than -loading the font properly, and is therefore handy when you want to create a -dictionary of available fonts based on a directory contents. - -\stopsection - -\startsection[title={Loading an \OPENTYPE\ or \TRUETYPE\ file}][library=fontloader] - -\topicindex {\OPENTYPE} -\topicindex {\TRUETYPE} - -\libindex{open} -\libindex{close} -\libindex{to_table} - -If you want to use an \OPENTYPE\ font, you have to get the metric information -from somewhere. Using the \type {fontloader} library, the simplest way to get -that information is thus: - -\starttyping -function load_font (filename) - local metrics = nil - local font = fontloader.open(filename) - if font then - metrics = fontloader.to_table(font) - fontloader.close(font) - end - return metrics -end - -myfont = load_font('/opt/tex/texmf/fonts/data/arial.ttf') -\stoptyping - -The main function call is - -\startfunctioncall - f,
w = fontloader.open( filename) - f,
w = fontloader.open( filename, fontname) -\stopfunctioncall - -The first return value is a userdata representation of the font. The second -return value is a table containing any warnings and errors reported by fontloader -while opening the font. In normal typesetting, you would probably ignore the -second argument, but it can be useful for debugging purposes. - -For \TRUETYPE\ collections (when filename ends in 'ttc') and \DFONT\ collections, -you have to use a second string argument to specify which font you want from the -collection. Use the \type {fontname} strings that are returned by \type -{fontloader.info} for that. - -To turn the font into a table, \type {fontloader.to_table} is used on the font -returned by \type {fontloader.open}. - -\startfunctioncall -
f = fontloader.to_table( font) -\stopfunctioncall - -This table cannot be used directly by \LUATEX\ and should be turned into another -one as described in~\in {chapter} [fonts]. Do not forget to store the \type -{fontname} value in the \type {psname} field of the metrics table to be returned -to \LUATEX, otherwise the font inclusion backend will not be able to find the -correct font in the collection. - -See \in {section} [fontloadertables] for details on the userdata object returned -by \type {fontloader.open} and the layout of the \type {metrics} table returned -by \type {fontloader.to_table}. - -The font file is parsed and partially interpreted by the font loading routines -from \FONTFORGE. The file format can be \OPENTYPE, \TRUETYPE, \TRUETYPE\ -Collection, \CFF, or \TYPEONE. - -There are a few advantages to this approach compared to reading the actual font -file ourselves: - -\startitemize - -\startitem - The font is automatically re|-|encoded, so that the \type {metrics} table for - \TRUETYPE\ and \OPENTYPE\ fonts is using \UNICODE\ for the character indices. -\stopitem - -\startitem - Many features are pre|-|processed into a format that is easier to handle than - just the bare tables would be. -\stopitem - -\startitem - \POSTSCRIPT|-|based \OPENTYPE\ fonts do not store the character height and - depth in the font file, so the character boundingbox has to be calculated in - some way. -\stopitem - -\stopitemize - -A loaded font is discarded with: - -\startfunctioncall -fontloader.close( font) -\stopfunctioncall - -\stopsection - -\startsection[title={Applying a \quote{feature file}}][library=fontloader] - -\libindex{apply_featurefile} - -You can apply a \quote{feature file} to a loaded font: - -\startfunctioncall -
errors = fontloader.apply_featurefile( font, filename) -\stopfunctioncall - -A \quote {feature file} is a textual representation of the features in an -\OPENTYPE\ font. See - -\starttyping -http://www.adobe.com/devnet/opentype/afdko/topic_feature_file_syntax.html -\stoptyping - -and - -\starttyping -http://fontforge.sourceforge.net/featurefile.html -\stoptyping - -for a more detailed description of feature files. - -If the function fails, the return value is a table containing any errors reported -by fontloader while applying the feature file. On success, \type {nil} is -returned. - -\stopsection - -\startsection[title={Applying an \quote{\AFM\ file}}][library=fontloader] - -\topicindex {\TYPEONE} - -\libindex{apply_afmfile} - -You can apply an \quote {\AFM\ file} to a loaded font: - -\startfunctioncall -
errors = fontloader.apply_afmfile( font, filename) -\stopfunctioncall - -An \AFM\ file is a textual representation of (some of) the meta information -in a \TYPEONE\ font. See - -\starttyping -ftp://ftp.math.utah.edu/u/ma/hohn/linux/postscript/5004.AFM_Spec.pdf -\stoptyping - -for more information about \AFM\ files. - -Note: If you \type {fontloader.open} a \TYPEONE\ file named \type {font.pfb}, -the library will automatically search for and apply \type {font.afm} if it exists -in the same directory as the file \type {font.pfb}. In that case, there is no -need for an explicit call to \type {apply_afmfile()}. - -If the function fails, the return value is a table containing any errors reported -by fontloader while applying the AFM file. On success, \type {nil} is returned. - -\stopsection - -\startsection[title={Fontloader font tables},reference=fontloadertables][library=fontloader] - -\topicindex {fontloader+tables} - -\libindex{fields} - -As mentioned earlier, the return value of \type {fontloader.open} is a userdata -object. One way to have access to the actual metrics is to call \type -{fontloader.to_table} on this object, returning the table structure that is -explained in the following sections. In teh following sections we will not -explain each field in detail. Most fields are self descriptive and for the more -technical aspects you need to consult the relevant font references. - -It turns out that the result from \type {fontloader.to_table} sometimes needs -very large amounts of memory (depending on the font's complexity and size) so it -is possible to access the userdata object directly. - -\startitemize -\startitem - All top|-|level keys that would be returned by \type {to_table()} - can also be accessed directly. -\stopitem -\startitem - The top|-|level key \quote {glyphs} returns a {\it virtual\/} array that - allows indices from \type {f.glyphmin} to (\type {f.glyphmax}). -\stopitem -\startitem - The items in that virtual array (the actual glyphs) are themselves also - userdata objects, and each has accessors for all of the keys explained in the - section \quote {Glyph items} below. -\stopitem -\startitem - The top|-|level key \quote {subfonts} returns an {\it actual} array of userdata - objects, one for each of the subfonts (or nil, if there are no subfonts). -\stopitem -\stopitemize - -A short example may be helpful. This code generates a printout of all -the glyph names in the font \type {PunkNova.kern.otf}: - -\starttyping -local f = fontloader.open('PunkNova.kern.otf') -print (f.fontname) -local i = 0 -if f.glyphcnt > 0 then - for i=f.glyphmin,f.glyphmax do - local g = f.glyphs[i] - if g then - print(g.name) - end - i = i + 1 - end -end -fontloader.close(f) -\stoptyping - -In this case, the \LUATEX\ memory requirement stays below 100MB on the test -computer, while the internal structure generated by \type {to_table()} needs more -than 2GB of memory (the font itself is 6.9MB in disk size). - -Only the top|-|level font, the subfont table entries, and the glyphs are virtual -objects, everything else still produces normal \LUA\ values and tables. - -If you want to know the valid fields in a font or glyph structure, call the \type -{fields} function on an object of a particular type (either glyph or font): - -\startfunctioncall -
fields = fontloader.fields( font) -
fields = fontloader.fields( font_glyph) -\stopfunctioncall - -For instance: - -\startfunctioncall -local fields = fontloader.fields(f) -local fields = fontloader.fields(f.glyphs[0]) -\stopfunctioncall - -\stopsection - -\startsection[title={Table types}][library=fontloader] - -\startsubsection[title={The main table}] - -The top|-|level keys in the returned table are (the explanations in this part of -the documentation are not yet finished): - -\starttabulate[|l|l|p|] -\DB key \BC type \NC explanation \NC \NR -\TB -\NC \type{table_version} \NC number \NC indicates the metrics version (currently~0.3)\NC \NR -\NC \type{fontname} \NC string \NC \POSTSCRIPT\ font name\NC \NR -\NC \type{fullname} \NC string \NC official (human-oriented) font name\NC \NR -\NC \type{familyname} \NC string \NC family name\NC \NR -\NC \type{weight} \NC string \NC weight indicator\NC \NR -\NC \type{copyright} \NC string \NC copyright information\NC \NR -\NC \type{filename} \NC string \NC the file name\NC \NR -\NC \type{version} \NC string \NC font version\NC \NR -\NC \type{italicangle} \NC float \NC slant angle\NC \NR -\NC \type{units_per_em} \NC number \NC 1000 for \POSTSCRIPT-based fonts, usually 2048 for \TRUETYPE\NC \NR -\NC \type{ascent} \NC number \NC height of ascender in \type {units_per_em}\NC \NR -\NC \type{descent} \NC number \NC depth of descender in \type {units_per_em}\NC \NR -\NC \type{upos} \NC float \NC \NC \NR -\NC \type{uwidth} \NC float \NC \NC \NR -\NC \type{uniqueid} \NC number \NC \NC \NR -\NC \type{glyphs} \NC array \NC \NC \NR -\NC \type{glyphcnt} \NC number \NC number of included glyphs\NC \NR -\NC \type{glyphmax} \NC number \NC maximum used index the glyphs array\NC \NR -\NC \type{glyphmin} \NC number \NC minimum used index the glyphs array\NC \NR -\NC \type{notdef_loc} \NC number \NC location of the \type {.notdef} glyph - or \type {-1} when not present \NC \NR -\NC \type{hasvmetrics} \NC number \NC \NC \NR -\NC \type{onlybitmaps} \NC number \NC \NC \NR -\NC \type{serifcheck} \NC number \NC \NC \NR -\NC \type{isserif} \NC number \NC \NC \NR -\NC \type{issans} \NC number \NC \NC \NR -\NC \type{encodingchanged} \NC number \NC \NC \NR -\NC \type{strokedfont} \NC number \NC \NC \NR -\NC \type{use_typo_metrics} \NC number \NC \NC \NR -\NC \type{weight_width_slope_only} \NC number \NC \NC \NR -\NC \type{head_optimized_for_cleartype} \NC number \NC \NC \NR -\NC \type{uni_interp} \NC enum \NC \nod {unset}, \type {none}, \type {adobe}, - \type {greek}, \type {japanese}, \type {trad_chinese}, - \type {simp_chinese}, \type {korean}, \type {ams}\NC \NR -\NC \type{origname} \NC string \NC the file name, as supplied by the user\NC \NR -\NC \type{map} \NC table \NC \NC \NR -\NC \type{private} \NC table \NC \NC \NR -\NC \type{xuid} \NC string \NC \NC \NR -\NC \type{pfminfo} \NC table \NC \NC \NR -\NC \type{names} \NC table \NC \NC \NR -\NC \type{cidinfo} \NC table \NC \NC \NR -\NC \type{subfonts} \NC array \NC \NC \NR -\NC \type{commments} \NC string \NC \NC \NR -\NC \type{fontlog} \NC string \NC \NC \NR -\NC \type{cvt_names} \NC string \NC \NC \NR -\NC \type{anchor_classes} \NC table \NC \NC \NR -\NC \type{ttf_tables} \NC table \NC \NC \NR -\NC \type{ttf_tab_saved} \NC table \NC \NC \NR -\NC \type{kerns} \NC table \NC \NC \NR -\NC \type{vkerns} \NC table \NC \NC \NR -\NC \type{texdata} \NC table \NC \NC \NR -\NC \type{lookups} \NC table \NC \NC \NR -\NC \type{gpos} \NC table \NC \NC \NR -\NC \type{gsub} \NC table \NC \NC \NR -\NC \type{mm} \NC table \NC \NC \NR -\NC \type{chosenname} \NC string \NC \NC \NR -\NC \type{macstyle} \NC number \NC \NC \NR -\NC \type{fondname} \NC string \NC \NC \NR -%NC \type{design_size} \NC number \NC \NC \NR -\NC \type{fontstyle_id} \NC number \NC \NC \NR -\NC \type{fontstyle_name} \NC table \NC \NC \NR -%NC \type{design_range_bottom} \NC number \NC \NC \NR -%NC \type{design_range_top} \NC number \NC \NC \NR -\NC \type{strokewidth} \NC float \NC \NC \NR -\NC \type{mark_classes} \NC table \NC \NC \NR -\NC \type{creationtime} \NC number \NC \NC \NR -\NC \type{modificationtime} \NC number \NC \NC \NR -\NC \type{os2_version} \NC number \NC \NC \NR -\NC \type{math} \NC table \NC \NC \NR -\NC \type{validation_state} \NC table \NC \NC \NR -\NC \type{horiz_base} \NC table \NC \NC \NR -\NC \type{vert_base} \NC table \NC \NC \NR -\NC \type{extrema_bound} \NC number \NC \NC \NR -\NC \type{truetype} \NC boolean \NC signals a \TRUETYPE\ font \NC \NR -\LL -\stoptabulate - -\stopsubsection - -\startsubsection[title={\type {glyphs}}] - -The \type {glyphs} is an array containing the per|-|character -information (quite a few of these are only present if non|-|zero). - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{name} \NC string \NC the glyph name \NC \NR -\NC \type{unicode} \NC number \NC unicode code point, or -1 \NC \NR -\NC \type{boundingbox} \NC array \NC array of four numbers, see note below \NC \NR -\NC \type{width} \NC number \NC only for horizontal fonts \NC \NR -\NC \type{vwidth} \NC number \NC only for vertical fonts \NC \NR -\NC \type{tsidebearing} \NC number \NC only for vertical ttf/otf fonts, and only if non|-|zero \NC \NR -\NC \type{lsidebearing} \NC number \NC only if non|-|zero and not equal to boundingbox[1] \NC \NR -\NC \type{class} \NC string \NC one of "none", "base", "ligature", "mark", "component" - (if not present, the glyph class is \quote {automatic}) \NC \NR -\NC \type{kerns} \NC array \NC only for horizontal fonts, if set \NC \NR -\NC \type{vkerns} \NC array \NC only for vertical fonts, if set \NC \NR -\NC \type{dependents} \NC array \NC linear array of glyph name strings, only if nonempty\NC \NR -\NC \type{lookups} \NC table \NC only if nonempty \NC \NR -\NC \type{ligatures} \NC table \NC only if nonempty \NC \NR -\NC \type{anchors} \NC table \NC only if set \NC \NR -\NC \type{comment} \NC string \NC only if set \NC \NR -\NC \type{tex_height} \NC number \NC only if set \NC \NR -\NC \type{tex_depth} \NC number \NC only if set \NC \NR -\NC \type{italic_correction} \NC number \NC only if set \NC \NR -\NC \type{top_accent} \NC number \NC only if set \NC \NR -\NC \type{is_extended_shape} \NC number \NC only if this character is part of a math extension list \NC \NR -\NC \type{altuni} \NC table \NC alternate \UNICODE\ items \NC \NR -\NC \type{vert_variants} \NC table \NC \NC \NR -\NC \type{horiz_variants} \NC table \NC \NC \NR -\NC \type{mathkern} \NC table \NC \NC \NR -\LL -\stoptabulate - -On \type {boundingbox}: The boundingbox information for \TRUETYPE\ fonts and -\TRUETYPE-based \OTF\ fonts is read directly from the font file. -\POSTSCRIPT-based fonts do not have this information, so the boundingbox of -traditional \POSTSCRIPT\ fonts is generated by interpreting the actual bezier -curves to find the exact boundingbox. This can be a slow process, so the -boundingboxes of \POSTSCRIPT-based \OTF\ fonts (and raw \CFF\ fonts) are -calculated using an approximation of the glyph shape based on the actual glyph -points only, instead of taking the whole curve into account. This means that -glyphs that have missing points at extrema will have a too|-|tight boundingbox, -but the processing is so much faster that in our opinion the tradeoff is worth -it. - -The \type {kerns} and \type {vkerns} are linear arrays of small hashes: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{char} \NC string \NC \NC \NR -\NC \type{off} \NC number \NC \NC \NR -\NC \type{lookup} \NC string \NC \NC \NR -\LL -\stoptabulate - -The \type {lookups} is a hash, based on lookup subtable names, with -the value of each key inside that a linear array of small hashes: - -% TODO: fix this description - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{type} \NC enum \NC \type {position}, \type {pair}, \type - {substitution}, \type {alternate}, \type - {multiple}, \type {ligature}, \type - {lcaret}, \cbk {kerning}, \type {vkerning}, - \type {anchors}, \type {contextpos}, \type - {contextsub}, \type {chainpos}, \type - {chainsub}, \type {reversesub}, \type - {max}, \type {kernback}, \type {vkernback} - \NC \NR -\NC \type{specification} \NC table \NC extra data \NC \NR -\LL -\stoptabulate - -For the first seven values of \type {type}, there can be additional -sub|-|information, stored in the sub-table \type {specification}: - -\starttabulate[|l|l|p|] -\DB value \BC type \BC explanation \NC \NR -\TB -\NC \type{position} \NC table \NC a table of the \type {offset_specs} type \NC \NR -\NC \type{pair} \NC table \NC one string: \type {paired}, and an array of one - or two \type {offset_specs} tables: \type {offsets} \NC \NR -\NC \type{substitution} \NC table \NC one string: \type {variant} \NC \NR -\NC \type{alternate} \NC table \NC one string: \type {components} \NC \NR -\NC \type{multiple} \NC table \NC one string: \type {components} \NC \NR -\NC \type{ligature} \NC table \NC two strings: \type {components}, \type {char} \NC \NR -\NC \type{lcaret} \NC array \NC linear array of numbers \NC \NR -\LL -\stoptabulate - -Tables for \type {offset_specs} contain up to four number|-|valued fields: \type -{x} (a horizontal offset), \type {y} (a vertical offset), \type {h} (an advance -width correction) and \type {v} (an advance height correction). - -The \type {ligatures} is a linear array of small hashes: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{lig} \NC table \NC uses the same substructure as a single item in - the \type {lookups} table explained above \NC \NR -\NC \type{char} \NC string \NC \NC \NR -\NC \type{components} \NC array \NC linear array of named components \NC \NR -\NC \type{ccnt} \NC number \NC \NC \NR -\LL -\stoptabulate - -The \type {anchor} table is indexed by a string signifying the anchor type, which -is one of: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{mark} \NC table \NC placement mark \NC \NR -\NC \type{basechar} \NC table \NC mark for attaching combining items to a base char \NC \NR -\NC \type{baselig} \NC table \NC mark for attaching combining items to a ligature \NC \NR -\NC \type{basemark} \NC table \NC generic mark for attaching combining items to connect to \NC \NR -\NC \type{centry} \NC table \NC cursive entry point \NC \NR -\NC \type{cexit} \NC table \NC cursive exit point \NC \NR -\LL -\stoptabulate - -The content of these is a short array of defined anchors, with the -entry keys being the anchor names. For all except \type {baselig}, the -value is a single table with this definition: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{x} \NC number \NC x location \NC \NR -\NC \type{y} \NC number \NC y location \NC \NR -\NC \type{ttf_pt_index} \NC number \NC truetype point index, only if given \NC \NR -\LL -\stoptabulate - -For \type {baselig}, the value is a small array of such anchor sets sets, one for -each constituent item of the ligature. - -For clarification, an anchor table could for example look like this : - -\starttyping -['anchor'] = { - ['basemark'] = { - ['Anchor-7'] = { ['x']=170, ['y']=1080 } - }, - ['mark'] ={ - ['Anchor-1'] = { ['x']=160, ['y']=810 }, - ['Anchor-4'] = { ['x']=160, ['y']=800 } - }, - ['baselig'] = { - [1] = { ['Anchor-2'] = { ['x']=160, ['y']=650 } }, - [2] = { ['Anchor-2'] = { ['x']=460, ['y']=640 } } - } - } -\stoptyping - -Note: The \type {baselig} table can be sparse! - -\stopsubsection - -\startsubsection[title={\type {map}}] - -The top|-|level map is a list of encoding mappings. Each of those is a table -itself. - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{enccount} \NC number \NC \NC \NR -\NC \type{encmax} \NC number \NC \NC \NR -\NC \type{backmax} \NC number \NC \NC \NR -\NC \type{remap} \NC table \NC \NC \NR -\NC \type{map} \NC array \NC non|-|linear array of mappings\NC \NR -\NC \type{backmap} \NC array \NC non|-|linear array of backward mappings\NC \NR -\NC \type{enc} \NC table \NC \NC \NR -\LL -\stoptabulate - -The \type {remap} table is very small: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{firstenc} \NC number \NC \NC \NR -\NC \type{lastenc} \NC number \NC \NC \NR -\NC \type{infont} \NC number \NC \NC \NR -\LL -\stoptabulate - -The \type {enc} table is a bit more verbose: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{enc_name} \NC string \NC \NC \NR -\NC \type{char_cnt} \NC number \NC \NC \NR -\NC \type{char_max} \NC number \NC \NC \NR -\NC \type{unicode} \NC array \NC of \UNICODE\ position numbers\NC \NR -\NC \type{psnames} \NC array \NC of \POSTSCRIPT\ glyph names\NC \NR -\NC \type{builtin} \NC number \NC \NC \NR -\NC \type{hidden} \NC number \NC \NC \NR -\NC \type{only_1byte} \NC number \NC \NC \NR -\NC \type{has_1byte} \NC number \NC \NC \NR -\NC \type{has_2byte} \NC number \NC \NC \NR -\NC \type{is_unicodebmp} \NC number \NC only if non|-|zero\NC \NR -\NC \type{is_unicodefull} \NC number \NC only if non|-|zero\NC \NR -\NC \type{is_custom} \NC number \NC only if non|-|zero\NC \NR -\NC \type{is_original} \NC number \NC only if non|-|zero\NC \NR -\NC \type{is_compact} \NC number \NC only if non|-|zero\NC \NR -\NC \type{is_japanese} \NC number \NC only if non|-|zero\NC \NR -\NC \type{is_korean} \NC number \NC only if non|-|zero\NC \NR -\NC \type{is_tradchinese} \NC number \NC only if non|-|zero [name?]\NC \NR -\NC \type{is_simplechinese} \NC number \NC only if non|-|zero\NC \NR -\NC \type{low_page} \NC number \NC \NC \NR -\NC \type{high_page} \NC number \NC \NC \NR -\NC \type{iconv_name} \NC string \NC \NC \NR -\NC \type{iso_2022_escape} \NC string \NC \NC \NR -\LL -\stoptabulate - -\stopsubsection - -\startsubsection[title={\type {private}}] - -This is the font's private \POSTSCRIPT\ dictionary, if any. Keys and values are -both strings. - -\stopsubsection - -\startsubsection[title={\type {cidinfo}}] - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{registry} \NC string \NC \NC \NR -\NC \type{ordering} \NC string \NC \NC \NR -\NC \type{supplement} \NC number \NC \NC \NR -\NC \type{version} \NC number \NC \NC \NR -\LL -\stoptabulate - -\stopsubsection - -\startsubsection[reference=fontloaderpfminfotable,title={\type {pfminfo}}] - -The \type {pfminfo} table contains most of the OS/2 information: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{pfmset} \NC number \NC \NC \NR -\NC \type{winascent_add} \NC number \NC \NC \NR -\NC \type{windescent_add} \NC number \NC \NC \NR -\NC \type{hheadascent_add} \NC number \NC \NC \NR -\NC \type{hheaddescent_add} \NC number \NC \NC \NR -\NC \type{typoascent_add} \NC number \NC \NC \NR -\NC \type{typodescent_add} \NC number \NC \NC \NR -\NC \type{subsuper_set} \NC number \NC \NC \NR -\NC \type{panose_set} \NC number \NC \NC \NR -\NC \type{hheadset} \NC number \NC \NC \NR -\NC \type{vheadset} \NC number \NC \NC \NR -\NC \type{pfmfamily} \NC number \NC \NC \NR -\NC \type{weight} \NC number \NC \NC \NR -\NC \type{width} \NC number \NC \NC \NR -\NC \type{avgwidth} \NC number \NC \NC \NR -\NC \type{firstchar} \NC number \NC \NC \NR -\NC \type{lastchar} \NC number \NC \NC \NR -\NC \type{fstype} \NC number \NC \NC \NR -\NC \type{linegap} \NC number \NC \NC \NR -\NC \type{vlinegap} \NC number \NC \NC \NR -\NC \type{hhead_ascent} \NC number \NC \NC \NR -\NC \type{hhead_descent} \NC number \NC \NC \NR -\NC \type{os2_typoascent} \NC number \NC \NC \NR -\NC \type{os2_typodescent} \NC number \NC \NC \NR -\NC \type{os2_typolinegap} \NC number \NC \NC \NR -\NC \type{os2_winascent} \NC number \NC \NC \NR -\NC \type{os2_windescent} \NC number \NC \NC \NR -\NC \type{os2_subxsize} \NC number \NC \NC \NR -\NC \type{os2_subysize} \NC number \NC \NC \NR -\NC \type{os2_subxoff} \NC number \NC \NC \NR -\NC \type{os2_subyoff} \NC number \NC \NC \NR -\NC \type{os2_supxsize} \NC number \NC \NC \NR -\NC \type{os2_supysize} \NC number \NC \NC \NR -\NC \type{os2_supxoff} \NC number \NC \NC \NR -\NC \type{os2_supyoff} \NC number \NC \NC \NR -\NC \type{os2_strikeysize} \NC number \NC \NC \NR -\NC \type{os2_strikeypos} \NC number \NC \NC \NR -\NC \type{os2_family_class} \NC number \NC \NC \NR -\NC \type{os2_xheight} \NC number \NC \NC \NR -\NC \type{os2_capheight} \NC number \NC \NC \NR -\NC \type{os2_defaultchar} \NC number \NC \NC \NR -\NC \type{os2_breakchar} \NC number \NC \NC \NR -\NC \type{os2_vendor} \NC string \NC \NC \NR -\NC \type{codepages} \NC table \NC A two-number array of encoded code pages \NC \NR -\NC \type{unicoderages} \NC table \NC A four-number array of encoded unicode ranges \NC \NR -\NC \type{panose} \NC table \NC \NC \NR -\LL -\stoptabulate - -The \type {panose} subtable has exactly 10 string keys: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{familytype} \NC string \NC Values as in the \OPENTYPE\ font - specification: \type {Any}, \type {No Fit}, - \type {Text and Display}, \type {Script}, - \type {Decorative}, \type {Pictorial} \NC - \NR -\NC \type{serifstyle} \NC string \NC See the \OPENTYPE\ font specification for - values \NC \NR -\NC \type{weight} \NC string \NC idem \NC \NR -\NC \type{proportion} \NC string \NC idem \NC \NR -\NC \type{contrast} \NC string \NC idem \NC \NR -\NC \type{strokevariation} \NC string \NC idem \NC \NR -\NC \type{armstyle} \NC string \NC idem \NC \NR -\NC \type{letterform} \NC string \NC idem \NC \NR -\NC \type{midline} \NC string \NC idem \NC \NR -\NC \type{xheight} \NC string \NC idem \NC \NR -\LL -\stoptabulate - -\stopsubsection - -\startsubsection[reference=fontloadernamestable,title={\type {names}}] - -Each item has two top|-|level keys: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{lang} \NC string \NC language for this entry \NC \NR -\NC \type{names} \NC table \NC \NC \NR -\LL -\stoptabulate - -The \type {names} keys are the actual \TRUETYPE\ name strings. The possible keys -are: \type {copyright}, \type {family}, \type {subfamily}, \type {uniqueid}, -\type {fullname}, \type {version}, \type {postscriptname}, \type {trademark}, -\type {manufacturer}, \type {designer}, \type {descriptor}, \type {venderurl}, -\type {designerurl}, \type {license}, \type {licenseurl}, \type {idontknow}, -\type {preffamilyname}, \type {prefmodifiers}, \type {compatfull}, \type -{sampletext}, \type {cidfindfontname}, \type {wwsfamily} and \type -{wwssubfamily}. - -\stopsubsection - -\startsubsection[title={\type {anchor_classes}}] - -The anchor_classes classes: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{name} \NC string \NC a descriptive id of this anchor class\NC \NR -\NC \type{lookup} \NC string \NC \NC \NR -\NC \type{type} \NC string \NC one of \nod {mark}, \type {mkmk}, \type {curs}, \type {mklg} \NC \NR -\LL -\stoptabulate - -% type is actually a lookup subtype, not a feature name. Officially, these -% strings should be gpos_mark2mark etc. - -\stopsubsection - -\startsubsection[title={\type {gpos}}] - -The \type {gpos} table has one array entry for each lookup. (The \type {gpos_} -prefix is somewhat redundant.) - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{type} \NC string \NC one of \type {gpos_single}, \type {gpos_pair}, - \type {gpos_cursive}, \type {gpos_mark2base},\crlf - \type {gpos_mark2ligature}, \type {gpos_mark2mark}, \type {gpos_context},\crlf \type {gpos_contextchain} \NC \NR -\NC \type{flags} \NC table \NC \NC \NR -\NC \type{name} \NC string \NC \NC \NR -\NC \type{features} \NC array \NC \NC \NR -\NC \type{subtables} \NC array \NC \NC \NR -\LL -\stoptabulate - -The flags table has a true value for each of the lookup flags that is actually -set: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{r2l} \NC boolean \NC \NC \NR -\NC \type{ignorebaseglyphs} \NC boolean \NC \NC \NR -\NC \type{ignoreligatures} \NC boolean \NC \NC \NR -\NC \type{ignorecombiningmarks} \NC boolean \NC \NC \NR -\NC \type{mark_class} \NC string \NC \NC \NR -\LL -\stoptabulate - -The features subtable items of gpos have: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{tag} \NC string \NC \NC \NR -\NC \type{scripts} \NC table \NC \NC \NR -\LL -\stoptabulate - -The scripts table within features has: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{script} \NC string \NC \NC \NR -\NC \type{langs} \NC array of strings \NC \NC \NR -\LL -\stoptabulate - -The subtables table has: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{name} \NC string \NC \NC \NR -\NC \type{suffix} \NC string \NC (only if used)\NC \NR % used by gpos_single to get a default -\NC \type{anchor_classes} \NC number \NC (only if used)\NC \NR -\NC \type{vertical_kerning} \NC number \NC (only if used)\NC \NR -\NC \type{kernclass} \NC table \NC (only if used)\NC \NR -\LL -\stoptabulate - -The kernclass with subtables table has: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{firsts} \NC array of strings \NC \NC \NR -\NC \type{seconds} \NC array of strings \NC \NC \NR -\NC \type{lookup} \NC string or array \NC associated lookup(s) \NC \NR -\NC \type{offsets} \NC array of numbers \NC \NC \NR -\LL -\stoptabulate - -Note: the kernclass (as far as we can see) always has one entry so it could be one level -deep instead. Also the seconds start at \type {[2]} which is close to the fontforge -internals so we keep that too. - -\stopsubsection - -\startsubsection[title={\type {gsub}}] - -This has identical layout to the \type {gpos} table, except for the -type: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{type} \NC string \NC one of \type {gsub_single}, \type {gsub_multiple}, - \type {gsub_alternate}, \type {gsub_ligature},\crlf - \type {gsub_context}, \type {gsub_contextchain}, - \type {gsub_reversecontextchain} \NC \NR -\LL -\stoptabulate - -\stopsubsection - -\startsubsection[title={\type {ttf_tables} and \type {ttf_tab_saved}}] - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{tag} \NC string \NC \NC \NR -\NC \type{len} \NC number \NC \NC \NR -\NC \type{maxlen} \NC number \NC \NC \NR -\NC \type{data} \NC number \NC \NC \NR -\LL -\stoptabulate - -\stopsubsection - -\startsubsection[title={\type {mm}}] - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{axes} \NC table \NC array of axis names \NC \NR -\NC \type{instance_count} \NC number \NC \NC \NR -\NC \type{positions} \NC table \NC array of instance positions - (\#axes * instances )\NC \NR -\NC \type{defweights} \NC table \NC array of default weights for instances \NC \NR -\NC \type{cdv} \NC string \NC \NC \NR -\NC \type{ndv} \NC string \NC \NC \NR -\NC \type{axismaps} \NC table \NC \NC \NR -\LL -\stoptabulate - -The \type {axismaps}: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{blends} \NC table \NC an array of blend points \NC \NR -\NC \type{designs} \NC table \NC an array of design values \NC \NR -\NC \type{min} \NC number \NC \NC \NR -\NC \type{def} \NC number \NC \NC \NR -\NC \type{max} \NC number \NC \NC \NR -\LL -\stoptabulate - -\stopsubsection - -\startsubsection[title={\type {mark_classes}}] - -The keys in this table are mark class names, and the values are a -space|-|separated string of glyph names in this class. - -\stopsubsection - -\startsubsection[title={\type {math}}] - -The math table has the variables that are also discussed in the chapter aboout -math: \type {ScriptPercentScaleDown}, \type {ScriptScriptPercentScaleDown}, \type -{DelimitedSubFormulaMinHeight}, \type {DisplayOperatorMinHeight}, \type -{MathLeading}, \type {AxisHeight}, \type {AccentBaseHeight}, \type -{FlattenedAccentBaseHeight}, \type {SubscriptShiftDown}, \type {SubscriptTopMax}, -\type {SubscriptBaselineDropMin}, \type {SuperscriptShiftUp}, \type -{SuperscriptShiftUpCramped}, \type {SuperscriptBottomMin}, \type -{SuperscriptBaselineDropMax}, \type {SubSuperscriptGapMin}, \type -{SuperscriptBottomMaxWithSubscript}, \type {SpaceAfterScript}, \type -{UpperLimitGapMin}, \type {UpperLimitBaselineRiseMin}, \type {LowerLimitGapMin}, -\type {LowerLimitBaselineDropMin}, \type {StackTopShiftUp}, \type -{StackTopDisplayStyleShiftUp}, \type {StackBottomShiftDown}, \type -{StackBottomDisplayStyleShiftDown}, \type {StackGapMin}, \type -{StackDisplayStyleGapMin}, \type {StretchStackTopShiftUp}, \type -{StretchStackBottomShiftDown}, \type {StretchStackGapAboveMin}, \type -{StretchStackGapBelowMin}, \type {FractionNumeratorShiftUp}, \type -{FractionNumeratorDisplayStyleShiftUp}, \type {FractionDenominatorShiftDown}, -\type {FractionDenominatorDisplayStyleShiftDown}, \type -{FractionNumeratorGapMin}, \type {FractionNumeratorDisplayStyleGapMin} \type -{FractionRuleThickness}, \type {FractionDenominatorGapMin}, \type -{FractionDenominatorDisplayStyleGapMin}, \type {SkewedFractionHorizontalGap}, -\type {SkewedFractionVerticalGap}, \type {OverbarVerticalGap}, \type -{OverbarRuleThickness}, \type {OverbarExtraAscender}, \type -{UnderbarVerticalGap}, \type {UnderbarRuleThickness}, \type -{UnderbarExtraDescender}, \type {RadicalVerticalGap}, \type -{RadicalDisplayStyleVerticalGap}, \type {RadicalRuleThickness}, \type -{RadicalExtraAscender}, \type {RadicalKernBeforeDegree}, \type -{RadicalKernAfterDegree}, \type {RadicalDegreeBottomRaisePercent}, \type -{MinConnectorOverlap}, \type {FractionDelimiterSize} and \type -{FractionDelimiterDisplayStyleSize}. - -\stopsubsection - -\startsubsection[title={\type {validation_state}}] - -This is just a bonus table with keys: \type {bad_ps_fontname}, \type {bad_glyph_table}, \type {bad_cff_table}, \type {bad_metrics_table}, \type {bad_cmap_table}, \type {bad_bitmaps_table}, \type {bad_gx_table}, \type {bad_ot_table}, \type {bad_os2_version} and \type {bad_sfnt_header}. - -\stopsubsection - -\startsubsection[title={\type {horiz_base} and \type {vert_base}}] - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{tags} \NC table \NC an array of script list tags\NC \NR -\NC \type{scripts} \NC table \NC \NC \NR -\LL -\stoptabulate - -The \type {scripts} subtable: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{baseline} \NC table \NC \NC \NR -\NC \type{default_baseline} \NC number \NC \NC \NR -\NC \type{lang} \NC table \NC \NC \NR -\LL -\stoptabulate - - -The \type {lang} subtable: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{tag} \NC string \NC a script tag \NC \NR -\NC \type{ascent} \NC number \NC \NC \NR -\NC \type{descent} \NC number \NC \NC \NR -\NC \type{features} \NC table \NC \NC \NR -\LL -\stoptabulate - -The \type {features} points to an array of tables with the same layout except -that in those nested tables, the tag represents a language. - -\stopsubsection - -\startsubsection[title={\type {altuni}}] - -An array of alternate \UNICODE\ values. Inside that array are hashes with: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{unicode} \NC number \NC this glyph is also used for this unicode \NC \NR -\NC \type{variant} \NC number \NC the alternative is driven by this unicode selector \NC \NR -\LL -\stoptabulate - -\stopsubsection - -\startsubsection[title={\type {vert_variants} and \type {horiz_variants}}] - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{variants} \NC string \NC \NC \NR -\NC \type{italic_correction} \NC number \NC \NC \NR -\NC \type{parts} \NC table \NC \NC \NR -\LL -\stoptabulate - -The \type {parts} table is an array of smaller tables: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{component} \NC string \NC \NC \NR -\NC \type{extender} \NC number \NC \NC \NR -\NC \type{start} \NC number \NC \NC \NR -\NC \type{end} \NC number \NC \NC \NR -\NC \type{advance} \NC number \NC \NC \NR -\LL -\stoptabulate - -\stopsubsection - -\startsubsection[title={\type {mathkern}}] - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{top_right} \NC table \NC \NC \NR -\NC \type{bottom_right} \NC table \NC \NC \NR -\NC \type{top_left} \NC table \NC \NC \NR -\NC \type{bottom_left} \NC table \NC \NC \NR -\LL -\stoptabulate - -Each of the subtables is an array of small hashes with two keys: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{height} \NC number \NC \NC \NR -\NC \type{kern} \NC number \NC \NC \NR -\LL -\stoptabulate - -\stopsubsection - -\startsubsection[title={\type {kerns}}] - -Substructure is identical to the per|-|glyph subtable. - -\stopsubsection - -\startsubsection[title={\type {vkerns}}] - -Substructure is identical to the per|-|glyph subtable. - -\stopsubsection - -\startsubsection[title={\type {texdata}}] - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{type} \NC string \NC \nod {unset}, \type {text}, \nod {math}, \type {mathext} \NC \NR -\NC \type{params} \NC array \NC 22 font numeric parameters \NC \NR -\LL -\stoptabulate - -\stopsubsection - -\startsubsection[title={\type {lookups}}] - -Top|-|level \type {lookups} is quite different from the ones at character level. -The keys in this hash are strings, the values the actual lookups, represented as -dictionary tables. - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{type} \NC string \NC \NC \NR -\NC \type{format} \NC enum \NC one of \type {glyphs}, \type {class}, \type {coverage}, - \type {reversecoverage} \NC \NR -\NC \type{tag} \NC string \NC \NC \NR -\NC \type{current_class} \NC array \NC \NC \NR -\NC \type{before_class} \NC array \NC \NC \NR -\NC \type{after_class} \NC array \NC \NC \NR -\NC \type{rules} \NC array \NC an array of rule items\NC \NR -\LL -\stoptabulate - -Rule items have one common item and one specialized item: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{lookups} \NC array \NC a linear array of lookup names \NC \NR -\NC \type{glyphs} \NC array \NC only if the parent's format is \type {glyphs} \NC \NR -\NC \type{class} \NC array \NC only if the parent's format is \type {class} \NC \NR -\NC \type{coverage} \NC array \NC only if the parent's format is \type {coverage} \NC \NR -\NC \type{reversecoverage} \NC array \NC only if the parent's format is \type {reversecoverage} \NC \NR -\LL -\stoptabulate - -A glyph table is: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{names} \NC string \NC \NC \NR -\NC \type{back} \NC string \NC \NC \NR -\NC \type{fore} \NC string \NC \NC \NR -\LL -\stoptabulate - -A class table is: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{current} \NC array \NC of numbers \NC \NR -\NC \type{before} \NC array \NC of numbers \NC \NR -\NC \type{after} \NC array \NC of numbers \NC \NR -\LL -\stoptabulate - -for coverage: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{current} \NC array \NC of strings \NC \NR -\NC \type{before} \NC array \NC of strings \NC \NR -\NC \type{after} \NC array \NC of strings \NC \NR -\LL -\stoptabulate - -and for reverse coverage: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{current} \NC array \NC of strings \NC \NR -\NC \type{before} \NC array \NC of strings \NC \NR -\NC \type{after} \NC array \NC of strings \NC \NR -\NC \type{replacements} \NC string \NC \NC \NR -\LL -\stoptabulate - -\stopsubsection - -\stopsection - -\stopchapter - -\stopcomponent +% language=uk + +\environment luatex-style + +\startcomponent luatex-fontloader + +\startchapter[reference=fontloader,title={The fontloader}] + +\topicindex {fonts+loading} + +The fontloader library is sort of independent of the rest in the sense that it +can load font into a \LUA\ table that then can be converted into a table suitable +for \TEX. The library is an adapted subset of \FONTFORGE\ and as such gives a +similar view on a font (which has advantages when you want to debug). We will not +discuss \OPENTYPE\ in detail here as the \MICROSOFT\ website offers enough +information about it. The tables returned by the loader are not that far from the +standard. We have no plans to extend the loader (it may even become an external +module at some time). + +\startsection[title={Getting quick information on a font}][library=fontloader] + +\topicindex {fonts+information} + +\libindex{info} + +When you want to locate font by name you need some basic information that is +hidden in the font files. For that reason we provide an efficient helper that +gets the basic information without loading all of the font. Normally this helper +is used to create a font (name) database. + +\startfunctioncall +
info = + fontloader.info( filename) +\stopfunctioncall + +This function returns either \type {nil}, or a \type {table}, or an array of +small tables (in the case of a \TRUETYPE\ collection). The returned table(s) will +contain some fairly interesting information items from the font(s) defined by the +file: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{fontname} \NC string \NC the \POSTSCRIPT\ name of the font\NC \NR +\NC \type{fullname} \NC string \NC the formal name of the font\NC \NR +\NC \type{familyname} \NC string \NC the family name this font belongs to\NC \NR +\NC \type{weight} \NC string \NC a string indicating the color value of the font\NC \NR +\NC \type{version} \NC string \NC the internal font version\NC \NR +\NC \type{italicangle} \NC float \NC the slant angle\NC \NR +\NC \type{units_per_em} \NC number \NC 1000 for \POSTSCRIPT-based fonts, usually 2048 for \TRUETYPE\NC \NR +\NC \type{pfminfo} \NC table \NC (see \in{section}[fontloaderpfminfotable])\NC \NR +\LL +\stoptabulate + +Getting information through this function is (sometimes much) more efficient than +loading the font properly, and is therefore handy when you want to create a +dictionary of available fonts based on a directory contents. + +\stopsection + +\startsection[title={Loading an \OPENTYPE\ or \TRUETYPE\ file}][library=fontloader] + +\topicindex {\OPENTYPE} +\topicindex {\TRUETYPE} + +\libindex{open} +\libindex{close} +\libindex{to_table} + +If you want to use an \OPENTYPE\ font, you have to get the metric information +from somewhere. Using the \type {fontloader} library, the simplest way to get +that information is thus: + +\starttyping +function load_font (filename) + local metrics = nil + local font = fontloader.open(filename) + if font then + metrics = fontloader.to_table(font) + fontloader.close(font) + end + return metrics +end + +myfont = load_font('/opt/tex/texmf/fonts/data/arial.ttf') +\stoptyping + +The main function call is + +\startfunctioncall + f,
w = fontloader.open( filename) + f,
w = fontloader.open( filename, fontname) +\stopfunctioncall + +The first return value is a userdata representation of the font. The second +return value is a table containing any warnings and errors reported by fontloader +while opening the font. In normal typesetting, you would probably ignore the +second argument, but it can be useful for debugging purposes. + +For \TRUETYPE\ collections (when filename ends in 'ttc') and \DFONT\ collections, +you have to use a second string argument to specify which font you want from the +collection. Use the \type {fontname} strings that are returned by \type +{fontloader.info} for that. + +To turn the font into a table, \type {fontloader.to_table} is used on the font +returned by \type {fontloader.open}. + +\startfunctioncall +
f = fontloader.to_table( font) +\stopfunctioncall + +This table cannot be used directly by \LUATEX\ and should be turned into another +one as described in~\in {chapter} [fonts]. Do not forget to store the \type +{fontname} value in the \type {psname} field of the metrics table to be returned +to \LUATEX, otherwise the font inclusion backend will not be able to find the +correct font in the collection. + +See \in {section} [fontloadertables] for details on the userdata object returned +by \type {fontloader.open} and the layout of the \type {metrics} table returned +by \type {fontloader.to_table}. + +The font file is parsed and partially interpreted by the font loading routines +from \FONTFORGE. The file format can be \OPENTYPE, \TRUETYPE, \TRUETYPE\ +Collection, \CFF, or \TYPEONE. + +There are a few advantages to this approach compared to reading the actual font +file ourselves: + +\startitemize + +\startitem + The font is automatically re|-|encoded, so that the \type {metrics} table for + \TRUETYPE\ and \OPENTYPE\ fonts is using \UNICODE\ for the character indices. +\stopitem + +\startitem + Many features are pre|-|processed into a format that is easier to handle than + just the bare tables would be. +\stopitem + +\startitem + \POSTSCRIPT|-|based \OPENTYPE\ fonts do not store the character height and + depth in the font file, so the character boundingbox has to be calculated in + some way. +\stopitem + +\stopitemize + +A loaded font is discarded with: + +\startfunctioncall +fontloader.close( font) +\stopfunctioncall + +\stopsection + +\startsection[title={Applying a \quote{feature file}}][library=fontloader] + +\libindex{apply_featurefile} + +You can apply a \quote{feature file} to a loaded font: + +\startfunctioncall +
errors = fontloader.apply_featurefile( font, filename) +\stopfunctioncall + +A \quote {feature file} is a textual representation of the features in an +\OPENTYPE\ font. See + +\starttyping +http://www.adobe.com/devnet/opentype/afdko/topic_feature_file_syntax.html +\stoptyping + +and + +\starttyping +http://fontforge.sourceforge.net/featurefile.html +\stoptyping + +for a more detailed description of feature files. + +If the function fails, the return value is a table containing any errors reported +by fontloader while applying the feature file. On success, \type {nil} is +returned. + +\stopsection + +\startsection[title={Applying an \quote{\AFM\ file}}][library=fontloader] + +\topicindex {\TYPEONE} + +\libindex{apply_afmfile} + +You can apply an \quote {\AFM\ file} to a loaded font: + +\startfunctioncall +
errors = fontloader.apply_afmfile( font, filename) +\stopfunctioncall + +An \AFM\ file is a textual representation of (some of) the meta information +in a \TYPEONE\ font. See + +\starttyping +ftp://ftp.math.utah.edu/u/ma/hohn/linux/postscript/5004.AFM_Spec.pdf +\stoptyping + +for more information about \AFM\ files. + +Note: If you \type {fontloader.open} a \TYPEONE\ file named \type {font.pfb}, +the library will automatically search for and apply \type {font.afm} if it exists +in the same directory as the file \type {font.pfb}. In that case, there is no +need for an explicit call to \type {apply_afmfile()}. + +If the function fails, the return value is a table containing any errors reported +by fontloader while applying the AFM file. On success, \type {nil} is returned. + +\stopsection + +\startsection[title={Fontloader font tables},reference=fontloadertables][library=fontloader] + +\topicindex {fontloader+tables} + +\libindex{fields} + +As mentioned earlier, the return value of \type {fontloader.open} is a userdata +object. One way to have access to the actual metrics is to call \type +{fontloader.to_table} on this object, returning the table structure that is +explained in the following sections. In teh following sections we will not +explain each field in detail. Most fields are self descriptive and for the more +technical aspects you need to consult the relevant font references. + +It turns out that the result from \type {fontloader.to_table} sometimes needs +very large amounts of memory (depending on the font's complexity and size) so it +is possible to access the userdata object directly. + +\startitemize +\startitem + All top|-|level keys that would be returned by \type {to_table()} + can also be accessed directly. +\stopitem +\startitem + The top|-|level key \quote {glyphs} returns a {\it virtual\/} array that + allows indices from \type {f.glyphmin} to (\type {f.glyphmax}). +\stopitem +\startitem + The items in that virtual array (the actual glyphs) are themselves also + userdata objects, and each has accessors for all of the keys explained in the + section \quote {Glyph items} below. +\stopitem +\startitem + The top|-|level key \quote {subfonts} returns an {\it actual} array of userdata + objects, one for each of the subfonts (or nil, if there are no subfonts). +\stopitem +\stopitemize + +A short example may be helpful. This code generates a printout of all +the glyph names in the font \type {PunkNova.kern.otf}: + +\starttyping +local f = fontloader.open('PunkNova.kern.otf') +print (f.fontname) +local i = 0 +if f.glyphcnt > 0 then + for i=f.glyphmin,f.glyphmax do + local g = f.glyphs[i] + if g then + print(g.name) + end + i = i + 1 + end +end +fontloader.close(f) +\stoptyping + +In this case, the \LUATEX\ memory requirement stays below 100MB on the test +computer, while the internal structure generated by \type {to_table()} needs more +than 2GB of memory (the font itself is 6.9MB in disk size). + +Only the top|-|level font, the subfont table entries, and the glyphs are virtual +objects, everything else still produces normal \LUA\ values and tables. + +If you want to know the valid fields in a font or glyph structure, call the \type +{fields} function on an object of a particular type (either glyph or font): + +\startfunctioncall +
fields = fontloader.fields( font) +
fields = fontloader.fields( font_glyph) +\stopfunctioncall + +For instance: + +\startfunctioncall +local fields = fontloader.fields(f) +local fields = fontloader.fields(f.glyphs[0]) +\stopfunctioncall + +\stopsection + +\startsection[title={Table types}][library=fontloader] + +\startsubsection[title={The main table}] + +The top|-|level keys in the returned table are (the explanations in this part of +the documentation are not yet finished): + +\starttabulate[|l|l|p|] +\DB key \BC type \NC explanation \NC \NR +\TB +\NC \type{table_version} \NC number \NC indicates the metrics version (currently~0.3)\NC \NR +\NC \type{fontname} \NC string \NC \POSTSCRIPT\ font name\NC \NR +\NC \type{fullname} \NC string \NC official (human-oriented) font name\NC \NR +\NC \type{familyname} \NC string \NC family name\NC \NR +\NC \type{weight} \NC string \NC weight indicator\NC \NR +\NC \type{copyright} \NC string \NC copyright information\NC \NR +\NC \type{filename} \NC string \NC the file name\NC \NR +\NC \type{version} \NC string \NC font version\NC \NR +\NC \type{italicangle} \NC float \NC slant angle\NC \NR +\NC \type{units_per_em} \NC number \NC 1000 for \POSTSCRIPT-based fonts, usually 2048 for \TRUETYPE\NC \NR +\NC \type{ascent} \NC number \NC height of ascender in \type {units_per_em}\NC \NR +\NC \type{descent} \NC number \NC depth of descender in \type {units_per_em}\NC \NR +\NC \type{upos} \NC float \NC \NC \NR +\NC \type{uwidth} \NC float \NC \NC \NR +\NC \type{uniqueid} \NC number \NC \NC \NR +\NC \type{glyphs} \NC array \NC \NC \NR +\NC \type{glyphcnt} \NC number \NC number of included glyphs\NC \NR +\NC \type{glyphmax} \NC number \NC maximum used index the glyphs array\NC \NR +\NC \type{glyphmin} \NC number \NC minimum used index the glyphs array\NC \NR +\NC \type{notdef_loc} \NC number \NC location of the \type {.notdef} glyph + or \type {-1} when not present \NC \NR +\NC \type{hasvmetrics} \NC number \NC \NC \NR +\NC \type{onlybitmaps} \NC number \NC \NC \NR +\NC \type{serifcheck} \NC number \NC \NC \NR +\NC \type{isserif} \NC number \NC \NC \NR +\NC \type{issans} \NC number \NC \NC \NR +\NC \type{encodingchanged} \NC number \NC \NC \NR +\NC \type{strokedfont} \NC number \NC \NC \NR +\NC \type{use_typo_metrics} \NC number \NC \NC \NR +\NC \type{weight_width_slope_only} \NC number \NC \NC \NR +\NC \type{head_optimized_for_cleartype} \NC number \NC \NC \NR +\NC \type{uni_interp} \NC enum \NC \nod {unset}, \type {none}, \type {adobe}, + \type {greek}, \type {japanese}, \type {trad_chinese}, + \type {simp_chinese}, \type {korean}, \type {ams}\NC \NR +\NC \type{origname} \NC string \NC the file name, as supplied by the user\NC \NR +\NC \type{map} \NC table \NC \NC \NR +\NC \type{private} \NC table \NC \NC \NR +\NC \type{xuid} \NC string \NC \NC \NR +\NC \type{pfminfo} \NC table \NC \NC \NR +\NC \type{names} \NC table \NC \NC \NR +\NC \type{cidinfo} \NC table \NC \NC \NR +\NC \type{subfonts} \NC array \NC \NC \NR +\NC \type{commments} \NC string \NC \NC \NR +\NC \type{fontlog} \NC string \NC \NC \NR +\NC \type{cvt_names} \NC string \NC \NC \NR +\NC \type{anchor_classes} \NC table \NC \NC \NR +\NC \type{ttf_tables} \NC table \NC \NC \NR +\NC \type{ttf_tab_saved} \NC table \NC \NC \NR +\NC \type{kerns} \NC table \NC \NC \NR +\NC \type{vkerns} \NC table \NC \NC \NR +\NC \type{texdata} \NC table \NC \NC \NR +\NC \type{lookups} \NC table \NC \NC \NR +\NC \type{gpos} \NC table \NC \NC \NR +\NC \type{gsub} \NC table \NC \NC \NR +\NC \type{mm} \NC table \NC \NC \NR +\NC \type{chosenname} \NC string \NC \NC \NR +\NC \type{macstyle} \NC number \NC \NC \NR +\NC \type{fondname} \NC string \NC \NC \NR +%NC \type{design_size} \NC number \NC \NC \NR +\NC \type{fontstyle_id} \NC number \NC \NC \NR +\NC \type{fontstyle_name} \NC table \NC \NC \NR +%NC \type{design_range_bottom} \NC number \NC \NC \NR +%NC \type{design_range_top} \NC number \NC \NC \NR +\NC \type{strokewidth} \NC float \NC \NC \NR +\NC \type{mark_classes} \NC table \NC \NC \NR +\NC \type{creationtime} \NC number \NC \NC \NR +\NC \type{modificationtime} \NC number \NC \NC \NR +\NC \type{os2_version} \NC number \NC \NC \NR +\NC \type{math} \NC table \NC \NC \NR +\NC \type{validation_state} \NC table \NC \NC \NR +\NC \type{horiz_base} \NC table \NC \NC \NR +\NC \type{vert_base} \NC table \NC \NC \NR +\NC \type{extrema_bound} \NC number \NC \NC \NR +\NC \type{truetype} \NC boolean \NC signals a \TRUETYPE\ font \NC \NR +\LL +\stoptabulate + +\stopsubsection + +\startsubsection[title={\type {glyphs}}] + +The \type {glyphs} is an array containing the per|-|character +information (quite a few of these are only present if non|-|zero). + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{name} \NC string \NC the glyph name \NC \NR +\NC \type{unicode} \NC number \NC unicode code point, or -1 \NC \NR +\NC \type{boundingbox} \NC array \NC array of four numbers, see note below \NC \NR +\NC \type{width} \NC number \NC only for horizontal fonts \NC \NR +\NC \type{vwidth} \NC number \NC only for vertical fonts \NC \NR +\NC \type{tsidebearing} \NC number \NC only for vertical ttf/otf fonts, and only if non|-|zero \NC \NR +\NC \type{lsidebearing} \NC number \NC only if non|-|zero and not equal to boundingbox[1] \NC \NR +\NC \type{class} \NC string \NC one of "none", "base", "ligature", "mark", "component" + (if not present, the glyph class is \quote {automatic}) \NC \NR +\NC \type{kerns} \NC array \NC only for horizontal fonts, if set \NC \NR +\NC \type{vkerns} \NC array \NC only for vertical fonts, if set \NC \NR +\NC \type{dependents} \NC array \NC linear array of glyph name strings, only if nonempty\NC \NR +\NC \type{lookups} \NC table \NC only if nonempty \NC \NR +\NC \type{ligatures} \NC table \NC only if nonempty \NC \NR +\NC \type{anchors} \NC table \NC only if set \NC \NR +\NC \type{comment} \NC string \NC only if set \NC \NR +\NC \type{tex_height} \NC number \NC only if set \NC \NR +\NC \type{tex_depth} \NC number \NC only if set \NC \NR +\NC \type{italic_correction} \NC number \NC only if set \NC \NR +\NC \type{top_accent} \NC number \NC only if set \NC \NR +\NC \type{is_extended_shape} \NC number \NC only if this character is part of a math extension list \NC \NR +\NC \type{altuni} \NC table \NC alternate \UNICODE\ items \NC \NR +\NC \type{vert_variants} \NC table \NC \NC \NR +\NC \type{horiz_variants} \NC table \NC \NC \NR +\NC \type{mathkern} \NC table \NC \NC \NR +\LL +\stoptabulate + +On \type {boundingbox}: The boundingbox information for \TRUETYPE\ fonts and +\TRUETYPE-based \OTF\ fonts is read directly from the font file. +\POSTSCRIPT-based fonts do not have this information, so the boundingbox of +traditional \POSTSCRIPT\ fonts is generated by interpreting the actual bezier +curves to find the exact boundingbox. This can be a slow process, so the +boundingboxes of \POSTSCRIPT-based \OTF\ fonts (and raw \CFF\ fonts) are +calculated using an approximation of the glyph shape based on the actual glyph +points only, instead of taking the whole curve into account. This means that +glyphs that have missing points at extrema will have a too|-|tight boundingbox, +but the processing is so much faster that in our opinion the tradeoff is worth +it. + +The \type {kerns} and \type {vkerns} are linear arrays of small hashes: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{char} \NC string \NC \NC \NR +\NC \type{off} \NC number \NC \NC \NR +\NC \type{lookup} \NC string \NC \NC \NR +\LL +\stoptabulate + +The \type {lookups} is a hash, based on lookup subtable names, with +the value of each key inside that a linear array of small hashes: + +% TODO: fix this description + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{type} \NC enum \NC \type {position}, \type {pair}, \type + {substitution}, \type {alternate}, \type + {multiple}, \type {ligature}, \type + {lcaret}, \cbk {kerning}, \type {vkerning}, + \type {anchors}, \type {contextpos}, \type + {contextsub}, \type {chainpos}, \type + {chainsub}, \type {reversesub}, \type + {max}, \type {kernback}, \type {vkernback} + \NC \NR +\NC \type{specification} \NC table \NC extra data \NC \NR +\LL +\stoptabulate + +For the first seven values of \type {type}, there can be additional +sub|-|information, stored in the sub-table \type {specification}: + +\starttabulate[|l|l|p|] +\DB value \BC type \BC explanation \NC \NR +\TB +\NC \type{position} \NC table \NC a table of the \type {offset_specs} type \NC \NR +\NC \type{pair} \NC table \NC one string: \type {paired}, and an array of one + or two \type {offset_specs} tables: \type {offsets} \NC \NR +\NC \type{substitution} \NC table \NC one string: \type {variant} \NC \NR +\NC \type{alternate} \NC table \NC one string: \type {components} \NC \NR +\NC \type{multiple} \NC table \NC one string: \type {components} \NC \NR +\NC \type{ligature} \NC table \NC two strings: \type {components}, \type {char} \NC \NR +\NC \type{lcaret} \NC array \NC linear array of numbers \NC \NR +\LL +\stoptabulate + +Tables for \type {offset_specs} contain up to four number|-|valued fields: \type +{x} (a horizontal offset), \type {y} (a vertical offset), \type {h} (an advance +width correction) and \type {v} (an advance height correction). + +The \type {ligatures} is a linear array of small hashes: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{lig} \NC table \NC uses the same substructure as a single item in + the \type {lookups} table explained above \NC \NR +\NC \type{char} \NC string \NC \NC \NR +\NC \type{components} \NC array \NC linear array of named components \NC \NR +\NC \type{ccnt} \NC number \NC \NC \NR +\LL +\stoptabulate + +The \type {anchor} table is indexed by a string signifying the anchor type, which +is one of: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{mark} \NC table \NC placement mark \NC \NR +\NC \type{basechar} \NC table \NC mark for attaching combining items to a base char \NC \NR +\NC \type{baselig} \NC table \NC mark for attaching combining items to a ligature \NC \NR +\NC \type{basemark} \NC table \NC generic mark for attaching combining items to connect to \NC \NR +\NC \type{centry} \NC table \NC cursive entry point \NC \NR +\NC \type{cexit} \NC table \NC cursive exit point \NC \NR +\LL +\stoptabulate + +The content of these is a short array of defined anchors, with the +entry keys being the anchor names. For all except \type {baselig}, the +value is a single table with this definition: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{x} \NC number \NC x location \NC \NR +\NC \type{y} \NC number \NC y location \NC \NR +\NC \type{ttf_pt_index} \NC number \NC truetype point index, only if given \NC \NR +\LL +\stoptabulate + +For \type {baselig}, the value is a small array of such anchor sets sets, one for +each constituent item of the ligature. + +For clarification, an anchor table could for example look like this : + +\starttyping +['anchor'] = { + ['basemark'] = { + ['Anchor-7'] = { ['x']=170, ['y']=1080 } + }, + ['mark'] ={ + ['Anchor-1'] = { ['x']=160, ['y']=810 }, + ['Anchor-4'] = { ['x']=160, ['y']=800 } + }, + ['baselig'] = { + [1] = { ['Anchor-2'] = { ['x']=160, ['y']=650 } }, + [2] = { ['Anchor-2'] = { ['x']=460, ['y']=640 } } + } + } +\stoptyping + +Note: The \type {baselig} table can be sparse! + +\stopsubsection + +\startsubsection[title={\type {map}}] + +The top|-|level map is a list of encoding mappings. Each of those is a table +itself. + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{enccount} \NC number \NC \NC \NR +\NC \type{encmax} \NC number \NC \NC \NR +\NC \type{backmax} \NC number \NC \NC \NR +\NC \type{remap} \NC table \NC \NC \NR +\NC \type{map} \NC array \NC non|-|linear array of mappings\NC \NR +\NC \type{backmap} \NC array \NC non|-|linear array of backward mappings\NC \NR +\NC \type{enc} \NC table \NC \NC \NR +\LL +\stoptabulate + +The \type {remap} table is very small: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{firstenc} \NC number \NC \NC \NR +\NC \type{lastenc} \NC number \NC \NC \NR +\NC \type{infont} \NC number \NC \NC \NR +\LL +\stoptabulate + +The \type {enc} table is a bit more verbose: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{enc_name} \NC string \NC \NC \NR +\NC \type{char_cnt} \NC number \NC \NC \NR +\NC \type{char_max} \NC number \NC \NC \NR +\NC \type{unicode} \NC array \NC of \UNICODE\ position numbers\NC \NR +\NC \type{psnames} \NC array \NC of \POSTSCRIPT\ glyph names\NC \NR +\NC \type{builtin} \NC number \NC \NC \NR +\NC \type{hidden} \NC number \NC \NC \NR +\NC \type{only_1byte} \NC number \NC \NC \NR +\NC \type{has_1byte} \NC number \NC \NC \NR +\NC \type{has_2byte} \NC number \NC \NC \NR +\NC \type{is_unicodebmp} \NC number \NC only if non|-|zero\NC \NR +\NC \type{is_unicodefull} \NC number \NC only if non|-|zero\NC \NR +\NC \type{is_custom} \NC number \NC only if non|-|zero\NC \NR +\NC \type{is_original} \NC number \NC only if non|-|zero\NC \NR +\NC \type{is_compact} \NC number \NC only if non|-|zero\NC \NR +\NC \type{is_japanese} \NC number \NC only if non|-|zero\NC \NR +\NC \type{is_korean} \NC number \NC only if non|-|zero\NC \NR +\NC \type{is_tradchinese} \NC number \NC only if non|-|zero [name?]\NC \NR +\NC \type{is_simplechinese} \NC number \NC only if non|-|zero\NC \NR +\NC \type{low_page} \NC number \NC \NC \NR +\NC \type{high_page} \NC number \NC \NC \NR +\NC \type{iconv_name} \NC string \NC \NC \NR +\NC \type{iso_2022_escape} \NC string \NC \NC \NR +\LL +\stoptabulate + +\stopsubsection + +\startsubsection[title={\type {private}}] + +This is the font's private \POSTSCRIPT\ dictionary, if any. Keys and values are +both strings. + +\stopsubsection + +\startsubsection[title={\type {cidinfo}}] + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{registry} \NC string \NC \NC \NR +\NC \type{ordering} \NC string \NC \NC \NR +\NC \type{supplement} \NC number \NC \NC \NR +\NC \type{version} \NC number \NC \NC \NR +\LL +\stoptabulate + +\stopsubsection + +\startsubsection[reference=fontloaderpfminfotable,title={\type {pfminfo}}] + +The \type {pfminfo} table contains most of the OS/2 information: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{pfmset} \NC number \NC \NC \NR +\NC \type{winascent_add} \NC number \NC \NC \NR +\NC \type{windescent_add} \NC number \NC \NC \NR +\NC \type{hheadascent_add} \NC number \NC \NC \NR +\NC \type{hheaddescent_add} \NC number \NC \NC \NR +\NC \type{typoascent_add} \NC number \NC \NC \NR +\NC \type{typodescent_add} \NC number \NC \NC \NR +\NC \type{subsuper_set} \NC number \NC \NC \NR +\NC \type{panose_set} \NC number \NC \NC \NR +\NC \type{hheadset} \NC number \NC \NC \NR +\NC \type{vheadset} \NC number \NC \NC \NR +\NC \type{pfmfamily} \NC number \NC \NC \NR +\NC \type{weight} \NC number \NC \NC \NR +\NC \type{width} \NC number \NC \NC \NR +\NC \type{avgwidth} \NC number \NC \NC \NR +\NC \type{firstchar} \NC number \NC \NC \NR +\NC \type{lastchar} \NC number \NC \NC \NR +\NC \type{fstype} \NC number \NC \NC \NR +\NC \type{linegap} \NC number \NC \NC \NR +\NC \type{vlinegap} \NC number \NC \NC \NR +\NC \type{hhead_ascent} \NC number \NC \NC \NR +\NC \type{hhead_descent} \NC number \NC \NC \NR +\NC \type{os2_typoascent} \NC number \NC \NC \NR +\NC \type{os2_typodescent} \NC number \NC \NC \NR +\NC \type{os2_typolinegap} \NC number \NC \NC \NR +\NC \type{os2_winascent} \NC number \NC \NC \NR +\NC \type{os2_windescent} \NC number \NC \NC \NR +\NC \type{os2_subxsize} \NC number \NC \NC \NR +\NC \type{os2_subysize} \NC number \NC \NC \NR +\NC \type{os2_subxoff} \NC number \NC \NC \NR +\NC \type{os2_subyoff} \NC number \NC \NC \NR +\NC \type{os2_supxsize} \NC number \NC \NC \NR +\NC \type{os2_supysize} \NC number \NC \NC \NR +\NC \type{os2_supxoff} \NC number \NC \NC \NR +\NC \type{os2_supyoff} \NC number \NC \NC \NR +\NC \type{os2_strikeysize} \NC number \NC \NC \NR +\NC \type{os2_strikeypos} \NC number \NC \NC \NR +\NC \type{os2_family_class} \NC number \NC \NC \NR +\NC \type{os2_xheight} \NC number \NC \NC \NR +\NC \type{os2_capheight} \NC number \NC \NC \NR +\NC \type{os2_defaultchar} \NC number \NC \NC \NR +\NC \type{os2_breakchar} \NC number \NC \NC \NR +\NC \type{os2_vendor} \NC string \NC \NC \NR +\NC \type{codepages} \NC table \NC A two-number array of encoded code pages \NC \NR +\NC \type{unicoderages} \NC table \NC A four-number array of encoded unicode ranges \NC \NR +\NC \type{panose} \NC table \NC \NC \NR +\LL +\stoptabulate + +The \type {panose} subtable has exactly 10 string keys: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{familytype} \NC string \NC Values as in the \OPENTYPE\ font + specification: \type {Any}, \type {No Fit}, + \type {Text and Display}, \type {Script}, + \type {Decorative}, \type {Pictorial} \NC + \NR +\NC \type{serifstyle} \NC string \NC See the \OPENTYPE\ font specification for + values \NC \NR +\NC \type{weight} \NC string \NC idem \NC \NR +\NC \type{proportion} \NC string \NC idem \NC \NR +\NC \type{contrast} \NC string \NC idem \NC \NR +\NC \type{strokevariation} \NC string \NC idem \NC \NR +\NC \type{armstyle} \NC string \NC idem \NC \NR +\NC \type{letterform} \NC string \NC idem \NC \NR +\NC \type{midline} \NC string \NC idem \NC \NR +\NC \type{xheight} \NC string \NC idem \NC \NR +\LL +\stoptabulate + +\stopsubsection + +\startsubsection[reference=fontloadernamestable,title={\type {names}}] + +Each item has two top|-|level keys: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{lang} \NC string \NC language for this entry \NC \NR +\NC \type{names} \NC table \NC \NC \NR +\LL +\stoptabulate + +The \type {names} keys are the actual \TRUETYPE\ name strings. The possible keys +are: \type {copyright}, \type {family}, \type {subfamily}, \type {uniqueid}, +\type {fullname}, \type {version}, \type {postscriptname}, \type {trademark}, +\type {manufacturer}, \type {designer}, \type {descriptor}, \type {venderurl}, +\type {designerurl}, \type {license}, \type {licenseurl}, \type {idontknow}, +\type {preffamilyname}, \type {prefmodifiers}, \type {compatfull}, \type +{sampletext}, \type {cidfindfontname}, \type {wwsfamily} and \type +{wwssubfamily}. + +\stopsubsection + +\startsubsection[title={\type {anchor_classes}}] + +The anchor_classes classes: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{name} \NC string \NC a descriptive id of this anchor class\NC \NR +\NC \type{lookup} \NC string \NC \NC \NR +\NC \type{type} \NC string \NC one of \nod {mark}, \type {mkmk}, \type {curs}, \type {mklg} \NC \NR +\LL +\stoptabulate + +% type is actually a lookup subtype, not a feature name. Officially, these +% strings should be gpos_mark2mark etc. + +\stopsubsection + +\startsubsection[title={\type {gpos}}] + +The \type {gpos} table has one array entry for each lookup. (The \type {gpos_} +prefix is somewhat redundant.) + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{type} \NC string \NC one of \type {gpos_single}, \type {gpos_pair}, + \type {gpos_cursive}, \type {gpos_mark2base},\crlf + \type {gpos_mark2ligature}, \type {gpos_mark2mark}, \type {gpos_context},\crlf \type {gpos_contextchain} \NC \NR +\NC \type{flags} \NC table \NC \NC \NR +\NC \type{name} \NC string \NC \NC \NR +\NC \type{features} \NC array \NC \NC \NR +\NC \type{subtables} \NC array \NC \NC \NR +\LL +\stoptabulate + +The flags table has a true value for each of the lookup flags that is actually +set: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{r2l} \NC boolean \NC \NC \NR +\NC \type{ignorebaseglyphs} \NC boolean \NC \NC \NR +\NC \type{ignoreligatures} \NC boolean \NC \NC \NR +\NC \type{ignorecombiningmarks} \NC boolean \NC \NC \NR +\NC \type{mark_class} \NC string \NC \NC \NR +\LL +\stoptabulate + +The features subtable items of gpos have: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{tag} \NC string \NC \NC \NR +\NC \type{scripts} \NC table \NC \NC \NR +\LL +\stoptabulate + +The scripts table within features has: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{script} \NC string \NC \NC \NR +\NC \type{langs} \NC array of strings \NC \NC \NR +\LL +\stoptabulate + +The subtables table has: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{name} \NC string \NC \NC \NR +\NC \type{suffix} \NC string \NC (only if used)\NC \NR % used by gpos_single to get a default +\NC \type{anchor_classes} \NC number \NC (only if used)\NC \NR +\NC \type{vertical_kerning} \NC number \NC (only if used)\NC \NR +\NC \type{kernclass} \NC table \NC (only if used)\NC \NR +\LL +\stoptabulate + +The kernclass with subtables table has: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{firsts} \NC array of strings \NC \NC \NR +\NC \type{seconds} \NC array of strings \NC \NC \NR +\NC \type{lookup} \NC string or array \NC associated lookup(s) \NC \NR +\NC \type{offsets} \NC array of numbers \NC \NC \NR +\LL +\stoptabulate + +Note: the kernclass (as far as we can see) always has one entry so it could be one level +deep instead. Also the seconds start at \type {[2]} which is close to the fontforge +internals so we keep that too. + +\stopsubsection + +\startsubsection[title={\type {gsub}}] + +This has identical layout to the \type {gpos} table, except for the +type: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{type} \NC string \NC one of \type {gsub_single}, \type {gsub_multiple}, + \type {gsub_alternate}, \type {gsub_ligature},\crlf + \type {gsub_context}, \type {gsub_contextchain}, + \type {gsub_reversecontextchain} \NC \NR +\LL +\stoptabulate + +\stopsubsection + +\startsubsection[title={\type {ttf_tables} and \type {ttf_tab_saved}}] + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{tag} \NC string \NC \NC \NR +\NC \type{len} \NC number \NC \NC \NR +\NC \type{maxlen} \NC number \NC \NC \NR +\NC \type{data} \NC number \NC \NC \NR +\LL +\stoptabulate + +\stopsubsection + +\startsubsection[title={\type {mm}}] + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{axes} \NC table \NC array of axis names \NC \NR +\NC \type{instance_count} \NC number \NC \NC \NR +\NC \type{positions} \NC table \NC array of instance positions + (\#axes * instances )\NC \NR +\NC \type{defweights} \NC table \NC array of default weights for instances \NC \NR +\NC \type{cdv} \NC string \NC \NC \NR +\NC \type{ndv} \NC string \NC \NC \NR +\NC \type{axismaps} \NC table \NC \NC \NR +\LL +\stoptabulate + +The \type {axismaps}: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{blends} \NC table \NC an array of blend points \NC \NR +\NC \type{designs} \NC table \NC an array of design values \NC \NR +\NC \type{min} \NC number \NC \NC \NR +\NC \type{def} \NC number \NC \NC \NR +\NC \type{max} \NC number \NC \NC \NR +\LL +\stoptabulate + +\stopsubsection + +\startsubsection[title={\type {mark_classes}}] + +The keys in this table are mark class names, and the values are a +space|-|separated string of glyph names in this class. + +\stopsubsection + +\startsubsection[title={\type {math}}] + +The math table has the variables that are also discussed in the chapter aboout +math: \type {ScriptPercentScaleDown}, \type {ScriptScriptPercentScaleDown}, \type +{DelimitedSubFormulaMinHeight}, \type {DisplayOperatorMinHeight}, \type +{MathLeading}, \type {AxisHeight}, \type {AccentBaseHeight}, \type +{FlattenedAccentBaseHeight}, \type {SubscriptShiftDown}, \type {SubscriptTopMax}, +\type {SubscriptBaselineDropMin}, \type {SuperscriptShiftUp}, \type +{SuperscriptShiftUpCramped}, \type {SuperscriptBottomMin}, \type +{SuperscriptBaselineDropMax}, \type {SubSuperscriptGapMin}, \type +{SuperscriptBottomMaxWithSubscript}, \type {SpaceAfterScript}, \type +{UpperLimitGapMin}, \type {UpperLimitBaselineRiseMin}, \type {LowerLimitGapMin}, +\type {LowerLimitBaselineDropMin}, \type {StackTopShiftUp}, \type +{StackTopDisplayStyleShiftUp}, \type {StackBottomShiftDown}, \type +{StackBottomDisplayStyleShiftDown}, \type {StackGapMin}, \type +{StackDisplayStyleGapMin}, \type {StretchStackTopShiftUp}, \type +{StretchStackBottomShiftDown}, \type {StretchStackGapAboveMin}, \type +{StretchStackGapBelowMin}, \type {FractionNumeratorShiftUp}, \type +{FractionNumeratorDisplayStyleShiftUp}, \type {FractionDenominatorShiftDown}, +\type {FractionDenominatorDisplayStyleShiftDown}, \type +{FractionNumeratorGapMin}, \type {FractionNumeratorDisplayStyleGapMin} \type +{FractionRuleThickness}, \type {FractionDenominatorGapMin}, \type +{FractionDenominatorDisplayStyleGapMin}, \type {SkewedFractionHorizontalGap}, +\type {SkewedFractionVerticalGap}, \type {OverbarVerticalGap}, \type +{OverbarRuleThickness}, \type {OverbarExtraAscender}, \type +{UnderbarVerticalGap}, \type {UnderbarRuleThickness}, \type +{UnderbarExtraDescender}, \type {RadicalVerticalGap}, \type +{RadicalDisplayStyleVerticalGap}, \type {RadicalRuleThickness}, \type +{RadicalExtraAscender}, \type {RadicalKernBeforeDegree}, \type +{RadicalKernAfterDegree}, \type {RadicalDegreeBottomRaisePercent}, \type +{MinConnectorOverlap}, \type {FractionDelimiterSize} and \type +{FractionDelimiterDisplayStyleSize}. + +\stopsubsection + +\startsubsection[title={\type {validation_state}}] + +This is just a bonus table with keys: \type {bad_ps_fontname}, \type {bad_glyph_table}, \type {bad_cff_table}, \type {bad_metrics_table}, \type {bad_cmap_table}, \type {bad_bitmaps_table}, \type {bad_gx_table}, \type {bad_ot_table}, \type {bad_os2_version} and \type {bad_sfnt_header}. + +\stopsubsection + +\startsubsection[title={\type {horiz_base} and \type {vert_base}}] + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{tags} \NC table \NC an array of script list tags\NC \NR +\NC \type{scripts} \NC table \NC \NC \NR +\LL +\stoptabulate + +The \type {scripts} subtable: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{baseline} \NC table \NC \NC \NR +\NC \type{default_baseline} \NC number \NC \NC \NR +\NC \type{lang} \NC table \NC \NC \NR +\LL +\stoptabulate + + +The \type {lang} subtable: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{tag} \NC string \NC a script tag \NC \NR +\NC \type{ascent} \NC number \NC \NC \NR +\NC \type{descent} \NC number \NC \NC \NR +\NC \type{features} \NC table \NC \NC \NR +\LL +\stoptabulate + +The \type {features} points to an array of tables with the same layout except +that in those nested tables, the tag represents a language. + +\stopsubsection + +\startsubsection[title={\type {altuni}}] + +An array of alternate \UNICODE\ values. Inside that array are hashes with: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{unicode} \NC number \NC this glyph is also used for this unicode \NC \NR +\NC \type{variant} \NC number \NC the alternative is driven by this unicode selector \NC \NR +\LL +\stoptabulate + +\stopsubsection + +\startsubsection[title={\type {vert_variants} and \type {horiz_variants}}] + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{variants} \NC string \NC \NC \NR +\NC \type{italic_correction} \NC number \NC \NC \NR +\NC \type{parts} \NC table \NC \NC \NR +\LL +\stoptabulate + +The \type {parts} table is an array of smaller tables: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{component} \NC string \NC \NC \NR +\NC \type{extender} \NC number \NC \NC \NR +\NC \type{start} \NC number \NC \NC \NR +\NC \type{end} \NC number \NC \NC \NR +\NC \type{advance} \NC number \NC \NC \NR +\LL +\stoptabulate + +\stopsubsection + +\startsubsection[title={\type {mathkern}}] + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{top_right} \NC table \NC \NC \NR +\NC \type{bottom_right} \NC table \NC \NC \NR +\NC \type{top_left} \NC table \NC \NC \NR +\NC \type{bottom_left} \NC table \NC \NC \NR +\LL +\stoptabulate + +Each of the subtables is an array of small hashes with two keys: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{height} \NC number \NC \NC \NR +\NC \type{kern} \NC number \NC \NC \NR +\LL +\stoptabulate + +\stopsubsection + +\startsubsection[title={\type {kerns}}] + +Substructure is identical to the per|-|glyph subtable. + +\stopsubsection + +\startsubsection[title={\type {vkerns}}] + +Substructure is identical to the per|-|glyph subtable. + +\stopsubsection + +\startsubsection[title={\type {texdata}}] + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{type} \NC string \NC \nod {unset}, \type {text}, \nod {math}, \type {mathext} \NC \NR +\NC \type{params} \NC array \NC 22 font numeric parameters \NC \NR +\LL +\stoptabulate + +\stopsubsection + +\startsubsection[title={\type {lookups}}] + +Top|-|level \type {lookups} is quite different from the ones at character level. +The keys in this hash are strings, the values the actual lookups, represented as +dictionary tables. + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{type} \NC string \NC \NC \NR +\NC \type{format} \NC enum \NC one of \type {glyphs}, \type {class}, \type {coverage}, + \type {reversecoverage} \NC \NR +\NC \type{tag} \NC string \NC \NC \NR +\NC \type{current_class} \NC array \NC \NC \NR +\NC \type{before_class} \NC array \NC \NC \NR +\NC \type{after_class} \NC array \NC \NC \NR +\NC \type{rules} \NC array \NC an array of rule items\NC \NR +\LL +\stoptabulate + +Rule items have one common item and one specialized item: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{lookups} \NC array \NC a linear array of lookup names \NC \NR +\NC \type{glyphs} \NC array \NC only if the parent's format is \type {glyphs} \NC \NR +\NC \type{class} \NC array \NC only if the parent's format is \type {class} \NC \NR +\NC \type{coverage} \NC array \NC only if the parent's format is \type {coverage} \NC \NR +\NC \type{reversecoverage} \NC array \NC only if the parent's format is \type {reversecoverage} \NC \NR +\LL +\stoptabulate + +A glyph table is: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{names} \NC string \NC \NC \NR +\NC \type{back} \NC string \NC \NC \NR +\NC \type{fore} \NC string \NC \NC \NR +\LL +\stoptabulate + +A class table is: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{current} \NC array \NC of numbers \NC \NR +\NC \type{before} \NC array \NC of numbers \NC \NR +\NC \type{after} \NC array \NC of numbers \NC \NR +\LL +\stoptabulate + +for coverage: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{current} \NC array \NC of strings \NC \NR +\NC \type{before} \NC array \NC of strings \NC \NR +\NC \type{after} \NC array \NC of strings \NC \NR +\LL +\stoptabulate + +and for reverse coverage: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{current} \NC array \NC of strings \NC \NR +\NC \type{before} \NC array \NC of strings \NC \NR +\NC \type{after} \NC array \NC of strings \NC \NR +\NC \type{replacements} \NC string \NC \NC \NR +\LL +\stoptabulate + +\stopsubsection + +\stopsection + +\stopchapter + +\stopcomponent diff --git a/manual/luatex-fonts.tex b/manual/luatex-fonts.tex index 0e1cc8cc5..d49c63afe 100644 --- a/manual/luatex-fonts.tex +++ b/manual/luatex-fonts.tex @@ -1,858 +1,858 @@ -% language=uk - -\environment luatex-style - -\startcomponent luatex-fonts - -\startchapter[reference=fonts,title={Font structure}] - -\startsection[title={The font tables}] - -\topicindex {fonts} -\topicindex {fonts+tables} - -All \TEX\ fonts are represented to \LUA\ code as tables, and internally as -\CCODE~structures. All keys in the table below are saved in the internal font -structure if they are present in the table returned by the \cbk {define_font} -callback, or if they result from the normal \TFM|/|\VF\ reading routines if there -is no \cbk {define_font} callback defined. - -The column \quote {\VF} means that this key will be created by the \type -{font.read_vf()} routine, \quote {\TFM} means that the key will be created by the -\type {font.read_tfm()} routine, and \quote {used} means whether or not the -\LUATEX\ engine itself will do something with the key. The top|-|level keys in -the table are as follows: - -\starttabulate[|l|c|c|c|l|pl|] -\DB key \BC vf \BC tfm \BC used \BC value type \BC description \NC \NR -\TB -\NC \type{name} \NC yes \NC yes \NC yes \NC string \NC metric (file) name \NC \NR -\NC \type{area} \NC no \NC yes \NC yes \NC string \NC (directory) location, typically empty \NC \NR -\NC \type{used} \NC no \NC yes \NC yes \NC boolean \NC indicates usage (initial: false) \NC \NR -\NC \type{characters} \NC yes \NC yes \NC yes \NC table \NC the defined glyphs of this font \NC \NR -\NC \type{checksum} \NC yes \NC yes \NC no \NC number \NC default: 0 \NC \NR -\NC \type{designsize} \NC no \NC yes \NC yes \NC number \NC expected size (default: 655360 == 10pt) \NC \NR -\NC \type{direction} \NC no \NC yes \NC yes \NC number \NC default: 0 \NC \NR -\NC \type{encodingbytes} \NC no \NC no \NC yes \NC number \NC default: depends on \type {format} \NC \NR -\NC \type{encodingname} \NC no \NC no \NC yes \NC string \NC encoding name \NC \NR -\NC \type{fonts} \NC yes \NC no \NC yes \NC table \NC locally used fonts \NC \NR -\NC \type{psname} \NC no \NC no \NC yes \NC string \NC This is the \POSTSCRIPT\ fontname in the incoming font - source, and it's used as fontname identifier in the \PDF\ - output. This has to be a valid string, e.g.\ no spaces - and such, as the backend will not do a cleanup. This gives - complete control to the loader. \NC \NR -\NC \type{fullname} \NC no \NC no \NC yes \NC string \NC output font name, used as a fallback in the \PDF\ output - if the \type {psname} is not set \NC \NR -\NC \type{header} \NC yes \NC no \NC no \NC string \NC header comments, if any \NC \NR -\NC \type{hyphenchar} \NC no \NC no \NC yes \NC number \NC default: \TEX's \prm {hyphenchar} \NC \NR -\NC \type{parameters} \NC no \NC yes \NC yes \NC hash \NC default: 7 parameters, all zero \NC \NR -\NC \type{size} \NC no \NC yes \NC yes \NC number \NC the required scaling (by default the same as designsize) \NC \NR -\NC \type{skewchar} \NC no \NC no \NC yes \NC number \NC default: \TEX's \prm {skewchar} \NC \NR -\NC \type{type} \NC yes \NC no \NC yes \NC string \NC basic type of this font \NC \NR -\NC \type{format} \NC no \NC no \NC yes \NC string \NC disk format type \NC \NR -\NC \type{embedding} \NC no \NC no \NC yes \NC string \NC \PDF\ inclusion \NC \NR -\NC \type{filename} \NC no \NC no \NC yes \NC string \NC the name of the font on disk \NC \NR -\NC \type{tounicode} \NC no \NC yes \NC yes \NC number \NC When this is set to~1 \LUATEX\ assumes per|-|glyph - tounicode entries are present in the font. \NC \NR -\NC \type{stretch} \NC no \NC no \NC yes \NC number \NC the \quote {stretch} value from \lpr {expandglyphsinfont} \NC \NR -\NC \type{shrink} \NC no \NC no \NC yes \NC number \NC the \quote {shrink} value from \lpr {expandglyphsinfont} \NC \NR -\NC \type{step} \NC no \NC no \NC yes \NC number \NC the \quote {step} value from \lpr {expandglyphsinfont} \NC \NR -\NC \type{expansion_factor} \NC no \NC no \NC no \NC number \NC the actual expansion factor of an expanded font \NC \NR -\NC \type{attributes} \NC no \NC no \NC yes \NC string \NC the \orm {pdffontattr} \NC \NR -\NC \type{cache} \NC no \NC no \NC yes \NC string \NC This key controls caching of the \LUA\ table on the - \TEX\ end where \type {yes} means: use a reference to - the table that is passed to \LUATEX\ (this is the - default), and \type {no} means: don't store the - table reference, don't cache any \LUA\ data for this - font while \type {renew} means: don't store the table - reference, but save a reference to the table that is - created at the first access to one of its fields in the - font. \NC \NR -\NC \type{nomath} \NC no \NC no \NC yes \NC boolean \NC This key allows a minor speedup for text fonts. If it - is present and true, then \LUATEX\ will not check the - character entries for math|-|specific keys. \NC \NR -\NC \type{oldmath} \NC no \NC no \NC yes \NC boolean \NC This key flags a font as representing an old school \TEX\ - math font and disables the \OPENTYPE\ code path. \NC \NR -\NC \type{slant} \NC no \NC no \NC yes \NC number \NC This parameter will tilt the font and - does the same as \type {SlantFont} in the map file for - \TYPEONE\ fonts. \NC \NR -\NC \type{extend} \NC no \NC no \NC yes \NC number \NC This parameter will scale the font horizontally and - does the same as \type {ExtendFont} in the map file for - \TYPEONE\ fonts. \NC \NR -\NC \type{squeeze} \NC no \NC no \NC yes \NC number \NC This parameter will scale the font vertically and has - no equivalent in the map file. \NC \NR -\NC \type{width} \NC no \NC no \NC yes \NC number \NC The backend will inject \PDF\ operators that set the - penwidth. The value is (as usual in \TEX) divided by 1000. - It works with the \type {mode} file. \NC \NR -\NC \type{mode} \NC no \NC no \NC yes \NC number \NC The backend will inject \PDF\ operators that relate to the - drawing mode with 0~being a fill, 1~being an outline, - 2~both draw and fill and 3~no painting at all. \NC \NR -\LL -\stoptabulate - -The saved reference in the \type {cache} option is thread|-|local, so be careful -when you are using coroutines: an error will be thrown if the table has been -cached in one thread, but you reference it from another thread. - -The key \type {name} is always required. The keys \type {stretch}, \type -{shrink}, \type {step} only have meaning when used together: they can be used to -replace a post|-|loading \lpr {expandglyphsinfont} command. The \type -{auto_expand} option is not supported in \LUATEX. In fact, the primitives that -create expanded or protruding copies are probably only useful when used with -traditional fonts because all these extra \OPENTYPE\ properties are kept out of -the picture. The \type {expansion_factor} is value that can be present inside a -font in \type {font.fonts}. It is the actual expansion factor (a value between -\type {-shrink} and \type {stretch}, with step \type {step}) of a font that was -automatically generated by the font expansion algorithm. - -Because we store the actual state of expansion with each glyph and don't have -special font instances, we can change some font related parameters before lines -are constructed, like: - -\starttyping -font.setexpansion(font.current(),100,100,20) -\stoptyping - -This is mostly meant for experiments (or an optimizing routing written in \LUA) -so there is no primitive. - -The key \type {attributes} can be used to set font attributes in the \PDF\ file. -The key \type {used} is set by the engine when a font is actively in use, this -makes sure that the font's definition is written to the output file (\DVI\ or -\PDF). The \TFM\ reader sets it to false. The \type {direction} is a number -signalling the \quote {normal} direction for this font. There are sixteen -possibilities: - -\starttabulate[|Tc|c|Tc|c|Tc|c|Tc|c|] -\DB \# \BC dir \BC \# \BC dir \BC \# \BC dir \BC \# \BC dir \NC \NR -\TB -\NC 0 \NC LT \NC 4 \NC RT \NC 8 \NC TT \NC 12 \NC BT \NC \NR -\NC 1 \NC LL \NC 5 \NC RL \NC 9 \NC TL \NC 13 \NC BL \NC \NR -\NC 2 \NC LB \NC 6 \NC RB \NC 10 \NC TB \NC 14 \NC BB \NC \NR -\NC 3 \NC LR \NC 7 \NC RR \NC 11 \NC TR \NC 15 \NC BR \NC \NR -\LL -\stoptabulate - -These are \OMEGA|-|style direction abbreviations: the first character indicates -the \quote {first} edge of the character glyphs (the edge that is seen first in -the writing direction), the second the \quote {top} side. Keep in mind that -\LUATEX\ has a bit different directional model so these values are not used for -anything. - -The \type {parameters} is a hash with mixed key types. There are seven possible -string keys, as well as a number of integer indices (these start from 8 up). The -seven strings are actually used instead of the bottom seven indices, because that -gives a nicer user interface. - -The names and their internal remapping are: - -\starttabulate[|l|c|] -\DB name \BC remapping \NC \NR -\TB -\NC \type {slant} \NC 1 \NC \NR -\NC \type {space} \NC 2 \NC \NR -\NC \type {space_stretch} \NC 3 \NC \NR -\NC \type {space_shrink} \NC 4 \NC \NR -\NC \type {x_height} \NC 5 \NC \NR -\NC \type {quad} \NC 6 \NC \NR -\NC \type {extra_space} \NC 7 \NC \NR -\LL -\stoptabulate - -The keys \type {type}, \type {format}, \type {embedding}, \type {fullname} and -\type {filename} are used to embed \OPENTYPE\ fonts in the result \PDF. - -The \type {characters} table is a list of character hashes indexed by an integer -number. The number is the \quote {internal code} \TEX\ knows this character by. - -Two very special string indexes can be used also: \type {left_boundary} is a -virtual character whose ligatures and kerns are used to handle word boundary -processing. \type {right_boundary} is similar but not actually used for anything -(yet). - -Each character hash itself is a hash. For example, here is the character \quote -{f} (decimal 102) in the font \type {cmr10 at 10pt}. The numbers that represent -dimensions are in scaled points. - -\starttyping -[102] = { - ["width"] = 200250, - ["height"] = 455111, - ["depth"] = 0, - ["italic"] = 50973, - ["kerns"] = { - [63] = 50973, - [93] = 50973, - [39] = 50973, - [33] = 50973, - [41] = 50973 - }, - ["ligatures"] = { - [102] = { ["char"] = 11, ["type"] = 0 }, - [108] = { ["char"] = 13, ["type"] = 0 }, - [105] = { ["char"] = 12, ["type"] = 0 } - } -} -\stoptyping - -The following top|-|level keys can be present inside a character hash: - -\starttabulate[|l|c|c|c|l|p|] -\DB key \BC vf \BC tfm \BC used \BC type \BC description \NC\NR -\TB -\NC \type{width} \NC yes \NC yes \NC yes \NC number \NC character's width, in sp (default 0) \NC\NR -\NC \type{height} \NC no \NC yes \NC yes \NC number \NC character's height, in sp (default 0) \NC\NR -\NC \type{depth} \NC no \NC yes \NC yes \NC number \NC character's depth, in sp (default 0) \NC\NR -\NC \type{italic} \NC no \NC yes \NC yes \NC number \NC character's italic correction, in sp (default zero) \NC\NR -\NC \type{top_accent} \NC no \NC no \NC maybe \NC number \NC character's top accent alignment place, in sp (default zero) \NC\NR -\NC \type{bot_accent} \NC no \NC no \NC maybe \NC number \NC character's bottom accent alignment place, in sp (default zero) \NC\NR -\NC \type{left_protruding} \NC no \NC no \NC maybe \NC number \NC character's \lpr {lpcode} \NC\NR -\NC \type{right_protruding} \NC no \NC no \NC maybe \NC number \NC character's \lpr {rpcode} \NC\NR -\NC \type{expansion_factor} \NC no \NC no \NC maybe \NC number \NC character's \lpr {efcode} \NC\NR -\NC \type{tounicode} \NC no \NC no \NC maybe \NC string \NC character's \UNICODE\ equivalent(s), in \UTF|-|16BE hexadecimal format \NC\NR -\NC \type{next} \NC no \NC yes \NC yes \NC number \NC the \quote {next larger} character index \NC\NR -\NC \type{extensible} \NC no \NC yes \NC yes \NC table \NC the constituent parts of an extensible recipe \NC\NR -\NC \type{vert_variants} \NC no \NC no \NC yes \NC table \NC constituent parts of a vertical variant set \NC \NR -\NC \type{horiz_variants} \NC no \NC no \NC yes \NC table \NC constituent parts of a horizontal variant set \NC \NR -\NC \type{kerns} \NC no \NC yes \NC yes \NC table \NC kerning information \NC\NR -\NC \type{ligatures} \NC no \NC yes \NC yes \NC table \NC ligaturing information \NC\NR -\NC \type{commands} \NC yes \NC no \NC yes \NC array \NC virtual font commands \NC\NR -\NC \type{name} \NC no \NC no \NC no \NC string \NC the character (\POSTSCRIPT) name \NC\NR -\NC \type{index} \NC no \NC no \NC yes \NC number \NC the (\OPENTYPE\ or \TRUETYPE) font glyph index \NC\NR -\NC \type{used} \NC no \NC yes \NC yes \NC boolean \NC typeset already (default: false) \NC\NR -\NC \type{mathkern} \NC no \NC no \NC yes \NC table \NC math cut-in specifications \NC\NR -\LL -\stoptabulate - -The values of \type {top_accent}, \type {bot_accent} and \type {mathkern} are -used only for math accent and superscript placement, see \at {page} [math] in -this manual for details. The values of \type {left_protruding} and \type -{right_protruding} are used only when \lpr {protrudechars} is non-zero. Whether -or not \type {expansion_factor} is used depends on the font's global expansion -settings, as well as on the value of \lpr {adjustspacing}. - -The usage of \type {tounicode} is this: if this font specifies a \type -{tounicode=1} at the top level, then \LUATEX\ will construct a \type {/ToUnicode} -entry for the \PDF\ font (or font subset) based on the character|-|level \type -{tounicode} strings, where they are available. If a character does not have a -sensible \UNICODE\ equivalent, do not provide a string either (no empty strings). - -If the font level \type {tounicode} is not set, then \LUATEX\ will build up \type -{/ToUnicode} based on the \TEX\ code points you used, and any character-level -\type {tounicodes} will be ignored. The string format is exactly the format that -is expected by Adobe \CMAP\ files (\UTF-16BE in hexadecimal encoding), minus the -enclosing angle brackets. For instance the \type {tounicode} for a \type {fi} -ligature would be \type {00660069}. When you pass a number the conversion will be -done for you. - -A math character can have a \type {next} field that points to a next larger -shape. However, the presence of \type {extensible} will overrule \type {next}, if -that is also present. The \type {extensible} field in turn can be overruled by -\type {vert_variants}, the \OPENTYPE\ version. The \type {extensible} table is -very simple: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC description \NC\NR -\TB -\NC \type{top} \NC number \NC top character index \NC\NR -\NC \type{mid} \NC number \NC middle character index \NC\NR -\NC \type{bot} \NC number \NC bottom character index \NC\NR -\NC \type{rep} \NC number \NC repeatable character index \NC\NR -\LL -\stoptabulate - -The \type {horiz_variants} and \type {vert_variants} are arrays of components. -Each of those components is itself a hash of up to five keys: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{glyph} \NC number \NC The character index. Note that this is an encoding number, not a name. \NC \NR -\NC \type{extender} \NC number \NC One (1) if this part is repeatable, zero (0) otherwise. \NC \NR -\NC \type{start} \NC number \NC The maximum overlap at the starting side (in scaled points). \NC \NR -\NC \type{end} \NC number \NC The maximum overlap at the ending side (in scaled points). \NC \NR -\NC \type{advance} \NC number \NC The total advance width of this item. It can be zero or missing, - then the natural size of the glyph for character \type {component} - is used. \NC \NR -\LL -\stoptabulate - -The \type {kerns} table is a hash indexed by character index (and \quote -{character index} is defined as either a non|-|negative integer or the string -value \type {right_boundary}), with the values of the kerning to be applied, in -scaled points. - -The \type {ligatures} table is a hash indexed by character index (and \quote -{character index} is defined as either a non|-|negative integer or the string -value \type {right_boundary}), with the values being yet another small hash, with -two fields: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC description \NC \NR -\TB -\NC \type{type} \NC number \NC the type of this ligature command, default 0 \NC \NR -\NC \type{char} \NC number \NC the character index of the resultant ligature \NC \NR -\LL -\stoptabulate - -The \type {char} field in a ligature is required. The \type {type} field inside a -ligature is the numerical or string value of one of the eight possible ligature -types supported by \TEX. When \TEX\ inserts a new ligature, it puts the new glyph -in the middle of the left and right glyphs. The original left and right glyphs -can optionally be retained, and when at least one of them is kept, it is also -possible to move the new \quote {insertion point} forward one or two places. The -glyph that ends up to the right of the insertion point will become the next -\quote {left}. - -\starttabulate[|l|c|l|l|] -\DB textual (Knuth) \BC number \BC string \BC result \NC\NR -\TB -\NC \type{l + r =: n} \NC 0 \NC \type{=:} \NC \type{|n} \NC\NR -\NC \type{l + r =:| n} \NC 1 \NC \type{=:|} \NC \type{|nr} \NC\NR -\NC \type{l + r |=: n} \NC 2 \NC \type{|=:} \NC \type{|ln} \NC\NR -\NC \type{l + r |=:| n} \NC 3 \NC \type{|=:|} \NC \type{|lnr} \NC\NR -\NC \type{l + r =:|> n} \NC 5 \NC \type{=:|>} \NC \type{n|r} \NC\NR -\NC \type{l + r |=:> n} \NC 6 \NC \type{|=:>} \NC \type{l|n} \NC\NR -\NC \type{l + r |=:|> n} \NC 7 \NC \type{|=:|>} \NC \type{l|nr} \NC\NR -\NC \type{l + r |=:|>> n} \NC 11 \NC \type{|=:|>>} \NC \type{ln|r} \NC\NR -\LL -\stoptabulate - -The default value is~0, and can be left out. That signifies a \quote {normal} -ligature where the ligature replaces both original glyphs. In this table the~\type {|} -indicates the final insertion point. - -The \type {commands} array is explained below. - -\stopsection - -\startsection[title={Real fonts}] - -\topicindex {fonts+real} -\topicindex {fonts+virtual} - -Whether or not a \TEX\ font is a \quote {real} font that should be written to the -\PDF\ document is decided by the \type {type} value in the top|-|level font -structure. If the value is \type {real}, then this is a proper font, and the -inclusion mechanism will attempt to add the needed font object definitions to the -\PDF. Values for \type {type} are: - -\starttabulate[|l|p|] -\DB value \BC description \NC\NR -\TB -\NC \type{real} \NC this is a base font \NC\NR -\NC \type{virtual} \NC this is a virtual font \NC\NR -\LL -\stoptabulate - -The actions to be taken depend on a number of different variables: - -\startitemize[packed] -\startitem - Whether the used font fits in an 8-bit encoding scheme or not. This is true for - traditional \TEX\ fonts that communicate via \TFM\ files. -\stopitem -\startitem - The type of the disk font file, for instance a bitmap file or an outline - \TYPEONE, \TRUETYPE\ or \OPENTYPE\ font. -\stopitem -\startitem - The level of embedding requested, although in most cases a subset of - characters is embedded. The times when nothing got embedded are (in our - opinion at least) basically gone. -\stopitem -\stopitemize - -A font that uses anything other than an 8-bit encoding vector has to be written -to the \PDF\ in a different way. When the font table has \type {encodingbytes} -set to~2, then it is a wide font, in all other cases it isn't. The value~2 is the -default for \OPENTYPE\ and \TRUETYPE\ fonts loaded via \LUA. For \TYPEONE\ fonts, -you have to set \type {encodingbytes} to~2 explicitly. For \PK\ bitmap fonts, -wide font encoding is not supported at all. - -If no special care is needed, \LUATEX\ falls back to the mapfile|-|based solution -used by \PDFTEX\ and \DVIPS, so that legacy fonts are supported transparently. If -a \quote {wide} font is used, the new subsystem kicks in, and some extra fields -have to be present in the font structure. In this case, \LUATEX\ does not use a -map file at all. These extra fields are: \type {format}, \type {embedding}, \type -{fullname}, \type {cidinfo} (as explained above), \type {filename}, and the \type -{index} key in the separate characters. - -The \type {format} variable can have the following values. \type {type3} fonts -are provided for backward compatibility only, and do not support the new wide -encoding options. - -\starttabulate[|l|p|] -\DB value \BC description \NC \NR -\TB -\NC \type{type1} \NC this is a \POSTSCRIPT\ \TYPEONE\ font \NC \NR -\NC \type{type3} \NC this is a bitmapped (\PK) font \NC \NR -\NC \type{truetype} \NC this is a \TRUETYPE\ or \TRUETYPE|-|based \OPENTYPE\ font \NC \NR -\NC \type{opentype} \NC this is a \POSTSCRIPT|-|based \OPENTYPE\ font \NC \NR -\LL -\stoptabulate - -Valid values for the \type {embedding} variable are: - -\starttabulate[|l|p|] -\DB value \BC description \NC \NR -\TB -\NC \type{no} \NC don't embed the font at all \NC \NR -\NC \type{subset} \NC include and atttempt to subset the font \NC \NR -\NC \type{full} \NC include this font in its entirety \NC \NR -\LL -\stoptabulate - -The other fields are used as follows. The \type {fullname} will be the -\POSTSCRIPT|/|\PDF\ font name. The \type {cidinfo} will be used as the character -set: the CID \type {/Ordering} and \type {/Registry} keys. The \type {filename} -points to the actual font file. If you include the full path in the \type -{filename} or if the file is in the local directory, \LUATEX\ will run a little -bit more efficient because it will not have to re|-|run the \type {find_*_file} -callback in that case. - -Be careful: when mixing old and new fonts in one document, it is possible to -create \POSTSCRIPT\ name clashes that can result in printing errors. When this -happens, you have to change the \type {fullname} of the font to a more unique -one. - -Typeset strings are written out in a wide format using 2~bytes per glyph, using -the \type {index} key in the character information as value. The overall effect -is like having an encoding based on numbers instead of traditional (\POSTSCRIPT) -name|-|based reencoding. One way to get the correct \type {index} numbers for -\TYPEONE\ fonts is by loading the font via \type {fontloader.open} and use the -table indices as \type {index} fields. - -In order to make sure that cut and paste of the final document works okay you can -best make sure that there is a \type {tounicode} vector enforced. Not all \PDF\ -viewers handle this right so take \ACROBAT\ as reference. - -\stopsection - -\startsection[reference=virtualfonts,title={Virtual fonts}] - -\subsection{The structure} - -\topicindex {fonts+virtual} - -You have to take the following steps if you want \LUATEX\ to treat the returned -table from \cbk {define_font} as a virtual font: - -\startitemize[packed] -\startitem - Set the top|-|level key \type {type} to \type {virtual}. In most cases it's - optional because we look at the \type {commands} entry anyway. -\stopitem -\startitem - Make sure there is at least one valid entry in \type {fonts} (see below), - although recent versions of \LUATEX\ add a default entry when this table is - missing. -\stopitem -\startitem - Add a \type {commands} array to those characters that matter. A virtual - character can itself point to virtual characters but be careful with nesting - as you can create loops and overflow the stack (which often indicates an - error anyway). -\stopitem -\stopitemize - -The presence of the toplevel \type {type} key with the specific value \type -{virtual} will trigger handling of the rest of the special virtual font fields in -the table, but the mere existence of 'type' is enough to prevent \LUATEX\ from -looking for a virtual font on its own. This also works \quote {in reverse}: if -you are absolutely certain that a font is not a virtual font, assigning the value -\type {real} to \type {type} will inhibit \LUATEX\ from looking for a virtual -font file, thereby saving you a disk search. This only matters when we load a -\TFM\ file. - -The \type {fonts} is an (indexed) \LUA\ table. The values are one- or two|-|key -hashes themselves, each entry indicating one of the base fonts in a virtual font. -In case your font is referring to itself, you can use the \type {font.nextid()} -function which returns the index of the next to be defined font which is probably -the currently defined one. So, a table looks like this: - -\starttyping -fonts = { - { name = "ptmr8a", size = 655360 }, - { name = "psyr", size = 600000 }, - { id = 38 } -} -\stoptyping - -The first referenced font (at index~1) in this virtual font is \type {ptrmr8a} -loaded at 10pt, and the second is \type {psyr} loaded at a little over 9pt. The -third one is a previously defined font that is known to \LUATEX\ as font id~38. -The array index numbers are used by the character command definitions that are -part of each character. - -The \type {commands} array is a hash where each item is another small array, -with the first entry representing a command and the extra items being the -parameters to that command. The allowed commands and their arguments are: - -\starttabulate[|l|l|l|p|] -\DB command \BC arguments \BC type \BC description \NC \NR -\TB -\NC \type{font} \NC 1 \NC number \NC select a new font from the local \type {fonts} table \NC \NR -\NC \type{char} \NC 1 \NC number \NC typeset this character number from the current font, - and move right by the character's width \NC \NR -\NC \type{node} \NC 1 \NC node \NC output this node (list), and move right - by the width of this list\NC \NR -\NC \type{slot} \NC 2 \NC 2 numbers \NC a shortcut for the combination of a font and char command\NC \NR -\NC \type{push} \NC 0 \NC \NC save current position\NC \NR -\NC \type{nop} \NC 0 \NC \NC do nothing \NC \NR -\NC \type{pop} \NC 0 \NC \NC pop position \NC \NR -\NC \type{rule} \NC 2 \NC 2 numbers \NC output a rule $ht*wd$, and move right. \NC \NR -\NC \type{down} \NC 1 \NC number \NC move down on the page \NC \NR -\NC \type{right} \NC 1 \NC number \NC move right on the page \NC \NR -\NC \type{special} \NC 1 \NC string \NC output a \prm {special} command \NC \NR -\NC \type{pdf} \NC 2 \NC 2 strings \NC output a \PDF\ literal, the first string is one of \type {origin}, - \type {page}, \type {text}, \type {font}, \type {direct} or \type {raw}; if you - have one string only \type {origin} is assumed \NC \NR -\NC \type{lua} \NC 1 \NC string, - function \NC execute a \LUA\ script when the glyph is embedded; in case of a - function it gets the font id and character code passed \NC \NR -\NC \type{image} \NC 1 \NC image \NC output an image (the argument can be either an \type {} variable or an \type {image_spec} table) \NC \NR -\NC \type{comment} \NC any \NC any \NC the arguments of this command are ignored \NC \NR -\LL -\stoptabulate - -When a font id is set to~0 then it will be replaced by the currently assigned -font id. This prevents the need for hackery with future id's. Normally one could -use \type {font.nextid} but when more complex fonts are built in the meantime -other instances could have been loaded. - -The \type {pdf} option also accepts a \type {mode} keyword in which case the -third argument sets the mode. That option will change the mode in an efficient -way (passing an empty string would result in an extra empty lines in the \PDF\ -file. This option only makes sense for virtual fonts. The \type {font} mode only -makes sense in virtual fonts. Modes are somewhat fuzzy and partially inherited -from \PDFTEX. - -\starttabulate[|l|p|] -\DB mode \BC description \NC \NR -\TB -\NC \type {origin} \NC enter page mode and set the position \NC \NR -\NC \type {page} \NC enter page mode \NC \NR -\NC \type {text} \NC enter text mode \NC \NR -\NC \type {font} \NC enter font mode (kind of text mode, only in virtual fonts) \NC \NR -\NC \type {always} \NC finish the current string and force a transform if needed \NC \NR -\NC \type {raw} \NC finish the current string \NC \NR -\LL -\stoptabulate - -You always need to check what \PDF\ code is generated because there can be all -kind of interferences with optimization in the backend and fonts are complicated -anyway. Here is a rather elaborate glyph commands example using such keys: - -\starttyping -... -commands = { - { "push" }, -- remember where we are - { "right", 5000 }, -- move right about 0.08pt - { "font", 3 }, -- select the fonts[3] entry - { "char", 97 }, -- place character 97 (ASCII 'a') - -- { "slot", 2, 97 }, -- an alternative for the previous two - { "pop" }, -- go all the way back - { "down", -200000 }, -- move upwards by about 3pt - { "special", "pdf: 1 0 0 rg" } -- switch to red color - -- { "pdf", "origin", "1 0 0 rg" } -- switch to red color (alternative) - { "rule", 500000, 20000 } -- draw a bar - { "special", "pdf: 0 g" } -- back to black - -- { "pdf", "origin", "0 g" } -- back to black (alternative) -} -... -\stoptyping - -The default value for \type {font} is always~1 at the start of the -\type {commands} array. Therefore, if the virtual font is essentially only a -re|-|encoding, then you do usually not have created an explicit \quote {font} -command in the array. - -Rules inside of \type {commands} arrays are built up using only two dimensions: -they do not have depth. For correct vertical placement, an extra \type {down} -command may be needed. - -Regardless of the amount of movement you create within the \type {commands}, the -output pointer will always move by exactly the width that was given in the \type -{width} key of the character hash. Any movements that take place inside the \type -{commands} array are ignored on the upper level. - -The special can have a \type {pdf:}, \type {pdf:origin:}, \type {pdf:page:}, -\type {pdf:direct:} or \type {pdf:raw:} prefix. When you have to concatenate -strings using the \type {pdf} command might be more efficient. - -\subsection{Artificial fonts} - -Even in a \quote {real} font, there can be virtual characters. When \LUATEX\ -encounters a \type {commands} field inside a character when it becomes time to -typeset the character, it will interpret the commands, just like for a true -virtual character. In this case, if you have created no \quote {fonts} array, -then the default (and only) \quote {base} font is taken to be the current font -itself. In practice, this means that you can create virtual duplicates of -existing characters which is useful if you want to create composite characters. - -Note: this feature does {\it not\/} work the other way around. There can not be -\quote {real} characters in a virtual font! You cannot use this technique for -font re-encoding either; you need a truly virtual font for that (because -characters that are already present cannot be altered). - -\subsection{Example virtual font} - -\topicindex {fonts+virtual} - -Finally, here is a plain \TEX\ input file with a virtual font demonstration: - -\startbuffer -\directlua { - callback.register('define_font', - function (name,size) - if name == 'cmr10-red' then - local f = font.read_tfm('cmr10',size) - f.name = 'cmr10-red' - f.type = 'virtual' - f.fonts = { - { name = 'cmr10', size = size } - } - for i,v in pairs(f.characters) do - if string.char(i):find('[tacohanshartmut]') then - v.commands = { - { "special", "pdf: 1 0 0 rg" }, - { "char", i }, - { "special", "pdf: 0 g" }, - } - end - end - return f - else - return font.read_tfm(name,size) - end - end - ) -} - -\font\myfont = cmr10-red at 10pt \myfont This is a line of text \par -\font\myfontx = cmr10 at 10pt \myfontx Here is another line of text \par -\stopbuffer - -\typebuffer - -\stopsection - -\startsection[title={The \type {vf} library}] - -The \type {vf} library can be used when \LUA\ code, as defined in the \type -{commands} of the font, is executed. The functions provided are similar as the -commands: \type {char}, \type {down}, \type {fontid}, \type {image}, \type -{node}, \type {nop}, \type {pop}, \type {push}, \type {right}, \nod {rule}, \type -{special} and \type {pdf}. This library has been present for a while but not been -advertised and tested much, if only because it's easy to define an invalid font -(or mess up the \PDF\ stream). Keep in mind that the \LUA\ snippets are executed -each time when a character is output. - -\stopsection - -\startsection[title={The \type {font} library}] - -\topicindex {fonts+library} - -The font library provides the interface into the internals of the font system, -and it also contains helper functions to load traditional \TEX\ font metrics -formats. Other font loading functionality is provided by the \type {fontloader} -library that will be discussed in the next section. - -\subsection{Loading a \TFM\ file} - -\topicindex {fonts+tfm} - -The behaviour documented in this subsection is considered stable in the sense that -there will not be backward|-|incompatible changes any more. - -\startfunctioncall -
fnt = - font.read_tfm( name, s) -\stopfunctioncall - -The number is a bit special: - -\startitemize -\startitem - If it is positive, it specifies an \quote {at size} in scaled points. -\stopitem -\startitem - If it is negative, its absolute value represents a \quote {scaled} - setting relative to the designsize of the font. -\stopitem -\stopitemize - -\subsection{Loading a \VF\ file} - -\topicindex {fonts+vf} - -The behavior documented in this subsection is considered stable in the sense that -there will not be backward-incompatible changes any more. - -\startfunctioncall -
vf_fnt = - font.read_vf( name, s) -\stopfunctioncall - -The meaning of the number \type {s} and the format of the returned table are -similar to the ones in the \type {read_tfm} function. - -\subsection{The fonts array} - -\topicindex {fonts+virtual} - -The whole table of \TEX\ fonts is accessible from \LUA\ using a virtual array. - -\starttyping -font.fonts[n] = { ... } -
f = font.fonts[n] -\stoptyping - -Because this is a virtual array, you cannot call \type {pairs} on it, but see -below for the \type {font.each} iterator. - -The two metatable functions implementing the virtual array are: - -\startfunctioncall -
f = font.getfont( n) -font.setfont( n,
f) -\stopfunctioncall - -Note that at the moment, each access to the \type {font.fonts} or call to \type -{font.getfont} creates a \LUA\ table for the whole font unless you cached it. -This process can be quite slow. - -\startfunctioncall -
p = font.getparameters( n) -\stopfunctioncall - -This one will return a table of the parameters as known to \TEX. These can be -different from the ones in the cached table. - -Also note the following: assignments can only be made to fonts that have already -been defined in \TEX, but have not been accessed {\it at all\/} since that -definition. This limits the usability of the write access to \type {font.fonts} -quite a lot, a less stringent ruleset will likely be implemented later. - -\subsection{Checking a font's status} - -You can test for the status of a font by calling this function: - -\startfunctioncall - f = - font.frozen( n) -\stopfunctioncall - -The return value is one of \type {true} (unassignable), \type {false} (can be -changed) or \type {nil} (not a valid font at all). - -\subsection{Defining a font directly} - -\topicindex {fonts+define} - -You can define your own font into \type {font.fonts} by calling this function: - -\startfunctioncall - i = - font.define(
f) -\stopfunctioncall - -The return value is the internal id number of the defined font (the index into -\type {font.fonts}). If the font creation fails, an error is raised. The table is -a font structure. An alternative call is: - -\startfunctioncall - i = - font.define( n,
f) -\stopfunctioncall - -Where the first argument is a reserved font id (see below). - -\subsection{Extending a font} - -\topicindex {fonts+extend} - -Within reasonable bounds you can extend a font after it has been defined. Because -some properties are best left unchanged this is limited to adding characters. - -\startfunctioncall -font.addcharacters(,
f) -\stopfunctioncall - -The table passed can have the fields \type {characters} which is a (sub)table -like the one used in define, and for virtual fonts a \type {fonts} table can be -added. The characters defined in the \type {characters} table are added (when not -yet present) or replace an existing entry. Keep in mind that replacing can have -side effects because a character already can have been used. Instead of posing -restrictions we expect the user to be careful. (The \type {setfont} helper is -a more drastic replacer.) - -\subsection{Projected next font id} - -\topicindex {fonts+id} - -\startfunctioncall - i = - font.nextid() -\stopfunctioncall - -This returns the font id number that would be returned by a \type {font.define} -call if it was executed at this spot in the code flow. This is useful for virtual -fonts that need to reference themselves. If you pass \type {true} as argument, -the id gets reserved and you can pass to \type {font.define} as first argument. -This can be handy when you create complex virtual fonts. - -\startfunctioncall - i = - font.nextid(true) -\stopfunctioncall - -\subsection{Font ids} - -\topicindex {fonts+id} -\topicindex {fonts+current} - -\startfunctioncall - i = - font.id( csname) -\stopfunctioncall - -This returns the font id associated with \type {csname}, or $-1$ if \type -{csname} is not defined. - -\startfunctioncall - i = - font.max() -\stopfunctioncall - -This is the largest used index in \type {font.fonts}. - -\startfunctioncall - i = font.current() -font.current( i) -\stopfunctioncall - -This gets or sets the currently used font number. - -\subsection{Iterating over all fonts} - -\topicindex {fonts+iterate} - -\startfunctioncall -for i,v in font.each() do - ... -end -\stopfunctioncall - -This is an iterator over each of the defined \TEX\ fonts. The first returned -value is the index in \type {font.fonts}, the second the font itself, as a \LUA\ -table. The indices are listed incrementally, but they do not always form an array -of consecutive numbers: in some cases there can be holes in the sequence. - -\stopsection - -\stopchapter - -\stopcomponent +% language=uk + +\environment luatex-style + +\startcomponent luatex-fonts + +\startchapter[reference=fonts,title={Font structure}] + +\startsection[title={The font tables}] + +\topicindex {fonts} +\topicindex {fonts+tables} + +All \TEX\ fonts are represented to \LUA\ code as tables, and internally as +\CCODE~structures. All keys in the table below are saved in the internal font +structure if they are present in the table returned by the \cbk {define_font} +callback, or if they result from the normal \TFM|/|\VF\ reading routines if there +is no \cbk {define_font} callback defined. + +The column \quote {\VF} means that this key will be created by the \type +{font.read_vf()} routine, \quote {\TFM} means that the key will be created by the +\type {font.read_tfm()} routine, and \quote {used} means whether or not the +\LUATEX\ engine itself will do something with the key. The top|-|level keys in +the table are as follows: + +\starttabulate[|l|c|c|c|l|pl|] +\DB key \BC vf \BC tfm \BC used \BC value type \BC description \NC \NR +\TB +\NC \type{name} \NC yes \NC yes \NC yes \NC string \NC metric (file) name \NC \NR +\NC \type{area} \NC no \NC yes \NC yes \NC string \NC (directory) location, typically empty \NC \NR +\NC \type{used} \NC no \NC yes \NC yes \NC boolean \NC indicates usage (initial: false) \NC \NR +\NC \type{characters} \NC yes \NC yes \NC yes \NC table \NC the defined glyphs of this font \NC \NR +\NC \type{checksum} \NC yes \NC yes \NC no \NC number \NC default: 0 \NC \NR +\NC \type{designsize} \NC no \NC yes \NC yes \NC number \NC expected size (default: 655360 == 10pt) \NC \NR +\NC \type{direction} \NC no \NC yes \NC yes \NC number \NC default: 0 \NC \NR +\NC \type{encodingbytes} \NC no \NC no \NC yes \NC number \NC default: depends on \type {format} \NC \NR +\NC \type{encodingname} \NC no \NC no \NC yes \NC string \NC encoding name \NC \NR +\NC \type{fonts} \NC yes \NC no \NC yes \NC table \NC locally used fonts \NC \NR +\NC \type{psname} \NC no \NC no \NC yes \NC string \NC This is the \POSTSCRIPT\ fontname in the incoming font + source, and it's used as fontname identifier in the \PDF\ + output. This has to be a valid string, e.g.\ no spaces + and such, as the backend will not do a cleanup. This gives + complete control to the loader. \NC \NR +\NC \type{fullname} \NC no \NC no \NC yes \NC string \NC output font name, used as a fallback in the \PDF\ output + if the \type {psname} is not set \NC \NR +\NC \type{header} \NC yes \NC no \NC no \NC string \NC header comments, if any \NC \NR +\NC \type{hyphenchar} \NC no \NC no \NC yes \NC number \NC default: \TEX's \prm {hyphenchar} \NC \NR +\NC \type{parameters} \NC no \NC yes \NC yes \NC hash \NC default: 7 parameters, all zero \NC \NR +\NC \type{size} \NC no \NC yes \NC yes \NC number \NC the required scaling (by default the same as designsize) \NC \NR +\NC \type{skewchar} \NC no \NC no \NC yes \NC number \NC default: \TEX's \prm {skewchar} \NC \NR +\NC \type{type} \NC yes \NC no \NC yes \NC string \NC basic type of this font \NC \NR +\NC \type{format} \NC no \NC no \NC yes \NC string \NC disk format type \NC \NR +\NC \type{embedding} \NC no \NC no \NC yes \NC string \NC \PDF\ inclusion \NC \NR +\NC \type{filename} \NC no \NC no \NC yes \NC string \NC the name of the font on disk \NC \NR +\NC \type{tounicode} \NC no \NC yes \NC yes \NC number \NC When this is set to~1 \LUATEX\ assumes per|-|glyph + tounicode entries are present in the font. \NC \NR +\NC \type{stretch} \NC no \NC no \NC yes \NC number \NC the \quote {stretch} value from \lpr {expandglyphsinfont} \NC \NR +\NC \type{shrink} \NC no \NC no \NC yes \NC number \NC the \quote {shrink} value from \lpr {expandglyphsinfont} \NC \NR +\NC \type{step} \NC no \NC no \NC yes \NC number \NC the \quote {step} value from \lpr {expandglyphsinfont} \NC \NR +\NC \type{expansion_factor} \NC no \NC no \NC no \NC number \NC the actual expansion factor of an expanded font \NC \NR +\NC \type{attributes} \NC no \NC no \NC yes \NC string \NC the \orm {pdffontattr} \NC \NR +\NC \type{cache} \NC no \NC no \NC yes \NC string \NC This key controls caching of the \LUA\ table on the + \TEX\ end where \type {yes} means: use a reference to + the table that is passed to \LUATEX\ (this is the + default), and \type {no} means: don't store the + table reference, don't cache any \LUA\ data for this + font while \type {renew} means: don't store the table + reference, but save a reference to the table that is + created at the first access to one of its fields in the + font. \NC \NR +\NC \type{nomath} \NC no \NC no \NC yes \NC boolean \NC This key allows a minor speedup for text fonts. If it + is present and true, then \LUATEX\ will not check the + character entries for math|-|specific keys. \NC \NR +\NC \type{oldmath} \NC no \NC no \NC yes \NC boolean \NC This key flags a font as representing an old school \TEX\ + math font and disables the \OPENTYPE\ code path. \NC \NR +\NC \type{slant} \NC no \NC no \NC yes \NC number \NC This parameter will tilt the font and + does the same as \type {SlantFont} in the map file for + \TYPEONE\ fonts. \NC \NR +\NC \type{extend} \NC no \NC no \NC yes \NC number \NC This parameter will scale the font horizontally and + does the same as \type {ExtendFont} in the map file for + \TYPEONE\ fonts. \NC \NR +\NC \type{squeeze} \NC no \NC no \NC yes \NC number \NC This parameter will scale the font vertically and has + no equivalent in the map file. \NC \NR +\NC \type{width} \NC no \NC no \NC yes \NC number \NC The backend will inject \PDF\ operators that set the + penwidth. The value is (as usual in \TEX) divided by 1000. + It works with the \type {mode} file. \NC \NR +\NC \type{mode} \NC no \NC no \NC yes \NC number \NC The backend will inject \PDF\ operators that relate to the + drawing mode with 0~being a fill, 1~being an outline, + 2~both draw and fill and 3~no painting at all. \NC \NR +\LL +\stoptabulate + +The saved reference in the \type {cache} option is thread|-|local, so be careful +when you are using coroutines: an error will be thrown if the table has been +cached in one thread, but you reference it from another thread. + +The key \type {name} is always required. The keys \type {stretch}, \type +{shrink}, \type {step} only have meaning when used together: they can be used to +replace a post|-|loading \lpr {expandglyphsinfont} command. The \type +{auto_expand} option is not supported in \LUATEX. In fact, the primitives that +create expanded or protruding copies are probably only useful when used with +traditional fonts because all these extra \OPENTYPE\ properties are kept out of +the picture. The \type {expansion_factor} is value that can be present inside a +font in \type {font.fonts}. It is the actual expansion factor (a value between +\type {-shrink} and \type {stretch}, with step \type {step}) of a font that was +automatically generated by the font expansion algorithm. + +Because we store the actual state of expansion with each glyph and don't have +special font instances, we can change some font related parameters before lines +are constructed, like: + +\starttyping +font.setexpansion(font.current(),100,100,20) +\stoptyping + +This is mostly meant for experiments (or an optimizing routing written in \LUA) +so there is no primitive. + +The key \type {attributes} can be used to set font attributes in the \PDF\ file. +The key \type {used} is set by the engine when a font is actively in use, this +makes sure that the font's definition is written to the output file (\DVI\ or +\PDF). The \TFM\ reader sets it to false. The \type {direction} is a number +signalling the \quote {normal} direction for this font. There are sixteen +possibilities: + +\starttabulate[|Tc|c|Tc|c|Tc|c|Tc|c|] +\DB \# \BC dir \BC \# \BC dir \BC \# \BC dir \BC \# \BC dir \NC \NR +\TB +\NC 0 \NC LT \NC 4 \NC RT \NC 8 \NC TT \NC 12 \NC BT \NC \NR +\NC 1 \NC LL \NC 5 \NC RL \NC 9 \NC TL \NC 13 \NC BL \NC \NR +\NC 2 \NC LB \NC 6 \NC RB \NC 10 \NC TB \NC 14 \NC BB \NC \NR +\NC 3 \NC LR \NC 7 \NC RR \NC 11 \NC TR \NC 15 \NC BR \NC \NR +\LL +\stoptabulate + +These are \OMEGA|-|style direction abbreviations: the first character indicates +the \quote {first} edge of the character glyphs (the edge that is seen first in +the writing direction), the second the \quote {top} side. Keep in mind that +\LUATEX\ has a bit different directional model so these values are not used for +anything. + +The \type {parameters} is a hash with mixed key types. There are seven possible +string keys, as well as a number of integer indices (these start from 8 up). The +seven strings are actually used instead of the bottom seven indices, because that +gives a nicer user interface. + +The names and their internal remapping are: + +\starttabulate[|l|c|] +\DB name \BC remapping \NC \NR +\TB +\NC \type {slant} \NC 1 \NC \NR +\NC \type {space} \NC 2 \NC \NR +\NC \type {space_stretch} \NC 3 \NC \NR +\NC \type {space_shrink} \NC 4 \NC \NR +\NC \type {x_height} \NC 5 \NC \NR +\NC \type {quad} \NC 6 \NC \NR +\NC \type {extra_space} \NC 7 \NC \NR +\LL +\stoptabulate + +The keys \type {type}, \type {format}, \type {embedding}, \type {fullname} and +\type {filename} are used to embed \OPENTYPE\ fonts in the result \PDF. + +The \type {characters} table is a list of character hashes indexed by an integer +number. The number is the \quote {internal code} \TEX\ knows this character by. + +Two very special string indexes can be used also: \type {left_boundary} is a +virtual character whose ligatures and kerns are used to handle word boundary +processing. \type {right_boundary} is similar but not actually used for anything +(yet). + +Each character hash itself is a hash. For example, here is the character \quote +{f} (decimal 102) in the font \type {cmr10 at 10pt}. The numbers that represent +dimensions are in scaled points. + +\starttyping +[102] = { + ["width"] = 200250, + ["height"] = 455111, + ["depth"] = 0, + ["italic"] = 50973, + ["kerns"] = { + [63] = 50973, + [93] = 50973, + [39] = 50973, + [33] = 50973, + [41] = 50973 + }, + ["ligatures"] = { + [102] = { ["char"] = 11, ["type"] = 0 }, + [108] = { ["char"] = 13, ["type"] = 0 }, + [105] = { ["char"] = 12, ["type"] = 0 } + } +} +\stoptyping + +The following top|-|level keys can be present inside a character hash: + +\starttabulate[|l|c|c|c|l|p|] +\DB key \BC vf \BC tfm \BC used \BC type \BC description \NC\NR +\TB +\NC \type{width} \NC yes \NC yes \NC yes \NC number \NC character's width, in sp (default 0) \NC\NR +\NC \type{height} \NC no \NC yes \NC yes \NC number \NC character's height, in sp (default 0) \NC\NR +\NC \type{depth} \NC no \NC yes \NC yes \NC number \NC character's depth, in sp (default 0) \NC\NR +\NC \type{italic} \NC no \NC yes \NC yes \NC number \NC character's italic correction, in sp (default zero) \NC\NR +\NC \type{top_accent} \NC no \NC no \NC maybe \NC number \NC character's top accent alignment place, in sp (default zero) \NC\NR +\NC \type{bot_accent} \NC no \NC no \NC maybe \NC number \NC character's bottom accent alignment place, in sp (default zero) \NC\NR +\NC \type{left_protruding} \NC no \NC no \NC maybe \NC number \NC character's \lpr {lpcode} \NC\NR +\NC \type{right_protruding} \NC no \NC no \NC maybe \NC number \NC character's \lpr {rpcode} \NC\NR +\NC \type{expansion_factor} \NC no \NC no \NC maybe \NC number \NC character's \lpr {efcode} \NC\NR +\NC \type{tounicode} \NC no \NC no \NC maybe \NC string \NC character's \UNICODE\ equivalent(s), in \UTF|-|16BE hexadecimal format \NC\NR +\NC \type{next} \NC no \NC yes \NC yes \NC number \NC the \quote {next larger} character index \NC\NR +\NC \type{extensible} \NC no \NC yes \NC yes \NC table \NC the constituent parts of an extensible recipe \NC\NR +\NC \type{vert_variants} \NC no \NC no \NC yes \NC table \NC constituent parts of a vertical variant set \NC \NR +\NC \type{horiz_variants} \NC no \NC no \NC yes \NC table \NC constituent parts of a horizontal variant set \NC \NR +\NC \type{kerns} \NC no \NC yes \NC yes \NC table \NC kerning information \NC\NR +\NC \type{ligatures} \NC no \NC yes \NC yes \NC table \NC ligaturing information \NC\NR +\NC \type{commands} \NC yes \NC no \NC yes \NC array \NC virtual font commands \NC\NR +\NC \type{name} \NC no \NC no \NC no \NC string \NC the character (\POSTSCRIPT) name \NC\NR +\NC \type{index} \NC no \NC no \NC yes \NC number \NC the (\OPENTYPE\ or \TRUETYPE) font glyph index \NC\NR +\NC \type{used} \NC no \NC yes \NC yes \NC boolean \NC typeset already (default: false) \NC\NR +\NC \type{mathkern} \NC no \NC no \NC yes \NC table \NC math cut-in specifications \NC\NR +\LL +\stoptabulate + +The values of \type {top_accent}, \type {bot_accent} and \type {mathkern} are +used only for math accent and superscript placement, see \at {page} [math] in +this manual for details. The values of \type {left_protruding} and \type +{right_protruding} are used only when \lpr {protrudechars} is non-zero. Whether +or not \type {expansion_factor} is used depends on the font's global expansion +settings, as well as on the value of \lpr {adjustspacing}. + +The usage of \type {tounicode} is this: if this font specifies a \type +{tounicode=1} at the top level, then \LUATEX\ will construct a \type {/ToUnicode} +entry for the \PDF\ font (or font subset) based on the character|-|level \type +{tounicode} strings, where they are available. If a character does not have a +sensible \UNICODE\ equivalent, do not provide a string either (no empty strings). + +If the font level \type {tounicode} is not set, then \LUATEX\ will build up \type +{/ToUnicode} based on the \TEX\ code points you used, and any character-level +\type {tounicodes} will be ignored. The string format is exactly the format that +is expected by Adobe \CMAP\ files (\UTF-16BE in hexadecimal encoding), minus the +enclosing angle brackets. For instance the \type {tounicode} for a \type {fi} +ligature would be \type {00660069}. When you pass a number the conversion will be +done for you. + +A math character can have a \type {next} field that points to a next larger +shape. However, the presence of \type {extensible} will overrule \type {next}, if +that is also present. The \type {extensible} field in turn can be overruled by +\type {vert_variants}, the \OPENTYPE\ version. The \type {extensible} table is +very simple: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC description \NC\NR +\TB +\NC \type{top} \NC number \NC top character index \NC\NR +\NC \type{mid} \NC number \NC middle character index \NC\NR +\NC \type{bot} \NC number \NC bottom character index \NC\NR +\NC \type{rep} \NC number \NC repeatable character index \NC\NR +\LL +\stoptabulate + +The \type {horiz_variants} and \type {vert_variants} are arrays of components. +Each of those components is itself a hash of up to five keys: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{glyph} \NC number \NC The character index. Note that this is an encoding number, not a name. \NC \NR +\NC \type{extender} \NC number \NC One (1) if this part is repeatable, zero (0) otherwise. \NC \NR +\NC \type{start} \NC number \NC The maximum overlap at the starting side (in scaled points). \NC \NR +\NC \type{end} \NC number \NC The maximum overlap at the ending side (in scaled points). \NC \NR +\NC \type{advance} \NC number \NC The total advance width of this item. It can be zero or missing, + then the natural size of the glyph for character \type {component} + is used. \NC \NR +\LL +\stoptabulate + +The \type {kerns} table is a hash indexed by character index (and \quote +{character index} is defined as either a non|-|negative integer or the string +value \type {right_boundary}), with the values of the kerning to be applied, in +scaled points. + +The \type {ligatures} table is a hash indexed by character index (and \quote +{character index} is defined as either a non|-|negative integer or the string +value \type {right_boundary}), with the values being yet another small hash, with +two fields: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC description \NC \NR +\TB +\NC \type{type} \NC number \NC the type of this ligature command, default 0 \NC \NR +\NC \type{char} \NC number \NC the character index of the resultant ligature \NC \NR +\LL +\stoptabulate + +The \type {char} field in a ligature is required. The \type {type} field inside a +ligature is the numerical or string value of one of the eight possible ligature +types supported by \TEX. When \TEX\ inserts a new ligature, it puts the new glyph +in the middle of the left and right glyphs. The original left and right glyphs +can optionally be retained, and when at least one of them is kept, it is also +possible to move the new \quote {insertion point} forward one or two places. The +glyph that ends up to the right of the insertion point will become the next +\quote {left}. + +\starttabulate[|l|c|l|l|] +\DB textual (Knuth) \BC number \BC string \BC result \NC\NR +\TB +\NC \type{l + r =: n} \NC 0 \NC \type{=:} \NC \type{|n} \NC\NR +\NC \type{l + r =:| n} \NC 1 \NC \type{=:|} \NC \type{|nr} \NC\NR +\NC \type{l + r |=: n} \NC 2 \NC \type{|=:} \NC \type{|ln} \NC\NR +\NC \type{l + r |=:| n} \NC 3 \NC \type{|=:|} \NC \type{|lnr} \NC\NR +\NC \type{l + r =:|> n} \NC 5 \NC \type{=:|>} \NC \type{n|r} \NC\NR +\NC \type{l + r |=:> n} \NC 6 \NC \type{|=:>} \NC \type{l|n} \NC\NR +\NC \type{l + r |=:|> n} \NC 7 \NC \type{|=:|>} \NC \type{l|nr} \NC\NR +\NC \type{l + r |=:|>> n} \NC 11 \NC \type{|=:|>>} \NC \type{ln|r} \NC\NR +\LL +\stoptabulate + +The default value is~0, and can be left out. That signifies a \quote {normal} +ligature where the ligature replaces both original glyphs. In this table the~\type {|} +indicates the final insertion point. + +The \type {commands} array is explained below. + +\stopsection + +\startsection[title={Real fonts}] + +\topicindex {fonts+real} +\topicindex {fonts+virtual} + +Whether or not a \TEX\ font is a \quote {real} font that should be written to the +\PDF\ document is decided by the \type {type} value in the top|-|level font +structure. If the value is \type {real}, then this is a proper font, and the +inclusion mechanism will attempt to add the needed font object definitions to the +\PDF. Values for \type {type} are: + +\starttabulate[|l|p|] +\DB value \BC description \NC\NR +\TB +\NC \type{real} \NC this is a base font \NC\NR +\NC \type{virtual} \NC this is a virtual font \NC\NR +\LL +\stoptabulate + +The actions to be taken depend on a number of different variables: + +\startitemize[packed] +\startitem + Whether the used font fits in an 8-bit encoding scheme or not. This is true for + traditional \TEX\ fonts that communicate via \TFM\ files. +\stopitem +\startitem + The type of the disk font file, for instance a bitmap file or an outline + \TYPEONE, \TRUETYPE\ or \OPENTYPE\ font. +\stopitem +\startitem + The level of embedding requested, although in most cases a subset of + characters is embedded. The times when nothing got embedded are (in our + opinion at least) basically gone. +\stopitem +\stopitemize + +A font that uses anything other than an 8-bit encoding vector has to be written +to the \PDF\ in a different way. When the font table has \type {encodingbytes} +set to~2, then it is a wide font, in all other cases it isn't. The value~2 is the +default for \OPENTYPE\ and \TRUETYPE\ fonts loaded via \LUA. For \TYPEONE\ fonts, +you have to set \type {encodingbytes} to~2 explicitly. For \PK\ bitmap fonts, +wide font encoding is not supported at all. + +If no special care is needed, \LUATEX\ falls back to the mapfile|-|based solution +used by \PDFTEX\ and \DVIPS, so that legacy fonts are supported transparently. If +a \quote {wide} font is used, the new subsystem kicks in, and some extra fields +have to be present in the font structure. In this case, \LUATEX\ does not use a +map file at all. These extra fields are: \type {format}, \type {embedding}, \type +{fullname}, \type {cidinfo} (as explained above), \type {filename}, and the \type +{index} key in the separate characters. + +The \type {format} variable can have the following values. \type {type3} fonts +are provided for backward compatibility only, and do not support the new wide +encoding options. + +\starttabulate[|l|p|] +\DB value \BC description \NC \NR +\TB +\NC \type{type1} \NC this is a \POSTSCRIPT\ \TYPEONE\ font \NC \NR +\NC \type{type3} \NC this is a bitmapped (\PK) font \NC \NR +\NC \type{truetype} \NC this is a \TRUETYPE\ or \TRUETYPE|-|based \OPENTYPE\ font \NC \NR +\NC \type{opentype} \NC this is a \POSTSCRIPT|-|based \OPENTYPE\ font \NC \NR +\LL +\stoptabulate + +Valid values for the \type {embedding} variable are: + +\starttabulate[|l|p|] +\DB value \BC description \NC \NR +\TB +\NC \type{no} \NC don't embed the font at all \NC \NR +\NC \type{subset} \NC include and atttempt to subset the font \NC \NR +\NC \type{full} \NC include this font in its entirety \NC \NR +\LL +\stoptabulate + +The other fields are used as follows. The \type {fullname} will be the +\POSTSCRIPT|/|\PDF\ font name. The \type {cidinfo} will be used as the character +set: the CID \type {/Ordering} and \type {/Registry} keys. The \type {filename} +points to the actual font file. If you include the full path in the \type +{filename} or if the file is in the local directory, \LUATEX\ will run a little +bit more efficient because it will not have to re|-|run the \type {find_*_file} +callback in that case. + +Be careful: when mixing old and new fonts in one document, it is possible to +create \POSTSCRIPT\ name clashes that can result in printing errors. When this +happens, you have to change the \type {fullname} of the font to a more unique +one. + +Typeset strings are written out in a wide format using 2~bytes per glyph, using +the \type {index} key in the character information as value. The overall effect +is like having an encoding based on numbers instead of traditional (\POSTSCRIPT) +name|-|based reencoding. One way to get the correct \type {index} numbers for +\TYPEONE\ fonts is by loading the font via \type {fontloader.open} and use the +table indices as \type {index} fields. + +In order to make sure that cut and paste of the final document works okay you can +best make sure that there is a \type {tounicode} vector enforced. Not all \PDF\ +viewers handle this right so take \ACROBAT\ as reference. + +\stopsection + +\startsection[reference=virtualfonts,title={Virtual fonts}] + +\subsection{The structure} + +\topicindex {fonts+virtual} + +You have to take the following steps if you want \LUATEX\ to treat the returned +table from \cbk {define_font} as a virtual font: + +\startitemize[packed] +\startitem + Set the top|-|level key \type {type} to \type {virtual}. In most cases it's + optional because we look at the \type {commands} entry anyway. +\stopitem +\startitem + Make sure there is at least one valid entry in \type {fonts} (see below), + although recent versions of \LUATEX\ add a default entry when this table is + missing. +\stopitem +\startitem + Add a \type {commands} array to those characters that matter. A virtual + character can itself point to virtual characters but be careful with nesting + as you can create loops and overflow the stack (which often indicates an + error anyway). +\stopitem +\stopitemize + +The presence of the toplevel \type {type} key with the specific value \type +{virtual} will trigger handling of the rest of the special virtual font fields in +the table, but the mere existence of 'type' is enough to prevent \LUATEX\ from +looking for a virtual font on its own. This also works \quote {in reverse}: if +you are absolutely certain that a font is not a virtual font, assigning the value +\type {real} to \type {type} will inhibit \LUATEX\ from looking for a virtual +font file, thereby saving you a disk search. This only matters when we load a +\TFM\ file. + +The \type {fonts} is an (indexed) \LUA\ table. The values are one- or two|-|key +hashes themselves, each entry indicating one of the base fonts in a virtual font. +In case your font is referring to itself, you can use the \type {font.nextid()} +function which returns the index of the next to be defined font which is probably +the currently defined one. So, a table looks like this: + +\starttyping +fonts = { + { name = "ptmr8a", size = 655360 }, + { name = "psyr", size = 600000 }, + { id = 38 } +} +\stoptyping + +The first referenced font (at index~1) in this virtual font is \type {ptrmr8a} +loaded at 10pt, and the second is \type {psyr} loaded at a little over 9pt. The +third one is a previously defined font that is known to \LUATEX\ as font id~38. +The array index numbers are used by the character command definitions that are +part of each character. + +The \type {commands} array is a hash where each item is another small array, +with the first entry representing a command and the extra items being the +parameters to that command. The allowed commands and their arguments are: + +\starttabulate[|l|l|l|p|] +\DB command \BC arguments \BC type \BC description \NC \NR +\TB +\NC \type{font} \NC 1 \NC number \NC select a new font from the local \type {fonts} table \NC \NR +\NC \type{char} \NC 1 \NC number \NC typeset this character number from the current font, + and move right by the character's width \NC \NR +\NC \type{node} \NC 1 \NC node \NC output this node (list), and move right + by the width of this list\NC \NR +\NC \type{slot} \NC 2 \NC 2 numbers \NC a shortcut for the combination of a font and char command\NC \NR +\NC \type{push} \NC 0 \NC \NC save current position\NC \NR +\NC \type{nop} \NC 0 \NC \NC do nothing \NC \NR +\NC \type{pop} \NC 0 \NC \NC pop position \NC \NR +\NC \type{rule} \NC 2 \NC 2 numbers \NC output a rule $ht*wd$, and move right. \NC \NR +\NC \type{down} \NC 1 \NC number \NC move down on the page \NC \NR +\NC \type{right} \NC 1 \NC number \NC move right on the page \NC \NR +\NC \type{special} \NC 1 \NC string \NC output a \prm {special} command \NC \NR +\NC \type{pdf} \NC 2 \NC 2 strings \NC output a \PDF\ literal, the first string is one of \type {origin}, + \type {page}, \type {text}, \type {font}, \type {direct} or \type {raw}; if you + have one string only \type {origin} is assumed \NC \NR +\NC \type{lua} \NC 1 \NC string, + function \NC execute a \LUA\ script when the glyph is embedded; in case of a + function it gets the font id and character code passed \NC \NR +\NC \type{image} \NC 1 \NC image \NC output an image (the argument can be either an \type {} variable or an \type {image_spec} table) \NC \NR +\NC \type{comment} \NC any \NC any \NC the arguments of this command are ignored \NC \NR +\LL +\stoptabulate + +When a font id is set to~0 then it will be replaced by the currently assigned +font id. This prevents the need for hackery with future id's. Normally one could +use \type {font.nextid} but when more complex fonts are built in the meantime +other instances could have been loaded. + +The \type {pdf} option also accepts a \type {mode} keyword in which case the +third argument sets the mode. That option will change the mode in an efficient +way (passing an empty string would result in an extra empty lines in the \PDF\ +file. This option only makes sense for virtual fonts. The \type {font} mode only +makes sense in virtual fonts. Modes are somewhat fuzzy and partially inherited +from \PDFTEX. + +\starttabulate[|l|p|] +\DB mode \BC description \NC \NR +\TB +\NC \type {origin} \NC enter page mode and set the position \NC \NR +\NC \type {page} \NC enter page mode \NC \NR +\NC \type {text} \NC enter text mode \NC \NR +\NC \type {font} \NC enter font mode (kind of text mode, only in virtual fonts) \NC \NR +\NC \type {always} \NC finish the current string and force a transform if needed \NC \NR +\NC \type {raw} \NC finish the current string \NC \NR +\LL +\stoptabulate + +You always need to check what \PDF\ code is generated because there can be all +kind of interferences with optimization in the backend and fonts are complicated +anyway. Here is a rather elaborate glyph commands example using such keys: + +\starttyping +... +commands = { + { "push" }, -- remember where we are + { "right", 5000 }, -- move right about 0.08pt + { "font", 3 }, -- select the fonts[3] entry + { "char", 97 }, -- place character 97 (ASCII 'a') + -- { "slot", 2, 97 }, -- an alternative for the previous two + { "pop" }, -- go all the way back + { "down", -200000 }, -- move upwards by about 3pt + { "special", "pdf: 1 0 0 rg" } -- switch to red color + -- { "pdf", "origin", "1 0 0 rg" } -- switch to red color (alternative) + { "rule", 500000, 20000 } -- draw a bar + { "special", "pdf: 0 g" } -- back to black + -- { "pdf", "origin", "0 g" } -- back to black (alternative) +} +... +\stoptyping + +The default value for \type {font} is always~1 at the start of the +\type {commands} array. Therefore, if the virtual font is essentially only a +re|-|encoding, then you do usually not have created an explicit \quote {font} +command in the array. + +Rules inside of \type {commands} arrays are built up using only two dimensions: +they do not have depth. For correct vertical placement, an extra \type {down} +command may be needed. + +Regardless of the amount of movement you create within the \type {commands}, the +output pointer will always move by exactly the width that was given in the \type +{width} key of the character hash. Any movements that take place inside the \type +{commands} array are ignored on the upper level. + +The special can have a \type {pdf:}, \type {pdf:origin:}, \type {pdf:page:}, +\type {pdf:direct:} or \type {pdf:raw:} prefix. When you have to concatenate +strings using the \type {pdf} command might be more efficient. + +\subsection{Artificial fonts} + +Even in a \quote {real} font, there can be virtual characters. When \LUATEX\ +encounters a \type {commands} field inside a character when it becomes time to +typeset the character, it will interpret the commands, just like for a true +virtual character. In this case, if you have created no \quote {fonts} array, +then the default (and only) \quote {base} font is taken to be the current font +itself. In practice, this means that you can create virtual duplicates of +existing characters which is useful if you want to create composite characters. + +Note: this feature does {\it not\/} work the other way around. There can not be +\quote {real} characters in a virtual font! You cannot use this technique for +font re-encoding either; you need a truly virtual font for that (because +characters that are already present cannot be altered). + +\subsection{Example virtual font} + +\topicindex {fonts+virtual} + +Finally, here is a plain \TEX\ input file with a virtual font demonstration: + +\startbuffer +\directlua { + callback.register('define_font', + function (name,size) + if name == 'cmr10-red' then + local f = font.read_tfm('cmr10',size) + f.name = 'cmr10-red' + f.type = 'virtual' + f.fonts = { + { name = 'cmr10', size = size } + } + for i,v in pairs(f.characters) do + if string.char(i):find('[tacohanshartmut]') then + v.commands = { + { "special", "pdf: 1 0 0 rg" }, + { "char", i }, + { "special", "pdf: 0 g" }, + } + end + end + return f + else + return font.read_tfm(name,size) + end + end + ) +} + +\font\myfont = cmr10-red at 10pt \myfont This is a line of text \par +\font\myfontx = cmr10 at 10pt \myfontx Here is another line of text \par +\stopbuffer + +\typebuffer + +\stopsection + +\startsection[title={The \type {vf} library}] + +The \type {vf} library can be used when \LUA\ code, as defined in the \type +{commands} of the font, is executed. The functions provided are similar as the +commands: \type {char}, \type {down}, \type {fontid}, \type {image}, \type +{node}, \type {nop}, \type {pop}, \type {push}, \type {right}, \nod {rule}, \type +{special} and \type {pdf}. This library has been present for a while but not been +advertised and tested much, if only because it's easy to define an invalid font +(or mess up the \PDF\ stream). Keep in mind that the \LUA\ snippets are executed +each time when a character is output. + +\stopsection + +\startsection[title={The \type {font} library}] + +\topicindex {fonts+library} + +The font library provides the interface into the internals of the font system, +and it also contains helper functions to load traditional \TEX\ font metrics +formats. Other font loading functionality is provided by the \type {fontloader} +library that will be discussed in the next section. + +\subsection{Loading a \TFM\ file} + +\topicindex {fonts+tfm} + +The behaviour documented in this subsection is considered stable in the sense that +there will not be backward|-|incompatible changes any more. + +\startfunctioncall +
fnt = + font.read_tfm( name, s) +\stopfunctioncall + +The number is a bit special: + +\startitemize +\startitem + If it is positive, it specifies an \quote {at size} in scaled points. +\stopitem +\startitem + If it is negative, its absolute value represents a \quote {scaled} + setting relative to the designsize of the font. +\stopitem +\stopitemize + +\subsection{Loading a \VF\ file} + +\topicindex {fonts+vf} + +The behavior documented in this subsection is considered stable in the sense that +there will not be backward-incompatible changes any more. + +\startfunctioncall +
vf_fnt = + font.read_vf( name, s) +\stopfunctioncall + +The meaning of the number \type {s} and the format of the returned table are +similar to the ones in the \type {read_tfm} function. + +\subsection{The fonts array} + +\topicindex {fonts+virtual} + +The whole table of \TEX\ fonts is accessible from \LUA\ using a virtual array. + +\starttyping +font.fonts[n] = { ... } +
f = font.fonts[n] +\stoptyping + +Because this is a virtual array, you cannot call \type {pairs} on it, but see +below for the \type {font.each} iterator. + +The two metatable functions implementing the virtual array are: + +\startfunctioncall +
f = font.getfont( n) +font.setfont( n,
f) +\stopfunctioncall + +Note that at the moment, each access to the \type {font.fonts} or call to \type +{font.getfont} creates a \LUA\ table for the whole font unless you cached it. +This process can be quite slow. + +\startfunctioncall +
p = font.getparameters( n) +\stopfunctioncall + +This one will return a table of the parameters as known to \TEX. These can be +different from the ones in the cached table. + +Also note the following: assignments can only be made to fonts that have already +been defined in \TEX, but have not been accessed {\it at all\/} since that +definition. This limits the usability of the write access to \type {font.fonts} +quite a lot, a less stringent ruleset will likely be implemented later. + +\subsection{Checking a font's status} + +You can test for the status of a font by calling this function: + +\startfunctioncall + f = + font.frozen( n) +\stopfunctioncall + +The return value is one of \type {true} (unassignable), \type {false} (can be +changed) or \type {nil} (not a valid font at all). + +\subsection{Defining a font directly} + +\topicindex {fonts+define} + +You can define your own font into \type {font.fonts} by calling this function: + +\startfunctioncall + i = + font.define(
f) +\stopfunctioncall + +The return value is the internal id number of the defined font (the index into +\type {font.fonts}). If the font creation fails, an error is raised. The table is +a font structure. An alternative call is: + +\startfunctioncall + i = + font.define( n,
f) +\stopfunctioncall + +Where the first argument is a reserved font id (see below). + +\subsection{Extending a font} + +\topicindex {fonts+extend} + +Within reasonable bounds you can extend a font after it has been defined. Because +some properties are best left unchanged this is limited to adding characters. + +\startfunctioncall +font.addcharacters(,
f) +\stopfunctioncall + +The table passed can have the fields \type {characters} which is a (sub)table +like the one used in define, and for virtual fonts a \type {fonts} table can be +added. The characters defined in the \type {characters} table are added (when not +yet present) or replace an existing entry. Keep in mind that replacing can have +side effects because a character already can have been used. Instead of posing +restrictions we expect the user to be careful. (The \type {setfont} helper is +a more drastic replacer.) + +\subsection{Projected next font id} + +\topicindex {fonts+id} + +\startfunctioncall + i = + font.nextid() +\stopfunctioncall + +This returns the font id number that would be returned by a \type {font.define} +call if it was executed at this spot in the code flow. This is useful for virtual +fonts that need to reference themselves. If you pass \type {true} as argument, +the id gets reserved and you can pass to \type {font.define} as first argument. +This can be handy when you create complex virtual fonts. + +\startfunctioncall + i = + font.nextid(true) +\stopfunctioncall + +\subsection{Font ids} + +\topicindex {fonts+id} +\topicindex {fonts+current} + +\startfunctioncall + i = + font.id( csname) +\stopfunctioncall + +This returns the font id associated with \type {csname}, or $-1$ if \type +{csname} is not defined. + +\startfunctioncall + i = + font.max() +\stopfunctioncall + +This is the largest used index in \type {font.fonts}. + +\startfunctioncall + i = font.current() +font.current( i) +\stopfunctioncall + +This gets or sets the currently used font number. + +\subsection{Iterating over all fonts} + +\topicindex {fonts+iterate} + +\startfunctioncall +for i,v in font.each() do + ... +end +\stopfunctioncall + +This is an iterator over each of the defined \TEX\ fonts. The first returned +value is the index in \type {font.fonts}, the second the font itself, as a \LUA\ +table. The indices are listed incrementally, but they do not always form an array +of consecutive numbers: in some cases there can be holes in the sequence. + +\stopsection + +\stopchapter + +\stopcomponent diff --git a/manual/luatex-graphics.tex b/manual/luatex-graphics.tex index 038710cd5..3f12762b6 100644 --- a/manual/luatex-graphics.tex +++ b/manual/luatex-graphics.tex @@ -1,831 +1,831 @@ -% language=uk - -% mp solve_path - -\environment luatex-style - -\startcomponent luatex-graphics - -\startchapter[reference=graphics,title={The graphic libraries}] - -\startsection[title={The \type {img} library}][library=img] - -\topicindex {images} -\topicindex {images+library} -\topicindex {graphics} - -The \type {img} library can be used as an alternative to \orm {pdfximage} and -\orm {pdfrefximage}, and the associated \quote {satellite} commands like \type -{\pdfximagebbox}. Image objects can also be used within virtual fonts via the -\type {image} command listed in~\in {section} [virtualfonts]. - -\subsection{\type {new}} - -\libindex{new} - -\startfunctioncall - var = img.new() - var = img.new(
image_spec) -\stopfunctioncall - -This function creates a userdata object of type \quote {image}. The \type -{image_spec} argument is optional. If it is given, it must be a table, and that -table must contain a \type {filename} key. A number of other keys can also be -useful, these are explained below. - -You can either say - -\starttyping -a = img.new() -\stoptyping - -followed by - -\starttyping -a.filename = "foo.png" -\stoptyping - -or you can put the file name (and some or all of the other keys) into a table -directly, like so: - -\starttyping -a = img.new({filename='foo.pdf', page=1}) -\stoptyping - -The generated \type {} userdata object allows access to a set of -user|-|specified values as well as a set of values that are normally filled in -and updated automatically by \LUATEX\ itself. Some of those are derived from the -actual image file, others are updated to reflect the \PDF\ output status of the -object. - -There is one required user-specified field: the file name (\type {filename}). It -can optionally be augmented by the requested image dimensions (\type {width}, -\type {depth}, \type {height}), user|-|specified image attributes (\type {attr}), -the requested \PDF\ page identifier (\type {page}), the requested boundingbox -(\type {pagebox}) for \PDF\ inclusion, the requested color space object (\type -{colorspace}). - -The function \type {img.new} does not access the actual image file, it just -creates the \type {} userdata object and initializes some memory -structures. The \type {} object and its internal structures are -automatically garbage collected. - -Once the image is scanned, all the values in the \type {} except \type -{width}, \type {height} and \type {depth}, become frozen, and you cannot change -them any more. - -You can use \type {pdf.setignoreunknownimages(1)} (or at the \TEX\ end the \lpr -{pdfvariable} \type {ignoreunknownimages}) to get around a quit when no known -image type is found (based on name or preamble). Beware: this will not catch -invalid images and we cannot guarantee side effects. A zero dimension image is -still included when requested. No special flags are set. A proper workflow will -not rely in such a catch but make sure that images are valid. - -\subsection{\type {fields}} - -\libindex{fields} - -\startfunctioncall -
keys = img.fields() -\stopfunctioncall - -This function returns a list of all the possible \type {image_spec} keys, both -user-supplied and automatic ones. - -\starttabulate[|l|l|p|] -\DB field name \BC type \BC description \NC \NR -\TB -\NC \type{attr} \NC string \NC the image attributes for \LUATEX \NC \NR -\NC \type{bbox} \NC table \NC table with 4 boundingbox dimensions \type - {llx}, \type {lly}, \type {urx} and \type - {ury} overruling the \type {pagebox} entry \NC \NR -\NC \type{colordepth} \NC number \NC the number of bits used by the color space \NC \NR -\NC \type{colorspace} \NC number \NC the color space object number \NC \NR -\NC \type{depth} \NC number \NC the image depth for \LUATEX \NC \NR -\NC \type{filename} \NC string \NC the image file name \NC \NR -\NC \type{filepath} \NC string \NC the full (expanded) file name of the image\NC \NR -\NC \type{height} \NC number \NC the image height for \LUATEX \NC \NR -\NC \type{imagetype} \NC string \NC one of \type {pdf}, \type {png}, \type {jpg}, - \type {jp2} or \type {jbig2} \NC \NR -\NC \type{index} \NC number \NC the \PDF\ image name suffix \NC \NR -\NC \type{objnum} \NC number \NC the \PDF\ image object number \NC \NR -\NC \type{page} \NC number \NC the identifier for the requested image page \NC \NR -\NC \type{pagebox} \NC string \NC the requested bounding box, one of - \type {none}, \type {media}, \type {crop}, - \type {bleed}, \type {trim}, \type {art} \NC \NR -\NC \type{pages} \NC number \NC the total number of available pages \NC \NR -\NC \type{rotation} \NC number \NC the image rotation from included \PDF\ file, - in multiples of 90~deg. \NC \NR -\NC \type{stream} \NC string \NC the raw stream data for an \type {/Xobject} - \type {/Form} object\NC \NR -\NC \type{transform} \NC number \NC the image transform, integer number 0..7 \NC \NR -\NC \type{orientation} \NC number \NC the (jpeg) image orientation, integer number 1..8 - (0 for unset) \NC \NR -\NC \type{width} \NC number \NC the image width for \LUATEX \NC \NR -\NC \type{xres} \NC number \NC the horizontal natural image resolution - (in \DPI) \NC \NR -\NC \type{xsize} \NC number \NC the natural image width \NC \NR -\NC \type{yres} \NC number \NC the vertical natural image resolution - (in \DPI) \NC \NR -\NC \type{ysize} \NC number \NC the natural image height \NC \NR -\NC \type{visiblefilename} \NC string \NC when set, this name will find its way in the - \PDF\ file as \type {PTEX} specification; when - an empty string is assigned nothing is written - to file; otherwise the natural filename is - taken \NC \NR -\NC \type{userpassword} \NC string \NC the userpassword needed for opening a \PDF\ file \NC \NR -\NC \type{ownerpassword} \NC string \NC the ownerpassword needed for opening a \PDF\ file \NC \NR -\NC \type{keepopen} \NC boolean \NC keep the \PDF\ file open \NC \NR -\NC \type{nobbox} \NC boolean \NC don't add a boundingbox specification for streams \NC \NR -\NC \type{nolength} \NC boolean \NC don't add length key nor compress for streams \NC \NR -\NC \type{nosize} \NC boolean \NC don't add size fields for streams \NC \NR -\LL -\stoptabulate - -A running (undefined) dimension in \type {width}, \type {height}, or \type -{depth} is represented as \type {nil} in \LUA, so if you want to load an image at -its \quote {natural} size, you do not have to specify any of those three fields. - -The \type {stream} parameter allows to fabricate an \type {/XObject} \type -{/Form} object from a string giving the stream contents, e.g., for a filled -rectangle: - -\startfunctioncall -a.stream = "0 0 20 10 re f" -\stopfunctioncall - -When writing the image, an \type {/Xobject} \type {/Form} object is created, like -with embedded \PDF\ file writing. The object is written out only once. The \type -{stream} key requires that also the \type {bbox} table is given. The \type -{stream} key conflicts with the \type {filename} key. The \type {transform} key -works as usual also with \type {stream}. - -The \type {bbox} key needs a table with four boundingbox values, e.g.: - -\startfunctioncall -a.bbox = { "30bp", 0, "225bp", "200bp" } -\stopfunctioncall - -This replaces and overrules any given \type {pagebox} value; with given \type -{bbox} the box dimensions coming with an embedded \PDF\ file are ignored. The -\type {xsize} and \type {ysize} dimensions are set accordingly, when the image is -scaled. The \type {bbox} parameter is ignored for non-\PDF\ images. - -The \type {transform} allows to mirror and rotate the image in steps of 90~deg. -The default value~$0$ gives an unmirrored, unrotated image. Values $1-3$ give -counterclockwise rotation by $90$, $180$, or $270$~degrees, whereas with values -$4-7$ the image is first mirrored and then rotated counterclockwise by $90$, -$180$, or $270$~degrees. The \type {transform} operation gives the same visual -result as if you would externally preprocess the image by a graphics tool and -then use it by \LUATEX. If a \PDF\ file to be embedded already contains a \type -{/Rotate} specification, the rotation result is the combination of the \type -{/Rotate} rotation followed by the \type {transform} operation. - -\subsection{\type {scan}} - -\libindex{scan} - -\startfunctioncall - var = img.scan( var) - var = img.scan(
image_spec) -\stopfunctioncall - -When you say \type {img.scan(a)} for a new image, the file is scanned, and -variables such as \type {xsize}, \type {ysize}, image \type {type}, number of -\type {pages}, and the resolution are extracted. Each of the \type {width}, \type -{height}, \type {depth} fields are set up according to the image dimensions, if -they were not given an explicit value already. An image file will never be -scanned more than once for a given image variable. With all subsequent \type -{img.scan(a)} calls only the dimensions are again set up (if they have been -changed by the user in the meantime). - -For ease of use, you can do right-away a - -\starttyping - a = img.scan { filename = "foo.png" } -\stoptyping - -without a prior \type {img.new}. - -Nothing is written yet at this point, so you can do \type {a=img.scan}, retrieve -the available info like image width and height, and then throw away \type {a} -again by saying \type {a=nil}. In that case no image object will be reserved in -the PDF, and the used memory will be cleaned up automatically. - -\subsection{\type {copy}} - -\libindex{copy} - -\startfunctioncall - var = img.copy( var) - var = img.copy(
image_spec) -\stopfunctioncall - -If you say \type {a = b}, then both variables point to the same \type {} -object. if you want to write out an image with different sizes, you can do -\type {b = img.copy(a)}. - -Afterwards, \type {a} and \type {b} still reference the same actual image -dictionary, but the dimensions for \type {b} can now be changed from their -initial values that were just copies from \type {a}. - -\subsection{\type {write}, \type {immediatewrite}, \type {immediatewriteobject}} - -\topicindex {images+injection} -\topicindex {images+immediate} -\topicindex {images+object} - -\libindex{write} -\libindex{immediatewrite} -\libindex{immediatewriteobject} - -\startfunctioncall - var = img.write( var) - var = img.write(
image_spec) -\stopfunctioncall - -By \type {img.write(a)} a \PDF\ object number is allocated, and a rule node of -subtype \type {image} is generated and put into the output list. By this the -image \type {a} is placed into the page stream, and the image file is written out -into an image stream object after the shipping of the current page is finished. - -Again you can do a terse call like - -\starttyping -img.write { filename = "foo.png" } -\stoptyping - -The \type {} variable is returned in case you want it for later -processing. You can also write an object. - -By \type {img.immediatewrite(a)} a \PDF\ object number is allocated, and the -image file for image \type {a} is written out immediately into the \PDF\ file as -an image stream object (like with \prm {immediate}\orm {pdfximage}). The object -number of the image stream dictionary is then available by the \type {objnum} -key. No \type {pdf_refximage} whatsit node is generated. You will need an -\type {img.write(a)} or \type {img.node(a)} call to let the image appear on the -page, or reference it by another trick; else you will have a dangling image -object in the \PDF\ file. - -\startfunctioncall - var = img.immediatewrite( var) - var = img.immediatewrite(
image_spec) -\stopfunctioncall - -Also here you can do a terse call like - -\starttyping -a = img.immediatewrite { filename = "foo.png" } -\stoptyping - -The \type {} variable is returned and you will most likely need it. - -The next function is kind of special as it copies an object from a (\PDF) image -file. This features is experimental and might disappear. - -\startfunctioncall - objnum = img.immediatewriteobject( var, objnum) - objnum = img.immediatewriteobject(
image_spec, objnum) -\stopfunctioncall - -\subsection{\type {node}} - -\libindex{node} - -\startfunctioncall - n = img.node( var) - n = img.node(
image_spec) -\stopfunctioncall - -This function allocates a \PDF\ object number and returns a whatsit node of -subtype \type {pdf_refximage}, filled with the image parameters \type {width}, -\type {height}, \type {depth}, and \type {objnum}. Also here you can do a terse -call like: - -\starttyping -n = img.node ({ filename = "foo.png" }) -\stoptyping - -This example outputs an image: - -\starttyping -node.write(img.node{filename="foo.png"}) -\stoptyping - -\subsection{\type {types}} - -\topicindex {images+types} - -\libindex{types} - -\startfunctioncall -
types = img.types() -\stopfunctioncall - -This function returns a list with the supported image file type names, currently -these are \type {pdf}, \type {png}, \type {jpg}, \type {jp2} (JPEG~2000), and -\type {jbig2}. - -\subsection{\type {boxes}} - -\libindex{boxes} - -\startfunctioncall -
boxes = img.boxes() -\stopfunctioncall - -This function returns a list with the supported \PDF\ page box names, currently -these are \type {media}, \type {crop}, \type {bleed}, \type {trim}, and \type -{art}, all in lowercase. - -The \PDF\ file is kept open after its properties are determined. After inclusion, -which happens when the page that references the image is flushed, the file is -closed. This means that when you have thousands of images on one page, your -operating system might decide to abort the run. When you include more than one -page from a \PDF\ file you can set the \type {keepopen} flag when you allocate an -image object, or pass the \type {keepopen} directive when you refer to the image -with \lpr {useimageresource}. This only makes sense when you embed many pages. -An \prm {immediate} applied to \lpr {saveimageresource} will also force a -close after inclusion. - -\starttyping -\immediate\useimageresource{foo.pdf}% - \saveimageresource \lastsavedimageresourceindex % closed - \useimageresource{foo.pdf}% - \saveimageresource \lastsavedimageresourceindex % kept open - \useimageresource{foo.pdf}% - \saveimageresource keepopen\lastsavedimageresourceindex % kept open - -\directlua{img.write(img.scan{ file = "foo.pdf" })} % closed -\directlua{img.write(img.scan{ file = "foo.pdf", keepopen = true })} % kept open -\stoptyping - -\stopsection - -\startsection[title={The \type {mplib} library}][library=mplib] - -\topicindex {\METAPOST} -\topicindex {\METAPOST+mplib} -\topicindex {images+mplib} -\topicindex {images+\METAPOST} - -\libindex{version} - -The \MP\ library interface registers itself in the table \type {mplib}. It is -based on \MPLIB\ version \ctxlua {context(mplib.version())}. - -\subsection{\type {new}} - -\libindex{new} - -To create a new \METAPOST\ instance, call - -\startfunctioncall - mp = mplib.new({...}) -\stopfunctioncall - -This creates the \type {mp} instance object. The argument hash can have a number -of different fields, as follows: - -\starttabulate[|l|l|pl|pl|] -\DB name \BC type \BC description \BC default \NC \NR -\TB -\NC \type{error_line} \NC number \NC error line width \NC 79 \NC \NR -\NC \type{print_line} \NC number \NC line length in ps output \NC 100 \NC \NR -\NC \type{random_seed} \NC number \NC the initial random seed \NC variable \NC \NR -\NC \type{math_mode} \NC string \NC the number system to use: - \type {scaled}, - \type {double} or - % \type {binary} or - \type {decimal} \NC \type {scaled} \NC \NR -\NC \type{interaction} \NC string \NC the interaction mode: - \type {batch}, - \type {nonstop}, - \type {scroll} or - \type {errorstop} \NC \type {errorstop} \NC \NR -\NC \type{job_name} \NC string \NC \type {--jobname} \NC \type {mpout} \NC \NR -\NC \type{find_file} \NC function \NC a function to find files \NC only local files \NC \NR -\LL -\stoptabulate - -The binary mode is no longer available in the \LUATEX\ version of \MPLIB. It -offers no real advantage and brings a ton of extra libraries with platform -specific properties that we can now avoid. We might introduce a high resolution -scaled variant at some point but only when it pays of performance wise. - -The \type {find_file} function should be of this form: - -\starttyping - found = finder ( name, mode, type) -\stoptyping - -with: - -\starttabulate[|l|p|] -\DB name \BC the requested file \NC \NR -\TB -\NC \type{mode} \NC the file mode: \type {r} or \type {w} \NC \NR -\NC \type{type} \NC the kind of file, one of: \type {mp}, \type {tfm}, \type {map}, - \type {pfb}, \type {enc} \NC \NR -\LL -\stoptabulate - -Return either the full path name of the found file, or \type {nil} if the file -cannot be found. - -Note that the new version of \MPLIB\ no longer uses binary mem files, so the way -to preload a set of macros is simply to start off with an \type {input} command -in the first \type {execute} call. - -When you are processing a snippet of text starting with \type {btex} and -ending with either \type {etex} or \type {verbatimtex}, the \METAPOST\ -\type {texscriptmode} parameter controls how spaces and newlines get honoured. -The default value is~1. Possible values are: - -\starttabulate[|l|p|] -\DB name \BC meaning \NC \NR -\TB -\NC \type {0} \NC no newlines \NC \NR -\NC \type {1} \NC newlines in \type {verbatimtex} \NC \NR -\NC \type {2} \NC newlines in \type {verbatimtex} and \type {etex} \NC \NR -\NC \type {3} \NC no leading and trailing strip in \type {verbatimtex} \NC \NR -\NC \type {4} \NC no leading and trailing strip in \type {verbatimtex} and \type {btex} \NC \NR -\LL -\stoptabulate - -That way the \LUA\ handler (assigned to \type {make_text}) can do what it likes. -An \type {etex} has to be followed by a space or \type {;} or be at the end of a -line and preceded by a space or at the beginning of a line. - -\subsection{\type {statistics}} - -\libindex{statistics} - -You can request statistics with: - -\startfunctioncall -
stats = mp:statistics() -\stopfunctioncall - -This function returns the vital statistics for an \MPLIB\ instance. There are -four fields, giving the maximum number of used items in each of four allocated -object classes: - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{main_memory} \NC number \NC memory size \NC \NR -\NC \type{hash_size} \NC number \NC hash size\NC \NR -\NC \type{param_size} \NC number \NC simultaneous macro parameters\NC \NR -\NC \type{max_in_open} \NC number \NC input file nesting levels\NC \NR -\LL -\stoptabulate - -Note that in the new version of \MPLIB, this is informational only. The objects -are all allocated dynamically, so there is no chance of running out of space -unless the available system memory is exhausted. - -\subsection{\type {execute}} - -\libindex{execute} - -You can ask the \METAPOST\ interpreter to run a chunk of code by calling - -\startfunctioncall -
rettable = execute(mp,"metapost code") -\stopfunctioncall - -for various bits of \METAPOST\ language input. Be sure to check the \type -{rettable.status} (see below) because when a fatal \METAPOST\ error occurs the -\MPLIB\ instance will become unusable thereafter. - -Generally speaking, it is best to keep your chunks small, but beware that all -chunks have to obey proper syntax, like each of them is a small file. For -instance, you cannot split a single statement over multiple chunks. - -In contrast with the normal stand alone \type {mpost} command, there is -\notabene {no} implied \quote{input} at the start of the first chunk. - -\subsection{\type {finish}} - -\libindex{finish} - -\startfunctioncall -
rettable = finish(mp) -\stopfunctioncall - -If for some reason you want to stop using an \MPLIB\ instance while processing is -not yet actually done, you can call \type finish}. Eventually, used memory -will be freed and open files will be closed by the \LUA\ garbage collector, but -an explicit \type finish} is the only way to capture the final part of the -output streams. - -\subsection{Result table} - -\libindex {fields} - -The return value of \type {execute} and \type {finish} is a table with a -few possible keys (only \type {status} is always guaranteed to be present). - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{log} \NC string \NC output to the \quote {log} stream \NC \NR -\NC \type{term} \NC string \NC output to the \quote {term} stream \NC \NR -\NC \type{error} \NC string \NC output to the \quote {error} stream - (only used for \quote {out of memory}) \NC \NR -\NC \type{status} \NC number \NC the return value: - \type {0} = good, - \type {1} = warning, - \type {2} = errors, - \type {3} = fatal error \NC \NR -\NC \type{fig} \NC table \NC an array of generated figures (if any) \NC \NR -\LL -\stoptabulate - -When \type {status} equals~3, you should stop using this \MPLIB\ instance -immediately, it is no longer capable of processing input. - -If it is present, each of the entries in the \type {fig} array is a userdata -representing a figure object, and each of those has a number of object methods -you can call: - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{boundingbox} \NC function \NC returns the bounding box, as an array of 4 - values \NC \NR -\NC \type{postscript} \NC function \NC returns a string that is the ps output of the - \type {fig}. this function accepts two optional - integer arguments for specifying the values of - \type {prologues} (first argument) and \type - {procset} (second argument) \NC \NR -\NC \type{svg} \NC function \NC returns a string that is the svg output of the - \type {fig}. This function accepts an optional - integer argument for specifying the value of - \type {prologues} \NC \NR -\NC \type{objects} \NC function \NC returns the actual array of graphic objects in - this \type {fig} \NC \NR -\NC \type{copy_objects} \NC function \NC returns a deep copy of the array of graphic - objects in this \type {fig} \NC \NR -\NC \type{filename} \NC function \NC the filename this \type {fig}'s \POSTSCRIPT\ - output would have written to in stand alone - mode \NC \NR -\NC \type{width} \NC function \NC the \type {fontcharwd} value \NC \NR -\NC \type{height} \NC function \NC the \type {fontcharht} value \NC \NR -\NC \type{depth} \NC function \NC the \type {fontchardp} value \NC \NR -\NC \type{italcorr} \NC function \NC the \type {fontcharit} value \NC \NR -\NC \type{charcode} \NC function \NC the (rounded) \type {charcode} value \NC \NR -\LL -\stoptabulate - -Note: you can call \type {fig:objects()} only once for any one \type {fig} -object! - -When the boundingbox represents a \quote {negated rectangle}, i.e.\ when the -first set of coordinates is larger than the second set, the picture is empty. - -Graphical objects come in various types that each has a different list of -accessible values. The types are: \type {fill}, \type {outline}, \type {text}, -\type {start_clip}, \type {stop_clip}, \type {start_bounds}, \type {stop_bounds}, -\type {special}. - -There is a helper function (\type {mplib.fields(obj)}) to get the list of -accessible values for a particular object, but you can just as easily use the -tables given below. - -All graphical objects have a field \type {type} that gives the object type as a -string value; it is not explicit mentioned in the following tables. In the -following, \type {number}s are \POSTSCRIPT\ points represented as a floating -point number, unless stated otherwise. Field values that are of type \type -{table} are explained in the next section. - -\subsubsection{fill} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{path} \NC table \NC the list of knots \NC \NR -\NC \type{htap} \NC table \NC the list of knots for the reversed trajectory \NC \NR -\NC \type{pen} \NC table \NC knots of the pen \NC \NR -\NC \type{color} \NC table \NC the object's color \NC \NR -\NC \type{linejoin} \NC number \NC line join style (bare number)\NC \NR -\NC \type{miterlimit} \NC number \NC miterlimit\NC \NR -\NC \type{prescript} \NC string \NC the prescript text \NC \NR -\NC \type{postscript} \NC string \NC the postscript text \NC \NR -\LL -\stoptabulate - -The entries \type {htap} and \type {pen} are optional. - -\subsubsection{outline} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{path} \NC table \NC the list of knots \NC \NR -\NC \type{pen} \NC table \NC knots of the pen \NC \NR -\NC \type{color} \NC table \NC the object's color \NC \NR -\NC \type{linejoin} \NC number \NC line join style (bare number) \NC \NR -\NC \type{miterlimit} \NC number \NC miterlimit \NC \NR -\NC \type{linecap} \NC number \NC line cap style (bare number) \NC \NR -\NC \type{dash} \NC table \NC representation of a dash list \NC \NR -\NC \type{prescript} \NC string \NC the prescript text \NC \NR -\NC \type{postscript} \NC string \NC the postscript text \NC \NR -\LL -\stoptabulate - -The entry \type {dash} is optional. - -\subsubsection{text} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{text} \NC string \NC the text \NC \NR -\NC \type{font} \NC string \NC font tfm name \NC \NR -\NC \type{dsize} \NC number \NC font size \NC \NR -\NC \type{color} \NC table \NC the object's color \NC \NR -\NC \type{width} \NC number \NC \NC \NR -\NC \type{height} \NC number \NC \NC \NR -\NC \type{depth} \NC number \NC \NC \NR -\NC \type{transform} \NC table \NC a text transformation \NC \NR -\NC \type{prescript} \NC string \NC the prescript text \NC \NR -\NC \type{postscript} \NC string \NC the postscript text \NC \NR -\LL -\stoptabulate - -\subsubsection{special} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{prescript} \NC string \NC special text \NC \NR -\LL -\stoptabulate - -\subsubsection{start_bounds, start_clip} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{path} \NC table \NC the list of knots \NC \NR -\LL -\stoptabulate - -\subsubsection{stop_bounds, stop_clip} - -Here are no fields available. - -\subsection{Subsidiary table formats} - -\subsubsection{Paths and pens} - -Paths and pens (that are really just a special type of paths as far as \MPLIB\ is -concerned) are represented by an array where each entry is a table that -represents a knot. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{left_type} \NC string \NC when present: endpoint, but usually absent \NC \NR -\NC \type{right_type} \NC string \NC like \type {left_type} \NC \NR -\NC \type{x_coord} \NC number \NC X coordinate of this knot \NC \NR -\NC \type{y_coord} \NC number \NC Y coordinate of this knot \NC \NR -\NC \type{left_x} \NC number \NC X coordinate of the precontrol point of this knot \NC \NR -\NC \type{left_y} \NC number \NC Y coordinate of the precontrol point of this knot \NC \NR -\NC \type{right_x} \NC number \NC X coordinate of the postcontrol point of this knot \NC \NR -\NC \type{right_y} \NC number \NC Y coordinate of the postcontrol point of this knot \NC \NR -\LL -\stoptabulate - -There is one special case: pens that are (possibly transformed) ellipses have an -extra string-valued key \type {type} with value \type {elliptical} besides the -array part containing the knot list. - -\subsubsection{Colors} - -A color is an integer array with 0, 1, 3 or 4 values: - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{0} \NC marking only \NC no values \NC \NR -\NC \type{1} \NC greyscale \NC one value in the range $(0,1)$, \quote {black} is $0$ \NC \NR -\NC \type{3} \NC \RGB \NC three values in the range $(0,1)$, \quote {black} is $0,0,0$ \NC \NR -\NC \type{4} \NC \CMYK \NC four values in the range $(0,1)$, \quote {black} is $0,0,0,1$ \NC \NR -\LL -\stoptabulate - -If the color model of the internal object was \type {uninitialized}, then it was -initialized to the values representing \quote {black} in the colorspace \type -{defaultcolormodel} that was in effect at the time of the \type {shipout}. - -\subsubsection{Transforms} - -Each transform is a six|-|item array. - -\starttabulate[|l|l|p|] -\DB index \BC type \BC explanation \NC \NR -\TB -\NC \type{1} \NC number \NC represents x \NC \NR -\NC \type{2} \NC number \NC represents y \NC \NR -\NC \type{3} \NC number \NC represents xx \NC \NR -\NC \type{4} \NC number \NC represents yx \NC \NR -\NC \type{5} \NC number \NC represents xy \NC \NR -\NC \type{6} \NC number \NC represents yy \NC \NR -\LL -\stoptabulate - -Note that the translation (index 1 and 2) comes first. This differs from the -ordering in \POSTSCRIPT, where the translation comes last. - -\subsubsection{Dashes} - -Each \type {dash} is two-item hash, using the same model as \POSTSCRIPT\ for the -representation of the dashlist. \type {dashes} is an array of \quote {on} and -\quote {off}, values, and \type {offset} is the phase of the pattern. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{dashes} \NC hash \NC an array of on-off numbers \NC \NR -\NC \type{offset} \NC number \NC the starting offset value \NC \NR -\LL -\stoptabulate - -\subsection{Pens and \type {pen_info}} - -\libindex{pen_info} - -There is helper function (\type {pen_info(obj)}) that returns a table containing -a bunch of vital characteristics of the used pen (all values are floats): - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{width} \NC number \NC width of the pen \NC \NR -\NC \type{sx} \NC number \NC $x$ scale \NC \NR -\NC \type{rx} \NC number \NC $xy$ multiplier \NC \NR -\NC \type{ry} \NC number \NC $yx$ multiplier \NC \NR -\NC \type{sy} \NC number \NC $y$ scale \NC \NR -\NC \type{tx} \NC number \NC $x$ offset \NC \NR -\NC \type{ty} \NC number \NC $y$ offset \NC \NR -\LL -\stoptabulate - -\subsection{Character size information} - -These functions find the size of a glyph in a defined font. The \type {fontname} -is the same name as the argument to \type {infont}; the \type {char} is a glyph -id in the range 0 to 255; the returned \type {w} is in AFM units. - -\subsubsection{\type {char_width}} - -\libindex{char_width} - -\startfunctioncall - w = char_width(mp, fontname, char) -\stopfunctioncall - -\subsubsection{\type {char_height}} - -\libindex{char_height} - -\startfunctioncall - w = char_height(mp, fontname, char) -\stopfunctioncall - -\subsubsection{\type {char_depth}} - -\libindex{char_depth} - -\startfunctioncall - w = char_depth(mp, fontname, char) -\stopfunctioncall - -\subsubsection{\type {get_[boolean|numeric|string|path]}} - -\libindex{get_boolean} -\libindex{get_numeric} -\libindex{get_path} -\libindex{get_string} - -When a script call brings you from the \METAPOST\ run (temporarily) back to -\LUA\ you can access variables, but only if they are known (so for instance -anonymous capsules like loop variables are not accessible). - -\startfunctioncall - w = get_boolean(mp, name) - n = get_numeric(mp, name) - s = get_string (mp, name) -
p = get_path (mp, name) -\stopfunctioncall - -The path is returned a a table with subtables that have six numbers: the -coordinates of the point, pre- and postcontrol. A \type {cycle} fields indicates -if a path is cyclic. - -\stopsection - -\stopchapter +% language=uk + +% mp solve_path + +\environment luatex-style + +\startcomponent luatex-graphics + +\startchapter[reference=graphics,title={The graphic libraries}] + +\startsection[title={The \type {img} library}][library=img] + +\topicindex {images} +\topicindex {images+library} +\topicindex {graphics} + +The \type {img} library can be used as an alternative to \orm {pdfximage} and +\orm {pdfrefximage}, and the associated \quote {satellite} commands like \type +{\pdfximagebbox}. Image objects can also be used within virtual fonts via the +\type {image} command listed in~\in {section} [virtualfonts]. + +\subsection{\type {new}} + +\libindex{new} + +\startfunctioncall + var = img.new() + var = img.new(
image_spec) +\stopfunctioncall + +This function creates a userdata object of type \quote {image}. The \type +{image_spec} argument is optional. If it is given, it must be a table, and that +table must contain a \type {filename} key. A number of other keys can also be +useful, these are explained below. + +You can either say + +\starttyping +a = img.new() +\stoptyping + +followed by + +\starttyping +a.filename = "foo.png" +\stoptyping + +or you can put the file name (and some or all of the other keys) into a table +directly, like so: + +\starttyping +a = img.new({filename='foo.pdf', page=1}) +\stoptyping + +The generated \type {} userdata object allows access to a set of +user|-|specified values as well as a set of values that are normally filled in +and updated automatically by \LUATEX\ itself. Some of those are derived from the +actual image file, others are updated to reflect the \PDF\ output status of the +object. + +There is one required user-specified field: the file name (\type {filename}). It +can optionally be augmented by the requested image dimensions (\type {width}, +\type {depth}, \type {height}), user|-|specified image attributes (\type {attr}), +the requested \PDF\ page identifier (\type {page}), the requested boundingbox +(\type {pagebox}) for \PDF\ inclusion, the requested color space object (\type +{colorspace}). + +The function \type {img.new} does not access the actual image file, it just +creates the \type {} userdata object and initializes some memory +structures. The \type {} object and its internal structures are +automatically garbage collected. + +Once the image is scanned, all the values in the \type {} except \type +{width}, \type {height} and \type {depth}, become frozen, and you cannot change +them any more. + +You can use \type {pdf.setignoreunknownimages(1)} (or at the \TEX\ end the \lpr +{pdfvariable} \type {ignoreunknownimages}) to get around a quit when no known +image type is found (based on name or preamble). Beware: this will not catch +invalid images and we cannot guarantee side effects. A zero dimension image is +still included when requested. No special flags are set. A proper workflow will +not rely in such a catch but make sure that images are valid. + +\subsection{\type {fields}} + +\libindex{fields} + +\startfunctioncall +
keys = img.fields() +\stopfunctioncall + +This function returns a list of all the possible \type {image_spec} keys, both +user-supplied and automatic ones. + +\starttabulate[|l|l|p|] +\DB field name \BC type \BC description \NC \NR +\TB +\NC \type{attr} \NC string \NC the image attributes for \LUATEX \NC \NR +\NC \type{bbox} \NC table \NC table with 4 boundingbox dimensions \type + {llx}, \type {lly}, \type {urx} and \type + {ury} overruling the \type {pagebox} entry \NC \NR +\NC \type{colordepth} \NC number \NC the number of bits used by the color space \NC \NR +\NC \type{colorspace} \NC number \NC the color space object number \NC \NR +\NC \type{depth} \NC number \NC the image depth for \LUATEX \NC \NR +\NC \type{filename} \NC string \NC the image file name \NC \NR +\NC \type{filepath} \NC string \NC the full (expanded) file name of the image\NC \NR +\NC \type{height} \NC number \NC the image height for \LUATEX \NC \NR +\NC \type{imagetype} \NC string \NC one of \type {pdf}, \type {png}, \type {jpg}, + \type {jp2} or \type {jbig2} \NC \NR +\NC \type{index} \NC number \NC the \PDF\ image name suffix \NC \NR +\NC \type{objnum} \NC number \NC the \PDF\ image object number \NC \NR +\NC \type{page} \NC number \NC the identifier for the requested image page \NC \NR +\NC \type{pagebox} \NC string \NC the requested bounding box, one of + \type {none}, \type {media}, \type {crop}, + \type {bleed}, \type {trim}, \type {art} \NC \NR +\NC \type{pages} \NC number \NC the total number of available pages \NC \NR +\NC \type{rotation} \NC number \NC the image rotation from included \PDF\ file, + in multiples of 90~deg. \NC \NR +\NC \type{stream} \NC string \NC the raw stream data for an \type {/Xobject} + \type {/Form} object\NC \NR +\NC \type{transform} \NC number \NC the image transform, integer number 0..7 \NC \NR +\NC \type{orientation} \NC number \NC the (jpeg) image orientation, integer number 1..8 + (0 for unset) \NC \NR +\NC \type{width} \NC number \NC the image width for \LUATEX \NC \NR +\NC \type{xres} \NC number \NC the horizontal natural image resolution + (in \DPI) \NC \NR +\NC \type{xsize} \NC number \NC the natural image width \NC \NR +\NC \type{yres} \NC number \NC the vertical natural image resolution + (in \DPI) \NC \NR +\NC \type{ysize} \NC number \NC the natural image height \NC \NR +\NC \type{visiblefilename} \NC string \NC when set, this name will find its way in the + \PDF\ file as \type {PTEX} specification; when + an empty string is assigned nothing is written + to file; otherwise the natural filename is + taken \NC \NR +\NC \type{userpassword} \NC string \NC the userpassword needed for opening a \PDF\ file \NC \NR +\NC \type{ownerpassword} \NC string \NC the ownerpassword needed for opening a \PDF\ file \NC \NR +\NC \type{keepopen} \NC boolean \NC keep the \PDF\ file open \NC \NR +\NC \type{nobbox} \NC boolean \NC don't add a boundingbox specification for streams \NC \NR +\NC \type{nolength} \NC boolean \NC don't add length key nor compress for streams \NC \NR +\NC \type{nosize} \NC boolean \NC don't add size fields for streams \NC \NR +\LL +\stoptabulate + +A running (undefined) dimension in \type {width}, \type {height}, or \type +{depth} is represented as \type {nil} in \LUA, so if you want to load an image at +its \quote {natural} size, you do not have to specify any of those three fields. + +The \type {stream} parameter allows to fabricate an \type {/XObject} \type +{/Form} object from a string giving the stream contents, e.g., for a filled +rectangle: + +\startfunctioncall +a.stream = "0 0 20 10 re f" +\stopfunctioncall + +When writing the image, an \type {/Xobject} \type {/Form} object is created, like +with embedded \PDF\ file writing. The object is written out only once. The \type +{stream} key requires that also the \type {bbox} table is given. The \type +{stream} key conflicts with the \type {filename} key. The \type {transform} key +works as usual also with \type {stream}. + +The \type {bbox} key needs a table with four boundingbox values, e.g.: + +\startfunctioncall +a.bbox = { "30bp", 0, "225bp", "200bp" } +\stopfunctioncall + +This replaces and overrules any given \type {pagebox} value; with given \type +{bbox} the box dimensions coming with an embedded \PDF\ file are ignored. The +\type {xsize} and \type {ysize} dimensions are set accordingly, when the image is +scaled. The \type {bbox} parameter is ignored for non-\PDF\ images. + +The \type {transform} allows to mirror and rotate the image in steps of 90~deg. +The default value~$0$ gives an unmirrored, unrotated image. Values $1-3$ give +counterclockwise rotation by $90$, $180$, or $270$~degrees, whereas with values +$4-7$ the image is first mirrored and then rotated counterclockwise by $90$, +$180$, or $270$~degrees. The \type {transform} operation gives the same visual +result as if you would externally preprocess the image by a graphics tool and +then use it by \LUATEX. If a \PDF\ file to be embedded already contains a \type +{/Rotate} specification, the rotation result is the combination of the \type +{/Rotate} rotation followed by the \type {transform} operation. + +\subsection{\type {scan}} + +\libindex{scan} + +\startfunctioncall + var = img.scan( var) + var = img.scan(
image_spec) +\stopfunctioncall + +When you say \type {img.scan(a)} for a new image, the file is scanned, and +variables such as \type {xsize}, \type {ysize}, image \type {type}, number of +\type {pages}, and the resolution are extracted. Each of the \type {width}, \type +{height}, \type {depth} fields are set up according to the image dimensions, if +they were not given an explicit value already. An image file will never be +scanned more than once for a given image variable. With all subsequent \type +{img.scan(a)} calls only the dimensions are again set up (if they have been +changed by the user in the meantime). + +For ease of use, you can do right-away a + +\starttyping + a = img.scan { filename = "foo.png" } +\stoptyping + +without a prior \type {img.new}. + +Nothing is written yet at this point, so you can do \type {a=img.scan}, retrieve +the available info like image width and height, and then throw away \type {a} +again by saying \type {a=nil}. In that case no image object will be reserved in +the PDF, and the used memory will be cleaned up automatically. + +\subsection{\type {copy}} + +\libindex{copy} + +\startfunctioncall + var = img.copy( var) + var = img.copy(
image_spec) +\stopfunctioncall + +If you say \type {a = b}, then both variables point to the same \type {} +object. if you want to write out an image with different sizes, you can do +\type {b = img.copy(a)}. + +Afterwards, \type {a} and \type {b} still reference the same actual image +dictionary, but the dimensions for \type {b} can now be changed from their +initial values that were just copies from \type {a}. + +\subsection{\type {write}, \type {immediatewrite}, \type {immediatewriteobject}} + +\topicindex {images+injection} +\topicindex {images+immediate} +\topicindex {images+object} + +\libindex{write} +\libindex{immediatewrite} +\libindex{immediatewriteobject} + +\startfunctioncall + var = img.write( var) + var = img.write(
image_spec) +\stopfunctioncall + +By \type {img.write(a)} a \PDF\ object number is allocated, and a rule node of +subtype \type {image} is generated and put into the output list. By this the +image \type {a} is placed into the page stream, and the image file is written out +into an image stream object after the shipping of the current page is finished. + +Again you can do a terse call like + +\starttyping +img.write { filename = "foo.png" } +\stoptyping + +The \type {} variable is returned in case you want it for later +processing. You can also write an object. + +By \type {img.immediatewrite(a)} a \PDF\ object number is allocated, and the +image file for image \type {a} is written out immediately into the \PDF\ file as +an image stream object (like with \prm {immediate}\orm {pdfximage}). The object +number of the image stream dictionary is then available by the \type {objnum} +key. No \type {pdf_refximage} whatsit node is generated. You will need an +\type {img.write(a)} or \type {img.node(a)} call to let the image appear on the +page, or reference it by another trick; else you will have a dangling image +object in the \PDF\ file. + +\startfunctioncall + var = img.immediatewrite( var) + var = img.immediatewrite(
image_spec) +\stopfunctioncall + +Also here you can do a terse call like + +\starttyping +a = img.immediatewrite { filename = "foo.png" } +\stoptyping + +The \type {} variable is returned and you will most likely need it. + +The next function is kind of special as it copies an object from a (\PDF) image +file. This features is experimental and might disappear. + +\startfunctioncall + objnum = img.immediatewriteobject( var, objnum) + objnum = img.immediatewriteobject(
image_spec, objnum) +\stopfunctioncall + +\subsection{\type {node}} + +\libindex{node} + +\startfunctioncall + n = img.node( var) + n = img.node(
image_spec) +\stopfunctioncall + +This function allocates a \PDF\ object number and returns a whatsit node of +subtype \type {pdf_refximage}, filled with the image parameters \type {width}, +\type {height}, \type {depth}, and \type {objnum}. Also here you can do a terse +call like: + +\starttyping +n = img.node ({ filename = "foo.png" }) +\stoptyping + +This example outputs an image: + +\starttyping +node.write(img.node{filename="foo.png"}) +\stoptyping + +\subsection{\type {types}} + +\topicindex {images+types} + +\libindex{types} + +\startfunctioncall +
types = img.types() +\stopfunctioncall + +This function returns a list with the supported image file type names, currently +these are \type {pdf}, \type {png}, \type {jpg}, \type {jp2} (JPEG~2000), and +\type {jbig2}. + +\subsection{\type {boxes}} + +\libindex{boxes} + +\startfunctioncall +
boxes = img.boxes() +\stopfunctioncall + +This function returns a list with the supported \PDF\ page box names, currently +these are \type {media}, \type {crop}, \type {bleed}, \type {trim}, and \type +{art}, all in lowercase. + +The \PDF\ file is kept open after its properties are determined. After inclusion, +which happens when the page that references the image is flushed, the file is +closed. This means that when you have thousands of images on one page, your +operating system might decide to abort the run. When you include more than one +page from a \PDF\ file you can set the \type {keepopen} flag when you allocate an +image object, or pass the \type {keepopen} directive when you refer to the image +with \lpr {useimageresource}. This only makes sense when you embed many pages. +An \prm {immediate} applied to \lpr {saveimageresource} will also force a +close after inclusion. + +\starttyping +\immediate\useimageresource{foo.pdf}% + \saveimageresource \lastsavedimageresourceindex % closed + \useimageresource{foo.pdf}% + \saveimageresource \lastsavedimageresourceindex % kept open + \useimageresource{foo.pdf}% + \saveimageresource keepopen\lastsavedimageresourceindex % kept open + +\directlua{img.write(img.scan{ file = "foo.pdf" })} % closed +\directlua{img.write(img.scan{ file = "foo.pdf", keepopen = true })} % kept open +\stoptyping + +\stopsection + +\startsection[title={The \type {mplib} library}][library=mplib] + +\topicindex {\METAPOST} +\topicindex {\METAPOST+mplib} +\topicindex {images+mplib} +\topicindex {images+\METAPOST} + +\libindex{version} + +The \MP\ library interface registers itself in the table \type {mplib}. It is +based on \MPLIB\ version \ctxlua {context(mplib.version())}. + +\subsection{\type {new}} + +\libindex{new} + +To create a new \METAPOST\ instance, call + +\startfunctioncall + mp = mplib.new({...}) +\stopfunctioncall + +This creates the \type {mp} instance object. The argument hash can have a number +of different fields, as follows: + +\starttabulate[|l|l|pl|pl|] +\DB name \BC type \BC description \BC default \NC \NR +\TB +\NC \type{error_line} \NC number \NC error line width \NC 79 \NC \NR +\NC \type{print_line} \NC number \NC line length in ps output \NC 100 \NC \NR +\NC \type{random_seed} \NC number \NC the initial random seed \NC variable \NC \NR +\NC \type{math_mode} \NC string \NC the number system to use: + \type {scaled}, + \type {double} or + % \type {binary} or + \type {decimal} \NC \type {scaled} \NC \NR +\NC \type{interaction} \NC string \NC the interaction mode: + \type {batch}, + \type {nonstop}, + \type {scroll} or + \type {errorstop} \NC \type {errorstop} \NC \NR +\NC \type{job_name} \NC string \NC \type {--jobname} \NC \type {mpout} \NC \NR +\NC \type{find_file} \NC function \NC a function to find files \NC only local files \NC \NR +\LL +\stoptabulate + +The binary mode is no longer available in the \LUATEX\ version of \MPLIB. It +offers no real advantage and brings a ton of extra libraries with platform +specific properties that we can now avoid. We might introduce a high resolution +scaled variant at some point but only when it pays of performance wise. + +The \type {find_file} function should be of this form: + +\starttyping + found = finder ( name, mode, type) +\stoptyping + +with: + +\starttabulate[|l|p|] +\DB name \BC the requested file \NC \NR +\TB +\NC \type{mode} \NC the file mode: \type {r} or \type {w} \NC \NR +\NC \type{type} \NC the kind of file, one of: \type {mp}, \type {tfm}, \type {map}, + \type {pfb}, \type {enc} \NC \NR +\LL +\stoptabulate + +Return either the full path name of the found file, or \type {nil} if the file +cannot be found. + +Note that the new version of \MPLIB\ no longer uses binary mem files, so the way +to preload a set of macros is simply to start off with an \type {input} command +in the first \type {execute} call. + +When you are processing a snippet of text starting with \type {btex} and +ending with either \type {etex} or \type {verbatimtex}, the \METAPOST\ +\type {texscriptmode} parameter controls how spaces and newlines get honoured. +The default value is~1. Possible values are: + +\starttabulate[|l|p|] +\DB name \BC meaning \NC \NR +\TB +\NC \type {0} \NC no newlines \NC \NR +\NC \type {1} \NC newlines in \type {verbatimtex} \NC \NR +\NC \type {2} \NC newlines in \type {verbatimtex} and \type {etex} \NC \NR +\NC \type {3} \NC no leading and trailing strip in \type {verbatimtex} \NC \NR +\NC \type {4} \NC no leading and trailing strip in \type {verbatimtex} and \type {btex} \NC \NR +\LL +\stoptabulate + +That way the \LUA\ handler (assigned to \type {make_text}) can do what it likes. +An \type {etex} has to be followed by a space or \type {;} or be at the end of a +line and preceded by a space or at the beginning of a line. + +\subsection{\type {statistics}} + +\libindex{statistics} + +You can request statistics with: + +\startfunctioncall +
stats = mp:statistics() +\stopfunctioncall + +This function returns the vital statistics for an \MPLIB\ instance. There are +four fields, giving the maximum number of used items in each of four allocated +object classes: + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{main_memory} \NC number \NC memory size \NC \NR +\NC \type{hash_size} \NC number \NC hash size\NC \NR +\NC \type{param_size} \NC number \NC simultaneous macro parameters\NC \NR +\NC \type{max_in_open} \NC number \NC input file nesting levels\NC \NR +\LL +\stoptabulate + +Note that in the new version of \MPLIB, this is informational only. The objects +are all allocated dynamically, so there is no chance of running out of space +unless the available system memory is exhausted. + +\subsection{\type {execute}} + +\libindex{execute} + +You can ask the \METAPOST\ interpreter to run a chunk of code by calling + +\startfunctioncall +
rettable = execute(mp,"metapost code") +\stopfunctioncall + +for various bits of \METAPOST\ language input. Be sure to check the \type +{rettable.status} (see below) because when a fatal \METAPOST\ error occurs the +\MPLIB\ instance will become unusable thereafter. + +Generally speaking, it is best to keep your chunks small, but beware that all +chunks have to obey proper syntax, like each of them is a small file. For +instance, you cannot split a single statement over multiple chunks. + +In contrast with the normal stand alone \type {mpost} command, there is +\notabene {no} implied \quote{input} at the start of the first chunk. + +\subsection{\type {finish}} + +\libindex{finish} + +\startfunctioncall +
rettable = finish(mp) +\stopfunctioncall + +If for some reason you want to stop using an \MPLIB\ instance while processing is +not yet actually done, you can call \type finish}. Eventually, used memory +will be freed and open files will be closed by the \LUA\ garbage collector, but +an explicit \type finish} is the only way to capture the final part of the +output streams. + +\subsection{Result table} + +\libindex {fields} + +The return value of \type {execute} and \type {finish} is a table with a +few possible keys (only \type {status} is always guaranteed to be present). + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{log} \NC string \NC output to the \quote {log} stream \NC \NR +\NC \type{term} \NC string \NC output to the \quote {term} stream \NC \NR +\NC \type{error} \NC string \NC output to the \quote {error} stream + (only used for \quote {out of memory}) \NC \NR +\NC \type{status} \NC number \NC the return value: + \type {0} = good, + \type {1} = warning, + \type {2} = errors, + \type {3} = fatal error \NC \NR +\NC \type{fig} \NC table \NC an array of generated figures (if any) \NC \NR +\LL +\stoptabulate + +When \type {status} equals~3, you should stop using this \MPLIB\ instance +immediately, it is no longer capable of processing input. + +If it is present, each of the entries in the \type {fig} array is a userdata +representing a figure object, and each of those has a number of object methods +you can call: + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{boundingbox} \NC function \NC returns the bounding box, as an array of 4 + values \NC \NR +\NC \type{postscript} \NC function \NC returns a string that is the ps output of the + \type {fig}. this function accepts two optional + integer arguments for specifying the values of + \type {prologues} (first argument) and \type + {procset} (second argument) \NC \NR +\NC \type{svg} \NC function \NC returns a string that is the svg output of the + \type {fig}. This function accepts an optional + integer argument for specifying the value of + \type {prologues} \NC \NR +\NC \type{objects} \NC function \NC returns the actual array of graphic objects in + this \type {fig} \NC \NR +\NC \type{copy_objects} \NC function \NC returns a deep copy of the array of graphic + objects in this \type {fig} \NC \NR +\NC \type{filename} \NC function \NC the filename this \type {fig}'s \POSTSCRIPT\ + output would have written to in stand alone + mode \NC \NR +\NC \type{width} \NC function \NC the \type {fontcharwd} value \NC \NR +\NC \type{height} \NC function \NC the \type {fontcharht} value \NC \NR +\NC \type{depth} \NC function \NC the \type {fontchardp} value \NC \NR +\NC \type{italcorr} \NC function \NC the \type {fontcharit} value \NC \NR +\NC \type{charcode} \NC function \NC the (rounded) \type {charcode} value \NC \NR +\LL +\stoptabulate + +Note: you can call \type {fig:objects()} only once for any one \type {fig} +object! + +When the boundingbox represents a \quote {negated rectangle}, i.e.\ when the +first set of coordinates is larger than the second set, the picture is empty. + +Graphical objects come in various types that each has a different list of +accessible values. The types are: \type {fill}, \type {outline}, \type {text}, +\type {start_clip}, \type {stop_clip}, \type {start_bounds}, \type {stop_bounds}, +\type {special}. + +There is a helper function (\type {mplib.fields(obj)}) to get the list of +accessible values for a particular object, but you can just as easily use the +tables given below. + +All graphical objects have a field \type {type} that gives the object type as a +string value; it is not explicit mentioned in the following tables. In the +following, \type {number}s are \POSTSCRIPT\ points represented as a floating +point number, unless stated otherwise. Field values that are of type \type +{table} are explained in the next section. + +\subsubsection{fill} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{path} \NC table \NC the list of knots \NC \NR +\NC \type{htap} \NC table \NC the list of knots for the reversed trajectory \NC \NR +\NC \type{pen} \NC table \NC knots of the pen \NC \NR +\NC \type{color} \NC table \NC the object's color \NC \NR +\NC \type{linejoin} \NC number \NC line join style (bare number)\NC \NR +\NC \type{miterlimit} \NC number \NC miterlimit\NC \NR +\NC \type{prescript} \NC string \NC the prescript text \NC \NR +\NC \type{postscript} \NC string \NC the postscript text \NC \NR +\LL +\stoptabulate + +The entries \type {htap} and \type {pen} are optional. + +\subsubsection{outline} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{path} \NC table \NC the list of knots \NC \NR +\NC \type{pen} \NC table \NC knots of the pen \NC \NR +\NC \type{color} \NC table \NC the object's color \NC \NR +\NC \type{linejoin} \NC number \NC line join style (bare number) \NC \NR +\NC \type{miterlimit} \NC number \NC miterlimit \NC \NR +\NC \type{linecap} \NC number \NC line cap style (bare number) \NC \NR +\NC \type{dash} \NC table \NC representation of a dash list \NC \NR +\NC \type{prescript} \NC string \NC the prescript text \NC \NR +\NC \type{postscript} \NC string \NC the postscript text \NC \NR +\LL +\stoptabulate + +The entry \type {dash} is optional. + +\subsubsection{text} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{text} \NC string \NC the text \NC \NR +\NC \type{font} \NC string \NC font tfm name \NC \NR +\NC \type{dsize} \NC number \NC font size \NC \NR +\NC \type{color} \NC table \NC the object's color \NC \NR +\NC \type{width} \NC number \NC \NC \NR +\NC \type{height} \NC number \NC \NC \NR +\NC \type{depth} \NC number \NC \NC \NR +\NC \type{transform} \NC table \NC a text transformation \NC \NR +\NC \type{prescript} \NC string \NC the prescript text \NC \NR +\NC \type{postscript} \NC string \NC the postscript text \NC \NR +\LL +\stoptabulate + +\subsubsection{special} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{prescript} \NC string \NC special text \NC \NR +\LL +\stoptabulate + +\subsubsection{start_bounds, start_clip} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{path} \NC table \NC the list of knots \NC \NR +\LL +\stoptabulate + +\subsubsection{stop_bounds, stop_clip} + +Here are no fields available. + +\subsection{Subsidiary table formats} + +\subsubsection{Paths and pens} + +Paths and pens (that are really just a special type of paths as far as \MPLIB\ is +concerned) are represented by an array where each entry is a table that +represents a knot. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{left_type} \NC string \NC when present: endpoint, but usually absent \NC \NR +\NC \type{right_type} \NC string \NC like \type {left_type} \NC \NR +\NC \type{x_coord} \NC number \NC X coordinate of this knot \NC \NR +\NC \type{y_coord} \NC number \NC Y coordinate of this knot \NC \NR +\NC \type{left_x} \NC number \NC X coordinate of the precontrol point of this knot \NC \NR +\NC \type{left_y} \NC number \NC Y coordinate of the precontrol point of this knot \NC \NR +\NC \type{right_x} \NC number \NC X coordinate of the postcontrol point of this knot \NC \NR +\NC \type{right_y} \NC number \NC Y coordinate of the postcontrol point of this knot \NC \NR +\LL +\stoptabulate + +There is one special case: pens that are (possibly transformed) ellipses have an +extra string-valued key \type {type} with value \type {elliptical} besides the +array part containing the knot list. + +\subsubsection{Colors} + +A color is an integer array with 0, 1, 3 or 4 values: + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{0} \NC marking only \NC no values \NC \NR +\NC \type{1} \NC greyscale \NC one value in the range $(0,1)$, \quote {black} is $0$ \NC \NR +\NC \type{3} \NC \RGB \NC three values in the range $(0,1)$, \quote {black} is $0,0,0$ \NC \NR +\NC \type{4} \NC \CMYK \NC four values in the range $(0,1)$, \quote {black} is $0,0,0,1$ \NC \NR +\LL +\stoptabulate + +If the color model of the internal object was \type {uninitialized}, then it was +initialized to the values representing \quote {black} in the colorspace \type +{defaultcolormodel} that was in effect at the time of the \type {shipout}. + +\subsubsection{Transforms} + +Each transform is a six|-|item array. + +\starttabulate[|l|l|p|] +\DB index \BC type \BC explanation \NC \NR +\TB +\NC \type{1} \NC number \NC represents x \NC \NR +\NC \type{2} \NC number \NC represents y \NC \NR +\NC \type{3} \NC number \NC represents xx \NC \NR +\NC \type{4} \NC number \NC represents yx \NC \NR +\NC \type{5} \NC number \NC represents xy \NC \NR +\NC \type{6} \NC number \NC represents yy \NC \NR +\LL +\stoptabulate + +Note that the translation (index 1 and 2) comes first. This differs from the +ordering in \POSTSCRIPT, where the translation comes last. + +\subsubsection{Dashes} + +Each \type {dash} is two-item hash, using the same model as \POSTSCRIPT\ for the +representation of the dashlist. \type {dashes} is an array of \quote {on} and +\quote {off}, values, and \type {offset} is the phase of the pattern. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{dashes} \NC hash \NC an array of on-off numbers \NC \NR +\NC \type{offset} \NC number \NC the starting offset value \NC \NR +\LL +\stoptabulate + +\subsection{Pens and \type {pen_info}} + +\libindex{pen_info} + +There is helper function (\type {pen_info(obj)}) that returns a table containing +a bunch of vital characteristics of the used pen (all values are floats): + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{width} \NC number \NC width of the pen \NC \NR +\NC \type{sx} \NC number \NC $x$ scale \NC \NR +\NC \type{rx} \NC number \NC $xy$ multiplier \NC \NR +\NC \type{ry} \NC number \NC $yx$ multiplier \NC \NR +\NC \type{sy} \NC number \NC $y$ scale \NC \NR +\NC \type{tx} \NC number \NC $x$ offset \NC \NR +\NC \type{ty} \NC number \NC $y$ offset \NC \NR +\LL +\stoptabulate + +\subsection{Character size information} + +These functions find the size of a glyph in a defined font. The \type {fontname} +is the same name as the argument to \type {infont}; the \type {char} is a glyph +id in the range 0 to 255; the returned \type {w} is in AFM units. + +\subsubsection{\type {char_width}} + +\libindex{char_width} + +\startfunctioncall + w = char_width(mp, fontname, char) +\stopfunctioncall + +\subsubsection{\type {char_height}} + +\libindex{char_height} + +\startfunctioncall + w = char_height(mp, fontname, char) +\stopfunctioncall + +\subsubsection{\type {char_depth}} + +\libindex{char_depth} + +\startfunctioncall + w = char_depth(mp, fontname, char) +\stopfunctioncall + +\subsubsection{\type {get_[boolean|numeric|string|path]}} + +\libindex{get_boolean} +\libindex{get_numeric} +\libindex{get_path} +\libindex{get_string} + +When a script call brings you from the \METAPOST\ run (temporarily) back to +\LUA\ you can access variables, but only if they are known (so for instance +anonymous capsules like loop variables are not accessible). + +\startfunctioncall + w = get_boolean(mp, name) + n = get_numeric(mp, name) + s = get_string (mp, name) +
p = get_path (mp, name) +\stopfunctioncall + +The path is returned a a table with subtables that have six numbers: the +coordinates of the point, pre- and postcontrol. A \type {cycle} fields indicates +if a path is cyclic. + +\stopsection + +\stopchapter diff --git a/manual/luatex-introduction.tex b/manual/luatex-introduction.tex index c03725357..93d0215a8 100644 --- a/manual/luatex-introduction.tex +++ b/manual/luatex-introduction.tex @@ -1,174 +1,174 @@ -% language=uk - -\environment luatex-style - -\startcomponent luatex-introduction - -\startchapter[title=Introduction] - -This is the reference manual of \LUATEX. We don't claim it is complete and we -assume that the reader knows about \TEX\ as described in \quotation {The \TEX\ -Book}, the \quotation {\ETEX\ manual}, the \quotation {\PDFTEX\ manual}, etc. -Additional reference material is published in journals of user groups and -\CONTEXT\ related documentation. - -It took about a decade to reach stable version 1.0, but for good reason. -Successive versions brought new functionality, more control, some cleanup of -internals. Experimental features evolved into stable ones or were dropped. -Already quite early \LUATEX\ could be used for production and it was used on a -daily basis by the authors. Successive versions sometimes demanded an adaption to -the \LUA\ interfacing, but the concepts were unchanged. The current version can -be considered stable in functionality and there will be no fundamental changes. -Of course we then can decide to move towards version 2.00 with different -properties. - -Don't expect \LUATEX\ to behave the same as \PDFTEX ! Although the core -functionality of that 8 bit engine was starting point, it has been combined with -the directional support of \OMEGA\ (\ALEPH). But, \LUATEX\ can behave different -due to its wide (32 bit) characters, many registers and large memory support. The -\PDF\ code produced differs from \PDFTEX\ but users will normally not notice -that. There is native \UTF\ input, support for large (more than 8 bit) fonts, and -the math machinery is tuned for \OPENTYPE\ math. There is support for directional -typesetting too. The log output can differ from other engines and will likely -differ more as we move forward. When you run plain \TEX\ for sure \LUATEX\ runs -slower than \PDFTEX\ but when you run for instance \CONTEXT\ \MKIV\ in many cases -it runs faster, especially when you have a bit more complex documents or input. -Anyway, 32 bit all||over combined with more features has a price, but on a modern -machine this is no real problem. - -Testing is done with \CONTEXT, but \LUATEX\ should work fine with other macro -packages too. For that purpose we provide generic font handlers that are mostly -the same as used in \CONTEXT. Discussing specific implementations is beyond this -manual. Even when we keep \LUATEX\ lean and mean, we already have enough to -discuss here. - -\LUATEX\ consists of a number of interrelated but (still) distinguishable parts. -The organization of the source code is adapted so that it can glue all these -components together. We continue cleaning up side effects of the accumulated -code in \TEX\ engines (especially code that is not needed any longer). - -\startitemize [unpacked] - \startitem - We started out with most of \PDFTEX\ version 1.40.9. The code base was - converted to \CCODE\ and split in modules. Experimental features were - removed and utility macros are not inherited because their functionality - can be programmed in \LUA. The number of backend interface commands has - been reduced to a few. The so called extensions are separated from the - core (which we try to keep close to the original \TEX\ core). Some - mechanisms like expansion and protrusion can behave different from the - original due to some cleanup and optimization. Some whatsit based - functionality (image support and reusable content) is now core - functionality. We don't stay in sync with \PDFTEX\ development. - \stopitem - \startitem - The direction model from \ALEPH\ RC4 (which is derived from \OMEGA) is - included. The related primitives are part of core \LUATEX\ but at the - node level directional support is no longer based on so called whatsits - but on real nodes with relevant properties. The number of directions is - limited to the useful set and the backend has been made direction aware. - \stopitem - \startitem - Neither \ALEPH's I/O translation processes, nor tcx files, nor \ENCTEX\ - are available. These encoding|-|related functions are superseded by a - \LUA|-|based solution (reader callbacks). In a similar fashion all file - \IO\ can be intercepted. - \stopitem - \startitem - We currently use \LUA\ 5.3.*. There are few \LUA\ libraries that we - consider part of the core \LUA\ machinery, for instance \type {lpeg}. - There are additional \LUA\ libraries that interface to the internals of - \TEX. We also keep the \LUA\ 5.2 \type {bit32} library around. - \stopitem - \startitem - There are various \TEX\ extensions but only those that cannot be done - using the \LUA\ interfaces. The math machinery often has two code paths: - one traditional and the other more suitable for wide \OPENTYPE\ fonts. Here - we follow the \MICROSOFT\ specifications as much as possible. Some math - functionality has been opened up a bit so that users have more control. - \stopitem - \startitem - The fontloader uses parts of \FONTFORGE\ 2008.11.17 combined with - additional code specific for usage in a \TEX\ engine. We try to minimize - specific font support to what \TEX\ needs: character references and - dimensions and delegate everything else to \LUA. That way we keep \TEX\ - open for extensions without touching the core. In order to minimize - dependencies at some point we may decide to make this an optional - library. - \stopitem - \startitem - The \METAPOST\ library is integral part of \LUATEX. This gives \TEX\ some - graphical capabilities using a relative high speed graphical subsystem. - Again \LUA\ is used as glue between the frontend and backend. Further - development of \METAPOST\ is closely related to \LUATEX. - \stopitem - \startitem - The virtual font technology that comes with \TEX\ has been integrated - into the font machinery in a way that permits creating virtual fonts - at runtime. Because \LUATEX\ can also act as a \LUA\ interpreter this - means that a complete \TEX\ workflow can be built without the need for - additional programs. - \stopitem - \startitem - The versions starting from 1.09 no longer use the poppler library for - inclusion but a lightweight dedicated one. This removes a dependency but - also makes the inclusion code of \LUATEX\ different from \PDFTEX. In fact - it was already much different due to the \LUA\ image interfacing. - \stopitem -\stopitemize - -We try to keep upcoming versions compatible but intermediate releases can contain -experimental features. A general rule is that versions that end up on \TEXLIVE\ -and|/|or are released around \CONTEXT\ meetings are stable. Any version between -the yearly \TEXLIVE\ releases are to be considered beta and in the repository end -up as trunk releases. We have an experimental branch that we use for development -but there is no support for any of its experimental features. Intermediate -releases (from trunk) are normally available via the \CONTEXT\ distribution -channels (the garden and so called minimals). - -Version 1.10 is more or less an endpoint in development: this is what you get. -Because not only \CONTEXT, that we can adapt rather easily, uses \LUATEX, we -cannot change fundamentals without unforeseen consequences. By now it has been -proven that \LUA\ can be used to extend the core functionality so there is no -need to add more, and definitely no hard coded solutions for (not so) common -problems. Of course there will be bug fixes, maybe some optimization, and there -might even be some additions or non|-|intrusive improvements, but only after -testing outside the stable release. After all, the binary is already more than -large enough and there is not that much to gain. - -You might find \LUA\ helpers that are not yet documented. These are considered -experimental, although when you encounter them in a \CONTEXT\ version that has -been around for a while you can assume that they will stay. Of course it can just -be that we forgot to document them yet. - -A manual like this is not really meant as tutorial, for that we refer to -documents that ship with \CONTEXT, articles, etc. It is also never complete -enough for all readers. We try to keep up but the reader needs to realize that -it's all volunteer work done in spare time. And for sure, complaining about a bad -manual or crappy documentation will not really motivate us to spend more time on -it. That being said, we hope that this document is useful. - -\blank[big] - -\testpage[5] - -\startlines -Hans Hagen -Harmut Henkel -Taco Hoekwater -Luigi Scarso -\stoplines - -\blank[3*big] - -\starttabulate[|||] -\NC Version \EQ \currentdate \NC \NR -\NC \LUATEX \EQ \cldcontext{LUATEXENGINE} % - \cldcontext{"\letterpercent 0.2f",LUATEXVERSION} / % - \cldcontext{LUATEXFUNCTIONALITY} - \NC \NR -\NC \CONTEXT \EQ MkIV \contextversion \NC \NR -\stoptabulate - -\stopchapter - -\stopcomponent +% language=uk + +\environment luatex-style + +\startcomponent luatex-introduction + +\startchapter[title=Introduction] + +This is the reference manual of \LUATEX. We don't claim it is complete and we +assume that the reader knows about \TEX\ as described in \quotation {The \TEX\ +Book}, the \quotation {\ETEX\ manual}, the \quotation {\PDFTEX\ manual}, etc. +Additional reference material is published in journals of user groups and +\CONTEXT\ related documentation. + +It took about a decade to reach stable version 1.0, but for good reason. +Successive versions brought new functionality, more control, some cleanup of +internals. Experimental features evolved into stable ones or were dropped. +Already quite early \LUATEX\ could be used for production and it was used on a +daily basis by the authors. Successive versions sometimes demanded an adaption to +the \LUA\ interfacing, but the concepts were unchanged. The current version can +be considered stable in functionality and there will be no fundamental changes. +Of course we then can decide to move towards version 2.00 with different +properties. + +Don't expect \LUATEX\ to behave the same as \PDFTEX ! Although the core +functionality of that 8 bit engine was starting point, it has been combined with +the directional support of \OMEGA\ (\ALEPH). But, \LUATEX\ can behave different +due to its wide (32 bit) characters, many registers and large memory support. The +\PDF\ code produced differs from \PDFTEX\ but users will normally not notice +that. There is native \UTF\ input, support for large (more than 8 bit) fonts, and +the math machinery is tuned for \OPENTYPE\ math. There is support for directional +typesetting too. The log output can differ from other engines and will likely +differ more as we move forward. When you run plain \TEX\ for sure \LUATEX\ runs +slower than \PDFTEX\ but when you run for instance \CONTEXT\ \MKIV\ in many cases +it runs faster, especially when you have a bit more complex documents or input. +Anyway, 32 bit all||over combined with more features has a price, but on a modern +machine this is no real problem. + +Testing is done with \CONTEXT, but \LUATEX\ should work fine with other macro +packages too. For that purpose we provide generic font handlers that are mostly +the same as used in \CONTEXT. Discussing specific implementations is beyond this +manual. Even when we keep \LUATEX\ lean and mean, we already have enough to +discuss here. + +\LUATEX\ consists of a number of interrelated but (still) distinguishable parts. +The organization of the source code is adapted so that it can glue all these +components together. We continue cleaning up side effects of the accumulated +code in \TEX\ engines (especially code that is not needed any longer). + +\startitemize [unpacked] + \startitem + We started out with most of \PDFTEX\ version 1.40.9. The code base was + converted to \CCODE\ and split in modules. Experimental features were + removed and utility macros are not inherited because their functionality + can be programmed in \LUA. The number of backend interface commands has + been reduced to a few. The so called extensions are separated from the + core (which we try to keep close to the original \TEX\ core). Some + mechanisms like expansion and protrusion can behave different from the + original due to some cleanup and optimization. Some whatsit based + functionality (image support and reusable content) is now core + functionality. We don't stay in sync with \PDFTEX\ development. + \stopitem + \startitem + The direction model from \ALEPH\ RC4 (which is derived from \OMEGA) is + included. The related primitives are part of core \LUATEX\ but at the + node level directional support is no longer based on so called whatsits + but on real nodes with relevant properties. The number of directions is + limited to the useful set and the backend has been made direction aware. + \stopitem + \startitem + Neither \ALEPH's I/O translation processes, nor tcx files, nor \ENCTEX\ + are available. These encoding|-|related functions are superseded by a + \LUA|-|based solution (reader callbacks). In a similar fashion all file + \IO\ can be intercepted. + \stopitem + \startitem + We currently use \LUA\ 5.3.*. There are few \LUA\ libraries that we + consider part of the core \LUA\ machinery, for instance \type {lpeg}. + There are additional \LUA\ libraries that interface to the internals of + \TEX. We also keep the \LUA\ 5.2 \type {bit32} library around. + \stopitem + \startitem + There are various \TEX\ extensions but only those that cannot be done + using the \LUA\ interfaces. The math machinery often has two code paths: + one traditional and the other more suitable for wide \OPENTYPE\ fonts. Here + we follow the \MICROSOFT\ specifications as much as possible. Some math + functionality has been opened up a bit so that users have more control. + \stopitem + \startitem + The fontloader uses parts of \FONTFORGE\ 2008.11.17 combined with + additional code specific for usage in a \TEX\ engine. We try to minimize + specific font support to what \TEX\ needs: character references and + dimensions and delegate everything else to \LUA. That way we keep \TEX\ + open for extensions without touching the core. In order to minimize + dependencies at some point we may decide to make this an optional + library. + \stopitem + \startitem + The \METAPOST\ library is integral part of \LUATEX. This gives \TEX\ some + graphical capabilities using a relative high speed graphical subsystem. + Again \LUA\ is used as glue between the frontend and backend. Further + development of \METAPOST\ is closely related to \LUATEX. + \stopitem + \startitem + The virtual font technology that comes with \TEX\ has been integrated + into the font machinery in a way that permits creating virtual fonts + at runtime. Because \LUATEX\ can also act as a \LUA\ interpreter this + means that a complete \TEX\ workflow can be built without the need for + additional programs. + \stopitem + \startitem + The versions starting from 1.09 no longer use the poppler library for + inclusion but a lightweight dedicated one. This removes a dependency but + also makes the inclusion code of \LUATEX\ different from \PDFTEX. In fact + it was already much different due to the \LUA\ image interfacing. + \stopitem +\stopitemize + +We try to keep upcoming versions compatible but intermediate releases can contain +experimental features. A general rule is that versions that end up on \TEXLIVE\ +and|/|or are released around \CONTEXT\ meetings are stable. Any version between +the yearly \TEXLIVE\ releases are to be considered beta and in the repository end +up as trunk releases. We have an experimental branch that we use for development +but there is no support for any of its experimental features. Intermediate +releases (from trunk) are normally available via the \CONTEXT\ distribution +channels (the garden and so called minimals). + +Version 1.10 is more or less an endpoint in development: this is what you get. +Because not only \CONTEXT, that we can adapt rather easily, uses \LUATEX, we +cannot change fundamentals without unforeseen consequences. By now it has been +proven that \LUA\ can be used to extend the core functionality so there is no +need to add more, and definitely no hard coded solutions for (not so) common +problems. Of course there will be bug fixes, maybe some optimization, and there +might even be some additions or non|-|intrusive improvements, but only after +testing outside the stable release. After all, the binary is already more than +large enough and there is not that much to gain. + +You might find \LUA\ helpers that are not yet documented. These are considered +experimental, although when you encounter them in a \CONTEXT\ version that has +been around for a while you can assume that they will stay. Of course it can just +be that we forgot to document them yet. + +A manual like this is not really meant as tutorial, for that we refer to +documents that ship with \CONTEXT, articles, etc. It is also never complete +enough for all readers. We try to keep up but the reader needs to realize that +it's all volunteer work done in spare time. And for sure, complaining about a bad +manual or crappy documentation will not really motivate us to spend more time on +it. That being said, we hope that this document is useful. + +\blank[big] + +\testpage[5] + +\startlines +Hans Hagen +Harmut Henkel +Taco Hoekwater +Luigi Scarso +\stoplines + +\blank[3*big] + +\starttabulate[|||] +\NC Version \EQ \currentdate \NC \NR +\NC \LUATEX \EQ \cldcontext{LUATEXENGINE} % + \cldcontext{"\letterpercent 0.2f",LUATEXVERSION} / % + \cldcontext{LUATEXFUNCTIONALITY} + \NC \NR +\NC \CONTEXT \EQ MkIV \contextversion \NC \NR +\stoptabulate + +\stopchapter + +\stopcomponent diff --git a/manual/luatex-languages.tex b/manual/luatex-languages.tex index 98960aa65..d4a7bda60 100644 --- a/manual/luatex-languages.tex +++ b/manual/luatex-languages.tex @@ -1,1113 +1,1113 @@ -% language=uk - -\environment luatex-style - -\startcomponent luatex-languages - -\startchapter[reference=languages,title={Languages, characters, fonts and glyphs}] - -\startsection[title={Introduction}] - -\topicindex {languages} - -\LUATEX's internal handling of the characters and glyphs that eventually become -typeset is quite different from the way \TEX82 handles those same objects. The -easiest way to explain the difference is to focus on unrestricted horizontal mode -(i.e.\ paragraphs) and hyphenation first. Later on, it will be easy to deal -with the differences that occur in horizontal and math modes. - -In \TEX82, the characters you type are converted into \type {char} node records -when they are encountered by the main control loop. \TEX\ attaches and processes -the font information while creating those records, so that the resulting \quote -{horizontal list} contains the final forms of ligatures and implicit kerning. -This packaging is needed because we may want to get the effective width of for -instance a horizontal box. - -When it becomes necessary to hyphenate words in a paragraph, \TEX\ converts (one -word at time) the \type {char} node records into a string by replacing ligatures -with their components and ignoring the kerning. Then it runs the hyphenation -algorithm on this string, and converts the hyphenated result back into a \quote -{horizontal list} that is consecutively spliced back into the paragraph stream. -Keep in mind that the paragraph may contain unboxed horizontal material, which -then already contains ligatures and kerns and the words therein are part of the -hyphenation process. - -Those \type {char} node records are somewhat misnamed, as they are glyph -positions in specific fonts, and therefore not really \quote {characters} in the -linguistic sense. There is no language information inside the \type {char} node -records at all. Instead, language information is passed along using \type -{language whatsit} nodes inside the horizontal list. - -In \LUATEX, the situation is quite different. The characters you type are always -converted into \nod {glyph} node records with a special subtype to identify them -as being intended as linguistic characters. \LUATEX\ stores the needed language -information in those records, but does not do any font|-|related processing at -the time of node creation. It only stores the index of the current font and a -reference to a character in that font. - -When it becomes necessary to typeset a paragraph, \LUATEX\ first inserts all -hyphenation points right into the whole node list. Next, it processes all the -font information in the whole list (creating ligatures and adjusting kerning), -and finally it adjusts all the subtype identifiers so that the records are \quote -{glyph nodes} from now on. - -\stopsection - -\startsection[title={Characters, glyphs and discretionaries},reference=charsandglyphs] - -\topicindex {characters} -\topicindex {glyphs} -\topicindex {hyphenation} - -\TEX82 (including \PDFTEX) differentiates between \type {char} nodes and \type -{lig} nodes. The former are simple items that contained nothing but a \quote -{character} and a \quote {font} field, and they lived in the same memory as -tokens did. The latter also contained a list of components, and a subtype -indicating whether this ligature was the result of a word boundary, and it was -stored in the same place as other nodes like boxes and kerns and glues. - -In \LUATEX, these two types are merged into one, somewhat larger structure called -a \nod {glyph} node. Besides having the old character, font, and component -fields there are a few more, like \quote {attr} that we will see in \in {section} -[glyphnodes], these nodes also contain a subtype, that codes four main types and -two additional ghost types. For ligatures, multiple bits can be set at the same -time (in case of a single|-|glyph word). - -\startitemize - \startitem - \type {character}, for characters to be hyphenated: the lowest bit - (bit 0) is set to 1. - \stopitem - \startitem - \nod {glyph}, for specific font glyphs: the lowest bit (bit 0) is - not set. - \stopitem - \startitem - \type {ligature}, for constructed ligatures bit 1 is set. - \stopitem - \startitem - \type {ghost}, for so called \quote {ghost objects} bit 2 is set. - \stopitem - \startitem - \type {left}, for ligatures created from a left word boundary and for - ghosts created from \lpr {leftghost} bit 3 gets set. - \stopitem - \startitem - \type {right}, for ligatures created from a right word boundary and - for ghosts created from \lpr {rightghost} bit 4 is set. - \stopitem -\stopitemize - -The \nod {glyph} nodes also contain language data, split into four items that -were current when the node was created: the \prm {setlanguage} (15~bits), \prm -{lefthyphenmin} (8~bits), \prm {righthyphenmin} (8~bits), and \prm {uchyph} -(1~bit). - -Incidentally, \LUATEX\ allows 16383 separate languages, and words can be 256 -characters long. The language is stored with each character. You can set -\prm {firstvalidlanguage} to for instance~1 and make thereby language~0 -an ignored hyphenation language. - -The new primitive \lpr {hyphenationmin} can be used to signal the minimal length -of a word. This value is stored with the (current) language. - -Because the \prm {uchyph} value is saved in the actual nodes, its handling is -subtly different from \TEX82: changes to \prm {uchyph} become effective -immediately, not at the end of the current partial paragraph. - -Typeset boxes now always have their language information embedded in the nodes -themselves, so there is no longer a possible dependency on the surrounding -language settings. In \TEX82, a mid|-|paragraph statement like \type {\unhbox0} -would process the box using the current paragraph language unless there was a -\prm {setlanguage} issued inside the box. In \LUATEX, all language variables -are already frozen. - -In traditional \TEX\ the process of hyphenation is driven by \type {lccode}s. In -\LUATEX\ we made this dependency less strong. There are several strategies -possible. When you do nothing, the currently used \type {lccode}s are used, when -loading patterns, setting exceptions or hyphenating a list. - -When you set \prm {savinghyphcodes} to a value greater than zero the current set -of \type {lccode}s will be saved with the language. In that case changing a \type -{lccode} afterwards has no effect. However, you can adapt the set with: - -\starttyping -\hjcode`a=`a -\stoptyping - -This change is global which makes sense if you keep in mind that the moment that -hyphenation happens is (normally) when the paragraph or a horizontal box is -constructed. When \prm {savinghyphcodes} was zero when the language got -initialized you start out with nothing, otherwise you already have a set. - -When a \lpr {hjcode} is greater than 0 but less than 32 is indicates the -to be used length. In the following example we map a character (\type {x}) onto -another one in the patterns and tell the engine that \type {œ} counts as one -character. Because traditionally zero itself is reserved for inhibiting -hyphenation, a value of 32 counts as zero. - -Here are some examples (we assume that French patterns are used): - -\starttabulate[||||] -\NC \NC \type{foobar} \NC \type{foo-bar} \NC \NR -\NC \type{\hjcode`x=`o} \NC \type{fxxbar} \NC \type{fxx-bar} \NC \NR -\NC \type{\lefthyphenmin3} \NC \type{œdipus} \NC \type{œdi-pus} \NC \NR -\NC \type{\lefthyphenmin4} \NC \type{œdipus} \NC \type{œdipus} \NC \NR -\NC \type{\hjcode`œ=2} \NC \type{œdipus} \NC \type{œdi-pus} \NC \NR -\NC \type{\hjcode`i=32 \hjcode`d=32} \NC \type{œdipus} \NC \type{œdipus} \NC \NR -\NC -\stoptabulate - -Carrying all this information with each glyph would give too much overhead and -also make the process of setting up these codes more complex. A solution with -\type {hjcode} sets was considered but rejected because in practice the current -approach is sufficient and it would not be compatible anyway. - -Beware: the values are always saved in the format, independent of the setting -of \prm {savinghyphcodes} at the moment the format is dumped. - -A boundary node normally would mark the end of a word which interferes with for -instance discretionary injection. For this you can use the \prm {wordboundary} -as a trigger. Here are a few examples of usage: - -\startbuffer - discrete---discrete -\stopbuffer -\typebuffer \startnarrower \dontcomplain \hsize 1pt \getbuffer \par \stopnarrower -\startbuffer - discrete\discretionary{}{}{---}discrete -\stopbuffer -\typebuffer \startnarrower \dontcomplain \hsize 1pt \getbuffer \par \stopnarrower -\startbuffer - discrete\wordboundary\discretionary{}{}{---}discrete -\stopbuffer -\typebuffer \startnarrower \dontcomplain \hsize 1pt \getbuffer \par \stopnarrower -\startbuffer - discrete\wordboundary\discretionary{}{}{---}\wordboundary discrete -\stopbuffer -\typebuffer \startnarrower \dontcomplain \hsize 1pt \getbuffer \par \stopnarrower -\startbuffer - discrete\wordboundary\discretionary{---}{}{}\wordboundary discrete -\stopbuffer -\typebuffer \startnarrower \dontcomplain \hsize 1pt \getbuffer \par \stopnarrower - -We only accept an explicit hyphen when there is a preceding glyph and we skip a -sequence of explicit hyphens since that normally indicates a \type {--} or \type -{---} ligature in which case we can in a worse case usage get bad node lists -later on due to messed up ligature building as these dashes are ligatures in base -fonts. This is a side effect of separating the hyphenation, ligaturing and -kerning steps. - -The start and end of a sequence of characters is signalled by a \nod {glue}, \nod -{penalty}, \nod {kern} or \nod {boundary} node. But by default also a \nod -{hlist}, \nod {vlist}, \nod {rule}, \nod {dir}, \nod {whatsit}, \nod {ins}, and -\nod {adjust} node indicate a start or end. You can omit the last set from the -test by setting \lpr {hyphenationbounds} to a non|-|zero value: - -\starttabulate[|c|l|] -\DB value \BC behaviour \NC \NR -\TB -\NC \type{0} \NC not strict \NC \NR -\NC \type{1} \NC strict start \NC \NR -\NC \type{2} \NC strict end \NC \NR -\NC \type{3} \NC strict start and strict end \NC \NR -\LL -\stoptabulate - -The word start is determined as follows: - -\starttabulate[|l|l|] -\DB node \BC behaviour \NC \NR -\TB -\BC boundary \NC yes when wordboundary \NC \NR -\BC hlist \NC when hyphenationbounds 1 or 3 \NC \NR -\BC vlist \NC when hyphenationbounds 1 or 3 \NC \NR -\BC rule \NC when hyphenationbounds 1 or 3 \NC \NR -\BC dir \NC when hyphenationbounds 1 or 3 \NC \NR -\BC whatsit \NC when hyphenationbounds 1 or 3 \NC \NR -\BC glue \NC yes \NC \NR -\BC math \NC skipped \NC \NR -\BC glyph \NC exhyphenchar (one only) : yes (so no -- ---) \NC \NR -\BC otherwise \NC yes \NC \NR -\LL -\stoptabulate - -The word end is determined as follows: - -\starttabulate[|l|l|] -\DB node \BC behaviour \NC \NR -\TB -\BC boundary \NC yes \NC \NR -\BC glyph \NC yes when different language \NC \NR -\BC glue \NC yes \NC \NR -\BC penalty \NC yes \NC \NR -\BC kern \NC yes when not italic (for some historic reason) \NC \NR -\BC hlist \NC when hyphenationbounds 2 or 3 \NC \NR -\BC vlist \NC when hyphenationbounds 2 or 3 \NC \NR -\BC rule \NC when hyphenationbounds 2 or 3 \NC \NR -\BC dir \NC when hyphenationbounds 2 or 3 \NC \NR -\BC whatsit \NC when hyphenationbounds 2 or 3 \NC \NR -\BC ins \NC when hyphenationbounds 2 or 3 \NC \NR -\BC adjust \NC when hyphenationbounds 2 or 3 \NC \NR -\LL -\stoptabulate - -\in {Figures} [hb:1] upto \in [hb:5] show some examples. In all cases we set the -min values to 1 and make sure that the words hyphenate at each character. - -\hyphenation{o-n-e t-w-o} - -\def\SomeTest#1#2% - {\lefthyphenmin \plusone - \righthyphenmin \plusone - \parindent \zeropoint - \everypar \emptytoks - \dontcomplain - \hbox to 2cm {% - \vtop {% - \hsize 1pt - \hyphenationbounds#1 - #2 - \par}}} - -\startplacefigure[reference=hb:1,title={\type{one}}] - \startcombination[4*1] - {\SomeTest{0}{one}} {\type{0}} - {\SomeTest{1}{one}} {\type{1}} - {\SomeTest{2}{one}} {\type{2}} - {\SomeTest{3}{one}} {\type{3}} - \stopcombination -\stopplacefigure - -\startplacefigure[reference=hb:2,title={\type{one\null two}}] - \startcombination[4*1] - {\SomeTest{0}{one\null two}} {\type{0}} - {\SomeTest{1}{one\null two}} {\type{1}} - {\SomeTest{2}{one\null two}} {\type{2}} - {\SomeTest{3}{one\null two}} {\type{3}} - \stopcombination -\stopplacefigure - -\startplacefigure[reference=hb:3,title={\type{\null one\null two}}] - \startcombination[4*1] - {\SomeTest{0}{\null one\null two}} {\type{0}} - {\SomeTest{1}{\null one\null two}} {\type{1}} - {\SomeTest{2}{\null one\null two}} {\type{2}} - {\SomeTest{3}{\null one\null two}} {\type{3}} - \stopcombination -\stopplacefigure - -\startplacefigure[reference=hb:4,title={\type{one\null two\null}}] - \startcombination[4*1] - {\SomeTest{0}{one\null two\null}} {\type{0}} - {\SomeTest{1}{one\null two\null}} {\type{1}} - {\SomeTest{2}{one\null two\null}} {\type{2}} - {\SomeTest{3}{one\null two\null}} {\type{3}} - \stopcombination -\stopplacefigure - -\startplacefigure[reference=hb:5,title={\type{\null one\null two\null}}] - \startcombination[4*1] - {\SomeTest{0}{\null one\null two\null}} {\type{0}} - {\SomeTest{1}{\null one\null two\null}} {\type{1}} - {\SomeTest{2}{\null one\null two\null}} {\type{2}} - {\SomeTest{3}{\null one\null two\null}} {\type{3}} - \stopcombination -\stopplacefigure - -% (Future versions of \LUATEX\ might provide more granularity.) - -In traditional \TEX\ ligature building and hyphenation are interwoven with the -line break mechanism. In \LUATEX\ these phases are isolated. As a consequence we -deal differently with (a sequence of) explicit hyphens. We already have added -some control over aspects of the hyphenation and yet another one concerns -automatic hyphens (e.g.\ \type {-} characters in the input). - -When \lpr {automatichyphenmode} has a value of 0, a hyphen will be turned into -an automatic discretionary. The snippets before and after it will not be -hyphenated. A side effect is that a leading hyphen can lead to a split but one -will seldom run into that situation. Setting a pre and post character makes this -more prominent. A value of 1 will prevent this side effect and a value of 2 will -not turn the hyphen into a discretionary. Experiments with other options, like -permitting hyphenation of the words on both sides were discarded. - -\startbuffer[a] -before-after \par -before--after \par -before---after \par -\stopbuffer - -\startbuffer[b] --before \par -after- \par ---before \par -after-- \par ----before \par -after--- \par -\stopbuffer - -\startbuffer[c] -before-after \par -before--after \par -before---after \par -\stopbuffer - -\startbuffer[demo] -\startcombination[nx=4,ny=3,location=top] - {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\zerocount \hsize6em \getbuffer[a]}} {A~0~6em} - {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\zerocount \hsize2pt \getbuffer[a]}} {A~0~2pt} - {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\plusone \hsize2pt \getbuffer[a]}} {A~1~2pt} - {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\plustwo \hsize2pt \getbuffer[a]}} {A~2~2pt} - {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\zerocount \hsize6em \getbuffer[b]}} {B~0~6em} - {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\zerocount \hsize2pt \getbuffer[b]}} {B~0~2pt} - {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\plusone \hsize2pt \getbuffer[b]}} {B~1~2pt} - {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\plustwo \hsize2pt \getbuffer[b]}} {B~2~2pt} - {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\zerocount \hsize6em \getbuffer[c]}} {C~0~6em} - {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\zerocount \hsize2pt \getbuffer[c]}} {C~0~2pt} - {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\plusone \hsize2pt \getbuffer[c]}} {C~1~2pt} - {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\plustwo \hsize2pt \getbuffer[c]}} {C~2~2pt} -\stopcombination -\stopbuffer - -\startplacefigure[locationreference=automatichyphenmode:1,title={The automatic modes \type {0} (default), \type {1} and \type {2}, with a \prm {hsize} -of 6em and 2pt (which triggers a linebreak).}] - \dontcomplain \tt \getbuffer[demo] -\stopplacefigure - -\startplacefigure[reference=automatichyphenmode:2,title={The automatic modes \type {0} (default), \type {1} and \type {2}, with \lpr {preexhyphenchar} and \lpr {postexhyphenchar} set to characters \type {A} and \type {B}.}] - \postexhyphenchar`A\relax - \preexhyphenchar `B\relax - \dontcomplain \tt \getbuffer[demo] -\stopplacefigure - -In \in {figure} [automatichyphenmode:1] \in {and} [automatichyphenmode:2] we show -what happens with three samples: - -Input A: \typebuffer[a] -Input B: \typebuffer[b] -Input C: \typebuffer[c] - -As with primitive companions of other single character commands, the \prm {-} -command has a more verbose primitive version in \lpr {explicitdiscretionary} -and the normally intercepted in the hyphenator character \type {-} (or whatever -is configured) is available as \lpr {automaticdiscretionary}. - -\stopsection - -\startsection[title={The main control loop}] - -\topicindex {main loop} -\topicindex {hyphenation} - -In \LUATEX's main loop, almost all input characters that are to be typeset are -converted into \nod {glyph} node records with subtype \quote {character}, but -there are a few exceptions. - -\startitemize[n] - -\startitem - The \prm {accent} primitive creates nodes with subtype \quote {glyph} - instead of \quote {character}: one for the actual accent and one for the - accentee. The primary reason for this is that \prm {accent} in \TEX82 is - explicitly dependent on the current font encoding, so it would not make much - sense to attach a new meaning to the primitive's name, as that would - invalidate many old documents and macro packages. A secondary reason is that - in \TEX82, \prm {accent} prohibits hyphenation of the current word. Since - in \LUATEX\ hyphenation only takes place on \quote {character} nodes, it is - possible to achieve the same effect. Of course, modern \UNICODE\ aware macro - packages will not use the \prm {accent} primitive at all but try to map - directly on composed characters. - - This change of meaning did happen with \prm {char}, that now generates - \quote {glyph} nodes with a character subtype. In traditional \TEX\ there was - a strong relationship between the 8|-|bit input encoding, hyphenation and - glyphs taken from a font. In \LUATEX\ we have \UTF\ input, and in most cases - this maps directly to a character in a font, apart from glyph replacement in - the font engine. If you want to access arbitrary glyphs in a font directly - you can always use \LUA\ to do so, because fonts are available as \LUA\ - table. -\stopitem - -\startitem - All the results of processing in math mode eventually become nodes with - \quote {glyph} subtypes. In fact, the result of processing math is just - a regular list of glyphs, kerns, glue, penalties, boxes etc. -\stopitem - -\startitem - The \ALEPH|-|derived commands \lpr {leftghost} and \lpr {rightghost} - create nodes of a third subtype: \quote {ghost}. These nodes are ignored - completely by all further processing until the stage where inter|-|glyph - kerning is added. -\stopitem - -\startitem - Automatic discretionaries are handled differently. \TEX82 inserts an empty - discretionary after sensing an input character that matches the \prm - {hyphenchar} in the current font. This test is wrong in our opinion: whether - or not hyphenation takes place should not depend on the current font, it is a - language property. \footnote {When \TEX\ showed up we didn't have \UNICODE\ - yet and being limited to eight bits meant that one sometimes had to - compromise between supporting character input, glyph rendering, hyphenation.} - - In \LUATEX, it works like this: if \LUATEX\ senses a string of input - characters that matches the value of the new integer parameter \prm - {exhyphenchar}, it will insert an explicit discretionary after that series of - nodes. Initially \TEX\ sets the \type {\exhyphenchar=`\-}. Incidentally, this - is a global parameter instead of a language-specific one because it may be - useful to change the value depending on the document structure instead of the - text language. - - The insertion of discretionaries after a sequence of explicit hyphens happens - at the same time as the other hyphenation processing, {\it not\/} inside the - main control loop. - - The only use \LUATEX\ has for \prm {hyphenchar} is at the check whether a - word should be considered for hyphenation at all. If the \prm {hyphenchar} - of the font attached to the first character node in a word is negative, then - hyphenation of that word is abandoned immediately. This behaviour is added - for backward compatibility only, and the use of \type {\hyphenchar=-1} as a - means of preventing hyphenation should not be used in new \LUATEX\ documents. -\stopitem - -\startitem - The \prm {setlanguage} command no longer creates whatsits. The meaning of - \prm {setlanguage} is changed so that it is now an integer parameter like all - others. That integer parameter is used in \type {\glyph_node} creation to add - language information to the glyph nodes. In conjunction, the \prm {language} - primitive is extended so that it always also updates the value of \prm - {setlanguage}. -\stopitem - -\startitem - The \prm {noboundary} command (that prohibits word boundary processing - where that would normally take place) now does create nodes. These nodes are - needed because the exact place of the \prm {noboundary} command in the - input stream has to be retained until after the ligature and font processing - stages. -\stopitem - -\startitem - There is no longer a \type {main_loop} label in the code. Remember that - \TEX82 did quite a lot of processing while adding \type {char_nodes} to the - horizontal list? For speed reasons, it handled that processing code outside - of the \quote {main control} loop, and only the first character of any \quote - {word} was handled by that \quote {main control} loop. In \LUATEX, there is - no longer a need for that (all hard work is done later), and the (now very - small) bits of character|-|handling code have been moved back inline. When - \prm {tracingcommands} is on, this is visible because the full word is - reported, instead of just the initial character. -\stopitem - -\stopitemize - -Because we tend to make hard coded behaviour configurable a few new primitives -have been added: - -\starttyping -\hyphenpenaltymode -\automatichyphenpenalty -\explicithyphenpenalty -\stoptyping - -The first parameter has the following consequences for automatic discs (the ones -resulting from an \prm {exhyphenchar}: - -\starttabulate[|c|l|l|] -\DB mode \BC automatic disc \type {-} \BC explicit disc \prm{-} \NC \NR -\TB -\NC \type{0} \NC \prm {exhyphenpenalty} \NC \prm {exhyphenpenalty} \NC \NR -\NC \type{1} \NC \prm {hyphenpenalty} \NC \prm {hyphenpenalty} \NC \NR -\NC \type{2} \NC \prm {exhyphenpenalty} \NC \prm {hyphenpenalty} \NC \NR -\NC \type{3} \NC \prm {hyphenpenalty} \NC \prm {exhyphenpenalty} \NC \NR -\NC \type{4} \NC \lpr {automatichyphenpenalty} \NC \lpr {explicithyphenpenalty} \NC \NR -\NC \type{5} \NC \prm {exhyphenpenalty} \NC \lpr {explicithyphenpenalty} \NC \NR -\NC \type{6} \NC \prm {hyphenpenalty} \NC \lpr {explicithyphenpenalty} \NC \NR -\NC \type{7} \NC \lpr {automatichyphenpenalty} \NC \prm {exhyphenpenalty} \NC \NR -\NC \type{8} \NC \lpr {automatichyphenpenalty} \NC \prm {hyphenpenalty} \NC \NR -\LL -\stoptabulate - -other values do what we always did in \LUATEX: insert \prm {exhyphenpenalty}. - -\stopsection - -\startsection[title={Loading patterns and exceptions},reference=patternsexceptions] - -\topicindex {hyphenation} -\topicindex {hyphenation+patterns} -\topicindex {hyphenation+exceptions} -\topicindex {patterns} -\topicindex {exceptions} - -Although we keep the traditional approach towards hyphenation (which is still -superior) the implementation of the hyphenation algorithm in \LUATEX\ is quite -different from the one in \TEX82. - -After expansion, the argument for \prm {patterns} has to be proper \UTF8 with -individual patterns separated by spaces, no \prm {char} or \prm {chardef}d -commands are allowed. The current implementation is quite strict and will reject -all non|-|\UNICODE\ characters. Likewise, the expanded argument for \prm -{hyphenation} also has to be proper \UTF8, but here a bit of extra syntax is -provided: - -\startitemize[n] -\startitem - Three sets of arguments in curly braces (\type {{}{}{}}) indicate a desired - complex discretionary, with arguments as in \prm {discretionary}'s command in - normal document input. -\stopitem -\startitem - A \type {-} indicates a desired simple discretionary, cf.\ \type {\-} and - \type {\discretionary{-}{}{}} in normal document input. -\stopitem -\startitem - Internal command names are ignored. This rule is provided especially for \prm - {discretionary}, but it also helps to deal with \prm {relax} commands that - may sneak in. -\stopitem -\startitem - An \type {=} indicates a (non|-|discretionary) hyphen in the document input. -\stopitem -\stopitemize - -The expanded argument is first converted back to a space|-|separated string while -dropping the internal command names. This string is then converted into a -dictionary by a routine that creates key|-|value pairs by converting the other -listed items. It is important to note that the keys in an exception dictionary -can always be generated from the values. Here are a few examples: - -\starttabulate[|l|l|l|] -\DB value \BC implied key (input) \BC effect \NC\NR -\TB -\NC \type {ta-ble} \NC table \NC \type {ta\-ble} ($=$ \type {ta\discretionary{-}{}{}ble}) \NC\NR -\NC \type {ba{k-}{}{c}ken} \NC backen \NC \type {ba\discretionary{k-}{}{c}ken} \NC\NR -\LL -\stoptabulate - -The resultant patterns and exception dictionary will be stored under the language -code that is the present value of \prm {language}. - -In the last line of the table, you see there is no \prm {discretionary} command -in the value: the command is optional in the \TEX-based input syntax. The -underlying reason for that is that it is conceivable that a whole dictionary of -words is stored as a plain text file and loaded into \LUATEX\ using one of the -functions in the \LUA\ \type {lang} library. This loading method is quite a bit -faster than going through the \TEX\ language primitives, but some (most?) of that -speed gain would be lost if it had to interpret command sequences while doing so. - -It is possible to specify extra hyphenation points in compound words by using -\type {{-}{}{-}} for the explicit hyphen character (replace \type {-} by the -actual explicit hyphen character if needed). For example, this matches the word -\quote {multi|-|word|-|boundaries} and allows an extra break inbetween \quote -{boun} and \quote {daries}: - -\starttyping -\hyphenation{multi{-}{}{-}word{-}{}{-}boun-daries} -\stoptyping - -The motivation behind the \ETEX\ extension \prm {savinghyphcodes} was that -hyphenation heavily depended on font encodings. This is no longer true in -\LUATEX, and the corresponding primitive is basically ignored. Because we now -have \lpr {hjcode}, the case relate codes can be used exclusively for \prm -{uppercase} and \prm {lowercase}. - -The three curly brace pair pattern in an exception can be somewhat unexpected so -we will try to explain it by example. The pattern \type {foo{}{}{x}bar} pattern -creates a lookup \type {fooxbar} and the pattern \type {foo{}{}{}bar} creates -\type {foobar}. Then, when a hit happens there is a replacement text (\type {x}) -or none. Because we introduced penalties in discretionary nodes, the exception -syntax now also can take a penalty specification. The value between square brackets -is a multiplier for \lpr {exceptionpenalty}. Here we have set it to 10000 so -effectively we get 30000 in the example. - -\def\ShowSample#1#2% - {\startlinecorrection[blank] - \hyphenation{#1}% - \exceptionpenalty=10000 - \bTABLE[foregroundstyle=type] - \bTR - \bTD[align=middle,nx=4] \type{#1} \eTD - \eTR - \bTR - \bTD[align=middle] \type{10em} \eTD - \bTD[align=middle] \type {3em} \eTD - \bTD[align=middle] \type {0em} \eTD - \bTD[align=middle] \type {6em} \eTD - \eTR - \bTR - \bTD[width=10em]\vtop{\hsize 10em 123 #2 123\par}\eTD - \bTD[width=10em]\vtop{\hsize 3em 123 #2 123\par}\eTD - \bTD[width=10em]\vtop{\hsize 0em 123 #2 123\par}\eTD - \bTD[width=10em]\vtop{\setupalign[verytolerant,stretch]\rmtf\hsize 6em 123 #2 #2 #2 #2 123\par}\eTD - \eTR - \eTABLE - \stoplinecorrection} - -\ShowSample{x{a-}{-b}{}x{a-}{-b}{}x{a-}{-b}{}x{a-}{-b}{}xx}{xxxxxx} -\ShowSample{x{a-}{-b}{}x{a-}{-b}{}[3]x{a-}{-b}{}[1]x{a-}{-b}{}xx}{xxxxxx} - -\ShowSample{z{a-}{-b}{z}{a-}{-b}{z}{a-}{-b}{z}{a-}{-b}{z}z}{zzzzzz} -\ShowSample{z{a-}{-b}{z}{a-}{-b}{z}[3]{a-}{-b}{z}[1]{a-}{-b}{z}z}{zzzzzz} - -\stopsection - -\startsection[title={Applying hyphenation}] - -\topicindex {hyphenation+how it works} -\topicindex {hyphenation+discretionaries} -\topicindex {discretionaries} - -The internal structures \LUATEX\ uses for the insertion of discretionaries in -words is very different from the ones in \TEX82, and that means there are some -noticeable differences in handling as well. - -First and foremost, there is no \quote {compressed trie} involved in hyphenation. -The algorithm still reads pattern files generated by \PATGEN, but \LUATEX\ uses a -finite state hash to match the patterns against the word to be hyphenated. This -algorithm is based on the \quote {libhnj} library used by \OPENOFFICE, which in -turn is inspired by \TEX. - -There are a few differences between \LUATEX\ and \TEX82 that are a direct result -of the implementation: - -\startitemize -\startitem - \LUATEX\ happily hyphenates the full \UNICODE\ character range. -\stopitem -\startitem - Pattern and exception dictionary size is limited by the available memory - only, all allocations are done dynamically. The trie|-|related settings in - \type {texmf.cnf} are ignored. -\stopitem -\startitem - Because there is no \quote {trie preparation} stage, language patterns never - become frozen. This means that the primitive \prm {patterns} (and its \LUA\ - counterpart \type {lang.patterns}) can be used at any time, not only in - ini\TEX. -\stopitem -\startitem - Only the string representation of \prm {patterns} and \prm {hyphenation} is - stored in the format file. At format load time, they are simply - re|-|evaluated. It follows that there is no real reason to preload languages - in the format file. In fact, it is usually not a good idea to do so. It is - much smarter to load patterns no sooner than the first time they are actually - needed. -\stopitem -\startitem - \LUATEX\ uses the language-specific variables \lpr {prehyphenchar} and \lpr - {posthyphenchar} in the creation of implicit discretionaries, instead of - \TEX82's \prm {hyphenchar}, and the values of the language|-|specific - variables \lpr {preexhyphenchar} and \lpr {postexhyphenchar} for explicit - discretionaries (instead of \TEX82's empty discretionary). -\stopitem -\startitem - The value of the two counters related to hyphenation, \prm {hyphenpenalty} - and \prm {exhyphenpenalty}, are now stored in the discretionary nodes. This - permits a local overload for explicit \prm {discretionary} commands. The - value current when the hyphenation pass is applied is used. When no callbacks - are used this is compatible with traditional \TEX. When you apply the \LUA\ - \type {lang.hyphenate} function the current values are used. -\stopitem -\startitem - The hyphenation exception dictionary is maintained as key|-|value hash, and - that is also dynamic, so the \type {hyph_size} setting is not used either. -\stopitem -\stopitemize - -Because we store penalties in the disc node the \prm {discretionary} command has -been extended to accept an optional penalty specification, so you can do the -following: - -\startbuffer -\hsize1mm -1:foo{\hyphenpenalty 10000\discretionary{}{}{}}bar\par -2:foo\discretionary penalty 10000 {}{}{}bar\par -3:foo\discretionary{}{}{}bar\par -\stopbuffer - -\typebuffer - -This results in: - -\blank \start \getbuffer \stop \blank - -Inserted characters and ligatures inherit their attributes from the nearest glyph -node item (usually the preceding one, but the following one for the items -inserted at the left-hand side of a word). - -Word boundaries are no longer implied by font switches, but by language switches. -One word can have two separate fonts and still be hyphenated correctly (but it -can not have two different languages, the \prm {setlanguage} command forces a -word boundary). - -All languages start out with \type {\prehyphenchar=`\-}, \type {\posthyphenchar=0}, -\type {\preexhyphenchar=0} and \type {\postexhyphenchar=0}. When you assign the -values of one of these four parameters, you are actually changing the settings -for the current \prm {language}, this behaviour is compatible with \prm {patterns} -and \prm {hyphenation}. - -\LUATEX\ also hyphenates the first word in a paragraph. Words can be up to 256 -characters long (up from 64 in \TEX82). Longer words are ignored right now, but -eventually either the limitation will be removed or perhaps it will become -possible to silently ignore the excess characters (this is what happens in -\TEX82, but there the behaviour cannot be controlled). - -If you are using the \LUA\ function \type {lang.hyphenate}, you should be aware -that this function expects to receive a list of \quote {character} nodes. It will -not operate properly in the presence of \quote {glyph}, \quote {ligature}, or -\quote {ghost} nodes, nor does it know how to deal with kerning. - -\stopsection - -\startsection[title={Applying ligatures and kerning}] - -\topicindex {ligatures} -\topicindex {kerning} - -After all possible hyphenation points have been inserted in the list, \LUATEX\ -will process the list to convert the \quote {character} nodes into \quote {glyph} -and \quote {ligature} nodes. This is actually done in two stages: first all -ligatures are processed, then all kerning information is applied to the result -list. But those two stages are somewhat dependent on each other: If the used font -makes it possible to do so, the ligaturing stage adds virtual \quote {character} -nodes to the word boundaries in the list. While doing so, it removes and -interprets \prm {noboundary} nodes. The kerning stage deletes those word -boundary items after it is done with them, and it does the same for \quote -{ghost} nodes. Finally, at the end of the kerning stage, all remaining \quote -{character} nodes are converted to \quote {glyph} nodes. - -This word separation is worth mentioning because, if you overrule from \LUA\ only -one of the two callbacks related to font handling, then you have to make sure you -perform the tasks normally done by \LUATEX\ itself in order to make sure that the -other, non|-|overruled, routine continues to function properly. - -Although we could improve the situation the reality is that in modern \OPENTYPE\ -fonts ligatures can be constructed in many ways: by replacing a sequence of -characters by one glyph, or by selectively replacing individual glyphs, or by -kerning, or any combination of this. Add to that contextual analysis and it will -be clear that we have to let \LUA\ do that job instead. The generic font handler -that we provide (which is part of \CONTEXT) distinguishes between base mode -(which essentially is what we describe here and which delegates the task to \TEX) -and node mode (which deals with more complex fonts. - -Let's look at an example. Take the word \type {office}, hyphenated \type -{of-fice}, using a \quote {normal} font with all the \type {f}-\type {f} and -\type {f}-\type {i} type ligatures: - -\starttabulate[|l|l|] -\NC initial \NC \type {{o}{f}{f}{i}{c}{e}} \NC\NR -\NC after hyphenation \NC \type {{o}{f}{{-},{},{}}{f}{i}{c}{e}} \NC\NR -\NC first ligature stage \NC \type {{o}{{f-},{f},{}}{i}{c}{e}} \NC\NR -\NC final result \NC \type {{o}{{f-},{},{}}{c}{e}} \NC\NR -\stoptabulate - -That's bad enough, but let us assume that there is also a hyphenation point -between the \type {f} and the \type {i}, to create \type {of-f-ice}. Then the -final result should be: - -\starttyping -{o}{{f-}, - {{f-}, - {i}, - {}}, - {{-}, - {i}, - {}}}{c}{e} -\stoptyping - -with discretionaries in the post-break text as well as in the replacement text of -the top-level discretionary that resulted from the first hyphenation point. - -Here is that nested solution again, in a different representation: - -\testpage[4] - -\starttabulate[|l|c|c|c|c|c|c|] -\DB \BC pre \BC \BC post \BC \BC replace \BC \NC \NR -\TB -\NC topdisc \NC \type {f-} \NC (1) \NC \NC sub 1 \NC \NC sub 2 \NC \NR -\NC sub 1 \NC \type {f-} \NC (2) \NC \type {i} \NC (3) \NC \type {} \NC (4) \NC \NR -\NC sub 2 \NC \type {-} \NC (5) \NC \type {i} \NC (6) \NC \type {} \NC (7) \NC \NR -\LL -\stoptabulate - -When line breaking is choosing its breakpoints, the following fields will -eventually be selected: - -\starttabulate[|l|c|c|] -\NC \type {of-f-ice} \NC \type {f-} \NC (1) \NC \NR -\NC \NC \type {f-} \NC (2) \NC \NR -\NC \NC \type {i} \NC (3) \NC \NR -\NC \type {of-fice} \NC \type {f-} \NC (1) \NC \NR -\NC \NC \type {} \NC (4) \NC \NR -\NC \type {off-ice} \NC \type {-} \NC (5) \NC \NR -\NC \NC \type {i} \NC (6) \NC \NR -\NC \type {office} \NC \type {} \NC (7) \NC \NR -\stoptabulate - -The current solution in \LUATEX\ is not able to handle nested discretionaries, -but it is in fact smart enough to handle this fictional \type {of-f-ice} example. -It does so by combining two sequential discretionary nodes as if they were a -single object (where the second discretionary node is treated as an extension of -the first node). - -One can observe that the \type {of-f-ice} and \type {off-ice} cases both end with -the same actual post replacement list (\type {i}), and that this would be the -case even if \type {i} was the first item of a potential following ligature like -\type {ic}. This allows \LUATEX\ to do away with one of the fields, and thus make -the whole stuff fit into just two discretionary nodes. - -The mapping of the seven list fields to the six fields in this discretionary node -pair is as follows: - -\starttabulate[|l|c|c|] -\DB field \BC description \NC \NC \NR -\TB -\NC \type {disc1.pre} \NC \type {f-} \NC (1) \NC \NR -\NC \type {disc1.post} \NC \type {} \NC (4) \NC \NR -\NC \type {disc1.replace} \NC \type {} \NC (7) \NC \NR -\NC \type {disc2.pre} \NC \type {f-} \NC (2) \NC \NR -\NC \type {disc2.post} \NC \type {i} \NC (3,6) \NC \NR -\NC \type {disc2.replace} \NC \type {-} \NC (5) \NC \NR -\LL -\stoptabulate - -What is actually generated after ligaturing has been applied is therefore: - -\starttyping -{o}{{f-}, - {}, - {}} - {{f-}, - {i}, - {-}}{c}{e} -\stoptyping - -The two discretionaries have different subtypes from a discretionary appearing on -its own: the first has subtype 4, and the second has subtype 5. The need for -these special subtypes stems from the fact that not all of the fields appear in -their \quote {normal} location. The second discretionary especially looks odd, -with things like the \type {-} appearing in \type {disc2.replace}. The fact -that some of the fields have different meanings (and different processing code -internally) is what makes it necessary to have different subtypes: this enables -\LUATEX\ to distinguish this sequence of two joined discretionary nodes from the -case of two standalone discretionaries appearing in a row. - -Of course there is still that relationship with fonts: ligatures can be implemented by -mapping a sequence of glyphs onto one glyph, but also by selective replacement and -kerning. This means that the above examples are just representing the traditional -approach. - -\stopsection - -\startsection[title={Breaking paragraphs into lines}] - -\topicindex {linebreaks} -\topicindex {paragraphs} -\topicindex {discretionaries} - -This code is almost unchanged, but because of the above|-|mentioned changes -with respect to discretionaries and ligatures, line breaking will potentially be -different from traditional \TEX. The actual line breaking code is still based on -the \TEX82 algorithms, and it does not expect there to be discretionaries inside -of discretionaries. But, as patterns evolve and font handling can influence -discretionaries, you need to be aware of the fact that long term consistency is not -an engine matter only. - -But that situation is now fairly common in \LUATEX, due to the changes to the -ligaturing mechanism. And also, the \LUATEX\ discretionary nodes are implemented -slightly different from the \TEX82 nodes: the \type {no_break} text is now -embedded inside the disc node, where previously these nodes kept their place in -the horizontal list. In traditional \TEX\ the discretionary node contains a -counter indicating how many nodes to skip, but in \LUATEX\ we store the pre, post -and replace text in the discretionary node. - -The combined effect of these two differences is that \LUATEX\ does not always use -all of the potential breakpoints in a paragraph, especially when fonts with many -ligatures are used. Of course kerning also complicates matters here. - -\stopsection - -\startsection[title={The \type {lang} library}][library=lang] - -\subsection {\type {new} and \type {id}} - -\topicindex {languages+library} - -\libindex {new} -\libindex {id} - -This library provides the interface to \LUATEX's structure representing a -language, and the associated functions. - -\startfunctioncall - l = lang.new() - l = lang.new( id) -\stopfunctioncall - -This function creates a new userdata object. An object of type \type {} -is the first argument to most of the other functions in the \type {lang} library. -These functions can also be used as if they were object methods, using the colon -syntax. Without an argument, the next available internal id number will be -assigned to this object. With argument, an object will be created that links to -the internal language with that id number. - -\startfunctioncall - n = lang.id( l) -\stopfunctioncall - -The number returned is the internal \prm {language} id number this object refers to. - -\subsection {\type {hyphenation}} - -\libindex {hyphenation} - -You can hyphenate a string directly with: - -\startfunctioncall - n = lang.hyphenation( l) -lang.hyphenation( l, n) -\stopfunctioncall - -\subsection {\type {clear_hyphenation} and \type {clean}} - -\libindex {clear_hyphenation} -\libindex {clean} - -This either returns the current hyphenation exceptions for this language, or adds -new ones. The syntax of the string is explained in~\in {section} -[patternsexceptions]. - -\startfunctioncall -lang.clear_hyphenation( l) -\stopfunctioncall - -This call clears the exception dictionary (string) for this language. - -\startfunctioncall - n = lang.clean( l, o) - n = lang.clean( o) -\stopfunctioncall - -This function creates a hyphenation key from the supplied hyphenation value. The -syntax of the argument string is explained in \in {section} [patternsexceptions]. -This function is useful if you want to do something else based on the words in a -dictionary file, like spell|-|checking. - -\subsection {\type {patterns} and \type {clear_patterns}} - -\libindex {patterns} -\libindex {clear_patterns} - -\startfunctioncall - n = lang.patterns( l) -lang.patterns( l, n) -\stopfunctioncall - -This adds additional patterns for this language object, or returns the current -set. The syntax of this string is explained in \in {section} -[patternsexceptions]. - -\startfunctioncall -lang.clear_patterns( l) -\stopfunctioncall - -This can be used to clear the pattern dictionary for a language. - -\subsection {\type {hyphenationmin}} - -\libindex {hyphenationmin} - -This function sets (or gets) the value of the \TEX\ parameter -\type {\hyphenationmin}. - -\startfunctioncall -n = lang.hyphenationmin( l) -lang.hyphenationmin( l, n) -\stopfunctioncall - -\subsection {\type {[pre|post][ex|]hyphenchar}} - -\libindex {prehyphenchar} -\libindex {posthyphenchar} -\libindex {preexhyphenchar} -\libindex {postexhyphenchar} - -\startfunctioncall - n = lang.prehyphenchar( l) -lang.prehyphenchar( l, n) - - n = lang.posthyphenchar( l) -lang.posthyphenchar( l, n) -\stopfunctioncall - -These two are used to get or set the \quote {pre|-|break} and \quote -{post|-|break} hyphen characters for implicit hyphenation in this language. The -intial values are decimal 45 (hyphen) and decimal~0 (indicating emptiness). - -\startfunctioncall - n = lang.preexhyphenchar( l) -lang.preexhyphenchar( l, n) - - n = lang.postexhyphenchar( l) -lang.postexhyphenchar( l, n) -\stopfunctioncall - -These gets or set the \quote {pre|-|break} and \quote {post|-|break} hyphen -characters for explicit hyphenation in this language. Both are initially -decimal~0 (indicating emptiness). - -\subsection {\type {hyphenate}} - -\libindex {hyphenate} - -The next call inserts hyphenation points (discretionary nodes) in a node list. If -\type {tail} is given as argument, processing stops on that node. Currently, -\type {success} is always true if \type {head} (and \type {tail}, if specified) -are proper nodes, regardless of possible other errors. - -\startfunctioncall - success = lang.hyphenate( head) - success = lang.hyphenate( head, tail) -\stopfunctioncall - -Hyphenation works only on \quote {characters}, a special subtype of all the glyph -nodes with the node subtype having the value \type {1}. Glyph modes with -different subtypes are not processed. See \in {section} [charsandglyphs] for -more details. - -\subsection {\type {[set|get]hjcode}} - -\libindex {sethjcode} -\libindex {gethjcode} - -The following two commands can be used to set or query hj codes: - -\startfunctioncall -lang.sethjcode( l, char, usedchar) - usedchar = lang.gethjcode( l, char) -\stopfunctioncall - -When you set a hjcode the current sets get initialized unless the set was already -initialized due to \prm {savinghyphcodes} being larger than zero. - -\stopsection - -\stopchapter - -\stopcomponent - -% \parindent0pt \hsize=1.1cm -% 12-34-56 \par -% 12-34-\hbox{56} \par -% 12-34-\vrule width 1em height 1.5ex \par -% 12-\hbox{34}-56 \par -% 12-\vrule width 1em height 1.5ex-56 \par -% \hjcode`\1=`\1 \hjcode`\2=`\2 \hjcode`\3=`\3 \hjcode`\4=`\4 \vskip.5cm -% 12-34-56 \par -% 12-34-\hbox{56} \par -% 12-34-\vrule width 1em height 1.5ex \par -% 12-\hbox{34}-56 \par -% 12-\vrule width 1em height 1.5ex-56 \par - +% language=uk + +\environment luatex-style + +\startcomponent luatex-languages + +\startchapter[reference=languages,title={Languages, characters, fonts and glyphs}] + +\startsection[title={Introduction}] + +\topicindex {languages} + +\LUATEX's internal handling of the characters and glyphs that eventually become +typeset is quite different from the way \TEX82 handles those same objects. The +easiest way to explain the difference is to focus on unrestricted horizontal mode +(i.e.\ paragraphs) and hyphenation first. Later on, it will be easy to deal +with the differences that occur in horizontal and math modes. + +In \TEX82, the characters you type are converted into \type {char} node records +when they are encountered by the main control loop. \TEX\ attaches and processes +the font information while creating those records, so that the resulting \quote +{horizontal list} contains the final forms of ligatures and implicit kerning. +This packaging is needed because we may want to get the effective width of for +instance a horizontal box. + +When it becomes necessary to hyphenate words in a paragraph, \TEX\ converts (one +word at time) the \type {char} node records into a string by replacing ligatures +with their components and ignoring the kerning. Then it runs the hyphenation +algorithm on this string, and converts the hyphenated result back into a \quote +{horizontal list} that is consecutively spliced back into the paragraph stream. +Keep in mind that the paragraph may contain unboxed horizontal material, which +then already contains ligatures and kerns and the words therein are part of the +hyphenation process. + +Those \type {char} node records are somewhat misnamed, as they are glyph +positions in specific fonts, and therefore not really \quote {characters} in the +linguistic sense. There is no language information inside the \type {char} node +records at all. Instead, language information is passed along using \type +{language whatsit} nodes inside the horizontal list. + +In \LUATEX, the situation is quite different. The characters you type are always +converted into \nod {glyph} node records with a special subtype to identify them +as being intended as linguistic characters. \LUATEX\ stores the needed language +information in those records, but does not do any font|-|related processing at +the time of node creation. It only stores the index of the current font and a +reference to a character in that font. + +When it becomes necessary to typeset a paragraph, \LUATEX\ first inserts all +hyphenation points right into the whole node list. Next, it processes all the +font information in the whole list (creating ligatures and adjusting kerning), +and finally it adjusts all the subtype identifiers so that the records are \quote +{glyph nodes} from now on. + +\stopsection + +\startsection[title={Characters, glyphs and discretionaries},reference=charsandglyphs] + +\topicindex {characters} +\topicindex {glyphs} +\topicindex {hyphenation} + +\TEX82 (including \PDFTEX) differentiates between \type {char} nodes and \type +{lig} nodes. The former are simple items that contained nothing but a \quote +{character} and a \quote {font} field, and they lived in the same memory as +tokens did. The latter also contained a list of components, and a subtype +indicating whether this ligature was the result of a word boundary, and it was +stored in the same place as other nodes like boxes and kerns and glues. + +In \LUATEX, these two types are merged into one, somewhat larger structure called +a \nod {glyph} node. Besides having the old character, font, and component +fields there are a few more, like \quote {attr} that we will see in \in {section} +[glyphnodes], these nodes also contain a subtype, that codes four main types and +two additional ghost types. For ligatures, multiple bits can be set at the same +time (in case of a single|-|glyph word). + +\startitemize + \startitem + \type {character}, for characters to be hyphenated: the lowest bit + (bit 0) is set to 1. + \stopitem + \startitem + \nod {glyph}, for specific font glyphs: the lowest bit (bit 0) is + not set. + \stopitem + \startitem + \type {ligature}, for constructed ligatures bit 1 is set. + \stopitem + \startitem + \type {ghost}, for so called \quote {ghost objects} bit 2 is set. + \stopitem + \startitem + \type {left}, for ligatures created from a left word boundary and for + ghosts created from \lpr {leftghost} bit 3 gets set. + \stopitem + \startitem + \type {right}, for ligatures created from a right word boundary and + for ghosts created from \lpr {rightghost} bit 4 is set. + \stopitem +\stopitemize + +The \nod {glyph} nodes also contain language data, split into four items that +were current when the node was created: the \prm {setlanguage} (15~bits), \prm +{lefthyphenmin} (8~bits), \prm {righthyphenmin} (8~bits), and \prm {uchyph} +(1~bit). + +Incidentally, \LUATEX\ allows 16383 separate languages, and words can be 256 +characters long. The language is stored with each character. You can set +\prm {firstvalidlanguage} to for instance~1 and make thereby language~0 +an ignored hyphenation language. + +The new primitive \lpr {hyphenationmin} can be used to signal the minimal length +of a word. This value is stored with the (current) language. + +Because the \prm {uchyph} value is saved in the actual nodes, its handling is +subtly different from \TEX82: changes to \prm {uchyph} become effective +immediately, not at the end of the current partial paragraph. + +Typeset boxes now always have their language information embedded in the nodes +themselves, so there is no longer a possible dependency on the surrounding +language settings. In \TEX82, a mid|-|paragraph statement like \type {\unhbox0} +would process the box using the current paragraph language unless there was a +\prm {setlanguage} issued inside the box. In \LUATEX, all language variables +are already frozen. + +In traditional \TEX\ the process of hyphenation is driven by \type {lccode}s. In +\LUATEX\ we made this dependency less strong. There are several strategies +possible. When you do nothing, the currently used \type {lccode}s are used, when +loading patterns, setting exceptions or hyphenating a list. + +When you set \prm {savinghyphcodes} to a value greater than zero the current set +of \type {lccode}s will be saved with the language. In that case changing a \type +{lccode} afterwards has no effect. However, you can adapt the set with: + +\starttyping +\hjcode`a=`a +\stoptyping + +This change is global which makes sense if you keep in mind that the moment that +hyphenation happens is (normally) when the paragraph or a horizontal box is +constructed. When \prm {savinghyphcodes} was zero when the language got +initialized you start out with nothing, otherwise you already have a set. + +When a \lpr {hjcode} is greater than 0 but less than 32 is indicates the +to be used length. In the following example we map a character (\type {x}) onto +another one in the patterns and tell the engine that \type {œ} counts as one +character. Because traditionally zero itself is reserved for inhibiting +hyphenation, a value of 32 counts as zero. + +Here are some examples (we assume that French patterns are used): + +\starttabulate[||||] +\NC \NC \type{foobar} \NC \type{foo-bar} \NC \NR +\NC \type{\hjcode`x=`o} \NC \type{fxxbar} \NC \type{fxx-bar} \NC \NR +\NC \type{\lefthyphenmin3} \NC \type{œdipus} \NC \type{œdi-pus} \NC \NR +\NC \type{\lefthyphenmin4} \NC \type{œdipus} \NC \type{œdipus} \NC \NR +\NC \type{\hjcode`œ=2} \NC \type{œdipus} \NC \type{œdi-pus} \NC \NR +\NC \type{\hjcode`i=32 \hjcode`d=32} \NC \type{œdipus} \NC \type{œdipus} \NC \NR +\NC +\stoptabulate + +Carrying all this information with each glyph would give too much overhead and +also make the process of setting up these codes more complex. A solution with +\type {hjcode} sets was considered but rejected because in practice the current +approach is sufficient and it would not be compatible anyway. + +Beware: the values are always saved in the format, independent of the setting +of \prm {savinghyphcodes} at the moment the format is dumped. + +A boundary node normally would mark the end of a word which interferes with for +instance discretionary injection. For this you can use the \prm {wordboundary} +as a trigger. Here are a few examples of usage: + +\startbuffer + discrete---discrete +\stopbuffer +\typebuffer \startnarrower \dontcomplain \hsize 1pt \getbuffer \par \stopnarrower +\startbuffer + discrete\discretionary{}{}{---}discrete +\stopbuffer +\typebuffer \startnarrower \dontcomplain \hsize 1pt \getbuffer \par \stopnarrower +\startbuffer + discrete\wordboundary\discretionary{}{}{---}discrete +\stopbuffer +\typebuffer \startnarrower \dontcomplain \hsize 1pt \getbuffer \par \stopnarrower +\startbuffer + discrete\wordboundary\discretionary{}{}{---}\wordboundary discrete +\stopbuffer +\typebuffer \startnarrower \dontcomplain \hsize 1pt \getbuffer \par \stopnarrower +\startbuffer + discrete\wordboundary\discretionary{---}{}{}\wordboundary discrete +\stopbuffer +\typebuffer \startnarrower \dontcomplain \hsize 1pt \getbuffer \par \stopnarrower + +We only accept an explicit hyphen when there is a preceding glyph and we skip a +sequence of explicit hyphens since that normally indicates a \type {--} or \type +{---} ligature in which case we can in a worse case usage get bad node lists +later on due to messed up ligature building as these dashes are ligatures in base +fonts. This is a side effect of separating the hyphenation, ligaturing and +kerning steps. + +The start and end of a sequence of characters is signalled by a \nod {glue}, \nod +{penalty}, \nod {kern} or \nod {boundary} node. But by default also a \nod +{hlist}, \nod {vlist}, \nod {rule}, \nod {dir}, \nod {whatsit}, \nod {ins}, and +\nod {adjust} node indicate a start or end. You can omit the last set from the +test by setting \lpr {hyphenationbounds} to a non|-|zero value: + +\starttabulate[|c|l|] +\DB value \BC behaviour \NC \NR +\TB +\NC \type{0} \NC not strict \NC \NR +\NC \type{1} \NC strict start \NC \NR +\NC \type{2} \NC strict end \NC \NR +\NC \type{3} \NC strict start and strict end \NC \NR +\LL +\stoptabulate + +The word start is determined as follows: + +\starttabulate[|l|l|] +\DB node \BC behaviour \NC \NR +\TB +\BC boundary \NC yes when wordboundary \NC \NR +\BC hlist \NC when hyphenationbounds 1 or 3 \NC \NR +\BC vlist \NC when hyphenationbounds 1 or 3 \NC \NR +\BC rule \NC when hyphenationbounds 1 or 3 \NC \NR +\BC dir \NC when hyphenationbounds 1 or 3 \NC \NR +\BC whatsit \NC when hyphenationbounds 1 or 3 \NC \NR +\BC glue \NC yes \NC \NR +\BC math \NC skipped \NC \NR +\BC glyph \NC exhyphenchar (one only) : yes (so no -- ---) \NC \NR +\BC otherwise \NC yes \NC \NR +\LL +\stoptabulate + +The word end is determined as follows: + +\starttabulate[|l|l|] +\DB node \BC behaviour \NC \NR +\TB +\BC boundary \NC yes \NC \NR +\BC glyph \NC yes when different language \NC \NR +\BC glue \NC yes \NC \NR +\BC penalty \NC yes \NC \NR +\BC kern \NC yes when not italic (for some historic reason) \NC \NR +\BC hlist \NC when hyphenationbounds 2 or 3 \NC \NR +\BC vlist \NC when hyphenationbounds 2 or 3 \NC \NR +\BC rule \NC when hyphenationbounds 2 or 3 \NC \NR +\BC dir \NC when hyphenationbounds 2 or 3 \NC \NR +\BC whatsit \NC when hyphenationbounds 2 or 3 \NC \NR +\BC ins \NC when hyphenationbounds 2 or 3 \NC \NR +\BC adjust \NC when hyphenationbounds 2 or 3 \NC \NR +\LL +\stoptabulate + +\in {Figures} [hb:1] upto \in [hb:5] show some examples. In all cases we set the +min values to 1 and make sure that the words hyphenate at each character. + +\hyphenation{o-n-e t-w-o} + +\def\SomeTest#1#2% + {\lefthyphenmin \plusone + \righthyphenmin \plusone + \parindent \zeropoint + \everypar \emptytoks + \dontcomplain + \hbox to 2cm {% + \vtop {% + \hsize 1pt + \hyphenationbounds#1 + #2 + \par}}} + +\startplacefigure[reference=hb:1,title={\type{one}}] + \startcombination[4*1] + {\SomeTest{0}{one}} {\type{0}} + {\SomeTest{1}{one}} {\type{1}} + {\SomeTest{2}{one}} {\type{2}} + {\SomeTest{3}{one}} {\type{3}} + \stopcombination +\stopplacefigure + +\startplacefigure[reference=hb:2,title={\type{one\null two}}] + \startcombination[4*1] + {\SomeTest{0}{one\null two}} {\type{0}} + {\SomeTest{1}{one\null two}} {\type{1}} + {\SomeTest{2}{one\null two}} {\type{2}} + {\SomeTest{3}{one\null two}} {\type{3}} + \stopcombination +\stopplacefigure + +\startplacefigure[reference=hb:3,title={\type{\null one\null two}}] + \startcombination[4*1] + {\SomeTest{0}{\null one\null two}} {\type{0}} + {\SomeTest{1}{\null one\null two}} {\type{1}} + {\SomeTest{2}{\null one\null two}} {\type{2}} + {\SomeTest{3}{\null one\null two}} {\type{3}} + \stopcombination +\stopplacefigure + +\startplacefigure[reference=hb:4,title={\type{one\null two\null}}] + \startcombination[4*1] + {\SomeTest{0}{one\null two\null}} {\type{0}} + {\SomeTest{1}{one\null two\null}} {\type{1}} + {\SomeTest{2}{one\null two\null}} {\type{2}} + {\SomeTest{3}{one\null two\null}} {\type{3}} + \stopcombination +\stopplacefigure + +\startplacefigure[reference=hb:5,title={\type{\null one\null two\null}}] + \startcombination[4*1] + {\SomeTest{0}{\null one\null two\null}} {\type{0}} + {\SomeTest{1}{\null one\null two\null}} {\type{1}} + {\SomeTest{2}{\null one\null two\null}} {\type{2}} + {\SomeTest{3}{\null one\null two\null}} {\type{3}} + \stopcombination +\stopplacefigure + +% (Future versions of \LUATEX\ might provide more granularity.) + +In traditional \TEX\ ligature building and hyphenation are interwoven with the +line break mechanism. In \LUATEX\ these phases are isolated. As a consequence we +deal differently with (a sequence of) explicit hyphens. We already have added +some control over aspects of the hyphenation and yet another one concerns +automatic hyphens (e.g.\ \type {-} characters in the input). + +When \lpr {automatichyphenmode} has a value of 0, a hyphen will be turned into +an automatic discretionary. The snippets before and after it will not be +hyphenated. A side effect is that a leading hyphen can lead to a split but one +will seldom run into that situation. Setting a pre and post character makes this +more prominent. A value of 1 will prevent this side effect and a value of 2 will +not turn the hyphen into a discretionary. Experiments with other options, like +permitting hyphenation of the words on both sides were discarded. + +\startbuffer[a] +before-after \par +before--after \par +before---after \par +\stopbuffer + +\startbuffer[b] +-before \par +after- \par +--before \par +after-- \par +---before \par +after--- \par +\stopbuffer + +\startbuffer[c] +before-after \par +before--after \par +before---after \par +\stopbuffer + +\startbuffer[demo] +\startcombination[nx=4,ny=3,location=top] + {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\zerocount \hsize6em \getbuffer[a]}} {A~0~6em} + {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\zerocount \hsize2pt \getbuffer[a]}} {A~0~2pt} + {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\plusone \hsize2pt \getbuffer[a]}} {A~1~2pt} + {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\plustwo \hsize2pt \getbuffer[a]}} {A~2~2pt} + {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\zerocount \hsize6em \getbuffer[b]}} {B~0~6em} + {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\zerocount \hsize2pt \getbuffer[b]}} {B~0~2pt} + {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\plusone \hsize2pt \getbuffer[b]}} {B~1~2pt} + {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\plustwo \hsize2pt \getbuffer[b]}} {B~2~2pt} + {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\zerocount \hsize6em \getbuffer[c]}} {C~0~6em} + {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\zerocount \hsize2pt \getbuffer[c]}} {C~0~2pt} + {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\plusone \hsize2pt \getbuffer[c]}} {C~1~2pt} + {\framed[align=normal,strut=no,top=\vskip.5ex,bottom=\vskip.5ex]{\automatichyphenmode\plustwo \hsize2pt \getbuffer[c]}} {C~2~2pt} +\stopcombination +\stopbuffer + +\startplacefigure[locationreference=automatichyphenmode:1,title={The automatic modes \type {0} (default), \type {1} and \type {2}, with a \prm {hsize} +of 6em and 2pt (which triggers a linebreak).}] + \dontcomplain \tt \getbuffer[demo] +\stopplacefigure + +\startplacefigure[reference=automatichyphenmode:2,title={The automatic modes \type {0} (default), \type {1} and \type {2}, with \lpr {preexhyphenchar} and \lpr {postexhyphenchar} set to characters \type {A} and \type {B}.}] + \postexhyphenchar`A\relax + \preexhyphenchar `B\relax + \dontcomplain \tt \getbuffer[demo] +\stopplacefigure + +In \in {figure} [automatichyphenmode:1] \in {and} [automatichyphenmode:2] we show +what happens with three samples: + +Input A: \typebuffer[a] +Input B: \typebuffer[b] +Input C: \typebuffer[c] + +As with primitive companions of other single character commands, the \prm {-} +command has a more verbose primitive version in \lpr {explicitdiscretionary} +and the normally intercepted in the hyphenator character \type {-} (or whatever +is configured) is available as \lpr {automaticdiscretionary}. + +\stopsection + +\startsection[title={The main control loop}] + +\topicindex {main loop} +\topicindex {hyphenation} + +In \LUATEX's main loop, almost all input characters that are to be typeset are +converted into \nod {glyph} node records with subtype \quote {character}, but +there are a few exceptions. + +\startitemize[n] + +\startitem + The \prm {accent} primitive creates nodes with subtype \quote {glyph} + instead of \quote {character}: one for the actual accent and one for the + accentee. The primary reason for this is that \prm {accent} in \TEX82 is + explicitly dependent on the current font encoding, so it would not make much + sense to attach a new meaning to the primitive's name, as that would + invalidate many old documents and macro packages. A secondary reason is that + in \TEX82, \prm {accent} prohibits hyphenation of the current word. Since + in \LUATEX\ hyphenation only takes place on \quote {character} nodes, it is + possible to achieve the same effect. Of course, modern \UNICODE\ aware macro + packages will not use the \prm {accent} primitive at all but try to map + directly on composed characters. + + This change of meaning did happen with \prm {char}, that now generates + \quote {glyph} nodes with a character subtype. In traditional \TEX\ there was + a strong relationship between the 8|-|bit input encoding, hyphenation and + glyphs taken from a font. In \LUATEX\ we have \UTF\ input, and in most cases + this maps directly to a character in a font, apart from glyph replacement in + the font engine. If you want to access arbitrary glyphs in a font directly + you can always use \LUA\ to do so, because fonts are available as \LUA\ + table. +\stopitem + +\startitem + All the results of processing in math mode eventually become nodes with + \quote {glyph} subtypes. In fact, the result of processing math is just + a regular list of glyphs, kerns, glue, penalties, boxes etc. +\stopitem + +\startitem + The \ALEPH|-|derived commands \lpr {leftghost} and \lpr {rightghost} + create nodes of a third subtype: \quote {ghost}. These nodes are ignored + completely by all further processing until the stage where inter|-|glyph + kerning is added. +\stopitem + +\startitem + Automatic discretionaries are handled differently. \TEX82 inserts an empty + discretionary after sensing an input character that matches the \prm + {hyphenchar} in the current font. This test is wrong in our opinion: whether + or not hyphenation takes place should not depend on the current font, it is a + language property. \footnote {When \TEX\ showed up we didn't have \UNICODE\ + yet and being limited to eight bits meant that one sometimes had to + compromise between supporting character input, glyph rendering, hyphenation.} + + In \LUATEX, it works like this: if \LUATEX\ senses a string of input + characters that matches the value of the new integer parameter \prm + {exhyphenchar}, it will insert an explicit discretionary after that series of + nodes. Initially \TEX\ sets the \type {\exhyphenchar=`\-}. Incidentally, this + is a global parameter instead of a language-specific one because it may be + useful to change the value depending on the document structure instead of the + text language. + + The insertion of discretionaries after a sequence of explicit hyphens happens + at the same time as the other hyphenation processing, {\it not\/} inside the + main control loop. + + The only use \LUATEX\ has for \prm {hyphenchar} is at the check whether a + word should be considered for hyphenation at all. If the \prm {hyphenchar} + of the font attached to the first character node in a word is negative, then + hyphenation of that word is abandoned immediately. This behaviour is added + for backward compatibility only, and the use of \type {\hyphenchar=-1} as a + means of preventing hyphenation should not be used in new \LUATEX\ documents. +\stopitem + +\startitem + The \prm {setlanguage} command no longer creates whatsits. The meaning of + \prm {setlanguage} is changed so that it is now an integer parameter like all + others. That integer parameter is used in \type {\glyph_node} creation to add + language information to the glyph nodes. In conjunction, the \prm {language} + primitive is extended so that it always also updates the value of \prm + {setlanguage}. +\stopitem + +\startitem + The \prm {noboundary} command (that prohibits word boundary processing + where that would normally take place) now does create nodes. These nodes are + needed because the exact place of the \prm {noboundary} command in the + input stream has to be retained until after the ligature and font processing + stages. +\stopitem + +\startitem + There is no longer a \type {main_loop} label in the code. Remember that + \TEX82 did quite a lot of processing while adding \type {char_nodes} to the + horizontal list? For speed reasons, it handled that processing code outside + of the \quote {main control} loop, and only the first character of any \quote + {word} was handled by that \quote {main control} loop. In \LUATEX, there is + no longer a need for that (all hard work is done later), and the (now very + small) bits of character|-|handling code have been moved back inline. When + \prm {tracingcommands} is on, this is visible because the full word is + reported, instead of just the initial character. +\stopitem + +\stopitemize + +Because we tend to make hard coded behaviour configurable a few new primitives +have been added: + +\starttyping +\hyphenpenaltymode +\automatichyphenpenalty +\explicithyphenpenalty +\stoptyping + +The first parameter has the following consequences for automatic discs (the ones +resulting from an \prm {exhyphenchar}: + +\starttabulate[|c|l|l|] +\DB mode \BC automatic disc \type {-} \BC explicit disc \prm{-} \NC \NR +\TB +\NC \type{0} \NC \prm {exhyphenpenalty} \NC \prm {exhyphenpenalty} \NC \NR +\NC \type{1} \NC \prm {hyphenpenalty} \NC \prm {hyphenpenalty} \NC \NR +\NC \type{2} \NC \prm {exhyphenpenalty} \NC \prm {hyphenpenalty} \NC \NR +\NC \type{3} \NC \prm {hyphenpenalty} \NC \prm {exhyphenpenalty} \NC \NR +\NC \type{4} \NC \lpr {automatichyphenpenalty} \NC \lpr {explicithyphenpenalty} \NC \NR +\NC \type{5} \NC \prm {exhyphenpenalty} \NC \lpr {explicithyphenpenalty} \NC \NR +\NC \type{6} \NC \prm {hyphenpenalty} \NC \lpr {explicithyphenpenalty} \NC \NR +\NC \type{7} \NC \lpr {automatichyphenpenalty} \NC \prm {exhyphenpenalty} \NC \NR +\NC \type{8} \NC \lpr {automatichyphenpenalty} \NC \prm {hyphenpenalty} \NC \NR +\LL +\stoptabulate + +other values do what we always did in \LUATEX: insert \prm {exhyphenpenalty}. + +\stopsection + +\startsection[title={Loading patterns and exceptions},reference=patternsexceptions] + +\topicindex {hyphenation} +\topicindex {hyphenation+patterns} +\topicindex {hyphenation+exceptions} +\topicindex {patterns} +\topicindex {exceptions} + +Although we keep the traditional approach towards hyphenation (which is still +superior) the implementation of the hyphenation algorithm in \LUATEX\ is quite +different from the one in \TEX82. + +After expansion, the argument for \prm {patterns} has to be proper \UTF8 with +individual patterns separated by spaces, no \prm {char} or \prm {chardef}d +commands are allowed. The current implementation is quite strict and will reject +all non|-|\UNICODE\ characters. Likewise, the expanded argument for \prm +{hyphenation} also has to be proper \UTF8, but here a bit of extra syntax is +provided: + +\startitemize[n] +\startitem + Three sets of arguments in curly braces (\type {{}{}{}}) indicate a desired + complex discretionary, with arguments as in \prm {discretionary}'s command in + normal document input. +\stopitem +\startitem + A \type {-} indicates a desired simple discretionary, cf.\ \type {\-} and + \type {\discretionary{-}{}{}} in normal document input. +\stopitem +\startitem + Internal command names are ignored. This rule is provided especially for \prm + {discretionary}, but it also helps to deal with \prm {relax} commands that + may sneak in. +\stopitem +\startitem + An \type {=} indicates a (non|-|discretionary) hyphen in the document input. +\stopitem +\stopitemize + +The expanded argument is first converted back to a space|-|separated string while +dropping the internal command names. This string is then converted into a +dictionary by a routine that creates key|-|value pairs by converting the other +listed items. It is important to note that the keys in an exception dictionary +can always be generated from the values. Here are a few examples: + +\starttabulate[|l|l|l|] +\DB value \BC implied key (input) \BC effect \NC\NR +\TB +\NC \type {ta-ble} \NC table \NC \type {ta\-ble} ($=$ \type {ta\discretionary{-}{}{}ble}) \NC\NR +\NC \type {ba{k-}{}{c}ken} \NC backen \NC \type {ba\discretionary{k-}{}{c}ken} \NC\NR +\LL +\stoptabulate + +The resultant patterns and exception dictionary will be stored under the language +code that is the present value of \prm {language}. + +In the last line of the table, you see there is no \prm {discretionary} command +in the value: the command is optional in the \TEX-based input syntax. The +underlying reason for that is that it is conceivable that a whole dictionary of +words is stored as a plain text file and loaded into \LUATEX\ using one of the +functions in the \LUA\ \type {lang} library. This loading method is quite a bit +faster than going through the \TEX\ language primitives, but some (most?) of that +speed gain would be lost if it had to interpret command sequences while doing so. + +It is possible to specify extra hyphenation points in compound words by using +\type {{-}{}{-}} for the explicit hyphen character (replace \type {-} by the +actual explicit hyphen character if needed). For example, this matches the word +\quote {multi|-|word|-|boundaries} and allows an extra break inbetween \quote +{boun} and \quote {daries}: + +\starttyping +\hyphenation{multi{-}{}{-}word{-}{}{-}boun-daries} +\stoptyping + +The motivation behind the \ETEX\ extension \prm {savinghyphcodes} was that +hyphenation heavily depended on font encodings. This is no longer true in +\LUATEX, and the corresponding primitive is basically ignored. Because we now +have \lpr {hjcode}, the case relate codes can be used exclusively for \prm +{uppercase} and \prm {lowercase}. + +The three curly brace pair pattern in an exception can be somewhat unexpected so +we will try to explain it by example. The pattern \type {foo{}{}{x}bar} pattern +creates a lookup \type {fooxbar} and the pattern \type {foo{}{}{}bar} creates +\type {foobar}. Then, when a hit happens there is a replacement text (\type {x}) +or none. Because we introduced penalties in discretionary nodes, the exception +syntax now also can take a penalty specification. The value between square brackets +is a multiplier for \lpr {exceptionpenalty}. Here we have set it to 10000 so +effectively we get 30000 in the example. + +\def\ShowSample#1#2% + {\startlinecorrection[blank] + \hyphenation{#1}% + \exceptionpenalty=10000 + \bTABLE[foregroundstyle=type] + \bTR + \bTD[align=middle,nx=4] \type{#1} \eTD + \eTR + \bTR + \bTD[align=middle] \type{10em} \eTD + \bTD[align=middle] \type {3em} \eTD + \bTD[align=middle] \type {0em} \eTD + \bTD[align=middle] \type {6em} \eTD + \eTR + \bTR + \bTD[width=10em]\vtop{\hsize 10em 123 #2 123\par}\eTD + \bTD[width=10em]\vtop{\hsize 3em 123 #2 123\par}\eTD + \bTD[width=10em]\vtop{\hsize 0em 123 #2 123\par}\eTD + \bTD[width=10em]\vtop{\setupalign[verytolerant,stretch]\rmtf\hsize 6em 123 #2 #2 #2 #2 123\par}\eTD + \eTR + \eTABLE + \stoplinecorrection} + +\ShowSample{x{a-}{-b}{}x{a-}{-b}{}x{a-}{-b}{}x{a-}{-b}{}xx}{xxxxxx} +\ShowSample{x{a-}{-b}{}x{a-}{-b}{}[3]x{a-}{-b}{}[1]x{a-}{-b}{}xx}{xxxxxx} + +\ShowSample{z{a-}{-b}{z}{a-}{-b}{z}{a-}{-b}{z}{a-}{-b}{z}z}{zzzzzz} +\ShowSample{z{a-}{-b}{z}{a-}{-b}{z}[3]{a-}{-b}{z}[1]{a-}{-b}{z}z}{zzzzzz} + +\stopsection + +\startsection[title={Applying hyphenation}] + +\topicindex {hyphenation+how it works} +\topicindex {hyphenation+discretionaries} +\topicindex {discretionaries} + +The internal structures \LUATEX\ uses for the insertion of discretionaries in +words is very different from the ones in \TEX82, and that means there are some +noticeable differences in handling as well. + +First and foremost, there is no \quote {compressed trie} involved in hyphenation. +The algorithm still reads pattern files generated by \PATGEN, but \LUATEX\ uses a +finite state hash to match the patterns against the word to be hyphenated. This +algorithm is based on the \quote {libhnj} library used by \OPENOFFICE, which in +turn is inspired by \TEX. + +There are a few differences between \LUATEX\ and \TEX82 that are a direct result +of the implementation: + +\startitemize +\startitem + \LUATEX\ happily hyphenates the full \UNICODE\ character range. +\stopitem +\startitem + Pattern and exception dictionary size is limited by the available memory + only, all allocations are done dynamically. The trie|-|related settings in + \type {texmf.cnf} are ignored. +\stopitem +\startitem + Because there is no \quote {trie preparation} stage, language patterns never + become frozen. This means that the primitive \prm {patterns} (and its \LUA\ + counterpart \type {lang.patterns}) can be used at any time, not only in + ini\TEX. +\stopitem +\startitem + Only the string representation of \prm {patterns} and \prm {hyphenation} is + stored in the format file. At format load time, they are simply + re|-|evaluated. It follows that there is no real reason to preload languages + in the format file. In fact, it is usually not a good idea to do so. It is + much smarter to load patterns no sooner than the first time they are actually + needed. +\stopitem +\startitem + \LUATEX\ uses the language-specific variables \lpr {prehyphenchar} and \lpr + {posthyphenchar} in the creation of implicit discretionaries, instead of + \TEX82's \prm {hyphenchar}, and the values of the language|-|specific + variables \lpr {preexhyphenchar} and \lpr {postexhyphenchar} for explicit + discretionaries (instead of \TEX82's empty discretionary). +\stopitem +\startitem + The value of the two counters related to hyphenation, \prm {hyphenpenalty} + and \prm {exhyphenpenalty}, are now stored in the discretionary nodes. This + permits a local overload for explicit \prm {discretionary} commands. The + value current when the hyphenation pass is applied is used. When no callbacks + are used this is compatible with traditional \TEX. When you apply the \LUA\ + \type {lang.hyphenate} function the current values are used. +\stopitem +\startitem + The hyphenation exception dictionary is maintained as key|-|value hash, and + that is also dynamic, so the \type {hyph_size} setting is not used either. +\stopitem +\stopitemize + +Because we store penalties in the disc node the \prm {discretionary} command has +been extended to accept an optional penalty specification, so you can do the +following: + +\startbuffer +\hsize1mm +1:foo{\hyphenpenalty 10000\discretionary{}{}{}}bar\par +2:foo\discretionary penalty 10000 {}{}{}bar\par +3:foo\discretionary{}{}{}bar\par +\stopbuffer + +\typebuffer + +This results in: + +\blank \start \getbuffer \stop \blank + +Inserted characters and ligatures inherit their attributes from the nearest glyph +node item (usually the preceding one, but the following one for the items +inserted at the left-hand side of a word). + +Word boundaries are no longer implied by font switches, but by language switches. +One word can have two separate fonts and still be hyphenated correctly (but it +can not have two different languages, the \prm {setlanguage} command forces a +word boundary). + +All languages start out with \type {\prehyphenchar=`\-}, \type {\posthyphenchar=0}, +\type {\preexhyphenchar=0} and \type {\postexhyphenchar=0}. When you assign the +values of one of these four parameters, you are actually changing the settings +for the current \prm {language}, this behaviour is compatible with \prm {patterns} +and \prm {hyphenation}. + +\LUATEX\ also hyphenates the first word in a paragraph. Words can be up to 256 +characters long (up from 64 in \TEX82). Longer words are ignored right now, but +eventually either the limitation will be removed or perhaps it will become +possible to silently ignore the excess characters (this is what happens in +\TEX82, but there the behaviour cannot be controlled). + +If you are using the \LUA\ function \type {lang.hyphenate}, you should be aware +that this function expects to receive a list of \quote {character} nodes. It will +not operate properly in the presence of \quote {glyph}, \quote {ligature}, or +\quote {ghost} nodes, nor does it know how to deal with kerning. + +\stopsection + +\startsection[title={Applying ligatures and kerning}] + +\topicindex {ligatures} +\topicindex {kerning} + +After all possible hyphenation points have been inserted in the list, \LUATEX\ +will process the list to convert the \quote {character} nodes into \quote {glyph} +and \quote {ligature} nodes. This is actually done in two stages: first all +ligatures are processed, then all kerning information is applied to the result +list. But those two stages are somewhat dependent on each other: If the used font +makes it possible to do so, the ligaturing stage adds virtual \quote {character} +nodes to the word boundaries in the list. While doing so, it removes and +interprets \prm {noboundary} nodes. The kerning stage deletes those word +boundary items after it is done with them, and it does the same for \quote +{ghost} nodes. Finally, at the end of the kerning stage, all remaining \quote +{character} nodes are converted to \quote {glyph} nodes. + +This word separation is worth mentioning because, if you overrule from \LUA\ only +one of the two callbacks related to font handling, then you have to make sure you +perform the tasks normally done by \LUATEX\ itself in order to make sure that the +other, non|-|overruled, routine continues to function properly. + +Although we could improve the situation the reality is that in modern \OPENTYPE\ +fonts ligatures can be constructed in many ways: by replacing a sequence of +characters by one glyph, or by selectively replacing individual glyphs, or by +kerning, or any combination of this. Add to that contextual analysis and it will +be clear that we have to let \LUA\ do that job instead. The generic font handler +that we provide (which is part of \CONTEXT) distinguishes between base mode +(which essentially is what we describe here and which delegates the task to \TEX) +and node mode (which deals with more complex fonts. + +Let's look at an example. Take the word \type {office}, hyphenated \type +{of-fice}, using a \quote {normal} font with all the \type {f}-\type {f} and +\type {f}-\type {i} type ligatures: + +\starttabulate[|l|l|] +\NC initial \NC \type {{o}{f}{f}{i}{c}{e}} \NC\NR +\NC after hyphenation \NC \type {{o}{f}{{-},{},{}}{f}{i}{c}{e}} \NC\NR +\NC first ligature stage \NC \type {{o}{{f-},{f},{}}{i}{c}{e}} \NC\NR +\NC final result \NC \type {{o}{{f-},{},{}}{c}{e}} \NC\NR +\stoptabulate + +That's bad enough, but let us assume that there is also a hyphenation point +between the \type {f} and the \type {i}, to create \type {of-f-ice}. Then the +final result should be: + +\starttyping +{o}{{f-}, + {{f-}, + {i}, + {}}, + {{-}, + {i}, + {}}}{c}{e} +\stoptyping + +with discretionaries in the post-break text as well as in the replacement text of +the top-level discretionary that resulted from the first hyphenation point. + +Here is that nested solution again, in a different representation: + +\testpage[4] + +\starttabulate[|l|c|c|c|c|c|c|] +\DB \BC pre \BC \BC post \BC \BC replace \BC \NC \NR +\TB +\NC topdisc \NC \type {f-} \NC (1) \NC \NC sub 1 \NC \NC sub 2 \NC \NR +\NC sub 1 \NC \type {f-} \NC (2) \NC \type {i} \NC (3) \NC \type {} \NC (4) \NC \NR +\NC sub 2 \NC \type {-} \NC (5) \NC \type {i} \NC (6) \NC \type {} \NC (7) \NC \NR +\LL +\stoptabulate + +When line breaking is choosing its breakpoints, the following fields will +eventually be selected: + +\starttabulate[|l|c|c|] +\NC \type {of-f-ice} \NC \type {f-} \NC (1) \NC \NR +\NC \NC \type {f-} \NC (2) \NC \NR +\NC \NC \type {i} \NC (3) \NC \NR +\NC \type {of-fice} \NC \type {f-} \NC (1) \NC \NR +\NC \NC \type {} \NC (4) \NC \NR +\NC \type {off-ice} \NC \type {-} \NC (5) \NC \NR +\NC \NC \type {i} \NC (6) \NC \NR +\NC \type {office} \NC \type {} \NC (7) \NC \NR +\stoptabulate + +The current solution in \LUATEX\ is not able to handle nested discretionaries, +but it is in fact smart enough to handle this fictional \type {of-f-ice} example. +It does so by combining two sequential discretionary nodes as if they were a +single object (where the second discretionary node is treated as an extension of +the first node). + +One can observe that the \type {of-f-ice} and \type {off-ice} cases both end with +the same actual post replacement list (\type {i}), and that this would be the +case even if \type {i} was the first item of a potential following ligature like +\type {ic}. This allows \LUATEX\ to do away with one of the fields, and thus make +the whole stuff fit into just two discretionary nodes. + +The mapping of the seven list fields to the six fields in this discretionary node +pair is as follows: + +\starttabulate[|l|c|c|] +\DB field \BC description \NC \NC \NR +\TB +\NC \type {disc1.pre} \NC \type {f-} \NC (1) \NC \NR +\NC \type {disc1.post} \NC \type {} \NC (4) \NC \NR +\NC \type {disc1.replace} \NC \type {} \NC (7) \NC \NR +\NC \type {disc2.pre} \NC \type {f-} \NC (2) \NC \NR +\NC \type {disc2.post} \NC \type {i} \NC (3,6) \NC \NR +\NC \type {disc2.replace} \NC \type {-} \NC (5) \NC \NR +\LL +\stoptabulate + +What is actually generated after ligaturing has been applied is therefore: + +\starttyping +{o}{{f-}, + {}, + {}} + {{f-}, + {i}, + {-}}{c}{e} +\stoptyping + +The two discretionaries have different subtypes from a discretionary appearing on +its own: the first has subtype 4, and the second has subtype 5. The need for +these special subtypes stems from the fact that not all of the fields appear in +their \quote {normal} location. The second discretionary especially looks odd, +with things like the \type {-} appearing in \type {disc2.replace}. The fact +that some of the fields have different meanings (and different processing code +internally) is what makes it necessary to have different subtypes: this enables +\LUATEX\ to distinguish this sequence of two joined discretionary nodes from the +case of two standalone discretionaries appearing in a row. + +Of course there is still that relationship with fonts: ligatures can be implemented by +mapping a sequence of glyphs onto one glyph, but also by selective replacement and +kerning. This means that the above examples are just representing the traditional +approach. + +\stopsection + +\startsection[title={Breaking paragraphs into lines}] + +\topicindex {linebreaks} +\topicindex {paragraphs} +\topicindex {discretionaries} + +This code is almost unchanged, but because of the above|-|mentioned changes +with respect to discretionaries and ligatures, line breaking will potentially be +different from traditional \TEX. The actual line breaking code is still based on +the \TEX82 algorithms, and it does not expect there to be discretionaries inside +of discretionaries. But, as patterns evolve and font handling can influence +discretionaries, you need to be aware of the fact that long term consistency is not +an engine matter only. + +But that situation is now fairly common in \LUATEX, due to the changes to the +ligaturing mechanism. And also, the \LUATEX\ discretionary nodes are implemented +slightly different from the \TEX82 nodes: the \type {no_break} text is now +embedded inside the disc node, where previously these nodes kept their place in +the horizontal list. In traditional \TEX\ the discretionary node contains a +counter indicating how many nodes to skip, but in \LUATEX\ we store the pre, post +and replace text in the discretionary node. + +The combined effect of these two differences is that \LUATEX\ does not always use +all of the potential breakpoints in a paragraph, especially when fonts with many +ligatures are used. Of course kerning also complicates matters here. + +\stopsection + +\startsection[title={The \type {lang} library}][library=lang] + +\subsection {\type {new} and \type {id}} + +\topicindex {languages+library} + +\libindex {new} +\libindex {id} + +This library provides the interface to \LUATEX's structure representing a +language, and the associated functions. + +\startfunctioncall + l = lang.new() + l = lang.new( id) +\stopfunctioncall + +This function creates a new userdata object. An object of type \type {} +is the first argument to most of the other functions in the \type {lang} library. +These functions can also be used as if they were object methods, using the colon +syntax. Without an argument, the next available internal id number will be +assigned to this object. With argument, an object will be created that links to +the internal language with that id number. + +\startfunctioncall + n = lang.id( l) +\stopfunctioncall + +The number returned is the internal \prm {language} id number this object refers to. + +\subsection {\type {hyphenation}} + +\libindex {hyphenation} + +You can hyphenate a string directly with: + +\startfunctioncall + n = lang.hyphenation( l) +lang.hyphenation( l, n) +\stopfunctioncall + +\subsection {\type {clear_hyphenation} and \type {clean}} + +\libindex {clear_hyphenation} +\libindex {clean} + +This either returns the current hyphenation exceptions for this language, or adds +new ones. The syntax of the string is explained in~\in {section} +[patternsexceptions]. + +\startfunctioncall +lang.clear_hyphenation( l) +\stopfunctioncall + +This call clears the exception dictionary (string) for this language. + +\startfunctioncall + n = lang.clean( l, o) + n = lang.clean( o) +\stopfunctioncall + +This function creates a hyphenation key from the supplied hyphenation value. The +syntax of the argument string is explained in \in {section} [patternsexceptions]. +This function is useful if you want to do something else based on the words in a +dictionary file, like spell|-|checking. + +\subsection {\type {patterns} and \type {clear_patterns}} + +\libindex {patterns} +\libindex {clear_patterns} + +\startfunctioncall + n = lang.patterns( l) +lang.patterns( l, n) +\stopfunctioncall + +This adds additional patterns for this language object, or returns the current +set. The syntax of this string is explained in \in {section} +[patternsexceptions]. + +\startfunctioncall +lang.clear_patterns( l) +\stopfunctioncall + +This can be used to clear the pattern dictionary for a language. + +\subsection {\type {hyphenationmin}} + +\libindex {hyphenationmin} + +This function sets (or gets) the value of the \TEX\ parameter +\type {\hyphenationmin}. + +\startfunctioncall +n = lang.hyphenationmin( l) +lang.hyphenationmin( l, n) +\stopfunctioncall + +\subsection {\type {[pre|post][ex|]hyphenchar}} + +\libindex {prehyphenchar} +\libindex {posthyphenchar} +\libindex {preexhyphenchar} +\libindex {postexhyphenchar} + +\startfunctioncall + n = lang.prehyphenchar( l) +lang.prehyphenchar( l, n) + + n = lang.posthyphenchar( l) +lang.posthyphenchar( l, n) +\stopfunctioncall + +These two are used to get or set the \quote {pre|-|break} and \quote +{post|-|break} hyphen characters for implicit hyphenation in this language. The +intial values are decimal 45 (hyphen) and decimal~0 (indicating emptiness). + +\startfunctioncall + n = lang.preexhyphenchar( l) +lang.preexhyphenchar( l, n) + + n = lang.postexhyphenchar( l) +lang.postexhyphenchar( l, n) +\stopfunctioncall + +These gets or set the \quote {pre|-|break} and \quote {post|-|break} hyphen +characters for explicit hyphenation in this language. Both are initially +decimal~0 (indicating emptiness). + +\subsection {\type {hyphenate}} + +\libindex {hyphenate} + +The next call inserts hyphenation points (discretionary nodes) in a node list. If +\type {tail} is given as argument, processing stops on that node. Currently, +\type {success} is always true if \type {head} (and \type {tail}, if specified) +are proper nodes, regardless of possible other errors. + +\startfunctioncall + success = lang.hyphenate( head) + success = lang.hyphenate( head, tail) +\stopfunctioncall + +Hyphenation works only on \quote {characters}, a special subtype of all the glyph +nodes with the node subtype having the value \type {1}. Glyph modes with +different subtypes are not processed. See \in {section} [charsandglyphs] for +more details. + +\subsection {\type {[set|get]hjcode}} + +\libindex {sethjcode} +\libindex {gethjcode} + +The following two commands can be used to set or query hj codes: + +\startfunctioncall +lang.sethjcode( l, char, usedchar) + usedchar = lang.gethjcode( l, char) +\stopfunctioncall + +When you set a hjcode the current sets get initialized unless the set was already +initialized due to \prm {savinghyphcodes} being larger than zero. + +\stopsection + +\stopchapter + +\stopcomponent + +% \parindent0pt \hsize=1.1cm +% 12-34-56 \par +% 12-34-\hbox{56} \par +% 12-34-\vrule width 1em height 1.5ex \par +% 12-\hbox{34}-56 \par +% 12-\vrule width 1em height 1.5ex-56 \par +% \hjcode`\1=`\1 \hjcode`\2=`\2 \hjcode`\3=`\3 \hjcode`\4=`\4 \vskip.5cm +% 12-34-56 \par +% 12-34-\hbox{56} \par +% 12-34-\vrule width 1em height 1.5ex \par +% 12-\hbox{34}-56 \par +% 12-\vrule width 1em height 1.5ex-56 \par + diff --git a/manual/luatex-logos.tex b/manual/luatex-logos.tex index d67ce5c0b..3172336ec 100644 --- a/manual/luatex-logos.tex +++ b/manual/luatex-logos.tex @@ -1,21 +1,21 @@ -\startenvironment luatex-logos - -\usemodule[abr-02] - -\logo[DFONT] {dfont} -\logo[CFF] {cff} -\logo[CMAP] {CMap} -\logo[PATGEN] {patgen} -\logo[MP] {MetaPost} -\logo[METAPOST] {MetaPost} -\logo[MPLIB] {MPlib} -\logo[COCO] {coco} -\logo[SUNOS] {SunOS} -\logo[BSD] {bsd} -\logo[SYSV] {sysv} -\logo[DPI] {dpi} -\logo[DLL] {dll} -\logo[OPENOFFICE]{OpenOffice} -\logo[OCP] {OCP} - -\stopenvironment +\startenvironment luatex-logos + +\usemodule[abr-02] + +\logo[DFONT] {dfont} +\logo[CFF] {cff} +\logo[CMAP] {CMap} +\logo[PATGEN] {patgen} +\logo[MP] {MetaPost} +\logo[METAPOST] {MetaPost} +\logo[MPLIB] {MPlib} +\logo[COCO] {coco} +\logo[SUNOS] {SunOS} +\logo[BSD] {bsd} +\logo[SYSV] {sysv} +\logo[DPI] {dpi} +\logo[DLL] {dll} +\logo[OPENOFFICE]{OpenOffice} +\logo[OCP] {OCP} + +\stopenvironment diff --git a/manual/luatex-lua.tex b/manual/luatex-lua.tex index 3d6d20c35..f9107fa1f 100644 --- a/manual/luatex-lua.tex +++ b/manual/luatex-lua.tex @@ -1,760 +1,760 @@ -% language=uk - -\environment luatex-style - -\startcomponent luatex-lua - -\startchapter[reference=lua,title={Using \LUATEX}] - -\startsection[title={Initialization},reference=init] - -\startsubsection[title={\LUATEX\ as a \LUA\ interpreter}] - -\topicindex {initialization} -\topicindex {\LUA+interpreter} - -There are some situations that make \LUATEX\ behave like a standalone \LUA\ -interpreter: - -\startitemize[packed] -\startitem - if a \type {--luaonly} option is given on the commandline, or -\stopitem -\startitem - if the executable is named \type {texlua} or \type {luatexlua}, or -\stopitem -\startitem - if the only non|-|option argument (file) on the commandline has the extension - \type {lua} or \type {luc}. -\stopitem -\stopitemize - -In this mode, it will set \LUA's \type {arg[0]} to the found script name, pushing -preceding options in negative values and the rest of the command line in the -positive values, just like the \LUA\ interpreter. - -\LUATEX\ will exit immediately after executing the specified \LUA\ script and is, -in effect, a somewhat bulky stand alone \LUA\ interpreter with a bunch of extra -preloaded libraries. - -\stopsubsection - -\startsubsection[title={\LUATEX\ as a \LUA\ byte compiler}] - -\topicindex {\LUA+byte code} - -There are two situations that make \LUATEX\ behave like the \LUA\ byte compiler: - -\startitemize[packed] -\startitem if a \type {--luaconly} option is given on the command line, or \stopitem -\startitem if the executable is named \type {texluac} \stopitem -\stopitemize - -In this mode, \LUATEX\ is exactly like \type {luac} from the stand alone \LUA\ -distribution, except that it does not have the \type {-l} switch, and that it -accepts (but ignores) the \type {--luaconly} switch. The current version of \LUA\ -can dump bytecode using \type {string.dump} so we might decide to drop this -version of \LUATEX. - -\stopsubsection - -\startsubsection[title={Other commandline processing}] - -\topicindex {command line} - -When the \LUATEX\ executable starts, it looks for the \type {--lua} command line -option. If there is no \type {--lua} option, the command line is interpreted in a -similar fashion as the other \TEX\ engines. Some options are accepted but have no -consequence. The following command|-|line options are understood: - -\starttabulate[|l|p|] -\DB commandline argument \BC explanation \NC \NR -\TB -\NC \type{--credits} \NC display credits and exit \NC \NR -\NC \type{--debug-format} \NC enable format debugging \NC \NR -\NC \type{--draftmode} \NC switch on draft mode i.e.\ generate no output in \PDF\ mode \NC \NR -\NC \type{--[no-]file-line-error} \NC disable/enable \type {file:line:error} style messages \NC \NR -\NC \type{--[no-]file-line-error-style} \NC aliases of \type {--[no-]file-line-error} \NC \NR -\NC \type{--fmt=FORMAT} \NC load the format file \type {FORMAT} \NC\NR -\NC \type{--halt-on-error} \NC stop processing at the first error\NC \NR -\NC \type{--help} \NC display help and exit \NC\NR -\NC \type{--ini} \NC be \type {iniluatex}, for dumping formats \NC\NR -\NC \type{--interaction=STRING} \NC set interaction mode: \type {batchmode}, \type {nonstopmode}, - \type {scrollmode} or \type {errorstopmode} \NC \NR -\NC \type{--jobname=STRING} \NC set the job name to \type {STRING} \NC \NR -\NC \type{--kpathsea-debug=NUMBER} \NC set path searching debugging flags according to the bits of - \type {NUMBER} \NC \NR -\NC \type{--lua=FILE} \NC load and execute a \LUA\ initialization script \NC\NR -\NC \type{--[no-]mktex=FMT} \NC disable/enable \type {mktexFMT} generation with \type {FMT} is - \type {tex} or \type {tfm} \NC \NR -\NC \type{--nosocket} \NC disable the \LUA\ socket library \NC\NR -\NC \type{--output-comment=STRING} \NC use \type {STRING} for \DVI\ file comment instead of date (no - effect for \PDF) \NC \NR -\NC \type{--output-directory=DIR} \NC use \type {DIR} as the directory to write files to \NC \NR -\NC \type{--output-format=FORMAT} \NC use \type {FORMAT} for job output; \type {FORMAT} is \type {dvi} - or \type {pdf} \NC \NR -\NC \type{--progname=STRING} \NC set the program name to \type {STRING} \NC \NR -\NC \type{--recorder} \NC enable filename recorder \NC \NR -\NC \type{--safer} \NC disable easily exploitable \LUA\ commands \NC\NR -\NC \type{--[no-]shell-escape} \NC disable/enable system calls \NC \NR -\NC \type{--shell-restricted} \NC restrict system calls to a list of commands given in \type - {texmf.cnf} \NC \NR -\NC \type{--synctex=NUMBER} \NC enable \type {synctex} \NC \NR -\NC \type{--utc} \NC use utc times when applicable \NC \NR -\NC \type{--version} \NC display version and exit \NC \NR -\LL -\stoptabulate - -We don't support \prm {write} 18 because \type {os.execute} can do the same. It -simplifies the code and makes more write targets possible. - -The value to use for \prm {jobname} is decided as follows: - -\startitemize -\startitem - If \type {--jobname} is given on the command line, its argument will be the - value for \prm {jobname}, without any changes. The argument will not be - used for actual input so it need not exist. The \type {--jobname} switch only - controls the \prm {jobname} setting. -\stopitem -\startitem - Otherwise, \prm {jobname} will be the name of the first file that is read - from the file system, with any path components and the last extension (the - part following the last \type {.}) stripped off. -\stopitem -\startitem - There is an exception to the previous point: if the command line goes into - interactive mode (by starting with a command) and there are no files input - via \prm {everyjob} either, then the \prm {jobname} is set to \type - {texput} as a last resort. -\stopitem -\stopitemize - -The file names for output files that are generated automatically are created by -attaching the proper extension (\type {log}, \type {pdf}, etc.) to the found -\prm {jobname}. These files are created in the directory pointed to by \type -{--output-directory}, or in the current directory, if that switch is not present. - -Without the \type {--lua} option, command line processing works like it does in -any other \WEBC|-|based typesetting engine, except that \LUATEX\ has a few extra -switches and lacks some others. Also, if the \type {--lua} option is present, -\LUATEX\ will enter an alternative mode of command line processing in comparison -to the standard \WEBC\ programs. In this mode, a small series of actions is taken -in the following order: - -\startitemize[n] - -\startitem - First, it will parse the command line as usual, but it will only interpret a - small subset of the options immediately: \type {--safer}, \type {--nosocket}, - \type {--[no-]shell-escape}, \type {--enable-write18}, \type - {--disable-write18}, \type {--shell-restricted}, \type {--help}, \type - {--version}, and \type {--credits}. -\stopitem - -\startitem - Next \LUATEX\ searches for the requested \LUA\ initialization script. If it - cannot be found using the actual name given on the command line, a second - attempt is made by prepending the value of the environment variable \type - {LUATEXDIR}, if that variable is defined in the environment. -\stopitem - -\startitem - Then it checks the various safety switches. You can use those to disable some - \LUA\ commands that can easily be abused by a malicious document. At the - moment, \type {--safer} \type {nil}s the following functions: - - \blank - - \starttabulate[|c|l|] - \DB library \BC functions \NC \NR - \TB - \NC \type {os} \NC \type {execute} \type {exec} \type {spawn} \type {setenv} - \type {rename} \type {remove} \type {tmpdir} \NC \NR - \NC \type {io} \NC \type {popen} \type {output} \type {tmpfile} \NC \NR - \NC \type {lfs} \NC \type {rmdir} \type {mkdir} \type {chdir} \type {lock} - \type {touch} \NC \NR - \LL - \stoptabulate - - \blank - - Furthermore, it disables loading of compiled \LUA\ libraries and it makes - \type {io.open()} fail on files that are opened for anything besides reading. -\stopitem - -\startitem - When \LUATEX\ starts it sets the \type {locale} to a neutral value. If for - some reason you use \type {os.locale}, you need to make sure you \type {nil} - it afterwards because otherwise it can interfere with code that for instance - generates dates. You can ignore the \type {locale} with: - - \starttyping - os.setlocale(nil,nil) - \stoptyping - - The \type {--nosocket} option makes the socket library unavailable, so that \LUA\ - cannot use networking. - - The switches \type {--[no-]shell-escape}, \type {--[enable|disable]-write18}, and - \type {--shell-restricted} have the same effects as in \PDFTEX, and additionally - make \type {io.popen()}, \type {os.execute}, \type {os.exec} and \type {os.spawn} - adhere to the requested option. -\stopitem - -\startitem - Next the initialization script is loaded and executed. From within the - script, the entire command line is available in the \LUA\ table \type {arg}, - beginning with \type {arg[0]}, containing the name of the executable. As - consequence warnings about unrecognized options are suppressed. -\stopitem - -\stopitemize - -Command line processing happens very early on. So early, in fact, that none of -\TEX's initializations have taken place yet. For that reason, the tables that -deal with typesetting, like \type {tex}, \type {token}, \type {node} and -\type {pdf}, are off|-|limits during the execution of the startup file (they -are \type {nil}'d). Special care is taken that \type {texio.write} and \type -{texio.write_nl} function properly, so that you can at least report your actions -to the log file when (and if) it eventually becomes opened (note that \TEX\ does -not even know its \prm {jobname} yet at this point). - -Everything you do in the \LUA\ initialization script will remain visible during -the rest of the run, with the exception of the \TEX\ specific libraries like -\type {tex}, \type {token}, \type {node} and \type {pdf} tables. These will be -initialized to their documented state after the execution of the script. You -should not store anything in variables or within tables with these four global -names, as they will be overwritten completely. - -We recommend you use the startup file only for your own \TEX|-|independent -initializations (if you need any), to parse the command line, set values in the -\type {texconfig} table, and register the callbacks you need. - -\LUATEX\ allows some of the command line options to be overridden by reading -values from the \type {texconfig} table at the end of script execution (see the -description of the \type {texconfig} table later on in this document for more -details on which ones exactly). - -Unless the \type {texconfig} table tells \LUATEX\ not to initialize \KPATHSEA\ -at all (set \type {texconfig.kpse_init} to \type {false} for that), \LUATEX\ -acts on some more command line options after the initialization script is -finished: in order to initialize the built|-|in \KPATHSEA\ library properly, -\LUATEX\ needs to know the correct program name to use, and for that it needs to -check \type {--progname}, or \type {--ini} and \type {--fmt}, if \type -{--progname} is missing. - -\stopsubsection - -\stopsection - -\startsection[title={\LUA\ behaviour}] - -\startsubsection[title={The \LUA\ version}] - -\topicindex {\LUA+libraries} -\topicindex {\LUA+extensions} - -We currently use \LUA\ 5.3 and will follow developments of the language but -normally with some delay. Therefore the user needs to keep an eye on (subtle) -differences in successive versions of the language. Also, \LUAJITTEX\ lags behind -in the sense that \LUAJIT\ is not in sync with regular \LUA\ development. Here is -an example of one aspect. - -\LUA s \type {tostring} function (and \type {string.format} may return values in -scientific notation, thereby confusing the \TEX\ end of things when it is used as -the right|-|hand side of an assignment to a \prm {dimen} or \prm {count}. The -output of these serializers also depend on the \LUA\ version, so in \LUA\ 5.3 you -can get different output than from 5.2. - -\stopsubsection - -\startsubsection[title={Integration in the \TDS\ ecosystem}] - -The main \TEX\ distributions follow the \TEX\ directory structure (\TDS). -\LUATEX\ is able to use the kpathsea library to find \type {require()}d modules. -For this purpose, \type {package.searchers[2]} is replaced by a different loader -function, that decides at runtime whether to use kpathsea or the built|-|in core -\LUA\ function. It uses \KPATHSEA\ when that is already initialized at that point -in time, otherwise it reverts to using the normal \type {package.path} loader. - -Initialization of \KPATHSEA\ can happen either implicitly (when \LUATEX\ starts -up and the startup script has not set \type {texconfig.kpse_init} to false), or -explicitly by calling the \LUA\ function \type {kpse.set_program_name()}. - -\stopsubsection - -\startsubsection[title={Loading libraries}] - -\LUATEX\ is able to use dynamically loadable \LUA\ libraries, unless -\type {--safer} was given as an option on the command line. For this purpose, -\type {package.searchers[3]} is replaced by a different loader function, that -decides at runtime whether to use \KPATHSEA\ or the built|-|in core \LUA\ -function. It uses \KPATHSEA\ when that is already initialized at that point in -time, otherwise it reverts to using the normal \type {package.cpath} loader. - -This functionality required an extension to kpathsea. There is a new kpathsea -file format: \type {kpse_clua_format} that searches for files with extension -\type {.dll} and \type {.so}. The \type {texmf.cnf} setting for this variable is -\type {CLUAINPUTS}, and by default it has this value: - -\starttyping -CLUAINPUTS=.:$SELFAUTOLOC/lib/{$progname,$engine,}/lua// -\stoptyping - -This path is imperfect (it requires a \TDS\ subtree below the binaries -directory), but the architecture has to be in the path somewhere, and the -currently simplest way to do that is to search below the binaries directory only. -Of course it no big deal to write an alternative loader and use that in a macro -package. One level up (a \type {lib} directory parallel to \type {bin}) would -have been nicer, but that is not doable because \TEXLIVE\ uses a \type -{bin/} structure. - -Loading dynamic \LUA\ libraries will fail if there are two \LUA\ libraries loaded -at the same time (which will typically happen on \type {win32}, because there is -one \LUA\ 5.3 inside \LUATEX, and another will likely be linked to the \DLL\ file -of the module itself). - -\stopsubsection - -\startsubsection[title={Executing programs}] - -In keeping with the other \TEX|-|like programs in \TEXLIVE, the two \LUA\ functions -\type {os.execute} and \type {io.popen}, as well as the two new functions \type -{os.exec} and \type {os.spawn} that are explained below, take the value of \type -{shell_escape} and|/|or \type {shell_escape_commands} in account. Whenever -\LUATEX\ is run with the assumed intention to typeset a document (and by that we -mean that it is called as \type {luatex}, as opposed to \type {texlua}, and that -the command line option \type {--luaonly} was not given), it will only run the -four functions above if the matching \type {texmf.cnf} variable(s) or their \type -{texconfig} (see \in {section} [texconfig]) counterparts allow execution of the -requested system command. In \quote {script interpreter} runs of \LUATEX, these -settings have no effect, and all four functions have their original meaning. - -Some libraries have a few more functions, either coded in \CCODE\ or in \LUA. For -instance, when we started with \LUATEX\ we added some helpers to the \type -{luafilesystem} namespace \type {lfs}. The two boolean functions \type -{lfs.isdir} and \type {lfs.isfile} were speedy and better variants of what could -be done with \type {lfs.attributes}. The additional function \type -{lfs.shortname} takes a file name and returns its short name on \type {win32} -platforms. Finally, for non|-|\type {win32} platforms only, we provided \type -{lfs.readlink} that takes an existing symbolic link as argument and returns its -name. However, the \type library evolved so we have dropped these in favour of -pure \LUA\ variants. The \type {shortname} helper is obsolete and now just -returns the name. - -\stopsubsection - -\startsubsection[title={Multibyte \type {string} functions}] - -The \type {string} library has a few extra functions, for example \libidx -{string} {explode}. This function takes upto two arguments: \type -{string.explode(s[,m])} and returns an array containing the string argument \type -{s} split into sub-strings based on the value of the string argument \type {m}. -The second argument is a string that is either empty (this splits the string into -characters), a single character (this splits on each occurrence of that -character, possibly introducing empty strings), or a single character followed by -the plus sign \type {+} (this special version does not create empty sub-strings). -The default value for \type {m} is \quote {\type { +}} (multiple spaces). Note: -\type {m} is not hidden by surrounding braces as it would be if this function was -written in \TEX\ macros. - -The \type {string} library also has six extra iterators that return strings -piecemeal: \libidx {string} {utfvalues}, \libidx {string} {utfcharacters}, -\libidx {string} {characters}, \libidx {string} {characterpairs}, \libidx -{string} {bytes} and \libidx {string} {bytepairs}. - -\startitemize -\startitem - \type {string.utfvalues(s)}: an integer value in the \UNICODE\ range -\stopitem -\startitem - \type {string.utfcharacters(s)}: a string with a single \UTF-8 token in it -\stopitem -\startitem - \type {string.cWharacters(s)}: a string containing one byte -\stopitem -\startitem - \type {string.characterpairs(s)}: two strings each containing one byte or an - empty second string if the string length was odd -\stopitem -\startitem - \type {string.bytes(s)}: a single byte value -\stopitem -\startitem - \type {string.bytepairs(s)}: two byte values or nil instead of a number as - its second return value if the string length was odd -\stopitem -\stopitemize - -The \type {string.characterpairs()} and \type {string.bytepairs()} iterators -are useful especially in the conversion of \UTF16 encoded data into \UTF8. - -There is also a two|-|argument form of \type {string.dump()}. The second argument -is a boolean which, if true, strips the symbols from the dumped data. This -matches an extension made in \type {luajit}. This is typically a function that -gets adapted as \LUA\ itself progresses. - -The \type {string} library functions \type {len}, \type {lower}, \type {sub} -etc.\ are not \UNICODE|-|aware. For strings in the \UTF8 encoding, i.e., strings -containing characters above code point 127, the corresponding functions from the -\type {slnunicode} library can be used, e.g., \type {unicode.utf8.len}, \type -{unicode.utf8.lower} etc.\ The exceptions are \type {unicode.utf8.find}, that -always returns byte positions in a string, and \type {unicode.utf8.match} and -\type {unicode.utf8.gmatch}. While the latter two functions in general {\it -are} \UNICODE|-|aware, they fall|-|back to non|-|\UNICODE|-|aware behavior when -using the empty capture \type {()} but other captures work as expected. For the -interpretation of character classes in \type {unicode.utf8} functions refer to -the library sources at \hyphenatedurl {http://luaforge.net/projects/sln}. - -Version 5.3 of \LUA\ provides some native \UTF8 support but we have added a few -similar helpers too: \libidx {string} {utfvalue}, \libidx {string} {utfcharacter} -and \libidx {string} {utflength}. - -\startitemize -\startitem - \type {string.utfvalue(s)}: returns the codepoints of the characters in the - given string -\stopitem -\startitem - \type {string.utfcharacter(c,...)}: returns a string with the characters of - the given code points -\stopitem -\startitem - \type {string.utflength(s)}: returns the length oif the given string -\stopitem -\stopitemize - -These three functions are relative fast and don't do much checking. They can be -used as building blocks for other helpers. - -\stopsubsection - -\startsubsection[title={Extra \type {os} library functions}] - -The \type {os} library has a few extra functions and variables: \libidx {os} -{selfdir}, \libidx {os} {exec}, \libidx {os} {spawn}, \libidx {os} {setenv}, -\libidx {os} {env}, \libidx {os} {gettimeofday}, \libidx {os} {times}, \libidx -{os} {tmpdir}, \libidx {os} {type}, \libidx {os} {name} and \libidx {os} {uname}, -that we will discuss here. - -\startitemize - -\startitem - \type {os.selfdir} is a variable that holds the directory path of the - actual executable. For example: \type {\directlua {tex.sprint(os.selfdir)}}. -\stopitem - -\startitem - \type {os.exec(commandline)} is a variation on \type {os.execute}. Here - \type {commandline} can be either a single string or a single table. - - \startitemize - - \startitem - If the argument is a table \LUATEX\ first checks if there is a value at - integer index zero. If there is, this is the command to be executed. - Otherwise, it will use the value at integer index one. If neither are - present, nothing at all happens. - \stopitem - - \startitem - The set of consecutive values starting at integer~1 in the table are the - arguments that are passed on to the command (the value at index~1 becomes - \type {arg[0]}). The command is searched for in the execution path, so - there is normally no need to pass on a fully qualified path name. - \stopitem - - \startitem - If the argument is a string, then it is automatically converted into a - table by splitting on whitespace. In this case, it is impossible for the - command and first argument to differ from each other. - \stopitem - - \startitem - In the string argument format, whitespace can be protected by putting - (part of) an argument inside single or double quotes. One layer of quotes - is interpreted by \LUATEX, and all occurrences of \type {\"}, \type {\'} - or \type {\\} within the quoted text are unescaped. In the table format, - there is no string handling taking place. - \stopitem - - \stopitemize - - This function normally does not return control back to the \LUA\ script: the - command will replace the current process. However, it will return the two - values \type {nil} and \type {error} if there was a problem while - attempting to execute the command. - - On \MSWINDOWS, the current process is actually kept in memory until after the - execution of the command has finished. This prevents crashes in situations - where \TEXLUA\ scripts are run inside integrated \TEX\ environments. - - The original reason for this command is that it cleans out the current - process before starting the new one, making it especially useful for use in - \TEXLUA. -\stopitem - -\startitem - \type {os.spawn(commandline)} is a returning version of \type {os.exec}, - with otherwise identical calling conventions. - - If the command ran ok, then the return value is the exit status of the - command. Otherwise, it will return the two values \type {nil} and \type - {error}. -\stopitem - -\startitem - \type {os.setenv(key,value)} sets a variable in the environment. Passing - \type {nil} instead of a value string will remove the variable. -\stopitem - -\startitem - \type {os.env} is a hash table containing a dump of the variables and - values in the process environment at the start of the run. It is writeable, - but the actual environment is \notabene {not} updated automatically. -\stopitem - -\startitem - \type {os.gettimeofday()} returns the current \quote {\UNIX\ time}, but as a - float. This function is not available on the \SUNOS\ platforms, so do not use - this function for portable documents. -\stopitem - -\startitem - \type {os.times()}returns the current process times according to \ the - \UNIX\ C library function \quote {times}. This function is not available on - the \MSWINDOWS\ and \SUNOS\ platforms, so do not use this function for - portable documents. -\stopitem - -\startitem - \type {os.tmpdir()} creates a directory in the \quote {current directory} - with the name \type {luatex.XXXXXX} where the \type {X}-es are replaced by a - unique string. The function also returns this string, so you can \type - {lfs.chdir()} into it, or \type {nil} if it failed to create the directory. - The user is responsible for cleaning up at the end of the run, it does not - happen automatically. -\stopitem - -\startitem - \type {os.type} is a string that gives a global indication of the class of - operating system. The possible values are currently \type {windows}, \type - {unix}, and \type {msdos} (you are unlikely to find this value \quote {in the - wild}). -\stopitem - -\startitem - \type {os.name} is a string that gives a more precise indication of the - operating system. These possible values are not yet fixed, and for \type - {os.type} values \type {windows} and \type {msdos}, the \type {os.name} - values are simply \type {windows} and \type {msdos} - - The list for the type \type {unix} is more precise: \type {linux}, \type - {freebsd}, \type {kfreebsd}, \type {cygwin}, \type {openbsd}, \type - {solaris}, \type {sunos} (pre-solaris), \type {hpux}, \type {irix}, \type - {macosx}, \type {gnu} (hurd), \type {bsd} (unknown, but \BSD|-|like), \type - {sysv} (unknown, but \SYSV|-|like), \type {generic} (unknown). -\stopitem - -\startitem - \type {os.uname} returns a table with specific operating system - information acquired at runtime. The keys in the returned table are all - string values, and their names are: \type {sysname}, \type {machine}, \type - {release}, \type {version}, and \type {nodename}. -\stopitem - -\stopitemize - -\stopsubsection - -\startsubsection[title={Binary input from files with \type {fio}}] - -There is a whole set of helpers for reading numbers and strings from a file: -\libidx {fio} {readcardinal1}, \libidx {fio} {readcardinal2}, \libidx {fio} -{readcardinal3}, \libidx {fio} {readcardinal4}, \libidx {fio} -{readcardinaltable}, \libidx {fio} {readinteger1}, \libidx {fio} {readinteger2}, -\libidx {fio} {readinteger3}, \libidx {fio} {readinteger4}, \libidx {fio} -{readintegertable}, \libidx {fio} {readfixed2}, \libidx {fio} {readfixed4}, -\libidx {fio} {read2dot14}, \libidx {fio} {setposition}, \libidx {fio} -{getposition}, \libidx {fio} {skipposition}, \libidx {fio} {readbytes}, \libidx -{fio} {readbytetable}. They work on normal \LUA\ file handles. - -%libidx{fio}{readline} -%libidx{fio}{recordfilename} -%libidx{fio}{checkpermission} - -This library provides a set of functions for reading numbers from a file and -in addition to the regular \type {io} library functions. - -\starttabulate -\NC \type{readcardinal1(f)} \NC a 1 byte unsigned integer \NC \NR -\NC \type{readcardinal2(f)} \NC a 2 byte unsigned integer \NC \NR -\NC \type{readcardinal3(f)} \NC a 3 byte unsigned integer \NC \NR -\NC \type{readcardinal4(f)} \NC a 4 byte unsigned integer \NC \NR -\NC \type{readcardinaltable(f,n,b)} \NC \type {n} cardinals of \type {b} bytes \NC \NR -\NC \type{readinteger1(f)} \NC a 1 byte signed integer \NC \NR -\NC \type{readinteger2(f)} \NC a 2 byte signed integer \NC \NR -\NC \type{readinteger3(f)} \NC a 3 byte signed integer \NC \NR -\NC \type{readinteger4(f)} \NC a 4 byte signed integer \NC \NR -\NC \type{readintegertable(f,n,b)} \NC \type {n} integers of \type {b} bytes \NC \NR -\NC \type{readfixed2(f)} \NC a 2 byte float (used in font files) \NC \NR -\NC \type{readfixed4(f)} \NC a 4 byte float (used in font files) \NC \NR -\NC \type{read2dot14(f)} \NC a 2 byte float (used in font files) \NC \NR -\NC \type{setposition(f,p)} \NC goto position \type {p} \NC \NR -\NC \type{getposition(f)} \NC get the current position \NC \NR -\NC \type{skipposition(f,n)} \NC skip \type {n} positions \NC \NR -\NC \type{readbytes(f,n)} \NC \type {n} bytes \NC \NR -\NC \type{readbytetable(f,n)} \NC \type {n} bytes\NC \NR -\stoptabulate - -\stopsubsection - -\startsubsection[title={Binary input from strings with \type {sio}}] - -A similar set of function as in the \type {fio} library is available in the \type -{sio} library: \libidx {sio} {readcardinal1}, \libidx {sio} {readcardinal2}, -\libidx {sio} {readcardinal3}, \libidx {sio} {readcardinal4}, \libidx {sio} -{readcardinaltable}, \libidx {sio} {readinteger1}, \libidx {sio} {readinteger2}, -\libidx {sio} {readinteger3}, \libidx {sio} {readinteger4}, \libidx {sio} -{readintegertable}, \libidx {sio} {readfixed2}, \libidx {sio} {readfixed4}, -\libidx {sio} {read2dot14}, \libidx {sio} {setposition}, \libidx {sio} -{getposition}, \libidx {sio} {skipposition}, \libidx {sio} {readbytes} and -\libidx {sio} {readbytetable}. Here the first argument is a string instead of a -file handle. More details can be found in the previous section. - -\stopsubsection - -\startsubsection[title={Hashes conform \type {sha2}}] - -This library is a side effect of the \type {pdfe} library that needs such -helpers. The \libidx{sha2}{digest256}, \libidx{sha2}{digest384} and -\libidx{sha2}{digest512} functions accept a string and return a string with the -hash. - -\stopsubsection - -\startsubsection[title={Locales}] - -\index {locales} - -In stock \LUA, many things depend on the current locale. In \LUATEX, we can't do -that, because it makes documents unportable. While \LUATEX\ is running if -forces the following locale settings: - -\starttyping -LC_CTYPE=C -LC_COLLATE=C -LC_NUMERIC=C -\stoptyping - -\stopsubsection - -\stopsection - -\startsection[title={\LUA\ modules}] - -\topicindex {\LUA+libraries} -\topicindex {\LUA+modules} - -Some modules that are normally external to \LUA\ are statically linked in with -\LUATEX, because they offer useful functionality: - -\startitemize - -\startitem - \type {lpeg}, by Roberto Ierusalimschy, \hyphenatedurl - {http://www.inf.puc-rio.br/~roberto/lpeg/lpeg.html}. This library is not - \UNICODE|-|aware, but interprets strings on a byte|-|per|-|byte basis. This - mainly means that \type {lpeg.S} cannot be used with \UTF8 characters encoded - in more than two bytes, and thus \type {lpeg.S} will look for one of those - two bytes when matching, not the combination of the two. The same is true for - \type {lpeg.R}, although the latter will display an error message if used - with multibyte characters. Therefore \type {lpeg.R('aä')} results in the - message \type {bad argument #1 to 'R' (range must have two characters)}, - since to \type {lpeg}, \type {ä} is two 'characters' (bytes), so \type {aä} - totals three. In practice this is no real issue and with some care you can - deal with \UNICODE\ just fine. -\stopitem - -\startitem - \type {slnunicode}, from the \type {selene} libraries, \hyphenatedurl - {http://luaforge.net/projects/sln}. This library has been slightly extended - so that the \type {unicode.utf8.*} functions also accept the first 256 values - of plane~18. This is the range \LUATEX\ uses for raw binary output, as - explained above. We have no plans to provide more like this because you can - basically do all that you want in \LUA. -\stopitem - -\startitem - \type {luazip}, from the kepler project, \hyphenatedurl - {http://www.keplerproject.org/luazip/}. -\stopitem - -\startitem - \type {luafilesystem}, also from the kepler project, \hyphenatedurl - {http://www.keplerproject.org/luafilesystem/}. -\stopitem - -\startitem - \type {lzlib}, by Tiago Dionizio, \hyphenatedurl - {http://luaforge.net/projects/lzlib/}. -\stopitem - -\startitem - \type {md5}, by Roberto Ierusalimschy \hyphenatedurl - {http://www.inf.puc-rio.br/~roberto/md5/md5-5/md5.html}. -\stopitem - -\startitem - \type {luasocket}, by Diego Nehab \hyphenatedurl - {http://w3.impa.br/~diego/software/luasocket/}. The \type {.lua} support - modules from \type {luasocket} are also preloaded inside the executable, - there are no external file dependencies. -\stopitem - -\stopitemize - -\stopsection - -\startsection[title={Testing}] - -\topicindex {testing} -\topicindex {\PDF+date} - -For development reasons you can influence the used startup date and time. This can -be done in two ways. - -\startitemize[n] - -\startitem - By setting the environmment variable \type {SOURCE_DATE_EPOCH}. This will - influence the \TEX\ parameters \type {time} and \type {date}, the random seed, - the \PDF\ timestamp and the \PDF\ id that is derived from the time as well. This - variable is consulted when the \KPSE\ library is enabled. Resolving is - delegated to this library. -\stopitem - -\startitem - By setting the \type {start_time} variable in the \type {texconfig} table; as - with other variables we use the internal name there. For compatibility - reasons we also honour a \type {SOURCE_DATE_EPOCH} entry. It should be noted - that there are no such variables in other engines and this method is only - relevant in case the while setup happens in \LUA. -\stopitem - -\stopitemize - -When Universal Time is needed, you can pass the flag \type {utc} to the engine. This -property also works when the date and time are set by \LUATEX\ itself. It has a -complementary entry \type {use_utc_time} in the \type {texconfig} table. - -There is some control possible, for instance prevent filename to be written to -the \PDF\ file. This is discussed elsewhere. In \CONTEXT\ we provide the command -line argument \type {--nodates} that does a bit more disabling of dates. - -\stopsection - -\stopchapter - -\stopcomponent +% language=uk + +\environment luatex-style + +\startcomponent luatex-lua + +\startchapter[reference=lua,title={Using \LUATEX}] + +\startsection[title={Initialization},reference=init] + +\startsubsection[title={\LUATEX\ as a \LUA\ interpreter}] + +\topicindex {initialization} +\topicindex {\LUA+interpreter} + +There are some situations that make \LUATEX\ behave like a standalone \LUA\ +interpreter: + +\startitemize[packed] +\startitem + if a \type {--luaonly} option is given on the commandline, or +\stopitem +\startitem + if the executable is named \type {texlua} or \type {luatexlua}, or +\stopitem +\startitem + if the only non|-|option argument (file) on the commandline has the extension + \type {lua} or \type {luc}. +\stopitem +\stopitemize + +In this mode, it will set \LUA's \type {arg[0]} to the found script name, pushing +preceding options in negative values and the rest of the command line in the +positive values, just like the \LUA\ interpreter. + +\LUATEX\ will exit immediately after executing the specified \LUA\ script and is, +in effect, a somewhat bulky stand alone \LUA\ interpreter with a bunch of extra +preloaded libraries. + +\stopsubsection + +\startsubsection[title={\LUATEX\ as a \LUA\ byte compiler}] + +\topicindex {\LUA+byte code} + +There are two situations that make \LUATEX\ behave like the \LUA\ byte compiler: + +\startitemize[packed] +\startitem if a \type {--luaconly} option is given on the command line, or \stopitem +\startitem if the executable is named \type {texluac} \stopitem +\stopitemize + +In this mode, \LUATEX\ is exactly like \type {luac} from the stand alone \LUA\ +distribution, except that it does not have the \type {-l} switch, and that it +accepts (but ignores) the \type {--luaconly} switch. The current version of \LUA\ +can dump bytecode using \type {string.dump} so we might decide to drop this +version of \LUATEX. + +\stopsubsection + +\startsubsection[title={Other commandline processing}] + +\topicindex {command line} + +When the \LUATEX\ executable starts, it looks for the \type {--lua} command line +option. If there is no \type {--lua} option, the command line is interpreted in a +similar fashion as the other \TEX\ engines. Some options are accepted but have no +consequence. The following command|-|line options are understood: + +\starttabulate[|l|p|] +\DB commandline argument \BC explanation \NC \NR +\TB +\NC \type{--credits} \NC display credits and exit \NC \NR +\NC \type{--debug-format} \NC enable format debugging \NC \NR +\NC \type{--draftmode} \NC switch on draft mode i.e.\ generate no output in \PDF\ mode \NC \NR +\NC \type{--[no-]file-line-error} \NC disable/enable \type {file:line:error} style messages \NC \NR +\NC \type{--[no-]file-line-error-style} \NC aliases of \type {--[no-]file-line-error} \NC \NR +\NC \type{--fmt=FORMAT} \NC load the format file \type {FORMAT} \NC\NR +\NC \type{--halt-on-error} \NC stop processing at the first error\NC \NR +\NC \type{--help} \NC display help and exit \NC\NR +\NC \type{--ini} \NC be \type {iniluatex}, for dumping formats \NC\NR +\NC \type{--interaction=STRING} \NC set interaction mode: \type {batchmode}, \type {nonstopmode}, + \type {scrollmode} or \type {errorstopmode} \NC \NR +\NC \type{--jobname=STRING} \NC set the job name to \type {STRING} \NC \NR +\NC \type{--kpathsea-debug=NUMBER} \NC set path searching debugging flags according to the bits of + \type {NUMBER} \NC \NR +\NC \type{--lua=FILE} \NC load and execute a \LUA\ initialization script \NC\NR +\NC \type{--[no-]mktex=FMT} \NC disable/enable \type {mktexFMT} generation with \type {FMT} is + \type {tex} or \type {tfm} \NC \NR +\NC \type{--nosocket} \NC disable the \LUA\ socket library \NC\NR +\NC \type{--output-comment=STRING} \NC use \type {STRING} for \DVI\ file comment instead of date (no + effect for \PDF) \NC \NR +\NC \type{--output-directory=DIR} \NC use \type {DIR} as the directory to write files to \NC \NR +\NC \type{--output-format=FORMAT} \NC use \type {FORMAT} for job output; \type {FORMAT} is \type {dvi} + or \type {pdf} \NC \NR +\NC \type{--progname=STRING} \NC set the program name to \type {STRING} \NC \NR +\NC \type{--recorder} \NC enable filename recorder \NC \NR +\NC \type{--safer} \NC disable easily exploitable \LUA\ commands \NC\NR +\NC \type{--[no-]shell-escape} \NC disable/enable system calls \NC \NR +\NC \type{--shell-restricted} \NC restrict system calls to a list of commands given in \type + {texmf.cnf} \NC \NR +\NC \type{--synctex=NUMBER} \NC enable \type {synctex} \NC \NR +\NC \type{--utc} \NC use utc times when applicable \NC \NR +\NC \type{--version} \NC display version and exit \NC \NR +\LL +\stoptabulate + +We don't support \prm {write} 18 because \type {os.execute} can do the same. It +simplifies the code and makes more write targets possible. + +The value to use for \prm {jobname} is decided as follows: + +\startitemize +\startitem + If \type {--jobname} is given on the command line, its argument will be the + value for \prm {jobname}, without any changes. The argument will not be + used for actual input so it need not exist. The \type {--jobname} switch only + controls the \prm {jobname} setting. +\stopitem +\startitem + Otherwise, \prm {jobname} will be the name of the first file that is read + from the file system, with any path components and the last extension (the + part following the last \type {.}) stripped off. +\stopitem +\startitem + There is an exception to the previous point: if the command line goes into + interactive mode (by starting with a command) and there are no files input + via \prm {everyjob} either, then the \prm {jobname} is set to \type + {texput} as a last resort. +\stopitem +\stopitemize + +The file names for output files that are generated automatically are created by +attaching the proper extension (\type {log}, \type {pdf}, etc.) to the found +\prm {jobname}. These files are created in the directory pointed to by \type +{--output-directory}, or in the current directory, if that switch is not present. + +Without the \type {--lua} option, command line processing works like it does in +any other \WEBC|-|based typesetting engine, except that \LUATEX\ has a few extra +switches and lacks some others. Also, if the \type {--lua} option is present, +\LUATEX\ will enter an alternative mode of command line processing in comparison +to the standard \WEBC\ programs. In this mode, a small series of actions is taken +in the following order: + +\startitemize[n] + +\startitem + First, it will parse the command line as usual, but it will only interpret a + small subset of the options immediately: \type {--safer}, \type {--nosocket}, + \type {--[no-]shell-escape}, \type {--enable-write18}, \type + {--disable-write18}, \type {--shell-restricted}, \type {--help}, \type + {--version}, and \type {--credits}. +\stopitem + +\startitem + Next \LUATEX\ searches for the requested \LUA\ initialization script. If it + cannot be found using the actual name given on the command line, a second + attempt is made by prepending the value of the environment variable \type + {LUATEXDIR}, if that variable is defined in the environment. +\stopitem + +\startitem + Then it checks the various safety switches. You can use those to disable some + \LUA\ commands that can easily be abused by a malicious document. At the + moment, \type {--safer} \type {nil}s the following functions: + + \blank + + \starttabulate[|c|l|] + \DB library \BC functions \NC \NR + \TB + \NC \type {os} \NC \type {execute} \type {exec} \type {spawn} \type {setenv} + \type {rename} \type {remove} \type {tmpdir} \NC \NR + \NC \type {io} \NC \type {popen} \type {output} \type {tmpfile} \NC \NR + \NC \type {lfs} \NC \type {rmdir} \type {mkdir} \type {chdir} \type {lock} + \type {touch} \NC \NR + \LL + \stoptabulate + + \blank + + Furthermore, it disables loading of compiled \LUA\ libraries and it makes + \type {io.open()} fail on files that are opened for anything besides reading. +\stopitem + +\startitem + When \LUATEX\ starts it sets the \type {locale} to a neutral value. If for + some reason you use \type {os.locale}, you need to make sure you \type {nil} + it afterwards because otherwise it can interfere with code that for instance + generates dates. You can ignore the \type {locale} with: + + \starttyping + os.setlocale(nil,nil) + \stoptyping + + The \type {--nosocket} option makes the socket library unavailable, so that \LUA\ + cannot use networking. + + The switches \type {--[no-]shell-escape}, \type {--[enable|disable]-write18}, and + \type {--shell-restricted} have the same effects as in \PDFTEX, and additionally + make \type {io.popen()}, \type {os.execute}, \type {os.exec} and \type {os.spawn} + adhere to the requested option. +\stopitem + +\startitem + Next the initialization script is loaded and executed. From within the + script, the entire command line is available in the \LUA\ table \type {arg}, + beginning with \type {arg[0]}, containing the name of the executable. As + consequence warnings about unrecognized options are suppressed. +\stopitem + +\stopitemize + +Command line processing happens very early on. So early, in fact, that none of +\TEX's initializations have taken place yet. For that reason, the tables that +deal with typesetting, like \type {tex}, \type {token}, \type {node} and +\type {pdf}, are off|-|limits during the execution of the startup file (they +are \type {nil}'d). Special care is taken that \type {texio.write} and \type +{texio.write_nl} function properly, so that you can at least report your actions +to the log file when (and if) it eventually becomes opened (note that \TEX\ does +not even know its \prm {jobname} yet at this point). + +Everything you do in the \LUA\ initialization script will remain visible during +the rest of the run, with the exception of the \TEX\ specific libraries like +\type {tex}, \type {token}, \type {node} and \type {pdf} tables. These will be +initialized to their documented state after the execution of the script. You +should not store anything in variables or within tables with these four global +names, as they will be overwritten completely. + +We recommend you use the startup file only for your own \TEX|-|independent +initializations (if you need any), to parse the command line, set values in the +\type {texconfig} table, and register the callbacks you need. + +\LUATEX\ allows some of the command line options to be overridden by reading +values from the \type {texconfig} table at the end of script execution (see the +description of the \type {texconfig} table later on in this document for more +details on which ones exactly). + +Unless the \type {texconfig} table tells \LUATEX\ not to initialize \KPATHSEA\ +at all (set \type {texconfig.kpse_init} to \type {false} for that), \LUATEX\ +acts on some more command line options after the initialization script is +finished: in order to initialize the built|-|in \KPATHSEA\ library properly, +\LUATEX\ needs to know the correct program name to use, and for that it needs to +check \type {--progname}, or \type {--ini} and \type {--fmt}, if \type +{--progname} is missing. + +\stopsubsection + +\stopsection + +\startsection[title={\LUA\ behaviour}] + +\startsubsection[title={The \LUA\ version}] + +\topicindex {\LUA+libraries} +\topicindex {\LUA+extensions} + +We currently use \LUA\ 5.3 and will follow developments of the language but +normally with some delay. Therefore the user needs to keep an eye on (subtle) +differences in successive versions of the language. Also, \LUAJITTEX\ lags behind +in the sense that \LUAJIT\ is not in sync with regular \LUA\ development. Here is +an example of one aspect. + +\LUA s \type {tostring} function (and \type {string.format} may return values in +scientific notation, thereby confusing the \TEX\ end of things when it is used as +the right|-|hand side of an assignment to a \prm {dimen} or \prm {count}. The +output of these serializers also depend on the \LUA\ version, so in \LUA\ 5.3 you +can get different output than from 5.2. + +\stopsubsection + +\startsubsection[title={Integration in the \TDS\ ecosystem}] + +The main \TEX\ distributions follow the \TEX\ directory structure (\TDS). +\LUATEX\ is able to use the kpathsea library to find \type {require()}d modules. +For this purpose, \type {package.searchers[2]} is replaced by a different loader +function, that decides at runtime whether to use kpathsea or the built|-|in core +\LUA\ function. It uses \KPATHSEA\ when that is already initialized at that point +in time, otherwise it reverts to using the normal \type {package.path} loader. + +Initialization of \KPATHSEA\ can happen either implicitly (when \LUATEX\ starts +up and the startup script has not set \type {texconfig.kpse_init} to false), or +explicitly by calling the \LUA\ function \type {kpse.set_program_name()}. + +\stopsubsection + +\startsubsection[title={Loading libraries}] + +\LUATEX\ is able to use dynamically loadable \LUA\ libraries, unless +\type {--safer} was given as an option on the command line. For this purpose, +\type {package.searchers[3]} is replaced by a different loader function, that +decides at runtime whether to use \KPATHSEA\ or the built|-|in core \LUA\ +function. It uses \KPATHSEA\ when that is already initialized at that point in +time, otherwise it reverts to using the normal \type {package.cpath} loader. + +This functionality required an extension to kpathsea. There is a new kpathsea +file format: \type {kpse_clua_format} that searches for files with extension +\type {.dll} and \type {.so}. The \type {texmf.cnf} setting for this variable is +\type {CLUAINPUTS}, and by default it has this value: + +\starttyping +CLUAINPUTS=.:$SELFAUTOLOC/lib/{$progname,$engine,}/lua// +\stoptyping + +This path is imperfect (it requires a \TDS\ subtree below the binaries +directory), but the architecture has to be in the path somewhere, and the +currently simplest way to do that is to search below the binaries directory only. +Of course it no big deal to write an alternative loader and use that in a macro +package. One level up (a \type {lib} directory parallel to \type {bin}) would +have been nicer, but that is not doable because \TEXLIVE\ uses a \type +{bin/} structure. + +Loading dynamic \LUA\ libraries will fail if there are two \LUA\ libraries loaded +at the same time (which will typically happen on \type {win32}, because there is +one \LUA\ 5.3 inside \LUATEX, and another will likely be linked to the \DLL\ file +of the module itself). + +\stopsubsection + +\startsubsection[title={Executing programs}] + +In keeping with the other \TEX|-|like programs in \TEXLIVE, the two \LUA\ functions +\type {os.execute} and \type {io.popen}, as well as the two new functions \type +{os.exec} and \type {os.spawn} that are explained below, take the value of \type +{shell_escape} and|/|or \type {shell_escape_commands} in account. Whenever +\LUATEX\ is run with the assumed intention to typeset a document (and by that we +mean that it is called as \type {luatex}, as opposed to \type {texlua}, and that +the command line option \type {--luaonly} was not given), it will only run the +four functions above if the matching \type {texmf.cnf} variable(s) or their \type +{texconfig} (see \in {section} [texconfig]) counterparts allow execution of the +requested system command. In \quote {script interpreter} runs of \LUATEX, these +settings have no effect, and all four functions have their original meaning. + +Some libraries have a few more functions, either coded in \CCODE\ or in \LUA. For +instance, when we started with \LUATEX\ we added some helpers to the \type +{luafilesystem} namespace \type {lfs}. The two boolean functions \type +{lfs.isdir} and \type {lfs.isfile} were speedy and better variants of what could +be done with \type {lfs.attributes}. The additional function \type +{lfs.shortname} takes a file name and returns its short name on \type {win32} +platforms. Finally, for non|-|\type {win32} platforms only, we provided \type +{lfs.readlink} that takes an existing symbolic link as argument and returns its +name. However, the \type library evolved so we have dropped these in favour of +pure \LUA\ variants. The \type {shortname} helper is obsolete and now just +returns the name. + +\stopsubsection + +\startsubsection[title={Multibyte \type {string} functions}] + +The \type {string} library has a few extra functions, for example \libidx +{string} {explode}. This function takes upto two arguments: \type +{string.explode(s[,m])} and returns an array containing the string argument \type +{s} split into sub-strings based on the value of the string argument \type {m}. +The second argument is a string that is either empty (this splits the string into +characters), a single character (this splits on each occurrence of that +character, possibly introducing empty strings), or a single character followed by +the plus sign \type {+} (this special version does not create empty sub-strings). +The default value for \type {m} is \quote {\type { +}} (multiple spaces). Note: +\type {m} is not hidden by surrounding braces as it would be if this function was +written in \TEX\ macros. + +The \type {string} library also has six extra iterators that return strings +piecemeal: \libidx {string} {utfvalues}, \libidx {string} {utfcharacters}, +\libidx {string} {characters}, \libidx {string} {characterpairs}, \libidx +{string} {bytes} and \libidx {string} {bytepairs}. + +\startitemize +\startitem + \type {string.utfvalues(s)}: an integer value in the \UNICODE\ range +\stopitem +\startitem + \type {string.utfcharacters(s)}: a string with a single \UTF-8 token in it +\stopitem +\startitem + \type {string.cWharacters(s)}: a string containing one byte +\stopitem +\startitem + \type {string.characterpairs(s)}: two strings each containing one byte or an + empty second string if the string length was odd +\stopitem +\startitem + \type {string.bytes(s)}: a single byte value +\stopitem +\startitem + \type {string.bytepairs(s)}: two byte values or nil instead of a number as + its second return value if the string length was odd +\stopitem +\stopitemize + +The \type {string.characterpairs()} and \type {string.bytepairs()} iterators +are useful especially in the conversion of \UTF16 encoded data into \UTF8. + +There is also a two|-|argument form of \type {string.dump()}. The second argument +is a boolean which, if true, strips the symbols from the dumped data. This +matches an extension made in \type {luajit}. This is typically a function that +gets adapted as \LUA\ itself progresses. + +The \type {string} library functions \type {len}, \type {lower}, \type {sub} +etc.\ are not \UNICODE|-|aware. For strings in the \UTF8 encoding, i.e., strings +containing characters above code point 127, the corresponding functions from the +\type {slnunicode} library can be used, e.g., \type {unicode.utf8.len}, \type +{unicode.utf8.lower} etc.\ The exceptions are \type {unicode.utf8.find}, that +always returns byte positions in a string, and \type {unicode.utf8.match} and +\type {unicode.utf8.gmatch}. While the latter two functions in general {\it +are} \UNICODE|-|aware, they fall|-|back to non|-|\UNICODE|-|aware behavior when +using the empty capture \type {()} but other captures work as expected. For the +interpretation of character classes in \type {unicode.utf8} functions refer to +the library sources at \hyphenatedurl {http://luaforge.net/projects/sln}. + +Version 5.3 of \LUA\ provides some native \UTF8 support but we have added a few +similar helpers too: \libidx {string} {utfvalue}, \libidx {string} {utfcharacter} +and \libidx {string} {utflength}. + +\startitemize +\startitem + \type {string.utfvalue(s)}: returns the codepoints of the characters in the + given string +\stopitem +\startitem + \type {string.utfcharacter(c,...)}: returns a string with the characters of + the given code points +\stopitem +\startitem + \type {string.utflength(s)}: returns the length oif the given string +\stopitem +\stopitemize + +These three functions are relative fast and don't do much checking. They can be +used as building blocks for other helpers. + +\stopsubsection + +\startsubsection[title={Extra \type {os} library functions}] + +The \type {os} library has a few extra functions and variables: \libidx {os} +{selfdir}, \libidx {os} {exec}, \libidx {os} {spawn}, \libidx {os} {setenv}, +\libidx {os} {env}, \libidx {os} {gettimeofday}, \libidx {os} {times}, \libidx +{os} {tmpdir}, \libidx {os} {type}, \libidx {os} {name} and \libidx {os} {uname}, +that we will discuss here. + +\startitemize + +\startitem + \type {os.selfdir} is a variable that holds the directory path of the + actual executable. For example: \type {\directlua {tex.sprint(os.selfdir)}}. +\stopitem + +\startitem + \type {os.exec(commandline)} is a variation on \type {os.execute}. Here + \type {commandline} can be either a single string or a single table. + + \startitemize + + \startitem + If the argument is a table \LUATEX\ first checks if there is a value at + integer index zero. If there is, this is the command to be executed. + Otherwise, it will use the value at integer index one. If neither are + present, nothing at all happens. + \stopitem + + \startitem + The set of consecutive values starting at integer~1 in the table are the + arguments that are passed on to the command (the value at index~1 becomes + \type {arg[0]}). The command is searched for in the execution path, so + there is normally no need to pass on a fully qualified path name. + \stopitem + + \startitem + If the argument is a string, then it is automatically converted into a + table by splitting on whitespace. In this case, it is impossible for the + command and first argument to differ from each other. + \stopitem + + \startitem + In the string argument format, whitespace can be protected by putting + (part of) an argument inside single or double quotes. One layer of quotes + is interpreted by \LUATEX, and all occurrences of \type {\"}, \type {\'} + or \type {\\} within the quoted text are unescaped. In the table format, + there is no string handling taking place. + \stopitem + + \stopitemize + + This function normally does not return control back to the \LUA\ script: the + command will replace the current process. However, it will return the two + values \type {nil} and \type {error} if there was a problem while + attempting to execute the command. + + On \MSWINDOWS, the current process is actually kept in memory until after the + execution of the command has finished. This prevents crashes in situations + where \TEXLUA\ scripts are run inside integrated \TEX\ environments. + + The original reason for this command is that it cleans out the current + process before starting the new one, making it especially useful for use in + \TEXLUA. +\stopitem + +\startitem + \type {os.spawn(commandline)} is a returning version of \type {os.exec}, + with otherwise identical calling conventions. + + If the command ran ok, then the return value is the exit status of the + command. Otherwise, it will return the two values \type {nil} and \type + {error}. +\stopitem + +\startitem + \type {os.setenv(key,value)} sets a variable in the environment. Passing + \type {nil} instead of a value string will remove the variable. +\stopitem + +\startitem + \type {os.env} is a hash table containing a dump of the variables and + values in the process environment at the start of the run. It is writeable, + but the actual environment is \notabene {not} updated automatically. +\stopitem + +\startitem + \type {os.gettimeofday()} returns the current \quote {\UNIX\ time}, but as a + float. This function is not available on the \SUNOS\ platforms, so do not use + this function for portable documents. +\stopitem + +\startitem + \type {os.times()}returns the current process times according to \ the + \UNIX\ C library function \quote {times}. This function is not available on + the \MSWINDOWS\ and \SUNOS\ platforms, so do not use this function for + portable documents. +\stopitem + +\startitem + \type {os.tmpdir()} creates a directory in the \quote {current directory} + with the name \type {luatex.XXXXXX} where the \type {X}-es are replaced by a + unique string. The function also returns this string, so you can \type + {lfs.chdir()} into it, or \type {nil} if it failed to create the directory. + The user is responsible for cleaning up at the end of the run, it does not + happen automatically. +\stopitem + +\startitem + \type {os.type} is a string that gives a global indication of the class of + operating system. The possible values are currently \type {windows}, \type + {unix}, and \type {msdos} (you are unlikely to find this value \quote {in the + wild}). +\stopitem + +\startitem + \type {os.name} is a string that gives a more precise indication of the + operating system. These possible values are not yet fixed, and for \type + {os.type} values \type {windows} and \type {msdos}, the \type {os.name} + values are simply \type {windows} and \type {msdos} + + The list for the type \type {unix} is more precise: \type {linux}, \type + {freebsd}, \type {kfreebsd}, \type {cygwin}, \type {openbsd}, \type + {solaris}, \type {sunos} (pre-solaris), \type {hpux}, \type {irix}, \type + {macosx}, \type {gnu} (hurd), \type {bsd} (unknown, but \BSD|-|like), \type + {sysv} (unknown, but \SYSV|-|like), \type {generic} (unknown). +\stopitem + +\startitem + \type {os.uname} returns a table with specific operating system + information acquired at runtime. The keys in the returned table are all + string values, and their names are: \type {sysname}, \type {machine}, \type + {release}, \type {version}, and \type {nodename}. +\stopitem + +\stopitemize + +\stopsubsection + +\startsubsection[title={Binary input from files with \type {fio}}] + +There is a whole set of helpers for reading numbers and strings from a file: +\libidx {fio} {readcardinal1}, \libidx {fio} {readcardinal2}, \libidx {fio} +{readcardinal3}, \libidx {fio} {readcardinal4}, \libidx {fio} +{readcardinaltable}, \libidx {fio} {readinteger1}, \libidx {fio} {readinteger2}, +\libidx {fio} {readinteger3}, \libidx {fio} {readinteger4}, \libidx {fio} +{readintegertable}, \libidx {fio} {readfixed2}, \libidx {fio} {readfixed4}, +\libidx {fio} {read2dot14}, \libidx {fio} {setposition}, \libidx {fio} +{getposition}, \libidx {fio} {skipposition}, \libidx {fio} {readbytes}, \libidx +{fio} {readbytetable}. They work on normal \LUA\ file handles. + +%libidx{fio}{readline} +%libidx{fio}{recordfilename} +%libidx{fio}{checkpermission} + +This library provides a set of functions for reading numbers from a file and +in addition to the regular \type {io} library functions. + +\starttabulate +\NC \type{readcardinal1(f)} \NC a 1 byte unsigned integer \NC \NR +\NC \type{readcardinal2(f)} \NC a 2 byte unsigned integer \NC \NR +\NC \type{readcardinal3(f)} \NC a 3 byte unsigned integer \NC \NR +\NC \type{readcardinal4(f)} \NC a 4 byte unsigned integer \NC \NR +\NC \type{readcardinaltable(f,n,b)} \NC \type {n} cardinals of \type {b} bytes \NC \NR +\NC \type{readinteger1(f)} \NC a 1 byte signed integer \NC \NR +\NC \type{readinteger2(f)} \NC a 2 byte signed integer \NC \NR +\NC \type{readinteger3(f)} \NC a 3 byte signed integer \NC \NR +\NC \type{readinteger4(f)} \NC a 4 byte signed integer \NC \NR +\NC \type{readintegertable(f,n,b)} \NC \type {n} integers of \type {b} bytes \NC \NR +\NC \type{readfixed2(f)} \NC a 2 byte float (used in font files) \NC \NR +\NC \type{readfixed4(f)} \NC a 4 byte float (used in font files) \NC \NR +\NC \type{read2dot14(f)} \NC a 2 byte float (used in font files) \NC \NR +\NC \type{setposition(f,p)} \NC goto position \type {p} \NC \NR +\NC \type{getposition(f)} \NC get the current position \NC \NR +\NC \type{skipposition(f,n)} \NC skip \type {n} positions \NC \NR +\NC \type{readbytes(f,n)} \NC \type {n} bytes \NC \NR +\NC \type{readbytetable(f,n)} \NC \type {n} bytes\NC \NR +\stoptabulate + +\stopsubsection + +\startsubsection[title={Binary input from strings with \type {sio}}] + +A similar set of function as in the \type {fio} library is available in the \type +{sio} library: \libidx {sio} {readcardinal1}, \libidx {sio} {readcardinal2}, +\libidx {sio} {readcardinal3}, \libidx {sio} {readcardinal4}, \libidx {sio} +{readcardinaltable}, \libidx {sio} {readinteger1}, \libidx {sio} {readinteger2}, +\libidx {sio} {readinteger3}, \libidx {sio} {readinteger4}, \libidx {sio} +{readintegertable}, \libidx {sio} {readfixed2}, \libidx {sio} {readfixed4}, +\libidx {sio} {read2dot14}, \libidx {sio} {setposition}, \libidx {sio} +{getposition}, \libidx {sio} {skipposition}, \libidx {sio} {readbytes} and +\libidx {sio} {readbytetable}. Here the first argument is a string instead of a +file handle. More details can be found in the previous section. + +\stopsubsection + +\startsubsection[title={Hashes conform \type {sha2}}] + +This library is a side effect of the \type {pdfe} library that needs such +helpers. The \libidx{sha2}{digest256}, \libidx{sha2}{digest384} and +\libidx{sha2}{digest512} functions accept a string and return a string with the +hash. + +\stopsubsection + +\startsubsection[title={Locales}] + +\index {locales} + +In stock \LUA, many things depend on the current locale. In \LUATEX, we can't do +that, because it makes documents unportable. While \LUATEX\ is running if +forces the following locale settings: + +\starttyping +LC_CTYPE=C +LC_COLLATE=C +LC_NUMERIC=C +\stoptyping + +\stopsubsection + +\stopsection + +\startsection[title={\LUA\ modules}] + +\topicindex {\LUA+libraries} +\topicindex {\LUA+modules} + +Some modules that are normally external to \LUA\ are statically linked in with +\LUATEX, because they offer useful functionality: + +\startitemize + +\startitem + \type {lpeg}, by Roberto Ierusalimschy, \hyphenatedurl + {http://www.inf.puc-rio.br/~roberto/lpeg/lpeg.html}. This library is not + \UNICODE|-|aware, but interprets strings on a byte|-|per|-|byte basis. This + mainly means that \type {lpeg.S} cannot be used with \UTF8 characters encoded + in more than two bytes, and thus \type {lpeg.S} will look for one of those + two bytes when matching, not the combination of the two. The same is true for + \type {lpeg.R}, although the latter will display an error message if used + with multibyte characters. Therefore \type {lpeg.R('aä')} results in the + message \type {bad argument #1 to 'R' (range must have two characters)}, + since to \type {lpeg}, \type {ä} is two 'characters' (bytes), so \type {aä} + totals three. In practice this is no real issue and with some care you can + deal with \UNICODE\ just fine. +\stopitem + +\startitem + \type {slnunicode}, from the \type {selene} libraries, \hyphenatedurl + {http://luaforge.net/projects/sln}. This library has been slightly extended + so that the \type {unicode.utf8.*} functions also accept the first 256 values + of plane~18. This is the range \LUATEX\ uses for raw binary output, as + explained above. We have no plans to provide more like this because you can + basically do all that you want in \LUA. +\stopitem + +\startitem + \type {luazip}, from the kepler project, \hyphenatedurl + {http://www.keplerproject.org/luazip/}. +\stopitem + +\startitem + \type {luafilesystem}, also from the kepler project, \hyphenatedurl + {http://www.keplerproject.org/luafilesystem/}. +\stopitem + +\startitem + \type {lzlib}, by Tiago Dionizio, \hyphenatedurl + {http://luaforge.net/projects/lzlib/}. +\stopitem + +\startitem + \type {md5}, by Roberto Ierusalimschy \hyphenatedurl + {http://www.inf.puc-rio.br/~roberto/md5/md5-5/md5.html}. +\stopitem + +\startitem + \type {luasocket}, by Diego Nehab \hyphenatedurl + {http://w3.impa.br/~diego/software/luasocket/}. The \type {.lua} support + modules from \type {luasocket} are also preloaded inside the executable, + there are no external file dependencies. +\stopitem + +\stopitemize + +\stopsection + +\startsection[title={Testing}] + +\topicindex {testing} +\topicindex {\PDF+date} + +For development reasons you can influence the used startup date and time. This can +be done in two ways. + +\startitemize[n] + +\startitem + By setting the environmment variable \type {SOURCE_DATE_EPOCH}. This will + influence the \TEX\ parameters \type {time} and \type {date}, the random seed, + the \PDF\ timestamp and the \PDF\ id that is derived from the time as well. This + variable is consulted when the \KPSE\ library is enabled. Resolving is + delegated to this library. +\stopitem + +\startitem + By setting the \type {start_time} variable in the \type {texconfig} table; as + with other variables we use the internal name there. For compatibility + reasons we also honour a \type {SOURCE_DATE_EPOCH} entry. It should be noted + that there are no such variables in other engines and this method is only + relevant in case the while setup happens in \LUA. +\stopitem + +\stopitemize + +When Universal Time is needed, you can pass the flag \type {utc} to the engine. This +property also works when the date and time are set by \LUATEX\ itself. It has a +complementary entry \type {use_utc_time} in the \type {texconfig} table. + +There is some control possible, for instance prevent filename to be written to +the \PDF\ file. This is discussed elsewhere. In \CONTEXT\ we provide the command +line argument \type {--nodates} that does a bit more disabling of dates. + +\stopsection + +\stopchapter + +\stopcomponent diff --git a/manual/luatex-math.tex b/manual/luatex-math.tex index fd038150f..4623ce706 100644 --- a/manual/luatex-math.tex +++ b/manual/luatex-math.tex @@ -1,1647 +1,1647 @@ -% language=uk - -\environment luatex-style - -\startcomponent luatex-math - -\startchapter[reference=math,title={Math}] - -\startsection[title={Traditional alongside \OPENTYPE}] - -\topicindex {math} - -The handling of mathematics in \LUATEX\ differs quite a bit from how \TEX82 (and -therefore \PDFTEX) handles math. First, \LUATEX\ adds primitives and extends some -others so that \UNICODE\ input can be used easily. Second, all of \TEX82's -internal special values (for example for operator spacing) have been made -accessible and changeable via control sequences. Third, there are extensions that -make it easier to use \OPENTYPE\ math fonts. And finally, there are some -extensions that have been proposed or considered in the past that are now added -to the engine. - -\stopsection - -\startsection[title={Unicode math characters}] - -\topicindex {math+\UNICODE} -\topicindex {\UNICODE+math} - -Character handling is now extended up to the full \UNICODE\ range (the \type {\U} -prefix), which is compatible with \XETEX. - -The math primitives from \TEX\ are kept as they are, except for the ones that -convert from input to math commands: \type {mathcode}, and \type {delcode}. These -two now allow for a 21-bit character argument on the left hand side of the equals -sign. - -Some of the new \LUATEX\ primitives read more than one separate value. This is -shown in the tables below by a plus sign. - -The input for such primitives would look like this: - -\starttyping -\def\overbrace{\Umathaccent 0 1 "23DE } -\stoptyping - -The altered \TEX82 primitives are: - -\starttabulate[|l|l|r|c|l|r|] -\DB primitive \BC min \BC max \BC \kern 2em \BC min \BC max \NC \NR -\TB -\NC \prm {mathcode} \NC 0 \NC 10FFFF \NC = \NC 0 \NC 8000 \NC \NR -\NC \prm {delcode} \NC 0 \NC 10FFFF \NC = \NC 0 \NC FFFFFF \NC \NR -\LL -\stoptabulate - -The unaltered ones are: - -\starttabulate[|l|l|r|] -\DB primitive \BC min \BC max \NC \NR -\TB -\NC \prm {mathchardef} \NC 0 \NC 8000 \NC \NR -\NC \prm {mathchar} \NC 0 \NC 7FFF \NC \NR -\NC \prm {mathaccent} \NC 0 \NC 7FFF \NC \NR -\NC \prm {delimiter} \NC 0 \NC 7FFFFFF \NC \NR -\NC \prm {radical} \NC 0 \NC 7FFFFFF \NC \NR -\LL -\stoptabulate - -For practical reasons \prm {mathchardef} will silently accept values larger -that \type {0x8000} and interpret it as \lpr {Umathcharnumdef}. This is needed -to satisfy older macro packages. - -The following new primitives are compatible with \XETEX: - -% somewhat fuzzy: - -\starttabulate[|l|l|r|c|l|r|] -\DB primitive \BC min \BC max \BC \kern 2em \BC min \BC max \NC \NR -\TB -\NC \lpr {Umathchardef} \NC 0+0+0 \NC 7+FF+10FFFF \NC \NC \NC \NC \NR -\NC \lpr {Umathcharnumdef}\rlap{\high{5}} \NC -80000000 \NC 7FFFFFFF \NC \NC \NC \NC \NR -\NC \lpr {Umathcode} \NC 0 \NC 10FFFF \NC = \NC 0+0+0 \NC 7+FF+10FFFF \NC \NR -\NC \lpr {Udelcode} \NC 0 \NC 10FFFF \NC = \NC 0+0 \NC FF+10FFFF \NC \NR -\NC \lpr {Umathchar} \NC 0+0+0 \NC 7+FF+10FFFF \NC \NC \NC \NC \NR -\NC \lpr {Umathaccent} \NC 0+0+0 \NC 7+FF+10FFFF \NC \NC \NC \NC \NR -\NC \lpr {Udelimiter} \NC 0+0+0 \NC 7+FF+10FFFF \NC \NC \NC \NC \NR -\NC \lpr {Uradical} \NC 0+0 \NC FF+10FFFF \NC \NC \NC \NC \NR -\NC \lpr {Umathcharnum} \NC -80000000 \NC 7FFFFFFF \NC \NC \NC \NC \NR -\NC \lpr {Umathcodenum} \NC 0 \NC 10FFFF \NC = \NC -80000000 \NC 7FFFFFFF \NC \NR -\NC \lpr {Udelcodenum} \NC 0 \NC 10FFFF \NC = \NC -80000000 \NC 7FFFFFFF \NC \NR -\LL -\stoptabulate - -Specifications typically look like: - -\starttyping -\Umathchardef\xx="1"0"456 -\Umathcode 123="1"0"789 -\stoptyping - -The new primitives that deal with delimiter|-|style objects do not set up a -\quote {large family}. Selecting a suitable size for display purposes is expected -to be dealt with by the font via the \lpr {Umathoperatorsize} parameter. - -For some of these primitives, all information is packed into a single signed -integer. For the first two (\lpr {Umathcharnum} and \lpr {Umathcodenum}), the -lowest 21 bits are the character code, the 3 bits above that represent the math -class, and the family data is kept in the topmost bits. This means that the values -for math families 128--255 are actually negative. For \lpr {Udelcodenum} there -is no math class. The math family information is stored in the bits directly on -top of the character code. Using these three commands is not as natural as using -the two- and three|-|value commands, so unless you know exactly what you are -doing and absolutely require the speedup resulting from the faster input -scanning, it is better to use the verbose commands instead. - -The \lpr {Umathaccent} command accepts optional keywords to control various -details regarding math accents. See \in {section} [mathacc] below for details. - -There are more new primitives and all of these will be explained in following -sections: - -\starttabulate[|l|l|] -\DB primitive \BC value range (in hex) \NC \NR -\TB -\NC \lpr {Uroot} \NC 0 + 0--FF + 10FFFF \NC \NR -\NC \lpr {Uoverdelimiter} \NC 0 + 0--FF + 10FFFF \NC \NR -\NC \lpr {Uunderdelimiter} \NC 0 + 0--FF + 10FFFF \NC \NR -\NC \lpr {Udelimiterover} \NC 0 + 0--FF + 10FFFF \NC \NR -\NC \lpr {Udelimiterunder} \NC 0 + 0--FF + 10FFFF \NC \NR -\LL -\stoptabulate - -\stopsection - -\startsection[title={Math styles}] - -\subsection{\lpr {mathstyle}} - -\topicindex {math+styles} - -It is possible to discover the math style that will be used for a formula in an -expandable fashion (while the math list is still being read). To make this -possible, \LUATEX\ adds the new primitive: \lpr {mathstyle}. This is a \quote -{convert command} like e.g. \prm {romannumeral}: its value can only be read, -not set. - -The returned value is between 0 and 7 (in math mode), or $-1$ (all other modes). -For easy testing, the eight math style commands have been altered so that they can -be used as numeric values, so you can write code like this: - -\starttyping -\ifnum\mathstyle=\textstyle - \message{normal text style} -\else \ifnum\mathstyle=\crampedtextstyle - \message{cramped text style} -\fi \fi -\stoptyping - -Sometimes you won't get what you expect so a bit of explanation might help to -understand what happens. When math is parsed and expanded it gets turned into a -linked list. In a second pass the formula will be build. This has to do with the -fact that in order to determine the automatically chosen sizes (in for instance -fractions) following content can influence preceding sizes. A side effect of this -is for instance that one cannot change the definition of a font family (and -thereby reusing numbers) because the number that got used is stored and used in -the second pass (so changing \type {\fam 12} mid|-|formula spoils over to -preceding use of that family). - -The style switching primitives like \prm {textstyle} are turned into nodes so the -styles set there are frozen. The \prm {mathchoice} primitive results in four -lists being constructed of which one is used in the second pass. The fact that -some automatic styles are not yet known also means that the \lpr {mathstyle} -primitive expands to the current style which can of course be different from the -one really used. It's a snapshot of the first pass state. As a consequence in the -following example you get a style number (first pass) typeset that can actually -differ from the used style (second pass). In the case of a math choice used -ungrouped, the chosen style is used after the choice too, unless you group. - -\startbuffer[1] - [a:\mathstyle]\quad - \bgroup - \mathchoice - {\bf \scriptstyle (x:d :\mathstyle)} - {\bf \scriptscriptstyle (x:t :\mathstyle)} - {\bf \scriptscriptstyle (x:s :\mathstyle)} - {\bf \scriptscriptstyle (x:ss:\mathstyle)} - \egroup - \quad[b:\mathstyle]\quad - \mathchoice - {\bf \scriptstyle (y:d :\mathstyle)} - {\bf \scriptscriptstyle (y:t :\mathstyle)} - {\bf \scriptscriptstyle (y:s :\mathstyle)} - {\bf \scriptscriptstyle (y:ss:\mathstyle)} - \quad[c:\mathstyle]\quad - \bgroup - \mathchoice - {\bf \scriptstyle (z:d :\mathstyle)} - {\bf \scriptscriptstyle (z:t :\mathstyle)} - {\bf \scriptscriptstyle (z:s :\mathstyle)} - {\bf \scriptscriptstyle (z:ss:\mathstyle)} - \egroup - \quad[d:\mathstyle] -\stopbuffer - -\startbuffer[2] - [a:\mathstyle]\quad - \begingroup - \mathchoice - {\bf \scriptstyle (x:d :\mathstyle)} - {\bf \scriptscriptstyle (x:t :\mathstyle)} - {\bf \scriptscriptstyle (x:s :\mathstyle)} - {\bf \scriptscriptstyle (x:ss:\mathstyle)} - \endgroup - \quad[b:\mathstyle]\quad - \mathchoice - {\bf \scriptstyle (y:d :\mathstyle)} - {\bf \scriptscriptstyle (y:t :\mathstyle)} - {\bf \scriptscriptstyle (y:s :\mathstyle)} - {\bf \scriptscriptstyle (y:ss:\mathstyle)} - \quad[c:\mathstyle]\quad - \begingroup - \mathchoice - {\bf \scriptstyle (z:d :\mathstyle)} - {\bf \scriptscriptstyle (z:t :\mathstyle)} - {\bf \scriptscriptstyle (z:s :\mathstyle)} - {\bf \scriptscriptstyle (z:ss:\mathstyle)} - \endgroup - \quad[d:\mathstyle] -\stopbuffer - -\typebuffer[1] - -% \typebuffer[2] - -This gives: - -\blank $\displaystyle \getbuffer[1]$ \blank -\blank $\textstyle \getbuffer[1]$ \blank - -Using \prm {begingroup} \unknown\ \prm {endgroup} instead gives: - -\blank $\displaystyle \getbuffer[2]$ \blank -\blank $\textstyle \getbuffer[2]$ \blank - -This might look wrong but it's just a side effect of \lpr {mathstyle} expanding -to the current (first pass) style and the number being injected in the list that -gets converted in the second pass. It all makes sense and it illustrates the -importance of grouping. In fact, the math choice style being effective afterwards -has advantages. It would be hard to get it otherwise. - -\subsection{\lpr {Ustack}} - -\topicindex {math+stacks} - -There are a few math commands in \TEX\ where the style that will be used is not -known straight from the start. These commands (\prm {over}, \prm {atop}, -\prm {overwithdelims}, \prm {atopwithdelims}) would therefore normally return -wrong values for \lpr {mathstyle}. To fix this, \LUATEX\ introduces a special -prefix command: \lpr {Ustack}: - -\starttyping -$\Ustack {a \over b}$ -\stoptyping - -The \lpr {Ustack} command will scan the next brace and start a new math group -with the correct (numerator) math style. - -\subsection{Cramped math styles} - -\topicindex {math+styles} -\topicindex {math+spacing} -\topicindex {math+cramped} - -\LUATEX\ has four new primitives to set the cramped math styles directly: - -\starttyping -\crampeddisplaystyle -\crampedtextstyle -\crampedscriptstyle -\crampedscriptscriptstyle -\stoptyping - -These additional commands are not all that valuable on their own, but they come -in handy as arguments to the math parameter settings that will be added shortly. - -In Eijkhouts \quotation {\TEX\ by Topic} the rules for handling styles in scripts -are described as follows: - -\startitemize -\startitem - In any style superscripts and subscripts are taken from the next smaller style. - Exception: in display style they are in script style. -\stopitem -\startitem - Subscripts are always in the cramped variant of the style; superscripts are only - cramped if the original style was cramped. -\stopitem -\startitem - In an \type {..\over..} formula in any style the numerator and denominator are - taken from the next smaller style. -\stopitem -\startitem - The denominator is always in cramped style; the numerator is only in cramped - style if the original style was cramped. -\stopitem -\startitem - Formulas under a \type {\sqrt} or \prm {overline} are in cramped style. -\stopitem -\stopitemize - -In \LUATEX\ one can set the styles in more detail which means that you sometimes -have to set both normal and cramped styles to get the effect you want. (Even) if -we force styles in the script using \prm {scriptstyle} and \lpr -{crampedscriptstyle} we get this: - -\startbuffer[demo] -\starttabulate -\DB style \BC example \NC \NR -\TB -\NC default \NC $b_{x=xx}^{x=xx}$ \NC \NR -\NC script \NC $b_{\scriptstyle x=xx}^{\scriptstyle x=xx}$ \NC \NR -\NC crampedscript \NC $b_{\crampedscriptstyle x=xx}^{\crampedscriptstyle x=xx}$ \NC \NR -\LL -\stoptabulate -\stopbuffer - -\getbuffer[demo] - -Now we set the following parameters - -\startbuffer[setup] -\Umathordrelspacing\scriptstyle=30mu -\Umathordordspacing\scriptstyle=30mu -\stopbuffer - -\typebuffer[setup] - -This gives a different result: - -\start\getbuffer[setup,demo]\stop - -But, as this is not what is expected (visually) we should say: - -\startbuffer[setup] -\Umathordrelspacing\scriptstyle=30mu -\Umathordordspacing\scriptstyle=30mu -\Umathordrelspacing\crampedscriptstyle=30mu -\Umathordordspacing\crampedscriptstyle=30mu -\stopbuffer - -\typebuffer[setup] - -Now we get: - -\start\getbuffer[setup,demo]\stop - -\stopsection - -\startsection[title={Math parameter settings}] - -\subsection {Many new \lpr {Umath*} primitives} - -\topicindex {math+parameters} - -In \LUATEX, the font dimension parameters that \TEX\ used in math typesetting are -now accessible via primitive commands. In fact, refactoring of the math engine -has resulted in many more parameters than were not accessible before. - -\starttabulate -\DB primitive name \BC description \NC \NR -\TB -\NC \lpr {Umathquad} \NC the width of 18 mu's \NC \NR -\NC \lpr {Umathaxis} \NC height of the vertical center axis of - the math formula above the baseline \NC \NR -\NC \lpr {Umathoperatorsize} \NC minimum size of large operators in display mode \NC \NR -\NC \lpr {Umathoverbarkern} \NC vertical clearance above the rule \NC \NR -\NC \lpr {Umathoverbarrule} \NC the width of the rule \NC \NR -\NC \lpr {Umathoverbarvgap} \NC vertical clearance below the rule \NC \NR -\NC \lpr {Umathunderbarkern} \NC vertical clearance below the rule \NC \NR -\NC \lpr {Umathunderbarrule} \NC the width of the rule \NC \NR -\NC \lpr {Umathunderbarvgap} \NC vertical clearance above the rule \NC \NR -\NC \lpr {Umathradicalkern} \NC vertical clearance above the rule \NC \NR -\NC \lpr {Umathradicalrule} \NC the width of the rule \NC \NR -\NC \lpr {Umathradicalvgap} \NC vertical clearance below the rule \NC \NR -\NC \lpr {Umathradicaldegreebefore}\NC the forward kern that takes place before placement of - the radical degree \NC \NR -\NC \lpr {Umathradicaldegreeafter} \NC the backward kern that takes place after placement of - the radical degree \NC \NR -\NC \lpr {Umathradicaldegreeraise} \NC this is the percentage of the total height and depth of - the radical sign that the degree is raised by; it is - expressed in \type {percents}, so 60\% is expressed as the - integer $60$ \NC \NR -\NC \lpr {Umathstackvgap} \NC vertical clearance between the two - elements in a \prm {atop} stack \NC \NR -\NC \lpr {Umathstacknumup} \NC numerator shift upward in \prm {atop} stack \NC \NR -\NC \lpr {Umathstackdenomdown} \NC denominator shift downward in \prm {atop} stack \NC \NR -\NC \lpr {Umathfractionrule} \NC the width of the rule in a \prm {over} \NC \NR -\NC \lpr {Umathfractionnumvgap} \NC vertical clearance between the numerator and the rule \NC \NR -\NC \lpr {Umathfractionnumup} \NC numerator shift upward in \prm {over} \NC \NR -\NC \lpr {Umathfractiondenomvgap} \NC vertical clearance between the denominator and the rule \NC \NR -\NC \lpr {Umathfractiondenomdown} \NC denominator shift downward in \prm {over} \NC \NR -\NC \lpr {Umathfractiondelsize} \NC minimum delimiter size for \type {\...withdelims} \NC \NR -\NC \lpr {Umathlimitabovevgap} \NC vertical clearance for limits above operators \NC \NR -\NC \lpr {Umathlimitabovebgap} \NC vertical baseline clearance for limits above operators \NC \NR -\NC \lpr {Umathlimitabovekern} \NC space reserved at the top of the limit \NC \NR -\NC \lpr {Umathlimitbelowvgap} \NC vertical clearance for limits below operators \NC \NR -\NC \lpr {Umathlimitbelowbgap} \NC vertical baseline clearance for limits below operators \NC \NR -\NC \lpr {Umathlimitbelowkern} \NC space reserved at the bottom of the limit \NC \NR -\NC \lpr {Umathoverdelimitervgap} \NC vertical clearance for limits above delimiters \NC \NR -\NC \lpr {Umathoverdelimiterbgap} \NC vertical baseline clearance for limits above delimiters \NC \NR -\NC \lpr {Umathunderdelimitervgap} \NC vertical clearance for limits below delimiters \NC \NR -\NC \lpr {Umathunderdelimiterbgap} \NC vertical baseline clearance for limits below delimiters \NC \NR -\NC \lpr {Umathsubshiftdrop} \NC subscript drop for boxes and subformulas \NC \NR -\NC \lpr {Umathsubshiftdown} \NC subscript drop for characters \NC \NR -\NC \lpr {Umathsupshiftdrop} \NC superscript drop (raise, actually) for boxes and subformulas \NC \NR -\NC \lpr {Umathsupshiftup} \NC superscript raise for characters \NC \NR -\NC \lpr {Umathsubsupshiftdown} \NC subscript drop in the presence of a superscript \NC \NR -\NC \lpr {Umathsubtopmax} \NC the top of standalone subscripts cannot be higher than this - above the baseline \NC \NR -\NC \lpr {Umathsupbottommin} \NC the bottom of standalone superscripts cannot be less than - this above the baseline \NC \NR -\NC \lpr {Umathsupsubbottommax} \NC the bottom of the superscript of a combined super- and subscript - be at least as high as this above the baseline \NC \NR -\NC \lpr {Umathsubsupvgap} \NC vertical clearance between super- and subscript \NC \NR -\NC \lpr {Umathspaceafterscript} \NC additional space added after a super- or subscript \NC \NR -\NC \lpr {Umathconnectoroverlapmin}\NC minimum overlap between parts in an extensible recipe \NC \NR -\LL -\stoptabulate - -Each of the parameters in this section can be set by a command like this: - -\starttyping -\Umathquad\displaystyle=1em -\stoptyping - -they obey grouping, and you can use \type {\the\Umathquad\displaystyle} if -needed. - -\subsection{Font|-|based math parameters} - -\topicindex {math+parameters} - -While it is nice to have these math parameters available for tweaking, it would -be tedious to have to set each of them by hand. For this reason, \LUATEX\ -initializes a bunch of these parameters whenever you assign a font identifier to -a math family based on either the traditional math font dimensions in the font -(for assignments to math family~2 and~3 using \TFM|-|based fonts like \type -{cmsy} and \type {cmex}), or based on the named values in a potential \type -{MathConstants} table when the font is loaded via Lua. If there is a \type -{MathConstants} table, this takes precedence over font dimensions, and in that -case no attention is paid to which family is being assigned to: the \type -{MathConstants} tables in the last assigned family sets all parameters. - -In the table below, the one|-|letter style abbreviations and symbolic tfm font -dimension names match those used in the \TeX book. Assignments to \prm -{textfont} set the values for the cramped and uncramped display and text styles, -\prm {scriptfont} sets the script styles, and \prm {scriptscriptfont} sets the -scriptscript styles, so we have eight parameters for three font sizes. In the -\TFM\ case, assignments only happen in family~2 and family~3 (and of course only -for the parameters for which there are font dimensions). - -Besides the parameters below, \LUATEX\ also looks at the \quote {space} font -dimension parameter. For math fonts, this should be set to zero. - -\def\MathLine#1#2#3#4#5% - {\TB - \NC \llap{\high{\tx #2\enspace}}\ttbf \string #1 \NC \tt #5 \NC \NR - \NC \tx #3 \NC \tt #4 \NC \NR} - -\starttabulate[|l|l|] -\DB variable / style \BC tfm / opentype \NC \NR -\MathLine{\Umathaxis} {} {} {AxisHeight} {axis_height} -\MathLine{\Umathoperatorsize} {6} {D, D'} {DisplayOperatorMinHeight} {\emdash} -\MathLine{\Umathfractiondelsize} {9} {D, D'} {FractionDelimiterDisplayStyleSize} {delim1} -\MathLine{\Umathfractiondelsize} {9} {T, T', S, S', SS, SS'}{FractionDelimiterSize} {delim2} -\MathLine{\Umathfractiondenomdown} {} {D, D'} {FractionDenominatorDisplayStyleShiftDown}{denom1} -\MathLine{\Umathfractiondenomdown} {} {T, T', S, S', SS, SS'}{FractionDenominatorShiftDown} {denom2} -\MathLine{\Umathfractiondenomvgap} {} {D, D'} {FractionDenominatorDisplayStyleGapMin} {3*default_rule_thickness} -\MathLine{\Umathfractiondenomvgap} {} {T, T', S, S', SS, SS'}{FractionDenominatorGapMin} {default_rule_thickness} -\MathLine{\Umathfractionnumup} {} {D, D'} {FractionNumeratorDisplayStyleShiftUp} {num1} -\MathLine{\Umathfractionnumup} {} {T, T', S, S', SS, SS'}{FractionNumeratorShiftUp} {num2} -\MathLine{\Umathfractionnumvgap} {} {D, D'} {FractionNumeratorDisplayStyleGapMin} {3*default_rule_thickness} -\MathLine{\Umathfractionnumvgap} {} {T, T', S, S', SS, SS'}{FractionNumeratorGapMin} {default_rule_thickness} -\MathLine{\Umathfractionrule} {} {} {FractionRuleThickness} {default_rule_thickness} -\MathLine{\Umathskewedfractionhgap} {} {} {SkewedFractionHorizontalGap} {math_quad/2} -\MathLine{\Umathskewedfractionvgap} {} {} {SkewedFractionVerticalGap} {math_x_height} -\MathLine{\Umathlimitabovebgap} {} {} {UpperLimitBaselineRiseMin} {big_op_spacing3} -\MathLine{\Umathlimitabovekern} {1} {} {0} {big_op_spacing5} -\MathLine{\Umathlimitabovevgap} {} {} {UpperLimitGapMin} {big_op_spacing1} -\MathLine{\Umathlimitbelowbgap} {} {} {LowerLimitBaselineDropMin} {big_op_spacing4} -\MathLine{\Umathlimitbelowkern} {1} {} {0} {big_op_spacing5} -\MathLine{\Umathlimitbelowvgap} {} {} {LowerLimitGapMin} {big_op_spacing2} -\MathLine{\Umathoverdelimitervgap} {} {} {StretchStackGapBelowMin} {big_op_spacing1} -\MathLine{\Umathoverdelimiterbgap} {} {} {StretchStackTopShiftUp} {big_op_spacing3} -\MathLine{\Umathunderdelimitervgap} {} {} {StretchStackGapAboveMin} {big_op_spacing2} -\MathLine{\Umathunderdelimiterbgap} {} {} {StretchStackBottomShiftDown} {big_op_spacing4} -\MathLine{\Umathoverbarkern} {} {} {OverbarExtraAscender} {default_rule_thickness} -\MathLine{\Umathoverbarrule} {} {} {OverbarRuleThickness} {default_rule_thickness} -\MathLine{\Umathoverbarvgap} {} {} {OverbarVerticalGap} {3*default_rule_thickness} -\MathLine{\Umathquad} {1} {} {} {math_quad} -\MathLine{\Umathradicalkern} {} {} {RadicalExtraAscender} {default_rule_thickness} -\MathLine{\Umathradicalrule} {2} {} {RadicalRuleThickness} {} -\MathLine{\Umathradicalvgap} {3} {D, D'} {RadicalDisplayStyleVerticalGap} {default_rule_thickness+abs(math_x_height)/4} -\MathLine{\Umathradicalvgap} {3} {T, T', S, S', SS, SS'}{RadicalVerticalGap} {default_rule_thickness+abs(default_rule_thickness)/4} -\MathLine{\Umathradicaldegreebefore}{2} {} {RadicalKernBeforeDegree} {} -\MathLine{\Umathradicaldegreeafter} {2} {} {RadicalKernAfterDegree} {} -\MathLine{\Umathradicaldegreeraise} {2,7}{} {RadicalDegreeBottomRaisePercent} {} -\MathLine{\Umathspaceafterscript} {4} {} {SpaceAfterScript} {script_space} -\MathLine{\Umathstackdenomdown} {} {D, D'} {StackBottomDisplayStyleShiftDown} {denom1} -\MathLine{\Umathstackdenomdown} {} {T, T', S, S', SS, SS'}{StackBottomShiftDown} {denom2} -\MathLine{\Umathstacknumup} {} {D, D'} {StackTopDisplayStyleShiftUp} {num1} -\MathLine{\Umathstacknumup} {} {T, T', S, S', SS, SS'}{StackTopShiftUp} {num3} -\MathLine{\Umathstackvgap} {} {D, D'} {StackDisplayStyleGapMin} {7*default_rule_thickness} -\MathLine{\Umathstackvgap} {} {T, T', S, S', SS, SS'}{StackGapMin} {3*default_rule_thickness} -\MathLine{\Umathsubshiftdown} {} {} {SubscriptShiftDown} {sub1} -\MathLine{\Umathsubshiftdrop} {} {} {SubscriptBaselineDropMin} {sub_drop} -\MathLine{\Umathsubsupshiftdown} {8} {} {SubscriptShiftDownWithSuperscript} {\emdash} -\MathLine{\Umathsubtopmax} {} {} {SubscriptTopMax} {abs(math_x_height*4)/5} -\MathLine{\Umathsubsupvgap} {} {} {SubSuperscriptGapMin} {4*default_rule_thickness} -\MathLine{\Umathsupbottommin} {} {} {SuperscriptBottomMin} {abs(math_x_height/4)} -\MathLine{\Umathsupshiftdrop} {} {} {SuperscriptBaselineDropMax} {sup_drop} -\MathLine{\Umathsupshiftup} {} {D} {SuperscriptShiftUp} {sup1} -\MathLine{\Umathsupshiftup} {} {T, S, SS,} {SuperscriptShiftUp} {sup2} -\MathLine{\Umathsupshiftup} {} {D', T', S', SS'} {SuperscriptShiftUpCramped} {sup3} -\MathLine{\Umathsupsubbottommax} {} {} {SuperscriptBottomMaxWithSubscript} {abs(math_x_height*4)/5} -\MathLine{\Umathunderbarkern} {} {} {UnderbarExtraDescender} {default_rule_thickness} -\MathLine{\Umathunderbarrule} {} {} {UnderbarRuleThickness} {default_rule_thickness} -\MathLine{\Umathunderbarvgap} {} {} {UnderbarVerticalGap} {3*default_rule_thickness} -\MathLine{\Umathconnectoroverlapmin}{5} {} {MinConnectorOverlap} {0} -\LL -\stoptabulate - -Note 1: \OPENTYPE\ fonts set \lpr {Umathlimitabovekern} and \lpr -{Umathlimitbelowkern} to zero and set \lpr {Umathquad} to the font size of the -used font, because these are not supported in the \type {MATH} table, - -Note 2: Traditional \TFM\ fonts do not set \lpr {Umathradicalrule} because -\TEX82\ uses the height of the radical instead. When this parameter is indeed not -set when \LUATEX\ has to typeset a radical, a backward compatibility mode will -kick in that assumes that an oldstyle \TEX\ font is used. Also, they do not set -\lpr {Umathradicaldegreebefore}, \lpr {Umathradicaldegreeafter}, and \lpr -{Umathradicaldegreeraise}. These are then automatically initialized to -$5/18$quad, $-10/18$quad, and 60. - -Note 3: If \TFM\ fonts are used, then the \lpr {Umathradicalvgap} is not set -until the first time \LUATEX\ has to typeset a formula because this needs -parameters from both family~2 and family~3. This provides a partial backward -compatibility with \TEX82, but that compatibility is only partial: once the \lpr -{Umathradicalvgap} is set, it will not be recalculated any more. - -Note 4: When \TFM\ fonts are used a similar situation arises with respect to \lpr -{Umathspaceafterscript}: it is not set until the first time \LUATEX\ has to -typeset a formula. This provides some backward compatibility with \TEX82. But -once the \lpr {Umathspaceafterscript} is set, \prm {scriptspace} will never be -looked at again. - -Note 5: Traditional \TFM\ fonts set \lpr {Umathconnectoroverlapmin} to zero -because \TEX82\ always stacks extensibles without any overlap. - -Note 6: The \lpr {Umathoperatorsize} is only used in \prm {displaystyle}, and is -only set in \OPENTYPE\ fonts. In \TFM\ font mode, it is artificially set to one -scaled point more than the initial attempt's size, so that always the \quote -{first next} will be tried, just like in \TEX82. - -Note 7: The \lpr {Umathradicaldegreeraise} is a special case because it is the -only parameter that is expressed in a percentage instead of a number of scaled -points. - -Note 8: \type {SubscriptShiftDownWithSuperscript} does not actually exist in the -\quote {standard} \OPENTYPE\ math font Cambria, but it is useful enough to be -added. - -Note 9: \type {FractionDelimiterDisplayStyleSize} and \type -{FractionDelimiterSize} do not actually exist in the \quote {standard} \OPENTYPE\ -math font Cambria, but were useful enough to be added. - -\stopsection - -\startsection[title={Math spacing}] - -\subsection{Inline surrounding space} - -\topicindex {math+spacing} - -Inline math is surrounded by (optional) \prm {mathsurround} spacing but that is a fixed -dimension. There is now an additional parameter \lpr {mathsurroundskip}. When set to a -non|-|zero value (or zero with some stretch or shrink) this parameter will replace -\prm {mathsurround}. By using an additional parameter instead of changing the nature -of \prm {mathsurround}, we can remain compatible. In the meantime a bit more -control has been added via \lpr {mathsurroundmode}. This directive can take 6 values -with zero being the default behaviour. - -\start - -\def\OneLiner#1#2% - {\NC \type{#1} - \NC \dontleavehmode\inframed[align=normal,offset=0pt,frame=off]{\mathsurroundmode#1\relax\hsize 100pt x$x$x} - \NC \dontleavehmode\inframed[align=normal,offset=0pt,frame=off]{\mathsurroundmode#1\relax\hsize 100pt x $x$ x} - \NC #2 - \NC \NR} - -\startbuffer -\mathsurround 10pt -\mathsurroundskip20pt -\stopbuffer - -\typebuffer \getbuffer - -\starttabulate[|c|c|c|pl|] -\DB mode \BC x\$x\$x \BC x \$x\$ x \BC effect \NC \NR -\TB -\OneLiner{0}{obey \prm {mathsurround} when \lpr {mathsurroundskip} is 0pt} -\OneLiner{1}{only add skip to the left} -\OneLiner{2}{only add skip to the right} -\OneLiner{3}{add skip to the left and right} -\OneLiner{4}{ignore the skip setting, obey \prm {mathsurround}} -\OneLiner{5}{disable all spacing around math} -\OneLiner{6}{only apply \lpr {mathsurroundskip} when also spacing} -\OneLiner{7}{only apply \lpr {mathsurroundskip} when no spacing} -\LL -\stoptabulate - -\stop - -Method six omits the surround glue when there is (x)spacing glue present while -method seven does the opposite, the glue is only applied when there is (x)space -glue present too. Anything more fancy, like checking the begining or end of a -paragraph (or edges of a box) would not be robust anyway. If you want that you -can write a callback that runs over a list and analyzes a paragraph. Actually, in -that case you could also inject glue (or set the properties of a math node) -explicitly. So, these modes are in practice mostly useful for special purposes -and experiments (they originate in a tracker item). Keep in mind that this glue -is part of the math node and not always treated as normal glue: it travels with -the begin and end math nodes. Also, method 6 and 7 will zero the skip related -fields in a node when applicable in the first occasion that checks them -(linebreaking or packaging). - -\subsection{Pairwise spacing} - -\topicindex {math+spacing} - -Besides the parameters mentioned in the previous sections, there are also 64 new -primitives to control the math spacing table (as explained in Chapter~18 of the -\TEX book). The primitive names are a simple matter of combining two math atom -types, but for completeness' sake, here is the whole list: - -\starttwocolumns -\startlines -\lpr {Umathordordspacing} -\lpr {Umathordopspacing} -\lpr {Umathordbinspacing} -\lpr {Umathordrelspacing} -\lpr {Umathordopenspacing} -\lpr {Umathordclosespacing} -\lpr {Umathordpunctspacing} -\lpr {Umathordinnerspacing} -\lpr {Umathopordspacing} -\lpr {Umathopopspacing} -\lpr {Umathopbinspacing} -\lpr {Umathoprelspacing} -\lpr {Umathopopenspacing} -\lpr {Umathopclosespacing} -\lpr {Umathoppunctspacing} -\lpr {Umathopinnerspacing} -\lpr {Umathbinordspacing} -\lpr {Umathbinopspacing} -\lpr {Umathbinbinspacing} -\lpr {Umathbinrelspacing} -\lpr {Umathbinopenspacing} -\lpr {Umathbinclosespacing} -\lpr {Umathbinpunctspacing} -\lpr {Umathbininnerspacing} -\lpr {Umathrelordspacing} -\lpr {Umathrelopspacing} -\lpr {Umathrelbinspacing} -\lpr {Umathrelrelspacing} -\lpr {Umathrelopenspacing} -\lpr {Umathrelclosespacing} -\lpr {Umathrelpunctspacing} -\lpr {Umathrelinnerspacing} -\lpr {Umathopenordspacing} -\lpr {Umathopenopspacing} -\lpr {Umathopenbinspacing} -\lpr {Umathopenrelspacing} -\lpr {Umathopenopenspacing} -\lpr {Umathopenclosespacing} -\lpr {Umathopenpunctspacing} -\lpr {Umathopeninnerspacing} -\lpr {Umathcloseordspacing} -\lpr {Umathcloseopspacing} -\lpr {Umathclosebinspacing} -\lpr {Umathcloserelspacing} -\lpr {Umathcloseopenspacing} -\lpr {Umathcloseclosespacing} -\lpr {Umathclosepunctspacing} -\lpr {Umathcloseinnerspacing} -\lpr {Umathpunctordspacing} -\lpr {Umathpunctopspacing} -\lpr {Umathpunctbinspacing} -\lpr {Umathpunctrelspacing} -\lpr {Umathpunctopenspacing} -\lpr {Umathpunctclosespacing} -\lpr {Umathpunctpunctspacing} -\lpr {Umathpunctinnerspacing} -\lpr {Umathinnerordspacing} -\lpr {Umathinneropspacing} -\lpr {Umathinnerbinspacing} -\lpr {Umathinnerrelspacing} -\lpr {Umathinneropenspacing} -\lpr {Umathinnerclosespacing} -\lpr {Umathinnerpunctspacing} -\lpr {Umathinnerinnerspacing} -\stoplines -\stoptwocolumns - -These parameters are of type \prm {muskip}, so setting a parameter can be done -like this: - -\starttyping -\Umathopordspacing\displaystyle=4mu plus 2mu -\stoptyping - -They are all initialized by \type {initex} to the values mentioned in the table -in Chapter~18 of the \TEX book. - -Note 1: for ease of use as well as for backward compatibility, \prm {thinmuskip}, -\prm {medmuskip} and \prm {thickmuskip} are treated specially. In their case a -pointer to the corresponding internal parameter is saved, not the actual \prm -{muskip} value. This means that any later changes to one of these three -parameters will be taken into account. - -Note 2: Careful readers will realise that there are also primitives for the items -marked \type {*} in the \TEX book. These will not actually be used as those -combinations of atoms cannot actually happen, but it seemed better not to break -orthogonality. They are initialized to zero. - -\subsection{Skips around display math} - -\topicindex {math+spacing} - -The injection of \prm {abovedisplayskip} and \prm {belowdisplayskip} is not -symmetrical. An above one is always inserted, also when zero, but the below is -only inserted when larger than zero. Especially the latter makes it sometimes hard -to fully control spacing. Therefore \LUATEX\ comes with a new directive: \lpr -{mathdisplayskipmode}. The following values apply: - -\starttabulate[|c|l|] -\DB value \BC meaning \NC \NR -\TB -\NC 0 \NC normal \TEX\ behaviour \NC \NR -\NC 1 \NC always (same as 0) \NC \NR -\NC 2 \NC only when not zero \NC \NR -\NC 3 \NC never, not even when not zero \NC \NR -\LL -\stoptabulate - -\subsection {Nolimit correction} - -\topicindex {math+limits} - -There are two extra math parameters \lpr {Umathnolimitsupfactor} and \lpr -{Umathnolimitsubfactor} that were added to provide some control over how limits -are spaced (for example the position of super and subscripts after integral -operators). They relate to an extra parameter \lpr {mathnolimitsmode}. The half -corrections are what happens when scripts are placed above and below. The -problem with italic corrections is that officially that correction italic is used -for above|/|below placement while advanced kerns are used for placement at the -right end. The question is: how often is this implemented, and if so, do the -kerns assume correction too. Anyway, with this parameter one can control it. - -\starttabulate[|l|ck1|ck1|ck1|ck1|ck1|ck1|] - \NC - \NC \mathnolimitsmode0 $\displaystyle\int\nolimits^0_1$ - \NC \mathnolimitsmode1 $\displaystyle\int\nolimits^0_1$ - \NC \mathnolimitsmode2 $\displaystyle\int\nolimits^0_1$ - \NC \mathnolimitsmode3 $\displaystyle\int\nolimits^0_1$ - \NC \mathnolimitsmode4 $\displaystyle\int\nolimits^0_1$ - \NC \mathnolimitsmode8000 $\displaystyle\int\nolimits^0_1$ - \NC \NR - \TB - \BC mode - \NC \tttf 0 - \NC \tttf 1 - \NC \tttf 2 - \NC \tttf 3 - \NC \tttf 4 - \NC \tttf 8000 - \NC \NR - \BC superscript - \NC 0 - \NC font - \NC 0 - \NC 0 - \NC +ic/2 - \NC 0 - \NC \NR - \BC subscript - \NC -ic - \NC font - \NC 0 - \NC -ic/2 - \NC -ic/2 - \NC 8000ic/1000 - \NC \NR -\stoptabulate - -When the mode is set to one, the math parameters are used. This way a macro -package writer can decide what looks best. Given the current state of fonts in -\CONTEXT\ we currently use mode 1 with factor 0 for the superscript and 750 for -the subscripts. Positive values are used for both parameters but the subscript -shifts to the left. A \lpr {mathnolimitsmode} larger that 15 is considered to -be a factor for the subscript correction. This feature can be handy when -experimenting. - -\subsection {Math italic mess} - -\topicindex {math+italics} - -The \lpr {mathitalicsmode} parameter can be set to~1 to force italic correction -before noads that represent some more complex structure (read: everything -that is not an ord, bin, rel, open, close, punct or inner). We show a Cambria -example. - -\starttexdefinition Whatever #1 - \NC \type{\mathitalicsmode = #1} - \NC \mathitalicsmode#1\ruledhbox{$\left|T^1\right|$} - \NC \mathitalicsmode#1\ruledhbox{$\left|T\right|$} - \NC \mathitalicsmode#1\ruledhbox{$T+1$} - \NC \mathitalicsmode#1\ruledhbox{$T{1\over2}$} - \NC \mathitalicsmode#1\ruledhbox{$T\sqrt{1}$} - \NC \NR -\stoptexdefinition - -\start - \switchtobodyfont[cambria] - \starttabulate[|c|c|c|c|c|c|] - \Whatever{0}% - \Whatever{1}% - \stoptabulate -\stop - -This kind of parameters relate to the fact that italic correction in \OPENTYPE\ -math is bound to fuzzy rules. So, control is the solution. - -\subsection {Script and kerning} - -\topicindex {math+kerning} -\topicindex {math+scripts} - -If you want to typeset text in math macro packages often provide something \type -{\text} which obeys the script sizes. As the definition can be anything there is -a good chance that the kerning doesn't come out well when used in a script. Given -that the first glyph ends up in a \prm {hbox} we have some control over this. -And, as a bonus we also added control over the normal sublist kerning. The \lpr -{mathscriptboxmode} parameter defaults to~1. - -\starttabulate[|c|l|] -\DB value \BC meaning \NC \NR -\TB -\NC \type {0} \NC forget about kerning \NC \NR -\NC \type {1} \NC kern math sub lists with a valid glyph \NC \NR -\NC \type {2} \NC also kern math sub boxes that have a valid glyph \NC \NR -\NC \type {2} \NC only kern math sub boxes with a boundary node present\NC \NR -\LL -\stoptabulate - -Here we show some examples. Of course this doesn't solve all our problems, if -only because some fonts have characters with bounding boxes that compensate for -italics, while other fonts can lack kerns. - -\startbuffer[1] - $T_{\tf fluff}$ -\stopbuffer - -\startbuffer[2] - $T_{\text{fluff}}$ -\stopbuffer - -\startbuffer[3] - $T_{\text{\boundary1 fluff}}$ -\stopbuffer - -\unexpanded\def\Show#1#2#3% - {\doifelsenothing{#3} - {\small\tx\typeinlinebuffer[#1]} - {\doifelse{#3}{-} - {\small\bf\tt mode #2} - {\switchtobodyfont[#3]\showfontkerns\showglyphs\mathscriptboxmode#2\relax\inlinebuffer[#1]}}} - -\starttabulate[|lBT|c|c|c|c|c|] - \NC \NC \Show{1}{0}{} \NC\Show{1}{1}{} \NC \Show{2}{1}{} \NC \Show{2}{2}{} \NC \Show{3}{3}{} \NC \NR - \NC \NC \Show{1}{0}{-} \NC\Show{1}{1}{-} \NC \Show{2}{1}{-} \NC \Show{2}{2}{-} \NC \Show{3}{3}{-} \NC \NR - \NC modern \NC \Show{1}{0}{modern} \NC\Show{1}{1}{modern} \NC \Show{2}{1}{modern} \NC \Show{2}{2}{modern} \NC \Show{3}{3}{modern} \NC \NR - \NC lucidaot \NC \Show{1}{0}{lucidaot} \NC\Show{1}{1}{lucidaot} \NC \Show{2}{1}{lucidaot} \NC \Show{2}{2}{lucidaot} \NC \Show{3}{3}{lucidaot} \NC \NR - \NC pagella \NC \Show{1}{0}{pagella} \NC\Show{1}{1}{pagella} \NC \Show{2}{1}{pagella} \NC \Show{2}{2}{pagella} \NC \Show{3}{3}{pagella} \NC \NR - \NC cambria \NC \Show{1}{0}{cambria} \NC\Show{1}{1}{cambria} \NC \Show{2}{1}{cambria} \NC \Show{2}{2}{cambria} \NC \Show{3}{3}{cambria} \NC \NR - \NC dejavu \NC \Show{1}{0}{dejavu} \NC\Show{1}{1}{dejavu} \NC \Show{2}{1}{dejavu} \NC \Show{2}{2}{dejavu} \NC \Show{3}{3}{dejavu} \NC \NR -\stoptabulate - -Kerning between a character subscript is controlled by \lpr {mathscriptcharmode} -which also defaults to~1. - -Here is another example. Internally we tag kerns as italic kerns or font kerns -where font kerns result from the staircase kern tables. In 2018 fonts like Latin -Modern and Pagella rely on cheats with the boundingbox, Cambria uses staircase -kerns and Lucida a mixture. Depending on how fonts evolve we might add some more -control over what one can turn on and off. - -\def\MathSample#1#2#3% - {\NC - #1 \NC - #2 \NC - \showglyphdata \switchtobodyfont[#2,17.3pt]$#3T_{f}$ \NC - \showglyphdata \switchtobodyfont[#2,17.3pt]$#3\gamma_{e}$ \NC - \showglyphdata \switchtobodyfont[#2,17.3pt]$#3\gamma_{ee}$ \NC - \showglyphdata \switchtobodyfont[#2,17.3pt]$#3T_{\tf fluff}$ \NC - \NR} - -\starttabulate[|Tl|Tl|l|l|l|l|] - \FL - \MathSample{normal}{modern} {\mr} - \MathSample{} {pagella} {\mr} - \MathSample{} {cambria} {\mr} - \MathSample{} {lucidaot}{\mr} - \ML - \MathSample{bold} {modern} {\mb} - \MathSample{} {pagella} {\mb} - \MathSample{} {cambria} {\mb} - \MathSample{} {lucidaot}{\mb} - \LL -\stoptabulate - -\subsection{Fixed scripts} - -We have three parameters that are used for this fixed anchoring: - -\starttabulate[|c|l|] -\DB parameter \BC register \NC \NR -\NC $d$ \NC \lpr {Umathsubshiftdown} \NC \NR -\NC $u$ \NC \lpr {Umathsupshiftup} \NC \NR -\NC $s$ \NC \lpr {Umathsubsupshiftdown} \NC \NR -\LL -\stoptabulate - -When we set \lpr {mathscriptsmode} to a value other than zero these are used -for calculating fixed positions. This is something that is needed for instance -for chemistry. You can manipulate the mentioned variables to achieve different -effects. - -\def\SampleMath#1% - {$\mathscriptsmode#1\mathupright CH_2 + CH^+_2 + CH^2_2$} - -\starttabulate[|c|c|c|p|] -\DB mode \BC down \BC up \BC example \NC \NR -\TB -\NC 0 \NC dynamic \NC dynamic \NC \SampleMath{0} \NC \NR -\NC 1 \NC $d$ \NC $u$ \NC \SampleMath{1} \NC \NR -\NC 2 \NC $s$ \NC $u$ \NC \SampleMath{2} \NC \NR -\NC 3 \NC $s$ \NC $u + s - d$ \NC \SampleMath{3} \NC \NR -\NC 4 \NC $d + (s-d)/2$ \NC $u + (s-d)/2$ \NC \SampleMath{4} \NC \NR -\NC 5 \NC $d$ \NC $u + s - d$ \NC \SampleMath{5} \NC \NR -\LL -\stoptabulate - -The value of this parameter obeys grouping but applies to the whole current -formula. - -% if needed we can put the value in stylenodes but maybe more should go there - -\subsection{Penalties: \lpr {mathpenaltiesmode}} - -\topicindex {math+penalties} - -Only in inline math penalties will be added in a math list. You can force -penalties (also in display math) by setting: - -\starttyping -\mathpenaltiesmode = 1 -\stoptyping - -This primnitive is not really needed in \LUATEX\ because you can use the callback -\cbk {mlist_to_hlist} to force penalties by just calling the regular routine -with forced penalties. However, as part of opening up and control this primitive -makes sense. As a bonus we also provide two extra penalties: - -\starttyping -\prebinoppenalty = -100 % example value -\prerelpenalty = 900 % example value -\stoptyping - -They default to inifinite which signals that they don't need to be inserted. When -set they are injected before a binop or rel noad. This is an experimental feature. - -\subsection{Equation spacing: \lpr {matheqnogapstep}} - -By default \TEX\ will add one quad between the equation and the number. This is -hard coded. A new primitive can control this: - -\startsyntax -\matheqnogapstep = 1000 -\stopsyntax - -Because a math quad from the math text font is used instead of a dimension, we -use a step to control the size. A value of zero will suppress the gap. The step -is divided by 1000 which is the usual way to mimmick floating point factors in -\TEX. - -\stopsection - -\startsection[title={Math constructs}] - -\subsection {Unscaled fences} - -\topicindex {math+fences} - -The \lpr {mathdelimitersmode} primitive is experimental and deals with the -following (potential) problems. Three bits can be set. The first bit prevents an -unwanted shift when the fence symbol is not scaled (a cambria side effect). The -second bit forces italic correction between a preceding character ordinal and the -fenced subformula, while the third bit turns that subformula into an ordinary so -that the same spacing applies as with unfenced variants. Here we show Cambria -(with \lpr {mathitalicsmode} enabled). - -\starttexdefinition Whatever #1 - \NC \type{\mathdelimitersmode = #1} - \NC \mathitalicsmode1\mathdelimitersmode#1\ruledhbox{\showglyphs\showfontkerns\showfontitalics$f(x)$} - \NC \mathitalicsmode1\mathdelimitersmode#1\ruledhbox{\showglyphs\showfontkerns\showfontitalics$f\left(x\right)$} - \NC \NR -\stoptexdefinition - -\start - \switchtobodyfont[cambria] - \starttabulate[|l|l|l|] - \Whatever{0}\Whatever{1}\Whatever{2}\Whatever{3}% - \Whatever{4}\Whatever{5}\Whatever{6}\Whatever{7}% - \stoptabulate -\stop - -So, when set to 7 fenced subformulas with unscaled delimiters come out the same -as unfenced ones. This can be handy for cases where one is forced to use \prm -{left} and \prm {right} always because of unpredictable content. As said, it's an -experimental feature (which somehow fits in the exceptional way fences are dealt -with in the engine). The full list of flags is given in the next table: - -\starttabulate[|c|l|] -\DB value \BC meaning \NC \NR -\TB -\NC \type{"01} \NC don't apply the usual shift \NC \NR -\NC \type{"02} \NC apply italic correction when possible \NC \NR -\NC \type{"04} \NC force an ordinary subformula \NC \NR -\NC \type{"08} \NC no shift when a base character \NC \NR -\NC \type{"10} \NC only shift when an extensible \NC \NR -\LL -\stoptabulate - -The effect can depend on the font (and for Cambria one can use for instance \type {"16}). - -\subsection[mathacc]{Accent handling} - -\topicindex {math+accents} - -\LUATEX\ supports both top accents and bottom accents in math mode, and math -accents stretch automatically (if this is supported by the font the accent comes -from, of course). Bottom and combined accents as well as fixed-width math accents -are controlled by optional keywords following \lpr {Umathaccent}. - -The keyword \type {bottom} after \lpr {Umathaccent} signals that a bottom accent -is needed, and the keyword \type {both} signals that both a top and a bottom -accent are needed (in this case two accents need to be specified, of course). - -Then the set of three integers defining the accent is read. This set of integers -can be prefixed by the \type {fixed} keyword to indicate that a non-stretching -variant is requested (in case of both accents, this step is repeated). - -A simple example: - -\starttyping -\Umathaccent both fixed 0 0 "20D7 fixed 0 0 "20D7 {example} -\stoptyping - -If a math top accent has to be placed and the accentee is a character and has a -non-zero \type {top_accent} value, then this value will be used to place the -accent instead of the \prm {skewchar} kern used by \TEX82. - -The \type {top_accent} value represents a vertical line somewhere in the -accentee. The accent will be shifted horizontally such that its own \type -{top_accent} line coincides with the one from the accentee. If the \type -{top_accent} value of the accent is zero, then half the width of the accent -followed by its italic correction is used instead. - -The vertical placement of a top accent depends on the \type {x_height} of the -font of the accentee (as explained in the \TEX book), but if a value turns out -to be zero and the font had a \type {MathConstants} table, then \type -{AccentBaseHeight} is used instead. - -The vertical placement of a bottom accent is straight below the accentee, no -correction takes place. - -Possible locations are \type {top}, \type {bottom}, \type {both} and \type -{center}. When no location is given \type {top} is assumed. An additional -parameter \nod {fraction} can be specified followed by a number; a value of for -instance 1200 means that the criterium is 1.2 times the width of the nucleus. The -fraction only applies to the stepwise selected shapes and is mostly meant for the -\type {overlay} location. It also works for the other locations but then it -concerns the width. - -\subsection{Radical extensions} - -\topicindex {math+radicals} - -The new primitive \lpr {Uroot} allows the construction of a radical noad -including a degree field. Its syntax is an extension of \lpr {Uradical}: - -\starttyping -\Uradical -\Uroot -\stoptyping - -The placement of the degree is controlled by the math parameters \lpr -{Umathradicaldegreebefore}, \lpr {Umathradicaldegreeafter}, and \lpr -{Umathradicaldegreeraise}. The degree will be typeset in \prm -{scriptscriptstyle}. - -\subsection{Super- and subscripts} - -The character fields in a \LUA|-|loaded \OPENTYPE\ math font can have a \quote -{mathkern} table. The format of this table is the same as the \quote {mathkern} -table that is returned by the \type {fontloader} library, except that all height -and kern values have to be specified in actual scaled points. - -When a super- or subscript has to be placed next to a math item, \LUATEX\ checks -whether the super- or subscript and the nucleus are both simple character items. -If they are, and if the fonts of both character items are \OPENTYPE\ fonts (as -opposed to legacy \TEX\ fonts), then \LUATEX\ will use the \OPENTYPE\ math -algorithm for deciding on the horizontal placement of the super- or subscript. - -This works as follows: - -\startitemize - \startitem - The vertical position of the script is calculated. - \stopitem - \startitem - The default horizontal position is flat next to the base character. - \stopitem - \startitem - For superscripts, the italic correction of the base character is added. - \stopitem - \startitem - For a superscript, two vertical values are calculated: the bottom of the - script (after shifting up), and the top of the base. For a subscript, the two - values are the top of the (shifted down) script, and the bottom of the base. - \stopitem - \startitem - For each of these two locations: - \startitemize - \startitem - find the math kern value at this height for the base (for a subscript - placement, this is the bottom_right corner, for a superscript - placement the top_right corner) - \stopitem - \startitem - find the math kern value at this height for the script (for a - subscript placement, this is the top_left corner, for a superscript - placement the bottom_left corner) - \stopitem - \startitem - add the found values together to get a preliminary result. - \stopitem - \stopitemize - \stopitem - \startitem - The horizontal kern to be applied is the smallest of the two results from - previous step. - \stopitem -\stopitemize - -The math kern value at a specific height is the kern value that is specified by the -next higher height and kern pair, or the highest one in the character (if there is no -value high enough in the character), or simply zero (if the character has no math kern -pairs at all). - -\subsection{Scripts on extensibles} - -\topicindex {math+scripts} -\topicindex {math+delimiters} -\topicindex {math+extensibles} - -The primitives \lpr {Uunderdelimiter} and \lpr {Uoverdelimiter} allow the -placement of a subscript or superscript on an automatically extensible item and -\lpr {Udelimiterunder} and \lpr {Udelimiterover} allow the placement of an -automatically extensible item as a subscript or superscript on a nucleus. The -input: - -% these produce radical noads .. in fact the code base has the numbers wrong for -% quite a while, so no one seems to use this - -\startbuffer -$\Uoverdelimiter 0 "2194 {\hbox{\strut overdelimiter}}$ -$\Uunderdelimiter 0 "2194 {\hbox{\strut underdelimiter}}$ -$\Udelimiterover 0 "2194 {\hbox{\strut delimiterover}}$ -$\Udelimiterunder 0 "2194 {\hbox{\strut delimiterunder}}$ -\stopbuffer - -\typebuffer will render this: - -\blank \startnarrower \getbuffer \stopnarrower \blank - -The vertical placements are controlled by \lpr {Umathunderdelimiterbgap}, \lpr -{Umathunderdelimitervgap}, \lpr {Umathoverdelimiterbgap}, and \lpr -{Umathoverdelimitervgap} in a similar way as limit placements on large operators. -The superscript in \lpr {Uoverdelimiter} is typeset in a suitable scripted style, -the subscript in \lpr {Uunderdelimiter} is cramped as well. - -These primitives accepts an option \type {width} specification. When used the -also optional keywords \type {left}, \type {middle} and \type {right} will -determine what happens when a requested size can't be met (which can happen when -we step to successive larger variants). - -An extra primitive \lpr {Uhextensible} is available that can be used like this: - -\startbuffer -$\Uhextensible width 10cm 0 "2194$ -\stopbuffer - -\typebuffer This will render this: - -\blank \startnarrower \getbuffer \stopnarrower \blank - -Here you can also pass options, like: - -\startbuffer -$\Uhextensible width 1pt middle 0 "2194$ -\stopbuffer - -\typebuffer This gives: - -\blank \startnarrower \getbuffer \stopnarrower \blank - -\LUATEX\ internally uses a structure that supports \OPENTYPE\ \quote -{MathVariants} as well as \TFM\ \quote {extensible recipes}. In most cases where -font metrics are involved we have a different code path for traditional fonts end -\OPENTYPE\ fonts. - -\subsection{Fractions} - -\topicindex {math+fractions} - -The \prm {abovewithdelims} command accepts a keyword \type {exact}. When issued -the extra space relative to the rule thickness is not added. One can of course -use the \type {\Umathfraction..gap} commands to influence the spacing. Also the -rule is still positioned around the math axis. - -\starttyping -$$ { {a} \abovewithdelims() exact 4pt {b} }$$ -\stoptyping - -The math parameter table contains some parameters that specify a horizontal and -vertical gap for skewed fractions. Of course some guessing is needed in order to -implement something that uses them. And so we now provide a primitive similar to the -other fraction related ones but with a few options so that one can influence the -rendering. Of course a user can also mess around a bit with the parameters -\lpr {Umathskewedfractionhgap} and \lpr {Umathskewedfractionvgap}. - -The syntax used here is: - -\starttyping -{ {1} \Uskewed / {2} } -{ {1} \Uskewedwithdelims / () {2} } -\stoptyping - -where the options can be \type {noaxis} and \type {exact}. By default we add half -the axis to the shifts and by default we zero the width of the middle character. -For Latin Modern the result looks as follows: - -\def\ShowA#1#2#3{$x + { {#1} \Uskewed / #3 {#2} } + x$} -\def\ShowB#1#2#3{$x + { {#1} \Uskewedwithdelims / () #3 {#2} } + x$} - -\start - \switchtobodyfont[modern] - \starttabulate[||||||] - \NC \NC - \ShowA{a}{b}{} \NC - \ShowA{1}{2}{} \NC - \ShowB{a}{b}{} \NC - \ShowB{1}{2}{} \NC - \NR - \NC \type{exact} \NC - \ShowA{a}{b}{exact} \NC - \ShowA{1}{2}{exact} \NC - \ShowB{a}{b}{exact} \NC - \ShowB{1}{2}{exact} \NC - \NR - \NC \type{noaxis} \NC - \ShowA{a}{b}{noaxis} \NC - \ShowA{1}{2}{noaxis} \NC - \ShowB{a}{b}{noaxis} \NC - \ShowB{1}{2}{noaxis} \NC - \NR - \NC \type{exact noaxis} \NC - \ShowA{a}{b}{exact noaxis} \NC - \ShowA{1}{2}{exact noaxis} \NC - \ShowB{a}{b}{exact noaxis} \NC - \ShowB{1}{2}{exact noaxis} \NC - \NR - \stoptabulate -\stop - -\subsection {Delimiters: \type{\Uleft}, \prm {Umiddle} and \prm {Uright}} - -\topicindex {math+delimiters} - -Normally you will force delimiters to certain sizes by putting an empty box or -rule next to it. The resulting delimiter will either be a character from the -stepwise size range or an extensible. The latter can be quite differently -positioned than the characters as it depends on the fit as well as the fact if -the used characters in the font have depth or height. Commands like (plain \TEX -s) \type {\big} need use this feature. In \LUATEX\ we provide a bit more control -by three variants that support optional parameters \type {height}, \type {depth} -and \type {axis}. The following example uses this: - -\startbuffer -\Uleft height 30pt depth 10pt \Udelimiter "0 "0 "000028 -\quad x\quad -\Umiddle height 40pt depth 15pt \Udelimiter "0 "0 "002016 -\quad x\quad -\Uright height 30pt depth 10pt \Udelimiter "0 "0 "000029 -\quad \quad \quad -\Uleft height 30pt depth 10pt axis \Udelimiter "0 "0 "000028 -\quad x\quad -\Umiddle height 40pt depth 15pt axis \Udelimiter "0 "0 "002016 -\quad x\quad -\Uright height 30pt depth 10pt axis \Udelimiter "0 "0 "000029 -\stopbuffer - -\typebuffer - -\startlinecorrection -\ruledhbox{\mathematics{\getbuffer}} -\stoplinecorrection - -The keyword \type {exact} can be used as directive that the real dimensions -should be applied when the criteria can't be met which can happen when we're -still stepping through the successively larger variants. When no dimensions are -given the \type {noaxis} command can be used to prevent shifting over the axis. - -You can influence the final class with the keyword \type {class} which will -influence the spacing. The numbers are the same as for character classes. - -\stopsection - -\startsection[title={Extracting values}] - -\subsection{Codes} - -\topicindex {math+codes} - -You can extract the components of a math character. Say that we have defined: - -\starttyping -\Umathcode 1 2 3 4 -\stoptyping - -then - -\starttyping -[\Umathcharclass1] [\Umathcharfam1] [\Umathcharslot1] -\stoptyping - -will return: - -\starttyping -[2] [3] [4] -\stoptyping - -These commands are provides as convenience. Before they come available you could -do the following: - -\starttyping -\def\Umathcharclass{\directlua{tex.print(tex.getmathcode(token.scan_int())[1])}} -\def\Umathcharfam {\directlua{tex.print(tex.getmathcode(token.scan_int())[2])}} -\def\Umathcharslot {\directlua{tex.print(tex.getmathcode(token.scan_int())[3])}} -\stoptyping - -\subsection {Last lines} - -\topicindex {math+last line} - -There is a new primitive to control the overshoot in the calculation of the -previous line in mid|-|paragraph display math. The default value is 2 times -the em width of the current font: - -\starttyping -\predisplaygapfactor=2000 -\stoptyping - -If you want to have the length of the last line independent of math i.e.\ you don't -want to revert to a hack where you insert a fake display math formula in order to -get the length of the last line, the following will often work too: - -\starttyping -\def\lastlinelength{\dimexpr - \directlua {tex.sprint ( - (nodes.dimensions(node.tail(tex.lists.page_head).list)) - )}sp -\relax} -\stoptyping - -\stopsection - -\startsection[title={Math mode}] - -\subsection {Verbose versions of single|-|character math commands} - -\topicindex {math+styles} - -\LUATEX\ defines six new primitives that have the same function as -\type {^}, \type {_}, \type {$}, and \type {$$}: - -\starttabulate[|l|l|] -\DB primitive \BC explanation \NC \NR -\TB -\NC \lpr {Usuperscript} \NC duplicates the functionality of \type {^} \NC \NR -\NC \lpr {Usubscript} \NC duplicates the functionality of \type {_} \NC \NR -\NC \lpr {Ustartmath} \NC duplicates the functionality of \type {$}, % $ - when used in non-math mode. \NC \NR -\NC \lpr {Ustopmath} \NC duplicates the functionality of \type {$}, % $ - when used in inline math mode. \NC \NR -\NC \lpr {Ustartdisplaymath} \NC duplicates the functionality of \type {$$}, % $$ - when used in non-math mode. \NC \NR -\NC \lpr {Ustopdisplaymath} \NC duplicates the functionality of \type {$$}, % $$ - when used in display math mode. \NC \NR -\LL -\stoptabulate - -The \lpr {Ustopmath} and \lpr {Ustopdisplaymath} primitives check if the current -math mode is the correct one (inline vs.\ displayed), but you can freely intermix -the four mathon|/|mathoff commands with explicit dollar sign(s). - -\subsection{Script commands \lpr {Unosuperscript} and \lpr {Unosubscript}} - -\topicindex {math+styles} -\topicindex {math+scripts} - -These two commands result in super- and subscripts but with the current style (at the -time of rendering). So, - -\startbuffer[script] -$ - x\Usuperscript {1}\Usubscript {2} = - x\Unosuperscript{1}\Unosubscript{2} = - x\Usuperscript {1}\Unosubscript{2} = - x\Unosuperscript{1}\Usubscript {2} -$ -\stopbuffer - -\typebuffer - -results in \inlinebuffer[script]. - -\subsection{Allowed math commands in non|-|math modes} - -\topicindex {math+text} -\topicindex {text+math} - -The commands \prm {mathchar}, and \lpr {Umathchar} and control sequences that are -the result of \prm {mathchardef} or \lpr {Umathchardef} are also acceptable in -the horizontal and vertical modes. In those cases, the \prm {textfont} from the -requested math family is used. - -% \startsection[title={Math todo}] -% -% The following items are still todo. -% -% \startitemize -% \startitem -% Pre-scripts. -% \stopitem -% \startitem -% Multi-story stacks. -% \stopitem -% \startitem -% Flattened accents for high characters (maybe). -% \stopitem -% \startitem -% Better control over the spacing around displays and handling of equation numbers. -% \stopitem -% \startitem -% Support for multi|-|line displays using \MATHML\ style alignment points. -% \stopitem -% \stopitemize -% -% \stopsection - -\stopsection - -\startsection[title={Goodies}] - -\subsection {Flattening: \lpr {mathflattenmode}} - -\topicindex {math+flattening} - -The \TEX\ math engine collapses \type {ord} noads without sub- and superscripts -and a character as nucleus. and which has the side effect that in \OPENTYPE\ mode -italic corrections are applied (given that they are enabled). - -\startbuffer[sample] -\switchtobodyfont[modern] -$V \mathbin{\mathbin{v}} V$\par -$V \mathord{\mathord{v}} V$\par -\stopbuffer - -\typebuffer[sample] - -This renders as: - -\blank \start \mathflattenmode\plusone \getbuffer[sample] \stop \blank - -When we set \lpr {mathflattenmode} to 31 we get: - -\blank \start \mathflattenmode\numexpr1+2+4+8+16\relax \getbuffer[sample] \stop \blank - -When you see no difference, then the font probably has the proper character -dimensions and no italic correction is needed. For Latin Modern (at least till -2018) there was a visual difference. In that respect this parameter is not always -needed unless of course you want efficient math lists anyway. - -You can influence flattening by adding the appropriate number to the value of the -mode parameter. The default value is~1. - -\starttabulate[|Tc|c|] -\DB mode \BC class \NC \NR -\TB -\NC 1 \NC ord \NC \NR -\NC 2 \NC bin \NC \NR -\NC 4 \NC rel \NC \NR -\NC 8 \NC punct \NC \NR -\NC 16 \NC inner \NC \NR -\LL -\stoptabulate - -\subsection {Less Tracing} - -\topicindex {math+tracing} - -Because there are quite some math related parameters and values, it is possible -to limit tracing. Only when \type {tracingassigns} and|/|or \type -{tracingrestores} are set to~2 or more they will be traced. - -\subsection {Math options with \lpr {mathoption}} - -The logic in the math engine is rather complex and there are often no universal -solutions (read: what works out well for one font, fails for another). Therefore -some variations in the implementation are driven by parameters (modes). In -addition there is a new primitive \lpr {mathoption} which will be used for -testing. Don't rely on any option to be there in a production version as they are -meant for development. - -This option was introduced for testing purposes when the math engine got split -code paths and it forces the engine to treat new fonts as old ones with respect -to italic correction etc. There are no guarantees given with respect to the final -result and unexpected side effects are not seen as bugs as they relate to font -properties. Ther eis currently only one option: - -\startbuffer -\mathoption old 1 -\stopbuffer - -The \type {oldmath} boolean flag in the \LUA\ font table is the official way to -force old treatment as it's bound to fonts. Like with all options we may -temporarily introduce with this command this feature is not meant for production. - -% % obsolete: -% -% \subsubsection {\type {\mathoption noitaliccompensation}} -% -% This option compensates placement for characters with a built|-|in italic -% correction. -% -% \startbuffer -% {\showboxes\int}\quad -% {\showboxes\int_{|}^{|}}\quad -% {\showboxes\int\limits_{|}^{|}} -% \stopbuffer -% -% \typebuffer -% -% Gives (with computer modern that has such italics): -% -% \startlinecorrection[blank] -% \switchtobodyfont[modern] -% \startcombination[nx=2,ny=2,distance=5em] -% {\mathoption noitaliccompensation 0\relax \mathematics{\getbuffer}} -% {\nohyphens\type{0:inline}} -% {\mathoption noitaliccompensation 0\relax \mathematics{\displaymath\getbuffer}} -% {\nohyphens\type{0:display}} -% {\mathoption noitaliccompensation 1\relax \mathematics{\getbuffer}} -% {\nohyphens\type{1:inline}} -% {\mathoption noitaliccompensation 1\relax \mathematics{\displaymath\getbuffer}} -% {\nohyphens\type{1:display}} -% \stopcombination -% \stoplinecorrection - -% % obsolete: -% -% \subsubsection {\type {\mathoption nocharitalic}} -% -% When two characters follow each other italic correction can interfere. The -% following example shows what this option does: -% -% \startbuffer -% \catcode"1D443=11 -% \catcode"1D444=11 -% \catcode"1D445=11 -% P( PP PQR -% \stopbuffer -% -% \typebuffer -% -% Gives (with computer modern that has such italics): -% -% \startlinecorrection[blank] -% \switchtobodyfont[modern] -% \startcombination[nx=2,ny=2,distance=5em] -% {\mathoption nocharitalic 0\relax \mathematics{\getbuffer}} -% {\nohyphens\type{0:inline}} -% {\mathoption nocharitalic 0\relax \mathematics{\displaymath\getbuffer}} -% {\nohyphens\type{0:display}} -% {\mathoption nocharitalic 1\relax \mathematics{\getbuffer}} -% {\nohyphens\type{1:inline}} -% {\mathoption nocharitalic 1\relax \mathematics{\displaymath\getbuffer}} -% {\nohyphens\type{1:display}} -% \stopcombination -% \stoplinecorrection - -% % obsolete: -% -% \subsubsection {\type {\mathoption useoldfractionscaling}} -% -% This option has been introduced as solution for tracker item 604 for fuzzy cases -% around either or not present fraction related settings for new fonts. - -\stopsection - -\stopchapter - -\stopcomponent +% language=uk + +\environment luatex-style + +\startcomponent luatex-math + +\startchapter[reference=math,title={Math}] + +\startsection[title={Traditional alongside \OPENTYPE}] + +\topicindex {math} + +The handling of mathematics in \LUATEX\ differs quite a bit from how \TEX82 (and +therefore \PDFTEX) handles math. First, \LUATEX\ adds primitives and extends some +others so that \UNICODE\ input can be used easily. Second, all of \TEX82's +internal special values (for example for operator spacing) have been made +accessible and changeable via control sequences. Third, there are extensions that +make it easier to use \OPENTYPE\ math fonts. And finally, there are some +extensions that have been proposed or considered in the past that are now added +to the engine. + +\stopsection + +\startsection[title={Unicode math characters}] + +\topicindex {math+\UNICODE} +\topicindex {\UNICODE+math} + +Character handling is now extended up to the full \UNICODE\ range (the \type {\U} +prefix), which is compatible with \XETEX. + +The math primitives from \TEX\ are kept as they are, except for the ones that +convert from input to math commands: \type {mathcode}, and \type {delcode}. These +two now allow for a 21-bit character argument on the left hand side of the equals +sign. + +Some of the new \LUATEX\ primitives read more than one separate value. This is +shown in the tables below by a plus sign. + +The input for such primitives would look like this: + +\starttyping +\def\overbrace{\Umathaccent 0 1 "23DE } +\stoptyping + +The altered \TEX82 primitives are: + +\starttabulate[|l|l|r|c|l|r|] +\DB primitive \BC min \BC max \BC \kern 2em \BC min \BC max \NC \NR +\TB +\NC \prm {mathcode} \NC 0 \NC 10FFFF \NC = \NC 0 \NC 8000 \NC \NR +\NC \prm {delcode} \NC 0 \NC 10FFFF \NC = \NC 0 \NC FFFFFF \NC \NR +\LL +\stoptabulate + +The unaltered ones are: + +\starttabulate[|l|l|r|] +\DB primitive \BC min \BC max \NC \NR +\TB +\NC \prm {mathchardef} \NC 0 \NC 8000 \NC \NR +\NC \prm {mathchar} \NC 0 \NC 7FFF \NC \NR +\NC \prm {mathaccent} \NC 0 \NC 7FFF \NC \NR +\NC \prm {delimiter} \NC 0 \NC 7FFFFFF \NC \NR +\NC \prm {radical} \NC 0 \NC 7FFFFFF \NC \NR +\LL +\stoptabulate + +For practical reasons \prm {mathchardef} will silently accept values larger +that \type {0x8000} and interpret it as \lpr {Umathcharnumdef}. This is needed +to satisfy older macro packages. + +The following new primitives are compatible with \XETEX: + +% somewhat fuzzy: + +\starttabulate[|l|l|r|c|l|r|] +\DB primitive \BC min \BC max \BC \kern 2em \BC min \BC max \NC \NR +\TB +\NC \lpr {Umathchardef} \NC 0+0+0 \NC 7+FF+10FFFF \NC \NC \NC \NC \NR +\NC \lpr {Umathcharnumdef}\rlap{\high{5}} \NC -80000000 \NC 7FFFFFFF \NC \NC \NC \NC \NR +\NC \lpr {Umathcode} \NC 0 \NC 10FFFF \NC = \NC 0+0+0 \NC 7+FF+10FFFF \NC \NR +\NC \lpr {Udelcode} \NC 0 \NC 10FFFF \NC = \NC 0+0 \NC FF+10FFFF \NC \NR +\NC \lpr {Umathchar} \NC 0+0+0 \NC 7+FF+10FFFF \NC \NC \NC \NC \NR +\NC \lpr {Umathaccent} \NC 0+0+0 \NC 7+FF+10FFFF \NC \NC \NC \NC \NR +\NC \lpr {Udelimiter} \NC 0+0+0 \NC 7+FF+10FFFF \NC \NC \NC \NC \NR +\NC \lpr {Uradical} \NC 0+0 \NC FF+10FFFF \NC \NC \NC \NC \NR +\NC \lpr {Umathcharnum} \NC -80000000 \NC 7FFFFFFF \NC \NC \NC \NC \NR +\NC \lpr {Umathcodenum} \NC 0 \NC 10FFFF \NC = \NC -80000000 \NC 7FFFFFFF \NC \NR +\NC \lpr {Udelcodenum} \NC 0 \NC 10FFFF \NC = \NC -80000000 \NC 7FFFFFFF \NC \NR +\LL +\stoptabulate + +Specifications typically look like: + +\starttyping +\Umathchardef\xx="1"0"456 +\Umathcode 123="1"0"789 +\stoptyping + +The new primitives that deal with delimiter|-|style objects do not set up a +\quote {large family}. Selecting a suitable size for display purposes is expected +to be dealt with by the font via the \lpr {Umathoperatorsize} parameter. + +For some of these primitives, all information is packed into a single signed +integer. For the first two (\lpr {Umathcharnum} and \lpr {Umathcodenum}), the +lowest 21 bits are the character code, the 3 bits above that represent the math +class, and the family data is kept in the topmost bits. This means that the values +for math families 128--255 are actually negative. For \lpr {Udelcodenum} there +is no math class. The math family information is stored in the bits directly on +top of the character code. Using these three commands is not as natural as using +the two- and three|-|value commands, so unless you know exactly what you are +doing and absolutely require the speedup resulting from the faster input +scanning, it is better to use the verbose commands instead. + +The \lpr {Umathaccent} command accepts optional keywords to control various +details regarding math accents. See \in {section} [mathacc] below for details. + +There are more new primitives and all of these will be explained in following +sections: + +\starttabulate[|l|l|] +\DB primitive \BC value range (in hex) \NC \NR +\TB +\NC \lpr {Uroot} \NC 0 + 0--FF + 10FFFF \NC \NR +\NC \lpr {Uoverdelimiter} \NC 0 + 0--FF + 10FFFF \NC \NR +\NC \lpr {Uunderdelimiter} \NC 0 + 0--FF + 10FFFF \NC \NR +\NC \lpr {Udelimiterover} \NC 0 + 0--FF + 10FFFF \NC \NR +\NC \lpr {Udelimiterunder} \NC 0 + 0--FF + 10FFFF \NC \NR +\LL +\stoptabulate + +\stopsection + +\startsection[title={Math styles}] + +\subsection{\lpr {mathstyle}} + +\topicindex {math+styles} + +It is possible to discover the math style that will be used for a formula in an +expandable fashion (while the math list is still being read). To make this +possible, \LUATEX\ adds the new primitive: \lpr {mathstyle}. This is a \quote +{convert command} like e.g. \prm {romannumeral}: its value can only be read, +not set. + +The returned value is between 0 and 7 (in math mode), or $-1$ (all other modes). +For easy testing, the eight math style commands have been altered so that they can +be used as numeric values, so you can write code like this: + +\starttyping +\ifnum\mathstyle=\textstyle + \message{normal text style} +\else \ifnum\mathstyle=\crampedtextstyle + \message{cramped text style} +\fi \fi +\stoptyping + +Sometimes you won't get what you expect so a bit of explanation might help to +understand what happens. When math is parsed and expanded it gets turned into a +linked list. In a second pass the formula will be build. This has to do with the +fact that in order to determine the automatically chosen sizes (in for instance +fractions) following content can influence preceding sizes. A side effect of this +is for instance that one cannot change the definition of a font family (and +thereby reusing numbers) because the number that got used is stored and used in +the second pass (so changing \type {\fam 12} mid|-|formula spoils over to +preceding use of that family). + +The style switching primitives like \prm {textstyle} are turned into nodes so the +styles set there are frozen. The \prm {mathchoice} primitive results in four +lists being constructed of which one is used in the second pass. The fact that +some automatic styles are not yet known also means that the \lpr {mathstyle} +primitive expands to the current style which can of course be different from the +one really used. It's a snapshot of the first pass state. As a consequence in the +following example you get a style number (first pass) typeset that can actually +differ from the used style (second pass). In the case of a math choice used +ungrouped, the chosen style is used after the choice too, unless you group. + +\startbuffer[1] + [a:\mathstyle]\quad + \bgroup + \mathchoice + {\bf \scriptstyle (x:d :\mathstyle)} + {\bf \scriptscriptstyle (x:t :\mathstyle)} + {\bf \scriptscriptstyle (x:s :\mathstyle)} + {\bf \scriptscriptstyle (x:ss:\mathstyle)} + \egroup + \quad[b:\mathstyle]\quad + \mathchoice + {\bf \scriptstyle (y:d :\mathstyle)} + {\bf \scriptscriptstyle (y:t :\mathstyle)} + {\bf \scriptscriptstyle (y:s :\mathstyle)} + {\bf \scriptscriptstyle (y:ss:\mathstyle)} + \quad[c:\mathstyle]\quad + \bgroup + \mathchoice + {\bf \scriptstyle (z:d :\mathstyle)} + {\bf \scriptscriptstyle (z:t :\mathstyle)} + {\bf \scriptscriptstyle (z:s :\mathstyle)} + {\bf \scriptscriptstyle (z:ss:\mathstyle)} + \egroup + \quad[d:\mathstyle] +\stopbuffer + +\startbuffer[2] + [a:\mathstyle]\quad + \begingroup + \mathchoice + {\bf \scriptstyle (x:d :\mathstyle)} + {\bf \scriptscriptstyle (x:t :\mathstyle)} + {\bf \scriptscriptstyle (x:s :\mathstyle)} + {\bf \scriptscriptstyle (x:ss:\mathstyle)} + \endgroup + \quad[b:\mathstyle]\quad + \mathchoice + {\bf \scriptstyle (y:d :\mathstyle)} + {\bf \scriptscriptstyle (y:t :\mathstyle)} + {\bf \scriptscriptstyle (y:s :\mathstyle)} + {\bf \scriptscriptstyle (y:ss:\mathstyle)} + \quad[c:\mathstyle]\quad + \begingroup + \mathchoice + {\bf \scriptstyle (z:d :\mathstyle)} + {\bf \scriptscriptstyle (z:t :\mathstyle)} + {\bf \scriptscriptstyle (z:s :\mathstyle)} + {\bf \scriptscriptstyle (z:ss:\mathstyle)} + \endgroup + \quad[d:\mathstyle] +\stopbuffer + +\typebuffer[1] + +% \typebuffer[2] + +This gives: + +\blank $\displaystyle \getbuffer[1]$ \blank +\blank $\textstyle \getbuffer[1]$ \blank + +Using \prm {begingroup} \unknown\ \prm {endgroup} instead gives: + +\blank $\displaystyle \getbuffer[2]$ \blank +\blank $\textstyle \getbuffer[2]$ \blank + +This might look wrong but it's just a side effect of \lpr {mathstyle} expanding +to the current (first pass) style and the number being injected in the list that +gets converted in the second pass. It all makes sense and it illustrates the +importance of grouping. In fact, the math choice style being effective afterwards +has advantages. It would be hard to get it otherwise. + +\subsection{\lpr {Ustack}} + +\topicindex {math+stacks} + +There are a few math commands in \TEX\ where the style that will be used is not +known straight from the start. These commands (\prm {over}, \prm {atop}, +\prm {overwithdelims}, \prm {atopwithdelims}) would therefore normally return +wrong values for \lpr {mathstyle}. To fix this, \LUATEX\ introduces a special +prefix command: \lpr {Ustack}: + +\starttyping +$\Ustack {a \over b}$ +\stoptyping + +The \lpr {Ustack} command will scan the next brace and start a new math group +with the correct (numerator) math style. + +\subsection{Cramped math styles} + +\topicindex {math+styles} +\topicindex {math+spacing} +\topicindex {math+cramped} + +\LUATEX\ has four new primitives to set the cramped math styles directly: + +\starttyping +\crampeddisplaystyle +\crampedtextstyle +\crampedscriptstyle +\crampedscriptscriptstyle +\stoptyping + +These additional commands are not all that valuable on their own, but they come +in handy as arguments to the math parameter settings that will be added shortly. + +In Eijkhouts \quotation {\TEX\ by Topic} the rules for handling styles in scripts +are described as follows: + +\startitemize +\startitem + In any style superscripts and subscripts are taken from the next smaller style. + Exception: in display style they are in script style. +\stopitem +\startitem + Subscripts are always in the cramped variant of the style; superscripts are only + cramped if the original style was cramped. +\stopitem +\startitem + In an \type {..\over..} formula in any style the numerator and denominator are + taken from the next smaller style. +\stopitem +\startitem + The denominator is always in cramped style; the numerator is only in cramped + style if the original style was cramped. +\stopitem +\startitem + Formulas under a \type {\sqrt} or \prm {overline} are in cramped style. +\stopitem +\stopitemize + +In \LUATEX\ one can set the styles in more detail which means that you sometimes +have to set both normal and cramped styles to get the effect you want. (Even) if +we force styles in the script using \prm {scriptstyle} and \lpr +{crampedscriptstyle} we get this: + +\startbuffer[demo] +\starttabulate +\DB style \BC example \NC \NR +\TB +\NC default \NC $b_{x=xx}^{x=xx}$ \NC \NR +\NC script \NC $b_{\scriptstyle x=xx}^{\scriptstyle x=xx}$ \NC \NR +\NC crampedscript \NC $b_{\crampedscriptstyle x=xx}^{\crampedscriptstyle x=xx}$ \NC \NR +\LL +\stoptabulate +\stopbuffer + +\getbuffer[demo] + +Now we set the following parameters + +\startbuffer[setup] +\Umathordrelspacing\scriptstyle=30mu +\Umathordordspacing\scriptstyle=30mu +\stopbuffer + +\typebuffer[setup] + +This gives a different result: + +\start\getbuffer[setup,demo]\stop + +But, as this is not what is expected (visually) we should say: + +\startbuffer[setup] +\Umathordrelspacing\scriptstyle=30mu +\Umathordordspacing\scriptstyle=30mu +\Umathordrelspacing\crampedscriptstyle=30mu +\Umathordordspacing\crampedscriptstyle=30mu +\stopbuffer + +\typebuffer[setup] + +Now we get: + +\start\getbuffer[setup,demo]\stop + +\stopsection + +\startsection[title={Math parameter settings}] + +\subsection {Many new \lpr {Umath*} primitives} + +\topicindex {math+parameters} + +In \LUATEX, the font dimension parameters that \TEX\ used in math typesetting are +now accessible via primitive commands. In fact, refactoring of the math engine +has resulted in many more parameters than were not accessible before. + +\starttabulate +\DB primitive name \BC description \NC \NR +\TB +\NC \lpr {Umathquad} \NC the width of 18 mu's \NC \NR +\NC \lpr {Umathaxis} \NC height of the vertical center axis of + the math formula above the baseline \NC \NR +\NC \lpr {Umathoperatorsize} \NC minimum size of large operators in display mode \NC \NR +\NC \lpr {Umathoverbarkern} \NC vertical clearance above the rule \NC \NR +\NC \lpr {Umathoverbarrule} \NC the width of the rule \NC \NR +\NC \lpr {Umathoverbarvgap} \NC vertical clearance below the rule \NC \NR +\NC \lpr {Umathunderbarkern} \NC vertical clearance below the rule \NC \NR +\NC \lpr {Umathunderbarrule} \NC the width of the rule \NC \NR +\NC \lpr {Umathunderbarvgap} \NC vertical clearance above the rule \NC \NR +\NC \lpr {Umathradicalkern} \NC vertical clearance above the rule \NC \NR +\NC \lpr {Umathradicalrule} \NC the width of the rule \NC \NR +\NC \lpr {Umathradicalvgap} \NC vertical clearance below the rule \NC \NR +\NC \lpr {Umathradicaldegreebefore}\NC the forward kern that takes place before placement of + the radical degree \NC \NR +\NC \lpr {Umathradicaldegreeafter} \NC the backward kern that takes place after placement of + the radical degree \NC \NR +\NC \lpr {Umathradicaldegreeraise} \NC this is the percentage of the total height and depth of + the radical sign that the degree is raised by; it is + expressed in \type {percents}, so 60\% is expressed as the + integer $60$ \NC \NR +\NC \lpr {Umathstackvgap} \NC vertical clearance between the two + elements in a \prm {atop} stack \NC \NR +\NC \lpr {Umathstacknumup} \NC numerator shift upward in \prm {atop} stack \NC \NR +\NC \lpr {Umathstackdenomdown} \NC denominator shift downward in \prm {atop} stack \NC \NR +\NC \lpr {Umathfractionrule} \NC the width of the rule in a \prm {over} \NC \NR +\NC \lpr {Umathfractionnumvgap} \NC vertical clearance between the numerator and the rule \NC \NR +\NC \lpr {Umathfractionnumup} \NC numerator shift upward in \prm {over} \NC \NR +\NC \lpr {Umathfractiondenomvgap} \NC vertical clearance between the denominator and the rule \NC \NR +\NC \lpr {Umathfractiondenomdown} \NC denominator shift downward in \prm {over} \NC \NR +\NC \lpr {Umathfractiondelsize} \NC minimum delimiter size for \type {\...withdelims} \NC \NR +\NC \lpr {Umathlimitabovevgap} \NC vertical clearance for limits above operators \NC \NR +\NC \lpr {Umathlimitabovebgap} \NC vertical baseline clearance for limits above operators \NC \NR +\NC \lpr {Umathlimitabovekern} \NC space reserved at the top of the limit \NC \NR +\NC \lpr {Umathlimitbelowvgap} \NC vertical clearance for limits below operators \NC \NR +\NC \lpr {Umathlimitbelowbgap} \NC vertical baseline clearance for limits below operators \NC \NR +\NC \lpr {Umathlimitbelowkern} \NC space reserved at the bottom of the limit \NC \NR +\NC \lpr {Umathoverdelimitervgap} \NC vertical clearance for limits above delimiters \NC \NR +\NC \lpr {Umathoverdelimiterbgap} \NC vertical baseline clearance for limits above delimiters \NC \NR +\NC \lpr {Umathunderdelimitervgap} \NC vertical clearance for limits below delimiters \NC \NR +\NC \lpr {Umathunderdelimiterbgap} \NC vertical baseline clearance for limits below delimiters \NC \NR +\NC \lpr {Umathsubshiftdrop} \NC subscript drop for boxes and subformulas \NC \NR +\NC \lpr {Umathsubshiftdown} \NC subscript drop for characters \NC \NR +\NC \lpr {Umathsupshiftdrop} \NC superscript drop (raise, actually) for boxes and subformulas \NC \NR +\NC \lpr {Umathsupshiftup} \NC superscript raise for characters \NC \NR +\NC \lpr {Umathsubsupshiftdown} \NC subscript drop in the presence of a superscript \NC \NR +\NC \lpr {Umathsubtopmax} \NC the top of standalone subscripts cannot be higher than this + above the baseline \NC \NR +\NC \lpr {Umathsupbottommin} \NC the bottom of standalone superscripts cannot be less than + this above the baseline \NC \NR +\NC \lpr {Umathsupsubbottommax} \NC the bottom of the superscript of a combined super- and subscript + be at least as high as this above the baseline \NC \NR +\NC \lpr {Umathsubsupvgap} \NC vertical clearance between super- and subscript \NC \NR +\NC \lpr {Umathspaceafterscript} \NC additional space added after a super- or subscript \NC \NR +\NC \lpr {Umathconnectoroverlapmin}\NC minimum overlap between parts in an extensible recipe \NC \NR +\LL +\stoptabulate + +Each of the parameters in this section can be set by a command like this: + +\starttyping +\Umathquad\displaystyle=1em +\stoptyping + +they obey grouping, and you can use \type {\the\Umathquad\displaystyle} if +needed. + +\subsection{Font|-|based math parameters} + +\topicindex {math+parameters} + +While it is nice to have these math parameters available for tweaking, it would +be tedious to have to set each of them by hand. For this reason, \LUATEX\ +initializes a bunch of these parameters whenever you assign a font identifier to +a math family based on either the traditional math font dimensions in the font +(for assignments to math family~2 and~3 using \TFM|-|based fonts like \type +{cmsy} and \type {cmex}), or based on the named values in a potential \type +{MathConstants} table when the font is loaded via Lua. If there is a \type +{MathConstants} table, this takes precedence over font dimensions, and in that +case no attention is paid to which family is being assigned to: the \type +{MathConstants} tables in the last assigned family sets all parameters. + +In the table below, the one|-|letter style abbreviations and symbolic tfm font +dimension names match those used in the \TeX book. Assignments to \prm +{textfont} set the values for the cramped and uncramped display and text styles, +\prm {scriptfont} sets the script styles, and \prm {scriptscriptfont} sets the +scriptscript styles, so we have eight parameters for three font sizes. In the +\TFM\ case, assignments only happen in family~2 and family~3 (and of course only +for the parameters for which there are font dimensions). + +Besides the parameters below, \LUATEX\ also looks at the \quote {space} font +dimension parameter. For math fonts, this should be set to zero. + +\def\MathLine#1#2#3#4#5% + {\TB + \NC \llap{\high{\tx #2\enspace}}\ttbf \string #1 \NC \tt #5 \NC \NR + \NC \tx #3 \NC \tt #4 \NC \NR} + +\starttabulate[|l|l|] +\DB variable / style \BC tfm / opentype \NC \NR +\MathLine{\Umathaxis} {} {} {AxisHeight} {axis_height} +\MathLine{\Umathoperatorsize} {6} {D, D'} {DisplayOperatorMinHeight} {\emdash} +\MathLine{\Umathfractiondelsize} {9} {D, D'} {FractionDelimiterDisplayStyleSize} {delim1} +\MathLine{\Umathfractiondelsize} {9} {T, T', S, S', SS, SS'}{FractionDelimiterSize} {delim2} +\MathLine{\Umathfractiondenomdown} {} {D, D'} {FractionDenominatorDisplayStyleShiftDown}{denom1} +\MathLine{\Umathfractiondenomdown} {} {T, T', S, S', SS, SS'}{FractionDenominatorShiftDown} {denom2} +\MathLine{\Umathfractiondenomvgap} {} {D, D'} {FractionDenominatorDisplayStyleGapMin} {3*default_rule_thickness} +\MathLine{\Umathfractiondenomvgap} {} {T, T', S, S', SS, SS'}{FractionDenominatorGapMin} {default_rule_thickness} +\MathLine{\Umathfractionnumup} {} {D, D'} {FractionNumeratorDisplayStyleShiftUp} {num1} +\MathLine{\Umathfractionnumup} {} {T, T', S, S', SS, SS'}{FractionNumeratorShiftUp} {num2} +\MathLine{\Umathfractionnumvgap} {} {D, D'} {FractionNumeratorDisplayStyleGapMin} {3*default_rule_thickness} +\MathLine{\Umathfractionnumvgap} {} {T, T', S, S', SS, SS'}{FractionNumeratorGapMin} {default_rule_thickness} +\MathLine{\Umathfractionrule} {} {} {FractionRuleThickness} {default_rule_thickness} +\MathLine{\Umathskewedfractionhgap} {} {} {SkewedFractionHorizontalGap} {math_quad/2} +\MathLine{\Umathskewedfractionvgap} {} {} {SkewedFractionVerticalGap} {math_x_height} +\MathLine{\Umathlimitabovebgap} {} {} {UpperLimitBaselineRiseMin} {big_op_spacing3} +\MathLine{\Umathlimitabovekern} {1} {} {0} {big_op_spacing5} +\MathLine{\Umathlimitabovevgap} {} {} {UpperLimitGapMin} {big_op_spacing1} +\MathLine{\Umathlimitbelowbgap} {} {} {LowerLimitBaselineDropMin} {big_op_spacing4} +\MathLine{\Umathlimitbelowkern} {1} {} {0} {big_op_spacing5} +\MathLine{\Umathlimitbelowvgap} {} {} {LowerLimitGapMin} {big_op_spacing2} +\MathLine{\Umathoverdelimitervgap} {} {} {StretchStackGapBelowMin} {big_op_spacing1} +\MathLine{\Umathoverdelimiterbgap} {} {} {StretchStackTopShiftUp} {big_op_spacing3} +\MathLine{\Umathunderdelimitervgap} {} {} {StretchStackGapAboveMin} {big_op_spacing2} +\MathLine{\Umathunderdelimiterbgap} {} {} {StretchStackBottomShiftDown} {big_op_spacing4} +\MathLine{\Umathoverbarkern} {} {} {OverbarExtraAscender} {default_rule_thickness} +\MathLine{\Umathoverbarrule} {} {} {OverbarRuleThickness} {default_rule_thickness} +\MathLine{\Umathoverbarvgap} {} {} {OverbarVerticalGap} {3*default_rule_thickness} +\MathLine{\Umathquad} {1} {} {} {math_quad} +\MathLine{\Umathradicalkern} {} {} {RadicalExtraAscender} {default_rule_thickness} +\MathLine{\Umathradicalrule} {2} {} {RadicalRuleThickness} {} +\MathLine{\Umathradicalvgap} {3} {D, D'} {RadicalDisplayStyleVerticalGap} {default_rule_thickness+abs(math_x_height)/4} +\MathLine{\Umathradicalvgap} {3} {T, T', S, S', SS, SS'}{RadicalVerticalGap} {default_rule_thickness+abs(default_rule_thickness)/4} +\MathLine{\Umathradicaldegreebefore}{2} {} {RadicalKernBeforeDegree} {} +\MathLine{\Umathradicaldegreeafter} {2} {} {RadicalKernAfterDegree} {} +\MathLine{\Umathradicaldegreeraise} {2,7}{} {RadicalDegreeBottomRaisePercent} {} +\MathLine{\Umathspaceafterscript} {4} {} {SpaceAfterScript} {script_space} +\MathLine{\Umathstackdenomdown} {} {D, D'} {StackBottomDisplayStyleShiftDown} {denom1} +\MathLine{\Umathstackdenomdown} {} {T, T', S, S', SS, SS'}{StackBottomShiftDown} {denom2} +\MathLine{\Umathstacknumup} {} {D, D'} {StackTopDisplayStyleShiftUp} {num1} +\MathLine{\Umathstacknumup} {} {T, T', S, S', SS, SS'}{StackTopShiftUp} {num3} +\MathLine{\Umathstackvgap} {} {D, D'} {StackDisplayStyleGapMin} {7*default_rule_thickness} +\MathLine{\Umathstackvgap} {} {T, T', S, S', SS, SS'}{StackGapMin} {3*default_rule_thickness} +\MathLine{\Umathsubshiftdown} {} {} {SubscriptShiftDown} {sub1} +\MathLine{\Umathsubshiftdrop} {} {} {SubscriptBaselineDropMin} {sub_drop} +\MathLine{\Umathsubsupshiftdown} {8} {} {SubscriptShiftDownWithSuperscript} {\emdash} +\MathLine{\Umathsubtopmax} {} {} {SubscriptTopMax} {abs(math_x_height*4)/5} +\MathLine{\Umathsubsupvgap} {} {} {SubSuperscriptGapMin} {4*default_rule_thickness} +\MathLine{\Umathsupbottommin} {} {} {SuperscriptBottomMin} {abs(math_x_height/4)} +\MathLine{\Umathsupshiftdrop} {} {} {SuperscriptBaselineDropMax} {sup_drop} +\MathLine{\Umathsupshiftup} {} {D} {SuperscriptShiftUp} {sup1} +\MathLine{\Umathsupshiftup} {} {T, S, SS,} {SuperscriptShiftUp} {sup2} +\MathLine{\Umathsupshiftup} {} {D', T', S', SS'} {SuperscriptShiftUpCramped} {sup3} +\MathLine{\Umathsupsubbottommax} {} {} {SuperscriptBottomMaxWithSubscript} {abs(math_x_height*4)/5} +\MathLine{\Umathunderbarkern} {} {} {UnderbarExtraDescender} {default_rule_thickness} +\MathLine{\Umathunderbarrule} {} {} {UnderbarRuleThickness} {default_rule_thickness} +\MathLine{\Umathunderbarvgap} {} {} {UnderbarVerticalGap} {3*default_rule_thickness} +\MathLine{\Umathconnectoroverlapmin}{5} {} {MinConnectorOverlap} {0} +\LL +\stoptabulate + +Note 1: \OPENTYPE\ fonts set \lpr {Umathlimitabovekern} and \lpr +{Umathlimitbelowkern} to zero and set \lpr {Umathquad} to the font size of the +used font, because these are not supported in the \type {MATH} table, + +Note 2: Traditional \TFM\ fonts do not set \lpr {Umathradicalrule} because +\TEX82\ uses the height of the radical instead. When this parameter is indeed not +set when \LUATEX\ has to typeset a radical, a backward compatibility mode will +kick in that assumes that an oldstyle \TEX\ font is used. Also, they do not set +\lpr {Umathradicaldegreebefore}, \lpr {Umathradicaldegreeafter}, and \lpr +{Umathradicaldegreeraise}. These are then automatically initialized to +$5/18$quad, $-10/18$quad, and 60. + +Note 3: If \TFM\ fonts are used, then the \lpr {Umathradicalvgap} is not set +until the first time \LUATEX\ has to typeset a formula because this needs +parameters from both family~2 and family~3. This provides a partial backward +compatibility with \TEX82, but that compatibility is only partial: once the \lpr +{Umathradicalvgap} is set, it will not be recalculated any more. + +Note 4: When \TFM\ fonts are used a similar situation arises with respect to \lpr +{Umathspaceafterscript}: it is not set until the first time \LUATEX\ has to +typeset a formula. This provides some backward compatibility with \TEX82. But +once the \lpr {Umathspaceafterscript} is set, \prm {scriptspace} will never be +looked at again. + +Note 5: Traditional \TFM\ fonts set \lpr {Umathconnectoroverlapmin} to zero +because \TEX82\ always stacks extensibles without any overlap. + +Note 6: The \lpr {Umathoperatorsize} is only used in \prm {displaystyle}, and is +only set in \OPENTYPE\ fonts. In \TFM\ font mode, it is artificially set to one +scaled point more than the initial attempt's size, so that always the \quote +{first next} will be tried, just like in \TEX82. + +Note 7: The \lpr {Umathradicaldegreeraise} is a special case because it is the +only parameter that is expressed in a percentage instead of a number of scaled +points. + +Note 8: \type {SubscriptShiftDownWithSuperscript} does not actually exist in the +\quote {standard} \OPENTYPE\ math font Cambria, but it is useful enough to be +added. + +Note 9: \type {FractionDelimiterDisplayStyleSize} and \type +{FractionDelimiterSize} do not actually exist in the \quote {standard} \OPENTYPE\ +math font Cambria, but were useful enough to be added. + +\stopsection + +\startsection[title={Math spacing}] + +\subsection{Inline surrounding space} + +\topicindex {math+spacing} + +Inline math is surrounded by (optional) \prm {mathsurround} spacing but that is a fixed +dimension. There is now an additional parameter \lpr {mathsurroundskip}. When set to a +non|-|zero value (or zero with some stretch or shrink) this parameter will replace +\prm {mathsurround}. By using an additional parameter instead of changing the nature +of \prm {mathsurround}, we can remain compatible. In the meantime a bit more +control has been added via \lpr {mathsurroundmode}. This directive can take 6 values +with zero being the default behaviour. + +\start + +\def\OneLiner#1#2% + {\NC \type{#1} + \NC \dontleavehmode\inframed[align=normal,offset=0pt,frame=off]{\mathsurroundmode#1\relax\hsize 100pt x$x$x} + \NC \dontleavehmode\inframed[align=normal,offset=0pt,frame=off]{\mathsurroundmode#1\relax\hsize 100pt x $x$ x} + \NC #2 + \NC \NR} + +\startbuffer +\mathsurround 10pt +\mathsurroundskip20pt +\stopbuffer + +\typebuffer \getbuffer + +\starttabulate[|c|c|c|pl|] +\DB mode \BC x\$x\$x \BC x \$x\$ x \BC effect \NC \NR +\TB +\OneLiner{0}{obey \prm {mathsurround} when \lpr {mathsurroundskip} is 0pt} +\OneLiner{1}{only add skip to the left} +\OneLiner{2}{only add skip to the right} +\OneLiner{3}{add skip to the left and right} +\OneLiner{4}{ignore the skip setting, obey \prm {mathsurround}} +\OneLiner{5}{disable all spacing around math} +\OneLiner{6}{only apply \lpr {mathsurroundskip} when also spacing} +\OneLiner{7}{only apply \lpr {mathsurroundskip} when no spacing} +\LL +\stoptabulate + +\stop + +Method six omits the surround glue when there is (x)spacing glue present while +method seven does the opposite, the glue is only applied when there is (x)space +glue present too. Anything more fancy, like checking the begining or end of a +paragraph (or edges of a box) would not be robust anyway. If you want that you +can write a callback that runs over a list and analyzes a paragraph. Actually, in +that case you could also inject glue (or set the properties of a math node) +explicitly. So, these modes are in practice mostly useful for special purposes +and experiments (they originate in a tracker item). Keep in mind that this glue +is part of the math node and not always treated as normal glue: it travels with +the begin and end math nodes. Also, method 6 and 7 will zero the skip related +fields in a node when applicable in the first occasion that checks them +(linebreaking or packaging). + +\subsection{Pairwise spacing} + +\topicindex {math+spacing} + +Besides the parameters mentioned in the previous sections, there are also 64 new +primitives to control the math spacing table (as explained in Chapter~18 of the +\TEX book). The primitive names are a simple matter of combining two math atom +types, but for completeness' sake, here is the whole list: + +\starttwocolumns +\startlines +\lpr {Umathordordspacing} +\lpr {Umathordopspacing} +\lpr {Umathordbinspacing} +\lpr {Umathordrelspacing} +\lpr {Umathordopenspacing} +\lpr {Umathordclosespacing} +\lpr {Umathordpunctspacing} +\lpr {Umathordinnerspacing} +\lpr {Umathopordspacing} +\lpr {Umathopopspacing} +\lpr {Umathopbinspacing} +\lpr {Umathoprelspacing} +\lpr {Umathopopenspacing} +\lpr {Umathopclosespacing} +\lpr {Umathoppunctspacing} +\lpr {Umathopinnerspacing} +\lpr {Umathbinordspacing} +\lpr {Umathbinopspacing} +\lpr {Umathbinbinspacing} +\lpr {Umathbinrelspacing} +\lpr {Umathbinopenspacing} +\lpr {Umathbinclosespacing} +\lpr {Umathbinpunctspacing} +\lpr {Umathbininnerspacing} +\lpr {Umathrelordspacing} +\lpr {Umathrelopspacing} +\lpr {Umathrelbinspacing} +\lpr {Umathrelrelspacing} +\lpr {Umathrelopenspacing} +\lpr {Umathrelclosespacing} +\lpr {Umathrelpunctspacing} +\lpr {Umathrelinnerspacing} +\lpr {Umathopenordspacing} +\lpr {Umathopenopspacing} +\lpr {Umathopenbinspacing} +\lpr {Umathopenrelspacing} +\lpr {Umathopenopenspacing} +\lpr {Umathopenclosespacing} +\lpr {Umathopenpunctspacing} +\lpr {Umathopeninnerspacing} +\lpr {Umathcloseordspacing} +\lpr {Umathcloseopspacing} +\lpr {Umathclosebinspacing} +\lpr {Umathcloserelspacing} +\lpr {Umathcloseopenspacing} +\lpr {Umathcloseclosespacing} +\lpr {Umathclosepunctspacing} +\lpr {Umathcloseinnerspacing} +\lpr {Umathpunctordspacing} +\lpr {Umathpunctopspacing} +\lpr {Umathpunctbinspacing} +\lpr {Umathpunctrelspacing} +\lpr {Umathpunctopenspacing} +\lpr {Umathpunctclosespacing} +\lpr {Umathpunctpunctspacing} +\lpr {Umathpunctinnerspacing} +\lpr {Umathinnerordspacing} +\lpr {Umathinneropspacing} +\lpr {Umathinnerbinspacing} +\lpr {Umathinnerrelspacing} +\lpr {Umathinneropenspacing} +\lpr {Umathinnerclosespacing} +\lpr {Umathinnerpunctspacing} +\lpr {Umathinnerinnerspacing} +\stoplines +\stoptwocolumns + +These parameters are of type \prm {muskip}, so setting a parameter can be done +like this: + +\starttyping +\Umathopordspacing\displaystyle=4mu plus 2mu +\stoptyping + +They are all initialized by \type {initex} to the values mentioned in the table +in Chapter~18 of the \TEX book. + +Note 1: for ease of use as well as for backward compatibility, \prm {thinmuskip}, +\prm {medmuskip} and \prm {thickmuskip} are treated specially. In their case a +pointer to the corresponding internal parameter is saved, not the actual \prm +{muskip} value. This means that any later changes to one of these three +parameters will be taken into account. + +Note 2: Careful readers will realise that there are also primitives for the items +marked \type {*} in the \TEX book. These will not actually be used as those +combinations of atoms cannot actually happen, but it seemed better not to break +orthogonality. They are initialized to zero. + +\subsection{Skips around display math} + +\topicindex {math+spacing} + +The injection of \prm {abovedisplayskip} and \prm {belowdisplayskip} is not +symmetrical. An above one is always inserted, also when zero, but the below is +only inserted when larger than zero. Especially the latter makes it sometimes hard +to fully control spacing. Therefore \LUATEX\ comes with a new directive: \lpr +{mathdisplayskipmode}. The following values apply: + +\starttabulate[|c|l|] +\DB value \BC meaning \NC \NR +\TB +\NC 0 \NC normal \TEX\ behaviour \NC \NR +\NC 1 \NC always (same as 0) \NC \NR +\NC 2 \NC only when not zero \NC \NR +\NC 3 \NC never, not even when not zero \NC \NR +\LL +\stoptabulate + +\subsection {Nolimit correction} + +\topicindex {math+limits} + +There are two extra math parameters \lpr {Umathnolimitsupfactor} and \lpr +{Umathnolimitsubfactor} that were added to provide some control over how limits +are spaced (for example the position of super and subscripts after integral +operators). They relate to an extra parameter \lpr {mathnolimitsmode}. The half +corrections are what happens when scripts are placed above and below. The +problem with italic corrections is that officially that correction italic is used +for above|/|below placement while advanced kerns are used for placement at the +right end. The question is: how often is this implemented, and if so, do the +kerns assume correction too. Anyway, with this parameter one can control it. + +\starttabulate[|l|ck1|ck1|ck1|ck1|ck1|ck1|] + \NC + \NC \mathnolimitsmode0 $\displaystyle\int\nolimits^0_1$ + \NC \mathnolimitsmode1 $\displaystyle\int\nolimits^0_1$ + \NC \mathnolimitsmode2 $\displaystyle\int\nolimits^0_1$ + \NC \mathnolimitsmode3 $\displaystyle\int\nolimits^0_1$ + \NC \mathnolimitsmode4 $\displaystyle\int\nolimits^0_1$ + \NC \mathnolimitsmode8000 $\displaystyle\int\nolimits^0_1$ + \NC \NR + \TB + \BC mode + \NC \tttf 0 + \NC \tttf 1 + \NC \tttf 2 + \NC \tttf 3 + \NC \tttf 4 + \NC \tttf 8000 + \NC \NR + \BC superscript + \NC 0 + \NC font + \NC 0 + \NC 0 + \NC +ic/2 + \NC 0 + \NC \NR + \BC subscript + \NC -ic + \NC font + \NC 0 + \NC -ic/2 + \NC -ic/2 + \NC 8000ic/1000 + \NC \NR +\stoptabulate + +When the mode is set to one, the math parameters are used. This way a macro +package writer can decide what looks best. Given the current state of fonts in +\CONTEXT\ we currently use mode 1 with factor 0 for the superscript and 750 for +the subscripts. Positive values are used for both parameters but the subscript +shifts to the left. A \lpr {mathnolimitsmode} larger that 15 is considered to +be a factor for the subscript correction. This feature can be handy when +experimenting. + +\subsection {Math italic mess} + +\topicindex {math+italics} + +The \lpr {mathitalicsmode} parameter can be set to~1 to force italic correction +before noads that represent some more complex structure (read: everything +that is not an ord, bin, rel, open, close, punct or inner). We show a Cambria +example. + +\starttexdefinition Whatever #1 + \NC \type{\mathitalicsmode = #1} + \NC \mathitalicsmode#1\ruledhbox{$\left|T^1\right|$} + \NC \mathitalicsmode#1\ruledhbox{$\left|T\right|$} + \NC \mathitalicsmode#1\ruledhbox{$T+1$} + \NC \mathitalicsmode#1\ruledhbox{$T{1\over2}$} + \NC \mathitalicsmode#1\ruledhbox{$T\sqrt{1}$} + \NC \NR +\stoptexdefinition + +\start + \switchtobodyfont[cambria] + \starttabulate[|c|c|c|c|c|c|] + \Whatever{0}% + \Whatever{1}% + \stoptabulate +\stop + +This kind of parameters relate to the fact that italic correction in \OPENTYPE\ +math is bound to fuzzy rules. So, control is the solution. + +\subsection {Script and kerning} + +\topicindex {math+kerning} +\topicindex {math+scripts} + +If you want to typeset text in math macro packages often provide something \type +{\text} which obeys the script sizes. As the definition can be anything there is +a good chance that the kerning doesn't come out well when used in a script. Given +that the first glyph ends up in a \prm {hbox} we have some control over this. +And, as a bonus we also added control over the normal sublist kerning. The \lpr +{mathscriptboxmode} parameter defaults to~1. + +\starttabulate[|c|l|] +\DB value \BC meaning \NC \NR +\TB +\NC \type {0} \NC forget about kerning \NC \NR +\NC \type {1} \NC kern math sub lists with a valid glyph \NC \NR +\NC \type {2} \NC also kern math sub boxes that have a valid glyph \NC \NR +\NC \type {2} \NC only kern math sub boxes with a boundary node present\NC \NR +\LL +\stoptabulate + +Here we show some examples. Of course this doesn't solve all our problems, if +only because some fonts have characters with bounding boxes that compensate for +italics, while other fonts can lack kerns. + +\startbuffer[1] + $T_{\tf fluff}$ +\stopbuffer + +\startbuffer[2] + $T_{\text{fluff}}$ +\stopbuffer + +\startbuffer[3] + $T_{\text{\boundary1 fluff}}$ +\stopbuffer + +\unexpanded\def\Show#1#2#3% + {\doifelsenothing{#3} + {\small\tx\typeinlinebuffer[#1]} + {\doifelse{#3}{-} + {\small\bf\tt mode #2} + {\switchtobodyfont[#3]\showfontkerns\showglyphs\mathscriptboxmode#2\relax\inlinebuffer[#1]}}} + +\starttabulate[|lBT|c|c|c|c|c|] + \NC \NC \Show{1}{0}{} \NC\Show{1}{1}{} \NC \Show{2}{1}{} \NC \Show{2}{2}{} \NC \Show{3}{3}{} \NC \NR + \NC \NC \Show{1}{0}{-} \NC\Show{1}{1}{-} \NC \Show{2}{1}{-} \NC \Show{2}{2}{-} \NC \Show{3}{3}{-} \NC \NR + \NC modern \NC \Show{1}{0}{modern} \NC\Show{1}{1}{modern} \NC \Show{2}{1}{modern} \NC \Show{2}{2}{modern} \NC \Show{3}{3}{modern} \NC \NR + \NC lucidaot \NC \Show{1}{0}{lucidaot} \NC\Show{1}{1}{lucidaot} \NC \Show{2}{1}{lucidaot} \NC \Show{2}{2}{lucidaot} \NC \Show{3}{3}{lucidaot} \NC \NR + \NC pagella \NC \Show{1}{0}{pagella} \NC\Show{1}{1}{pagella} \NC \Show{2}{1}{pagella} \NC \Show{2}{2}{pagella} \NC \Show{3}{3}{pagella} \NC \NR + \NC cambria \NC \Show{1}{0}{cambria} \NC\Show{1}{1}{cambria} \NC \Show{2}{1}{cambria} \NC \Show{2}{2}{cambria} \NC \Show{3}{3}{cambria} \NC \NR + \NC dejavu \NC \Show{1}{0}{dejavu} \NC\Show{1}{1}{dejavu} \NC \Show{2}{1}{dejavu} \NC \Show{2}{2}{dejavu} \NC \Show{3}{3}{dejavu} \NC \NR +\stoptabulate + +Kerning between a character subscript is controlled by \lpr {mathscriptcharmode} +which also defaults to~1. + +Here is another example. Internally we tag kerns as italic kerns or font kerns +where font kerns result from the staircase kern tables. In 2018 fonts like Latin +Modern and Pagella rely on cheats with the boundingbox, Cambria uses staircase +kerns and Lucida a mixture. Depending on how fonts evolve we might add some more +control over what one can turn on and off. + +\def\MathSample#1#2#3% + {\NC + #1 \NC + #2 \NC + \showglyphdata \switchtobodyfont[#2,17.3pt]$#3T_{f}$ \NC + \showglyphdata \switchtobodyfont[#2,17.3pt]$#3\gamma_{e}$ \NC + \showglyphdata \switchtobodyfont[#2,17.3pt]$#3\gamma_{ee}$ \NC + \showglyphdata \switchtobodyfont[#2,17.3pt]$#3T_{\tf fluff}$ \NC + \NR} + +\starttabulate[|Tl|Tl|l|l|l|l|] + \FL + \MathSample{normal}{modern} {\mr} + \MathSample{} {pagella} {\mr} + \MathSample{} {cambria} {\mr} + \MathSample{} {lucidaot}{\mr} + \ML + \MathSample{bold} {modern} {\mb} + \MathSample{} {pagella} {\mb} + \MathSample{} {cambria} {\mb} + \MathSample{} {lucidaot}{\mb} + \LL +\stoptabulate + +\subsection{Fixed scripts} + +We have three parameters that are used for this fixed anchoring: + +\starttabulate[|c|l|] +\DB parameter \BC register \NC \NR +\NC $d$ \NC \lpr {Umathsubshiftdown} \NC \NR +\NC $u$ \NC \lpr {Umathsupshiftup} \NC \NR +\NC $s$ \NC \lpr {Umathsubsupshiftdown} \NC \NR +\LL +\stoptabulate + +When we set \lpr {mathscriptsmode} to a value other than zero these are used +for calculating fixed positions. This is something that is needed for instance +for chemistry. You can manipulate the mentioned variables to achieve different +effects. + +\def\SampleMath#1% + {$\mathscriptsmode#1\mathupright CH_2 + CH^+_2 + CH^2_2$} + +\starttabulate[|c|c|c|p|] +\DB mode \BC down \BC up \BC example \NC \NR +\TB +\NC 0 \NC dynamic \NC dynamic \NC \SampleMath{0} \NC \NR +\NC 1 \NC $d$ \NC $u$ \NC \SampleMath{1} \NC \NR +\NC 2 \NC $s$ \NC $u$ \NC \SampleMath{2} \NC \NR +\NC 3 \NC $s$ \NC $u + s - d$ \NC \SampleMath{3} \NC \NR +\NC 4 \NC $d + (s-d)/2$ \NC $u + (s-d)/2$ \NC \SampleMath{4} \NC \NR +\NC 5 \NC $d$ \NC $u + s - d$ \NC \SampleMath{5} \NC \NR +\LL +\stoptabulate + +The value of this parameter obeys grouping but applies to the whole current +formula. + +% if needed we can put the value in stylenodes but maybe more should go there + +\subsection{Penalties: \lpr {mathpenaltiesmode}} + +\topicindex {math+penalties} + +Only in inline math penalties will be added in a math list. You can force +penalties (also in display math) by setting: + +\starttyping +\mathpenaltiesmode = 1 +\stoptyping + +This primnitive is not really needed in \LUATEX\ because you can use the callback +\cbk {mlist_to_hlist} to force penalties by just calling the regular routine +with forced penalties. However, as part of opening up and control this primitive +makes sense. As a bonus we also provide two extra penalties: + +\starttyping +\prebinoppenalty = -100 % example value +\prerelpenalty = 900 % example value +\stoptyping + +They default to inifinite which signals that they don't need to be inserted. When +set they are injected before a binop or rel noad. This is an experimental feature. + +\subsection{Equation spacing: \lpr {matheqnogapstep}} + +By default \TEX\ will add one quad between the equation and the number. This is +hard coded. A new primitive can control this: + +\startsyntax +\matheqnogapstep = 1000 +\stopsyntax + +Because a math quad from the math text font is used instead of a dimension, we +use a step to control the size. A value of zero will suppress the gap. The step +is divided by 1000 which is the usual way to mimmick floating point factors in +\TEX. + +\stopsection + +\startsection[title={Math constructs}] + +\subsection {Unscaled fences} + +\topicindex {math+fences} + +The \lpr {mathdelimitersmode} primitive is experimental and deals with the +following (potential) problems. Three bits can be set. The first bit prevents an +unwanted shift when the fence symbol is not scaled (a cambria side effect). The +second bit forces italic correction between a preceding character ordinal and the +fenced subformula, while the third bit turns that subformula into an ordinary so +that the same spacing applies as with unfenced variants. Here we show Cambria +(with \lpr {mathitalicsmode} enabled). + +\starttexdefinition Whatever #1 + \NC \type{\mathdelimitersmode = #1} + \NC \mathitalicsmode1\mathdelimitersmode#1\ruledhbox{\showglyphs\showfontkerns\showfontitalics$f(x)$} + \NC \mathitalicsmode1\mathdelimitersmode#1\ruledhbox{\showglyphs\showfontkerns\showfontitalics$f\left(x\right)$} + \NC \NR +\stoptexdefinition + +\start + \switchtobodyfont[cambria] + \starttabulate[|l|l|l|] + \Whatever{0}\Whatever{1}\Whatever{2}\Whatever{3}% + \Whatever{4}\Whatever{5}\Whatever{6}\Whatever{7}% + \stoptabulate +\stop + +So, when set to 7 fenced subformulas with unscaled delimiters come out the same +as unfenced ones. This can be handy for cases where one is forced to use \prm +{left} and \prm {right} always because of unpredictable content. As said, it's an +experimental feature (which somehow fits in the exceptional way fences are dealt +with in the engine). The full list of flags is given in the next table: + +\starttabulate[|c|l|] +\DB value \BC meaning \NC \NR +\TB +\NC \type{"01} \NC don't apply the usual shift \NC \NR +\NC \type{"02} \NC apply italic correction when possible \NC \NR +\NC \type{"04} \NC force an ordinary subformula \NC \NR +\NC \type{"08} \NC no shift when a base character \NC \NR +\NC \type{"10} \NC only shift when an extensible \NC \NR +\LL +\stoptabulate + +The effect can depend on the font (and for Cambria one can use for instance \type {"16}). + +\subsection[mathacc]{Accent handling} + +\topicindex {math+accents} + +\LUATEX\ supports both top accents and bottom accents in math mode, and math +accents stretch automatically (if this is supported by the font the accent comes +from, of course). Bottom and combined accents as well as fixed-width math accents +are controlled by optional keywords following \lpr {Umathaccent}. + +The keyword \type {bottom} after \lpr {Umathaccent} signals that a bottom accent +is needed, and the keyword \type {both} signals that both a top and a bottom +accent are needed (in this case two accents need to be specified, of course). + +Then the set of three integers defining the accent is read. This set of integers +can be prefixed by the \type {fixed} keyword to indicate that a non-stretching +variant is requested (in case of both accents, this step is repeated). + +A simple example: + +\starttyping +\Umathaccent both fixed 0 0 "20D7 fixed 0 0 "20D7 {example} +\stoptyping + +If a math top accent has to be placed and the accentee is a character and has a +non-zero \type {top_accent} value, then this value will be used to place the +accent instead of the \prm {skewchar} kern used by \TEX82. + +The \type {top_accent} value represents a vertical line somewhere in the +accentee. The accent will be shifted horizontally such that its own \type +{top_accent} line coincides with the one from the accentee. If the \type +{top_accent} value of the accent is zero, then half the width of the accent +followed by its italic correction is used instead. + +The vertical placement of a top accent depends on the \type {x_height} of the +font of the accentee (as explained in the \TEX book), but if a value turns out +to be zero and the font had a \type {MathConstants} table, then \type +{AccentBaseHeight} is used instead. + +The vertical placement of a bottom accent is straight below the accentee, no +correction takes place. + +Possible locations are \type {top}, \type {bottom}, \type {both} and \type +{center}. When no location is given \type {top} is assumed. An additional +parameter \nod {fraction} can be specified followed by a number; a value of for +instance 1200 means that the criterium is 1.2 times the width of the nucleus. The +fraction only applies to the stepwise selected shapes and is mostly meant for the +\type {overlay} location. It also works for the other locations but then it +concerns the width. + +\subsection{Radical extensions} + +\topicindex {math+radicals} + +The new primitive \lpr {Uroot} allows the construction of a radical noad +including a degree field. Its syntax is an extension of \lpr {Uradical}: + +\starttyping +\Uradical +\Uroot +\stoptyping + +The placement of the degree is controlled by the math parameters \lpr +{Umathradicaldegreebefore}, \lpr {Umathradicaldegreeafter}, and \lpr +{Umathradicaldegreeraise}. The degree will be typeset in \prm +{scriptscriptstyle}. + +\subsection{Super- and subscripts} + +The character fields in a \LUA|-|loaded \OPENTYPE\ math font can have a \quote +{mathkern} table. The format of this table is the same as the \quote {mathkern} +table that is returned by the \type {fontloader} library, except that all height +and kern values have to be specified in actual scaled points. + +When a super- or subscript has to be placed next to a math item, \LUATEX\ checks +whether the super- or subscript and the nucleus are both simple character items. +If they are, and if the fonts of both character items are \OPENTYPE\ fonts (as +opposed to legacy \TEX\ fonts), then \LUATEX\ will use the \OPENTYPE\ math +algorithm for deciding on the horizontal placement of the super- or subscript. + +This works as follows: + +\startitemize + \startitem + The vertical position of the script is calculated. + \stopitem + \startitem + The default horizontal position is flat next to the base character. + \stopitem + \startitem + For superscripts, the italic correction of the base character is added. + \stopitem + \startitem + For a superscript, two vertical values are calculated: the bottom of the + script (after shifting up), and the top of the base. For a subscript, the two + values are the top of the (shifted down) script, and the bottom of the base. + \stopitem + \startitem + For each of these two locations: + \startitemize + \startitem + find the math kern value at this height for the base (for a subscript + placement, this is the bottom_right corner, for a superscript + placement the top_right corner) + \stopitem + \startitem + find the math kern value at this height for the script (for a + subscript placement, this is the top_left corner, for a superscript + placement the bottom_left corner) + \stopitem + \startitem + add the found values together to get a preliminary result. + \stopitem + \stopitemize + \stopitem + \startitem + The horizontal kern to be applied is the smallest of the two results from + previous step. + \stopitem +\stopitemize + +The math kern value at a specific height is the kern value that is specified by the +next higher height and kern pair, or the highest one in the character (if there is no +value high enough in the character), or simply zero (if the character has no math kern +pairs at all). + +\subsection{Scripts on extensibles} + +\topicindex {math+scripts} +\topicindex {math+delimiters} +\topicindex {math+extensibles} + +The primitives \lpr {Uunderdelimiter} and \lpr {Uoverdelimiter} allow the +placement of a subscript or superscript on an automatically extensible item and +\lpr {Udelimiterunder} and \lpr {Udelimiterover} allow the placement of an +automatically extensible item as a subscript or superscript on a nucleus. The +input: + +% these produce radical noads .. in fact the code base has the numbers wrong for +% quite a while, so no one seems to use this + +\startbuffer +$\Uoverdelimiter 0 "2194 {\hbox{\strut overdelimiter}}$ +$\Uunderdelimiter 0 "2194 {\hbox{\strut underdelimiter}}$ +$\Udelimiterover 0 "2194 {\hbox{\strut delimiterover}}$ +$\Udelimiterunder 0 "2194 {\hbox{\strut delimiterunder}}$ +\stopbuffer + +\typebuffer will render this: + +\blank \startnarrower \getbuffer \stopnarrower \blank + +The vertical placements are controlled by \lpr {Umathunderdelimiterbgap}, \lpr +{Umathunderdelimitervgap}, \lpr {Umathoverdelimiterbgap}, and \lpr +{Umathoverdelimitervgap} in a similar way as limit placements on large operators. +The superscript in \lpr {Uoverdelimiter} is typeset in a suitable scripted style, +the subscript in \lpr {Uunderdelimiter} is cramped as well. + +These primitives accepts an option \type {width} specification. When used the +also optional keywords \type {left}, \type {middle} and \type {right} will +determine what happens when a requested size can't be met (which can happen when +we step to successive larger variants). + +An extra primitive \lpr {Uhextensible} is available that can be used like this: + +\startbuffer +$\Uhextensible width 10cm 0 "2194$ +\stopbuffer + +\typebuffer This will render this: + +\blank \startnarrower \getbuffer \stopnarrower \blank + +Here you can also pass options, like: + +\startbuffer +$\Uhextensible width 1pt middle 0 "2194$ +\stopbuffer + +\typebuffer This gives: + +\blank \startnarrower \getbuffer \stopnarrower \blank + +\LUATEX\ internally uses a structure that supports \OPENTYPE\ \quote +{MathVariants} as well as \TFM\ \quote {extensible recipes}. In most cases where +font metrics are involved we have a different code path for traditional fonts end +\OPENTYPE\ fonts. + +\subsection{Fractions} + +\topicindex {math+fractions} + +The \prm {abovewithdelims} command accepts a keyword \type {exact}. When issued +the extra space relative to the rule thickness is not added. One can of course +use the \type {\Umathfraction..gap} commands to influence the spacing. Also the +rule is still positioned around the math axis. + +\starttyping +$$ { {a} \abovewithdelims() exact 4pt {b} }$$ +\stoptyping + +The math parameter table contains some parameters that specify a horizontal and +vertical gap for skewed fractions. Of course some guessing is needed in order to +implement something that uses them. And so we now provide a primitive similar to the +other fraction related ones but with a few options so that one can influence the +rendering. Of course a user can also mess around a bit with the parameters +\lpr {Umathskewedfractionhgap} and \lpr {Umathskewedfractionvgap}. + +The syntax used here is: + +\starttyping +{ {1} \Uskewed / {2} } +{ {1} \Uskewedwithdelims / () {2} } +\stoptyping + +where the options can be \type {noaxis} and \type {exact}. By default we add half +the axis to the shifts and by default we zero the width of the middle character. +For Latin Modern the result looks as follows: + +\def\ShowA#1#2#3{$x + { {#1} \Uskewed / #3 {#2} } + x$} +\def\ShowB#1#2#3{$x + { {#1} \Uskewedwithdelims / () #3 {#2} } + x$} + +\start + \switchtobodyfont[modern] + \starttabulate[||||||] + \NC \NC + \ShowA{a}{b}{} \NC + \ShowA{1}{2}{} \NC + \ShowB{a}{b}{} \NC + \ShowB{1}{2}{} \NC + \NR + \NC \type{exact} \NC + \ShowA{a}{b}{exact} \NC + \ShowA{1}{2}{exact} \NC + \ShowB{a}{b}{exact} \NC + \ShowB{1}{2}{exact} \NC + \NR + \NC \type{noaxis} \NC + \ShowA{a}{b}{noaxis} \NC + \ShowA{1}{2}{noaxis} \NC + \ShowB{a}{b}{noaxis} \NC + \ShowB{1}{2}{noaxis} \NC + \NR + \NC \type{exact noaxis} \NC + \ShowA{a}{b}{exact noaxis} \NC + \ShowA{1}{2}{exact noaxis} \NC + \ShowB{a}{b}{exact noaxis} \NC + \ShowB{1}{2}{exact noaxis} \NC + \NR + \stoptabulate +\stop + +\subsection {Delimiters: \type{\Uleft}, \prm {Umiddle} and \prm {Uright}} + +\topicindex {math+delimiters} + +Normally you will force delimiters to certain sizes by putting an empty box or +rule next to it. The resulting delimiter will either be a character from the +stepwise size range or an extensible. The latter can be quite differently +positioned than the characters as it depends on the fit as well as the fact if +the used characters in the font have depth or height. Commands like (plain \TEX +s) \type {\big} need use this feature. In \LUATEX\ we provide a bit more control +by three variants that support optional parameters \type {height}, \type {depth} +and \type {axis}. The following example uses this: + +\startbuffer +\Uleft height 30pt depth 10pt \Udelimiter "0 "0 "000028 +\quad x\quad +\Umiddle height 40pt depth 15pt \Udelimiter "0 "0 "002016 +\quad x\quad +\Uright height 30pt depth 10pt \Udelimiter "0 "0 "000029 +\quad \quad \quad +\Uleft height 30pt depth 10pt axis \Udelimiter "0 "0 "000028 +\quad x\quad +\Umiddle height 40pt depth 15pt axis \Udelimiter "0 "0 "002016 +\quad x\quad +\Uright height 30pt depth 10pt axis \Udelimiter "0 "0 "000029 +\stopbuffer + +\typebuffer + +\startlinecorrection +\ruledhbox{\mathematics{\getbuffer}} +\stoplinecorrection + +The keyword \type {exact} can be used as directive that the real dimensions +should be applied when the criteria can't be met which can happen when we're +still stepping through the successively larger variants. When no dimensions are +given the \type {noaxis} command can be used to prevent shifting over the axis. + +You can influence the final class with the keyword \type {class} which will +influence the spacing. The numbers are the same as for character classes. + +\stopsection + +\startsection[title={Extracting values}] + +\subsection{Codes} + +\topicindex {math+codes} + +You can extract the components of a math character. Say that we have defined: + +\starttyping +\Umathcode 1 2 3 4 +\stoptyping + +then + +\starttyping +[\Umathcharclass1] [\Umathcharfam1] [\Umathcharslot1] +\stoptyping + +will return: + +\starttyping +[2] [3] [4] +\stoptyping + +These commands are provides as convenience. Before they come available you could +do the following: + +\starttyping +\def\Umathcharclass{\directlua{tex.print(tex.getmathcode(token.scan_int())[1])}} +\def\Umathcharfam {\directlua{tex.print(tex.getmathcode(token.scan_int())[2])}} +\def\Umathcharslot {\directlua{tex.print(tex.getmathcode(token.scan_int())[3])}} +\stoptyping + +\subsection {Last lines} + +\topicindex {math+last line} + +There is a new primitive to control the overshoot in the calculation of the +previous line in mid|-|paragraph display math. The default value is 2 times +the em width of the current font: + +\starttyping +\predisplaygapfactor=2000 +\stoptyping + +If you want to have the length of the last line independent of math i.e.\ you don't +want to revert to a hack where you insert a fake display math formula in order to +get the length of the last line, the following will often work too: + +\starttyping +\def\lastlinelength{\dimexpr + \directlua {tex.sprint ( + (nodes.dimensions(node.tail(tex.lists.page_head).list)) + )}sp +\relax} +\stoptyping + +\stopsection + +\startsection[title={Math mode}] + +\subsection {Verbose versions of single|-|character math commands} + +\topicindex {math+styles} + +\LUATEX\ defines six new primitives that have the same function as +\type {^}, \type {_}, \type {$}, and \type {$$}: + +\starttabulate[|l|l|] +\DB primitive \BC explanation \NC \NR +\TB +\NC \lpr {Usuperscript} \NC duplicates the functionality of \type {^} \NC \NR +\NC \lpr {Usubscript} \NC duplicates the functionality of \type {_} \NC \NR +\NC \lpr {Ustartmath} \NC duplicates the functionality of \type {$}, % $ + when used in non-math mode. \NC \NR +\NC \lpr {Ustopmath} \NC duplicates the functionality of \type {$}, % $ + when used in inline math mode. \NC \NR +\NC \lpr {Ustartdisplaymath} \NC duplicates the functionality of \type {$$}, % $$ + when used in non-math mode. \NC \NR +\NC \lpr {Ustopdisplaymath} \NC duplicates the functionality of \type {$$}, % $$ + when used in display math mode. \NC \NR +\LL +\stoptabulate + +The \lpr {Ustopmath} and \lpr {Ustopdisplaymath} primitives check if the current +math mode is the correct one (inline vs.\ displayed), but you can freely intermix +the four mathon|/|mathoff commands with explicit dollar sign(s). + +\subsection{Script commands \lpr {Unosuperscript} and \lpr {Unosubscript}} + +\topicindex {math+styles} +\topicindex {math+scripts} + +These two commands result in super- and subscripts but with the current style (at the +time of rendering). So, + +\startbuffer[script] +$ + x\Usuperscript {1}\Usubscript {2} = + x\Unosuperscript{1}\Unosubscript{2} = + x\Usuperscript {1}\Unosubscript{2} = + x\Unosuperscript{1}\Usubscript {2} +$ +\stopbuffer + +\typebuffer + +results in \inlinebuffer[script]. + +\subsection{Allowed math commands in non|-|math modes} + +\topicindex {math+text} +\topicindex {text+math} + +The commands \prm {mathchar}, and \lpr {Umathchar} and control sequences that are +the result of \prm {mathchardef} or \lpr {Umathchardef} are also acceptable in +the horizontal and vertical modes. In those cases, the \prm {textfont} from the +requested math family is used. + +% \startsection[title={Math todo}] +% +% The following items are still todo. +% +% \startitemize +% \startitem +% Pre-scripts. +% \stopitem +% \startitem +% Multi-story stacks. +% \stopitem +% \startitem +% Flattened accents for high characters (maybe). +% \stopitem +% \startitem +% Better control over the spacing around displays and handling of equation numbers. +% \stopitem +% \startitem +% Support for multi|-|line displays using \MATHML\ style alignment points. +% \stopitem +% \stopitemize +% +% \stopsection + +\stopsection + +\startsection[title={Goodies}] + +\subsection {Flattening: \lpr {mathflattenmode}} + +\topicindex {math+flattening} + +The \TEX\ math engine collapses \type {ord} noads without sub- and superscripts +and a character as nucleus. and which has the side effect that in \OPENTYPE\ mode +italic corrections are applied (given that they are enabled). + +\startbuffer[sample] +\switchtobodyfont[modern] +$V \mathbin{\mathbin{v}} V$\par +$V \mathord{\mathord{v}} V$\par +\stopbuffer + +\typebuffer[sample] + +This renders as: + +\blank \start \mathflattenmode\plusone \getbuffer[sample] \stop \blank + +When we set \lpr {mathflattenmode} to 31 we get: + +\blank \start \mathflattenmode\numexpr1+2+4+8+16\relax \getbuffer[sample] \stop \blank + +When you see no difference, then the font probably has the proper character +dimensions and no italic correction is needed. For Latin Modern (at least till +2018) there was a visual difference. In that respect this parameter is not always +needed unless of course you want efficient math lists anyway. + +You can influence flattening by adding the appropriate number to the value of the +mode parameter. The default value is~1. + +\starttabulate[|Tc|c|] +\DB mode \BC class \NC \NR +\TB +\NC 1 \NC ord \NC \NR +\NC 2 \NC bin \NC \NR +\NC 4 \NC rel \NC \NR +\NC 8 \NC punct \NC \NR +\NC 16 \NC inner \NC \NR +\LL +\stoptabulate + +\subsection {Less Tracing} + +\topicindex {math+tracing} + +Because there are quite some math related parameters and values, it is possible +to limit tracing. Only when \type {tracingassigns} and|/|or \type +{tracingrestores} are set to~2 or more they will be traced. + +\subsection {Math options with \lpr {mathoption}} + +The logic in the math engine is rather complex and there are often no universal +solutions (read: what works out well for one font, fails for another). Therefore +some variations in the implementation are driven by parameters (modes). In +addition there is a new primitive \lpr {mathoption} which will be used for +testing. Don't rely on any option to be there in a production version as they are +meant for development. + +This option was introduced for testing purposes when the math engine got split +code paths and it forces the engine to treat new fonts as old ones with respect +to italic correction etc. There are no guarantees given with respect to the final +result and unexpected side effects are not seen as bugs as they relate to font +properties. Ther eis currently only one option: + +\startbuffer +\mathoption old 1 +\stopbuffer + +The \type {oldmath} boolean flag in the \LUA\ font table is the official way to +force old treatment as it's bound to fonts. Like with all options we may +temporarily introduce with this command this feature is not meant for production. + +% % obsolete: +% +% \subsubsection {\type {\mathoption noitaliccompensation}} +% +% This option compensates placement for characters with a built|-|in italic +% correction. +% +% \startbuffer +% {\showboxes\int}\quad +% {\showboxes\int_{|}^{|}}\quad +% {\showboxes\int\limits_{|}^{|}} +% \stopbuffer +% +% \typebuffer +% +% Gives (with computer modern that has such italics): +% +% \startlinecorrection[blank] +% \switchtobodyfont[modern] +% \startcombination[nx=2,ny=2,distance=5em] +% {\mathoption noitaliccompensation 0\relax \mathematics{\getbuffer}} +% {\nohyphens\type{0:inline}} +% {\mathoption noitaliccompensation 0\relax \mathematics{\displaymath\getbuffer}} +% {\nohyphens\type{0:display}} +% {\mathoption noitaliccompensation 1\relax \mathematics{\getbuffer}} +% {\nohyphens\type{1:inline}} +% {\mathoption noitaliccompensation 1\relax \mathematics{\displaymath\getbuffer}} +% {\nohyphens\type{1:display}} +% \stopcombination +% \stoplinecorrection + +% % obsolete: +% +% \subsubsection {\type {\mathoption nocharitalic}} +% +% When two characters follow each other italic correction can interfere. The +% following example shows what this option does: +% +% \startbuffer +% \catcode"1D443=11 +% \catcode"1D444=11 +% \catcode"1D445=11 +% P( PP PQR +% \stopbuffer +% +% \typebuffer +% +% Gives (with computer modern that has such italics): +% +% \startlinecorrection[blank] +% \switchtobodyfont[modern] +% \startcombination[nx=2,ny=2,distance=5em] +% {\mathoption nocharitalic 0\relax \mathematics{\getbuffer}} +% {\nohyphens\type{0:inline}} +% {\mathoption nocharitalic 0\relax \mathematics{\displaymath\getbuffer}} +% {\nohyphens\type{0:display}} +% {\mathoption nocharitalic 1\relax \mathematics{\getbuffer}} +% {\nohyphens\type{1:inline}} +% {\mathoption nocharitalic 1\relax \mathematics{\displaymath\getbuffer}} +% {\nohyphens\type{1:display}} +% \stopcombination +% \stoplinecorrection + +% % obsolete: +% +% \subsubsection {\type {\mathoption useoldfractionscaling}} +% +% This option has been introduced as solution for tracker item 604 for fuzzy cases +% around either or not present fraction related settings for new fonts. + +\stopsection + +\stopchapter + +\stopcomponent diff --git a/manual/luatex-modifications.tex b/manual/luatex-modifications.tex index 294f3fc3f..b7ce6ca2b 100644 --- a/manual/luatex-modifications.tex +++ b/manual/luatex-modifications.tex @@ -1,1380 +1,1389 @@ -% language=uk - -\environment luatex-style - -\startcomponent luatex-modifications - -\startchapter[reference=modifications,title={Modifications}] - -\startsection[title=The merged engines] - -\startsubsection[title=The need for change] - -\topicindex {engines} -\topicindex {history} - -The first version of \LUATEX\ only had a few extra primitives and it was largely -the same as \PDFTEX. Then we merged substantial parts of \ALEPH\ into the code -and got more primitives. When we got more stable the decision was made to clean -up the rather hybrid nature of the program. This means that some primitives have -been promoted to core primitives, often with a different name, and that others -were removed. This made it possible to start cleaning up the code base. In \in -{chapter} [enhancements] we discussed some new primitives, here we will cover -most of the adapted ones. - -Besides the expected changes caused by new functionality, there are a number of -not|-|so|-|expected changes. These are sometimes a side|-|effect of a new -(conflicting) feature, or, more often than not, a change necessary to clean up -the internal interfaces. These will also be mentioned. - -\stopsubsection - -\startsubsection[title=Changes from \TEX\ 3.1415926] - -\topicindex {\TEX} - -Of course it all starts with traditional \TEX. Even if we started with \PDFTEX, -most still comes from the original. But we divert a bit. - -\startitemize - -\startitem - The current code base is written in \CCODE, not \PASCAL. We use \CWEB\ when - possible. As a consequence instead of one large file plus change files, we - now have multiple files organized in categories like \type {tex}, \type - {pdf}, \type {lang}, \type {font}, \type {lua}, etc. There are some artifacts - of the conversion to \CCODE, but in due time we will clean up the source code - and make sure that the documentation is done right. Many files are in the - \CWEB\ format, but others, like those interfacing to \LUA, are \CCODE\ files. - Of course we want to stay as close as possible to the original so that the - documentation of the fundamentals behind \TEX\ by Don Knuth still applies. -\stopitem - -\startitem - See \in {chapter} [languages] for many small changes related to paragraph - building, language handling and hyphenation. The most important change is - that adding a brace group in the middle of a word (like in \type {of{}fice}) - does not prevent ligature creation. -\stopitem - -\startitem - There is no pool file, all strings are embedded during compilation. -\stopitem - -\startitem - The specifier \type {plus 1 fillll} does not generate an error. The extra - \quote{l} is simply typeset. -\stopitem - -\startitem - The upper limit to \prm {endlinechar} and \prm {newlinechar} is 127. -\stopitem - -\startitem - Magnification (\prm {mag}) is only supported in \DVI\ output mode. You can - set this parameter and it even works with \type {true} units till you switch - to \PDF\ output mode. When you use \PDF\ output you can best not touch the - \prm {mag} variable. This fuzzy behaviour is not much different from using - \PDF\ backend related functionality while eventually \DVI\ output is - required. - - After the output mode has been frozen (normally that happens when the first - page is shipped out) or when \PDF\ output is enabled, the \type {true} - specification is ignored. When you preload a plain format adapted to - \LUATEX\ it can be that the \prm {mag} parameter already has been set. -\stopitem - -\stopitemize - -\stopsubsection - -\startsubsection[title=Changes from \ETEX\ 2.2] - -\topicindex {\ETEX} - -Being the de factor standard extension of course we provide the \ETEX\ -functionality, but with a few small adaptations. - -\startitemize - -\startitem - The \ETEX\ functionality is always present and enabled so the prepended - asterisk or \type {-etex} switch for \INITEX\ is not needed. -\stopitem - -\startitem - The \TEXXET\ extension is not present, so the primitives \type - {\TeXXeTstate}, \type {\beginR}, \type {\beginL}, \type {\endR} and \type - {\endL} are missing. Instead we used the \OMEGA/\ALEPH\ approach to - directionality as starting point. -\stopitem - -\startitem - Some of the tracing information that is output by \ETEX's \prm - {tracingassigns} and \prm {tracingrestores} is not there. -\stopitem - -\startitem - Register management in \LUATEX\ uses the \OMEGA/\ALEPH\ model, so the maximum - value is 65535 and the implementation uses a flat array instead of the mixed - flat & sparse model from \ETEX. -\stopitem - -\startitem - When kpathsea is used to find files, \LUATEX\ uses the \type {ofm} file - format to search for font metrics. In turn, this means that \LUATEX\ looks at - the \type {OFMFONTS} configuration variable (like \OMEGA\ and \ALEPH) instead - of \type {TFMFONTS} (like \TEX\ and \PDFTEX). Likewise for virtual fonts - (\LUATEX\ uses the variable \type {OVFFONTS} instead of \type {VFFONTS}). -\stopitem - -\stopitemize - -\stopsubsection - -\startsubsection[title=Changes from \PDFTEX\ 1.40] - -\topicindex {\PDFTEX} - -Because we want to produce \PDF\ the most natural starting point was the popular -\PDFTEX\ program. We inherit the stable features, dropped most of the -experimental code and promoted some functionality to core \LUATEX\ functionality -which in turn triggered renaming primitives. - -For compatibility reasons we still refer to \type {\pdf...} commands but \LUATEX\ -has a different backend interface. Instead of these primitives there are three -interfacing primitives: \lpr {pdfextension}, \lpr {pdfvariable} and \lpr -{pdffeedback} that take keywords and optional further arguments (below we will -still use the \tex {pdf} prefix names as reference). This way we can extend the -features when needed but don't need to adapt the core engine. The front- and -backend are decoupled as much as possible. - -\startitemize - -\startitem - The (experimental) support for snap nodes has been removed, because it is - much more natural to build this functionality on top of node processing and - attributes. The associated primitives that are gone are: \orm - {pdfsnaprefpoint}, \orm {pdfsnapy}, and \orm {pdfsnapycomp}. -\stopitem - -\startitem - The (experimental) support for specialized spacing around nodes has also been - removed. The associated primitives that are gone are: \orm - {pdfadjustinterwordglue}, \orm {pdfprependkern}, and \orm {pdfappendkern}, as - well as the five supporting primitives \orm {knbscode}, \orm {stbscode}, \orm - {shbscode}, \orm {knbccode}, and \orm {knaccode}. -\stopitem - -\startitem - A number of \quote {\PDFTEX\ primitives} have been removed as they can be - implemented using \LUA: \orm {pdfelapsedtime}, \orm {pdfescapehex}, \orm - {pdfescapename}, \orm {pdfescapestring}, \orm {pdffiledump}, \orm - {pdffilemoddate}, \orm {pdffilesize}, \orm {pdfforcepagebox}, \orm - {pdflastmatch}, \orm {pdfmatch}, \orm {pdfmdfivesum}, \orm {pdfmovechars}, - \orm {pdfoptionalwaysusepdfpagebox}, \orm {pdfoptionpdfinclusionerrorlevel}, - \orm {pdfresettimer}, \orm {pdfshellescape}, \orm {pdfstrcmp} and \orm - {pdfunescapehex}. -\stopitem - -\startitem - The version related primitives \orm {pdftexbanner}, \orm {pdftexversion} - and \orm {pdftexrevision} are no longer present as there is no longer a - relationship with \PDFTEX\ development. -\stopitem - -\startitem - The experimental snapper mechanism has been removed and therefore also the - primitives \orm {pdfignoreddimen}, \orm {pdffirstlineheight}, \orm - {pdfeachlineheight}, \orm {pdfeachlinedepth} and \orm {pdflastlinedepth}. -\stopitem - -\startitem - The experimental primitives \lpr {primitive}, \lpr {ifprimitive}, \lpr - {ifabsnum} and \lpr {ifabsdim} are promoted to core primitives. The \type - {\pdf*} prefixed originals are not available. -\stopitem - -\startitem - Because \LUATEX\ has a different subsystem for managing images, more - diversion from its ancestor happened in the meantime. We don't adapt to - changes in \PDFTEX. -\stopitem - -\startitem - Two extra token lists are provided, \orm {pdfxformresources} and \orm - {pdfxformattr}, as an alternative to \orm {pdfxform} keywords. -\stopitem - -\startitem - Image specifications also support \type {visiblefilename}, \type - {userpassword} and \type {ownerpassword}. The password options are only - relevant for encrypted \PDF\ files. -\stopitem - -\startitem - The current version of \LUATEX\ no longer replaces and|/|or merges fonts in - embedded \PDF\ files with fonts of the enveloping \PDF\ document. This - regression may be temporary, depending on how the rewritten font backend will - look like. -\stopitem - -\startitem - The primitives \orm {pdfpagewidth} and \orm {pdfpageheight} have been removed - because \lpr {pagewidth} and \lpr {pageheight} have that purpose. -\stopitem - -\startitem - The primitives \orm {pdfnormaldeviate}, \orm {pdfuniformdeviate}, \orm - {pdfsetrandomseed} and \orm {pdfrandomseed} have been promoted to core - primitives without \type {pdf} prefix so the original commands are no longer - recognized. -\stopitem - -\startitem - The primitives \lpr {ifincsname}, \lpr {expanded} and \lpr {quitvmode} - are now core primitives. -\stopitem - -\startitem - As the hz and protrusion mechanism are part of the core the related - primitives \lpr {lpcode}, \lpr {rpcode}, \lpr {efcode}, \lpr - {leftmarginkern}, \lpr {rightmarginkern} are promoted to core primitives. The - two commands \lpr {protrudechars} and \lpr {adjustspacing} replace their - prefixed with \type {\pdf} originals. -\stopitem - -\startitem - The hz optimization code has been partially redone so that we no longer need - to create extra font instances. The front- and backend have been decoupled - and more efficient (\PDF) code is generated. -\stopitem - -\startitem - When \lpr {adjustspacing} has value~2, hz optimization will be applied to - glyphs and kerns. When the value is~3, only glyphs will be treated. A value - smaller than~2 disables this feature. -\stopitem - -\startitem - The \lpr {tagcode} primitive is promoted to core primitive. -\stopitem - -\startitem - The \lpr {letterspacefont} feature is now part of the core but will not be - changed (improved). We just provide it for legacy use. -\stopitem - -\startitem - The \orm {pdfnoligatures} primitive is now \lpr {ignoreligaturesinfont}. -\stopitem - -\startitem - The \orm {pdfcopyfont} primitive is now \lpr {copyfont}. -\stopitem - -\startitem - The \orm {pdffontexpand} primitive is now \lpr {expandglyphsinfont}. -\stopitem - -\startitem - Because position tracking is also available in \DVI\ mode the \lpr {savepos}, - \lpr {lastxpos} and \lpr {lastypos} commands now replace their \type {pdf} - prefixed originals. -\stopitem - -\startitem - The introspective primitives \type {\pdflastximagecolordepth} and \type - {\pdfximagebbox} have been removed. One can use external applications to - determine these properties or use the built|-|in \type {img} library. -\stopitem - -\startitem - The initializers \orm {pdfoutput} has been replaced by \lpr {outputmode} and - \orm {pdfdraftmode} is now \lpr {draftmode}. -\stopitem - -\startitem - The pixel multiplier dimension \orm {pdfpxdimen} lost its prefix and is now - called \lpr {pxdimen}. -\stopitem - -\startitem - An extra \orm {pdfimageaddfilename} option has been added that can be used to - block writing the filename to the \PDF\ file. -\stopitem - -\startitem - The primitive \orm {pdftracingfonts} is now \lpr {tracingfonts} as it - doesn't relate to the backend. -\stopitem - -\startitem - The experimental primitive \orm {pdfinsertht} is kept as \lpr {insertht}. -\stopitem - -\startitem - There is some more control over what metadata goes into the \PDF\ file. -\stopitem - -\startitem - The promotion of primitives to core primitives as well as the separation of - font- and backend means that the initialization namespace \type {pdftex} is - gone. -\stopitem - -\stopitemize - -One change involves the so called xforms and ximages. In \PDFTEX\ these are -implemented as so called whatsits. But contrary to other whatsits they have -dimensions that need to be taken into account when for instance calculating -optimal line breaks. In \LUATEX\ these are now promoted to a special type of rule -nodes, which simplifies code that needs those dimensions. - -Another reason for promotion is that these are useful concepts. Backends can -provide the ability to use content that has been rendered in several places, and -images are also common. As already mentioned in \in {section} -[sec:imagedandforms], we now have: - -\starttabulate[|l|l|] -\DB \LUATEX \BC \PDFTEX \NC \NR -\TB -\NC \lpr {saveboxresource} \NC \orm {pdfxform} \NC \NR -\NC \lpr {saveimageresource} \NC \orm {pdfximage} \NC \NR -\NC \lpr {useboxresource} \NC \orm {pdfrefxform} \NC \NR -\NC \lpr {useimageresource} \NC \orm {pdfrefximage} \NC \NR -\NC \lpr {lastsavedboxresourceindex} \NC \orm {pdflastxform} \NC \NR -\NC \lpr {lastsavedimageresourceindex} \NC \orm {pdflastximage} \NC \NR -\NC \lpr {lastsavedimageresourcepages} \NC \orm {pdflastximagepages} \NC \NR -\LL -\stoptabulate - -There are a few \lpr {pdffeedback} features that relate to this but these are -typical backend specific ones. The index that gets returned is to be considered -as \quote {just a number} and although it still has the same meaning (object -related) as before, you should not depend on that. - -The protrusion detection mechanism is enhanced a bit to enable a bit more complex -situations. When protrusion characters are identified some nodes are skipped: - -\startitemize[packed,columns,two] -\startitem zero glue \stopitem -\startitem penalties \stopitem -\startitem empty discretionaries \stopitem -\startitem normal zero kerns \stopitem -\startitem rules with zero dimensions \stopitem -\startitem math nodes with a surround of zero \stopitem -\startitem dir nodes \stopitem -\startitem empty horizontal lists \stopitem -\startitem local par nodes \stopitem -\startitem inserts, marks and adjusts \stopitem -\startitem boundaries \stopitem -\startitem whatsits \stopitem -\stopitemize - -Because this can not be enough, you can also use a protrusion boundary node to -make the next node being ignored. When the value is~1 or~3, the next node will be -ignored in the test when locating a left boundary condition. When the value is~2 -or~3, the previous node will be ignored when locating a right boundary condition -(the search goes from right to left). This permits protrusion combined with for -instance content moved into the margin: - -\starttyping -\protrusionboundary1\llap{!\quad}«Who needs protrusion?» -\stoptyping - -\stopsubsection - -\startsubsection[title=Changes from \ALEPH\ RC4] - -\topicindex {\ALEPH} - -Because we wanted proper directional typesetting the \ALEPH\ mechanisms looked -most attractive. These are rather close to the ones provided by \OMEGA, so what -we say next applies to both these programs. - -\startitemize - -\startitem - The extended 16-bit math primitives (\orm {omathcode} etc.) have been - removed. -\stopitem - -\startitem - The \OCP\ processing has been removed completely and as a consequence, the - following primitives have been removed: \orm {ocp}, \orm {externalocp}, \orm - {ocplist}, \orm {pushocplist}, \orm {popocplist}, \orm {clearocplists}, \orm - {addbeforeocplist}, \orm {addafterocplist}, \orm {removebeforeocplist}, \orm - {removeafterocplist} and \orm {ocptracelevel}. -\stopitem - -\startitem - \LUATEX\ only understands 4~of the 16~direction specifiers of \ALEPH: \type - {TLT} (latin), \type {TRT} (arabic), \type {RTT} (cjk), \type {LTL} (mongolian). - All other direction specifiers generate an error. In addition to a keyword - driven model we also provide an integer driven one. -\stopitem - -\startitem - The input translations from \ALEPH\ are not implemented, the related - primitives are not available: \orm {DefaultInputMode}, \orm - {noDefaultInputMode}, \orm {noInputMode}, \orm {InputMode}, \orm - {DefaultOutputMode}, \orm {noDefaultOutputMode}, \orm {noOutputMode}, \orm - {OutputMode}, \orm {DefaultInputTranslation}, \orm - {noDefaultInputTranslation}, \orm {noInputTranslation}, \orm - {InputTranslation}, \orm {DefaultOutputTranslation}, \orm - {noDefaultOutputTranslation}, \orm {noOutputTranslation} and \orm - {OutputTranslation}. -\stopitem - -\startitem - Several bugs have been fixed and confusing implementation details have been - sorted out. -\stopitem - -\startitem - The scanner for direction specifications now allows an optional space after - the direction is completely parsed. -\stopitem - -\startitem - The \type {^^} notation has been extended: after \type {^^^^} four - hexadecimal characters are expected and after \type {^^^^^^} six hexadecimal - characters have to be given. The original \TEX\ interpretation is still valid - for the \type {^^} case but the four and six variants do no backtracking, - i.e.\ when they are not followed by the right number of hexadecimal digits - they issue an error message. Because \type{^^^} is a normal \TEX\ case, we - don't support the odd number of \type {^^^^^} either. -\stopitem - -\startitem - Glues {\it immediately after} direction change commands are not legal - breakpoints. -\stopitem - -\startitem - Several mechanisms that need to be right|-|to|-|left aware have been - improved. For instance placement of formula numbers. -\stopitem - -\startitem - The page dimension related primitives \lpr {pagewidth} and \lpr {pageheight} - have been promoted to core primitives. The \prm {hoffset} and \prm {voffset} - primitives have been fixed. -\stopitem - -\startitem - The primitives \type {\charwd}, \type {\charht}, \type {\chardp} and \type - {\charit} have been removed as we have the \ETEX\ variants \type - {\fontchar*}. -\stopitem - -\startitem - The two dimension registers \lpr {pagerightoffset} and \lpr - {pagebottomoffset} are now core primitives. -\stopitem - -\startitem - The direction related primitives \lpr {pagedir}, \lpr {bodydir}, \lpr - {pardir}, \lpr {textdir}, \lpr {mathdir} and \lpr {boxdir} are now core - primitives. -\stopitem - -\startitem - The promotion of primitives to core primitives as well as removing of all - others means that the initialization namespace \type {aleph} that early - versions of \LUATEX\ provided is gone. -\stopitem - -\stopitemize - -The above let's itself summarize as: we took the 32 bit aspects and much of the -directional mechanisms and merged it into the \PDFTEX\ code base as starting -point for further development. Then we simplified directionality, fixed it and -opened it up. - -\stopsubsection - -\startsubsection[title=Changes from standard \WEBC] - -\topicindex {\WEBC} - -The compilation framework is \WEBC\ and we keep using that but without the -\PASCAL\ to \CCODE\ step. This framework also provides some common features that -deal with reading bytes from files and locating files in \TDS. This is what we do -different: - -\startitemize - -\startitem - There is no mltex support. -\stopitem - -\startitem - There is no enctex support. -\stopitem - -\startitem - The following encoding related command line switches are silently ignored, - even in non|-|\LUA\ mode: \type {-8bit}, \type {-translate-file}, \type - {-mltex}, \type {-enc} and \type {-etex}. -\stopitem - -\startitem - The \prm {openout} whatsits are not written to the log file. -\stopitem - -\startitem - Some of the so|-|called \WEBC\ extensions are hard to set up in non|-|\KPSE\ - mode because \type {texmf.cnf} is not read: \type {shell-escape} is off (but - that is not a problem because of \LUA's \type {os.execute}), and the paranoia - checks on \type {openin} and \type {openout} do not happen. However, it is - easy for a \LUA\ script to do this itself by overloading \type {io.open} and - alike. -\stopitem - -\startitem - The \quote{E} option does not do anything useful. -\stopitem - -\stopitemize - -\stopsubsection - -\stopsection - -\startsection[reference=backendprimitives,title=The backend primitives] - -\startsubsection[title={Less primitives}] - -\topicindex {backend} -\topicindex {\PDF+backend} - -In a previous section we mentioned that some \PDFTEX\ primitives were removed and -others promoted to core \LUATEX\ primitives. That is only part of the story. In -order to separate the backend specific primitives in de code these commands are -now replaced by only a few. In traditional \TEX\ we only had the \DVI\ backend -but now we have two: \DVI\ and \PDF. Additional functionality is implemented as -\quote {extensions} in \TEX\ speak. By separating more strickly we are able to -keep the core (frontend) clean and stable and isolate these extensions. If for -some reason an extra backend option is needed, it can be implemented without -touching the core. The three \PDF\ backend related primitives are: - -\starttyping -\pdfextension command [specification] -\pdfvariable name -\pdffeedback name -\stoptyping - -An extension triggers further parsing, depending on the command given. A variable is -a (kind of) register and can be read and written, while a feedback is reporting -something (as it comes from the backend it's normally a sequence of tokens). - -\stopsubsection - -\startsubsection[title={\lpr{pdfextension}, \lpr {pdfvariable} and \lpr {pdffeedback}},reference=sec:pdfextensions] - -In order for \LUATEX\ to be more than just \TEX\ you need to enable primitives. That -has already been the case right from the start. If you want the traditional \PDFTEX\ -primitives (for as far their functionality is still around) you now can do this: - -\starttyping -\protected\def\pdfliteral {\pdfextension literal} -\protected\def\pdfcolorstack {\pdfextension colorstack} -\protected\def\pdfsetmatrix {\pdfextension setmatrix} -\protected\def\pdfsave {\pdfextension save\relax} -\protected\def\pdfrestore {\pdfextension restore\relax} -\protected\def\pdfobj {\pdfextension obj } -\protected\def\pdfrefobj {\pdfextension refobj } -\protected\def\pdfannot {\pdfextension annot } -\protected\def\pdfstartlink {\pdfextension startlink } -\protected\def\pdfendlink {\pdfextension endlink\relax} -\protected\def\pdfoutline {\pdfextension outline } -\protected\def\pdfdest {\pdfextension dest } -\protected\def\pdfthread {\pdfextension thread } -\protected\def\pdfstartthread {\pdfextension startthread } -\protected\def\pdfendthread {\pdfextension endthread\relax} -\protected\def\pdfinfo {\pdfextension info } -\protected\def\pdfcatalog {\pdfextension catalog } -\protected\def\pdfnames {\pdfextension names } -\protected\def\pdfincludechars {\pdfextension includechars } -\protected\def\pdffontattr {\pdfextension fontattr } -\protected\def\pdfmapfile {\pdfextension mapfile } -\protected\def\pdfmapline {\pdfextension mapline } -\protected\def\pdftrailer {\pdfextension trailer } -\protected\def\pdfglyphtounicode {\pdfextension glyphtounicode } -\stoptyping - -The introspective primitives can be defined as: - -\starttyping -\def\pdftexversion {\numexpr\pdffeedback version\relax} -\def\pdftexrevision {\pdffeedback revision} -\def\pdflastlink {\numexpr\pdffeedback lastlink\relax} -\def\pdfretval {\numexpr\pdffeedback retval\relax} -\def\pdflastobj {\numexpr\pdffeedback lastobj\relax} -\def\pdflastannot {\numexpr\pdffeedback lastannot\relax} -\def\pdfxformname {\numexpr\pdffeedback xformname\relax} -\def\pdfcreationdate {\pdffeedback creationdate} -\def\pdffontname {\numexpr\pdffeedback fontname\relax} -\def\pdffontobjnum {\numexpr\pdffeedback fontobjnum\relax} -\def\pdffontsize {\dimexpr\pdffeedback fontsize\relax} -\def\pdfpageref {\numexpr\pdffeedback pageref\relax} -\def\pdfcolorstackinit {\pdffeedback colorstackinit} -\stoptyping - -The configuration related registers have become: - -\starttyping -\edef\pdfcompresslevel {\pdfvariable compresslevel} -\edef\pdfobjcompresslevel {\pdfvariable objcompresslevel} -\edef\pdfrecompress {\pdfvariable recompress} -\edef\pdfdecimaldigits {\pdfvariable decimaldigits} -\edef\pdfgamma {\pdfvariable gamma} -\edef\pdfimageresolution {\pdfvariable imageresolution} -\edef\pdfimageapplygamma {\pdfvariable imageapplygamma} -\edef\pdfimagegamma {\pdfvariable imagegamma} -\edef\pdfimagehicolor {\pdfvariable imagehicolor} -\edef\pdfimageaddfilename {\pdfvariable imageaddfilename} -\edef\pdfpkresolution {\pdfvariable pkresolution} -\edef\pdfpkfixeddpi {\pdfvariable pkfixeddpi} -\edef\pdfinclusioncopyfonts {\pdfvariable inclusioncopyfonts} -\edef\pdfinclusionerrorlevel {\pdfvariable inclusionerrorlevel} -\edef\pdfignoreunknownimages {\pdfvariable ignoreunknownimages} -\edef\pdfgentounicode {\pdfvariable gentounicode} -\edef\pdfomitcidset {\pdfvariable omitcidset} -\edef\pdfomitcharset {\pdfvariable omitcharset} -\edef\pdfpagebox {\pdfvariable pagebox} -\edef\pdfminorversion {\pdfvariable minorversion} -\edef\pdfuniqueresname {\pdfvariable uniqueresname} - -\edef\pdfhorigin {\pdfvariable horigin} -\edef\pdfvorigin {\pdfvariable vorigin} -\edef\pdflinkmargin {\pdfvariable linkmargin} -\edef\pdfdestmargin {\pdfvariable destmargin} -\edef\pdfthreadmargin {\pdfvariable threadmargin} -\edef\pdfxformmargin {\pdfvariable xformmargin} - -\edef\pdfpagesattr {\pdfvariable pagesattr} -\edef\pdfpageattr {\pdfvariable pageattr} -\edef\pdfpageresources {\pdfvariable pageresources} -\edef\pdfxformattr {\pdfvariable xformattr} -\edef\pdfxformresources {\pdfvariable xformresources} -\edef\pdfpkmode {\pdfvariable pkmode} - -\edef\pdfsuppressoptionalinfo {\pdfvariable suppressoptionalinfo } -\edef\pdftrailerid {\pdfvariable trailerid } -\stoptyping - -The variables are internal ones, so they are anonymous. When you ask for the -meaning of a few previously defined ones: - -\starttyping -\meaning\pdfhorigin -\meaning\pdfcompresslevel -\meaning\pdfpageattr -\stoptyping - -you will get: - -\starttyping -macro:->[internal backend dimension] -macro:->[internal backend integer] -macro:->[internal backend tokenlist] -\stoptyping - -The \prm {edef} can also be a \prm {def} but it's a bit more efficient to expand -the lookup related register beforehand. - -The backend is derived from \PDFTEX\ so the same syntax applies. However, the -\type {outline} command accepts a \type {objnum} followed by a number. No -checking takes place so when this is used it had better be a valid (flushed) -object. - -In order to be (more or less) compatible with \PDFTEX\ we also support the option -to suppress some info but we do so via a bitset: - -\starttyping -\pdfvariable suppressoptionalinfo \numexpr - 0 - + 1 % PTEX.FullBanner - + 2 % PTEX.FileName - + 4 % PTEX.PageNumber - + 8 % PTEX.InfoDict - + 16 % Creator - + 32 % CreationDate - + 64 % ModDate - + 128 % Producer - + 256 % Trapped - + 512 % ID -\relax -\stoptyping - -In addition you can overload the trailer id, but we don't do any checking on -validity, so you have to pass a valid array. The following is like the ones -normally generated by the engine. You even need to include the brackets here! - -\starttyping -\pdfvariable trailerid {[ - - -]} -\stoptyping - -Although we started from a merge of \PDFTEX\ and \ALEPH, by now the code base as -well as functionality has diverted from those parents. Here we show the options -that can be passed to the extensions. - -\starttexsyntax -\pdfextension literal - [ direct | page | raw ] { tokens } -\stoptexsyntax - -\starttexsyntax -\pdfextension dest - num integer | name { tokens }!crlf - [ fitbh | fitbv | fitb | fith| fitv | fit | - fitr | xyz [ zoom ] -\stoptexsyntax - -\starttexsyntax -\pdfextension annot - reserveobjnum | useobjnum - { tokens } -\stoptexsyntax - -\starttexsyntax -\pdfextension save -\stoptexsyntax - -\starttexsyntax -\pdfextension restore -\stoptexsyntax - -\starttexsyntax -\pdfextension setmatrix - { tokens } -\stoptexsyntax - -\starttexsyntax -[ \immediate ] \pdfextension obj - reserveobjnum -\stoptexsyntax - -\starttexsyntax -[ \immediate ] \pdfextension obj - [ useobjnum ] - [ uncompressed ] - [ stream [ attr { tokens } ] ] - [ file ] - { tokens } -\stoptexsyntax - -\starttexsyntax -\pdfextension refobj - -\stoptexsyntax - -\starttexsyntax -\pdfextension colorstack - - set { tokens } | push { tokens } | pop | current -\stoptexsyntax - -\starttexsyntax -\pdfextension startlink - [ attr { tokens } ] - user { tokens } | goto | thread - [ file { tokens } ] - [ page { tokens } | name { tokens } | num integer ] - [ newwindow | nonewwindow ] -\stoptexsyntax - -\starttexsyntax -\pdfextension endlink -\stoptexsyntax - -\starttexsyntax -\pdfextension startthread - num | name { tokens } -\stoptexsyntax - -\starttexsyntax -\pdfextension endthread -\stoptexsyntax - -\starttexsyntax -\pdfextension thread - num | name { tokens } -\stoptexsyntax - -\starttexsyntax -\pdfextension outline - [ attr { tokens } ] - [ useobjnum ] - [ count ] - { tokens } -\stoptexsyntax - -\starttexsyntax -\pdfextension glyphtounicode - { tokens } - { tokens } -\stoptexsyntax - -\starttexsyntax -\pdfextension catalog - { tokens } - [ openaction - user { tokens } | goto | thread - [ file { tokens } ] - [ page { tokens } | name { tokens } | num ] - [ newwindow | nonewwindow ] ] -\stoptexsyntax - -\starttexsyntax -\pdfextension fontattr - - {tokens} -\stoptexsyntax - -\starttexsyntax -\pdfextension mapfile - {tokens} -\stoptexsyntax - -\starttexsyntax -\pdfextension mapline - {tokens} -\stoptexsyntax - -\starttexsyntax -\pdfextension includechars - {tokens} -\stoptexsyntax - -\starttexsyntax -\pdfextension info - {tokens} -\stoptexsyntax - -\starttexsyntax -\pdfextension names - {tokens} -\stoptexsyntax - -\starttexsyntax -\pdfextension trailer - {tokens} -\stoptexsyntax - -\stopsubsection - -\startsubsection[title={Defaults}] - -The engine sets the following defaults. - -\starttyping -\pdfcompresslevel 9 -\pdfobjcompresslevel 1 % used: (0,9) -\pdfrecompress 0 % mostly for debugging -\pdfdecimaldigits 4 % used: (3,6) -\pdfgamma 1000 -\pdfimageresolution 71 -\pdfimageapplygamma 0 -\pdfimagegamma 2200 -\pdfimagehicolor 1 -\pdfimageaddfilename 1 -\pdfpkresolution 72 -\pdfpkfixeddpi 0 -\pdfinclusioncopyfonts 0 -\pdfinclusionerrorlevel 0 -\pdfignoreunknownimages 0 -\pdfgentounicode 0 -\pdfomitcidset 0 -\pdfomitcharset 0 -\pdfpagebox 0 -\pdfminorversion 4 -\pdfuniqueresname 0 - -\pdfhorigin 1in -\pdfvorigin 1in -\pdflinkmargin 0pt -\pdfdestmargin 0pt -\pdfthreadmargin 0pt -\pdfxformmargin 0pt -\stoptyping - -\stopsubsection - -\startsubsection[title={Backward compatibility}] - -If you also want some backward compatibility, you can add: - -\starttyping -\let\pdfpagewidth \pagewidth -\let\pdfpageheight \pageheight - -\let\pdfadjustspacing \adjustspacing -\let\pdfprotrudechars \protrudechars -\let\pdfnoligatures \ignoreligaturesinfont -\let\pdffontexpand \expandglyphsinfont -\let\pdfcopyfont \copyfont - -\let\pdfxform \saveboxresource -\let\pdflastxform \lastsavedboxresourceindex -\let\pdfrefxform \useboxresource - -\let\pdfximage \saveimageresource -\let\pdflastximage \lastsavedimageresourceindex -\let\pdflastximagepages\lastsavedimageresourcepages -\let\pdfrefximage \useimageresource - -\let\pdfsavepos \savepos -\let\pdflastxpos \lastxpos -\let\pdflastypos \lastypos - -\let\pdfoutput \outputmode -\let\pdfdraftmode \draftmode - -\let\pdfpxdimen \pxdimen - -\let\pdfinsertht \insertht - -\let\pdfnormaldeviate \normaldeviate -\let\pdfuniformdeviate \uniformdeviate -\let\pdfsetrandomseed \setrandomseed -\let\pdfrandomseed \randomseed - -\let\pdfprimitive \primitive -\let\ifpdfprimitive \ifprimitive - -\let\ifpdfabsnum \ifabsnum -\let\ifpdfabsdim \ifabsdim -\stoptyping - -And even: - -\starttyping -\newdimen\pdfeachlineheight -\newdimen\pdfeachlinedepth -\newdimen\pdflastlinedepth -\newdimen\pdffirstlineheight -\newdimen\pdfignoreddimen -\stoptyping - -\stopsubsection - -\stopsection - -\startsection[title=Directions] - -\topicindex {\OMEGA} -\topicindex {\ALEPH} -\topicindex {directions} - -\startsubsection[title={Four directions}] - -The directional model in \LUATEX\ is inherited from \OMEGA|/|\ALEPH\ but we tried -to improve it a bit. At some point we played with recovery of modes but that was -disabled later on when we found that it interfered with nested directions. That -itself had as side effect that the node list was no longer balanced with respect -to directional nodes which in turn can give side effects when a series of dir -changes happens without grouping. - -When extending the \PDF\ backend to support directions some inconsistencies were -found and as a result we decided to support only the four models that make sense -\type {TLT} (latin), \type {TRT} (arabic), \type {RTT} (cjk) and \type {LTL} -(mongolian). - -\stopsubsection - -\startsubsection[title={How it works}] - -The approach is that we again make the list balanced but try to avoid some side -effects. What happens is quite intuitive if we forget about spaces (turned into -glue) but even there what happens makes sense if you look at it in detail. -However that logic makes in|-|group switching kind of useless when no proper -nested grouping is used: switching from right to left several times nested, -results in spacing ending up after each other due to nested mirroring. Of course -a sane macro package will manage this for the user but here we are discussing the -low level dir injection. - -This is what happens: - -\starttyping -\textdir TRT nur {\textdir TLT run \textdir TRT NUR} nur -\stoptyping - -This becomes stepwise: - -\startnarrower -\starttyping -injected: [+TRT]nur {[+TLT]run [+TRT]NUR} nur -balanced: [+TRT]nur {[+TLT]run [-TLT][+TRT]NUR[-TRT]} nur[-TRT] -result : run {RUNrun } run -\stoptyping -\stopnarrower - -And this: - -\starttyping -\textdir TRT nur {nur \textdir TLT run \textdir TRT NUR} nur -\stoptyping - -becomes: - -\startnarrower -\starttyping -injected: [+TRT]nur {nur [+TLT]run [+TRT]NUR} nur -balanced: [+TRT]nur {nur [+TLT]run [-TLT][+TRT]NUR[-TRT]} nur[-TRT] -result : run {run RUNrun } run -\stoptyping -\stopnarrower - -Now, in the following examples watch where we put the braces: - -\startbuffer -\textdir TRT nur {{\textdir TLT run} {\textdir TRT NUR}} nur -\stopbuffer - -\typebuffer - -This becomes: - -\startnarrower -\getbuffer -\stopnarrower - -Compare this to: - -\startbuffer -\textdir TRT nur {{\textdir TLT run }{\textdir TRT NUR}} nur -\stopbuffer - -\typebuffer - -Which renders as: - -\startnarrower -\getbuffer -\stopnarrower - -So how do we deal with the next? - -\startbuffer -\def\ltr{\textdir TLT\relax} -\def\rtl{\textdir TRT\relax} - -run {\rtl nur {\ltr run \rtl NUR \ltr run \rtl NUR} nur} -run {\ltr run {\rtl nur \ltr RUN \rtl nur \ltr RUN} run} -\stopbuffer - -\typebuffer - -It gets typeset as: - -\startnarrower -\startlines -\getbuffer -\stoplines -\stopnarrower - -We could define the two helpers to look back, pick up a skip, remove it and -inject it after the dir node. But that way we loose the subtype information that -for some applications can be handy to be kept as|-|is. This is why we now have a -variant of \lpr {textdir} which injects the balanced node before the skip. -Instead of the previous definition we can use: - -\startbuffer[def] -\def\ltr{\linedir TLT\relax} -\def\rtl{\linedir TRT\relax} -\stopbuffer - -\typebuffer[def] - -and this time: - -\startbuffer[txt] -run {\rtl nur {\ltr run \rtl NUR \ltr run \rtl NUR} nur} -run {\ltr run {\rtl nur \ltr RUN \rtl nur \ltr RUN} run} -\stopbuffer - -\typebuffer[txt] - -comes out as a properly spaced: - -\startnarrower -\startlines -\getbuffer[def,txt] -\stoplines -\stopnarrower - -Anything more complex that this, like combination of skips and penalties, or -kerns, should be handled in the input or macro package because there is no way we -can predict the expected behaviour. In fact, the \lpr {linedir} is just a -convenience extra which could also have been implemented using node list parsing. - -\stopsubsection - -\startsubsection[title={Controlling glue with \lpr {breakafterdirmode}}] - -Glue after a dir node is ignored in the linebreak decision but you can bypass that -by setting \lpr {breakafterdirmode} to~\type {1}. The following table shows the -difference. Watch your spaces. - -\def\ShowSome#1{% - \BC \type{#1} - \NC \breakafterdirmode\zerocount\hsize\zeropoint#1 - \NC - \NC \breakafterdirmode\plusone\hsize\zeropoint#1 - \NC - \NC \NR -} - -\starttabulate[|l|Tp(1pt)|w(5em)|Tp(1pt)|w(5em)|] - \DB - \BC \type{0} - \NC - \BC \type{1} - \NC - \NC \NR - \TB - \ShowSome{pre {\textdir TLT xxx} post} - \ShowSome{pre {\textdir TLT xxx }post} - \ShowSome{pre{ \textdir TLT xxx} post} - \ShowSome{pre{ \textdir TLT xxx }post} - \ShowSome{pre { \textdir TLT xxx } post} - \ShowSome{pre {\textdir TLT\relax\space xxx} post} - \LL -\stoptabulate - -\stopsubsection - -\startsubsection[title={Controling parshapes with \lpr {shapemode}}] - -Another adaptation to the \ALEPH\ directional model is control over shapes driven -by \prm {hangindent} and \prm {parshape}. This is controlled by a new parameter -\lpr {shapemode}: - -\starttabulate[|c|l|l|] -\DB value \BC \prm {hangindent} \BC \prm {parshape} \NC \NR -\TB -\BC \type{0} \NC normal \NC normal \NC \NR -\BC \type{1} \NC mirrored \NC normal \NC \NR -\BC \type{2} \NC normal \NC mirrored \NC \NR -\BC \type{3} \NC mirrored \NC mirrored \NC \NR -\LL -\stoptabulate - -The value is reset to zero (like \prm {hangindent} and \prm {parshape}) -after the paragraph is done with. You can use negative values to prevent -this. In \in {figure} [fig:shapemode] a few examples are given. - -\startplacefigure[reference=fig:shapemode,title={The effect of \type {shapemode}.}] - \startcombination[2*3] - {\ruledvbox \bgroup \setuptolerance[verytolerant] - \hsize .45\textwidth \switchtobodyfont[6pt] - \pardir TLT \textdir TLT - \hangindent 40pt \hangafter -3 - \leftskip10pt \input tufte \par - \egroup} {TLT: hangindent} - {\ruledvbox \bgroup \setuptolerance[verytolerant] - \hsize .45\textwidth \switchtobodyfont[6pt] - \pardir TLT \textdir TLT - \parshape 4 0pt .8\hsize 10pt .8\hsize 20pt .8\hsize 0pt \hsize - \input tufte \par - \egroup} {TLT: parshape} - {\ruledvbox \bgroup \setuptolerance[verytolerant] - \hsize .45\textwidth \switchtobodyfont[6pt] - \pardir TRT \textdir TRT - \hangindent 40pt \hangafter -3 - \leftskip10pt \input tufte \par - \egroup} {TRT: hangindent mode 0} - {\ruledvbox \bgroup \setuptolerance[verytolerant] - \hsize .45\textwidth \switchtobodyfont[6pt] - \pardir TRT \textdir TRT - \parshape 4 0pt .8\hsize 10pt .8\hsize 20pt .8\hsize 0pt \hsize - \input tufte \par - \egroup} {TRT: parshape mode 0} - {\ruledvbox \bgroup \setuptolerance[verytolerant] - \hsize .45\textwidth \switchtobodyfont[6pt] - \shapemode=3 - \pardir TRT \textdir TRT - \hangindent 40pt \hangafter -3 - \leftskip10pt \input tufte \par - \egroup} {TRT: hangindent mode 1 & 3} - {\ruledvbox \bgroup \setuptolerance[verytolerant] - \hsize .45\textwidth \switchtobodyfont[6pt] - \shapemode=3 - \pardir TRT \textdir TRT - \parshape 4 0pt .8\hsize 10pt .8\hsize 20pt .8\hsize 0pt \hsize - \input tufte \par - \egroup} {TRT: parshape mode 2 & 3} - \stopcombination -\stopplacefigure - -\stopsubsection - -\startsubsection[title={Symbols or numbers}] - -Internally the implementation is different from \ALEPH. First of all we use no -whatsits but dedicated nodes, but also we have only 4 directions that are mapped -onto 4 numbers. A text direction node can mark the start or end of a sequence of -nodes, and therefore has two states. At the \TEX\ end we don't see these states -because \TEX\ itself will add proper end state nodes if needed. - -The symbolic names \type {TLT}, \type {TRT}, etc.\ originate in \OMEGA. In -\LUATEX\ we also have a number based model which sometimes makes more sense. - -\starttabulate[|c|l|l|] -\DB value \BC equivalent \NC \NR -\TB -\BC \type {0} \NC TLT \NC \NR -\BC \type {1} \NC TRT \NC \NR -\BC \type {2} \NC LTL \NC \NR -\BC \type {3} \NC RTT \NC \NR -\LL -\stoptabulate - -We support the \OMEGA\ primitives \orm {textdir}, \orm {pardir}, \orm {pagedir}, -\orm {pardir} and \orm {mathdir}. These accept three character keywords. The -primitives that set the direction by number are: \lpr {textdirection}, \lpr -{pardirection}, \lpr {pagedirection} and \lpr {bodydirection} and \lpr -{mathdirection}. When specifying a direction for a box you can use \type {bdir} -instead of \type {dir}. - -\stopsubsection - -\stopsection - -\startsection[title=Implementation notes] - -\startsubsection[title=Memory allocation] - -\topicindex {memory} - -The single internal memory heap that traditional \TEX\ used for tokens and nodes -is split into two separate arrays. Each of these will grow dynamically when -needed. - -The \type {texmf.cnf} settings related to main memory are no longer used (these -are: \type {main_memory}, \type {mem_bot}, \type {extra_mem_top} and \type -{extra_mem_bot}). \quote {Out of main memory} errors can still occur, but the -limiting factor is now the amount of RAM in your system, not a predefined limit. - -Also, the memory (de)allocation routines for nodes are completely rewritten. The -relevant code now lives in the C file \type {texnode.c}, and basically uses a -dozen or so \quote {avail} lists instead of a doubly|-|linked model. An extra -function layer is added so that the code can ask for nodes by type instead of -directly requisitioning a certain amount of memory words. - -Because of the split into two arrays and the resulting differences in the data -structures, some of the macros have been duplicated. For instance, there are now -\type {vlink} and \type {vinfo} as well as \type {token_link} and \type -{token_info}. All access to the variable memory array is now hidden behind a -macro called \type {vmem}. We mention this because using the \TEX book as -reference is still quite valid but not for memory related details. Another -significant detail is that we have double linked node lists and that most nodes -carry more data. - -The input line buffer and pool size are now also reallocated when needed, and the -\type {texmf.cnf} settings \type {buf_size} and \type {pool_size} are silently -ignored. - -\stopsubsection - -\startsubsection[title=Sparse arrays] - -The \prm {mathcode}, \prm {delcode}, \prm {catcode}, \prm {sfcode}, \prm {lccode} -and \prm {uccode} (and the new \lpr {hjcode}) tables are now sparse arrays that -are implemented in~\CCODE. They are no longer part of the \TEX\ \quote -{equivalence table} and because each had 1.1 million entries with a few memory -words each, this makes a major difference in memory usage. Performance is not -really hurt by this. - -The \prm {catcode}, \prm {sfcode}, \prm {lccode}, \prm {uccode} and \lpr {hjcode} -assignments don't show up when using the \ETEX\ tracing routines \prm -{tracingassigns} and \prm {tracingrestores} but we don't see that as a real -limitation. - -A side|-|effect of the current implementation is that \prm {global} is now more -expensive in terms of processing than non|-|global assignments but not many users -will notice that. - -The glyph ids within a font are also managed by means of a sparse array as glyph -ids can go up to index $2^{21}-1$ but these are never accessed directly so again -users will not notice this. - -\stopsubsection - -\startsubsection[title=Simple single|-|character csnames] - -\topicindex {csnames} - -Single|-|character commands are no longer treated specially in the internals, -they are stored in the hash just like the multiletter csnames. - -The code that displays control sequences explicitly checks if the length is one -when it has to decide whether or not to add a trailing space. - -Active characters are internally implemented as a special type of multi|-|letter -control sequences that uses a prefix that is otherwise impossible to obtain. - -\stopsubsection - -\startsubsection[title=The compressed format file] - -\topicindex {format} - -The format is passed through \type {zlib}, allowing it to shrink to roughly half -of the size it would have had in uncompressed form. This takes a bit more \CPU\ -cycles but much less disk \IO, so it should still be faster. We use a level~3 -compression which we found to be the optimal trade|-|off between filesize and -decompression speed. - -\stopsubsection - -\startsubsection[title=Binary file reading] - -\topicindex {files+binary} - -All of the internal code is changed in such a way that if one of the \type -{read_xxx_file} callbacks is not set, then the file is read by a \CCODE\ function -using basically the same convention as the callback: a single read into a buffer -big enough to hold the entire file contents. While this uses more memory than the -previous code (that mostly used \type {getc} calls), it can be quite a bit faster -(depending on your \IO\ subsystem). - -\stopsubsection - -\startsubsection[title=Tabs and spaces] - -\topicindex {space} -\topicindex {newline} - -We conform to the way other \TEX\ engines handle trailing tabs and spaces. For -decades trailing tabs and spaces (before a newline) were removed from the input -but this behaviour was changed in September 2017 to only handle spaces. We are -aware that this can introduce compatibility issues in existing workflows but -because we don't want too many differences with upstream \TEXLIVE\ we just follow -up on that patch (which is a functional one and not really a fix). It is up to -macro packages maintainers to deal with possible compatibility issues and in -\LUATEX\ they can do so via the callbacks that deal with reading from files. - -The previous behaviour was a known side effect and (as that kind of input -normally comes from generated sources) it was normally dealt with by adding a -comment token to the line in case the spaces and|/|or tabs were intentional and -to be kept. We are aware of the fact that this contradicts some of our other -choices but consistency with other engines and the fact that in \KPSE\ mode a -common file \IO\ layer is used can have a side effect of breaking compatibility. -We still stick to our view that at the log level we can (and might be) more -incompatible. We already expose some more details. - -\stopsubsection - -\stopsection - -\stopchapter - -\stopcomponent +% language=uk + +\environment luatex-style + +\startcomponent luatex-modifications + +\startchapter[reference=modifications,title={Modifications}] + +\startsection[title=The merged engines] + +\startsubsection[title=The need for change] + +\topicindex {engines} +\topicindex {history} + +The first version of \LUATEX\ only had a few extra primitives and it was largely +the same as \PDFTEX. Then we merged substantial parts of \ALEPH\ into the code +and got more primitives. When we got more stable the decision was made to clean +up the rather hybrid nature of the program. This means that some primitives have +been promoted to core primitives, often with a different name, and that others +were removed. This made it possible to start cleaning up the code base. In \in +{chapter} [enhancements] we discussed some new primitives, here we will cover +most of the adapted ones. + +Besides the expected changes caused by new functionality, there are a number of +not|-|so|-|expected changes. These are sometimes a side|-|effect of a new +(conflicting) feature, or, more often than not, a change necessary to clean up +the internal interfaces. These will also be mentioned. + +\stopsubsection + +\startsubsection[title=Changes from \TEX\ 3.1415926] + +\topicindex {\TEX} + +Of course it all starts with traditional \TEX. Even if we started with \PDFTEX, +most still comes from the original. But we divert a bit. + +\startitemize + +\startitem + The current code base is written in \CCODE, not \PASCAL. We use \CWEB\ when + possible. As a consequence instead of one large file plus change files, we + now have multiple files organized in categories like \type {tex}, \type + {pdf}, \type {lang}, \type {font}, \type {lua}, etc. There are some artifacts + of the conversion to \CCODE, but in due time we will clean up the source code + and make sure that the documentation is done right. Many files are in the + \CWEB\ format, but others, like those interfacing to \LUA, are \CCODE\ files. + Of course we want to stay as close as possible to the original so that the + documentation of the fundamentals behind \TEX\ by Don Knuth still applies. +\stopitem + +\startitem + See \in {chapter} [languages] for many small changes related to paragraph + building, language handling and hyphenation. The most important change is + that adding a brace group in the middle of a word (like in \type {of{}fice}) + does not prevent ligature creation. +\stopitem + +\startitem + There is no pool file, all strings are embedded during compilation. +\stopitem + +\startitem + The specifier \type {plus 1 fillll} does not generate an error. The extra + \quote{l} is simply typeset. +\stopitem + +\startitem + The upper limit to \prm {endlinechar} and \prm {newlinechar} is 127. +\stopitem + +\startitem + Magnification (\prm {mag}) is only supported in \DVI\ output mode. You can + set this parameter and it even works with \type {true} units till you switch + to \PDF\ output mode. When you use \PDF\ output you can best not touch the + \prm {mag} variable. This fuzzy behaviour is not much different from using + \PDF\ backend related functionality while eventually \DVI\ output is + required. + + After the output mode has been frozen (normally that happens when the first + page is shipped out) or when \PDF\ output is enabled, the \type {true} + specification is ignored. When you preload a plain format adapted to + \LUATEX\ it can be that the \prm {mag} parameter already has been set. +\stopitem + +\stopitemize + +\stopsubsection + +\startsubsection[title=Changes from \ETEX\ 2.2] + +\topicindex {\ETEX} + +Being the de factor standard extension of course we provide the \ETEX\ +functionality, but with a few small adaptations. + +\startitemize + +\startitem + The \ETEX\ functionality is always present and enabled so the prepended + asterisk or \type {-etex} switch for \INITEX\ is not needed. +\stopitem + +\startitem + The \TEXXET\ extension is not present, so the primitives \type + {\TeXXeTstate}, \type {\beginR}, \type {\beginL}, \type {\endR} and \type + {\endL} are missing. Instead we used the \OMEGA/\ALEPH\ approach to + directionality as starting point. +\stopitem + +\startitem + Some of the tracing information that is output by \ETEX's \prm + {tracingassigns} and \prm {tracingrestores} is not there. +\stopitem + +\startitem + Register management in \LUATEX\ uses the \OMEGA/\ALEPH\ model, so the maximum + value is 65535 and the implementation uses a flat array instead of the mixed + flat & sparse model from \ETEX. +\stopitem + +\startitem + When kpathsea is used to find files, \LUATEX\ uses the \type {ofm} file + format to search for font metrics. In turn, this means that \LUATEX\ looks at + the \type {OFMFONTS} configuration variable (like \OMEGA\ and \ALEPH) instead + of \type {TFMFONTS} (like \TEX\ and \PDFTEX). Likewise for virtual fonts + (\LUATEX\ uses the variable \type {OVFFONTS} instead of \type {VFFONTS}). +\stopitem + +\startitem + The primitives that report a stretch or shrink order report a value in a + convenient range zero upto four. Because some macro packages can break on + that we also provide \type {\eTeXgluestretchorder} and \type + {\eTeXglueshrinkorder} which report values compatible with \ETEX. The (new) + \type {fi} value is reported as \type {-1} (so when used in an \type + {\ifcase} test that value makes one end up in the \type {\else}). +\stopitem + +\stopitemize + +\stopsubsection + +\startsubsection[title=Changes from \PDFTEX\ 1.40] + +\topicindex {\PDFTEX} + +Because we want to produce \PDF\ the most natural starting point was the popular +\PDFTEX\ program. We inherit the stable features, dropped most of the +experimental code and promoted some functionality to core \LUATEX\ functionality +which in turn triggered renaming primitives. + +For compatibility reasons we still refer to \type {\pdf...} commands but \LUATEX\ +has a different backend interface. Instead of these primitives there are three +interfacing primitives: \lpr {pdfextension}, \lpr {pdfvariable} and \lpr +{pdffeedback} that take keywords and optional further arguments (below we will +still use the \tex {pdf} prefix names as reference). This way we can extend the +features when needed but don't need to adapt the core engine. The front- and +backend are decoupled as much as possible. + +\startitemize + +\startitem + The (experimental) support for snap nodes has been removed, because it is + much more natural to build this functionality on top of node processing and + attributes. The associated primitives that are gone are: \orm + {pdfsnaprefpoint}, \orm {pdfsnapy}, and \orm {pdfsnapycomp}. +\stopitem + +\startitem + The (experimental) support for specialized spacing around nodes has also been + removed. The associated primitives that are gone are: \orm + {pdfadjustinterwordglue}, \orm {pdfprependkern}, and \orm {pdfappendkern}, as + well as the five supporting primitives \orm {knbscode}, \orm {stbscode}, \orm + {shbscode}, \orm {knbccode}, and \orm {knaccode}. +\stopitem + +\startitem + A number of \quote {\PDFTEX\ primitives} have been removed as they can be + implemented using \LUA: \orm {pdfelapsedtime}, \orm {pdfescapehex}, \orm + {pdfescapename}, \orm {pdfescapestring}, \orm {pdffiledump}, \orm + {pdffilemoddate}, \orm {pdffilesize}, \orm {pdfforcepagebox}, \orm + {pdflastmatch}, \orm {pdfmatch}, \orm {pdfmdfivesum}, \orm {pdfmovechars}, + \orm {pdfoptionalwaysusepdfpagebox}, \orm {pdfoptionpdfinclusionerrorlevel}, + \orm {pdfresettimer}, \orm {pdfshellescape}, \orm {pdfstrcmp} and \orm + {pdfunescapehex}. +\stopitem + +\startitem + The version related primitives \orm {pdftexbanner}, \orm {pdftexversion} + and \orm {pdftexrevision} are no longer present as there is no longer a + relationship with \PDFTEX\ development. +\stopitem + +\startitem + The experimental snapper mechanism has been removed and therefore also the + primitives \orm {pdfignoreddimen}, \orm {pdffirstlineheight}, \orm + {pdfeachlineheight}, \orm {pdfeachlinedepth} and \orm {pdflastlinedepth}. +\stopitem + +\startitem + The experimental primitives \lpr {primitive}, \lpr {ifprimitive}, \lpr + {ifabsnum} and \lpr {ifabsdim} are promoted to core primitives. The \type + {\pdf*} prefixed originals are not available. +\stopitem + +\startitem + Because \LUATEX\ has a different subsystem for managing images, more + diversion from its ancestor happened in the meantime. We don't adapt to + changes in \PDFTEX. +\stopitem + +\startitem + Two extra token lists are provided, \orm {pdfxformresources} and \orm + {pdfxformattr}, as an alternative to \orm {pdfxform} keywords. +\stopitem + +\startitem + Image specifications also support \type {visiblefilename}, \type + {userpassword} and \type {ownerpassword}. The password options are only + relevant for encrypted \PDF\ files. +\stopitem + +\startitem + The current version of \LUATEX\ no longer replaces and|/|or merges fonts in + embedded \PDF\ files with fonts of the enveloping \PDF\ document. This + regression may be temporary, depending on how the rewritten font backend will + look like. +\stopitem + +\startitem + The primitives \orm {pdfpagewidth} and \orm {pdfpageheight} have been removed + because \lpr {pagewidth} and \lpr {pageheight} have that purpose. +\stopitem + +\startitem + The primitives \orm {pdfnormaldeviate}, \orm {pdfuniformdeviate}, \orm + {pdfsetrandomseed} and \orm {pdfrandomseed} have been promoted to core + primitives without \type {pdf} prefix so the original commands are no longer + recognized. +\stopitem + +\startitem + The primitives \lpr {ifincsname}, \lpr {expanded} and \lpr {quitvmode} + are now core primitives. +\stopitem + +\startitem + As the hz and protrusion mechanism are part of the core the related + primitives \lpr {lpcode}, \lpr {rpcode}, \lpr {efcode}, \lpr + {leftmarginkern}, \lpr {rightmarginkern} are promoted to core primitives. The + two commands \lpr {protrudechars} and \lpr {adjustspacing} replace their + prefixed with \type {\pdf} originals. +\stopitem + +\startitem + The hz optimization code has been partially redone so that we no longer need + to create extra font instances. The front- and backend have been decoupled + and more efficient (\PDF) code is generated. +\stopitem + +\startitem + When \lpr {adjustspacing} has value~2, hz optimization will be applied to + glyphs and kerns. When the value is~3, only glyphs will be treated. A value + smaller than~2 disables this feature. +\stopitem + +\startitem + The \lpr {tagcode} primitive is promoted to core primitive. +\stopitem + +\startitem + The \lpr {letterspacefont} feature is now part of the core but will not be + changed (improved). We just provide it for legacy use. +\stopitem + +\startitem + The \orm {pdfnoligatures} primitive is now \lpr {ignoreligaturesinfont}. +\stopitem + +\startitem + The \orm {pdfcopyfont} primitive is now \lpr {copyfont}. +\stopitem + +\startitem + The \orm {pdffontexpand} primitive is now \lpr {expandglyphsinfont}. +\stopitem + +\startitem + Because position tracking is also available in \DVI\ mode the \lpr {savepos}, + \lpr {lastxpos} and \lpr {lastypos} commands now replace their \type {pdf} + prefixed originals. +\stopitem + +\startitem + The introspective primitives \type {\pdflastximagecolordepth} and \type + {\pdfximagebbox} have been removed. One can use external applications to + determine these properties or use the built|-|in \type {img} library. +\stopitem + +\startitem + The initializers \orm {pdfoutput} has been replaced by \lpr {outputmode} and + \orm {pdfdraftmode} is now \lpr {draftmode}. +\stopitem + +\startitem + The pixel multiplier dimension \orm {pdfpxdimen} lost its prefix and is now + called \lpr {pxdimen}. +\stopitem + +\startitem + An extra \orm {pdfimageaddfilename} option has been added that can be used to + block writing the filename to the \PDF\ file. +\stopitem + +\startitem + The primitive \orm {pdftracingfonts} is now \lpr {tracingfonts} as it + doesn't relate to the backend. +\stopitem + +\startitem + The experimental primitive \orm {pdfinsertht} is kept as \lpr {insertht}. +\stopitem + +\startitem + There is some more control over what metadata goes into the \PDF\ file. +\stopitem + +\startitem + The promotion of primitives to core primitives as well as the separation of + font- and backend means that the initialization namespace \type {pdftex} is + gone. +\stopitem + +\stopitemize + +One change involves the so called xforms and ximages. In \PDFTEX\ these are +implemented as so called whatsits. But contrary to other whatsits they have +dimensions that need to be taken into account when for instance calculating +optimal line breaks. In \LUATEX\ these are now promoted to a special type of rule +nodes, which simplifies code that needs those dimensions. + +Another reason for promotion is that these are useful concepts. Backends can +provide the ability to use content that has been rendered in several places, and +images are also common. As already mentioned in \in {section} +[sec:imagedandforms], we now have: + +\starttabulate[|l|l|] +\DB \LUATEX \BC \PDFTEX \NC \NR +\TB +\NC \lpr {saveboxresource} \NC \orm {pdfxform} \NC \NR +\NC \lpr {saveimageresource} \NC \orm {pdfximage} \NC \NR +\NC \lpr {useboxresource} \NC \orm {pdfrefxform} \NC \NR +\NC \lpr {useimageresource} \NC \orm {pdfrefximage} \NC \NR +\NC \lpr {lastsavedboxresourceindex} \NC \orm {pdflastxform} \NC \NR +\NC \lpr {lastsavedimageresourceindex} \NC \orm {pdflastximage} \NC \NR +\NC \lpr {lastsavedimageresourcepages} \NC \orm {pdflastximagepages} \NC \NR +\LL +\stoptabulate + +There are a few \lpr {pdffeedback} features that relate to this but these are +typical backend specific ones. The index that gets returned is to be considered +as \quote {just a number} and although it still has the same meaning (object +related) as before, you should not depend on that. + +The protrusion detection mechanism is enhanced a bit to enable a bit more complex +situations. When protrusion characters are identified some nodes are skipped: + +\startitemize[packed,columns,two] +\startitem zero glue \stopitem +\startitem penalties \stopitem +\startitem empty discretionaries \stopitem +\startitem normal zero kerns \stopitem +\startitem rules with zero dimensions \stopitem +\startitem math nodes with a surround of zero \stopitem +\startitem dir nodes \stopitem +\startitem empty horizontal lists \stopitem +\startitem local par nodes \stopitem +\startitem inserts, marks and adjusts \stopitem +\startitem boundaries \stopitem +\startitem whatsits \stopitem +\stopitemize + +Because this can not be enough, you can also use a protrusion boundary node to +make the next node being ignored. When the value is~1 or~3, the next node will be +ignored in the test when locating a left boundary condition. When the value is~2 +or~3, the previous node will be ignored when locating a right boundary condition +(the search goes from right to left). This permits protrusion combined with for +instance content moved into the margin: + +\starttyping +\protrusionboundary1\llap{!\quad}«Who needs protrusion?» +\stoptyping + +\stopsubsection + +\startsubsection[title=Changes from \ALEPH\ RC4] + +\topicindex {\ALEPH} + +Because we wanted proper directional typesetting the \ALEPH\ mechanisms looked +most attractive. These are rather close to the ones provided by \OMEGA, so what +we say next applies to both these programs. + +\startitemize + +\startitem + The extended 16-bit math primitives (\orm {omathcode} etc.) have been + removed. +\stopitem + +\startitem + The \OCP\ processing has been removed completely and as a consequence, the + following primitives have been removed: \orm {ocp}, \orm {externalocp}, \orm + {ocplist}, \orm {pushocplist}, \orm {popocplist}, \orm {clearocplists}, \orm + {addbeforeocplist}, \orm {addafterocplist}, \orm {removebeforeocplist}, \orm + {removeafterocplist} and \orm {ocptracelevel}. +\stopitem + +\startitem + \LUATEX\ only understands 4~of the 16~direction specifiers of \ALEPH: \type + {TLT} (latin), \type {TRT} (arabic), \type {RTT} (cjk), \type {LTL} (mongolian). + All other direction specifiers generate an error. In addition to a keyword + driven model we also provide an integer driven one. +\stopitem + +\startitem + The input translations from \ALEPH\ are not implemented, the related + primitives are not available: \orm {DefaultInputMode}, \orm + {noDefaultInputMode}, \orm {noInputMode}, \orm {InputMode}, \orm + {DefaultOutputMode}, \orm {noDefaultOutputMode}, \orm {noOutputMode}, \orm + {OutputMode}, \orm {DefaultInputTranslation}, \orm + {noDefaultInputTranslation}, \orm {noInputTranslation}, \orm + {InputTranslation}, \orm {DefaultOutputTranslation}, \orm + {noDefaultOutputTranslation}, \orm {noOutputTranslation} and \orm + {OutputTranslation}. +\stopitem + +\startitem + Several bugs have been fixed and confusing implementation details have been + sorted out. +\stopitem + +\startitem + The scanner for direction specifications now allows an optional space after + the direction is completely parsed. +\stopitem + +\startitem + The \type {^^} notation has been extended: after \type {^^^^} four + hexadecimal characters are expected and after \type {^^^^^^} six hexadecimal + characters have to be given. The original \TEX\ interpretation is still valid + for the \type {^^} case but the four and six variants do no backtracking, + i.e.\ when they are not followed by the right number of hexadecimal digits + they issue an error message. Because \type{^^^} is a normal \TEX\ case, we + don't support the odd number of \type {^^^^^} either. +\stopitem + +\startitem + Glues {\it immediately after} direction change commands are not legal + breakpoints. +\stopitem + +\startitem + Several mechanisms that need to be right|-|to|-|left aware have been + improved. For instance placement of formula numbers. +\stopitem + +\startitem + The page dimension related primitives \lpr {pagewidth} and \lpr {pageheight} + have been promoted to core primitives. The \prm {hoffset} and \prm {voffset} + primitives have been fixed. +\stopitem + +\startitem + The primitives \type {\charwd}, \type {\charht}, \type {\chardp} and \type + {\charit} have been removed as we have the \ETEX\ variants \type + {\fontchar*}. +\stopitem + +\startitem + The two dimension registers \lpr {pagerightoffset} and \lpr + {pagebottomoffset} are now core primitives. +\stopitem + +\startitem + The direction related primitives \lpr {pagedir}, \lpr {bodydir}, \lpr + {pardir}, \lpr {textdir}, \lpr {mathdir} and \lpr {boxdir} are now core + primitives. +\stopitem + +\startitem + The promotion of primitives to core primitives as well as removing of all + others means that the initialization namespace \type {aleph} that early + versions of \LUATEX\ provided is gone. +\stopitem + +\stopitemize + +The above let's itself summarize as: we took the 32 bit aspects and much of the +directional mechanisms and merged it into the \PDFTEX\ code base as starting +point for further development. Then we simplified directionality, fixed it and +opened it up. + +\stopsubsection + +\startsubsection[title=Changes from standard \WEBC] + +\topicindex {\WEBC} + +The compilation framework is \WEBC\ and we keep using that but without the +\PASCAL\ to \CCODE\ step. This framework also provides some common features that +deal with reading bytes from files and locating files in \TDS. This is what we do +different: + +\startitemize + +\startitem + There is no mltex support. +\stopitem + +\startitem + There is no enctex support. +\stopitem + +\startitem + The following encoding related command line switches are silently ignored, + even in non|-|\LUA\ mode: \type {-8bit}, \type {-translate-file}, \type + {-mltex}, \type {-enc} and \type {-etex}. +\stopitem + +\startitem + The \prm {openout} whatsits are not written to the log file. +\stopitem + +\startitem + Some of the so|-|called \WEBC\ extensions are hard to set up in non|-|\KPSE\ + mode because \type {texmf.cnf} is not read: \type {shell-escape} is off (but + that is not a problem because of \LUA's \type {os.execute}), and the paranoia + checks on \type {openin} and \type {openout} do not happen. However, it is + easy for a \LUA\ script to do this itself by overloading \type {io.open} and + alike. +\stopitem + +\startitem + The \quote{E} option does not do anything useful. +\stopitem + +\stopitemize + +\stopsubsection + +\stopsection + +\startsection[reference=backendprimitives,title=The backend primitives] + +\startsubsection[title={Less primitives}] + +\topicindex {backend} +\topicindex {\PDF+backend} + +In a previous section we mentioned that some \PDFTEX\ primitives were removed and +others promoted to core \LUATEX\ primitives. That is only part of the story. In +order to separate the backend specific primitives in de code these commands are +now replaced by only a few. In traditional \TEX\ we only had the \DVI\ backend +but now we have two: \DVI\ and \PDF. Additional functionality is implemented as +\quote {extensions} in \TEX\ speak. By separating more strickly we are able to +keep the core (frontend) clean and stable and isolate these extensions. If for +some reason an extra backend option is needed, it can be implemented without +touching the core. The three \PDF\ backend related primitives are: + +\starttyping +\pdfextension command [specification] +\pdfvariable name +\pdffeedback name +\stoptyping + +An extension triggers further parsing, depending on the command given. A variable is +a (kind of) register and can be read and written, while a feedback is reporting +something (as it comes from the backend it's normally a sequence of tokens). + +\stopsubsection + +\startsubsection[title={\lpr{pdfextension}, \lpr {pdfvariable} and \lpr {pdffeedback}},reference=sec:pdfextensions] + +In order for \LUATEX\ to be more than just \TEX\ you need to enable primitives. That +has already been the case right from the start. If you want the traditional \PDFTEX\ +primitives (for as far their functionality is still around) you now can do this: + +\starttyping +\protected\def\pdfliteral {\pdfextension literal} +\protected\def\pdfcolorstack {\pdfextension colorstack} +\protected\def\pdfsetmatrix {\pdfextension setmatrix} +\protected\def\pdfsave {\pdfextension save\relax} +\protected\def\pdfrestore {\pdfextension restore\relax} +\protected\def\pdfobj {\pdfextension obj } +\protected\def\pdfrefobj {\pdfextension refobj } +\protected\def\pdfannot {\pdfextension annot } +\protected\def\pdfstartlink {\pdfextension startlink } +\protected\def\pdfendlink {\pdfextension endlink\relax} +\protected\def\pdfoutline {\pdfextension outline } +\protected\def\pdfdest {\pdfextension dest } +\protected\def\pdfthread {\pdfextension thread } +\protected\def\pdfstartthread {\pdfextension startthread } +\protected\def\pdfendthread {\pdfextension endthread\relax} +\protected\def\pdfinfo {\pdfextension info } +\protected\def\pdfcatalog {\pdfextension catalog } +\protected\def\pdfnames {\pdfextension names } +\protected\def\pdfincludechars {\pdfextension includechars } +\protected\def\pdffontattr {\pdfextension fontattr } +\protected\def\pdfmapfile {\pdfextension mapfile } +\protected\def\pdfmapline {\pdfextension mapline } +\protected\def\pdftrailer {\pdfextension trailer } +\protected\def\pdfglyphtounicode {\pdfextension glyphtounicode } +\stoptyping + +The introspective primitives can be defined as: + +\starttyping +\def\pdftexversion {\numexpr\pdffeedback version\relax} +\def\pdftexrevision {\pdffeedback revision} +\def\pdflastlink {\numexpr\pdffeedback lastlink\relax} +\def\pdfretval {\numexpr\pdffeedback retval\relax} +\def\pdflastobj {\numexpr\pdffeedback lastobj\relax} +\def\pdflastannot {\numexpr\pdffeedback lastannot\relax} +\def\pdfxformname {\numexpr\pdffeedback xformname\relax} +\def\pdfcreationdate {\pdffeedback creationdate} +\def\pdffontname {\numexpr\pdffeedback fontname\relax} +\def\pdffontobjnum {\numexpr\pdffeedback fontobjnum\relax} +\def\pdffontsize {\dimexpr\pdffeedback fontsize\relax} +\def\pdfpageref {\numexpr\pdffeedback pageref\relax} +\def\pdfcolorstackinit {\pdffeedback colorstackinit} +\stoptyping + +The configuration related registers have become: + +\starttyping +\edef\pdfcompresslevel {\pdfvariable compresslevel} +\edef\pdfobjcompresslevel {\pdfvariable objcompresslevel} +\edef\pdfrecompress {\pdfvariable recompress} +\edef\pdfdecimaldigits {\pdfvariable decimaldigits} +\edef\pdfgamma {\pdfvariable gamma} +\edef\pdfimageresolution {\pdfvariable imageresolution} +\edef\pdfimageapplygamma {\pdfvariable imageapplygamma} +\edef\pdfimagegamma {\pdfvariable imagegamma} +\edef\pdfimagehicolor {\pdfvariable imagehicolor} +\edef\pdfimageaddfilename {\pdfvariable imageaddfilename} +\edef\pdfpkresolution {\pdfvariable pkresolution} +\edef\pdfpkfixeddpi {\pdfvariable pkfixeddpi} +\edef\pdfinclusioncopyfonts {\pdfvariable inclusioncopyfonts} +\edef\pdfinclusionerrorlevel {\pdfvariable inclusionerrorlevel} +\edef\pdfignoreunknownimages {\pdfvariable ignoreunknownimages} +\edef\pdfgentounicode {\pdfvariable gentounicode} +\edef\pdfomitcidset {\pdfvariable omitcidset} +\edef\pdfomitcharset {\pdfvariable omitcharset} +\edef\pdfpagebox {\pdfvariable pagebox} +\edef\pdfminorversion {\pdfvariable minorversion} +\edef\pdfuniqueresname {\pdfvariable uniqueresname} + +\edef\pdfhorigin {\pdfvariable horigin} +\edef\pdfvorigin {\pdfvariable vorigin} +\edef\pdflinkmargin {\pdfvariable linkmargin} +\edef\pdfdestmargin {\pdfvariable destmargin} +\edef\pdfthreadmargin {\pdfvariable threadmargin} +\edef\pdfxformmargin {\pdfvariable xformmargin} + +\edef\pdfpagesattr {\pdfvariable pagesattr} +\edef\pdfpageattr {\pdfvariable pageattr} +\edef\pdfpageresources {\pdfvariable pageresources} +\edef\pdfxformattr {\pdfvariable xformattr} +\edef\pdfxformresources {\pdfvariable xformresources} +\edef\pdfpkmode {\pdfvariable pkmode} + +\edef\pdfsuppressoptionalinfo {\pdfvariable suppressoptionalinfo } +\edef\pdftrailerid {\pdfvariable trailerid } +\stoptyping + +The variables are internal ones, so they are anonymous. When you ask for the +meaning of a few previously defined ones: + +\starttyping +\meaning\pdfhorigin +\meaning\pdfcompresslevel +\meaning\pdfpageattr +\stoptyping + +you will get: + +\starttyping +macro:->[internal backend dimension] +macro:->[internal backend integer] +macro:->[internal backend tokenlist] +\stoptyping + +The \prm {edef} can also be a \prm {def} but it's a bit more efficient to expand +the lookup related register beforehand. + +The backend is derived from \PDFTEX\ so the same syntax applies. However, the +\type {outline} command accepts a \type {objnum} followed by a number. No +checking takes place so when this is used it had better be a valid (flushed) +object. + +In order to be (more or less) compatible with \PDFTEX\ we also support the option +to suppress some info but we do so via a bitset: + +\starttyping +\pdfvariable suppressoptionalinfo \numexpr + 0 + + 1 % PTEX.FullBanner + + 2 % PTEX.FileName + + 4 % PTEX.PageNumber + + 8 % PTEX.InfoDict + + 16 % Creator + + 32 % CreationDate + + 64 % ModDate + + 128 % Producer + + 256 % Trapped + + 512 % ID +\relax +\stoptyping + +In addition you can overload the trailer id, but we don't do any checking on +validity, so you have to pass a valid array. The following is like the ones +normally generated by the engine. You even need to include the brackets here! + +\starttyping +\pdfvariable trailerid {[ + + +]} +\stoptyping + +Although we started from a merge of \PDFTEX\ and \ALEPH, by now the code base as +well as functionality has diverted from those parents. Here we show the options +that can be passed to the extensions. + +\starttexsyntax +\pdfextension literal + [ direct | page | raw ] { tokens } +\stoptexsyntax + +\starttexsyntax +\pdfextension dest + num integer | name { tokens }!crlf + [ fitbh | fitbv | fitb | fith| fitv | fit | + fitr | xyz [ zoom ] +\stoptexsyntax + +\starttexsyntax +\pdfextension annot + reserveobjnum | useobjnum + { tokens } +\stoptexsyntax + +\starttexsyntax +\pdfextension save +\stoptexsyntax + +\starttexsyntax +\pdfextension restore +\stoptexsyntax + +\starttexsyntax +\pdfextension setmatrix + { tokens } +\stoptexsyntax + +\starttexsyntax +[ \immediate ] \pdfextension obj + reserveobjnum +\stoptexsyntax + +\starttexsyntax +[ \immediate ] \pdfextension obj + [ useobjnum ] + [ uncompressed ] + [ stream [ attr { tokens } ] ] + [ file ] + { tokens } +\stoptexsyntax + +\starttexsyntax +\pdfextension refobj + +\stoptexsyntax + +\starttexsyntax +\pdfextension colorstack + + set { tokens } | push { tokens } | pop | current +\stoptexsyntax + +\starttexsyntax +\pdfextension startlink + [ attr { tokens } ] + user { tokens } | goto | thread + [ file { tokens } ] + [ page { tokens } | name { tokens } | num integer ] + [ newwindow | nonewwindow ] +\stoptexsyntax + +\starttexsyntax +\pdfextension endlink +\stoptexsyntax + +\starttexsyntax +\pdfextension startthread + num | name { tokens } +\stoptexsyntax + +\starttexsyntax +\pdfextension endthread +\stoptexsyntax + +\starttexsyntax +\pdfextension thread + num | name { tokens } +\stoptexsyntax + +\starttexsyntax +\pdfextension outline + [ attr { tokens } ] + [ useobjnum ] + [ count ] + { tokens } +\stoptexsyntax + +\starttexsyntax +\pdfextension glyphtounicode + { tokens } + { tokens } +\stoptexsyntax + +\starttexsyntax +\pdfextension catalog + { tokens } + [ openaction + user { tokens } | goto | thread + [ file { tokens } ] + [ page { tokens } | name { tokens } | num ] + [ newwindow | nonewwindow ] ] +\stoptexsyntax + +\starttexsyntax +\pdfextension fontattr + + {tokens} +\stoptexsyntax + +\starttexsyntax +\pdfextension mapfile + {tokens} +\stoptexsyntax + +\starttexsyntax +\pdfextension mapline + {tokens} +\stoptexsyntax + +\starttexsyntax +\pdfextension includechars + {tokens} +\stoptexsyntax + +\starttexsyntax +\pdfextension info + {tokens} +\stoptexsyntax + +\starttexsyntax +\pdfextension names + {tokens} +\stoptexsyntax + +\starttexsyntax +\pdfextension trailer + {tokens} +\stoptexsyntax + +\stopsubsection + +\startsubsection[title={Defaults}] + +The engine sets the following defaults. + +\starttyping +\pdfcompresslevel 9 +\pdfobjcompresslevel 1 % used: (0,9) +\pdfrecompress 0 % mostly for debugging +\pdfdecimaldigits 4 % used: (3,6) +\pdfgamma 1000 +\pdfimageresolution 71 +\pdfimageapplygamma 0 +\pdfimagegamma 2200 +\pdfimagehicolor 1 +\pdfimageaddfilename 1 +\pdfpkresolution 72 +\pdfpkfixeddpi 0 +\pdfinclusioncopyfonts 0 +\pdfinclusionerrorlevel 0 +\pdfignoreunknownimages 0 +\pdfgentounicode 0 +\pdfomitcidset 0 +\pdfomitcharset 0 +\pdfpagebox 0 +\pdfminorversion 4 +\pdfuniqueresname 0 + +\pdfhorigin 1in +\pdfvorigin 1in +\pdflinkmargin 0pt +\pdfdestmargin 0pt +\pdfthreadmargin 0pt +\pdfxformmargin 0pt +\stoptyping + +\stopsubsection + +\startsubsection[title={Backward compatibility}] + +If you also want some backward compatibility, you can add: + +\starttyping +\let\pdfpagewidth \pagewidth +\let\pdfpageheight \pageheight + +\let\pdfadjustspacing \adjustspacing +\let\pdfprotrudechars \protrudechars +\let\pdfnoligatures \ignoreligaturesinfont +\let\pdffontexpand \expandglyphsinfont +\let\pdfcopyfont \copyfont + +\let\pdfxform \saveboxresource +\let\pdflastxform \lastsavedboxresourceindex +\let\pdfrefxform \useboxresource + +\let\pdfximage \saveimageresource +\let\pdflastximage \lastsavedimageresourceindex +\let\pdflastximagepages\lastsavedimageresourcepages +\let\pdfrefximage \useimageresource + +\let\pdfsavepos \savepos +\let\pdflastxpos \lastxpos +\let\pdflastypos \lastypos + +\let\pdfoutput \outputmode +\let\pdfdraftmode \draftmode + +\let\pdfpxdimen \pxdimen + +\let\pdfinsertht \insertht + +\let\pdfnormaldeviate \normaldeviate +\let\pdfuniformdeviate \uniformdeviate +\let\pdfsetrandomseed \setrandomseed +\let\pdfrandomseed \randomseed + +\let\pdfprimitive \primitive +\let\ifpdfprimitive \ifprimitive + +\let\ifpdfabsnum \ifabsnum +\let\ifpdfabsdim \ifabsdim +\stoptyping + +And even: + +\starttyping +\newdimen\pdfeachlineheight +\newdimen\pdfeachlinedepth +\newdimen\pdflastlinedepth +\newdimen\pdffirstlineheight +\newdimen\pdfignoreddimen +\stoptyping + +\stopsubsection + +\stopsection + +\startsection[title=Directions] + +\topicindex {\OMEGA} +\topicindex {\ALEPH} +\topicindex {directions} + +\startsubsection[title={Four directions}] + +The directional model in \LUATEX\ is inherited from \OMEGA|/|\ALEPH\ but we tried +to improve it a bit. At some point we played with recovery of modes but that was +disabled later on when we found that it interfered with nested directions. That +itself had as side effect that the node list was no longer balanced with respect +to directional nodes which in turn can give side effects when a series of dir +changes happens without grouping. + +When extending the \PDF\ backend to support directions some inconsistencies were +found and as a result we decided to support only the four models that make sense +\type {TLT} (latin), \type {TRT} (arabic), \type {RTT} (cjk) and \type {LTL} +(mongolian). + +\stopsubsection + +\startsubsection[title={How it works}] + +The approach is that we again make the list balanced but try to avoid some side +effects. What happens is quite intuitive if we forget about spaces (turned into +glue) but even there what happens makes sense if you look at it in detail. +However that logic makes in|-|group switching kind of useless when no proper +nested grouping is used: switching from right to left several times nested, +results in spacing ending up after each other due to nested mirroring. Of course +a sane macro package will manage this for the user but here we are discussing the +low level dir injection. + +This is what happens: + +\starttyping +\textdir TRT nur {\textdir TLT run \textdir TRT NUR} nur +\stoptyping + +This becomes stepwise: + +\startnarrower +\starttyping +injected: [+TRT]nur {[+TLT]run [+TRT]NUR} nur +balanced: [+TRT]nur {[+TLT]run [-TLT][+TRT]NUR[-TRT]} nur[-TRT] +result : run {RUNrun } run +\stoptyping +\stopnarrower + +And this: + +\starttyping +\textdir TRT nur {nur \textdir TLT run \textdir TRT NUR} nur +\stoptyping + +becomes: + +\startnarrower +\starttyping +injected: [+TRT]nur {nur [+TLT]run [+TRT]NUR} nur +balanced: [+TRT]nur {nur [+TLT]run [-TLT][+TRT]NUR[-TRT]} nur[-TRT] +result : run {run RUNrun } run +\stoptyping +\stopnarrower + +Now, in the following examples watch where we put the braces: + +\startbuffer +\textdir TRT nur {{\textdir TLT run} {\textdir TRT NUR}} nur +\stopbuffer + +\typebuffer + +This becomes: + +\startnarrower +\getbuffer +\stopnarrower + +Compare this to: + +\startbuffer +\textdir TRT nur {{\textdir TLT run }{\textdir TRT NUR}} nur +\stopbuffer + +\typebuffer + +Which renders as: + +\startnarrower +\getbuffer +\stopnarrower + +So how do we deal with the next? + +\startbuffer +\def\ltr{\textdir TLT\relax} +\def\rtl{\textdir TRT\relax} + +run {\rtl nur {\ltr run \rtl NUR \ltr run \rtl NUR} nur} +run {\ltr run {\rtl nur \ltr RUN \rtl nur \ltr RUN} run} +\stopbuffer + +\typebuffer + +It gets typeset as: + +\startnarrower +\startlines +\getbuffer +\stoplines +\stopnarrower + +We could define the two helpers to look back, pick up a skip, remove it and +inject it after the dir node. But that way we loose the subtype information that +for some applications can be handy to be kept as|-|is. This is why we now have a +variant of \lpr {textdir} which injects the balanced node before the skip. +Instead of the previous definition we can use: + +\startbuffer[def] +\def\ltr{\linedir TLT\relax} +\def\rtl{\linedir TRT\relax} +\stopbuffer + +\typebuffer[def] + +and this time: + +\startbuffer[txt] +run {\rtl nur {\ltr run \rtl NUR \ltr run \rtl NUR} nur} +run {\ltr run {\rtl nur \ltr RUN \rtl nur \ltr RUN} run} +\stopbuffer + +\typebuffer[txt] + +comes out as a properly spaced: + +\startnarrower +\startlines +\getbuffer[def,txt] +\stoplines +\stopnarrower + +Anything more complex that this, like combination of skips and penalties, or +kerns, should be handled in the input or macro package because there is no way we +can predict the expected behaviour. In fact, the \lpr {linedir} is just a +convenience extra which could also have been implemented using node list parsing. + +\stopsubsection + +\startsubsection[title={Controlling glue with \lpr {breakafterdirmode}}] + +Glue after a dir node is ignored in the linebreak decision but you can bypass that +by setting \lpr {breakafterdirmode} to~\type {1}. The following table shows the +difference. Watch your spaces. + +\def\ShowSome#1{% + \BC \type{#1} + \NC \breakafterdirmode\zerocount\hsize\zeropoint#1 + \NC + \NC \breakafterdirmode\plusone\hsize\zeropoint#1 + \NC + \NC \NR +} + +\starttabulate[|l|Tp(1pt)|w(5em)|Tp(1pt)|w(5em)|] + \DB + \BC \type{0} + \NC + \BC \type{1} + \NC + \NC \NR + \TB + \ShowSome{pre {\textdir TLT xxx} post} + \ShowSome{pre {\textdir TLT xxx }post} + \ShowSome{pre{ \textdir TLT xxx} post} + \ShowSome{pre{ \textdir TLT xxx }post} + \ShowSome{pre { \textdir TLT xxx } post} + \ShowSome{pre {\textdir TLT\relax\space xxx} post} + \LL +\stoptabulate + +\stopsubsection + +\startsubsection[title={Controling parshapes with \lpr {shapemode}}] + +Another adaptation to the \ALEPH\ directional model is control over shapes driven +by \prm {hangindent} and \prm {parshape}. This is controlled by a new parameter +\lpr {shapemode}: + +\starttabulate[|c|l|l|] +\DB value \BC \prm {hangindent} \BC \prm {parshape} \NC \NR +\TB +\BC \type{0} \NC normal \NC normal \NC \NR +\BC \type{1} \NC mirrored \NC normal \NC \NR +\BC \type{2} \NC normal \NC mirrored \NC \NR +\BC \type{3} \NC mirrored \NC mirrored \NC \NR +\LL +\stoptabulate + +The value is reset to zero (like \prm {hangindent} and \prm {parshape}) +after the paragraph is done with. You can use negative values to prevent +this. In \in {figure} [fig:shapemode] a few examples are given. + +\startplacefigure[reference=fig:shapemode,title={The effect of \type {shapemode}.}] + \startcombination[2*3] + {\ruledvbox \bgroup \setuptolerance[verytolerant] + \hsize .45\textwidth \switchtobodyfont[6pt] + \pardir TLT \textdir TLT + \hangindent 40pt \hangafter -3 + \leftskip10pt \input tufte \par + \egroup} {TLT: hangindent} + {\ruledvbox \bgroup \setuptolerance[verytolerant] + \hsize .45\textwidth \switchtobodyfont[6pt] + \pardir TLT \textdir TLT + \parshape 4 0pt .8\hsize 10pt .8\hsize 20pt .8\hsize 0pt \hsize + \input tufte \par + \egroup} {TLT: parshape} + {\ruledvbox \bgroup \setuptolerance[verytolerant] + \hsize .45\textwidth \switchtobodyfont[6pt] + \pardir TRT \textdir TRT + \hangindent 40pt \hangafter -3 + \leftskip10pt \input tufte \par + \egroup} {TRT: hangindent mode 0} + {\ruledvbox \bgroup \setuptolerance[verytolerant] + \hsize .45\textwidth \switchtobodyfont[6pt] + \pardir TRT \textdir TRT + \parshape 4 0pt .8\hsize 10pt .8\hsize 20pt .8\hsize 0pt \hsize + \input tufte \par + \egroup} {TRT: parshape mode 0} + {\ruledvbox \bgroup \setuptolerance[verytolerant] + \hsize .45\textwidth \switchtobodyfont[6pt] + \shapemode=3 + \pardir TRT \textdir TRT + \hangindent 40pt \hangafter -3 + \leftskip10pt \input tufte \par + \egroup} {TRT: hangindent mode 1 & 3} + {\ruledvbox \bgroup \setuptolerance[verytolerant] + \hsize .45\textwidth \switchtobodyfont[6pt] + \shapemode=3 + \pardir TRT \textdir TRT + \parshape 4 0pt .8\hsize 10pt .8\hsize 20pt .8\hsize 0pt \hsize + \input tufte \par + \egroup} {TRT: parshape mode 2 & 3} + \stopcombination +\stopplacefigure + +\stopsubsection + +\startsubsection[title={Symbols or numbers}] + +Internally the implementation is different from \ALEPH. First of all we use no +whatsits but dedicated nodes, but also we have only 4 directions that are mapped +onto 4 numbers. A text direction node can mark the start or end of a sequence of +nodes, and therefore has two states. At the \TEX\ end we don't see these states +because \TEX\ itself will add proper end state nodes if needed. + +The symbolic names \type {TLT}, \type {TRT}, etc.\ originate in \OMEGA. In +\LUATEX\ we also have a number based model which sometimes makes more sense. + +\starttabulate[|c|l|l|] +\DB value \BC equivalent \NC \NR +\TB +\BC \type {0} \NC TLT \NC \NR +\BC \type {1} \NC TRT \NC \NR +\BC \type {2} \NC LTL \NC \NR +\BC \type {3} \NC RTT \NC \NR +\LL +\stoptabulate + +We support the \OMEGA\ primitives \orm {textdir}, \orm {pardir}, \orm {pagedir}, +\orm {pardir} and \orm {mathdir}. These accept three character keywords. The +primitives that set the direction by number are: \lpr {textdirection}, \lpr +{pardirection}, \lpr {pagedirection} and \lpr {bodydirection} and \lpr +{mathdirection}. When specifying a direction for a box you can use \type {bdir} +instead of \type {dir}. + +\stopsubsection + +\stopsection + +\startsection[title=Implementation notes] + +\startsubsection[title=Memory allocation] + +\topicindex {memory} + +The single internal memory heap that traditional \TEX\ used for tokens and nodes +is split into two separate arrays. Each of these will grow dynamically when +needed. + +The \type {texmf.cnf} settings related to main memory are no longer used (these +are: \type {main_memory}, \type {mem_bot}, \type {extra_mem_top} and \type +{extra_mem_bot}). \quote {Out of main memory} errors can still occur, but the +limiting factor is now the amount of RAM in your system, not a predefined limit. + +Also, the memory (de)allocation routines for nodes are completely rewritten. The +relevant code now lives in the C file \type {texnode.c}, and basically uses a +dozen or so \quote {avail} lists instead of a doubly|-|linked model. An extra +function layer is added so that the code can ask for nodes by type instead of +directly requisitioning a certain amount of memory words. + +Because of the split into two arrays and the resulting differences in the data +structures, some of the macros have been duplicated. For instance, there are now +\type {vlink} and \type {vinfo} as well as \type {token_link} and \type +{token_info}. All access to the variable memory array is now hidden behind a +macro called \type {vmem}. We mention this because using the \TEX book as +reference is still quite valid but not for memory related details. Another +significant detail is that we have double linked node lists and that most nodes +carry more data. + +The input line buffer and pool size are now also reallocated when needed, and the +\type {texmf.cnf} settings \type {buf_size} and \type {pool_size} are silently +ignored. + +\stopsubsection + +\startsubsection[title=Sparse arrays] + +The \prm {mathcode}, \prm {delcode}, \prm {catcode}, \prm {sfcode}, \prm {lccode} +and \prm {uccode} (and the new \lpr {hjcode}) tables are now sparse arrays that +are implemented in~\CCODE. They are no longer part of the \TEX\ \quote +{equivalence table} and because each had 1.1 million entries with a few memory +words each, this makes a major difference in memory usage. Performance is not +really hurt by this. + +The \prm {catcode}, \prm {sfcode}, \prm {lccode}, \prm {uccode} and \lpr {hjcode} +assignments don't show up when using the \ETEX\ tracing routines \prm +{tracingassigns} and \prm {tracingrestores} but we don't see that as a real +limitation. + +A side|-|effect of the current implementation is that \prm {global} is now more +expensive in terms of processing than non|-|global assignments but not many users +will notice that. + +The glyph ids within a font are also managed by means of a sparse array as glyph +ids can go up to index $2^{21}-1$ but these are never accessed directly so again +users will not notice this. + +\stopsubsection + +\startsubsection[title=Simple single|-|character csnames] + +\topicindex {csnames} + +Single|-|character commands are no longer treated specially in the internals, +they are stored in the hash just like the multiletter csnames. + +The code that displays control sequences explicitly checks if the length is one +when it has to decide whether or not to add a trailing space. + +Active characters are internally implemented as a special type of multi|-|letter +control sequences that uses a prefix that is otherwise impossible to obtain. + +\stopsubsection + +\startsubsection[title=The compressed format file] + +\topicindex {format} + +The format is passed through \type {zlib}, allowing it to shrink to roughly half +of the size it would have had in uncompressed form. This takes a bit more \CPU\ +cycles but much less disk \IO, so it should still be faster. We use a level~3 +compression which we found to be the optimal trade|-|off between filesize and +decompression speed. + +\stopsubsection + +\startsubsection[title=Binary file reading] + +\topicindex {files+binary} + +All of the internal code is changed in such a way that if one of the \type +{read_xxx_file} callbacks is not set, then the file is read by a \CCODE\ function +using basically the same convention as the callback: a single read into a buffer +big enough to hold the entire file contents. While this uses more memory than the +previous code (that mostly used \type {getc} calls), it can be quite a bit faster +(depending on your \IO\ subsystem). + +\stopsubsection + +\startsubsection[title=Tabs and spaces] + +\topicindex {space} +\topicindex {newline} + +We conform to the way other \TEX\ engines handle trailing tabs and spaces. For +decades trailing tabs and spaces (before a newline) were removed from the input +but this behaviour was changed in September 2017 to only handle spaces. We are +aware that this can introduce compatibility issues in existing workflows but +because we don't want too many differences with upstream \TEXLIVE\ we just follow +up on that patch (which is a functional one and not really a fix). It is up to +macro packages maintainers to deal with possible compatibility issues and in +\LUATEX\ they can do so via the callbacks that deal with reading from files. + +The previous behaviour was a known side effect and (as that kind of input +normally comes from generated sources) it was normally dealt with by adding a +comment token to the line in case the spaces and|/|or tabs were intentional and +to be kept. We are aware of the fact that this contradicts some of our other +choices but consistency with other engines and the fact that in \KPSE\ mode a +common file \IO\ layer is used can have a side effect of breaking compatibility. +We still stick to our view that at the log level we can (and might be) more +incompatible. We already expose some more details. + +\stopsubsection + +\stopsection + +\stopchapter + +\stopcomponent diff --git a/manual/luatex-nodes.tex b/manual/luatex-nodes.tex index 1b8de8d76..21e8a2808 100644 --- a/manual/luatex-nodes.tex +++ b/manual/luatex-nodes.tex @@ -1,2664 +1,2664 @@ -% language=uk - -\environment luatex-style - -\startcomponent luatex-nodes - -\startchapter[reference=nodes,title={Nodes}] - -\startsection[title={\LUA\ node representation}][library=node] - -\topicindex {nodes} - -\libindex {fields} -\libindex {subtypes} -\libindex {values} - -\TEX's nodes are represented in \LUA\ as userdata objects with a variable set of -fields. In the following syntax tables, such as the type of such a userdata object -is represented as \syntax {}. - -The current return value of \type {node.types()} is: -\startluacode - for id, name in table.sortedhash(node.types()) do - context.type(name) - context(" (%s), ",id) - end - context.removeunwantedspaces() - context.removepunctuation() -\stopluacode -. % period - -The \prm {lastnodetype} primitive is \ETEX\ compliant. The valid range is still -$[-1,15]$ and glyph nodes (formerly known as char nodes) have number~0 while -ligature nodes are mapped to~7. That way macro packages can use the same symbolic -names as in traditional \ETEX. Keep in mind that these \ETEX\ node numbers are -different from the real internal ones and that there are more \ETEX\ node types -than~15. - -You can ask for a list of fields with \type {node.fields} and for valid subtypes -with \type {node.subtypes}. The \type {node.values} function reports some used -values. Valid arguments are \nod {dir}, \type {direction}, \nod {glue}, \whs -{pdf_literal}, \whs {pdf_action}, \whs {pdf_window} and \whs {color_stack}. Keep -in mind that the setters normally expect a number, but this helper gives you a -list of what numbers matter. For practical reason the \type {pagestate} values -are also reported with this helper. - -\stopsection - -\startsection[title={Main text nodes}] - -\topicindex {nodes+text} - -These are the nodes that comprise actual typesetting commands. A few fields are -present in all nodes regardless of their type, these are: - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{next} \NC node \NC the next node in a list, or nil \NC \NR -\NC \type{id} \NC number \NC the node's type (\type {id}) number \NC \NR -\NC \type{subtype} \NC number \NC the node \type {subtype} identifier \NC \NR -\LL -\stoptabulate - -The \type {subtype} is sometimes just a dummy entry because not all nodes -actually use the \type {subtype}, but this way you can be sure that all nodes -accept it as a valid field name, and that is often handy in node list traversal. -In the following tables \type {next} and \type {id} are not explicitly mentioned. - -Besides these three fields, almost all nodes also have an \type {attr} field, and -there is a also a field called \type {prev}. That last field is always present, -but only initialized on explicit request: when the function \type {node.slide()} -is called, it will set up the \type {prev} fields to be a backwards pointer in -the argument node list. By now most of \TEX's node processing makes sure that the -\type {prev} nodes are valid but there can be exceptions, especially when the -internal magic uses a leading \nod {temp} nodes to temporarily store a state. - -\subsection{\nod {hlist} nodes} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{subtype} \NC number \NC \showsubtypes{list} \NC \NR -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{width} \NC number \NC the width of the box \NC \NR -\NC \type{height} \NC number \NC the height of the box \NC \NR -\NC \type{depth} \NC number \NC the depth of the box \NC \NR -\NC \type{shift} \NC number \NC a displacement perpendicular to the character - progression direction \NC \NR -\NC \type{glue_order} \NC number \NC a number in the range $[0,4]$, indicating the - glue order \NC \NR -\NC \type{glue_set} \NC number \NC the calculated glue ratio \NC \NR -\NC \type{glue_sign} \NC number \NC 0 = \type {normal}, 1 = \type {stretching}, 2 = - \type {shrinking} \NC \NR -\NC \type{head/list} \NC node \NC the first node of the body of this list \NC \NR -\NC \type{dir} \NC string \NC the direction of this box, see~\in [dirnodes] \NC \NR -\LL -\stoptabulate - -\topicindex {nodes+lists} -\topicindex {lists} - -A warning: never assign a node list to the \type {head} field unless you are sure -its internal link structure is correct, otherwise an error may result. - -Note: the field name \type {head} and \type {list} are both valid. Sometimes it -makes more sense to refer to a list by \type {head}, sometimes \type {list} makes -more sense. - -\subsection{\nod {vlist} nodes} - -\topicindex {nodes+lists} -\topicindex {lists} - -This node is similar to \nod {hlist}, except that \quote {shift} is a displacement -perpendicular to the line progression direction, and \quote {subtype} only has -the values 0, 4, and~5. - -\subsection{\nod {rule} nodes} - -\topicindex {nodes+rules} -\topicindex {rules} - -Contrary to traditional \TEX, \LUATEX\ has more \prm {rule} subtypes because we -also use rules to store reuseable objects and images. User nodes are invisible -and can be intercepted by a callback. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{subtype} \NC number \NC \showsubtypes {rule} \NC \NR -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{width} \NC number \NC the width of the rule where the special value - $-1073741824$ is used for \quote {running} glue dimensions \NC \NR -\NC \type{height} \NC number \NC the height of the rule (can be negative) \NC \NR -\NC \type{depth} \NC number \NC the depth of the rule (can be negative) \NC \NR -\NC \type{left} \NC number \NC shift at the left end (also subtracted from width) \NC \NR -\NC \type{right} \NC number \NC (subtracted from width) \NC \NR -\NC \type{dir} \NC string \NC the direction of this rule, see~\in[dirnodes] \NC \NR -\NC \type{index} \NC number \NC an optional index that can be referred to \NC \NR -\NC \type{transform} \NC number \NC an private variable (also used to specify outline width) \NC \NR -\LL -\stoptabulate - -The \type {left} and type {right} keys are somewhat special (and experimental). -When rules are auto adapting to the surrounding box width you can enforce a shift -to the right by setting \type {left}. The value is also subtracted from the width -which can be a value set by the engine itself and is not entirely under user -control. The \type {right} is also subtracted from the width. It all happens in -the backend so these are not affecting the calculations in the frontend (actually -the auto settings also happen in the backend). For a vertical rule \type {left} -affects the height and \type {right} affects the depth. There is no matching -interface at the \TEX\ end (although we can have more keywords for rules it would -complicate matters and introduce a speed penalty.) However, you can just -construct a rule node with \LUA\ and write it to the \TEX\ input. The \type -{outline} subtype is just a convenient variant and the \type {transform} field -specifies the width of the outline. - -\subsection{\nod {ins} nodes} - -\topicindex {nodes+insertions} -\topicindex {insertions} - -This node relates to the \prm {insert} primitive. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{subtype} \NC number \NC the insertion class \NC \NR -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{cost} \NC number \NC the penalty associated with this insert \NC \NR -\NC \type{height} \NC number \NC height of the insert \NC \NR -\NC \type{depth} \NC number \NC depth of the insert \NC \NR -\NC \type{head/list} \NC node \NC the first node of the body of this insert \NC \NR -\LL -\stoptabulate - -There is a set of extra fields that concern the associated glue: \type {width}, -\type {stretch}, \type {stretch_order}, \type {shrink} and \type {shrink_order}. -These are all numbers. - -A warning: never assign a node list to the \type {head} field unless you are sure -its internal link structure is correct, otherwise an error may result. You can use -\type {list} instead (often in functions you want to use local variable with similar -names and both names are equally sensible). - -\subsection{\nod {mark} nodes} - -\topicindex {nodes+marks} -\topicindex {marks} - -This one relates to the \prm {mark} primitive. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{subtype} \NC number \NC unused \NC \NR -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{class} \NC number \NC the mark class \NC \NR -\NC \type{mark} \NC table \NC a table representing a token list \NC \NR -\LL -\stoptabulate - -\subsection{\nod {adjust} nodes} - -\topicindex {nodes+adjust} -\topicindex {adjust} - -This node comes from \prm {vadjust} primitive. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{subtype} \NC number \NC \showsubtypes{adjust} \NC \NR -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{head/list} \NC node \NC adjusted material \NC \NR -\LL -\stoptabulate - -A warning: never assign a node list to the \type {head} field unless you are sure -its internal link structure is correct, otherwise an error may be the result. - -\subsection{\nod {disc} nodes} - -\topicindex {nodes+discretionaries} -\topicindex {discretionaries} - -The \prm {discretionary} and \prm {-}, the \type {-} character but also the -hyphenation mechanism produces these nodes. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{subtype} \NC number \NC \showsubtypes{disc} \NC \NR -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{pre} \NC node \NC pointer to the pre|-|break text \NC \NR -\NC \type{post} \NC node \NC pointer to the post|-|break text \NC \NR -\NC \type{replace} \NC node \NC pointer to the no|-|break text \NC \NR -\NC \type{penalty} \NC number \NC the penalty associated with the break, normally - \prm {hyphenpenalty} or \prm {exhyphenpenalty} \NC \NR -\LL -\stoptabulate - -The subtype numbers~4 and~5 belong to the \quote {of-f-ice} explanation given -elsewhere. These disc nodes are kind of special as at some point they also keep -information about breakpoints and nested ligatures. - -The \type {pre}, \type {post} and \type {replace} fields at the \LUA\ end are in -fact indirectly accessed and have a \type {prev} pointer that is not \type {nil}. -This means that when you mess around with the head of these (three) lists, you -also need to reassign them because that will restore the proper \type {prev} -pointer, so: - -\starttyping -pre = d.pre --- change the list starting with pre -d.pre = pre -\stoptyping - -Otherwise you can end up with an invalid internal perception of reality and -\LUATEX\ might even decide to crash on you. It also means that running forward -over for instance \type {pre} is ok but backward you need to stop at \type {pre}. -And you definitely must not mess with the node that \type {prev} points to, if -only because it is not really a node but part of the disc data structure (so -freeing it again might crash \LUATEX). - -\subsection{\nod {math} nodes} - -\topicindex {nodes+math} -\topicindex {math+nodes} - -Math nodes represent the boundaries of a math formula, normally wrapped into -\type {$} signs. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{subtype} \NC number \NC \showsubtypes{math} \NC \NR -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{surround} \NC number \NC width of the \prm {mathsurround} kern \NC \NR -\LL -\stoptabulate - -There is a set of extra fields that concern the associated glue: \type {width}, -\type {stretch}, \type {stretch_order}, \type {shrink} and \type {shrink_order}. -These are all numbers. - -\subsection{\nod {glue} nodes} - -\topicindex {nodes+glue} -\topicindex {glue} - -Skips are about the only type of data objects in traditional \TEX\ that are not a -simple value. They are inserted when \TEX\ sees a space in the text flow but also -by \prm {hskip} and \prm {vskip}. The structure that represents the glue -components of a skip is called a \nod {glue_spec}, and it has the following -accessible fields: - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{width} \NC number \NC the horizontal or vertical displacement \NC \NR -\NC \type{stretch} \NC number \NC extra (positive) displacement or stretch amount \NC \NR -\NC \type{stretch_order} \NC number \NC factor applied to stretch amount \NC \NR -\NC \type{shrink} \NC number \NC extra (negative) displacement or shrink amount\NC \NR -\NC \type{shrink_order} \NC number \NC factor applied to shrink amount \NC \NR -\LL -\stoptabulate - -The effective width of some glue subtypes depends on the stretch or shrink needed -to make the encapsulating box fit its dimensions. For instance, in a paragraph -lines normally have glue representing spaces and these stretch or shrink to make -the content fit in the available space. The \type {effective_glue} function that -takes a glue node and a parent (hlist or vlist) returns the effective width of -that glue item. When you pass \type {true} as third argument the value will be -rounded. - -A \nod {glue_spec} node is a special kind of node that is used for storing a set -of glue values in registers. Originally they were also used to store properties -of glue nodes (using a system of reference counts) but we now keep these -properties in the glue nodes themselves, which gives a cleaner interface to \LUA. - -The indirect spec approach was in fact an optimization in the original \TEX\ -code. First of all it can save quite some memory because all these spaces that -become glue now share the same specification (only the reference count is -incremented), and zero testing is also a bit faster because only the pointer has -to be checked (this is no longer true for engines that implement for instance -protrusion where we really need to ensure that zero is zero when we test for -bounds). Another side effect is that glue specifications are read|-|only, so in -the end copies need to be made when they are used from \LUA\ (each assignment to -a field can result in a new copy). So in the end the advantages of sharing are -not that high (and nowadays memory is less an issue, also given that a glue node -is only a few memory words larger than a spec). - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{subtype} \NC number \NC \showsubtypes{glue} \NC \NR -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{leader} \NC node \NC pointer to a box or rule for leaders \NC \NR -\LL -\stoptabulate - -In addition there are the \type {width}, \type {stretch} \type {stretch_order}, -\type {shrink}, and \type {shrink_order} fields. Note that we use the key \type -{width} in both horizontal and vertical glue. This suits the \TEX\ internals well -so we decided to stick to that naming. - -A regular word space also results in a \type {spaceskip} subtype (this used to be -a \type {userskip} with subtype zero). - -\subsection{\nod {kern} nodes} - -\topicindex {nodes+kerns} -\topicindex {kerns} - -The \prm {kern} command creates such nodes but for instance the font and math -machinery can also add them. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{subtype} \NC number \NC \showsubtypes{kern} \NC \NR -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{kern} \NC number \NC fixed horizontal or vertical advance \NC \NR -\LL -\stoptabulate - -\subsection{\nod {penalty} nodes} - -\topicindex {nodes+penalty} -\topicindex {penalty} - -The \prm {penalty} command is one that generates these nodes. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{subtype} \NC number \NC \showsubtypes{penalty} \NC \NR -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{penalty} \NC number \NC the penalty value \NC \NR -\LL -\stoptabulate - -The subtypes are just informative and \TEX\ itself doesn't use them. When you -run into an \type {linebreakpenalty} you need to keep in mind that it's a -accumulation of \type {club}, \type{widow} and other relevant penalties. - -\subsection[glyphnodes]{\nod {glyph} nodes} - -\topicindex {nodes+glyph} -\topicindex {glyphs} - -These are probably the mostly used nodes and although you can push them in the -current list with for instance \prm {char} \TEX\ will normally do it for you when -it considers some input to be text. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{subtype} \NC number \NC bit field \NC \NR -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{char} \NC number \NC the character index in the font \NC \NR -\NC \type{font} \NC number \NC the font identifier \NC \NR -\NC \type{lang} \NC number \NC the language identifier \NC \NR -\NC \type{left} \NC number \NC the frozen \type {\lefthyphenmnin} value \NC \NR -\NC \type{right} \NC number \NC the frozen \type {\righthyphenmnin} value \NC \NR -\NC \type{uchyph} \NC boolean \NC the frozen \prm {uchyph} value \NC \NR -\NC \type{components} \NC node \NC pointer to ligature components \NC \NR -\NC \type{xoffset} \NC number \NC a virtual displacement in horizontal direction \NC \NR -\NC \type{yoffset} \NC number \NC a virtual displacement in vertical direction \NC \NR -\NC \type{width} \NC number \NC the (original) width of the character \NC \NR -\NC \type{height} \NC number \NC the (original) height of the character\NC \NR -\NC \type{depth} \NC number \NC the (original) depth of the character\NC \NR -\NC \type{expansion_factor} \NC number \NC the to be applied expansion_factor \NC \NR -\NC \type{data} \NC number \NC a general purpose field for users (we had room for it) \NC \NR -\LL -\stoptabulate - -The \type {width}, \type {height} and \type {depth} values are read|-|only. The -\type {expansion_factor} is assigned in the par builder and used in the backend. - -A warning: never assign a node list to the components field unless you are sure -its internal link structure is correct, otherwise an error may be result. Valid -bits for the \type {subtype} field are: - -\starttabulate[|c|l|] -\DB bit \BC meaning \NC \NR -\TB -\NC 0 \NC character \NC \NR -\NC 1 \NC ligature \NC \NR -\NC 2 \NC ghost \NC \NR -\NC 3 \NC left \NC \NR -\NC 4 \NC right \NC \NR -\LL -\stoptabulate - -See \in {section} [charsandglyphs] for a detailed description of the \type -{subtype} field. - -The \type {expansion_factor} has been introduced as part of the separation -between font- and backend. It is the result of extensive experiments with a more -efficient implementation of expansion. Early versions of \LUATEX\ already -replaced multiple instances of fonts in the backend by scaling but contrary to -\PDFTEX\ in \LUATEX\ we now also got rid of font copies in the frontend and -replaced them by expansion factors that travel with glyph nodes. Apart from a -cleaner approach this is also a step towards a better separation between front- -and backend. - -The \type {is_char} function checks if a node is a glyph node with a subtype still -less than 256. This function can be used to determine if applying font logic to a -glyph node makes sense. The value \type {nil} gets returned when the node is not -a glyph, a character number is returned if the node is still tagged as character -and \type {false} gets returned otherwise. When nil is returned, the id is also -returned. The \type {is_glyph} variant doesn't check for a subtype being less -than 256, so it returns either the character value or nil plus the id. These -helpers are not always faster than separate calls but they sometimes permit -making more readable tests. The \type {uses_font} helpers takes a node -and font id and returns true when a glyph or disc node references that font. - -\subsection{\nod {boundary} nodes} - -\topicindex {nodes+boundary} -\topicindex {boundary} - -This node relates to the \prm {noboundary}, \prm {boundary}, \prm -{protrusionboundary} and \prm {wordboundary} primitives. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{subtype} \NC number \NC \showsubtypes{boundary} \NC \NR -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{value} \NC number \NC values 0--255 are reserved \NC \NR -\LL -\stoptabulate - -\subsection{\nod {local_par} nodes} - -\topicindex {nodes+paragraphs} -\topicindex {paragraphs} - -This node is inserted at the start of a paragraph. You should not mess -too much with this one. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{pen_inter} \NC number \NC local interline penalty (from \lpr {localinterlinepenalty}) \NC \NR -\NC \type{pen_broken} \NC number \NC local broken penalty (from \lpr {localbrokenpenalty}) \NC \NR -\NC \type{dir} \NC string \NC the direction of this par. see~\in [dirnodes] \NC \NR -\NC \type{box_left} \NC node \NC the \lpr {localleftbox} \NC \NR -\NC \type{box_left_width} \NC number \NC width of the \lpr {localleftbox} \NC \NR -\NC \type{box_right} \NC node \NC the \lpr {localrightbox} \NC \NR -\NC \type{box_right_width} \NC number \NC width of the \lpr {localrightbox} \NC \NR -\LL -\stoptabulate - -A warning: never assign a node list to the \type {box_left} or \type {box_right} -field unless you are sure its internal link structure is correct, otherwise an -error may result. - -\subsection[dirnodes]{\nod {dir} nodes} - -\topicindex {nodes+direction} -\topicindex {directions} - -Direction nodes mark parts of the running text that need a change of direction and \ -the \prm {textdir} command generates them. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{dir} \NC string \NC the direction (but see below) \NC \NR -\NC \type{level} \NC number \NC nesting level of this direction whatsit \NC \NR -\LL -\stoptabulate - -Direction specifiers are three|-|letter combinations of \type {T}, \type {B}, -\type {R}, and \type {L}. These are built up out of three separate items: - -\startitemize[packed] -\startitem - the first is the direction of the \quote{top} of paragraphs -\stopitem -\startitem - the second is the direction of the \quote{start} of lines -\stopitem -\startitem - the third is the direction of the \quote{top} of glyphs -\stopitem -\stopitemize - -However, only four combinations are accepted: \type {TLT}, \type {TRT}, \type -{RTT}, and \type {LTL}. Inside actual \nod {dir} nodes, the representation of -\nod {dir} is not a three|-|letter but a combination of numbers. When printed the -direction is indicated by a \type {+} or \type {-}, indicating whether the value -is pushed or popped from the direction stack. - -\subsection{\nod {marginkern} nodes} - -\topicindex {nodes+paragraphs} -\topicindex {paragraphs} -\topicindex {protrusion} - -Margin kerns result from protrusion. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{subtype} \NC number \NC \showsubtypes{marginkern} \NC \NR -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{width} \NC number \NC the advance of the kern \NC \NR -\NC \type{glyph} \NC node \NC the glyph to be used \NC \NR -\LL -\stoptabulate - -\stopsection - -\startsection[title={Math noads}] - -\topicindex {nodes+math} -\topicindex {math+nodes} - -These are the so||called \quote {noad}s and the nodes that are specifically -associated with math processing. Most of these nodes contain subnodes so that the -list of possible fields is actually quite small. First, the subnodes: - -\subsection{Math kernel subnodes} - -Many object fields in math mode are either simple characters in a specific family -or math lists or node lists. There are four associated subnodes that represent -these cases (in the following node descriptions these are indicated by the word -\type {}). - -The \type {next} and \type {prev} fields for these subnodes are unused. - -\subsection{\nod {math_char} and \nod {math_text_char} subnodes} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{char} \NC number \NC the character index \NC \NR -\NC \type{fam} \NC number \NC the family number \NC \NR -\LL -\stoptabulate - -The \nod {math_char} is the simplest subnode field, it contains the character -and family for a single glyph object. The \nod {math_text_char} is a special -case that you will not normally encounter, it arises temporarily during math list -conversion (its sole function is to suppress a following italic correction). - -\subsection{\nod {sub_box} and \nod {sub_mlist} subnodes} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{head/list} \NC node \NC list of nodes \NC \NR -\LL -\stoptabulate - -These two subnode types are used for subsidiary list items. For \nod {sub_box}, -the \type {head} points to a \quote {normal} vbox or hbox. For \nod {sub_mlist}, -the \type {head} points to a math list that is yet to be converted. - -A warning: never assign a node list to the \type {head} field unless you are sure -its internal link structure is correct, otherwise an error is triggered. - -\subsection{\nod {delim} subnodes} - -There is a fifth subnode type that is used exclusively for delimiter fields. As -before, the \type {next} and \type {prev} fields are unused. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{small_char} \NC number \NC character index of base character \NC \NR -\NC \type{small_fam} \NC number \NC family number of base character \NC \NR -\NC \type{large_char} \NC number \NC character index of next larger character \NC \NR -\NC \type{large_fam} \NC number \NC family number of next larger character \NC \NR -\LL -\stoptabulate - -The fields \type {large_char} and \type {large_fam} can be zero, in that case the -font that is set for the \type {small_fam} is expected to provide the large -version as an extension to the \type {small_char}. - -\subsection{Math core nodes} - -First, there are the objects (the \TEX book calls them \quote {atoms}) that are -associated with the simple math objects: ord, op, bin, rel, open, close, punct, -inner, over, under, vcent. These all have the same fields, and they are combined -into a single node type with separate subtypes for differentiation. - -Some noads have an option field. The values in this bitset are common: - -\starttabulate[|l|r|] -\DB meaning \BC bits \NC \NR -\TB -\NC set \NC \type{0x08} \NC \NR -\NC internal \NC \type{0x00} + \type{0x08} \NC \NR -\NC internal \NC \type{0x01} + \type{0x08} \NC \NR -\NC axis \NC \type{0x02} + \type{0x08} \NC \NR -\NC no axis \NC \type{0x04} + \type{0x08} \NC \NR -\NC exact \NC \type{0x10} + \type{0x08} \NC \NR -\NC left \NC \type{0x11} + \type{0x08} \NC \NR -\NC middle \NC \type{0x12} + \type{0x08} \NC \NR -\NC right \NC \type{0x14} + \type{0x08} \NC \NR -\NC no sub script \NC \type{0x21} + \type{0x08} \NC \NR -\NC no super script \NC \type{0x22} + \type{0x08} \NC \NR -\NC no script \NC \type{0x23} + \type{0x08} \NC \NR -\LL -\stoptabulate - -\subsection{simple \nod {noad} nodes} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{subtype} \NC number \NC \showsubtypes{noad} \NC \NR -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{nucleus} \NC kernel node \NC base \NC \NR -\NC \type{sub} \NC kernel node \NC subscript \NC \NR -\NC \type{sup} \NC kernel node \NC superscript \NC \NR -\NC \type{options} \NC number \NC bitset of rendering options \NC \NR -\LL -\stoptabulate - -\subsection{\nod {accent} nodes} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{subtype} \NC number \NC \showsubtypes{accent} \NC \NR -\NC \type{nucleus} \NC kernel node \NC base \NC \NR -\NC \type{sub} \NC kernel node \NC subscript \NC \NR -\NC \type{sup} \NC kernel node \NC superscript \NC \NR -\NC \type{accent} \NC kernel node \NC top accent \NC \NR -\NC \type{bot_accent} \NC kernel node \NC bottom accent \NC \NR -\NC \type{fraction} \NC number \NC larger step criterium (divided by 1000) \NC \NR -\LL -\stoptabulate - -\subsection{\nod {style} nodes} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{style} \NC string \NC contains the style \NC \NR -\LL -\stoptabulate - -There are eight possibilities for the string value: one of \type {display}, -\type {text}, \type {script}, or \type {scriptscript}. Each of these can have -be prefixed by \type {cramped}. - -\subsection{\nod {choice} nodes} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{display} \NC node \NC list of display size alternatives \NC \NR -\NC \type{text} \NC node \NC list of text size alternatives \NC \NR -\NC \type{script} \NC node \NC list of scriptsize alternatives \NC \NR -\NC \type{scriptscript} \NC node \NC list of scriptscriptsize alternatives \NC \NR -\LL -\stoptabulate - -Warning: never assign a node list to the \type {display}, \type {text}, \type -{script}, or \type {scriptscript} field unless you are sure its internal link -structure is correct, otherwise an error can occur. - -\subsection{\nod {radical} nodes} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{subtype} \NC number \NC \showsubtypes{radical} \NC \NR -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{nucleus} \NC kernel node \NC base \NC \NR -\NC \type{sub} \NC kernel node \NC subscript \NC \NR -\NC \type{sup} \NC kernel node \NC superscript \NC \NR -\NC \type{left} \NC delimiter node \NC \NC \NR -\NC \type{degree} \NC kernel node \NC only set by \lpr {Uroot} \NC \NR -\NC \type{width} \NC number \NC required width \NC \NR -\NC \type{options} \NC number \NC bitset of rendering options \NC \NR -\LL -\stoptabulate - -Warning: never assign a node list to the \type {nucleus}, \type {sub}, \type -{sup}, \type {left}, or \type {degree} field unless you are sure its internal -link structure is correct, otherwise an error can be triggered. - -\subsection{\nod {fraction} nodes} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{width} \NC number \NC (optional) width of the fraction \NC \NR -\NC \type{num} \NC kernel node \NC numerator \NC \NR -\NC \type{denom} \NC kernel node \NC denominator \NC \NR -\NC \type{left} \NC delimiter node \NC left side symbol \NC \NR -\NC \type{right} \NC delimiter node \NC right side symbol \NC \NR -\NC \type{middle} \NC delimiter node \NC middle symbol \NC \NR -\NC \type{options} \NC number \NC bitset of rendering options \NC \NR -\LL -\stoptabulate - -Warning: never assign a node list to the \type {num}, or \type {denom} field -unless you are sure its internal link structure is correct, otherwise an error -can result. - -\subsection{\nod {fence} nodes} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{subtype} \NC number \NC \showsubtypes{fence} \NC \NR -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{delim} \NC delimiter node \NC delimiter specification \NC \NR -\NC \type{italic} \NC number \NC italic correction \NC \NR -\NC \type{height} \NC number \NC required height \NC \NR -\NC \type{depth} \NC number \NC required depth \NC \NR -\NC \type{options} \NC number \NC bitset of rendering options \NC \NR -\NC \type{class} \NC number \NC spacing related class \NC \NR -\LL -\stoptabulate - -Warning: some of these fields are used by the renderer and might get adapted in -the process. - -\stopsection - -\startsection[title={Front|-|end whatsits}] - -Whatsit nodes come in many subtypes that you can ask for them by running -\type {node.whatsits}: -\startluacode - for id, name in table.sortedpairs(node.whatsits()) do - context.type(name) - context(" (%s), ",id) - end - context.removeunwantedspaces() - context.removepunctuation() -\stopluacode -. % period - -Some of them are generic and independent of the output mode and others are -specific to the chosen backend: \DVI\ or \PDF. Here we discuss the generic -font|-|end nodes nodes. - -\subsection{\whs {open}} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{stream} \NC number \NC \TEX's stream id number \NC \NR -\NC \type{name} \NC string \NC file name \NC \NR -\NC \type{ext} \NC string \NC file extension \NC \NR -\NC \type{area} \NC string \NC file area (this may become obsolete) \NC \NR -\LL -\stoptabulate - -\subsection{\whs {write}} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{stream} \NC number \NC \TEX's stream id number \NC \NR -\NC \type{data} \NC table \NC a table representing the token list to be written \NC \NR -\LL -\stoptabulate - -\subsection{\whs {close}} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{stream} \NC number \NC \TEX's stream id number \NC \NR -\LL -\stoptabulate - -\subsection{\whs {user_defined}} - -User|-|defined whatsit nodes can only be created and handled from \LUA\ code. In -effect, they are an extension to the extension mechanism. The \LUATEX\ engine -will simply step over such whatsits without ever looking at the contents. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{user_id} \NC number \NC id number \NC \NR -\NC \type{type} \NC number \NC type of the value \NC \NR -\NC \type{value} \NC number \NC a \LUA\ number \NC \NR -\NC \NC node \NC a node list \NC \NR -\NC \NC string \NC a \LUA\ string \NC \NR -\NC \NC table \NC a \LUA\ table \NC \NR -\LL -\stoptabulate - -The \type {type} can have one of six distinct values. The number is the \ASCII\ -value if the first character of the type name (so you can use string.byte("l") -instead of \type {108}). - -\starttabulate[|r|c|p|] -\DB value \BC meaning \BC explanation \NC \NR -\TB -\NC 97 \NC a \NC list of attributes (a node list) \NC \NR -\NC 100 \NC d \NC a \LUA\ number \NC \NR -\NC 108 \NC l \NC a \LUA\ value (table, number, boolean, etc) \NC \NR -\NC 110 \NC n \NC a node list \NC \NR -\NC 115 \NC s \NC a \LUA\ string \NC \NR -\NC 116 \NC t \NC a \LUA\ token list in \LUA\ table form (a list of triplets) \NC \NR -\LL -\stoptabulate - -\subsection{\whs {save_pos}} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\LL -\stoptabulate - -\subsection{\whs {late_lua}} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{data} \NC string or function \NC the to be written information stored as \LUA\ value \NC \NR -\NC \type{token} \NC string \NC the to be written information stored as token list \NC \NR -\NC \type{name} \NC string \NC the name to use for \LUA\ error reporting \NC \NR -\LL -\stoptabulate - -The difference between \type {data} and \type {string} is that on assignment, the -\type {data} field is converted to a token list, cf.\ use as \lpr {latelua}. The -\type {string} version is treated as a literal string. - -\stopsection - -\startsection[title={\DVI\ backend whatsits}] - -\subsection{\whs {special}} - -There is only one \DVI\ backend whatsit, and it just flushes its content to the -output file. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{data} \NC string \NC the \prm {special} information \NC \NR -\LL -\stoptabulate - -\stopsection - -\startsection[title={\PDF\ backend whatsits}] - -\subsection{\whs {pdf_literal}} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{mode} \NC number \NC the \quote {mode} setting of this literal \NC \NR -\NC \type{data} \NC string \NC the to be written information stored as \LUA\ string \NC \NR -\NC \type{token} \NC string \NC the to be written information stored as token list \NC \NR -\LL -\stoptabulate - -Possible mode values are: - -\starttabulate[|c|p|] -\DB value \BC keyword \NC \NR -\TB -\NC 0 \NC \type{origin} \NC \NR -\NC 1 \NC \type{page} \NC \NR -\NC 2 \NC \type{direct} \NC \NR -\NC 3 \NC \type{raw} \NC \NR -\NC 4 \NC \type{text} \NC \NR -\LL -\stoptabulate - -The higher the number, the less checking and the more you can run into trouble. -Especially the \type {raw} variant can produce bad \PDF\ so you can best check -what you generate. - -\subsection{\whs {pdf_refobj}} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{objnum} \NC number \NC the referenced \PDF\ object number \NC \NR -\LL -\stoptabulate - -\subsection{\whs {pdf_annot}} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{width} \NC number \NC the width (not used in calculations) \NC \NR -\NC \type{height} \NC number \NC the height (not used in calculations) \NC \NR -\NC \type{depth} \NC number \NC the depth (not used in calculations) \NC \NR -\NC \type{objnum} \NC number \NC the referenced \PDF\ object number \NC \NR -\NC \type{data} \NC string \NC the annotation data \NC \NR -\LL -\stoptabulate - -\subsection{\whs {pdf_start_link}} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{width} \NC number \NC the width (not used in calculations) \NC \NR -\NC \type{height} \NC number \NC the height (not used in calculations) \NC \NR -\NC \type{depth} \NC number \NC the depth (not used in calculations) \NC \NR -\NC \type{objnum} \NC number \NC the referenced \PDF\ object number \NC \NR -\NC \type{link_attr} \NC table \NC the link attribute token list \NC \NR -\NC \type{action} \NC node \NC the action to perform \NC \NR -\LL -\stoptabulate - -\subsection{\whs {pdf_end_link}} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC \NC \NR -\LL -\stoptabulate - -\subsection{\whs {pdf_dest}} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{width} \NC number \NC the width (not used in calculations) \NC \NR -\NC \type{height} \NC number \NC the height (not used in calculations) \NC \NR -\NC \type{depth} \NC number \NC the depth (not used in calculations) \NC \NR -\NC \type{named_id} \NC number \NC is the \type {dest_id} a string value? \NC \NR -\NC \type{dest_id} \NC number \NC the destination id \NC \NR -\NC \NC string \NC the destination name \NC \NR -\NC \type{dest_type} \NC number \NC type of destination \NC \NR -\NC \type{xyz_zoom} \NC number \NC the zoom factor (times 1000) \NC \NR -\NC \type{objnum} \NC number \NC the \PDF\ object number \NC \NR -\LL -\stoptabulate - -\subsection{\whs {pdf_action}} - -These are a special kind of items that only appear inside \PDF\ start link -objects. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{action_type} \NC number \NC the kind of action involved \NC \NR -\NC \type{action_id} \NC number or string \NC token list reference or string \NC \NR -\NC \type{named_id} \NC number \NC the index of the destination \NC \NR -\NC \type{file} \NC string \NC the target filename \NC \NR -\NC \type{new_window} \NC number \NC the window state of the target \NC \NR -\NC \type{data} \NC string \NC the name of the destination \NC \NR -\LL -\stoptabulate - -Valid action types are: - -\starttabulate[|l|l|] -\DB value \BC meaning \NC \NR -\TB -\NC 0 \NC \type{page} \NC \NR -\NC 1 \NC \type{goto} \NC \NR -\NC 2 \NC \type{thread} \NC \NR -\NC 3 \NC \type{user} \NC \NR -\LL -\stoptabulate - -Valid window types are: - -\starttabulate[|l|l|] -\DB value \BC meaning \NC \NR -\TB -\NC 0 \NC \type{notset} \NC \NR -\NC 1 \NC \type{new} \NC \NR -\NC 2 \NC \type{nonew} \NC \NR -\LL -\stoptabulate - -\subsection{\whs {pdf_thread}} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{width} \NC number \NC the width (not used in calculations) \NC \NR -\NC \type{height} \NC number \NC the height (not used in calculations) \NC \NR -\NC \type{depth} \NC number \NC the depth (not used in calculations) \NC \NR -\NC \type{named_id} \NC number \NC is \type {tread_id} a string value? \NC \NR -\NC \type{tread_id} \NC number \NC the thread id \NC \NR -\NC \NC string \NC the thread name \NC \NR -\NC \type{thread_attr} \NC number \NC extra thread information \NC \NR -\LL -\stoptabulate - -\subsection{\whs {pdf_start_thread}} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{width} \NC number \NC the width (not used in calculations) \NC \NR -\NC \type{height} \NC number \NC the height (not used in calculations) \NC \NR -\NC \type{depth} \NC number \NC the depth (not used in calculations) \NC \NR -\NC \type{named_id} \NC number \NC is \type {tread_id} a string value? \NC \NR -\NC \type{tread_id} \NC number \NC the thread id \NC \NR -\NC \NC string \NC the thread name \NC \NR -\NC \type{thread_attr} \NC number \NC extra thread information \NC \NR -\LL -\stoptabulate - -\subsection{\whs {pdf_end_thread}} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC \NC \NR -\LL -\stoptabulate - -\subsection{\whs {pdf_colorstack}} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{stack} \NC number \NC colorstack id number \NC \NR -\NC \type{command} \NC number \NC command to execute \NC \NR -\NC \type{data} \NC string \NC data \NC \NR -\LL -\stoptabulate - -\subsection{\whs {pdf_setmatrix}} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\NC \type{data} \NC string \NC data \NC \NR -\LL -\stoptabulate - -\subsection{\whs {pdf_save}} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\LL -\stoptabulate - -\subsection{\whs {pdf_restore}} - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{attr} \NC node \NC list of attributes \NC \NR -\LL -\stoptabulate - -\stopsection - -\startsection[title={The \type {node} library}][library=node] - -\subsection {Introduction} - -The \type {node} library contains functions that facilitate dealing with (lists -of) nodes and their values. They allow you to create, alter, copy, delete, and -insert \LUATEX\ node objects, the core objects within the typesetter. - -\LUATEX\ nodes are represented in \LUA\ as userdata with the metadata type -\type {luatex.node}. The various parts within a node can be accessed using -named fields. - -Each node has at least the three fields \type {next}, \type {id}, and \type {subtype}: - -\startitemize[intro] - -\startitem - The \type {next} field returns the userdata object for the next node in a - linked list of nodes, or \type {nil}, if there is no next node. -\stopitem - -\startitem - The \type {id} indicates \TEX's \quote{node type}. The field \type {id} has a - numeric value for efficiency reasons, but some of the library functions also - accept a string value instead of \type {id}. -\stopitem - -\startitem - The \type {subtype} is another number. It often gives further information - about a node of a particular \type {id}, but it is most important when - dealing with \quote {whatsits}, because they are differentiated solely based - on their \type {subtype}. -\stopitem - -\stopitemize - -The other available fields depend on the \type {id} (and for \quote {whatsits}, -the \type {subtype}) of the node. - -Support for \nod {unset} (alignment) nodes is partial: they can be queried and -modified from \LUA\ code, but not created. - -Nodes can be compared to each other, but: you are actually comparing indices into -the node memory. This means that equality tests can only be trusted under very -limited conditions. It will not work correctly in any situation where one of the -two nodes has been freed and|/|or reallocated: in that case, there will be false -positives. - -At the moment, memory management of nodes should still be done explicitly by the -user. Nodes are not \quote {seen} by the \LUA\ garbage collector, so you have to -call the node freeing functions yourself when you are no longer in need of a node -(list). Nodes form linked lists without reference counting, so you have to be -careful that when control returns back to \LUATEX\ itself, you have not deleted -nodes that are still referenced from a \type {next} pointer elsewhere, and that -you did not create nodes that are referenced more than once. Normally the setters -and getters handle this for you. - -There are statistics available with regards to the allocated node memory, which -can be handy for tracing. - -\subsection{\type {is_node}} - -\topicindex {nodes+functions} - -\libindex {is_node} - -\startfunctioncall - t = - node.is_node( item) -\stopfunctioncall - -This function returns a number (the internal index of the node) if the argument -is a userdata object of type \type {} and false when no node is passed. - -\subsection{\type {types} and \type {whatsits}} - -\libindex {types} -\libindex {whatsits} - -This function returns an array that maps node id numbers to node type strings, -providing an overview of the possible top|-|level \type {id} types. - -\startfunctioncall -
t = - node.types() -\stopfunctioncall - -\TEX's \quote {whatsits} all have the same \type {id}. The various subtypes are -defined by their \type {subtype} fields. The function is much like \type {types}, -except that it provides an array of \type {subtype} mappings. - -\startfunctioncall -
t = - node.whatsits() -\stopfunctioncall - -\subsection{\type {id}} - -\libindex{id} - -This converts a single type name to its internal numeric representation. - -\startfunctioncall - id = - node.id( type) -\stopfunctioncall - -\subsection{\type {type} and \type {subtype}} - -\libindex {type} -\libindex {subtype} - -In the argument is a number, then the next function converts an internal numeric -representation to an external string representation. Otherwise, it will return -the string \type {node} if the object represents a node, and \type {nil} -otherwise. - -\startfunctioncall - type = - node.type( n) -\stopfunctioncall - -This next one converts a single whatsit name to its internal numeric -representation (\type {subtype}). - -\startfunctioncall - subtype = - node.subtype( type) -\stopfunctioncall - -\subsection{\type {fields}} - -\libindex {fields} - -This function returns an array of valid field names for a particular type of -node. If you want to get the valid fields for a \quote {whatsit}, you have to -supply the second argument also. In other cases, any given second argument will -be silently ignored. - -\startfunctioncall -
t = - node.fields( id) -
t = - node.fields( id, subtype) -\stopfunctioncall - -The function accepts string \type {id} and \type {subtype} values as well. - -\subsection{\type {has_field}} - -\libindex {has_field} - -This function returns a boolean that is only true if \type {n} is -actually a node, and it has the field. - -\startfunctioncall - t = - node.has_field( n, field) -\stopfunctioncall - -\subsection{\type {new}} - -\libindex{new} - -The \type {new} function creates a new node. All its fields are initialized to -either zero or \type {nil} except for \type {id} and \type {subtype}. Instead of -numbers you can also use strings (names). If you create a new \nod {whatsit} node -the second argument is required. As with all node functions, this function -creates a node at the \TEX\ level. - -\startfunctioncall - n = - node.new( id) - n = - node.new( id, subtype) -\stopfunctioncall - -\subsection{\type {free}, \type {flush_node} and \type {flush_list}} - -\libindex{free} -\libindex{flush_node} -\libindex{flush_list} - -The next one the node \type {n} from \TEX's memory. Be careful: no checks are -done on whether this node is still pointed to from a register or some \type -{next} field: it is up to you to make sure that the internal data structures -remain correct. - -\startfunctioncall - next = - node.free( n) -flush_node( n) -\stopfunctioncall - -The \type {free} function returns the next field of the freed node, while the -\type {flush_node} alternative returns nothing. - -A list starting with node \type {n} can be flushed from \TEX's memory too. Be -careful: no checks are done on whether any of these nodes is still pointed to -from a register or some \type {next} field: it is up to you to make sure that the -internal data structures remain correct. - -\startfunctioncall -node.flush_list( n) -\stopfunctioncall - -\subsection{\type {copy} and \type {copy_list}} - -\libindex{copy} -\libindex{copy_list} - -This creates a deep copy of node \type {n}, including all nested lists as in the case -of a hlist or vlist node. Only the \type {next} field is not copied. - -\startfunctioncall - m = - node.copy( n) -\stopfunctioncall - -A deep copy of the node list that starts at \type {n} can be created too. If -\type {m} is also given, the copy stops just before node \type {m}. - -\startfunctioncall - m = - node.copy_list( n) - m = - node.copy_list( n, m) -\stopfunctioncall - -Note that you cannot copy attribute lists this way. However, there is normally no -need to copy attribute lists as when you do assignments to the \type {attr} field -or make changes to specific attributes, the needed copying and freeing takes -place automatically. - -\subsection{\type {prev} and \type{next}} - -\libindex{prev} -\libindex{next} - -These returns the node preceding or following the given node, or \type {nil} if -there is no such node. - -\startfunctioncall - m = - node.next( n) - m = - node.prev( n) -\stopfunctioncall - -\subsection{\type {current_attr}} - -\libindex{current_attr} - -This returns the currently active list of attributes, if there is one. - -\startfunctioncall - m = - node.current_attr() -\stopfunctioncall - -The intended usage of \type {current_attr} is as follows: - -\starttyping -local x1 = node.new("glyph") -x1.attr = node.current_attr() -local x2 = node.new("glyph") -x2.attr = node.current_attr() -\stoptyping - -or: - -\starttyping -local x1 = node.new("glyph") -local x2 = node.new("glyph") -local ca = node.current_attr() -x1.attr = ca -x2.attr = ca -\stoptyping - -The attribute lists are ref counted and the assignment takes care of incrementing -the refcount. You cannot expect the value \type {ca} to be valid any more when -you assign attributes (using \type {tex.setattribute}) or when control has been -passed back to \TEX. - -Note: this function is somewhat experimental, and it returns the {\it actual} -attribute list, not a copy thereof. Therefore, changing any of the attributes in -the list will change these values for all nodes that have the current attribute -list assigned to them. - -\subsection{\type {hpack}} - -\libindex {hpack} - -This function creates a new hlist by packaging the list that begins at node \type -{n} into a horizontal box. With only a single argument, this box is created using -the natural width of its components. In the three argument form, \type {info} -must be either \type {additional} or \type {exactly}, and \type {w} is the -additional (\type {\hbox spread}) or exact (\type {\hbox to}) width to be used. -The second return value is the badness of the generated box. - -\startfunctioncall - h, b = - node.hpack( n) - h, b = - node.hpack( n, w, info) - h, b = - node.hpack( n, w, info, dir) -\stopfunctioncall - -Caveat: there can be unexpected side|-|effects to this function, like updating -some of the \prm {marks} and \type {\inserts}. Also note that the content of -\type {h} is the original node list \type {n}: if you call \type {node.free(h)} -you will also free the node list itself, unless you explicitly set the \type -{list} field to \type {nil} beforehand. And in a similar way, calling \type -{node.free(n)} will invalidate \type {h} as well! - -\subsection{\type {vpack}} - -\libindex {vpack} - -This function creates a new vlist by packaging the list that begins at node \type -{n} into a vertical box. With only a single argument, this box is created using -the natural height of its components. In the three argument form, \type {info} -must be either \type {additional} or \type {exactly}, and \type {w} is the -additional (\type {\vbox spread}) or exact (\type {\vbox to}) height to be used. - -\startfunctioncall - h, b = - node.vpack( n) - h, b = - node.vpack( n, w, info) - h, b = - node.vpack( n, w, info, dir) -\stopfunctioncall - -The second return value is the badness of the generated box. See the description -of \type {hpack} for a few memory allocation caveats. - -\subsection{\type {prepend_prevdepth}} - -\libindex {prepend_prevdepth} - -This function is somewhat special in the sense that it is an experimental helper -that adds the interlinespace to a line keeping the baselineskip and lineskip into -account. - -\startfunctioncall - n, delta = - node.prepend_prevdepth( n, prevdepth) -\stopfunctioncall - -\subsection{\type {dimensions} and \type {rangedimensions}} - -\libindex{dimensions} -\libindex{rangedimensions} - -\startfunctioncall - w, h, d = - node.dimensions( n) - w, h, d = - node.dimensions( n, dir) - w, h, d = - node.dimensions( n, t) - w, h, d = - node.dimensions( n, t, dir) -\stopfunctioncall - -This function calculates the natural in|-|line dimensions of the node list starting -at node \type {n} and terminating just before node \type {t} (or the end of the -list, if there is no second argument). The return values are scaled points. An -alternative format that starts with glue parameters as the first three arguments -is also possible: - -\startfunctioncall - w, h, d = - node.dimensions( glue_set, glue_sign, glue_order, - n) - w, h, d = - node.dimensions( glue_set, glue_sign, glue_order, - n, dir) - w, h, d = - node.dimensions( glue_set, glue_sign, glue_order, - n, t) - w, h, d = - node.dimensions( glue_set, glue_sign, glue_order, - n, t, dir) -\stopfunctioncall - -This calling method takes glue settings into account and is especially useful for -finding the actual width of a sublist of nodes that are already boxed, for -example in code like this, which prints the width of the space in between the -\type {a} and \type {b} as it would be if \type {\box0} was used as-is: - -\starttyping -\setbox0 = \hbox to 20pt {a b} - -\directlua{print (node.dimensions( - tex.box[0].glue_set, - tex.box[0].glue_sign, - tex.box[0].glue_order, - tex.box[0].head.next, - node.tail(tex.box[0].head) -)) } -\stoptyping - -You need to keep in mind that this is one of the few places in \TEX\ where floats -are used, which means that you can get small differences in rounding when you -compare the width reported by \type {hpack} with \type {dimensions}. - -The second alternative saves a few lookups and can be more convenient in some -cases: - -\startfunctioncall - w, h, d = - node.rangedimensions( parent, first) - w, h, d = - node.rangedimensions( parent, first, last) -\stopfunctioncall - -\subsection{\type {mlist_to_hlist}} - -\libindex {mlist_to_hlist} - -\startfunctioncall - h = - node.mlist_to_hlist( n, display_type, penalties) -\stopfunctioncall - -This runs the internal mlist to hlist conversion, converting the math list in -\type {n} into the horizontal list \type {h}. The interface is exactly the same -as for the callback \cbk {mlist_to_hlist}. - -\subsection{\type {slide}} - -\startfunctioncall - m = - node.slide( n) -\stopfunctioncall - -Returns the last node of the node list that starts at \type {n}. As a -side|-|effect, it also creates a reverse chain of \type {prev} pointers between -nodes. - -\subsection{\type {tail}} - -\libindex {tail} - -\startfunctioncall - m = - node.tail( n) -\stopfunctioncall - -Returns the last node of the node list that starts at \type {n}. - -\subsection{\type {length} and type {count}} - -\libindex {length} -\libindex {count} - -\startfunctioncall - i = - node.length( n) - i = - node.length( n, m) -\stopfunctioncall - -Returns the number of nodes contained in the node list that starts at \type {n}. -If \type {m} is also supplied it stops at \type {m} instead of at the end of the -list. The node \type {m} is not counted. - -\startfunctioncall - i = - node.count( id, n) - i = - node.count( id, n, m) -\stopfunctioncall - -Returns the number of nodes contained in the node list that starts at \type {n} -that have a matching \type {id} field. If \type {m} is also supplied, counting -stops at \type {m} instead of at the end of the list. The node \type {m} is not -counted. This function also accept string \type {id}'s. - -\subsection{\type {is_char} and \type {is_glyph}} - -\libindex {is_char} -\libindex {is_glyph} - -The subtype of a glyph node signals if the glyph is already turned into a character reference -or not. - -\startfunctioncall - b = - node.is_char( n) - b = - node.is_glyph( n) -\stopfunctioncall - -\subsection{\type {traverse}} - -\libindex {traverse} - -\startfunctioncall - t, id, subtype = - node.traverse( n) -\stopfunctioncall - -This is a \LUA\ iterator that loops over the node list that starts at \type {n}. -Typically code looks like this: - -\starttyping -for n in node.traverse(head) do - ... -end -\stoptyping - -is functionally equivalent to: - -\starttyping -do - local n - local function f (head,var) - local t - if var == nil then - t = head - else - t = var.next - end - return t - end - while true do - n = f (head, n) - if n == nil then break end - ... - end -end -\stoptyping - -It should be clear from the definition of the function \type {f} that even though -it is possible to add or remove nodes from the node list while traversing, you -have to take great care to make sure all the \type {next} (and \type {prev}) -pointers remain valid. - -If the above is unclear to you, see the section \quote {For Statement} in the -\LUA\ Reference Manual. - -\subsection{\type {traverse_id}} - -\libindex {traverse_id} - -\startfunctioncall - t, subtype = - node.traverse_id( id, n) -\stopfunctioncall - -This is an iterator that loops over all the nodes in the list that starts at -\type {n} that have a matching \type {id} field. - -See the previous section for details. The change is in the local function \type -{f}, which now does an extra while loop checking against the upvalue \type {id}: - -\starttyping - local function f(head,var) - local t - if var == nil then - t = head - else - t = var.next - end - while not t.id == id do - t = t.next - end - return t - end -\stoptyping - -\subsection{\type {traverse_char} and \type {traverse_glyph}} - -\libindex {traverse_char} -\libindex {traverse_glyph} - -The \type{traverse_char} iterator loops over the \nod {glyph} nodes in a list. -Only nodes with a subtype less than 256 are seen. - -\startfunctioncall - n, font, char = - node.traverse_char( n) -\stopfunctioncall - -The \type{traverse_glyph} iterator loops over a list and returns the list and -filters all glyphs: - -\startfunctioncall - n, font, char = - node.traverse_glyph( n) -\stopfunctioncall - -\subsection{\type {traverse_list}} - -\libindex {traverse_list} - -This iterator loops over the \nod {hlist} and \nod {vlist} nodes in a list. - -\startfunctioncall - n, id, subtype, list = - node.traverse_list( n) -\stopfunctioncall - -The four return values can save some time compared to fetching these fields but -in practice you seldom need them all. So consider it a (side effect of -experimental) convenience. - -\subsection{\type {has_glyph}} - -\libindex {has_glyph} - -This function returns the first glyph or disc node in the given list: - -\startfunctioncall - n = - node.has_glyph( n) -\stopfunctioncall - -\subsection{\type {end_of_math}} - -\libindex {end_of_math} - -\startfunctioncall - t = - node.end_of_math( start) -\stopfunctioncall - -Looks for and returns the next \type {math_node} following the \type {start}. If -the given node is a math end node this helper returns that node, else it follows -the list and returns the next math endnote. If no such node is found nil is -returned. - -\subsection{\type {remove}} - -\libindex {remove} - -\startfunctioncall - head, current = - node.remove( head, current) -\stopfunctioncall - -This function removes the node \type {current} from the list following \type -{head}. It is your responsibility to make sure it is really part of that list. -The return values are the new \type {head} and \type {current} nodes. The -returned \type {current} is the node following the \type {current} in the calling -argument, and is only passed back as a convenience (or \type {nil}, if there is -no such node). The returned \type {head} is more important, because if the -function is called with \type {current} equal to \type {head}, it will be -changed. - -\subsection{\type {insert_before}} - -\libindex {insert_before} - -\startfunctioncall - head, new = - node.insert_before( head, current, new) -\stopfunctioncall - -This function inserts the node \type {new} before \type {current} into the list -following \type {head}. It is your responsibility to make sure that \type -{current} is really part of that list. The return values are the (potentially -mutated) \type {head} and the node \type {new}, set up to be part of the list -(with correct \type {next} field). If \type {head} is initially \type {nil}, it -will become \type {new}. - -\subsection{\type {insert_after}} - -\libindex {insert_after} - -\startfunctioncall - head, new = - node.insert_after( head, current, new) -\stopfunctioncall - -This function inserts the node \type {new} after \type {current} into the list -following \type {head}. It is your responsibility to make sure that \type -{current} is really part of that list. The return values are the \type {head} and -the node \type {new}, set up to be part of the list (with correct \type {next} -field). If \type {head} is initially \type {nil}, it will become \type {new}. - -\subsection{\type {first_glyph}} - -\libindex {first_glyph} - -\startfunctioncall - n = - node.first_glyph( n) - n = - node.first_glyph( n, m) -\stopfunctioncall - -Returns the first node in the list starting at \type {n} that is a glyph node -with a subtype indicating it is a glyph, or \type {nil}. If \type {m} is given, -processing stops at (but including) that node, otherwise processing stops at the -end of the list. - -\subsection{\type {ligaturing}} - -\libindex {ligaturing} - -\startfunctioncall - h, t, success = - node.ligaturing( n) - h, t, success = - node.ligaturing( n, m) -\stopfunctioncall - -Apply \TEX-style ligaturing to the specified nodelist. The tail node \type {m} is -optional. The two returned nodes \type {h} and \type {t} are the new head and -tail (both \type {n} and \type {m} can change into a new ligature). - -\subsection{\type {kerning}} - -\libindex {kerning} - -\startfunctioncall - h, t, success = - node.kerning( n) - h, t, success = - node.kerning( n, m) -\stopfunctioncall - -Apply \TEX|-|style kerning to the specified node list. The tail node \type {m} is -optional. The two returned nodes \type {h} and \type {t} are the head and tail -(either one of these can be an inserted kern node, because special kernings with -word boundaries are possible). - -\subsection{\type {unprotect_glyph[s]}} - -\libindex {unprotect_glyphs} -\libindex {unprotect_glyph} - -\startfunctioncall -node.unprotect_glyph( n) -node.unprotect_glyphs( n,[ n]) -\stopfunctioncall - -Subtracts 256 from all glyph node subtypes. This and the next function are -helpers to convert from \type {characters} to \type {glyphs} during node -processing. The second argument is optional and indicates the end of a range. - -\subsection{\type {protect_glyph[s]}} - -\libindex {protect_glyphs} -\libindex {protect_glyph} - -\startfunctioncall -node.protect_glyph( n) -node.protect_glyphs( n,[ n]) -\stopfunctioncall - -Adds 256 to all glyph node subtypes in the node list starting at \type {n}, -except that if the value is 1, it adds only 255. The special handling of 1 means -that \type {characters} will become \type {glyphs} after subtraction of 256. A -single character can be marked by the singular call. The second argument is -optional and indicates the end of a range. - -\subsection{\type {last_node}} - -\libindex {last_node} - -\startfunctioncall - n = - node.last_node() -\stopfunctioncall - -This function pops the last node from \TEX's \quote{current list}. It returns -that node, or \type {nil} if the current list is empty. - -\subsection{\type {write}} - -\libindex {write} - -\startfunctioncall -node.write( n) -\stopfunctioncall - -This function that will append a node list to \TEX's \quote {current list}. The -node list is not deep|-|copied! There is no error checking either! You mignt need -to enforce horizontal mode in order for this to work as expected. - -\subsection{\type {protrusion_skippable}} - -\libindex {protrusion_skippable} - -\startfunctioncall - skippable = - node.protrusion_skippable( n) -\stopfunctioncall - -Returns \type {true} if, for the purpose of line boundary discovery when -character protrusion is active, this node can be skipped. - -\stopsection - -\startsection[title={Glue handling}][library=node] - -\subsection{\type {setglue}} - -\libindex {setglue} - -You can set the properties of a glue in one go. If you pass no values, the glue -will become a zero glue. - -\startfunctioncall -node.setglue( n) -node.setglue( n,width,stretch,shrink,stretch_order,shrink_order) -\stopfunctioncall - -When you pass values, only arguments that are numbers are assigned so - -\starttyping -node.setglue(n,655360,false,65536) -\stoptyping - -will only adapt the width and shrink. - -When a list node is passed, you set the glue, order and sign instead. - -\subsection{\type {getglue}} - -\libindex {getglue} - -The next call will return 5 values or nothing when no glue is passed. - -\startfunctioncall - width, stretch, shrink, stretch_order, - shrink_order = node.getglue( n) -\stopfunctioncall - -When the second argument is false, only the width is returned (this is consistent -with \type {tex.get}). - -When a list node is passed, you get back the glue that is set, the order of that -glue and the sign. - -\subsection{\type {is_zero_glue}} - -\libindex {is_zero_glue} - -This function returns \type {true} when the width, stretch and shrink properties -are zero. - -\startfunctioncall - isglue = - node.is_zero_glue( n) -\stopfunctioncall - -\stopsection - -\startsection[title={Attribute handling}][library=node] - -\subsection{Attributes} - -\topicindex {attributes} - -The newly introduced attribute registers are non|-|trivial, because the value -that is attached to a node is essentially a sparse array of key|-|value pairs. It -is generally easiest to deal with attribute lists and attributes by using the -dedicated functions in the \type {node} library, but for completeness, here is -the low|-|level interface. - -Attributes appear as linked list of userdata objects in the \type {attr} field of -individual nodes. They can be handled individually, but it is much safer and more -efficient to use the dedicated functions associated with them. - -\subsection{\nod {attribute_list} nodes} - -\topicindex {nodes+attributes} - -An \nod {attribute_list} item is used as a head pointer for a list of attribute -items. It has only one user-visible field: - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{next} \NC node \NC pointer to the first attribute \NC \NR -\LL -\stoptabulate - -\subsection{\nod {attr} nodes} - -A normal node's attribute field will point to an item of type \nod -{attribute_list}, and the \type {next} field in that item will point to the first -defined \quote {attribute} item, whose \type {next} will point to the second -\quote {attribute} item, etc. - -\starttabulate[|l|l|p|] -\DB field \BC type \BC explanation \NC \NR -\TB -\NC \type{next} \NC node \NC pointer to the next attribute \NC \NR -\NC \type{number} \NC number \NC the attribute type id \NC \NR -\NC \type{value} \NC number \NC the attribute value \NC \NR -\LL -\stoptabulate - -As mentioned it's better to use the official helpers rather than edit these -fields directly. For instance the \type {prev} field is used for other purposes -and there is no double linked list. - -\subsection{\type {has_attribute}} - -\libindex {has_attribute} - -\startfunctioncall - v = - node.has_attribute( n, id) - v = - node.has_attribute( n, id, val) -\stopfunctioncall - -Tests if a node has the attribute with number \type {id} set. If \type {val} is -also supplied, also tests if the value matches \type {val}. It returns the value, -or, if no match is found, \type {nil}. - -\subsection{\type {get_attribute}} - -\libindex {get_attribute} - -\startfunctioncall - v = - node.get_attribute( n, id) -\stopfunctioncall - -Tests if a node has an attribute with number \type {id} set. It returns the -value, or, if no match is found, \type {nil}. If no \type {id} is given then the -zero attributes is assumed. - -\subsection{\type {find_attribute}} - -\libindex {find_attribute} - -\startfunctioncall - v, n = - node.find_attribute( n, id) -\stopfunctioncall - -Finds the first node that has attribute with number \type {id} set. It returns -the value and the node if there is a match and otherwise nothing. - -\subsection{\type {set_attribute}} - -\libindex {set_attribute} - -\startfunctioncall -node.set_attribute( n, id, val) -\stopfunctioncall - -Sets the attribute with number \type {id} to the value \type {val}. Duplicate -assignments are ignored. - -\subsection{\type {unset_attribute}} - -\libindex {unset_attribute} - -\startfunctioncall - v = - node.unset_attribute( n, id) - v = - node.unset_attribute( n, id, val) -\stopfunctioncall - -Unsets the attribute with number \type {id}. If \type {val} is also supplied, it -will only perform this operation if the value matches \type {val}. Missing -attributes or attribute|-|value pairs are ignored. - -If the attribute was actually deleted, returns its old value. Otherwise, returns -\type {nil}. - -\subsection{\type {slide}} - -\libindex {slide} - -This helper makes sure that the node lists is double linked and returns the found -tail node. - -\startfunctioncall - tail = - node.slide( n) -\stopfunctioncall - -After some callbacks automatic sliding takes place. This feature can be turned -off with \type {node.fix_node_lists(false)} but you better make sure then that -you don't mess up lists. In most cases \TEX\ itself only uses \type {next} -pointers but your other callbacks might expect proper \type {prev} pointers too. -Future versions of \LUATEX\ can add more checking but this will not influence -usage. - -\subsection{\type {check_discretionary}, \type {check_discretionaries}} - -\libindex{check_discretionary} -\libindex{check_discretionaries} - -When you fool around with disc nodes you need to be aware of the fact that they -have a special internal data structure. As long as you reassign the fields when -you have extended the lists it's ok because then the tail pointers get updated, -but when you add to list without reassigning you might end up in trouble when -the linebreak routine kicks in. You can call this function to check the list for -issues with disc nodes. - -\startfunctioncall -node.check_discretionary( n) -node.check_discretionaries( head) -\stopfunctioncall - -The plural variant runs over all disc nodes in a list, the singular variant -checks one node only (it also checks if the node is a disc node). - -\subsection{\type {flatten_discretionaries}} - -\libindex {flatten_discretionaries} - -This function will remove the discretionaries in the list and inject the replace -field when set. - -\startfunctioncall - head, count = node.flatten_discretionaries( n) -\stopfunctioncall - -\subsection{\type {family_font}} - -\libindex {family_font} - -When you pass a proper family identifier the next helper will return the font -currently associated with it. You can normally also access the font with the -normal font field or getter because it will resolve the family automatically for -noads. - -\startfunctioncall - id = - node.family_font( fam) -\stopfunctioncall - -\stopsection - -\startsection[title={Two access models}][library=node] - -\topicindex{nodes+direct} -\topicindex{direct nodes} - -\libindex {todirect} -\libindex {tonode} -\libindex {tostring} - -Deep down in \TEX\ a node has a number which is a numeric entry in a memory -table. In fact, this model, where \TEX\ manages memory is real fast and one of -the reasons why plugging in callbacks that operate on nodes is quite fast too. -Each node gets a number that is in fact an index in the memory table and that -number often is reported when you print node related information. You go from -userdata nodes and there numeric references and back with: - -\startfunctioncall - d = node.todirect( n)) - n = node.tonode( d)) -\stopfunctioncall - -The userdata model is rather robust as it is a virtual interface with some -additional checking while the more direct access which uses the node numbers -directly. However, even with userdata you can get into troubles when you free -nodes that are no longer allocated or mess up lists. if you apply \type -{tostring} to a node you see its internal (direct) number and id. - -The first model provides key based access while the second always accesses fields -via functions: - -\starttyping -nodeobject.char -getfield(nodenumber,"char") -\stoptyping - -If you use the direct model, even if you know that you deal with numbers, you -should not depend on that property but treat it as an abstraction just like -traditional nodes. In fact, the fact that we use a simple basic datatype has the -penalty that less checking can be done, but less checking is also the reason why -it's somewhat faster. An important aspect is that one cannot mix both methods, -but you can cast both models. So, multiplying a node number makes no sense. - -So our advice is: use the indexed (table) approach when possible and investigate -the direct one when speed might be a real issue. For that reason \LUATEX\ also -provide the \type {get*} and \type {set*} functions in the top level node -namespace. There is a limited set of getters. When implementing this direct -approach the regular index by key variant was also optimized, so direct access -only makes sense when nodes are accessed millions of times (which happens in some -font processing for instance). - -We're talking mostly of getters because setters are less important. Documents -have not that many content related nodes and setting many thousands of properties -is hardly a burden contrary to millions of consultations. - -Normally you will access nodes like this: - -\starttyping -local next = current.next -if next then - -- do something -end -\stoptyping - -Here \type {next} is not a real field, but a virtual one. Accessing it results in -a metatable method being called. In practice it boils down to looking up the node -type and based on the node type checking for the field name. In a worst case you -have a node type that sits at the end of the lookup list and a field that is last -in the lookup chain. However, in successive versions of \LUATEX\ these lookups -have been optimized and the most frequently accessed nodes and fields have a -higher priority. - -Because in practice the \type {next} accessor results in a function call, there -is some overhead involved. The next code does the same and performs a tiny bit -faster (but not that much because it is still a function call but one that knows -what to look up). - -\starttyping -local next = node.next(current) -if next then - -- do something -end -\stoptyping - -Some accessors are used frequently and for these we provide more efficient helpers: - -\starttabulate[|l|p|] -\DB function \BC explanation \NC \NR -\TB -\NC \type{getnext} \NC parsing nodelist always involves this one \NC \NR -\NC \type{getprev} \NC used less but a logical companion to \type {getnext} \NC \NR -\NC \type{getboth} \NC returns the next and prev pointer of a node \NC \NR -\NC \type{getid} \NC consulted a lot \NC \NR -\NC \type{getsubtype} \NC consulted less but also a topper \NC \NR -\NC \type{getfont} \NC used a lot in \OPENTYPE\ handling (glyph nodes are consulted a lot) \NC \NR -\NC \type{getchar} \NC idem and also in other places \NC \NR -\NC \type{getwhd} \NC returns the \type {width}, \type {height} and \type {depth} of a list, rule or - (unexpanded) glyph as well as glue (its spec is looked at) and unset nodes\NC \NR -\NC \type{getdisc} \NC returns the \type {pre}, \type {post} and \type {replace} fields and - optionally when true is passed also the tail fields \NC \NR -\NC \type{getlist} \NC we often parse nested lists so this is a convenient one too \NC \NR -\NC \type{getleader} \NC comparable to list, seldom used in \TEX\ (but needs frequent consulting - like lists; leaders could have been made a dedicated node type) \NC \NR -\NC \type{getfield} \NC generic getter, sufficient for the rest (other field names are - often shared so a specific getter makes no sense then) \NC \NR -\NC \type{getbox} \NC gets the given box (a list node) \NC \NR -\NC \type{getoffsets} \NC gets the \type {xoffset} and \type {yoffset} of a glyph or - \type {left} and \type {right} values of a rule \NC \NR -\LL -\stoptabulate - -In the direct namespace there are more such helpers and most of them are -accompanied by setters. The getters and setters are clever enough to see what -node is meant. We don't deal with whatsit nodes: their fields are always accessed -by name. It doesn't make sense to add getters for all fields, we just identifier -the most likely candidates. In complex documents, many node and fields types -never get seen, or seen only a few times, but for instance glyphs are candidates -for such optimization. The \type {node.direct} interface has some more helpers. -\footnote {We can define the helpers in the node namespace with \type {getfield} -which is about as efficient, so at some point we might provide that as module.} - -The \type {setdisc} helper takes three (optional) arguments plus an optional -fourth indicating the subtype. Its \type {getdisc} takes an optional boolean; -when its value is \type {true} the tail nodes will also be returned. The \type -{setfont} helper takes an optional second argument, it being the character. The -directmode setter \type {setlink} takes a list of nodes and will link them, -thereby ignoring \type {nil} entries. The first valid node is returned (beware: -for good reason it assumes single nodes). For rarely used fields no helpers are -provided and there are a few that probably are used seldom too but were added for -consistency. You can of course always define additional accessors using \type -{getfield} and \type {setfield} with little overhead. When the second argument of -\type {setattributelist} is \type {true} the current attribute list is assumed. - -\def\yes{$+$} \def\nop{$-$} - -\def\supported#1#2#3% - {\NC \type{#1} - \NC \ifx#2\yes\lix{node} {#1}\fi #2 - \NC \ifx#3\yes\lix{node.direct}{#1}\fi #3 \NC - \NR} - -\starttabulate[|l|c|c|] -\DB function \BC node \BC direct \NC \NR -\TB -\supported {check_discretionaries} \yes \yes -\supported {check_discretionary} \yes \yes -\supported {copy_list} \yes \yes -\supported {copy} \yes \yes -\supported {count} \yes \yes -\supported {current_attr} \yes \yes -\supported {dimensions} \yes \yes -\supported {effective_glue} \yes \yes -\supported {end_of_math} \yes \yes -\supported {family_font} \yes \nop -\supported {fields} \yes \nop -\supported {find_attribute} \yes \yes -\supported {first_glyph} \yes \yes -\supported {flatten_discretionaries} \yes \yes -\supported {flush_list} \yes \yes -\supported {flush_node} \yes \yes -\supported {free} \yes \yes -\supported {get_attribute} \yes \yes -\supported {get_synctex_fields} \nop \yes -\supported {getattributelist} \nop \yes -\supported {getboth} \yes \yes -\supported {getbox} \nop \yes -\supported {getchar} \yes \yes -\supported {getcomponents} \nop \yes -\supported {getdepth} \nop \yes -\supported {getdirection} \nop \yes -\supported {getdir} \nop \yes -\supported {getdisc} \yes \yes -\supported {getfam} \nop \yes -\supported {getfield} \yes \yes -\supported {getfont} \yes \yes -\supported {getglue} \yes \yes -\supported {getheight} \nop \yes -\supported {getid} \yes \yes -\supported {getkern} \nop \yes -\supported {getlang} \nop \yes -\supported {getleader} \yes \yes -\supported {getlist} \yes \yes -\supported {getnext} \yes \yes -\supported {getnucleus} \nop \yes -\supported {getoffsets} \nop \yes -\supported {getpenalty} \nop \yes -\supported {getprev} \yes \yes -\supported {getproperty} \yes \yes -\supported {getshift} \nop \yes -\supported {getsubtype} \yes \yes -\supported {getsub} \nop \yes -\supported {getsup} \nop \yes -\supported {getdata} \nop \yes -\supported {getwhd} \yes \yes -\supported {getwidth} \nop \yes -\supported {has_attribute} \yes \yes -\supported {has_field} \yes \yes -\supported {has_glyph} \yes \yes -\supported {hpack} \yes \yes -\supported {id} \yes \nop -\supported {insert_after} \yes \yes -\supported {insert_before} \yes \yes -\supported {is_char} \yes \yes -\supported {is_direct} \nop \yes -\supported {is_glyph} \yes \yes -\supported {is_node} \yes \yes -\supported {is_zero_glue} \yes \yes -\supported {kerning} \yes \yes -\supported {last_node} \yes \yes -\supported {length} \yes \yes -\supported {ligaturing} \yes \yes -\supported {mlist_to_hlist} \yes \nop -\supported {new} \yes \yes -\supported {next} \yes \nop -\supported {prepend_prevdepth} \nop \yes -\supported {prev} \yes \nop -\supported {protect_glyphs} \yes \yes -\supported {protect_glyph} \yes \yes -\supported {protrusion_skippable} \yes \yes -\supported {rangedimensions} \yes \yes -\supported {remove} \yes \yes -\supported {set_attribute} \yes \yes -\supported {set_synctex_fields} \nop \yes -\supported {setattributelist} \nop \yes -\supported {setboth} \nop \yes -\supported {setbox} \nop \yes -\supported {setchar} \nop \yes -\supported {setcomponents} \nop \yes -\supported {setdepth} \nop \yes -\supported {setdirection} \nop \yes -\supported {setdir} \nop \yes -\supported {setdisc} \nop \yes -\supported {setfam} \nop \yes -\supported {setfield} \yes \yes -\supported {setfont} \nop \yes -\supported {setexpansion} \nop \yes -\supported {setglue} \yes \yes -\supported {setheight} \nop \yes -\supported {setkern} \nop \yes -\supported {setlang} \nop \yes -\supported {setleader} \nop \yes -\supported {setlink} \nop \yes -\supported {setlist} \nop \yes -\supported {setnext} \nop \yes -\supported {setnucleus} \nop \yes -\supported {setoffsets} \nop \yes -\supported {setpenalty} \nop \yes -\supported {setprev} \nop \yes -\supported {setproperty} \yes \yes -\supported {setshift} \nop \yes -\supported {setsplit} \nop \yes -\supported {setsubtype} \nop \yes -\supported {setsub} \nop \yes -\supported {setsup} \nop \yes -\supported {setwhd} \nop \yes -\supported {setwidth} \nop \yes -\supported {slide} \yes \yes -\supported {subtypes} \yes \nop -\supported {subtype} \yes \nop -\supported {tail} \yes \yes -\supported {todirect} \yes \yes -\supported {tonode} \yes \yes -\supported {tostring} \yes \yes -\supported {traverse_char} \yes \yes -\supported {traverse_glyph} \yes \yes -\supported {traverse_id} \yes \yes -\supported {traverse} \yes \yes -\supported {types} \yes \nop -\supported {type} \yes \nop -\supported {unprotect_glyphs} \yes \yes -\supported {unprotect_glyph} \yes \yes -\supported {unset_attribute} \yes \yes -\supported {usedlist} \yes \yes -\supported {uses_font} \yes \yes -\supported {vpack} \yes \yes -\supported {whatsits} \yes \nop -\supported {write} \yes \yes -\LL -\stoptabulate - -The \type {node.next} and \type {node.prev} functions will stay but for -consistency there are variants called \type {getnext} and \type {getprev}. We had -to use \type {get} because \type {node.id} and \type {node.subtype} are already -taken for providing meta information about nodes. Note: The getters do only basic -checking for valid keys. You should just stick to the keys mentioned in the -sections that describe node properties. - -Some of the getters and setters handle multiple node types, given that the field -is relevant. In that case, some field names are considered similar (like \type -{kern} and \type {width}, or \type {data} and \type {value}. In retrospect we -could have normalized field names better but we decided to stick to the original -(internal) names as much as possible. After all, at the \LUA\ end one can easily -create synonyms. - -Some nodes have indirect references. For instance a math character refers to a -family instead of a font. In that case we provide a virtual font field as -accessor. So, \type {getfont} and \type {.font} can be used on them. The same is -true for the \type {width}, \type {height} and \type {depth} of glue nodes. These -actually access the spec node properties, and here we can set as well as get the -values. - -In some places \LUATEX\ can do a bit of extra checking for valid node lists and -you can enable that with: - -\startfunctioncall -node.fix_node_lists( b) -\stopfunctioncall - -You can set and query the \SYNCTEX\ fields, a file number aka tag and a line -number, for a glue, kern, hlist, vlist, rule and math nodes as well as glyph -nodes (although this last one is not used in native \SYNCTEX). - -\startfunctioncall -node.set_synctex_fields( f, l) - f, l = - node.get_synctex_fields( n) -\stopfunctioncall - -Of course you need to know what you're doing as no checking on sane values takes -place. Also, the synctex interpreter used in editors is rather peculiar and has -some assumptions (heuristics). - -\stopsection - -\startsection[title={Properties}][library=node] - -\topicindex {nodes+properties} -\topicindex {properties} - -\libindex{flush_properties_table} -\libindex{get_properties_table} -\libindex{set_properties_mode} - -Attributes are a convenient way to relate extra information to a node. You can -assign them at the \TEX\ end as well as at the \LUA\ end and and consult them at -the \LUA\ end. One big advantage is that they obey grouping. They are linked -lists and normally checking for them is pretty efficient, even if you use a lot -of them. A macro package has to provide some way to manage these attributes at the -\TEX\ end because otherwise clashes in their usage can occur. - -Each node also can have a properties table and you can assign values to this -table using the \type {setproperty} function and get properties using the \type -{getproperty} function. Managing properties is way more demanding than managing -attributes. - -Take the following example: - -\starttyping -\directlua { - local n = node.new("glyph") - - node.setproperty(n,"foo") - print(node.getproperty(n)) - - node.setproperty(n,"bar") - print(node.getproperty(n)) - - node.free(n) -} -\stoptyping - -This will print \type {foo} and \type {bar} which in itself is not that useful -when multiple mechanisms want to use this feature. A variant is: - -\starttyping -\directlua { - local n = node.new("glyph") - - node.setproperty(n,{ one = "foo", two = "bar" }) - print(node.getproperty(n).one) - print(node.getproperty(n).two) - - node.free(n) -} -\stoptyping - -This time we store two properties with the node. It really makes sense to have a -table as property because that way we can store more. But in order for that to -work well you need to do it this way: - -\starttyping -\directlua { - local n = node.new("glyph") - - local t = node.getproperty(n) - - if not t then - t = { } - node.setproperty(n,t) - end - t.one = "foo" - t.two = "bar" - - print(node.getproperty(n).one) - print(node.getproperty(n).two) - - node.free(n) -} -\stoptyping - -Here our own properties will not overwrite other users properties unless of -course they use the same keys. So, eventually you will end up with something: - -\starttyping -\directlua { - local n = node.new("glyph") - - local t = node.getproperty(n) - - if not t then - t = { } - node.setproperty(n,t) - end - t.myself = { one = "foo", two = "bar" } - - print(node.getproperty(n).myself.one) - print(node.getproperty(n).myself.two) - - node.free(n) -} -\stoptyping - -This assumes that only you use \type {myself} as subtable. The possibilities are -endless but care is needed. For instance, the generic font handler that ships -with \CONTEXT\ uses the \type {injections} subtable and you should not mess with -that one! - -There are a few helper functions that you normally should not touch as user: \typ -{flush_properties_table} will wipe the table (normally a bad idea), \typ -{get_properties_table} and will give the table that stores properties (using -direct entries) and you can best not mess too much with that one either because -\LUATEX\ itself will make sure that entries related to nodes will get wiped when -nodes get freed, so that the \LUA\ garbage collector can do its job. In fact, the -main reason why we have this mechanism is that it saves the user (or macro -package) some work. One can easily write a property mechanism in \LUA\ where -after a shipout properties gets cleaned up but it's not entirely trivial to make -sure that with each freed node also its properties get freed, due to the fact -that there can be nodes left over for a next page. And having a callback bound to -the node deallocator would add way to much overhead. - -Managing properties in the node (de)allocator functions is disabled by default -and is enabled by: - -\starttyping -node.set_properties_mode(true) -\stoptyping - -When we copy a node list that has a table as property, there are several possibilities: we do the same as -a new node, we copy the entry to the table in properties (a reference), we do -a deep copy of a table in the properties, we create a new table and give it -the original one as a metatable. After some experiments (that also included -timing) with these scenarios we decided that a deep copy made no sense, nor -did nilling. In the end both the shallow copy and the metatable variant were -both ok, although the second one is slower. The most important aspect to keep -in mind is that references to other nodes in properties no longer can be -valid for that copy. We could use two tables (one unique and one shared) or -metatables but that only complicates matters. - -When defining a new node, we could already allocate a table but it is rather easy -to do that at the lua end e.g.\ using a metatable \type {__index} method. That -way it is under macro package control. When deleting a node, we could keep the -slot (e.g. setting it to false) but it could make memory consumption raise -unneeded when we have temporary large node lists and after that only small lists. -Both are not done. - -So in the end this is what happens now: when a node is copied, and it has a table -as property, the new node will share that table. If the second argument of \typ -{set_properties_mode} is \type {true} then a metatable approach is chosen: the -copy gets its own table with the original table as metatable. If you use the -generic font loader the mode is enabled that way. - -A few more xperiments were done. For instance: copy attributes to the properties -so that we have fast access at the \LUA\ end. In the end the overhead is not -compensated by speed and convenience, in fact, attributes are not that slow when -it comes to accessing them. So this was rejected. - -Another experiment concerned a bitset in the node but again the gain compared to -attributes was neglectable and given the small amount of available bits it also -demands a pretty strong agreement over what bit represents what, and this is -unlikely to succeed in the \TEX\ community. It doesn't pay off. - -Just in case one wonders why properties make sense: it is not so much speed that -we gain, but more convenience: storing all kind of (temporary) data in attributes -is no fun and this mechanism makes sure that properties are cleaned up when a -node is freed. Also, the advantage of a more or less global properties table is -that we stay at the \LUA\ end. An alternative is to store a reference in the node -itself but that is complicated by the fact that the register has some limitations -(no numeric keys) and we also don't want to mess with it too much. - -\stopsection - -\stopchapter - -\stopcomponent +% language=uk + +\environment luatex-style + +\startcomponent luatex-nodes + +\startchapter[reference=nodes,title={Nodes}] + +\startsection[title={\LUA\ node representation}][library=node] + +\topicindex {nodes} + +\libindex {fields} +\libindex {subtypes} +\libindex {values} + +\TEX's nodes are represented in \LUA\ as userdata objects with a variable set of +fields. In the following syntax tables, such as the type of such a userdata object +is represented as \syntax {}. + +The current return value of \type {node.types()} is: +\startluacode + for id, name in table.sortedhash(node.types()) do + context.type(name) + context(" (%s), ",id) + end + context.removeunwantedspaces() + context.removepunctuation() +\stopluacode +. % period + +The \prm {lastnodetype} primitive is \ETEX\ compliant. The valid range is still +$[-1,15]$ and glyph nodes (formerly known as char nodes) have number~0 while +ligature nodes are mapped to~7. That way macro packages can use the same symbolic +names as in traditional \ETEX. Keep in mind that these \ETEX\ node numbers are +different from the real internal ones and that there are more \ETEX\ node types +than~15. + +You can ask for a list of fields with \type {node.fields} and for valid subtypes +with \type {node.subtypes}. The \type {node.values} function reports some used +values. Valid arguments are \nod {dir}, \type {direction}, \nod {glue}, \whs +{pdf_literal}, \whs {pdf_action}, \whs {pdf_window} and \whs {color_stack}. Keep +in mind that the setters normally expect a number, but this helper gives you a +list of what numbers matter. For practical reason the \type {pagestate} values +are also reported with this helper. + +\stopsection + +\startsection[title={Main text nodes}] + +\topicindex {nodes+text} + +These are the nodes that comprise actual typesetting commands. A few fields are +present in all nodes regardless of their type, these are: + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{next} \NC node \NC the next node in a list, or nil \NC \NR +\NC \type{id} \NC number \NC the node's type (\type {id}) number \NC \NR +\NC \type{subtype} \NC number \NC the node \type {subtype} identifier \NC \NR +\LL +\stoptabulate + +The \type {subtype} is sometimes just a dummy entry because not all nodes +actually use the \type {subtype}, but this way you can be sure that all nodes +accept it as a valid field name, and that is often handy in node list traversal. +In the following tables \type {next} and \type {id} are not explicitly mentioned. + +Besides these three fields, almost all nodes also have an \type {attr} field, and +there is a also a field called \type {prev}. That last field is always present, +but only initialized on explicit request: when the function \type {node.slide()} +is called, it will set up the \type {prev} fields to be a backwards pointer in +the argument node list. By now most of \TEX's node processing makes sure that the +\type {prev} nodes are valid but there can be exceptions, especially when the +internal magic uses a leading \nod {temp} nodes to temporarily store a state. + +\subsection{\nod {hlist} nodes} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{subtype} \NC number \NC \showsubtypes{list} \NC \NR +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{width} \NC number \NC the width of the box \NC \NR +\NC \type{height} \NC number \NC the height of the box \NC \NR +\NC \type{depth} \NC number \NC the depth of the box \NC \NR +\NC \type{shift} \NC number \NC a displacement perpendicular to the character + progression direction \NC \NR +\NC \type{glue_order} \NC number \NC a number in the range $[0,4]$, indicating the + glue order \NC \NR +\NC \type{glue_set} \NC number \NC the calculated glue ratio \NC \NR +\NC \type{glue_sign} \NC number \NC 0 = \type {normal}, 1 = \type {stretching}, 2 = + \type {shrinking} \NC \NR +\NC \type{head/list} \NC node \NC the first node of the body of this list \NC \NR +\NC \type{dir} \NC string \NC the direction of this box, see~\in [dirnodes] \NC \NR +\LL +\stoptabulate + +\topicindex {nodes+lists} +\topicindex {lists} + +A warning: never assign a node list to the \type {head} field unless you are sure +its internal link structure is correct, otherwise an error may result. + +Note: the field name \type {head} and \type {list} are both valid. Sometimes it +makes more sense to refer to a list by \type {head}, sometimes \type {list} makes +more sense. + +\subsection{\nod {vlist} nodes} + +\topicindex {nodes+lists} +\topicindex {lists} + +This node is similar to \nod {hlist}, except that \quote {shift} is a displacement +perpendicular to the line progression direction, and \quote {subtype} only has +the values 0, 4, and~5. + +\subsection{\nod {rule} nodes} + +\topicindex {nodes+rules} +\topicindex {rules} + +Contrary to traditional \TEX, \LUATEX\ has more \prm {rule} subtypes because we +also use rules to store reuseable objects and images. User nodes are invisible +and can be intercepted by a callback. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{subtype} \NC number \NC \showsubtypes {rule} \NC \NR +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{width} \NC number \NC the width of the rule where the special value + $-1073741824$ is used for \quote {running} glue dimensions \NC \NR +\NC \type{height} \NC number \NC the height of the rule (can be negative) \NC \NR +\NC \type{depth} \NC number \NC the depth of the rule (can be negative) \NC \NR +\NC \type{left} \NC number \NC shift at the left end (also subtracted from width) \NC \NR +\NC \type{right} \NC number \NC (subtracted from width) \NC \NR +\NC \type{dir} \NC string \NC the direction of this rule, see~\in[dirnodes] \NC \NR +\NC \type{index} \NC number \NC an optional index that can be referred to \NC \NR +\NC \type{transform} \NC number \NC an private variable (also used to specify outline width) \NC \NR +\LL +\stoptabulate + +The \type {left} and type {right} keys are somewhat special (and experimental). +When rules are auto adapting to the surrounding box width you can enforce a shift +to the right by setting \type {left}. The value is also subtracted from the width +which can be a value set by the engine itself and is not entirely under user +control. The \type {right} is also subtracted from the width. It all happens in +the backend so these are not affecting the calculations in the frontend (actually +the auto settings also happen in the backend). For a vertical rule \type {left} +affects the height and \type {right} affects the depth. There is no matching +interface at the \TEX\ end (although we can have more keywords for rules it would +complicate matters and introduce a speed penalty.) However, you can just +construct a rule node with \LUA\ and write it to the \TEX\ input. The \type +{outline} subtype is just a convenient variant and the \type {transform} field +specifies the width of the outline. + +\subsection{\nod {ins} nodes} + +\topicindex {nodes+insertions} +\topicindex {insertions} + +This node relates to the \prm {insert} primitive. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{subtype} \NC number \NC the insertion class \NC \NR +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{cost} \NC number \NC the penalty associated with this insert \NC \NR +\NC \type{height} \NC number \NC height of the insert \NC \NR +\NC \type{depth} \NC number \NC depth of the insert \NC \NR +\NC \type{head/list} \NC node \NC the first node of the body of this insert \NC \NR +\LL +\stoptabulate + +There is a set of extra fields that concern the associated glue: \type {width}, +\type {stretch}, \type {stretch_order}, \type {shrink} and \type {shrink_order}. +These are all numbers. + +A warning: never assign a node list to the \type {head} field unless you are sure +its internal link structure is correct, otherwise an error may result. You can use +\type {list} instead (often in functions you want to use local variable with similar +names and both names are equally sensible). + +\subsection{\nod {mark} nodes} + +\topicindex {nodes+marks} +\topicindex {marks} + +This one relates to the \prm {mark} primitive. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{subtype} \NC number \NC unused \NC \NR +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{class} \NC number \NC the mark class \NC \NR +\NC \type{mark} \NC table \NC a table representing a token list \NC \NR +\LL +\stoptabulate + +\subsection{\nod {adjust} nodes} + +\topicindex {nodes+adjust} +\topicindex {adjust} + +This node comes from \prm {vadjust} primitive. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{subtype} \NC number \NC \showsubtypes{adjust} \NC \NR +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{head/list} \NC node \NC adjusted material \NC \NR +\LL +\stoptabulate + +A warning: never assign a node list to the \type {head} field unless you are sure +its internal link structure is correct, otherwise an error may be the result. + +\subsection{\nod {disc} nodes} + +\topicindex {nodes+discretionaries} +\topicindex {discretionaries} + +The \prm {discretionary} and \prm {-}, the \type {-} character but also the +hyphenation mechanism produces these nodes. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{subtype} \NC number \NC \showsubtypes{disc} \NC \NR +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{pre} \NC node \NC pointer to the pre|-|break text \NC \NR +\NC \type{post} \NC node \NC pointer to the post|-|break text \NC \NR +\NC \type{replace} \NC node \NC pointer to the no|-|break text \NC \NR +\NC \type{penalty} \NC number \NC the penalty associated with the break, normally + \prm {hyphenpenalty} or \prm {exhyphenpenalty} \NC \NR +\LL +\stoptabulate + +The subtype numbers~4 and~5 belong to the \quote {of-f-ice} explanation given +elsewhere. These disc nodes are kind of special as at some point they also keep +information about breakpoints and nested ligatures. + +The \type {pre}, \type {post} and \type {replace} fields at the \LUA\ end are in +fact indirectly accessed and have a \type {prev} pointer that is not \type {nil}. +This means that when you mess around with the head of these (three) lists, you +also need to reassign them because that will restore the proper \type {prev} +pointer, so: + +\starttyping +pre = d.pre +-- change the list starting with pre +d.pre = pre +\stoptyping + +Otherwise you can end up with an invalid internal perception of reality and +\LUATEX\ might even decide to crash on you. It also means that running forward +over for instance \type {pre} is ok but backward you need to stop at \type {pre}. +And you definitely must not mess with the node that \type {prev} points to, if +only because it is not really a node but part of the disc data structure (so +freeing it again might crash \LUATEX). + +\subsection{\nod {math} nodes} + +\topicindex {nodes+math} +\topicindex {math+nodes} + +Math nodes represent the boundaries of a math formula, normally wrapped into +\type {$} signs. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{subtype} \NC number \NC \showsubtypes{math} \NC \NR +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{surround} \NC number \NC width of the \prm {mathsurround} kern \NC \NR +\LL +\stoptabulate + +There is a set of extra fields that concern the associated glue: \type {width}, +\type {stretch}, \type {stretch_order}, \type {shrink} and \type {shrink_order}. +These are all numbers. + +\subsection{\nod {glue} nodes} + +\topicindex {nodes+glue} +\topicindex {glue} + +Skips are about the only type of data objects in traditional \TEX\ that are not a +simple value. They are inserted when \TEX\ sees a space in the text flow but also +by \prm {hskip} and \prm {vskip}. The structure that represents the glue +components of a skip is called a \nod {glue_spec}, and it has the following +accessible fields: + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{width} \NC number \NC the horizontal or vertical displacement \NC \NR +\NC \type{stretch} \NC number \NC extra (positive) displacement or stretch amount \NC \NR +\NC \type{stretch_order} \NC number \NC factor applied to stretch amount \NC \NR +\NC \type{shrink} \NC number \NC extra (negative) displacement or shrink amount\NC \NR +\NC \type{shrink_order} \NC number \NC factor applied to shrink amount \NC \NR +\LL +\stoptabulate + +The effective width of some glue subtypes depends on the stretch or shrink needed +to make the encapsulating box fit its dimensions. For instance, in a paragraph +lines normally have glue representing spaces and these stretch or shrink to make +the content fit in the available space. The \type {effective_glue} function that +takes a glue node and a parent (hlist or vlist) returns the effective width of +that glue item. When you pass \type {true} as third argument the value will be +rounded. + +A \nod {glue_spec} node is a special kind of node that is used for storing a set +of glue values in registers. Originally they were also used to store properties +of glue nodes (using a system of reference counts) but we now keep these +properties in the glue nodes themselves, which gives a cleaner interface to \LUA. + +The indirect spec approach was in fact an optimization in the original \TEX\ +code. First of all it can save quite some memory because all these spaces that +become glue now share the same specification (only the reference count is +incremented), and zero testing is also a bit faster because only the pointer has +to be checked (this is no longer true for engines that implement for instance +protrusion where we really need to ensure that zero is zero when we test for +bounds). Another side effect is that glue specifications are read|-|only, so in +the end copies need to be made when they are used from \LUA\ (each assignment to +a field can result in a new copy). So in the end the advantages of sharing are +not that high (and nowadays memory is less an issue, also given that a glue node +is only a few memory words larger than a spec). + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{subtype} \NC number \NC \showsubtypes{glue} \NC \NR +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{leader} \NC node \NC pointer to a box or rule for leaders \NC \NR +\LL +\stoptabulate + +In addition there are the \type {width}, \type {stretch} \type {stretch_order}, +\type {shrink}, and \type {shrink_order} fields. Note that we use the key \type +{width} in both horizontal and vertical glue. This suits the \TEX\ internals well +so we decided to stick to that naming. + +A regular word space also results in a \type {spaceskip} subtype (this used to be +a \type {userskip} with subtype zero). + +\subsection{\nod {kern} nodes} + +\topicindex {nodes+kerns} +\topicindex {kerns} + +The \prm {kern} command creates such nodes but for instance the font and math +machinery can also add them. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{subtype} \NC number \NC \showsubtypes{kern} \NC \NR +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{kern} \NC number \NC fixed horizontal or vertical advance \NC \NR +\LL +\stoptabulate + +\subsection{\nod {penalty} nodes} + +\topicindex {nodes+penalty} +\topicindex {penalty} + +The \prm {penalty} command is one that generates these nodes. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{subtype} \NC number \NC \showsubtypes{penalty} \NC \NR +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{penalty} \NC number \NC the penalty value \NC \NR +\LL +\stoptabulate + +The subtypes are just informative and \TEX\ itself doesn't use them. When you +run into an \type {linebreakpenalty} you need to keep in mind that it's a +accumulation of \type {club}, \type{widow} and other relevant penalties. + +\subsection[glyphnodes]{\nod {glyph} nodes} + +\topicindex {nodes+glyph} +\topicindex {glyphs} + +These are probably the mostly used nodes and although you can push them in the +current list with for instance \prm {char} \TEX\ will normally do it for you when +it considers some input to be text. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{subtype} \NC number \NC bit field \NC \NR +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{char} \NC number \NC the character index in the font \NC \NR +\NC \type{font} \NC number \NC the font identifier \NC \NR +\NC \type{lang} \NC number \NC the language identifier \NC \NR +\NC \type{left} \NC number \NC the frozen \type {\lefthyphenmnin} value \NC \NR +\NC \type{right} \NC number \NC the frozen \type {\righthyphenmnin} value \NC \NR +\NC \type{uchyph} \NC boolean \NC the frozen \prm {uchyph} value \NC \NR +\NC \type{components} \NC node \NC pointer to ligature components \NC \NR +\NC \type{xoffset} \NC number \NC a virtual displacement in horizontal direction \NC \NR +\NC \type{yoffset} \NC number \NC a virtual displacement in vertical direction \NC \NR +\NC \type{width} \NC number \NC the (original) width of the character \NC \NR +\NC \type{height} \NC number \NC the (original) height of the character\NC \NR +\NC \type{depth} \NC number \NC the (original) depth of the character\NC \NR +\NC \type{expansion_factor} \NC number \NC the to be applied expansion_factor \NC \NR +\NC \type{data} \NC number \NC a general purpose field for users (we had room for it) \NC \NR +\LL +\stoptabulate + +The \type {width}, \type {height} and \type {depth} values are read|-|only. The +\type {expansion_factor} is assigned in the par builder and used in the backend. + +A warning: never assign a node list to the components field unless you are sure +its internal link structure is correct, otherwise an error may be result. Valid +bits for the \type {subtype} field are: + +\starttabulate[|c|l|] +\DB bit \BC meaning \NC \NR +\TB +\NC 0 \NC character \NC \NR +\NC 1 \NC ligature \NC \NR +\NC 2 \NC ghost \NC \NR +\NC 3 \NC left \NC \NR +\NC 4 \NC right \NC \NR +\LL +\stoptabulate + +See \in {section} [charsandglyphs] for a detailed description of the \type +{subtype} field. + +The \type {expansion_factor} has been introduced as part of the separation +between font- and backend. It is the result of extensive experiments with a more +efficient implementation of expansion. Early versions of \LUATEX\ already +replaced multiple instances of fonts in the backend by scaling but contrary to +\PDFTEX\ in \LUATEX\ we now also got rid of font copies in the frontend and +replaced them by expansion factors that travel with glyph nodes. Apart from a +cleaner approach this is also a step towards a better separation between front- +and backend. + +The \type {is_char} function checks if a node is a glyph node with a subtype still +less than 256. This function can be used to determine if applying font logic to a +glyph node makes sense. The value \type {nil} gets returned when the node is not +a glyph, a character number is returned if the node is still tagged as character +and \type {false} gets returned otherwise. When nil is returned, the id is also +returned. The \type {is_glyph} variant doesn't check for a subtype being less +than 256, so it returns either the character value or nil plus the id. These +helpers are not always faster than separate calls but they sometimes permit +making more readable tests. The \type {uses_font} helpers takes a node +and font id and returns true when a glyph or disc node references that font. + +\subsection{\nod {boundary} nodes} + +\topicindex {nodes+boundary} +\topicindex {boundary} + +This node relates to the \prm {noboundary}, \prm {boundary}, \prm +{protrusionboundary} and \prm {wordboundary} primitives. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{subtype} \NC number \NC \showsubtypes{boundary} \NC \NR +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{value} \NC number \NC values 0--255 are reserved \NC \NR +\LL +\stoptabulate + +\subsection{\nod {local_par} nodes} + +\topicindex {nodes+paragraphs} +\topicindex {paragraphs} + +This node is inserted at the start of a paragraph. You should not mess +too much with this one. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{pen_inter} \NC number \NC local interline penalty (from \lpr {localinterlinepenalty}) \NC \NR +\NC \type{pen_broken} \NC number \NC local broken penalty (from \lpr {localbrokenpenalty}) \NC \NR +\NC \type{dir} \NC string \NC the direction of this par. see~\in [dirnodes] \NC \NR +\NC \type{box_left} \NC node \NC the \lpr {localleftbox} \NC \NR +\NC \type{box_left_width} \NC number \NC width of the \lpr {localleftbox} \NC \NR +\NC \type{box_right} \NC node \NC the \lpr {localrightbox} \NC \NR +\NC \type{box_right_width} \NC number \NC width of the \lpr {localrightbox} \NC \NR +\LL +\stoptabulate + +A warning: never assign a node list to the \type {box_left} or \type {box_right} +field unless you are sure its internal link structure is correct, otherwise an +error may result. + +\subsection[dirnodes]{\nod {dir} nodes} + +\topicindex {nodes+direction} +\topicindex {directions} + +Direction nodes mark parts of the running text that need a change of direction and \ +the \prm {textdir} command generates them. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{dir} \NC string \NC the direction (but see below) \NC \NR +\NC \type{level} \NC number \NC nesting level of this direction whatsit \NC \NR +\LL +\stoptabulate + +Direction specifiers are three|-|letter combinations of \type {T}, \type {B}, +\type {R}, and \type {L}. These are built up out of three separate items: + +\startitemize[packed] +\startitem + the first is the direction of the \quote{top} of paragraphs +\stopitem +\startitem + the second is the direction of the \quote{start} of lines +\stopitem +\startitem + the third is the direction of the \quote{top} of glyphs +\stopitem +\stopitemize + +However, only four combinations are accepted: \type {TLT}, \type {TRT}, \type +{RTT}, and \type {LTL}. Inside actual \nod {dir} nodes, the representation of +\nod {dir} is not a three|-|letter but a combination of numbers. When printed the +direction is indicated by a \type {+} or \type {-}, indicating whether the value +is pushed or popped from the direction stack. + +\subsection{\nod {marginkern} nodes} + +\topicindex {nodes+paragraphs} +\topicindex {paragraphs} +\topicindex {protrusion} + +Margin kerns result from protrusion. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{subtype} \NC number \NC \showsubtypes{marginkern} \NC \NR +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{width} \NC number \NC the advance of the kern \NC \NR +\NC \type{glyph} \NC node \NC the glyph to be used \NC \NR +\LL +\stoptabulate + +\stopsection + +\startsection[title={Math noads}] + +\topicindex {nodes+math} +\topicindex {math+nodes} + +These are the so||called \quote {noad}s and the nodes that are specifically +associated with math processing. Most of these nodes contain subnodes so that the +list of possible fields is actually quite small. First, the subnodes: + +\subsection{Math kernel subnodes} + +Many object fields in math mode are either simple characters in a specific family +or math lists or node lists. There are four associated subnodes that represent +these cases (in the following node descriptions these are indicated by the word +\type {}). + +The \type {next} and \type {prev} fields for these subnodes are unused. + +\subsection{\nod {math_char} and \nod {math_text_char} subnodes} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{char} \NC number \NC the character index \NC \NR +\NC \type{fam} \NC number \NC the family number \NC \NR +\LL +\stoptabulate + +The \nod {math_char} is the simplest subnode field, it contains the character +and family for a single glyph object. The \nod {math_text_char} is a special +case that you will not normally encounter, it arises temporarily during math list +conversion (its sole function is to suppress a following italic correction). + +\subsection{\nod {sub_box} and \nod {sub_mlist} subnodes} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{head/list} \NC node \NC list of nodes \NC \NR +\LL +\stoptabulate + +These two subnode types are used for subsidiary list items. For \nod {sub_box}, +the \type {head} points to a \quote {normal} vbox or hbox. For \nod {sub_mlist}, +the \type {head} points to a math list that is yet to be converted. + +A warning: never assign a node list to the \type {head} field unless you are sure +its internal link structure is correct, otherwise an error is triggered. + +\subsection{\nod {delim} subnodes} + +There is a fifth subnode type that is used exclusively for delimiter fields. As +before, the \type {next} and \type {prev} fields are unused. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{small_char} \NC number \NC character index of base character \NC \NR +\NC \type{small_fam} \NC number \NC family number of base character \NC \NR +\NC \type{large_char} \NC number \NC character index of next larger character \NC \NR +\NC \type{large_fam} \NC number \NC family number of next larger character \NC \NR +\LL +\stoptabulate + +The fields \type {large_char} and \type {large_fam} can be zero, in that case the +font that is set for the \type {small_fam} is expected to provide the large +version as an extension to the \type {small_char}. + +\subsection{Math core nodes} + +First, there are the objects (the \TEX book calls them \quote {atoms}) that are +associated with the simple math objects: ord, op, bin, rel, open, close, punct, +inner, over, under, vcent. These all have the same fields, and they are combined +into a single node type with separate subtypes for differentiation. + +Some noads have an option field. The values in this bitset are common: + +\starttabulate[|l|r|] +\DB meaning \BC bits \NC \NR +\TB +\NC set \NC \type{0x08} \NC \NR +\NC internal \NC \type{0x00} + \type{0x08} \NC \NR +\NC internal \NC \type{0x01} + \type{0x08} \NC \NR +\NC axis \NC \type{0x02} + \type{0x08} \NC \NR +\NC no axis \NC \type{0x04} + \type{0x08} \NC \NR +\NC exact \NC \type{0x10} + \type{0x08} \NC \NR +\NC left \NC \type{0x11} + \type{0x08} \NC \NR +\NC middle \NC \type{0x12} + \type{0x08} \NC \NR +\NC right \NC \type{0x14} + \type{0x08} \NC \NR +\NC no sub script \NC \type{0x21} + \type{0x08} \NC \NR +\NC no super script \NC \type{0x22} + \type{0x08} \NC \NR +\NC no script \NC \type{0x23} + \type{0x08} \NC \NR +\LL +\stoptabulate + +\subsection{simple \nod {noad} nodes} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{subtype} \NC number \NC \showsubtypes{noad} \NC \NR +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{nucleus} \NC kernel node \NC base \NC \NR +\NC \type{sub} \NC kernel node \NC subscript \NC \NR +\NC \type{sup} \NC kernel node \NC superscript \NC \NR +\NC \type{options} \NC number \NC bitset of rendering options \NC \NR +\LL +\stoptabulate + +\subsection{\nod {accent} nodes} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{subtype} \NC number \NC \showsubtypes{accent} \NC \NR +\NC \type{nucleus} \NC kernel node \NC base \NC \NR +\NC \type{sub} \NC kernel node \NC subscript \NC \NR +\NC \type{sup} \NC kernel node \NC superscript \NC \NR +\NC \type{accent} \NC kernel node \NC top accent \NC \NR +\NC \type{bot_accent} \NC kernel node \NC bottom accent \NC \NR +\NC \type{fraction} \NC number \NC larger step criterium (divided by 1000) \NC \NR +\LL +\stoptabulate + +\subsection{\nod {style} nodes} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{style} \NC string \NC contains the style \NC \NR +\LL +\stoptabulate + +There are eight possibilities for the string value: one of \type {display}, +\type {text}, \type {script}, or \type {scriptscript}. Each of these can have +be prefixed by \type {cramped}. + +\subsection{\nod {choice} nodes} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{display} \NC node \NC list of display size alternatives \NC \NR +\NC \type{text} \NC node \NC list of text size alternatives \NC \NR +\NC \type{script} \NC node \NC list of scriptsize alternatives \NC \NR +\NC \type{scriptscript} \NC node \NC list of scriptscriptsize alternatives \NC \NR +\LL +\stoptabulate + +Warning: never assign a node list to the \type {display}, \type {text}, \type +{script}, or \type {scriptscript} field unless you are sure its internal link +structure is correct, otherwise an error can occur. + +\subsection{\nod {radical} nodes} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{subtype} \NC number \NC \showsubtypes{radical} \NC \NR +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{nucleus} \NC kernel node \NC base \NC \NR +\NC \type{sub} \NC kernel node \NC subscript \NC \NR +\NC \type{sup} \NC kernel node \NC superscript \NC \NR +\NC \type{left} \NC delimiter node \NC \NC \NR +\NC \type{degree} \NC kernel node \NC only set by \lpr {Uroot} \NC \NR +\NC \type{width} \NC number \NC required width \NC \NR +\NC \type{options} \NC number \NC bitset of rendering options \NC \NR +\LL +\stoptabulate + +Warning: never assign a node list to the \type {nucleus}, \type {sub}, \type +{sup}, \type {left}, or \type {degree} field unless you are sure its internal +link structure is correct, otherwise an error can be triggered. + +\subsection{\nod {fraction} nodes} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{width} \NC number \NC (optional) width of the fraction \NC \NR +\NC \type{num} \NC kernel node \NC numerator \NC \NR +\NC \type{denom} \NC kernel node \NC denominator \NC \NR +\NC \type{left} \NC delimiter node \NC left side symbol \NC \NR +\NC \type{right} \NC delimiter node \NC right side symbol \NC \NR +\NC \type{middle} \NC delimiter node \NC middle symbol \NC \NR +\NC \type{options} \NC number \NC bitset of rendering options \NC \NR +\LL +\stoptabulate + +Warning: never assign a node list to the \type {num}, or \type {denom} field +unless you are sure its internal link structure is correct, otherwise an error +can result. + +\subsection{\nod {fence} nodes} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{subtype} \NC number \NC \showsubtypes{fence} \NC \NR +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{delim} \NC delimiter node \NC delimiter specification \NC \NR +\NC \type{italic} \NC number \NC italic correction \NC \NR +\NC \type{height} \NC number \NC required height \NC \NR +\NC \type{depth} \NC number \NC required depth \NC \NR +\NC \type{options} \NC number \NC bitset of rendering options \NC \NR +\NC \type{class} \NC number \NC spacing related class \NC \NR +\LL +\stoptabulate + +Warning: some of these fields are used by the renderer and might get adapted in +the process. + +\stopsection + +\startsection[title={Front|-|end whatsits}] + +Whatsit nodes come in many subtypes that you can ask for them by running +\type {node.whatsits}: +\startluacode + for id, name in table.sortedpairs(node.whatsits()) do + context.type(name) + context(" (%s), ",id) + end + context.removeunwantedspaces() + context.removepunctuation() +\stopluacode +. % period + +Some of them are generic and independent of the output mode and others are +specific to the chosen backend: \DVI\ or \PDF. Here we discuss the generic +font|-|end nodes nodes. + +\subsection{\whs {open}} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{stream} \NC number \NC \TEX's stream id number \NC \NR +\NC \type{name} \NC string \NC file name \NC \NR +\NC \type{ext} \NC string \NC file extension \NC \NR +\NC \type{area} \NC string \NC file area (this may become obsolete) \NC \NR +\LL +\stoptabulate + +\subsection{\whs {write}} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{stream} \NC number \NC \TEX's stream id number \NC \NR +\NC \type{data} \NC table \NC a table representing the token list to be written \NC \NR +\LL +\stoptabulate + +\subsection{\whs {close}} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{stream} \NC number \NC \TEX's stream id number \NC \NR +\LL +\stoptabulate + +\subsection{\whs {user_defined}} + +User|-|defined whatsit nodes can only be created and handled from \LUA\ code. In +effect, they are an extension to the extension mechanism. The \LUATEX\ engine +will simply step over such whatsits without ever looking at the contents. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{user_id} \NC number \NC id number \NC \NR +\NC \type{type} \NC number \NC type of the value \NC \NR +\NC \type{value} \NC number \NC a \LUA\ number \NC \NR +\NC \NC node \NC a node list \NC \NR +\NC \NC string \NC a \LUA\ string \NC \NR +\NC \NC table \NC a \LUA\ table \NC \NR +\LL +\stoptabulate + +The \type {type} can have one of six distinct values. The number is the \ASCII\ +value if the first character of the type name (so you can use string.byte("l") +instead of \type {108}). + +\starttabulate[|r|c|p|] +\DB value \BC meaning \BC explanation \NC \NR +\TB +\NC 97 \NC a \NC list of attributes (a node list) \NC \NR +\NC 100 \NC d \NC a \LUA\ number \NC \NR +\NC 108 \NC l \NC a \LUA\ value (table, number, boolean, etc) \NC \NR +\NC 110 \NC n \NC a node list \NC \NR +\NC 115 \NC s \NC a \LUA\ string \NC \NR +\NC 116 \NC t \NC a \LUA\ token list in \LUA\ table form (a list of triplets) \NC \NR +\LL +\stoptabulate + +\subsection{\whs {save_pos}} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\LL +\stoptabulate + +\subsection{\whs {late_lua}} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{data} \NC string or function \NC the to be written information stored as \LUA\ value \NC \NR +\NC \type{token} \NC string \NC the to be written information stored as token list \NC \NR +\NC \type{name} \NC string \NC the name to use for \LUA\ error reporting \NC \NR +\LL +\stoptabulate + +The difference between \type {data} and \type {string} is that on assignment, the +\type {data} field is converted to a token list, cf.\ use as \lpr {latelua}. The +\type {string} version is treated as a literal string. + +\stopsection + +\startsection[title={\DVI\ backend whatsits}] + +\subsection{\whs {special}} + +There is only one \DVI\ backend whatsit, and it just flushes its content to the +output file. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{data} \NC string \NC the \prm {special} information \NC \NR +\LL +\stoptabulate + +\stopsection + +\startsection[title={\PDF\ backend whatsits}] + +\subsection{\whs {pdf_literal}} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{mode} \NC number \NC the \quote {mode} setting of this literal \NC \NR +\NC \type{data} \NC string \NC the to be written information stored as \LUA\ string \NC \NR +\NC \type{token} \NC string \NC the to be written information stored as token list \NC \NR +\LL +\stoptabulate + +Possible mode values are: + +\starttabulate[|c|p|] +\DB value \BC keyword \NC \NR +\TB +\NC 0 \NC \type{origin} \NC \NR +\NC 1 \NC \type{page} \NC \NR +\NC 2 \NC \type{direct} \NC \NR +\NC 3 \NC \type{raw} \NC \NR +\NC 4 \NC \type{text} \NC \NR +\LL +\stoptabulate + +The higher the number, the less checking and the more you can run into trouble. +Especially the \type {raw} variant can produce bad \PDF\ so you can best check +what you generate. + +\subsection{\whs {pdf_refobj}} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{objnum} \NC number \NC the referenced \PDF\ object number \NC \NR +\LL +\stoptabulate + +\subsection{\whs {pdf_annot}} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{width} \NC number \NC the width (not used in calculations) \NC \NR +\NC \type{height} \NC number \NC the height (not used in calculations) \NC \NR +\NC \type{depth} \NC number \NC the depth (not used in calculations) \NC \NR +\NC \type{objnum} \NC number \NC the referenced \PDF\ object number \NC \NR +\NC \type{data} \NC string \NC the annotation data \NC \NR +\LL +\stoptabulate + +\subsection{\whs {pdf_start_link}} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{width} \NC number \NC the width (not used in calculations) \NC \NR +\NC \type{height} \NC number \NC the height (not used in calculations) \NC \NR +\NC \type{depth} \NC number \NC the depth (not used in calculations) \NC \NR +\NC \type{objnum} \NC number \NC the referenced \PDF\ object number \NC \NR +\NC \type{link_attr} \NC table \NC the link attribute token list \NC \NR +\NC \type{action} \NC node \NC the action to perform \NC \NR +\LL +\stoptabulate + +\subsection{\whs {pdf_end_link}} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC \NC \NR +\LL +\stoptabulate + +\subsection{\whs {pdf_dest}} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{width} \NC number \NC the width (not used in calculations) \NC \NR +\NC \type{height} \NC number \NC the height (not used in calculations) \NC \NR +\NC \type{depth} \NC number \NC the depth (not used in calculations) \NC \NR +\NC \type{named_id} \NC number \NC is the \type {dest_id} a string value? \NC \NR +\NC \type{dest_id} \NC number \NC the destination id \NC \NR +\NC \NC string \NC the destination name \NC \NR +\NC \type{dest_type} \NC number \NC type of destination \NC \NR +\NC \type{xyz_zoom} \NC number \NC the zoom factor (times 1000) \NC \NR +\NC \type{objnum} \NC number \NC the \PDF\ object number \NC \NR +\LL +\stoptabulate + +\subsection{\whs {pdf_action}} + +These are a special kind of items that only appear inside \PDF\ start link +objects. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{action_type} \NC number \NC the kind of action involved \NC \NR +\NC \type{action_id} \NC number or string \NC token list reference or string \NC \NR +\NC \type{named_id} \NC number \NC the index of the destination \NC \NR +\NC \type{file} \NC string \NC the target filename \NC \NR +\NC \type{new_window} \NC number \NC the window state of the target \NC \NR +\NC \type{data} \NC string \NC the name of the destination \NC \NR +\LL +\stoptabulate + +Valid action types are: + +\starttabulate[|l|l|] +\DB value \BC meaning \NC \NR +\TB +\NC 0 \NC \type{page} \NC \NR +\NC 1 \NC \type{goto} \NC \NR +\NC 2 \NC \type{thread} \NC \NR +\NC 3 \NC \type{user} \NC \NR +\LL +\stoptabulate + +Valid window types are: + +\starttabulate[|l|l|] +\DB value \BC meaning \NC \NR +\TB +\NC 0 \NC \type{notset} \NC \NR +\NC 1 \NC \type{new} \NC \NR +\NC 2 \NC \type{nonew} \NC \NR +\LL +\stoptabulate + +\subsection{\whs {pdf_thread}} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{width} \NC number \NC the width (not used in calculations) \NC \NR +\NC \type{height} \NC number \NC the height (not used in calculations) \NC \NR +\NC \type{depth} \NC number \NC the depth (not used in calculations) \NC \NR +\NC \type{named_id} \NC number \NC is \type {tread_id} a string value? \NC \NR +\NC \type{tread_id} \NC number \NC the thread id \NC \NR +\NC \NC string \NC the thread name \NC \NR +\NC \type{thread_attr} \NC number \NC extra thread information \NC \NR +\LL +\stoptabulate + +\subsection{\whs {pdf_start_thread}} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{width} \NC number \NC the width (not used in calculations) \NC \NR +\NC \type{height} \NC number \NC the height (not used in calculations) \NC \NR +\NC \type{depth} \NC number \NC the depth (not used in calculations) \NC \NR +\NC \type{named_id} \NC number \NC is \type {tread_id} a string value? \NC \NR +\NC \type{tread_id} \NC number \NC the thread id \NC \NR +\NC \NC string \NC the thread name \NC \NR +\NC \type{thread_attr} \NC number \NC extra thread information \NC \NR +\LL +\stoptabulate + +\subsection{\whs {pdf_end_thread}} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC \NC \NR +\LL +\stoptabulate + +\subsection{\whs {pdf_colorstack}} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{stack} \NC number \NC colorstack id number \NC \NR +\NC \type{command} \NC number \NC command to execute \NC \NR +\NC \type{data} \NC string \NC data \NC \NR +\LL +\stoptabulate + +\subsection{\whs {pdf_setmatrix}} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\NC \type{data} \NC string \NC data \NC \NR +\LL +\stoptabulate + +\subsection{\whs {pdf_save}} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\LL +\stoptabulate + +\subsection{\whs {pdf_restore}} + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{attr} \NC node \NC list of attributes \NC \NR +\LL +\stoptabulate + +\stopsection + +\startsection[title={The \type {node} library}][library=node] + +\subsection {Introduction} + +The \type {node} library contains functions that facilitate dealing with (lists +of) nodes and their values. They allow you to create, alter, copy, delete, and +insert \LUATEX\ node objects, the core objects within the typesetter. + +\LUATEX\ nodes are represented in \LUA\ as userdata with the metadata type +\type {luatex.node}. The various parts within a node can be accessed using +named fields. + +Each node has at least the three fields \type {next}, \type {id}, and \type {subtype}: + +\startitemize[intro] + +\startitem + The \type {next} field returns the userdata object for the next node in a + linked list of nodes, or \type {nil}, if there is no next node. +\stopitem + +\startitem + The \type {id} indicates \TEX's \quote{node type}. The field \type {id} has a + numeric value for efficiency reasons, but some of the library functions also + accept a string value instead of \type {id}. +\stopitem + +\startitem + The \type {subtype} is another number. It often gives further information + about a node of a particular \type {id}, but it is most important when + dealing with \quote {whatsits}, because they are differentiated solely based + on their \type {subtype}. +\stopitem + +\stopitemize + +The other available fields depend on the \type {id} (and for \quote {whatsits}, +the \type {subtype}) of the node. + +Support for \nod {unset} (alignment) nodes is partial: they can be queried and +modified from \LUA\ code, but not created. + +Nodes can be compared to each other, but: you are actually comparing indices into +the node memory. This means that equality tests can only be trusted under very +limited conditions. It will not work correctly in any situation where one of the +two nodes has been freed and|/|or reallocated: in that case, there will be false +positives. + +At the moment, memory management of nodes should still be done explicitly by the +user. Nodes are not \quote {seen} by the \LUA\ garbage collector, so you have to +call the node freeing functions yourself when you are no longer in need of a node +(list). Nodes form linked lists without reference counting, so you have to be +careful that when control returns back to \LUATEX\ itself, you have not deleted +nodes that are still referenced from a \type {next} pointer elsewhere, and that +you did not create nodes that are referenced more than once. Normally the setters +and getters handle this for you. + +There are statistics available with regards to the allocated node memory, which +can be handy for tracing. + +\subsection{\type {is_node}} + +\topicindex {nodes+functions} + +\libindex {is_node} + +\startfunctioncall + t = + node.is_node( item) +\stopfunctioncall + +This function returns a number (the internal index of the node) if the argument +is a userdata object of type \type {} and false when no node is passed. + +\subsection{\type {types} and \type {whatsits}} + +\libindex {types} +\libindex {whatsits} + +This function returns an array that maps node id numbers to node type strings, +providing an overview of the possible top|-|level \type {id} types. + +\startfunctioncall +
t = + node.types() +\stopfunctioncall + +\TEX's \quote {whatsits} all have the same \type {id}. The various subtypes are +defined by their \type {subtype} fields. The function is much like \type {types}, +except that it provides an array of \type {subtype} mappings. + +\startfunctioncall +
t = + node.whatsits() +\stopfunctioncall + +\subsection{\type {id}} + +\libindex{id} + +This converts a single type name to its internal numeric representation. + +\startfunctioncall + id = + node.id( type) +\stopfunctioncall + +\subsection{\type {type} and \type {subtype}} + +\libindex {type} +\libindex {subtype} + +In the argument is a number, then the next function converts an internal numeric +representation to an external string representation. Otherwise, it will return +the string \type {node} if the object represents a node, and \type {nil} +otherwise. + +\startfunctioncall + type = + node.type( n) +\stopfunctioncall + +This next one converts a single whatsit name to its internal numeric +representation (\type {subtype}). + +\startfunctioncall + subtype = + node.subtype( type) +\stopfunctioncall + +\subsection{\type {fields}} + +\libindex {fields} + +This function returns an array of valid field names for a particular type of +node. If you want to get the valid fields for a \quote {whatsit}, you have to +supply the second argument also. In other cases, any given second argument will +be silently ignored. + +\startfunctioncall +
t = + node.fields( id) +
t = + node.fields( id, subtype) +\stopfunctioncall + +The function accepts string \type {id} and \type {subtype} values as well. + +\subsection{\type {has_field}} + +\libindex {has_field} + +This function returns a boolean that is only true if \type {n} is +actually a node, and it has the field. + +\startfunctioncall + t = + node.has_field( n, field) +\stopfunctioncall + +\subsection{\type {new}} + +\libindex{new} + +The \type {new} function creates a new node. All its fields are initialized to +either zero or \type {nil} except for \type {id} and \type {subtype}. Instead of +numbers you can also use strings (names). If you create a new \nod {whatsit} node +the second argument is required. As with all node functions, this function +creates a node at the \TEX\ level. + +\startfunctioncall + n = + node.new( id) + n = + node.new( id, subtype) +\stopfunctioncall + +\subsection{\type {free}, \type {flush_node} and \type {flush_list}} + +\libindex{free} +\libindex{flush_node} +\libindex{flush_list} + +The next one the node \type {n} from \TEX's memory. Be careful: no checks are +done on whether this node is still pointed to from a register or some \type +{next} field: it is up to you to make sure that the internal data structures +remain correct. + +\startfunctioncall + next = + node.free( n) +flush_node( n) +\stopfunctioncall + +The \type {free} function returns the next field of the freed node, while the +\type {flush_node} alternative returns nothing. + +A list starting with node \type {n} can be flushed from \TEX's memory too. Be +careful: no checks are done on whether any of these nodes is still pointed to +from a register or some \type {next} field: it is up to you to make sure that the +internal data structures remain correct. + +\startfunctioncall +node.flush_list( n) +\stopfunctioncall + +\subsection{\type {copy} and \type {copy_list}} + +\libindex{copy} +\libindex{copy_list} + +This creates a deep copy of node \type {n}, including all nested lists as in the case +of a hlist or vlist node. Only the \type {next} field is not copied. + +\startfunctioncall + m = + node.copy( n) +\stopfunctioncall + +A deep copy of the node list that starts at \type {n} can be created too. If +\type {m} is also given, the copy stops just before node \type {m}. + +\startfunctioncall + m = + node.copy_list( n) + m = + node.copy_list( n, m) +\stopfunctioncall + +Note that you cannot copy attribute lists this way. However, there is normally no +need to copy attribute lists as when you do assignments to the \type {attr} field +or make changes to specific attributes, the needed copying and freeing takes +place automatically. + +\subsection{\type {prev} and \type{next}} + +\libindex{prev} +\libindex{next} + +These returns the node preceding or following the given node, or \type {nil} if +there is no such node. + +\startfunctioncall + m = + node.next( n) + m = + node.prev( n) +\stopfunctioncall + +\subsection{\type {current_attr}} + +\libindex{current_attr} + +This returns the currently active list of attributes, if there is one. + +\startfunctioncall + m = + node.current_attr() +\stopfunctioncall + +The intended usage of \type {current_attr} is as follows: + +\starttyping +local x1 = node.new("glyph") +x1.attr = node.current_attr() +local x2 = node.new("glyph") +x2.attr = node.current_attr() +\stoptyping + +or: + +\starttyping +local x1 = node.new("glyph") +local x2 = node.new("glyph") +local ca = node.current_attr() +x1.attr = ca +x2.attr = ca +\stoptyping + +The attribute lists are ref counted and the assignment takes care of incrementing +the refcount. You cannot expect the value \type {ca} to be valid any more when +you assign attributes (using \type {tex.setattribute}) or when control has been +passed back to \TEX. + +Note: this function is somewhat experimental, and it returns the {\it actual} +attribute list, not a copy thereof. Therefore, changing any of the attributes in +the list will change these values for all nodes that have the current attribute +list assigned to them. + +\subsection{\type {hpack}} + +\libindex {hpack} + +This function creates a new hlist by packaging the list that begins at node \type +{n} into a horizontal box. With only a single argument, this box is created using +the natural width of its components. In the three argument form, \type {info} +must be either \type {additional} or \type {exactly}, and \type {w} is the +additional (\type {\hbox spread}) or exact (\type {\hbox to}) width to be used. +The second return value is the badness of the generated box. + +\startfunctioncall + h, b = + node.hpack( n) + h, b = + node.hpack( n, w, info) + h, b = + node.hpack( n, w, info, dir) +\stopfunctioncall + +Caveat: there can be unexpected side|-|effects to this function, like updating +some of the \prm {marks} and \type {\inserts}. Also note that the content of +\type {h} is the original node list \type {n}: if you call \type {node.free(h)} +you will also free the node list itself, unless you explicitly set the \type +{list} field to \type {nil} beforehand. And in a similar way, calling \type +{node.free(n)} will invalidate \type {h} as well! + +\subsection{\type {vpack}} + +\libindex {vpack} + +This function creates a new vlist by packaging the list that begins at node \type +{n} into a vertical box. With only a single argument, this box is created using +the natural height of its components. In the three argument form, \type {info} +must be either \type {additional} or \type {exactly}, and \type {w} is the +additional (\type {\vbox spread}) or exact (\type {\vbox to}) height to be used. + +\startfunctioncall + h, b = + node.vpack( n) + h, b = + node.vpack( n, w, info) + h, b = + node.vpack( n, w, info, dir) +\stopfunctioncall + +The second return value is the badness of the generated box. See the description +of \type {hpack} for a few memory allocation caveats. + +\subsection{\type {prepend_prevdepth}} + +\libindex {prepend_prevdepth} + +This function is somewhat special in the sense that it is an experimental helper +that adds the interlinespace to a line keeping the baselineskip and lineskip into +account. + +\startfunctioncall + n, delta = + node.prepend_prevdepth( n, prevdepth) +\stopfunctioncall + +\subsection{\type {dimensions} and \type {rangedimensions}} + +\libindex{dimensions} +\libindex{rangedimensions} + +\startfunctioncall + w, h, d = + node.dimensions( n) + w, h, d = + node.dimensions( n, dir) + w, h, d = + node.dimensions( n, t) + w, h, d = + node.dimensions( n, t, dir) +\stopfunctioncall + +This function calculates the natural in|-|line dimensions of the node list starting +at node \type {n} and terminating just before node \type {t} (or the end of the +list, if there is no second argument). The return values are scaled points. An +alternative format that starts with glue parameters as the first three arguments +is also possible: + +\startfunctioncall + w, h, d = + node.dimensions( glue_set, glue_sign, glue_order, + n) + w, h, d = + node.dimensions( glue_set, glue_sign, glue_order, + n, dir) + w, h, d = + node.dimensions( glue_set, glue_sign, glue_order, + n, t) + w, h, d = + node.dimensions( glue_set, glue_sign, glue_order, + n, t, dir) +\stopfunctioncall + +This calling method takes glue settings into account and is especially useful for +finding the actual width of a sublist of nodes that are already boxed, for +example in code like this, which prints the width of the space in between the +\type {a} and \type {b} as it would be if \type {\box0} was used as-is: + +\starttyping +\setbox0 = \hbox to 20pt {a b} + +\directlua{print (node.dimensions( + tex.box[0].glue_set, + tex.box[0].glue_sign, + tex.box[0].glue_order, + tex.box[0].head.next, + node.tail(tex.box[0].head) +)) } +\stoptyping + +You need to keep in mind that this is one of the few places in \TEX\ where floats +are used, which means that you can get small differences in rounding when you +compare the width reported by \type {hpack} with \type {dimensions}. + +The second alternative saves a few lookups and can be more convenient in some +cases: + +\startfunctioncall + w, h, d = + node.rangedimensions( parent, first) + w, h, d = + node.rangedimensions( parent, first, last) +\stopfunctioncall + +\subsection{\type {mlist_to_hlist}} + +\libindex {mlist_to_hlist} + +\startfunctioncall + h = + node.mlist_to_hlist( n, display_type, penalties) +\stopfunctioncall + +This runs the internal mlist to hlist conversion, converting the math list in +\type {n} into the horizontal list \type {h}. The interface is exactly the same +as for the callback \cbk {mlist_to_hlist}. + +\subsection{\type {slide}} + +\startfunctioncall + m = + node.slide( n) +\stopfunctioncall + +Returns the last node of the node list that starts at \type {n}. As a +side|-|effect, it also creates a reverse chain of \type {prev} pointers between +nodes. + +\subsection{\type {tail}} + +\libindex {tail} + +\startfunctioncall + m = + node.tail( n) +\stopfunctioncall + +Returns the last node of the node list that starts at \type {n}. + +\subsection{\type {length} and type {count}} + +\libindex {length} +\libindex {count} + +\startfunctioncall + i = + node.length( n) + i = + node.length( n, m) +\stopfunctioncall + +Returns the number of nodes contained in the node list that starts at \type {n}. +If \type {m} is also supplied it stops at \type {m} instead of at the end of the +list. The node \type {m} is not counted. + +\startfunctioncall + i = + node.count( id, n) + i = + node.count( id, n, m) +\stopfunctioncall + +Returns the number of nodes contained in the node list that starts at \type {n} +that have a matching \type {id} field. If \type {m} is also supplied, counting +stops at \type {m} instead of at the end of the list. The node \type {m} is not +counted. This function also accept string \type {id}'s. + +\subsection{\type {is_char} and \type {is_glyph}} + +\libindex {is_char} +\libindex {is_glyph} + +The subtype of a glyph node signals if the glyph is already turned into a character reference +or not. + +\startfunctioncall + b = + node.is_char( n) + b = + node.is_glyph( n) +\stopfunctioncall + +\subsection{\type {traverse}} + +\libindex {traverse} + +\startfunctioncall + t, id, subtype = + node.traverse( n) +\stopfunctioncall + +This is a \LUA\ iterator that loops over the node list that starts at \type {n}. +Typically code looks like this: + +\starttyping +for n in node.traverse(head) do + ... +end +\stoptyping + +is functionally equivalent to: + +\starttyping +do + local n + local function f (head,var) + local t + if var == nil then + t = head + else + t = var.next + end + return t + end + while true do + n = f (head, n) + if n == nil then break end + ... + end +end +\stoptyping + +It should be clear from the definition of the function \type {f} that even though +it is possible to add or remove nodes from the node list while traversing, you +have to take great care to make sure all the \type {next} (and \type {prev}) +pointers remain valid. + +If the above is unclear to you, see the section \quote {For Statement} in the +\LUA\ Reference Manual. + +\subsection{\type {traverse_id}} + +\libindex {traverse_id} + +\startfunctioncall + t, subtype = + node.traverse_id( id, n) +\stopfunctioncall + +This is an iterator that loops over all the nodes in the list that starts at +\type {n} that have a matching \type {id} field. + +See the previous section for details. The change is in the local function \type +{f}, which now does an extra while loop checking against the upvalue \type {id}: + +\starttyping + local function f(head,var) + local t + if var == nil then + t = head + else + t = var.next + end + while not t.id == id do + t = t.next + end + return t + end +\stoptyping + +\subsection{\type {traverse_char} and \type {traverse_glyph}} + +\libindex {traverse_char} +\libindex {traverse_glyph} + +The \type{traverse_char} iterator loops over the \nod {glyph} nodes in a list. +Only nodes with a subtype less than 256 are seen. + +\startfunctioncall + n, font, char = + node.traverse_char( n) +\stopfunctioncall + +The \type{traverse_glyph} iterator loops over a list and returns the list and +filters all glyphs: + +\startfunctioncall + n, font, char = + node.traverse_glyph( n) +\stopfunctioncall + +\subsection{\type {traverse_list}} + +\libindex {traverse_list} + +This iterator loops over the \nod {hlist} and \nod {vlist} nodes in a list. + +\startfunctioncall + n, id, subtype, list = + node.traverse_list( n) +\stopfunctioncall + +The four return values can save some time compared to fetching these fields but +in practice you seldom need them all. So consider it a (side effect of +experimental) convenience. + +\subsection{\type {has_glyph}} + +\libindex {has_glyph} + +This function returns the first glyph or disc node in the given list: + +\startfunctioncall + n = + node.has_glyph( n) +\stopfunctioncall + +\subsection{\type {end_of_math}} + +\libindex {end_of_math} + +\startfunctioncall + t = + node.end_of_math( start) +\stopfunctioncall + +Looks for and returns the next \type {math_node} following the \type {start}. If +the given node is a math end node this helper returns that node, else it follows +the list and returns the next math endnote. If no such node is found nil is +returned. + +\subsection{\type {remove}} + +\libindex {remove} + +\startfunctioncall + head, current = + node.remove( head, current) +\stopfunctioncall + +This function removes the node \type {current} from the list following \type +{head}. It is your responsibility to make sure it is really part of that list. +The return values are the new \type {head} and \type {current} nodes. The +returned \type {current} is the node following the \type {current} in the calling +argument, and is only passed back as a convenience (or \type {nil}, if there is +no such node). The returned \type {head} is more important, because if the +function is called with \type {current} equal to \type {head}, it will be +changed. + +\subsection{\type {insert_before}} + +\libindex {insert_before} + +\startfunctioncall + head, new = + node.insert_before( head, current, new) +\stopfunctioncall + +This function inserts the node \type {new} before \type {current} into the list +following \type {head}. It is your responsibility to make sure that \type +{current} is really part of that list. The return values are the (potentially +mutated) \type {head} and the node \type {new}, set up to be part of the list +(with correct \type {next} field). If \type {head} is initially \type {nil}, it +will become \type {new}. + +\subsection{\type {insert_after}} + +\libindex {insert_after} + +\startfunctioncall + head, new = + node.insert_after( head, current, new) +\stopfunctioncall + +This function inserts the node \type {new} after \type {current} into the list +following \type {head}. It is your responsibility to make sure that \type +{current} is really part of that list. The return values are the \type {head} and +the node \type {new}, set up to be part of the list (with correct \type {next} +field). If \type {head} is initially \type {nil}, it will become \type {new}. + +\subsection{\type {first_glyph}} + +\libindex {first_glyph} + +\startfunctioncall + n = + node.first_glyph( n) + n = + node.first_glyph( n, m) +\stopfunctioncall + +Returns the first node in the list starting at \type {n} that is a glyph node +with a subtype indicating it is a glyph, or \type {nil}. If \type {m} is given, +processing stops at (but including) that node, otherwise processing stops at the +end of the list. + +\subsection{\type {ligaturing}} + +\libindex {ligaturing} + +\startfunctioncall + h, t, success = + node.ligaturing( n) + h, t, success = + node.ligaturing( n, m) +\stopfunctioncall + +Apply \TEX-style ligaturing to the specified nodelist. The tail node \type {m} is +optional. The two returned nodes \type {h} and \type {t} are the new head and +tail (both \type {n} and \type {m} can change into a new ligature). + +\subsection{\type {kerning}} + +\libindex {kerning} + +\startfunctioncall + h, t, success = + node.kerning( n) + h, t, success = + node.kerning( n, m) +\stopfunctioncall + +Apply \TEX|-|style kerning to the specified node list. The tail node \type {m} is +optional. The two returned nodes \type {h} and \type {t} are the head and tail +(either one of these can be an inserted kern node, because special kernings with +word boundaries are possible). + +\subsection{\type {unprotect_glyph[s]}} + +\libindex {unprotect_glyphs} +\libindex {unprotect_glyph} + +\startfunctioncall +node.unprotect_glyph( n) +node.unprotect_glyphs( n,[ n]) +\stopfunctioncall + +Subtracts 256 from all glyph node subtypes. This and the next function are +helpers to convert from \type {characters} to \type {glyphs} during node +processing. The second argument is optional and indicates the end of a range. + +\subsection{\type {protect_glyph[s]}} + +\libindex {protect_glyphs} +\libindex {protect_glyph} + +\startfunctioncall +node.protect_glyph( n) +node.protect_glyphs( n,[ n]) +\stopfunctioncall + +Adds 256 to all glyph node subtypes in the node list starting at \type {n}, +except that if the value is 1, it adds only 255. The special handling of 1 means +that \type {characters} will become \type {glyphs} after subtraction of 256. A +single character can be marked by the singular call. The second argument is +optional and indicates the end of a range. + +\subsection{\type {last_node}} + +\libindex {last_node} + +\startfunctioncall + n = + node.last_node() +\stopfunctioncall + +This function pops the last node from \TEX's \quote{current list}. It returns +that node, or \type {nil} if the current list is empty. + +\subsection{\type {write}} + +\libindex {write} + +\startfunctioncall +node.write( n) +\stopfunctioncall + +This function that will append a node list to \TEX's \quote {current list}. The +node list is not deep|-|copied! There is no error checking either! You mignt need +to enforce horizontal mode in order for this to work as expected. + +\subsection{\type {protrusion_skippable}} + +\libindex {protrusion_skippable} + +\startfunctioncall + skippable = + node.protrusion_skippable( n) +\stopfunctioncall + +Returns \type {true} if, for the purpose of line boundary discovery when +character protrusion is active, this node can be skipped. + +\stopsection + +\startsection[title={Glue handling}][library=node] + +\subsection{\type {setglue}} + +\libindex {setglue} + +You can set the properties of a glue in one go. If you pass no values, the glue +will become a zero glue. + +\startfunctioncall +node.setglue( n) +node.setglue( n,width,stretch,shrink,stretch_order,shrink_order) +\stopfunctioncall + +When you pass values, only arguments that are numbers are assigned so + +\starttyping +node.setglue(n,655360,false,65536) +\stoptyping + +will only adapt the width and shrink. + +When a list node is passed, you set the glue, order and sign instead. + +\subsection{\type {getglue}} + +\libindex {getglue} + +The next call will return 5 values or nothing when no glue is passed. + +\startfunctioncall + width, stretch, shrink, stretch_order, + shrink_order = node.getglue( n) +\stopfunctioncall + +When the second argument is false, only the width is returned (this is consistent +with \type {tex.get}). + +When a list node is passed, you get back the glue that is set, the order of that +glue and the sign. + +\subsection{\type {is_zero_glue}} + +\libindex {is_zero_glue} + +This function returns \type {true} when the width, stretch and shrink properties +are zero. + +\startfunctioncall + isglue = + node.is_zero_glue( n) +\stopfunctioncall + +\stopsection + +\startsection[title={Attribute handling}][library=node] + +\subsection{Attributes} + +\topicindex {attributes} + +The newly introduced attribute registers are non|-|trivial, because the value +that is attached to a node is essentially a sparse array of key|-|value pairs. It +is generally easiest to deal with attribute lists and attributes by using the +dedicated functions in the \type {node} library, but for completeness, here is +the low|-|level interface. + +Attributes appear as linked list of userdata objects in the \type {attr} field of +individual nodes. They can be handled individually, but it is much safer and more +efficient to use the dedicated functions associated with them. + +\subsection{\nod {attribute_list} nodes} + +\topicindex {nodes+attributes} + +An \nod {attribute_list} item is used as a head pointer for a list of attribute +items. It has only one user-visible field: + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{next} \NC node \NC pointer to the first attribute \NC \NR +\LL +\stoptabulate + +\subsection{\nod {attr} nodes} + +A normal node's attribute field will point to an item of type \nod +{attribute_list}, and the \type {next} field in that item will point to the first +defined \quote {attribute} item, whose \type {next} will point to the second +\quote {attribute} item, etc. + +\starttabulate[|l|l|p|] +\DB field \BC type \BC explanation \NC \NR +\TB +\NC \type{next} \NC node \NC pointer to the next attribute \NC \NR +\NC \type{number} \NC number \NC the attribute type id \NC \NR +\NC \type{value} \NC number \NC the attribute value \NC \NR +\LL +\stoptabulate + +As mentioned it's better to use the official helpers rather than edit these +fields directly. For instance the \type {prev} field is used for other purposes +and there is no double linked list. + +\subsection{\type {has_attribute}} + +\libindex {has_attribute} + +\startfunctioncall + v = + node.has_attribute( n, id) + v = + node.has_attribute( n, id, val) +\stopfunctioncall + +Tests if a node has the attribute with number \type {id} set. If \type {val} is +also supplied, also tests if the value matches \type {val}. It returns the value, +or, if no match is found, \type {nil}. + +\subsection{\type {get_attribute}} + +\libindex {get_attribute} + +\startfunctioncall + v = + node.get_attribute( n, id) +\stopfunctioncall + +Tests if a node has an attribute with number \type {id} set. It returns the +value, or, if no match is found, \type {nil}. If no \type {id} is given then the +zero attributes is assumed. + +\subsection{\type {find_attribute}} + +\libindex {find_attribute} + +\startfunctioncall + v, n = + node.find_attribute( n, id) +\stopfunctioncall + +Finds the first node that has attribute with number \type {id} set. It returns +the value and the node if there is a match and otherwise nothing. + +\subsection{\type {set_attribute}} + +\libindex {set_attribute} + +\startfunctioncall +node.set_attribute( n, id, val) +\stopfunctioncall + +Sets the attribute with number \type {id} to the value \type {val}. Duplicate +assignments are ignored. + +\subsection{\type {unset_attribute}} + +\libindex {unset_attribute} + +\startfunctioncall + v = + node.unset_attribute( n, id) + v = + node.unset_attribute( n, id, val) +\stopfunctioncall + +Unsets the attribute with number \type {id}. If \type {val} is also supplied, it +will only perform this operation if the value matches \type {val}. Missing +attributes or attribute|-|value pairs are ignored. + +If the attribute was actually deleted, returns its old value. Otherwise, returns +\type {nil}. + +\subsection{\type {slide}} + +\libindex {slide} + +This helper makes sure that the node lists is double linked and returns the found +tail node. + +\startfunctioncall + tail = + node.slide( n) +\stopfunctioncall + +After some callbacks automatic sliding takes place. This feature can be turned +off with \type {node.fix_node_lists(false)} but you better make sure then that +you don't mess up lists. In most cases \TEX\ itself only uses \type {next} +pointers but your other callbacks might expect proper \type {prev} pointers too. +Future versions of \LUATEX\ can add more checking but this will not influence +usage. + +\subsection{\type {check_discretionary}, \type {check_discretionaries}} + +\libindex{check_discretionary} +\libindex{check_discretionaries} + +When you fool around with disc nodes you need to be aware of the fact that they +have a special internal data structure. As long as you reassign the fields when +you have extended the lists it's ok because then the tail pointers get updated, +but when you add to list without reassigning you might end up in trouble when +the linebreak routine kicks in. You can call this function to check the list for +issues with disc nodes. + +\startfunctioncall +node.check_discretionary( n) +node.check_discretionaries( head) +\stopfunctioncall + +The plural variant runs over all disc nodes in a list, the singular variant +checks one node only (it also checks if the node is a disc node). + +\subsection{\type {flatten_discretionaries}} + +\libindex {flatten_discretionaries} + +This function will remove the discretionaries in the list and inject the replace +field when set. + +\startfunctioncall + head, count = node.flatten_discretionaries( n) +\stopfunctioncall + +\subsection{\type {family_font}} + +\libindex {family_font} + +When you pass a proper family identifier the next helper will return the font +currently associated with it. You can normally also access the font with the +normal font field or getter because it will resolve the family automatically for +noads. + +\startfunctioncall + id = + node.family_font( fam) +\stopfunctioncall + +\stopsection + +\startsection[title={Two access models}][library=node] + +\topicindex{nodes+direct} +\topicindex{direct nodes} + +\libindex {todirect} +\libindex {tonode} +\libindex {tostring} + +Deep down in \TEX\ a node has a number which is a numeric entry in a memory +table. In fact, this model, where \TEX\ manages memory is real fast and one of +the reasons why plugging in callbacks that operate on nodes is quite fast too. +Each node gets a number that is in fact an index in the memory table and that +number often is reported when you print node related information. You go from +userdata nodes and there numeric references and back with: + +\startfunctioncall + d = node.todirect( n)) + n = node.tonode( d)) +\stopfunctioncall + +The userdata model is rather robust as it is a virtual interface with some +additional checking while the more direct access which uses the node numbers +directly. However, even with userdata you can get into troubles when you free +nodes that are no longer allocated or mess up lists. if you apply \type +{tostring} to a node you see its internal (direct) number and id. + +The first model provides key based access while the second always accesses fields +via functions: + +\starttyping +nodeobject.char +getfield(nodenumber,"char") +\stoptyping + +If you use the direct model, even if you know that you deal with numbers, you +should not depend on that property but treat it as an abstraction just like +traditional nodes. In fact, the fact that we use a simple basic datatype has the +penalty that less checking can be done, but less checking is also the reason why +it's somewhat faster. An important aspect is that one cannot mix both methods, +but you can cast both models. So, multiplying a node number makes no sense. + +So our advice is: use the indexed (table) approach when possible and investigate +the direct one when speed might be a real issue. For that reason \LUATEX\ also +provide the \type {get*} and \type {set*} functions in the top level node +namespace. There is a limited set of getters. When implementing this direct +approach the regular index by key variant was also optimized, so direct access +only makes sense when nodes are accessed millions of times (which happens in some +font processing for instance). + +We're talking mostly of getters because setters are less important. Documents +have not that many content related nodes and setting many thousands of properties +is hardly a burden contrary to millions of consultations. + +Normally you will access nodes like this: + +\starttyping +local next = current.next +if next then + -- do something +end +\stoptyping + +Here \type {next} is not a real field, but a virtual one. Accessing it results in +a metatable method being called. In practice it boils down to looking up the node +type and based on the node type checking for the field name. In a worst case you +have a node type that sits at the end of the lookup list and a field that is last +in the lookup chain. However, in successive versions of \LUATEX\ these lookups +have been optimized and the most frequently accessed nodes and fields have a +higher priority. + +Because in practice the \type {next} accessor results in a function call, there +is some overhead involved. The next code does the same and performs a tiny bit +faster (but not that much because it is still a function call but one that knows +what to look up). + +\starttyping +local next = node.next(current) +if next then + -- do something +end +\stoptyping + +Some accessors are used frequently and for these we provide more efficient helpers: + +\starttabulate[|l|p|] +\DB function \BC explanation \NC \NR +\TB +\NC \type{getnext} \NC parsing nodelist always involves this one \NC \NR +\NC \type{getprev} \NC used less but a logical companion to \type {getnext} \NC \NR +\NC \type{getboth} \NC returns the next and prev pointer of a node \NC \NR +\NC \type{getid} \NC consulted a lot \NC \NR +\NC \type{getsubtype} \NC consulted less but also a topper \NC \NR +\NC \type{getfont} \NC used a lot in \OPENTYPE\ handling (glyph nodes are consulted a lot) \NC \NR +\NC \type{getchar} \NC idem and also in other places \NC \NR +\NC \type{getwhd} \NC returns the \type {width}, \type {height} and \type {depth} of a list, rule or + (unexpanded) glyph as well as glue (its spec is looked at) and unset nodes\NC \NR +\NC \type{getdisc} \NC returns the \type {pre}, \type {post} and \type {replace} fields and + optionally when true is passed also the tail fields \NC \NR +\NC \type{getlist} \NC we often parse nested lists so this is a convenient one too \NC \NR +\NC \type{getleader} \NC comparable to list, seldom used in \TEX\ (but needs frequent consulting + like lists; leaders could have been made a dedicated node type) \NC \NR +\NC \type{getfield} \NC generic getter, sufficient for the rest (other field names are + often shared so a specific getter makes no sense then) \NC \NR +\NC \type{getbox} \NC gets the given box (a list node) \NC \NR +\NC \type{getoffsets} \NC gets the \type {xoffset} and \type {yoffset} of a glyph or + \type {left} and \type {right} values of a rule \NC \NR +\LL +\stoptabulate + +In the direct namespace there are more such helpers and most of them are +accompanied by setters. The getters and setters are clever enough to see what +node is meant. We don't deal with whatsit nodes: their fields are always accessed +by name. It doesn't make sense to add getters for all fields, we just identifier +the most likely candidates. In complex documents, many node and fields types +never get seen, or seen only a few times, but for instance glyphs are candidates +for such optimization. The \type {node.direct} interface has some more helpers. +\footnote {We can define the helpers in the node namespace with \type {getfield} +which is about as efficient, so at some point we might provide that as module.} + +The \type {setdisc} helper takes three (optional) arguments plus an optional +fourth indicating the subtype. Its \type {getdisc} takes an optional boolean; +when its value is \type {true} the tail nodes will also be returned. The \type +{setfont} helper takes an optional second argument, it being the character. The +directmode setter \type {setlink} takes a list of nodes and will link them, +thereby ignoring \type {nil} entries. The first valid node is returned (beware: +for good reason it assumes single nodes). For rarely used fields no helpers are +provided and there are a few that probably are used seldom too but were added for +consistency. You can of course always define additional accessors using \type +{getfield} and \type {setfield} with little overhead. When the second argument of +\type {setattributelist} is \type {true} the current attribute list is assumed. + +\def\yes{$+$} \def\nop{$-$} + +\def\supported#1#2#3% + {\NC \type{#1} + \NC \ifx#2\yes\lix{node} {#1}\fi #2 + \NC \ifx#3\yes\lix{node.direct}{#1}\fi #3 \NC + \NR} + +\starttabulate[|l|c|c|] +\DB function \BC node \BC direct \NC \NR +\TB +\supported {check_discretionaries} \yes \yes +\supported {check_discretionary} \yes \yes +\supported {copy_list} \yes \yes +\supported {copy} \yes \yes +\supported {count} \yes \yes +\supported {current_attr} \yes \yes +\supported {dimensions} \yes \yes +\supported {effective_glue} \yes \yes +\supported {end_of_math} \yes \yes +\supported {family_font} \yes \nop +\supported {fields} \yes \nop +\supported {find_attribute} \yes \yes +\supported {first_glyph} \yes \yes +\supported {flatten_discretionaries} \yes \yes +\supported {flush_list} \yes \yes +\supported {flush_node} \yes \yes +\supported {free} \yes \yes +\supported {get_attribute} \yes \yes +\supported {get_synctex_fields} \nop \yes +\supported {getattributelist} \nop \yes +\supported {getboth} \yes \yes +\supported {getbox} \nop \yes +\supported {getchar} \yes \yes +\supported {getcomponents} \nop \yes +\supported {getdepth} \nop \yes +\supported {getdirection} \nop \yes +\supported {getdir} \nop \yes +\supported {getdisc} \yes \yes +\supported {getfam} \nop \yes +\supported {getfield} \yes \yes +\supported {getfont} \yes \yes +\supported {getglue} \yes \yes +\supported {getheight} \nop \yes +\supported {getid} \yes \yes +\supported {getkern} \nop \yes +\supported {getlang} \nop \yes +\supported {getleader} \yes \yes +\supported {getlist} \yes \yes +\supported {getnext} \yes \yes +\supported {getnucleus} \nop \yes +\supported {getoffsets} \nop \yes +\supported {getpenalty} \nop \yes +\supported {getprev} \yes \yes +\supported {getproperty} \yes \yes +\supported {getshift} \nop \yes +\supported {getsubtype} \yes \yes +\supported {getsub} \nop \yes +\supported {getsup} \nop \yes +\supported {getdata} \nop \yes +\supported {getwhd} \yes \yes +\supported {getwidth} \nop \yes +\supported {has_attribute} \yes \yes +\supported {has_field} \yes \yes +\supported {has_glyph} \yes \yes +\supported {hpack} \yes \yes +\supported {id} \yes \nop +\supported {insert_after} \yes \yes +\supported {insert_before} \yes \yes +\supported {is_char} \yes \yes +\supported {is_direct} \nop \yes +\supported {is_glyph} \yes \yes +\supported {is_node} \yes \yes +\supported {is_zero_glue} \yes \yes +\supported {kerning} \yes \yes +\supported {last_node} \yes \yes +\supported {length} \yes \yes +\supported {ligaturing} \yes \yes +\supported {mlist_to_hlist} \yes \nop +\supported {new} \yes \yes +\supported {next} \yes \nop +\supported {prepend_prevdepth} \nop \yes +\supported {prev} \yes \nop +\supported {protect_glyphs} \yes \yes +\supported {protect_glyph} \yes \yes +\supported {protrusion_skippable} \yes \yes +\supported {rangedimensions} \yes \yes +\supported {remove} \yes \yes +\supported {set_attribute} \yes \yes +\supported {set_synctex_fields} \nop \yes +\supported {setattributelist} \nop \yes +\supported {setboth} \nop \yes +\supported {setbox} \nop \yes +\supported {setchar} \nop \yes +\supported {setcomponents} \nop \yes +\supported {setdepth} \nop \yes +\supported {setdirection} \nop \yes +\supported {setdir} \nop \yes +\supported {setdisc} \nop \yes +\supported {setfam} \nop \yes +\supported {setfield} \yes \yes +\supported {setfont} \nop \yes +\supported {setexpansion} \nop \yes +\supported {setglue} \yes \yes +\supported {setheight} \nop \yes +\supported {setkern} \nop \yes +\supported {setlang} \nop \yes +\supported {setleader} \nop \yes +\supported {setlink} \nop \yes +\supported {setlist} \nop \yes +\supported {setnext} \nop \yes +\supported {setnucleus} \nop \yes +\supported {setoffsets} \nop \yes +\supported {setpenalty} \nop \yes +\supported {setprev} \nop \yes +\supported {setproperty} \yes \yes +\supported {setshift} \nop \yes +\supported {setsplit} \nop \yes +\supported {setsubtype} \nop \yes +\supported {setsub} \nop \yes +\supported {setsup} \nop \yes +\supported {setwhd} \nop \yes +\supported {setwidth} \nop \yes +\supported {slide} \yes \yes +\supported {subtypes} \yes \nop +\supported {subtype} \yes \nop +\supported {tail} \yes \yes +\supported {todirect} \yes \yes +\supported {tonode} \yes \yes +\supported {tostring} \yes \yes +\supported {traverse_char} \yes \yes +\supported {traverse_glyph} \yes \yes +\supported {traverse_id} \yes \yes +\supported {traverse} \yes \yes +\supported {types} \yes \nop +\supported {type} \yes \nop +\supported {unprotect_glyphs} \yes \yes +\supported {unprotect_glyph} \yes \yes +\supported {unset_attribute} \yes \yes +\supported {usedlist} \yes \yes +\supported {uses_font} \yes \yes +\supported {vpack} \yes \yes +\supported {whatsits} \yes \nop +\supported {write} \yes \yes +\LL +\stoptabulate + +The \type {node.next} and \type {node.prev} functions will stay but for +consistency there are variants called \type {getnext} and \type {getprev}. We had +to use \type {get} because \type {node.id} and \type {node.subtype} are already +taken for providing meta information about nodes. Note: The getters do only basic +checking for valid keys. You should just stick to the keys mentioned in the +sections that describe node properties. + +Some of the getters and setters handle multiple node types, given that the field +is relevant. In that case, some field names are considered similar (like \type +{kern} and \type {width}, or \type {data} and \type {value}. In retrospect we +could have normalized field names better but we decided to stick to the original +(internal) names as much as possible. After all, at the \LUA\ end one can easily +create synonyms. + +Some nodes have indirect references. For instance a math character refers to a +family instead of a font. In that case we provide a virtual font field as +accessor. So, \type {getfont} and \type {.font} can be used on them. The same is +true for the \type {width}, \type {height} and \type {depth} of glue nodes. These +actually access the spec node properties, and here we can set as well as get the +values. + +In some places \LUATEX\ can do a bit of extra checking for valid node lists and +you can enable that with: + +\startfunctioncall +node.fix_node_lists( b) +\stopfunctioncall + +You can set and query the \SYNCTEX\ fields, a file number aka tag and a line +number, for a glue, kern, hlist, vlist, rule and math nodes as well as glyph +nodes (although this last one is not used in native \SYNCTEX). + +\startfunctioncall +node.set_synctex_fields( f, l) + f, l = + node.get_synctex_fields( n) +\stopfunctioncall + +Of course you need to know what you're doing as no checking on sane values takes +place. Also, the synctex interpreter used in editors is rather peculiar and has +some assumptions (heuristics). + +\stopsection + +\startsection[title={Properties}][library=node] + +\topicindex {nodes+properties} +\topicindex {properties} + +\libindex{flush_properties_table} +\libindex{get_properties_table} +\libindex{set_properties_mode} + +Attributes are a convenient way to relate extra information to a node. You can +assign them at the \TEX\ end as well as at the \LUA\ end and and consult them at +the \LUA\ end. One big advantage is that they obey grouping. They are linked +lists and normally checking for them is pretty efficient, even if you use a lot +of them. A macro package has to provide some way to manage these attributes at the +\TEX\ end because otherwise clashes in their usage can occur. + +Each node also can have a properties table and you can assign values to this +table using the \type {setproperty} function and get properties using the \type +{getproperty} function. Managing properties is way more demanding than managing +attributes. + +Take the following example: + +\starttyping +\directlua { + local n = node.new("glyph") + + node.setproperty(n,"foo") + print(node.getproperty(n)) + + node.setproperty(n,"bar") + print(node.getproperty(n)) + + node.free(n) +} +\stoptyping + +This will print \type {foo} and \type {bar} which in itself is not that useful +when multiple mechanisms want to use this feature. A variant is: + +\starttyping +\directlua { + local n = node.new("glyph") + + node.setproperty(n,{ one = "foo", two = "bar" }) + print(node.getproperty(n).one) + print(node.getproperty(n).two) + + node.free(n) +} +\stoptyping + +This time we store two properties with the node. It really makes sense to have a +table as property because that way we can store more. But in order for that to +work well you need to do it this way: + +\starttyping +\directlua { + local n = node.new("glyph") + + local t = node.getproperty(n) + + if not t then + t = { } + node.setproperty(n,t) + end + t.one = "foo" + t.two = "bar" + + print(node.getproperty(n).one) + print(node.getproperty(n).two) + + node.free(n) +} +\stoptyping + +Here our own properties will not overwrite other users properties unless of +course they use the same keys. So, eventually you will end up with something: + +\starttyping +\directlua { + local n = node.new("glyph") + + local t = node.getproperty(n) + + if not t then + t = { } + node.setproperty(n,t) + end + t.myself = { one = "foo", two = "bar" } + + print(node.getproperty(n).myself.one) + print(node.getproperty(n).myself.two) + + node.free(n) +} +\stoptyping + +This assumes that only you use \type {myself} as subtable. The possibilities are +endless but care is needed. For instance, the generic font handler that ships +with \CONTEXT\ uses the \type {injections} subtable and you should not mess with +that one! + +There are a few helper functions that you normally should not touch as user: \typ +{flush_properties_table} will wipe the table (normally a bad idea), \typ +{get_properties_table} and will give the table that stores properties (using +direct entries) and you can best not mess too much with that one either because +\LUATEX\ itself will make sure that entries related to nodes will get wiped when +nodes get freed, so that the \LUA\ garbage collector can do its job. In fact, the +main reason why we have this mechanism is that it saves the user (or macro +package) some work. One can easily write a property mechanism in \LUA\ where +after a shipout properties gets cleaned up but it's not entirely trivial to make +sure that with each freed node also its properties get freed, due to the fact +that there can be nodes left over for a next page. And having a callback bound to +the node deallocator would add way to much overhead. + +Managing properties in the node (de)allocator functions is disabled by default +and is enabled by: + +\starttyping +node.set_properties_mode(true) +\stoptyping + +When we copy a node list that has a table as property, there are several possibilities: we do the same as +a new node, we copy the entry to the table in properties (a reference), we do +a deep copy of a table in the properties, we create a new table and give it +the original one as a metatable. After some experiments (that also included +timing) with these scenarios we decided that a deep copy made no sense, nor +did nilling. In the end both the shallow copy and the metatable variant were +both ok, although the second one is slower. The most important aspect to keep +in mind is that references to other nodes in properties no longer can be +valid for that copy. We could use two tables (one unique and one shared) or +metatables but that only complicates matters. + +When defining a new node, we could already allocate a table but it is rather easy +to do that at the lua end e.g.\ using a metatable \type {__index} method. That +way it is under macro package control. When deleting a node, we could keep the +slot (e.g. setting it to false) but it could make memory consumption raise +unneeded when we have temporary large node lists and after that only small lists. +Both are not done. + +So in the end this is what happens now: when a node is copied, and it has a table +as property, the new node will share that table. If the second argument of \typ +{set_properties_mode} is \type {true} then a metatable approach is chosen: the +copy gets its own table with the original table as metatable. If you use the +generic font loader the mode is enabled that way. + +A few more xperiments were done. For instance: copy attributes to the properties +so that we have fast access at the \LUA\ end. In the end the overhead is not +compensated by speed and convenience, in fact, attributes are not that slow when +it comes to accessing them. So this was rejected. + +Another experiment concerned a bitset in the node but again the gain compared to +attributes was neglectable and given the small amount of available bits it also +demands a pretty strong agreement over what bit represents what, and this is +unlikely to succeed in the \TEX\ community. It doesn't pay off. + +Just in case one wonders why properties make sense: it is not so much speed that +we gain, but more convenience: storing all kind of (temporary) data in attributes +is no fun and this mechanism makes sure that properties are cleaned up when a +node is freed. Also, the advantage of a more or less global properties table is +that we stay at the \LUA\ end. An alternative is to store a reference in the node +itself but that is complicated by the fact that the register has some limitations +(no numeric keys) and we also don't want to mess with it too much. + +\stopsection + +\stopchapter + +\stopcomponent diff --git a/manual/luatex-preamble.tex b/manual/luatex-preamble.tex index 635ff4134..829317977 100644 --- a/manual/luatex-preamble.tex +++ b/manual/luatex-preamble.tex @@ -1,110 +1,110 @@ -% language=uk - -\environment luatex-style - -\startcomponent luatex-preamble - -\startchapter[reference=preamble,title={Preamble}] - -\topicindex{nodes} -\topicindex{boxes} -\topicindex{\LUA} - -This is a reference manual, not a tutorial. This means that we discuss changes -relative to traditonal \TEX\ and also present new functionality. As a consequence -we will refer to concepts that we assume to be known or that might be explained -later. - -The average user doesn't need to know much about what is in this manual. For -instance fonts and languages are normally dealt with in the macro package that -you use. Messing around with node lists is also often not really needed at the -user level. If you do mess around, you'd better know what you're dealing with. -Reading \quotation {The \TEX\ Book} by Donald Knuth is a good investment of time -then also because it's good to know where it all started. A more summarizing -overview is given by \quotation {\TEX\ by Topic} by Victor Eijkhout. You might -want to peek in \quotation {The \ETEX\ manual} and documentation about \PDFTEX. - -But \unknown\ if you're here because of \LUA, then all you need to know is that -you can call it from within a run. The macro package that you use probably will -provide a few wrapper mechanisms but the basic \lpr {directlua} command that -does the job is: - -\starttyping -\directlua{tex.print("Hi there")} -\stoptyping - -You can put code between curly braces but if it's a lot you can also put it in a -file and load that file with the usual \LUA\ commands. - -If you still decide to read on, then it's good to know what nodes are, so we do a -quick introduction here. If you input this text: - -\starttyping -Hi There -\stoptyping - -eventually we will get a linked lists of nodes, which in \ASCII\ art looks like: - -\starttyping -H <=> i <=> [glue] <=> T <=> h <=> e <=> r <=> e -\stoptyping - -When we have a paragraph, we actually get something: - -\starttyping -[localpar] <=> H <=> i <=> [glue] <=> T <=> h <=> e <=> r <=> e <=> [glue] -\stoptyping - -Each character becomes a so called glyph node, a record with properties like the -current font, the character code and the current language. Spaces become glue -nodes. There are many node types that we will discuss later. Each node points -back to a previous node or next node, given that these exist. - -It's also good to know beforehand that \TEX\ is basically centered around -creating paragraphs and pages. The par builder takes a list and breaks it into -lines. We turn horizontal material into vertical. Lines are so called boxes and -can be separated by glue, penalties and more. The page builder accumulates lines -and when feasible triggers an output routine that will take the list so far. -Constructing the actual page is not part of \TEX\ but done using primitives that -permit manipulation of boxes. The result is handled back to \TEX\ and flushed to -a (often \PDF) file. - -The \LUATEX\ engine provides hooks for \LUA\ code at nearly every reasonable -point in the process: collecting content, hyphenating, applying font features, -breaking into lines, etc. This means that you can overload \TEX's natural -behaviour, which still is the benchmark. When we refer to \quote {callbacks} we -means these hooks. - -Where plain \TEX\ is basically a basic framework for writing a specific style, -macro packages like \CONTEXT\ and \LATEX\ provide the user a whole lot of -additional tools to make documents look good. They hide the dirty details of font -management, language demands, turning structure into typeset results, wrapping -pages, including images, and so on. You should be aware of the fact that when you -hook in your own code to manipulate lists, this can interfere with the macro -package that you use. - -When you read about nodes in the following chapters it's good to keep in mind their -commands that relate to then. Here are a few: - -\starttabulate[|l|l|p|] -\DB command \BC node \BC explanation \NC \NR -\TB -\NC \prm {hbox} \NC \nod {hlist} \NC horizontal box \NC \NR -\NC \prm {vbox} \NC \nod {vlist} \NC vertical box with the baseline at the bottom \NC \NR -\NC \prm {vtop} \NC \nod {vlist} \NC vertical box with the baseline at the top \NC \NR -\NC \prm {hskip} \NC \nod {glue} \NC horizontal skip with optional stretch and shrink \NC \NR -\NC \prm {vskip} \NC \nod {glue} \NC vertical skip with optional stretch and shrink \NC \NR -\NC \prm {kern} \NC \nod {kern} \NC horizontal or vertical fixed skip \NC \NR -\NC \prm {discretionary} \NC \nod {disc} \NC hyphenation point (pre, post, replace) \NC \NR -\NC \prm {char} \NC \nod {glyph} \NC a character \NC \NR -\NC \prm {hrule} \NC \nod {rule} \NC a horizontal rule \NC \NR -\NC \prm {vrule} \NC \nod {rule} \NC a vertical rule \NC \NR -\NC \prm {textdir(ection)} \NC \nod {dir} \NC a change in text direction \NC \NR -\LL -\stoptabulate - -For now this should be enough to enable you to understand the next chapters. - -\stopchapter - -\stopcomponent +% language=uk + +\environment luatex-style + +\startcomponent luatex-preamble + +\startchapter[reference=preamble,title={Preamble}] + +\topicindex{nodes} +\topicindex{boxes} +\topicindex{\LUA} + +This is a reference manual, not a tutorial. This means that we discuss changes +relative to traditonal \TEX\ and also present new functionality. As a consequence +we will refer to concepts that we assume to be known or that might be explained +later. + +The average user doesn't need to know much about what is in this manual. For +instance fonts and languages are normally dealt with in the macro package that +you use. Messing around with node lists is also often not really needed at the +user level. If you do mess around, you'd better know what you're dealing with. +Reading \quotation {The \TEX\ Book} by Donald Knuth is a good investment of time +then also because it's good to know where it all started. A more summarizing +overview is given by \quotation {\TEX\ by Topic} by Victor Eijkhout. You might +want to peek in \quotation {The \ETEX\ manual} and documentation about \PDFTEX. + +But \unknown\ if you're here because of \LUA, then all you need to know is that +you can call it from within a run. The macro package that you use probably will +provide a few wrapper mechanisms but the basic \lpr {directlua} command that +does the job is: + +\starttyping +\directlua{tex.print("Hi there")} +\stoptyping + +You can put code between curly braces but if it's a lot you can also put it in a +file and load that file with the usual \LUA\ commands. + +If you still decide to read on, then it's good to know what nodes are, so we do a +quick introduction here. If you input this text: + +\starttyping +Hi There +\stoptyping + +eventually we will get a linked lists of nodes, which in \ASCII\ art looks like: + +\starttyping +H <=> i <=> [glue] <=> T <=> h <=> e <=> r <=> e +\stoptyping + +When we have a paragraph, we actually get something: + +\starttyping +[localpar] <=> H <=> i <=> [glue] <=> T <=> h <=> e <=> r <=> e <=> [glue] +\stoptyping + +Each character becomes a so called glyph node, a record with properties like the +current font, the character code and the current language. Spaces become glue +nodes. There are many node types that we will discuss later. Each node points +back to a previous node or next node, given that these exist. + +It's also good to know beforehand that \TEX\ is basically centered around +creating paragraphs and pages. The par builder takes a list and breaks it into +lines. We turn horizontal material into vertical. Lines are so called boxes and +can be separated by glue, penalties and more. The page builder accumulates lines +and when feasible triggers an output routine that will take the list so far. +Constructing the actual page is not part of \TEX\ but done using primitives that +permit manipulation of boxes. The result is handled back to \TEX\ and flushed to +a (often \PDF) file. + +The \LUATEX\ engine provides hooks for \LUA\ code at nearly every reasonable +point in the process: collecting content, hyphenating, applying font features, +breaking into lines, etc. This means that you can overload \TEX's natural +behaviour, which still is the benchmark. When we refer to \quote {callbacks} we +means these hooks. + +Where plain \TEX\ is basically a basic framework for writing a specific style, +macro packages like \CONTEXT\ and \LATEX\ provide the user a whole lot of +additional tools to make documents look good. They hide the dirty details of font +management, language demands, turning structure into typeset results, wrapping +pages, including images, and so on. You should be aware of the fact that when you +hook in your own code to manipulate lists, this can interfere with the macro +package that you use. + +When you read about nodes in the following chapters it's good to keep in mind their +commands that relate to then. Here are a few: + +\starttabulate[|l|l|p|] +\DB command \BC node \BC explanation \NC \NR +\TB +\NC \prm {hbox} \NC \nod {hlist} \NC horizontal box \NC \NR +\NC \prm {vbox} \NC \nod {vlist} \NC vertical box with the baseline at the bottom \NC \NR +\NC \prm {vtop} \NC \nod {vlist} \NC vertical box with the baseline at the top \NC \NR +\NC \prm {hskip} \NC \nod {glue} \NC horizontal skip with optional stretch and shrink \NC \NR +\NC \prm {vskip} \NC \nod {glue} \NC vertical skip with optional stretch and shrink \NC \NR +\NC \prm {kern} \NC \nod {kern} \NC horizontal or vertical fixed skip \NC \NR +\NC \prm {discretionary} \NC \nod {disc} \NC hyphenation point (pre, post, replace) \NC \NR +\NC \prm {char} \NC \nod {glyph} \NC a character \NC \NR +\NC \prm {hrule} \NC \nod {rule} \NC a horizontal rule \NC \NR +\NC \prm {vrule} \NC \nod {rule} \NC a vertical rule \NC \NR +\NC \prm {textdir(ection)} \NC \nod {dir} \NC a change in text direction \NC \NR +\LL +\stoptabulate + +For now this should be enough to enable you to understand the next chapters. + +\stopchapter + +\stopcomponent diff --git a/manual/luatex-registers.tex b/manual/luatex-registers.tex index 293023007..36b1ec051 100644 --- a/manual/luatex-registers.tex +++ b/manual/luatex-registers.tex @@ -1,47 +1,47 @@ -\environment luatex-style - -\startcomponent luatex-registers - -\startchapter[title=Topics] - - \placeregister[topicindex] - -\stopchapter - -\startchapter[title=Primitives] - - This register contains the primitives that are mentioned in the manual. There - are of course many more primitives. The \LUATEX\ primitives are typeset in - bold. The primitives from \PDFTEX\ are not supported that way but mentioned - anyway. - - \placeregister[primitiveindex][indicator=no] - -\stopchapter - -\startchapter[title=Callbacks] - - \placeregister[callbackindex] - -\stopchapter - -\startchapter[title=Nodes] - - This register contains the nodes that are known to \LUATEX. The primary nodes - are in bold, whatsits that are determined by their subtype are normal. The - names prefixed by \type {pdf_} are backend specific. - - \placeregister[nodeindex] - -\stopchapter - -\startchapter[title=Libraries] - - This register contains the functions available in libraries. Not all functions - are documented, for instance because they can be experimental or obsolete. - - \placeregister[libraryindex] - -\stopchapter - -\stopcomponent +\environment luatex-style + +\startcomponent luatex-registers + +\startchapter[title=Topics] + + \placeregister[topicindex] + +\stopchapter + +\startchapter[title=Primitives] + + This register contains the primitives that are mentioned in the manual. There + are of course many more primitives. The \LUATEX\ primitives are typeset in + bold. The primitives from \PDFTEX\ are not supported that way but mentioned + anyway. + + \placeregister[primitiveindex][indicator=no] + +\stopchapter + +\startchapter[title=Callbacks] + + \placeregister[callbackindex] + +\stopchapter + +\startchapter[title=Nodes] + + This register contains the nodes that are known to \LUATEX. The primary nodes + are in bold, whatsits that are determined by their subtype are normal. The + names prefixed by \type {pdf_} are backend specific. + + \placeregister[nodeindex] + +\stopchapter + +\startchapter[title=Libraries] + + This register contains the functions available in libraries. Not all functions + are documented, for instance because they can be experimental or obsolete. + + \placeregister[libraryindex] + +\stopchapter + +\stopcomponent diff --git a/manual/luatex-statistics.tex b/manual/luatex-statistics.tex index 2428a2929..efd7f1c75 100644 --- a/manual/luatex-statistics.tex +++ b/manual/luatex-statistics.tex @@ -1,17 +1,17 @@ -% language=uk - -\environment luatex-style - -\startcomponent luatex-statistics - -\startchapter[title={Statistics}] - - \topicindex{fonts+used} - - The following fonts are used in this document: - - \showfontusage - -\stopchapter - -\stopcomponent +% language=uk + +\environment luatex-style + +\startcomponent luatex-statistics + +\startchapter[title={Statistics}] + + \topicindex{fonts+used} + + The following fonts are used in this document: + + \showfontusage + +\stopchapter + +\stopcomponent diff --git a/manual/luatex-style.tex b/manual/luatex-style.tex index 502e894a8..aa0a7edc3 100644 --- a/manual/luatex-style.tex +++ b/manual/luatex-style.tex @@ -1,443 +1,443 @@ -\startenvironment luatex-style - -% todo: use \useMPlibrary[lua] - -\enabletrackers[fonts.usage] - -\usemodule[fonts-statistics] - -\setuplayout - [height=middle, - width=middle, - backspace=2cm, - topspace=10mm, - bottomspace=10mm, - header=10mm, - footer=10mm, - footerdistance=10mm, - headerdistance=10mm] - -\setuppagenumbering - [alternative=doublesided] - -\setuptolerance - [stretch,tolerant] - -\setuptype - [lines=hyphenated] - -\setuptyping - [lines=hyphenated] - -\setupitemize - [each] - [packed] - -\definesymbol[1][\Uchar"2023] -\definesymbol[2][\endash] -\definesymbol[3][\wait] % we want to catch it - -\setupitemize - [each] - [headcolor=maincolor, - symbolcolor=maincolor, - color=maincolor] - -\setupwhitespace - [medium] - -\setuptabulate - [blank={small,samepage}, - headstyle=bold, - rulecolor=maincolor, - rulethickness=1pt, - foregroundcolor=white, - foregroundstyle=\ss\bfx\WORD, - backgroundcolor=maincolor] - -\setupcaptions - [headcolor=darkblue] - -\startluacode - local skipped = table.tohash { 'id', 'subtype', 'next', 'prev' } - - function document.functions.showfields(s) - local t = string.split(s,',') - local f = node.fields(t[1],t[2]) - if f then - local d = false - for i=1,#f do - local fi = f[i] - if skipped[fi] then - -- okay - elseif d then - context(', {\tttf %s}', fi) - else - context('{\tttf %s}', fi) - d = true - end - end - end - end - - function document.functions.showid(s) - local t = string.split(s,',') - context('{tttf %s}',node.id(t[1])) - if t[2] then - context(', {tttf %s}',node.subtype(t[2])) - end - end - - function document.functions.showsubtypes(s) - local s = node.subtypes(s) - local d = false - for k, v in table.sortedhash(s) do - if d then - context(', %s = {\\tttf %s}',k,v) - else - context('%s = {\\tttf %s}',k,v) - d = true - end - end - end -\stopluacode - -\unexpanded\def\showfields #1{\ctxlua{document.functions.showfields("#1")}} -\unexpanded\def\showid #1{\ctxlua{document.functions.showid("#1")}} -\unexpanded\def\showsubtypes#1{\ctxlua{document.functions.showsubtypes("#1")}} - -\definecolor[blue] [b=.5] -\definecolor[red] [r=.5] -\definecolor[green] [g=.5] -\definecolor[maincolor] [b=.5] -\definecolor[keptcolor] [b=.5] -\definecolor[othercolor][r=.5,g=.5] - -\writestatus{luatex manual}{} -\writestatus{luatex manual}{defining lucodaot} \usebodyfont [lucidaot] -\writestatus{luatex manual}{defining pagella} \usebodyfont [pagella] -\writestatus{luatex manual}{defining cambria} \usebodyfont [cambria] -\writestatus{luatex manual}{defining modern} \usebodyfont [modern] -\writestatus{luatex manual}{defining dejavu} \setupbodyfont[dejavu,10pt] -\writestatus{luatex manual}{} - -\setuphead [chapter] [align={flushleft,broad},style=\bfd] -\setuphead [section] [align={flushleft,broad},style=\bfb] -\setuphead [subsection] [align={flushleft,broad},style=\bfa] -\setuphead [subsubsection][align={flushleft,broad},style=\bf] - -\setuphead [chapter] [color=maincolor] -\setuphead [section] [color=maincolor] -\setuphead [subsection] [color=maincolor] -\setuphead [subsubsection][color=maincolor] - -\setupfloats - [ntop=4] - -\definehead - [remark] - [subsubsubject] - -\setupheadertexts - [] - -% \setuplayout -% [style=bold, -% color=maincolor] - -\definemixedcolumns - [twocolumns] - [n=2, - balance=yes, - before=\blank, - after=\blank] - -\definemixedcolumns - [threecolumns] - [twocolumns] - [n=3] - -\definemixedcolumns - [fourcolumns] - [threecolumns] - [n=4] - -% if we do this we also need to do it in table cells -% -% \setuptyping -% [color=maincolor] -% -% \setuptype -% [color=maincolor] - -\definetyping - [functioncall] - -\startMPdefinitions - - color luaplanetcolor ; luaplanetcolor := \MPcolor{maincolor} ; - color luaholecolor ; luaholecolor := white ; - numeric luaextraangle ; luaextraangle := 0 ; - numeric luaorbitfactor ; luaorbitfactor := .25 ; - - vardef lualogo = image ( - - % Graphic design by A. Nakonechnyj. Copyright (c) 1998, All rights reserved. - - save d, r, p ; numeric d, r, p ; - - d := sqrt(2)/4 ; r := 1/4 ; p := r/8 ; - - fill fullcircle scaled 1 - withcolor luaplanetcolor ; - draw fullcircle rotated 40.5 scaled (1+r) - dashed evenly scaled p - withpen pencircle scaled (p/2) - withcolor (luaorbitfactor * luaholecolor) ; - fill fullcircle scaled r shifted (d+1/8,d+1/8) - rotated - luaextraangle - withcolor luaplanetcolor ; - fill fullcircle scaled r shifted (d-1/8,d-1/8) - withcolor luaholecolor ; - luaorbitfactor := .25 ; - ) enddef ; - -\stopMPdefinitions - -\startuseMPgraphic{luapage} - StartPage ; - - fill Page withcolor \MPcolor{othercolor} ; - - luaorbitfactor := 1 ; - - picture p ; p := lualogo ysized (5*\measure{paperheight}/10) ; - draw p - shifted - center p - shifted ( - \measure{spreadwidth} - .5*\measure{paperwidth} + \measure{spinewidth}, - .375*\measure{paperheight} - ) - ; - - StopPage ; -\stopuseMPgraphic - -% \starttexdefinition luaextraangle -% % we can also just access the last page and so in mp directly -% \ctxlua { -% context(\lastpage == 0 and 0 or \realfolio*360/\lastpage) -% } -% \stoptexdefinition - -\startuseMPgraphic{luanumber} - % luaextraangle := \luaextraangle; - luaextraangle := if (LastPageNumber < 10) : 10 else : (RealPageNumber / LastPageNumber) * 360 fi; - luaorbitfactor := 0.25 ; - picture p ; p := lualogo ; - setbounds p to boundingbox fullcircle ; - draw p ysized 1cm ; -\stopuseMPgraphic - -\definelayer - [page] - [width=\paperwidth, - height=\paperheight] - -\setupbackgrounds - [leftpage] - [background=page] - -\setupbackgrounds - [rightpage] - [background=page] - -\definemeasure[banneroffset][\bottomspace-\footerheight-\footerdistance+2cm] - -\startsetups pagenumber:right - \setlayerframed - [page] - [preset=rightbottom,x=1.0cm,y=\measure{banneroffset}] - [frame=off,height=1cm,offset=overlay] - {\strut\useMPgraphic{luanumber}} - \setlayerframed - [page] - [preset=rightbottom,x=2.5cm,y=\measure{banneroffset}] - [frame=off,height=1cm,width=1cm,offset=overlay, - foregroundstyle=bold,foregroundcolor=maincolor] - {\strut\pagenumber} - \setlayerframed - [page] - [preset=rightbottom,x=3.5cm,y=\measure{banneroffset}] - [frame=off,height=1cm,offset=overlay, - foregroundstyle=bold,foregroundcolor=maincolor] - {\strut\getmarking[chapter]} -\stopsetups - -\startsetups pagenumber:left - \setlayerframed - [page] - [preset=leftbottom,x=3.5cm,y=\measure{banneroffset}] - [frame=off,height=1cm,offset=overlay, - foregroundstyle=bold,foregroundcolor=maincolor] - {\strut\getmarking[chapter]} - \setlayerframed - [page] - [preset=leftbottom,x=2.5cm,y=\measure{banneroffset}] - [frame=off,height=1cm,width=1cm,offset=overlay, - foregroundstyle=bold,foregroundcolor=maincolor] - {\strut\pagenumber} - \setlayerframed - [page] - [preset=leftbottom,x=1.0cm,y=\measure{banneroffset}] - [frame=off,height=1cm,offset=overlay] - {\strut\useMPgraphic{luanumber}} -\stopsetups - -\unexpanded\def\nonterminal#1>{\mathematics{\langle\hbox{\rm #1}\rangle}} - -% taco's brainwave -) .. todo: create a typing variant so that we can avoid the !crlf - -\newcatcodetable\syntaxcodetable - -\unexpanded\def\makesyntaxcodetable - {\begingroup - \catcode`\<=13 \catcode`\|=12 - \catcode`\!= 0 \catcode`\\=12 - \savecatcodetable\syntaxcodetable - \endgroup} - -\makesyntaxcodetable - -\unexpanded\def\startsyntax {\begingroup\catcodetable\syntaxcodetable \dostartsyntax} -\unexpanded\def\syntax {\begingroup\catcodetable\syntaxcodetable \dosyntax} - \let\stopsyntax \relax - -\unexpanded\def\syntaxenvbody#1% - {\par - \tt - \startnarrower - % \maincolor - #1 - \stopnarrower - \par} - -\unexpanded\def\syntaxbody#1% - {\begingroup - % \maincolor - \tt #1% - \endgroup} - -\bgroup \catcodetable\syntaxcodetable - -!gdef!dostartsyntax#1\stopsyntax{!let{\mathematics{\langle\hbox{\rm #1}\rangle}} + +% taco's brainwave -) .. todo: create a typing variant so that we can avoid the !crlf + +\newcatcodetable\syntaxcodetable + +\unexpanded\def\makesyntaxcodetable + {\begingroup + \catcode`\<=13 \catcode`\|=12 + \catcode`\!= 0 \catcode`\\=12 + \savecatcodetable\syntaxcodetable + \endgroup} + +\makesyntaxcodetable + +\unexpanded\def\startsyntax {\begingroup\catcodetable\syntaxcodetable \dostartsyntax} +\unexpanded\def\syntax {\begingroup\catcodetable\syntaxcodetable \dosyntax} + \let\stopsyntax \relax + +\unexpanded\def\syntaxenvbody#1% + {\par + \tt + \startnarrower + % \maincolor + #1 + \stopnarrower + \par} + +\unexpanded\def\syntaxbody#1% + {\begingroup + % \maincolor + \tt #1% + \endgroup} + +\bgroup \catcodetable\syntaxcodetable + +!gdef!dostartsyntax#1\stopsyntax{!let s = lua.version -\stoptyping - -This returns the \LUA\ version identifier string. The value is currently -\directlua {tex.print(lua.version)}. - -\stopsubsection - -\startsubsection[title={Bytecode registers}] - -\topicindex{bytecodes} -\topicindex{registers+bytecodes} - -\libindex{bytecode} -\libindex{setbytecode} -\libindex{getbytecode} - -\LUA\ registers can be used to store \LUA\ code chunks. The accepted values for -assignments are functions and \type {nil}. Likewise, the retrieved value is -either a function or \type {nil}. - -\starttyping -lua.bytecode[ n] = f -lua.bytecode[ n]() -\stoptyping - -The contents of the \type {lua.bytecode} array is stored inside the format file -as actual \LUA\ bytecode, so it can also be used to preload \LUA\ code. The -function must not contain any upvalues. The associated function calls are: - -\startfunctioncall - f = lua.getbytecode( n) -lua.setbytecode( n, f) -\stopfunctioncall - -Note: Since a \LUA\ file loaded using \type {loadfile(filename)} is essentially -an anonymous function, a complete file can be stored in a bytecode register like -this: - -\startfunctioncall -lua.bytecode[n] = loadfile(filename) -\stopfunctioncall - -Now all definitions (functions, variables) contained in the file can be -created by executing this bytecode register: - -\startfunctioncall -lua.bytecode[n]() -\stopfunctioncall - -Note that the path of the file is stored in the \LUA\ bytecode to be used in -stack backtraces and therefore dumped into the format file if the above code is -used in \INITEX. If it contains private information, i.e. the user name, this -information is then contained in the format file as well. This should be kept in -mind when preloading files into a bytecode register in \INITEX. - -\stopsubsection - -\startsubsection[title={Chunk name registers}] - -\libindex{name} -\libindex{setluaname} -\libindex{getluaname} - -There is an array of 65536 (0--65535) potential chunk names for use with the -\prm {directlua} and \lpr {latelua} primitives. - -\startfunctioncall -lua.name[ n] = s - s = lua.name[ n] -\stopfunctioncall - -If you want to unset a \LUA\ name, you can assign \type {nil} to it. The function -accessors are: - -\startfunctioncall -lua.setluaname( s, n]) - s = lua.getluaname( n) -\stopfunctioncall - -\stopsubsection - -\startsubsection[title={Introspection}] - -\libindex{getstacktop} -\libindex{getcalllevel} - -The \type {getstacktop} and\type {getcalllevel} functions return numbers -indicating how much nesting is going on. They are only of use as breakpoints when -checking some mechanism going haywire. - -\stopsubsection - -\stopsection - -\startsection[title={The \type {status} library}][library=status] - -\topicindex{libraries+\type{status}} - -\libindex{list} -\libindex{resetmessages} -\libindex{setexitcode} - -This contains a number of run|-|time configuration items that you may find useful -in message reporting, as well as an iterator function that gets all of the names -and values as a table. - -\startfunctioncall -
info = status.list() -\stopfunctioncall - -The keys in the table are the known items, the value is the current value. Almost -all of the values in \type {status} are fetched through a metatable at run|-|time -whenever they are accessed, so you cannot use \type {pairs} on \type {status}, -but you {\it can\/} use \type {pairs} on \type {info}, of course. If you do not -need the full list, you can also ask for a single item by using its name as an -index into \type {status}. The current list is: - -\starttabulate[|l|p|] -\DB key \BC explanation \NC \NR -\TB -\NC \type{banner} \NC terminal display banner \NC \NR -\NC \type{best_page_break} \NC the current best break (a node) \NC \NR -\NC \type{buf_size} \NC current allocated size of the line buffer \NC \NR -\NC \type{callbacks} \NC total number of executed callbacks so far \NC \NR -\NC \type{cs_count} \NC number of control sequences \NC \NR -\NC \type{dest_names_size} \NC \PDF\ destination table size \NC \NR -\NC \type{dvi_gone} \NC written \DVI\ bytes \NC \NR -\NC \type{dvi_ptr} \NC not yet written \DVI\ bytes \NC \NR -\NC \type{dyn_used} \NC token (multi|-|word) memory in use \NC \NR -\NC \type{filename} \NC name of the current input file \NC \NR -\NC \type{fix_mem_end} \NC maximum number of used tokens \NC \NR -\NC \type{fix_mem_min} \NC minimum number of allocated words for tokens \NC \NR -\NC \type{fix_mem_max} \NC maximum number of allocated words for tokens \NC \NR -\NC \type{font_ptr} \NC number of active fonts \NC \NR -\NC \type{hash_extra} \NC extra allowed hash \NC \NR -\NC \type{hash_size} \NC size of hash \NC \NR -\NC \type{indirect_callbacks} \NC number of those that were themselves a result of other callbacks (e.g. file readers) \NC \NR -\NC \type{ini_version} \NC \type {true} if this is an \INITEX\ run \NC \NR -\NC \type{init_pool_ptr} \NC \INITEX\ string pool index \NC \NR -\NC \type{init_str_ptr} \NC number of \INITEX\ strings \NC \NR -\NC \type{input_ptr} \NC the level of input we're at \NC \NR -\NC \type{inputid} \NC numeric id of the current input \NC \NR -\NC \type{largest_used_mark} \NC max referenced marks class \NC \NR -\NC \type{lasterrorcontext} \NC last error context string (with newlines) \NC \NR -\NC \type{lasterrorstring} \NC last \TEX\ error string \NC \NR -\NC \type{lastluaerrorstring} \NC last \LUA\ error string \NC \NR -\NC \type{lastwarningstring} \NC last warning tag, normally an indication of in what part\NC \NR -\NC \type{lastwarningtag} \NC last warning string\NC \NR -\NC \type{linenumber} \NC location in the current input file \NC \NR -\NC \type{log_name} \NC name of the log file \NC \NR -\NC \type{luabytecode_bytes} \NC number of bytes in \LUA\ bytecode registers \NC \NR -\NC \type{luabytecodes} \NC number of active \LUA\ bytecode registers \NC \NR -\NC \type{luastate_bytes} \NC number of bytes in use by \LUA\ interpreters \NC \NR -\NC \type{luatex_engine} \NC the \LUATEX\ engine identifier \NC \NR -\NC \type{luatex_hashchars} \NC length to which \LUA\ hashes strings ($2^n$) \NC \NR -\NC \type{luatex_hashtype} \NC the hash method used (in \LUAJITTEX) \NC \NR -\NC \type{luatex_version} \NC the \LUATEX\ version number \NC \NR -\NC \type{luatex_revision} \NC the \LUATEX\ revision string \NC \NR -\NC \type{max_buf_stack} \NC max used buffer position \NC \NR -\NC \type{max_in_stack} \NC max used input stack entries \NC \NR -\NC \type{max_nest_stack} \NC max used nesting stack entries \NC \NR -\NC \type{max_param_stack} \NC max used parameter stack entries \NC \NR -\NC \type{max_save_stack} \NC max used save stack entries \NC \NR -\NC \type{max_strings} \NC maximum allowed strings \NC \NR -\NC \type{nest_size} \NC nesting stack size \NC \NR -\NC \type{node_mem_usage} \NC a string giving insight into currently used nodes \NC \NR -\NC \type{obj_ptr} \NC max \PDF\ object pointer \NC \NR -\NC \type{obj_tab_size} \NC \PDF\ object table size \NC \NR -\NC \type{output_active} \NC \type {true} if the \prm {output} routine is active \NC \NR -\NC \type{output_file_name} \NC name of the \PDF\ or \DVI\ file \NC \NR -\NC \type{param_size} \NC parameter stack size \NC \NR -\NC \type{pdf_dest_names_ptr} \NC max \PDF\ destination pointer \NC \NR -\NC \type{pdf_gone} \NC written \PDF\ bytes \NC \NR -\NC \type{pdf_mem_ptr} \NC max \PDF\ memory used \NC \NR -\NC \type{pdf_mem_size} \NC \PDF\ memory size \NC \NR -\NC \type{pdf_os_cntr} \NC max \PDF\ object stream pointer \NC \NR -\NC \type{pdf_os_objidx} \NC \PDF\ object stream index \NC \NR -\NC \type{pdf_ptr} \NC not yet written \PDF\ bytes \NC \NR -\NC \type{pool_ptr} \NC string pool index \NC \NR -\NC \type{pool_size} \NC current size allocated for string characters \NC \NR -\NC \type{save_size} \NC save stack size \NC \NR -\NC \type{shell_escape} \NC \type {0} means disabled, \type {1} means anything is permitted, and \type {2} is restricted \NC \NR -\NC \type{safer_option} \NC \type {1} means safer is enforced \NC \NR -\NC \type{kpse_used} \NC \type {1} means that kpse is used \NC \NR -\NC \type{stack_size} \NC input stack size \NC \NR -\NC \type{str_ptr} \NC number of strings \NC \NR -\NC \type{total_pages} \NC number of written pages \NC \NR -\NC \type{var_mem_max} \NC number of allocated words for nodes \NC \NR -\NC \type{var_used} \NC variable (one|-|word) memory in use \NC \NR -\NC \type{lc_collate} \NC the value of \type {LC_COLLATE} at startup time (becomes \type {C} at startup) \NC \NR -\NC \type{lc_ctype} \NC the value of \type {LC_CTYPE} at startup time (becomes \type {C} at startup) \NC \NR -%NC \type{lc_monetary} \NC the value of \type {LC_MONETARY} at startup time \NC \NR -\NC \type{lc_numeric} \NC the value of \type {LC_NUMERIC} at startup time \NC \NR -%NC \type{lc_time} \NC the value of \type {LC_TIME} at startup time (becomes \type {C} at startup) \NC \NR -\LL -\stoptabulate - -The error and warning messages can be wiped with the \type {resetmessages} -function. A return value can be set with \type {setexitcode}. - -\stopsection - -\startsection[title={The \type {tex} library}][library=tex] - -\startsubsection[title={Introduction}] - -\topicindex{libraries+\type{tex}} - -The \type {tex} table contains a large list of virtual internal \TEX\ -parameters that are partially writable. - -The designation \quote {virtual} means that these items are not properly defined -in \LUA, but are only front\-ends that are handled by a metatable that operates -on the actual \TEX\ values. As a result, most of the \LUA\ table operators (like -\type {pairs} and \type {#}) do not work on such items. - -At the moment, it is possible to access almost every parameter that you can use -after \prm {the}, is a single tokens or is sort of special in \TEX. This excludes -parameters that need extra arguments, like \type {\the\scriptfont}. The subset -comprising simple integer and dimension registers are writable as well as -readable (like \prm {tracingcommands} and \prm {parindent}). - -\stopsubsection - -\startsubsection[title={Internal parameter values, \type {set} and \type {get}}] - -\topicindex{parameters+internal} - -\libindex{set} \libindex{get} - -For all the parameters in this section, it is possible to access them directly -using their names as index in the \type {tex} table, or by using one of the -functions \type {tex.get} and \type {tex.set}. - -The exact parameters and return values differ depending on the actual parameter, -and so does whether \type {tex.set} has any effect. For the parameters that {\em -can} be set, it is possible to use \type {global} as the first argument to \type -{tex.set}; this makes the assignment global instead of local. - -\startfunctioncall -tex.set (["global",] n, ...) -... = tex.get ( n) -\stopfunctioncall - -Glue is kind of special because there are five values involved. The return value -is a \nod {glue_spec} node but when you pass \type {false} as last argument to -\type {tex.get} you get the width of the glue and when you pass \type {true} you -get all five values. Otherwise you get a node which is a copy of the internal -value so you are responsible for its freeing at the \LUA\ end. When you set a -glue quantity you can either pass a \nod {glue_spec} or upto five numbers. If -you pass \type {true} to \type {get} you get 5 values returned for a glue and -when you pass \type {false} you only get the width returned. - -\subsubsection{Integer parameters} - -The integer parameters accept and return \LUA\ numbers. These are read|-|write: - -\starttwocolumns -\starttyping -tex.adjdemerits -tex.binoppenalty -tex.brokenpenalty -tex.catcodetable -tex.clubpenalty -tex.day -tex.defaulthyphenchar -tex.defaultskewchar -tex.delimiterfactor -tex.displaywidowpenalty -tex.doublehyphendemerits -tex.endlinechar -tex.errorcontextlines -tex.escapechar -tex.exhyphenpenalty -tex.fam -tex.finalhyphendemerits -tex.floatingpenalty -tex.globaldefs -tex.hangafter -tex.hbadness -tex.holdinginserts -tex.hyphenpenalty -tex.interlinepenalty -tex.language -tex.lastlinefit -tex.lefthyphenmin -tex.linepenalty -tex.localbrokenpenalty -tex.localinterlinepenalty -tex.looseness -tex.mag -tex.maxdeadcycles -tex.month -tex.newlinechar -tex.outputpenalty -tex.pausing -tex.postdisplaypenalty -tex.predisplaydirection -tex.predisplaypenalty -tex.pretolerance -tex.relpenalty -tex.righthyphenmin -tex.savinghyphcodes -tex.savingvdiscards -tex.showboxbreadth -tex.showboxdepth -tex.time -tex.tolerance -tex.tracingassigns -tex.tracingcommands -tex.tracinggroups -tex.tracingifs -tex.tracinglostchars -tex.tracingmacros -tex.tracingnesting -tex.tracingonline -tex.tracingoutput -tex.tracingpages -tex.tracingparagraphs -tex.tracingrestores -tex.tracingscantokens -tex.tracingstats -tex.uchyph -tex.vbadness -tex.widowpenalty -tex.year -\stoptyping -\stoptwocolumns - -These are read|-|only: - -\startthreecolumns -\starttyping -tex.deadcycles -tex.insertpenalties -tex.parshape -tex.prevgraf -tex.spacefactor -\stoptyping -\stopthreecolumns - -\subsubsection{Dimension parameters} - -The dimension parameters accept \LUA\ numbers (signifying scaled points) or -strings (with included dimension). The result is always a number in scaled -points. These are read|-|write: - -\startthreecolumns -\starttyping -tex.boxmaxdepth -tex.delimitershortfall -tex.displayindent -tex.displaywidth -tex.emergencystretch -tex.hangindent -tex.hfuzz -tex.hoffset -tex.hsize -tex.lineskiplimit -tex.mathsurround -tex.maxdepth -tex.nulldelimiterspace -tex.overfullrule -tex.pagebottomoffset -tex.pageheight -tex.pageleftoffset -tex.pagerightoffset -tex.pagetopoffset -tex.pagewidth -tex.parindent -tex.predisplaysize -tex.scriptspace -tex.splitmaxdepth -tex.vfuzz -tex.voffset -tex.vsize -tex.prevdepth -tex.prevgraf -tex.spacefactor -\stoptyping -\stopthreecolumns - -These are read|-|only: - -\startthreecolumns -\starttyping -tex.pagedepth -tex.pagefilllstretch -tex.pagefillstretch -tex.pagefilstretch -tex.pagegoal -tex.pageshrink -tex.pagestretch -tex.pagetotal -\stoptyping -\stopthreecolumns - -Beware: as with all \LUA\ tables you can add values to them. So, the following is -valid: - -\starttyping -tex.foo = 123 -\stoptyping - -When you access a \TEX\ parameter a look up takes place. For read||only variables -that means that you will get something back, but when you set them you create a -new entry in the table thereby making the original invisible. - -There are a few special cases that we make an exception for: \type {prevdepth}, -\type {prevgraf} and \type {spacefactor}. These normally are accessed via the -\type {tex.nest} table: - -\starttyping -tex.nest[tex.nest.ptr].prevdepth = p -tex.nest[tex.nest.ptr].spacefactor = s -\stoptyping - -However, the following also works: - -\starttyping -tex.prevdepth = p -tex.spacefactor = s -\stoptyping - -Keep in mind that when you mess with node lists directly at the \LUA\ end you -might need to update the top of the nesting stack's \type {prevdepth} explicitly -as there is no way \LUATEX\ can guess your intentions. By using the accessor in -the \type {tex} tables, you get and set the values at the top of the nesting -stack. - -\subsubsection{Direction parameters} - -The direction parameters are read|-|only and return a \LUA\ string. - -\startthreecolumns -\starttyping -tex.bodydir -tex.mathdir -tex.pagedir -tex.pardir -tex.textdir -\stoptyping -\stopthreecolumns - -\subsubsection{Glue parameters} - -The glue parameters accept and return a userdata object that represents a \nod {glue_spec} node. - -\startthreecolumns -\starttyping -tex.abovedisplayshortskip -tex.abovedisplayskip -tex.baselineskip -tex.belowdisplayshortskip -tex.belowdisplayskip -tex.leftskip -tex.lineskip -tex.parfillskip -tex.parskip -tex.rightskip -tex.spaceskip -tex.splittopskip -tex.tabskip -tex.topskip -tex.xspaceskip -\stoptyping -\stopthreecolumns - -\subsubsection{Muglue parameters} - -All muglue parameters are to be used read|-|only and return a \LUA\ string. - -\startthreecolumns -\starttyping -tex.medmuskip -tex.thickmuskip -tex.thinmuskip -\stoptyping -\stopthreecolumns - -\subsubsection{Tokenlist parameters} - -The tokenlist parameters accept and return \LUA\ strings. \LUA\ strings are -converted to and from token lists using \prm {the} \prm {toks} style expansion: -all category codes are either space (10) or other (12). It follows that assigning -to some of these, like \quote {tex.output}, is actually useless, but it feels bad -to make exceptions in view of a coming extension that will accept full|-|blown -token strings. - -\startthreecolumns -\starttyping -tex.errhelp -tex.everycr -tex.everydisplay -tex.everyeof -tex.everyhbox -tex.everyjob -tex.everymath -tex.everypar -tex.everyvbox -tex.output -\stoptyping -\stopthreecolumns - -\stopsubsection - -\startsubsection[title={Convert commands}] - -\topicindex{convert commands} - -All \quote {convert} commands are read|-|only and return a \LUA\ string. The -supported commands at this moment are: - -\starttwocolumns -\starttyping -tex.eTeXVersion -tex.eTeXrevision -tex.formatname -tex.jobname -tex.luatexbanner -tex.luatexrevision -tex.fontname(number) -tex.uniformdeviate(number) -tex.number(number) -tex.romannumeral(number) -tex.fontidentifier(number) -\stoptyping -\stoptwocolumns - -If you are wondering why this list looks haphazard; these are all the cases of -the \quote {convert} internal command that do not require an argument, as well as -the ones that require only a simple numeric value. The special (\LUA|-|only) case -of \type {tex.fontidentifier} returns the \type {csname} string that matches a -font id number (if there is one). - -\stopsubsection - -\startsubsection[title={Last item commands}] - -\topicindex{last items} - -All \quote {last item} commands are read|-|only and return a number. The -supported commands at this moment are: - -\startthreecolumns -\starttyping -tex.lastpenalty -tex.lastkern -tex.lastskip -tex.lastnodetype -tex.inputlineno -tex.lastxpos -tex.lastypos -tex.randomseed -tex.luatexversion -tex.eTeXminorversion -tex.eTeXversion -tex.currentgrouplevel -tex.currentgrouptype -tex.currentiflevel -tex.currentiftype -tex.currentifbranch -\stoptyping -\stopthreecolumns - -\stopsubsection - -\startsubsection[title={Accessing registers: \type {set*}, \type {get*} and \type {is*}}] - -\topicindex{attributes} -\topicindex{registers} - -\libindex{attribute} \libindex{setattribute} \libindex{getattribute} \libindex{isattribute} -\libindex{count} \libindex{setcount} \libindex{getcount} \libindex{iscount} -\libindex{dimen} \libindex{setdimen} \libindex{getdimen} \libindex{isdimen} -\libindex{skip} \libindex{setskip} \libindex{getskip} \libindex{isskip} -\libindex{muskip} \libindex{setmuskip} \libindex{getmuskip} \libindex{ismuskip} -\libindex{glue} \libindex{setglue} \libindex{getglue} \libindex{isglue} -\libindex{muglue} \libindex{setmuglue} \libindex{getmuglue} \libindex{ismuglue} -\libindex{toks} \libindex{settoks} \libindex{gettoks} \libindex{istoks} -\libindex{box} \libindex{setbox} \libindex{getbox} \libindex{isbox} - -\libindex{scantoks} - -\TEX's attributes (\lpr {attribute}), counters (\prm {count}), dimensions (\prm -{dimen}), skips (\prm {skip}, \prm {muskip}) and token (\prm {toks}) registers -can be accessed and written to using two times five virtual sub|-|tables of the -\type {tex} table: - -\startthreecolumns -\starttyping -tex.attribute -tex.count -tex.dimen -tex.skip -tex.glue -tex.muskip -tex.muglue -tex.toks -\stoptyping -\stopthreecolumns - -It is possible to use the names of relevant \lpr {attributedef}, \prm {countdef}, -\prm {dimendef}, \prm {skipdef}, or \prm {toksdef} control sequences as indices -to these tables: - -\starttyping -tex.count.scratchcounter = 0 -enormous = tex.dimen['maxdimen'] -\stoptyping - -In this case, \LUATEX\ looks up the value for you on the fly. You have to use a -valid \prm {countdef} (or \lpr {attributedef}, or \prm {dimendef}, or \prm -{skipdef}, or \prm {toksdef}), anything else will generate an error (the intent -is to eventually also allow \type {} and even macros that expand -into a number). - -\startitemize - - \startitem - The count registers accept and return \LUA\ numbers. - \stopitem - - \startitem - The dimension registers accept \LUA\ numbers (in scaled points) or - strings (with an included absolute dimension; \type {em} and \type {ex} - and \type {px} are forbidden). The result is always a number in scaled - points. - \stopitem - - \startitem - The token registers accept and return \LUA\ strings. \LUA\ strings are - converted to and from token lists using \prm {the} \prm {toks} style - expansion: all category codes are either space (10) or other (12). - \stopitem - - \startitem - The skip registers accept and return \nod {glue_spec} userdata node - objects (see the description of the node interface elsewhere in this - manual). - \stopitem - - \startitem - The glue registers are just skip registers but instead of userdata - are verbose. - \stopitem - - \startitem - Like the counts, the attribute registers accept and return \LUA\ numbers. - \stopitem - -\stopitemize - -As an alternative to array addressing, there are also accessor functions defined -for all cases, for example, here is the set of possibilities for \prm {skip} -registers: - -\startfunctioncall -tex.setskip (["global",] n, s) -tex.setskip (["global",] s, s) - s = tex.getskip ( n) - s = tex.getskip ( s) -\stopfunctioncall - -We have similar setters for \type {count}, \type {dimen}, \type {muskip}, and -\type {toks}. Counters and dimen are represented by numbers, skips and muskips by -nodes, and toks by strings. - -Again the glue variants are not using the \nod {glue-spec} userdata nodes. The -\type {setglue} function accepts upto 5 arguments: width, stretch, shrink, -stretch order and shrink order and the \type {getglue} function reports them, -unless the second argument is \type {false} in which care only the width is -returned. - -Here is an example usign a threesome: - -\startfunctioncall -local d = tex.getdimen("foo") -if tex.isdimen("bar") then - tex.setdimen("bar",d) -end -\stopfunctioncall - -There are six extra skip (glue) related helpers: - -\startfunctioncall -tex.setglue (["global"], n, - width, stretch, shrink, stretch_order, shrink_order) -tex.setglue (["global"], s, - width, stretch, shrink, stretch_order, shrink_order) -width, stretch, shrink, stretch_order, shrink_order = - tex.getglue ( n) -width, stretch, shrink, stretch_order, shrink_order = - tex.getglue ( s) -\stopfunctioncall - -The other two are \type {tex.setmuglue} and \type {tex.getmuglue}. - -There are such helpers for \type {dimen}, \type {count}, \type {skip}, \type -{muskip}, \type {box} and \type {attribute} registers but the glue ones -are special because they have to deal with more properties. - -As with the general \type {get} and \type {set} function discussed before, for -the skip registers \type {getskip} returns a node and \type {getglue} returns -numbers, while \type {setskip} accepts a node and \type {setglue} expects upto 5 -numbers. Again, when you pass \type {false} as second argument to \type {getglue} -you only get the width returned. The same is true for the \type {mu} variants -\type {getmuskip}, \type {setmuskip}, \type {getmuskip} and\type {setmuskip}. - -For tokens registers we have an alternative where a catcode table is specified: - -\startfunctioncall -tex.scantoks(0,3,"$e=mc^2$") -tex.scantoks("global",0,"$\int\limits^1_2$") -\stopfunctioncall - -In the function-based interface, it is possible to define values globally by -using the string \type {global} as the first function argument. - -\stopsubsection - -\startsubsection[title={Character code registers: \type {[get|set]*code[s]}}] - -\topicindex{characters+codes} - -\libindex{lccode} \libindex{setlccode} \libindex{getlccode} -\libindex{uccode} \libindex{setuccode} \libindex{getuccode} -\libindex{sfcode} \libindex{setsfcode} \libindex{getsfcode} -\libindex{catcode} \libindex{setcatcode} \libindex{getcatcode} -\libindex{mathcode} \libindex{setmathcode} \libindex{getmathcode} -\libindex{delcode} \libindex{setdelcode} \libindex{getdelcode} - -\libindex{setdelcodes} \libindex{getdelcodes} -\libindex{setmathcodes} \libindex{getmathcodes} - -\TEX's character code tables (\prm {lccode}, \prm {uccode}, \prm {sfcode}, \prm -{catcode}, \prm {mathcode}, \prm {delcode}) can be accessed and written to using -six virtual subtables of the \type {tex} table - -\startthreecolumns -\starttyping -tex.lccode -tex.uccode -tex.sfcode -tex.catcode -tex.mathcode -tex.delcode -\stoptyping -\stopthreecolumns - -The function call interfaces are roughly as above, but there are a few twists. -\type {sfcode}s are the simple ones: - -\startfunctioncall -tex.setsfcode (["global",] n, s) - s = tex.getsfcode ( n) -\stopfunctioncall - -The function call interface for \type {lccode} and \type {uccode} additionally -allows you to set the associated sibling at the same time: - -\startfunctioncall -tex.setlccode (["global"], n, lc) -tex.setlccode (["global"], n, lc, uc) - lc = tex.getlccode ( n) -tex.setuccode (["global"], n, uc) -tex.setuccode (["global"], n, uc, lc) - uc = tex.getuccode ( n) -\stopfunctioncall - -The function call interface for \type {catcode} also allows you to specify a -category table to use on assignment or on query (default in both cases is the -current one): - -\startfunctioncall -tex.setcatcode (["global"], n, c) -tex.setcatcode (["global"], cattable, n, c) - lc = tex.getcatcode ( n) - lc = tex.getcatcode ( cattable, n) -\stopfunctioncall - -The interfaces for \type {delcode} and \type {mathcode} use small array tables to -set and retrieve values: - -\startfunctioncall -tex.setmathcode (["global"], n,
mval ) -
mval = tex.getmathcode ( n) -tex.setdelcode (["global"], n,
dval ) -
dval = tex.getdelcode ( n) -\stopfunctioncall - -Where the table for \type {mathcode} is an array of 3 numbers, like this: - -\starttyping -{ - class, - family, - character -} -\stoptyping - -And the table for \type {delcode} is an array with 4 numbers, like this: - -\starttyping -{ - small_fam, - small_char, - large_fam, - large_char -} -\stoptyping - -You can also avoid the table: - -\startfunctioncall -tex.setmathcode (["global"], n, class, - family, character) -class, family, char = - tex.getmathcodes ( n) -tex.setdelcode (["global"], n, smallfam, - smallchar, largefam, largechar) -smallfam, smallchar, largefam, largechar = - tex.getdelcodes ( n) -\stopfunctioncall - -Normally, the third and fourth values in a delimiter code assignment will be zero -according to \lpr {Udelcode} usage, but the returned table can have values there -(if the delimiter code was set using \prm {delcode}, for example). Unset \type -{delcode}'s can be recognized because \type {dval[1]} is $-1$. - -\stopsubsection - -\startsubsection[title={Box registers: \type {[get|set]box}}] - -\topicindex{registers} -\topicindex{boxes} - -\libindex{box} -\libindex{setbox} \libindex{getbox} - -It is possible to set and query actual boxes, coming for instance from \prm -{hbox}, \prm {vbox} or \prm {vtop}, using the node interface as defined in the -\type {node} library: - -\starttyping -tex.box -\stoptyping - -for array access, or - -\starttyping -tex.setbox(["global",] n, s) -tex.setbox(["global",] cs, s) - n = tex.getbox( n) - n = tex.getbox( cs) -\stoptyping - -for function|-|based access. In the function-based interface, it is possible to -define values globally by using the string \type {global} as the first function -argument. - -Be warned that an assignment like - -\starttyping -tex.box[0] = tex.box[2] -\stoptyping - -does not copy the node list, it just duplicates a node pointer. If \type {\box2} -will be cleared by \TEX\ commands later on, the contents of \type {\box0} becomes -invalid as well. To prevent this from happening, always use \type -{node.copy_list} unless you are assigning to a temporary variable: - -\starttyping -tex.box[0] = node.copy_list(tex.box[2]) -\stoptyping - -\stopsubsection - -\startsubsection[title={Reusing boxes: \type {[use|save]boxresource} and \type {getboxresourcedimensions}}] - -\topicindex{boxes+reuse} - -\libindex{useboxresource} -\libindex{saveboxresource} -\libindex{getboxresourcedimensions} - -The following function will register a box for reuse (this is modelled after so -called xforms in \PDF). You can (re)use the box with \lpr {useboxresource} or -by creating a rule node with subtype~2. - -\starttyping -local index = tex.saveboxresource(n,attributes,resources,immediate,type,margin) -\stoptyping - -The optional second and third arguments are strings, the fourth is a boolean. The -fifth argument is a type. When set to non|-|zero the \type {/Type} entry is -omitted. A value of 1 or 3 still writes a \type {/BBox}, while 2 or 3 will write -a \type {/Matrix}. The sixth argument is the (virtual) margin that extends beyond -the effective boundingbox as seen by \TEX. Instead of a box number one can also -pass a \type {[h|v]list} node. - -You can generate the reference (a rule type) with: - -\starttyping -local reused = tex.useboxresource(n,wd,ht,dp) -\stoptyping - -The dimensions are optional and the final ones are returned as extra values. The -following is just a bonus (no dimensions returned means that the resource is -unknown): - -\starttyping -local w, h, d, m = tex.getboxresourcedimensions(n) -\stoptyping - -This returns the width, height, depth and margin of the resource. - -\stopsubsection - -\startsubsection[title={\type {triggerbuildpage}}] - -\topicindex{pages} - -\libindex{triggerbuildpage} - -You should not expect to much from the \type {triggerbuildpage} helpers because -often \TEX\ doesn't do much if it thinks nothing has to be done, but it might be -useful for some applications. It just does as it says it calls the internal -function that build a page, given that there is something to build. - -\stopsubsection - -\startsubsection[title={\type {splitbox}}] - -\topicindex{boxes+split} - -\libindex{splitbox} - -You can split a box: - -\starttyping -local vlist = tex.splitbox(n,height,mode) -\stoptyping - -The remainder is kept in the original box and a packaged vlist is returned. This -operation is comparable to the \prm {vsplit} operation. The mode can be \type -{additional} or \type {exactly} and concerns the split off box. - -\stopsubsection - -\startsubsection[title={Accessing math parameters: \type {[get|set]math}}] - -\topicindex{math+parameters} -\topicindex{parameters+math} - -\libindex{setmath} -\libindex{getmath} - -It is possible to set and query the internal math parameters using: - -\startfunctioncall -tex.setmath(["global",] n, t, n) - n = tex.getmath( n, t) -\stopfunctioncall - -As before an optional first parameter \type {global} indicates a global -assignment. - -The first string is the parameter name minus the leading \quote {Umath}, and the -second string is the style name minus the trailing \quote {style}. Just to be -complete, the values for the math parameter name are: - -\starttyping -quad axis operatorsize -overbarkern overbarrule overbarvgap -underbarkern underbarrule underbarvgap -radicalkern radicalrule radicalvgap -radicaldegreebefore radicaldegreeafter radicaldegreeraise -stackvgap stacknumup stackdenomdown -fractionrule fractionnumvgap fractionnumup -fractiondenomvgap fractiondenomdown fractiondelsize -limitabovevgap limitabovebgap limitabovekern -limitbelowvgap limitbelowbgap limitbelowkern -underdelimitervgap underdelimiterbgap -overdelimitervgap overdelimiterbgap -subshiftdrop supshiftdrop subshiftdown -subsupshiftdown subtopmax supshiftup -supbottommin supsubbottommax subsupvgap -spaceafterscript connectoroverlapmin -ordordspacing ordopspacing ordbinspacing ordrelspacing -ordopenspacing ordclosespacing ordpunctspacing ordinnerspacing -opordspacing opopspacing opbinspacing oprelspacing -opopenspacing opclosespacing oppunctspacing opinnerspacing -binordspacing binopspacing binbinspacing binrelspacing -binopenspacing binclosespacing binpunctspacing bininnerspacing -relordspacing relopspacing relbinspacing relrelspacing -relopenspacing relclosespacing relpunctspacing relinnerspacing -openordspacing openopspacing openbinspacing openrelspacing -openopenspacing openclosespacing openpunctspacing openinnerspacing -closeordspacing closeopspacing closebinspacing closerelspacing -closeopenspacing closeclosespacing closepunctspacing closeinnerspacing -punctordspacing punctopspacing punctbinspacing punctrelspacing -punctopenspacing punctclosespacing punctpunctspacing punctinnerspacing -innerordspacing inneropspacing innerbinspacing innerrelspacing -inneropenspacing innerclosespacing innerpunctspacing innerinnerspacing -\stoptyping - -The values for the style parameter are: - -\starttyping -display crampeddisplay -text crampedtext -script crampedscript -scriptscript crampedscriptscript -\stoptyping - -The value is either a number (representing a dimension or number) or a glue spec -node representing a muskip for \type {ordordspacing} and similar spacing -parameters. - -\stopsubsection - -\startsubsection[title={Special list heads: \type {[get|set]list}}] - -\topicindex{lists} - -\libindex{lists} -\libindex{setlist} -\libindex{getlist} - -The virtual table \type {tex.lists} contains the set of internal registers that -keep track of building page lists. - -\starttabulate[|l|p|] -\DB field \BC explanation \NC \NR -\TB -\NC \type{page_ins_head} \NC circular list of pending insertions \NC \NR -\NC \type{contrib_head} \NC the recent contributions \NC \NR -\NC \type{page_head} \NC the current page content \NC \NR -%NC \type{temp_head} \NC \NC \NR -\NC \type{hold_head} \NC used for held-over items for next page \NC \NR -\NC \type{adjust_head} \NC head of the current \prm {vadjust} list \NC \NR -\NC \type{pre_adjust_head} \NC head of the current \type {\vadjust pre} list \NC \NR -%NC \type{align_head} \NC \NC \NR -\NC \type{page_discards_head} \NC head of the discarded items of a page break \NC \NR -\NC \type{split_discards_head} \NC head of the discarded items in a vsplit \NC \NR -\LL -\stoptabulate - -The getter and setter functions are \type {getlist} and \type {setlist}. You have -to be careful with what you set as \TEX\ can have expectations with regards to -how a list is constructed or in what state it is. - -\stopsubsection - -\startsubsection[title={Semantic nest levels: \type {getnest} and \type {ptr}}] - -\topicindex{nesting} - -\libindex{nest} -\libindex{ptr} -%libindex{setnest} % only a message -\libindex{getnest} - -The virtual table \type {nest} contains the currently active semantic nesting -state. It has two main parts: a zero-based array of userdata for the semantic -nest itself, and the numerical value \type {ptr}, which gives the highest -available index. Neither the array items in \type {nest[]} nor \type {ptr} can be -assigned to (as this would confuse the typesetting engine beyond repair), but you -can assign to the individual values inside the array items, e.g.\ \type -{tex.nest[tex.nest.ptr].prevdepth}. - -\type {tex.nest[tex.nest.ptr]} is the current nest state, \type {nest[0]} the -outermost (main vertical list) level. The getter function is \type {getnest}. You -can pass a number (which gives you a list), nothing or \type {top}, which returns -the topmost list, or the string \type {ptr} which gives you the index of the -topmost list. - -The known fields are: - -\starttabulate[|l|l|l|p|] -\DB key \BC type \BC modes \BC explanation \NC \NR -\TB -\NC \type{mode} \NC number \NC all \NC a string: - \type {none} (this happens during \prm {write}), - \type {vmode}, \type {hmode}, \type {displaymath}, - \type {innervmode}, \type {innerhmode}, \type {inlinemath}; - these fields cannot be set \NC \NR -\NC \type{modeline} \NC number \NC all \NC source input line where this mode was entered in, - negative inside the output routine \NC \NR -\NC \type{head} \NC node \NC all \NC the head of the current list \NC \NR -\NC \type{tail} \NC node \NC all \NC the tail of the current list \NC \NR -\NC \type{prevgraf} \NC number \NC vmode \NC number of lines in the previous paragraph \NC \NR -\NC \type{prevdepth} \NC number \NC vmode \NC depth of the previous paragraph \NC \NR -\NC \type{spacefactor} \NC number \NC hmode \NC the current space factor \NC \NR -\NC \type{dirs} \NC node \NC hmode \NC used for temporary storage by the line break algorithm\NC \NR -\NC \type{noad} \NC node \NC mmode \NC used for temporary storage of a pending fraction numerator, - for \prm {over} etc. \NC \NR -\NC \type{delimptr} \NC node \NC mmode \NC used for temporary storage of the previous math delimiter, - for \prm {middle} \NC \NR -\NC \type{mathdir} \NC boolean \NC mmode \NC true when during math processing the \lpr {mathdir} is not - the same as the surrounding \lpr {textdir} \NC \NR -\NC \type{mathstyle} \NC number \NC mmode \NC the current \lpr {mathstyle} \NC \NR -\LL -\stoptabulate - -\stopsubsection - -\startsubsection[reference=sec:luaprint,title={Print functions}] - -\topicindex{printing} - -The \type {tex} table also contains the three print functions that are the major -interface from \LUA\ scripting to \TEX. The arguments to these three functions -are all stored in an in|-|memory virtual file that is fed to the \TEX\ scanner as -the result of the expansion of \prm {directlua}. - -The total amount of returnable text from a \prm {directlua} command is only -limited by available system \RAM. However, each separate printed string has to -fit completely in \TEX's input buffer. The result of using these functions from -inside callbacks is undefined at the moment. - -\subsubsection{\type {print}} - -\libindex{print} - -\startfunctioncall -tex.print( s, ...) -tex.print( n, s, ...) -tex.print(
t) -tex.print( n,
t) -\stopfunctioncall - -Each string argument is treated by \TEX\ as a separate input line. If there is a -table argument instead of a list of strings, this has to be a consecutive array -of strings to print (the first non-string value will stop the printing process). - -The optional parameter can be used to print the strings using the catcode regime -defined by \lpr {catcodetable}~\type {n}. If \type {n} is $-1$, the currently -active catcode regime is used. If \type {n} is $-2$, the resulting catcodes are -the result of \prm {the} \prm {toks}: all category codes are 12 (other) except for -the space character, that has category code 10 (space). Otherwise, if \type {n} -is not a valid catcode table, then it is ignored, and the currently active -catcode regime is used instead. - -The very last string of the very last \type {tex.print} command in a \prm -{directlua} will not have the \prm {endlinechar} appended, all others do. - -\subsubsection{\type {sprint}} - -\libindex{sprint} - -\startfunctioncall -tex.sprint( s, ...) -tex.sprint( n, s, ...) -tex.sprint(
t) -tex.sprint( n,
t) -\stopfunctioncall - -Each string argument is treated by \TEX\ as a special kind of input line that -makes it suitable for use as a partial line input mechanism: - -\startitemize[packed] -\startitem - \TEX\ does not switch to the \quote {new line} state, so that leading spaces - are not ignored. -\stopitem -\startitem - No \prm {endlinechar} is inserted. -\stopitem -\startitem - Trailing spaces are not removed. Note that this does not prevent \TEX\ itself - from eating spaces as result of interpreting the line. For example, in - - \starttyping - before\directlua{tex.sprint("\\relax")tex.sprint(" inbetween")}after - \stoptyping - - the space before \type {in between} will be gobbled as a result of the \quote - {normal} scanning of \prm {relax}. -\stopitem -\stopitemize - -If there is a table argument instead of a list of strings, this has to be a -consecutive array of strings to print (the first non-string value will stop the -printing process). - -The optional argument sets the catcode regime, as with \type {tex.print}. This -influences the string arguments (or numbers turned into strings). - -Although this needs to be used with care, you can also pass token or node -userdata objects. These get injected into the stream. Tokens had best be valid -tokens, while nodes need to be around when they get injected. Therefore it is -important to realize the following: - -\startitemize -\startitem - When you inject a token, you need to pass a valid token userdata object. This - object will be collected by \LUA\ when it no longer is referenced. When it gets - printed to \TEX\ the token itself gets copied so there is no interference with the - \LUA\ garbage collection. You manage the object yourself. Because tokens are - actually just numbers, there is no real extra overhead at the \TEX\ end. -\stopitem -\startitem - When you inject a node, you need to pass a valid node userdata object. The - node related to the object will not be collected by \LUA\ when it no longer - is referenced. It lives on at the \TEX\ end in its own memory space. When it - gets printed to \TEX\ the node reference is used assuming that node stays - around. There is no \LUA\ garbage collection involved. Again, you manage the - object yourself. The node itself is freed when \TEX\ is done with it. -\stopitem -\stopitemize - -If you consider the last remark you might realize that we have a problem when a -printed mix of strings, tokens and nodes is reused. Inside \TEX\ the sequence -becomes a linked list of input buffers. So, \type {"123"} or \type {"\foo{123}"} -gets read and parsed on the fly, while \typ {} already is -tokenized and effectively is a token list now. A \typ {} is also -tokenized into a token list but it has a reference to a real node. Normally this -goes fine. But now assume that you store the whole lot in a macro: in that case -the tokenized node can be flushed many times. But, after the first such flush the -node is used and its memory freed. You can prevent this by using copies which is -controlled by setting \lpr {luacopyinputnodes} to a non|-|zero value. This is one -of these fuzzy areas you have to live with if you really mess with these low -level issues. - -\subsubsection{\type {tprint}} - -\libindex{tprint} - -\startfunctioncall -tex.tprint({ n, s, ...}, {...}) -\stopfunctioncall - -This function is basically a shortcut for repeated calls to \type -{tex.sprint( n, s, ...)}, once for each of the supplied argument -tables. - -\subsubsection{\type {cprint}} - -\libindex{cprint} - -This function takes a number indicating the to be used catcode, plus either a -table of strings or an argument list of strings that will be pushed into the -input stream. - -\startfunctioncall -tex.cprint( 1," 1: $&{\\foo}") tex.print("\\par") -- a lot of \bgroup s -tex.cprint( 2," 2: $&{\\foo}") tex.print("\\par") -- matching \egroup s -tex.cprint( 9," 9: $&{\\foo}") tex.print("\\par") -- all get ignored -tex.cprint(10,"10: $&{\\foo}") tex.print("\\par") -- all become spaces -tex.cprint(11,"11: $&{\\foo}") tex.print("\\par") -- letters -tex.cprint(12,"12: $&{\\foo}") tex.print("\\par") -- other characters -tex.cprint(14,"12: $&{\\foo}") tex.print("\\par") -- comment triggers -\stopfunctioncall - -% \subsubsection{\type {write}, \type {twrite}, \type {nwrite}} -\subsubsection{\type {write}} - -\libindex{write} -% \libindex{twrite} -% \libindex{nwrite} - -\startfunctioncall -tex.write( s, ...) -tex.write(
t) -\stopfunctioncall - -Each string argument is treated by \TEX\ as a special kind of input line that -makes it suitable for use as a quick way to dump information: - -\startitemize -\item All catcodes on that line are either \quote{space} (for '~') or \quote - {character} (for all others). -\item There is no \prm {endlinechar} appended. -\stopitemize - -If there is a table argument instead of a list of strings, this has to be a -consecutive array of strings to print (the first non-string value will stop the -printing process). - -% The functions \type {twrite} and \type {nwrite} can be used to write a token or -% node back to \TEX\, possibly intermixed with regular strings that will be -% tokenized. You have to make sure that you pass the right data because sometimes -% \TEX\ has expectations that need to be met. - -\stopsubsection - -\startsubsection[title={Helper functions}] - -\subsubsection{\type {round}} - -\topicindex {helpers} - -\libindex{round} - -\startfunctioncall - n = tex.round( o) -\stopfunctioncall - -Rounds \LUA\ number \type {o}, and returns a number that is in the range of a -valid \TEX\ register value. If the number starts out of range, it generates a -\quote {number too big} error as well. - -\subsubsection{\type {scale}} - -\libindex{scale} - -\startfunctioncall - n = tex.scale( o, delta) -
n = tex.scale(table o, delta) -\stopfunctioncall - -Multiplies the \LUA\ numbers \type {o} and \nod {delta}, and returns a rounded -number that is in the range of a valid \TEX\ register value. In the table -version, it creates a copy of the table with all numeric top||level values scaled -in that manner. If the multiplied number(s) are of range, it generates -\quote{number too big} error(s) as well. - -Note: the precision of the output of this function will depend on your computer's -architecture and operating system, so use with care! An interface to \LUATEX's -internal, 100\% portable scale function will be added at a later date. - -\subsubsection{\type {number} and \type {romannumeral}} - -\libindex{number} -\libindex{romannumeral} - -These are the companions to the primitives \prm {number} and \prm -{romannumeral}. They can be used like: - -\startfunctioncall -tex.print(tex.romannumeral(123)) -\stopfunctioncall - -\subsubsection{\type {fontidentifier} and \type {fontname}} - -\libindex{fontidentifier} -\libindex{fontname} - -The first one returns the name only, the second one reports the size too. - -\startfunctioncall -tex.print(tex.fontname(tex.fontname)) -tex.print(tex.fontname(tex.fontidentidier)) -\stopfunctioncall - -\subsubsection{\type {sp}} - -\libindex{sp} - -\startfunctioncall - n = tex.sp( o) - n = tex.sp( s) -\stopfunctioncall - -Converts the number \type {o} or a string \type {s} that represents an explicit -dimension into an integer number of scaled points. - -For parsing the string, the same scanning and conversion rules are used that -\LUATEX\ would use if it was scanning a dimension specifier in its \TEX|-|like -input language (this includes generating errors for bad values), expect for the -following: - -\startitemize[n] -\startitem - only explicit values are allowed, control sequences are not handled -\stopitem -\startitem - infinite dimension units (\type {fil...}) are forbidden -\stopitem -\startitem - \type {mu} units do not generate an error (but may not be useful either) -\stopitem -\stopitemize - -\subsubsection{\type {tex.getlinenumber} and \type {tex.setlinenumber}} - -\libindex{getlinenumber} -\libindex{setlinenumber} - -You can mess with the current line number: - -\startfunctioncall -local n = tex.getlinenumber() -tex.setlinenumber(n+10) -\stopfunctioncall - -which can be shortcut to: - -\startfunctioncall -tex.setlinenumber(10,true) -\stopfunctioncall - -This might be handy when you have a callback that read numbers from a file and -combines them in one line (in which case an error message probably has to refer -to the original line). Interference with \TEX's internal handling of numbers is -of course possible. - -\subsubsection{\type {error} and \type {show_context}} - -\topicindex{errors} - -\libindex{error} -\libindex{show_context} - -\startfunctioncall -tex.error( s) -tex.error( s,
help) -\stopfunctioncall - -This creates an error somewhat like the combination of \prm {errhelp} and \prm -{errmessage} would. During this error, deletions are disabled. - -The array part of the \type {help} table has to contain strings, one for each -line of error help. - -In case of an error the \type {show_context} function will show the current -context where we're at (in the expansion). - -\subsubsection{\type {run}, \type {finish}} - -\libindex{run} -\libindex{finish} - -These two functions start the interpretations and force its end. A runs normally -boils down to \TEX\ entering the so called main loop. A token is fetched and -depending on it current meaning some actions takes place. Sometimes that actions -comes immediately, sometimes more scanning is needed. Quite often tokens get -pushed back into the input. This all means that the \TEX\ scanner is constantly -pushing and popping input states, but in the end after all the action is done -returns to the main loop. - -\subsubsection{\type {runtoks}} - -Because of the fact that \TEX\ is in a complex dance of expanding, dealing with -fonts, typesetting paragraphs, messing around with boxes, building pages, and so -on, you cannot easily run a nested \TEX\ run (read nested main loop). However, -there is an option to force a local run with \type {runtoks}. The content of the -given token list register gets expanded locally after which we return to where we -triggered this expansion, at the \LUA\ end. Instead a function can get passed -that does some work. You have to make sure that at the end \TEX\ is in a sane -state and this is not always trivial. A more complex mechanism would complicate -\TEX\ itself (and probably also harm performance) so this simple local expansion -loop has to do. - -\startfunctioncall -tex.runtoks() -tex.runtoks() -\stopfunctioncall - -When the \prm {tracingnesting} parameter is set to a value larger than~2 some -information is reported about the state of the local loop. - -\subsubsection{\type {forcehmode}} - -\libindex{forcehmode} - -An example of a (possible error triggering) complication is that \TEX\ expects to -be in some state, say horizontal mode, and you have to make sure it is when you -start feeding back something from \LUA\ into \TEX. Normally a user will not run -into issues but when you start writing tokens or nodes or have a nested run there -can be situations that you need to run \type {forcehmode}. There is no recipe for -this and intercepting possible cases would weaken \LUATEX's flexibility. - -\subsubsection{\type {hashtokens}} - -\libindex{hashtokens} - -\topicindex{hash} - -\startfunctioncall -for i,v in pairs (tex.hashtokens()) do ... end -\stopfunctioncall - -Returns a list of names. This can be useful for debugging, but note that this -also reports control sequences that may be unreachable at this moment due to -local redefinitions: it is strictly a dump of the hash table. You can use \type -{token.create} to inspect properties, for instance when the \type {command} key -in a created table equals \type {123}, you have the \type {cmdname} value \type -{undefined_cs}. - -\subsubsection{\type {definefont}} - -\topicindex{fonts+defining} - -\libindex{definefont} - -\startfunctioncall -tex.definefont( csname, fontid) -tex.definefont( global, csname, fontid) -\stopfunctioncall - -Associates \type {csname} with the internal font number \type {fontid}. The -definition is global if (and only if) \type {global} is specified and true (the -setting of \type {globaldefs} is not taken into account). - -\stopsubsection - -\startsubsection[reference=luaprimitives,title={Functions for dealing with primitives}] - -\subsubsection{\type {enableprimitives}} - -\libindex{enableprimitives} - -\topicindex{initialization} -\topicindex{primitives} - -\startfunctioncall -tex.enableprimitives( prefix,
primitive names) -\stopfunctioncall - -This function accepts a prefix string and an array of primitive names. For each -combination of \quote {prefix} and \quote {name}, the \type -{tex.enableprimitives} first verifies that \quote {name} is an actual primitive -(it must be returned by one of the \type {tex.extraprimitives} calls explained -below, or part of \TEX82, or \prm {directlua}). If it is not, \type -{tex.enableprimitives} does nothing and skips to the next pair. - -But if it is, then it will construct a csname variable by concatenating the -\quote {prefix} and \quote {name}, unless the \quote {prefix} is already the -actual prefix of \quote {name}. In the latter case, it will discard the \quote -{prefix}, and just use \quote {name}. - -Then it will check for the existence of the constructed csname. If the csname is -currently undefined (note: that is not the same as \prm {relax}), it will -globally define the csname to have the meaning: run code belonging to the -primitive \quote {name}. If for some reason the csname is already defined, it -does nothing and tries the next pair. - -An example: - -\starttyping -tex.enableprimitives('LuaTeX', {'formatname'}) -\stoptyping - -will define \type {\LuaTeXformatname} with the same intrinsic meaning as the -documented primitive \lpr {formatname}, provided that the control sequences \type -{\LuaTeXformatname} is currently undefined. - -When \LUATEX\ is run with \type {--ini} only the \TEX82 primitives and \prm -{directlua} are available, so no extra primitives {\bf at all}. - -If you want to have all the new functionality available using their default -names, as it is now, you will have to add - -\starttyping -\ifx\directlua\undefined \else - \directlua {tex.enableprimitives('',tex.extraprimitives ())} -\fi -\stoptyping - -near the beginning of your format generation file. Or you can choose different -prefixes for different subsets, as you see fit. - -Calling some form of \type {tex.enableprimitives} is highly important though, -because if you do not, you will end up with a \TEX82-lookalike that can run \LUA\ -code but not do much else. The defined csnames are (of course) saved in the -format and will be available at runtime. - -\subsubsection{\type {extraprimitives}} - -\libindex{extraprimitives} - -\startfunctioncall -
t = tex.extraprimitives( s, ...) -\stopfunctioncall - -This function returns a list of the primitives that originate from the engine(s) -given by the requested string value(s). The possible values and their (current) -return values are given in the following table. In addition the somewhat special -primitives \quote{\tex{ }}, \quote{\tex {/}} and \quote{\type {-}} are defined. - -\startluacode -function document.showprimitives(tag) - for k, v in table.sortedpairs(tex.extraprimitives(tag)) do - if v ~= ' ' and v ~= "/" and v ~= "-" then - context.type(v) - context.space() - end - end -end -\stopluacode - -\starttabulate[|l|pl|] -\DB name \BC values \NC \NR -\TB -\NC tex \NC \ctxlua{document.showprimitives('tex') } \NC \NR -\NC core \NC \ctxlua{document.showprimitives('core') } \NC \NR -\NC etex \NC \ctxlua{document.showprimitives('etex') } \NC \NR -\NC luatex \NC \ctxlua{document.showprimitives('luatex') } \NC \NR -\LL -\stoptabulate - -Note that \type {luatex} does not contain \type {directlua}, as that is -considered to be a core primitive, along with all the \TEX82 primitives, so it is -part of the list that is returned from \type {'core'}. - -Running \type {tex.extraprimitives} will give you the complete list of -primitives \type {-ini} startup. It is exactly equivalent to \type -{tex.extraprimitives("etex","luatex")}. - -\subsubsection{\type {primitives}} - -\libindex{primitives} - -\startfunctioncall -
t = tex.primitives() -\stopfunctioncall - -This function returns a list of all primitives that \LUATEX\ knows about. - -\stopsubsection - -\startsubsection[title={Core functionality interfaces}] - -\subsubsection{\type {badness}} - -\libindex{badness} - -\startfunctioncall - b = tex.badness( t, s) -\stopfunctioncall - -This helper function is useful during linebreak calculations. \type {t} and \type -{s} are scaled values; the function returns the badness for when total \type {t} -is supposed to be made from amounts that sum to \type {s}. The returned number is -a reasonable approximation of \mathematics {100(t/s)^3}; - -\subsubsection{\type {tex.resetparagraph}} - -\topicindex {paragraphs+reset} - -\libindex{resetparagraph} - -This function resets the parameters that \TEX\ normally resets when a new paragraph -is seen. - -\subsubsection{\type {linebreak}} - -\topicindex {linebreaks} - -\libindex{linebreak} - -\startfunctioncall -local nodelist,
info = - tex.linebreak( listhead,
parameters) -\stopfunctioncall - -The understood parameters are as follows: - -\starttabulate[|l|l|p|] -\DB name \BC type \BC explanation \NC \NR -\TB -\NC \type{pardir} \NC string \NC \NC \NR -\NC \type{pretolerance} \NC number \NC \NC \NR -\NC \type{tracingparagraphs} \NC number \NC \NC \NR -\NC \type{tolerance} \NC number \NC \NC \NR -\NC \type{looseness} \NC number \NC \NC \NR -\NC \type{hyphenpenalty} \NC number \NC \NC \NR -\NC \type{exhyphenpenalty} \NC number \NC \NC \NR -\NC \type{pdfadjustspacing} \NC number \NC \NC \NR -\NC \type{adjdemerits} \NC number \NC \NC \NR -\NC \type{pdfprotrudechars} \NC number \NC \NC \NR -\NC \type{linepenalty} \NC number \NC \NC \NR -\NC \type{lastlinefit} \NC number \NC \NC \NR -\NC \type{doublehyphendemerits} \NC number \NC \NC \NR -\NC \type{finalhyphendemerits} \NC number \NC \NC \NR -\NC \type{hangafter} \NC number \NC \NC \NR -\NC \type{interlinepenalty} \NC number or table \NC if a table, then it is an array like \prm {interlinepenalties} \NC \NR -\NC \type{clubpenalty} \NC number or table \NC if a table, then it is an array like \prm {clubpenalties} \NC \NR -\NC \type{widowpenalty} \NC number or table \NC if a table, then it is an array like \prm {widowpenalties} \NC \NR -\NC \type{brokenpenalty} \NC number \NC \NC \NR -\NC \type{emergencystretch} \NC number \NC in scaled points \NC \NR -\NC \type{hangindent} \NC number \NC in scaled points \NC \NR -\NC \type{hsize} \NC number \NC in scaled points \NC \NR -\NC \type{leftskip} \NC glue_spec node \NC \NC \NR -\NC \type{rightskip} \NC glue_spec node \NC \NC \NR -\NC \type{parshape} \NC table \NC \NC \NR -\LL -\stoptabulate - -Note that there is no interface for \prm {displaywidowpenalties}, you have to -pass the right choice for \type {widowpenalties} yourself. - -It is your own job to make sure that \type {listhead} is a proper paragraph list: -this function does not add any nodes to it. To be exact, if you want to replace -the core line breaking, you may have to do the following (when you are not -actually working in the \cbk {pre_linebreak_filter} or \cbk {linebreak_filter} -callbacks, or when the original list starting at listhead was generated in -horizontal mode): - -\startitemize -\startitem - add an \quote {indent box} and perhaps a \nod {local_par} node at the start - (only if you need them) -\stopitem -\startitem - replace any found final glue by an infinite penalty (or add such a penalty, - if the last node is not a glue) -\stopitem -\startitem - add a glue node for the \prm {parfillskip} after that penalty node -\stopitem -\startitem - make sure all the \type {prev} pointers are OK -\stopitem -\stopitemize - -The result is a node list, it still needs to be vpacked if you want to assign it -to a \prm {vbox}. The returned \type {info} table contains four values that are -all numbers: - -\starttabulate[|l|p|] -\DB name \BC explanation \NC \NR -\TB -\NC prevdepth \NC depth of the last line in the broken paragraph \NC \NR -\NC prevgraf \NC number of lines in the broken paragraph \NC \NR -\NC looseness \NC the actual looseness value in the broken paragraph \NC \NR -\NC demerits \NC the total demerits of the chosen solution \NC \NR -\LL -\stoptabulate - -Note there are a few things you cannot interface using this function: You cannot -influence font expansion other than via \type {pdfadjustspacing}, because the -settings for that take place elsewhere. The same is true for hbadness and hfuzz -etc. All these are in the \type {hpack} routine, and that fetches its own -variables via globals. - -\subsubsection{\type {shipout}} - -\topicindex {shipout} - -\libindex{shipout} - -\startfunctioncall -tex.shipout( n) -\stopfunctioncall - -Ships out box number \type {n} to the output file, and clears the box register. - -\subsubsection{\type {getpagestate}} - -\topicindex {pages} - -\libindex{getpagestate} - -This helper reports the current page state: \type {empty}, \type {box_there} or -\type {inserts_only} as integer value. - -\subsubsection{\type {getlocallevel}} - -\topicindex {nesting} - -\libindex{getlocallevel} - -This integer reports the current level of the local loop. It's only useful for -debugging and the (relative state) numbers can change with the implementation. - -\stopsubsection - -\startsubsection[title={Randomizers}] - -\libindex{lua_math_random} -\libindex{lua_math_randomseed} -\libindex{init_rand} -\libindex{normal_rand} -\libindex{uniform_rand} -\libindex{uniformdeviate} - -For practical reasons \LUATEX\ has its own random number generator. The original -\LUA\ random function is available as \typ {tex.lua_math_random}. You can -initialize with a new seed with \type {init_rand} (\typ {lua_math_randomseed} is -equivalent to this one. - -There are three generators: \type {normal_rand} (no argument is used), \type -{uniform_rand} (takes a number that will get rounded before being used) and \type -{uniformdeviate} which behaves like the primitive and expects a scaled integer, so - -\startfunctioncall -tex.print(tex.uniformdeviate(65536)/65536) -\stopfunctioncall - -will give a random number between zero and one. - -\stopsubsection - -\startsubsection[reference=synctex,title={Functions related to synctex}] - -\topicindex {synctex} - -\libindex{set_synctex_mode} \libindex{get_synctex_mode} -\libindex{set_synctex_no_files} -\libindex{set_synctex_tag} \libindex{get_synctex_tag} \libindex{force_synctex_tag} -\libindex{set_synctex_line} \libindex{get_synctex_line} \libindex{force_synctex_line} - -The next helpers only make sense when you implement your own synctex logic. Keep in -mind that the library used in editors assumes a certain logic and is geared for -plain and \LATEX, so after a decade users expect a certain behaviour. - -\starttabulate[|l|p|] -\DB name \BC explanation \NC \NR -\TB -\NC \type{set_synctex_mode} \NC \type {0} is the default and used normal synctex - logic, \type {1} uses the values set by the next - helpers while \type {2} also sets these for glyph - nodes; \type{3} sets glyphs and glue and \type {4} - sets only glyphs \NC \NR -\NC \type{set_synctex_tag} \NC set the current tag (file) value (obeys save stack) \NC \NR -\NC \type{set_synctex_line} \NC set the current line value (obeys save stack) \NC \NR -\NC \type{set_synctex_no_files} \NC disable synctex file logging \NC \NR -\NC \type{get_synctex_mode} \NC returns the current mode (for values see above) \NC \NR -\NC \type{get_synctex_tag} \NC get the currently set value of tag (file) \NC \NR -\NC \type{get_synctex_line} \NC get the currently set value of line \NC \NR -\NC \type{force_synctex_tag} \NC overload the tag (file) value (\type {0} resets) \NC \NR -\NC \type{force_synctex_line} \NC overload the line value (\type {0} resets) \NC \NR -\LL -\stoptabulate - -The last one is somewhat special. Due to the way files are registered in \SYNCTEX\ we need -to explicitly disable that feature if we provide our own alternative if we want to avoid -that overhead. Passing a value of 1 disables registering. - -\stopsubsection - -\stopsection - -\startsection[title={The \type {texconfig} table},reference=texconfig][library=texconfig] - -\topicindex{libraries+\type{texconfig}} - -\topicindex {configuration} - -This is a table that is created empty. A startup \LUA\ script could -fill this table with a number of settings that are read out by -the executable after loading and executing the startup file. - -\starttabulate[|l|l|l|p|] -\DB key \BC type \BC default \BC explanation \NC \NR -\TB -\NC \type{kpse_init} \NC boolean \NC true -\NC - \type {false} totally disables \KPATHSEA\ initialisation, and enables - interpretation of the following numeric key--value pairs. (only ever unset - this if you implement {\it all\/} file find callbacks!) -\NC \NR -\NC - \type{shell_escape} \NC string \NC \type {'f'} \NC Use \type {'y'} or \type - {'t'} or \type {'1'} to enable \type {\write18} unconditionally, \type {'p'} - to enable the commands that are listed in \type {shell_escape_commands} -\NC \NR -\NC - shell_escape_commands \NC string \NC \NC Comma-separated list of command - names that may be executed by \type {\write18} even if \type {shell_escape} - is set to \type {'p'}. Do {\it not\/} use spaces around commas, separate any - required command arguments by using a space, and use the \ASCII\ double quote - (\type {"}) for any needed argument or path quoting -\NC \NR -\NC \type{string_vacancies} \NC number \NC 75000 \NC cf.\ web2c docs \NC \NR -\NC \type{pool_free} \NC number \NC 5000 \NC cf.\ web2c docs \NC \NR -\NC \type{max_strings} \NC number \NC 15000 \NC cf.\ web2c docs \NC \NR -\NC \type{strings_free} \NC number \NC 100 \NC cf.\ web2c docs \NC \NR -\NC \type{nest_size} \NC number \NC 50 \NC cf.\ web2c docs \NC \NR -\NC \type{max_in_open} \NC number \NC 15 \NC cf.\ web2c docs \NC \NR -\NC \type{param_size} \NC number \NC 60 \NC cf.\ web2c docs \NC \NR -\NC \type{save_size} \NC number \NC 4000 \NC cf.\ web2c docs \NC \NR -\NC \type{stack_size} \NC number \NC 300 \NC cf.\ web2c docs \NC \NR -\NC \type{dvi_buf_size} \NC number \NC 16384 \NC cf.\ web2c docs \NC \NR -\NC \type{error_line} \NC number \NC 79 \NC cf.\ web2c docs \NC \NR -\NC \type{half_error_line} \NC number \NC 50 \NC cf.\ web2c docs \NC \NR -\NC \type{max_print_line} \NC number \NC 79 \NC cf.\ web2c docs \NC \NR -\NC \type{hash_extra} \NC number \NC 0 \NC cf.\ web2c docs \NC \NR -\NC \type{pk_dpi} \NC number \NC 72 \NC cf.\ web2c docs \NC \NR -\NC \type{trace_file_names} \NC boolean \NC true -\NC - \type {false} disables \TEX's normal file open|-|close feedback (the - assumption is that callbacks will take care of that) -\NC \NR -\NC \type{file_line_error} \NC boolean \NC false -\NC - do \type {file:line} style error messages -\NC \NR -\NC \type{halt_on_error} \NC boolean \NC false -\NC - abort run on the first encountered error -\NC \NR -\NC \type{formatname} \NC string \NC -\NC - if no format name was given on the command line, this key will be tested first - instead of simply quitting -\NC \NR -\NC \type{jobname} \NC string \NC -\NC - if no input file name was given on the command line, this key will be tested - first instead of simply giving up -\NC \NR -\LL -\stoptabulate - -Note: the numeric values that match web2c parameters are only used if \type -{kpse_init} is explicitly set to \type {false}. In all other cases, the normal -values from \type {texmf.cnf} are used. - -\stopsection - -\startsection[title={The \type {texio} library}][library=texio] - -\topicindex{libraries+\type{texio}} -\topicindex{\IO} - -This library takes care of the low|-|level I/O interface: writing to the log file -and|/|or console. - -\startsubsection[title={\type {write}}] - -\libindex{write} - -\startfunctioncall -texio.write( target, s, ...) -texio.write( s, ...) -\stopfunctioncall - -Without the \type {target} argument, writes all given strings to the same -location(s) \TEX\ writes messages to at this moment. If \prm {batchmode} is in -effect, it writes only to the log, otherwise it writes to the log and the -terminal. The optional \type {target} can be one of three possibilities: \type -{term}, \type {log} or \type {term and log}. - -Note: If several strings are given, and if the first of these strings is or might -be one of the targets above, the \type {target} must be specified explicitly to -prevent \LUA\ from interpreting the first string as the target. - -\stopsubsection - -\startsubsection[title={\type {write_nl}}] - -\libindex{write_nl} - -\startfunctioncall -texio.write_nl( target, s, ...) -texio.write_nl( s, ...) -\stopfunctioncall - -This function behaves like \type {texio.write}, but make sure that the given -strings will appear at the beginning of a new line. You can pass a single empty -string if you only want to move to the next line. - -\stopsubsection - -\startsubsection[title={\type {setescape}}] - -\libindex{setescape} - -You can disable \type {^^} escaping of control characters by passing a value of -zero. - -\stopsubsection - -\startsubsection[title={\type {closeinput}}] - -\libindex{closeinput} - -This function that should be used with care. It acts as \prm {endinput} but at -the \LUA\ end. You can use it to (sort of) force a jump back to \TEX. Normally a -\LUA\ will just collect prints and at the end bump an input level and flush these -prints. This function can help you stay at the current level but you need to know -what you're doing (or more precise: what \TEX\ is doing with input). - -\stopsubsection - -\stopsection - -\startsection[title={The \type {token} library}][library=token] - -\startsubsection[title={The scanner}] - -\topicindex{libraries+\type{token}} -\topicindex{tokens} - -\libindex{scan_keyword} -\libindex{scan_keywordcs} -\libindex{scan_int} -\libindex{scan_real} -\libindex{scan_float} -\libindex{scan_dimen} -\libindex{scan_glue} -\libindex{scan_toks} -\libindex{scan_code} -\libindex{scan_string} -\libindex{scan_argument} -\libindex{scan_word} -\libindex{scan_csname} -\libindex{scan_list} - -The token library provides means to intercept the input and deal with it at the -\LUA\ level. The library provides a basic scanner infrastructure that can be used -to write macros that accept a wide range of arguments. This interface is on -purpose kept general and as performance is quite ok. One can build additional -parsers without too much overhead. It's up to macro package writers to see how -they can benefit from this as the main principle behind \LUATEX\ is to provide a -minimal set of tools and no solutions. The scanner functions are probably the -most intriguing. - -\starttabulate[|l|l|p|] -\DB function \BC argument \BC result \NC \NR -\TB -\NC \type{scan_keyword} \NC string \NC returns true if the given keyword is gobbled; as with - the regular \TEX\ keyword scanner this is case insensitive - (and \ASCII\ based) \NC \NR -\NC \type{scan_keywordcs} \NC string \NC returns true if the given keyword is gobbled; this variant - is case sensitive and also suitable for \UTF8 \NC \NR -\NC \type{scan_int} \NC \NC returns an integer \NC \NR -\NC \type{scan_real} \NC \NC returns a number from e.g.\ \type {1}, \type {1.1}, \type {.1} with optional collapsed signs \NC \NR -\NC \type{scan_float} \NC \NC returns a number from e.g.\ \type {1}, \type {1.1}, \type {.1}, \type {1.1E10}, , \type {.1e-10} with optional collapsed signs \NC \NR -\NC \type{scan_dimen} \NC infinity, mu-units \NC returns a number representing a dimension and or two numbers being the filler and order \NC \NR -\NC \type{scan_glue} \NC mu-units \NC returns a glue spec node \NC \NR -\NC \type{scan_toks} \NC definer, expand \NC returns a table of tokens tokens \NC \NR -\NC \type{scan_code} \NC bitset \NC returns a character if its category is in the given bitset (representing catcodes) \NC \NR -\NC \type{scan_string} \NC \NC returns a string given between \type {{}}, as \type {\macro} or as sequence of characters with catcode 11 or 12 \NC \NR -\NC \type{scan_argument} \NC \NC this one is simular to \type {scanstring} but also accepts a \type {\cs} - (which then get expanded) \NC \NR -\NC \type{scan_word} \NC \NC returns a sequence of characters with catcode 11 or 12 as string \NC \NR -\NC \type{scan_csname} \NC \NC returns \type {foo} after scanning \type {\foo} \NC \NR -\NC \type{scan_list} \NC \NC picks up a box specification and returns a \type {[h|v]list} node \NC \NR -\LL -\stoptabulate - -The scanners can be considered stable apart from the one scanning for a token. -The \type {scan_code} function takes an optional number, the \type {keyword} -function a normal \LUA\ string. The \type {infinity} boolean signals that we also -permit \type {fill} as dimension and the \type {mu-units} flags the scanner that -we expect math units. When scanning tokens we can indicate that we are defining a -macro, in which case the result will also provide information about what -arguments are expected and in the result this is separated from the meaning by a -separator token. The \type {expand} flag determines if the list will be expanded. - -The string scanner scans for something between curly braces and expands on the -way, or when it sees a control sequence it will return its meaning. Otherwise it -will scan characters with catcode \type {letter} or \type {other}. So, given the -following definition: - -\startbuffer -\def\bar{bar} -\def\foo{foo-\bar} -\stopbuffer - -\typebuffer \getbuffer - -we get: - -\starttabulate[|l|Tl|l|] -\DB name \BC result \NC \NR -\TB -\NC \type {\directlua{token.scan_string()}{foo}} \NC \directlua{context("{\\red\\type {"..token.scan_string().."}}")} {foo} \NC full expansion \NC \NR -\NC \type {\directlua{token.scan_string()}foo} \NC \directlua{context("{\\red\\type {"..token.scan_string().."}}")} foo \NC letters and others \NC \NR -\NC \type {\directlua{token.scan_string()}\foo} \NC \directlua{context("{\\red\\type {"..token.scan_string().."}}")}\foo \NC meaning \NC \NR -\LL -\stoptabulate - -The \type {\foo} case only gives the meaning, but one can pass an already -expanded definition (\prm {edef}'d). In the case of the braced variant one can of -course use the \prm {detokenize} and \prm {unexpanded} primitives since there we -do expand. - -The \type {scan_word} scanner can be used to implement for instance a number scanner: - -\starttyping -function token.scan_number(base) - return tonumber(token.scan_word(),base) -end -\stoptyping - -This scanner accepts any valid \LUA\ number so it is a way to pick up floats -in the input. - -You can use the \LUA\ interface as follows: - -\starttyping -\directlua { - function mymacro(n) - ... - end -} - -\def\mymacro#1{% - \directlua { - mymacro(\number\dimexpr#1) - }% -} - -\mymacro{12pt} -\mymacro{\dimen0} -\stoptyping - -You can also do this: - -\starttyping -\directlua { - function mymacro() - local d = token.scan_dimen() - ... - end -} - -\def\mymacro{% - \directlua { - mymacro() - }% -} - -\mymacro 12pt -\mymacro \dimen0 -\stoptyping - -It is quite clear from looking at the code what the first method needs as -argument(s). For the second method you need to look at the \LUA\ code to see what -gets picked up. Instead of passing from \TEX\ to \LUA\ we let \LUA\ fetch from -the input stream. - -In the first case the input is tokenized and then turned into a string, then it -is passed to \LUA\ where it gets interpreted. In the second case only a function -call gets interpreted but then the input is picked up by explicitly calling the -scanner functions. These return proper \LUA\ variables so no further conversion -has to be done. This is more efficient but in practice (given what \TEX\ has to -do) this effect should not be overestimated. For numbers and dimensions it saves -a bit but for passing strings conversion to and from tokens has to be done anyway -(although we can probably speed up the process in later versions if needed). - -\stopsubsection - -\startsubsection[title= {Picking up one token}] - -\libindex {get_next} -\libindex {scan_token} -\libindex {expand} - -The scanners look for a sequence. When you want to pick up one token from the -input you use \type {get_next}. This creates a token with the (low level) -properties as discussed next. This token is just the next one. If you want to -enforce expansion first you can use \type {scan_token}. Internally tokens are -characterized by a number that packs a lot of information. In order to access -the bits of information a token is wrapped in a userdata object. - -The \type {expand} function will trigger expansion of the next token in the -input. This can be quite unpredictable but when you call it you probably know -enough about \TEX\ not to be too worried about that. It basically is a call to -the internal expand related function. - -\stopsubsection - -\startsubsection[title={Creating tokens}] - -\libindex{create} -\libindex{new} - -\libindex{is_defined} -\libindex{is_token} -\libindex{biggest_char} - -\libindex{commands} -\libindex{command_id} - -\libindex{get_command} -\libindex{get_cmdname} -\libindex{get_csname} -\libindex{get_id} -\libindex{get_active} -\libindex{get_expandable} -\libindex{get_protected} -\libindex{get_mode} -\libindex{get_index} -\libindex{get_tok} - -\libindex{get_next} - -The creator function can be used as follows: - -\starttyping -local t = token.create("relax") -\stoptyping - -This gives back a token object that has the properties of the \prm {relax} -primitive. The possible properties of tokens are: - -\starttabulate[|l|p|] -\DB name \BC explanation \NC \NR -\TB -\NC \type {command} \NC a number representing the internal command number \NC \NR -\NC \type {cmdname} \NC the type of the command (for instance the catcode in case of a - character or the classifier that determines the internal - treatment \NC \NR -\NC \type {csname} \NC the associated control sequence (if applicable) \NC \NR -\NC \type {id} \NC the unique id of the token \NC \NR -\NC \type {tok} \NC the full token number as stored in \TEX \NC \NR -\NC \type {active} \NC a boolean indicating the active state of the token \NC \NR -\NC \type {expandable} \NC a boolean indicating if the token (macro) is expandable \NC \NR -\NC \type {protected} \NC a boolean indicating if the token (macro) is protected \NC \NR -\NC \type {mode} \NC a number either representing a character or another entity \NC \NR -\NC \type {index} \NC a number running from 0x0000 upto 0xFFFF indicating a \TEX\ register index \NC \NR -\LL -\stoptabulate - -Alternatively you can use a getter \type {get_} to access a property -of a token. - -The numbers that represent a catcode are the same as in \TEX\ itself, so using -this information assumes that you know a bit about \TEX's internals. The other -numbers and names are used consistently but are not frozen. So, when you use them -for comparing you can best query a known primitive or character first to see the -values. - -You can ask for a list of commands: - -\starttyping -local t = token.commands() -\stoptyping - -The id of a token class can be queried as follows: - -\starttyping -local id = token.command_id("math_shift") -\stoptyping - -If you really know what you're doing you can create character tokens by not -passing a string but a number: - -\starttyping -local letter_x = token.create(string.byte("x")) -local other_x = token.create(string.byte("x"),12) -\stoptyping - -Passing weird numbers can give side effects so don't expect too much help with -that. As said, you need to know what you're doing. The best way to explore the -way these internals work is to just look at how primitives or macros or \prm -{chardef}'d commands are tokenized. Just create a known one and inspect its -fields. A variant that ignores the current catcode table is: - -\starttyping -local whatever = token.new(123,12) -\stoptyping - -You can test if a control sequence is defined with \type {is_defined}, which -accepts a string and returns a boolean: - -\starttyping -local okay = token.is_defined("foo") -\stoptyping - -The largest character possible is returned by \type {biggest_char}, just in case you -need to know that boundary condition. - -\stopsubsection - -\startsubsection[title={Macros}] - -\topicindex {macros} - -\libindex{set_macro} -\libindex{get_macro} -\libindex{get_meaning} -\libindex{set_char} -\libindex{set_lua} -\libindex{get_functions_table} - -The \type {set_macro} function can get upto 4 arguments: - -\starttyping -set_macro("csname","content") -set_macro("csname","content","global") -set_macro("csname") -\stoptyping - -You can pass a catcodetable identifier as first argument: - -\starttyping -set_macro(catcodetable,"csname","content") -set_macro(catcodetable,"csname","content","global") -set_macro(catcodetable,"csname") -\stoptyping - -The results are like: - -\starttyping - \def\csname{content} -\gdef\csname{content} - \def\csname{} -\stoptyping - -The \type {get_macro} function can be used to get the content of a macro while -the \type {get_meaning} function gives the meaning including the argument -specification (as usual in \TEX\ separated by \type {->}). - -The \type {set_char} function can be used to do a \prm {chardef} at the -\LUA\ end, where invalid assignments are silently ignored: - -\starttyping -set_char("csname",number) -set_char("csname",number,"global") -\stoptyping - -A special one is the following: - -\starttyping -set_lua("mycode",id) -set_lua("mycode",id,"global","protected") -\stoptyping - -This creates a token that refers to a \LUA\ function with an entry in the table -that you can access with \type {lua.get_functions_table}. It is the companion -to \lpr {luadef}. - -\stopsubsection - -\startsubsection[title={Pushing back}] - -\libindex{get_next} -\libindex{put_next} - -There is a (for now) experimental putter: - -\starttyping -local t1 = token.get_next() -local t2 = token.get_next() -local t3 = token.get_next() -local t4 = token.get_next() --- watch out, we flush in sequence -token.put_next { t1, t2 } --- but this one gets pushed in front -token.put_next ( t3, t4 ) -\stoptyping - -When we scan \type {wxyz!} we get \type {yzwx!} back. The argument is either a table -with tokens or a list of tokens. The \type {token.expand} function will trigger -expansion but what happens really depends on what you're doing where. - -\stopsubsection - -\startsubsection[title={Nota bene}] - -When scanning for the next token you need to keep in mind that we're not scanning -like \TEX\ does: expanding, changing modes and doing things as it goes. When we -scan with \LUA\ we just pick up tokens. Say that we have: - -\starttyping -\bar -\stoptyping - -but \type {\bar} is undefined. Normally \TEX\ will then issue an error message. -However, when we have: - -\starttyping -\def\foo{\bar} -\stoptyping - -We get no error, unless we expand \type {\foo} while \type {\bar} is still -undefined. What happens is that as soon as \TEX\ sees an undefined macro it will -create a hash entry and when later it gets defined that entry will be reused. So, -\type {\bar} really exists but can be in an undefined state. - -\startbuffer[demo] -bar : \directlua{tex.print(token.scan_csname())}\bar -foo : \directlua{tex.print(token.scan_csname())}\foo -myfirstbar : \directlua{tex.print(token.scan_csname())}\myfirstbar -\stopbuffer - -\startlines -\getbuffer[demo] -\stoplines - -This was entered as: - -\typebuffer[demo] - -The reason that you see \type {bar} reported and not \type {myfirstbar} is that -\type {\bar} was already used in a previous paragraph. - -If we now say: - -\startbuffer -\def\foo{} -\stopbuffer - -\typebuffer \getbuffer - -we get: - -\startlines -\getbuffer[demo] -\stoplines - -And if we say - -\startbuffer -\def\foo{\bar} -\stopbuffer - -\typebuffer \getbuffer - -we get: - -\startlines -\getbuffer[demo] -\stoplines - -When scanning from \LUA\ we are not in a mode that defines (undefined) macros at -all. There we just get the real primitive undefined macro token. - -\startbuffer -\directlua{local t = token.get_next() tex.print(t.id.." "..t.tok)}\myfirstbar -\directlua{local t = token.get_next() tex.print(t.id.." "..t.tok)}\mysecondbar -\directlua{local t = token.get_next() tex.print(t.id.." "..t.tok)}\mythirdbar -\stopbuffer - -\startlines -\getbuffer -\stoplines - -This was generated with: - -\typebuffer - -So, we do get a unique token because after all we need some kind of \LUA\ object -that can be used and garbage collected, but it is basically the same one, -representing an undefined control sequence. - -\stopsubsection - -\stopsection - -\startsection[title={The \type {kpse} library}][library=kpse] - -\topicindex{libraries+\type{kpse}} - -This library provides two separate, but nearly identical interfaces to the -\KPATHSEA\ file search functionality: there is a \quote {normal} procedural -interface that shares its kpathsea instance with \LUATEX\ itself, and an object -oriented interface that is completely on its own. - -\startsubsection[title={\type {set_program_name} and \type {new}}] - -\libindex{set_program_name} -\libindex{default_texmfcnf} -\libindex{new} - -The way the library looks up variables is driven by the \type {texmf.cmf} file -where the currently set program name acts as filter. You can check what file is -used by with \type {default_texmfcnf}. - -Before the search library can be used at all, its database has to be initialized. -There are three possibilities, two of which belong to the procedural interface. - -First, when \LUATEX\ is used to typeset documents, this initialization happens -automatically and the \KPATHSEA\ executable and program names are set to \type -{luatex} (that is, unless explicitly prohibited by the user's startup script. -See~\in {section} [init] for more details). - -Second, in \TEXLUA\ mode, the initialization has to be done explicitly via the -\type {kpse.set_program_name} function, which sets the \KPATHSEA\ executable -(and optionally program) name. - -\startfunctioncall -kpse.set_program_name( name) -kpse.set_program_name( name, progname) -\stopfunctioncall - -The second argument controls the use of the \quote {dotted} values in the \type -{texmf.cnf} configuration file, and defaults to the first argument. - -Third, if you prefer the object oriented interface, you have to call a different -function. It has the same arguments, but it returns a userdata variable. - -\startfunctioncall -local kpathsea = kpse.new( name) -local kpathsea = kpse.new( name, progname) -\stopfunctioncall - -Apart from these two functions, the calling conventions of the interfaces are -identical. Depending on the chosen interface, you either call \type -{kpse.find_file} or \type {kpathsea:find_file}, with identical arguments and -return values. - -\stopsubsection - -\startsubsection[title={\type {record_input_file} and \type {record_output_file}}] - -\topicindex {files+recording} - -\libindex{record_input_file} -\libindex{record_output_file} - -These two function can be used to register used files. Because callbacks can load -files themselves you might need these helpers (if you use recording at all). - -\startfunctioncall -kpse.record_input_file( name) -kpse.record_output_file( name) -\stopfunctioncall - -\stopsubsection - -\startsubsection[title={\type {find_file}}] - -\topicindex {files+finding} - -\libindex {find_file} - -The most often used function in the library is \type {find_file}: - -\startfunctioncall - f = kpse.find_file( filename) - f = kpse.find_file( filename, ftype) - f = kpse.find_file( filename, mustexist) - f = kpse.find_file( filename, ftype, mustexist) - f = kpse.find_file( filename, ftype, dpi) -\stopfunctioncall - -Arguments: - -\startitemize[intro] - -\sym{filename} - -the name of the file you want to find, with or without extension. - -\sym{ftype} - -maps to the \type {-format} argument of \KPSEWHICH. The supported \type {ftype} -values are the same as the ones supported by the standalone \type {kpsewhich} -program: \startluacode - local list = { - "afm", - "base", - "bib", - "bitmap font", - "bst", - "cid maps", - "clua", - "cmap files", - "cnf", - "cweb", - "dvips config", - "enc files", - "fmt", - "font feature files", - "gf", - "graphic|/|figure", - "ist", - "lig files", - "ls-R", - "lua", - "map", - "mem", - "MetaPost support", - "mf", - "mfpool", - "mft", - "misc fonts", - "mlbib", - "mlbst", - "mp", - "mppool", - "ocp", - "ofm", - "opentype fonts", - "opl", - "other binary files", - "other text files", - "otp", - "ovf", - "ovp", - "pdftex config", - "pk", - "PostScript header", - "subfont definition files", - "tex", - "TeX system documentation", - "TeX system sources", - "texmfscripts", - "texpool", - "tfm", - "Troff fonts", - "truetype fonts", - "type1 fonts", - "type42 fonts", - "vf", - "web", - "web2c files", - } - table.sort(list) - context("{\\tttf \letterpercent, t}",list) -\stopluacode - -The default type is \type {tex}. Note: this is different from \KPSEWHICH, which -tries to deduce the file type itself from looking at the supplied extension. - -\sym{mustexist} - -is similar to \KPSEWHICH's \type {-must-exist}, and the default is \type {false}. -If you specify \type {true} (or a non|-|zero integer), then the \KPSE\ library -will search the disk as well as the \type {ls-R} databases. - -\sym{dpi} - -This is used for the size argument of the formats \type {pk}, \type {gf}, and -\type {bitmap font}. \stopitemize - -\stopsubsection - -\startsubsection[title={\type {lookup}}] - -\libindex{lookup} - -A more powerful (but slower) generic method for finding files is also available. -It returns a string for each found file. - -\startfunctioncall - f, ... = kpse.lookup( filename,
options) -\stopfunctioncall - -The options match commandline arguments from \type {kpsewhich}: - -\starttabulate[|l|l|p|] -\DB key \BC type \BC explanation \NC \NR -\TB -\NC \type{debug} \NC number \NC set debugging flags for this lookup\NC \NR -\NC \type{format} \NC string \NC use specific file type (see list above)\NC \NR -\NC \type{dpi} \NC number \NC use this resolution for this lookup; default 600\NC \NR -\NC \type{path} \NC string \NC search in the given path\NC \NR -\NC \type{all} \NC boolean \NC output all matches, not just the first\NC \NR -\NC \type{mustexist} \NC boolean \NC search the disk as well as ls-R if necessary\NC \NR -\NC \type{mktexpk} \NC boolean \NC disable/enable mktexpk generation for this lookup\NC \NR -\NC \type{mktextex} \NC boolean \NC disable/enable mktextex generation for this lookup\NC \NR -\NC \type{mktexmf} \NC boolean \NC disable/enable mktexmf generation for this lookup\NC \NR -\NC \type{mktextfm} \NC boolean \NC disable/enable mktextfm generation for this lookup\NC \NR -\NC \type{subdir} \NC string - or table \NC only output matches whose directory part - ends with the given string(s) \NC \NR -\LL -\stoptabulate - -\stopsubsection - -\startsubsection[title={\type {init_prog}}] - -\topicindex {initialization+bitmaps} - -\libindex{init_prog} - -Extra initialization for programs that need to generate bitmap fonts. - -\startfunctioncall -kpse.init_prog( prefix, base_dpi, mfmode) -kpse.init_prog( prefix, base_dpi, mfmode, fallback) -\stopfunctioncall - -\stopsubsection - -\startsubsection[title={\type {readable_file}}] - -\libindex{readable_file} - -Test if an (absolute) file name is a readable file. - -\startfunctioncall - f = kpse.readable_file( name) -\stopfunctioncall - -The return value is the actual absolute filename you should use, because the disk -name is not always the same as the requested name, due to aliases and -system|-|specific handling under e.g.\ \MSDOS. Returns \type {nil} if the file -does not exist or is not readable. - -\stopsubsection - -\startsubsection[title={\type {expand_path}}] - -\libindex{expand_path} - -Like kpsewhich's \type {-expand-path}: - -\startfunctioncall - r = kpse.expand_path( s) -\stopfunctioncall - -\stopsubsection - -\startsubsection[title={\type {expand_var}}] - -\libindex{expand_var} - -Like kpsewhich's \type {-expand-var}: - -\startfunctioncall - r = kpse.expand_var( s) -\stopfunctioncall - -\stopsubsection - -\startsubsection[title={\type {expand_braces}}] - -\libindex{expand_braces} - -Like kpsewhich's \type {-expand-braces}: - -\startfunctioncall - r = kpse.expand_braces( s) -\stopfunctioncall - -\stopsubsection - -\startsubsection[title={\type {show_path}}] - -\libindex{show_path} - -Like kpsewhich's \type {-show-path}: - -\startfunctioncall - r = kpse.show_path( ftype) -\stopfunctioncall - -\stopsubsection - -\startsubsection[title={\type {var_value}}] - -\libindex{var_value} - -Like kpsewhich's \type {-var-value}: - -\startfunctioncall - r = kpse.var_value( s) -\stopfunctioncall - -\stopsubsection - -\startsubsection[title={\type {version}}] - -\libindex{version} - -Returns the kpathsea version string. - -\startfunctioncall - r = kpse.version() -\stopfunctioncall - -\stopsubsection - -\stopsection - -\stopchapter - -\stopcomponent +% language=uk + +% lua.newtable + +\environment luatex-style + +\startcomponent luatex-tex + +\startchapter[reference=tex,title={The \TEX\ related libraries}] + +\startsection[title={The \type {lua} library}][library=lua] + +\startsubsection[title={Version information}] + +\topicindex{libraries+\type{lua}} +\topicindex{version} + +\libindex{version} + +This library contains one read|-|only item: + +\starttyping + s = lua.version +\stoptyping + +This returns the \LUA\ version identifier string. The value is currently +\directlua {tex.print(lua.version)}. + +\stopsubsection + +\startsubsection[title={Bytecode registers}] + +\topicindex{bytecodes} +\topicindex{registers+bytecodes} + +\libindex{bytecode} +\libindex{setbytecode} +\libindex{getbytecode} + +\LUA\ registers can be used to store \LUA\ code chunks. The accepted values for +assignments are functions and \type {nil}. Likewise, the retrieved value is +either a function or \type {nil}. + +\starttyping +lua.bytecode[ n] = f +lua.bytecode[ n]() +\stoptyping + +The contents of the \type {lua.bytecode} array is stored inside the format file +as actual \LUA\ bytecode, so it can also be used to preload \LUA\ code. The +function must not contain any upvalues. The associated function calls are: + +\startfunctioncall + f = lua.getbytecode( n) +lua.setbytecode( n, f) +\stopfunctioncall + +Note: Since a \LUA\ file loaded using \type {loadfile(filename)} is essentially +an anonymous function, a complete file can be stored in a bytecode register like +this: + +\startfunctioncall +lua.bytecode[n] = loadfile(filename) +\stopfunctioncall + +Now all definitions (functions, variables) contained in the file can be +created by executing this bytecode register: + +\startfunctioncall +lua.bytecode[n]() +\stopfunctioncall + +Note that the path of the file is stored in the \LUA\ bytecode to be used in +stack backtraces and therefore dumped into the format file if the above code is +used in \INITEX. If it contains private information, i.e. the user name, this +information is then contained in the format file as well. This should be kept in +mind when preloading files into a bytecode register in \INITEX. + +\stopsubsection + +\startsubsection[title={Chunk name registers}] + +\libindex{name} +\libindex{setluaname} +\libindex{getluaname} + +There is an array of 65536 (0--65535) potential chunk names for use with the +\prm {directlua} and \lpr {latelua} primitives. + +\startfunctioncall +lua.name[ n] = s + s = lua.name[ n] +\stopfunctioncall + +If you want to unset a \LUA\ name, you can assign \type {nil} to it. The function +accessors are: + +\startfunctioncall +lua.setluaname( s, n]) + s = lua.getluaname( n) +\stopfunctioncall + +\stopsubsection + +\startsubsection[title={Introspection}] + +\libindex{getstacktop} +\libindex{getcalllevel} + +The \type {getstacktop} and\type {getcalllevel} functions return numbers +indicating how much nesting is going on. They are only of use as breakpoints when +checking some mechanism going haywire. + +\stopsubsection + +\stopsection + +\startsection[title={The \type {status} library}][library=status] + +\topicindex{libraries+\type{status}} + +\libindex{list} +\libindex{resetmessages} +\libindex{setexitcode} + +This contains a number of run|-|time configuration items that you may find useful +in message reporting, as well as an iterator function that gets all of the names +and values as a table. + +\startfunctioncall +
info = status.list() +\stopfunctioncall + +The keys in the table are the known items, the value is the current value. Almost +all of the values in \type {status} are fetched through a metatable at run|-|time +whenever they are accessed, so you cannot use \type {pairs} on \type {status}, +but you {\it can\/} use \type {pairs} on \type {info}, of course. If you do not +need the full list, you can also ask for a single item by using its name as an +index into \type {status}. The current list is: + +\starttabulate[|l|p|] +\DB key \BC explanation \NC \NR +\TB +\NC \type{banner} \NC terminal display banner \NC \NR +\NC \type{best_page_break} \NC the current best break (a node) \NC \NR +\NC \type{buf_size} \NC current allocated size of the line buffer \NC \NR +\NC \type{callbacks} \NC total number of executed callbacks so far \NC \NR +\NC \type{cs_count} \NC number of control sequences \NC \NR +\NC \type{dest_names_size} \NC \PDF\ destination table size \NC \NR +\NC \type{dvi_gone} \NC written \DVI\ bytes \NC \NR +\NC \type{dvi_ptr} \NC not yet written \DVI\ bytes \NC \NR +\NC \type{dyn_used} \NC token (multi|-|word) memory in use \NC \NR +\NC \type{filename} \NC name of the current input file \NC \NR +\NC \type{fix_mem_end} \NC maximum number of used tokens \NC \NR +\NC \type{fix_mem_min} \NC minimum number of allocated words for tokens \NC \NR +\NC \type{fix_mem_max} \NC maximum number of allocated words for tokens \NC \NR +\NC \type{font_ptr} \NC number of active fonts \NC \NR +\NC \type{hash_extra} \NC extra allowed hash \NC \NR +\NC \type{hash_size} \NC size of hash \NC \NR +\NC \type{indirect_callbacks} \NC number of those that were themselves a result of other callbacks (e.g. file readers) \NC \NR +\NC \type{ini_version} \NC \type {true} if this is an \INITEX\ run \NC \NR +\NC \type{init_pool_ptr} \NC \INITEX\ string pool index \NC \NR +\NC \type{init_str_ptr} \NC number of \INITEX\ strings \NC \NR +\NC \type{input_ptr} \NC the level of input we're at \NC \NR +\NC \type{inputid} \NC numeric id of the current input \NC \NR +\NC \type{largest_used_mark} \NC max referenced marks class \NC \NR +\NC \type{lasterrorcontext} \NC last error context string (with newlines) \NC \NR +\NC \type{lasterrorstring} \NC last \TEX\ error string \NC \NR +\NC \type{lastluaerrorstring} \NC last \LUA\ error string \NC \NR +\NC \type{lastwarningstring} \NC last warning tag, normally an indication of in what part\NC \NR +\NC \type{lastwarningtag} \NC last warning string\NC \NR +\NC \type{linenumber} \NC location in the current input file \NC \NR +\NC \type{log_name} \NC name of the log file \NC \NR +\NC \type{luabytecode_bytes} \NC number of bytes in \LUA\ bytecode registers \NC \NR +\NC \type{luabytecodes} \NC number of active \LUA\ bytecode registers \NC \NR +\NC \type{luastate_bytes} \NC number of bytes in use by \LUA\ interpreters \NC \NR +\NC \type{luatex_engine} \NC the \LUATEX\ engine identifier \NC \NR +\NC \type{luatex_hashchars} \NC length to which \LUA\ hashes strings ($2^n$) \NC \NR +\NC \type{luatex_hashtype} \NC the hash method used (in \LUAJITTEX) \NC \NR +\NC \type{luatex_version} \NC the \LUATEX\ version number \NC \NR +\NC \type{luatex_revision} \NC the \LUATEX\ revision string \NC \NR +\NC \type{max_buf_stack} \NC max used buffer position \NC \NR +\NC \type{max_in_stack} \NC max used input stack entries \NC \NR +\NC \type{max_nest_stack} \NC max used nesting stack entries \NC \NR +\NC \type{max_param_stack} \NC max used parameter stack entries \NC \NR +\NC \type{max_save_stack} \NC max used save stack entries \NC \NR +\NC \type{max_strings} \NC maximum allowed strings \NC \NR +\NC \type{nest_size} \NC nesting stack size \NC \NR +\NC \type{node_mem_usage} \NC a string giving insight into currently used nodes \NC \NR +\NC \type{obj_ptr} \NC max \PDF\ object pointer \NC \NR +\NC \type{obj_tab_size} \NC \PDF\ object table size \NC \NR +\NC \type{output_active} \NC \type {true} if the \prm {output} routine is active \NC \NR +\NC \type{output_file_name} \NC name of the \PDF\ or \DVI\ file \NC \NR +\NC \type{param_size} \NC parameter stack size \NC \NR +\NC \type{pdf_dest_names_ptr} \NC max \PDF\ destination pointer \NC \NR +\NC \type{pdf_gone} \NC written \PDF\ bytes \NC \NR +\NC \type{pdf_mem_ptr} \NC max \PDF\ memory used \NC \NR +\NC \type{pdf_mem_size} \NC \PDF\ memory size \NC \NR +\NC \type{pdf_os_cntr} \NC max \PDF\ object stream pointer \NC \NR +\NC \type{pdf_os_objidx} \NC \PDF\ object stream index \NC \NR +\NC \type{pdf_ptr} \NC not yet written \PDF\ bytes \NC \NR +\NC \type{pool_ptr} \NC string pool index \NC \NR +\NC \type{pool_size} \NC current size allocated for string characters \NC \NR +\NC \type{save_size} \NC save stack size \NC \NR +\NC \type{shell_escape} \NC \type {0} means disabled, \type {1} means anything is permitted, and \type {2} is restricted \NC \NR +\NC \type{safer_option} \NC \type {1} means safer is enforced \NC \NR +\NC \type{kpse_used} \NC \type {1} means that kpse is used \NC \NR +\NC \type{stack_size} \NC input stack size \NC \NR +\NC \type{str_ptr} \NC number of strings \NC \NR +\NC \type{total_pages} \NC number of written pages \NC \NR +\NC \type{var_mem_max} \NC number of allocated words for nodes \NC \NR +\NC \type{var_used} \NC variable (one|-|word) memory in use \NC \NR +\NC \type{lc_collate} \NC the value of \type {LC_COLLATE} at startup time (becomes \type {C} at startup) \NC \NR +\NC \type{lc_ctype} \NC the value of \type {LC_CTYPE} at startup time (becomes \type {C} at startup) \NC \NR +%NC \type{lc_monetary} \NC the value of \type {LC_MONETARY} at startup time \NC \NR +\NC \type{lc_numeric} \NC the value of \type {LC_NUMERIC} at startup time \NC \NR +%NC \type{lc_time} \NC the value of \type {LC_TIME} at startup time (becomes \type {C} at startup) \NC \NR +\LL +\stoptabulate + +The error and warning messages can be wiped with the \type {resetmessages} +function. A return value can be set with \type {setexitcode}. + +\stopsection + +\startsection[title={The \type {tex} library}][library=tex] + +\startsubsection[title={Introduction}] + +\topicindex{libraries+\type{tex}} + +The \type {tex} table contains a large list of virtual internal \TEX\ +parameters that are partially writable. + +The designation \quote {virtual} means that these items are not properly defined +in \LUA, but are only front\-ends that are handled by a metatable that operates +on the actual \TEX\ values. As a result, most of the \LUA\ table operators (like +\type {pairs} and \type {#}) do not work on such items. + +At the moment, it is possible to access almost every parameter that you can use +after \prm {the}, is a single tokens or is sort of special in \TEX. This excludes +parameters that need extra arguments, like \type {\the\scriptfont}. The subset +comprising simple integer and dimension registers are writable as well as +readable (like \prm {tracingcommands} and \prm {parindent}). + +\stopsubsection + +\startsubsection[title={Internal parameter values, \type {set} and \type {get}}] + +\topicindex{parameters+internal} + +\libindex{set} \libindex{get} + +For all the parameters in this section, it is possible to access them directly +using their names as index in the \type {tex} table, or by using one of the +functions \type {tex.get} and \type {tex.set}. + +The exact parameters and return values differ depending on the actual parameter, +and so does whether \type {tex.set} has any effect. For the parameters that {\em +can} be set, it is possible to use \type {global} as the first argument to \type +{tex.set}; this makes the assignment global instead of local. + +\startfunctioncall +tex.set (["global",] n, ...) +... = tex.get ( n) +\stopfunctioncall + +Glue is kind of special because there are five values involved. The return value +is a \nod {glue_spec} node but when you pass \type {false} as last argument to +\type {tex.get} you get the width of the glue and when you pass \type {true} you +get all five values. Otherwise you get a node which is a copy of the internal +value so you are responsible for its freeing at the \LUA\ end. When you set a +glue quantity you can either pass a \nod {glue_spec} or upto five numbers. If +you pass \type {true} to \type {get} you get 5 values returned for a glue and +when you pass \type {false} you only get the width returned. + +\subsubsection{Integer parameters} + +The integer parameters accept and return \LUA\ numbers. These are read|-|write: + +\starttwocolumns +\starttyping +tex.adjdemerits +tex.binoppenalty +tex.brokenpenalty +tex.catcodetable +tex.clubpenalty +tex.day +tex.defaulthyphenchar +tex.defaultskewchar +tex.delimiterfactor +tex.displaywidowpenalty +tex.doublehyphendemerits +tex.endlinechar +tex.errorcontextlines +tex.escapechar +tex.exhyphenpenalty +tex.fam +tex.finalhyphendemerits +tex.floatingpenalty +tex.globaldefs +tex.hangafter +tex.hbadness +tex.holdinginserts +tex.hyphenpenalty +tex.interlinepenalty +tex.language +tex.lastlinefit +tex.lefthyphenmin +tex.linepenalty +tex.localbrokenpenalty +tex.localinterlinepenalty +tex.looseness +tex.mag +tex.maxdeadcycles +tex.month +tex.newlinechar +tex.outputpenalty +tex.pausing +tex.postdisplaypenalty +tex.predisplaydirection +tex.predisplaypenalty +tex.pretolerance +tex.relpenalty +tex.righthyphenmin +tex.savinghyphcodes +tex.savingvdiscards +tex.showboxbreadth +tex.showboxdepth +tex.time +tex.tolerance +tex.tracingassigns +tex.tracingcommands +tex.tracinggroups +tex.tracingifs +tex.tracinglostchars +tex.tracingmacros +tex.tracingnesting +tex.tracingonline +tex.tracingoutput +tex.tracingpages +tex.tracingparagraphs +tex.tracingrestores +tex.tracingscantokens +tex.tracingstats +tex.uchyph +tex.vbadness +tex.widowpenalty +tex.year +\stoptyping +\stoptwocolumns + +These are read|-|only: + +\startthreecolumns +\starttyping +tex.deadcycles +tex.insertpenalties +tex.parshape +tex.prevgraf +tex.spacefactor +\stoptyping +\stopthreecolumns + +\subsubsection{Dimension parameters} + +The dimension parameters accept \LUA\ numbers (signifying scaled points) or +strings (with included dimension). The result is always a number in scaled +points. These are read|-|write: + +\startthreecolumns +\starttyping +tex.boxmaxdepth +tex.delimitershortfall +tex.displayindent +tex.displaywidth +tex.emergencystretch +tex.hangindent +tex.hfuzz +tex.hoffset +tex.hsize +tex.lineskiplimit +tex.mathsurround +tex.maxdepth +tex.nulldelimiterspace +tex.overfullrule +tex.pagebottomoffset +tex.pageheight +tex.pageleftoffset +tex.pagerightoffset +tex.pagetopoffset +tex.pagewidth +tex.parindent +tex.predisplaysize +tex.scriptspace +tex.splitmaxdepth +tex.vfuzz +tex.voffset +tex.vsize +tex.prevdepth +tex.prevgraf +tex.spacefactor +\stoptyping +\stopthreecolumns + +These are read|-|only: + +\startthreecolumns +\starttyping +tex.pagedepth +tex.pagefilllstretch +tex.pagefillstretch +tex.pagefilstretch +tex.pagegoal +tex.pageshrink +tex.pagestretch +tex.pagetotal +\stoptyping +\stopthreecolumns + +Beware: as with all \LUA\ tables you can add values to them. So, the following is +valid: + +\starttyping +tex.foo = 123 +\stoptyping + +When you access a \TEX\ parameter a look up takes place. For read||only variables +that means that you will get something back, but when you set them you create a +new entry in the table thereby making the original invisible. + +There are a few special cases that we make an exception for: \type {prevdepth}, +\type {prevgraf} and \type {spacefactor}. These normally are accessed via the +\type {tex.nest} table: + +\starttyping +tex.nest[tex.nest.ptr].prevdepth = p +tex.nest[tex.nest.ptr].spacefactor = s +\stoptyping + +However, the following also works: + +\starttyping +tex.prevdepth = p +tex.spacefactor = s +\stoptyping + +Keep in mind that when you mess with node lists directly at the \LUA\ end you +might need to update the top of the nesting stack's \type {prevdepth} explicitly +as there is no way \LUATEX\ can guess your intentions. By using the accessor in +the \type {tex} tables, you get and set the values at the top of the nesting +stack. + +\subsubsection{Direction parameters} + +The direction parameters are read|-|only and return a \LUA\ string. + +\startthreecolumns +\starttyping +tex.bodydir +tex.mathdir +tex.pagedir +tex.pardir +tex.textdir +\stoptyping +\stopthreecolumns + +\subsubsection{Glue parameters} + +The glue parameters accept and return a userdata object that represents a \nod {glue_spec} node. + +\startthreecolumns +\starttyping +tex.abovedisplayshortskip +tex.abovedisplayskip +tex.baselineskip +tex.belowdisplayshortskip +tex.belowdisplayskip +tex.leftskip +tex.lineskip +tex.parfillskip +tex.parskip +tex.rightskip +tex.spaceskip +tex.splittopskip +tex.tabskip +tex.topskip +tex.xspaceskip +\stoptyping +\stopthreecolumns + +\subsubsection{Muglue parameters} + +All muglue parameters are to be used read|-|only and return a \LUA\ string. + +\startthreecolumns +\starttyping +tex.medmuskip +tex.thickmuskip +tex.thinmuskip +\stoptyping +\stopthreecolumns + +\subsubsection{Tokenlist parameters} + +The tokenlist parameters accept and return \LUA\ strings. \LUA\ strings are +converted to and from token lists using \prm {the} \prm {toks} style expansion: +all category codes are either space (10) or other (12). It follows that assigning +to some of these, like \quote {tex.output}, is actually useless, but it feels bad +to make exceptions in view of a coming extension that will accept full|-|blown +token strings. + +\startthreecolumns +\starttyping +tex.errhelp +tex.everycr +tex.everydisplay +tex.everyeof +tex.everyhbox +tex.everyjob +tex.everymath +tex.everypar +tex.everyvbox +tex.output +\stoptyping +\stopthreecolumns + +\stopsubsection + +\startsubsection[title={Convert commands}] + +\topicindex{convert commands} + +All \quote {convert} commands are read|-|only and return a \LUA\ string. The +supported commands at this moment are: + +\starttwocolumns +\starttyping +tex.eTeXVersion +tex.eTeXrevision +tex.formatname +tex.jobname +tex.luatexbanner +tex.luatexrevision +tex.fontname(number) +tex.uniformdeviate(number) +tex.number(number) +tex.romannumeral(number) +tex.fontidentifier(number) +\stoptyping +\stoptwocolumns + +If you are wondering why this list looks haphazard; these are all the cases of +the \quote {convert} internal command that do not require an argument, as well as +the ones that require only a simple numeric value. The special (\LUA|-|only) case +of \type {tex.fontidentifier} returns the \type {csname} string that matches a +font id number (if there is one). + +\stopsubsection + +\startsubsection[title={Last item commands}] + +\topicindex{last items} + +All \quote {last item} commands are read|-|only and return a number. The +supported commands at this moment are: + +\startthreecolumns +\starttyping +tex.lastpenalty +tex.lastkern +tex.lastskip +tex.lastnodetype +tex.inputlineno +tex.lastxpos +tex.lastypos +tex.randomseed +tex.luatexversion +tex.eTeXminorversion +tex.eTeXversion +tex.currentgrouplevel +tex.currentgrouptype +tex.currentiflevel +tex.currentiftype +tex.currentifbranch +\stoptyping +\stopthreecolumns + +\stopsubsection + +\startsubsection[title={Accessing registers: \type {set*}, \type {get*} and \type {is*}}] + +\topicindex{attributes} +\topicindex{registers} + +\libindex{attribute} \libindex{setattribute} \libindex{getattribute} \libindex{isattribute} +\libindex{count} \libindex{setcount} \libindex{getcount} \libindex{iscount} +\libindex{dimen} \libindex{setdimen} \libindex{getdimen} \libindex{isdimen} +\libindex{skip} \libindex{setskip} \libindex{getskip} \libindex{isskip} +\libindex{muskip} \libindex{setmuskip} \libindex{getmuskip} \libindex{ismuskip} +\libindex{glue} \libindex{setglue} \libindex{getglue} \libindex{isglue} +\libindex{muglue} \libindex{setmuglue} \libindex{getmuglue} \libindex{ismuglue} +\libindex{toks} \libindex{settoks} \libindex{gettoks} \libindex{istoks} +\libindex{box} \libindex{setbox} \libindex{getbox} \libindex{isbox} + +\libindex{scantoks} + +\TEX's attributes (\lpr {attribute}), counters (\prm {count}), dimensions (\prm +{dimen}), skips (\prm {skip}, \prm {muskip}) and token (\prm {toks}) registers +can be accessed and written to using two times five virtual sub|-|tables of the +\type {tex} table: + +\startthreecolumns +\starttyping +tex.attribute +tex.count +tex.dimen +tex.skip +tex.glue +tex.muskip +tex.muglue +tex.toks +\stoptyping +\stopthreecolumns + +It is possible to use the names of relevant \lpr {attributedef}, \prm {countdef}, +\prm {dimendef}, \prm {skipdef}, or \prm {toksdef} control sequences as indices +to these tables: + +\starttyping +tex.count.scratchcounter = 0 +enormous = tex.dimen['maxdimen'] +\stoptyping + +In this case, \LUATEX\ looks up the value for you on the fly. You have to use a +valid \prm {countdef} (or \lpr {attributedef}, or \prm {dimendef}, or \prm +{skipdef}, or \prm {toksdef}), anything else will generate an error (the intent +is to eventually also allow \type {} and even macros that expand +into a number). + +\startitemize + + \startitem + The count registers accept and return \LUA\ numbers. + \stopitem + + \startitem + The dimension registers accept \LUA\ numbers (in scaled points) or + strings (with an included absolute dimension; \type {em} and \type {ex} + and \type {px} are forbidden). The result is always a number in scaled + points. + \stopitem + + \startitem + The token registers accept and return \LUA\ strings. \LUA\ strings are + converted to and from token lists using \prm {the} \prm {toks} style + expansion: all category codes are either space (10) or other (12). + \stopitem + + \startitem + The skip registers accept and return \nod {glue_spec} userdata node + objects (see the description of the node interface elsewhere in this + manual). + \stopitem + + \startitem + The glue registers are just skip registers but instead of userdata + are verbose. + \stopitem + + \startitem + Like the counts, the attribute registers accept and return \LUA\ numbers. + \stopitem + +\stopitemize + +As an alternative to array addressing, there are also accessor functions defined +for all cases, for example, here is the set of possibilities for \prm {skip} +registers: + +\startfunctioncall +tex.setskip (["global",] n, s) +tex.setskip (["global",] s, s) + s = tex.getskip ( n) + s = tex.getskip ( s) +\stopfunctioncall + +We have similar setters for \type {count}, \type {dimen}, \type {muskip}, and +\type {toks}. Counters and dimen are represented by numbers, skips and muskips by +nodes, and toks by strings. + +Again the glue variants are not using the \nod {glue-spec} userdata nodes. The +\type {setglue} function accepts upto 5 arguments: width, stretch, shrink, +stretch order and shrink order and the \type {getglue} function reports them, +unless the second argument is \type {false} in which care only the width is +returned. + +Here is an example usign a threesome: + +\startfunctioncall +local d = tex.getdimen("foo") +if tex.isdimen("bar") then + tex.setdimen("bar",d) +end +\stopfunctioncall + +There are six extra skip (glue) related helpers: + +\startfunctioncall +tex.setglue (["global"], n, + width, stretch, shrink, stretch_order, shrink_order) +tex.setglue (["global"], s, + width, stretch, shrink, stretch_order, shrink_order) +width, stretch, shrink, stretch_order, shrink_order = + tex.getglue ( n) +width, stretch, shrink, stretch_order, shrink_order = + tex.getglue ( s) +\stopfunctioncall + +The other two are \type {tex.setmuglue} and \type {tex.getmuglue}. + +There are such helpers for \type {dimen}, \type {count}, \type {skip}, \type +{muskip}, \type {box} and \type {attribute} registers but the glue ones +are special because they have to deal with more properties. + +As with the general \type {get} and \type {set} function discussed before, for +the skip registers \type {getskip} returns a node and \type {getglue} returns +numbers, while \type {setskip} accepts a node and \type {setglue} expects upto 5 +numbers. Again, when you pass \type {false} as second argument to \type {getglue} +you only get the width returned. The same is true for the \type {mu} variants +\type {getmuskip}, \type {setmuskip}, \type {getmuskip} and\type {setmuskip}. + +For tokens registers we have an alternative where a catcode table is specified: + +\startfunctioncall +tex.scantoks(0,3,"$e=mc^2$") +tex.scantoks("global",0,"$\int\limits^1_2$") +\stopfunctioncall + +In the function-based interface, it is possible to define values globally by +using the string \type {global} as the first function argument. + +\stopsubsection + +\startsubsection[title={Character code registers: \type {[get|set]*code[s]}}] + +\topicindex{characters+codes} + +\libindex{lccode} \libindex{setlccode} \libindex{getlccode} +\libindex{uccode} \libindex{setuccode} \libindex{getuccode} +\libindex{sfcode} \libindex{setsfcode} \libindex{getsfcode} +\libindex{catcode} \libindex{setcatcode} \libindex{getcatcode} +\libindex{mathcode} \libindex{setmathcode} \libindex{getmathcode} +\libindex{delcode} \libindex{setdelcode} \libindex{getdelcode} + +\libindex{setdelcodes} \libindex{getdelcodes} +\libindex{setmathcodes} \libindex{getmathcodes} + +\TEX's character code tables (\prm {lccode}, \prm {uccode}, \prm {sfcode}, \prm +{catcode}, \prm {mathcode}, \prm {delcode}) can be accessed and written to using +six virtual subtables of the \type {tex} table + +\startthreecolumns +\starttyping +tex.lccode +tex.uccode +tex.sfcode +tex.catcode +tex.mathcode +tex.delcode +\stoptyping +\stopthreecolumns + +The function call interfaces are roughly as above, but there are a few twists. +\type {sfcode}s are the simple ones: + +\startfunctioncall +tex.setsfcode (["global",] n, s) + s = tex.getsfcode ( n) +\stopfunctioncall + +The function call interface for \type {lccode} and \type {uccode} additionally +allows you to set the associated sibling at the same time: + +\startfunctioncall +tex.setlccode (["global"], n, lc) +tex.setlccode (["global"], n, lc, uc) + lc = tex.getlccode ( n) +tex.setuccode (["global"], n, uc) +tex.setuccode (["global"], n, uc, lc) + uc = tex.getuccode ( n) +\stopfunctioncall + +The function call interface for \type {catcode} also allows you to specify a +category table to use on assignment or on query (default in both cases is the +current one): + +\startfunctioncall +tex.setcatcode (["global"], n, c) +tex.setcatcode (["global"], cattable, n, c) + lc = tex.getcatcode ( n) + lc = tex.getcatcode ( cattable, n) +\stopfunctioncall + +The interfaces for \type {delcode} and \type {mathcode} use small array tables to +set and retrieve values: + +\startfunctioncall +tex.setmathcode (["global"], n,
mval ) +
mval = tex.getmathcode ( n) +tex.setdelcode (["global"], n,
dval ) +
dval = tex.getdelcode ( n) +\stopfunctioncall + +Where the table for \type {mathcode} is an array of 3 numbers, like this: + +\starttyping +{ + class, + family, + character +} +\stoptyping + +And the table for \type {delcode} is an array with 4 numbers, like this: + +\starttyping +{ + small_fam, + small_char, + large_fam, + large_char +} +\stoptyping + +You can also avoid the table: + +\startfunctioncall +tex.setmathcode (["global"], n, class, + family, character) +class, family, char = + tex.getmathcodes ( n) +tex.setdelcode (["global"], n, smallfam, + smallchar, largefam, largechar) +smallfam, smallchar, largefam, largechar = + tex.getdelcodes ( n) +\stopfunctioncall + +Normally, the third and fourth values in a delimiter code assignment will be zero +according to \lpr {Udelcode} usage, but the returned table can have values there +(if the delimiter code was set using \prm {delcode}, for example). Unset \type +{delcode}'s can be recognized because \type {dval[1]} is $-1$. + +\stopsubsection + +\startsubsection[title={Box registers: \type {[get|set]box}}] + +\topicindex{registers} +\topicindex{boxes} + +\libindex{box} +\libindex{setbox} \libindex{getbox} + +It is possible to set and query actual boxes, coming for instance from \prm +{hbox}, \prm {vbox} or \prm {vtop}, using the node interface as defined in the +\type {node} library: + +\starttyping +tex.box +\stoptyping + +for array access, or + +\starttyping +tex.setbox(["global",] n, s) +tex.setbox(["global",] cs, s) + n = tex.getbox( n) + n = tex.getbox( cs) +\stoptyping + +for function|-|based access. In the function-based interface, it is possible to +define values globally by using the string \type {global} as the first function +argument. + +Be warned that an assignment like + +\starttyping +tex.box[0] = tex.box[2] +\stoptyping + +does not copy the node list, it just duplicates a node pointer. If \type {\box2} +will be cleared by \TEX\ commands later on, the contents of \type {\box0} becomes +invalid as well. To prevent this from happening, always use \type +{node.copy_list} unless you are assigning to a temporary variable: + +\starttyping +tex.box[0] = node.copy_list(tex.box[2]) +\stoptyping + +\stopsubsection + +\startsubsection[title={Reusing boxes: \type {[use|save]boxresource} and \type {getboxresourcedimensions}}] + +\topicindex{boxes+reuse} + +\libindex{useboxresource} +\libindex{saveboxresource} +\libindex{getboxresourcedimensions} + +The following function will register a box for reuse (this is modelled after so +called xforms in \PDF). You can (re)use the box with \lpr {useboxresource} or +by creating a rule node with subtype~2. + +\starttyping +local index = tex.saveboxresource(n,attributes,resources,immediate,type,margin) +\stoptyping + +The optional second and third arguments are strings, the fourth is a boolean. The +fifth argument is a type. When set to non|-|zero the \type {/Type} entry is +omitted. A value of 1 or 3 still writes a \type {/BBox}, while 2 or 3 will write +a \type {/Matrix}. The sixth argument is the (virtual) margin that extends beyond +the effective boundingbox as seen by \TEX. Instead of a box number one can also +pass a \type {[h|v]list} node. + +You can generate the reference (a rule type) with: + +\starttyping +local reused = tex.useboxresource(n,wd,ht,dp) +\stoptyping + +The dimensions are optional and the final ones are returned as extra values. The +following is just a bonus (no dimensions returned means that the resource is +unknown): + +\starttyping +local w, h, d, m = tex.getboxresourcedimensions(n) +\stoptyping + +This returns the width, height, depth and margin of the resource. + +\stopsubsection + +\startsubsection[title={\type {triggerbuildpage}}] + +\topicindex{pages} + +\libindex{triggerbuildpage} + +You should not expect to much from the \type {triggerbuildpage} helpers because +often \TEX\ doesn't do much if it thinks nothing has to be done, but it might be +useful for some applications. It just does as it says it calls the internal +function that build a page, given that there is something to build. + +\stopsubsection + +\startsubsection[title={\type {splitbox}}] + +\topicindex{boxes+split} + +\libindex{splitbox} + +You can split a box: + +\starttyping +local vlist = tex.splitbox(n,height,mode) +\stoptyping + +The remainder is kept in the original box and a packaged vlist is returned. This +operation is comparable to the \prm {vsplit} operation. The mode can be \type +{additional} or \type {exactly} and concerns the split off box. + +\stopsubsection + +\startsubsection[title={Accessing math parameters: \type {[get|set]math}}] + +\topicindex{math+parameters} +\topicindex{parameters+math} + +\libindex{setmath} +\libindex{getmath} + +It is possible to set and query the internal math parameters using: + +\startfunctioncall +tex.setmath(["global",] n, t, n) + n = tex.getmath( n, t) +\stopfunctioncall + +As before an optional first parameter \type {global} indicates a global +assignment. + +The first string is the parameter name minus the leading \quote {Umath}, and the +second string is the style name minus the trailing \quote {style}. Just to be +complete, the values for the math parameter name are: + +\starttyping +quad axis operatorsize +overbarkern overbarrule overbarvgap +underbarkern underbarrule underbarvgap +radicalkern radicalrule radicalvgap +radicaldegreebefore radicaldegreeafter radicaldegreeraise +stackvgap stacknumup stackdenomdown +fractionrule fractionnumvgap fractionnumup +fractiondenomvgap fractiondenomdown fractiondelsize +limitabovevgap limitabovebgap limitabovekern +limitbelowvgap limitbelowbgap limitbelowkern +underdelimitervgap underdelimiterbgap +overdelimitervgap overdelimiterbgap +subshiftdrop supshiftdrop subshiftdown +subsupshiftdown subtopmax supshiftup +supbottommin supsubbottommax subsupvgap +spaceafterscript connectoroverlapmin +ordordspacing ordopspacing ordbinspacing ordrelspacing +ordopenspacing ordclosespacing ordpunctspacing ordinnerspacing +opordspacing opopspacing opbinspacing oprelspacing +opopenspacing opclosespacing oppunctspacing opinnerspacing +binordspacing binopspacing binbinspacing binrelspacing +binopenspacing binclosespacing binpunctspacing bininnerspacing +relordspacing relopspacing relbinspacing relrelspacing +relopenspacing relclosespacing relpunctspacing relinnerspacing +openordspacing openopspacing openbinspacing openrelspacing +openopenspacing openclosespacing openpunctspacing openinnerspacing +closeordspacing closeopspacing closebinspacing closerelspacing +closeopenspacing closeclosespacing closepunctspacing closeinnerspacing +punctordspacing punctopspacing punctbinspacing punctrelspacing +punctopenspacing punctclosespacing punctpunctspacing punctinnerspacing +innerordspacing inneropspacing innerbinspacing innerrelspacing +inneropenspacing innerclosespacing innerpunctspacing innerinnerspacing +\stoptyping + +The values for the style parameter are: + +\starttyping +display crampeddisplay +text crampedtext +script crampedscript +scriptscript crampedscriptscript +\stoptyping + +The value is either a number (representing a dimension or number) or a glue spec +node representing a muskip for \type {ordordspacing} and similar spacing +parameters. + +\stopsubsection + +\startsubsection[title={Special list heads: \type {[get|set]list}}] + +\topicindex{lists} + +\libindex{lists} +\libindex{setlist} +\libindex{getlist} + +The virtual table \type {tex.lists} contains the set of internal registers that +keep track of building page lists. + +\starttabulate[|l|p|] +\DB field \BC explanation \NC \NR +\TB +\NC \type{page_ins_head} \NC circular list of pending insertions \NC \NR +\NC \type{contrib_head} \NC the recent contributions \NC \NR +\NC \type{page_head} \NC the current page content \NC \NR +%NC \type{temp_head} \NC \NC \NR +\NC \type{hold_head} \NC used for held-over items for next page \NC \NR +\NC \type{adjust_head} \NC head of the current \prm {vadjust} list \NC \NR +\NC \type{pre_adjust_head} \NC head of the current \type {\vadjust pre} list \NC \NR +%NC \type{align_head} \NC \NC \NR +\NC \type{page_discards_head} \NC head of the discarded items of a page break \NC \NR +\NC \type{split_discards_head} \NC head of the discarded items in a vsplit \NC \NR +\LL +\stoptabulate + +The getter and setter functions are \type {getlist} and \type {setlist}. You have +to be careful with what you set as \TEX\ can have expectations with regards to +how a list is constructed or in what state it is. + +\stopsubsection + +\startsubsection[title={Semantic nest levels: \type {getnest} and \type {ptr}}] + +\topicindex{nesting} + +\libindex{nest} +\libindex{ptr} +%libindex{setnest} % only a message +\libindex{getnest} + +The virtual table \type {nest} contains the currently active semantic nesting +state. It has two main parts: a zero-based array of userdata for the semantic +nest itself, and the numerical value \type {ptr}, which gives the highest +available index. Neither the array items in \type {nest[]} nor \type {ptr} can be +assigned to (as this would confuse the typesetting engine beyond repair), but you +can assign to the individual values inside the array items, e.g.\ \type +{tex.nest[tex.nest.ptr].prevdepth}. + +\type {tex.nest[tex.nest.ptr]} is the current nest state, \type {nest[0]} the +outermost (main vertical list) level. The getter function is \type {getnest}. You +can pass a number (which gives you a list), nothing or \type {top}, which returns +the topmost list, or the string \type {ptr} which gives you the index of the +topmost list. + +The known fields are: + +\starttabulate[|l|l|l|p|] +\DB key \BC type \BC modes \BC explanation \NC \NR +\TB +\NC \type{mode} \NC number \NC all \NC the meaning of these numbers depends on the engine + and sometimes even the version; you can use \typ + {tex.getmodevalues()} to get the mapping: positive + values signal vertical, horizontal and math mode, + while negative values indicate inner and inline + variants \NC \NR +\NC \type{modeline} \NC number \NC all \NC source input line where this mode was entered in, + negative inside the output routine \NC \NR +\NC \type{head} \NC node \NC all \NC the head of the current list \NC \NR +\NC \type{tail} \NC node \NC all \NC the tail of the current list \NC \NR +\NC \type{prevgraf} \NC number \NC vmode \NC number of lines in the previous paragraph \NC \NR +\NC \type{prevdepth} \NC number \NC vmode \NC depth of the previous paragraph \NC \NR +\NC \type{spacefactor} \NC number \NC hmode \NC the current space factor \NC \NR +\NC \type{dirs} \NC node \NC hmode \NC used for temporary storage by the line break algorithm\NC \NR +\NC \type{noad} \NC node \NC mmode \NC used for temporary storage of a pending fraction numerator, + for \prm {over} etc. \NC \NR +\NC \type{delimptr} \NC node \NC mmode \NC used for temporary storage of the previous math delimiter, + for \prm {middle} \NC \NR +\NC \type{mathdir} \NC boolean \NC mmode \NC true when during math processing the \lpr {mathdir} is not + the same as the surrounding \lpr {textdir} \NC \NR +\NC \type{mathstyle} \NC number \NC mmode \NC the current \lpr {mathstyle} \NC \NR +\LL +\stoptabulate + +\stopsubsection + +\startsubsection[reference=sec:luaprint,title={Print functions}] + +\topicindex{printing} + +The \type {tex} table also contains the three print functions that are the major +interface from \LUA\ scripting to \TEX. The arguments to these three functions +are all stored in an in|-|memory virtual file that is fed to the \TEX\ scanner as +the result of the expansion of \prm {directlua}. + +The total amount of returnable text from a \prm {directlua} command is only +limited by available system \RAM. However, each separate printed string has to +fit completely in \TEX's input buffer. The result of using these functions from +inside callbacks is undefined at the moment. + +\subsubsection{\type {print}} + +\libindex{print} + +\startfunctioncall +tex.print( s, ...) +tex.print( n, s, ...) +tex.print(
t) +tex.print( n,
t) +\stopfunctioncall + +Each string argument is treated by \TEX\ as a separate input line. If there is a +table argument instead of a list of strings, this has to be a consecutive array +of strings to print (the first non-string value will stop the printing process). + +The optional parameter can be used to print the strings using the catcode regime +defined by \lpr {catcodetable}~\type {n}. If \type {n} is $-1$, the currently +active catcode regime is used. If \type {n} is $-2$, the resulting catcodes are +the result of \prm {the} \prm {toks}: all category codes are 12 (other) except for +the space character, that has category code 10 (space). Otherwise, if \type {n} +is not a valid catcode table, then it is ignored, and the currently active +catcode regime is used instead. + +The very last string of the very last \type {tex.print} command in a \prm +{directlua} will not have the \prm {endlinechar} appended, all others do. + +\subsubsection{\type {sprint}} + +\libindex{sprint} + +\startfunctioncall +tex.sprint( s, ...) +tex.sprint( n, s, ...) +tex.sprint(
t) +tex.sprint( n,
t) +\stopfunctioncall + +Each string argument is treated by \TEX\ as a special kind of input line that +makes it suitable for use as a partial line input mechanism: + +\startitemize[packed] +\startitem + \TEX\ does not switch to the \quote {new line} state, so that leading spaces + are not ignored. +\stopitem +\startitem + No \prm {endlinechar} is inserted. +\stopitem +\startitem + Trailing spaces are not removed. Note that this does not prevent \TEX\ itself + from eating spaces as result of interpreting the line. For example, in + + \starttyping + before\directlua{tex.sprint("\\relax")tex.sprint(" inbetween")}after + \stoptyping + + the space before \type {in between} will be gobbled as a result of the \quote + {normal} scanning of \prm {relax}. +\stopitem +\stopitemize + +If there is a table argument instead of a list of strings, this has to be a +consecutive array of strings to print (the first non-string value will stop the +printing process). + +The optional argument sets the catcode regime, as with \type {tex.print}. This +influences the string arguments (or numbers turned into strings). + +Although this needs to be used with care, you can also pass token or node +userdata objects. These get injected into the stream. Tokens had best be valid +tokens, while nodes need to be around when they get injected. Therefore it is +important to realize the following: + +\startitemize +\startitem + When you inject a token, you need to pass a valid token userdata object. This + object will be collected by \LUA\ when it no longer is referenced. When it gets + printed to \TEX\ the token itself gets copied so there is no interference with the + \LUA\ garbage collection. You manage the object yourself. Because tokens are + actually just numbers, there is no real extra overhead at the \TEX\ end. +\stopitem +\startitem + When you inject a node, you need to pass a valid node userdata object. The + node related to the object will not be collected by \LUA\ when it no longer + is referenced. It lives on at the \TEX\ end in its own memory space. When it + gets printed to \TEX\ the node reference is used assuming that node stays + around. There is no \LUA\ garbage collection involved. Again, you manage the + object yourself. The node itself is freed when \TEX\ is done with it. +\stopitem +\stopitemize + +If you consider the last remark you might realize that we have a problem when a +printed mix of strings, tokens and nodes is reused. Inside \TEX\ the sequence +becomes a linked list of input buffers. So, \type {"123"} or \type {"\foo{123}"} +gets read and parsed on the fly, while \typ {} already is +tokenized and effectively is a token list now. A \typ {} is also +tokenized into a token list but it has a reference to a real node. Normally this +goes fine. But now assume that you store the whole lot in a macro: in that case +the tokenized node can be flushed many times. But, after the first such flush the +node is used and its memory freed. You can prevent this by using copies which is +controlled by setting \lpr {luacopyinputnodes} to a non|-|zero value. This is one +of these fuzzy areas you have to live with if you really mess with these low +level issues. + +\subsubsection{\type {tprint}} + +\libindex{tprint} + +\startfunctioncall +tex.tprint({ n, s, ...}, {...}) +\stopfunctioncall + +This function is basically a shortcut for repeated calls to \type +{tex.sprint( n, s, ...)}, once for each of the supplied argument +tables. + +\subsubsection{\type {cprint}} + +\libindex{cprint} + +This function takes a number indicating the to be used catcode, plus either a +table of strings or an argument list of strings that will be pushed into the +input stream. + +\startfunctioncall +tex.cprint( 1," 1: $&{\\foo}") tex.print("\\par") -- a lot of \bgroup s +tex.cprint( 2," 2: $&{\\foo}") tex.print("\\par") -- matching \egroup s +tex.cprint( 9," 9: $&{\\foo}") tex.print("\\par") -- all get ignored +tex.cprint(10,"10: $&{\\foo}") tex.print("\\par") -- all become spaces +tex.cprint(11,"11: $&{\\foo}") tex.print("\\par") -- letters +tex.cprint(12,"12: $&{\\foo}") tex.print("\\par") -- other characters +tex.cprint(14,"12: $&{\\foo}") tex.print("\\par") -- comment triggers +\stopfunctioncall + +% \subsubsection{\type {write}, \type {twrite}, \type {nwrite}} +\subsubsection{\type {write}} + +\libindex{write} +% \libindex{twrite} +% \libindex{nwrite} + +\startfunctioncall +tex.write( s, ...) +tex.write(
t) +\stopfunctioncall + +Each string argument is treated by \TEX\ as a special kind of input line that +makes it suitable for use as a quick way to dump information: + +\startitemize +\item All catcodes on that line are either \quote{space} (for '~') or \quote + {character} (for all others). +\item There is no \prm {endlinechar} appended. +\stopitemize + +If there is a table argument instead of a list of strings, this has to be a +consecutive array of strings to print (the first non-string value will stop the +printing process). + +% The functions \type {twrite} and \type {nwrite} can be used to write a token or +% node back to \TEX\, possibly intermixed with regular strings that will be +% tokenized. You have to make sure that you pass the right data because sometimes +% \TEX\ has expectations that need to be met. + +\stopsubsection + +\startsubsection[title={Helper functions}] + +\subsubsection{\type {round}} + +\topicindex {helpers} + +\libindex{round} + +\startfunctioncall + n = tex.round( o) +\stopfunctioncall + +Rounds \LUA\ number \type {o}, and returns a number that is in the range of a +valid \TEX\ register value. If the number starts out of range, it generates a +\quote {number too big} error as well. + +\subsubsection{\type {scale}} + +\libindex{scale} + +\startfunctioncall + n = tex.scale( o, delta) +
n = tex.scale(table o, delta) +\stopfunctioncall + +Multiplies the \LUA\ numbers \type {o} and \nod {delta}, and returns a rounded +number that is in the range of a valid \TEX\ register value. In the table +version, it creates a copy of the table with all numeric top||level values scaled +in that manner. If the multiplied number(s) are of range, it generates +\quote{number too big} error(s) as well. + +Note: the precision of the output of this function will depend on your computer's +architecture and operating system, so use with care! An interface to \LUATEX's +internal, 100\% portable scale function will be added at a later date. + +\subsubsection{\type {number} and \type {romannumeral}} + +\libindex{number} +\libindex{romannumeral} + +These are the companions to the primitives \prm {number} and \prm +{romannumeral}. They can be used like: + +\startfunctioncall +tex.print(tex.romannumeral(123)) +\stopfunctioncall + +\subsubsection{\type {fontidentifier} and \type {fontname}} + +\libindex{fontidentifier} +\libindex{fontname} + +The first one returns the name only, the second one reports the size too. + +\startfunctioncall +tex.print(tex.fontname(tex.fontname)) +tex.print(tex.fontname(tex.fontidentidier)) +\stopfunctioncall + +\subsubsection{\type {sp}} + +\libindex{sp} + +\startfunctioncall + n = tex.sp( o) + n = tex.sp( s) +\stopfunctioncall + +Converts the number \type {o} or a string \type {s} that represents an explicit +dimension into an integer number of scaled points. + +For parsing the string, the same scanning and conversion rules are used that +\LUATEX\ would use if it was scanning a dimension specifier in its \TEX|-|like +input language (this includes generating errors for bad values), expect for the +following: + +\startitemize[n] +\startitem + only explicit values are allowed, control sequences are not handled +\stopitem +\startitem + infinite dimension units (\type {fil...}) are forbidden +\stopitem +\startitem + \type {mu} units do not generate an error (but may not be useful either) +\stopitem +\stopitemize + +\subsubsection{\type {tex.getlinenumber} and \type {tex.setlinenumber}} + +\libindex{getlinenumber} +\libindex{setlinenumber} + +You can mess with the current line number: + +\startfunctioncall +local n = tex.getlinenumber() +tex.setlinenumber(n+10) +\stopfunctioncall + +which can be shortcut to: + +\startfunctioncall +tex.setlinenumber(10,true) +\stopfunctioncall + +This might be handy when you have a callback that read numbers from a file and +combines them in one line (in which case an error message probably has to refer +to the original line). Interference with \TEX's internal handling of numbers is +of course possible. + +\subsubsection{\type {error} and \type {show_context}} + +\topicindex{errors} + +\libindex{error} +\libindex{show_context} + +\startfunctioncall +tex.error( s) +tex.error( s,
help) +\stopfunctioncall + +This creates an error somewhat like the combination of \prm {errhelp} and \prm +{errmessage} would. During this error, deletions are disabled. + +The array part of the \type {help} table has to contain strings, one for each +line of error help. + +In case of an error the \type {show_context} function will show the current +context where we're at (in the expansion). + +\subsubsection{\type {run}, \type {finish}} + +\libindex{run} +\libindex{finish} + +These two functions start the interpretations and force its end. A runs normally +boils down to \TEX\ entering the so called main loop. A token is fetched and +depending on it current meaning some actions takes place. Sometimes that actions +comes immediately, sometimes more scanning is needed. Quite often tokens get +pushed back into the input. This all means that the \TEX\ scanner is constantly +pushing and popping input states, but in the end after all the action is done +returns to the main loop. + +\subsubsection{\type {runtoks}} + +Because of the fact that \TEX\ is in a complex dance of expanding, dealing with +fonts, typesetting paragraphs, messing around with boxes, building pages, and so +on, you cannot easily run a nested \TEX\ run (read nested main loop). However, +there is an option to force a local run with \type {runtoks}. The content of the +given token list register gets expanded locally after which we return to where we +triggered this expansion, at the \LUA\ end. Instead a function can get passed +that does some work. You have to make sure that at the end \TEX\ is in a sane +state and this is not always trivial. A more complex mechanism would complicate +\TEX\ itself (and probably also harm performance) so this simple local expansion +loop has to do. + +\startfunctioncall +tex.runtoks() +tex.runtoks() +\stopfunctioncall + +When the \prm {tracingnesting} parameter is set to a value larger than~2 some +information is reported about the state of the local loop. + +\subsubsection{\type {forcehmode}} + +\libindex{forcehmode} + +An example of a (possible error triggering) complication is that \TEX\ expects to +be in some state, say horizontal mode, and you have to make sure it is when you +start feeding back something from \LUA\ into \TEX. Normally a user will not run +into issues but when you start writing tokens or nodes or have a nested run there +can be situations that you need to run \type {forcehmode}. There is no recipe for +this and intercepting possible cases would weaken \LUATEX's flexibility. + +\subsubsection{\type {hashtokens}} + +\libindex{hashtokens} + +\topicindex{hash} + +\startfunctioncall +for i,v in pairs (tex.hashtokens()) do ... end +\stopfunctioncall + +Returns a list of names. This can be useful for debugging, but note that this +also reports control sequences that may be unreachable at this moment due to +local redefinitions: it is strictly a dump of the hash table. You can use \type +{token.create} to inspect properties, for instance when the \type {command} key +in a created table equals \type {123}, you have the \type {cmdname} value \type +{undefined_cs}. + +\subsubsection{\type {definefont}} + +\topicindex{fonts+defining} + +\libindex{definefont} + +\startfunctioncall +tex.definefont( csname, fontid) +tex.definefont( global, csname, fontid) +\stopfunctioncall + +Associates \type {csname} with the internal font number \type {fontid}. The +definition is global if (and only if) \type {global} is specified and true (the +setting of \type {globaldefs} is not taken into account). + +\stopsubsection + +\startsubsection[reference=luaprimitives,title={Functions for dealing with primitives}] + +\subsubsection{\type {enableprimitives}} + +\libindex{enableprimitives} + +\topicindex{initialization} +\topicindex{primitives} + +\startfunctioncall +tex.enableprimitives( prefix,
primitive names) +\stopfunctioncall + +This function accepts a prefix string and an array of primitive names. For each +combination of \quote {prefix} and \quote {name}, the \type +{tex.enableprimitives} first verifies that \quote {name} is an actual primitive +(it must be returned by one of the \type {tex.extraprimitives} calls explained +below, or part of \TEX82, or \prm {directlua}). If it is not, \type +{tex.enableprimitives} does nothing and skips to the next pair. + +But if it is, then it will construct a csname variable by concatenating the +\quote {prefix} and \quote {name}, unless the \quote {prefix} is already the +actual prefix of \quote {name}. In the latter case, it will discard the \quote +{prefix}, and just use \quote {name}. + +Then it will check for the existence of the constructed csname. If the csname is +currently undefined (note: that is not the same as \prm {relax}), it will +globally define the csname to have the meaning: run code belonging to the +primitive \quote {name}. If for some reason the csname is already defined, it +does nothing and tries the next pair. + +An example: + +\starttyping +tex.enableprimitives('LuaTeX', {'formatname'}) +\stoptyping + +will define \type {\LuaTeXformatname} with the same intrinsic meaning as the +documented primitive \lpr {formatname}, provided that the control sequences \type +{\LuaTeXformatname} is currently undefined. + +When \LUATEX\ is run with \type {--ini} only the \TEX82 primitives and \prm +{directlua} are available, so no extra primitives {\bf at all}. + +If you want to have all the new functionality available using their default +names, as it is now, you will have to add + +\starttyping +\ifx\directlua\undefined \else + \directlua {tex.enableprimitives('',tex.extraprimitives ())} +\fi +\stoptyping + +near the beginning of your format generation file. Or you can choose different +prefixes for different subsets, as you see fit. + +Calling some form of \type {tex.enableprimitives} is highly important though, +because if you do not, you will end up with a \TEX82-lookalike that can run \LUA\ +code but not do much else. The defined csnames are (of course) saved in the +format and will be available at runtime. + +\subsubsection{\type {extraprimitives}} + +\libindex{extraprimitives} + +\startfunctioncall +
t = tex.extraprimitives( s, ...) +\stopfunctioncall + +This function returns a list of the primitives that originate from the engine(s) +given by the requested string value(s). The possible values and their (current) +return values are given in the following table. In addition the somewhat special +primitives \quote{\tex{ }}, \quote{\tex {/}} and \quote{\type {-}} are defined. + +\startluacode +function document.showprimitives(tag) + for k, v in table.sortedpairs(tex.extraprimitives(tag)) do + if v ~= ' ' and v ~= "/" and v ~= "-" then + context.type(v) + context.space() + end + end +end +\stopluacode + +\starttabulate[|l|pl|] +\DB name \BC values \NC \NR +\TB +\NC tex \NC \ctxlua{document.showprimitives('tex') } \NC \NR +\NC core \NC \ctxlua{document.showprimitives('core') } \NC \NR +\NC etex \NC \ctxlua{document.showprimitives('etex') } \NC \NR +\NC luatex \NC \ctxlua{document.showprimitives('luatex') } \NC \NR +\LL +\stoptabulate + +Note that \type {luatex} does not contain \type {directlua}, as that is +considered to be a core primitive, along with all the \TEX82 primitives, so it is +part of the list that is returned from \type {'core'}. + +Running \type {tex.extraprimitives} will give you the complete list of +primitives \type {-ini} startup. It is exactly equivalent to \type +{tex.extraprimitives("etex","luatex")}. + +\subsubsection{\type {primitives}} + +\libindex{primitives} + +\startfunctioncall +
t = tex.primitives() +\stopfunctioncall + +This function returns a list of all primitives that \LUATEX\ knows about. + +\stopsubsection + +\startsubsection[title={Core functionality interfaces}] + +\subsubsection{\type {badness}} + +\libindex{badness} + +\startfunctioncall + b = tex.badness( t, s) +\stopfunctioncall + +This helper function is useful during linebreak calculations. \type {t} and \type +{s} are scaled values; the function returns the badness for when total \type {t} +is supposed to be made from amounts that sum to \type {s}. The returned number is +a reasonable approximation of \mathematics {100(t/s)^3}; + +\subsubsection{\type {tex.resetparagraph}} + +\topicindex {paragraphs+reset} + +\libindex{resetparagraph} + +This function resets the parameters that \TEX\ normally resets when a new paragraph +is seen. + +\subsubsection{\type {linebreak}} + +\topicindex {linebreaks} + +\libindex{linebreak} + +\startfunctioncall +local nodelist,
info = + tex.linebreak( listhead,
parameters) +\stopfunctioncall + +The understood parameters are as follows: + +\starttabulate[|l|l|p|] +\DB name \BC type \BC explanation \NC \NR +\TB +\NC \type{pardir} \NC string \NC \NC \NR +\NC \type{pretolerance} \NC number \NC \NC \NR +\NC \type{tracingparagraphs} \NC number \NC \NC \NR +\NC \type{tolerance} \NC number \NC \NC \NR +\NC \type{looseness} \NC number \NC \NC \NR +\NC \type{hyphenpenalty} \NC number \NC \NC \NR +\NC \type{exhyphenpenalty} \NC number \NC \NC \NR +\NC \type{pdfadjustspacing} \NC number \NC \NC \NR +\NC \type{adjdemerits} \NC number \NC \NC \NR +\NC \type{pdfprotrudechars} \NC number \NC \NC \NR +\NC \type{linepenalty} \NC number \NC \NC \NR +\NC \type{lastlinefit} \NC number \NC \NC \NR +\NC \type{doublehyphendemerits} \NC number \NC \NC \NR +\NC \type{finalhyphendemerits} \NC number \NC \NC \NR +\NC \type{hangafter} \NC number \NC \NC \NR +\NC \type{interlinepenalty} \NC number or table \NC if a table, then it is an array like \prm {interlinepenalties} \NC \NR +\NC \type{clubpenalty} \NC number or table \NC if a table, then it is an array like \prm {clubpenalties} \NC \NR +\NC \type{widowpenalty} \NC number or table \NC if a table, then it is an array like \prm {widowpenalties} \NC \NR +\NC \type{brokenpenalty} \NC number \NC \NC \NR +\NC \type{emergencystretch} \NC number \NC in scaled points \NC \NR +\NC \type{hangindent} \NC number \NC in scaled points \NC \NR +\NC \type{hsize} \NC number \NC in scaled points \NC \NR +\NC \type{leftskip} \NC glue_spec node \NC \NC \NR +\NC \type{rightskip} \NC glue_spec node \NC \NC \NR +\NC \type{parshape} \NC table \NC \NC \NR +\LL +\stoptabulate + +Note that there is no interface for \prm {displaywidowpenalties}, you have to +pass the right choice for \type {widowpenalties} yourself. + +It is your own job to make sure that \type {listhead} is a proper paragraph list: +this function does not add any nodes to it. To be exact, if you want to replace +the core line breaking, you may have to do the following (when you are not +actually working in the \cbk {pre_linebreak_filter} or \cbk {linebreak_filter} +callbacks, or when the original list starting at listhead was generated in +horizontal mode): + +\startitemize +\startitem + add an \quote {indent box} and perhaps a \nod {local_par} node at the start + (only if you need them) +\stopitem +\startitem + replace any found final glue by an infinite penalty (or add such a penalty, + if the last node is not a glue) +\stopitem +\startitem + add a glue node for the \prm {parfillskip} after that penalty node +\stopitem +\startitem + make sure all the \type {prev} pointers are OK +\stopitem +\stopitemize + +The result is a node list, it still needs to be vpacked if you want to assign it +to a \prm {vbox}. The returned \type {info} table contains four values that are +all numbers: + +\starttabulate[|l|p|] +\DB name \BC explanation \NC \NR +\TB +\NC prevdepth \NC depth of the last line in the broken paragraph \NC \NR +\NC prevgraf \NC number of lines in the broken paragraph \NC \NR +\NC looseness \NC the actual looseness value in the broken paragraph \NC \NR +\NC demerits \NC the total demerits of the chosen solution \NC \NR +\LL +\stoptabulate + +Note there are a few things you cannot interface using this function: You cannot +influence font expansion other than via \type {pdfadjustspacing}, because the +settings for that take place elsewhere. The same is true for hbadness and hfuzz +etc. All these are in the \type {hpack} routine, and that fetches its own +variables via globals. + +\subsubsection{\type {shipout}} + +\topicindex {shipout} + +\libindex{shipout} + +\startfunctioncall +tex.shipout( n) +\stopfunctioncall + +Ships out box number \type {n} to the output file, and clears the box register. + +\subsubsection{\type {getpagestate}} + +\topicindex {pages} + +\libindex{getpagestate} + +This helper reports the current page state: \type {empty}, \type {box_there} or +\type {inserts_only} as integer value. + +\subsubsection{\type {getlocallevel}} + +\topicindex {nesting} + +\libindex{getlocallevel} + +This integer reports the current level of the local loop. It's only useful for +debugging and the (relative state) numbers can change with the implementation. + +\stopsubsection + +\startsubsection[title={Randomizers}] + +\libindex{lua_math_random} +\libindex{lua_math_randomseed} +\libindex{init_rand} +\libindex{normal_rand} +\libindex{uniform_rand} +\libindex{uniformdeviate} + +For practical reasons \LUATEX\ has its own random number generator. The original +\LUA\ random function is available as \typ {tex.lua_math_random}. You can +initialize with a new seed with \type {init_rand} (\typ {lua_math_randomseed} is +equivalent to this one. + +There are three generators: \type {normal_rand} (no argument is used), \type +{uniform_rand} (takes a number that will get rounded before being used) and \type +{uniformdeviate} which behaves like the primitive and expects a scaled integer, so + +\startfunctioncall +tex.print(tex.uniformdeviate(65536)/65536) +\stopfunctioncall + +will give a random number between zero and one. + +\stopsubsection + +\startsubsection[reference=synctex,title={Functions related to synctex}] + +\topicindex {synctex} + +\libindex{set_synctex_mode} \libindex{get_synctex_mode} +\libindex{set_synctex_no_files} +\libindex{set_synctex_tag} \libindex{get_synctex_tag} \libindex{force_synctex_tag} +\libindex{set_synctex_line} \libindex{get_synctex_line} \libindex{force_synctex_line} + +The next helpers only make sense when you implement your own synctex logic. Keep in +mind that the library used in editors assumes a certain logic and is geared for +plain and \LATEX, so after a decade users expect a certain behaviour. + +\starttabulate[|l|p|] +\DB name \BC explanation \NC \NR +\TB +\NC \type{set_synctex_mode} \NC \type {0} is the default and used normal synctex + logic, \type {1} uses the values set by the next + helpers while \type {2} also sets these for glyph + nodes; \type{3} sets glyphs and glue and \type {4} + sets only glyphs \NC \NR +\NC \type{set_synctex_tag} \NC set the current tag (file) value (obeys save stack) \NC \NR +\NC \type{set_synctex_line} \NC set the current line value (obeys save stack) \NC \NR +\NC \type{set_synctex_no_files} \NC disable synctex file logging \NC \NR +\NC \type{get_synctex_mode} \NC returns the current mode (for values see above) \NC \NR +\NC \type{get_synctex_tag} \NC get the currently set value of tag (file) \NC \NR +\NC \type{get_synctex_line} \NC get the currently set value of line \NC \NR +\NC \type{force_synctex_tag} \NC overload the tag (file) value (\type {0} resets) \NC \NR +\NC \type{force_synctex_line} \NC overload the line value (\type {0} resets) \NC \NR +\LL +\stoptabulate + +The last one is somewhat special. Due to the way files are registered in \SYNCTEX\ we need +to explicitly disable that feature if we provide our own alternative if we want to avoid +that overhead. Passing a value of 1 disables registering. + +\stopsubsection + +\stopsection + +\startsection[title={The \type {texconfig} table},reference=texconfig][library=texconfig] + +\topicindex{libraries+\type{texconfig}} + +\topicindex {configuration} + +This is a table that is created empty. A startup \LUA\ script could +fill this table with a number of settings that are read out by +the executable after loading and executing the startup file. + +\starttabulate[|l|l|l|p|] +\DB key \BC type \BC default \BC explanation \NC \NR +\TB +\NC \type{kpse_init} \NC boolean \NC true +\NC + \type {false} totally disables \KPATHSEA\ initialisation, and enables + interpretation of the following numeric key--value pairs. (only ever unset + this if you implement {\it all\/} file find callbacks!) +\NC \NR +\NC + \type{shell_escape} \NC string \NC \type {'f'} \NC Use \type {'y'} or \type + {'t'} or \type {'1'} to enable \type {\write18} unconditionally, \type {'p'} + to enable the commands that are listed in \type {shell_escape_commands} +\NC \NR +\NC + shell_escape_commands \NC string \NC \NC Comma-separated list of command + names that may be executed by \type {\write18} even if \type {shell_escape} + is set to \type {'p'}. Do {\it not\/} use spaces around commas, separate any + required command arguments by using a space, and use the \ASCII\ double quote + (\type {"}) for any needed argument or path quoting +\NC \NR +\NC \type{string_vacancies} \NC number \NC 75000 \NC cf.\ web2c docs \NC \NR +\NC \type{pool_free} \NC number \NC 5000 \NC cf.\ web2c docs \NC \NR +\NC \type{max_strings} \NC number \NC 15000 \NC cf.\ web2c docs \NC \NR +\NC \type{strings_free} \NC number \NC 100 \NC cf.\ web2c docs \NC \NR +\NC \type{nest_size} \NC number \NC 50 \NC cf.\ web2c docs \NC \NR +\NC \type{max_in_open} \NC number \NC 15 \NC cf.\ web2c docs \NC \NR +\NC \type{param_size} \NC number \NC 60 \NC cf.\ web2c docs \NC \NR +\NC \type{save_size} \NC number \NC 4000 \NC cf.\ web2c docs \NC \NR +\NC \type{stack_size} \NC number \NC 300 \NC cf.\ web2c docs \NC \NR +\NC \type{dvi_buf_size} \NC number \NC 16384 \NC cf.\ web2c docs \NC \NR +\NC \type{error_line} \NC number \NC 79 \NC cf.\ web2c docs \NC \NR +\NC \type{half_error_line} \NC number \NC 50 \NC cf.\ web2c docs \NC \NR +\NC \type{max_print_line} \NC number \NC 79 \NC cf.\ web2c docs \NC \NR +\NC \type{hash_extra} \NC number \NC 0 \NC cf.\ web2c docs \NC \NR +\NC \type{pk_dpi} \NC number \NC 72 \NC cf.\ web2c docs \NC \NR +\NC \type{trace_file_names} \NC boolean \NC true +\NC + \type {false} disables \TEX's normal file open|-|close feedback (the + assumption is that callbacks will take care of that) +\NC \NR +\NC \type{file_line_error} \NC boolean \NC false +\NC + do \type {file:line} style error messages +\NC \NR +\NC \type{halt_on_error} \NC boolean \NC false +\NC + abort run on the first encountered error +\NC \NR +\NC \type{formatname} \NC string \NC +\NC + if no format name was given on the command line, this key will be tested first + instead of simply quitting +\NC \NR +\NC \type{jobname} \NC string \NC +\NC + if no input file name was given on the command line, this key will be tested + first instead of simply giving up +\NC \NR +\LL +\stoptabulate + +Note: the numeric values that match web2c parameters are only used if \type +{kpse_init} is explicitly set to \type {false}. In all other cases, the normal +values from \type {texmf.cnf} are used. + +\stopsection + +\startsection[title={The \type {texio} library}][library=texio] + +\topicindex{libraries+\type{texio}} +\topicindex{\IO} + +This library takes care of the low|-|level I/O interface: writing to the log file +and|/|or console. + +\startsubsection[title={\type {write}}] + +\libindex{write} + +\startfunctioncall +texio.write( target, s, ...) +texio.write( s, ...) +\stopfunctioncall + +Without the \type {target} argument, writes all given strings to the same +location(s) \TEX\ writes messages to at this moment. If \prm {batchmode} is in +effect, it writes only to the log, otherwise it writes to the log and the +terminal. The optional \type {target} can be one of three possibilities: \type +{term}, \type {log} or \type {term and log}. + +Note: If several strings are given, and if the first of these strings is or might +be one of the targets above, the \type {target} must be specified explicitly to +prevent \LUA\ from interpreting the first string as the target. + +\stopsubsection + +\startsubsection[title={\type {write_nl}}] + +\libindex{write_nl} + +\startfunctioncall +texio.write_nl( target, s, ...) +texio.write_nl( s, ...) +\stopfunctioncall + +This function behaves like \type {texio.write}, but make sure that the given +strings will appear at the beginning of a new line. You can pass a single empty +string if you only want to move to the next line. + +\stopsubsection + +\startsubsection[title={\type {setescape}}] + +\libindex{setescape} + +You can disable \type {^^} escaping of control characters by passing a value of +zero. + +\stopsubsection + +\startsubsection[title={\type {closeinput}}] + +\libindex{closeinput} + +This function that should be used with care. It acts as \prm {endinput} but at +the \LUA\ end. You can use it to (sort of) force a jump back to \TEX. Normally a +\LUA\ will just collect prints and at the end bump an input level and flush these +prints. This function can help you stay at the current level but you need to know +what you're doing (or more precise: what \TEX\ is doing with input). + +\stopsubsection + +\stopsection + +\startsection[title={The \type {token} library}][library=token] + +\startsubsection[title={The scanner}] + +\topicindex{libraries+\type{token}} +\topicindex{tokens} + +\libindex{scan_keyword} +\libindex{scan_keywordcs} +\libindex{scan_int} +\libindex{scan_real} +\libindex{scan_float} +\libindex{scan_dimen} +\libindex{scan_glue} +\libindex{scan_toks} +\libindex{scan_code} +\libindex{scan_string} +\libindex{scan_argument} +\libindex{scan_word} +\libindex{scan_csname} +\libindex{scan_list} + +The token library provides means to intercept the input and deal with it at the +\LUA\ level. The library provides a basic scanner infrastructure that can be used +to write macros that accept a wide range of arguments. This interface is on +purpose kept general and as performance is quite ok. One can build additional +parsers without too much overhead. It's up to macro package writers to see how +they can benefit from this as the main principle behind \LUATEX\ is to provide a +minimal set of tools and no solutions. The scanner functions are probably the +most intriguing. + +\starttabulate[|l|l|p|] +\DB function \BC argument \BC result \NC \NR +\TB +\NC \type{scan_keyword} \NC string \NC returns true if the given keyword is gobbled; as with + the regular \TEX\ keyword scanner this is case insensitive + (and \ASCII\ based) \NC \NR +\NC \type{scan_keywordcs} \NC string \NC returns true if the given keyword is gobbled; this variant + is case sensitive and also suitable for \UTF8 \NC \NR +\NC \type{scan_int} \NC \NC returns an integer \NC \NR +\NC \type{scan_real} \NC \NC returns a number from e.g.\ \type {1}, \type {1.1}, \type {.1} with optional collapsed signs \NC \NR +\NC \type{scan_float} \NC \NC returns a number from e.g.\ \type {1}, \type {1.1}, \type {.1}, \type {1.1E10}, , \type {.1e-10} with optional collapsed signs \NC \NR +\NC \type{scan_dimen} \NC infinity, mu-units \NC returns a number representing a dimension and or two numbers being the filler and order \NC \NR +\NC \type{scan_glue} \NC mu-units \NC returns a glue spec node \NC \NR +\NC \type{scan_toks} \NC definer, expand \NC returns a table of tokens tokens \NC \NR +\NC \type{scan_code} \NC bitset \NC returns a character if its category is in the given bitset (representing catcodes) \NC \NR +\NC \type{scan_string} \NC \NC returns a string given between \type {{}}, as \type {\macro} or as sequence of characters with catcode 11 or 12 \NC \NR +\NC \type{scan_argument} \NC \NC this one is simular to \type {scanstring} but also accepts a \type {\cs} + (which then get expanded) \NC \NR +\NC \type{scan_word} \NC \NC returns a sequence of characters with catcode 11 or 12 as string \NC \NR +\NC \type{scan_csname} \NC \NC returns \type {foo} after scanning \type {\foo} \NC \NR +\NC \type{scan_list} \NC \NC picks up a box specification and returns a \type {[h|v]list} node \NC \NR +\LL +\stoptabulate + +The scanners can be considered stable apart from the one scanning for a token. +The \type {scan_code} function takes an optional number, the \type {keyword} +function a normal \LUA\ string. The \type {infinity} boolean signals that we also +permit \type {fill} as dimension and the \type {mu-units} flags the scanner that +we expect math units. When scanning tokens we can indicate that we are defining a +macro, in which case the result will also provide information about what +arguments are expected and in the result this is separated from the meaning by a +separator token. The \type {expand} flag determines if the list will be expanded. + +The string scanner scans for something between curly braces and expands on the +way, or when it sees a control sequence it will return its meaning. Otherwise it +will scan characters with catcode \type {letter} or \type {other}. So, given the +following definition: + +\startbuffer +\def\bar{bar} +\def\foo{foo-\bar} +\stopbuffer + +\typebuffer \getbuffer + +we get: + +\starttabulate[|l|Tl|l|] +\DB name \BC result \NC \NR +\TB +\NC \type {\directlua{token.scan_string()}{foo}} \NC \directlua{context("{\\red\\type {"..token.scan_string().."}}")} {foo} \NC full expansion \NC \NR +\NC \type {\directlua{token.scan_string()}foo} \NC \directlua{context("{\\red\\type {"..token.scan_string().."}}")} foo \NC letters and others \NC \NR +\NC \type {\directlua{token.scan_string()}\foo} \NC \directlua{context("{\\red\\type {"..token.scan_string().."}}")}\foo \NC meaning \NC \NR +\LL +\stoptabulate + +The \type {\foo} case only gives the meaning, but one can pass an already +expanded definition (\prm {edef}'d). In the case of the braced variant one can of +course use the \prm {detokenize} and \prm {unexpanded} primitives since there we +do expand. + +The \type {scan_word} scanner can be used to implement for instance a number scanner: + +\starttyping +function token.scan_number(base) + return tonumber(token.scan_word(),base) +end +\stoptyping + +This scanner accepts any valid \LUA\ number so it is a way to pick up floats +in the input. + +You can use the \LUA\ interface as follows: + +\starttyping +\directlua { + function mymacro(n) + ... + end +} + +\def\mymacro#1{% + \directlua { + mymacro(\number\dimexpr#1) + }% +} + +\mymacro{12pt} +\mymacro{\dimen0} +\stoptyping + +You can also do this: + +\starttyping +\directlua { + function mymacro() + local d = token.scan_dimen() + ... + end +} + +\def\mymacro{% + \directlua { + mymacro() + }% +} + +\mymacro 12pt +\mymacro \dimen0 +\stoptyping + +It is quite clear from looking at the code what the first method needs as +argument(s). For the second method you need to look at the \LUA\ code to see what +gets picked up. Instead of passing from \TEX\ to \LUA\ we let \LUA\ fetch from +the input stream. + +In the first case the input is tokenized and then turned into a string, then it +is passed to \LUA\ where it gets interpreted. In the second case only a function +call gets interpreted but then the input is picked up by explicitly calling the +scanner functions. These return proper \LUA\ variables so no further conversion +has to be done. This is more efficient but in practice (given what \TEX\ has to +do) this effect should not be overestimated. For numbers and dimensions it saves +a bit but for passing strings conversion to and from tokens has to be done anyway +(although we can probably speed up the process in later versions if needed). + +\stopsubsection + +\startsubsection[title= {Picking up one token}] + +\libindex {get_next} +\libindex {scan_token} +\libindex {expand} + +The scanners look for a sequence. When you want to pick up one token from the +input you use \type {get_next}. This creates a token with the (low level) +properties as discussed next. This token is just the next one. If you want to +enforce expansion first you can use \type {scan_token}. Internally tokens are +characterized by a number that packs a lot of information. In order to access +the bits of information a token is wrapped in a userdata object. + +The \type {expand} function will trigger expansion of the next token in the +input. This can be quite unpredictable but when you call it you probably know +enough about \TEX\ not to be too worried about that. It basically is a call to +the internal expand related function. + +\stopsubsection + +\startsubsection[title={Creating tokens}] + +\libindex{create} +\libindex{new} + +\libindex{is_defined} +\libindex{is_token} +\libindex{biggest_char} + +\libindex{commands} +\libindex{command_id} + +\libindex{get_command} +\libindex{get_cmdname} +\libindex{get_csname} +\libindex{get_id} +\libindex{get_active} +\libindex{get_expandable} +\libindex{get_protected} +\libindex{get_mode} +\libindex{get_index} +\libindex{get_tok} + +\libindex{get_next} + +The creator function can be used as follows: + +\starttyping +local t = token.create("relax") +\stoptyping + +This gives back a token object that has the properties of the \prm {relax} +primitive. The possible properties of tokens are: + +\starttabulate[|l|p|] +\DB name \BC explanation \NC \NR +\TB +\NC \type {command} \NC a number representing the internal command number \NC \NR +\NC \type {cmdname} \NC the type of the command (for instance the catcode in case of a + character or the classifier that determines the internal + treatment \NC \NR +\NC \type {csname} \NC the associated control sequence (if applicable) \NC \NR +\NC \type {id} \NC the unique id of the token \NC \NR +\NC \type {tok} \NC the full token number as stored in \TEX \NC \NR +\NC \type {active} \NC a boolean indicating the active state of the token \NC \NR +\NC \type {expandable} \NC a boolean indicating if the token (macro) is expandable \NC \NR +\NC \type {protected} \NC a boolean indicating if the token (macro) is protected \NC \NR +\NC \type {mode} \NC a number either representing a character or another entity \NC \NR +\NC \type {index} \NC a number running from 0x0000 upto 0xFFFF indicating a \TEX\ register index \NC \NR +\LL +\stoptabulate + +Alternatively you can use a getter \type {get_} to access a property +of a token. + +The numbers that represent a catcode are the same as in \TEX\ itself, so using +this information assumes that you know a bit about \TEX's internals. The other +numbers and names are used consistently but are not frozen. So, when you use them +for comparing you can best query a known primitive or character first to see the +values. + +You can ask for a list of commands: + +\starttyping +local t = token.commands() +\stoptyping + +The id of a token class can be queried as follows: + +\starttyping +local id = token.command_id("math_shift") +\stoptyping + +If you really know what you're doing you can create character tokens by not +passing a string but a number: + +\starttyping +local letter_x = token.create(string.byte("x")) +local other_x = token.create(string.byte("x"),12) +\stoptyping + +Passing weird numbers can give side effects so don't expect too much help with +that. As said, you need to know what you're doing. The best way to explore the +way these internals work is to just look at how primitives or macros or \prm +{chardef}'d commands are tokenized. Just create a known one and inspect its +fields. A variant that ignores the current catcode table is: + +\starttyping +local whatever = token.new(123,12) +\stoptyping + +You can test if a control sequence is defined with \type {is_defined}, which +accepts a string and returns a boolean: + +\starttyping +local okay = token.is_defined("foo") +\stoptyping + +The largest character possible is returned by \type {biggest_char}, just in case you +need to know that boundary condition. + +\stopsubsection + +\startsubsection[title={Macros}] + +\topicindex {macros} + +\libindex{set_macro} +\libindex{get_macro} +\libindex{get_meaning} +\libindex{set_char} +\libindex{set_lua} +\libindex{get_functions_table} + +The \type {set_macro} function can get upto 4 arguments: + +\starttyping +set_macro("csname","content") +set_macro("csname","content","global") +set_macro("csname") +\stoptyping + +You can pass a catcodetable identifier as first argument: + +\starttyping +set_macro(catcodetable,"csname","content") +set_macro(catcodetable,"csname","content","global") +set_macro(catcodetable,"csname") +\stoptyping + +The results are like: + +\starttyping + \def\csname{content} +\gdef\csname{content} + \def\csname{} +\stoptyping + +The \type {get_macro} function can be used to get the content of a macro while +the \type {get_meaning} function gives the meaning including the argument +specification (as usual in \TEX\ separated by \type {->}). + +The \type {set_char} function can be used to do a \prm {chardef} at the +\LUA\ end, where invalid assignments are silently ignored: + +\starttyping +set_char("csname",number) +set_char("csname",number,"global") +\stoptyping + +A special one is the following: + +\starttyping +set_lua("mycode",id) +set_lua("mycode",id,"global","protected") +\stoptyping + +This creates a token that refers to a \LUA\ function with an entry in the table +that you can access with \type {lua.get_functions_table}. It is the companion +to \lpr {luadef}. + +\stopsubsection + +\startsubsection[title={Pushing back}] + +\libindex{get_next} +\libindex{put_next} + +There is a (for now) experimental putter: + +\starttyping +local t1 = token.get_next() +local t2 = token.get_next() +local t3 = token.get_next() +local t4 = token.get_next() +-- watch out, we flush in sequence +token.put_next { t1, t2 } +-- but this one gets pushed in front +token.put_next ( t3, t4 ) +\stoptyping + +When we scan \type {wxyz!} we get \type {yzwx!} back. The argument is either a table +with tokens or a list of tokens. The \type {token.expand} function will trigger +expansion but what happens really depends on what you're doing where. + +\stopsubsection + +\startsubsection[title={Nota bene}] + +When scanning for the next token you need to keep in mind that we're not scanning +like \TEX\ does: expanding, changing modes and doing things as it goes. When we +scan with \LUA\ we just pick up tokens. Say that we have: + +\starttyping +\bar +\stoptyping + +but \type {\bar} is undefined. Normally \TEX\ will then issue an error message. +However, when we have: + +\starttyping +\def\foo{\bar} +\stoptyping + +We get no error, unless we expand \type {\foo} while \type {\bar} is still +undefined. What happens is that as soon as \TEX\ sees an undefined macro it will +create a hash entry and when later it gets defined that entry will be reused. So, +\type {\bar} really exists but can be in an undefined state. + +\startbuffer[demo] +bar : \directlua{tex.print(token.scan_csname())}\bar +foo : \directlua{tex.print(token.scan_csname())}\foo +myfirstbar : \directlua{tex.print(token.scan_csname())}\myfirstbar +\stopbuffer + +\startlines +\getbuffer[demo] +\stoplines + +This was entered as: + +\typebuffer[demo] + +The reason that you see \type {bar} reported and not \type {myfirstbar} is that +\type {\bar} was already used in a previous paragraph. + +If we now say: + +\startbuffer +\def\foo{} +\stopbuffer + +\typebuffer \getbuffer + +we get: + +\startlines +\getbuffer[demo] +\stoplines + +And if we say + +\startbuffer +\def\foo{\bar} +\stopbuffer + +\typebuffer \getbuffer + +we get: + +\startlines +\getbuffer[demo] +\stoplines + +When scanning from \LUA\ we are not in a mode that defines (undefined) macros at +all. There we just get the real primitive undefined macro token. + +\startbuffer +\directlua{local t = token.get_next() tex.print(t.id.." "..t.tok)}\myfirstbar +\directlua{local t = token.get_next() tex.print(t.id.." "..t.tok)}\mysecondbar +\directlua{local t = token.get_next() tex.print(t.id.." "..t.tok)}\mythirdbar +\stopbuffer + +\startlines +\getbuffer +\stoplines + +This was generated with: + +\typebuffer + +So, we do get a unique token because after all we need some kind of \LUA\ object +that can be used and garbage collected, but it is basically the same one, +representing an undefined control sequence. + +\stopsubsection + +\stopsection + +\startsection[title={The \type {kpse} library}][library=kpse] + +\topicindex{libraries+\type{kpse}} + +This library provides two separate, but nearly identical interfaces to the +\KPATHSEA\ file search functionality: there is a \quote {normal} procedural +interface that shares its kpathsea instance with \LUATEX\ itself, and an object +oriented interface that is completely on its own. + +\startsubsection[title={\type {set_program_name} and \type {new}}] + +\libindex{set_program_name} +\libindex{default_texmfcnf} +\libindex{new} + +The way the library looks up variables is driven by the \type {texmf.cmf} file +where the currently set program name acts as filter. You can check what file is +used by with \type {default_texmfcnf}. + +Before the search library can be used at all, its database has to be initialized. +There are three possibilities, two of which belong to the procedural interface. + +First, when \LUATEX\ is used to typeset documents, this initialization happens +automatically and the \KPATHSEA\ executable and program names are set to \type +{luatex} (that is, unless explicitly prohibited by the user's startup script. +See~\in {section} [init] for more details). + +Second, in \TEXLUA\ mode, the initialization has to be done explicitly via the +\type {kpse.set_program_name} function, which sets the \KPATHSEA\ executable +(and optionally program) name. + +\startfunctioncall +kpse.set_program_name( name) +kpse.set_program_name( name, progname) +\stopfunctioncall + +The second argument controls the use of the \quote {dotted} values in the \type +{texmf.cnf} configuration file, and defaults to the first argument. + +Third, if you prefer the object oriented interface, you have to call a different +function. It has the same arguments, but it returns a userdata variable. + +\startfunctioncall +local kpathsea = kpse.new( name) +local kpathsea = kpse.new( name, progname) +\stopfunctioncall + +Apart from these two functions, the calling conventions of the interfaces are +identical. Depending on the chosen interface, you either call \type +{kpse.find_file} or \type {kpathsea:find_file}, with identical arguments and +return values. + +\stopsubsection + +\startsubsection[title={\type {record_input_file} and \type {record_output_file}}] + +\topicindex {files+recording} + +\libindex{record_input_file} +\libindex{record_output_file} + +These two function can be used to register used files. Because callbacks can load +files themselves you might need these helpers (if you use recording at all). + +\startfunctioncall +kpse.record_input_file( name) +kpse.record_output_file( name) +\stopfunctioncall + +\stopsubsection + +\startsubsection[title={\type {find_file}}] + +\topicindex {files+finding} + +\libindex {find_file} + +The most often used function in the library is \type {find_file}: + +\startfunctioncall + f = kpse.find_file( filename) + f = kpse.find_file( filename, ftype) + f = kpse.find_file( filename, mustexist) + f = kpse.find_file( filename, ftype, mustexist) + f = kpse.find_file( filename, ftype, dpi) +\stopfunctioncall + +Arguments: + +\startitemize[intro] + +\sym{filename} + +the name of the file you want to find, with or without extension. + +\sym{ftype} + +maps to the \type {-format} argument of \KPSEWHICH. The supported \type {ftype} +values are the same as the ones supported by the standalone \type {kpsewhich} +program: \startluacode + local list = { + "afm", + "base", + "bib", + "bitmap font", + "bst", + "cid maps", + "clua", + "cmap files", + "cnf", + "cweb", + "dvips config", + "enc files", + "fmt", + "font feature files", + "gf", + "graphic|/|figure", + "ist", + "lig files", + "ls-R", + "lua", + "map", + "mem", + "MetaPost support", + "mf", + "mfpool", + "mft", + "misc fonts", + "mlbib", + "mlbst", + "mp", + "mppool", + "ocp", + "ofm", + "opentype fonts", + "opl", + "other binary files", + "other text files", + "otp", + "ovf", + "ovp", + "pdftex config", + "pk", + "PostScript header", + "subfont definition files", + "tex", + "TeX system documentation", + "TeX system sources", + "texmfscripts", + "texpool", + "tfm", + "Troff fonts", + "truetype fonts", + "type1 fonts", + "type42 fonts", + "vf", + "web", + "web2c files", + } + table.sort(list) + context("{\\tttf \letterpercent, t}",list) +\stopluacode + +The default type is \type {tex}. Note: this is different from \KPSEWHICH, which +tries to deduce the file type itself from looking at the supplied extension. + +\sym{mustexist} + +is similar to \KPSEWHICH's \type {-must-exist}, and the default is \type {false}. +If you specify \type {true} (or a non|-|zero integer), then the \KPSE\ library +will search the disk as well as the \type {ls-R} databases. + +\sym{dpi} + +This is used for the size argument of the formats \type {pk}, \type {gf}, and +\type {bitmap font}. \stopitemize + +\stopsubsection + +\startsubsection[title={\type {lookup}}] + +\libindex{lookup} + +A more powerful (but slower) generic method for finding files is also available. +It returns a string for each found file. + +\startfunctioncall + f, ... = kpse.lookup( filename,
options) +\stopfunctioncall + +The options match commandline arguments from \type {kpsewhich}: + +\starttabulate[|l|l|p|] +\DB key \BC type \BC explanation \NC \NR +\TB +\NC \type{debug} \NC number \NC set debugging flags for this lookup\NC \NR +\NC \type{format} \NC string \NC use specific file type (see list above)\NC \NR +\NC \type{dpi} \NC number \NC use this resolution for this lookup; default 600\NC \NR +\NC \type{path} \NC string \NC search in the given path\NC \NR +\NC \type{all} \NC boolean \NC output all matches, not just the first\NC \NR +\NC \type{mustexist} \NC boolean \NC search the disk as well as ls-R if necessary\NC \NR +\NC \type{mktexpk} \NC boolean \NC disable/enable mktexpk generation for this lookup\NC \NR +\NC \type{mktextex} \NC boolean \NC disable/enable mktextex generation for this lookup\NC \NR +\NC \type{mktexmf} \NC boolean \NC disable/enable mktexmf generation for this lookup\NC \NR +\NC \type{mktextfm} \NC boolean \NC disable/enable mktextfm generation for this lookup\NC \NR +\NC \type{subdir} \NC string + or table \NC only output matches whose directory part + ends with the given string(s) \NC \NR +\LL +\stoptabulate + +\stopsubsection + +\startsubsection[title={\type {init_prog}}] + +\topicindex {initialization+bitmaps} + +\libindex{init_prog} + +Extra initialization for programs that need to generate bitmap fonts. + +\startfunctioncall +kpse.init_prog( prefix, base_dpi, mfmode) +kpse.init_prog( prefix, base_dpi, mfmode, fallback) +\stopfunctioncall + +\stopsubsection + +\startsubsection[title={\type {readable_file}}] + +\libindex{readable_file} + +Test if an (absolute) file name is a readable file. + +\startfunctioncall + f = kpse.readable_file( name) +\stopfunctioncall + +The return value is the actual absolute filename you should use, because the disk +name is not always the same as the requested name, due to aliases and +system|-|specific handling under e.g.\ \MSDOS. Returns \type {nil} if the file +does not exist or is not readable. + +\stopsubsection + +\startsubsection[title={\type {expand_path}}] + +\libindex{expand_path} + +Like kpsewhich's \type {-expand-path}: + +\startfunctioncall + r = kpse.expand_path( s) +\stopfunctioncall + +\stopsubsection + +\startsubsection[title={\type {expand_var}}] + +\libindex{expand_var} + +Like kpsewhich's \type {-expand-var}: + +\startfunctioncall + r = kpse.expand_var( s) +\stopfunctioncall + +\stopsubsection + +\startsubsection[title={\type {expand_braces}}] + +\libindex{expand_braces} + +Like kpsewhich's \type {-expand-braces}: + +\startfunctioncall + r = kpse.expand_braces( s) +\stopfunctioncall + +\stopsubsection + +\startsubsection[title={\type {show_path}}] + +\libindex{show_path} + +Like kpsewhich's \type {-show-path}: + +\startfunctioncall + r = kpse.show_path( ftype) +\stopfunctioncall + +\stopsubsection + +\startsubsection[title={\type {var_value}}] + +\libindex{var_value} + +Like kpsewhich's \type {-var-value}: + +\startfunctioncall + r = kpse.var_value( s) +\stopfunctioncall + +\stopsubsection + +\startsubsection[title={\type {version}}] + +\libindex{version} + +Returns the kpathsea version string. + +\startfunctioncall + r = kpse.version() +\stopfunctioncall + +\stopsubsection + +\stopsection + +\stopchapter + +\stopcomponent diff --git a/manual/luatex-titlepage.tex b/manual/luatex-titlepage.tex index 5a91f73e8..d9ca4b3f9 100644 --- a/manual/luatex-titlepage.tex +++ b/manual/luatex-titlepage.tex @@ -1,53 +1,53 @@ -\environment luatex-style - -\startcomponent luatex-titlepage - -\startstandardmakeup - - \switchtobodyfont - [mainfacemedium] - - \definedfont[Bold*default at \the\dimexpr.06\paperheight\relax] \setupinterlinespace - - \setlayer - [page] - {\useMPgraphic{luapage}} - - \setlayerframed - [page] - [preset=righttop, - location=middletop, - hoffset=.500\measured{paperwidth}, - voffset=.175\measured{paperheight}] - [align=middle, - foregroundcolor=white, - frame=off] - {\documentvariable{manual}\crlf Reference\crlf Manual} - - \definedfont[Bold*default at 14pt] \setupinterlinespace - - \setlayerframed - [page] - [preset=rightbottom, - offset=.025\measured{paperheight}] - [align=flushright, - foregroundcolor=white, - frame=off] - {\doifsomething{\documentvariable{status}}{\documentvariable{status}\par} - \currentdate[month,space,year]\par - Version \documentvariable{version}} - - \setlayerframed - [page] - [preset=middle, - hoffset=-.5\dimexpr\measured{paperwidth}-\measured{spinewidth}\relax] - [width=.7\measured{paperwidth}, - align=normal, - foregroundstyle=\bf, - foregroundcolor=white, - frame=off] - {\getbuffer[backpage]} - -\stopstandardmakeup - -\stopcomponent +\environment luatex-style + +\startcomponent luatex-titlepage + +\startstandardmakeup + + \switchtobodyfont + [mainfacemedium] + + \definedfont[Bold*default at \the\dimexpr.06\paperheight\relax] \setupinterlinespace + + \setlayer + [page] + {\useMPgraphic{luapage}} + + \setlayerframed + [page] + [preset=righttop, + location=middletop, + hoffset=.500\measured{paperwidth}, + voffset=.175\measured{paperheight}] + [align=middle, + foregroundcolor=white, + frame=off] + {\documentvariable{manual}\crlf Reference\crlf Manual} + + \definedfont[Bold*default at 14pt] \setupinterlinespace + + \setlayerframed + [page] + [preset=rightbottom, + offset=.025\measured{paperheight}] + [align=flushright, + foregroundcolor=white, + frame=off] + {\doifsomething{\documentvariable{status}}{\documentvariable{status}\par} + \currentdate[month,space,year]\par + Version \documentvariable{version}} + + \setlayerframed + [page] + [preset=middle, + hoffset=-.5\dimexpr\measured{paperwidth}-\measured{spinewidth}\relax] + [width=.7\measured{paperwidth}, + align=normal, + foregroundstyle=\bf, + foregroundcolor=white, + frame=off] + {\getbuffer[backpage]} + +\stopstandardmakeup + +\stopcomponent diff --git a/manual/luatex.pdf b/manual/luatex.pdf index 572b75d84..23abaa0a5 100644 Binary files a/manual/luatex.pdf and b/manual/luatex.pdf differ diff --git a/manual/luatex.tex b/manual/luatex.tex index 2d1d4efec..0230af738 100644 --- a/manual/luatex.tex +++ b/manual/luatex.tex @@ -1,103 +1,103 @@ -% macros=mkvi - -% \nopdfcompression - -% \disabledirectives[vspacing.synchronizepage] - -% wsl /data/context/runcontext.sh --global --path=/mnt/c/data/develop/context/manuals/mkiv/external/luatex luatex.tex -% -% same runtime as regular context or linux -% author : Hans Hagen with Taco Hoekwater, Luigi Scarso & Hartmut Henkel -% copyright : PRAGMA ADE & ConTeXt Development Team -% license : Creative Commons Attribution ShareAlike 4.0 International -% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions -% origin : the ConTeXt distribution -% -% comment : Because this manual is distributed with TeX distributions it comes with a rather -% liberal license. We try to adapt these documents to upgrades in the (sub)systems -% that they describe. Using parts of the content otherwise can therefore conflict -% with existing functionality and we cannot be held responsible for that. Many of -% the manuals contain characteristic graphics and personal notes or examples that -% make no sense when used out-of-context. -% -% comment : Some (parts of) chapters might have been published in TugBoat, the NTG Maps, the -% ConTeXt Group journal or otherwise. Thanks to the editors for corrections. Also -% thanks to users for testing, feedback and corrections. - -% \tex vs \type vs \syntax vs. \luatex -% \em \it \/ - -% "context --nodates --nocompression luatex" can be used for comparison -% runs, not that we do it - -% todo: all (sub)section to start/stop - -% \enabledirectives[hyphenator.flatten] - -% \setupsynctex[state=start,method=max] % adds 5 pct overhead - -% compoundhyphenmode : looks okay -% endlocalcontrol : very experimental -% fixupboxesmode : very experimental -% mathflattenmode : looks okay -% mathrulethicknessmode : looks okay - -% after adding primitives: context mult-prm.mkiv - -\environment luatex-style - -\startmode[book] - \environment luatex-style-book -\stopmode - -\environment luatex-logos -\environment luatex-private - -\startmode[export] - - \setupbackend - [export=luatex] - -\stopmode - -\startdocument - [manual=Lua\TeX, - status=stable, - version=1.10] - -\startnotmode[*export] - \component luatex-titlepage - \component luatex-firstpage -\stopnotmode - -\startmode[*export] - \component luatex-export-titlepage -\stopmode - -\startfrontmatter - \component luatex-contents - \component luatex-introduction -\stopfrontmatter - -\startbodymatter - \component luatex-preamble - \component luatex-enhancements - \component luatex-modifications - \component luatex-lua - \component luatex-languages - \component luatex-fonts - \component luatex-math - \component luatex-nodes - \component luatex-callbacks - \component luatex-tex - \component luatex-graphics - \component luatex-fontloader - \component luatex-backend -\stopbodymatter - -\startbackmatter - \component luatex-registers - \component luatex-statistics -\stopbackmatter - -\stopdocument +% macros=mkvi + +% \nopdfcompression + +% \disabledirectives[vspacing.synchronizepage] + +% wsl /data/context/runcontext.sh --global --path=/mnt/c/data/develop/context/manuals/mkiv/external/luatex luatex.tex +% +% same runtime as regular context or linux +% author : Hans Hagen with Taco Hoekwater, Luigi Scarso & Hartmut Henkel +% copyright : PRAGMA ADE & ConTeXt Development Team +% license : Creative Commons Attribution ShareAlike 4.0 International +% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions +% origin : the ConTeXt distribution +% +% comment : Because this manual is distributed with TeX distributions it comes with a rather +% liberal license. We try to adapt these documents to upgrades in the (sub)systems +% that they describe. Using parts of the content otherwise can therefore conflict +% with existing functionality and we cannot be held responsible for that. Many of +% the manuals contain characteristic graphics and personal notes or examples that +% make no sense when used out-of-context. +% +% comment : Some (parts of) chapters might have been published in TugBoat, the NTG Maps, the +% ConTeXt Group journal or otherwise. Thanks to the editors for corrections. Also +% thanks to users for testing, feedback and corrections. + +% \tex vs \type vs \syntax vs. \luatex +% \em \it \/ + +% "context --nodates --nocompression luatex" can be used for comparison +% runs, not that we do it + +% todo: all (sub)section to start/stop + +% \enabledirectives[hyphenator.flatten] + +% \setupsynctex[state=start,method=max] % adds 5 pct overhead + +% compoundhyphenmode : looks okay +% endlocalcontrol : very experimental +% fixupboxesmode : very experimental +% mathflattenmode : looks okay +% mathrulethicknessmode : looks okay + +% after adding primitives: context mult-prm.mkiv + +\environment luatex-style + +\startmode[book] + \environment luatex-style-book +\stopmode + +\environment luatex-logos +\environment luatex-private + +\startmode[export] + + \setupbackend + [export=luatex] + +\stopmode + +\startdocument + [manual=Lua\TeX, + status=stable, + version=1.10] + +\startnotmode[*export] + \component luatex-titlepage + \component luatex-firstpage +\stopnotmode + +\startmode[*export] + \component luatex-export-titlepage +\stopmode + +\startfrontmatter + \component luatex-contents + \component luatex-introduction +\stopfrontmatter + +\startbodymatter + \component luatex-preamble + \component luatex-enhancements + \component luatex-modifications + \component luatex-lua + \component luatex-languages + \component luatex-fonts + \component luatex-math + \component luatex-nodes + \component luatex-callbacks + \component luatex-tex + \component luatex-graphics + \component luatex-fontloader + \component luatex-backend +\stopbodymatter + +\startbackmatter + \component luatex-registers + \component luatex-statistics +\stopbackmatter + +\stopdocument diff --git a/source/Build b/source/Build index 898cbb9d2..5c5bbc88d 100755 --- a/source/Build +++ b/source/Build @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: Build 48808 2018-10-02 01:55:09Z karl $ +# $Id: Build 51486 2019-06-27 00:06:35Z preining $ # Public domain. Originally written many years ago by Sebastian Rahtz. # The basic idea is to run configure && make, but with a multitude of # environment variables to allow overriding everything. @@ -15,8 +15,10 @@ LANG=C; export LANG # cd to our source directory. mydir=`dirname $0` cd $mydir || exit 1 +mydir=`pwd` # make absolute -: ${TL_WORKDIR=Work} +# We export the TL_* variables so that they can be dumped to buildenv.log. +: ${TL_WORKDIR=Work}; export TL_WORKDIR # allow override of install destination. if test -z "$TL_INSTALL_DEST"; then @@ -24,6 +26,7 @@ if test -z "$TL_INSTALL_DEST"; then test -d inst || mkdir -p inst/texmf # avoid configure warnings TL_INSTALL_DEST=$H/inst fi +export TL_INSTALL_DEST # allow override of the make program. # The idea is to use TL_MAKE if that is defined (and set MAKE), @@ -39,14 +42,14 @@ else TL_MAKE=make MAKE=make fi -export MAKE +export MAKE; export TL_MAKE # make flags -: ${TL_MAKE_FLAGS=} -: ${TL_MAKE_VERBOSE=VERBOSE=1} +: ${TL_MAKE_FLAGS=}; export TL_MAKE_FLAGS +: ${TL_MAKE_VERBOSE=VERBOSE=1}; export TL_MAKE_VERBOSE # allow override of make target. -: ${TL_TARGET=world} +: ${TL_TARGET=world}; export TL_TARGET if test "x$1" = x--no-clean; then shift @@ -56,7 +59,7 @@ else fi # allow adding environment setting for build. -: ${TL_BUILD_ENV=} +: ${TL_BUILD_ENV=}; export TL_BUILD_ENV if test "x$1" = x--debug || test "x$1" = x-g; then shift # The idea is that with Build -g, you can set TL_COMPILER_GFLAGS in @@ -64,42 +67,43 @@ if test "x$1" = x--debug || test "x$1" = x-g; then # not necessarily anything to do with debugging, e.g., -mcpu=sparvc9. # Or you can set TL_{C,CXX,OBJCXX}FLAGS for per-language flags, # notably TL_CFLAGS=-Wdeclaration-after-statement. - : ${TL_COMPILER_GFLAGS=-g} + : ${TL_COMPILER_GFLAGS=-g}; export TL_COMPILER_CFLAGS c="CFLAGS='$TL_COMPILER_GFLAGS $TL_CFLAGS'" cxx="CXXFLAGS='$TL_COMPILER_GFLAGS $TL_CXXFLAGS'" objcxx="OBJCXXFLAGS='$TL_COMPILER_GFLAGS $TL_OBJCXXFLAGS'" # only for macs TL_BUILD_ENV="$c $cxx $objcxx $TL_BUILD_ENV" fi -# allow override of configure location. -: ${TL_CONFIGURE=../configure} - # allow for changing the banner identification, e.g., # --with-banner-add='/SomeDistro'; see the build doc. -: ${TL_CONF_BANNER=} +: ${TL_CONF_BANNER=}; export TL_CONF_BANNER # default to supporting large files as much as possible; # see comments at --disable-largefile in README.config. -: ${TL_CONF_LARGEFILE=--enable-largefile} +: ${TL_CONF_LARGEFILE=--enable-largefile}; export TL_CONF_LARGEFILE # default to terminate if requested programs or features must be disabled. -: ${TL_CONF_MISSING=--disable-missing} +: ${TL_CONF_MISSING=--disable-missing}; export TL_CONF_MISSING # default to static linking. -: ${TL_CONF_SHARED=--disable-shared} +: ${TL_CONF_SHARED=--disable-shared}; export TL_CONF_SHARED # allow override of xdvi toolkit, default to standard xaw. : ${TL_CONF_XDVI_TOOLKIT=--with-xdvi-x-toolkit=xaw} +export TL_CONF_XDVI_TOOLKIT + +# allow override of configure location. +: ${TL_CONFIGURE=../configure}; export TL_CONFIGURE # allow adding arbitrary other configure args, after all the others. -: ${TL_CONFIGURE_ARGS=} +: ${TL_CONFIGURE_ARGS=}; export TL_CONFIGURE_ARGS # allow for doing stuff betwen configure and make. -: ${TL_POSTCONFIGURE=true} +: ${TL_POSTCONFIGURE=true}; export TL_POSTCONFIGURE # Kpathsea is not going to be able to find its cnf files during the # build, so omit the warning about it. -: ${KPATHSEA_WARNING=0} +: ${KPATHSEA_WARNING=0}; export KPATHSEA_WARNING # make our working directory. test -d $TL_WORKDIR || mkdir $TL_WORKDIR @@ -109,11 +113,12 @@ cd $TL_WORKDIR || exit 1 # failure at either step. { echo "starting TeX Live build at `date`" - echo "on `uname -a`" - echo "in `pwd`" - echo "$0 $*" - echo + printf 'CMDLINE\t"%s"\n' "$0 $*" + printf 'PWD\t"%s"\n' "`pwd`" + printf 'UNAME\t"%s"\n' "`uname`" env | sort >buildenv.log + echo "See also buildenv.log and buildinfo.log in `pwd`" + echo # set -vx # show the configure and make commands in the log. @@ -130,7 +135,7 @@ cd $TL_WORKDIR || exit 1 && eval $TL_POSTCONFIGURE \ && eval $TL_BUILD_ENV $TL_MAKE $TL_MAKE_FLAGS $TL_MAKE_VERBOSE $TL_TARGET - # Too arcane to try to propagate the exit status through a pipeline. + # Too arcane to propagate the exit status through a pipeline. # Just use a temp file. echo $? >exitstatus.txt } 2>&1 | tee build.log @@ -145,7 +150,7 @@ if test -d "$bindir"; then echo "$0: $count executables in $bindir." else echo "$0: Build failed, no executables under $bindir." - echo "$0: Full log in `pwd`/build.log." + echo "$0: Full log in: `pwd`/build.log" exit 1 fi | tee -a build.log # if no bindir, perhaps they specified --prefix; don't worry. diff --git a/source/ChangeLog b/source/ChangeLog index 5e8181085..113e709f2 100644 --- a/source/ChangeLog +++ b/source/ChangeLog @@ -1,3 +1,44 @@ +2019-06-25 Karl Berry + + * Build: don't call buildinfo from here, the output when the CC + etc. envvars are not set is too misleading. Just write UNAME. + +2019-06-24 Karl Berry + + * doc/buildinfo.sh (compiler_version): new shell function; + ignore useless first "Configured:" line for gcc->cc on Macs. + +2019-06-23 Karl Berry + + * doc/buildinfo.sh: output the compiler/other names + that we pass from the buildinfo target. + * Makefile.am (buildinfo): pass OBJCXX, not OBJC. + * Build: more maintainable exports of TL_*. + +2019-06-22 Karl Berry + + * doc/buildinfo.sh: rename from build-info.sh; + forget /etc/issue; + allow option to omit config.status output; + do not dump environment; + run lsb_release -a. We'll see ... + * Build: use buildinfo.sh instead of inline commands (mostly). + * Makefile.am (buildinfo): make dependency of all-recursive + so that it runs first; rename from build-info; remove from world. + +2019-06-06 Karl Berry + + * Makefile.am (world): make build-info. + (build-info): new target to invoke doc/build-info.sh. + (build_info_target): new variable. + * Build: export TL_* variables so build-info.sh can report them. + * doc/build-info.sh: new script to report compiler versions, + dump environment, config.status, etc. + +2019-05-03 Karl Berry + + * version.ac: 2020/dev. + 2019-04-07 Karl Berry * tardate.ac (tex_live_tardate): let's hope for 2019-04-07. diff --git a/source/Makefile.am b/source/Makefile.am index 05b236d22..aa14301f2 100644 --- a/source/Makefile.am +++ b/source/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am 43493 2017-03-14 00:03:01Z karl $ +## $Id: Makefile.am 51428 2019-06-23 17:20:20Z karl $ ## Makefile.am for the TeX Live top-level ## ## Copyright 2016 Karl Berry @@ -42,25 +42,40 @@ recurse_top = include $(srcdir)/am/recurse.am -# This is the default target for the Build script in TeX Live. +# This (world) is the default target for the ./Build script in TeX Live. .PHONY: world # Run texlinks here since the binaries won't be there # at install-data, and fmtutil.cnf won't be there at install-exec, # and there is no install-hook or install-local. texlinks_dir = texk/texlive/tl_scripts world: all -## Serialize 'make all' and 'make install-strip'. +# Serialize 'make all' and 'make install-strip'. @echo "top-level make $@: running install-strip..." $(MAKE) $(AM_MAKEFLAGS) install-strip -## - @echo "top-level make $@: running texlinks in $(texlinks_dir) ..." +# + @echo "top-level make $@: making run-texlinks in $(texlinks_dir) ..." cd $(texlinks_dir) && $(MAKE) $(AM_MAKEFLAGS) run-texlinks -## +# @echo "top-level make $@: running $(check_target)..." $(MAKE) $(AM_MAKEFLAGS) $(check_target) -## +# @echo "top-level make $@ done." +# create file buildinfo.log in working directory, to record relevant +# information about the build environment. +buildinfo: + -env MAKE="$(MAKE)" LDFLAGS="$(LDFLAGS)" \ + CC="$(CC)" CFLAGS="$(CFLAGS)" \ + CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \ + OBJCXX="$(OBJCXX)" OBJCXXFLAGS="$(OBJCXXFLAGS)" \ + $(srcdir)/doc/buildinfo.sh >buildinfo.log + +# should be harmless to run it, but just in case: +build_info_target = buildinfo + +# run buildinfo first. +all-recursive: buildinfo + install-exec-hook: @echo "WARNING: make install does not result in a usable TeX!" @echo " ! The binaries require the myriad support files." diff --git a/source/Makefile.in b/source/Makefile.in index e1f2bc710..9df7d0534 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -124,6 +124,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \ $(top_srcdir)/texk/web2c/ac/web2c.ac \ $(top_srcdir)/texk/texlive/ac/withenable.ac \ $(top_srcdir)/texk/texlive/ac/texlive.ac \ + $(top_srcdir)/libs/harfbuzz/ac/withenable.ac \ + $(top_srcdir)/libs/graphite2/ac/withenable.ac \ $(top_srcdir)/libs/zziplib/ac/withenable.ac \ $(top_srcdir)/libs/libpng/ac/withenable.ac \ $(top_srcdir)/libs/luajit/ac/withenable.ac \ @@ -135,6 +137,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \ $(top_srcdir)/libs/zlib/ac/zlib.ac \ $(top_srcdir)/libs/libpng/ac/libpng.ac \ $(top_srcdir)/libs/zziplib/ac/zziplib.ac \ + $(top_srcdir)/libs/graphite2/ac/graphite2.ac \ + $(top_srcdir)/libs/harfbuzz/ac/harfbuzz.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -436,6 +440,9 @@ CONFIG_AUX = $(recurse_top)subsubdir-conf.cmd # at install-data, and fmtutil.cnf won't be there at install-exec, # and there is no install-hook or install-local. texlinks_dir = texk/texlive/tl_scripts + +# should be harmless to run it, but just in case: +build_info_target = buildinfo @cross_FALSE@check_target = check # Allow for skipping make check if needed. @@ -952,17 +959,33 @@ $(CONFIG_AUX): @echo "configure in $(recurse_top)auxdir/auxsub failed to create the file $@" exit 1 -# This is the default target for the Build script in TeX Live. +# This (world) is the default target for the ./Build script in TeX Live. .PHONY: world world: all +# Serialize 'make all' and 'make install-strip'. @echo "top-level make $@: running install-strip..." $(MAKE) $(AM_MAKEFLAGS) install-strip - @echo "top-level make $@: running texlinks in $(texlinks_dir) ..." +# + @echo "top-level make $@: making run-texlinks in $(texlinks_dir) ..." cd $(texlinks_dir) && $(MAKE) $(AM_MAKEFLAGS) run-texlinks +# @echo "top-level make $@: running $(check_target)..." $(MAKE) $(AM_MAKEFLAGS) $(check_target) +# @echo "top-level make $@ done." +# create file buildinfo.log in working directory, to record relevant +# information about the build environment. +buildinfo: + -env MAKE="$(MAKE)" LDFLAGS="$(LDFLAGS)" \ + CC="$(CC)" CFLAGS="$(CFLAGS)" \ + CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \ + OBJCXX="$(OBJCXX)" OBJCXXFLAGS="$(OBJCXXFLAGS)" \ + $(srcdir)/doc/buildinfo.sh >buildinfo.log + +# run buildinfo first. +all-recursive: buildinfo + install-exec-hook: @echo "WARNING: make install does not result in a usable TeX!" @echo " ! The binaries require the myriad support files." diff --git a/source/README b/source/README index 1cbe89d63..042246a1c 100644 --- a/source/README +++ b/source/README @@ -1,4 +1,4 @@ -$Id: README 50267 2019-03-06 22:50:00Z karl $ +$Id: README 51181 2019-05-21 21:34:13Z karl $ Public domain. Originally written 2005 by Karl Berry. For a high-level overview of building TeX Live, see @@ -25,6 +25,7 @@ that document). Build information for some of the platforms. +See also Master/tlpkg/bin/tl-update-bindir aarch64-linux: aarch64 Debian GNU/Linux 9 (stretch) @@ -39,7 +40,8 @@ i386-netbsd, amd64-netbsd: ./Build --enable-xindy CLISP=/usr/local/bin/clisp i386-freebsd, amd64-freebsd: - http://anthesphoria.net/FreeBSD/TeXLive-2018/ has all details. + http://anthesphoria.net/FreeBSD/TeXLive-2018/ has details for 2018. + 2019 built on contextgarden, see below. i386-linux: see travis below. @@ -48,6 +50,7 @@ i386-openbsd, amd64-openbsd: http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/print/texlive/base/ i386-solaris, x86_64-solaris: + Built on contextgarden, see below. Solaris 10, gcc 5.5. See doc/README.solaris. i386-cygwin, x86_64-cygwin: gcc-4.8.2, cygwin-1.7.29. @@ -68,32 +71,3 @@ x86_64-linuxmusl: Binaries are taken from the CI testing on travis-ci see the source/.travis.yaml file for details on how to build, and tlpkg/bin/tl-update-bindir for updating binaries (in general). - -x86_64-linux-glibc2.12, on CentOS6: -#!/bin/sh -x -# Public domain. -# in ~/.subversion/config: use-commit-times=yes -# mkdir /usr/local/src/tl -# cd !$ -# svn -q co svn://tug.org/texlive/branches/branch2018/Build/source -# rm -rf source/libs/icu source/libs/poppler # to avoid configuring them -# -cd /usr/local/src/tl || exit 1 -# -debug=-g # for debugging, no optimization -# -./Build \ - $debug \ - -C \ - --disable-xetex \ - --disable-luatex \ - --disable-luajittex \ - --disable-luatex53 \ - --disable-dvisvgm \ - --disable-bibtexu \ - --disable-upmendex \ - --disable-poppler \ - --without-system-icu \ - --without-system-poppler \ - --enable-native-texlive-build \ -exit $? diff --git a/source/build-aux/ar-lib b/source/build-aux/ar-lib index 0baa4f607..f64465e4f 100755 --- a/source/build-aux/ar-lib +++ b/source/build-aux/ar-lib @@ -2,9 +2,9 @@ # Wrapper for Microsoft lib.exe me=ar-lib -scriptversion=2012-03-01.08; # UTC +scriptversion=2019-07-04.01; # UTC -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2019 Free Software Foundation, Inc. # Written by Peter Rosin . # # This program is free software; you can redistribute it and/or modify @@ -224,10 +224,11 @@ elif test -n "$extract"; then esac done else - $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member - do - $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? - done + $AR -NOLOGO -LIST "$archive" | tr -d '\r' | sed -e 's/\\/\\\\/g' \ + | while read member + do + $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? + done fi elif test -n "$quick$replace"; then diff --git a/source/build-aux/config.guess b/source/build-aux/config.guess index 79d1317f5..7f9ebbe31 100755 --- a/source/build-aux/config.guess +++ b/source/build-aux/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2019 Free Software Foundation, Inc. -timestamp='2019-03-04' +timestamp='2019-09-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -262,6 +262,9 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:SolidBSD:*:*) echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" exit ;; + *:OS108:*:*) + echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE" + exit ;; macppc:MirBSD:*:*) echo powerpc-unknown-mirbsd"$UNAME_RELEASE" exit ;; @@ -271,12 +274,15 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:Sortix:*:*) echo "$UNAME_MACHINE"-unknown-sortix exit ;; + *:Twizzler:*:*) + echo "$UNAME_MACHINE"-unknown-twizzler + exit ;; *:Redox:*:*) echo "$UNAME_MACHINE"-unknown-redox exit ;; mips:OSF1:*.*) - echo mips-dec-osf1 - exit ;; + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -1325,38 +1331,39 @@ EOF echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - set_cc_for_build - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc + UNAME_PROCESSOR=`uname -p` + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + if command -v xcode-select > /dev/null 2> /dev/null && \ + ! xcode-select --print-path > /dev/null 2> /dev/null ; then + # Avoid executing cc if there is no toolchain installed as + # cc will be a stub that puts up a graphical alert + # prompting the user to install developer tools. + CC_FOR_BUILD=no_compiler_found + else + set_cc_for_build fi - if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc - if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_PPC >/dev/null - then - UNAME_PROCESSOR=powerpc - fi + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc fi elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 + # uname -m returns i386 or x86_64 + UNAME_PROCESSOR=$UNAME_MACHINE fi echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; @@ -1468,6 +1475,14 @@ cat > "$dummy.c" < #include #endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#include +#if defined(_SIZE_T_) || defined(SIGLOST) +#include +#endif +#endif +#endif main () { #if defined (sony) @@ -1554,19 +1569,24 @@ main () #else printf ("vax-dec-bsd\n"); exit (0); #endif +#else +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname un; + uname (&un); + printf ("vax-dec-ultrix%s\n", un.release); exit (0); #else printf ("vax-dec-ultrix\n"); exit (0); #endif #endif +#endif #if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) #if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) -#include -#if defined(_SIZE_T_) /* >= ULTRIX4 */ - printf ("mips-dec-ultrix4\n"); exit (0); +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname *un; + uname (&un); + printf ("mips-dec-ultrix%s\n", un.release); exit (0); #else -#if defined(ULTRIX3) || defined(ultrix3) || defined(SIGLOST) - printf ("mips-dec-ultrix3\n"); exit (0); -#endif + printf ("mips-dec-ultrix\n"); exit (0); #endif #endif #endif diff --git a/source/build-aux/config.sub b/source/build-aux/config.sub index a44fd8ae9..0f2234c17 100755 --- a/source/build-aux/config.sub +++ b/source/build-aux/config.sub @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2019 Free Software Foundation, Inc. -timestamp='2019-01-05' +timestamp='2019-06-30' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -337,17 +337,14 @@ case $1 in basic_machine=m88k-harris os=sysv3 ;; - hp300) + hp300 | hp300hpux) basic_machine=m68k-hp + os=hpux ;; hp300bsd) basic_machine=m68k-hp os=bsd ;; - hp300hpux) - basic_machine=m68k-hp - os=hpux - ;; hppaosf) basic_machine=hppa1.1-hp os=osf @@ -360,10 +357,6 @@ case $1 in basic_machine=i386-mach os=mach ;; - vsta) - basic_machine=i386-pc - os=vsta - ;; isi68 | isi) basic_machine=m68k-isi os=sysv @@ -612,6 +605,10 @@ case $1 in basic_machine=vax-dec os=vms ;; + vsta) + basic_machine=i386-pc + os=vsta + ;; vxworks960) basic_machine=i960-wrs os=vxworks @@ -1172,7 +1169,7 @@ case $cpu-$vendor in | asmjs \ | ba \ | be32 | be64 \ - | bfin | bs2000 \ + | bfin | bpf | bs2000 \ | c[123]* | c30 | [cjt]90 | c4x \ | c8051 | clipper | craynv | csky | cydra \ | d10v | d30v | dlx | dsp16xx \ @@ -1247,7 +1244,8 @@ case $cpu-$vendor in | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ | vax \ | visium \ - | w65 | wasm32 \ + | w65 \ + | wasm32 | wasm64 \ | we32k \ | x86 | x86_64 | xc16x | xgate | xps100 \ | xstormy16 | xtensa* \ @@ -1345,11 +1343,11 @@ case $os in | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ | sym* | kopensolaris* | plan9* \ | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ - | aos* | aros* | cloudabi* | sortix* \ + | aos* | aros* | cloudabi* | sortix* | twizzler* \ | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ | knetbsd* | mirbsd* | netbsd* \ - | bitrig* | openbsd* | solidbsd* | libertybsd* \ + | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \ | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \ | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ @@ -1367,7 +1365,8 @@ case $os in | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ | skyos* | haiku* | rdos* | toppers* | drops* | es* \ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ - | midnightbsd* | amdhsa* | unleashed* | emscripten*) + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ + | nsk* | powerunix) # Remember, each alternative MUST END IN *, to match a version number. ;; qnx*) @@ -1451,9 +1450,6 @@ case $os in ns2) os=nextstep2 ;; - nsk*) - os=nsk - ;; # Preserve the version number of sinix5. sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` diff --git a/source/build-aux/install-sh b/source/build-aux/install-sh index 8175c640f..20d8b2eae 100755 --- a/source/build-aux/install-sh +++ b/source/build-aux/install-sh @@ -451,7 +451,18 @@ do trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # diff --git a/source/build-aux/texinfo.tex b/source/build-aux/texinfo.tex index 192284ccc..1ea515b2a 100644 --- a/source/build-aux/texinfo.tex +++ b/source/build-aux/texinfo.tex @@ -1,10 +1,9 @@ % texinfo.tex -- TeX macros to handle Texinfo files. -% +% % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2019-03-03.15} - +\def\texinfoversion{2019-09-24.13} % % Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc. % @@ -219,7 +218,7 @@ % @errormsg{MSG}. Do the index-like expansions on MSG, but if things % aren't perfect, it's not the end of the world, being an error message, % after all. -% +% \def\errormsg{\begingroup \indexnofonts \doerrormsg} \def\doerrormsg#1{\errmessage{#1}} @@ -324,9 +323,9 @@ % the output routine. The saved contents are valid until we actually % \shipout a page. % -% (We used to run a short output routine to actually set \topmark and -% \firstmark to the right values, but if this was called with an empty page -% containing whatsits for writing index entries, the whatsits would be thrown +% (We used to run a short output routine to actually set \topmark and +% \firstmark to the right values, but if this was called with an empty page +% containing whatsits for writing index entries, the whatsits would be thrown % away and the index auxiliary file would remain empty.) % \newtoks\savedtopmark @@ -366,7 +365,7 @@ \let\thischapterheading\thischapter \else % \thischapterheading is the same as \thischapter except it is blank - % for the first page of a chapter. This is to prevent the chapter name + % for the first page of a chapter. This is to prevent the chapter name % being shown twice. \def\thischapterheading{}% \fi @@ -387,14 +386,8 @@ % take effect in \write's, yet the group defined by the \vbox ends % before the \shipout runs. % - \indexdummies % don't expand commands in the output. - \normalturnoffactive % \ in index entries must not stay \, e.g., if - % the page break happens to be in the middle of an example. - % We don't want .vr (or whatever) entries like this: - % \entry{{\indexbackslash }acronym}{32}{\code {\acronym}} - % "\acronym" won't work when it's read back in; - % it needs to be - % {\code {{\backslashcurfont }acronym} + \atdummies % don't expand commands in the output. + \turnoffactive \shipout\vbox{% % Do this early so pdf references go to the beginning of the page. \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi @@ -455,11 +448,10 @@ }% } -% First remove any @comment, then any @c comment. Also remove a @texinfoc -% comment (see \scanmacro for details). Pass the result on to \argcheckspaces. +% First remove any @comment, then any @c comment. Pass the result on to +% \argcheckspaces. \def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm} -\def\argremovec#1\c#2\ArgTerm{\argremovetexinfoc #1\texinfoc\ArgTerm} -\def\argremovetexinfoc#1\texinfoc#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm} +\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm} % Each occurrence of `\^^M' or `\^^M' is replaced by a single space. % @@ -1060,7 +1052,7 @@ tex.sprint( string.format(string.char(0x5c) .. string.char(0x25) .. '03o' .. string.char(0x5c) .. string.char(0x25) .. '03o', - (c / 256), (c % 256))) + math.floor(c / 256), math.floor(c % 256))) else c = c - 0x10000 local c_hi = c / 1024 + 0xd800 @@ -1070,8 +1062,8 @@ string.char(0x5c) .. string.char(0x25) .. '03o' .. string.char(0x5c) .. string.char(0x25) .. '03o' .. string.char(0x5c) .. string.char(0x25) .. '03o', - (c_hi / 256), (c_hi % 256), - (c_lo / 256), (c_lo % 256))) + math.floor(c_hi / 256), math.floor(c_hi % 256), + math.floor(c_lo / 256), math.floor(c_lo % 256))) end end end @@ -1084,15 +1076,19 @@ function PDFescstr(str) for c in string.bytes(str) do if c <= 0x20 or c >= 0x80 or c == 0x28 or c == 0x29 or c == 0x5c then - tex.sprint( + tex.sprint(-2, string.format(string.char(0x5c) .. string.char(0x25) .. '03o', c)) else - tex.sprint(string.char(c)) + tex.sprint(-2, string.char(c)) end end end } + % The -2 in the arguments here gives all the input to TeX catcode 12 + % (other) or 10 (space), preventing undefined control sequence errors. See + % https://lists.gnu.org/archive/html/bug-texinfo/2019-08/msg00031.html + % \endgroup \def\pdfescapestring#1{\directlua{PDFescstr('\luaescapestring{#1}')}} \ifnum\luatexversion>84 @@ -1131,11 +1127,21 @@ \fi \fi +\newif\ifpdforxetex +\pdforxetexfalse +\ifpdf + \pdforxetextrue +\fi +\ifx\XeTeXrevision\thisisundefined\else + \pdforxetextrue +\fi + + % PDF uses PostScript string constants for the names of xref targets, % for display in the outlines, and in other places. Thus, we have to % double any backslashes. Otherwise, a name like "\node" will be % interpreted as a newline (\n), followed by o, d, e. Not good. -% +% % See http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html and % related messages. The final outcome is that it is up to the TeX user % to double the backslashes and otherwise make the string valid, so @@ -1440,7 +1446,7 @@ % their "best" equivalent, based on the @documentencoding. Too % much work for too little return. Just use the ASCII equivalents % we use for the index sort strings. - % + % \indexnofonts \setupdatafile % We can have normal brace characters in the PDF outlines, unlike @@ -2173,7 +2179,7 @@ % A few fonts for @defun names and args. \setfont\defbf\bfshape{10}{\magstep1}{OT1} \setfont\deftt\ttshape{10}{\magstep1}{OT1TT} -\setfont\defsl\slshape{10}{\magstep1}{OT1TT} +\setfont\defsl\slshape{10}{\magstep1}{OT1} \setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT} \def\df{\let\ttfont=\deftt \let\bffont = \defbf \let\ttslfont=\defttsl \let\slfont=\defsl \bf} @@ -2321,7 +2327,7 @@ % A few fonts for @defun names and args. \setfont\defbf\bfshape{10}{\magstephalf}{OT1} \setfont\deftt\ttshape{10}{\magstephalf}{OT1TT} -\setfont\defsl\slshape{10}{\magstephalf}{OT1TT} +\setfont\defsl\slshape{10}{\magstephalf}{OT1} \setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT} \def\df{\let\ttfont=\deftt \let\bffont = \defbf \let\slfont=\defsl \let\ttslfont=\defttsl \bf} @@ -2724,7 +2730,7 @@ } % Commands to set the quote options. -% +% \parseargdef\codequoteundirected{% \def\temp{#1}% \ifx\temp\onword @@ -2765,7 +2771,7 @@ % If we are in a monospaced environment, however, 1) always use \ttsl, % and 2) do not add an italic correction. \def\dosmartslant#1#2{% - \ifusingtt + \ifusingtt {{\ttsl #2}\let\next=\relax}% {\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}% \next @@ -2844,7 +2850,7 @@ % @t, explicit typewriter. \def\t#1{% - {\tt \rawbackslash \plainfrenchspacing #1}% + {\tt \plainfrenchspacing #1}% \null } @@ -2871,7 +2877,6 @@ % Turn off hyphenation. \nohyphenation % - \rawbackslash \plainfrenchspacing #1% }% @@ -2913,14 +2918,14 @@ \gdef\codedash{\futurelet\next\codedashfinish} \gdef\codedashfinish{% \normaldash % always output the dash character itself. - % + % % Now, output a discretionary to allow a line break, unless % (a) the next character is a -, or % (b) the preceding character is a -. % E.g., given --posix, we do not want to allow a break after either -. % Given --foo-bar, we do want to allow a break between the - and the b. \ifx\next\codedash \else - \ifx\codedashprev\codedash + \ifx\codedashprev\codedash \else \discretionary{}{}{}\fi \fi % we need the space after the = for the case when \next itself is a @@ -3002,7 +3007,7 @@ % For pdfTeX and LuaTeX \ifurefurlonlylink % PDF plus option to not display url, show just arg - \unhbox0 + \unhbox0 \else % PDF, normally display both arg and url for consistency, % visibility, if the pdf is eventually used to print, etc. @@ -3015,7 +3020,7 @@ % For XeTeX \ifurefurlonlylink % PDF plus option to not display url, show just arg - \unhbox0 + \unhbox0 \else % PDF, normally display both arg and url for consistency, % visibility, if the pdf is eventually used to print, etc. @@ -3073,10 +3078,10 @@ } } -% By default we'll break after the special characters, but some people like to -% break before the special chars, so allow that. Also allow no breaking at +% By default we'll break after the special characters, but some people like to +% break before the special chars, so allow that. Also allow no breaking at % all, for manual control. -% +% \parseargdef\urefbreakstyle{% \def\txiarg{#1}% \ifx\txiarg\wordnone @@ -3094,12 +3099,17 @@ \def\wordbefore{before} \def\wordnone{none} -% Allow a ragged right output to aid breaking long URL's. Putting stretch in -% between characters of the URL doesn't look good. +% Allow a ragged right output to aid breaking long URL's. There can +% be a break at the \allowbreak with no extra glue (if the existing stretch in +% the line is sufficent), a break at the \penalty100 with extra glue added +% at the end of the line, or no break at all here. +% Changing the value of the penalty and/or the amount of stretch affects how +% preferrable one choice is over the other. \def\urefallowbreak{% - \hskip 0pt plus 1fil\relax \allowbreak - \hskip 0pt plus -1fil\relax + \hskip 0pt plus 4 em\relax + \penalty100 + \hskip 0pt plus -4 em\relax } \urefbreakstyle after @@ -3112,7 +3122,7 @@ % So now @email is just like @uref, unless we are pdf. % %\def\email#1{\angleleft{\tt #1}\angleright} -\ifpdf +\ifpdforxetex \def\email#1{\doemail#1,,\finish} \def\doemail#1,#2,#3\finish{\begingroup \unsepspaces @@ -3122,18 +3132,7 @@ \endlink \endgroup} \else - \ifx\XeTeXrevision\thisisundefined - \let\email=\uref - \else - \def\email#1{\doemail#1,,\finish} - \def\doemail#1,#2,#3\finish{\begingroup - \unsepspaces - \pdfurl{mailto:#1}% - \setbox0 = \hbox{\ignorespaces #2}% - \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi - \endlink - \endgroup} - \fi + \let\email=\uref \fi % @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always), @@ -3309,7 +3308,7 @@ % @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}. % Ignore unless FMTNAME == tex; then it is like @iftex and @tex, % except specified as a normal braced arg, so no newlines to worry about. -% +% \def\outfmtnametex{tex} % \long\def\inlinefmt#1{\doinlinefmt #1,\finish} @@ -3317,7 +3316,7 @@ \def\inlinefmtname{#1}% \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi } -% +% % @inlinefmtifelse{FMTNAME,THEN-TEXT,ELSE-TEXT} expands THEN-TEXT if % FMTNAME is tex, else ELSE-TEXT. \long\def\inlinefmtifelse#1{\doinlinefmtifelse #1,,,\finish} @@ -3333,7 +3332,7 @@ % *right* brace they would have to use a command anyway, so they may as % well use a command to get a left brace too. We could re-use the % delimiter character idea from \verb, but it seems like overkill. -% +% \long\def\inlineraw{\tex \doinlineraw} \long\def\doinlineraw#1{\doinlinerawtwo #1,\finish} \def\doinlinerawtwo#1,#2,\finish{% @@ -3610,7 +3609,7 @@ % for non-CM glyphs. That is ec* for regular text and tc* for the text % companion symbols (LaTeX TS1 encoding). Both are part of the ec % package and follow the same conventions. -% +% \def\ecfont{\etcfont{e}} \def\tcfont{\etcfont{t}} % @@ -3682,7 +3681,7 @@ after the title page.}}% \def\setshortcontentsaftertitlepage{% \errmessage{@setshortcontentsaftertitlepage has been removed as a Texinfo - command; move your @shortcontents and @contents commands if you + command; move your @shortcontents and @contents commands if you want the contents after the title page.}}% \parseargdef\shorttitlepage{% @@ -3737,7 +3736,7 @@ % don't worry much about spacing, ragged right. This should be used % inside a \vbox, and fonts need to be set appropriately first. \par should % be specified before the end of the \vbox, since a vbox is a group. -% +% \def\raggedtitlesettings{% \rm \hyphenpenalty=10000 @@ -4360,7 +4359,7 @@ } % multitable-only commands. -% +% % @headitem starts a heading row, which we typeset in bold. Assignments % have to be global since we are inside the implicit group of an % alignment entry. \everycr below resets \everytab so we don't have to @@ -4667,19 +4666,6 @@ } } -% We have this subroutine so that we can handle at least some @value's -% properly in indexes (we call \makevalueexpandable in \indexdummies). -% The command has to be fully expandable (if the variable is set), since -% the result winds up in the index file. This means that if the -% variable's value contains other Texinfo commands, it's almost certain -% it will fail (although perhaps we could fix that with sufficient work -% to do a one-level expansion on the result, instead of complete). -% -% Unfortunately, this has the consequence that when _ is in the *value* -% of an @set, it does not print properly in the roman fonts (get the cmr -% dot accent at position 126 instead). No fix comes to mind, and it's -% been this way since 2003 or earlier, so just ignore it. -% \def\expandablevalue#1{% \expandafter\ifx\csname SET#1\endcsname\relax {[No value for ``#1'']}% @@ -4692,13 +4678,13 @@ % Like \expandablevalue, but completely expandable (the \message in the % definition above operates at the execution level of TeX). Used when % writing to auxiliary files, due to the expansion that \write does. -% If flag is undefined, pass through an unexpanded @value command: maybe it +% If flag is undefined, pass through an unexpanded @value command: maybe it % will be set by the time it is read back in. % % NB flag names containing - or _ may not work here. \def\dummyvalue#1{% \expandafter\ifx\csname SET#1\endcsname\relax - \noexpand\value{#1}% + \string\value{#1}% \else \csname SET#1\endcsname \fi @@ -4708,7 +4694,7 @@ % if possible, otherwise sort late. \def\indexnofontsvalue#1{% \expandafter\ifx\csname SET#1\endcsname\relax - ZZZZZZZ + ZZZZZZZ% \else \csname SET#1\endcsname \fi @@ -4716,7 +4702,7 @@ % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined % with @set. -% +% % To get the special treatment we need for `@end ifset,' we call % \makecond and then redefine. % @@ -4749,7 +4735,7 @@ % without the @) is in fact defined. We can only feasibly check at the % TeX level, so something like `mathcode' is going to considered % defined even though it is not a Texinfo command. -% +% \makecond{ifcommanddefined} \def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}} % @@ -4857,30 +4843,16 @@ \def\docodeindex#1{\edef\indexname{#1}\parsearg\docodeindexxxx} \def\docodeindexxxx #1{\doind{\indexname}{\code{#1}}} - -% Used when writing an index entry out to an index file to prevent -% expansion of Texinfo commands that can appear in an index entry. -% -\def\indexdummies{% - \escapechar = `\\ % use backslash in output files. - \definedummyletter\@% - \definedummyletter\ % - % - % For texindex which always views { and } as separators. - \def\{{\lbracechar{}}% - \def\}{\rbracechar{}}% - % - % Do the redefinitions. - \definedummies -} -% Used for the aux and toc files, where @ is the escape character. +% Used for the aux, toc and index files to prevent expansion of Texinfo +% commands. % \def\atdummies{% \definedummyletter\@% \definedummyletter\ % \definedummyletter\{% \definedummyletter\}% + \definedummyletter\&% % % Do the redefinitions. \definedummies @@ -4904,8 +4876,7 @@ \def\definedummyletter#1{\def#1{\string#1}}% \let\definedummyaccent\definedummyletter -% Called from \indexdummies and \atdummies, to effectively prevent -% the expansion of commands. +% Called from \atdummies to prevent the expansion of commands. % \def\definedummies{% % @@ -4952,8 +4923,10 @@ \definedummyword\TeX % % Assorted special characters. + \definedummyword\ampchar \definedummyword\atchar \definedummyword\arrow + \definedummyword\backslashchar \definedummyword\bullet \definedummyword\comma \definedummyword\copyright @@ -4990,6 +4963,8 @@ \definedummyword\sup \definedummyword\textdegree % + \definedummyword\subentry + % % We want to disable all macros so that they are not expanded by \write. \macrolist \let\value\dummyvalue @@ -5070,11 +5045,10 @@ \commondummyword\xref } -% This does nothing, but for a time it was recommended to use -% \usebracesinindexestrue to be able to use braces in index entries. - \let\indexlbrace\relax \let\indexrbrace\relax +\let\indexatchar\relax +\let\indexbackslash\relax {\catcode`\@=0 \catcode`\\=13 @@ -5108,10 +5082,8 @@ } \gdef\indexnonalnumreappear{% - \useindexbackslash \let-\normaldash \let<\normalless - \def\@{@}% } } @@ -5219,10 +5191,8 @@ } \def\defglyph#1#2{\def#1##1{#2}} % see above - -\let\SETmarginindex=\relax % put index entries in margin (undocumented)? % #1 is the index name, #2 is the entry text. \def\doind#1#2{% @@ -5248,20 +5218,13 @@ \ifx\suffix\indexisfl\def\suffix{f1}\fi % Open the file \immediate\openout\csname#1indfile\endcsname \jobname.\suffix - % Using \immediate above here prevents an object entering into the current + % Using \immediate above here prevents an object entering into the current % box, which could confound checks such as those in \safewhatsit for % preceding skips. \typeout{Writing index file \jobname.\suffix}% \fi} \def\indexisfl{fl} -% Output \ as {\indexbackslash}, because \ is an escape character in -% the index files. -\let\indexbackslash=\relax -{\catcode`\@=0 \catcode`\\=\active - @gdef@useindexbackslash{@def\{{@indexbackslash}}} -} - % Definition for writing index entry sort key. { \catcode`\-=13 @@ -5273,14 +5236,31 @@ \xdef\indexsortkey{#1}\endgroup} } +\def\indexwriteseealso#1{ + \gdef\pagenumbertext{\string\seealso{#1}}% +} +\def\indexwriteseeentry#1{ + \gdef\pagenumbertext{\string\seeentry{#1}}% +} + +% The default definitions +\def\sortas#1{}% +\def\seealso#1{\i{\putwordSeeAlso}\ #1}% for sorted index file only +\def\putwordSeeAlso{See also} +\def\seeentry#1{\i{\putwordSee}\ #1}% for sorted index file only + + % Given index entry text like "aaa @subentry bbb @sortas{ZZZ}": % * Set \bracedtext to "{aaa}{bbb}" % * Set \fullindexsortkey to "aaa @subentry ZZZ" +% * If @seealso occurs, set \pagenumbertext % \def\splitindexentry#1{% \gdef\fullindexsortkey{}% \xdef\bracedtext{}% \def\sep{}% + \def\seealso##1{}% + \def\seeentry##1{}% \expandafter\doindexsegment#1\subentry\finish\subentry } @@ -5290,9 +5270,8 @@ \ifx\segment\isfinish \else % - % Fully expand the segment, throwing away any @sortas directives, and + % Fully expand the segment, throwing away any @sortas directives, and % trim spaces. - \def\sortas##1{}% \edef\trimmed{\segment}% \edef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}% % @@ -5302,16 +5281,23 @@ % font commands turned off. \bgroup \let\sortas\indexwritesortas + \let\seealso\indexwriteseealso + \let\seeentry\indexwriteseeentry \indexnofonts % The braces around the commands are recognized by texindex. - \def\lbracechar{{\indexlbrace}}% - \def\rbracechar{{\indexrbrace}}% + \def\lbracechar{{\string\indexlbrace}}% + \def\rbracechar{{\string\indexrbrace}}% \let\{=\lbracechar \let\}=\rbracechar + \def\@{{\string\indexatchar}}% + \def\atchar##1{\@}% + \def\backslashchar{{\string\indexbackslash}}% + \uccode`\~=`\\ \uppercase{\let~\backslashchar}% % \let\indexsortkey\empty + \global\let\pagenumbertext\empty % Execute the segment and throw away the typeset output. This executes - % any @sortas commands in this segment. + % any @sortas or @seealso commands in this segment. \setbox\dummybox = \hbox{\segment}% \ifx\indexsortkey\empty{% \indexnonalnumdisappear @@ -5332,23 +5318,42 @@ \fi } \def\isfinish{\finish}% +\newbox\dummybox % used above \let\subentry\relax -% Write the entry in \toks0 to the index file. +% Use \ instead of @ in index files. To support old texi2dvi and texindex. +% This works without changing the escape character used in the toc or aux +% files because the index entries are fully expanded here, and \string uses +% the current value of \escapechar. +\def\escapeisbackslash{\escapechar=`\\} + +% Use \ in index files by default. texi2dvi didn't support @ as the escape +% character (as it checked for "\entry" in the files, and not "@entry"). When +% the new version of texi2dvi has had a chance to become more prevalent, then +% the escape character can change back to @ again. This should be an easy +% change to make now because both @ and \ are only used as escape characters in +% index files, never standing for themselves. +% +\set txiindexescapeisbackslash + +% Write the entry in \indextext to the index file. % \def\doindwrite{% - % Put the index entry in the margin if desired. - \ifx\SETmarginindex\relax\else - \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}% + \maybemarginindex + % + \atdummies + % + \expandafter\ifx\csname SETtxiindexescapeisbackslash\endcsname\relax\else + \escapeisbackslash \fi % - % Remember, we are within a group. - \indexdummies % Must do this here, since \bf, etc expand at this stage - \useindexbackslash % \indexbackslash isn't defined now so it will be output - % as is; and it will print as backslash. + % For texindex which always views { and } as separators. + \def\{{\lbracechar{}}% + \def\}{\rbracechar{}}% + \uccode`\~=`\\ \uppercase{\def~{\backslashchar{}}}% % - % Split the entry into primary entry and any subentries, and get the index + % Split the entry into primary entry and any subentries, and get the index % sort key. \splitindexentry\indextext % @@ -5360,11 +5365,21 @@ % \edef\temp{% \write\writeto{% - \string\entry{\fullindexsortkey}{\noexpand\folio}\bracedtext}% + \string\entry{\fullindexsortkey}% + {\ifx\pagenumbertext\empty\noexpand\folio\else\pagenumbertext\fi}% + \bracedtext}% }% \temp } -\newbox\dummybox % used above + +% Put the index entry in the margin if desired (undocumented). +\def\maybemarginindex{% + \ifx\SETmarginindex\relax\else + \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \relax\indextext}}% + \fi +} +\let\SETmarginindex=\relax + % Take care of unwanted page breaks/skips around a whatsit: % @@ -5452,9 +5467,14 @@ % \entry {topic}{pagelist} % for a topic that is used without subtopics % \primary {topic} +% \entry {topic}{} % for the beginning of a topic that is used with subtopics % \secondary {subtopic}{pagelist} % for each subtopic. +% \secondary {subtopic}{} +% for a subtopic with sub-subtopics +% \tertiary {subtopic}{subsubtopic}{pagelist} +% for each sub-subtopic. % Define the user-accessible indexing commands % @findex, @vindex, @kindex, @cindex. @@ -5479,14 +5499,10 @@ \plainfrenchspacing \everypar = {}% don't want the \kern\-parindent from indentation suppression. % - % See if the index file exists and is nonempty. - % Change catcode of @ here so that if the index file contains - % \initial {@} - % as its first line, TeX doesn't complain about mismatched braces - % (because it thinks @} is a control sequence). - \catcode`\@ = 12 % See comment in \requireopenindexfile. \def\indexname{#1}\ifx\indexname\indexisfl\def\indexname{f1}\fi + % + % See if the index file exists and is nonempty. \openin 1 \jobname.\indexname s \ifeof 1 % \enddoublecolumns gets confused if there is no text in the index, @@ -5496,8 +5512,6 @@ \putwordIndexNonexistent \typeout{No file \jobname.\indexname s.}% \else - \catcode`\\ = 0 - % % If the index file exists but is empty, then \openin leaves \ifeof % false. We have to make TeX try to read something from the file, so % it can discover if there is anything in it. @@ -5505,47 +5519,51 @@ \ifeof 1 \putwordIndexIsEmpty \else - % Index files are almost Texinfo source, but we use \ as the escape - % character. It would be better to use @, but that's too big a change - % to make right now. - \def\indexbackslash{\ttbackslash}% - \let\indexlbrace\{ % Likewise, set these sequences for braces - \let\indexrbrace\} % used in the sort key. - \begindoublecolumns - \let\dotheinsertentrybox\dotheinsertentryboxwithpenalty - % - % Read input from the index file line by line. - \loopdo - \ifeof1 \else - \read 1 to \nextline - \fi - % - \indexinputprocessing - \thisline - % - \ifeof1\else - \let\thisline\nextline - \repeat - %% - \enddoublecolumns + \expandafter\printindexzz\thisline\relax\relax\finish% \fi \fi \closein 1 \endgroup} -\def\loopdo#1\repeat{\def\body{#1}\loopdoxxx} -\def\loopdoxxx{\let\next=\relax\body\let\next=\loopdoxxx\fi\next} -\def\indexinputprocessing{% - \ifeof1 - \let\firsttoken\relax +% If the index file starts with a backslash, forgo reading the index +% file altogether. If somebody upgrades texinfo.tex they may still have +% old index files using \ as the escape character. Reading this would +% at best lead to typesetting garbage, at worst a TeX syntax error. +\def\printindexzz#1#2\finish{% + \expandafter\ifx\csname SETtxiindexescapeisbackslash\endcsname\relax + \uccode`\~=`\\ \uppercase{\if\noexpand~}\noexpand#1 + \expandafter\ifx\csname SETtxiskipindexfileswithbackslash\endcsname\relax +\errmessage{% +ERROR: A sorted index file in an obsolete format was skipped. +To fix this problem, please upgrade your version of 'texi2dvi' +or 'texi2pdf' to that at . +If you are using an old version of 'texindex' (part of the Texinfo +distribution), you may also need to upgrade to a newer version (at least 6.0). +You may be able to typeset the index if you run +'texindex \jobname.\indexname' yourself. +You could also try setting the 'txiindexescapeisbackslash' flag by +running a command like +'texi2dvi -t "@set txiindexescapeisbackslash" \jobname.texi'. If you do +this, Texinfo will try to use index files in the old format. +If you continue to have problems, deleting the index files and starting again +might help (with 'rm \jobname.?? \jobname.??s')% +}% + \else + (Skipped sorted index file in obsolete format) + \fi + \else + \begindoublecolumns + \input \jobname.\indexname s + \enddoublecolumns + \fi \else - \edef\act{\gdef\noexpand\firsttoken{\getfirsttoken\nextline}}% - \act + \begindoublecolumns + \catcode`\\=0\relax + \catcode`\@=12\relax + \input \jobname.\indexname s + \enddoublecolumns \fi } -\def\getfirsttoken#1{\expandafter\getfirsttokenx#1\endfirsttoken} -\long\def\getfirsttokenx#1#2\endfirsttoken{\noexpand#1} - % These macros are used by the sorted index file itself. % Change them to control the appearance of the index. @@ -5554,12 +5572,19 @@ \catcode`\|=13 \catcode`\<=13 \catcode`\>=13 \catcode`\+=13 \catcode`\"=13 \catcode`\$=3 \gdef\initialglyphs{% + % special control sequences used in the index sort key + \let\indexlbrace\{% + \let\indexrbrace\}% + \let\indexatchar\@% + \def\indexbackslash{\math{\backslash}}% + % % Some changes for non-alphabetic characters. Using the glyphs from the % math fonts looks more consistent than the typewriter font used elsewhere % for these characters. - \def\indexbackslash{\math{\backslash}}% - \let\\=\indexbackslash + \uccode`\~=`\\ \uppercase{\def~{\math{\backslash}}} % + % In case @\ is used for backslash + \uppercase{\let\\=~} % Can't get bold backslash so don't use bold forward slash \catcode`\/=13 \def/{{\secrmnotbold \normalslash}}% @@ -5589,7 +5614,7 @@ % bottom of a column to reduce an increase in inter-line spacing. \nobreak \vskip 0pt plus 5\baselineskip - \penalty -300 + \penalty -300 \vskip 0pt plus -5\baselineskip % % Typeset the initial. Making this add up to a whole number of @@ -5618,12 +5643,6 @@ % \def\entry{% \begingroup - % - % For pdfTeX and XeTeX. - % The redefinition of \domark stops marks being added in \pdflink to - % preserve coloured links across page boundaries. Otherwise the marks - % would get in the way of \lastbox in \insertentrybox. - \let\domark\relax % % Start a new paragraph if necessary, so our assignments below can't % affect previous text. @@ -5657,35 +5676,31 @@ \gdef\finishentry#1{% \egroup % end box A \dimen@ = \wd\boxA % Length of text of entry - \global\setbox\boxA=\hbox\bgroup\unhbox\boxA - % #1 is the page number. - % - % Get the width of the page numbers, and only use - % leaders if they are present. - \global\setbox\boxB = \hbox{#1}% - \ifdim\wd\boxB = 0pt - \null\nobreak\hfill\ % - \else - % - \null\nobreak\indexdotfill % Have leaders before the page number. + \global\setbox\boxA=\hbox\bgroup + \unhbox\boxA + % #1 is the page number. % - \ifpdf - \pdfgettoks#1.% - \hskip\skip\thinshrinkable\the\toksA + % Get the width of the page numbers, and only use + % leaders if they are present. + \global\setbox\boxB = \hbox{#1}% + \ifdim\wd\boxB = 0pt + \null\nobreak\hfill\ % \else - \ifx\XeTeXrevision\thisisundefined - \hskip\skip\thinshrinkable #1% - \else + % + \null\nobreak\indexdotfill % Have leaders before the page number. + % + \ifpdforxetex \pdfgettoks#1.% \hskip\skip\thinshrinkable\the\toksA + \else + \hskip\skip\thinshrinkable #1% \fi \fi - \fi \egroup % end \boxA \ifdim\wd\boxB = 0pt - \global\setbox\entrybox=\vbox{\unhbox\boxA}% - \else - \global\setbox\entrybox=\vbox\bgroup + \noindent\unhbox\boxA\par + \nobreak + \else\bgroup % We want the text of the entries to be aligned to the left, and the % page numbers to be aligned to the right. % @@ -5715,7 +5730,7 @@ \advance\dimen@ii by 1\dimen@i \ifdim\wd\boxA > \dimen@ii % If the entry doesn't fit in one line \ifdim\dimen@ > 0.8\dimen@ii % due to long index text - % Try to split the text roughly evenly. \dimen@ will be the length of + % Try to split the text roughly evenly. \dimen@ will be the length of % the first line. \dimen@ = 0.7\dimen@ \dimen@ii = \hsize @@ -5751,55 +5766,11 @@ \egroup % The \vbox \fi \endgroup - \dotheinsertentrybox }} \newskip\thinshrinkable \skip\thinshrinkable=.15em minus .15em -\newbox\entrybox -\def\insertentrybox{% - \ourunvbox\entrybox -} - -% default definition -\let\dotheinsertentrybox\insertentrybox - -% Use \lastbox to take apart vbox box by box, and add each sub-box -% to the current vertical list. -\def\ourunvbox#1{% -\bgroup % for local binding of \delayedbox - % Remove the last box from box #1 - \global\setbox#1=\vbox{% - \unvbox#1% - \unskip % remove any glue - \unpenalty - \global\setbox\interbox=\lastbox - }% - \setbox\delayedbox=\box\interbox - \ifdim\ht#1=0pt\else - \ourunvbox#1 % Repeat on what's left of the box - \nobreak - \fi - \box\delayedbox -\egroup -} -\newbox\delayedbox -\newbox\interbox - -% Used from \printindex. \firsttoken should be the first token -% after the \entry. If it's not another \entry, we are at the last -% line of a group of index entries, so insert a penalty to discourage -% widowed index entries. -\def\dotheinsertentryboxwithpenalty{% - \ifx\firsttoken\isentry - \else - \penalty 9000 - \fi - \insertentrybox -} -\def\isentry{\entry}% - % Like plain.tex's \dotfill, except uses up at least 1 em. % The filll stretch here overpowers both the fil and fill stretch to push % the page number to the right. @@ -5809,24 +5780,15 @@ \def\primary #1{\line{#1\hfil}} -\newskip\secondaryindent \secondaryindent=0.5cm -\def\secondary#1#2{{% - \parfillskip=0in - \parskip=0in - \hangindent=1in - \hangafter=1 - \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill - \ifpdf - \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph. - \else - \ifx\XeTeXrevision\thisisundefined - #2 - \else - \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph. - \fi - \fi - \par -}} +\def\secondary{\indententry{0.5cm}} +\def\tertiary{\indententry{1cm}} + +\def\indententry#1#2#3{% + \bgroup + \leftskip=#1 + \entry{#2}{#3}% + \egroup +} % Define two-column mode, which we use to typeset indexes. % Adapted from the TeXbook, page 416, which is to say, @@ -5844,17 +5806,6 @@ \output = {% \savetopmark % - % Here is a possibility not foreseen in manmac: if we accumulate a - % whole lot of material, we might end up calling this \output - % routine twice in a row (see the doublecol-lose test, which is - % essentially a couple of indexes with @setchapternewpage off). In - % that case we just ship out what is in \partialpage with the normal - % output routine. Generally, \partialpage will be empty when this - % runs and this will be a no-op. See the indexspread.tex test case. - \ifvoid\partialpage \else - \onepageout{\pagecontents\partialpage}% - \fi - % \global\setbox\partialpage = \vbox{% % Unvbox the main output page. \unvbox\PAGE @@ -5926,7 +5877,7 @@ } -% Finished with with double columns. +% Finished with double columns. \def\enddoublecolumns{% % The following penalty ensures that the page builder is exercised % _before_ we change the output routine. This is necessary in the @@ -5987,7 +5938,7 @@ \newbox\balancedcolumns \setbox\balancedcolumns=\vbox{shouldnt see this}% % -% Only called for the last of the double column material. \doublecolumnout +% Only called for the last of the double column material. \doublecolumnout % does the others. \def\balancecolumns{% \setbox0 = \vbox{\unvbox\PAGE}% like \box255 but more efficient, see p.120. @@ -6015,7 +5966,7 @@ }% % Now the left column is in box 1, and the right column in box 3. % - % Check whether the left column has come out higher than the page itself. + % Check whether the left column has come out higher than the page itself. % (Note that we have doubled \vsize for the double columns, so % the actual height of the page is 0.5\vsize). \ifdim2\ht1>\vsize @@ -6134,11 +6085,9 @@ % @raisesections: treat @section as chapter, @subsection as section, etc. \def\raisesections{\global\advance\secbase by -1} -\let\up=\raisesections % original BFox name % @lowersections: treat @chapter as section, @section as subsection, etc. \def\lowersections{\global\advance\secbase by 1} -\let\down=\lowersections % original BFox name % we only have subsub. \chardef\maxseclevel = 3 @@ -6314,7 +6263,7 @@ \let\top\unnumbered % Sections. -% +% \outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz \def\seczzz#1{% \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 @@ -6337,7 +6286,7 @@ } % Subsections. -% +% % normally calls numberedsubseczzz: \outer\parseargdef\numberedsubsec{\numhead2{#1}} \def\numberedsubseczzz#1{% @@ -6362,7 +6311,7 @@ } % Subsubsections. -% +% % normally numberedsubsubseczzz: \outer\parseargdef\numberedsubsubsec{\numhead3{#1}} \def\numberedsubsubseczzz#1{% @@ -6790,13 +6739,8 @@ % 1 and 2 (the page numbers aren't printed), and so are the first % two pages of the document. Thus, we'd have two destinations named % `1', and two named `2'. - \ifpdf + \ifpdforxetex \global\pdfmakepagedesttrue - \else - \ifx\XeTeXrevision\thisisundefined - \else - \global\pdfmakepagedesttrue - \fi \fi } @@ -7159,11 +7103,7 @@ % @cartouche ... @end cartouche: draw rectangle w/rounded corners around % environment contents. -\font\circle=lcircle10 -\newdimen\circthick -\newdimen\cartouter\newdimen\cartinner -\newskip\normbskip\newskip\normpskip\newskip\normlskip -\circthick=\fontdimen8\circle + % \def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth \def\ctr{{\hskip 6pt\circle\char'010}} @@ -7178,7 +7118,18 @@ % \newskip\lskip\newskip\rskip +% only require the font if @cartouche is actually used +\def\cartouchefontdefs{% + \font\circle=lcircle10\relax + \circthick=\fontdimen8\circle +} +\newdimen\circthick +\newdimen\cartouter\newdimen\cartinner +\newskip\normbskip\newskip\normpskip\newskip\normlskip + + \envdef\cartouche{% + \cartouchefontdefs \ifhmode\par\fi % can't be in the midst of a paragraph. \startsavinginserts \lskip=\leftskip \rskip=\rightskip @@ -7418,7 +7369,7 @@ % @indentedblock is like @quotation, but indents only on the left and % has no optional argument. -% +% \makedispenvdef{indentedblock}{\indentedblockstart} % \def\indentedblockstart{% @@ -7718,7 +7669,7 @@ % @deftypefnnewline on|off says whether the return type of typed functions % are printed on their own line. This affects @deftypefn, @deftypefun, % @deftypeop, and @deftypemethod. -% +% \parseargdef\deftypefnnewline{% \def\temp{#1}% \ifx\temp\onword @@ -7737,8 +7688,8 @@ % \dosubind {index}{topic}{subtopic} % % If SUBTOPIC is present, precede it with a space, and call \doind. -% (At some time during the 20th century, this made a two-level entry in an -% index such as the operation index. Nobody seemed to notice the change in +% (At some time during the 20th century, this made a two-level entry in an +% index such as the operation index. Nobody seemed to notice the change in % behaviour though.) \def\dosubind#1#2#3{% \def\thirdarg{#3}% @@ -7913,7 +7864,7 @@ \tclose{\temp}% typeset the return type \ifrettypeownline % put return type on its own line; prohibit line break following: - \hfil\vadjust{\nobreak}\break + \hfil\vadjust{\nobreak}\break \else \space % type on same line, so just followed by a space \fi @@ -8050,36 +8001,18 @@ } \fi -% alias because \c means cedilla in @tex or @math -\let\texinfoc=\c - -\newcount\savedcatcodeone -\newcount\savedcatcodetwo - % Used at the time of macro expansion. % Argument is macro body with arguments substituted \def\scanmacro#1{% \newlinechar`\^^M \def\xeatspaces{\eatspaces}% % - % Temporarily undo catcode changes of \printindex. Set catcode of @ to - % 0 so that @-commands in macro expansions aren't printed literally when - % formatting an index file, where \ is used as the escape character. - \savedcatcodeone=\catcode`\@ - \savedcatcodetwo=\catcode`\\ - \catcode`\@=0 - \catcode`\\=\active - % % Process the macro body under the current catcode regime. - \scantokens{#1@texinfoc}% + \scantokens{#1@comment}% % - \catcode`\@=\savedcatcodeone - \catcode`\\=\savedcatcodetwo - % - % The \texinfoc is to remove the \newlinechar added by \scantokens, and - % can be noticed by \parsearg. - % We avoid surrounding the call to \scantokens with \bgroup and \egroup - % to allow macros to open or close groups themselves. + % The \comment is to remove the \newlinechar added by \scantokens, and + % can be noticed by \parsearg. Note \c isn't used because this means cedilla + % in math mode. } % Used for copying and captions @@ -8180,12 +8113,14 @@ \def\macroargctxt{% \scanctxt \catcode`\ =\active + \catcode`\@=\other \catcode`\^^M=\other \catcode`\\=\active } \def\macrolineargctxt{% used for whole-line arguments without braces \scanctxt + \catcode`\@=\other \catcode`\{=\other \catcode`\}=\other } @@ -8277,7 +8212,7 @@ % list to some hook where the argument is to be expanded. If there are % less than 10 arguments that hook is to be replaced by ##N where N % is the position in that list, that is to say the macro arguments are to be -% defined `a la TeX in the macro body. +% defined `a la TeX in the macro body. % % That gets used by \mbodybackslash (above). % @@ -8308,8 +8243,8 @@ % % Read recursive and nonrecursive macro bodies. (They're different since % rec and nonrec macros end differently.) -% -% We are in \macrobodyctxt, and the \xdef causes backslashshes in the macro +% +% We are in \macrobodyctxt, and the \xdef causes backslashshes in the macro % body to be transformed. % Set \macrobody to the body of the macro, and call \defmacro. % @@ -8343,7 +8278,7 @@ % twice the \macarg.BLAH macros does not cost too much processing power. \def\parsemmanyargdef@@#1,{% \if#1;\let\next=\relax - \else + \else \let\next=\parsemmanyargdef@@ \edef\tempb{\eatspaces{#1}}% \expandafter\def\expandafter\tempa @@ -8428,7 +8363,7 @@ % Replace arguments by their values in the macro body, and place the result % in macro \@tempa. -% +% \def\macvalstoargs@{% % To do this we use the property that token registers that are \the'ed % within an \edef expand only once. So we are going to place all argument @@ -8452,9 +8387,9 @@ \expandafter\def\expandafter\@tempa\expandafter{\@tempc}% } -% Define the named-macro outside of this group and then close this group. -% -\def\macargexpandinbody@{% +% Define the named-macro outside of this group and then close this group. +% +\def\macargexpandinbody@{% \expandafter \endgroup \macargdeflist@ @@ -8492,7 +8427,7 @@ } % Trailing missing arguments are set to empty. -% +% \def\setemptyargvalues@{% \ifx\paramlist\nilm@ \let\next\macargexpandinbody@ @@ -8569,7 +8504,7 @@ \else % at most 9 \ifnum\paramno<10\relax % @MACNAME sets the context for reading the macro argument - % @MACNAME@@ gets the argument, processes backslashes and appends a + % @MACNAME@@ gets the argument, processes backslashes and appends a % comma. % @MACNAME@@@ removes braces surrounding the argument list. % @MACNAME@@@@ scans the macro body with arguments substituted. @@ -8613,11 +8548,11 @@ % Call #1 with a list of tokens #2, with any doubled backslashes in #2 % compressed to one. % -% This implementation works by expansion, and not execution (so we cannot use -% \def or similar). This reduces the risk of this failing in contexts where -% complete expansion is done with no execution (for example, in writing out to +% This implementation works by expansion, and not execution (so we cannot use +% \def or similar). This reduces the risk of this failing in contexts where +% complete expansion is done with no execution (for example, in writing out to % an auxiliary file for an index entry). -% +% % State is kept in the input stream: the argument passed to % @look_ahead, @gobble_and_check_finish and @add_segment is % @@ -8639,11 +8574,11 @@ % #3 - NEXT_TOKEN % #4 used to look ahead % -% If the next token is not a backslash, process the rest of the argument; +% If the next token is not a backslash, process the rest of the argument; % otherwise, remove the next token. @gdef@look_ahead#1!#2#3#4{% @ifx#4\% - @expandafter@gobble_and_check_finish + @expandafter@gobble_and_check_finish @else @expandafter@add_segment @fi#1!{#2}#4#4% @@ -8667,9 +8602,9 @@ % #3 - NEXT_TOKEN % #4 is input stream until next backslash % -% Input stream is either at the start of the argument, or just after a -% backslash sequence, either a lone backslash, or a doubled backslash. -% NEXT_TOKEN contains the first token in the input stream: if it is \finish, +% Input stream is either at the start of the argument, or just after a +% backslash sequence, either a lone backslash, or a doubled backslash. +% NEXT_TOKEN contains the first token in the input stream: if it is \finish, % finish; otherwise, append to ARG_RESULT the segment of the argument up until % the next backslash. PENDING_BACKSLASH contains a backslash to represent % a backslash just before the start of the input stream that has not been @@ -8681,13 +8616,13 @@ % append the pending backslash to the result, followed by the next segment @expandafter@is_fi@look_ahead#1#2#4!{\}@fi % this @fi is discarded by @look_ahead. - % we can't get rid of it with \expandafter because we don't know how + % we can't get rid of it with \expandafter because we don't know how % long #4 is. } % #1 - THE_MACRO % #2 - ARG_RESULT -% #3 discards the res of the conditional in @add_segment, and @is_fi ends the +% #3 discards the res of the conditional in @add_segment, and @is_fi ends the % conditional. @gdef@call_the_macro#1#2!#3@fi{@is_fi #1{#2}} @@ -8699,7 +8634,7 @@ % for reading the argument (slightly different in the two cases). Then, % to read the argument, in the whole-line case, it then calls the regular % \parsearg MAC; in the lbrace case, it calls \passargtomacro MAC. -% +% \def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx} \def\braceorlinexxx{% \ifx\nchar\bgroup @@ -8749,9 +8684,29 @@ % also remove a trailing comma, in case of something like this: % @node Help-Cross, , , Cross-refs \def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse} -\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}} +\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}\omittopnode} + +% Used so that the @top node doesn't have to be wrapped in an @ifnottex +% conditional. +% \doignore goes to more effort to skip nested conditionals but we don't need +% that here. +\def\omittopnode{% + \ifx\lastnode\wordTop + \expandafter\ignorenode\fi +} +\def\wordTop{Top} + +% Until the next @node or @bye command, divert output to a box that is not +% output. +\def\ignorenode{\setbox\dummybox\vbox\bgroup\def\node{\egroup\node}% +\ignorenodebye +} + +{\let\bye\relax +\gdef\ignorenodebye{\let\bye\ignorenodebyedef} +\gdef\ignorenodebyedef{\egroup(`Top' node ignored)\bye}} +% The redefinition of \bye here is because it is declared \outer -\let\nwnode=\node \let\lastnode=\empty % Write a cross-reference definition for the current node. #1 is the @@ -8808,7 +8763,7 @@ % automatically in xrefs, if the third arg is not explicitly specified. % This was provided as a "secret" @set xref-automatic-section-title % variable, now it's official. -% +% \parseargdef\xrefautomaticsectiontitle{% \def\temp{#1}% \ifx\temp\onword @@ -8824,7 +8779,7 @@ \fi\fi } -% +% % @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is % the node name, #2 the name of the Info cross-reference, #3 the printed % node name, #4 the name of the Info file, #5 the name of the printed @@ -8977,24 +8932,24 @@ \fi \else % node/anchor (non-float) references. - % + % % If we use \unhbox to print the node names, TeX does not insert % empty discretionaries after hyphens, which means that it will not % find a line break at a hyphen in a node names. Since some manuals % are best written with fairly long node names, containing hyphens, % this is a loss. Therefore, we give the text of the node name % again, so it is as if TeX is seeing it for the first time. - % + % \ifdim \wd\printedmanualbox > 0pt % Cross-manual reference with a printed manual name. - % + % \crossmanualxref{\cite{\printedmanual\unskip}}% % \else\ifdim \wd\infofilenamebox > 0pt % Cross-manual reference with only an info filename (arg 4), no % printed manual name (arg 5). This is essentially the same as % the case above; we output the filename, since we have nothing else. - % + % \crossmanualxref{\code{\infofilename\unskip}}% % \else @@ -9034,20 +8989,20 @@ \endgroup} % Output a cross-manual xref to #1. Used just above (twice). -% +% % Only include the text "Section ``foo'' in" if the foo is neither % missing or Top. Thus, @xref{,,,foo,The Foo Manual} outputs simply % "see The Foo Manual", the idea being to refer to the whole manual. -% +% % But, this being TeX, we can't easily compare our node name against the % string "Top" while ignoring the possible spaces before and after in % the input. By adding the arbitrary 7sp below, we make it much less % likely that a real node name would have the same width as "Top" (e.g., % in a monospaced font). Hopefully it will never happen in practice. -% +% % For the same basic reason, we retypeset the "Top" at every % reference, since the current font is indeterminate. -% +% \def\crossmanualxref#1{% \setbox\toprefbox = \hbox{Top\kern7sp}% \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}% @@ -9094,7 +9049,7 @@ \fi\fi\fi } -% \refx{NAME}{SUFFIX} - reference a cross-reference string named NAME. SUFFIX +% \refx{NAME}{SUFFIX} - reference a cross-reference string named NAME. SUFFIX % is output afterwards if non-empty. \def\refx#1#2{% \requireauxfile @@ -9126,9 +9081,9 @@ #2% Output the suffix in any case. } -% This is the macro invoked by entries in the aux file. Define a control -% sequence for a cross-reference target (we prepend XR to the control sequence -% name to avoid collisions). The value is the page number. If this is a float +% This is the macro invoked by entries in the aux file. Define a control +% sequence for a cross-reference target (we prepend XR to the control sequence +% name to avoid collisions). The value is the page number. If this is a float % type, we have more work to do. % \def\xrdef#1#2{% @@ -9144,10 +9099,10 @@ \bgroup \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% \egroup - % We put the \gdef inside a group to avoid the definitions building up on - % TeX's save stack, which can cause it to run out of space for aux files with + % We put the \gdef inside a group to avoid the definitions building up on + % TeX's save stack, which can cause it to run out of space for aux files with % thousands of lines. \gdef doesn't use the save stack, but \csname does - % when it defines an unknown control sequence as \relax. + % when it defines an unknown control sequence as \relax. % % Was that xref control sequence that we just defined for a float? \expandafter\iffloat\csname XR\safexrefname\endcsname @@ -9226,19 +9181,6 @@ \catcode`\^^]=\other \catcode`\^^^=\other \catcode`\^^_=\other - % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc. - % in xref tags, i.e., node names. But since ^^e4 notation isn't - % supported in the main text, it doesn't seem desirable. Furthermore, - % that is not enough: for node names that actually contain a ^ - % character, we would end up writing a line like this: 'xrdef {'hat - % b-title}{'hat b} and \xrdef does a \csname...\endcsname on the first - % argument, and \hat is not an expandable control sequence. It could - % all be worked out, but why? Either we support ^^ or we don't. - % - % The other change necessary for this was to define \auxhat: - % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter - % and then to call \auxhat in \setq. - % \catcode`\^=\other % % Special characters. Should be turned off anyway, but... @@ -9256,14 +9198,7 @@ \catcode`\%=\other \catcode`+=\other % avoid \+ for paranoia even though we've turned it off % - % This is to support \ in node names and titles, since the \ - % characters end up in a \csname. It's easier than - % leaving it active and making its active definition an actual \ - % character. What I don't understand is why it works in the *value* - % of the xrdef. Seems like it should be a catcode12 \, and that - % should not typeset properly. But it works, so I'm moving on for - % now. --karl, 15jan04. - \catcode`\\=\other + \catcode`\\=\active % % @ is our escape character in .aux files, and we need braces. \catcode`\{=1 @@ -9526,7 +9461,7 @@ % \ifimagevmode \medskip % space after a standalone image - \fi + \fi \ifx\centersub\centerV \egroup \fi \endgroup} @@ -10357,7 +10292,7 @@ \uppercase{.} \endgroup \else - \errhelp = \EMsimple + \errhelp = \EMsimple \errmessage{Unicode character U+#1 not supported, sorry}% \fi \else @@ -10390,7 +10325,7 @@ \countUTFz = "#1\relax \begingroup \parseXMLCharref - + % Give \u8:... its definition. The sequence of seven \expandafter's % expands after the \gdef three times, e.g. % @@ -10402,7 +10337,7 @@ \expandafter\expandafter \expandafter\expandafter \expandafter\gdef \UTFviiiTmp{#2}% - % + % \expandafter\ifx\csname uni:#1\endcsname \relax \else \message{Internal error, already defined: #1}% \fi @@ -10441,7 +10376,7 @@ \divide\countUTFz by 64 \countUTFy = \countUTFz % Save to be the future value of \countUTFz. \multiply\countUTFz by 64 - + % \countUTFz is now \countUTFx with the last 5 bits cleared. Subtract % in order to get the last five bits. \advance\countUTFx by -\countUTFz @@ -10476,7 +10411,7 @@ % U+0080..U+00FF = https://en.wikipedia.org/wiki/Latin-1_Supplement_(Unicode_block) % U+0100..U+017F = https://en.wikipedia.org/wiki/Latin_Extended-A % U+0180..U+024F = https://en.wikipedia.org/wiki/Latin_Extended-B -% +% % Many of our renditions are less than wonderful, and all the missing % characters are available somewhere. Loading the necessary fonts % awaits user request. We can't truly support Unicode without @@ -11514,9 +11449,9 @@ \def\texinfochars{% \let< = \activeless \let> = \activegtr - \let~ = \activetilde + \let~ = \activetilde \let^ = \activehat - \markupsetuplqdefault \markupsetuprqdefault + \markupsetuplqdefault \markupsetuprqdefault \let\b = \strong \let\i = \smartitalic % in principle, all other definitions in \tex have to be undone too. @@ -11534,11 +11469,9 @@ % \backslashcurfont outputs one backslash character in current font, % as in \char`\\. \global\chardef\backslashcurfont=`\\ -\global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work -% \realbackslash is an actual character `\' with catcode other, and -% \doublebackslash is two of them (for the pdf outlines). -{\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}} +% \realbackslash is an actual character `\' with catcode other. +{\catcode`\\=\other @gdef@realbackslash{\}} % In Texinfo, backslash is an active character; it prints the backslash % in fixed width font. @@ -11556,10 +11489,8 @@ @def@ttbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}} @let@backslashchar = @ttbackslash % @backslashchar{} is for user documents. -% \rawbackslash defines an active \ to do \backslashcurfont. % \otherbackslash defines an active \ to be a literal `\' character with -% catcode other. We switch back and forth between these. -@gdef@rawbackslash{@let\=@backslashcurfont} +% catcode other. @gdef@otherbackslash{@let\=@realbackslash} % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of @@ -11631,7 +11562,7 @@ @ifx\@eatinput @let\ = @ttbackslash @fi @catcode13=5 % regular end of line @enableemergencynewline - @let@c=@texinfoc + @let@c=@comment @let@parsearg@originalparsearg % Also turn back on active characters that might appear in the input % file name, in case not using a pre-dumped format. diff --git a/source/configure b/source/configure index 0e2d074fc..57772c98c 100755 --- a/source/configure +++ b/source/configure @@ -785,6 +785,22 @@ enable_native_texlive_build enable_multiplatform enable_cxx_runtime_hack enable_libtool_hack +enable_autosp +enable_axodraw2 +enable_devnag +enable_lacheck +enable_m_tx +enable_pmx +enable_ps2eps +enable_t1utils +enable_texdoctk +enable_tpic2pdftex +enable_vlna +enable_xindy +enable_xindy_rules +enable_xindy_docs +with_clisp_runtime +enable_xpdfopen enable_web2c with_banner_add with_editor @@ -808,6 +824,8 @@ enable_pdftex enable_pdftex_synctex enable_luatex enable_luajittex +enable_luahbtex +enable_luajithbtex enable_mp enable_pmp enable_upmp @@ -830,13 +848,83 @@ enable_tektronixwin enable_unitermwin enable_web_progs enable_synctex +enable_afm2pl +enable_bibtex_x +enable_bibtex8 +enable_bibtexu +enable_chktex +enable_cjkutils +enable_detex +enable_dtl +enable_dvi2tty +enable_dvidvi +enable_dviljk +enable_dviout_util +enable_dvipdfm_x +enable_dvipng +enable_debug +enable_timing +with_gs +enable_dvipos +enable_dvipsk +enable_dvisvgm +enable_gregorio +enable_gsftopk +enable_lcdf_typetools +enable_cfftot1 +enable_mmafm +enable_mmpfb +enable_otfinfo +enable_otftotfm +enable_t1dotlessj +enable_t1lint +enable_t1rawafm +enable_t1reencode +enable_t1testpage +enable_ttftotype42 +enable_updmap +enable_makeindexk +enable_makejvf +enable_mendexk +enable_musixtnt +enable_ps2pk +enable_psutils +enable_seetexk +enable_tex4htk +enable_ttf2pk2 +enable_ttfdump +enable_upmendex +enable_xdvik +with_xdvi_x_toolkit enable_texlive enable_linked_scripts +with_system_harfbuzz +with_system_icu +with_system_teckit +with_system_graphite2 with_system_zziplib +with_system_xpdf +with_system_poppler +with_system_mpfr +with_mpfr_includes +with_mpfr_libdir +with_system_gmp +with_gmp_includes +with_gmp_libdir +with_system_cairo +with_system_pixman +with_system_gd +with_gd_includes +with_gd_libdir +with_system_freetype2 with_system_libpng +with_system_libpaper +with_libpaper_includes +with_libpaper_libdir with_system_zlib with_zlib_includes with_zlib_libdir +with_system_ptexenc with_system_kpathsea enable_mktexmf_default enable_mktexpk_default @@ -1507,6 +1595,21 @@ Optional Features: lib/PLATFORM --enable-cxx-runtime-hack link C++ runtime statically --enable-libtool-hack ignore libtool dependency_libs + --disable-autosp do not build the autosp package + --disable-axodraw2 do not build the axodraw2 package + --disable-devnag do not build the devnag package + --disable-lacheck do not build the lacheck package + --disable-m-tx do not build the m-tx package + --disable-pmx do not build the pmx package + --disable-ps2eps do not build the ps2eps package + --disable-t1utils do not build the t1utils package + --disable-texdoctk do not build the texdoctk package + --disable-tpic2pdftex do not build the tpic2pdftex package + --disable-vlna do not build the vlna package + --enable-xindy build the xindy package + --enable-xindy-rules build and install make-rules package + --enable-xindy-docs build and install documentation + --disable-xpdfopen do not build the xpdfopen package --disable-web2c do not build the web2c (TeX & Co.) package --enable-auto-core cause TeX&MF to dump core, given a certain filename @@ -1530,6 +1633,8 @@ Optional Features: --disable-pdftex-synctex build pdfTeX without SyncTeX support --disable-luatex do not compile and install LuaTeX --disable-luajittex do not compile and install LuaJITTeX + --disable-luahbtex do not compile and install LuaHBTeX + --disable-luajithbtex do not compile and install LuaHBJITTeX --disable-mp do not compile and install MetaPost --disable-pmp do not compile and install pMetaPost --disable-upmp do not compile and install upMetaPost @@ -1552,6 +1657,57 @@ Optional Features: --enable-unitermwin include Uniterm window support --disable-web-progs do not build WEB programs bibtex ... weave --disable-synctex do not build the SyncTeX library and tool + --disable-afm2pl do not build the afm2pl package + --disable-bibtex-x do not build the bibtex-x package + --disable-bibtex8 do not build the bibtex8 program + --disable-bibtexu do not build the bibtexu program + --disable-chktex do not build the chktex package + --disable-cjkutils do not build the cjkutils package + --disable-detex do not build the detex package + --disable-dtl do not build the dtl package + --disable-dvi2tty do not build the dvi2tty package + --disable-dvidvi do not build the dvidvi package + --disable-dviljk do not build the dviljk package + --disable-dviout-util do not build the dviout-util package + --disable-dvipdfm-x do not build the dvipdfm-x package + --disable-dvipng do not build the dvipng package + --disable-debug Compile without debug (-d) option + --enable-timing Output execution time of dvipng + --disable-dvipos do not build the dvipos package + --disable-dvipsk do not build the dvipsk package + --disable-dvisvgm do not build the dvisvgm package + --disable-gregorio do not build the gregorio package + --disable-gsftopk do not build the gsftopk package + --disable-lcdf-typetools + do not build the lcdf-typetools package + --disable-cfftot1 do not build the cfftot1 program + --disable-mmafm do not build the mmafm program + --disable-mmpfb do not build the mmpfb program + --disable-otfinfo do not build the otfinfo program + --disable-otftotfm do not build the otftotfm program + --disable-t1dotlessj do not build the t1dotlessj program + --disable-t1lint do not build the t1lint program + --disable-t1rawafm do not build the t1rawafm program + --disable-t1reencode do not build the t1reencode program + --disable-t1testpage do not build the t1testpage program + --disable-ttftotype42 do not build the ttftotype42 program + --disable-auto-cfftot1 disable running cfftot1 from otftotfm + --disable-auto-t1dotlessj disable running t1dotlessj from otftotfm + --disable-auto-ttftotype42 + disable running ttftotype42 from otftotfm + --disable-auto-updmap disable running updmap from otftotfm + --disable-makeindexk do not build the makeindexk package + --disable-makejvf do not build the makejvf package + --disable-mendexk do not build the mendexk package + --disable-musixtnt do not build the musixtnt package + --disable-ps2pk do not build the ps2pk package + --disable-psutils do not build the psutils package + --disable-seetexk do not build the seetexk package + --disable-tex4htk do not build the tex4htk package + --disable-ttf2pk2 do not build the ttf2pk2 package + --disable-ttfdump do not build the ttfdump package + --disable-upmendex do not build the upmendex package + --disable-xdvik do not build the xdvik package --disable-texlive do not build the texlive (TeX Live scripts) package --disable-linked-scripts do not install the linked scripts --disable-mktexmf-default do not run mktexmf if MF source missing @@ -1583,18 +1739,61 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-clisp-runtime=PATH + pathname of clisp runtime to install for `xindy', + `default' to derive from clisp, or `system' to use + installed version --with-banner-add=STR add STR to version string appended to banner lines --with-editor=CMD invoke CMD from the `e' option [vi +%d '%s'] or [texworks --position=%d "%s"] --with-mf-x-toolkit use X toolkit for METAFONT + --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript + --with-xdvi-x-toolkit=KIT + Use toolkit KIT (xaw/motif/xaw3d/neXtaw) for xdvi + [default: Xaw] + --with-system-harfbuzz use installed harfbuzz headers and library (requires + pkg-config) + --with-system-icu use installed ICU headers and libraries (requires + pkg-config or icu-config) + --with-system-teckit use installed teckit headers and library (requires + pkg-config) + --with-system-graphite2 use installed graphite2 headers and library + (requires pkg-config) --with-system-zziplib use installed zziplib headers and library (requires pkg-config) + --with-system-xpdf use installed poppler headers and library instead of + xpdf library from TL (requires pkg-config) + --with-system-poppler use installed poppler headers and library (requires + pkg-config) + --with-system-mpfr use installed mpfr headers and library + --with-mpfr-includes=DIR + mpfr headers installed in DIR + --with-mpfr-libdir=DIR mpfr library installed in DIR + --with-system-gmp use installed gmp headers and library + --with-gmp-includes=DIR gmp headers installed in DIR + --with-gmp-libdir=DIR gmp library installed in DIR + --with-system-cairo use installed cairo headers and library (requires + pkg-config) + --with-system-pixman use installed pixman headers and library (requires + pkg-config) + --with-system-gd use installed gd headers and library + --with-gd-includes=DIR gd headers installed in DIR + --with-gd-libdir=DIR gd library installed in DIR + --with-system-freetype2 use installed freetype2 headers and library + (requires freetype-config) --with-system-libpng use installed libpng headers and library (requires pkg-config) + --with-system-libpaper use installed libpaper headers and library + --with-libpaper-includes=DIR + libpaper headers installed in DIR + --with-libpaper-libdir=DIR + libpaper library installed in DIR --with-system-zlib use installed zlib headers and library --with-zlib-includes=DIR zlib headers installed in DIR --with-zlib-libdir=DIR zlib library installed in DIR + --with-system-ptexenc use installed ptexenc headers and library (requires + pkg-config) --with-system-kpathsea use installed kpathsea headers and library (requires pkg-config) --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use @@ -3980,6 +4179,296 @@ $as_echo "$as_me: $host -> \`--disable-mfluajit'" >&6;} esac ;; esac +## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir +## $Id: withenable.ac 46590 2018-02-10 23:30:32Z karl $ +## configure options and TL libraries required for autosp. +# Check whether --enable-autosp was given. +if test "${enable_autosp+set}" = set; then : + enableval=$enable_autosp; +fi +case $enable_autosp in #( + yes|no) : + ;; #( + *) : + + enable_autosp=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-autosp=$enable_autosp'" >&5 +$as_echo "$as_me: Assuming \`--enable-autosp=$enable_autosp'" >&6;} + ac_configure_args="$ac_configure_args '--enable-autosp=$enable_autosp'" + ;; +esac + +## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir +## $Id: withenable.ac 46590 2018-02-10 23:30:32Z karl $ +## configure options and TL libraries for axodraw2. +# Check whether --enable-axodraw2 was given. +if test "${enable_axodraw2+set}" = set; then : + enableval=$enable_axodraw2; +fi +case $enable_axodraw2 in #( + yes|no) : + ;; #( + *) : + + enable_axodraw2=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-axodraw2=$enable_axodraw2'" >&5 +$as_echo "$as_me: Assuming \`--enable-axodraw2=$enable_axodraw2'" >&6;} + ac_configure_args="$ac_configure_args '--enable-axodraw2=$enable_axodraw2'" + ;; +esac + +## utils/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/devnag/ +## configure options and TL libraries required for devnag +# Check whether --enable-devnag was given. +if test "${enable_devnag+set}" = set; then : + enableval=$enable_devnag; +fi +case $enable_devnag in #( + yes|no) : + ;; #( + *) : + + enable_devnag=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-devnag=$enable_devnag'" >&5 +$as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;} + ac_configure_args="$ac_configure_args '--enable-devnag=$enable_devnag'" + ;; +esac + +## utils/lacheck/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/lacheck/ +## configure options and TL libraries required for lacheck +# Check whether --enable-lacheck was given. +if test "${enable_lacheck+set}" = set; then : + enableval=$enable_lacheck; +fi +case $enable_lacheck in #( + yes|no) : + ;; #( + *) : + + enable_lacheck=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lacheck=$enable_lacheck'" >&5 +$as_echo "$as_me: Assuming \`--enable-lacheck=$enable_lacheck'" >&6;} + ac_configure_args="$ac_configure_args '--enable-lacheck=$enable_lacheck'" + ;; +esac + +## utils/m-tx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/m-tx/ +## configure options and TL libraries required for mtx +# Check whether --enable-m-tx was given. +if test "${enable_m_tx+set}" = set; then : + enableval=$enable_m_tx; +fi +case $enable_m_tx in #( + yes|no) : + ;; #( + *) : + + enable_m_tx=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-m-tx=$enable_m_tx'" >&5 +$as_echo "$as_me: Assuming \`--enable-m-tx=$enable_m_tx'" >&6;} + ac_configure_args="$ac_configure_args '--enable-m-tx=$enable_m_tx'" + ;; +esac + +## utils/pmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/pmx/ +## configure options and TL libraries required for pmx +# Check whether --enable-pmx was given. +if test "${enable_pmx+set}" = set; then : + enableval=$enable_pmx; +fi +case $enable_pmx in #( + yes|no) : + ;; #( + *) : + + enable_pmx=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-pmx=$enable_pmx'" >&5 +$as_echo "$as_me: Assuming \`--enable-pmx=$enable_pmx'" >&6;} + ac_configure_args="$ac_configure_args '--enable-pmx=$enable_pmx'" + ;; +esac + +## utils/ps2eps/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ps2eps/ +## configure options and TL libraries required for ps2eps +# Check whether --enable-ps2eps was given. +if test "${enable_ps2eps+set}" = set; then : + enableval=$enable_ps2eps; +fi +case $enable_ps2eps in #( + yes|no) : + ;; #( + *) : + + enable_ps2eps=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&5 +$as_echo "$as_me: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&6;} + ac_configure_args="$ac_configure_args '--enable-ps2eps=$enable_ps2eps'" + ;; +esac + +## utils/t1utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/t1utils/ +## configure options and TL libraries required for t1utils +# Check whether --enable-t1utils was given. +if test "${enable_t1utils+set}" = set; then : + enableval=$enable_t1utils; +fi +case $enable_t1utils in #( + yes|no) : + ;; #( + *) : + + enable_t1utils=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-t1utils=$enable_t1utils'" >&5 +$as_echo "$as_me: Assuming \`--enable-t1utils=$enable_t1utils'" >&6;} + ac_configure_args="$ac_configure_args '--enable-t1utils=$enable_t1utils'" + ;; +esac + +## utils/texdoctk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/texdoctk/ +## configure options and TL libraries required for texdoctk +# Check whether --enable-texdoctk was given. +if test "${enable_texdoctk+set}" = set; then : + enableval=$enable_texdoctk; +fi +case $enable_texdoctk in #( + yes|no) : + ;; #( + *) : + + enable_texdoctk=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texdoctk=$enable_texdoctk'" >&5 +$as_echo "$as_me: Assuming \`--enable-texdoctk=$enable_texdoctk'" >&6;} + ac_configure_args="$ac_configure_args '--enable-texdoctk=$enable_texdoctk'" + ;; +esac + +## utils/tpic2pdftex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/tpic2pdftex/ +## configure options and TL libraries required for tpic2pdftex +# Check whether --enable-tpic2pdftex was given. +if test "${enable_tpic2pdftex+set}" = set; then : + enableval=$enable_tpic2pdftex; +fi +case $enable_tpic2pdftex in #( + yes|no) : + ;; #( + *) : + + enable_tpic2pdftex=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&5 +$as_echo "$as_me: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&6;} + ac_configure_args="$ac_configure_args '--enable-tpic2pdftex=$enable_tpic2pdftex'" + ;; +esac + +## utils/vlna/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/vlna/ +## configure options and TL libraries required for vlna +# Check whether --enable-vlna was given. +if test "${enable_vlna+set}" = set; then : + enableval=$enable_vlna; +fi +case $enable_vlna in #( + yes|no) : + ;; #( + *) : + + enable_vlna=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-vlna=$enable_vlna'" >&5 +$as_echo "$as_me: Assuming \`--enable-vlna=$enable_vlna'" >&6;} + ac_configure_args="$ac_configure_args '--enable-vlna=$enable_vlna'" + ;; +esac + +# $Id: withenable.ac 49993 2019-02-10 19:14:27Z karl $ +# utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/ +## configure options and TL libraries required for xindy +# Check whether --enable-xindy was given. +if test "${enable_xindy+set}" = set; then : + enableval=$enable_xindy; +fi +case $enable_xindy in #( + yes|no) : + ;; #( + *) : + + enable_xindy=no + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xindy=$enable_xindy'" >&5 +$as_echo "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;} + ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'" + ;; +esac + +## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/ +## configure options for xindy +# Check whether --enable-xindy-rules was given. +if test "${enable_xindy_rules+set}" = set; then : + enableval=$enable_xindy_rules; +fi +# Check whether --enable-xindy-docs was given. +if test "${enable_xindy_docs+set}" = set; then : + enableval=$enable_xindy_docs; +fi + +# Check whether --with-clisp-runtime was given. +if test "${with_clisp_runtime+set}" = set; then : + withval=$with_clisp_runtime; +fi + +## utils/xindy/ac/clisp.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/ +## configure checks for xindy and clisp +case $with_clisp_runtime in #( + default) : + ;; #( + system) : + if test "x$enable_native_texlive_build" = xyes; then : + as_fn_error $? "you can not use the installed clisp for a native TeX Live build" "$LINENO" 5 +fi ;; #( + "") : + if test "x$enable_native_texlive_build" = xyes; then : + with_clisp_runtime=default +else + with_clisp_runtime=system +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--with-clisp-runtime=$with_clisp_runtime'" >&5 +$as_echo "$as_me: Assuming \`--with-clisp-runtime=$with_clisp_runtime'" >&6;} + ac_configure_args="$ac_configure_args '--with-clisp-runtime=$with_clisp_runtime'" ;; #( + *) : + if test ! -f "$with_clisp_runtime"; then : + as_fn_error $? "no such file: \"$with_clisp_runtime\"" "$LINENO" 5 +fi ;; +esac + +## utils/xpdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xpdfopen/ +## configure options and TL libraries required for xpdfopen +# Check whether --enable-xpdfopen was given. +if test "${enable_xpdfopen+set}" = set; then : + enableval=$enable_xpdfopen; +fi +if test "x$with_x" = xno; then : + case $enable_xpdfopen in #( + "") : + { $as_echo "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-xpdfopen'" >&5 +$as_echo "$as_me: \`--without-x' -> \`--disable-xpdfopen'" >&6;} + enable_xpdfopen=no + ac_configure_args="$ac_configure_args '--disable-xpdfopen'" ;; #( + yes) : + as_fn_error $? "Sorry, incompatible options \`--without-x' and \`--enable-xpdfopen'" "$LINENO" 5 ;; #( + *) : + ;; +esac +fi +case $enable_xpdfopen in #( + yes|no) : + ;; #( + *) : + + enable_xpdfopen=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xpdfopen=$enable_xpdfopen'" >&5 +$as_echo "$as_me: Assuming \`--enable-xpdfopen=$enable_xpdfopen'" >&6;} + ac_configure_args="$ac_configure_args '--enable-xpdfopen=$enable_xpdfopen'" + ;; +esac + ## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ ## configure options and TL libraries required for web2c @@ -4004,7 +4493,7 @@ test "x$enable_web2c" = xno || { need_zlib=yes } -# $Id: web2c.ac 50341 2019-03-11 22:04:24Z karl $ +# $Id: web2c.ac 51577 2019-07-08 06:07:11Z lscarso $ # texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ ## configure options for TeX and MF @@ -4198,6 +4687,40 @@ test "x$enable_web2c:$enable_luajittex" = xyes:yes && { need_zziplib=yes need_luajit=yes } +# Check whether --enable-luahbtex was given. +if test "${enable_luahbtex+set}" = set; then : + enableval=$enable_luahbtex; +fi +case $enable_luahbtex in #( + yes | no) : + ;; #( + *) : + enable_luahbtex=yes ;; +esac + +test "x$enable_web2c:$enable_luahbtex" = xyes:yes && { + need_libpng=yes + need_zziplib=yes + need_lua53=yes + need_harfbuzz=yes +} +# Check whether --enable-luajithbtex was given. +if test "${enable_luajithbtex+set}" = set; then : + enableval=$enable_luajithbtex; +fi +case $enable_luajithbtex in #( + yes | no) : + ;; #( + *) : + enable_luajithbtex=yes ;; +esac + +test "x$enable_web2c:$enable_luajithbtex" = xyes:yes && { + need_libpng=yes + need_zziplib=yes + need_luajit=yes + need_harfbuzz=yes +} # Check whether --enable-mp was given. if test "${enable_mp+set}" = set; then : enableval=$enable_mp; @@ -4392,92 +4915,1401 @@ if test "${enable_synctex+set}" = set; then : fi -## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/ -## configure options and TL libraries required for texlive -# Check whether --enable-texlive was given. -if test "${enable_texlive+set}" = set; then : - enableval=$enable_texlive; +## texk/afm2pl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/afm2pl/ +## configure options and TL libraries required for afm2pl +# Check whether --enable-afm2pl was given. +if test "${enable_afm2pl+set}" = set; then : + enableval=$enable_afm2pl; fi -case $enable_texlive in #( +case $enable_afm2pl in #( yes|no) : ;; #( *) : - enable_texlive=$enable_all_pkgs - { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texlive=$enable_texlive'" >&5 -$as_echo "$as_me: Assuming \`--enable-texlive=$enable_texlive'" >&6;} - ac_configure_args="$ac_configure_args '--enable-texlive=$enable_texlive'" + enable_afm2pl=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&5 +$as_echo "$as_me: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&6;} + ac_configure_args="$ac_configure_args '--enable-afm2pl=$enable_afm2pl'" ;; esac -## texk/texlive/ac/texlive.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/ -## configure options for texlive -# Check whether --enable-linked-scripts was given. -if test "${enable_linked_scripts+set}" = set; then : - enableval=$enable_linked_scripts; +test "x$enable_afm2pl" = xno || { + need_kpathsea=yes +} + +## texk/bibtex-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex-x/ +## configure options and TL libraries required for bibtex-x +# Check whether --enable-bibtex-x was given. +if test "${enable_bibtex_x+set}" = set; then : + enableval=$enable_bibtex_x; fi +case $enable_bibtex_x in #( + yes|no) : + ;; #( + *) : + enable_bibtex_x=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-bibtex-x=$enable_bibtex_x'" >&5 +$as_echo "$as_me: Assuming \`--enable-bibtex-x=$enable_bibtex_x'" >&6;} + ac_configure_args="$ac_configure_args '--enable-bibtex-x=$enable_bibtex_x'" + ;; +esac -## libs/zziplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zziplib/ -## configure options and TL libraries required for zziplib +test "x$enable_bibtex_x" = xno || { + need_kpathsea=yes +} -# Check whether --with-system-zziplib was given. -if test "${with_system_zziplib+set}" = set; then : - withval=$with_system_zziplib; +## texk/bibtex-x/ac/bibtex-x.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex-x/ +## configure options for bibtex-x +# Check whether --enable-bibtex8 was given. +if test "${enable_bibtex8+set}" = set; then : + enableval=$enable_bibtex8; fi -if test "x$with_system_zziplib" = x; then - if test -f $srcdir/libs/zziplib/configure; then - { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`zziplib' headers and library from TL tree" >&5 -$as_echo "$as_me: Assuming \`zziplib' headers and library from TL tree" >&6;} - with_system_zziplib=no - else - { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`zziplib' headers and library" >&5 -$as_echo "$as_me: Assuming installed \`zziplib' headers and library" >&6;} - with_system_zziplib=yes - fi - ac_configure_args="$ac_configure_args '--with-system-zziplib=$with_system_zziplib'" -elif test "x$with_system_zziplib" = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`zziplib' headers and library" >&5 -$as_echo "$as_me: Using installed \`zziplib' headers and library" >&6;} -else - { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`zziplib' headers and library from TL tree" >&5 -$as_echo "$as_me: Using \`zziplib' headers and library from TL tree" >&6;} - if test "x$with_system_zziplib" != xno; then - with_system_zziplib=no - ac_configure_args="$ac_configure_args '--without-system-zziplib'" - fi + +case $enable_bibtex8 in #( + yes | no) : + ;; #( + *) : + enable_bibtex8=yes ;; +esac +# Check whether --enable-bibtexu was given. +if test "${enable_bibtexu+set}" = set; then : + enableval=$enable_bibtexu; fi -if test "x$with_system_zziplib" = xyes; then - if test "x$with_system_zlib" = x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`zlib' headers and library" >&5 -$as_echo "$as_me: -> installed \`zlib' headers and library" >&6;} - with_system_zlib=yes - ac_configure_args="$ac_configure_args '--with-system-zlib'" - elif test "x$with_system_zlib" != xyes; then - as_fn_error $? "Sorry, \`--with-system-zziplib' requires \`--with-system-zlib'" "$LINENO" 5 - fi + +case $enable_bibtexu in #( + yes | no) : + ;; #( + *) : + enable_bibtexu=yes ;; +esac + +test "x$enable_bibtex_x:$enable_bibtexu" = xyes:yes && need_icu=yes + +## texk/chktex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/chktex/ +## configure options and TL libraries required for chktex +# Check whether --enable-chktex was given. +if test "${enable_chktex+set}" = set; then : + enableval=$enable_chktex; fi +case $enable_chktex in #( + yes|no) : + ;; #( + *) : -test "x$need_zziplib" = xyes && { - need_zlib=yes + enable_chktex=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-chktex=$enable_chktex'" >&5 +$as_echo "$as_me: Assuming \`--enable-chktex=$enable_chktex'" >&6;} + ac_configure_args="$ac_configure_args '--enable-chktex=$enable_chktex'" + ;; +esac + +test "x$enable_chktex" = xno || { + need_kpathsea=yes } -## libs/libpng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/ -## configure options and TL libraries required for libpng +## texk/cjkutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/cjkutils/ +## configure options and TL libraries required for cjkutils +# Check whether --enable-cjkutils was given. +if test "${enable_cjkutils+set}" = set; then : + enableval=$enable_cjkutils; +fi +case $enable_cjkutils in #( + yes|no) : + ;; #( + *) : -# Check whether --with-system-libpng was given. -if test "${with_system_libpng+set}" = set; then : - withval=$with_system_libpng; + enable_cjkutils=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&5 +$as_echo "$as_me: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&6;} + ac_configure_args="$ac_configure_args '--enable-cjkutils=$enable_cjkutils'" + ;; +esac + +test "x$enable_cjkutils" = xno || { + need_kpathsea=yes +} + +## texk/detex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/detex/ +## configure options and TL libraries required for detex +# Check whether --enable-detex was given. +if test "${enable_detex+set}" = set; then : + enableval=$enable_detex; fi -if test "x$with_system_libpng" = x; then - if test -f $srcdir/libs/libpng/configure; then - { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`libpng' headers and library from TL tree" >&5 -$as_echo "$as_me: Assuming \`libpng' headers and library from TL tree" >&6;} - with_system_libpng=no - else - { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`libpng' headers and library" >&5 -$as_echo "$as_me: Assuming installed \`libpng' headers and library" >&6;} - with_system_libpng=yes +case $enable_detex in #( + yes|no) : + ;; #( + *) : + + enable_detex=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-detex=$enable_detex'" >&5 +$as_echo "$as_me: Assuming \`--enable-detex=$enable_detex'" >&6;} + ac_configure_args="$ac_configure_args '--enable-detex=$enable_detex'" + ;; +esac + +test "x$enable_detex" = xno || { + need_kpathsea=yes +} + +## texk/dtl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dtl/ +## configure options and TL libraries required for dtl +# Check whether --enable-dtl was given. +if test "${enable_dtl+set}" = set; then : + enableval=$enable_dtl; +fi +case $enable_dtl in #( + yes|no) : + ;; #( + *) : + + enable_dtl=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dtl=$enable_dtl'" >&5 +$as_echo "$as_me: Assuming \`--enable-dtl=$enable_dtl'" >&6;} + ac_configure_args="$ac_configure_args '--enable-dtl=$enable_dtl'" + ;; +esac + +test "x$enable_dtl" = xno || { + need_kpathsea=yes +} + +## texk/dvi2tty/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvi2tty/ +## configure options and TL libraries required for dvi2tty +# Check whether --enable-dvi2tty was given. +if test "${enable_dvi2tty+set}" = set; then : + enableval=$enable_dvi2tty; +fi +case $enable_dvi2tty in #( + yes|no) : + ;; #( + *) : + + enable_dvi2tty=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&5 +$as_echo "$as_me: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&6;} + ac_configure_args="$ac_configure_args '--enable-dvi2tty=$enable_dvi2tty'" + ;; +esac + +test "x$enable_dvi2tty" = xno || { + need_ptexenc=yes +} + +## texk/dvidvi/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvidvi/ +## configure options and TL libraries required for dvidvi +# Check whether --enable-dvidvi was given. +if test "${enable_dvidvi+set}" = set; then : + enableval=$enable_dvidvi; +fi +case $enable_dvidvi in #( + yes|no) : + ;; #( + *) : + + enable_dvidvi=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&5 +$as_echo "$as_me: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&6;} + ac_configure_args="$ac_configure_args '--enable-dvidvi=$enable_dvidvi'" + ;; +esac + +test "x$enable_dvidvi" = xno || { + need_kpathsea=yes +} + +## texk/dviljk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviljk/ +## configure options and TL libraries required for dviljk +# Check whether --enable-dviljk was given. +if test "${enable_dviljk+set}" = set; then : + enableval=$enable_dviljk; +fi +case $enable_dviljk in #( + yes|no) : + ;; #( + *) : + + enable_dviljk=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dviljk=$enable_dviljk'" >&5 +$as_echo "$as_me: Assuming \`--enable-dviljk=$enable_dviljk'" >&6;} + ac_configure_args="$ac_configure_args '--enable-dviljk=$enable_dviljk'" + ;; +esac + +test "x$enable_dviljk" = xno || { + need_kpathsea=yes +} + +## texk/dviout-util/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviout-util/ +## configure options and TL libraries required for dviout-util +# Check whether --enable-dviout-util was given. +if test "${enable_dviout_util+set}" = set; then : + enableval=$enable_dviout_util; +fi +case $enable_dviout_util in #( + yes|no) : + ;; #( + *) : + + enable_dviout_util=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dviout-util=$enable_dviout_util'" >&5 +$as_echo "$as_me: Assuming \`--enable-dviout-util=$enable_dviout_util'" >&6;} + ac_configure_args="$ac_configure_args '--enable-dviout-util=$enable_dviout_util'" + ;; +esac + +test "x$enable_dviout_util" = xno || { + need_ptexenc=yes +} + +## texk/dvipdfm-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm-x/ +## configure options and TL libraries required for dvipdfm-x +# Check whether --enable-dvipdfm-x was given. +if test "${enable_dvipdfm_x+set}" = set; then : + enableval=$enable_dvipdfm_x; +fi +case $enable_dvipdfm_x in #( + yes|no) : + ;; #( + *) : + + enable_dvipdfm_x=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipdfm-x=$enable_dvipdfm_x'" >&5 +$as_echo "$as_me: Assuming \`--enable-dvipdfm-x=$enable_dvipdfm_x'" >&6;} + ac_configure_args="$ac_configure_args '--enable-dvipdfm-x=$enable_dvipdfm_x'" + ;; +esac + +test "x$enable_dvipdfm_x" = xno || { + need_kpathsea=yes + need_libpng=yes + need_libpaper=yes +} + +## texk/dvipng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/ +## configure options and TL libraries required for dvipng +# Check whether --enable-dvipng was given. +if test "${enable_dvipng+set}" = set; then : + enableval=$enable_dvipng; +fi +case $enable_dvipng in #( + yes|no) : + ;; #( + *) : + + enable_dvipng=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipng=$enable_dvipng'" >&5 +$as_echo "$as_me: Assuming \`--enable-dvipng=$enable_dvipng'" >&6;} + ac_configure_args="$ac_configure_args '--enable-dvipng=$enable_dvipng'" + ;; +esac + +test "x$enable_dvipng" = xno || { + need_kpathsea=yes + need_gd=yes +} + +## texk/dvipng/ac/dvipng.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/ +## configure options for dvipng +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; +fi + +# Check whether --enable-timing was given. +if test "${enable_timing+set}" = set; then : + enableval=$enable_timing; +fi + + +# Check whether --with-gs was given. +if test "${with_gs+set}" = set; then : + withval=$with_gs; +fi + + +## texk/dvipos/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipos/ +## configure options and TL libraries required for dvipos +# Check whether --enable-dvipos was given. +if test "${enable_dvipos+set}" = set; then : + enableval=$enable_dvipos; +fi +case $enable_dvipos in #( + yes|no) : + ;; #( + *) : + + enable_dvipos=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipos=$enable_dvipos'" >&5 +$as_echo "$as_me: Assuming \`--enable-dvipos=$enable_dvipos'" >&6;} + ac_configure_args="$ac_configure_args '--enable-dvipos=$enable_dvipos'" + ;; +esac + +test "x$enable_dvipos" = xno || { + need_kpathsea=yes +} + +## texk/dvipsk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipsk/ +## configure options and TL libraries required for dvipsk +# Check whether --enable-dvipsk was given. +if test "${enable_dvipsk+set}" = set; then : + enableval=$enable_dvipsk; +fi +case $enable_dvipsk in #( + yes|no) : + ;; #( + *) : + + enable_dvipsk=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&5 +$as_echo "$as_me: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&6;} + ac_configure_args="$ac_configure_args '--enable-dvipsk=$enable_dvipsk'" + ;; +esac + +test "x$enable_dvipsk" = xno || { + need_kpathsea=yes +} + +# texk/dvisvgm/ac/withenable.ac: configure.ac fragment +## configure options and TL libraries required for dvisvgm +# Check whether --enable-dvisvgm was given. +if test "${enable_dvisvgm+set}" = set; then : + enableval=$enable_dvisvgm; +fi +case $enable_dvisvgm in #( + yes|no) : + ;; #( + *) : + + enable_dvisvgm=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvisvgm=$enable_dvisvgm'" >&5 +$as_echo "$as_me: Assuming \`--enable-dvisvgm=$enable_dvisvgm'" >&6;} + ac_configure_args="$ac_configure_args '--enable-dvisvgm=$enable_dvisvgm'" + ;; +esac + +test "x$enable_dvisvgm" = xno || { + need_kpathsea=yes + need_potrace=yes + need_freetype2=yes + need_zlib=yes +} + +## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/ +## configure options and TL libraries required for gregorio +# Check whether --enable-gregorio was given. +if test "${enable_gregorio+set}" = set; then : + enableval=$enable_gregorio; +fi +case $enable_gregorio in #( + yes|no) : + ;; #( + *) : + + enable_gregorio=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-gregorio=$enable_gregorio'" >&5 +$as_echo "$as_me: Assuming \`--enable-gregorio=$enable_gregorio'" >&6;} + ac_configure_args="$ac_configure_args '--enable-gregorio=$enable_gregorio'" + ;; +esac + +test "x$enable_gregorio" = xno || { + need_kpathsea=yes +} + +## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/ +## configure options and TL libraries required for gsftopk +# Check whether --enable-gsftopk was given. +if test "${enable_gsftopk+set}" = set; then : + enableval=$enable_gsftopk; +fi +case $enable_gsftopk in #( + yes|no) : + ;; #( + *) : + + enable_gsftopk=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&5 +$as_echo "$as_me: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&6;} + ac_configure_args="$ac_configure_args '--enable-gsftopk=$enable_gsftopk'" + ;; +esac + +test "x$enable_gsftopk" = xno || { + need_kpathsea=yes +} + +## texk/lcdf-typetools/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/ +## configure options and TL libraries required for lcdf-typetools +# Check whether --enable-lcdf-typetools was given. +if test "${enable_lcdf_typetools+set}" = set; then : + enableval=$enable_lcdf_typetools; +fi +case $enable_lcdf_typetools in #( + yes|no) : + ;; #( + *) : + + enable_lcdf_typetools=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&5 +$as_echo "$as_me: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&6;} + ac_configure_args="$ac_configure_args '--enable-lcdf-typetools=$enable_lcdf_typetools'" + ;; +esac + +test "x$enable_lcdf_typetools" = xno || { + need_kpathsea=yes +} + +## Define configure options for lcdf-typetools. Extracted from configure.ac +## for ease of building TeX Live. +# Check whether --enable-cfftot1 was given. +if test "${enable_cfftot1+set}" = set; then : + enableval=$enable_cfftot1; +fi +# Check whether --enable-mmafm was given. +if test "${enable_mmafm+set}" = set; then : + enableval=$enable_mmafm; +fi +# Check whether --enable-mmpfb was given. +if test "${enable_mmpfb+set}" = set; then : + enableval=$enable_mmpfb; +fi +# Check whether --enable-otfinfo was given. +if test "${enable_otfinfo+set}" = set; then : + enableval=$enable_otfinfo; +fi +# Check whether --enable-otftotfm was given. +if test "${enable_otftotfm+set}" = set; then : + enableval=$enable_otftotfm; +fi +# Check whether --enable-t1dotlessj was given. +if test "${enable_t1dotlessj+set}" = set; then : + enableval=$enable_t1dotlessj; +fi +# Check whether --enable-t1lint was given. +if test "${enable_t1lint+set}" = set; then : + enableval=$enable_t1lint; +fi +# Check whether --enable-t1rawafm was given. +if test "${enable_t1rawafm+set}" = set; then : + enableval=$enable_t1rawafm; +fi +# Check whether --enable-t1reencode was given. +if test "${enable_t1reencode+set}" = set; then : + enableval=$enable_t1reencode; +fi +# Check whether --enable-t1testpage was given. +if test "${enable_t1testpage+set}" = set; then : + enableval=$enable_t1testpage; +fi +# Check whether --enable-ttftotype42 was given. +if test "${enable_ttftotype42+set}" = set; then : + enableval=$enable_ttftotype42; +fi + +# Check whether --enable-cfftot1 was given. +if test "${enable_cfftot1+set}" = set; then : + enableval=$enable_cfftot1; +fi +# Check whether --enable-t1dotlessj was given. +if test "${enable_t1dotlessj+set}" = set; then : + enableval=$enable_t1dotlessj; +fi +# Check whether --enable-ttftotype42 was given. +if test "${enable_ttftotype42+set}" = set; then : + enableval=$enable_ttftotype42; +fi +# Check whether --enable-updmap was given. +if test "${enable_updmap+set}" = set; then : + enableval=$enable_updmap; +fi + + +## texk/makeindexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makeindexk/ +## configure options and TL libraries required for makeindexk +# Check whether --enable-makeindexk was given. +if test "${enable_makeindexk+set}" = set; then : + enableval=$enable_makeindexk; +fi +case $enable_makeindexk in #( + yes|no) : + ;; #( + *) : + + enable_makeindexk=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&5 +$as_echo "$as_me: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&6;} + ac_configure_args="$ac_configure_args '--enable-makeindexk=$enable_makeindexk'" + ;; +esac + +test "x$enable_makeindexk" = xno || { + need_kpathsea=yes +} + +## texk/makejvf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makejvf/ +## configure options and TL libraries required for makejvf +# Check whether --enable-makejvf was given. +if test "${enable_makejvf+set}" = set; then : + enableval=$enable_makejvf; +fi +case $enable_makejvf in #( + yes|no) : + ;; #( + *) : + + enable_makejvf=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makejvf=$enable_makejvf'" >&5 +$as_echo "$as_me: Assuming \`--enable-makejvf=$enable_makejvf'" >&6;} + ac_configure_args="$ac_configure_args '--enable-makejvf=$enable_makejvf'" + ;; +esac + +test "x$enable_makejvf" = xno || { + need_ptexenc=yes +} + +## texk/mendexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/mendexk/ +## configure options and TL libraries required for mendexk +# Check whether --enable-mendexk was given. +if test "${enable_mendexk+set}" = set; then : + enableval=$enable_mendexk; +fi +case $enable_mendexk in #( + yes|no) : + ;; #( + *) : + + enable_mendexk=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-mendexk=$enable_mendexk'" >&5 +$as_echo "$as_me: Assuming \`--enable-mendexk=$enable_mendexk'" >&6;} + ac_configure_args="$ac_configure_args '--enable-mendexk=$enable_mendexk'" + ;; +esac + +test "x$enable_mendexk" = xno || { + need_ptexenc=yes +} + +## texk/musixtnt/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/musixtnt/ +## configure options and TL libraries required for musixtnt +# Check whether --enable-musixtnt was given. +if test "${enable_musixtnt+set}" = set; then : + enableval=$enable_musixtnt; +fi +case $enable_musixtnt in #( + yes|no) : + ;; #( + *) : + + enable_musixtnt=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-musixtnt=$enable_musixtnt'" >&5 +$as_echo "$as_me: Assuming \`--enable-musixtnt=$enable_musixtnt'" >&6;} + ac_configure_args="$ac_configure_args '--enable-musixtnt=$enable_musixtnt'" + ;; +esac + +test "x$enable_musixtnt" = xno || { + need_kpathsea=yes +} + +## texk/ps2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pk/ +## configure options and TL libraries required for ps2pk +# Check whether --enable-ps2pk was given. +if test "${enable_ps2pk+set}" = set; then : + enableval=$enable_ps2pk; +fi +case $enable_ps2pk in #( + yes|no) : + ;; #( + *) : + + enable_ps2pk=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&5 +$as_echo "$as_me: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&6;} + ac_configure_args="$ac_configure_args '--enable-ps2pk=$enable_ps2pk'" + ;; +esac + +test "x$enable_ps2pk" = xno || { + need_kpathsea=yes +} + +## texk/psutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/psutils/ +## configure options and TL libraries required for psutils +# Check whether --enable-psutils was given. +if test "${enable_psutils+set}" = set; then : + enableval=$enable_psutils; +fi +case $enable_psutils in #( + yes|no) : + ;; #( + *) : + + enable_psutils=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-psutils=$enable_psutils'" >&5 +$as_echo "$as_me: Assuming \`--enable-psutils=$enable_psutils'" >&6;} + ac_configure_args="$ac_configure_args '--enable-psutils=$enable_psutils'" + ;; +esac + +test "x$enable_psutils" = xno || { + need_kpathsea=yes + need_libpaper=yes +} + +## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/ +## configure options and TL libraries required for seetexk +# Check whether --enable-seetexk was given. +if test "${enable_seetexk+set}" = set; then : + enableval=$enable_seetexk; +fi +case $enable_seetexk in #( + yes|no) : + ;; #( + *) : + + enable_seetexk=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-seetexk=$enable_seetexk'" >&5 +$as_echo "$as_me: Assuming \`--enable-seetexk=$enable_seetexk'" >&6;} + ac_configure_args="$ac_configure_args '--enable-seetexk=$enable_seetexk'" + ;; +esac + +test "x$enable_seetexk" = xno || { + need_kpathsea=yes +} + +## texk/tex4htk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tex4htk/ +## configure options and TL libraries required for tex4htk +# Check whether --enable-tex4htk was given. +if test "${enable_tex4htk+set}" = set; then : + enableval=$enable_tex4htk; +fi +case $enable_tex4htk in #( + yes|no) : + ;; #( + *) : + + enable_tex4htk=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&5 +$as_echo "$as_me: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&6;} + ac_configure_args="$ac_configure_args '--enable-tex4htk=$enable_tex4htk'" + ;; +esac + +test "x$enable_tex4htk" = xno || { + need_kpathsea=yes +} + +## texk/ttf2pk2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk2/ +## configure options and TL libraries required for ttf2pk +# Check whether --enable-ttf2pk2 was given. +if test "${enable_ttf2pk2+set}" = set; then : + enableval=$enable_ttf2pk2; +fi +case $enable_ttf2pk2 in #( + yes|no) : + ;; #( + *) : + + enable_ttf2pk2=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&5 +$as_echo "$as_me: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&6;} + ac_configure_args="$ac_configure_args '--enable-ttf2pk2=$enable_ttf2pk2'" + ;; +esac + +test "x$enable_ttf2pk2" = xno || { + need_kpathsea=yes + need_freetype2=yes +} + +## texk/ttfdump/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttfdump/ +## configure options and TL libraries required for ttfdump +# Check whether --enable-ttfdump was given. +if test "${enable_ttfdump+set}" = set; then : + enableval=$enable_ttfdump; +fi +case $enable_ttfdump in #( + yes|no) : + ;; #( + *) : + + enable_ttfdump=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&5 +$as_echo "$as_me: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&6;} + ac_configure_args="$ac_configure_args '--enable-ttfdump=$enable_ttfdump'" + ;; +esac + +test "x$enable_ttfdump" = xno || { + need_kpathsea=yes +} + +## texk/upmendex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/upmendex/ +## configure options and TL libraries required for upmendex +# Check whether --enable-upmendex was given. +if test "${enable_upmendex+set}" = set; then : + enableval=$enable_upmendex; +fi +case $enable_upmendex in #( + yes|no) : + ;; #( + *) : + + enable_upmendex=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-upmendex=$enable_upmendex'" >&5 +$as_echo "$as_me: Assuming \`--enable-upmendex=$enable_upmendex'" >&6;} + ac_configure_args="$ac_configure_args '--enable-upmendex=$enable_upmendex'" + ;; +esac + +test "x$enable_upmendex" = xno || { + need_kpathsea=yes + need_icu=yes +} + +## texk/xdvik/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/ +## configure options and TL libraries required for xdvik +# Check whether --enable-xdvik was given. +if test "${enable_xdvik+set}" = set; then : + enableval=$enable_xdvik; +fi +if test "x$with_x" = xno; then : + case $enable_xdvik in #( + "") : + { $as_echo "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-xdvik'" >&5 +$as_echo "$as_me: \`--without-x' -> \`--disable-xdvik'" >&6;} + enable_xdvik=no + ac_configure_args="$ac_configure_args '--disable-xdvik'" ;; #( + yes) : + as_fn_error $? "Sorry, incompatible options \`--without-x' and \`--enable-xdvik'" "$LINENO" 5 ;; #( + *) : + ;; +esac +fi +case $enable_xdvik in #( + yes|no) : + ;; #( + *) : + + enable_xdvik=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xdvik=$enable_xdvik'" >&5 +$as_echo "$as_me: Assuming \`--enable-xdvik=$enable_xdvik'" >&6;} + ac_configure_args="$ac_configure_args '--enable-xdvik=$enable_xdvik'" + ;; +esac + +test "x$enable_xdvik" = xno || { + need_kpathsea=yes + need_freetype2=yes +} + +## texk/xdvik/ac/xdvik.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/ +## configure options for xdvik + +# Check whether --with-xdvi-x-toolkit was given. +if test "${with_xdvi_x_toolkit+set}" = set; then : + withval=$with_xdvi_x_toolkit; +fi + + +## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/ +## configure options and TL libraries required for texlive +# Check whether --enable-texlive was given. +if test "${enable_texlive+set}" = set; then : + enableval=$enable_texlive; +fi +case $enable_texlive in #( + yes|no) : + ;; #( + *) : + + enable_texlive=$enable_all_pkgs + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texlive=$enable_texlive'" >&5 +$as_echo "$as_me: Assuming \`--enable-texlive=$enable_texlive'" >&6;} + ac_configure_args="$ac_configure_args '--enable-texlive=$enable_texlive'" + ;; +esac + +## texk/texlive/ac/texlive.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/ +## configure options for texlive +# Check whether --enable-linked-scripts was given. +if test "${enable_linked_scripts+set}" = set; then : + enableval=$enable_linked_scripts; +fi + + +## libs/harfbuzz/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/ +## configure options and TL libraries required for harfbuzz + +# Check whether --with-system-harfbuzz was given. +if test "${with_system_harfbuzz+set}" = set; then : + withval=$with_system_harfbuzz; +fi +if test "x$with_system_harfbuzz" = x; then + if test -f $srcdir/libs/harfbuzz/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`harfbuzz' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`harfbuzz' headers and library from TL tree" >&6;} + with_system_harfbuzz=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`harfbuzz' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`harfbuzz' headers and library" >&6;} + with_system_harfbuzz=yes + fi + ac_configure_args="$ac_configure_args '--with-system-harfbuzz=$with_system_harfbuzz'" +elif test "x$with_system_harfbuzz" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`harfbuzz' headers and library" >&5 +$as_echo "$as_me: Using installed \`harfbuzz' headers and library" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`harfbuzz' headers and library from TL tree" >&5 +$as_echo "$as_me: Using \`harfbuzz' headers and library from TL tree" >&6;} + if test "x$with_system_harfbuzz" != xno; then + with_system_harfbuzz=no + ac_configure_args="$ac_configure_args '--without-system-harfbuzz'" + fi +fi +if test "x$with_system_harfbuzz" = xyes; then + if test "x$with_system_graphite2" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`graphite2' headers and library" >&5 +$as_echo "$as_me: -> installed \`graphite2' headers and library" >&6;} + with_system_graphite2=yes + ac_configure_args="$ac_configure_args '--with-system-graphite2'" + elif test "x$with_system_graphite2" != xyes; then + as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-graphite2'" "$LINENO" 5 + fi + if test "x$with_system_icu" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`icu' headers and library" >&5 +$as_echo "$as_me: -> installed \`icu' headers and library" >&6;} + with_system_icu=yes + ac_configure_args="$ac_configure_args '--with-system-icu'" + elif test "x$with_system_icu" != xyes; then + as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-icu'" "$LINENO" 5 + fi +fi + +test "x$need_harfbuzz" = xyes && { + need_graphite2=yes + need_icu=yes +} + +## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/ +## configure options and TL libraries required for icu (modified for XeTeX) + +# Check whether --with-system-icu was given. +if test "${with_system_icu+set}" = set; then : + withval=$with_system_icu; +fi +if test "x$with_system_icu" = x; then + if test -f $srcdir/libs/icu/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`icu' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`icu' headers and library from TL tree" >&6;} + with_system_icu=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`icu' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`icu' headers and library" >&6;} + with_system_icu=yes + fi + ac_configure_args="$ac_configure_args '--with-system-icu=$with_system_icu'" +elif test "x$with_system_icu" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`icu' headers and library" >&5 +$as_echo "$as_me: Using installed \`icu' headers and library" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`icu' headers and library from TL tree" >&5 +$as_echo "$as_me: Using \`icu' headers and library from TL tree" >&6;} + if test "x$with_system_icu" != xno; then + with_system_icu=no + ac_configure_args="$ac_configure_args '--without-system-icu'" + fi +fi + +## libs/teckit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/ +## configure options and TL libraries required for teckit + +# Check whether --with-system-teckit was given. +if test "${with_system_teckit+set}" = set; then : + withval=$with_system_teckit; +fi +if test "x$with_system_teckit" = x; then + if test -f $srcdir/libs/teckit/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`teckit' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`teckit' headers and library from TL tree" >&6;} + with_system_teckit=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`teckit' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`teckit' headers and library" >&6;} + with_system_teckit=yes + fi + ac_configure_args="$ac_configure_args '--with-system-teckit=$with_system_teckit'" +elif test "x$with_system_teckit" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`teckit' headers and library" >&5 +$as_echo "$as_me: Using installed \`teckit' headers and library" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`teckit' headers and library from TL tree" >&5 +$as_echo "$as_me: Using \`teckit' headers and library from TL tree" >&6;} + if test "x$with_system_teckit" != xno; then + with_system_teckit=no + ac_configure_args="$ac_configure_args '--without-system-teckit'" + fi +fi +if test "x$with_system_teckit" = xyes; then + if test "x$with_system_zlib" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`zlib' headers and library" >&5 +$as_echo "$as_me: -> installed \`zlib' headers and library" >&6;} + with_system_zlib=yes + ac_configure_args="$ac_configure_args '--with-system-zlib'" + elif test "x$with_system_zlib" != xyes; then + as_fn_error $? "Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" "$LINENO" 5 + fi +fi + +test "x$need_teckit" = xyes && { + need_zlib=yes +} + +## libs/graphite2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/ +## configure options and TL libraries required for graphite2 + +# Check whether --with-system-graphite2 was given. +if test "${with_system_graphite2+set}" = set; then : + withval=$with_system_graphite2; +fi +if test "x$with_system_graphite2" = x; then + if test -f $srcdir/libs/graphite2/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`graphite2' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`graphite2' headers and library from TL tree" >&6;} + with_system_graphite2=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`graphite2' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`graphite2' headers and library" >&6;} + with_system_graphite2=yes + fi + ac_configure_args="$ac_configure_args '--with-system-graphite2=$with_system_graphite2'" +elif test "x$with_system_graphite2" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`graphite2' headers and library" >&5 +$as_echo "$as_me: Using installed \`graphite2' headers and library" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`graphite2' headers and library from TL tree" >&5 +$as_echo "$as_me: Using \`graphite2' headers and library from TL tree" >&6;} + if test "x$with_system_graphite2" != xno; then + with_system_graphite2=no + ac_configure_args="$ac_configure_args '--without-system-graphite2'" + fi +fi + +## libs/zziplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zziplib/ +## configure options and TL libraries required for zziplib + +# Check whether --with-system-zziplib was given. +if test "${with_system_zziplib+set}" = set; then : + withval=$with_system_zziplib; +fi +if test "x$with_system_zziplib" = x; then + if test -f $srcdir/libs/zziplib/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`zziplib' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`zziplib' headers and library from TL tree" >&6;} + with_system_zziplib=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`zziplib' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`zziplib' headers and library" >&6;} + with_system_zziplib=yes + fi + ac_configure_args="$ac_configure_args '--with-system-zziplib=$with_system_zziplib'" +elif test "x$with_system_zziplib" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`zziplib' headers and library" >&5 +$as_echo "$as_me: Using installed \`zziplib' headers and library" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`zziplib' headers and library from TL tree" >&5 +$as_echo "$as_me: Using \`zziplib' headers and library from TL tree" >&6;} + if test "x$with_system_zziplib" != xno; then + with_system_zziplib=no + ac_configure_args="$ac_configure_args '--without-system-zziplib'" + fi +fi +if test "x$with_system_zziplib" = xyes; then + if test "x$with_system_zlib" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`zlib' headers and library" >&5 +$as_echo "$as_me: -> installed \`zlib' headers and library" >&6;} + with_system_zlib=yes + ac_configure_args="$ac_configure_args '--with-system-zlib'" + elif test "x$with_system_zlib" != xyes; then + as_fn_error $? "Sorry, \`--with-system-zziplib' requires \`--with-system-zlib'" "$LINENO" 5 + fi +fi + +test "x$need_zziplib" = xyes && { + need_zlib=yes +} + +## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/ +## configure options and TL libraries required for xpdf + +# Check whether --with-system-xpdf was given. +if test "${with_system_xpdf+set}" = set; then : + withval=$with_system_xpdf; +fi +if test "x$with_system_xpdf" = x; then + if test -f $srcdir/libs/xpdf/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`xpdf' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`xpdf' headers and library from TL tree" >&6;} + with_system_xpdf=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`xpdf' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`xpdf' headers and library" >&6;} + with_system_xpdf=yes + fi + ac_configure_args="$ac_configure_args '--with-system-xpdf=$with_system_xpdf'" +elif test "x$with_system_xpdf" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`xpdf' headers and library" >&5 +$as_echo "$as_me: Using installed \`xpdf' headers and library" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`xpdf' headers and library from TL tree" >&5 +$as_echo "$as_me: Using \`xpdf' headers and library from TL tree" >&6;} + if test "x$with_system_xpdf" != xno; then + with_system_xpdf=no + ac_configure_args="$ac_configure_args '--without-system-xpdf'" + fi +fi + +## libs/poppler/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/poppler/ +## configure options and TL libraries required for poppler + +# Check whether --with-system-poppler was given. +if test "${with_system_poppler+set}" = set; then : + withval=$with_system_poppler; +fi +if test "x$with_system_poppler" = x; then + if test -f $srcdir/libs/poppler/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`poppler' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`poppler' headers and library from TL tree" >&6;} + with_system_poppler=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`poppler' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`poppler' headers and library" >&6;} + with_system_poppler=yes + fi + ac_configure_args="$ac_configure_args '--with-system-poppler=$with_system_poppler'" +elif test "x$with_system_poppler" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`poppler' headers and library" >&5 +$as_echo "$as_me: Using installed \`poppler' headers and library" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`poppler' headers and library from TL tree" >&5 +$as_echo "$as_me: Using \`poppler' headers and library from TL tree" >&6;} + if test "x$with_system_poppler" != xno; then + with_system_poppler=no + ac_configure_args="$ac_configure_args '--without-system-poppler'" + fi +fi +if test "x$with_system_poppler" = xyes; then + if test "x$with_system_zlib" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`zlib' headers and library" >&5 +$as_echo "$as_me: -> installed \`zlib' headers and library" >&6;} + with_system_zlib=yes + ac_configure_args="$ac_configure_args '--with-system-zlib'" + elif test "x$with_system_zlib" != xyes; then + as_fn_error $? "Sorry, \`--with-system-poppler' requires \`--with-system-zlib'" "$LINENO" 5 + fi +fi + +test "x$need_poppler" = xyes && { + need_zlib=yes +} + +## libs/mpfr/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/mpfr/ +## configure options and TL libraries required for mpfr + +# Check whether --with-system-mpfr was given. +if test "${with_system_mpfr+set}" = set; then : + withval=$with_system_mpfr; +fi + +# Check whether --with-mpfr-includes was given. +if test "${with_mpfr_includes+set}" = set; then : + withval=$with_mpfr_includes; +fi + +# Check whether --with-mpfr-libdir was given. +if test "${with_mpfr_libdir+set}" = set; then : + withval=$with_mpfr_libdir; +fi +if test "x$with_system_mpfr" = x; then + if test -f $srcdir/libs/mpfr/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`mpfr' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`mpfr' headers and library from TL tree" >&6;} + with_system_mpfr=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`mpfr' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`mpfr' headers and library" >&6;} + with_system_mpfr=yes + fi + ac_configure_args="$ac_configure_args '--with-system-mpfr=$with_system_mpfr'" +elif test "x$with_system_mpfr" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`mpfr' headers and library" >&5 +$as_echo "$as_me: Using installed \`mpfr' headers and library" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`mpfr' headers and library from TL tree" >&5 +$as_echo "$as_me: Using \`mpfr' headers and library from TL tree" >&6;} + if test "x$with_system_mpfr" != xno; then + with_system_mpfr=no + ac_configure_args="$ac_configure_args '--without-system-mpfr'" + fi +fi +if test "x$with_system_mpfr" = xyes; then + if test "x$with_system_gmp" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`gmp' headers and library" >&5 +$as_echo "$as_me: -> installed \`gmp' headers and library" >&6;} + with_system_gmp=yes + ac_configure_args="$ac_configure_args '--with-system-gmp'" + elif test "x$with_system_gmp" != xyes; then + as_fn_error $? "Sorry, \`--with-system-mpfr' requires \`--with-system-gmp'" "$LINENO" 5 + fi +fi + +test "x$need_mpfr" = xyes && { + need_gmp=yes +} + +## libs/gmp/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gmp/ +## configure options and TL libraries required for gmp + +# Check whether --with-system-gmp was given. +if test "${with_system_gmp+set}" = set; then : + withval=$with_system_gmp; +fi + +# Check whether --with-gmp-includes was given. +if test "${with_gmp_includes+set}" = set; then : + withval=$with_gmp_includes; +fi + +# Check whether --with-gmp-libdir was given. +if test "${with_gmp_libdir+set}" = set; then : + withval=$with_gmp_libdir; +fi +if test "x$with_system_gmp" = x; then + if test -f $srcdir/libs/gmp/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`gmp' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`gmp' headers and library from TL tree" >&6;} + with_system_gmp=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`gmp' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`gmp' headers and library" >&6;} + with_system_gmp=yes + fi + ac_configure_args="$ac_configure_args '--with-system-gmp=$with_system_gmp'" +elif test "x$with_system_gmp" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`gmp' headers and library" >&5 +$as_echo "$as_me: Using installed \`gmp' headers and library" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`gmp' headers and library from TL tree" >&5 +$as_echo "$as_me: Using \`gmp' headers and library from TL tree" >&6;} + if test "x$with_system_gmp" != xno; then + with_system_gmp=no + ac_configure_args="$ac_configure_args '--without-system-gmp'" + fi +fi + +## libs/cairo/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/cairo/ +## configure options and TL libraries required for cairo + +# Check whether --with-system-cairo was given. +if test "${with_system_cairo+set}" = set; then : + withval=$with_system_cairo; +fi +if test "x$with_system_cairo" = x; then + if test -f $srcdir/libs/cairo/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`cairo' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`cairo' headers and library from TL tree" >&6;} + with_system_cairo=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`cairo' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`cairo' headers and library" >&6;} + with_system_cairo=yes + fi + ac_configure_args="$ac_configure_args '--with-system-cairo=$with_system_cairo'" +elif test "x$with_system_cairo" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`cairo' headers and library" >&5 +$as_echo "$as_me: Using installed \`cairo' headers and library" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`cairo' headers and library from TL tree" >&5 +$as_echo "$as_me: Using \`cairo' headers and library from TL tree" >&6;} + if test "x$with_system_cairo" != xno; then + with_system_cairo=no + ac_configure_args="$ac_configure_args '--without-system-cairo'" + fi +fi +if test "x$with_system_cairo" = xyes; then + if test "x$with_system_pixman" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`pixman' headers and library" >&5 +$as_echo "$as_me: -> installed \`pixman' headers and library" >&6;} + with_system_pixman=yes + ac_configure_args="$ac_configure_args '--with-system-pixman'" + elif test "x$with_system_pixman" != xyes; then + as_fn_error $? "Sorry, \`--with-system-cairo' requires \`--with-system-pixman'" "$LINENO" 5 + fi +fi + +test "x$need_cairo" = xyes && { + need_pixman=yes +} + +## libs/pixman/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pixman/ +## configure options and TL libraries required for pixman + +# Check whether --with-system-pixman was given. +if test "${with_system_pixman+set}" = set; then : + withval=$with_system_pixman; +fi +if test "x$with_system_pixman" = x; then + if test -f $srcdir/libs/pixman/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`pixman' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`pixman' headers and library from TL tree" >&6;} + with_system_pixman=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`pixman' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`pixman' headers and library" >&6;} + with_system_pixman=yes + fi + ac_configure_args="$ac_configure_args '--with-system-pixman=$with_system_pixman'" +elif test "x$with_system_pixman" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`pixman' headers and library" >&5 +$as_echo "$as_me: Using installed \`pixman' headers and library" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`pixman' headers and library from TL tree" >&5 +$as_echo "$as_me: Using \`pixman' headers and library from TL tree" >&6;} + if test "x$with_system_pixman" != xno; then + with_system_pixman=no + ac_configure_args="$ac_configure_args '--without-system-pixman'" + fi +fi + +## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ +## configure options and TL libraries required for gd + +# Check whether --with-system-gd was given. +if test "${with_system_gd+set}" = set; then : + withval=$with_system_gd; +fi + +# Check whether --with-gd-includes was given. +if test "${with_gd_includes+set}" = set; then : + withval=$with_gd_includes; +fi + +# Check whether --with-gd-libdir was given. +if test "${with_gd_libdir+set}" = set; then : + withval=$with_gd_libdir; +fi +if test "x$with_system_gd" = x; then + if test -f $srcdir/libs/gd/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`gd' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`gd' headers and library from TL tree" >&6;} + with_system_gd=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`gd' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`gd' headers and library" >&6;} + with_system_gd=yes + fi + ac_configure_args="$ac_configure_args '--with-system-gd=$with_system_gd'" +elif test "x$with_system_gd" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`gd' headers and library" >&5 +$as_echo "$as_me: Using installed \`gd' headers and library" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`gd' headers and library from TL tree" >&5 +$as_echo "$as_me: Using \`gd' headers and library from TL tree" >&6;} + if test "x$with_system_gd" != xno; then + with_system_gd=no + ac_configure_args="$ac_configure_args '--without-system-gd'" + fi +fi +if test "x$with_system_gd" = xyes; then + if test "x$with_system_libpng" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`libpng' headers and library" >&5 +$as_echo "$as_me: -> installed \`libpng' headers and library" >&6;} + with_system_libpng=yes + ac_configure_args="$ac_configure_args '--with-system-libpng'" + elif test "x$with_system_libpng" != xyes; then + as_fn_error $? "Sorry, \`--with-system-gd' requires \`--with-system-libpng'" "$LINENO" 5 + fi + if test "x$with_system_freetype2" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`freetype2' headers and library" >&5 +$as_echo "$as_me: -> installed \`freetype2' headers and library" >&6;} + with_system_freetype2=yes + ac_configure_args="$ac_configure_args '--with-system-freetype2'" + elif test "x$with_system_freetype2" != xyes; then + as_fn_error $? "Sorry, \`--with-system-gd' requires \`--with-system-freetype2'" "$LINENO" 5 + fi +fi + +test "x$need_gd" = xyes && { + need_libpng=yes + need_freetype2=yes +} + +## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/ +## configure options and TL libraries required for freetype2 + +# Check whether --with-system-freetype2 was given. +if test "${with_system_freetype2+set}" = set; then : + withval=$with_system_freetype2; +fi +if test "x$with_system_freetype2" = x; then + if test -f $srcdir/libs/freetype2/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`freetype2' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`freetype2' headers and library from TL tree" >&6;} + with_system_freetype2=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`freetype2' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`freetype2' headers and library" >&6;} + with_system_freetype2=yes + fi + ac_configure_args="$ac_configure_args '--with-system-freetype2=$with_system_freetype2'" +elif test "x$with_system_freetype2" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`freetype2' headers and library" >&5 +$as_echo "$as_me: Using installed \`freetype2' headers and library" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`freetype2' headers and library from TL tree" >&5 +$as_echo "$as_me: Using \`freetype2' headers and library from TL tree" >&6;} + if test "x$with_system_freetype2" != xno; then + with_system_freetype2=no + ac_configure_args="$ac_configure_args '--without-system-freetype2'" + fi +fi +if test "x$with_system_freetype2" = xyes; then + if test "x$with_system_zlib" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`zlib' headers and library" >&5 +$as_echo "$as_me: -> installed \`zlib' headers and library" >&6;} + with_system_zlib=yes + ac_configure_args="$ac_configure_args '--with-system-zlib'" + elif test "x$with_system_zlib" != xyes; then + as_fn_error $? "Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" "$LINENO" 5 + fi +fi + +test "x$need_freetype2" = xyes && { + need_zlib=yes +} + +## libs/libpng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/ +## configure options and TL libraries required for libpng + +# Check whether --with-system-libpng was given. +if test "${with_system_libpng+set}" = set; then : + withval=$with_system_libpng; +fi +if test "x$with_system_libpng" = x; then + if test -f $srcdir/libs/libpng/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`libpng' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`libpng' headers and library from TL tree" >&6;} + with_system_libpng=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`libpng' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`libpng' headers and library" >&6;} + with_system_libpng=yes fi ac_configure_args="$ac_configure_args '--with-system-libpng=$with_system_libpng'" elif test "x$with_system_libpng" = xyes; then @@ -4506,6 +6338,46 @@ test "x$need_libpng" = xyes && { need_zlib=yes } +## libs/libpaper/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpaper/ +## configure options and TL libraries required for libpaper + +# Check whether --with-system-libpaper was given. +if test "${with_system_libpaper+set}" = set; then : + withval=$with_system_libpaper; +fi + +# Check whether --with-libpaper-includes was given. +if test "${with_libpaper_includes+set}" = set; then : + withval=$with_libpaper_includes; +fi + +# Check whether --with-libpaper-libdir was given. +if test "${with_libpaper_libdir+set}" = set; then : + withval=$with_libpaper_libdir; +fi +if test "x$with_system_libpaper" = x; then + if test -f $srcdir/libs/libpaper/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`libpaper' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`libpaper' headers and library from TL tree" >&6;} + with_system_libpaper=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`libpaper' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`libpaper' headers and library" >&6;} + with_system_libpaper=yes + fi + ac_configure_args="$ac_configure_args '--with-system-libpaper=$with_system_libpaper'" +elif test "x$with_system_libpaper" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`libpaper' headers and library" >&5 +$as_echo "$as_me: Using installed \`libpaper' headers and library" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`libpaper' headers and library from TL tree" >&5 +$as_echo "$as_me: Using \`libpaper' headers and library from TL tree" >&6;} + if test "x$with_system_libpaper" != xno; then + with_system_libpaper=no + ac_configure_args="$ac_configure_args '--without-system-libpaper'" + fi +fi + ## libs/luajit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/luajit/ ## configure options and TL libraries required for luajit @@ -4553,6 +6425,50 @@ $as_echo "$as_me: Using \`zlib' headers and library from TL tree" >&6;} fi +## texk/ptexenc/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/ +## configure options and TL libraries required for ptexenc + +# Check whether --with-system-ptexenc was given. +if test "${with_system_ptexenc+set}" = set; then : + withval=$with_system_ptexenc; +fi +if test "x$with_system_ptexenc" = x; then + if test -f $srcdir/texk/ptexenc/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`ptexenc' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`ptexenc' headers and library from TL tree" >&6;} + with_system_ptexenc=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`ptexenc' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`ptexenc' headers and library" >&6;} + with_system_ptexenc=yes + fi + ac_configure_args="$ac_configure_args '--with-system-ptexenc=$with_system_ptexenc'" +elif test "x$with_system_ptexenc" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`ptexenc' headers and library" >&5 +$as_echo "$as_me: Using installed \`ptexenc' headers and library" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`ptexenc' headers and library from TL tree" >&5 +$as_echo "$as_me: Using \`ptexenc' headers and library from TL tree" >&6;} + if test "x$with_system_ptexenc" != xno; then + with_system_ptexenc=no + ac_configure_args="$ac_configure_args '--without-system-ptexenc'" + fi +fi +if test "x$with_system_ptexenc" = xyes; then + if test "x$with_system_kpathsea" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`kpathsea' headers and library" >&5 +$as_echo "$as_me: -> installed \`kpathsea' headers and library" >&6;} + with_system_kpathsea=yes + ac_configure_args="$ac_configure_args '--with-system-kpathsea'" + elif test "x$with_system_kpathsea" != xyes; then + as_fn_error $? "Sorry, \`--with-system-ptexenc' requires \`--with-system-kpathsea'" "$LINENO" 5 + fi +fi + +test "x$need_ptexenc" = xyes && { + need_kpathsea=yes +} + ## texk/kpathsea/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/ ## configure options and TL libraries required for kpathsea @@ -19190,6 +21106,10 @@ $as_echo_n "checking for TeX specific libraries to build... " >&6; } echo 'tldbg:_KPSE_RECURSE called: list=texlibs, text=TeX specific libraries, cond=test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes, prefix=texk/.' >&5 MAKE_SUBDIRS= CONF_SUBDIRS= +if test -x $srcdir/texk/ptexenc/configure; then + test "x$with_system_ptexenc" != xyes && test "x$need_ptexenc" = xyes && MAKE_SUBDIRS="texk/ptexenc $MAKE_SUBDIRS" + CONF_SUBDIRS="texk/ptexenc $CONF_SUBDIRS" +fi if test -x $srcdir/texk/kpathsea/configure; then test "x$with_system_kpathsea" != xyes && test "x$need_kpathsea" = xyes && MAKE_SUBDIRS="texk/kpathsea $MAKE_SUBDIRS" CONF_SUBDIRS="texk/kpathsea $CONF_SUBDIRS" @@ -19768,67 +21688,362 @@ IFS=$as_save_IFS fi fi -ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG -if test -n "$ac_ct_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5 -$as_echo "$ac_ct_PKG_CONFIG" >&6; } +ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG +if test -n "$ac_ct_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5 +$as_echo "$ac_ct_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_PKG_CONFIG" = x; then + PKG_CONFIG="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_ct_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" +fi +if $ICU_CONFIG --version >/dev/null 2>&1; then + ICU_INCLUDES=`$ICU_CONFIG --cppflags` + ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-system` +elif $PKG_CONFIG --libs icu-uc icu-io >/dev/null 2>&1; then + ICU_INCLUDES=`$PKG_CONFIG --cflags icu-uc icu-io` + ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io` +elif test "x$need_icu:$with_system_icu" = xyes:yes; then + as_fn_error $? "did not find either pkg-config or icu-config; one is required for system icu library support" "$LINENO" 5 +fi + +if $PKG_CONFIG harfbuzz; then + HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz --cflags` + HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz --libs` +elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then + as_fn_error $? "did not find harfbuzz" "$LINENO" 5 +fi + + + + + + +## texk/kpathsea/ac/kpathsea.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/ +## basic check of system kpathsea +if test "x$need_kpathsea:$with_system_kpathsea" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`kpathsea' library" >&5 +$as_echo_n "checking requested system \`kpathsea' library... " >&6; } + CPPFLAGS="$KPATHSEA_INCLUDES $CPPFLAGS" + LIBS="$KPATHSEA_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +int +main () +{ +const char *version = kpathsea_version_string; +kpse_set_program_name("prog", "name"); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + syslib_used=yes kpse_res=ok +else + syslib_status=no kpse_res=failed +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 +$as_echo "$kpse_res" >&6; } +fi + +## texk/ptexenc/ac/ptexenc.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/ +## basic check of system ptexenc +if test "x$need_ptexenc:$with_system_ptexenc" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`ptexenc' library" >&5 +$as_echo_n "checking requested system \`ptexenc' library... " >&6; } + CPPFLAGS="$PTEXENC_INCLUDES $CPPFLAGS" + LIBS="$PTEXENC_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +const char *version = ptexenc_version_string; +set_enc_string("prog", "name"); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + syslib_used=yes kpse_res=ok +else + syslib_status=no kpse_res=failed +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 +$as_echo "$kpse_res" >&6; } +fi + +## libs/zlib/ac/zlib.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/ +## basic check of system zlib +if test "x$need_zlib:$with_system_zlib" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`zlib' library" >&5 +$as_echo_n "checking requested system \`zlib' library... " >&6; } + CPPFLAGS="$ZLIB_INCLUDES $CPPFLAGS" + LIBS="$ZLIB_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +z_stream stream; +const char *version = zlibVersion(); +deflate(&stream, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + syslib_used=yes kpse_res=ok +else + syslib_status=no kpse_res=failed +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 +$as_echo "$kpse_res" >&6; } +fi + +## libs/libpaper/ac/libpaper.ac: configure.ac fragment for the TeX Live subdirectory libs/libpaper/ +## basic check of system libpaper +if test "x$need_libpaper:$with_system_libpaper" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`libpaper' library" >&5 +$as_echo_n "checking requested system \`libpaper' library... " >&6; } + CPPFLAGS="$LIBPAPER_INCLUDES $CPPFLAGS" + LIBS="$LIBPAPER_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +const char *v = defaultpapername(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + syslib_used=yes kpse_res=ok +else + syslib_status=no kpse_res=failed +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 +$as_echo "$kpse_res" >&6; } +fi + +## libs/libpng/ac/libpng.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/ +## basic check of system libpng +if test "x$need_libpng:$with_system_libpng" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`libpng' library" >&5 +$as_echo_n "checking requested system \`libpng' library... " >&6; } + CPPFLAGS="$LIBPNG_INCLUDES $CPPFLAGS" + LIBS="$LIBPNG_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +png_structp png; png_voidp io; png_rw_ptr fn; +png_set_read_fn(png, io, fn); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + syslib_used=yes kpse_res=ok +else + syslib_status=no kpse_res=failed +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 +$as_echo "$kpse_res" >&6; } +fi + +## libs/freetype2/ac/freetype2.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/ +## basic check of system freetype2 +if test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`freetype2' library" >&5 +$as_echo_n "checking requested system \`freetype2' library... " >&6; } + CPPFLAGS="$FREETYPE2_INCLUDES $CPPFLAGS" + LIBS="$FREETYPE2_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include FT_FREETYPE_H +int +main () +{ +FT_Library library; FT_Init_FreeType(&library); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + syslib_used=yes kpse_res=ok +else + syslib_status=no kpse_res=failed +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 +$as_echo "$kpse_res" >&6; } +fi + +## libs/gd/ac/gd.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ +## basic check of system gd +if test "x$need_gd:$with_system_gd" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`gd' library" >&5 +$as_echo_n "checking requested system \`gd' library... " >&6; } + CPPFLAGS="$GD_INCLUDES $CPPFLAGS" + LIBS="$GD_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +gdImageCreate(1, 2); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + syslib_used=yes kpse_res=ok +else + syslib_status=no kpse_res=failed +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 +$as_echo "$kpse_res" >&6; } +fi + +## libs/pixman/ac/pixman.ac: configure.ac fragment for the TeX Live subdirectory libs/pixman/ +## basic check of system pixman +if test "x$need_pixman:$with_system_pixman" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`pixman' library" >&5 +$as_echo_n "checking requested system \`pixman' library... " >&6; } + CPPFLAGS="$PIXMAN_INCLUDES $CPPFLAGS" + LIBS="$PIXMAN_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +const char *s = pixman_version_string(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + syslib_used=yes kpse_res=ok else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + syslib_status=no kpse_res=failed +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 +$as_echo "$kpse_res" >&6; } fi - if test "x$ac_ct_PKG_CONFIG" = x; then - PKG_CONFIG="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_ct_PKG_CONFIG - fi +## libs/cairo/ac/cairo.ac: configure.ac fragment for the TeX Live subdirectory libs/cairo/ +## basic check of system cairo +if test "x$need_cairo:$with_system_cairo" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`cairo' library" >&5 +$as_echo_n "checking requested system \`cairo' library... " >&6; } + CPPFLAGS="$CAIRO_INCLUDES $CPPFLAGS" + LIBS="$CAIRO_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +const char *s = cairo_version_string(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + syslib_used=yes kpse_res=ok else - PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" + syslib_status=no kpse_res=failed fi -if $ICU_CONFIG --version >/dev/null 2>&1; then - ICU_INCLUDES=`$ICU_CONFIG --cppflags` - ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-system` -elif $PKG_CONFIG --libs icu-uc icu-io >/dev/null 2>&1; then - ICU_INCLUDES=`$PKG_CONFIG --cflags icu-uc icu-io` - ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io` -elif test "x$need_icu:$with_system_icu" = xyes:yes; then - as_fn_error $? "did not find either pkg-config or icu-config; one is required for system icu library support" "$LINENO" 5 +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 +$as_echo "$kpse_res" >&6; } fi -if $PKG_CONFIG harfbuzz-icu; then - HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz-icu --cflags` - HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz-icu --libs` -elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then - as_fn_error $? "did not find harfbuzz-icu" "$LINENO" 5 +## libs/gmp/ac/gmp.ac: configure.ac fragment for the TeX Live subdirectory libs/gmp/ +## basic check of system gmp +if test "x$need_gmp:$with_system_gmp" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`gmp' library" >&5 +$as_echo_n "checking requested system \`gmp' library... " >&6; } + CPPFLAGS="$GMP_INCLUDES $CPPFLAGS" + LIBS="$GMP_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +const char *s = gmp_version; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + syslib_used=yes kpse_res=ok +else + syslib_status=no kpse_res=failed +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 +$as_echo "$kpse_res" >&6; } fi - - - - - -## texk/kpathsea/ac/kpathsea.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/ -## basic check of system kpathsea -if test "x$need_kpathsea:$with_system_kpathsea" = xyes:yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`kpathsea' library" >&5 -$as_echo_n "checking requested system \`kpathsea' library... " >&6; } - CPPFLAGS="$KPATHSEA_INCLUDES $CPPFLAGS" - LIBS="$KPATHSEA_LIBS $LIBS" +## libs/mpfr/ac/mpfr.ac: configure.ac fragment for the TeX Live subdirectory libs/mpfr/ +## basic check of system mpfr +if test "x$need_mpfr:$with_system_mpfr" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`mpfr' library" >&5 +$as_echo_n "checking requested system \`mpfr' library... " >&6; } + CPPFLAGS="$MPFR_INCLUDES $CPPFLAGS" + LIBS="$MPFR_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include +#include int main () { -const char *version = kpathsea_version_string; -kpse_set_program_name("prog", "name"); +const char *s = mpfr_get_version(); ; return 0; } @@ -19844,27 +22059,30 @@ rm -f core conftest.err conftest.$ac_objext \ $as_echo "$kpse_res" >&6; } fi -## libs/zlib/ac/zlib.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/ -## basic check of system zlib -if test "x$need_zlib:$with_system_zlib" = xyes:yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`zlib' library" >&5 -$as_echo_n "checking requested system \`zlib' library... " >&6; } - CPPFLAGS="$ZLIB_INCLUDES $CPPFLAGS" - LIBS="$ZLIB_LIBS $LIBS" +## libs/poppler/ac/poppler.ac: configure.ac fragment for the TeX Live subdirectory libs/poppler/ +## basic check of system poppler +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test "x$need_poppler:$with_system_poppler" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`poppler' library" >&5 +$as_echo_n "checking requested system \`poppler' library... " >&6; } + CPPFLAGS="$POPPLER_INCLUDES $CPPFLAGS" + LIBS="$POPPLER_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#include int main () { -z_stream stream; -const char *version = zlibVersion(); -deflate(&stream, 0); +GfxFont *gfxFont; gfxFont->decRefCnt(); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO"; then : syslib_used=yes kpse_res=ok else syslib_status=no kpse_res=failed @@ -19874,27 +22092,36 @@ rm -f core conftest.err conftest.$ac_objext \ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 $as_echo "$kpse_res" >&6; } fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -## libs/libpng/ac/libpng.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/ -## basic check of system libpng -if test "x$need_libpng:$with_system_libpng" = xyes:yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`libpng' library" >&5 -$as_echo_n "checking requested system \`libpng' library... " >&6; } - CPPFLAGS="$LIBPNG_INCLUDES $CPPFLAGS" - LIBS="$LIBPNG_LIBS $LIBS" +## libs/xpdf/ac/xpdf.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/ +## basic check of system xpdf (poppler) +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`xpdf' library" >&5 +$as_echo_n "checking requested system \`xpdf' library... " >&6; } + CPPFLAGS="$XPDF_INCLUDES $CPPFLAGS" + LIBS="$XPDF_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#include int main () { -png_structp png; png_voidp io; png_rw_ptr fn; -png_set_read_fn(png, io, fn); +GfxFont *gfxFont; gfxFont->decRefCnt(); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO"; then : syslib_used=yes kpse_res=ok else syslib_status=no kpse_res=failed @@ -19904,6 +22131,11 @@ rm -f core conftest.err conftest.$ac_objext \ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 $as_echo "$kpse_res" >&6; } fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu ## libs/zziplib/ac/zziplib.ac: configure.ac fragment for the TeX Live subdirectory libs/zziplib/ ## basic check of system zziplib @@ -19934,6 +22166,144 @@ rm -f core conftest.err conftest.$ac_objext \ $as_echo "$kpse_res" >&6; } fi +## libs/graphite2/ac/graphite2.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/ +## basic check of system graphite2 +if test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`graphite2' library" >&5 +$as_echo_n "checking requested system \`graphite2' library... " >&6; } + CPPFLAGS="$GRAPHITE2_INCLUDES $CPPFLAGS" + LIBS="$GRAPHITE2_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +int *nMajor, *nMinor, *nBugFix; +gr_engine_version(nMajor, nMinor, nBugFix); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + syslib_used=yes kpse_res=ok +else + syslib_status=no kpse_res=failed +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 +$as_echo "$kpse_res" >&6; } +fi + +## libs/teckit/ac/teckit.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/ +## basic check of system teckit +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test "x$need_teckit:$with_system_teckit" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`teckit' library" >&5 +$as_echo_n "checking requested system \`teckit' library... " >&6; } + CPPFLAGS="$TECKIT_INCLUDES $CPPFLAGS" + LIBS="$TECKIT_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +TECkit_Converter converter; TECkit_DisposeConverter(converter); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + syslib_used=yes kpse_res=ok +else + syslib_status=no kpse_res=failed +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 +$as_echo "$kpse_res" >&6; } +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +## libs/icu/ac/icu.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/ +## basic check of system icu +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test "x$need_icu:$with_system_icu" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`icu' library" >&5 +$as_echo_n "checking requested system \`icu' library... " >&6; } + CPPFLAGS="$ICU_INCLUDES $CPPFLAGS" + LIBS="$ICU_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +UErrorCode code; const UChar *src; UChar *dst; +u_strToLower(dst, -1, src, -1, NULL, &code); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + syslib_used=yes kpse_res=ok +else + syslib_status=no kpse_res=failed +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 +$as_echo "$kpse_res" >&6; } +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +## libs/harfbuzz/ac/harfbuzz.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/ +## basic check of system harfbuzz +if test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`harfbuzz' library" >&5 +$as_echo_n "checking requested system \`harfbuzz' library... " >&6; } + CPPFLAGS="$HARFBUZZ_INCLUDES $CPPFLAGS" + LIBS="$HARFBUZZ_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +const char *v = hb_version_string(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + syslib_used=yes kpse_res=ok +else + syslib_status=no kpse_res=failed +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 +$as_echo "$kpse_res" >&6; } +fi + if test "x$syslib_status" = xno; then as_fn_error $? "some requested system libraries failed" "$LINENO" 5 fi @@ -22556,11 +24926,11 @@ msg_compiling="$msg_compiling test "x$srcdir" = x. || msg_compiling="$msg_compiling from sources in $kpse_src" { $as_echo "$as_me:${as_lineno-$LINENO}: result: -** Configuration summary for $PACKAGE_STRING (2019$with_banner_add): +** Configuration summary for $PACKAGE_STRING (2020/dev$with_banner_add): $msg_compiling" >&5 $as_echo " -** Configuration summary for $PACKAGE_STRING (2019$with_banner_add): +** Configuration summary for $PACKAGE_STRING (2020/dev$with_banner_add): $msg_compiling" >&6; } case $kpse_src$kpse_bld in diff --git a/source/doc/ChangeLog b/source/doc/ChangeLog index 1f5291248..7eb81910b 100644 --- a/source/doc/ChangeLog +++ b/source/doc/ChangeLog @@ -1,3 +1,7 @@ +2019-08-11 Karl Berry + + * tlbuild.texi (Build one package): rm sources to build without C++11. + 2018-04-10 Karl Berry * tlbuild.texi (Cross compilation): move to under Building. @@ -5,7 +9,6 @@ * Makefile.am (*_node_{good,bad}): update for current pod doc. ($(mydoc)-incl.texi): hint to symlink scripts for pod2texi. - 2018-02-20 Karl Berry diff --git a/source/doc/Makefile.in b/source/doc/Makefile.in index d7248c87d..7589bf258 100644 --- a/source/doc/Makefile.in +++ b/source/doc/Makefile.in @@ -124,6 +124,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \ $(top_srcdir)/texk/web2c/ac/web2c.ac \ $(top_srcdir)/texk/texlive/ac/withenable.ac \ $(top_srcdir)/texk/texlive/ac/texlive.ac \ + $(top_srcdir)/libs/harfbuzz/ac/withenable.ac \ + $(top_srcdir)/libs/graphite2/ac/withenable.ac \ $(top_srcdir)/libs/zziplib/ac/withenable.ac \ $(top_srcdir)/libs/libpng/ac/withenable.ac \ $(top_srcdir)/libs/luajit/ac/withenable.ac \ @@ -135,6 +137,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \ $(top_srcdir)/libs/zlib/ac/zlib.ac \ $(top_srcdir)/libs/libpng/ac/libpng.ac \ $(top_srcdir)/libs/zziplib/ac/zziplib.ac \ + $(top_srcdir)/libs/graphite2/ac/graphite2.ac \ + $(top_srcdir)/libs/harfbuzz/ac/harfbuzz.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/source/doc/build-tools.txt b/source/doc/build-tools.txt index 16bd6fa19..3fde6a590 100644 --- a/source/doc/build-tools.txt +++ b/source/doc/build-tools.txt @@ -1,7 +1,7 @@ autoconf (GNU Autoconf) 2.69 automake (GNU automake) 1.16.1 -bison (GNU Bison) 3.3.1 +bison (GNU Bison) 3.4.2 flex 2.6.0 ltmain.sh (GNU libtool) 2.4.6 m4 (GNU M4) 1.4.18 -makeinfo (GNU texinfo) 6.6 +makeinfo (GNU texinfo) 6.7 diff --git a/source/doc/buildinfo.sh b/source/doc/buildinfo.sh new file mode 100755 index 000000000..dde616c79 --- /dev/null +++ b/source/doc/buildinfo.sh @@ -0,0 +1,60 @@ +#!/bin/sh +# $Id: buildinfo.sh 51449 2019-06-24 22:12:32Z karl $ +# Public domain. Report basics of current system; run from top-level +# Makefile so any make overrides will be taken into account. (And from +# Build.) buildenv.log with full environment dump is also created. + +do_config_status=true +if test "x$1" = x--no-config-status; then + shift + do_config_status=false +fi + +printf 'UNAME\t"%s"\n' "`uname -a`" + +# /etc/issue often contains only placeholders, so don't bother with it. + +# Return version identification for $1, by calling it with --version. +# gcc on Macs, when linked to cc, has a useless "Configured with:" as +# the first line. Likely we'll need to generalize for other compilers. +# We intentionally don't quote $1 in case CC was set to something like +# "cc --someopt". +compiler_version () { + $1 --version 2>&1 | grep -v '^Configured' | sed 1q +} + +printf 'MAKE\t"%s"\n' "${MAKE-make}" +printf 'MAKE-v\t"%s"\n' "`${MAKE-make} -v 2>&1 | sed 1q`" +# BSD make does not give version info with -v, but the +# first line of the usage message is sort of an identifier. + +# our configure defaults to using gcc and g++, so we will too. +printf 'CC\t"%s"\n' "${CC-gcc}" +printf 'CFLAGS\t"%s"\n' "${CFLAGS}" +printf 'CC-v\t"%s"\n' "`compiler_version ${CC-gcc}`" +# +printf 'CXX\t"%s"\n' "${CXX-g++}" +printf 'CXXFLAGS\t"%s"\n' "${CXXFLAGS}" +printf 'CXX-v\t"%s"\n' "`compiler_version ${CXX-g++}`" +# +printf 'OBJCXX\t"%s"\n' "${OBJCXX-cc}" +printf 'OBJCXXFLAGS\t"%s"\n' "${OBJCXXFLAGS}" +# +printf 'LDFLAGS\t"%s"\n' "${LDFLAGS}" + +# Some Linux-based systems provide this, but don't worry if not there. +# Let's hope that other systems are sufficiently identified by uname, +# don't feel like doing a big system-information hunt. But if we do: +# http://www.datadisk.co.uk/html_docs/misc/unix_commands.htm +if test -n "`lsb_release -a 2>/dev/null`"; then + printf '\nLSB_RELEASE\n' + lsb_release -a 2>&1 +fi + +# the whole configure line and more, if requested. +# (We want this from make, but not from Build.) +$do_config_status \ +&& test -s config.status \ +&& (printf '\nCONFIG_STATUS\n'; ./config.status --version | sed -n '1,/^$/p') + +exit 0 diff --git a/source/doc/tlbuild.info b/source/doc/tlbuild.info index 9ce25d8b3..1e6a5dbfb 100644 --- a/source/doc/tlbuild.info +++ b/source/doc/tlbuild.info @@ -1,4 +1,4 @@ -This is tlbuild.info, produced by makeinfo version 6.6 from +This is tlbuild.info, produced by makeinfo version 6.7 from tlbuild.texi. This file documents the TeX Live build system and more. @@ -169,19 +169,18 @@ Automake/Autoconf output in general) work with any reasonable 'make'. A C++11 compiler is similarly required because of the third-party libraries ICU and Poppler; the program 'dvisvgm' also requires C++11. -It is possible to build everything else with older compilers; - links to a build script for -doing this. +It is possible to build everything else with older compilers, but you +have to remove the C++11-dependent sources. *Note Build one package::. - However, a few programs in the tree have additional requirements: + A few programs in the tree have additional requirements: 'web2c' requires 'perl' for some tests run by 'make check'. 'xdvik' 'xpdfopen' - require X11 headers and libraries, often in "development" packages - that are not installed by default. + require X11 headers and libraries, typically in "development" + packages that are not installed by default. 'xetex' requires 'fontconfig' (again both headers and library), or, for @@ -189,8 +188,8 @@ doing this. 'xindy' requires GNU 'clisp', 'libsigsegv', and 'libiconv'; additionally, - to build the rules and/or documentation: 'perl', 'latex', and - 'pdflatex' + to build the rules and/or documentation: 'perl', 'latex', + 'pdflatex'. Lacking the required tools, building these programs must avoided, e.g., 'configure --without-x --disable-xetex --disable-xindy' @@ -329,16 +328,9 @@ library modules are configured but none are made. However, the invoked to build an individual program or library, first building any required libraries. - This "build-on-demand" procedure is used, e.g., in the upstream -LuaTeX repository to build LuaTeX, from a subset of the complete -TeX Live source tree. As another example, when building the original -e-TeX has been disabled (as it is by default), one can run 'make etex' -(or 'make etex.exe') in 'texk/web2c/' to build e-TeX (although there is -no comparably simple way to _install_ e-TeX). - - If you want to work on a single program within the TL sources, this -is the recommended way to do it. Here is an example from start to -finish for working on 'dvipdfm-x'. + Here is an example from start to finish for working on 'dvipdfm-x'. +(Unfortunately, this does not suffice for building one, or a subset, of +the TeX engines; see the next section.) mkdir mydir && cd mydir # new working directory @@ -387,10 +379,19 @@ this approach, see the 'build-pdftex.sh' script in the 'pdftex' development source (details at ), which is indeed such a cut-down TL source tree. - Even with '--disable-all-pkgs', dependencies will be checked. For -instance, if a (non-MacOSX) system does not have 'fontconfig', XeTeX -cannot be built (*note Prerequisites::) and 'configure' will terminate. -To proceed without such dependencies, specify '--enable-missing' also. + Some libraries and programs require C++11. If you want to build with +an older compiler lacking such support, you need to (re)move those +source directories; specifying '--disable' for them does not suffice, +unfortunately. Specifically, before running 'configure': + + rm -rf libs/icu libs/poppler libs/graphite2 texk/dvisvgm + + Also, even with '--disable-all-pkgs', dependencies are (currently) +checked. For instance, if a (non-MacOSX) system does not have +'fontconfig', XeTeX cannot be built (*note Prerequisites::), and +'configure' will terminate even with '--disable-xetex'. To proceed +without such dependencies, specify '--enable-missing' also. (Patches to +improve this would be most welcome.) By default, the 'gcc' compilers will be used if present; otherwise, individual packages may use something different. You can explicitly @@ -417,8 +418,9 @@ explicitly specify what to make. For example, to build only LuaTeX: This works because the 'make' automatically runs 'configure' as necessary for the dependencies and target. Furthermore, the source tree -can be cut down to just what is needed for the given engine (as the -separate pdfTeX and LuaTeX source repositories do). +can be cut down to just what is needed for the given engine (the +separate pdfTeX and LuaTeX source repositories do this, if you want to +peruse examples). We hope to improve the situation in the future. Patches are welcome. @@ -745,11 +747,11 @@ many extra hassles, so don't do that, tempting as it may be. autoconf (GNU Autoconf) 2.69 automake (GNU automake) 1.16.1 - bison (GNU Bison) 3.3.1 + bison (GNU Bison) 3.4.2 flex 2.6.0 ltmain.sh (GNU libtool) 2.4.6 m4 (GNU M4) 1.4.18 - makeinfo (GNU texinfo) 6.6 + makeinfo (GNU texinfo) 6.7 These versions should be used to update the generated files (e.g., 'configure' or 'Makefile.in') in all or parts of the TL tree after their @@ -771,7 +773,6 @@ runs of 'bison', 'flex', or 'makeinfo' with 'touch' of the generated ('.c', '.h', or '.info') files. With '--enable-maintainer-mode' it may also be necessary to 'touch' first 'aclocal.m4', then 'configure' and 'config.h.in' (or 'c-auto.in'), and finally all 'Makefile.in' files. -Perhaps 'make -t' will help.  File: tlbuild.info, Node: Top-level directories, Next: Autoconf macros, Prev: Build system tools, Up: Layout and infrastructure @@ -2086,6 +2087,7 @@ pushed is tested on Travis-CI. * Transfer from Subversion to Github:: * Automatic update of the Git mirror:: * CI testing on Travis-CI:: +* Releases on Github::  File: tlbuild.info, Node: Transfer from Subversion to Github, Next: Automatic update of the Git mirror, Up: Continuous integration @@ -2146,7 +2148,7 @@ from the Subversion repository and updates the 'master' branch with them, and the second pushes changes (if any) to Github.  -File: tlbuild.info, Node: CI testing on Travis-CI, Prev: Automatic update of the Git mirror, Up: Continuous integration +File: tlbuild.info, Node: CI testing on Travis-CI, Next: Releases on Github, Prev: Automatic update of the Git mirror, Up: Continuous integration 9.3 CI testing on Travis-CI =========================== @@ -2161,6 +2163,23 @@ Travis-CI. If changes have been pushed via the cron job above, Travis-CI will automatically checkout the last pushed commit and try building it. + +File: tlbuild.info, Node: Releases on Github, Prev: CI testing on Travis-CI, Up: Continuous integration + +9.4 Releases on Github +====================== + +Given a git checkout of 'texlive-source': + + git pull + git tag build-svnNNNN + git push --tags + +and the result will appear at +. Releases can +also be made manually from that web page (see 'tl-update-bindir' for +hints). +  File: tlbuild.info, Node: install-tl, Next: tlmgr, Prev: Continuous integration, Up: Top @@ -5157,7 +5176,7 @@ Index * ANSI C: Declarations and definitions. (line 6) * ApplicationServices Mac framework, required by xetex: Prerequisites. - (line 32) + (line 31) * asymptote: Linked scripts. (line 23) * asymptote <1>: asymptote. (line 6) * Autoconf: Overview of build system. @@ -5188,6 +5207,7 @@ Index * building: Building. (line 6) * building a distribution: Build distribution. (line 6) * building in parallel: Build in parallel. (line 6) +* C++11, removing dependent sources: Build one package. (line 64) * C++11, required: Prerequisites. (line 15) * C, ANSI, required: Declarations and definitions. (line 6) @@ -5198,7 +5218,7 @@ Index * callexe.c: Macros for Windows. (line 32) * CC: Variables for configure. (line 10) -* CC=C-COMPILER: Build one package. (line 76) +* CC=C-COMPILER: Build one package. (line 78) * CC_BUILD: Cross problems. (line 13) * chktex: Declarations and definitions. (line 18) @@ -5208,8 +5228,8 @@ Index (line 17) * CLISP <1>: Configure options for utils/xindy. (line 14) -* clisp, required by xindy: Prerequisites. (line 36) -* Cocoa Mac framework, required by xetex: Prerequisites. (line 32) +* clisp, required by xindy: Prerequisites. (line 35) +* Cocoa Mac framework, required by xetex: Prerequisites. (line 31) * coding conventions: Coding conventions. (line 6) * compilers, C and C++11: Prerequisites. (line 6) * config.guess, config.sub, ...: Top-level directories. @@ -5255,7 +5275,7 @@ Index * ctangle: Cross problems. (line 26) * CXX: Variables for configure. (line 11) -* CXX=C++-COMPILER: Build one package. (line 76) +* CXX=C++-COMPILER: Build one package. (line 78) * declarations and definitions, in source code: Declarations and definitions. (line 6) * declarations before statements, avoiding: Declarations and definitions. @@ -5287,7 +5307,7 @@ Index * failure to build: Build problems. (line 6) * flags, macros for library and header: Macros for library and header flags. (line 6) -* fontconfig library, required by xetex: Prerequisites. (line 32) +* fontconfig library, required by xetex: Prerequisites. (line 31) * FreeType: Prerequisites. (line 11) * freetype cross compiling: Cross problems. (line 13) * freetype library: freetype library. (line 6) @@ -5296,7 +5316,7 @@ Index (line 24) * FT2_CONFIG: Variables for configure. (line 21) -* gcc, default compilers: Build one package. (line 76) +* gcc, default compilers: Build one package. (line 78) * general setup macros: General setup macros. (line 6) * generic library module, adding: Adding a new generic library module. (line 6) @@ -5416,7 +5436,7 @@ Index * library modules: Library modules. (line 6) * library-specific configure options: Library-specific configure options. (line 6) -* libsigsegv, required by xindy: Prerequisites. (line 36) +* libsigsegv, required by xindy: Prerequisites. (line 35) * libstc++, statically linking: Macros for compilers. (line 29) * Libtool: Overview of build system. (line 6) @@ -5455,7 +5475,7 @@ Index * motif: Configure options for texk/xdvik. (line 9) * native cross compilation: Cross compilation. (line 10) -* OBJCXX=OBJC-COMPILER: Build one package. (line 76) +* OBJCXX=OBJC-COMPILER: Build one package. (line 78) * one engine, building: Build one engine. (line 6) * one package, building: Build one package. (line 6) * OpenGL, required for Asymptote: asymptote. (line 6) @@ -5470,7 +5490,7 @@ Index (line 41) * PERL: Variables for configure. (line 39) -* perl, required by web2c, etc.: Prerequisites. (line 24) +* perl, required by web2c, etc.: Prerequisites. (line 23) * PKG_CONFIG: Variables for configure. (line 23) * plain.tex, not in source tree: Installing. (line 8) @@ -5500,7 +5520,7 @@ Index * setup macros, general: General setup macros. (line 6) * shared libraries, using vs. avoiding: Distro builds. (line 11) * size of PDF and PS files: --disable-largefile. (line 11) -* size of source tree: Build one package. (line 60) +* size of source tree: Build one package. (line 53) * source code declarations: Declarations and definitions. (line 6) * source directory building, not supported: Building. (line 17) @@ -5562,7 +5582,7 @@ Index * wrapper build system: freetype library. (line 6) * X toolkit: Configure options for texk/web2c. (line 22) -* X11 development, required by X clients: Prerequisites. (line 28) +* X11 development, required by X clients: Prerequisites. (line 27) * X11 headers, and const: Const. (line 21) * xasy: asymptote. (line 6) * xaw: Configure options for texk/xdvik. @@ -5593,367 +5613,373 @@ Node: Top1208 Node: Introduction2118 Node: Overview of build system3946 Node: Prerequisites5997 -Node: Building8616 -Node: Build iteration10002 -Node: Build problems11043 -Node: Build in parallel11497 -Node: Build distribution12101 -Node: Build one package12749 -Node: Build one engine16384 -Node: Cross compilation17399 -Node: Cross configuring18679 -Node: Cross problems20356 -Node: Installing22018 -Node: Installation directories23038 -Node: Linked scripts24856 -Node: Distro builds26347 -Node: Layout and infrastructure28723 -Node: Build system tools29554 -Node: Top-level directories31800 -Node: Autoconf macros34036 -Node: General setup macros34798 -Node: Macros for programs35673 -Node: Macros for compilers36474 -Node: Macros for libraries37882 -Node: Macros for library and header flags38308 -Node: Macros for Windows40219 -Node: Library modules41806 -Node: png library42295 -Node: zlib library44643 -Node: freetype library45158 -Node: kpathsea library45854 -Node: Program modules47233 -Node: t1utils package47661 -Node: xindy package48206 -Node: xdvik package49320 -Node: asymptote50379 -Node: Extending TeX Live50875 -Node: Adding a new program module51658 -Node: Adding a new generic library module54997 -Node: Adding a new TeX-specific library module57226 -Node: Configure options57924 -Node: Global configure options59305 -Node: --disable-native-texlive-build59847 -Node: --prefix --bindir ...60809 -Node: --disable-largefile61349 -Node: --disable-missing62050 -Node: --enable-compiler-warnings=LEVEL62451 -Node: --enable-cxx-runtime-hack63107 -Node: --enable-maintainer-mode63527 -Node: --enable-multiplatform64056 -Node: --enable-shared64629 -Node: --enable-silent-rules65000 -Node: --without-ln-s65452 -Node: --without-x65799 -Node: Program-specific configure options65987 -Node: --enable-PROG --disable-PROG66630 -Node: --disable-all-pkgs66903 -Node: Configure options for texk/web2c67686 -Node: Configure options for texk/bibtex-x70224 -Node: Configure options for texk/dvipdfm-x70767 -Node: Configure options for texk/dvisvgm71543 -Node: Configure options for texk/texlive72424 -Node: Configure options for texk/xdvik72845 -Node: Configure options for utils/xindy73466 -Node: Library-specific configure options74356 -Node: Configure options for kpathsea75358 -Node: Configure options for system poppler76107 -Node: Variables for configure76871 -Node: Coding conventions78297 -Node: Declarations and definitions79012 -Node: Const81186 -Node: Continuous integration83050 -Node: Transfer from Subversion to Github83691 -Node: Automatic update of the Git mirror85853 -Node: CI testing on Travis-CI86435 -Node: install-tl87117 -Node: install-tl NAME87486 -Node: install-tl SYNOPSIS87644 -Node: install-tl DESCRIPTION87902 -Node: install-tl REFERENCES88969 -Node: install-tl OPTIONS89495 -Ref: install-tl *-gui* [[=]_module_]89836 -Ref: install-tl text90046 -Ref: install-tl wizard90169 -Ref: install-tl perltk90323 -Ref: install-tl *-no-gui*90754 -Ref: install-tl *-lang* _llcode_90835 -Ref: install-tl *-repository* _url|path_91522 -Ref: install-tl *-select-repository*93402 -Ref: install-tl *-all-options*93838 -Ref: install-tl *-custom-bin* _path_94093 -Ref: install-tl *-debug-translation*94925 -Ref: install-tl *-force-platform* _platform_95144 -Ref: install-tl *-help*, *--help*, *-?*95388 -Ref: install-tl *-in-place*95795 -Ref: install-tl *-init-from-profile* _profile_file_96340 -Ref: install-tl *-logfile* _file_96560 -Ref: install-tl *-no-cls*96911 -Ref: install-tl *-non-admin*97045 -Ref: install-tl *-persistent-downloads*97150 -Ref: install-tl *-no-persistent-downloads*97178 -Ref: install-tl *-no-verify-downloads*97796 -Ref: install-tl *-portable*98157 -Ref: install-tl *-print-platform*98296 -Ref: install-tl *-profile* _profile_file_98494 -Ref: install-tl *-q*98674 -Ref: install-tl *-scheme* _scheme_98736 -Ref: install-tl *-v*99210 -Ref: install-tl *-version*, *--version*99365 -Node: install-tl PROFILES99496 -Ref: install-tl instopt_adjustpath (default 0 on Unix, 1 on Windows)102146 -Ref: install-tl instopt_adjustrepo (default 1)102222 -Ref: install-tl instopt_letter (default 0)102359 -Ref: install-tl instopt_portable (default 0)102450 -Ref: install-tl instopt_write18_restricted (default 1)102546 -Node: install-tl ENVIRONMENT VARIABLES103865 -Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK104256 -Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE104458 -Ref: install-tl TEXLIVE_INSTALL_NO_WELCOME104568 -Ref: install-tl TEXLIVE_INSTALL_PREFIX104689 -Ref: install-tl TEXLIVE_INSTALL_TEXDIR104715 -Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG104746 -Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR104774 -Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME104803 -Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL104833 -Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG104867 -Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR104898 -Ref: install-tl NOPERLDOC105269 -Node: install-tl AUTHORS AND COPYRIGHT105333 -Node: tlmgr105749 -Node: tlmgr NAME106202 -Node: tlmgr SYNOPSIS106334 -Node: tlmgr DESCRIPTION106524 -Node: tlmgr EXAMPLES107620 -Ref: tlmgr tlmgr option repository ctan107871 -Ref: tlmgr tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet107943 -Ref: tlmgr tlmgr update --list108395 -Ref: tlmgr tlmgr update --all108488 -Ref: tlmgr tlmgr info _what_108645 -Node: tlmgr OPTIONS108907 -Ref: tlmgr *--repository* _url|path_109427 -Ref: tlmgr *--gui* [_action_]110152 -Ref: tlmgr *--gui-lang* _llcode_110559 -Ref: tlmgr *--debug-translation*111242 -Ref: tlmgr *--machine-readable*111445 -Ref: tlmgr *--no-execute-actions*111713 -Ref: tlmgr *--package-logfile* _file_111906 -Ref: tlmgr *--pause*112160 -Ref: tlmgr *--persistent-downloads*112315 -Ref: tlmgr *--no-persistent-downloads*112343 -Ref: tlmgr *--pin-file*112837 -Ref: tlmgr *--usermode*113055 -Ref: tlmgr *--usertree* _dir_113175 -Ref: tlmgr *--verify-repo=[none|main|all]*113301 -Node: tlmgr ACTIONS114200 -Node: tlmgr help115052 -Node: tlmgr version115528 -Node: tlmgr backup115791 -Ref: tlmgr *backup [_option_...] --all*115962 -Ref: tlmgr *backup [_option_...] _pkg_...*115995 -Ref: tlmgr *--backupdir* _directory_116850 -Ref: tlmgr *--all*117067 -Ref: tlmgr *--clean*[=_N_]117319 -Ref: tlmgr *--dry-run*117646 -Node: tlmgr candidates _pkg_117776 -Node: tlmgr check [_option_...] [files|depends|executes|runfiles|all]118122 -Ref: tlmgr *files*118495 -Ref: tlmgr *depends*118630 -Ref: tlmgr *executes*118972 -Ref: tlmgr *runfiles*119090 -Ref: tlmgr *--use-svn*119211 -Node: tlmgr conf119328 -Ref: tlmgr *conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]*119607 -Ref: tlmgr *conf auxtrees [--conffile _file_] [show|add|delete] [_value_]*119671 -Node: tlmgr dump-tlpdb [_option_...] [--json]122016 -Ref: tlmgr *--local*122449 -Ref: tlmgr *--remote*122488 -Ref: tlmgr *--json*122526 -Node: tlmgr generate123097 -Ref: tlmgr *generate [_option_...] language*123293 -Ref: tlmgr *generate [_option_...] language.dat*123332 -Ref: tlmgr *generate [_option_...] language.def*123371 -Ref: tlmgr *generate [_option_...] language.dat.lua*123414 -Ref: tlmgr *--dest* _output_file_125740 -Ref: tlmgr *--localcfg* _local_conf_file_126316 -Ref: tlmgr *--rebuild-sys*126439 -Node: tlmgr gui127254 -Node: tlmgr info127432 -Ref: tlmgr *info [_option_...] _pkg_...*127594 -Ref: tlmgr *info [_option_...] collections*127628 -Ref: tlmgr *info [_option_...] schemes*127658 -Ref: tlmgr *--list*129188 -Ref: tlmgr *--only-installed*129502 -Ref: tlmgr *--data item1,item2,...*129701 -Ref: tlmgr *--json* 1130282 -Node: tlmgr init-usertree130665 -Node: tlmgr install [_option_...] _pkg_...131046 -Ref: tlmgr *--dry-run* 1131556 -Ref: tlmgr *--file*131673 -Ref: tlmgr *--force*131895 -Ref: tlmgr *--no-depends*132115 -Ref: tlmgr *--no-depends-at-all*132274 -Ref: tlmgr *--reinstall*132674 -Ref: tlmgr *--with-doc*133052 -Ref: tlmgr *--with-src*133065 -Node: tlmgr key133587 -Ref: tlmgr *key list*133745 -Ref: tlmgr *key add _file_*133763 -Ref: tlmgr *key remove _keyid_*133785 -Node: tlmgr list134380 -Node: tlmgr option134542 -Ref: tlmgr *option [--json] [show]*134697 -Ref: tlmgr *option [--json] showall*134723 -Ref: tlmgr *option _key_ [_value_]*134749 -Node: tlmgr paper139146 -Ref: tlmgr *paper [a4|letter]*139295 -Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*139369 -Ref: tlmgr *paper --json*139384 -Node: tlmgr path140599 -Ref: tlmgr *path [--w32mode=user|admin] add*140760 -Ref: tlmgr *path [--w32mode=user|admin] remove*140797 -Node: tlmgr pinning142137 -Ref: tlmgr pinning show142378 -Ref: tlmgr pinning add _repo_ _pkgglob_...142451 -Ref: tlmgr pinning remove _repo_ _pkgglob_...142570 -Ref: tlmgr pinning remove _repo_ --all142723 -Node: tlmgr platform142777 -Ref: tlmgr *platform list|add|remove _platform_...*142963 -Ref: tlmgr *platform set _platform_*142990 -Ref: tlmgr *platform set auto*143011 -Ref: tlmgr *--dry-run* 2143897 -Node: tlmgr postaction144016 -Ref: tlmgr *postaction [_option_...] install [shortcut|fileassoc|script] [_pkg_...]*144246 -Ref: tlmgr *postaction [_option_...] remove [shortcut|fileassoc|script] [_pkg_...]*144320 -Ref: tlmgr *--w32mode=[user|admin]*144635 -Ref: tlmgr *--fileassocmode=[1|2]*145051 -Ref: tlmgr *--all* 1145336 -Node: tlmgr print-platform145391 -Node: tlmgr print-platform-info145722 -Node: tlmgr remove [_option_...] _pkg_...146022 -Ref: tlmgr *--all* 2146506 -Ref: tlmgr *--backup*146616 -Ref: tlmgr *--backupdir* _directory_ 1146642 -Ref: tlmgr *--no-depends* 1147047 -Ref: tlmgr *--no-depends-at-all* 1147109 -Ref: tlmgr *--force* 1147212 -Ref: tlmgr *--dry-run* 3147685 -Node: tlmgr repository147792 -Ref: tlmgr *repository list*147980 -Ref: tlmgr *repository list _path|tag_*148010 -Ref: tlmgr *repository add _path_ [_tag_]*148043 -Ref: tlmgr *repository remove _path|tag_*148075 -Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*148129 -Node: tlmgr restore149182 -Ref: tlmgr *restore [_option_...] _pkg_ [_rev_]*149361 -Ref: tlmgr *restore [_option_...] --all*149391 -Ref: tlmgr *--all* 3150091 -Ref: tlmgr *--backupdir* _directory_ 2150305 -Ref: tlmgr *--dry-run* 4150486 -Ref: tlmgr *--force* 2150618 -Ref: tlmgr *--json* 2150664 -Node: tlmgr search150991 -Ref: tlmgr *search [_option_...] _what_*151155 -Ref: tlmgr *search [_option_...] --file _what_*151192 -Ref: tlmgr *search [_option_...] --all _what_*151228 -Ref: tlmgr *--file* 1151448 -Ref: tlmgr *--all* 4151510 -Ref: tlmgr *--global*151599 -Ref: tlmgr *--word*151726 -Node: tlmgr shell152041 -Ref: tlmgr protocol152776 -Ref: tlmgr help 1152840 -Ref: tlmgr version 1152893 -Ref: tlmgr quit, end, bye, byebye, EOF152961 -Ref: tlmgr restart152982 -Ref: tlmgr load [local|remote]153105 -Ref: tlmgr save153175 -Ref: tlmgr get [_var_] =item set [_var_ [_val_]]153298 -Node: tlmgr show153899 -Node: tlmgr uninstall154066 -Node: tlmgr update [_option_...] [_pkg_...]154296 -Ref: tlmgr *--all* 5154667 -Ref: tlmgr *--self*156408 -Ref: tlmgr *--dry-run* 5157172 -Ref: tlmgr *--list* [_pkg_]157349 -Ref: tlmgr *--exclude* _pkg_158038 -Ref: tlmgr *--no-auto-remove* [_pkg_...]158838 -Ref: tlmgr *--no-auto-install* [_pkg_...]159289 -Ref: tlmgr *--reinstall-forcibly-removed*159945 -Ref: tlmgr *--backup* 1160480 -Ref: tlmgr *--backupdir* _directory_ 3160506 -Ref: tlmgr *--no-depends* 2161672 -Ref: tlmgr *--no-depends-at-all* 2161875 -Ref: tlmgr *--force* 3161978 -Node: tlmgr CONFIGURATION FILE FOR TLMGR162793 -Ref: tlmgr auto-remove, value 0 or 1 (default 1), same as command-line option.163806 -Ref: tlmgr gui-expertmode, value 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.163943 -Ref: tlmgr gui-lang _llcode_, with a language code value as with the command-line option.164025 -Ref: tlmgr no-checksums, value 0 or 1 (default 0, see below).164079 -Ref: tlmgr persistent-downloads, value 0 or 1 (default 1), same as command-line option.164159 -Ref: tlmgr require-verification, value 0 or 1 (default 0), same as command-line option.164239 -Ref: tlmgr update-exclude, value: comma-separated list of packages (no space allowed). Same as the command line option --exclude for the action update.164387 -Ref: tlmgr verify-downloads, value 0 or 1 (default 1), same as command-line option.164463 -Ref: tlmgr allowed-actions _action1_ [,_action_,...] The value is a comma-separated list of tlmgr actions which are allowed to be executed when tlmgr is invoked in system mode (that is, without --usermode).164732 -Node: tlmgr CRYPTOGRAPHIC VERIFICATION165818 -Node: tlmgr Configuration of GnuPG invocation167967 -Node: tlmgr USER MODE168605 -Node: tlmgr User mode install171451 -Node: tlmgr User mode backup, restore, remove, update172595 -Node: tlmgr User mode generate, option, paper173037 -Node: tlmgr MULTIPLE REPOSITORIES173413 -Node: tlmgr Pinning175142 -Node: tlmgr GUI FOR TLMGR177117 -Node: tlmgr Main display178457 -Node: tlmgr Display configuration area178709 -Ref: tlmgr Status179070 -Ref: tlmgr Category179234 -Ref: tlmgr Match179420 -Ref: tlmgr Selection179601 -Ref: tlmgr Display configuration buttons179805 -Node: tlmgr Package list area179988 -Ref: tlmgr a checkbox180572 -Ref: tlmgr package name180708 -Ref: tlmgr local revision (and version)180807 -Ref: tlmgr remote revision (and version)181182 -Ref: tlmgr short description181479 -Node: tlmgr Main display action buttons181524 -Ref: tlmgr Update all installed181790 -Ref: tlmgr Update182162 -Ref: tlmgr Install182212 -Ref: tlmgr Remove182398 -Ref: tlmgr Backup182576 -Node: tlmgr Menu bar182733 -Ref: tlmgr tlmgr menu182956 -Ref: tlmgr Options menu183264 -Ref: tlmgr Actions menu184347 -Ref: tlmgr Help menu184775 -Node: tlmgr GUI options184908 -Ref: tlmgr -background _color_185154 -Ref: tlmgr -font " _fontname_ _fontsize_ "185219 -Ref: tlmgr -foreground _color_185377 -Ref: tlmgr -geometry _geomspec_185429 -Ref: tlmgr -xrm _xresource_185621 -Node: tlmgr MACHINE-READABLE OUTPUT185889 -Node: tlmgr Machine-readable update and install output186699 -Ref: tlmgr location-url _location_187975 -Ref: tlmgr total-bytes _count_188191 -Ref: tlmgr _pkgname_188601 -Ref: tlmgr _status_188811 -Ref: tlmgr d188889 -Ref: tlmgr f188949 -Ref: tlmgr u189128 -Ref: tlmgr r189174 -Ref: tlmgr a189297 -Ref: tlmgr i189475 -Ref: tlmgr I189594 -Ref: tlmgr _localrev_189696 -Ref: tlmgr _serverrev_189803 -Ref: tlmgr _size_189915 -Ref: tlmgr _runtime_190084 -Ref: tlmgr _esttot_190154 -Node: tlmgr Machine-readable option output190187 -Node: tlmgr AUTHORS AND COPYRIGHT190699 -Node: Index191098 +Node: Building8606 +Node: Build iteration9992 +Node: Build problems11033 +Node: Build in parallel11487 +Node: Build distribution12091 +Node: Build one package12739 +Node: Build one engine16418 +Node: Cross compilation17467 +Node: Cross configuring18747 +Node: Cross problems20424 +Node: Installing22086 +Node: Installation directories23106 +Node: Linked scripts24924 +Node: Distro builds26415 +Node: Layout and infrastructure28791 +Node: Build system tools29622 +Node: Top-level directories31839 +Node: Autoconf macros34075 +Node: General setup macros34837 +Node: Macros for programs35712 +Node: Macros for compilers36513 +Node: Macros for libraries37921 +Node: Macros for library and header flags38347 +Node: Macros for Windows40258 +Node: Library modules41845 +Node: png library42334 +Node: zlib library44682 +Node: freetype library45197 +Node: kpathsea library45893 +Node: Program modules47272 +Node: t1utils package47700 +Node: xindy package48245 +Node: xdvik package49359 +Node: asymptote50418 +Node: Extending TeX Live50914 +Node: Adding a new program module51697 +Node: Adding a new generic library module55036 +Node: Adding a new TeX-specific library module57265 +Node: Configure options57963 +Node: Global configure options59344 +Node: --disable-native-texlive-build59886 +Node: --prefix --bindir ...60848 +Node: --disable-largefile61388 +Node: --disable-missing62089 +Node: --enable-compiler-warnings=LEVEL62490 +Node: --enable-cxx-runtime-hack63146 +Node: --enable-maintainer-mode63566 +Node: --enable-multiplatform64095 +Node: --enable-shared64668 +Node: --enable-silent-rules65039 +Node: --without-ln-s65491 +Node: --without-x65838 +Node: Program-specific configure options66026 +Node: --enable-PROG --disable-PROG66669 +Node: --disable-all-pkgs66942 +Node: Configure options for texk/web2c67725 +Node: Configure options for texk/bibtex-x70263 +Node: Configure options for texk/dvipdfm-x70806 +Node: Configure options for texk/dvisvgm71582 +Node: Configure options for texk/texlive72463 +Node: Configure options for texk/xdvik72884 +Node: Configure options for utils/xindy73505 +Node: Library-specific configure options74395 +Node: Configure options for kpathsea75397 +Node: Configure options for system poppler76146 +Node: Variables for configure76910 +Node: Coding conventions78336 +Node: Declarations and definitions79051 +Node: Const81225 +Node: Continuous integration83089 +Node: Transfer from Subversion to Github83753 +Node: Automatic update of the Git mirror85915 +Node: CI testing on Travis-CI86497 +Node: Releases on Github87206 +Node: install-tl87646 +Node: install-tl NAME88015 +Node: install-tl SYNOPSIS88173 +Node: install-tl DESCRIPTION88431 +Node: install-tl REFERENCES89498 +Node: install-tl OPTIONS90024 +Ref: install-tl *-gui* [[=]_module_]90365 +Ref: install-tl text90575 +Ref: install-tl wizard90698 +Ref: install-tl perltk90852 +Ref: install-tl *-no-gui*91283 +Ref: install-tl *-lang* _llcode_91364 +Ref: install-tl *-repository* _url|path_92051 +Ref: install-tl *-select-repository*93931 +Ref: install-tl *-all-options*94367 +Ref: install-tl *-custom-bin* _path_94622 +Ref: install-tl *-debug-translation*95454 +Ref: install-tl *-force-platform* _platform_95673 +Ref: install-tl *-help*, *--help*, *-?*95917 +Ref: install-tl *-in-place*96324 +Ref: install-tl *-init-from-profile* _profile_file_96869 +Ref: install-tl *-logfile* _file_97089 +Ref: install-tl *-no-cls*97440 +Ref: install-tl *-non-admin*97574 +Ref: install-tl *-persistent-downloads*97679 +Ref: install-tl *-no-persistent-downloads*97707 +Ref: install-tl *-no-verify-downloads*98325 +Ref: install-tl *-portable*98686 +Ref: install-tl *-print-platform*98825 +Ref: install-tl *-profile* _profile_file_99023 +Ref: install-tl *-q*99203 +Ref: install-tl *-scheme* _scheme_99265 +Ref: install-tl *-v*99739 +Ref: install-tl *-version*, *--version*99894 +Node: install-tl PROFILES100025 +Ref: install-tl instopt_adjustpath (default 0 on Unix, 1 on Windows)102675 +Ref: install-tl instopt_adjustrepo (default 1)102751 +Ref: install-tl instopt_letter (default 0)102888 +Ref: install-tl instopt_portable (default 0)102979 +Ref: install-tl instopt_write18_restricted (default 1)103075 +Node: install-tl ENVIRONMENT VARIABLES104394 +Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK104785 +Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE104987 +Ref: install-tl TEXLIVE_INSTALL_NO_WELCOME105097 +Ref: install-tl TEXLIVE_INSTALL_PREFIX105218 +Ref: install-tl TEXLIVE_INSTALL_TEXDIR105244 +Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG105275 +Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR105303 +Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME105332 +Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL105362 +Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG105396 +Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR105427 +Ref: install-tl NOPERLDOC105798 +Node: install-tl AUTHORS AND COPYRIGHT105862 +Node: tlmgr106278 +Node: tlmgr NAME106731 +Node: tlmgr SYNOPSIS106863 +Node: tlmgr DESCRIPTION107053 +Node: tlmgr EXAMPLES108149 +Ref: tlmgr tlmgr option repository ctan108400 +Ref: tlmgr tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet108472 +Ref: tlmgr tlmgr update --list108924 +Ref: tlmgr tlmgr update --all109017 +Ref: tlmgr tlmgr info _what_109174 +Node: tlmgr OPTIONS109436 +Ref: tlmgr *--repository* _url|path_109956 +Ref: tlmgr *--gui* [_action_]110681 +Ref: tlmgr *--gui-lang* _llcode_111088 +Ref: tlmgr *--debug-translation*111771 +Ref: tlmgr *--machine-readable*111974 +Ref: tlmgr *--no-execute-actions*112242 +Ref: tlmgr *--package-logfile* _file_112435 +Ref: tlmgr *--pause*112689 +Ref: tlmgr *--persistent-downloads*112844 +Ref: tlmgr *--no-persistent-downloads*112872 +Ref: tlmgr *--pin-file*113366 +Ref: tlmgr *--usermode*113584 +Ref: tlmgr *--usertree* _dir_113704 +Ref: tlmgr *--verify-repo=[none|main|all]*113830 +Node: tlmgr ACTIONS114729 +Node: tlmgr help115581 +Node: tlmgr version116057 +Node: tlmgr backup116320 +Ref: tlmgr *backup [_option_...] --all*116491 +Ref: tlmgr *backup [_option_...] _pkg_...*116524 +Ref: tlmgr *--backupdir* _directory_117379 +Ref: tlmgr *--all*117596 +Ref: tlmgr *--clean*[=_N_]117848 +Ref: tlmgr *--dry-run*118175 +Node: tlmgr candidates _pkg_118305 +Node: tlmgr check [_option_...] [files|depends|executes|runfiles|all]118651 +Ref: tlmgr *files*119024 +Ref: tlmgr *depends*119159 +Ref: tlmgr *executes*119501 +Ref: tlmgr *runfiles*119619 +Ref: tlmgr *--use-svn*119740 +Node: tlmgr conf119857 +Ref: tlmgr *conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]*120136 +Ref: tlmgr *conf auxtrees [--conffile _file_] [show|add|delete] [_value_]*120200 +Node: tlmgr dump-tlpdb [_option_...] [--json]122545 +Ref: tlmgr *--local*122978 +Ref: tlmgr *--remote*123017 +Ref: tlmgr *--json*123055 +Node: tlmgr generate123626 +Ref: tlmgr *generate [_option_...] language*123822 +Ref: tlmgr *generate [_option_...] language.dat*123861 +Ref: tlmgr *generate [_option_...] language.def*123900 +Ref: tlmgr *generate [_option_...] language.dat.lua*123943 +Ref: tlmgr *--dest* _output_file_126269 +Ref: tlmgr *--localcfg* _local_conf_file_126845 +Ref: tlmgr *--rebuild-sys*126968 +Node: tlmgr gui127783 +Node: tlmgr info127961 +Ref: tlmgr *info [_option_...] _pkg_...*128123 +Ref: tlmgr *info [_option_...] collections*128157 +Ref: tlmgr *info [_option_...] schemes*128187 +Ref: tlmgr *--list*129717 +Ref: tlmgr *--only-installed*130031 +Ref: tlmgr *--data item1,item2,...*130230 +Ref: tlmgr *--json* 1130811 +Node: tlmgr init-usertree131194 +Node: tlmgr install [_option_...] _pkg_...131575 +Ref: tlmgr *--dry-run* 1132085 +Ref: tlmgr *--file*132202 +Ref: tlmgr *--force*132424 +Ref: tlmgr *--no-depends*132644 +Ref: tlmgr *--no-depends-at-all*132803 +Ref: tlmgr *--reinstall*133203 +Ref: tlmgr *--with-doc*133581 +Ref: tlmgr *--with-src*133594 +Node: tlmgr key134116 +Ref: tlmgr *key list*134274 +Ref: tlmgr *key add _file_*134292 +Ref: tlmgr *key remove _keyid_*134314 +Node: tlmgr list134909 +Node: tlmgr option135071 +Ref: tlmgr *option [--json] [show]*135226 +Ref: tlmgr *option [--json] showall*135252 +Ref: tlmgr *option _key_ [_value_]*135278 +Node: tlmgr paper139675 +Ref: tlmgr *paper [a4|letter]*139824 +Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*139898 +Ref: tlmgr *paper --json*139913 +Node: tlmgr path141128 +Ref: tlmgr *path [--w32mode=user|admin] add*141289 +Ref: tlmgr *path [--w32mode=user|admin] remove*141326 +Node: tlmgr pinning142666 +Ref: tlmgr pinning show142907 +Ref: tlmgr pinning add _repo_ _pkgglob_...142980 +Ref: tlmgr pinning remove _repo_ _pkgglob_...143099 +Ref: tlmgr pinning remove _repo_ --all143252 +Node: tlmgr platform143306 +Ref: tlmgr *platform list|add|remove _platform_...*143492 +Ref: tlmgr *platform set _platform_*143519 +Ref: tlmgr *platform set auto*143540 +Ref: tlmgr *--dry-run* 2144426 +Node: tlmgr postaction144545 +Ref: tlmgr *postaction [_option_...] install [shortcut|fileassoc|script] [_pkg_...]*144775 +Ref: tlmgr *postaction [_option_...] remove [shortcut|fileassoc|script] [_pkg_...]*144849 +Ref: tlmgr *--w32mode=[user|admin]*145164 +Ref: tlmgr *--fileassocmode=[1|2]*145580 +Ref: tlmgr *--all* 1145865 +Node: tlmgr print-platform145920 +Node: tlmgr print-platform-info146251 +Node: tlmgr remove [_option_...] _pkg_...146551 +Ref: tlmgr *--all* 2147035 +Ref: tlmgr *--backup*147145 +Ref: tlmgr *--backupdir* _directory_ 1147171 +Ref: tlmgr *--no-depends* 1147576 +Ref: tlmgr *--no-depends-at-all* 1147638 +Ref: tlmgr *--force* 1147741 +Ref: tlmgr *--dry-run* 3148214 +Node: tlmgr repository148321 +Ref: tlmgr *repository list*148509 +Ref: tlmgr *repository list _path|tag_*148539 +Ref: tlmgr *repository add _path_ [_tag_]*148572 +Ref: tlmgr *repository remove _path|tag_*148604 +Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*148658 +Node: tlmgr restore149711 +Ref: tlmgr *restore [_option_...] _pkg_ [_rev_]*149890 +Ref: tlmgr *restore [_option_...] --all*149920 +Ref: tlmgr *--all* 3150620 +Ref: tlmgr *--backupdir* _directory_ 2150834 +Ref: tlmgr *--dry-run* 4151015 +Ref: tlmgr *--force* 2151147 +Ref: tlmgr *--json* 2151193 +Node: tlmgr search151520 +Ref: tlmgr *search [_option_...] _what_*151684 +Ref: tlmgr *search [_option_...] --file _what_*151721 +Ref: tlmgr *search [_option_...] --all _what_*151757 +Ref: tlmgr *--file* 1151977 +Ref: tlmgr *--all* 4152039 +Ref: tlmgr *--global*152128 +Ref: tlmgr *--word*152255 +Node: tlmgr shell152570 +Ref: tlmgr protocol153305 +Ref: tlmgr help 1153369 +Ref: tlmgr version 1153422 +Ref: tlmgr quit, end, bye, byebye, EOF153490 +Ref: tlmgr restart153511 +Ref: tlmgr load [local|remote]153634 +Ref: tlmgr save153704 +Ref: tlmgr get [_var_] =item set [_var_ [_val_]]153827 +Node: tlmgr show154428 +Node: tlmgr uninstall154595 +Node: tlmgr update [_option_...] [_pkg_...]154825 +Ref: tlmgr *--all* 5155196 +Ref: tlmgr *--self*156937 +Ref: tlmgr *--dry-run* 5157701 +Ref: tlmgr *--list* [_pkg_]157878 +Ref: tlmgr *--exclude* _pkg_158567 +Ref: tlmgr *--no-auto-remove* [_pkg_...]159367 +Ref: tlmgr *--no-auto-install* [_pkg_...]159818 +Ref: tlmgr *--reinstall-forcibly-removed*160474 +Ref: tlmgr *--backup* 1161009 +Ref: tlmgr *--backupdir* _directory_ 3161035 +Ref: tlmgr *--no-depends* 2162201 +Ref: tlmgr *--no-depends-at-all* 2162404 +Ref: tlmgr *--force* 3162507 +Node: tlmgr CONFIGURATION FILE FOR TLMGR163322 +Ref: tlmgr auto-remove, value 0 or 1 (default 1), same as command-line option.164335 +Ref: tlmgr gui-expertmode, value 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.164472 +Ref: tlmgr gui-lang _llcode_, with a language code value as with the command-line option.164554 +Ref: tlmgr no-checksums, value 0 or 1 (default 0, see below).164608 +Ref: tlmgr persistent-downloads, value 0 or 1 (default 1), same as command-line option.164688 +Ref: tlmgr require-verification, value 0 or 1 (default 0), same as command-line option.164768 +Ref: tlmgr update-exclude, value: comma-separated list of packages (no space allowed). Same as the command line option --exclude for the action update.164916 +Ref: tlmgr verify-downloads, value 0 or 1 (default 1), same as command-line option.164992 +Ref: tlmgr allowed-actions _action1_ [,_action_,...] The value is a comma-separated list of tlmgr actions which are allowed to be executed when tlmgr is invoked in system mode (that is, without --usermode).165261 +Node: tlmgr CRYPTOGRAPHIC VERIFICATION166347 +Node: tlmgr Configuration of GnuPG invocation168496 +Node: tlmgr USER MODE169134 +Node: tlmgr User mode install171980 +Node: tlmgr User mode backup, restore, remove, update173124 +Node: tlmgr User mode generate, option, paper173566 +Node: tlmgr MULTIPLE REPOSITORIES173942 +Node: tlmgr Pinning175671 +Node: tlmgr GUI FOR TLMGR177646 +Node: tlmgr Main display178986 +Node: tlmgr Display configuration area179238 +Ref: tlmgr Status179599 +Ref: tlmgr Category179763 +Ref: tlmgr Match179949 +Ref: tlmgr Selection180130 +Ref: tlmgr Display configuration buttons180334 +Node: tlmgr Package list area180517 +Ref: tlmgr a checkbox181101 +Ref: tlmgr package name181237 +Ref: tlmgr local revision (and version)181336 +Ref: tlmgr remote revision (and version)181711 +Ref: tlmgr short description182008 +Node: tlmgr Main display action buttons182053 +Ref: tlmgr Update all installed182319 +Ref: tlmgr Update182691 +Ref: tlmgr Install182741 +Ref: tlmgr Remove182927 +Ref: tlmgr Backup183105 +Node: tlmgr Menu bar183262 +Ref: tlmgr tlmgr menu183485 +Ref: tlmgr Options menu183793 +Ref: tlmgr Actions menu184876 +Ref: tlmgr Help menu185304 +Node: tlmgr GUI options185437 +Ref: tlmgr -background _color_185683 +Ref: tlmgr -font " _fontname_ _fontsize_ "185748 +Ref: tlmgr -foreground _color_185906 +Ref: tlmgr -geometry _geomspec_185958 +Ref: tlmgr -xrm _xresource_186150 +Node: tlmgr MACHINE-READABLE OUTPUT186418 +Node: tlmgr Machine-readable update and install output187228 +Ref: tlmgr location-url _location_188504 +Ref: tlmgr total-bytes _count_188720 +Ref: tlmgr _pkgname_189130 +Ref: tlmgr _status_189340 +Ref: tlmgr d189418 +Ref: tlmgr f189478 +Ref: tlmgr u189657 +Ref: tlmgr r189703 +Ref: tlmgr a189826 +Ref: tlmgr i190004 +Ref: tlmgr I190123 +Ref: tlmgr _localrev_190225 +Ref: tlmgr _serverrev_190332 +Ref: tlmgr _size_190444 +Ref: tlmgr _runtime_190613 +Ref: tlmgr _esttot_190683 +Node: tlmgr Machine-readable option output190716 +Node: tlmgr AUTHORS AND COPYRIGHT191228 +Node: Index191627  End Tag Table + + +Local Variables: +coding: utf-8 +End: diff --git a/source/doc/tlbuild.texi b/source/doc/tlbuild.texi index 2898707ce..3ea08d701 100644 --- a/source/doc/tlbuild.texi +++ b/source/doc/tlbuild.texi @@ -234,11 +234,11 @@ Automake/Autoconf output in general) work with any reasonable @cindex C++11, required A C++11 compiler is similarly required because of the third-party libraries ICU and Poppler; the program @code{dvisvgm} also requires -C++11. It is possible to build everything else with older compilers; -@url{https://tug.org/texlive/custom-bin.html} links to a build script -for doing this. +C++11. It is possible to build everything else with older compilers, +but you have to remove the C++11-dependent sources. @xref{Build one +package}. -However, a few programs in the tree have additional requirements: +A few programs in the tree have additional requirements: @table @file @item web2c @@ -248,7 +248,7 @@ requires @code{perl} for some tests run by @code{make check}. @item xdvik @itemx xpdfopen @cindex X11 development, required by X clients -require X11 headers and libraries, often in ``development'' packages +require X11 headers and libraries, typically in ``development'' packages that are not installed by default. @item xetex @@ -264,7 +264,7 @@ frameworks. @cindex @code{libsigsegv}, required by @code{xindy} requires GNU @code{clisp}, @code{libsigsegv}, and @code{libiconv}; additionally, to build the rules and/or documentation: @code{perl}, -@code{latex}, and @code{pdflatex} +@code{latex}, @code{pdflatex}. @end table @@ -440,17 +440,9 @@ However, the @file{Makefile}s still contain all build rules and dependencies and can be invoked to build an individual program or library, first building any required libraries. -This ``build-on-demand'' procedure is used, e.g., in the upstream -Lua@TeX{} repository to build Lua@TeX{}, from a subset of the complete -@TL{} source tree. As another example, when building the original -e-@TeX{} has been disabled (as it is by default), one can run -@code{make etex} (or @code{make etex.exe}) in @file{texk/web2c/} to -build e-@TeX{} (although there is no comparably simple way to -@emph{install} e-@TeX{}). - -If you want to work on a single program within the TL sources, this is -the recommended way to do it. Here is an example from start to -finish for working on @code{dvipdfm-x}. +Here is an example from start to finish for working on +@code{dvipdfm-x}. (Unfortunately, this does not suffice for building +one, or a subset, of the @TeX{} engines; see the next section.) @example mkdir mydir && cd mydir # new working directory @@ -492,7 +484,6 @@ tweak as desired; check the output from @code{configure --help}. It is also a good idea to run @code{make check} after making any changes, to ensure that whatever tests have been written still pass. - @cindex size of source tree Finally, the above retrieves the entire TL source tree (several hundred megabytes). It is natural to ask if this is really necessary. @@ -506,12 +497,23 @@ in the @code{pdftex} development source (details at @url{http://pdftex.org}), which is indeed such a cut-down TL source tree. +@cindex C++11, removing dependent sources +Some libraries and programs require C++11. If you want to build with +an older compiler lacking such support, you need to (re)move those +source directories; specifying @code{--disable} for them does not +suffice, unfortunately. Specifically, before running @code{configure}: + +@example +rm -rf libs/icu libs/poppler libs/graphite2 texk/dvisvgm +@end example + @vindex --enable-missing @r{to ignore dependencies} -Even with @code{--disable-all-pkgs}, dependencies will be checked. -For instance, if a (non-MacOSX) system does not have -@code{fontconfig}, Xe@TeX{} cannot be built (@pxref{Prerequisites}) -and @code{configure} will terminate. To proceed without such -dependencies, specify @code{--enable-missing} also. +Also, even with @code{--disable-all-pkgs}, dependencies are (currently) +checked. For instance, if a (non-MacOSX) system does not have +@code{fontconfig}, Xe@TeX{} cannot be built (@pxref{Prerequisites}), +and @code{configure} will terminate even with @code{--disable-xetex}. +To proceed without such dependencies, specify @code{--enable-missing} +also. (Patches to improve this would be most welcome.) @vindex CC=@var{c-compiler} @vindex CXX=@var{c++-compiler} @@ -546,8 +548,9 @@ make luatex # specify target This works because the @code{make} automatically runs @code{configure} as necessary for the dependencies and target. Furthermore, the source -tree can be cut down to just what is needed for the given engine (as -the separate pdf@TeX{} and Lua@TeX{} source repositories do). +tree can be cut down to just what is needed for the given engine +(the separate pdf@TeX{} and Lua@TeX{} source repositories do this, if +you want to peruse examples). We hope to improve the situation in the future. Patches are welcome. @@ -974,7 +977,6 @@ bugs). For this to be reflected by their timestamps in your checkout, be sure to set @file{use-commit-times=yes} in @file{~/.subversion/config} or the equivalent. - @cindex touching files to avoid rerunning @pindex make -t If timestamps are wrong, you may also be able to avoid unnecessary @@ -983,7 +985,7 @@ runs of @code{bison}, @code{flex}, or @code{makeinfo} with files. With @code{--enable-maintainer-mode} it may also be necessary to @code{touch} first @file{aclocal.m4}, then @file{configure} and @file{config.h.in} (or @file{c-auto.in}), and finally all -@file{Makefile.in} files. Perhaps @code{make -t} will help. +@file{Makefile.in} files. @node Top-level directories @@ -2031,7 +2033,7 @@ enabled. This is useful when one wants to work on only a single program, which is specified with an additional @code{--enable} option, e.g., @code{--enable-dvipdfm-x}. It's still simplest to check out and configure the whole source tree, but at least only the program you are -interested in, and its dependencies, are built. @xref{Build one package}. +interested in, and its dependencies, are built. @xref{Build one package}. Without this option, all modules are built except those that are explicitly disabled or specify @code{disable} in their @@ -2552,6 +2554,7 @@ commit pushed is tested on Travis-CI. * Transfer from Subversion to Github:: * Automatic update of the Git mirror:: * CI testing on Travis-CI:: +* Releases on Github:: @end menu @@ -2634,6 +2637,22 @@ Travis-CI. If changes have been pushed via the cron job above, Travis-CI will automatically checkout the last pushed commit and try building it. +@node Releases on Github +@section Releases on Github + +Given a git checkout of @code{texlive-source}: + +@example +git pull +git tag build-svnNNNN +git push --tags +@end example + +@noindent and the result will appear at +@url{https://github.com/TeX-Live/texlive-source/releases}. +Releases can also be made manually from that web page (see +@code{tl-update-bindir} for hints). + @c made from pod doc. @include tlbuild-incl/install-tl.texi @include tlbuild-incl/tlmgr.texi diff --git a/source/libs/Makefile.in b/source/libs/Makefile.in index d0df468c6..5abfce2b8 100644 --- a/source/libs/Makefile.in +++ b/source/libs/Makefile.in @@ -91,6 +91,8 @@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../m4/kpse-cxx-hack.m4 \ + $(top_srcdir)/../m4/kpse-graphite2-flags.m4 \ + $(top_srcdir)/../m4/kpse-harfbuzz-flags.m4 \ $(top_srcdir)/../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../m4/kpse-libpng-flags.m4 \ $(top_srcdir)/../m4/kpse-lt-hack.m4 \ @@ -108,6 +110,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../texk/web2c/ac/web2c.ac \ $(top_srcdir)/../texk/texlive/ac/withenable.ac \ $(top_srcdir)/../texk/texlive/ac/texlive.ac \ + $(top_srcdir)/../libs/harfbuzz/ac/withenable.ac \ + $(top_srcdir)/../libs/graphite2/ac/withenable.ac \ $(top_srcdir)/../libs/zziplib/ac/withenable.ac \ $(top_srcdir)/../libs/libpng/ac/withenable.ac \ $(top_srcdir)/../libs/luajit/ac/withenable.ac \ diff --git a/source/libs/README b/source/libs/README index 58268f59d..49cf112b7 100644 --- a/source/libs/README +++ b/source/libs/README @@ -1,4 +1,4 @@ -$Id: README 50122 2019-02-25 03:01:12Z kakuto $ +$Id: README 52233 2019-09-30 22:08:36Z kakuto $ Public domain. Originally created by Karl Berry, 2005. Libraries we compile for TeX Live. @@ -12,7 +12,7 @@ See also comments in ../texk/README. cairo 1.16.0 - checked 20oct18 http://cairographics.org/releases/ -freetype2 2.9.1 - checked 04may18 +freetype2 2.10.1 - checked 02jul19 http://savannah.nongnu.org/download/freetype/ gd 2.2.5 - checked 30aug17 @@ -25,7 +25,7 @@ graphite2 1.3.13 - checked 21dec18 http://sourceforge.net/projects/silgraphite/files/graphite2/ (requires C++11) -harfbuzz 2.3.1 - checked 31jan19 +harfbuzz 2.6.2 - checked 01oct19 http://www.freedesktop.org/software/harfbuzz/release/ icu 63.1 - checked 8jan19 @@ -34,7 +34,7 @@ icu 63.1 - checked 8jan19 libpaper 1.1.24+nmu2 - checked 24oct13 ftp://ftp.de.debian.org/debian/pool/main/libp/libpaper/ -libpng 1.6.36 - checked 02dec18 +libpng 1.6.37 - checked 03may19 https://sourceforge.net/projects/libpng/files/ - used by many lua 5.2.4 - checked 11mar15 @@ -49,17 +49,17 @@ luajit 2.1.0-beta3 - checked 20jun17 mpfr 4.0.2 - checked 1jan19 http://ftp.gnu.org/gnu/mpfr/ -pixman 0.38.0 - checked 13feb19 +pixman 0.38.4 - checked 03may19 http://cairographics.org/releases/ poppler 0.68.0 - checked 20aug18 http://poppler.freedesktop.org/ - used by xetex (requires C++11) -teckit 2.5.8 - checked 24jul18 - https://github.com/silnrsi/teckit/archive/2.5.8.tar.gz +teckit 2.5.9 - checked 03may19 + https://github.com/silnrsi/teckit/archive/2.5.9.tar.gz -xpdf 4.01 - checked 25feb19 +xpdf 4.02 - checked 29sep19 http://www.xpdfreader.com/download.html with modifications for pdftex diff --git a/source/libs/aclocal.m4 b/source/libs/aclocal.m4 index 998a0760f..0b6cf33e9 100644 --- a/source/libs/aclocal.m4 +++ b/source/libs/aclocal.m4 @@ -1171,6 +1171,8 @@ AC_SUBST([am__untar]) m4_include([../m4/kpse-common.m4]) m4_include([../m4/kpse-cxx-hack.m4]) +m4_include([../m4/kpse-graphite2-flags.m4]) +m4_include([../m4/kpse-harfbuzz-flags.m4]) m4_include([../m4/kpse-kpathsea-flags.m4]) m4_include([../m4/kpse-libpng-flags.m4]) m4_include([../m4/kpse-lt-hack.m4]) diff --git a/source/libs/configure b/source/libs/configure index a1040aaba..f572ac5e2 100755 --- a/source/libs/configure +++ b/source/libs/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for TeX Live libs 2019. +# Generated by GNU Autoconf 2.69 for TeX Live libs 2020/dev. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='TeX Live libs' PACKAGE_TARNAME='tex-live-libs' -PACKAGE_VERSION='2019' -PACKAGE_STRING='TeX Live libs 2019' +PACKAGE_VERSION='2020/dev' +PACKAGE_STRING='TeX Live libs 2020/dev' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -717,6 +717,8 @@ enable_pdftex enable_pdftex_synctex enable_luatex enable_luajittex +enable_luahbtex +enable_luajithbtex enable_mp enable_pmp enable_upmp @@ -741,6 +743,8 @@ enable_web_progs enable_synctex enable_texlive enable_linked_scripts +with_system_harfbuzz +with_system_graphite2 with_system_zziplib with_system_libpng with_system_zlib @@ -1307,7 +1311,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures TeX Live libs 2019 to adapt to many kinds of systems. +\`configure' configures TeX Live libs 2020/dev to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1377,7 +1381,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of TeX Live libs 2019:";; + short | recursive ) echo "Configuration of TeX Live libs 2020/dev:";; esac cat <<\_ACEOF @@ -1417,6 +1421,8 @@ Optional Features: --disable-pdftex-synctex build pdfTeX without SyncTeX support --disable-luatex do not compile and install LuaTeX --disable-luajittex do not compile and install LuaJITTeX + --disable-luahbtex do not compile and install LuaHBTeX + --disable-luajithbtex do not compile and install LuaHBJITTeX --disable-mp do not compile and install MetaPost --disable-pmp do not compile and install pMetaPost --disable-upmp do not compile and install upMetaPost @@ -1468,6 +1474,10 @@ Optional Packages: --with-editor=CMD invoke CMD from the `e' option [vi +%d '%s'] or [texworks --position=%d "%s"] --with-mf-x-toolkit use X toolkit for METAFONT + --with-system-harfbuzz use installed harfbuzz headers and library (requires + pkg-config) + --with-system-graphite2 use installed graphite2 headers and library + (requires pkg-config) --with-system-zziplib use installed zziplib headers and library (requires pkg-config) --with-system-libpng use installed libpng headers and library (requires @@ -1554,7 +1564,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -TeX Live libs configure 2019 +TeX Live libs configure 2020/dev generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1655,7 +1665,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by TeX Live libs $as_me 2019, which was +It was created by TeX Live libs $as_me 2020/dev, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3184,7 +3194,7 @@ test "x$enable_web2c" = xno || { need_zlib=yes } -# $Id: web2c.ac 50341 2019-03-11 22:04:24Z karl $ +# $Id: web2c.ac 51577 2019-07-08 06:07:11Z lscarso $ # texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ ## configure options for TeX and MF @@ -3378,6 +3388,40 @@ test "x$enable_web2c:$enable_luajittex" = xyes:yes && { need_zziplib=yes need_luajit=yes } +# Check whether --enable-luahbtex was given. +if test "${enable_luahbtex+set}" = set; then : + enableval=$enable_luahbtex; +fi +case $enable_luahbtex in #( + yes | no) : + ;; #( + *) : + enable_luahbtex=yes ;; +esac + +test "x$enable_web2c:$enable_luahbtex" = xyes:yes && { + need_libpng=yes + need_zziplib=yes + need_lua53=yes + need_harfbuzz=yes +} +# Check whether --enable-luajithbtex was given. +if test "${enable_luajithbtex+set}" = set; then : + enableval=$enable_luajithbtex; +fi +case $enable_luajithbtex in #( + yes | no) : + ;; #( + *) : + enable_luajithbtex=yes ;; +esac + +test "x$enable_web2c:$enable_luajithbtex" = xyes:yes && { + need_libpng=yes + need_zziplib=yes + need_luajit=yes + need_harfbuzz=yes +} # Check whether --enable-mp was given. if test "${enable_mp+set}" = set; then : enableval=$enable_mp; @@ -3598,6 +3642,69 @@ if test "${enable_linked_scripts+set}" = set; then : fi +## libs/harfbuzz/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/ +## configure options and TL libraries required for harfbuzz + +# Check whether --with-system-harfbuzz was given. +if test "${with_system_harfbuzz+set}" = set; then : + withval=$with_system_harfbuzz; +fi +if test "x$with_system_harfbuzz" = x; then + if test -f $srcdir/../libs/harfbuzz/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`harfbuzz' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`harfbuzz' headers and library from TL tree" >&6;} + with_system_harfbuzz=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`harfbuzz' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`harfbuzz' headers and library" >&6;} + with_system_harfbuzz=yes + fi + ac_configure_args="$ac_configure_args '--with-system-harfbuzz=$with_system_harfbuzz'" +fi +if test "x$with_system_harfbuzz" = xyes; then + if test "x$with_system_graphite2" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`graphite2' headers and library" >&5 +$as_echo "$as_me: -> installed \`graphite2' headers and library" >&6;} + with_system_graphite2=yes + ac_configure_args="$ac_configure_args '--with-system-graphite2'" + elif test "x$with_system_graphite2" != xyes; then + as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-graphite2'" "$LINENO" 5 + fi + if test "x$with_system_icu" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`icu' headers and library" >&5 +$as_echo "$as_me: -> installed \`icu' headers and library" >&6;} + with_system_icu=yes + ac_configure_args="$ac_configure_args '--with-system-icu'" + elif test "x$with_system_icu" != xyes; then + as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-icu'" "$LINENO" 5 + fi +fi + +test "x$need_harfbuzz" = xyes && { + need_graphite2=yes + need_icu=yes +} + +## libs/graphite2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/ +## configure options and TL libraries required for graphite2 + +# Check whether --with-system-graphite2 was given. +if test "${with_system_graphite2+set}" = set; then : + withval=$with_system_graphite2; +fi +if test "x$with_system_graphite2" = x; then + if test -f $srcdir/../libs/graphite2/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`graphite2' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`graphite2' headers and library from TL tree" >&6;} + with_system_graphite2=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`graphite2' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`graphite2' headers and library" >&6;} + with_system_graphite2=yes + fi + ac_configure_args="$ac_configure_args '--with-system-graphite2=$with_system_graphite2'" +fi + ## libs/zziplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zziplib/ ## configure options and TL libraries required for zziplib @@ -4321,7 +4428,7 @@ fi # Define the identity of the package. PACKAGE='tex-live-libs' - VERSION='2019' + VERSION='2020/dev' cat >>confdefs.h <<_ACEOF @@ -4657,6 +4764,14 @@ $as_echo_n "checking for generic libraries to build... " >&6; } echo 'tldbg:_KPSE_RECURSE called: list=libs, text=generic libraries, cond=test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes, prefix=.' >&5 MAKE_SUBDIRS= CONF_SUBDIRS= +if test -x $srcdir/harfbuzz/configure; then + test "x$with_system_harfbuzz" != xyes && test "x$need_harfbuzz" = xyes && MAKE_SUBDIRS="harfbuzz $MAKE_SUBDIRS" + CONF_SUBDIRS="harfbuzz $CONF_SUBDIRS" +fi +if test -x $srcdir/graphite2/configure; then + test "x$with_system_graphite2" != xyes && test "x$need_graphite2" = xyes && MAKE_SUBDIRS="graphite2 $MAKE_SUBDIRS" + CONF_SUBDIRS="graphite2 $CONF_SUBDIRS" +fi if test -x $srcdir/zziplib/configure; then test "x$with_system_zziplib" != xyes && test "x$need_zziplib" = xyes && MAKE_SUBDIRS="zziplib $MAKE_SUBDIRS" CONF_SUBDIRS="zziplib $CONF_SUBDIRS" @@ -5254,7 +5369,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by TeX Live libs $as_me 2019, which was +This file was extended by TeX Live libs $as_me 2020/dev, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5311,7 +5426,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -TeX Live libs config.status 2019 +TeX Live libs config.status 2020/dev configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/source/libs/graphite2/ChangeLog b/source/libs/graphite2/ChangeLog new file mode 100644 index 000000000..b1f9119ae --- /dev/null +++ b/source/libs/graphite2/ChangeLog @@ -0,0 +1,147 @@ +2018-12-21 Akira Kakuto + + Import graphite2-1.3.13. + * version.ac: Adjusted. + +2018-08-16 Akira Kakuto + + Import graphite2-1.3.12. + * configure.ac, version.ac, Makefile.am: Adjusted. + +2018-03-05 Akira Kakuto + + Import graphite2-1.3.11. + * version.ac: Adjusted. + +2017-06-20 Akira Kakuto + + Import graphite2-1.3.10. + * version.ac: Adjusted. + +2016-11-13 Akira Kakuto + + Import graphite2-1.3.9. + * version.ac: Adjusted. + +2016-03-31 Akira Kakuto + + Import graphite2-1.3.8. + * version.ac: Adjusted. + +2016-03-15 Akira Kakuto + + Import graphite2-1.3.7. + * version.ac: Adjusted. + +2016-03-01 Akira Kakuto + + Import graphite2-1.3.6. + * version.ac: Adjusted. + +2016-02-15 Karl Berry + + * graphite2-PATCHES: rename from graphite2-src-PATCHES. + * Makefile.am (EXTRA_DIST): likewise. + +2016-01-20 Akira Kakuto + + Import graphite2-1.3.5. + * version.ac: Adjusted. + * configure.ac: New convention for source tree. + +2015-09-26 Peter Breitenlohner + + Import graphite2-1.3.3. + * version.ac: Adjusted. + +2015-09-11 Peter Breitenlohner + + Import graphite2-1.3.2. + * Makefile.am, version.ac: Adapted. + +2015-08-31 Peter Breitenlohner + + Import graphite2-1.3.1. + * version.ac: Adjust. + +2015-08-05 Peter Breitenlohner + + Import graphite2-1.3.0. + * Makefile.am, version.ac: Adapted. + +2015-07-06 Peter Breitenlohner + + * Makefile.am: Better dependencies for 'make check'. + +2015-02-16 Peter Breitenlohner + + * Makefile.am: Use the fragment ../../am/dist_hook.am. + +2014-06-16 Peter Breitenlohner + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + +2014-02-20 Peter Breitenlohner + + * Makefile.am (gr2test_CPPFLAGS): Add -DGRAPHITE2_STATIC for + Windows/MinGW/Cygwin. + +2013-12-02 Peter Breitenlohner + + Import graphite2-1.2.4. + * version.ac: Adjust. + +2013-10-29 Peter Breitenlohner + + * gr2test.c: Print more info. + +2013-09-01 Peter Breitenlohner + + * configure.ac: Drop LT_INIT, not using Libtool. + +2013-07-06 Peter Breitenlohner + + * Makefile.am: Use ../../am/rebuild.am. + + * graphite2.test (new): Shell script for a basic test. + * gr2test.c (new): Source code for test program. + +2013-07-05 Peter Breitenlohner + + * include/graphite2/Makefile.am: + Moved Makefile fragments to ../../am/. + +2013-06-12 Peter Breitenlohner + + Import graphite2-1.2.3. + * version.ac: Adjust. + +2013-06-02 Peter Breitenlohner + + Import graphite2-1.2.2. + * version.ac: Adjust. + +2012-12-04 Peter Breitenlohner + + Import graphite2-1.2.1. + * version.ac: Adjust. + +2013-01-29 Peter Breitenlohner + + * Makefile.am: Allow subdir-objects. + +2013-01-03 Peter Breitenlohner + + * Makefile.am (AM_CPPFLAGS): Add -DGRAPHITE2_NSEGCACHE, + -DGRAPHITE2_NFILEFACE, and -DGRAPHITE2_NTRACING respectively + when building without segment caching, file face, or logging. + + * ac/graphite2.ac [KPSE_TRY_LIB]: Correct a syntax bug. + +2012-12-15 Peter Breitenlohner + + * configure.ac: Use KPSE_BASIC to enable silent rules. + +2012-12-04 Peter Breitenlohner + + Import graphite2-1.2.0. diff --git a/source/libs/graphite2/Makefile.am b/source/libs/graphite2/Makefile.am new file mode 100644 index 000000000..f038d7108 --- /dev/null +++ b/source/libs/graphite2/Makefile.am @@ -0,0 +1,104 @@ +## $Id: Makefile.am 48409 2018-08-16 00:30:02Z kakuto $ +## Proxy Makefile.am to build graphite2 for TeX Live. +## +## Copyright 2016-2017 Karl Berry +## Copyright 2012-2015 Peter Breitenlohner +## +## This file is free software; the copyright holder +## gives unlimited permission to copy and/or distribute it, +## with or without modifications, as long as this notice is preserved. +## +## We want to re-distribute the whole original graphite2 source tree. +## +EXTRA_DIST = $(GRAPHITE2_TREE) + +## Changes applied to the original source tree +## +EXTRA_DIST += TLpatches + +GRAPHITE2_SRC = $(GRAPHITE2_TREE)/src +GRAPHITE2_INC = $(GRAPHITE2_TREE)/include + +# Files not to be distributed +include $(srcdir)/../../am/dist_hook.am +NEVER_NAMES += $(NEVER_NAMES_SUB) + +SUBDIRS = . include/graphite2 + +noinst_LIBRARIES = libgraphite2.a + +## common +AM_CPPFLAGS = -I$(top_srcdir)/$(GRAPHITE2_SRC) -I$(top_srcdir)/$(GRAPHITE2_INC) +AM_CPPFLAGS += -DGRAPHITE2_STATIC -DGRAPHITE2_CUSTOM_HEADER='' +libgraphite2_a_SOURCES = \ + @GRAPHITE2_TREE@/src/CmapCache.cpp \ + @GRAPHITE2_TREE@/src/Code.cpp \ + @GRAPHITE2_TREE@/src/Collider.cpp \ + @GRAPHITE2_TREE@/src/Decompressor.cpp \ + @GRAPHITE2_TREE@/src/Face.cpp \ + @GRAPHITE2_TREE@/src/FeatureMap.cpp \ + @GRAPHITE2_TREE@/src/Font.cpp \ + @GRAPHITE2_TREE@/src/GlyphCache.cpp \ + @GRAPHITE2_TREE@/src/GlyphFace.cpp \ + @GRAPHITE2_TREE@/src/Intervals.cpp \ + @GRAPHITE2_TREE@/src/Justifier.cpp \ + @GRAPHITE2_TREE@/src/NameTable.cpp \ + @GRAPHITE2_TREE@/src/Pass.cpp \ + @GRAPHITE2_TREE@/src/Position.cpp \ + @GRAPHITE2_TREE@/src/Segment.cpp \ + @GRAPHITE2_TREE@/src/Silf.cpp \ + @GRAPHITE2_TREE@/src/Slot.cpp \ + @GRAPHITE2_TREE@/src/Sparse.cpp \ + @GRAPHITE2_TREE@/src/TtfUtil.cpp \ + @GRAPHITE2_TREE@/src/UtfCodec.cpp \ + @GRAPHITE2_TREE@/src/gr_char_info.cpp \ + @GRAPHITE2_TREE@/src/gr_face.cpp \ + @GRAPHITE2_TREE@/src/gr_features.cpp \ + @GRAPHITE2_TREE@/src/gr_font.cpp \ + @GRAPHITE2_TREE@/src/gr_logging.cpp \ + @GRAPHITE2_TREE@/src/gr_segment.cpp \ + @GRAPHITE2_TREE@/src/gr_slot.cpp + +if DIRECT_TYPE +libgraphite2_a_SOURCES += @GRAPHITE2_TREE@/src/direct_machine.cpp +else !DIRECT_TYPE +libgraphite2_a_SOURCES += @GRAPHITE2_TREE@/src/call_machine.cpp +endif !DIRECT_TYPE + +AM_CPPFLAGS += -DGRAPHITE2_NSEGCACHE + +if WITH_FILEFACE +libgraphite2_a_SOURCES += @GRAPHITE2_TREE@/src/FileFace.cpp +else !WITH_FILEFACE +AM_CPPFLAGS += -DGRAPHITE2_NFILEFACE +endif !WITH_FILEFACE + +if WITH_TRACING +libgraphite2_a_SOURCES += @GRAPHITE2_TREE@/src/json.cpp +else !WITH_TRACING +AM_CPPFLAGS += -DGRAPHITE2_NTRACING +endif !WITH_TRACING + +if build +check_PROGRAMS = gr2test +dist_check_SCRIPTS = graphite2.test +TESTS = graphite2.test +endif build +graphite2.log: gr2test$(EXEEXT) + +gr2test_SOURCES = gr2test.c + +# Force Automake to use CXXLD for linking +nodist_EXTRA_gr2test_SOURCES = dummy.cxx + +gr2test_CPPFLAGS = -Iinclude -DGRAPHITE2_STATIC + +LDADD = libgraphite2.a + +# Rebuild +rebuild_prereq = +rebuild_target = all +CLEANFILES = + +include $(srcdir)/../../am/rebuild.am + diff --git a/source/libs/graphite2/Makefile.in b/source/libs/graphite2/Makefile.in new file mode 100644 index 000000000..6de8caae1 --- /dev/null +++ b/source/libs/graphite2/Makefile.in @@ -0,0 +1,1699 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +@DIRECT_TYPE_TRUE@am__append_1 = @GRAPHITE2_TREE@/src/direct_machine.cpp +@DIRECT_TYPE_FALSE@am__append_2 = @GRAPHITE2_TREE@/src/call_machine.cpp +@WITH_FILEFACE_TRUE@am__append_3 = @GRAPHITE2_TREE@/src/FileFace.cpp +@WITH_FILEFACE_FALSE@am__append_4 = -DGRAPHITE2_NFILEFACE +@WITH_TRACING_TRUE@am__append_5 = @GRAPHITE2_TREE@/src/json.cpp +@WITH_TRACING_FALSE@am__append_6 = -DGRAPHITE2_NTRACING +@build_TRUE@check_PROGRAMS = gr2test$(EXEEXT) +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/../../m4/ax_cxx_compile_stdcxx.m4 \ + $(top_srcdir)/../../m4/kpse-common.m4 \ + $(top_srcdir)/../../m4/kpse-warnings.m4 \ + $(top_srcdir)/version.ac $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__dist_check_SCRIPTS_DIST) \ + $(am__DIST_COMMON) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +LIBRARIES = $(noinst_LIBRARIES) +AR = ar +ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = +libgraphite2_a_AR = $(AR) $(ARFLAGS) +libgraphite2_a_LIBADD = +am__libgraphite2_a_SOURCES_DIST = @GRAPHITE2_TREE@/src/CmapCache.cpp \ + @GRAPHITE2_TREE@/src/Code.cpp \ + @GRAPHITE2_TREE@/src/Collider.cpp \ + @GRAPHITE2_TREE@/src/Decompressor.cpp \ + @GRAPHITE2_TREE@/src/Face.cpp \ + @GRAPHITE2_TREE@/src/FeatureMap.cpp \ + @GRAPHITE2_TREE@/src/Font.cpp \ + @GRAPHITE2_TREE@/src/GlyphCache.cpp \ + @GRAPHITE2_TREE@/src/GlyphFace.cpp \ + @GRAPHITE2_TREE@/src/Intervals.cpp \ + @GRAPHITE2_TREE@/src/Justifier.cpp \ + @GRAPHITE2_TREE@/src/NameTable.cpp \ + @GRAPHITE2_TREE@/src/Pass.cpp \ + @GRAPHITE2_TREE@/src/Position.cpp \ + @GRAPHITE2_TREE@/src/Segment.cpp @GRAPHITE2_TREE@/src/Silf.cpp \ + @GRAPHITE2_TREE@/src/Slot.cpp @GRAPHITE2_TREE@/src/Sparse.cpp \ + @GRAPHITE2_TREE@/src/TtfUtil.cpp \ + @GRAPHITE2_TREE@/src/UtfCodec.cpp \ + @GRAPHITE2_TREE@/src/gr_char_info.cpp \ + @GRAPHITE2_TREE@/src/gr_face.cpp \ + @GRAPHITE2_TREE@/src/gr_features.cpp \ + @GRAPHITE2_TREE@/src/gr_font.cpp \ + @GRAPHITE2_TREE@/src/gr_logging.cpp \ + @GRAPHITE2_TREE@/src/gr_segment.cpp \ + @GRAPHITE2_TREE@/src/gr_slot.cpp \ + @GRAPHITE2_TREE@/src/direct_machine.cpp \ + @GRAPHITE2_TREE@/src/call_machine.cpp \ + @GRAPHITE2_TREE@/src/FileFace.cpp \ + @GRAPHITE2_TREE@/src/json.cpp +am__dirstamp = $(am__leading_dot)dirstamp +@DIRECT_TYPE_TRUE@am__objects_1 = @GRAPHITE2_TREE@/src/direct_machine.$(OBJEXT) +@DIRECT_TYPE_FALSE@am__objects_2 = @GRAPHITE2_TREE@/src/call_machine.$(OBJEXT) +@WITH_FILEFACE_TRUE@am__objects_3 = \ +@WITH_FILEFACE_TRUE@ @GRAPHITE2_TREE@/src/FileFace.$(OBJEXT) +@WITH_TRACING_TRUE@am__objects_4 = \ +@WITH_TRACING_TRUE@ @GRAPHITE2_TREE@/src/json.$(OBJEXT) +am_libgraphite2_a_OBJECTS = @GRAPHITE2_TREE@/src/CmapCache.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/Code.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/Collider.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/Decompressor.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/Face.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/FeatureMap.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/Font.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/GlyphCache.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/GlyphFace.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/Intervals.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/Justifier.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/NameTable.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/Pass.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/Position.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/Segment.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/Silf.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/Slot.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/Sparse.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/TtfUtil.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/UtfCodec.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/gr_char_info.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/gr_face.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/gr_features.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/gr_font.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/gr_logging.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/gr_segment.$(OBJEXT) \ + @GRAPHITE2_TREE@/src/gr_slot.$(OBJEXT) $(am__objects_1) \ + $(am__objects_2) $(am__objects_3) $(am__objects_4) +libgraphite2_a_OBJECTS = $(am_libgraphite2_a_OBJECTS) +am_gr2test_OBJECTS = gr2test-gr2test.$(OBJEXT) +gr2test_OBJECTS = $(am_gr2test_OBJECTS) +gr2test_LDADD = $(LDADD) +gr2test_DEPENDENCIES = libgraphite2.a +am__dist_check_SCRIPTS_DIST = graphite2.test +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ +depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/gr2test-dummy.Po \ + ./$(DEPDIR)/gr2test-gr2test.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/CmapCache.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/Code.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/Collider.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/Decompressor.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/Face.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/FeatureMap.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/FileFace.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/Font.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/GlyphCache.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/GlyphFace.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/Intervals.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/Justifier.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/NameTable.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/Pass.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/Position.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/Segment.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/Silf.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/Slot.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/Sparse.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/TtfUtil.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/UtfCodec.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/call_machine.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/direct_machine.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_char_info.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_face.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_features.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_font.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_logging.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_segment.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_slot.Po \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/json.Po +am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +SOURCES = $(libgraphite2_a_SOURCES) $(gr2test_SOURCES) \ + $(nodist_EXTRA_gr2test_SOURCES) +DIST_SOURCES = $(am__libgraphite2_a_SOURCES_DIST) $(gr2test_SOURCES) +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope check recheck distdir distdir-am dist dist-all \ + distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +CSCOPE = cscope +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \ + $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \ + $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \ + $(top_srcdir)/../../build-aux/depcomp \ + $(top_srcdir)/../../build-aux/install-sh \ + $(top_srcdir)/../../build-aux/missing \ + $(top_srcdir)/../../build-aux/test-driver \ + ../../build-aux/ar-lib ../../build-aux/compile \ + ../../build-aux/config.guess ../../build-aux/config.sub \ + ../../build-aux/depcomp ../../build-aux/install-sh \ + ../../build-aux/ltmain.sh ../../build-aux/missing \ + ../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +DIST_ARCHIVES = $(distdir).tar.gz +GZIP_ENV = --best +DIST_TARGETS = dist-gzip +distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EXEEXT = @EXEEXT@ +GRAPHITE2_TREE = @GRAPHITE2_TREE@ +HAVE_CXX11 = @HAVE_CXX11@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +WARNING_CFLAGS = @WARNING_CFLAGS@ +WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build_alias = @build_alias@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host_alias = @host_alias@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = $(GRAPHITE2_TREE) TLpatches +GRAPHITE2_SRC = $(GRAPHITE2_TREE)/src +GRAPHITE2_INC = $(GRAPHITE2_TREE)/include +NEVER_DIST = `find . $(NEVER_NAMES)` + +# Files not to be distributed +NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB) +NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)' +NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' +SUBDIRS = . include/graphite2 +noinst_LIBRARIES = libgraphite2.a +AM_CPPFLAGS = -I$(top_srcdir)/$(GRAPHITE2_SRC) \ + -I$(top_srcdir)/$(GRAPHITE2_INC) -DGRAPHITE2_STATIC \ + -DGRAPHITE2_CUSTOM_HEADER='' -DGRAPHITE2_NSEGCACHE \ + $(am__append_4) $(am__append_6) +libgraphite2_a_SOURCES = @GRAPHITE2_TREE@/src/CmapCache.cpp \ + @GRAPHITE2_TREE@/src/Code.cpp \ + @GRAPHITE2_TREE@/src/Collider.cpp \ + @GRAPHITE2_TREE@/src/Decompressor.cpp \ + @GRAPHITE2_TREE@/src/Face.cpp \ + @GRAPHITE2_TREE@/src/FeatureMap.cpp \ + @GRAPHITE2_TREE@/src/Font.cpp \ + @GRAPHITE2_TREE@/src/GlyphCache.cpp \ + @GRAPHITE2_TREE@/src/GlyphFace.cpp \ + @GRAPHITE2_TREE@/src/Intervals.cpp \ + @GRAPHITE2_TREE@/src/Justifier.cpp \ + @GRAPHITE2_TREE@/src/NameTable.cpp \ + @GRAPHITE2_TREE@/src/Pass.cpp \ + @GRAPHITE2_TREE@/src/Position.cpp \ + @GRAPHITE2_TREE@/src/Segment.cpp @GRAPHITE2_TREE@/src/Silf.cpp \ + @GRAPHITE2_TREE@/src/Slot.cpp @GRAPHITE2_TREE@/src/Sparse.cpp \ + @GRAPHITE2_TREE@/src/TtfUtil.cpp \ + @GRAPHITE2_TREE@/src/UtfCodec.cpp \ + @GRAPHITE2_TREE@/src/gr_char_info.cpp \ + @GRAPHITE2_TREE@/src/gr_face.cpp \ + @GRAPHITE2_TREE@/src/gr_features.cpp \ + @GRAPHITE2_TREE@/src/gr_font.cpp \ + @GRAPHITE2_TREE@/src/gr_logging.cpp \ + @GRAPHITE2_TREE@/src/gr_segment.cpp \ + @GRAPHITE2_TREE@/src/gr_slot.cpp $(am__append_1) \ + $(am__append_2) $(am__append_3) $(am__append_5) +@build_TRUE@dist_check_SCRIPTS = graphite2.test +@build_TRUE@TESTS = graphite2.test +gr2test_SOURCES = gr2test.c + +# Force Automake to use CXXLD for linking +nodist_EXTRA_gr2test_SOURCES = dummy.cxx +gr2test_CPPFLAGS = -Iinclude -DGRAPHITE2_STATIC +LDADD = libgraphite2.a + +# Rebuild +rebuild_prereq = +rebuild_target = all +CLEANFILES = rebuild.stamp +all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +.SUFFIXES: +.SUFFIXES: .c .cpp .cxx .log .o .obj .test .test$(EXEEXT) .trs +am--refresh: Makefile + @: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ + esac; +$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__empty): + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + $(am__cd) $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): + +config.h: stamp-h1 + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) + rm -f stamp-h1 + touch $@ + +distclean-hdr: + -rm -f config.h stamp-h1 + +clean-checkPROGRAMS: + -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) +@GRAPHITE2_TREE@/src/$(am__dirstamp): + @$(MKDIR_P) @GRAPHITE2_TREE@/src + @: > @GRAPHITE2_TREE@/src/$(am__dirstamp) +@GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) @GRAPHITE2_TREE@/src/$(DEPDIR) + @: > @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/CmapCache.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/Code.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/Collider.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/Decompressor.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/Face.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/FeatureMap.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/Font.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/GlyphCache.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/GlyphFace.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/Intervals.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/Justifier.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/NameTable.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/Pass.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/Position.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/Segment.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/Silf.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/Slot.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/Sparse.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/TtfUtil.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/UtfCodec.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/gr_char_info.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/gr_face.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/gr_features.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/gr_font.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/gr_logging.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/gr_segment.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/gr_slot.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/direct_machine.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/call_machine.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/FileFace.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GRAPHITE2_TREE@/src/json.$(OBJEXT): \ + @GRAPHITE2_TREE@/src/$(am__dirstamp) \ + @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) + +libgraphite2.a: $(libgraphite2_a_OBJECTS) $(libgraphite2_a_DEPENDENCIES) $(EXTRA_libgraphite2_a_DEPENDENCIES) + $(AM_V_at)-rm -f libgraphite2.a + $(AM_V_AR)$(libgraphite2_a_AR) libgraphite2.a $(libgraphite2_a_OBJECTS) $(libgraphite2_a_LIBADD) + $(AM_V_at)$(RANLIB) libgraphite2.a + +gr2test$(EXEEXT): $(gr2test_OBJECTS) $(gr2test_DEPENDENCIES) $(EXTRA_gr2test_DEPENDENCIES) + @rm -f gr2test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(gr2test_OBJECTS) $(gr2test_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + -rm -f @GRAPHITE2_TREE@/src/*.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr2test-dummy.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr2test-gr2test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/CmapCache.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/Code.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/Collider.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/Decompressor.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/Face.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/FeatureMap.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/FileFace.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/Font.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/GlyphCache.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/GlyphFace.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/Intervals.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/Justifier.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/NameTable.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/Pass.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/Position.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/Segment.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/Silf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/Slot.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/Sparse.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/TtfUtil.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/UtfCodec.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/call_machine.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/direct_machine.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/gr_char_info.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/gr_face.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/gr_features.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/gr_font.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/gr_logging.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/gr_segment.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/gr_slot.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GRAPHITE2_TREE@/src/$(DEPDIR)/json.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +gr2test-gr2test.o: gr2test.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gr2test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gr2test-gr2test.o -MD -MP -MF $(DEPDIR)/gr2test-gr2test.Tpo -c -o gr2test-gr2test.o `test -f 'gr2test.c' || echo '$(srcdir)/'`gr2test.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gr2test-gr2test.Tpo $(DEPDIR)/gr2test-gr2test.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gr2test.c' object='gr2test-gr2test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gr2test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gr2test-gr2test.o `test -f 'gr2test.c' || echo '$(srcdir)/'`gr2test.c + +gr2test-gr2test.obj: gr2test.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gr2test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gr2test-gr2test.obj -MD -MP -MF $(DEPDIR)/gr2test-gr2test.Tpo -c -o gr2test-gr2test.obj `if test -f 'gr2test.c'; then $(CYGPATH_W) 'gr2test.c'; else $(CYGPATH_W) '$(srcdir)/gr2test.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gr2test-gr2test.Tpo $(DEPDIR)/gr2test-gr2test.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gr2test.c' object='gr2test-gr2test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gr2test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gr2test-gr2test.obj `if test -f 'gr2test.c'; then $(CYGPATH_W) 'gr2test.c'; else $(CYGPATH_W) '$(srcdir)/gr2test.c'; fi` + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +gr2test-dummy.o: dummy.cxx +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gr2test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gr2test-dummy.o -MD -MP -MF $(DEPDIR)/gr2test-dummy.Tpo -c -o gr2test-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gr2test-dummy.Tpo $(DEPDIR)/gr2test-dummy.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='dummy.cxx' object='gr2test-dummy.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gr2test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gr2test-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx + +gr2test-dummy.obj: dummy.cxx +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gr2test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gr2test-dummy.obj -MD -MP -MF $(DEPDIR)/gr2test-dummy.Tpo -c -o gr2test-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gr2test-dummy.Tpo $(DEPDIR)/gr2test-dummy.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='dummy.cxx' object='gr2test-dummy.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gr2test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gr2test-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi` + +.cxx.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cxx.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +# This directory's subdirectories are mostly independent; you can cd +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files + +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ + fi; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ + else \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ + fi; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ + else \ + color_start= color_end=; \ + fi; \ + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: $(check_PROGRAMS) $(dist_check_SCRIPTS) + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) $(dist_check_SCRIPTS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + $(am__remove_distdir) + test -d "$(distdir)" || mkdir "$(distdir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r "$(distdir)" +dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz + $(am__post_remove_distdir) + +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) + +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) + +dist-tarZ: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__post_remove_distdir) + +dist-shar: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz + $(am__post_remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__post_remove_distdir) + +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst + chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=../.. --prefix="$$dc_install_base" \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 + $(am__post_remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' +distuninstallcheck: + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) \ + $(dist_check_SCRIPTS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS +check: check-recursive +all-am: Makefile $(LIBRARIES) config.h +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/$(am__dirstamp) + -rm -f @GRAPHITE2_TREE@/src/$(am__dirstamp) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-checkPROGRAMS clean-generic clean-noinstLIBRARIES \ + mostlyclean-am + +distclean: distclean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f ./$(DEPDIR)/gr2test-dummy.Po + -rm -f ./$(DEPDIR)/gr2test-gr2test.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/CmapCache.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Code.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Collider.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Decompressor.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Face.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/FeatureMap.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/FileFace.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Font.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/GlyphCache.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/GlyphFace.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Intervals.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Justifier.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/NameTable.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Pass.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Position.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Segment.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Silf.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Slot.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Sparse.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/TtfUtil.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/UtfCodec.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/call_machine.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/direct_machine.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_char_info.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_face.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_features.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_font.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_logging.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_segment.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_slot.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/json.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-hdr distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f ./$(DEPDIR)/gr2test-dummy.Po + -rm -f ./$(DEPDIR)/gr2test-gr2test.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/CmapCache.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Code.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Collider.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Decompressor.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Face.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/FeatureMap.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/FileFace.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Font.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/GlyphCache.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/GlyphFace.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Intervals.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Justifier.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/NameTable.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Pass.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Position.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Segment.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Silf.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Slot.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/Sparse.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/TtfUtil.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/UtfCodec.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/call_machine.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/direct_machine.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_char_info.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_face.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_features.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_font.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_logging.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_segment.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/gr_slot.Po + -rm -f @GRAPHITE2_TREE@/src/$(DEPDIR)/json.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(am__recursive_targets) all check-am install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--depfiles am--refresh check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-cscope clean-generic \ + clean-noinstLIBRARIES cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-compile distclean-generic distclean-hdr \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile + +dist-hook: + cd "$(distdir)" && rm -rf $(NEVER_DIST) +graphite2.log: gr2test$(EXEEXT) +rebuild.stamp: $(rebuild_target) + echo timestamp >$@ + +.PHONY: rebuild +rebuild: $(rebuild_prereq) + @dry=; for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=*|--*);; \ + *n*) dry=:;; \ + esac; \ + done; \ + if test -f rebuild.stamp; then :; else \ + $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \ + if $$dry mkdir rebuild.lock 2>/dev/null; then \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ + $$dry rmdir rebuild.lock; \ + else \ + while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ + fi; \ + $$dry test -f rebuild.stamp; exit $$?; \ + fi + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/source/libs/graphite2/TLpatches/ChangeLog b/source/libs/graphite2/TLpatches/ChangeLog new file mode 100644 index 000000000..30c3417f6 --- /dev/null +++ b/source/libs/graphite2/TLpatches/ChangeLog @@ -0,0 +1,92 @@ +2018-12-21 Akira Kakuto + + Imported graphite2-1.3.13 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +2018-08-16 Akira Kakuto + + Imported graphite2-1.3.12 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +2018-03-05 Akira Kakuto + + Imported graphite2-1.3.11 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +2017-06-20 Akira Kakuto + + Imported graphite2-1.3.10 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +2016-11-13 Akira Kakuto + + Imported graphite2-1.3.9 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +2016-03-31 Akira Kakuto + + Imported graphite2-1.3.8 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +2016-03-15 Akira Kakuto + + Imported graphite2-1.3.7 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +2016-03-01 Akira Kakuto + + Imported graphite2-1.3.6 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +2016-01-20 Akira Kakuto + + Imported graphite2-1.3.5 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +2013-12-02 Peter Breitenlohner + + Imported graphite2-1.2.4 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +2013-06-12 Peter Breitenlohner + + Imported graphite2-1.2.3 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +2013-06-02 Peter Breitenlohner + + Imported graphite2-1.2.2 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + + * patch-01-case-sensitive (removed): Applied upstream. + * patch-02-attribute-hot (removed): ditto. + +2013-03-27 Peter Breitenlohner + + * patch-02-solaris-variables (new): Upstream patch to not clash + with on Solaris. + From http://projects.palaso.org/projects/graphitedev/repository/ + revisions/1132 and revisions/1136. + +2013-03-07 Peter Breitenlohner + + Imported graphite2-1.2.1 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + + * patch-02-attribute-hot (removed): Now in graphite2-1.2.1. + * patch-01-case-sensitive: Adapted. + +2012-12-06 Peter Breitenlohner + + * patch-03-old-gcc (removed): No longer needed since HarfBuzz + requires gcc-4.x. + +2012-12-04 Peter Breitenlohner + + Imported graphite2-1.2.0 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + + * patch-01-case-sensitive (new): Windows.h => windows.h. + * patch-02-attribute-hot (new): Test for gcc-4.3 or better. + * patch-03-old-gcc (new): Allow to build with, e.g., gcc-3.4. + diff --git a/source/libs/graphite2/TLpatches/TL-Changes b/source/libs/graphite2/TLpatches/TL-Changes new file mode 100644 index 000000000..2f56db0f1 --- /dev/null +++ b/source/libs/graphite2/TLpatches/TL-Changes @@ -0,0 +1,11 @@ +Changes applied to the graphite2-1.3.13/ tree as obtained from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +Removed setup.py +Removed unused dirs: + contrib + debian-src + doc + gr2fonttest + python + tests diff --git a/source/libs/graphite2/ac/graphite2.ac b/source/libs/graphite2/ac/graphite2.ac new file mode 100644 index 000000000..c48cdc1f5 --- /dev/null +++ b/source/libs/graphite2/ac/graphite2.ac @@ -0,0 +1,10 @@ +## libs/graphite2/ac/graphite2.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/ +dnl +dnl Copyright (C) 2012, 2013 Peter Breitenlohner +dnl You may freely use, modify and/or distribute this file. +dnl +## basic check of system graphite2 +KPSE_TRY_LIB([graphite2], + [#include ], + [int *nMajor, *nMinor, *nBugFix; +gr_engine_version(nMajor, nMinor, nBugFix);]) diff --git a/source/libs/graphite2/ac/withenable.ac b/source/libs/graphite2/ac/withenable.ac new file mode 100644 index 000000000..7d276b58a --- /dev/null +++ b/source/libs/graphite2/ac/withenable.ac @@ -0,0 +1,7 @@ +## libs/graphite2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/ +dnl +dnl Copyright (C) 2012 Peter Breitenlohner +dnl You may freely use, modify and/or distribute this file. +dnl +## configure options and TL libraries required for graphite2 +KPSE_WITH_LIB([graphite2]) diff --git a/source/libs/graphite2/aclocal.m4 b/source/libs/graphite2/aclocal.m4 new file mode 100644 index 000000000..d14dd3284 --- /dev/null +++ b/source/libs/graphite2/aclocal.m4 @@ -0,0 +1,1174 @@ +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- + +# Copyright (C) 1996-2018 Free Software Foundation, Inc. + +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) + +# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.16' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.16.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.16.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is '.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + + +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) + shift + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf + do + # Strip MF so we end up with the name of the file. + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? + done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.65])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST([install_sh])]) + +# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MAKE_INCLUDE() +# ----------------- +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. +AC_DEFUN([AM_MAKE_INCLUDE], +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' +am__doit: + @echo this is the am__doit target >confinc.out +.PHONY: am__doit +END +am__include="#" +am__quote= +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + AC_MSG_WARN(['missing' script is too old or missing]) +fi +]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# -------------------- +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) + +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) + +# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor 'install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in "make install-strip", and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +# +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' + +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + +m4_include([../../m4/ax_cxx_compile_stdcxx.m4]) +m4_include([../../m4/kpse-common.m4]) +m4_include([../../m4/kpse-warnings.m4]) diff --git a/source/libs/graphite2/config.h.in b/source/libs/graphite2/config.h.in new file mode 100644 index 000000000..292d75521 --- /dev/null +++ b/source/libs/graphite2/config.h.in @@ -0,0 +1,34 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 to disable fileface support. */ +#undef GRAPHITE2_NFILEFACE + +/* Define to 1 to disable tracing support. */ +#undef GRAPHITE2_NTRACING + +/* define if the compiler supports basic C++11 syntax */ +#undef HAVE_CXX11 + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Version number of package */ +#undef VERSION diff --git a/source/libs/graphite2/configure b/source/libs/graphite2/configure new file mode 100755 index 000000000..62316e40d --- /dev/null +++ b/source/libs/graphite2/configure @@ -0,0 +1,7472 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. +# Generated by GNU Autoconf 2.69 for graphite2 (TeX Live) 1.3.13. +# +# Report bugs to . +# +# +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false +done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org and tex-k@tug.org +$0: about your system, including any error possibly output +$0: before this message. Then install a modern shell, or +$0: manually run the script under such a shell if you do +$0: have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + + + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +test -n "$DJDIR" || exec 7<&0 &1 + +# Name of the host. +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +# +# Initializations. +# +ac_default_prefix=/usr/local +ac_clean_files= +ac_config_libobj_dir=. +LIBOBJS= +cross_compiling=no +subdirs= +MFLAGS= +MAKEFLAGS= + +# Identity of this package. +PACKAGE_NAME='graphite2 (TeX Live)' +PACKAGE_TARNAME='graphite2--tex-live-' +PACKAGE_VERSION='1.3.13' +PACKAGE_STRING='graphite2 (TeX Live) 1.3.13' +PACKAGE_BUGREPORT='tex-k@tug.org' +PACKAGE_URL='' + +ac_unique_file="graphite2-src/graphite2.pc.in" +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS +LIBOBJS +GRAPHITE2_TREE +WITH_TRACING_FALSE +WITH_TRACING_TRUE +WITH_FILEFACE_FALSE +WITH_FILEFACE_TRUE +DIRECT_TYPE_FALSE +DIRECT_TYPE_TRUE +build_FALSE +build_TRUE +LN_S +RANLIB +HAVE_CXX11 +WARNING_CXXFLAGS +am__fastdepCXX_FALSE +am__fastdepCXX_TRUE +CXXDEPMODE +ac_ct_CXX +CXXFLAGS +CXX +WARNING_CFLAGS +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +am__nodep +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__include +DEPDIR +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +MAINT +MAINTAINER_MODE_FALSE +MAINTAINER_MODE_TRUE +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL +am__quote' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_silent_rules +enable_maintainer_mode +enable_dependency_tracking +enable_compiler_warnings +' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CXX +CXXFLAGS +CCC' + + +# Initialize some variables set by options. +ac_init_help= +ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= +# The variables have the same names as the options, with +# dashes changed to underlines. +cache_file=/dev/null +exec_prefix=NONE +no_create= +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +verbose= +x_includes=NONE +x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datarootdir='${prefix}/share' +datadir='${datarootdir}' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +includedir='${prefix}/include' +oldincludedir='/usr/include' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' + +ac_prev= +ac_dashdash= +for ac_option +do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval $ac_prev=\$ac_option + ac_prev= + continue + fi + + case $ac_option in + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; + + -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; + + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; + + -with-* | --with-*) + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac +done + +if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + as_fn_error $? "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir +do + eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" +done + +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi + +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- + +test "$silent" = yes && exec 6>/dev/null + + +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + as_fn_error $? "working directory cannot be determined" +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + as_fn_error $? "pwd does not report name of working directory" + + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done + +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +\`configure' configures graphite2 (TeX Live) 1.3.13 to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root + [DATAROOTDIR/doc/graphite2--tex-live-] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] +_ACEOF + + cat <<\_ACEOF + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names +_ACEOF +fi + +if test -n "$ac_init_help"; then + case $ac_init_help in + short | recursive ) echo "Configuration of graphite2 (TeX Live) 1.3.13:";; + esac + cat <<\_ACEOF + +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build + --enable-compiler-warnings=[no|min|yes|max|all] + Turn on compiler warnings [default: yes if + maintainer-mode, min otherwise] + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CXX C++ compiler command + CXXFLAGS C++ compiler flags + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to . +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +fi + +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +graphite2 (TeX Live) configure 1.3.13 +generated by GNU Autoconf 2.69 + +Copyright (C) 2012 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit +fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_cxx_try_compile LINENO +# ---------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_compile +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by graphite2 (TeX Live) $as_me 1.3.13, which was +generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + $as_echo "## ---------------- ## +## Cache variables. ## +## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + $as_echo "## ----------------- ## +## Output variables. ## +## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + $as_echo "## ------------------- ## +## File substitutions. ## +## ------------------- ##" + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + $as_echo "## ----------- ## +## confdefs.h. ## +## ----------- ##" + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h + +$as_echo "/* confdefs.h */" > confdefs.h + +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site +fi +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } + fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + +ac_aux_dir= +for ac_dir in ../../build-aux "$srcdir"/../../build-aux; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../build-aux \"$srcdir\"/../../build-aux" "$LINENO" 5 +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + + + +am__api_version='1.16' + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$2" = conftest.file + ) +then + # Ok. + : +else + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + +test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# Double any \ or $. +# By default was `s,x,x', remove it if useless. +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` + +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} +fi + +if test x"${install_sh+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi + +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done +IFS=$as_save_IFS + +fi + + test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + MKDIR_P="$ac_install_sh -d" + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AWK" && break +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + SET_MAKE= +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi + +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null + +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' +am__doit: + @echo this is the am__doit target >confinc.out +.PHONY: am__doit +END +am__include="#" +am__quote= +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : + ;; +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; +fi + +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } + +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { { ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else + ac_file='' +fi +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +ac_exeext=$ac_cv_exeext + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +else + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +depcc="$CC" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + + +# Check whether --enable-compiler-warnings was given. +if test "${enable_compiler_warnings+set}" = set; then : + enableval=$enable_compiler_warnings; +fi +case $enable_compiler_warnings in #( + no | min | yes | max | all) : + ;; #( + *) : + if test "x$enable_maintainer_mode" = xyes; then : + enable_compiler_warnings=yes +else + enable_compiler_warnings=min +fi ;; +esac + +##tldbg KPSE_BASIC: Remember graphite2 () as Kpse_Package (for future messages). + +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi + + +# Define the identity of the package. + PACKAGE='graphite2--tex-live-' + VERSION='1.3.13' + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF + +# Some tools Automake needs. + +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + + +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + + +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} + + +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + + + + + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + + MAINT=$MAINTAINER_MODE_TRUE + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 +$as_echo_n "checking whether the compiler accepts prototypes... " >&6; } +if ${kb_cv_c_prototypes+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +extern void foo(int i,...); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kb_cv_c_prototypes=yes +else + kb_cv_c_prototypes=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kb_cv_c_prototypes" >&5 +$as_echo "$kb_cv_c_prototypes" >&6; } +if test "x$kb_cv_c_prototypes" = xno; then + as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 +$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; } +if ${kpse_cv_warning_cflags+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$GCC" = xyes; then + kpse_cv_warning_cflags= +if test "x$enable_compiler_warnings" != xno; then + kpse_cv_warning_cflags="-Wimplicit -Wreturn-type" + case `$CC -dumpversion` in #( + 3.4.* | 4.* | 5.*) : + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #( + *) : + ;; +esac + case `$CC -dumpversion` in #( + 3.[234].* | 4.* | 5.*) : + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #( + *) : + ;; +esac + if test "x$enable_compiler_warnings" != xmin; then + kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags" + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations" + if test "x$enable_compiler_warnings" != xyes; then + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith" + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings" + case `$CC -dumpversion` in #( + 3.4.* | 4.* | 5.*) : + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #( + *) : + ;; +esac + if test "x$enable_compiler_warnings" != xmax; then + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow" + fi + fi + fi +fi +elif test "x$enable_compiler_warnings" = xno; then + kpse_cv_warning_cflags= +else + kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_warning_cflags" >&5 +$as_echo "$kpse_cv_warning_cflags" >&6; } +WARNING_CFLAGS=$kpse_cv_warning_cflags + + + + + + + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } + +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +else + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +depcc="$CC" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +$as_echo "$CXX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CXX" && break + done +fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CXX" && break +done + + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi +fi + + fi +fi +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +if ${ac_cv_cxx_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } +if ${ac_cv_prog_cxx_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +else + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + +else + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +depcc="$CXX" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CXX_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CXX_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CXX_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' +else + am__fastdepCXX_TRUE='#' + am__fastdepCXX_FALSE= +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C++ compiler" >&5 +$as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; } +if ${kpse_cv_warning_cxxflags+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$GXX" = xyes; then + kpse_cv_warning_cxxflags= +kpse_warn_strings="-Wno-write-strings" +if test "x$enable_compiler_warnings" != xno; then + kpse_cv_warning_cxxflags="-Wreturn-type" + case `$CXX -dumpversion` in #( + 3.* | 4.[012345].*) : + kpse_cv_warning_cxxflags="-Wimplicit $kpse_cv_warning_cxxflags" ;; #( + *) : + ;; +esac + case `$CXX -dumpversion` in #( + 3.[234].* | 4.* | 5.*) : + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #( + *) : + ;; +esac + if test "x$enable_compiler_warnings" != xmin; then + kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags" + if test "x$enable_compiler_warnings" != xyes; then + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith" + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align" + kpse_warn_strings="-Wwrite-strings" + if test "x$enable_compiler_warnings" != xmax; then + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow" + fi + fi + fi +fi +kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags $kpse_warn_strings" +elif test "x$enable_compiler_warnings" = xno; then + kpse_cv_warning_cxxflags= +else + kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_warning_cxxflags" >&5 +$as_echo "$kpse_cv_warning_cxxflags" >&6; } +WARNING_CXXFLAGS=$kpse_cv_warning_cxxflags + + + + + ax_cxx_compile_alternatives="11 0x" ax_cxx_compile_cxx11_required=true + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + ac_success=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features by default" >&5 +$as_echo_n "checking whether $CXX supports C++11 features by default... " >&6; } +if ${ax_cv_cxx_compile_cxx11+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +// If the compiler admits that it is not ready for C++11, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201103L + +#error "This is not a C++11 compiler" + +#else + +namespace cxx11 +{ + + namespace test_static_assert + { + + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + } + + namespace test_final_override + { + + struct Base + { + virtual void f() {} + }; + + struct Derived : public Base + { + virtual void f() override {} + }; + + } + + namespace test_double_right_angle_brackets + { + + template < typename T > + struct check {}; + + typedef check single_type; + typedef check> double_type; + typedef check>> triple_type; + typedef check>>> quadruple_type; + + } + + namespace test_decltype + { + + int + f() + { + int a = 1; + decltype(a) b = 2; + return a + b; + } + + } + + namespace test_type_deduction + { + + template < typename T1, typename T2 > + struct is_same + { + static const bool value = false; + }; + + template < typename T > + struct is_same + { + static const bool value = true; + }; + + template < typename T1, typename T2 > + auto + add(T1 a1, T2 a2) -> decltype(a1 + a2) + { + return a1 + a2; + } + + int + test(const int c, volatile int v) + { + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == true, ""); + return (sumf > 0.0) ? sumi : add(c, v); + } + + } + + namespace test_noexcept + { + + int f() { return 0; } + int g() noexcept { return 0; } + + static_assert(noexcept(f()) == false, ""); + static_assert(noexcept(g()) == true, ""); + + } + + namespace test_constexpr + { + + template < typename CharT > + unsigned long constexpr + strlen_c_r(const CharT *const s, const unsigned long acc) noexcept + { + return *s ? strlen_c_r(s + 1, acc + 1) : acc; + } + + template < typename CharT > + unsigned long constexpr + strlen_c(const CharT *const s) noexcept + { + return strlen_c_r(s, 0UL); + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("1") == 1UL, ""); + static_assert(strlen_c("example") == 7UL, ""); + static_assert(strlen_c("another\0example") == 7UL, ""); + + } + + namespace test_rvalue_references + { + + template < int N > + struct answer + { + static constexpr int value = N; + }; + + answer<1> f(int&) { return answer<1>(); } + answer<2> f(const int&) { return answer<2>(); } + answer<3> f(int&&) { return answer<3>(); } + + void + test() + { + int i = 0; + const int c = 0; + static_assert(decltype(f(i))::value == 1, ""); + static_assert(decltype(f(c))::value == 2, ""); + static_assert(decltype(f(0))::value == 3, ""); + } + + } + + namespace test_uniform_initialization + { + + struct test + { + static const int zero {}; + static const int one {1}; + }; + + static_assert(test::zero == 0, ""); + static_assert(test::one == 1, ""); + + } + + namespace test_lambdas + { + + void + test1() + { + auto lambda1 = [](){}; + auto lambda2 = lambda1; + lambda1(); + lambda2(); + } + + int + test2() + { + auto a = [](int i, int j){ return i + j; }(1, 2); + auto b = []() -> int { return '0'; }(); + auto c = [=](){ return a + b; }(); + auto d = [&](){ return c; }(); + auto e = [a, &b](int x) mutable { + const auto identity = [](int y){ return y; }; + for (auto i = 0; i < a; ++i) + a += b--; + return x + identity(a + b); + }(0); + return a + b + c + d + e; + } + + int + test3() + { + const auto nullary = [](){ return 0; }; + const auto unary = [](int x){ return x; }; + using nullary_t = decltype(nullary); + using unary_t = decltype(unary); + const auto higher1st = [](nullary_t f){ return f(); }; + const auto higher2nd = [unary](nullary_t f1){ + return [unary, f1](unary_t f2){ return f2(unary(f1())); }; + }; + return higher1st(nullary) + higher2nd(nullary)(unary); + } + + } + + namespace test_variadic_templates + { + + template + struct sum; + + template + struct sum + { + static constexpr auto value = N0 + sum::value; + }; + + template <> + struct sum<> + { + static constexpr auto value = 0; + }; + + static_assert(sum<>::value == 0, ""); + static_assert(sum<1>::value == 1, ""); + static_assert(sum<23>::value == 23, ""); + static_assert(sum<1, 2>::value == 3, ""); + static_assert(sum<5, 5, 11>::value == 21, ""); + static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); + + } + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function + // because of this. + namespace test_template_alias_sfinae + { + + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { func(0); } + + } + +} // namespace cxx11 + +#endif // __cplusplus >= 201103L + + + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ax_cv_cxx_compile_cxx11=yes +else + ax_cv_cxx_compile_cxx11=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx11" >&5 +$as_echo "$ax_cv_cxx_compile_cxx11" >&6; } + if test x$ax_cv_cxx_compile_cxx11 = xyes; then + ac_success=yes + fi + + if test x$ac_success = xno; then + for alternative in ${ax_cxx_compile_alternatives}; do + switch="-std=gnu++${alternative}" + cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5 +$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; } +if eval \${$cachevar+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_CXX="$CXX" + CXX="$CXX $switch" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +// If the compiler admits that it is not ready for C++11, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201103L + +#error "This is not a C++11 compiler" + +#else + +namespace cxx11 +{ + + namespace test_static_assert + { + + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + } + + namespace test_final_override + { + + struct Base + { + virtual void f() {} + }; + + struct Derived : public Base + { + virtual void f() override {} + }; + + } + + namespace test_double_right_angle_brackets + { + + template < typename T > + struct check {}; + + typedef check single_type; + typedef check> double_type; + typedef check>> triple_type; + typedef check>>> quadruple_type; + + } + + namespace test_decltype + { + + int + f() + { + int a = 1; + decltype(a) b = 2; + return a + b; + } + + } + + namespace test_type_deduction + { + + template < typename T1, typename T2 > + struct is_same + { + static const bool value = false; + }; + + template < typename T > + struct is_same + { + static const bool value = true; + }; + + template < typename T1, typename T2 > + auto + add(T1 a1, T2 a2) -> decltype(a1 + a2) + { + return a1 + a2; + } + + int + test(const int c, volatile int v) + { + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == true, ""); + return (sumf > 0.0) ? sumi : add(c, v); + } + + } + + namespace test_noexcept + { + + int f() { return 0; } + int g() noexcept { return 0; } + + static_assert(noexcept(f()) == false, ""); + static_assert(noexcept(g()) == true, ""); + + } + + namespace test_constexpr + { + + template < typename CharT > + unsigned long constexpr + strlen_c_r(const CharT *const s, const unsigned long acc) noexcept + { + return *s ? strlen_c_r(s + 1, acc + 1) : acc; + } + + template < typename CharT > + unsigned long constexpr + strlen_c(const CharT *const s) noexcept + { + return strlen_c_r(s, 0UL); + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("1") == 1UL, ""); + static_assert(strlen_c("example") == 7UL, ""); + static_assert(strlen_c("another\0example") == 7UL, ""); + + } + + namespace test_rvalue_references + { + + template < int N > + struct answer + { + static constexpr int value = N; + }; + + answer<1> f(int&) { return answer<1>(); } + answer<2> f(const int&) { return answer<2>(); } + answer<3> f(int&&) { return answer<3>(); } + + void + test() + { + int i = 0; + const int c = 0; + static_assert(decltype(f(i))::value == 1, ""); + static_assert(decltype(f(c))::value == 2, ""); + static_assert(decltype(f(0))::value == 3, ""); + } + + } + + namespace test_uniform_initialization + { + + struct test + { + static const int zero {}; + static const int one {1}; + }; + + static_assert(test::zero == 0, ""); + static_assert(test::one == 1, ""); + + } + + namespace test_lambdas + { + + void + test1() + { + auto lambda1 = [](){}; + auto lambda2 = lambda1; + lambda1(); + lambda2(); + } + + int + test2() + { + auto a = [](int i, int j){ return i + j; }(1, 2); + auto b = []() -> int { return '0'; }(); + auto c = [=](){ return a + b; }(); + auto d = [&](){ return c; }(); + auto e = [a, &b](int x) mutable { + const auto identity = [](int y){ return y; }; + for (auto i = 0; i < a; ++i) + a += b--; + return x + identity(a + b); + }(0); + return a + b + c + d + e; + } + + int + test3() + { + const auto nullary = [](){ return 0; }; + const auto unary = [](int x){ return x; }; + using nullary_t = decltype(nullary); + using unary_t = decltype(unary); + const auto higher1st = [](nullary_t f){ return f(); }; + const auto higher2nd = [unary](nullary_t f1){ + return [unary, f1](unary_t f2){ return f2(unary(f1())); }; + }; + return higher1st(nullary) + higher2nd(nullary)(unary); + } + + } + + namespace test_variadic_templates + { + + template + struct sum; + + template + struct sum + { + static constexpr auto value = N0 + sum::value; + }; + + template <> + struct sum<> + { + static constexpr auto value = 0; + }; + + static_assert(sum<>::value == 0, ""); + static_assert(sum<1>::value == 1, ""); + static_assert(sum<23>::value == 23, ""); + static_assert(sum<1, 2>::value == 3, ""); + static_assert(sum<5, 5, 11>::value == 21, ""); + static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); + + } + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function + // because of this. + namespace test_template_alias_sfinae + { + + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { func(0); } + + } + +} // namespace cxx11 + +#endif // __cplusplus >= 201103L + + + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + eval $cachevar=yes +else + eval $cachevar=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CXX="$ac_save_CXX" +fi +eval ac_res=\$$cachevar + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + fi + + if test x$ac_success = xno; then + for alternative in ${ax_cxx_compile_alternatives}; do + for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do + cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5 +$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; } +if eval \${$cachevar+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_CXX="$CXX" + CXX="$CXX $switch" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +// If the compiler admits that it is not ready for C++11, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201103L + +#error "This is not a C++11 compiler" + +#else + +namespace cxx11 +{ + + namespace test_static_assert + { + + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + } + + namespace test_final_override + { + + struct Base + { + virtual void f() {} + }; + + struct Derived : public Base + { + virtual void f() override {} + }; + + } + + namespace test_double_right_angle_brackets + { + + template < typename T > + struct check {}; + + typedef check single_type; + typedef check> double_type; + typedef check>> triple_type; + typedef check>>> quadruple_type; + + } + + namespace test_decltype + { + + int + f() + { + int a = 1; + decltype(a) b = 2; + return a + b; + } + + } + + namespace test_type_deduction + { + + template < typename T1, typename T2 > + struct is_same + { + static const bool value = false; + }; + + template < typename T > + struct is_same + { + static const bool value = true; + }; + + template < typename T1, typename T2 > + auto + add(T1 a1, T2 a2) -> decltype(a1 + a2) + { + return a1 + a2; + } + + int + test(const int c, volatile int v) + { + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == true, ""); + return (sumf > 0.0) ? sumi : add(c, v); + } + + } + + namespace test_noexcept + { + + int f() { return 0; } + int g() noexcept { return 0; } + + static_assert(noexcept(f()) == false, ""); + static_assert(noexcept(g()) == true, ""); + + } + + namespace test_constexpr + { + + template < typename CharT > + unsigned long constexpr + strlen_c_r(const CharT *const s, const unsigned long acc) noexcept + { + return *s ? strlen_c_r(s + 1, acc + 1) : acc; + } + + template < typename CharT > + unsigned long constexpr + strlen_c(const CharT *const s) noexcept + { + return strlen_c_r(s, 0UL); + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("1") == 1UL, ""); + static_assert(strlen_c("example") == 7UL, ""); + static_assert(strlen_c("another\0example") == 7UL, ""); + + } + + namespace test_rvalue_references + { + + template < int N > + struct answer + { + static constexpr int value = N; + }; + + answer<1> f(int&) { return answer<1>(); } + answer<2> f(const int&) { return answer<2>(); } + answer<3> f(int&&) { return answer<3>(); } + + void + test() + { + int i = 0; + const int c = 0; + static_assert(decltype(f(i))::value == 1, ""); + static_assert(decltype(f(c))::value == 2, ""); + static_assert(decltype(f(0))::value == 3, ""); + } + + } + + namespace test_uniform_initialization + { + + struct test + { + static const int zero {}; + static const int one {1}; + }; + + static_assert(test::zero == 0, ""); + static_assert(test::one == 1, ""); + + } + + namespace test_lambdas + { + + void + test1() + { + auto lambda1 = [](){}; + auto lambda2 = lambda1; + lambda1(); + lambda2(); + } + + int + test2() + { + auto a = [](int i, int j){ return i + j; }(1, 2); + auto b = []() -> int { return '0'; }(); + auto c = [=](){ return a + b; }(); + auto d = [&](){ return c; }(); + auto e = [a, &b](int x) mutable { + const auto identity = [](int y){ return y; }; + for (auto i = 0; i < a; ++i) + a += b--; + return x + identity(a + b); + }(0); + return a + b + c + d + e; + } + + int + test3() + { + const auto nullary = [](){ return 0; }; + const auto unary = [](int x){ return x; }; + using nullary_t = decltype(nullary); + using unary_t = decltype(unary); + const auto higher1st = [](nullary_t f){ return f(); }; + const auto higher2nd = [unary](nullary_t f1){ + return [unary, f1](unary_t f2){ return f2(unary(f1())); }; + }; + return higher1st(nullary) + higher2nd(nullary)(unary); + } + + } + + namespace test_variadic_templates + { + + template + struct sum; + + template + struct sum + { + static constexpr auto value = N0 + sum::value; + }; + + template <> + struct sum<> + { + static constexpr auto value = 0; + }; + + static_assert(sum<>::value == 0, ""); + static_assert(sum<1>::value == 1, ""); + static_assert(sum<23>::value == 23, ""); + static_assert(sum<1, 2>::value == 3, ""); + static_assert(sum<5, 5, 11>::value == 21, ""); + static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); + + } + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function + // because of this. + namespace test_template_alias_sfinae + { + + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { func(0); } + + } + +} // namespace cxx11 + +#endif // __cplusplus >= 201103L + + + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + eval $cachevar=yes +else + eval $cachevar=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CXX="$ac_save_CXX" +fi +eval ac_res=\$$cachevar + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + if test x$ac_success = xyes; then + break + fi + done + fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + if test x$ax_cxx_compile_cxx11_required = xtrue; then + if test x$ac_success = xno; then + as_fn_error $? "*** A compiler with support for C++11 language features is required." "$LINENO" 5 + fi + fi + if test x$ac_success = xno; then + HAVE_CXX11=0 + { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5 +$as_echo "$as_me: No compiler with C++11 support was found" >&6;} + else + HAVE_CXX11=1 + +$as_echo "#define HAVE_CXX11 1" >>confdefs.h + + fi + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi +else + RANLIB="$ac_cv_prog_RANLIB" +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } +fi + + +ac_config_headers="$ac_config_headers config.h" + + + if test "x$enable_build" != xno; then + build_TRUE= + build_FALSE='#' +else + build_TRUE='#' + build_FALSE= +fi + + + if test "x$GCC" = xyes; then + DIRECT_TYPE_TRUE= + DIRECT_TYPE_FALSE='#' +else + DIRECT_TYPE_TRUE='#' + DIRECT_TYPE_FALSE= +fi + + +enable_fileface=yes + if test "x$enable_fileface" != xno; then + WITH_FILEFACE_TRUE= + WITH_FILEFACE_FALSE='#' +else + WITH_FILEFACE_TRUE='#' + WITH_FILEFACE_FALSE= +fi + +if test "x$enable_fileface" = no; then + +$as_echo "#define GRAPHITE2_NFILEFACE 1" >>confdefs.h + +fi + +enable_tracing=no + if test "x$enable_tracing" != xno; then + WITH_TRACING_TRUE= + WITH_TRACING_FALSE='#' +else + WITH_TRACING_TRUE='#' + WITH_TRACING_FALSE= +fi + +if test "x$enable_tracing" = no; then + +$as_echo "#define GRAPHITE2_NTRACING 1" >>confdefs.h + +fi + +GRAPHITE2_TREE=graphite2-src + + +ac_config_files="$ac_config_files Makefile include/graphite2/Makefile" + + +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi +fi +rm -f confcache + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +DEFS=-DHAVE_CONFIG_H + +ac_libobjs= +ac_ltlibobjs= +U= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +else + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +fi + +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${build_TRUE}" && test -z "${build_FALSE}"; then + as_fn_error $? "conditional \"build\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DIRECT_TYPE_TRUE}" && test -z "${DIRECT_TYPE_FALSE}"; then + as_fn_error $? "conditional \"DIRECT_TYPE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${WITH_FILEFACE_TRUE}" && test -z "${WITH_FILEFACE_FALSE}"; then + as_fn_error $? "conditional \"WITH_FILEFACE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${WITH_TRACING_TRUE}" && test -z "${WITH_TRACING_FALSE}"; then + as_fn_error $? "conditional \"WITH_TRACING\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi + +: "${CONFIG_STATUS=./config.status}" +ac_write_fail=0 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. + +debug=false +ac_cs_recheck=false +ac_cs_silent=false + +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by graphite2 (TeX Live) $as_me 1.3.13, which was +generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + +_ACEOF + +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# Files that config.status was made for. +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +ac_cs_usage="\ +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. + +Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Configuration commands: +$config_commands + +Report bugs to ." + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_version="\\ +graphite2 (TeX Live) config.status 1.3.13 +configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +Copyright (C) 2012 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac + shift +done + +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +if \$ac_cs_recheck; then + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + $as_echo "$ac_log" +} >&5 + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# +# INIT-COMMANDS +# +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "include/graphite2/Makefile") CONFIG_FILES="$CONFIG_FILES include/graphite2/Makefile" ;; + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +done + + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= ac_tmp= + trap 'exit_status=$? + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status +' 0 + trap 'as_fn_exit 1' 1 2 13 15 +} +# Create a (secure) tmp directory for tmp files. + +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp + +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then + + +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +_ACEOF + + +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +_ACEOF + +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// +s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" + +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$ac_tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + + +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac + + case $ac_tag in + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= +ac_sed_dataroot=' +/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t +$ac_datarootdir_hack +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$ac_tmp/stdin" + case $ac_file in + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # + # CONFIG_HEADER + # + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 + fi +# Compute "$ac_file"'s index in $config_headers. +_am_arg="$ac_file" +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; + + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac + + + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac + shift + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf + do + # Strip MF so we end up with the name of the file. + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$am_mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? + done + if test $am_rc -ne 0; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk +} + ;; + + esac +done # for ac_tag + + +as_fn_exit 0 +_ACEOF +ac_clean_files=$ac_clean_files_save + +test $ac_write_fail = 0 || + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || as_fn_exit 1 +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi + diff --git a/source/libs/graphite2/configure.ac b/source/libs/graphite2/configure.ac new file mode 100644 index 000000000..7ac789728 --- /dev/null +++ b/source/libs/graphite2/configure.ac @@ -0,0 +1,49 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl Copyright (C) 2012, 2013 Peter Breitenlohner +dnl +dnl This file is free software; the copyright holder +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +m4_include([version.ac])[] dnl define graphite2_version +AC_INIT([graphite2 (TeX Live)], graphite2_version, [tex-k@tug.org]) +AC_PREREQ([2.65]) +AC_CONFIG_SRCDIR([graphite2-src/graphite2.pc.in]) +AC_CONFIG_AUX_DIR([../../build-aux]) +AC_CONFIG_MACRO_DIR([../../m4]) + +KPSE_BASIC([graphite2]) + +dnl ! C++11 required since graphite2 1.3.12 ! +AC_PROG_CC +AC_PROG_CXX +AX_CXX_COMPILE_STDCXX([11]) +AC_PROG_RANLIB +AC_PROG_LN_S + +AC_CONFIG_HEADERS([config.h]) + +AM_CONDITIONAL([build], [test "x$enable_build" != xno]) + +AM_CONDITIONAL([DIRECT_TYPE], [test "x$GCC" = xyes]) + +enable_fileface=yes +AM_CONDITIONAL([WITH_FILEFACE], [test "x$enable_fileface" != xno]) +if test "x$enable_fileface" = no; then + AC_DEFINE([GRAPHITE2_NFILEFACE], 1, + [Define to 1 to disable fileface support.]) +fi + +enable_tracing=no +AM_CONDITIONAL([WITH_TRACING], [test "x$enable_tracing" != xno]) +if test "x$enable_tracing" = no; then + AC_DEFINE([GRAPHITE2_NTRACING], 1, + [Define to 1 to disable tracing support.]) +fi + +AC_SUBST([GRAPHITE2_TREE], [graphite2-src]) + +AC_CONFIG_FILES([Makefile include/graphite2/Makefile]) + +AC_OUTPUT diff --git a/source/libs/graphite2/gr2test.c b/source/libs/graphite2/gr2test.c new file mode 100644 index 000000000..06d2237ab --- /dev/null +++ b/source/libs/graphite2/gr2test.c @@ -0,0 +1,22 @@ +/* gr2test.c: Basic test for libgraphite2 + * + * Copyright (C) 2013 Peter Breitenlohner + * You may freely use, modify and/or distribute this file. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif +#include +#include + +int main (int argc, char **argv) +{ + int nMajor, nMinor, nBugFix; + + gr_engine_version(&nMajor, &nMinor, &nBugFix); + printf ("%s: Compiled with Graphite2 version %d.%d.%d; using %d.%d.%d\n", + argv[0], GR2_VERSION_MAJOR, GR2_VERSION_MINOR, GR2_VERSION_BUGFIX, + nMajor, nMinor, nBugFix); + return 0; +} diff --git a/source/libs/graphite2/graphite2-src/CMakeLists.txt b/source/libs/graphite2/graphite2-src/CMakeLists.txt new file mode 100644 index 000000000..496712d54 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/CMakeLists.txt @@ -0,0 +1,97 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR) +cmake_policy(SET CMP0012 NEW) +include(TestBigEndian) +find_package(PythonInterp 3.6) +project(graphite2) +set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}) +if (NOT CMAKE_BUILD_TYPE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY VALUE Release) +endif() + +option(BUILD_SHARED_LIBS "Make library a shared library instead of static" ON) + +enable_language(CXX C) +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED 11) + +include_directories(${PROJECT_SOURCE_DIR}/include) + +enable_testing() + +set(GRAPHITE2_VM_TYPE auto CACHE STRING "Choose the type of vm machine: Auto, Direct or Call.") +option(GRAPHITE2_NFILEFACE "Compile out the gr_make_file_face* APIs") +option(GRAPHITE2_NTRACING "Compile out log segment tracing capability" ON) +option(GRAPHITE2_TELEMETRY "Add memory usage telemetry") +set(GRAPHITE2_SANITIZERS "" CACHE STRING "Set compiler sanitizers passed to -fsanitize") +set(GRAPHITE2_FUZZING_ENGINE libFuzzer.a CACHE STRING "Fuzzing engine to link against for the fuzzers") + +message(STATUS "Build: " ${CMAKE_BUILD_TYPE}) +string(REPLACE "ON" "shared" _LIB_OBJECT_TYPE ${BUILD_SHARED_LIBS}) +string(REPLACE "OFF" "static" _LIB_OBJECT_TYPE ${_LIB_OBJECT_TYPE}) +string(REPLACE "ON" "disabled" _FILEFACE_SUPPORT ${GRAPHITE2_NFILEFACE}) +string(REPLACE "OFF" "enabled" _FILEFACE_SUPPORT ${_FILEFACE_SUPPORT}) +string(REPLACE "ON" "disabled" _TRACING_SUPPORT ${GRAPHITE2_NTRACING}) +string(REPLACE "OFF" "enabled" _TRACING_SUPPORT ${_TRACING_SUPPORT}) +message(STATUS "Building library: " ${_LIB_OBJECT_TYPE}) +message(STATUS "File Face support: " ${_FILEFACE_SUPPORT}) +message(STATUS "Tracing support: " ${_TRACING_SUPPORT}) + +if (GRAPHITE2_SANITIZERS) + string(STRIP ${GRAPHITE2_SANITIZERS} GRAPHITE2_SANITIZERS) + add_compile_options(-fsanitize=${GRAPHITE2_SANITIZERS} -fno-omit-frame-pointer -g -O1) + message(STATUS "Sanitizer support: " ${GRAPHITE2_SANITIZERS}) + string(REGEX REPLACE "(,?fuzzer|fuzzer,?)" "" SANITIZERS_LINK ${GRAPHITE2_SANITIZERS}) + if (GRAPHITE2_SANITIZERS MATCHES "fuzzer") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize-coverage=trace-pc-guard") + endif () + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${SANITIZERS_LINK}") +endif () + +string(TOLOWER ${GRAPHITE2_VM_TYPE} GRAPHITE2_VM_TYPE) +if (NOT GRAPHITE2_VM_TYPE MATCHES "auto|direct|call") + message(SEND_ERROR "unrecognised vm machine type: ${GRAPHITE2_VM_TYPE}. Only Auto, Direct or Call are available") +endif() +if (GRAPHITE2_VM_TYPE STREQUAL "auto") + if (CMAKE_BUILD_TYPE MATCHES "[Rr]el(ease|[Ww]ith[Dd]eb[Ii]nfo)") + set(GRAPHITE2_VM_TYPE "direct") + else(CMAKE_BUILD_TYPE MATCHES "[Rr]el(ease|[Ww]ith[Dd]eb[Ii]nfo)") + set(GRAPHITE2_VM_TYPE "call") + endif() +endif() +if (GRAPHITE2_VM_TYPE STREQUAL "direct" AND NOT (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")) + message(WARNING "vm machine type direct can only be built using GCC") + set(GRAPHITE2_VM_TYPE "call") +endif() +message(STATUS "Using vm machine type: ${GRAPHITE2_VM_TYPE}") + +if (BUILD_SHARED_LIBS) + if (PYTHONINTERP_FOUND) + EXEC_PROGRAM(${PYTHON_EXECUTABLE} + ARGS -c \"import ctypes\; print(ctypes.sizeof(ctypes.c_void_p)) \" + OUTPUT_VARIABLE PYTHON_SIZEOF_VOID_P) + if (NOT (PYTHON_VERSION_MAJOR GREATER 2 AND PYTHON_VERSION_MINOR GREATER 5)) + message(WARNING "Python version 3.6 or greater required. Disabling some tests.") + elseif ((PYTHON_SIZEOF_VOID_P STREQUAL CMAKE_SIZEOF_VOID_P) AND (NOT GRAPHITE2_NFILEFACE) AND ((NOT GRAPHITE2_SANITIZERS MATCHES "address") OR CMAKE_COMPILER_IS_GNUCXX)) + set(PYTHON_CTYPES_COMPATBILE TRUE) + else () + if ((NOT GRAPHITE2_SANITIZERS MATCHES "address") OR CMAKE_COMPILER_IS_GNUCXX) + message(WARNING "Python ctypes is incompatible with built DLL. Disabling some tests.") + endif () + endif () + endif() +endif() + +add_subdirectory(src) +add_subdirectory(tests) +add_subdirectory(doc) +if (NOT GRAPHITE2_NFILEFACE) + add_subdirectory(gr2fonttest) +endif() + +set(version 3.0.1) +set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) +set(includedir ${CMAKE_INSTALL_PREFIX}/include) + +configure_file(graphite2.pc.in graphite2.pc) + +install(FILES ${PROJECT_BINARY_DIR}/graphite2.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) diff --git a/source/libs/graphite2/graphite2-src/COPYING b/source/libs/graphite2/graphite2-src/COPYING new file mode 100644 index 000000000..f6630af53 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/COPYING @@ -0,0 +1,26 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + + Alternatively, you may use this library under the terms of the Mozilla + Public License (http://mozilla.org/MPL) or under the GNU General Public + License, as published by the Free Sofware Foundation; either version + 2 of the license or (at your option) any later version. +*/ diff --git a/source/libs/graphite2/graphite2-src/ChangeLog b/source/libs/graphite2/graphite2-src/ChangeLog new file mode 100644 index 000000000..ac8b23aa1 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/ChangeLog @@ -0,0 +1,232 @@ +1.3.13 + . Resolve minor spacing issue in rtl non-overlap kerning + . python3 for graphite.py + . Better fuzzing + . Better building on windows + +1.3.12 + . Graphite no longer does dumb rendering for fonts with no smarts + . Segment caching code removed. Anything attempting to use the segment cache gets given a regular face instead + . Add libfuzzer support + . Builds now require C++11 + . Improvements to Windows 64 bit builds + . Support different versions of python including 32 bit and python 3 + . Various minor bug fixes + +1.3.11 + . Fixes due to security review + . Minor collision avoidance fixes + . Fix LZ4 decompressor against high compression + +1.3.10 + . Address floating point build parameters to give consistent positioning results across platforms + . Various bug fixes + +1.3.9 + . Add Collision COLL_ISSPACE to allow for visible spaces in collision avoidance + . Add segment and pass direction information to tracing output + . Bug fix rule length testing in 32-bit + . Increase slanted margin distances for collision avoidance + . Change kerning algorithm to simple outline expansion. Seems to make no visible difference. + . Add trace2svg to test tools + +1.3.8 + . Various bug fixes arising from fuzzing + . Fix regression that stopped piglatin from working + . Make collision avoidance kerning give more regular results + . Minor modification to clustering algorithm to handle variable width chars + +1.3.7 + . Bug fixes + . Start to deprecate SegCache. This will be going away in a later release. + +1.3.6 + . Bug fixes + +1.3.5 + . Bug fixes + . Security bug fix + . Fix ARM misalignment problem + . Track latest cmake + +1.3.4 + . Transition from Mercurial to Git + . Bug fixes + . Fix Collision Kerning ignoring some diacritics + . Handle pass bits 16-31 to speed up fonts with > 16 passes + . Various minor fuzz bug fixes + . Make Coverity happy + . Add GR_FALLTHROUGH macro for clang c++11 + +1.3.3 + . Slight speed up in Collision Avoidance + . Remove dead bidi code + . Bug fixes + . Between pass bidi reorderings and at the end + . Decompressor fuzz bugs + . Other fuzz bugs + +1.3.2 + . Remove full bidi. All segments are assumed to be single directioned. + . Bug fixes: + . Decompressor corner cases + . Various fuzz bugs + +1.3.1 + . Deprecation warning: Full bidi support is about to be deprecated. Make contact + if this impacts you. + . Change compression block format slightly to conform to LZ4 + . Bug fixes: + . Handle mono direction text with diacritics consistently. Fonts + now see the direction they expect consistently and bidi now + gives expected results. + . Fixed lots of fuzz bugs + . Coverity cleanups + . Build now works for clang and/or asan and/or afl etc. + +1.3.0 + . Add collision avoidance + . Shift Collider + . Kern Collider + . Octabox outlines and subboxes + . Add compressed Silf and Glat table support + . Bug fixes: + . Stop loops forming in the child, sibling tree + . Handle bidi mirroring correctly if no bidi occurring + +1.2.4 + . Face failure now has error code reporting via debug logging + . can now call gr_start_logging(NULL, fname) + . gr2fonttest --alltrace added + . Format 14 table support + . Not done. To be handled entirely in the compiler + . Bidi support for Unicode 6.3 Isolating direction controls + . Fonts no longer require a glyf/loca table. In such cases the bounding box is always 0. + . Clang ASAN build support added for testing. + . Handle out of memory sanely. + . Documentation improvements + . Bug fixes: + . Enforce fonts having to store glyph attributes by monotonically increasing attribute number + . zeropadding was not getting called on feature tags + . automatic associations for unassociated characters + . use direct engine on Mac + . various extreme case reading 1 past the end errors fixed + . remove tabs from sources so that it becomes readable again + +1.2.3 + . Bug fixes only: + . fix byte swapping when testing cmap subtable lengths + . work around armel compilation problems with conditional operators + . fix pseudoglyph support for advance and bbox + +1.2.2 + . Add support for passKeySlot (makes Charis 2x faster) up to 32 passes + . Add telemetry output to json if enabled in build GRAPHITE2_TELEMETRY + . Shrink font memory footprint particularly in the fsm + . Add -S to comparerenderer + . Bug fixes: + . Fix shift.x being reversed for rtl text + . Fix faulty fallback justification + . Fix bad cmap handling + . Support compiling on old Solaris where bidi attributes clash with register names + . Follow the crowd in using Windows.h + +1.2.1 + . Bug fixes: + . Allow glyph reattachment + . Allow signed glyph attributes + . Various build problems with MacOS, old gcc versions, etc. + . Various overrun read errors fixed + +1.2.0 + . API Changes: + . Added Windows friendly gr_start_logging and gr_stop_logging, now per face + . Added gr_make_face_with_ops, gr_make_face_with_seg_cache_and_ops + . Added gr_make_font_with_ops + . Added gr_face_is_char_supported + . Added gr_face_info to give info to apps about face capabilities + . Deprecated gr_make_face, gr_make_face_with_seg_cache, gr_make_font_with_advance_fn + . Deprecated graphite_start_logging and graphite_stop_logging + . These functions are stubbed now and do nothing, but do compile and link. + . Bump API version to 3 + . Add C# wrapper to contrib + . Handle justification information in a font and do something useful with it + . Builds clang clean (has done for a while) + . Bug fixes + . Windows build and bug fixes + . Add extra information to json debug output + . Added windows build documentation + . Added freetype sample code and test + +1.1.3 + . Default build has GRAPHITE2_COMPARE_RENDERER to OFF to reduce dependencies + . Builds on Mac with clang + . Debug output improvements + . Tidy up perl wrappers + . Fuzz tester improvements + . Various bug fixes for bad font handling + +1.1.2 + . Support feature ids < 4 chars when space padded for inclusion in FF 14. + . More fuzztesting and removal of causes of valgrind bad reads and sigabrts + . Remove contrib/android into its own repo (http://hg.palaso.org/grandroid) + . Update comparerenderer to latest harfbuzzng api + +1.1.1 + . Missing Log.h included + . perl wrappers updated + +1.1.0 + . Refactored debug output to use json + . Renamed VM_MACHINE_TYPE to GRAPHITE2_VM_TYPE + . Renamed DISABLE_SEGCACHE to GRAPHITE2_NSEGCACE + . Renamed DISBALE_FILE_FACE to GRAPHITE2_NFILEFACE + . Renamed ENABLE_COMPARE_RENDERER to GRAPHTIE2_COMPARE_RENDERER + . Renamed DOXYGEN_CONFIG to GRAPHITE2_DOXYGEN_CONFIG + . Renamed GR2_CUSTOM_HEADER to GRAPHITE2_CUSTOM_HEADER + . Renamed GR2_EXPORTING to GRAPHITE2_EXPORTING + . Added GRAPHITE2_STATIC for static only builds + . Added GRAPHITE2_NTRACING to compile out tracing code + . Documented GRAPHITE2_{EXPORTING,STATIC,NTRACING} in hacking.txt + . Bump libtool version to 2.1.0 + . dumb font rendering works + . slot user attributes are now signed rather than unsigned + . add support for long class maps + . Rename perl library to avoid nameclash on Windows + . Various robustness fixes + . Moved internal .h files into src/inc + . Parallelise fuzztest + . General build improvements, particularly on Windows + +1.0.3 + . Fix UTF16 surrogate support + . script and lang tags may be space padded or null padded + . Remove need for WORDS_BIGENDIAN, do it all automatically + . Remove all #include . Use CLASS_NEW_DELETE instead. + . Fix comparerenderer to work with current hbng + . Add valgrind to fuzztest to ensure good memory use at all times + . Fix new fuzztest exposed bugs. + . Fix bugs exposed by Mozilla security review + . Add continuous integration build on Windows support + +1.0.2 + . Fix Windows build + . Comparerenderer uses hbng enforcing ot rendering + . Add Bidi .hasChar support and refactor mirroring code + . Make cmake default Release rather than debug + . Don't compile in a boat load of TtfUtil that isn't used, saving 15% of binary + . Chase the FSF around its latest office moves + . WORDS_BIGENDIAN is set at the top so tests now pass on ppc, etc. + . More words in the manual + +1.0.1 + . Release is the default build in cmake now. + . Refactor cmake build to not rebuild things so much. + . Include a missing file + . Remove -nostdlibs, making gcc happy everywhere + . Update comparerenderer to latest hbng interface + . Add changelog + +1.0.0 + . First major release of perfect code! + diff --git a/source/libs/graphite2/graphite2-src/Graphite.cmake b/source/libs/graphite2/graphite2-src/Graphite.cmake new file mode 100644 index 000000000..1782c98d6 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/Graphite.cmake @@ -0,0 +1,115 @@ +include(GetPrerequisites) + +function(nolib_test LIBNAME OBJECTFILE) + string(REGEX REPLACE "[][^$.*+?|()-]" "\\\\\\0" LIBNAME_REGEX ${LIBNAME}) + if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + add_test(NAME nolib-${LIBNAME}-${PROJECT_NAME} + COMMAND otool -L ${OBJECTFILE}) + set_tests_properties(nolib-${LIBNAME}-${PROJECT_NAME} PROPERTIES + FAIL_REGULAR_EXPRESSION "${CMAKE_SHARED_LIBRARY_PREFIX}${LIBNAME_REGEX}[.0-9]+${CMAKE_SHARED_LIBRARY_SUFFIX}") + else (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + add_test(NAME nolib-${LIBNAME}-${PROJECT_NAME} + COMMAND readelf --dynamic ${OBJECTFILE}) + set_tests_properties(nolib-${LIBNAME}-${PROJECT_NAME} PROPERTIES + FAIL_REGULAR_EXPRESSION "0x[0-9a-f]+ \\(NEEDED\\)[ \\t]+Shared library: \\[${CMAKE_SHARED_LIBRARY_PREFIX}${LIBNAME_REGEX}${CMAKE_SHARED_LIBRARY_SUFFIX}.*\\]") + endif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") +endfunction(nolib_test) + + +MACRO(GET_TARGET_PROPERTY_WITH_DEFAULT _variable _target _property _default_value) + GET_TARGET_PROPERTY (${_variable} ${_target} ${_property}) + IF (${_variable} MATCHES NOTFOUND) + SET (${_variable} ${_default_value}) + ENDIF (${_variable} MATCHES NOTFOUND) +ENDMACRO (GET_TARGET_PROPERTY_WITH_DEFAULT) + + +FUNCTION(CREATE_LIBTOOL_FILE _target _install_DIR) + GET_TARGET_PROPERTY_WITH_DEFAULT(_target_static_lib ${_target} STATIC_LIB "") + GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dependency_libs ${_target} LT_DEPENDENCY_LIBS "") + GET_TARGET_PROPERTY_WITH_DEFAULT(_target_current ${_target} LT_VERSION_CURRENT 0) + GET_TARGET_PROPERTY_WITH_DEFAULT(_target_age ${_target} LT_VERSION_AGE 0) + GET_TARGET_PROPERTY_WITH_DEFAULT(_target_revision ${_target} LT_VERSION_REVISION 0) + GET_TARGET_PROPERTY_WITH_DEFAULT(_target_installed ${_target} LT_INSTALLED yes) + GET_TARGET_PROPERTY_WITH_DEFAULT(_target_shouldnotlink ${_target} LT_SHOULDNOTLINK no) + GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlopen ${_target} LT_DLOPEN "") + GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlpreopen ${_target} LT_DLPREOPEN "") + + SET(_lanamewe ${CMAKE_SHARED_LIBRARY_PREFIX}${_target}) + SET(_soname ${_lanamewe}${CMAKE_SHARED_LIBRARY_SUFFIX}) + SET(_soext ${CMAKE_SHARED_LIBRARY_SUFFIX}) + SET(_laname ${PROJECT_BINARY_DIR}/${_lanamewe}.la) + FILE(WRITE ${_laname} "# ${_lanamewe}.la - a libtool library file\n") + FILE(APPEND ${_laname} "# Generated by CMake ${CMAKE_VERSION} (like GNU libtool)\n") + FILE(APPEND ${_laname} "\n# Please DO NOT delete this file!\n# It is necessary for linking the library with libtool.\n\n" ) + FILE(APPEND ${_laname} "# The name that we can dlopen(3).\n") + FILE(APPEND ${_laname} "dlname='${_soname}'\n\n") + FILE(APPEND ${_laname} "# Names of this library.\n") + if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + FILE(APPEND ${_laname} "library_names='${_lanamewe}.${_target_current}.${_target_revision}.${_target_age}${_soext} ${_lanamewe}.${_target_current}${_soext} ${_soname}'\n\n") + else (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + FILE(APPEND ${_laname} "library_names='${_soname}.${_target_current}.${_target_revision}.${_target_age} ${_soname}.${_target_current} ${_soname}'\n\n") + endif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + FILE(APPEND ${_laname} "# The name of the static archive.\n") + FILE(APPEND ${_laname} "old_library='${_target_static_lib}'\n\n") + FILE(APPEND ${_laname} "# Libraries that this one depends upon.\n") + FILE(APPEND ${_laname} "dependency_libs='${_target_dependency_libs}'\n\n") + FILE(APPEND ${_laname} "# Names of additional weak libraries provided by this library\n") + FILE(APPEND ${_laname} "weak_library_names=\n\n") + FILE(APPEND ${_laname} "# Version information for ${_lanamewe}.\n") + FILE(APPEND ${_laname} "current=${_target_current}\n") + FILE(APPEND ${_laname} "age=${_target_age}\n") + FILE(APPEND ${_laname} "revision=${_target_revision}\n\n") + FILE(APPEND ${_laname} "# Is this an already installed library?\n") + FILE(APPEND ${_laname} "installed=${_target_installed}\n\n") + FILE(APPEND ${_laname} "# Should we warn about portability when linking against -modules?\n") + FILE(APPEND ${_laname} "shouldnotlink=${_target_shouldnotlink}\n\n") + FILE(APPEND ${_laname} "# Files to dlopen/dlpreopen\n") + FILE(APPEND ${_laname} "dlopen='${_target_dlopen}'\n") + FILE(APPEND ${_laname} "dlpreopen='${_target_dlpreopen}'\n\n") + FILE(APPEND ${_laname} "# Directory that this library needs to be installed in:\n") + FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}${_install_DIR}'\n") + INSTALL( FILES ${_laname} DESTINATION ${CMAKE_INSTALL_PREFIX}${_install_DIR}) +ENDFUNCTION(CREATE_LIBTOOL_FILE) + + +function(fonttest TESTNAME FONTFILE) + if (EXISTS ${PROJECT_SOURCE_DIR}/standards/${TESTNAME}${CMAKE_SYSTEM_NAME}.log) + set(PLATFORM_TEST_SUFFIX ${CMAKE_SYSTEM_NAME}) + endif (EXISTS ${PROJECT_SOURCE_DIR}/standards/${TESTNAME}${CMAKE_SYSTEM_NAME}.log) + if (NOT GRAPHITE2_NFILEFACE) + add_test(NAME ${TESTNAME} COMMAND $ -trace ${PROJECT_BINARY_DIR}/${TESTNAME}.json -log ${PROJECT_BINARY_DIR}/${TESTNAME}.log ${PROJECT_SOURCE_DIR}/fonts/${FONTFILE} -codes ${ARGN}) + set_tests_properties(${TESTNAME} PROPERTIES TIMEOUT 3) + add_test(NAME ${TESTNAME}Output COMMAND ${CMAKE_COMMAND} -E compare_files ${PROJECT_BINARY_DIR}/${TESTNAME}.log ${PROJECT_SOURCE_DIR}/standards/${TESTNAME}${PLATFORM_TEST_SUFFIX}.log) + if ((NOT GRAPHITE2_NTRACING) AND PYTHONINTERP_FOUND) + add_test(NAME ${TESTNAME}Debug COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/jsoncmp ${PROJECT_BINARY_DIR}/${TESTNAME}.json ${PROJECT_SOURCE_DIR}/standards/${TESTNAME}.json) + set_tests_properties(${TESTNAME}Debug PROPERTIES DEPENDS ${TESTNAME}) + endif ((NOT GRAPHITE2_NTRACING) AND PYTHONINTERP_FOUND) + set_tests_properties(${TESTNAME}Output PROPERTIES DEPENDS ${TESTNAME}) + endif (NOT GRAPHITE2_NFILEFACE) +endfunction(fonttest) + + +function(feattest TESTNAME FONTFILE) + if (EXISTS ${PROJECT_SOURCE_DIR}/standards/${TESTNAME}${CMAKE_SYSTEM_NAME}.log) + set(PLATFORM_TEST_SUFFIX ${CMAKE_SYSTEM_NAME}) + endif (EXISTS ${PROJECT_SOURCE_DIR}/standards/${TESTNAME}${CMAKE_SYSTEM_NAME}.log) + if (NOT GRAPHITE2_NFILEFACE) + add_test(NAME ${TESTNAME} COMMAND $ -log ${PROJECT_BINARY_DIR}/${TESTNAME}.log ${PROJECT_SOURCE_DIR}/fonts/${FONTFILE}) + set_tests_properties(${TESTNAME} PROPERTIES TIMEOUT 3) + add_test(NAME ${TESTNAME}Output COMMAND ${CMAKE_COMMAND} -E compare_files ${PROJECT_BINARY_DIR}/${TESTNAME}.log ${PROJECT_SOURCE_DIR}/standards/${TESTNAME}${PLATFORM_TEST_SUFFIX}.log) + set_tests_properties(${TESTNAME}Output PROPERTIES DEPENDS ${TESTNAME}) + endif (NOT GRAPHITE2_NFILEFACE) +endfunction(feattest) + +function(cmptest TESTNAME FONTFILE TEXTFILE) + if (NOT GRAPHITE2_SANITIZERS) + if (EXISTS ${PROJECT_SOURCE_DIR}/standards/${TESTNAME}${CMAKE_SYSTEM_NAME}.json) + set(PLATFORM_TEST_SUFFIX ${CMAKE_SYSTEM_NAME}) + endif (EXISTS ${PROJECT_SOURCE_DIR}/standards/${TESTNAME}${CMAKE_SYSTEM_NAME}.json) + if (PYTHON_CTYPES_COMPATBILE) + add_test(NAME ${TESTNAME} COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/fnttxtrender --graphite_library=$ -t ${PROJECT_SOURCE_DIR}/texts/${TEXTFILE} -o ${PROJECT_BINARY_DIR}/${TESTNAME}.json -c ${PROJECT_SOURCE_DIR}/standards/${TESTNAME}${PLATFORM_TEST_SUFFIX}.json ${ARGN} ${PROJECT_SOURCE_DIR}/fonts/${FONTFILE}) + set_tests_properties(${TESTNAME} PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/python) + endif (PYTHON_CTYPES_COMPATBILE) + endif () +endfunction(cmptest) diff --git a/source/libs/graphite2/graphite2-src/LICENSE b/source/libs/graphite2/graphite2-src/LICENSE new file mode 100644 index 000000000..2d2d780e6 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/LICENSE @@ -0,0 +1,510 @@ + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations +below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it +becomes a de-facto standard. To achieve this, non-free programs must +be allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control +compilation and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at least + three years, to give the same user the materials specified in + Subsection 6a, above, for a charge no more than the cost of + performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply, and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License +may add an explicit geographical distribution limitation excluding those +countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms +of the ordinary General Public License). + + To apply these terms, attach the following notices to the library. +It is safest to attach them to the start of each source file to most +effectively convey the exclusion of warranty; and each file should +have at least the "copyright" line and a pointer to where the full +notice is found. + + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or +your school, if any, to sign a "copyright disclaimer" for the library, +if necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James + Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/source/libs/graphite2/graphite2-src/README.md b/source/libs/graphite2/graphite2-src/README.md new file mode 100644 index 000000000..277c32777 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/README.md @@ -0,0 +1,38 @@ +# Graphite engine + +## Project CI status +| OS | Intel 64 bit | Intel 32 bit | Arm 32 bit | +|---------|:------------:|:------------:|:----------:| +| Linux | [![Build Status](http://build.palaso.org/app/rest/builds/buildType:bt124/statusIcon)](http://build.palaso.org/viewType.html?buildTypeId=bt124&guest=1) | [![Build Status](http://build.palaso.org/app/rest/builds/buildType:bt123/statusIcon)](http://build.palaso.org/viewType.html?buildTypeId=bt123&guest=1) | [![Build Status](http://build.palaso.org/app/rest/builds/buildType:Graphite_Linux32bitArm/statusIcon)](http://build.palaso.org/viewType.html?buildTypeId=Graphite_Linux32bitArm&guest=1) | +| Windows | [![Build Status](http://build.palaso.org/app/rest/builds/buildType:Graphite_Windows64bit/statusIcon)](http://build.palaso.org/viewType.html?buildTypeId=Graphite_Windows64bit&guest=1) | [![Build Status](http://build.palaso.org/app/rest/builds/buildType:bt91/statusIcon)](http://build.palaso.org/viewType.html?buildTypeId=bt91&guest=1)| | + +## What is Graphite? + +Graphite is a system that can be used to create “smart fonts” capable of displaying writing systems with various complex behaviors. A smart font contains not only letter shapes but also additional instructions indicating how to combine and position the letters in complex ways. + +Graphite was primarily developed to provide the flexibility needed for minority languages which often need to be written according to slightly different rules than well-known languages that use the same script. + +Examples of complex script behaviors Graphite can handle include: + +* contextual shaping +* ligatures +* reordering +* split glyphs +* bidirectionality +* stacking diacritics +* complex positioning +* shape aware kerning +* automatic diacritic collision avoidance + +See [examples of scripts with complex rendering](http://scripts.sil.org/CmplxRndExamples). + +## Graphite system overview +The Graphite system consists of: + +* A rule-based programming language [Graphite Description Language](http://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_devFont#gdl) (GDL) that can be used to describe the behavior of a writing system +* A compiler for that language +* A rendering engine that can serve as the layout component of a text-processing application + +Graphite renders TrueType fonts that have been extended by means of compiling a GDL program. + +Further technical information is available on the [Graphite technical overview](http://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_techAbout) page. diff --git a/source/libs/graphite2/graphite2-src/Todo.txt b/source/libs/graphite2/graphite2-src/Todo.txt new file mode 100644 index 000000000..72ab26feb --- /dev/null +++ b/source/libs/graphite2/graphite2-src/Todo.txt @@ -0,0 +1,7 @@ +Expected changes to come: +* Change regression testing to use binary diffs of fonts instead of font locations +* Move to github +* Reduce size of committed test/ tree + +Questions: +* Do we support glyphid as a slot attribute? diff --git a/source/libs/graphite2/graphite2-src/graphite2.pc.in b/source/libs/graphite2/graphite2-src/graphite2.pc.in new file mode 100644 index 000000000..a4f19b39c --- /dev/null +++ b/source/libs/graphite2/graphite2-src/graphite2.pc.in @@ -0,0 +1,7 @@ + +Name: Graphite2 +Description: Font rendering engine for Complex Scripts +Version: ${version} +Libs: -L${libdir} -lgraphite2 +Cflags: -I${includedir} + diff --git a/source/libs/graphite2/graphite2-src/include/graphite2/Font.h b/source/libs/graphite2/graphite2-src/include/graphite2/Font.h new file mode 100644 index 000000000..3e8214d46 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/include/graphite2/Font.h @@ -0,0 +1,389 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + + Alternatively, the contents of this file may be used under the terms + of the Mozilla Public License (http://mozilla.org/MPL) or the GNU + General Public License, as published by the Free Software Foundation, + either version 2 of the License or (at your option) any later version. +*/ +#pragma once + +#include "graphite2/Types.h" + +#define GR2_VERSION_MAJOR 1 +#define GR2_VERSION_MINOR 3 +#define GR2_VERSION_BUGFIX 13 + +#ifdef __cplusplus +extern "C" +{ +#endif + +typedef struct gr_face gr_face; +typedef struct gr_font gr_font; +typedef struct gr_feature_ref gr_feature_ref; +typedef struct gr_feature_val gr_feature_val; + +/** +* Returns version information on this engine +*/ +GR2_API void gr_engine_version(int *nMajor, int *nMinor, int *nBugFix); + +/** +* The Face Options allow the application to require that certain tables are +* read during face construction. This may be of concern if the appFaceHandle +* used in the gr_get_table_fn may change. +* The values can be combined +*/ +enum gr_face_options { + /** No preload, no cmap caching, fail if the graphite tables are invalid */ + gr_face_default = 0, + /** Dumb rendering will be enabled if the graphite tables are invalid. @deprecated Since 1.311 */ + gr_face_dumbRendering = 1, + /** preload glyphs at construction time */ + gr_face_preloadGlyphs = 2, + /** Cache the lookup from code point to glyph ID at construction time */ + gr_face_cacheCmap = 4, + /** Preload everything */ + gr_face_preloadAll = gr_face_preloadGlyphs | gr_face_cacheCmap +}; + +/** Holds information about a particular Graphite silf table that has been loaded */ +struct gr_faceinfo { + gr_uint16 extra_ascent; /**< The extra_ascent in the GDL, in design units */ + gr_uint16 extra_descent; /**< The extra_descent in the GDL, in design units */ + gr_uint16 upem; /**< The design units for the font */ + enum gr_space_contextuals { + gr_space_unknown = 0, /**< no information is known. */ + gr_space_none = 1, /**< the space character never occurs in any rules. */ + gr_space_left_only = 2, /**< the space character only occurs as the first element in a rule. */ + gr_space_right_only = 3, /**< the space character only occurs as the last element in a rule. */ + gr_space_either_only = 4, /**< the space character only occurs as the only element in a rule. */ + gr_space_both = 5, /**< the space character may occur as the first or last element of a rule. */ + gr_space_cross = 6 /**< the space character occurs in a rule not as a first or last element. */ + } space_contextuals; + unsigned int has_bidi_pass : 1; /**< the table specifies that a bidirectional pass should run */ + unsigned int line_ends : 1; /**< there are line end contextuals somewhere */ + unsigned int justifies : 1; /**< there are .justify properties set somewhere on some glyphs */ +}; + +typedef struct gr_faceinfo gr_faceinfo; + +/** type describing function to retrieve font table information + * + * @return a pointer to the table in memory. The pointed to memory must exist as + * long as the gr_face which makes the call. + * @param appFaceHandle is the unique information passed to gr_make_face() + * @param name is a 32bit tag to the table name. + * @param len returned by this function to say how long the table is in memory. + */ +typedef const void *(*gr_get_table_fn)(const void* appFaceHandle, unsigned int name, size_t *len); + +/** type describing function to release any resources allocated by the above get_table table function + * + * @param appFaceHandle is the unique information passed to gr_make_face() + * @param pointer to table memory returned by get_table. + */ +typedef void (*gr_release_table_fn)(const void* appFaceHandle, const void *table_buffer); + +/** struct housing function pointers to manage font table buffers for the graphite engine. */ +struct gr_face_ops +{ + /** size in bytes of this structure */ + size_t size; + /** a pointer to a function to request a table from the client. */ + gr_get_table_fn get_table; + /** is a pointer to a function to notify the client the a table can be released. + * This can be NULL to signify that the client does not wish to do any release handling. */ + gr_release_table_fn release_table; +}; +typedef struct gr_face_ops gr_face_ops; + +/** Create a gr_face object given application information and a table functions. + * + * @return gr_face or NULL if the font fails to load for some reason. + * @param appFaceHandle This is application specific information that is passed + * to the getTable function. The appFaceHandle must stay + * alive as long as the gr_face is alive. + * @param face_ops Pointer to face specific callback structure for table + * management. Must stay alive for the duration of the + * call only. + * @param faceOptions Bitfield describing various options. See enum gr_face_options for details. + */ +GR2_API gr_face* gr_make_face_with_ops(const void* appFaceHandle/*non-NULL*/, const gr_face_ops *face_ops, unsigned int faceOptions); + +/** @deprecated Since v1.2.0 in favour of gr_make_face_with_ops. + * Create a gr_face object given application information and a getTable function. + * + * @return gr_face or NULL if the font fails to load for some reason. + * @param appFaceHandle This is application specific information that is passed + * to the getTable function. The appFaceHandle must stay + * alive as long as the gr_face is alive. + * @param getTable Callback function to get table data. + * @param faceOptions Bitfield describing various options. See enum gr_face_options for details. + */ +GR2_DEPRECATED_API gr_face* gr_make_face(const void* appFaceHandle/*non-NULL*/, gr_get_table_fn getTable, unsigned int faceOptions); + +/** @deprecated Since 1.3.7 this function is now an alias for gr_make_face_with_ops(). + * + * Create a gr_face object given application information, with subsegmental caching support + * + * @return gr_face or NULL if the font fails to load. + * @param appFaceHandle is a pointer to application specific information that is passed to getTable. + * This may not be NULL and must stay alive as long as the gr_face is alive. + * @param face_ops Pointer to face specific callback structure for table management. Must stay + * alive for the duration of the call only. + * @param segCacheMaxSize Unused. + * @param faceOptions Bitfield of values from enum gr_face_options + */ +GR2_DEPRECATED_API gr_face* gr_make_face_with_seg_cache_and_ops(const void* appFaceHandle, const gr_face_ops *face_ops, unsigned int segCacheMaxSize, unsigned int faceOptions); + +/** @deprecated Since 1.3.7 this function is now an alias for gr_make_face(). + * + * Create a gr_face object given application information, with subsegmental caching support. + * This function is deprecated as of v1.2.0 in favour of gr_make_face_with_seg_cache_and_ops. + * + * @return gr_face or NULL if the font fails to load. + * @param appFaceHandle is a pointer to application specific information that is passed to getTable. + * This may not be NULL and must stay alive as long as the gr_face is alive. + * @param getTable The function graphite calls to access font table data + * @param segCacheMaxSize How large the segment cache is. + * @param faceOptions Bitfield of values from enum gr_face_options + */ +GR2_DEPRECATED_API gr_face* gr_make_face_with_seg_cache(const void* appFaceHandle, gr_get_table_fn getTable, unsigned int segCacheMaxSize, unsigned int faceOptions); + +/** Convert a tag in a string into a gr_uint32 + * + * @return gr_uint32 tag, zero padded + * @param str a nul terminated string of which at most the first 4 characters are read + */ +GR2_API gr_uint32 gr_str_to_tag(const char *str); + +/** Convert a gr_uint32 tag into a string + * + * @param tag contains the tag to convert + * @param str is a pointer to a char array of at least size 4 bytes. The first 4 bytes of this array + * will be overwritten by this function. No nul is appended. + */ +GR2_API void gr_tag_to_str(gr_uint32 tag, char *str); + +/** Get feature values for a given language or default + * + * @return a copy of the default feature values for a given language. The application must call + * gr_featureval_destroy() to free this object when done. + * @param pFace The font face to get feature values from + * @param langname The language tag to get feature values for. If there is no such language or + * langname is 0, the default feature values for the font are returned. + * langname is right 0 padded and assumes lowercase. Thus the en langauge + * would be 0x656E0000. Langname may also be space padded, thus 0x656E2020. + */ +GR2_API gr_feature_val* gr_face_featureval_for_lang(const gr_face* pFace, gr_uint32 langname); + +/** Get feature reference for a given feature id from a face + * + * @return a feature reference corresponding to the given id. This data is part of the gr_face and + * will be freed when the face is destroyed. + * @param pFace Font face to get information on. + * @param featId Feature id tag to get reference to. + */ +GR2_API const gr_feature_ref* gr_face_find_fref(const gr_face* pFace, gr_uint32 featId); + +/** Returns number of feature references in a face **/ +GR2_API gr_uint16 gr_face_n_fref(const gr_face* pFace); + +/** Returns feature reference at given index in face **/ +GR2_API const gr_feature_ref* gr_face_fref(const gr_face* pFace, gr_uint16 i); + +/** Return number of languages the face knows about **/ +GR2_API unsigned short gr_face_n_languages(const gr_face* pFace); + +/** Returns a language id corresponding to a language of given index in the face **/ +GR2_API gr_uint32 gr_face_lang_by_index(const gr_face* pFace, gr_uint16 i); + +/** Destroy the given face and free its memory **/ +GR2_API void gr_face_destroy(gr_face *face); + +/** Returns the number of glyphs in the face **/ +GR2_API unsigned short gr_face_n_glyphs(const gr_face* pFace); + +/** Returns a faceinfo for the face and script **/ +GR2_API const gr_faceinfo *gr_face_info(const gr_face *pFace, gr_uint32 script); + +/** Returns whether the font supports a given Unicode character + * + * @return true if the character is supported. + * @param pFace face to test within + * @param usv Unicode Scalar Value of character to test + * @param script Tag of script for selecting which set of pseudo glyphs to test. May be NULL. + */ +GR2_API int gr_face_is_char_supported(const gr_face *pFace, gr_uint32 usv, gr_uint32 script); + +#ifndef GRAPHITE2_NFILEFACE +/** Create gr_face from a font file + * + * @return gr_face that accesses a font file directly. Returns NULL on failure. + * @param filename Full path and filename to font file + * @param faceOptions Bitfile from enum gr_face_options to control face options. + */ +GR2_API gr_face* gr_make_file_face(const char *filename, unsigned int faceOptions); + +/** @deprecated Since 1.3.7. This function is now an alias for gr_make_file_face(). + * + * Create gr_face from a font file, with subsegment caching support. + * + * @return gr_face that accesses a font file directly. Returns NULL on failure. + * @param filename Full path and filename to font file + * @param segCacheMaxSize Specifies how big to make the cache in segments. + * @param faceOptions Bitfield from enum gr_face_options to control face options. + */ +GR2_DEPRECATED_API gr_face* gr_make_file_face_with_seg_cache(const char *filename, unsigned int segCacheMaxSize, unsigned int faceOptions); +#endif // !GRAPHITE2_NFILEFACE + +/** Create a font from a face + * + * @return gr_font Call font_destroy to free this font + * @param ppm Resolution of the font in pixels per em + * @param face Face this font corresponds to. This must stay alive as long as the font is alive. + */ +GR2_API gr_font* gr_make_font(float ppm, const gr_face *face); + +/** query function to find the hinted advance of a glyph + * + * @param appFontHandle is the unique information passed to gr_make_font_with_advance() + * @param glyphid is the glyph to retireve the hinted advance for. + */ +typedef float (*gr_advance_fn)(const void* appFontHandle, gr_uint16 glyphid); + +/** struct housing function pointers to manage font hinted metrics for the + * graphite engine. */ +struct gr_font_ops +{ + /** size of the structure in bytes to allow for future extensibility */ + size_t size; + /** a pointer to a function to retrieve the hinted + * advance width of a glyph which the font cannot + * provide without client assistance. This can be + * NULL to signify no horizontal hinted metrics are necessary. */ + gr_advance_fn glyph_advance_x; + /** a pointer to a function to retrieve the hinted + * advance height of a glyph which the font cannot + * provide without client assistance. This can be + * NULL to signify no horizontal hinted metrics are necessary. */ + gr_advance_fn glyph_advance_y; +}; +typedef struct gr_font_ops gr_font_ops; + +/** Creates a font with hinted advance width query functions + * + * @return gr_font to be destroyed via font_destroy + * @param ppm size of font in pixels per em + * @param appFontHandle font specific information that must stay alive as long + * as the font does + * @param font_ops pointer font specific callback structure for hinted metrics. + * Need only stay alive for the duration of the call. + * @param face the face this font corresponds to. Must stay alive as long as + * the font does. + */ +GR2_API gr_font* gr_make_font_with_ops(float ppm, const void* appFontHandle, const gr_font_ops * font_ops, const gr_face *face); + +/** Creates a font with hinted advance width query function. + * This function is deprecated. Use gr_make_font_with_ops instead. + * + * @return gr_font to be destroyed via font_destroy + * @param ppm size of font in pixels per em + * @param appFontHandle font specific information that must stay alive as long + * as the font does + * @param getAdvance callback function reference that returns horizontal advance in pixels for a glyph. + * @param face the face this font corresponds to. Must stay alive as long as + * the font does. + */ +GR2_API gr_font* gr_make_font_with_advance_fn(float ppm, const void* appFontHandle, gr_advance_fn getAdvance, const gr_face *face); + +/** Free a font **/ +GR2_API void gr_font_destroy(gr_font *font); + +/** get a feature value + * + * @return value of specific feature or 0 if any problems. + * @param pfeatureref gr_feature_ref to the feature + * @param feats gr_feature_val containing all the values + */ +GR2_API gr_uint16 gr_fref_feature_value(const gr_feature_ref* pfeatureref, const gr_feature_val* feats); + +/** set a feature value + * + * @return false if there were any problems (value out of range, etc.) + * @param pfeatureref gr_feature_ref to the feature + * @param val value to set the feature to + * @param pDest the gr_feature_val containing all the values for all the features + */ +GR2_API int gr_fref_set_feature_value(const gr_feature_ref* pfeatureref, gr_uint16 val, gr_feature_val* pDest); + +/** Returns the id tag for a gr_feature_ref **/ +GR2_API gr_uint32 gr_fref_id(const gr_feature_ref* pfeatureref); + +/** Returns number of values a feature may take, given a gr_feature_ref **/ +GR2_API gr_uint16 gr_fref_n_values(const gr_feature_ref* pfeatureref); + +/** Returns the value associated with a particular value in a feature + * + * @return value + * @param pfeatureref gr_feature_ref of the feature of interest + * @param settingno Index up to the return value of gr_fref_n_values() of the value + */ +GR2_API gr_int16 gr_fref_value(const gr_feature_ref* pfeatureref, gr_uint16 settingno); + +/** Returns a string of the UI name of a feature + * + * @return string of the UI name, in the encoding form requested. Call gr_label_destroy() after use. + * @param pfeatureref gr_feature_ref of the feature + * @param langId This is a pointer since the face may not support a string in the requested + * language. The actual language of the string is returned in langId + * @param utf Encoding form for the string + * @param length Used to return the length of the string returned in bytes. + */ +GR2_API void* gr_fref_label(const gr_feature_ref* pfeatureref, gr_uint16 *langId, enum gr_encform utf, gr_uint32 *length); + +/** Return a UI string for a possible value of a feature + * + * @return string of the UI name, in the encoding form requested. nul terminated. Call gr_label_destroy() + * after use. + * @param pfeatureref gr_feature_ref of the feature + * @param settingno Value setting index + * @param langId This is a pointer to the requested language. The requested language id is + * replaced by the actual language id of the string returned. + * @param utf Encoding form for the string + * @param length Returns the length of the string returned in bytes. + */ +GR2_API void* gr_fref_value_label(const gr_feature_ref* pfeatureref, gr_uint16 settingno/*rather than a value*/, gr_uint16 *langId, enum gr_encform utf, gr_uint32 *length); + +/** Destroy a previously returned label string **/ +GR2_API void gr_label_destroy(void * label); + +/** Copies a gr_feature_val **/ +GR2_API gr_feature_val* gr_featureval_clone(const gr_feature_val* pfeatures); + +/** Destroys a gr_feature_val **/ +GR2_API void gr_featureval_destroy(gr_feature_val *pfeatures); + +#ifdef __cplusplus +} +#endif diff --git a/source/libs/graphite2/graphite2-src/include/graphite2/Log.h b/source/libs/graphite2/graphite2-src/include/graphite2/Log.h new file mode 100644 index 000000000..a5a6947fa --- /dev/null +++ b/source/libs/graphite2/graphite2-src/include/graphite2/Log.h @@ -0,0 +1,85 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + + Alternatively, the contents of this file may be used under the terms + of the Mozilla Public License (http://mozilla.org/MPL) or the GNU + General Public License, as published by the Free Software Foundation, + either version 2 of the License or (at your option) any later version. +*/ +#pragma once + +#include +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/** deprecated mechanism that doesn't do anything now. */ +typedef enum { + GRLOG_NONE = 0x0, + GRLOG_FACE = 0x01, + GRLOG_SEGMENT = 0x02, + GRLOG_PASS = 0x04, + GRLOG_CACHE = 0x08, + + GRLOG_OPCODE = 0x80, + GRLOG_ALL = 0xFF +} GrLogMask; + +/** Start logging all segment creation and updates on the provided face. This + * is logged to a JSON file, see "Segment JSON Schema.txt" for a precise + * definition of the file + * + * @return true if the file was successfully created and logging is correctly + * initialised. + * @param face the gr_face whose segments you want to log to the given file + * @param log_path a utf8 encoded file name and path to log to. + */ +GR2_API bool gr_start_logging(gr_face * face, const char *log_path); + + +/** Stop logging on the given face. This will close the log file created by + * gr_start_logging. + * + * @param face the gr_face whose segments you want to stop logging + */ +GR2_API void gr_stop_logging(gr_face * face); + +/** Start logging to a FILE object. + * This function is deprecated as of 1.2.0, use the _face versions instead. + * + * @return True on success + * @param logfile FILE reference to output logging to + * @param mask What aspects of logging to report (ignored) + */ +GR2_API bool graphite_start_logging(FILE * logFile, GrLogMask mask); //may not do anthing if disabled in the implementation of the engine. + +/** Stop logging to a FILE object. + * This function is deprecated as of 1.2.0, use the _face versions instead. + */ +GR2_API void graphite_stop_logging(); + +#ifdef __cplusplus +} +#endif diff --git a/source/libs/graphite2/graphite2-src/include/graphite2/Segment.h b/source/libs/graphite2/graphite2-src/include/graphite2/Segment.h new file mode 100644 index 000000000..0e24f5d79 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/include/graphite2/Segment.h @@ -0,0 +1,461 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + + Alternatively, the contents of this file may be used under the terms + of the Mozilla Public License (http://mozilla.org/MPL) or the GNU + General Public License, as published by the Free Software Foundation, + either version 2 of the License or (at your option) any later version. +*/ +#pragma once + +#include "graphite2/Types.h" +#include "graphite2/Font.h" + +#ifdef __cplusplus +extern "C" +{ +#endif + +enum gr_break_weight { + gr_breakNone = 0, + /* after break weights */ + gr_breakWhitespace = 10, + gr_breakWord = 15, + gr_breakIntra = 20, + gr_breakLetter = 30, + gr_breakClip = 40, + /* before break weights */ + gr_breakBeforeWhitespace = -10, + gr_breakBeforeWord = -15, + gr_breakBeforeIntra = -20, + gr_breakBeforeLetter = -30, + gr_breakBeforeClip = -40 +}; + +enum gr_justFlags { + /// Indicates that this segment is a complete line + gr_justCompleteLine = 0, + /// Indicates that the start of the slot list is not at the start of a line + gr_justStartInline = 1, + /// Indicates that the end of the slot list is not at the end of a line + gr_justEndInline = 2 +}; + +/** Used for looking up slot attributes. Most are already available in other functions **/ +enum gr_attrCode { + /// adjusted glyph advance in x direction in design units + gr_slatAdvX = 0, + /// adjusted glyph advance in y direction (usually 0) in design units + gr_slatAdvY, + /// returns 0. Deprecated. + gr_slatAttTo, + /// This slot attaches to its parent at the given design units in the x direction + gr_slatAttX, + /// This slot attaches to its parent at the given design units in the y direction + gr_slatAttY, + /// This slot attaches to its parent at the given glyph point (not implemented) + gr_slatAttGpt, + /// x-direction adjustment from the given glyph point (not implemented) + gr_slatAttXOff, + /// y-direction adjustment from the given glyph point (not implemented) + gr_slatAttYOff, + /// Where on this glyph should align with the attachment point on the parent glyph in the x-direction. + gr_slatAttWithX, + /// Where on this glyph should align with the attachment point on the parent glyph in the y-direction + gr_slatAttWithY, + /// Which glyph point on this glyph should align with the attachment point on the parent glyph (not implemented). + gr_slatWithGpt, + /// Adjustment to gr_slatWithGpt in x-direction (not implemented) + gr_slatAttWithXOff, + /// Adjustment to gr_slatWithGpt in y-direction (not implemented) + gr_slatAttWithYOff, + /// Attach at given nesting level (not implemented) + gr_slatAttLevel, + /// Line break breakweight for this glyph + gr_slatBreak, + /// Ligature component reference (not implemented) + gr_slatCompRef, + /// bidi directionality of this glyph (not implemented) + gr_slatDir, + /// Whether insertion is allowed before this glyph + gr_slatInsert, + /// Final positioned position of this glyph relative to its parent in x-direction in pixels + gr_slatPosX, + /// Final positioned position of this glyph relative to its parent in y-direction in pixels + gr_slatPosY, + /// Amount to shift glyph by in x-direction design units + gr_slatShiftX, + /// Amount to shift glyph by in y-direction design units + gr_slatShiftY, + /// attribute user1 + gr_slatUserDefnV1, + /// not implemented + gr_slatMeasureSol, + /// not implemented + gr_slatMeasureEol, + /// Amount this slot can stretch (not implemented) + gr_slatJStretch, + /// Amount this slot can shrink (not implemented) + gr_slatJShrink, + /// Granularity by which this slot can stretch or shrink (not implemented) + gr_slatJStep, + /// Justification weight for this glyph (not implemented) + gr_slatJWeight, + /// Amount this slot mush shrink or stretch in design units + gr_slatJWidth = 29, + /// SubSegment split point + gr_slatSegSplit = gr_slatJStretch + 29, + /// User defined attribute, see subattr for user attr number + gr_slatUserDefn, + /// Bidi level + gr_slatBidiLevel = 56, + /// Collision flags + gr_slatColFlags, + /// Collision constraint rectangle left (bl.x) + gr_slatColLimitblx, + /// Collision constraint rectangle lower (bl.y) + gr_slatColLimitbly, + /// Collision constraint rectangle right (tr.x) + gr_slatColLimittrx, + /// Collision constraint rectangle upper (tr.y) + gr_slatColLimittry, + /// Collision shift x + gr_slatColShiftx, + /// Collision shift y + gr_slatColShifty, + /// Collision margin + gr_slatColMargin, + /// Margin cost weight + gr_slatColMarginWt, + // Additional glyph that excludes movement near this one: + gr_slatColExclGlyph, + gr_slatColExclOffx, + gr_slatColExclOffy, + // Collision sequence enforcing attributes: + gr_slatSeqClass, + gr_slatSeqProxClass, + gr_slatSeqOrder, + gr_slatSeqAboveXoff, + gr_slatSeqAboveWt, + gr_slatSeqBelowXlim, + gr_slatSeqBelowWt, + gr_slatSeqValignHt, + gr_slatSeqValignWt, + + /// not implemented + gr_slatMax, + /// not implemented + gr_slatNoEffect = gr_slatMax + 1 +}; + +enum gr_bidirtl { + /// Underlying paragraph direction is RTL + gr_rtl = 1, + /// Set this to not run the bidi pass internally, even if the font asks for it. + /// This presumes that the segment is in a single direction. Most of the time + /// this bit should be set unless you know you are passing full paragraphs of text. + gr_nobidi = 2, + /// Disable auto mirroring for rtl text + gr_nomirror = 4 +}; + +typedef struct gr_char_info gr_char_info; +typedef struct gr_segment gr_segment; +typedef struct gr_slot gr_slot; + +/** Returns Unicode character for a charinfo. + * + * @param p Pointer to charinfo to return information on. + */ +GR2_API unsigned int gr_cinfo_unicode_char(const gr_char_info* p/*not NULL*/); + +/** Returns breakweight for a charinfo. + * + * @return Breakweight is a number between -50 and 50 indicating the cost of a + * break before or after this character. If the value < 0, the absolute value + * is this character's contribution to the overall breakweight before it. If the value + * > 0, then the value is this character's contribution to the overall breakweight after it. + * The overall breakweight between two characters is the maximum of the breakweight + * contributions from the characters either side of it. If a character makes no + * contribution to the breakweight on one side of it, the contribution is considered + * to be 0. + * @param p Pointer to charinfo to return information on. + */ +GR2_API int gr_cinfo_break_weight(const gr_char_info* p/*not NULL*/); + +/** Returns the slot index that after this character is after in the slot stream + * + * In effect each character is associated with a set of slots and this returns + * the index of the last slot in the segment this character is associated with. + * + * @return after slot index between 0 and gr_seg_n_slots() + * @param p Pointer to charinfo to return information on. + */ +GR2_API int gr_cinfo_after(const gr_char_info* p/*not NULL*/); + +/** Returns the slot index that before this character is before in the slot stream + * + * In effect each character is associated with a set of slots and this returns + * the index of the first slot in the segment this character is associated with. + * + * @return before slot index between 0 and gr_seg_n_slots() + * @param p Pointer to charinfo to return information on. + */ +GR2_API int gr_cinfo_before(const gr_char_info* p/*not NULL*/); + +/** Returns the code unit index of this character in the input string + * + * @return code unit index between 0 and the end of the string + * @param p Pointer to charinfo to return information on. + */ +GR2_API size_t gr_cinfo_base(const gr_char_info* p/*not NULL*/); + +/** Returns the number of unicode characters in a string. + * + * @return number of characters in the string + * @param enc Specifies the type of data in the string: utf8, utf16, utf32 + * @param buffer_begin The start of the string + * @param buffer_end Measure up to the first nul or when end is reached, whichever is earliest. + * This parameter may be NULL. + * @param pError If there is a structural fault in the string, the location is returned + * in this variable. If no error occurs, pError will contain NULL. NULL + * may be passed for pError if no such information is required. + */ +GR2_API size_t gr_count_unicode_characters(enum gr_encform enc, const void* buffer_begin, const void* buffer_end, const void** pError); + +/** Creates and returns a segment. + * + * @return a segment that needs seg_destroy called on it. May return NULL if bad problems + * in segment processing. + * @param font Gives the size of the font in pixels per em for final positioning. If + * NULL, positions are returned in design units, i.e. at a ppm of the upem + * of the face. + * @param face The face containing all the non-size dependent information. + * @param script This is a tag containing a script identifier that is used to choose + * which graphite table within the font to use. Maybe 0. Tag may be 4 chars + * NULL padded in LSBs or space padded in LSBs. + * @param pFeats Pointer to a feature values to be used for the segment. Only one + * feature values may be used for a segment. If NULL the default features + * for the font will be used. + * @param enc Specifies what encoding form the string is in (utf8, utf16, utf32) + * @param pStart Start of the string + * @param nChars Number of unicode characters to process in the string. The string will + * be processed either up to the first NULL or until nChars have been + * processed. nChars is also used to initialise the internal memory + * allocations of the segment. So it is wise not to make nChars too much + * greater than the actual number of characters being processed. + * @param dir Specifies whether the segment is processed right to left (1) or left to + * right (0) and whether to run the internal bidi pass, if a font requests it. + * See enum gr_bidirtl for details. + */ +GR2_API gr_segment* gr_make_seg(const gr_font* font, const gr_face* face, gr_uint32 script, const gr_feature_val* pFeats, enum gr_encform enc, const void* pStart, size_t nChars, int dir); + +/** Destroys a segment, freeing the memory. + * + * @param p The segment to destroy + */ +GR2_API void gr_seg_destroy(gr_segment* p); + +/** Returns the advance for the whole segment. + * + * Returns the width of the segment up to the next glyph origin after the segment + */ +GR2_API float gr_seg_advance_X(const gr_segment* pSeg/*not NULL*/); + +/** Returns the height advance for the segment. **/ +GR2_API float gr_seg_advance_Y(const gr_segment* pSeg/*not NULL*/); + +/** Returns the number of gr_char_infos in the segment. **/ +GR2_API unsigned int gr_seg_n_cinfo(const gr_segment* pSeg/*not NULL*/); + +/** Returns a gr_char_info at a given index in the segment. **/ +GR2_API const gr_char_info* gr_seg_cinfo(const gr_segment* pSeg/*not NULL*/, unsigned int index/*must be + +typedef unsigned char gr_uint8; +typedef gr_uint8 gr_byte; +typedef signed char gr_int8; +typedef unsigned short gr_uint16; +typedef short gr_int16; +typedef unsigned int gr_uint32; +typedef int gr_int32; + +enum gr_encform { + gr_utf8 = 1/*sizeof(uint8)*/, gr_utf16 = 2/*sizeof(uint16)*/, gr_utf32 = 4/*sizeof(uint32)*/ +}; + + +// Define API function declspec/attributes and how each supported compiler or OS +// allows us to specify them. +#if defined __GNUC__ + #define _gr2_and , + #define _gr2_tag_fn(a) __attribute__((a)) + #define _gr2_deprecated_flag deprecated + #define _gr2_export_flag visibility("default") + #define _gr2_import_flag visibility("default") + #define _gr2_static_flag visibility("hidden") +#endif + +#if defined _WIN32 || defined __CYGWIN__ + #if defined __GNUC__ // These three will be redefined for Windows + #undef _gr2_export_flag + #undef _gr2_import_flag + #undef _gr2_static_flag + #else // How MSVC sepcifies function level attributes adn deprecation + #define _gr2_and + #define _gr2_tag_fn(a) __declspec(a) + #define _gr2_deprecated_flag deprecated + #endif + #define _gr2_export_flag dllexport + #define _gr2_import_flag dllimport + #define _gr2_static_flag +#endif + +#if defined GRAPHITE2_STATIC + #define GR2_API _gr2_tag_fn(_gr2_static_flag) + #define GR2_DEPRECATED_API _gr2_tag_fn(_gr2_deprecated_flag _gr2_and _gr2_static_flag) +#elif defined GRAPHITE2_EXPORTING + #define GR2_API _gr2_tag_fn(_gr2_export_flag) + #define GR2_DEPRECATED_API _gr2_tag_fn(_gr2_deprecated_flag _gr2_and _gr2_export_flag) +#else + #define GR2_API _gr2_tag_fn(_gr2_import_flag) + #define GR2_DEPRECATED_API _gr2_tag_fn(_gr2_deprecated_flag _gr2_and _gr2_import_flag) +#endif diff --git a/source/libs/graphite2/graphite2-src/src/CMakeLists.txt b/source/libs/graphite2/graphite2-src/src/CMakeLists.txt new file mode 100644 index 000000000..389cf5a23 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/CMakeLists.txt @@ -0,0 +1,156 @@ +# GRAPHITE2 LICENSING +# +# Copyright 2010, SIL International +# All rights reserved. +# +# This library is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published +# by the Free Software Foundation; either version 2.1 of License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should also have received a copy of the GNU Lesser General Public +# License along with this library in the file named "LICENSE". +# If not, write to the Free Software Foundation, 51 Franklin Street, +# Suite 500, Boston, MA 02110-1335, USA or visit their web page on the +# internet at http://www.fsf.org/licenses/lgpl.html. + +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR) +project(graphite2_core) +cmake_policy(SET CMP0012 NEW) +INCLUDE(CheckCXXSourceCompiles) + +set(GRAPHITE_API_CURRENT 3) +set(GRAPHITE_API_REVISION 2) +set(GRAPHITE_API_AGE 1) +set(GRAPHITE_VERSION ${GRAPHITE_API_CURRENT}.${GRAPHITE_API_REVISION}.${GRAPHITE_API_AGE}) +set(GRAPHITE_SO_VERSION ${GRAPHITE_API_CURRENT}) + +include(TestBigEndian) + +include_directories(${PROJECT_SOURCE_DIR}) + +set(FILEFACE FileFace.cpp) +if (GRAPHITE2_NFILEFACE) + add_definitions(-DGRAPHITE2_NFILEFACE) + set(FILEFACE) +endif() + +set(TRACING json.cpp) +if (GRAPHITE2_NTRACING) + add_definitions(-DGRAPHITE2_NTRACING) + set(TRACING) +endif() + +if (GRAPHITE2_TELEMETRY) + add_definitions(-DGRAPHITE2_TELEMETRY) +endif() + +if (NOT BUILD_SHARED_LIBS) + add_definitions(-DGRAPHITE2_STATIC) +endif() + +set(GRAPHITE_HEADERS + ../include/graphite2/Font.h + ../include/graphite2/Segment.h + ../include/graphite2/Types.h + ../include/graphite2/Log.h + ) + +file(GLOB PRIVATE_HEADERS inc/*.h) + +add_library(graphite2 + ${GRAPHITE2_VM_TYPE}_machine.cpp + gr_char_info.cpp + gr_features.cpp + gr_face.cpp + gr_font.cpp + gr_logging.cpp + gr_segment.cpp + gr_slot.cpp + CmapCache.cpp + Code.cpp + Collider.cpp + Decompressor.cpp + Face.cpp + FeatureMap.cpp + Font.cpp + GlyphFace.cpp + GlyphCache.cpp + Intervals.cpp + Justifier.cpp + NameTable.cpp + Pass.cpp + Position.cpp + Segment.cpp + Silf.cpp + Slot.cpp + Sparse.cpp + TtfUtil.cpp + UtfCodec.cpp + ${FILEFACE} + ${TRACING}) + +set_target_properties(graphite2 PROPERTIES PUBLIC_HEADER "${GRAPHITE_HEADERS}" + SOVERSION ${GRAPHITE_SO_VERSION} + VERSION ${GRAPHITE_VERSION} + LT_VERSION_CURRENT ${GRAPHITE_API_CURRENT} + LT_VERSION_REVISION ${GRAPHITE_API_REVISION} + LT_VERSION_AGE ${GRAPHITE_API_AGE}) + +if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set_target_properties(graphite2 PROPERTIES + COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" + LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}" + LINKER_LANGUAGE C) + if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86") + add_definitions(-mfpmath=sse -msse2) + endif() + if (CMAKE_COMPILER_IS_GNUCXX) + add_definitions(-Wdouble-promotion) + endif() + message(STATUS "Compiler ID is: ${CMAKE_CXX_COMPILER_ID}") + if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") + add_definitions(-Wimplicit-fallthrough -Wshorten-64-to-32) + endif() + if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") + target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32) + else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") + if (GRAPHITE2_SANITIZERS) + target_link_libraries(graphite2 c gcc_s) + else () + target_link_libraries(graphite2 c gcc) + endif () + endif() + include(Graphite) + if (BUILD_SHARED_LIBS) + nolib_test(stdc++ $) + endif () + set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "") + CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}") +endif() + +if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + set_target_properties(graphite2 PROPERTIES + COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wimplicit-fallthrough -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -mfpmath=sse -msse2" + LINK_FLAGS "-nodefaultlibs" + LINKER_LANGUAGE C) + target_link_libraries(graphite2 c) + include(Graphite) + nolib_test(stdc++ $) + set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "") + CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}") +endif() + +if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + set_target_properties(graphite2 PROPERTIES + COMPILE_DEFINITIONS "_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;UNICODE;GRAPHITE2_EXPORTING") +endif() + + +install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin) +install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_) diff --git a/source/libs/graphite2/graphite2-src/src/CmapCache.cpp b/source/libs/graphite2/graphite2-src/src/CmapCache.cpp new file mode 100644 index 000000000..d070019a3 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/CmapCache.cpp @@ -0,0 +1,155 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ + +#include "inc/Main.h" +#include "inc/CmapCache.h" +#include "inc/Face.h" +#include "inc/TtfTypes.h" +#include "inc/TtfUtil.h" + + +using namespace graphite2; + +const void * bmp_subtable(const Face::Table & cmap) +{ + const void * stbl; + if (!cmap.size()) return 0; + if (TtfUtil::CheckCmapSubtable4(stbl = TtfUtil::FindCmapSubtable(cmap, 3, 1, cmap.size()), cmap + cmap.size()) + || TtfUtil::CheckCmapSubtable4(stbl = TtfUtil::FindCmapSubtable(cmap, 0, 3, cmap.size()), cmap + cmap.size()) + || TtfUtil::CheckCmapSubtable4(stbl = TtfUtil::FindCmapSubtable(cmap, 0, 2, cmap.size()), cmap + cmap.size()) + || TtfUtil::CheckCmapSubtable4(stbl = TtfUtil::FindCmapSubtable(cmap, 0, 1, cmap.size()), cmap + cmap.size()) + || TtfUtil::CheckCmapSubtable4(stbl = TtfUtil::FindCmapSubtable(cmap, 0, 0, cmap.size()), cmap + cmap.size())) + return stbl; + return 0; +} + +const void * smp_subtable(const Face::Table & cmap) +{ + const void * stbl; + if (!cmap.size()) return 0; + if (TtfUtil::CheckCmapSubtable12(stbl = TtfUtil::FindCmapSubtable(cmap, 3, 10, cmap.size()), cmap + cmap.size()) + || TtfUtil::CheckCmapSubtable12(stbl = TtfUtil::FindCmapSubtable(cmap, 0, 4, cmap.size()), cmap + cmap.size())) + return stbl; + return 0; +} + +template +bool cache_subtable(uint16 * blocks[], const void * cst, const unsigned int limit) +{ + int rangeKey = 0; + uint32 codePoint = NextCodePoint(cst, 0, &rangeKey), + prevCodePoint = 0; + while (codePoint < limit) + { + unsigned int block = codePoint >> 8; + if (!blocks[block]) + { + blocks[block] = grzeroalloc(0x100); + if (!blocks[block]) + return false; + } + blocks[block][codePoint & 0xFF] = LookupCodePoint(cst, codePoint, rangeKey); + // prevent infinite loop + if (codePoint <= prevCodePoint) + codePoint = prevCodePoint + 1; + prevCodePoint = codePoint; + codePoint = NextCodePoint(cst, codePoint, &rangeKey); + } + return true; +} + + +CachedCmap::CachedCmap(const Face & face) +: m_isBmpOnly(true), + m_blocks(0) +{ + const Face::Table cmap(face, Tag::cmap); + if (!cmap) return; + + const void * bmp_cmap = bmp_subtable(cmap); + const void * smp_cmap = smp_subtable(cmap); + m_isBmpOnly = !smp_cmap; + + m_blocks = grzeroalloc(m_isBmpOnly ? 0x100 : 0x1100); + if (m_blocks && smp_cmap) + { + if (!cache_subtable(m_blocks, smp_cmap, 0x10FFFF)) + return; + } + + if (m_blocks && bmp_cmap) + { + if (!cache_subtable(m_blocks, bmp_cmap, 0xFFFF)) + return; + } +} + +CachedCmap::~CachedCmap() throw() +{ + if (!m_blocks) return; + unsigned int numBlocks = (m_isBmpOnly)? 0x100 : 0x1100; + for (unsigned int i = 0; i < numBlocks; i++) + free(m_blocks[i]); + free(m_blocks); +} + +uint16 CachedCmap::operator [] (const uint32 usv) const throw() +{ + if ((m_isBmpOnly && usv > 0xFFFF) || (usv > 0x10FFFF)) + return 0; + const uint32 block = 0xFFFF & (usv >> 8); + if (m_blocks[block]) + return m_blocks[block][usv & 0xFF]; + return 0; +}; + +CachedCmap::operator bool() const throw() +{ + return m_blocks != 0; +} + + +DirectCmap::DirectCmap(const Face & face) +: _cmap(face, Tag::cmap), + _smp(smp_subtable(_cmap)), + _bmp(bmp_subtable(_cmap)) +{ +} + +uint16 DirectCmap::operator [] (const uint32 usv) const throw() +{ + return usv > 0xFFFF + ? (_smp ? TtfUtil::CmapSubtable12Lookup(_smp, usv, 0) : 0) + : TtfUtil::CmapSubtable4Lookup(_bmp, usv, 0); +} + +DirectCmap::operator bool () const throw() +{ + return _cmap && _bmp; +} + diff --git a/source/libs/graphite2/graphite2-src/src/Code.cpp b/source/libs/graphite2/graphite2-src/src/Code.cpp new file mode 100644 index 000000000..5cff6b534 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/Code.cpp @@ -0,0 +1,752 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +// This class represents loaded graphite stack machine code. It performs +// basic sanity checks, on the incoming code to prevent more obvious problems +// from crashing graphite. +// Author: Tim Eves + +#include +#include +#include +#include +#include "graphite2/Segment.h" +#include "inc/Code.h" +#include "inc/Face.h" +#include "inc/GlyphFace.h" +#include "inc/GlyphCache.h" +#include "inc/Machine.h" +#include "inc/Rule.h" +#include "inc/Silf.h" + +#include + +#ifdef NDEBUG +#ifdef __GNUC__ +#pragma GCC diagnostic ignored "-Wunused-parameter" +#endif +#endif + + +using namespace graphite2; +using namespace vm; + +namespace { + +inline bool is_return(const instr i) { + const opcode_t * opmap = Machine::getOpcodeTable(); + const instr pop_ret = *opmap[POP_RET].impl, + ret_zero = *opmap[RET_ZERO].impl, + ret_true = *opmap[RET_TRUE].impl; + return i == pop_ret || i == ret_zero || i == ret_true; +} + +struct context +{ + context(uint8 ref=0) : codeRef(ref) {flags.changed=false; flags.referenced=false;} + struct { + uint8 changed:1, + referenced:1; + } flags; + uint8 codeRef; +}; + +} // end namespace + + +class Machine::Code::decoder +{ +public: + struct limits; + static const int NUMCONTEXTS = 256; + + decoder(limits & lims, Code &code, enum passtype pt) throw(); + + bool load(const byte * bc_begin, const byte * bc_end); + void apply_analysis(instr * const code, instr * code_end); + byte max_ref() { return _max_ref; } + int out_index() const { return _out_index; } + +private: + void set_ref(int index) throw(); + void set_noref(int index) throw(); + void set_changed(int index) throw(); + opcode fetch_opcode(const byte * bc); + void analyse_opcode(const opcode, const int8 * const dp) throw(); + bool emit_opcode(opcode opc, const byte * & bc); + bool validate_opcode(const byte opc, const byte * const bc); + bool valid_upto(const uint16 limit, const uint16 x) const throw(); + bool test_context() const throw(); + bool test_ref(int8 index) const throw(); + void failure(const status_t s) const throw() { _code.failure(s); } + + Code & _code; + int _out_index; + uint16 _out_length; + instr * _instr; + byte * _data; + limits & _max; + enum passtype _passtype; + int _stack_depth; + bool _in_ctxt_item; + int16 _slotref; + context _contexts[NUMCONTEXTS]; + byte _max_ref; +}; + + +struct Machine::Code::decoder::limits +{ + const byte * bytecode; + const uint8 pre_context; + const uint16 rule_length, + classes, + glyf_attrs, + features; + const byte attrid[gr_slatMax]; +}; + +inline Machine::Code::decoder::decoder(limits & lims, Code &code, enum passtype pt) throw() +: _code(code), + _out_index(code._constraint ? 0 : lims.pre_context), + _out_length(code._constraint ? 1 : lims.rule_length), + _instr(code._code), _data(code._data), _max(lims), _passtype(pt), + _stack_depth(0), + _in_ctxt_item(false), + _slotref(0), + _max_ref(0) +{ } + + + +Machine::Code::Code(bool is_constraint, const byte * bytecode_begin, const byte * const bytecode_end, + uint8 pre_context, uint16 rule_length, const Silf & silf, const Face & face, + enum passtype pt, byte * * const _out) + : _code(0), _data(0), _data_size(0), _instr_count(0), _max_ref(0), _status(loaded), + _constraint(is_constraint), _modify(false), _delete(false), _own(_out==0) +{ +#ifdef GRAPHITE2_TELEMETRY + telemetry::category _code_cat(face.tele.code); +#endif + assert(bytecode_begin != 0); + if (bytecode_begin == bytecode_end) + { + // ::new (this) Code(); + return; + } + assert(bytecode_end > bytecode_begin); + const opcode_t * op_to_fn = Machine::getOpcodeTable(); + + // Allocate code and data target buffers, these sizes are a worst case + // estimate. Once we know their real sizes the we'll shrink them. + if (_out) _code = reinterpret_cast(*_out); + else _code = static_cast(malloc(estimateCodeDataOut(bytecode_end-bytecode_begin, 1, is_constraint ? 0 : rule_length))); + _data = reinterpret_cast(_code + (bytecode_end - bytecode_begin)); + + if (!_code || !_data) { + failure(alloc_failed); + return; + } + + decoder::limits lims = { + bytecode_end, + pre_context, + rule_length, + silf.numClasses(), + face.glyphs().numAttrs(), + face.numFeatures(), + {1,1,1,1,1,1,1,1, + 1,1,1,1,1,1,1,255, + 1,1,1,1,1,1,1,1, + 1,1,1,1,1,1,0,0, + 0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0, silf.numUser()} + }; + + decoder dec(lims, *this, pt); + if(!dec.load(bytecode_begin, bytecode_end)) + return; + + // Is this an empty program? + if (_instr_count == 0) + { + release_buffers(); + ::new (this) Code(); + return; + } + + // When we reach the end check we've terminated it correctly + if (!is_return(_code[_instr_count-1])) { + failure(missing_return); + return; + } + + assert((_constraint && immutable()) || !_constraint); + dec.apply_analysis(_code, _code + _instr_count); + _max_ref = dec.max_ref(); + + // Now we know exactly how much code and data the program really needs + // realloc the buffers to exactly the right size so we don't waste any + // memory. + assert((bytecode_end - bytecode_begin) >= ptrdiff_t(_instr_count)); + assert((bytecode_end - bytecode_begin) >= ptrdiff_t(_data_size)); + memmove(_code + (_instr_count+1), _data, _data_size*sizeof(byte)); + size_t const total_sz = ((_instr_count+1) + (_data_size + sizeof(instr)-1)/sizeof(instr))*sizeof(instr); + if (_out) + *_out += total_sz; + else + { + instr * const old_code = _code; + _code = static_cast(realloc(_code, total_sz)); + if (!_code) free(old_code); + } + _data = reinterpret_cast(_code + (_instr_count+1)); + + if (!_code) + { + failure(alloc_failed); + return; + } + + // Make this RET_ZERO, we should never reach this but just in case ... + _code[_instr_count] = op_to_fn[RET_ZERO].impl[_constraint]; + +#ifdef GRAPHITE2_TELEMETRY + telemetry::count_bytes(_data_size + (_instr_count+1)*sizeof(instr)); +#endif +} + +Machine::Code::~Code() throw () +{ + if (_own) + release_buffers(); +} + + +bool Machine::Code::decoder::load(const byte * bc, const byte * bc_end) +{ + _max.bytecode = bc_end; + while (bc < bc_end) + { + const opcode opc = fetch_opcode(bc++); + if (opc == vm::MAX_OPCODE) + return false; + + analyse_opcode(opc, reinterpret_cast(bc)); + + if (!emit_opcode(opc, bc)) + return false; + } + + return bool(_code); +} + +// Validation check and fixups. +// + +opcode Machine::Code::decoder::fetch_opcode(const byte * bc) +{ + const byte opc = *bc++; + + // Do some basic sanity checks based on what we know about the opcode + if (!validate_opcode(opc, bc)) return MAX_OPCODE; + + // And check its arguments as far as possible + switch (opcode(opc)) + { + case NOP : + break; + case PUSH_BYTE : + case PUSH_BYTEU : + case PUSH_SHORT : + case PUSH_SHORTU : + case PUSH_LONG : + ++_stack_depth; + break; + case ADD : + case SUB : + case MUL : + case DIV : + case MIN_ : + case MAX_ : + case AND : + case OR : + case EQUAL : + case NOT_EQ : + case LESS : + case GTR : + case LESS_EQ : + case GTR_EQ : + case BITOR : + case BITAND : + if (--_stack_depth <= 0) + failure(underfull_stack); + break; + case NEG : + case TRUNC8 : + case TRUNC16 : + case NOT : + case BITNOT : + case BITSET : + if (_stack_depth <= 0) + failure(underfull_stack); + break; + case COND : + _stack_depth -= 2; + if (_stack_depth <= 0) + failure(underfull_stack); + break; + case NEXT_N : // runtime checked + break; + case NEXT : + case COPY_NEXT : + ++_out_index; + if (_out_index < -1 || _out_index > _out_length || _slotref > _max.rule_length) + failure(out_of_range_data); + break; + case PUT_GLYPH_8BIT_OBS : + valid_upto(_max.classes, bc[0]); + test_context(); + break; + case PUT_SUBS_8BIT_OBS : + test_ref(int8(bc[0])); + valid_upto(_max.classes, bc[1]); + valid_upto(_max.classes, bc[2]); + test_context(); + break; + case PUT_COPY : + test_ref(int8(bc[0])); + test_context(); + break; + case INSERT : + if (_passtype >= PASS_TYPE_POSITIONING) + failure(invalid_opcode); + ++_out_length; + if (_out_index < 0) ++_out_index; + if (_out_index < -1 || _out_index >= _out_length) + failure(out_of_range_data); + break; + case DELETE : + if (_passtype >= PASS_TYPE_POSITIONING) + failure(invalid_opcode); + if (_out_index < _max.pre_context) + failure(out_of_range_data); + --_out_index; + --_out_length; + if (_out_index < -1 || _out_index > _out_length) + failure(out_of_range_data); + break; + case ASSOC : + if (bc[0] == 0) + failure(out_of_range_data); + for (uint8 num = bc[0]; num; --num) + test_ref(int8(bc[num])); + test_context(); + break; + case CNTXT_ITEM : + valid_upto(_max.rule_length, _max.pre_context + int8(bc[0])); + if (bc + 2 + bc[1] >= _max.bytecode) failure(jump_past_end); + if (_in_ctxt_item) failure(nested_context_item); + break; + case ATTR_SET : + case ATTR_ADD : + case ATTR_SUB : + case ATTR_SET_SLOT : + if (--_stack_depth < 0) + failure(underfull_stack); + valid_upto(gr_slatMax, bc[0]); + if (attrCode(bc[0]) == gr_slatUserDefn) // use IATTR for user attributes + failure(out_of_range_data); + test_context(); + break; + case IATTR_SET_SLOT : + if (--_stack_depth < 0) + failure(underfull_stack); + if (valid_upto(gr_slatMax, bc[0])) + valid_upto(_max.attrid[bc[0]], bc[1]); + test_context(); + break; + case PUSH_SLOT_ATTR : + ++_stack_depth; + valid_upto(gr_slatMax, bc[0]); + test_ref(int8(bc[1])); + if (attrCode(bc[0]) == gr_slatUserDefn) // use IATTR for user attributes + failure(out_of_range_data); + break; + case PUSH_GLYPH_ATTR_OBS : + case PUSH_ATT_TO_GATTR_OBS : + ++_stack_depth; + valid_upto(_max.glyf_attrs, bc[0]); + test_ref(int8(bc[1])); + break; + case PUSH_ATT_TO_GLYPH_METRIC : + case PUSH_GLYPH_METRIC : + ++_stack_depth; + valid_upto(kgmetDescent, bc[0]); + test_ref(int8(bc[1])); + // level: dp[2] no check necessary + break; + case PUSH_FEAT : + ++_stack_depth; + valid_upto(_max.features, bc[0]); + test_ref(int8(bc[1])); + break; + case PUSH_ISLOT_ATTR : + ++_stack_depth; + if (valid_upto(gr_slatMax, bc[0])) + { + test_ref(int8(bc[1])); + valid_upto(_max.attrid[bc[0]], bc[2]); + } + break; + case PUSH_IGLYPH_ATTR :// not implemented + ++_stack_depth; + break; + case POP_RET : + if (--_stack_depth < 0) + failure(underfull_stack); + GR_FALLTHROUGH; + // no break + case RET_ZERO : + case RET_TRUE : + break; + case IATTR_SET : + case IATTR_ADD : + case IATTR_SUB : + if (--_stack_depth < 0) + failure(underfull_stack); + if (valid_upto(gr_slatMax, bc[0])) + valid_upto(_max.attrid[bc[0]], bc[1]); + test_context(); + break; + case PUSH_PROC_STATE : // dummy: dp[0] no check necessary + case PUSH_VERSION : + ++_stack_depth; + break; + case PUT_SUBS : + test_ref(int8(bc[0])); + valid_upto(_max.classes, uint16(bc[1]<< 8) | bc[2]); + valid_upto(_max.classes, uint16(bc[3]<< 8) | bc[4]); + test_context(); + break; + case PUT_SUBS2 : // not implemented + case PUT_SUBS3 : // not implemented + break; + case PUT_GLYPH : + valid_upto(_max.classes, uint16(bc[0]<< 8) | bc[1]); + test_context(); + break; + case PUSH_GLYPH_ATTR : + case PUSH_ATT_TO_GLYPH_ATTR : + ++_stack_depth; + valid_upto(_max.glyf_attrs, uint16(bc[0]<< 8) | bc[1]); + test_ref(int8(bc[2])); + break; + case SET_FEAT : + valid_upto(_max.features, bc[0]); + test_ref(int8(bc[1])); + break; + default: + failure(invalid_opcode); + break; + } + + return bool(_code) ? opcode(opc) : MAX_OPCODE; +} + + +void Machine::Code::decoder::analyse_opcode(const opcode opc, const int8 * arg) throw() +{ + switch (opc) + { + case DELETE : + _code._delete = true; + break; + case ASSOC : + set_changed(0); +// for (uint8 num = arg[0]; num; --num) +// _analysis.set_noref(num); + break; + case PUT_GLYPH_8BIT_OBS : + case PUT_GLYPH : + _code._modify = true; + set_changed(0); + break; + case ATTR_SET : + case ATTR_ADD : + case ATTR_SUB : + case ATTR_SET_SLOT : + case IATTR_SET_SLOT : + case IATTR_SET : + case IATTR_ADD : + case IATTR_SUB : + set_noref(0); + break; + case NEXT : + case COPY_NEXT : + ++_slotref; + _contexts[_slotref] = context(uint8(_code._instr_count+1)); + // if (_analysis.slotref > _analysis.max_ref) _analysis.max_ref = _analysis.slotref; + break; + case INSERT : + if (_slotref >= 0) --_slotref; + _code._modify = true; + break; + case PUT_SUBS_8BIT_OBS : // slotref on 1st parameter + case PUT_SUBS : + _code._modify = true; + set_changed(0); + GR_FALLTHROUGH; + // no break + case PUT_COPY : + if (arg[0] != 0) { set_changed(0); _code._modify = true; } + set_ref(arg[0]); + break; + case PUSH_GLYPH_ATTR_OBS : + case PUSH_SLOT_ATTR : + case PUSH_GLYPH_METRIC : + case PUSH_ATT_TO_GATTR_OBS : + case PUSH_ATT_TO_GLYPH_METRIC : + case PUSH_ISLOT_ATTR : + case PUSH_FEAT : + case SET_FEAT : + set_ref(arg[1]); + break; + case PUSH_ATT_TO_GLYPH_ATTR : + case PUSH_GLYPH_ATTR : + set_ref(arg[2]); + break; + default: + break; + } +} + + +bool Machine::Code::decoder::emit_opcode(opcode opc, const byte * & bc) +{ + const opcode_t * op_to_fn = Machine::getOpcodeTable(); + const opcode_t & op = op_to_fn[opc]; + if (op.impl[_code._constraint] == 0) + { + failure(unimplemented_opcode_used); + return false; + } + + const size_t param_sz = op.param_sz == VARARGS ? bc[0] + 1 : op.param_sz; + + // Add this instruction + *_instr++ = op.impl[_code._constraint]; + ++_code._instr_count; + + // Grab the parameters + if (param_sz) { + memcpy(_data, bc, param_sz * sizeof(byte)); + bc += param_sz; + _data += param_sz; + _code._data_size += param_sz; + } + + // recursively decode a context item so we can split the skip into + // instruction and data portions. + if (opc == CNTXT_ITEM) + { + assert(_out_index == 0); + _in_ctxt_item = true; + _out_index = _max.pre_context + int8(_data[-2]); + _slotref = int8(_data[-2]); + _out_length = _max.rule_length; + + const size_t ctxt_start = _code._instr_count; + byte & instr_skip = _data[-1]; + byte & data_skip = *_data++; + ++_code._data_size; + const byte *curr_end = _max.bytecode; + + if (load(bc, bc + instr_skip)) + { + bc += instr_skip; + data_skip = instr_skip - byte(_code._instr_count - ctxt_start); + instr_skip = byte(_code._instr_count - ctxt_start); + _max.bytecode = curr_end; + + _out_length = 1; + _out_index = 0; + _slotref = 0; + _in_ctxt_item = false; + } + else + { + _out_index = 0; + _slotref = 0; + return false; + } + } + + return bool(_code); +} + + +void Machine::Code::decoder::apply_analysis(instr * const code, instr * code_end) +{ + // insert TEMP_COPY commands for slots that need them (that change and are referenced later) + int tempcount = 0; + if (_code._constraint) return; + + const instr temp_copy = Machine::getOpcodeTable()[TEMP_COPY].impl[0]; + for (const context * c = _contexts, * const ce = c + _slotref; c < ce; ++c) + { + if (!c->flags.referenced || !c->flags.changed) continue; + + instr * const tip = code + c->codeRef + tempcount; + memmove(tip+1, tip, (code_end - tip) * sizeof(instr)); + *tip = temp_copy; + ++code_end; + ++tempcount; + _code._delete = true; + } + + _code._instr_count = code_end - code; +} + + +inline +bool Machine::Code::decoder::validate_opcode(const byte opc, const byte * const bc) +{ + if (opc >= MAX_OPCODE) + { + failure(invalid_opcode); + return false; + } + const opcode_t & op = Machine::getOpcodeTable()[opc]; + if (op.impl[_code._constraint] == 0) + { + failure(unimplemented_opcode_used); + return false; + } + if (op.param_sz == VARARGS && bc >= _max.bytecode) + { + failure(arguments_exhausted); + return false; + } + const size_t param_sz = op.param_sz == VARARGS ? bc[0] + 1 : op.param_sz; + if (bc - 1 + param_sz >= _max.bytecode) + { + failure(arguments_exhausted); + return false; + } + return true; +} + + +bool Machine::Code::decoder::valid_upto(const uint16 limit, const uint16 x) const throw() +{ + const bool t = (limit != 0) && (x < limit); + if (!t) failure(out_of_range_data); + return t; +} + +inline +bool Machine::Code::decoder::test_ref(int8 index) const throw() +{ + if (_code._constraint && !_in_ctxt_item) + { + if (index > 0 || -index > _max.pre_context) + { + failure(out_of_range_data); + return false; + } + } + else + return valid_upto(_max.rule_length, _slotref + _max.pre_context + index); + return true; +} + +bool Machine::Code::decoder::test_context() const throw() +{ + if (_out_index >= _out_length || _out_index < 0 || _slotref >= NUMCONTEXTS - 1) + { + failure(out_of_range_data); + return false; + } + return true; +} + +inline +void Machine::Code::failure(const status_t s) throw() { + release_buffers(); + _status = s; +} + + +inline +void Machine::Code::decoder::set_ref(int index) throw() { + if (index + _slotref < 0 || index + _slotref >= NUMCONTEXTS) return; + _contexts[index + _slotref].flags.referenced = true; + if (index + _slotref > _max_ref) _max_ref = index + _slotref; +} + + +inline +void Machine::Code::decoder::set_noref(int index) throw() { + if (index + _slotref < 0 || index + _slotref >= NUMCONTEXTS) return; + if (index + _slotref > _max_ref) _max_ref = index + _slotref; +} + + +inline +void Machine::Code::decoder::set_changed(int index) throw() { + if (index + _slotref < 0 || index + _slotref >= NUMCONTEXTS) return; + _contexts[index + _slotref].flags.changed= true; + if (index + _slotref > _max_ref) _max_ref = index + _slotref; +} + + +void Machine::Code::release_buffers() throw() +{ + if (_own) + free(_code); + _code = 0; + _data = 0; + _own = false; +} + + +int32 Machine::Code::run(Machine & m, slotref * & map) const +{ +// assert(_own); + assert(*this); // Check we are actually runnable + + if (m.slotMap().size() <= size_t(_max_ref + m.slotMap().context()) + || m.slotMap()[_max_ref + m.slotMap().context()] == 0) + { + m._status = Machine::slot_offset_out_bounds; + return 1; +// return m.run(_code, _data, map); + } + + return m.run(_code, _data, map); +} diff --git a/source/libs/graphite2/graphite2-src/src/Collider.cpp b/source/libs/graphite2/graphite2-src/src/Collider.cpp new file mode 100644 index 000000000..6b20a91c9 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/Collider.cpp @@ -0,0 +1,1115 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include +#include +#include +#include +#include +#include "inc/Collider.h" +#include "inc/Segment.h" +#include "inc/Slot.h" +#include "inc/GlyphCache.h" +#include "inc/Sparse.h" + +#define ISQRT2 0.707106781f + +// Possible rounding error for subbox boundaries: 0.016 = 1/64 = 1/256 * 4 +// (values in font range from 0..256) +// #define SUBBOX_RND_ERR 0.016 + +using namespace graphite2; + +//// SHIFT-COLLIDER //// + +// Initialize the Collider to hold the basic movement limits for the +// target slot, the one we are focusing on fixing. +bool ShiftCollider::initSlot(Segment *seg, Slot *aSlot, const Rect &limit, float margin, float marginWeight, + const Position &currShift, const Position &currOffset, int dir, GR_MAYBE_UNUSED json * const dbgout) +{ + int i; + float mx, mn; + float a, shift; + const GlyphCache &gc = seg->getFace()->glyphs(); + unsigned short gid = aSlot->gid(); + if (!gc.check(gid)) + return false; + const BBox &bb = gc.getBoundingBBox(gid); + const SlantBox &sb = gc.getBoundingSlantBox(gid); + //float sx = aSlot->origin().x + currShift.x; + //float sy = aSlot->origin().y + currShift.y; + if (currOffset.x != 0.f || currOffset.y != 0.f) + _limit = Rect(limit.bl - currOffset, limit.tr - currOffset); + else + _limit = limit; + // For a ShiftCollider, these indices indicate which vector we are moving by: + // each _ranges represents absolute space with respect to the origin of the slot. Thus take into account true origins but subtract the vmin for the slot + for (i = 0; i < 4; ++i) + { + switch (i) { + case 0 : // x direction + mn = _limit.bl.x + currOffset.x; + mx = _limit.tr.x + currOffset.x; + _len[i] = bb.xa - bb.xi; + a = currOffset.y + currShift.y; + _ranges[i].initialise(mn, mx, margin, marginWeight, a); + break; + case 1 : // y direction + mn = _limit.bl.y + currOffset.y; + mx = _limit.tr.y + currOffset.y; + _len[i] = bb.ya - bb.yi; + a = currOffset.x + currShift.x; + _ranges[i].initialise(mn, mx, margin, marginWeight, a); + break; + case 2 : // sum (negatively sloped diagonal boundaries) + // pick closest x,y limit boundaries in s direction + shift = currOffset.x + currOffset.y + currShift.x + currShift.y; + mn = -2 * min(currShift.x - _limit.bl.x, currShift.y - _limit.bl.y) + shift; + mx = 2 * min(_limit.tr.x - currShift.x, _limit.tr.y - currShift.y) + shift; + _len[i] = sb.sa - sb.si; + a = currOffset.x - currOffset.y + currShift.x - currShift.y; + _ranges[i].initialise(mn, mx, margin / ISQRT2, marginWeight, a); + break; + case 3 : // diff (positively sloped diagonal boundaries) + // pick closest x,y limit boundaries in d direction + shift = currOffset.x - currOffset.y + currShift.x - currShift.y; + mn = -2 * min(currShift.x - _limit.bl.x, _limit.tr.y - currShift.y) + shift; + mx = 2 * min(_limit.tr.x - currShift.x, currShift.y - _limit.bl.y) + shift; + _len[i] = sb.da - sb.di; + a = currOffset.x + currOffset.y + currShift.x + currShift.y; + _ranges[i].initialise(mn, mx, margin / ISQRT2, marginWeight, a); + break; + } + } + + _target = aSlot; + if ((dir & 1) == 0) + { + // For LTR, switch and negate x limits. + _limit.bl.x = -1 * limit.tr.x; + //_limit.tr.x = -1 * limit.bl.x; + } + _currOffset = currOffset; + _currShift = currShift; + _origin = aSlot->origin() - currOffset; // the original anchor position of the glyph + + _margin = margin; + _marginWt = marginWeight; + + SlotCollision *c = seg->collisionInfo(aSlot); + _seqClass = c->seqClass(); + _seqProxClass = c->seqProxClass(); + _seqOrder = c->seqOrder(); + return true; +} + +template +float sdm(float vi, float va, float mx, float my, O op) +{ + float res = 2 * mx - vi; + if (op(res, vi + 2 * my)) + { + res = va + 2 * my; + if (op(res, 2 * mx - va)) + res = mx + my; + } + return res; +} + +// Mark an area with a cost that can vary along the x or y axis. The region is expressed in terms of the centre of the target glyph in each axis +void ShiftCollider::addBox_slope(bool isx, const Rect &box, const BBox &bb, const SlantBox &sb, const Position &org, float weight, float m, bool minright, int axis) +{ + float a, c; + switch (axis) { + case 0 : + if (box.bl.y < org.y + bb.ya && box.tr.y > org.y + bb.yi && box.width() > 0) + { + a = org.y + 0.5f * (bb.yi + bb.ya); + c = 0.5f * (bb.xi + bb.xa); + if (isx) + _ranges[axis].weighted(box.bl.x - c, box.tr.x - c, weight, a, m, + (minright ? box.tr.x : box.bl.x) - c, a, 0, false); + else + _ranges[axis].weighted(box.bl.x - c, box.tr.x - c, weight, a, 0, 0, org.y, + m * (a * a + sqr((minright ? box.tr.y : box.bl.y) - 0.5f * (bb.yi + bb.ya))), false); + } + break; + case 1 : + if (box.bl.x < org.x + bb.xa && box.tr.x > org.x + bb.xi && box.height() > 0) + { + a = org.x + 0.5f * (bb.xi + bb.xa); + c = 0.5f * (bb.yi + bb.ya); + if (isx) + _ranges[axis].weighted(box.bl.y - c, box.tr.y - c, weight, a, 0, 0, org.x, + m * (a * a + sqr((minright ? box.tr.x : box.bl.x) - 0.5f * (bb.xi + bb.xa))), false); + else + _ranges[axis].weighted(box.bl.y - c, box.tr.y - c, weight, a, m, + (minright ? box.tr.y : box.bl.y) - c, a, 0, false); + } + break; + case 2 : + if (box.bl.x - box.tr.y < org.x - org.y + sb.da && box.tr.x - box.bl.y > org.x - org.y + sb.di) + { + float d = org.x - org.y + 0.5f * (sb.di + sb.da); + c = 0.5f * (sb.si + sb.sa); + float smax = min(2 * box.tr.x - d, 2 * box.tr.y + d); + float smin = max(2 * box.bl.x - d, 2 * box.bl.y + d); + if (smin > smax) return; + float si; + a = d; + if (isx) + si = 2 * (minright ? box.tr.x : box.bl.x) - a; + else + si = 2 * (minright ? box.tr.y : box.bl.y) + a; + _ranges[axis].weighted(smin - c, smax - c, weight / 2, a, m / 2, si, 0, 0, isx); + } + break; + case 3 : + if (box.bl.x + box.bl.y < org.x + org.y + sb.sa && box.tr.x + box.tr.y > org.x + org.y + sb.si) + { + float s = org.x + org.y + 0.5f * (sb.si + sb.sa); + c = 0.5f * (sb.di + sb.da); + float dmax = min(2 * box.tr.x - s, s - 2 * box.bl.y); + float dmin = max(2 * box.bl.x - s, s - 2 * box.tr.y); + if (dmin > dmax) return; + float di; + a = s; + if (isx) + di = 2 * (minright ? box.tr.x : box.bl.x) - a; + else + di = 2 * (minright ? box.tr.y : box.bl.y) + a; + _ranges[axis].weighted(dmin - c, dmax - c, weight / 2, a, m / 2, di, 0, 0, !isx); + } + break; + default : + break; + } + return; +} + +// Mark an area with an absolute cost, making it completely inaccessible. +inline void ShiftCollider::removeBox(const Rect &box, const BBox &bb, const SlantBox &sb, const Position &org, int axis) +{ + float c; + switch (axis) { + case 0 : + if (box.bl.y < org.y + bb.ya && box.tr.y > org.y + bb.yi && box.width() > 0) + { + c = 0.5f * (bb.xi + bb.xa); + _ranges[axis].exclude(box.bl.x - c, box.tr.x - c); + } + break; + case 1 : + if (box.bl.x < org.x + bb.xa && box.tr.x > org.x + bb.xi && box.height() > 0) + { + c = 0.5f * (bb.yi + bb.ya); + _ranges[axis].exclude(box.bl.y - c, box.tr.y - c); + } + break; + case 2 : + if (box.bl.x - box.tr.y < org.x - org.y + sb.da && box.tr.x - box.bl.y > org.x - org.y + sb.di + && box.width() > 0 && box.height() > 0) + { + float di = org.x - org.y + sb.di; + float da = org.x - org.y + sb.da; + float smax = sdm(di, da, box.tr.x, box.tr.y, std::greater()); + float smin = sdm(da, di, box.bl.x, box.bl.y, std::less()); + c = 0.5f * (sb.si + sb.sa); + _ranges[axis].exclude(smin - c, smax - c); + } + break; + case 3 : + if (box.bl.x + box.bl.y < org.x + org.y + sb.sa && box.tr.x + box.tr.y > org.x + org.y + sb.si + && box.width() > 0 && box.height() > 0) + { + float si = org.x + org.y + sb.si; + float sa = org.x + org.y + sb.sa; + float dmax = sdm(si, sa, box.tr.x, -box.bl.y, std::greater()); + float dmin = sdm(sa, si, box.bl.x, -box.tr.y, std::less()); + c = 0.5f * (sb.di + sb.da); + _ranges[axis].exclude(dmin - c, dmax - c); + } + break; + default : + break; + } + return; +} + +// Adjust the movement limits for the target to avoid having it collide +// with the given neighbor slot. Also determine if there is in fact a collision +// between the target and the given slot. +bool ShiftCollider::mergeSlot(Segment *seg, Slot *slot, const SlotCollision *cslot, const Position &currShift, + bool isAfter, // slot is logically after _target + bool sameCluster, bool &hasCol, bool isExclusion, + GR_MAYBE_UNUSED json * const dbgout ) +{ + bool isCol = false; + const float sx = slot->origin().x - _origin.x + currShift.x; + const float sy = slot->origin().y - _origin.y + currShift.y; + const float sd = sx - sy; + const float ss = sx + sy; + float vmin, vmax; + float omin, omax, otmin, otmax; + float cmin, cmax; // target limits + float torg; + const GlyphCache &gc = seg->getFace()->glyphs(); + const unsigned short gid = slot->gid(); + if (!gc.check(gid)) + return false; + const BBox &bb = gc.getBoundingBBox(gid); + + // SlotCollision * cslot = seg->collisionInfo(slot); + int orderFlags = 0; + bool sameClass = _seqProxClass == 0 && cslot->seqClass() == _seqClass; + if (sameCluster && _seqClass + && (sameClass || (_seqProxClass != 0 && cslot->seqClass() == _seqProxClass))) + // Force the target glyph to be in the specified direction from the slot we're testing. + orderFlags = _seqOrder; + + // short circuit if only interested in direct collision and we are out of range + if (orderFlags || (sx + bb.xa + _margin >= _limit.bl.x && sx + bb.xi - _margin <= _limit.tr.x) + || (sy + bb.ya + _margin >= _limit.bl.y && sy + bb.yi - _margin <= _limit.tr.y)) + + { + const float tx = _currOffset.x + _currShift.x; + const float ty = _currOffset.y + _currShift.y; + const float td = tx - ty; + const float ts = tx + ty; + const SlantBox &sb = gc.getBoundingSlantBox(gid); + const unsigned short tgid = _target->gid(); + const BBox &tbb = gc.getBoundingBBox(tgid); + const SlantBox &tsb = gc.getBoundingSlantBox(tgid); + float seq_above_wt = cslot->seqAboveWt(); + float seq_below_wt = cslot->seqBelowWt(); + float seq_valign_wt = cslot->seqValignWt(); + float lmargin; + // if isAfter, invert orderFlags for diagonal orders. + if (isAfter) + { + // invert appropriate bits + orderFlags ^= (sameClass ? 0x3F : 0x3); + // consider 2 bits at a time, non overlapping. If both bits set, clear them + orderFlags = orderFlags ^ ((((orderFlags >> 1) & orderFlags) & 0x15) * 3); + } + +#if !defined GRAPHITE2_NTRACING + if (dbgout) + dbgout->setenv(0, slot); +#endif + + // Process main bounding octabox. + for (int i = 0; i < 4; ++i) + { + switch (i) { + case 0 : // x direction + vmin = max(max(bb.xi - tbb.xa + sx, sb.di - tsb.da + ty + sd), sb.si - tsb.sa - ty + ss); + vmax = min(min(bb.xa - tbb.xi + sx, sb.da - tsb.di + ty + sd), sb.sa - tsb.si - ty + ss); + otmin = tbb.yi + ty; + otmax = tbb.ya + ty; + omin = bb.yi + sy; + omax = bb.ya + sy; + torg = _currOffset.x; + cmin = _limit.bl.x + torg; + cmax = _limit.tr.x - tbb.xi + tbb.xa + torg; + lmargin = _margin; + break; + case 1 : // y direction + vmin = max(max(bb.yi - tbb.ya + sy, tsb.di - sb.da + tx - sd), sb.si - tsb.sa - tx + ss); + vmax = min(min(bb.ya - tbb.yi + sy, tsb.da - sb.di + tx - sd), sb.sa - tsb.si - tx + ss); + otmin = tbb.xi + tx; + otmax = tbb.xa + tx; + omin = bb.xi + sx; + omax = bb.xa + sx; + torg = _currOffset.y; + cmin = _limit.bl.y + torg; + cmax = _limit.tr.y - tbb.yi + tbb.ya + torg; + lmargin = _margin; + break; + case 2 : // sum - moving along the positively-sloped vector, so the boundaries are the + // negatively-sloped boundaries. + vmin = max(max(sb.si - tsb.sa + ss, 2 * (bb.yi - tbb.ya + sy) + td), 2 * (bb.xi - tbb.xa + sx) - td); + vmax = min(min(sb.sa - tsb.si + ss, 2 * (bb.ya - tbb.yi + sy) + td), 2 * (bb.xa - tbb.xi + sx) - td); + otmin = tsb.di + td; + otmax = tsb.da + td; + omin = sb.di + sd; + omax = sb.da + sd; + torg = _currOffset.x + _currOffset.y; + cmin = _limit.bl.x + _limit.bl.y + torg; + cmax = _limit.tr.x + _limit.tr.y - tsb.si + tsb.sa + torg; + lmargin = _margin / ISQRT2; + break; + case 3 : // diff - moving along the negatively-sloped vector, so the boundaries are the + // positively-sloped boundaries. + vmin = max(max(sb.di - tsb.da + sd, 2 * (bb.xi - tbb.xa + sx) - ts), -2 * (bb.ya - tbb.yi + sy) + ts); + vmax = min(min(sb.da - tsb.di + sd, 2 * (bb.xa - tbb.xi + sx) - ts), -2 * (bb.yi - tbb.ya + sy) + ts); + otmin = tsb.si + ts; + otmax = tsb.sa + ts; + omin = sb.si + ss; + omax = sb.sa + ss; + torg = _currOffset.x - _currOffset.y; + cmin = _limit.bl.x - _limit.tr.y + torg; + cmax = _limit.tr.x - _limit.bl.y - tsb.di + tsb.da + torg; + lmargin = _margin / ISQRT2; + break; + default : + continue; + } + +#if !defined GRAPHITE2_NTRACING + if (dbgout) + dbgout->setenv(1, reinterpret_cast(-1)); +#define DBGTAG(x) if (dbgout) dbgout->setenv(1, reinterpret_cast(-x)); +#else +#define DBGTAG(x) +#endif + + if (orderFlags) + { + Position org(tx, ty); + float xminf = _limit.bl.x + _currOffset.x + tbb.xi; + float xpinf = _limit.tr.x + _currOffset.x + tbb.xa; + float ypinf = _limit.tr.y + _currOffset.y + tbb.ya; + float yminf = _limit.bl.y + _currOffset.y + tbb.yi; + switch (orderFlags) { + case SlotCollision::SEQ_ORDER_RIGHTUP : + { + float r1Xedge = cslot->seqAboveXoff() + 0.5f * (bb.xi + bb.xa) + sx; + float r3Xedge = cslot->seqBelowXlim() + bb.xa + sx + 0.5f * (tbb.xa - tbb.xi); + float r2Yedge = 0.5f * (bb.yi + bb.ya) + sy; + + // DBGTAG(1x) means the regions are up and right + // region 1 + DBGTAG(11) + addBox_slope(true, Rect(Position(xminf, r2Yedge), Position(r1Xedge, ypinf)), + tbb, tsb, org, 0, seq_above_wt, true, i); + // region 2 + DBGTAG(12) + removeBox(Rect(Position(xminf, yminf), Position(r3Xedge, r2Yedge)), tbb, tsb, org, i); + // region 3, which end is zero is irrelevant since m weight is 0 + DBGTAG(13) + addBox_slope(true, Rect(Position(r3Xedge, yminf), Position(xpinf, r2Yedge - cslot->seqValignHt())), + tbb, tsb, org, seq_below_wt, 0, true, i); + // region 4 + DBGTAG(14) + addBox_slope(false, Rect(Position(sx + bb.xi, r2Yedge), Position(xpinf, r2Yedge + cslot->seqValignHt())), + tbb, tsb, org, 0, seq_valign_wt, true, i); + // region 5 + DBGTAG(15) + addBox_slope(false, Rect(Position(sx + bb.xi, r2Yedge - cslot->seqValignHt()), Position(xpinf, r2Yedge)), + tbb, tsb, org, seq_below_wt, seq_valign_wt, false, i); + break; + } + case SlotCollision::SEQ_ORDER_LEFTDOWN : + { + float r1Xedge = 0.5f * (bb.xi + bb.xa) + cslot->seqAboveXoff() + sx; + float r3Xedge = bb.xi - cslot->seqBelowXlim() + sx - 0.5f * (tbb.xa - tbb.xi); + float r2Yedge = 0.5f * (bb.yi + bb.ya) + sy; + // DBGTAG(2x) means the regions are up and right + // region 1 + DBGTAG(21) + addBox_slope(true, Rect(Position(r1Xedge, yminf), Position(xpinf, r2Yedge)), + tbb, tsb, org, 0, seq_above_wt, false, i); + // region 2 + DBGTAG(22) + removeBox(Rect(Position(r3Xedge, r2Yedge), Position(xpinf, ypinf)), tbb, tsb, org, i); + // region 3 + DBGTAG(23) + addBox_slope(true, Rect(Position(xminf, r2Yedge - cslot->seqValignHt()), Position(r3Xedge, ypinf)), + tbb, tsb, org, seq_below_wt, 0, false, i); + // region 4 + DBGTAG(24) + addBox_slope(false, Rect(Position(xminf, r2Yedge), Position(sx + bb.xa, r2Yedge + cslot->seqValignHt())), + tbb, tsb, org, 0, seq_valign_wt, true, i); + // region 5 + DBGTAG(25) + addBox_slope(false, Rect(Position(xminf, r2Yedge - cslot->seqValignHt()), + Position(sx + bb.xa, r2Yedge)), tbb, tsb, org, seq_below_wt, seq_valign_wt, false, i); + break; + } + case SlotCollision::SEQ_ORDER_NOABOVE : // enforce neighboring glyph being above + DBGTAG(31); + removeBox(Rect(Position(bb.xi - tbb.xa + sx, sy + bb.ya), + Position(bb.xa - tbb.xi + sx, ypinf)), tbb, tsb, org, i); + break; + case SlotCollision::SEQ_ORDER_NOBELOW : // enforce neighboring glyph being below + DBGTAG(32); + removeBox(Rect(Position(bb.xi - tbb.xa + sx, yminf), + Position(bb.xa - tbb.xi + sx, sy + bb.yi)), tbb, tsb, org, i); + break; + case SlotCollision::SEQ_ORDER_NOLEFT : // enforce neighboring glyph being to the left + DBGTAG(33) + removeBox(Rect(Position(xminf, bb.yi - tbb.ya + sy), + Position(bb.xi - tbb.xa + sx, bb.ya - tbb.yi + sy)), tbb, tsb, org, i); + break; + case SlotCollision::SEQ_ORDER_NORIGHT : // enforce neighboring glyph being to the right + DBGTAG(34) + removeBox(Rect(Position(bb.xa - tbb.xi + sx, bb.yi - tbb.ya + sy), + Position(xpinf, bb.ya - tbb.yi + sy)), tbb, tsb, org, i); + break; + default : + break; + } + } + + if (vmax < cmin - lmargin || vmin > cmax + lmargin || omax < otmin - lmargin || omin > otmax + lmargin) + continue; + + // Process sub-boxes that are defined for this glyph. + // We only need to do this if there was in fact a collision with the main octabox. + uint8 numsub = gc.numSubBounds(gid); + if (numsub > 0) + { + bool anyhits = false; + for (int j = 0; j < numsub; ++j) + { + const BBox &sbb = gc.getSubBoundingBBox(gid, j); + const SlantBox &ssb = gc.getSubBoundingSlantBox(gid, j); + switch (i) { + case 0 : // x + vmin = max(max(sbb.xi-tbb.xa+sx, ssb.di-tsb.da+sd+ty), ssb.si-tsb.sa+ss-ty); + vmax = min(min(sbb.xa-tbb.xi+sx, ssb.da-tsb.di+sd+ty), ssb.sa-tsb.si+ss-ty); + omin = sbb.yi + sy; + omax = sbb.ya + sy; + break; + case 1 : // y + vmin = max(max(sbb.yi-tbb.ya+sy, tsb.di-ssb.da-sd+tx), ssb.si-tsb.sa+ss-tx); + vmax = min(min(sbb.ya-tbb.yi+sy, tsb.da-ssb.di-sd+tx), ssb.sa-tsb.si+ss-tx); + omin = sbb.xi + sx; + omax = sbb.xa + sx; + break; + case 2 : // sum + vmin = max(max(ssb.si-tsb.sa+ss, 2*(sbb.yi-tbb.ya+sy)+td), 2*(sbb.xi-tbb.xa+sx)-td); + vmax = min(min(ssb.sa-tsb.si+ss, 2*(sbb.ya-tbb.yi+sy)+td), 2*(sbb.xa-tbb.xi+sx)-td); + omin = ssb.di + sd; + omax = ssb.da + sd; + break; + case 3 : // diff + vmin = max(max(ssb.di-tsb.da+sd, 2*(sbb.xi-tbb.xa+sx)-ts), -2*(sbb.ya-tbb.yi+sy)+ts); + vmax = min(min(ssb.da-tsb.di+sd, 2*(sbb.xa-tbb.xi+sx)-ts), -2*(sbb.yi-tbb.ya+sy)+ts); + omin = ssb.si + ss; + omax = ssb.sa + ss; + break; + } + if (vmax < cmin - lmargin || vmin > cmax + lmargin || omax < otmin - lmargin || omin > otmax + lmargin) + continue; + +#if !defined GRAPHITE2_NTRACING + if (dbgout) + dbgout->setenv(1, reinterpret_cast(j)); +#endif + if (omin > otmax) + _ranges[i].weightedAxis(i, vmin - lmargin, vmax + lmargin, 0, 0, 0, 0, 0, + sqr(lmargin - omin + otmax) * _marginWt, false); + else if (omax < otmin) + _ranges[i].weightedAxis(i, vmin - lmargin, vmax + lmargin, 0, 0, 0, 0, 0, + sqr(lmargin - otmin + omax) * _marginWt, false); + else + _ranges[i].exclude_with_margins(vmin, vmax, i); + anyhits = true; + } + if (anyhits) + isCol = true; + } + else // no sub-boxes + { +#if !defined GRAPHITE2_NTRACING + if (dbgout) + dbgout->setenv(1, reinterpret_cast(-1)); +#endif + isCol = true; + if (omin > otmax) + _ranges[i].weightedAxis(i, vmin - lmargin, vmax + lmargin, 0, 0, 0, 0, 0, + sqr(lmargin - omin + otmax) * _marginWt, false); + else if (omax < otmin) + _ranges[i].weightedAxis(i, vmin - lmargin, vmax + lmargin, 0, 0, 0, 0, 0, + sqr(lmargin - otmin + omax) * _marginWt, false); + else + _ranges[i].exclude_with_margins(vmin, vmax, i); + + } + } + } + bool res = true; + if (cslot->exclGlyph() > 0 && gc.check(cslot->exclGlyph()) && !isExclusion) + { + // Set up the bogus slot representing the exclusion glyph. + Slot *exclSlot = seg->newSlot(); + if (!exclSlot) + return res; + exclSlot->setGlyph(seg, cslot->exclGlyph()); + Position exclOrigin(slot->origin() + cslot->exclOffset()); + exclSlot->origin(exclOrigin); + SlotCollision exclInfo(seg, exclSlot); + res &= mergeSlot(seg, exclSlot, &exclInfo, currShift, isAfter, sameCluster, isCol, true, dbgout ); + seg->freeSlot(exclSlot); + } + hasCol |= isCol; + return res; + +} // end of ShiftCollider::mergeSlot + + +// Figure out where to move the target glyph to, and return the amount to shift by. +Position ShiftCollider::resolve(GR_MAYBE_UNUSED Segment *seg, bool &isCol, GR_MAYBE_UNUSED json * const dbgout) +{ + float tbase; + float totalCost = (float)(std::numeric_limits::max() / 2); + Position resultPos = Position(0, 0); +#if !defined GRAPHITE2_NTRACING + int bestAxis = -1; + if (dbgout) + { + outputJsonDbgStartSlot(dbgout, seg); + *dbgout << "vectors" << json::array; + } +#endif + isCol = true; + for (int i = 0; i < 4; ++i) + { + float bestCost = -1; + float bestPos; + // Calculate the margin depending on whether we are moving diagonally or not: + switch (i) { + case 0 : // x direction + tbase = _currOffset.x; + break; + case 1 : // y direction + tbase = _currOffset.y; + break; + case 2 : // sum (negatively-sloped diagonals) + tbase = _currOffset.x + _currOffset.y; + break; + case 3 : // diff (positively-sloped diagonals) + tbase = _currOffset.x - _currOffset.y; + break; + } + Position testp; + bestPos = _ranges[i].closest(0, bestCost) - tbase; // Get the best relative position +#if !defined GRAPHITE2_NTRACING + if (dbgout) + outputJsonDbgOneVector(dbgout, seg, i, tbase, bestCost, bestPos) ; +#endif + if (bestCost >= 0.0f) + { + isCol = false; + switch (i) { + case 0 : testp = Position(bestPos, _currShift.y); break; + case 1 : testp = Position(_currShift.x, bestPos); break; + case 2 : testp = Position(0.5f * (_currShift.x - _currShift.y + bestPos), 0.5f * (_currShift.y - _currShift.x + bestPos)); break; + case 3 : testp = Position(0.5f * (_currShift.x + _currShift.y + bestPos), 0.5f * (_currShift.x + _currShift.y - bestPos)); break; + } + if (bestCost < totalCost - 0.01f) + { + totalCost = bestCost; + resultPos = testp; +#if !defined GRAPHITE2_NTRACING + bestAxis = i; +#endif + } + } + } // end of loop over 4 directions + +#if !defined GRAPHITE2_NTRACING + if (dbgout) + outputJsonDbgEndSlot(dbgout, resultPos, bestAxis, isCol); +#endif + + return resultPos; + +} // end of ShiftCollider::resolve + + +#if !defined GRAPHITE2_NTRACING + +void ShiftCollider::outputJsonDbg(json * const dbgout, Segment *seg, int axis) +{ + int axisMax = axis; + if (axis < 0) // output all axes + { + *dbgout << "gid" << _target->gid() + << "limit" << _limit + << "target" << json::object + << "origin" << _target->origin() + << "margin" << _margin + << "bbox" << seg->theGlyphBBoxTemporary(_target->gid()) + << "slantbox" << seg->getFace()->glyphs().slant(_target->gid()) + << json::close; // target object + *dbgout << "ranges" << json::array; + axis = 0; + axisMax = 3; + } + for (int iAxis = axis; iAxis <= axisMax; ++iAxis) + { + *dbgout << json::flat << json::array << _ranges[iAxis].position(); + for (Zones::const_iterator s = _ranges[iAxis].begin(), e = _ranges[iAxis].end(); s != e; ++s) + *dbgout << json::flat << json::array + << Position(s->x, s->xm) << s->sm << s->smx << s->c + << json::close; + *dbgout << json::close; + } + if (axis < axisMax) // looped through the _ranges array for all axes + *dbgout << json::close; // ranges array +} + +void ShiftCollider::outputJsonDbgStartSlot(json * const dbgout, Segment *seg) +{ + *dbgout << json::object // slot - not closed till the end of the caller method + << "slot" << objectid(dslot(seg, _target)) + << "gid" << _target->gid() + << "limit" << _limit + << "target" << json::object + << "origin" << _origin + << "currShift" << _currShift + << "currOffset" << seg->collisionInfo(_target)->offset() + << "bbox" << seg->theGlyphBBoxTemporary(_target->gid()) + << "slantBox" << seg->getFace()->glyphs().slant(_target->gid()) + << "fix" << "shift"; + *dbgout << json::close; // target object +} + +void ShiftCollider::outputJsonDbgEndSlot(GR_MAYBE_UNUSED json * const dbgout, + Position resultPos, int bestAxis, bool isCol) +{ + *dbgout << json::close // vectors array + << "result" << resultPos + //<< "scraping" << _scraping[bestAxis] + << "bestAxis" << bestAxis + << "stillBad" << isCol + << json::close; // slot object +} + +void ShiftCollider::outputJsonDbgOneVector(json * const dbgout, Segment *seg, int axis, + float tleft, float bestCost, float bestVal) +{ + const char * label; + switch (axis) + { + case 0: label = "x"; break; + case 1: label = "y"; break; + case 2: label = "sum (NE-SW)"; break; + case 3: label = "diff (NW-SE)"; break; + default: label = "???"; break; + } + + *dbgout << json::object // vector + << "direction" << label + << "targetMin" << tleft; + + outputJsonDbgRemovals(dbgout, axis, seg); + + *dbgout << "ranges"; + outputJsonDbg(dbgout, seg, axis); + + *dbgout << "bestCost" << bestCost + << "bestVal" << bestVal + tleft + << json::close; // vectors object +} + +void ShiftCollider::outputJsonDbgRemovals(json * const dbgout, int axis, Segment *seg) +{ + *dbgout << "removals" << json::array; + _ranges[axis].jsonDbgOut(seg); + *dbgout << json::close; // removals array +} + +#endif // !defined GRAPHITE2_NTRACING + + +//// KERN-COLLIDER //// + +inline +static float localmax (float al, float au, float bl, float bu, float x) +{ + if (al < bl) + { if (au < bu) return au < x ? au : x; } + else if (au > bu) return bl < x ? bl : x; + return x; +} + +inline +static float localmin(float al, float au, float bl, float bu, float x) +{ + if (bl > al) + { if (bu > au) return bl > x ? bl : x; } + else if (au > bu) return al > x ? al : x; + return x; +} + +// Return the given edge of the glyph at height y, taking any slant box into account. +static float get_edge(Segment *seg, const Slot *s, const Position &shift, float y, float width, float margin, bool isRight) +{ + const GlyphCache &gc = seg->getFace()->glyphs(); + unsigned short gid = s->gid(); + float sx = s->origin().x + shift.x; + float sy = s->origin().y + shift.y; + uint8 numsub = gc.numSubBounds(gid); + float res = isRight ? (float)-1e38 : (float)1e38; + + if (numsub > 0) + { + for (int i = 0; i < numsub; ++i) + { + const BBox &sbb = gc.getSubBoundingBBox(gid, i); + const SlantBox &ssb = gc.getSubBoundingSlantBox(gid, i); + if (sy + sbb.yi - margin > y + width / 2 || sy + sbb.ya + margin < y - width / 2) + continue; + if (isRight) + { + float x = sx + sbb.xa + margin; + if (x > res) + { + float td = sx - sy + ssb.da + margin + y; + float ts = sx + sy + ssb.sa + margin - y; + x = localmax(td - width / 2, td + width / 2, ts - width / 2, ts + width / 2, x); + if (x > res) + res = x; + } + } + else + { + float x = sx + sbb.xi - margin; + if (x < res) + { + float td = sx - sy + ssb.di - margin + y; + float ts = sx + sy + ssb.si - margin - y; + x = localmin(td - width / 2, td + width / 2, ts - width / 2, ts + width / 2, x); + if (x < res) + res = x; + } + } + } + } + else + { + const BBox &bb = gc.getBoundingBBox(gid); + const SlantBox &sb = gc.getBoundingSlantBox(gid); + if (sy + bb.yi - margin > y + width / 2 || sy + bb.ya + margin < y - width / 2) + return res; + float td = sx - sy + y; + float ts = sx + sy - y; + if (isRight) + res = localmax(td + sb.da - width / 2, td + sb.da + width / 2, ts + sb.sa - width / 2, ts + sb.sa + width / 2, sx + bb.xa) + margin; + else + res = localmin(td + sb.di - width / 2, td + sb.di + width / 2, ts + sb.si - width / 2, ts + sb.si + width / 2, sx + bb.xi) - margin; + } + return res; +} + + +bool KernCollider::initSlot(Segment *seg, Slot *aSlot, const Rect &limit, float margin, + const Position &currShift, const Position &offsetPrev, int dir, + float ymin, float ymax, GR_MAYBE_UNUSED json * const dbgout) +{ + const GlyphCache &gc = seg->getFace()->glyphs(); + const Slot *base = aSlot; + // const Slot *last = aSlot; + const Slot *s; + int numSlices; + while (base->attachedTo()) + base = base->attachedTo(); + if (margin < 10) margin = 10; + + _limit = limit; + _offsetPrev = offsetPrev; // kern from a previous pass + + // Calculate the height of the glyph and how many horizontal slices to use. + if (_maxy >= 1e37f) + { + _sliceWidth = margin / 1.5f; + _maxy = ymax + margin; + _miny = ymin - margin; + numSlices = int((_maxy - _miny + 2) / (_sliceWidth / 1.5f) + 1.f); // +2 helps with rounding errors + _edges.clear(); + _edges.insert(_edges.begin(), numSlices, (dir & 1) ? 1e38f : -1e38f); + _xbound = (dir & 1) ? (float)1e38f : (float)-1e38f; + } + else if (_maxy != ymax || _miny != ymin) + { + if (_miny != ymin) + { + numSlices = int((ymin - margin - _miny) / _sliceWidth - 1); + _miny += numSlices * _sliceWidth; + if (numSlices < 0) + _edges.insert(_edges.begin(), -numSlices, (dir & 1) ? 1e38f : -1e38f); + else if ((unsigned)numSlices < _edges.size()) // this shouldn't fire since we always grow the range + { + Vector::iterator e = _edges.begin(); + while (numSlices--) + ++e; + _edges.erase(_edges.begin(), e); + } + } + if (_maxy != ymax) + { + numSlices = int((ymax + margin - _miny) / _sliceWidth + 1); + _maxy = numSlices * _sliceWidth + _miny; + if (numSlices > (int)_edges.size()) + _edges.insert(_edges.end(), numSlices - _edges.size(), (dir & 1) ? 1e38f : -1e38f); + else if (numSlices < (int)_edges.size()) // this shouldn't fire since we always grow the range + { + while ((int)_edges.size() > numSlices) + _edges.pop_back(); + } + } + goto done; + } + numSlices = int(_edges.size()); + +#if !defined GRAPHITE2_NTRACING + // Debugging + _seg = seg; + _slotNear.clear(); + _slotNear.insert(_slotNear.begin(), numSlices, NULL); + _nearEdges.clear(); + _nearEdges.insert(_nearEdges.begin(), numSlices, (dir & 1) ? -1e38f : +1e38f); +#endif + + // Determine the trailing edge of each slice (ie, left edge for a RTL glyph). + for (s = base; s; s = s->nextInCluster(s)) + { + SlotCollision *c = seg->collisionInfo(s); + if (!gc.check(s->gid())) + return false; + const BBox &bs = gc.getBoundingBBox(s->gid()); + float x = s->origin().x + c->shift().x + ((dir & 1) ? bs.xi : bs.xa); + // Loop over slices. + // Note smin might not be zero if glyph s is not at the bottom of the cluster; similarly for smax. + float toffset = c->shift().y - _miny + 1 + s->origin().y; + int smin = max(0, int((bs.yi + toffset) / _sliceWidth)); + int smax = min(numSlices - 1, int((bs.ya + toffset) / _sliceWidth + 1)); + for (int i = smin; i <= smax; ++i) + { + float t; + float y = _miny - 1 + (i + .5f) * _sliceWidth; // vertical center of slice + if ((dir & 1) && x < _edges[i]) + { + t = get_edge(seg, s, c->shift(), y, _sliceWidth, margin, false); + if (t < _edges[i]) + { + _edges[i] = t; + if (t < _xbound) + _xbound = t; + } + } + else if (!(dir & 1) && x > _edges[i]) + { + t = get_edge(seg, s, c->shift(), y, _sliceWidth, margin, true); + if (t > _edges[i]) + { + _edges[i] = t; + if (t > _xbound) + _xbound = t; + } + } + } + } + done: + _mingap = (float)1e37; // less than 1e38 s.t. 1e38-_mingap is really big + _target = aSlot; + _margin = margin; + _currShift = currShift; + return true; +} // end of KernCollider::initSlot + + +// Determine how much the target slot needs to kern away from the given slot. +// In other words, merge information from given slot's position with what the target slot knows +// about how it can kern. +// Return false if we know there is no collision, true if we think there might be one. +bool KernCollider::mergeSlot(Segment *seg, Slot *slot, const Position &currShift, float currSpace, int dir, GR_MAYBE_UNUSED json * const dbgout) +{ + int rtl = (dir & 1) * 2 - 1; + if (!seg->getFace()->glyphs().check(slot->gid())) + return false; + const Rect &bb = seg->theGlyphBBoxTemporary(slot->gid()); + const float sx = slot->origin().x + currShift.x; + float x = (sx + (rtl > 0 ? bb.tr.x : bb.bl.x)) * rtl; + // this isn't going to reduce _mingap so skip + if (_hit && x < rtl * (_xbound - _mingap - currSpace)) + return false; + + const float sy = slot->origin().y + currShift.y; + int smin = max(1, int((bb.bl.y + (1 - _miny + sy)) / _sliceWidth + 1)) - 1; + int smax = min((int)_edges.size() - 2, int((bb.tr.y + (1 - _miny + sy)) / _sliceWidth + 1)) + 1; + if (smin > smax) + return false; + bool collides = false; + bool nooverlap = true; + + for (int i = smin; i <= smax; ++i) + { + float here = _edges[i] * rtl; + if (here > (float)9e37) + continue; + if (!_hit || x > here - _mingap - currSpace) + { + float y = (float)(_miny - 1 + (i + .5f) * _sliceWidth); // vertical center of slice + // 2 * currSpace to account for the space that is already separating them and the space we want to add + float m = get_edge(seg, slot, currShift, y, _sliceWidth, 0., rtl > 0) * rtl + 2 * currSpace; + if (m < (float)-8e37) // only true if the glyph has a gap in it + continue; + nooverlap = false; + float t = here - m; + // _mingap is positive to shrink + if (t < _mingap || (!_hit && !collides)) + { + _mingap = t; + collides = true; + } +#if !defined GRAPHITE2_NTRACING + // Debugging - remember the closest neighboring edge for this slice. + if (m > rtl * _nearEdges[i]) + { + _slotNear[i] = slot; + _nearEdges[i] = m * rtl; + } +#endif + } + else + nooverlap = false; + } + if (nooverlap) + _mingap = max(_mingap, _xbound - rtl * (currSpace + _margin + x)); + if (collides && !nooverlap) + _hit = true; + return collides | nooverlap; // note that true is not a necessarily reliable value + +} // end of KernCollider::mergeSlot + + +// Return the amount to kern by. +Position KernCollider::resolve(GR_MAYBE_UNUSED Segment *seg, GR_MAYBE_UNUSED Slot *slot, + int dir, GR_MAYBE_UNUSED json * const dbgout) +{ + float resultNeeded = (1 - 2 * (dir & 1)) * _mingap; + // float resultNeeded = (1 - 2 * (dir & 1)) * (_mingap - margin); + float result = min(_limit.tr.x - _offsetPrev.x, max(resultNeeded, _limit.bl.x - _offsetPrev.x)); + +#if !defined GRAPHITE2_NTRACING + if (dbgout) + { + *dbgout << json::object // slot + << "slot" << objectid(dslot(seg, _target)) + << "gid" << _target->gid() + << "limit" << _limit + << "miny" << _miny + << "maxy" << _maxy + << "slicewidth" << _sliceWidth + << "target" << json::object + << "origin" << _target->origin() + //<< "currShift" << _currShift + << "offsetPrev" << _offsetPrev + << "bbox" << seg->theGlyphBBoxTemporary(_target->gid()) + << "slantBox" << seg->getFace()->glyphs().slant(_target->gid()) + << "fix" << "kern" + << json::close; // target object + + *dbgout << "slices" << json::array; + for (int is = 0; is < (int)_edges.size(); is++) + { + *dbgout << json::flat << json::object + << "i" << is + << "targetEdge" << _edges[is] + << "neighbor" << objectid(dslot(seg, _slotNear[is])) + << "nearEdge" << _nearEdges[is] + << json::close; + } + *dbgout << json::close; // slices array + + *dbgout + << "xbound" << _xbound + << "minGap" << _mingap + << "needed" << resultNeeded + << "result" << result + << "stillBad" << (result != resultNeeded) + << json::close; // slot object + } +#endif + + return Position(result, 0.); + +} // end of KernCollider::resolve + +void KernCollider::shift(const Position &mv, int dir) +{ + for (Vector::iterator e = _edges.begin(); e != _edges.end(); ++e) + *e += mv.x; + _xbound += (1 - 2 * (dir & 1)) * mv.x; +} + +//// SLOT-COLLISION //// + +// Initialize the collision attributes for the given slot. +SlotCollision::SlotCollision(Segment *seg, Slot *slot) +{ + initFromSlot(seg, slot); +} + +void SlotCollision::initFromSlot(Segment *seg, Slot *slot) +{ + // Initialize slot attributes from glyph attributes. + // The order here must match the order in the grcompiler code, + // GrcSymbolTable::AssignInternalGlyphAttrIDs. + uint16 gid = slot->gid(); + uint16 aCol = seg->silf()->aCollision(); // flags attr ID + const GlyphFace * glyphFace = seg->getFace()->glyphs().glyphSafe(gid); + if (!glyphFace) + return; + const sparse &p = glyphFace->attrs(); + _flags = p[aCol]; + _limit = Rect(Position(p[aCol+1], p[aCol+2]), + Position(p[aCol+3], p[aCol+4])); + _margin = p[aCol+5]; + _marginWt = p[aCol+6]; + + _seqClass = p[aCol+7]; + _seqProxClass = p[aCol+8]; + _seqOrder = p[aCol+9]; + _seqAboveXoff = p[aCol+10]; + _seqAboveWt = p[aCol+11]; + _seqBelowXlim = p[aCol+12]; + _seqBelowWt = p[aCol+13]; + _seqValignHt = p[aCol+14]; + _seqValignWt = p[aCol+15]; + + // These attributes do not have corresponding glyph attribute: + _exclGlyph = 0; + _exclOffset = Position(0, 0); +} + +float SlotCollision::getKern(int dir) const +{ + if ((_flags & SlotCollision::COLL_KERN) != 0) + return float(_shift.x * ((dir & 1) ? -1 : 1)); + else + return 0; +} + +bool SlotCollision::ignore() const +{ + return ((flags() & SlotCollision::COLL_IGNORE) || (flags() & SlotCollision::COLL_ISSPACE)); +} diff --git a/source/libs/graphite2/graphite2-src/src/Decompressor.cpp b/source/libs/graphite2/graphite2-src/src/Decompressor.cpp new file mode 100644 index 000000000..42dc9113e --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/Decompressor.cpp @@ -0,0 +1,125 @@ +/* GRAPHITE2 LICENSING + + Copyright 2015, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include + +#include "inc/Decompressor.h" +#include "inc/Compression.h" + +using namespace lz4; + +namespace { + +inline +u32 read_literal(u8 const * &s, u8 const * const e, u32 l) { + if (l == 15 && s != e) + { + u8 b = 0; + do { l += b = *s++; } while(b==0xff && s != e); + } + return l; +} + +bool read_sequence(u8 const * &src, u8 const * const end, u8 const * &literal, + u32 & literal_len, u32 & match_len, u32 & match_dist) +{ + u8 const token = *src++; + + literal_len = read_literal(src, end, token >> 4); + literal = src; + src += literal_len; + + // Normal exit for end of stream, wrap arround check and parital match check. + if (src > end - sizeof(u16) || src < literal) + return false; + + match_dist = *src++; + match_dist |= *src++ << 8; + match_len = read_literal(src, end, token & 0xf) + MINMATCH; + + // Malformed stream check. + return src <= end-MINCODA; +} + +} + +int lz4::decompress(void const *in, size_t in_size, void *out, size_t out_size) +{ + if (out_size <= in_size || in_size < MINSRCSIZE) + return -1; + + u8 const * src = static_cast(in), + * literal = 0, + * const src_end = src + in_size; + + u8 * dst = static_cast(out), + * const dst_end = dst + out_size; + + // Check the in and out size hasn't wrapped around. + if (src >= src_end || dst >= dst_end) + return -1; + + u32 literal_len = 0, + match_len = 0, + match_dist = 0; + + while (read_sequence(src, src_end, literal, literal_len, match_len, + match_dist)) + { + if (literal_len != 0) + { + // Copy in literal. At this point the a minimal literal + minminal + // match plus the coda (1 + 2 + 5) must be 8 bytes or more allowing + // us to remain within the src buffer for an overrun_copy on + // machines upto 64 bits. + if (align(literal_len) > out_size) + return -1; + dst = overrun_copy(dst, literal, literal_len); + out_size -= literal_len; + } + + // Copy, possibly repeating, match from earlier in the + // decoded output. + u8 const * const pcpy = dst - match_dist; + if (pcpy < static_cast(out) + || match_len > unsigned(out_size - LASTLITERALS) + // Wrap around checks: + || out_size < LASTLITERALS || pcpy >= dst) + return -1; + if (dst > pcpy+sizeof(unsigned long) + && align(match_len) <= out_size) + dst = overrun_copy(dst, pcpy, match_len); + else + dst = safe_copy(dst, pcpy, match_len); + out_size -= match_len; + } + + if (literal > src_end - literal_len || literal_len > out_size) + return -1; + dst = fast_copy(dst, literal, literal_len); + + return int(dst - (u8*)out); +} diff --git a/source/libs/graphite2/graphite2-src/src/Face.cpp b/source/libs/graphite2/graphite2-src/src/Face.cpp new file mode 100644 index 000000000..3e106050d --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/Face.cpp @@ -0,0 +1,366 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include +#include "graphite2/Segment.h" +#include "inc/CmapCache.h" +#include "inc/debug.h" +#include "inc/Decompressor.h" +#include "inc/Endian.h" +#include "inc/Face.h" +#include "inc/FileFace.h" +#include "inc/GlyphFace.h" +#include "inc/json.h" +#include "inc/Segment.h" +#include "inc/NameTable.h" +#include "inc/Error.h" + +using namespace graphite2; + +namespace +{ +enum compression +{ + NONE, + LZ4 +}; + +} + +Face::Face(const void* appFaceHandle/*non-NULL*/, const gr_face_ops & ops) +: m_appFaceHandle(appFaceHandle), + m_pFileFace(NULL), + m_pGlyphFaceCache(NULL), + m_cmap(NULL), + m_pNames(NULL), + m_logger(NULL), + m_error(0), m_errcntxt(0), + m_silfs(NULL), + m_numSilf(0), + m_ascent(0), + m_descent(0) +{ + memset(&m_ops, 0, sizeof m_ops); + memcpy(&m_ops, &ops, min(sizeof m_ops, ops.size)); +} + + +Face::~Face() +{ + setLogger(0); + delete m_pGlyphFaceCache; + delete m_cmap; + delete[] m_silfs; +#ifndef GRAPHITE2_NFILEFACE + delete m_pFileFace; +#endif + delete m_pNames; +} + +float Face::default_glyph_advance(const void* font_ptr, gr_uint16 glyphid) +{ + const Font & font = *reinterpret_cast(font_ptr); + + return font.face().glyphs().glyph(glyphid)->theAdvance().x * font.scale(); +} + +bool Face::readGlyphs(uint32 faceOptions) +{ + Error e; +#ifdef GRAPHITE2_TELEMETRY + telemetry::category _glyph_cat(tele.glyph); +#endif + error_context(EC_READGLYPHS); + m_pGlyphFaceCache = new GlyphCache(*this, faceOptions); + + if (e.test(!m_pGlyphFaceCache, E_OUTOFMEM) + || e.test(m_pGlyphFaceCache->numGlyphs() == 0, E_NOGLYPHS) + || e.test(m_pGlyphFaceCache->unitsPerEm() == 0, E_BADUPEM)) + { + return error(e); + } + + if (faceOptions & gr_face_cacheCmap) + m_cmap = new CachedCmap(*this); + else + m_cmap = new DirectCmap(*this); + if (e.test(!m_cmap, E_OUTOFMEM) || e.test(!*m_cmap, E_BADCMAP)) + return error(e); + + if (faceOptions & gr_face_preloadGlyphs) + nameTable(); // preload the name table along with the glyphs. + + return true; +} + +bool Face::readGraphite(const Table & silf) +{ +#ifdef GRAPHITE2_TELEMETRY + telemetry::category _silf_cat(tele.silf); +#endif + Error e; + error_context(EC_READSILF); + const byte * p = silf; + if (e.test(!p, E_NOSILF) || e.test(silf.size() < 20, E_BADSIZE)) return error(e); + + const uint32 version = be::read(p); + if (e.test(version < 0x00020000, E_TOOOLD)) return error(e); + if (version >= 0x00030000) + be::skip(p); // compilerVersion + m_numSilf = be::read(p); + + be::skip(p); // reserved + + bool havePasses = false; + m_silfs = new Silf[m_numSilf]; + if (e.test(!m_silfs, E_OUTOFMEM)) return error(e); + for (int i = 0; i < m_numSilf; i++) + { + error_context(EC_ASILF + (i << 8)); + const uint32 offset = be::read(p), + next = i == m_numSilf - 1 ? uint32(silf.size()) : be::peek(p); + if (e.test(next > silf.size() || offset >= next, E_BADSIZE)) + return error(e); + + if (!m_silfs[i].readGraphite(silf + offset, next - offset, *this, version)) + return false; + + if (m_silfs[i].numPasses()) + havePasses = true; + } + + return havePasses; +} + +bool Face::readFeatures() +{ + return m_Sill.readFace(*this); +} + +bool Face::runGraphite(Segment *seg, const Silf *aSilf) const +{ +#if !defined GRAPHITE2_NTRACING + json * dbgout = logger(); + if (dbgout) + { + *dbgout << json::object + << "id" << objectid(seg) + << "passes" << json::array; + } +#endif + +// if ((seg->dir() & 1) != aSilf->dir()) +// seg->reverseSlots(); + if ((seg->dir() & 3) == 3 && aSilf->bidiPass() == 0xFF) + seg->doMirror(aSilf->aMirror()); + bool res = aSilf->runGraphite(seg, 0, aSilf->positionPass(), true); + if (res) + { + seg->associateChars(0, seg->charInfoCount()); + if (aSilf->flags() & 0x20) + res &= seg->initCollisions(); + if (res) + res &= aSilf->runGraphite(seg, aSilf->positionPass(), aSilf->numPasses(), false); + } + +#if !defined GRAPHITE2_NTRACING + if (dbgout) +{ + seg->positionSlots(0, 0, 0, seg->currdir()); + *dbgout << json::item + << json::close // Close up the passes array + << "outputdir" << (seg->currdir() ? "rtl" : "ltr") + << "output" << json::array; + for(Slot * s = seg->first(); s; s = s->next()) + *dbgout << dslot(seg, s); + *dbgout << json::close + << "advance" << seg->advance() + << "chars" << json::array; + for(size_t i = 0, n = seg->charInfoCount(); i != n; ++i) + *dbgout << json::flat << *seg->charinfo(int(i)); + *dbgout << json::close // Close up the chars array + << json::close; // Close up the segment object + } +#endif + + return res; +} + +void Face::setLogger(FILE * log_file GR_MAYBE_UNUSED) +{ +#if !defined GRAPHITE2_NTRACING + delete m_logger; + m_logger = log_file ? new json(log_file) : 0; +#endif +} + +const Silf *Face::chooseSilf(uint32 script) const +{ + if (m_numSilf == 0) + return NULL; + else if (m_numSilf == 1 || script == 0) + return m_silfs; + else // do more work here + return m_silfs; +} + +uint16 Face::findPseudo(uint32 uid) const +{ + return (m_numSilf) ? m_silfs[0].findPseudo(uid) : 0; +} + +int32 Face::getGlyphMetric(uint16 gid, uint8 metric) const +{ + switch (metrics(metric)) + { + case kgmetAscent : return m_ascent; + case kgmetDescent : return m_descent; + default: + if (gid >= glyphs().numGlyphs()) return 0; + return glyphs().glyph(gid)->getMetric(metric); + } +} + +void Face::takeFileFace(FileFace* pFileFace GR_MAYBE_UNUSED/*takes ownership*/) +{ +#ifndef GRAPHITE2_NFILEFACE + if (m_pFileFace==pFileFace) + return; + + delete m_pFileFace; + m_pFileFace = pFileFace; +#endif +} + +NameTable * Face::nameTable() const +{ + if (m_pNames) return m_pNames; + const Table name(*this, Tag::name); + if (name) + m_pNames = new NameTable(name, name.size()); + return m_pNames; +} + +uint16 Face::languageForLocale(const char * locale) const +{ + nameTable(); + if (m_pNames) + return m_pNames->getLanguageId(locale); + return 0; +} + + + +Face::Table::Table(const Face & face, const Tag n, uint32 version) throw() +: _f(&face), _sz(0), _compressed(false) +{ + _p = static_cast((*_f->m_ops.get_table)(_f->m_appFaceHandle, n, &_sz)); + + if (!TtfUtil::CheckTable(n, _p, _sz)) + { + release(); // Make sure we release the table buffer even if the table failed its checks + return; + } + + if (be::peek(_p) >= version) + decompress(); +} + +void Face::Table::release() +{ + if (_compressed) + free(const_cast(_p)); + else if (_p && _f->m_ops.release_table) + (*_f->m_ops.release_table)(_f->m_appFaceHandle, _p); + _p = 0; _sz = 0; +} + +Face::Table & Face::Table::operator = (const Table && rhs) throw() +{ + if (this == &rhs) return *this; + release(); + new (this) Table(std::move(rhs)); + return *this; +} + +Error Face::Table::decompress() +{ + Error e; + if (e.test(_sz < 5 * sizeof(uint32), E_BADSIZE)) + return e; + byte * uncompressed_table = 0; + size_t uncompressed_size = 0; + + const byte * p = _p; + const uint32 version = be::read(p); // Table version number. + + // The scheme is in the top 5 bits of the 1st uint32. + const uint32 hdr = be::read(p); + switch(compression(hdr >> 27)) + { + case NONE: return e; + + case LZ4: + { + uncompressed_size = hdr & 0x07ffffff; + uncompressed_table = gralloc(uncompressed_size); + if (!e.test(!uncompressed_table || uncompressed_size < 4, E_OUTOFMEM)) + { + memset(uncompressed_table, 0, 4); // make sure version number is initialised + // coverity[forward_null : FALSE] - uncompressed_table has been checked so can't be null + // coverity[checked_return : FALSE] - we test e later + e.test(lz4::decompress(p, _sz - 2*sizeof(uint32), uncompressed_table, uncompressed_size) != signed(uncompressed_size), E_SHRINKERFAILED); + } + break; + } + + default: + e.error(E_BADSCHEME); + }; + + // Check the uncompressed version number against the original. + if (!e) + // coverity[forward_null : FALSE] - uncompressed_table has already been tested so can't be null + // coverity[checked_return : FALSE] - we test e later + e.test(be::peek(uncompressed_table) != version, E_SHRINKERFAILED); + + // Tell the provider to release the compressed form since were replacing + // it anyway. + release(); + + if (e) + { + free(uncompressed_table); + uncompressed_table = 0; + uncompressed_size = 0; + } + + _p = uncompressed_table; + _sz = uncompressed_size; + _compressed = true; + + return e; +} diff --git a/source/libs/graphite2/graphite2-src/src/FeatureMap.cpp b/source/libs/graphite2/graphite2-src/src/FeatureMap.cpp new file mode 100644 index 000000000..e63415dd1 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/FeatureMap.cpp @@ -0,0 +1,292 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include + +#include "inc/Main.h" +#include "inc/bits.h" +#include "inc/Endian.h" +#include "inc/FeatureMap.h" +#include "inc/FeatureVal.h" +#include "graphite2/Font.h" +#include "inc/TtfUtil.h" +#include +#include "inc/Face.h" + + +using namespace graphite2; + +namespace +{ + static int cmpNameAndFeatures(const void *ap, const void *bp) + { + const NameAndFeatureRef & a = *static_cast(ap), + & b = *static_cast(bp); + return (a < b ? -1 : (b < a ? 1 : 0)); + } + + const size_t FEAT_HEADER = sizeof(uint32) + 2*sizeof(uint16) + sizeof(uint32), + FEATURE_SIZE = sizeof(uint32) + + 2*sizeof(uint16) + + sizeof(uint32) + + 2*sizeof(uint16), + FEATURE_SETTING_SIZE = sizeof(int16) + sizeof(uint16); + + uint16 readFeatureSettings(const byte * p, FeatureSetting * s, size_t num_settings) + { + uint16 max_val = 0; + for (FeatureSetting * const end = s + num_settings; s != end; ++s) + { + const int16 value = be::read(p); + ::new (s) FeatureSetting(value, be::read(p)); + if (uint16(value) > max_val) max_val = value; + } + + return max_val; + } +} + +FeatureRef::FeatureRef(const Face & face, + unsigned short & bits_offset, uint32 max_val, + uint32 name, uint16 uiName, uint16 flags, + FeatureSetting *settings, uint16 num_set) throw() +: m_face(&face), + m_nameValues(settings), + m_mask(mask_over_val(max_val)), + m_max(max_val), + m_id(name), + m_nameid(uiName), + m_flags(flags), + m_numSet(num_set) +{ + const uint8 need_bits = bit_set_count(m_mask); + m_index = (bits_offset + need_bits) / SIZEOF_CHUNK; + if (m_index > bits_offset / SIZEOF_CHUNK) + bits_offset = m_index*SIZEOF_CHUNK; + m_bits = bits_offset % SIZEOF_CHUNK; + bits_offset += need_bits; + m_mask <<= m_bits; +} + +FeatureRef::~FeatureRef() throw() +{ + free(m_nameValues); +} + +bool FeatureMap::readFeats(const Face & face) +{ + const Face::Table feat(face, TtfUtil::Tag::Feat); + const byte * p = feat; + if (!p) return true; + if (feat.size() < FEAT_HEADER) return false; + + const byte *const feat_start = p, + *const feat_end = p + feat.size(); + + const uint32 version = be::read(p); + m_numFeats = be::read(p); + be::skip(p); + be::skip(p); + + // Sanity checks + if (m_numFeats == 0) return true; + if (version < 0x00010000 || + p + m_numFeats*FEATURE_SIZE > feat_end) + { //defensive + m_numFeats = 0; + return false; + } + + m_feats = new FeatureRef [m_numFeats]; + uint16 * const defVals = gralloc(m_numFeats); + if (!defVals || !m_feats) return false; + unsigned short bits = 0; //to cause overflow on first Feature + + for (int i = 0, ie = m_numFeats; i != ie; i++) + { + const uint32 label = version < 0x00020000 ? be::read(p) : be::read(p); + const uint16 num_settings = be::read(p); + if (version >= 0x00020000) + be::skip(p); + const uint32 settings_offset = be::read(p); + const uint16 flags = be::read(p), + uiName = be::read(p); + + if (settings_offset > size_t(feat_end - feat_start) + || settings_offset + num_settings * FEATURE_SETTING_SIZE > size_t(feat_end - feat_start)) + { + free(defVals); + return false; + } + + FeatureSetting *uiSet; + uint32 maxVal; + if (num_settings != 0) + { + uiSet = gralloc(num_settings); + if (!uiSet) + { + free(defVals); + return false; + } + maxVal = readFeatureSettings(feat_start + settings_offset, uiSet, num_settings); + defVals[i] = uiSet[0].value(); + } + else + { + uiSet = 0; + maxVal = 0xffffffff; + defVals[i] = 0; + } + + ::new (m_feats + i) FeatureRef (face, bits, maxVal, + label, uiName, flags, + uiSet, num_settings); + } + new (&m_defaultFeatures) Features(bits/(sizeof(uint32)*8) + 1, *this); + m_pNamedFeats = new NameAndFeatureRef[m_numFeats]; + if (!m_pNamedFeats) + { + free(defVals); + return false; + } + for (int i = 0; i < m_numFeats; ++i) + { + m_feats[i].applyValToFeature(defVals[i], m_defaultFeatures); + m_pNamedFeats[i] = m_feats[i]; + } + + free(defVals); + + qsort(m_pNamedFeats, m_numFeats, sizeof(NameAndFeatureRef), &cmpNameAndFeatures); + + return true; +} + +bool SillMap::readFace(const Face & face) +{ + if (!m_FeatureMap.readFeats(face)) return false; + if (!readSill(face)) return false; + return true; +} + + +bool SillMap::readSill(const Face & face) +{ + const Face::Table sill(face, TtfUtil::Tag::Sill); + const byte *p = sill; + + if (!p) return true; + if (sill.size() < 12) return false; + if (be::read(p) != 0x00010000UL) return false; + m_numLanguages = be::read(p); + m_langFeats = new LangFeaturePair[m_numLanguages]; + if (!m_langFeats || !m_FeatureMap.m_numFeats) { m_numLanguages = 0; return true; } //defensive + + p += 6; // skip the fast search + if (sill.size() < m_numLanguages * 8U + 12) return false; + + for (int i = 0; i < m_numLanguages; i++) + { + uint32 langid = be::read(p); + uint16 numSettings = be::read(p); + uint16 offset = be::read(p); + if (offset + 8U * numSettings > sill.size() && numSettings > 0) return false; + Features* feats = new Features(m_FeatureMap.m_defaultFeatures); + if (!feats) return false; + const byte *pLSet = sill + offset; + + // Apply langauge specific settings + for (int j = 0; j < numSettings; j++) + { + uint32 name = be::read(pLSet); + uint16 val = be::read(pLSet); + pLSet += 2; + const FeatureRef* pRef = m_FeatureMap.findFeatureRef(name); + if (pRef) pRef->applyValToFeature(val, *feats); + } + // Add the language id feature which is always feature id 1 + const FeatureRef* pRef = m_FeatureMap.findFeatureRef(1); + if (pRef) pRef->applyValToFeature(langid, *feats); + + m_langFeats[i].m_lang = langid; + m_langFeats[i].m_pFeatures = feats; + } + return true; +} + + +Features* SillMap::cloneFeatures(uint32 langname/*0 means default*/) const +{ + if (langname) + { + // the number of languages in a font is usually small e.g. 8 in Doulos + // so this loop is not very expensive + for (uint16 i = 0; i < m_numLanguages; i++) + { + if (m_langFeats[i].m_lang == langname) + return new Features(*m_langFeats[i].m_pFeatures); + } + } + return new Features (m_FeatureMap.m_defaultFeatures); +} + + + +const FeatureRef *FeatureMap::findFeatureRef(uint32 name) const +{ + NameAndFeatureRef *it; + + for (it = m_pNamedFeats; it < m_pNamedFeats + m_numFeats; ++it) + if (it->m_name == name) + return it->m_pFRef; + return NULL; +} + +bool FeatureRef::applyValToFeature(uint32 val, Features & pDest) const +{ + if (val>maxVal() || !m_face) + return false; + if (pDest.m_pMap==NULL) + pDest.m_pMap = &m_face->theSill().theFeatureMap(); + else + if (pDest.m_pMap!=&m_face->theSill().theFeatureMap()) + return false; //incompatible + if (m_index >= pDest.size()) + pDest.resize(m_index+1); + pDest[m_index] &= ~m_mask; + pDest[m_index] |= (uint32(val) << m_bits); + return true; +} + +uint32 FeatureRef::getFeatureVal(const Features& feats) const +{ + if (m_index < feats.size() && m_face + && &m_face->theSill().theFeatureMap()==feats.m_pMap) + return (feats[m_index] & m_mask) >> m_bits; + else + return 0; +} diff --git a/source/libs/graphite2/graphite2-src/src/FileFace.cpp b/source/libs/graphite2/graphite2-src/src/FileFace.cpp new file mode 100644 index 000000000..7e663876a --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/FileFace.cpp @@ -0,0 +1,115 @@ +/* GRAPHITE2 LICENSING + + Copyright 2012, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include +#include "inc/FileFace.h" + + +#ifndef GRAPHITE2_NFILEFACE + +using namespace graphite2; + +FileFace::FileFace(const char *filename) +: _file(fopen(filename, "rb")), + _file_len(0), + _header_tbl(NULL), + _table_dir(NULL) +{ + if (!_file) return; + + if (fseek(_file, 0, SEEK_END)) return; + _file_len = ftell(_file); + if (fseek(_file, 0, SEEK_SET)) return; + + size_t tbl_offset, tbl_len; + + // Get the header. + if (!TtfUtil::GetHeaderInfo(tbl_offset, tbl_len)) return; + if (fseek(_file, long(tbl_offset), SEEK_SET)) return; + _header_tbl = (TtfUtil::Sfnt::OffsetSubTable*)gralloc(tbl_len); + if (_header_tbl) + { + if (fread(_header_tbl, 1, tbl_len, _file) != tbl_len) return; + if (!TtfUtil::CheckHeader(_header_tbl)) return; + } + + // Get the table directory + if (!TtfUtil::GetTableDirInfo(_header_tbl, tbl_offset, tbl_len)) return; + _table_dir = (TtfUtil::Sfnt::OffsetSubTable::Entry*)gralloc(tbl_len); + if (fseek(_file, long(tbl_offset), SEEK_SET)) return; + if (_table_dir && fread(_table_dir, 1, tbl_len, _file) != tbl_len) + { + free(_table_dir); + _table_dir = NULL; + } + return; +} + +FileFace::~FileFace() +{ + free(_table_dir); + free(_header_tbl); + if (_file) + fclose(_file); +} + + +const void *FileFace::get_table_fn(const void* appFaceHandle, unsigned int name, size_t *len) +{ + if (appFaceHandle == 0) return 0; + const FileFace & file_face = *static_cast(appFaceHandle); + + void *tbl; + size_t tbl_offset, tbl_len; + if (!TtfUtil::GetTableInfo(name, file_face._header_tbl, file_face._table_dir, tbl_offset, tbl_len)) + return 0; + + if (tbl_offset > file_face._file_len || tbl_len > file_face._file_len - tbl_offset + || fseek(file_face._file, long(tbl_offset), SEEK_SET) != 0) + return 0; + + tbl = malloc(tbl_len); + if (!tbl || fread(tbl, 1, tbl_len, file_face._file) != tbl_len) + { + free(tbl); + return 0; + } + + if (len) *len = tbl_len; + return tbl; +} + +void FileFace::rel_table_fn(const void* appFaceHandle, const void *table_buffer) +{ + if (appFaceHandle == 0) return; + + free(const_cast(table_buffer)); +} + +const gr_face_ops FileFace::ops = { sizeof FileFace::ops, &FileFace::get_table_fn, &FileFace::rel_table_fn }; + + +#endif //!GRAPHITE2_NFILEFACE diff --git a/source/libs/graphite2/graphite2-src/src/Font.cpp b/source/libs/graphite2/graphite2-src/src/Font.cpp new file mode 100644 index 000000000..faf3715f9 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/Font.cpp @@ -0,0 +1,58 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include "inc/Face.h" +#include "inc/Font.h" +#include "inc/GlyphCache.h" + +using namespace graphite2; + +Font::Font(float ppm, const Face & f, const void * appFontHandle, const gr_font_ops * ops) +: m_appFontHandle(appFontHandle ? appFontHandle : this), + m_face(f), + m_scale(ppm / f.glyphs().unitsPerEm()), + m_hinted(appFontHandle && ops && (ops->glyph_advance_x || ops->glyph_advance_y)) +{ + memset(&m_ops, 0, sizeof m_ops); + if (m_hinted && ops) + memcpy(&m_ops, ops, min(sizeof m_ops, ops->size)); + else + m_ops.glyph_advance_x = &Face::default_glyph_advance; + + size_t nGlyphs = f.glyphs().numGlyphs(); + m_advances = gralloc(nGlyphs); + if (m_advances) + { + for (float *advp = m_advances; nGlyphs; --nGlyphs, ++advp) + *advp = INVALID_ADVANCE; + } +} + + +/*virtual*/ Font::~Font() +{ + free(m_advances); +} diff --git a/source/libs/graphite2/graphite2-src/src/GlyphCache.cpp b/source/libs/graphite2/graphite2-src/src/GlyphCache.cpp new file mode 100644 index 000000000..282bdc18f --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/GlyphCache.cpp @@ -0,0 +1,492 @@ +/* GRAPHITE2 LICENSING + + Copyright 2012, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include "graphite2/Font.h" + +#include "inc/Main.h" +#include "inc/Face.h" //for the tags +#include "inc/GlyphCache.h" +#include "inc/GlyphFace.h" +#include "inc/Endian.h" +#include "inc/bits.h" + +using namespace graphite2; + +namespace +{ + // Iterator over version 1 or 2 glat entries which consist of a series of + // +-+-+-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+-+-+-+-+ + // v1 |k|n|v1 |v2 |...|vN | or v2 | k | n |v1 |v2 |...|vN | + // +-+-+-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+-+-+-+-+ + // variable length structures. + + template + class _glat_iterator : public std::iterator > + { + unsigned short key() const { return uint16(be::peek(_e) + _n); } + unsigned int run() const { return be::peek(_e+sizeof(W)); } + void advance_entry() { _n = 0; _e = _v; be::skip(_v,2); } + public: + _glat_iterator(const void * glat=0) : _e(reinterpret_cast(glat)), _v(_e+2*sizeof(W)), _n(0) {} + + _glat_iterator & operator ++ () { + ++_n; be::skip(_v); + if (_n == run()) advance_entry(); + return *this; + } + _glat_iterator operator ++ (int) { _glat_iterator tmp(*this); operator++(); return tmp; } + + // This is strictly a >= operator. A true == operator could be + // implemented that test for overlap but it would be more expensive a + // test. + bool operator == (const _glat_iterator & rhs) { return _v >= rhs._e - 1; } + bool operator != (const _glat_iterator & rhs) { return !operator==(rhs); } + + value_type operator * () const { + return value_type(key(), be::peek(_v)); + } + + protected: + const byte * _e, * _v; + size_t _n; + }; + + typedef _glat_iterator glat_iterator; + typedef _glat_iterator glat2_iterator; +} + +const SlantBox SlantBox::empty = {0,0,0,0}; + + +class GlyphCache::Loader +{ +public: + Loader(const Face & face); //return result indicates success. Do not use if failed. + + operator bool () const throw(); + unsigned short int units_per_em() const throw(); + unsigned short int num_glyphs() const throw(); + unsigned short int num_attrs() const throw(); + bool has_boxes() const throw(); + + const GlyphFace * read_glyph(unsigned short gid, GlyphFace &, int *numsubs) const throw(); + GlyphBox * read_box(uint16 gid, GlyphBox *curr, const GlyphFace & face) const throw(); + + CLASS_NEW_DELETE; +private: + Face::Table _head, + _hhea, + _hmtx, + _glyf, + _loca, + m_pGlat, + m_pGloc; + + bool _long_fmt; + bool _has_boxes; + unsigned short _num_glyphs_graphics, //i.e. boundary box and advance + _num_glyphs_attributes, + _num_attrs; // number of glyph attributes per glyph +}; + + + +GlyphCache::GlyphCache(const Face & face, const uint32 face_options) +: _glyph_loader(new Loader(face)), + _glyphs(_glyph_loader && *_glyph_loader && _glyph_loader->num_glyphs() + ? grzeroalloc(_glyph_loader->num_glyphs()) : 0), + _boxes(_glyph_loader && _glyph_loader->has_boxes() && _glyph_loader->num_glyphs() + ? grzeroalloc(_glyph_loader->num_glyphs()) : 0), + _num_glyphs(_glyphs ? _glyph_loader->num_glyphs() : 0), + _num_attrs(_glyphs ? _glyph_loader->num_attrs() : 0), + _upem(_glyphs ? _glyph_loader->units_per_em() : 0) +{ + if ((face_options & gr_face_preloadGlyphs) && _glyph_loader && _glyphs) + { + int numsubs = 0; + GlyphFace * const glyphs = new GlyphFace [_num_glyphs]; + if (!glyphs) + return; + + // The 0 glyph is definately required. + _glyphs[0] = _glyph_loader->read_glyph(0, glyphs[0], &numsubs); + + // glyphs[0] has the same address as the glyphs array just allocated, + // thus assigning the &glyphs[0] to _glyphs[0] means _glyphs[0] points + // to the entire array. + const GlyphFace * loaded = _glyphs[0]; + for (uint16 gid = 1; loaded && gid != _num_glyphs; ++gid) + _glyphs[gid] = loaded = _glyph_loader->read_glyph(gid, glyphs[gid], &numsubs); + + if (!loaded) + { + _glyphs[0] = 0; + delete [] glyphs; + } + else if (numsubs > 0 && _boxes) + { + GlyphBox * boxes = (GlyphBox *)gralloc(_num_glyphs * sizeof(GlyphBox) + numsubs * 8 * sizeof(float)); + GlyphBox * currbox = boxes; + + for (uint16 gid = 0; currbox && gid != _num_glyphs; ++gid) + { + _boxes[gid] = currbox; + currbox = _glyph_loader->read_box(gid, currbox, *_glyphs[gid]); + } + if (!currbox) + { + free(boxes); + _boxes[0] = 0; + } + } + delete _glyph_loader; + _glyph_loader = 0; + // coverity[leaked_storage : FALSE] - calling read_glyph on index 0 saved + // glyphs as _glyphs[0]. Setting _glyph_loader to nullptr here flags that + // the dtor needs to call delete[] on _glyphs[0] to release what was allocated + // as glyphs + } + + if (_glyphs && glyph(0) == 0) + { + free(_glyphs); + _glyphs = 0; + if (_boxes) + { + free(_boxes); + _boxes = 0; + } + _num_glyphs = _num_attrs = _upem = 0; + } +} + + +GlyphCache::~GlyphCache() +{ + if (_glyphs) + { + if (_glyph_loader) + { + const GlyphFace * * g = _glyphs; + for(unsigned short n = _num_glyphs; n; --n, ++g) + delete *g; + } + else + delete [] _glyphs[0]; + free(_glyphs); + } + if (_boxes) + { + if (_glyph_loader) + { + GlyphBox * * g = _boxes; + for (uint16 n = _num_glyphs; n; --n, ++g) + free(*g); + } + else + free(_boxes[0]); + free(_boxes); + } + delete _glyph_loader; +} + +const GlyphFace *GlyphCache::glyph(unsigned short glyphid) const //result may be changed by subsequent call with a different glyphid +{ + if (glyphid >= numGlyphs()) + return _glyphs[0]; + const GlyphFace * & p = _glyphs[glyphid]; + if (p == 0 && _glyph_loader) + { + int numsubs = 0; + GlyphFace * g = new GlyphFace(); + if (g) p = _glyph_loader->read_glyph(glyphid, *g, &numsubs); + if (!p) + { + delete g; + return *_glyphs; + } + if (_boxes) + { + _boxes[glyphid] = (GlyphBox *)gralloc(sizeof(GlyphBox) + 8 * numsubs * sizeof(float)); + if (!_glyph_loader->read_box(glyphid, _boxes[glyphid], *_glyphs[glyphid])) + { + free(_boxes[glyphid]); + _boxes[glyphid] = 0; + } + } + } + return p; +} + + + +GlyphCache::Loader::Loader(const Face & face) +: _head(face, Tag::head), + _hhea(face, Tag::hhea), + _hmtx(face, Tag::hmtx), + _glyf(face, Tag::glyf), + _loca(face, Tag::loca), + _long_fmt(false), + _has_boxes(false), + _num_glyphs_graphics(0), + _num_glyphs_attributes(0), + _num_attrs(0) +{ + if (!operator bool()) + return; + + const Face::Table maxp = Face::Table(face, Tag::maxp); + if (!maxp) { _head = Face::Table(); return; } + + _num_glyphs_graphics = static_cast(TtfUtil::GlyphCount(maxp)); + // This will fail if the number of glyphs is wildly out of range. + if (_glyf && TtfUtil::LocaLookup(_num_glyphs_graphics-1, _loca, _loca.size(), _head) == size_t(-2)) + { + _head = Face::Table(); + return; + } + + if ((m_pGlat = Face::Table(face, Tag::Glat, 0x00030000)) == NULL + || (m_pGloc = Face::Table(face, Tag::Gloc)) == NULL + || m_pGloc.size() < 8) + { + _head = Face::Table(); + return; + } + const byte * p = m_pGloc; + int version = be::read(p); + const uint16 flags = be::read(p); + _num_attrs = be::read(p); + // We can accurately calculate the number of attributed glyphs by + // subtracting the length of the attribids array (numAttribs long if present) + // and dividing by either 2 or 4 depending on shor or lonf format + _long_fmt = flags & 1; + ptrdiff_t tmpnumgattrs = (m_pGloc.size() + - (p - m_pGloc) + - sizeof(uint16)*(flags & 0x2 ? _num_attrs : 0)) + / (_long_fmt ? sizeof(uint32) : sizeof(uint16)) - 1; + + if (version >= 0x00020000 || tmpnumgattrs < 0 || tmpnumgattrs > 65535 + || _num_attrs == 0 || _num_attrs > 0x3000 // is this hard limit appropriate? + || _num_glyphs_graphics > tmpnumgattrs + || m_pGlat.size() < 4) + { + _head = Face::Table(); + return; + } + + _num_glyphs_attributes = static_cast(tmpnumgattrs); + p = m_pGlat; + version = be::read(p); + if (version >= 0x00040000 || (version >= 0x00030000 && m_pGlat.size() < 8)) // reject Glat tables that are too new + { + _head = Face::Table(); + return; + } + else if (version >= 0x00030000) + { + unsigned int glatflags = be::read(p); + _has_boxes = glatflags & 1; + // delete this once the compiler is fixed + _has_boxes = true; + } +} + +inline +GlyphCache::Loader::operator bool () const throw() +{ + return _head && _hhea && _hmtx && !(bool(_glyf) != bool(_loca)); +} + +inline +unsigned short int GlyphCache::Loader::units_per_em() const throw() +{ + return _head ? TtfUtil::DesignUnits(_head) : 0; +} + +inline +unsigned short int GlyphCache::Loader::num_glyphs() const throw() +{ + return max(_num_glyphs_graphics, _num_glyphs_attributes); +} + +inline +unsigned short int GlyphCache::Loader::num_attrs() const throw() +{ + return _num_attrs; +} + +inline +bool GlyphCache::Loader::has_boxes () const throw() +{ + return _has_boxes; +} + +const GlyphFace * GlyphCache::Loader::read_glyph(unsigned short glyphid, GlyphFace & glyph, int *numsubs) const throw() +{ + Rect bbox; + Position advance; + + if (glyphid < _num_glyphs_graphics) + { + int nLsb; + unsigned int nAdvWid; + if (_glyf) + { + int xMin, yMin, xMax, yMax; + size_t locidx = TtfUtil::LocaLookup(glyphid, _loca, _loca.size(), _head); + void *pGlyph = TtfUtil::GlyfLookup(_glyf, locidx, _glyf.size()); + + if (pGlyph && TtfUtil::GlyfBox(pGlyph, xMin, yMin, xMax, yMax)) + { + if ((xMin > xMax) || (yMin > yMax)) + return 0; + bbox = Rect(Position(static_cast(xMin), static_cast(yMin)), + Position(static_cast(xMax), static_cast(yMax))); + } + } + if (TtfUtil::HorMetrics(glyphid, _hmtx, _hmtx.size(), _hhea, nLsb, nAdvWid)) + advance = Position(static_cast(nAdvWid), 0); + } + + if (glyphid < _num_glyphs_attributes) + { + const byte * gloc = m_pGloc; + size_t glocs = 0, gloce = 0; + + be::skip(gloc); + be::skip(gloc,2); + if (_long_fmt) + { + if (8 + glyphid * sizeof(uint32) > m_pGloc.size()) + return 0; + be::skip(gloc, glyphid); + glocs = be::read(gloc); + gloce = be::peek(gloc); + } + else + { + if (8 + glyphid * sizeof(uint16) > m_pGloc.size()) + return 0; + be::skip(gloc, glyphid); + glocs = be::read(gloc); + gloce = be::peek(gloc); + } + + if (glocs >= m_pGlat.size() - 1 || gloce > m_pGlat.size()) + return 0; + + const uint32 glat_version = be::peek(m_pGlat); + if (glat_version >= 0x00030000) + { + if (glocs >= gloce) + return 0; + const byte * p = m_pGlat + glocs; + uint16 bmap = be::read(p); + int num = bit_set_count((uint32)bmap); + if (numsubs) *numsubs += num; + glocs += 6 + 8 * num; + if (glocs > gloce) + return 0; + } + if (glat_version < 0x00020000) + { + if (gloce - glocs < 2*sizeof(byte)+sizeof(uint16) + || gloce - glocs > _num_attrs*(2*sizeof(byte)+sizeof(uint16))) + return 0; + new (&glyph) GlyphFace(bbox, advance, glat_iterator(m_pGlat + glocs), glat_iterator(m_pGlat + gloce)); + } + else + { + if (gloce - glocs < 3*sizeof(uint16) // can a glyph have no attributes? why not? + || gloce - glocs > _num_attrs*3*sizeof(uint16) + || glocs > m_pGlat.size() - 2*sizeof(uint16)) + return 0; + new (&glyph) GlyphFace(bbox, advance, glat2_iterator(m_pGlat + glocs), glat2_iterator(m_pGlat + gloce)); + } + if (!glyph.attrs() || glyph.attrs().capacity() > _num_attrs) + return 0; + } + return &glyph; +} + +inline float scale_to(uint8 t, float zmin, float zmax) +{ + return (zmin + t * (zmax - zmin) / 255); +} + +Rect readbox(Rect &b, uint8 zxmin, uint8 zymin, uint8 zxmax, uint8 zymax) +{ + return Rect(Position(scale_to(zxmin, b.bl.x, b.tr.x), scale_to(zymin, b.bl.y, b.tr.y)), + Position(scale_to(zxmax, b.bl.x, b.tr.x), scale_to(zymax, b.bl.y, b.tr.y))); +} + +GlyphBox * GlyphCache::Loader::read_box(uint16 gid, GlyphBox *curr, const GlyphFace & glyph) const throw() +{ + if (gid >= _num_glyphs_attributes) return 0; + + const byte * gloc = m_pGloc; + size_t glocs = 0, gloce = 0; + + be::skip(gloc); + be::skip(gloc,2); + if (_long_fmt) + { + be::skip(gloc, gid); + glocs = be::read(gloc); + gloce = be::peek(gloc); + } + else + { + be::skip(gloc, gid); + glocs = be::read(gloc); + gloce = be::peek(gloc); + } + + if (gloce > m_pGlat.size() || glocs + 6 >= gloce) + return 0; + + const byte * p = m_pGlat + glocs; + uint16 bmap = be::read(p); + int num = bit_set_count((uint32)bmap); + + Rect bbox = glyph.theBBox(); + Rect diamax(Position(bbox.bl.x + bbox.bl.y, bbox.bl.x - bbox.tr.y), + Position(bbox.tr.x + bbox.tr.y, bbox.tr.x - bbox.bl.y)); + Rect diabound = readbox(diamax, p[0], p[2], p[1], p[3]); + ::new (curr) GlyphBox(num, bmap, &diabound); + be::skip(p, 4); + if (glocs + 6 + num * 8 >= gloce) + return 0; + + for (int i = 0; i < num * 2; ++i) + { + Rect box = readbox((i & 1) ? diamax : bbox, p[0], p[2], p[1], p[3]); + curr->addSubBox(i >> 1, i & 1, &box); + be::skip(p, 4); + } + return (GlyphBox *)((char *)(curr) + sizeof(GlyphBox) + 2 * num * sizeof(Rect)); +} diff --git a/source/libs/graphite2/graphite2-src/src/GlyphFace.cpp b/source/libs/graphite2/graphite2-src/src/GlyphFace.cpp new file mode 100644 index 000000000..bc5e63a9f --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/GlyphFace.cpp @@ -0,0 +1,48 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include "inc/GlyphFace.h" + + +using namespace graphite2; + +int32 GlyphFace::getMetric(uint8 metric) const +{ + switch (metrics(metric)) + { + case kgmetLsb : return int32(m_bbox.bl.x); + case kgmetRsb : return int32(m_advance.x - m_bbox.tr.x); + case kgmetBbTop : return int32(m_bbox.tr.y); + case kgmetBbBottom : return int32(m_bbox.bl.y); + case kgmetBbLeft : return int32(m_bbox.bl.x); + case kgmetBbRight : return int32(m_bbox.tr.x); + case kgmetBbHeight : return int32(m_bbox.tr.y - m_bbox.bl.y); + case kgmetBbWidth : return int32(m_bbox.tr.x - m_bbox.bl.x); + case kgmetAdvWidth : return int32(m_advance.x); + case kgmetAdvHeight : return int32(m_advance.y); + default : return 0; + } +} diff --git a/source/libs/graphite2/graphite2-src/src/Intervals.cpp b/source/libs/graphite2/graphite2-src/src/Intervals.cpp new file mode 100644 index 000000000..0fe99a127 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/Intervals.cpp @@ -0,0 +1,298 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include +#include +#include + +#include "inc/Intervals.h" +#include "inc/Segment.h" +#include "inc/Slot.h" +#include "inc/debug.h" +#include "inc/bits.h" + +using namespace graphite2; + +#include + +inline +Zones::Exclusion Zones::Exclusion::split_at(float p) { + Exclusion r(*this); + r.xm = x = p; + return r; +} + +inline +void Zones::Exclusion::left_trim(float p) { + x = p; +} + +inline +Zones::Exclusion & Zones::Exclusion::operator += (Exclusion const & rhs) { + c += rhs.c; sm += rhs.sm; smx += rhs.smx; open = false; + return *this; +} + +inline +uint8 Zones::Exclusion::outcode(float val) const { + float p = val; + //float d = std::numeric_limits::epsilon(); + float d = 0.; + return ((p - xm >= d) << 1) | (x - p > d); +} + +void Zones::exclude_with_margins(float xmin, float xmax, int axis) { + remove(xmin, xmax); + weightedAxis(axis, xmin-_margin_len, xmin, 0, 0, _margin_weight, xmin-_margin_len, 0, 0, false); + weightedAxis(axis, xmax, xmax+_margin_len, 0, 0, _margin_weight, xmax+_margin_len, 0, 0, false); +} + +namespace +{ + +inline +bool separated(float a, float b) { + return a != b; + //int exp; + //float res = frexpf(fabs(a - b), &exp); + //return (*(unsigned int *)(&res) > 4); + //return std::fabs(a-b) > std::numeric_limits::epsilon(); // std::epsilon may not work. but 0.5 fails exising 64 bit tests + //return std::fabs(a-b) > 0.5f; +} + +} + +void Zones::insert(Exclusion e) +{ +#if !defined GRAPHITE2_NTRACING + addDebug(&e); +#endif + e.x = max(e.x, _pos); + e.xm = min(e.xm, _posm); + if (e.x >= e.xm) return; + + for (iterator i = _exclusions.begin(), ie = _exclusions.end(); i != ie && e.x < e.xm; ++i) + { + const uint8 oca = e.outcode(i->x), + ocb = e.outcode(i->xm); + if ((oca & ocb) != 0) continue; + + switch (oca ^ ocb) // What kind of overlap? + { + case 0: // e completely covers i + // split e at i.x into e1,e2 + // split e2 at i.mx into e2,e3 + // drop e1 ,i+e2, e=e3 + *i += e; + e.left_trim(i->xm); + break; + case 1: // e overlaps on the rhs of i + // split i at e->x into i1,i2 + // split e at i.mx into e1,e2 + // trim i1, insert i2+e1, e=e2 + if (!separated(i->xm, e.x)) break; + if (separated(i->x,e.x)) { i = _exclusions.insert(i,i->split_at(e.x)); ++i; } + *i += e; + e.left_trim(i->xm); + break; + case 2: // e overlaps on the lhs of i + // split e at i->x into e1,e2 + // split i at e.mx into i1,i2 + // drop e1, insert e2+i1, trim i2 + if (!separated(e.xm, i->x)) return; + if (separated(e.xm, i->xm)) i = _exclusions.insert(i,i->split_at(e.xm)); + *i += e; + return; + case 3: // i completely covers e + // split i at e.x into i1,i2 + // split i2 at e.mx into i2,i3 + // insert i1, insert e+i2 + if (separated(e.xm, i->xm)) i = _exclusions.insert(i,i->split_at(e.xm)); + i = _exclusions.insert(i, i->split_at(e.x)); + *++i += e; + return; + } + + ie = _exclusions.end(); + } +} + + +void Zones::remove(float x, float xm) +{ +#if !defined GRAPHITE2_NTRACING + removeDebug(x, xm); +#endif + x = max(x, _pos); + xm = min(xm, _posm); + if (x >= xm) return; + + for (iterator i = _exclusions.begin(), ie = _exclusions.end(); i != ie; ++i) + { + const uint8 oca = i->outcode(x), + ocb = i->outcode(xm); + if ((oca & ocb) != 0) continue; + + switch (oca ^ ocb) // What kind of overlap? + { + case 0: // i completely covers e + if (separated(i->x, x)) { i = _exclusions.insert(i,i->split_at(x)); ++i; } + GR_FALLTHROUGH; + // no break + case 1: // i overlaps on the rhs of e + i->left_trim(xm); + return; + case 2: // i overlaps on the lhs of e + i->xm = x; + if (separated(i->x, i->xm)) break; + GR_FALLTHROUGH; + // no break + case 3: // e completely covers i + i = _exclusions.erase(i); + --i; + break; + } + + ie = _exclusions.end(); + } +} + + +Zones::const_iterator Zones::find_exclusion_under(float x) const +{ + size_t l = 0, h = _exclusions.size(); + + while (l < h) + { + size_t const p = (l+h) >> 1; + switch (_exclusions[p].outcode(x)) + { + case 0 : return _exclusions.begin()+p; + case 1 : h = p; break; + case 2 : + case 3 : l = p+1; break; + } + } + + return _exclusions.begin()+l; +} + + +float Zones::closest(float origin, float & cost) const +{ + float best_c = std::numeric_limits::max(), + best_x = 0; + + const const_iterator start = find_exclusion_under(origin); + + // Forward scan looking for lowest cost + for (const_iterator i = start, ie = _exclusions.end(); i != ie; ++i) + if (i->track_cost(best_c, best_x, origin)) break; + + // Backward scan looking for lowest cost + // We start from the exclusion to the immediate left of start since we've + // already tested start with the right most scan above. + for (const_iterator i = start-1, ie = _exclusions.begin()-1; i != ie; --i) + if (i->track_cost(best_c, best_x, origin)) break; + + cost = (best_c == std::numeric_limits::max() ? -1 : best_c); + return best_x; +} + + +// Cost and test position functions + +bool Zones::Exclusion::track_cost(float & best_cost, float & best_pos, float origin) const { + const float p = test_position(origin), + localc = cost(p - origin); + if (open && localc > best_cost) return true; + + if (localc < best_cost) + { + best_cost = localc; + best_pos = p; + } + return false; +} + +inline +float Zones::Exclusion::cost(float p) const { + return (sm * p - 2 * smx) * p + c; +} + + +float Zones::Exclusion::test_position(float origin) const { + if (sm < 0) + { + // sigh, test both ends and perhaps the middle too! + float res = x; + float cl = cost(x); + if (x < origin && xm > origin) + { + float co = cost(origin); + if (co < cl) + { + cl = co; + res = origin; + } + } + float cr = cost(xm); + return cl > cr ? xm : res; + } + else + { + float zerox = smx / sm + origin; + if (zerox < x) return x; + else if (zerox > xm) return xm; + else return zerox; + } +} + + +#if !defined GRAPHITE2_NTRACING + +void Zones::jsonDbgOut(Segment *seg) const { + + if (_dbg) + { + for (Zones::idebugs s = dbgs_begin(), e = dbgs_end(); s != e; ++s) + { + *_dbg << json::flat << json::array + << objectid(dslot(seg, (Slot *)(s->_env[0]))) + << reinterpret_cast(s->_env[1]); + if (s->_isdel) + *_dbg << "remove" << Position(s->_excl.x, s->_excl.xm); + else + *_dbg << "exclude" << json::flat << json::array + << s->_excl.x << s->_excl.xm + << s->_excl.sm << s->_excl.smx << s->_excl.c + << json::close; + *_dbg << json::close; + } + } +} + +#endif diff --git a/source/libs/graphite2/graphite2-src/src/Justifier.cpp b/source/libs/graphite2/graphite2-src/src/Justifier.cpp new file mode 100644 index 000000000..78c11e6a5 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/Justifier.cpp @@ -0,0 +1,282 @@ +/* GRAPHITE2 LICENSING + + Copyright 2012, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ + +#include "inc/Segment.h" +#include "graphite2/Font.h" +#include "inc/debug.h" +#include "inc/CharInfo.h" +#include "inc/Slot.h" +#include "inc/Main.h" +#include + +using namespace graphite2; + +class JustifyTotal { +public: + JustifyTotal() : m_numGlyphs(0), m_tStretch(0), m_tShrink(0), m_tStep(0), m_tWeight(0) {} + void accumulate(Slot *s, Segment *seg, int level); + int weight() const { return m_tWeight; } + + CLASS_NEW_DELETE + +private: + int m_numGlyphs; + int m_tStretch; + int m_tShrink; + int m_tStep; + int m_tWeight; +}; + +void JustifyTotal::accumulate(Slot *s, Segment *seg, int level) +{ + ++m_numGlyphs; + m_tStretch += s->getJustify(seg, level, 0); + m_tShrink += s->getJustify(seg, level, 1); + m_tStep += s->getJustify(seg, level, 2); + m_tWeight += s->getJustify(seg, level, 3); +} + +float Segment::justify(Slot *pSlot, const Font *font, float width, GR_MAYBE_UNUSED justFlags jflags, Slot *pFirst, Slot *pLast) +{ + Slot *end = last(); + float currWidth = 0.0; + const float scale = font ? font->scale() : 1.0f; + Position res; + + if (width < 0 && !(silf()->flags())) + return width; + + if ((m_dir & 1) != m_silf->dir() && m_silf->bidiPass() != m_silf->numPasses()) + { + reverseSlots(); + std::swap(pFirst, pLast); + } + if (!pFirst) pFirst = pSlot; + while (!pFirst->isBase()) pFirst = pFirst->attachedTo(); + if (!pLast) pLast = last(); + while (!pLast->isBase()) pLast = pLast->attachedTo(); + const float base = pFirst->origin().x / scale; + width = width / scale; + if ((jflags & gr_justEndInline) == 0) + { + while (pLast != pFirst && pLast) + { + Rect bbox = theGlyphBBoxTemporary(pLast->glyph()); + if (bbox.bl.x != 0.f || bbox.bl.y != 0.f || bbox.tr.x != 0.f || bbox.tr.y == 0.f) + break; + pLast = pLast->prev(); + } + } + + if (pLast) + end = pLast->nextSibling(); + if (pFirst) + pFirst = pFirst->nextSibling(); + + int icount = 0; + int numLevels = silf()->numJustLevels(); + if (!numLevels) + { + for (Slot *s = pSlot; s && s != end; s = s->nextSibling()) + { + CharInfo *c = charinfo(s->before()); + if (isWhitespace(c->unicodeChar())) + { + s->setJustify(this, 0, 3, 1); + s->setJustify(this, 0, 2, 1); + s->setJustify(this, 0, 0, -1); + ++icount; + } + } + if (!icount) + { + for (Slot *s = pSlot; s && s != end; s = s->nextSibling()) + { + s->setJustify(this, 0, 3, 1); + s->setJustify(this, 0, 2, 1); + s->setJustify(this, 0, 0, -1); + } + } + ++numLevels; + } + + Vector stats(numLevels); + for (Slot *s = pFirst; s && s != end; s = s->nextSibling()) + { + float w = s->origin().x / scale + s->advance() - base; + if (w > currWidth) currWidth = w; + for (int j = 0; j < numLevels; ++j) + stats[j].accumulate(s, this, j); + s->just(0); + } + + for (int i = (width < 0.0f) ? -1 : numLevels - 1; i >= 0; --i) + { + float diff; + float error = 0.; + float diffpw; + int tWeight = stats[i].weight(); + if (tWeight == 0) continue; + + do { + error = 0.; + diff = width - currWidth; + diffpw = diff / tWeight; + tWeight = 0; + for (Slot *s = pFirst; s && s != end; s = s->nextSibling()) // don't include final glyph + { + int w = s->getJustify(this, i, 3); + float pref = diffpw * w + error; + int step = s->getJustify(this, i, 2); + if (!step) step = 1; // handle lazy font developers + if (pref > 0) + { + float max = uint16(s->getJustify(this, i, 0)); + if (i == 0) max -= s->just(); + if (pref > max) pref = max; + else tWeight += w; + } + else + { + float max = uint16(s->getJustify(this, i, 1)); + if (i == 0) max += s->just(); + if (-pref > max) pref = -max; + else tWeight += w; + } + int actual = int(pref / step) * step; + + if (actual) + { + error += diffpw * w - actual; + if (i == 0) + s->just(s->just() + actual); + else + s->setJustify(this, i, 4, actual); + } + } + currWidth += diff - error; + } while (i == 0 && int(std::abs(error)) > 0 && tWeight); + } + + Slot *oldFirst = m_first; + Slot *oldLast = m_last; + if (silf()->flags() & 1) + { + m_first = pSlot = addLineEnd(pSlot); + m_last = pLast = addLineEnd(end); + if (!m_first || !m_last) return -1.0; + } + else + { + m_first = pSlot; + m_last = pLast; + } + + // run justification passes here +#if !defined GRAPHITE2_NTRACING + json * const dbgout = m_face->logger(); + if (dbgout) + *dbgout << json::object + << "justifies" << objectid(this) + << "passes" << json::array; +#endif + + if (m_silf->justificationPass() != m_silf->positionPass() && (width >= 0.f || (silf()->flags() & 1))) + m_silf->runGraphite(this, m_silf->justificationPass(), m_silf->positionPass()); + +#if !defined GRAPHITE2_NTRACING + if (dbgout) + { + *dbgout << json::item << json::close; // Close up the passes array + positionSlots(NULL, pSlot, pLast, m_dir); + Slot *lEnd = pLast->nextSibling(); + *dbgout << "output" << json::array; + for(Slot * t = pSlot; t != lEnd; t = t->next()) + *dbgout << dslot(this, t); + *dbgout << json::close << json::close; + } +#endif + + res = positionSlots(font, pSlot, pLast, m_dir); + + if (silf()->flags() & 1) + { + if (m_first) + delLineEnd(m_first); + if (m_last) + delLineEnd(m_last); + } + m_first = oldFirst; + m_last = oldLast; + + if ((m_dir & 1) != m_silf->dir() && m_silf->bidiPass() != m_silf->numPasses()) + reverseSlots(); + return res.x; +} + +Slot *Segment::addLineEnd(Slot *nSlot) +{ + Slot *eSlot = newSlot(); + if (!eSlot) return NULL; + const uint16 gid = silf()->endLineGlyphid(); + const GlyphFace * theGlyph = m_face->glyphs().glyphSafe(gid); + eSlot->setGlyph(this, gid, theGlyph); + if (nSlot) + { + eSlot->next(nSlot); + eSlot->prev(nSlot->prev()); + nSlot->prev(eSlot); + eSlot->before(nSlot->before()); + if (eSlot->prev()) + eSlot->after(eSlot->prev()->after()); + else + eSlot->after(nSlot->before()); + } + else + { + nSlot = m_last; + eSlot->prev(nSlot); + nSlot->next(eSlot); + eSlot->after(eSlot->prev()->after()); + eSlot->before(nSlot->after()); + } + return eSlot; +} + +void Segment::delLineEnd(Slot *s) +{ + Slot *nSlot = s->next(); + if (nSlot) + { + nSlot->prev(s->prev()); + if (s->prev()) + s->prev()->next(nSlot); + } + else + s->prev()->next(NULL); + freeSlot(s); +} diff --git a/source/libs/graphite2/graphite2-src/src/NameTable.cpp b/source/libs/graphite2/graphite2-src/src/NameTable.cpp new file mode 100644 index 000000000..d42b7f95b --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/NameTable.cpp @@ -0,0 +1,254 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include "inc/Main.h" +#include "inc/Endian.h" + +#include "inc/NameTable.h" +#include "inc/UtfCodec.h" + +using namespace graphite2; + +NameTable::NameTable(const void* data, size_t length, uint16 platformId, uint16 encodingID) + : m_platformId(0), m_encodingId(0), m_languageCount(0), + m_platformOffset(0), m_platformLastRecord(0), m_nameDataLength(0), + m_table(0), m_nameData(NULL) +{ + void *pdata = gralloc(length); + if (!pdata) return; + memcpy(pdata, data, length); + m_table = reinterpret_cast(pdata); + + if ((length > sizeof(TtfUtil::Sfnt::FontNames)) && + (length > sizeof(TtfUtil::Sfnt::FontNames) + + sizeof(TtfUtil::Sfnt::NameRecord) * ( be::swap(m_table->count) - 1))) + { + uint16 offset = be::swap(m_table->string_offset); + if (offset < length) + { + m_nameData = reinterpret_cast(pdata) + offset; + setPlatformEncoding(platformId, encodingID); + m_nameDataLength = uint16(length - offset); + return; + } + } + free(const_cast(m_table)); + m_table = NULL; +} + +uint16 NameTable::setPlatformEncoding(uint16 platformId, uint16 encodingID) +{ + if (!m_nameData) return 0; + uint16 i = 0; + uint16 count = be::swap(m_table->count); + for (; i < count; i++) + { + if (be::swap(m_table->name_record[i].platform_id) == platformId && + be::swap(m_table->name_record[i].platform_specific_id) == encodingID) + { + m_platformOffset = i; + break; + } + } + while ((++i < count) && + (be::swap(m_table->name_record[i].platform_id) == platformId) && + (be::swap(m_table->name_record[i].platform_specific_id) == encodingID)) + { + m_platformLastRecord = i; + } + m_encodingId = encodingID; + m_platformId = platformId; + return 0; +} + +void* NameTable::getName(uint16& languageId, uint16 nameId, gr_encform enc, uint32& length) +{ + uint16 anyLang = 0; + uint16 enUSLang = 0; + uint16 bestLang = 0; + if (!m_table) + { + languageId = 0; + length = 0; + return NULL; + } + for (uint16 i = m_platformOffset; i <= m_platformLastRecord; i++) + { + if (be::swap(m_table->name_record[i].name_id) == nameId) + { + uint16 langId = be::swap(m_table->name_record[i].language_id); + if (langId == languageId) + { + bestLang = i; + break; + } + // MS language tags have the language in the lower byte, region in the higher + else if ((langId & 0xFF) == (languageId & 0xFF)) + { + bestLang = i; + } + else if (langId == 0x409) + { + enUSLang = i; + } + else + { + anyLang = i; + } + } + } + if (!bestLang) + { + if (enUSLang) bestLang = enUSLang; + else + { + bestLang = anyLang; + if (!anyLang) + { + languageId = 0; + length = 0; + return NULL; + } + } + } + const TtfUtil::Sfnt::NameRecord & nameRecord = m_table->name_record[bestLang]; + languageId = be::swap(nameRecord.language_id); + uint16 utf16Length = be::swap(nameRecord.length); + uint16 offset = be::swap(nameRecord.offset); + if(offset + utf16Length > m_nameDataLength) + { + languageId = 0; + length = 0; + return NULL; + } + utf16Length >>= 1; // in utf16 units + utf16::codeunit_t * utf16Name = gralloc(utf16Length + 1); + if (!utf16Name) + { + languageId = 0; + length = 0; + return NULL; + } + const uint8* pName = m_nameData + offset; + for (size_t i = 0; i < utf16Length; i++) + { + utf16Name[i] = be::read(pName); + } + utf16Name[utf16Length] = 0; + if (!utf16::validate(utf16Name, utf16Name + utf16Length)) + { + free(utf16Name); + languageId = 0; + length = 0; + return NULL; + } + switch (enc) + { + case gr_utf8: + { + utf8::codeunit_t* uniBuffer = gralloc(3 * utf16Length + 1); + if (!uniBuffer) + { + free(utf16Name); + languageId = 0; + length = 0; + return NULL; + } + utf8::iterator d = uniBuffer; + for (utf16::const_iterator s = utf16Name, e = utf16Name + utf16Length; s != e; ++s, ++d) + *d = *s; + length = uint32(d - uniBuffer); + uniBuffer[length] = 0; + free(utf16Name); + return uniBuffer; + } + case gr_utf16: + length = utf16Length; + return utf16Name; + case gr_utf32: + { + utf32::codeunit_t * uniBuffer = gralloc(utf16Length + 1); + if (!uniBuffer) + { + free(utf16Name); + languageId = 0; + length = 0; + return NULL; + } + utf32::iterator d = uniBuffer; + for (utf16::const_iterator s = utf16Name, e = utf16Name + utf16Length; s != e; ++s, ++d) + *d = *s; + length = uint32(d - uniBuffer); + uniBuffer[length] = 0; + free(utf16Name); + return uniBuffer; + } + } + free(utf16Name); + languageId = 0; + length = 0; + return NULL; +} + +uint16 NameTable::getLanguageId(const char * bcp47Locale) +{ + size_t localeLength = strlen(bcp47Locale); + uint16 localeId = m_locale2Lang.getMsId(bcp47Locale); + if (m_table && (be::swap(m_table->format) == 1)) + { + const uint8 * pLangEntries = reinterpret_cast(m_table) + + sizeof(TtfUtil::Sfnt::FontNames) + + sizeof(TtfUtil::Sfnt::NameRecord) * ( be::swap(m_table->count) - 1); + uint16 numLangEntries = be::read(pLangEntries); + const TtfUtil::Sfnt::LangTagRecord * langTag = + reinterpret_cast(pLangEntries); + if (pLangEntries + numLangEntries * sizeof(TtfUtil::Sfnt::LangTagRecord) <= m_nameData) + { + for (uint16 i = 0; i < numLangEntries; i++) + { + uint16 offset = be::swap(langTag[i].offset); + uint16 length = be::swap(langTag[i].length); + if ((offset + length <= m_nameDataLength) && (length == 2 * localeLength)) + { + const uint8* pName = m_nameData + offset; + bool match = true; + for (size_t j = 0; j < localeLength; j++) + { + uint16 code = be::read(pName); + if ((code > 0x7F) || (code != bcp47Locale[j])) + { + match = false; + break; + } + } + if (match) + return 0x8000 + i; + } + } + } + } + return localeId; +} diff --git a/source/libs/graphite2/graphite2-src/src/Pass.cpp b/source/libs/graphite2/graphite2-src/src/Pass.cpp new file mode 100644 index 000000000..76d4983ae --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/Pass.cpp @@ -0,0 +1,1107 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include "inc/Main.h" +#include "inc/debug.h" +#include "inc/Endian.h" +#include "inc/Pass.h" +#include +#include +#include +#include +#include "inc/Segment.h" +#include "inc/Code.h" +#include "inc/Rule.h" +#include "inc/Error.h" +#include "inc/Collider.h" + +using namespace graphite2; +using vm::Machine; +typedef Machine::Code Code; + +enum KernCollison +{ + None = 0, + CrossSpace = 1, + InWord = 2, + reserved = 3 +}; + +Pass::Pass() +: m_silf(0), + m_cols(0), + m_rules(0), + m_ruleMap(0), + m_startStates(0), + m_transitions(0), + m_states(0), + m_codes(0), + m_progs(0), + m_numCollRuns(0), + m_kernColls(0), + m_iMaxLoop(0), + m_numGlyphs(0), + m_numRules(0), + m_numStates(0), + m_numTransition(0), + m_numSuccess(0), + m_successStart(0), + m_numColumns(0), + m_minPreCtxt(0), + m_maxPreCtxt(0), + m_colThreshold(0), + m_isReverseDir(false) +{ +} + +Pass::~Pass() +{ + free(m_cols); + free(m_startStates); + free(m_transitions); + free(m_states); + free(m_ruleMap); + + if (m_rules) delete [] m_rules; + if (m_codes) delete [] m_codes; + free(m_progs); +} + +bool Pass::readPass(const byte * const pass_start, size_t pass_length, size_t subtable_base, + GR_MAYBE_UNUSED Face & face, passtype pt, GR_MAYBE_UNUSED uint32 version, Error &e) +{ + const byte * p = pass_start, + * const pass_end = p + pass_length; + size_t numRanges; + + if (e.test(pass_length < 40, E_BADPASSLENGTH)) return face.error(e); + // Read in basic values + const byte flags = be::read(p); + if (e.test((flags & 0x1f) && + (pt < PASS_TYPE_POSITIONING || !m_silf->aCollision() || !face.glyphs().hasBoxes() || !(m_silf->flags() & 0x20)), + E_BADCOLLISIONPASS)) + return face.error(e); + m_numCollRuns = flags & 0x7; + m_kernColls = (flags >> 3) & 0x3; + m_isReverseDir = (flags >> 5) & 0x1; + m_iMaxLoop = be::read(p); + if (m_iMaxLoop < 1) m_iMaxLoop = 1; + be::skip(p,2); // skip maxContext & maxBackup + m_numRules = be::read(p); + if (e.test(!m_numRules && m_numCollRuns == 0, E_BADEMPTYPASS)) return face.error(e); + be::skip(p); // fsmOffset - not sure why we would want this + const byte * const pcCode = pass_start + be::read(p) - subtable_base, + * const rcCode = pass_start + be::read(p) - subtable_base, + * const aCode = pass_start + be::read(p) - subtable_base; + be::skip(p); + m_numStates = be::read(p); + m_numTransition = be::read(p); + m_numSuccess = be::read(p); + m_numColumns = be::read(p); + numRanges = be::read(p); + be::skip(p, 3); // skip searchRange, entrySelector & rangeShift. + assert(p - pass_start == 40); + // Perform some sanity checks. + if ( e.test(m_numTransition > m_numStates, E_BADNUMTRANS) + || e.test(m_numSuccess > m_numStates, E_BADNUMSUCCESS) + || e.test(m_numSuccess + m_numTransition < m_numStates, E_BADNUMSTATES) + || e.test(m_numRules && numRanges == 0, E_NORANGES) + || e.test(m_numColumns > 0x7FFF, E_BADNUMCOLUMNS)) + return face.error(e); + + m_successStart = m_numStates - m_numSuccess; + // test for beyond end - 1 to account for reading uint16 + if (e.test(p + numRanges * 6 - 2 > pass_end, E_BADPASSLENGTH)) return face.error(e); + m_numGlyphs = be::peek(p + numRanges * 6 - 4) + 1; + // Calculate the start of various arrays. + const byte * const ranges = p; + be::skip(p, numRanges*3); + const byte * const o_rule_map = p; + be::skip(p, m_numSuccess + 1); + + // More sanity checks + if (e.test(reinterpret_cast(o_rule_map + m_numSuccess*sizeof(uint16)) > pass_end + || p > pass_end, E_BADRULEMAPLEN)) + return face.error(e); + const size_t numEntries = be::peek(o_rule_map + m_numSuccess*sizeof(uint16)); + const byte * const rule_map = p; + be::skip(p, numEntries); + + if (e.test(p + 2*sizeof(uint8) > pass_end, E_BADPASSLENGTH)) return face.error(e); + m_minPreCtxt = be::read(p); + m_maxPreCtxt = be::read(p); + if (e.test(m_minPreCtxt > m_maxPreCtxt, E_BADCTXTLENBOUNDS)) return face.error(e); + const byte * const start_states = p; + be::skip(p, m_maxPreCtxt - m_minPreCtxt + 1); + const uint16 * const sort_keys = reinterpret_cast(p); + be::skip(p, m_numRules); + const byte * const precontext = p; + be::skip(p, m_numRules); + + if (e.test(p + sizeof(uint16) + sizeof(uint8) > pass_end, E_BADCTXTLENS)) return face.error(e); + m_colThreshold = be::read(p); + if (m_colThreshold == 0) m_colThreshold = 10; // A default + const size_t pass_constraint_len = be::read(p); + + const uint16 * const o_constraint = reinterpret_cast(p); + be::skip(p, m_numRules + 1); + const uint16 * const o_actions = reinterpret_cast(p); + be::skip(p, m_numRules + 1); + const byte * const states = p; + if (e.test(2u*m_numTransition*m_numColumns >= (unsigned)(pass_end - p), E_BADPASSLENGTH) + || e.test(p >= pass_end, E_BADPASSLENGTH)) + return face.error(e); + be::skip(p, m_numTransition*m_numColumns); + be::skip(p); + if (e.test(p != pcCode, E_BADPASSCCODEPTR)) return face.error(e); + be::skip(p, pass_constraint_len); + if (e.test(p != rcCode, E_BADRULECCODEPTR) + || e.test(size_t(rcCode - pcCode) != pass_constraint_len, E_BADCCODELEN)) return face.error(e); + be::skip(p, be::peek(o_constraint + m_numRules)); + if (e.test(p != aCode, E_BADACTIONCODEPTR)) return face.error(e); + be::skip(p, be::peek(o_actions + m_numRules)); + + // We should be at the end or within the pass + if (e.test(p > pass_end, E_BADPASSLENGTH)) return face.error(e); + + // Load the pass constraint if there is one. + if (pass_constraint_len) + { + face.error_context(face.error_context() + 1); + m_cPConstraint = vm::Machine::Code(true, pcCode, pcCode + pass_constraint_len, + precontext[0], be::peek(sort_keys), *m_silf, face, PASS_TYPE_UNKNOWN); + if (e.test(!m_cPConstraint, E_OUTOFMEM) + || e.test(m_cPConstraint.status() != Code::loaded, m_cPConstraint.status() + E_CODEFAILURE)) + return face.error(e); + face.error_context(face.error_context() - 1); + } + if (m_numRules) + { + if (!readRanges(ranges, numRanges, e)) return face.error(e); + if (!readRules(rule_map, numEntries, precontext, sort_keys, + o_constraint, rcCode, o_actions, aCode, face, pt, e)) return false; + } +#ifdef GRAPHITE2_TELEMETRY + telemetry::category _states_cat(face.tele.states); +#endif + return m_numRules ? readStates(start_states, states, o_rule_map, face, e) : true; +} + + +bool Pass::readRules(const byte * rule_map, const size_t num_entries, + const byte *precontext, const uint16 * sort_key, + const uint16 * o_constraint, const byte *rc_data, + const uint16 * o_action, const byte * ac_data, + Face & face, passtype pt, Error &e) +{ + const byte * const ac_data_end = ac_data + be::peek(o_action + m_numRules); + const byte * const rc_data_end = rc_data + be::peek(o_constraint + m_numRules); + + precontext += m_numRules; + sort_key += m_numRules; + o_constraint += m_numRules; + o_action += m_numRules; + + // Load rules. + const byte * ac_begin = 0, * rc_begin = 0, + * ac_end = ac_data + be::peek(o_action), + * rc_end = rc_data + be::peek(o_constraint); + + // Allocate pools + m_rules = new Rule [m_numRules]; + m_codes = new Code [m_numRules*2]; + int totalSlots = 0; + const uint16 *tsort = sort_key; + for (int i = 0; i < m_numRules; ++i) + totalSlots += be::peek(--tsort); + const size_t prog_pool_sz = vm::Machine::Code::estimateCodeDataOut(ac_end - ac_data + rc_end - rc_data, 2 * m_numRules, totalSlots); + m_progs = gralloc(prog_pool_sz); + byte * prog_pool_free = m_progs, + * prog_pool_end = m_progs + prog_pool_sz; + if (e.test(!(m_rules && m_codes && m_progs), E_OUTOFMEM)) return face.error(e); + + Rule * r = m_rules + m_numRules - 1; + for (size_t n = m_numRules; r >= m_rules; --n, --r, ac_end = ac_begin, rc_end = rc_begin) + { + face.error_context((face.error_context() & 0xFFFF00) + EC_ARULE + int((n - 1) << 24)); + r->preContext = *--precontext; + r->sort = be::peek(--sort_key); +#ifndef NDEBUG + r->rule_idx = uint16(n - 1); +#endif + if (r->sort > 63 || r->preContext >= r->sort || r->preContext > m_maxPreCtxt || r->preContext < m_minPreCtxt) + return false; + ac_begin = ac_data + be::peek(--o_action); + --o_constraint; + rc_begin = be::peek(o_constraint) ? rc_data + be::peek(o_constraint) : rc_end; + + if (ac_begin > ac_end || ac_begin > ac_data_end || ac_end > ac_data_end + || rc_begin > rc_end || rc_begin > rc_data_end || rc_end > rc_data_end + || vm::Machine::Code::estimateCodeDataOut(ac_end - ac_begin + rc_end - rc_begin, 2, r->sort) > size_t(prog_pool_end - prog_pool_free)) + return false; + r->action = new (m_codes+n*2-2) vm::Machine::Code(false, ac_begin, ac_end, r->preContext, r->sort, *m_silf, face, pt, &prog_pool_free); + r->constraint = new (m_codes+n*2-1) vm::Machine::Code(true, rc_begin, rc_end, r->preContext, r->sort, *m_silf, face, pt, &prog_pool_free); + + if (e.test(!r->action || !r->constraint, E_OUTOFMEM) + || e.test(r->action->status() != Code::loaded, r->action->status() + E_CODEFAILURE) + || e.test(r->constraint->status() != Code::loaded, r->constraint->status() + E_CODEFAILURE) + || e.test(!r->constraint->immutable(), E_MUTABLECCODE)) + return face.error(e); + } + + byte * const moved_progs = prog_pool_free > m_progs ? static_cast(realloc(m_progs, prog_pool_free - m_progs)) : 0; + if (e.test(!moved_progs, E_OUTOFMEM)) + { + free(m_progs); + m_progs = 0; + return face.error(e); + } + + if (moved_progs != m_progs) + { + for (Code * c = m_codes, * const ce = c + m_numRules*2; c != ce; ++c) + { + c->externalProgramMoved(moved_progs - m_progs); + } + m_progs = moved_progs; + } + + // Load the rule entries map + face.error_context((face.error_context() & 0xFFFF00) + EC_APASS); + //TODO: Coverity: 1315804: FORWARD_NULL + RuleEntry * re = m_ruleMap = gralloc(num_entries); + if (e.test(!re, E_OUTOFMEM)) return face.error(e); + for (size_t n = num_entries; n; --n, ++re) + { + const ptrdiff_t rn = be::read(rule_map); + if (e.test(rn >= m_numRules, E_BADRULENUM)) return face.error(e); + re->rule = m_rules + rn; + } + + return true; +} + +static int cmpRuleEntry(const void *a, const void *b) { return (*(RuleEntry *)a < *(RuleEntry *)b ? -1 : + (*(RuleEntry *)b < *(RuleEntry *)a ? 1 : 0)); } + +bool Pass::readStates(const byte * starts, const byte *states, const byte * o_rule_map, GR_MAYBE_UNUSED Face & face, Error &e) +{ +#ifdef GRAPHITE2_TELEMETRY + telemetry::category _states_cat(face.tele.starts); +#endif + m_startStates = gralloc(m_maxPreCtxt - m_minPreCtxt + 1); +#ifdef GRAPHITE2_TELEMETRY + telemetry::set_category(face.tele.states); +#endif + m_states = gralloc(m_numStates); +#ifdef GRAPHITE2_TELEMETRY + telemetry::set_category(face.tele.transitions); +#endif + m_transitions = gralloc(m_numTransition * m_numColumns); + + if (e.test(!m_startStates || !m_states || !m_transitions, E_OUTOFMEM)) return face.error(e); + // load start states + for (uint16 * s = m_startStates, + * const s_end = s + m_maxPreCtxt - m_minPreCtxt + 1; s != s_end; ++s) + { + *s = be::read(starts); + if (e.test(*s >= m_numStates, E_BADSTATE)) + { + face.error_context((face.error_context() & 0xFFFF00) + EC_ASTARTS + int((s - m_startStates) << 24)); + return face.error(e); // true; + } + } + + // load state transition table. + for (uint16 * t = m_transitions, + * const t_end = t + m_numTransition*m_numColumns; t != t_end; ++t) + { + *t = be::read(states); + if (e.test(*t >= m_numStates, E_BADSTATE)) + { + face.error_context((face.error_context() & 0xFFFF00) + EC_ATRANS + int(((t - m_transitions) / m_numColumns) << 8)); + return face.error(e); + } + } + + State * s = m_states, + * const success_begin = m_states + m_numStates - m_numSuccess; + const RuleEntry * rule_map_end = m_ruleMap + be::peek(o_rule_map + m_numSuccess*sizeof(uint16)); + for (size_t n = m_numStates; n; --n, ++s) + { + RuleEntry * const begin = s < success_begin ? 0 : m_ruleMap + be::read(o_rule_map), + * const end = s < success_begin ? 0 : m_ruleMap + be::peek(o_rule_map); + + if (e.test(begin >= rule_map_end || end > rule_map_end || begin > end, E_BADRULEMAPPING)) + { + face.error_context((face.error_context() & 0xFFFF00) + EC_ARULEMAP + int(n << 24)); + return face.error(e); + } + s->rules = begin; + s->rules_end = (end - begin <= FiniteStateMachine::MAX_RULES)? end : + begin + FiniteStateMachine::MAX_RULES; + if (begin) // keep UBSan happy can't call qsort with null begin + qsort(begin, end - begin, sizeof(RuleEntry), &cmpRuleEntry); + } + + return true; +} + +bool Pass::readRanges(const byte * ranges, size_t num_ranges, Error &e) +{ + m_cols = gralloc(m_numGlyphs); + if (e.test(!m_cols, E_OUTOFMEM)) return false; + memset(m_cols, 0xFF, m_numGlyphs * sizeof(uint16)); + for (size_t n = num_ranges; n; --n) + { + uint16 * ci = m_cols + be::read(ranges), + * ci_end = m_cols + be::read(ranges) + 1, + col = be::read(ranges); + + if (e.test(ci >= ci_end || ci_end > m_cols+m_numGlyphs || col >= m_numColumns, E_BADRANGE)) + return false; + + // A glyph must only belong to one column at a time + while (ci != ci_end && *ci == 0xffff) + *ci++ = col; + + if (e.test(ci != ci_end, E_BADRANGE)) + return false; + } + return true; +} + + +bool Pass::runGraphite(vm::Machine & m, FiniteStateMachine & fsm, bool reverse) const +{ + Slot *s = m.slotMap().segment.first(); + if (!s || !testPassConstraint(m)) return true; + if (reverse) + { + m.slotMap().segment.reverseSlots(); + s = m.slotMap().segment.first(); + } + if (m_numRules) + { + Slot *currHigh = s->next(); + +#if !defined GRAPHITE2_NTRACING + if (fsm.dbgout) *fsm.dbgout << "rules" << json::array; + json::closer rules_array_closer(fsm.dbgout); +#endif + + m.slotMap().highwater(currHigh); + int lc = m_iMaxLoop; + do + { + findNDoRule(s, m, fsm); + if (m.status() != Machine::finished) return false; + if (s && (s == m.slotMap().highwater() || m.slotMap().highpassed() || --lc == 0)) { + if (!lc) + s = m.slotMap().highwater(); + lc = m_iMaxLoop; + if (s) + m.slotMap().highwater(s->next()); + } + } while (s); + } + //TODO: Use enums for flags + const bool collisions = m_numCollRuns || m_kernColls; + + if (!collisions || !m.slotMap().segment.hasCollisionInfo()) + return true; + + if (m_numCollRuns) + { + if (!(m.slotMap().segment.flags() & Segment::SEG_INITCOLLISIONS)) + { + m.slotMap().segment.positionSlots(0, 0, 0, m.slotMap().dir(), true); +// m.slotMap().segment.flags(m.slotMap().segment.flags() | Segment::SEG_INITCOLLISIONS); + } + if (!collisionShift(&m.slotMap().segment, m.slotMap().dir(), fsm.dbgout)) + return false; + } + if ((m_kernColls) && !collisionKern(&m.slotMap().segment, m.slotMap().dir(), fsm.dbgout)) + return false; + if (collisions && !collisionFinish(&m.slotMap().segment, fsm.dbgout)) + return false; + return true; +} + +bool Pass::runFSM(FiniteStateMachine& fsm, Slot * slot) const +{ + fsm.reset(slot, m_maxPreCtxt); + if (fsm.slots.context() < m_minPreCtxt) + return false; + + uint16 state = m_startStates[m_maxPreCtxt - fsm.slots.context()]; + uint8 free_slots = SlotMap::MAX_SLOTS; + do + { + fsm.slots.pushSlot(slot); + if (slot->gid() >= m_numGlyphs + || m_cols[slot->gid()] == 0xffffU + || --free_slots == 0 + || state >= m_numTransition) + return free_slots != 0; + + const uint16 * transitions = m_transitions + state*m_numColumns; + state = transitions[m_cols[slot->gid()]]; + if (state >= m_successStart) + fsm.rules.accumulate_rules(m_states[state]); + + slot = slot->next(); + } while (state != 0 && slot); + + fsm.slots.pushSlot(slot); + return true; +} + +#if !defined GRAPHITE2_NTRACING + +inline +Slot * input_slot(const SlotMap & slots, const int n) +{ + Slot * s = slots[slots.context() + n]; + if (!s->isCopied()) return s; + + return s->prev() ? s->prev()->next() : (s->next() ? s->next()->prev() : slots.segment.last()); +} + +inline +Slot * output_slot(const SlotMap & slots, const int n) +{ + Slot * s = slots[slots.context() + n - 1]; + return s ? s->next() : slots.segment.first(); +} + +#endif //!defined GRAPHITE2_NTRACING + +void Pass::findNDoRule(Slot * & slot, Machine &m, FiniteStateMachine & fsm) const +{ + assert(slot); + + if (runFSM(fsm, slot)) + { + // Search for the first rule which passes the constraint + const RuleEntry * r = fsm.rules.begin(), + * const re = fsm.rules.end(); + while (r != re && !testConstraint(*r->rule, m)) + { + ++r; + if (m.status() != Machine::finished) + return; + } + +#if !defined GRAPHITE2_NTRACING + if (fsm.dbgout) + { + if (fsm.rules.size() != 0) + { + *fsm.dbgout << json::item << json::object; + dumpRuleEventConsidered(fsm, *r); + if (r != re) + { + const int adv = doAction(r->rule->action, slot, m); + dumpRuleEventOutput(fsm, *r->rule, slot); + if (r->rule->action->deletes()) fsm.slots.collectGarbage(slot); + adjustSlot(adv, slot, fsm.slots); + *fsm.dbgout << "cursor" << objectid(dslot(&fsm.slots.segment, slot)) + << json::close; // Close RuelEvent object + + return; + } + else + { + *fsm.dbgout << json::close // close "considered" array + << "output" << json::null + << "cursor" << objectid(dslot(&fsm.slots.segment, slot->next())) + << json::close; + } + } + } + else +#endif + { + if (r != re) + { + const int adv = doAction(r->rule->action, slot, m); + if (m.status() != Machine::finished) return; + if (r->rule->action->deletes()) fsm.slots.collectGarbage(slot); + adjustSlot(adv, slot, fsm.slots); + return; + } + } + } + + slot = slot->next(); + return; +} + +#if !defined GRAPHITE2_NTRACING + +void Pass::dumpRuleEventConsidered(const FiniteStateMachine & fsm, const RuleEntry & re) const +{ + *fsm.dbgout << "considered" << json::array; + for (const RuleEntry *r = fsm.rules.begin(); r != &re; ++r) + { + if (r->rule->preContext > fsm.slots.context()) + continue; + *fsm.dbgout << json::flat << json::object + << "id" << r->rule - m_rules + << "failed" << true + << "input" << json::flat << json::object + << "start" << objectid(dslot(&fsm.slots.segment, input_slot(fsm.slots, -r->rule->preContext))) + << "length" << r->rule->sort + << json::close // close "input" + << json::close; // close Rule object + } +} + + +void Pass::dumpRuleEventOutput(const FiniteStateMachine & fsm, const Rule & r, Slot * const last_slot) const +{ + *fsm.dbgout << json::item << json::flat << json::object + << "id" << &r - m_rules + << "failed" << false + << "input" << json::flat << json::object + << "start" << objectid(dslot(&fsm.slots.segment, input_slot(fsm.slots, 0))) + << "length" << r.sort - r.preContext + << json::close // close "input" + << json::close // close Rule object + << json::close // close considered array + << "output" << json::object + << "range" << json::flat << json::object + << "start" << objectid(dslot(&fsm.slots.segment, input_slot(fsm.slots, 0))) + << "end" << objectid(dslot(&fsm.slots.segment, last_slot)) + << json::close // close "input" + << "slots" << json::array; + const Position rsb_prepos = last_slot ? last_slot->origin() : fsm.slots.segment.advance(); + fsm.slots.segment.positionSlots(0, 0, 0, fsm.slots.segment.currdir()); + + for(Slot * slot = output_slot(fsm.slots, 0); slot != last_slot; slot = slot->next()) + *fsm.dbgout << dslot(&fsm.slots.segment, slot); + *fsm.dbgout << json::close // close "slots" + << "postshift" << (last_slot ? last_slot->origin() : fsm.slots.segment.advance()) - rsb_prepos + << json::close; // close "output" object + +} + +#endif + + +inline +bool Pass::testPassConstraint(Machine & m) const +{ + if (!m_cPConstraint) return true; + + assert(m_cPConstraint.constraint()); + + m.slotMap().reset(*m.slotMap().segment.first(), 0); + m.slotMap().pushSlot(m.slotMap().segment.first()); + vm::slotref * map = m.slotMap().begin(); + const uint32 ret = m_cPConstraint.run(m, map); + +#if !defined GRAPHITE2_NTRACING + json * const dbgout = m.slotMap().segment.getFace()->logger(); + if (dbgout) + *dbgout << "constraint" << (ret && m.status() == Machine::finished); +#endif + + return ret && m.status() == Machine::finished; +} + + +bool Pass::testConstraint(const Rule & r, Machine & m) const +{ + const uint16 curr_context = m.slotMap().context(); + if (unsigned(r.sort + curr_context - r.preContext) > m.slotMap().size() + || curr_context - r.preContext < 0) return false; + + vm::slotref * map = m.slotMap().begin() + curr_context - r.preContext; + if (map[r.sort - 1] == 0) + return false; + + if (!*r.constraint) return true; + assert(r.constraint->constraint()); + for (int n = r.sort; n && map; --n, ++map) + { + if (!*map) continue; + const int32 ret = r.constraint->run(m, map); + if (!ret || m.status() != Machine::finished) + return false; + } + + return true; +} + + +void SlotMap::collectGarbage(Slot * &aSlot) +{ + for(Slot **s = begin(), *const *const se = end() - 1; s != se; ++s) { + Slot *& slot = *s; + if(slot && (slot->isDeleted() || slot->isCopied())) + { + if (slot == aSlot) + aSlot = slot->prev() ? slot->prev() : slot->next(); + segment.freeSlot(slot); + } + } +} + + + +int Pass::doAction(const Code *codeptr, Slot * & slot_out, vm::Machine & m) const +{ + assert(codeptr); + if (!*codeptr) return 0; + SlotMap & smap = m.slotMap(); + vm::slotref * map = &smap[smap.context()]; + smap.highpassed(false); + + int32 ret = codeptr->run(m, map); + + if (m.status() != Machine::finished) + { + slot_out = NULL; + smap.highwater(0); + return 0; + } + + slot_out = *map; + return ret; +} + + +void Pass::adjustSlot(int delta, Slot * & slot_out, SlotMap & smap) const +{ + if (!slot_out) + { + if (smap.highpassed() || slot_out == smap.highwater()) + { + slot_out = smap.segment.last(); + ++delta; + if (!smap.highwater()) + smap.highpassed(false); + } + else + { + slot_out = smap.segment.first(); + --delta; + } + } + if (delta < 0) + { + while (++delta <= 0 && slot_out) + { + slot_out = slot_out->prev(); + if (smap.highpassed() && smap.highwater() == slot_out) + smap.highpassed(false); + } + } + else if (delta > 0) + { + while (--delta >= 0 && slot_out) + { + if (slot_out == smap.highwater() && slot_out) + smap.highpassed(true); + slot_out = slot_out->next(); + } + } +} + +bool Pass::collisionShift(Segment *seg, int dir, json * const dbgout) const +{ + ShiftCollider shiftcoll(dbgout); + // bool isfirst = true; + bool hasCollisions = false; + Slot *start = seg->first(); // turn on collision fixing for the first slot + Slot *end = NULL; + bool moved = false; + +#if !defined GRAPHITE2_NTRACING + if (dbgout) + *dbgout << "collisions" << json::array + << json::flat << json::object << "num-loops" << m_numCollRuns << json::close; +#endif + + while (start) + { +#if !defined GRAPHITE2_NTRACING + if (dbgout) *dbgout << json::object << "phase" << "1" << "moves" << json::array; +#endif + hasCollisions = false; + end = NULL; + // phase 1 : position shiftable glyphs, ignoring kernable glyphs + for (Slot *s = start; s; s = s->next()) + { + const SlotCollision * c = seg->collisionInfo(s); + if (start && (c->flags() & (SlotCollision::COLL_FIX | SlotCollision::COLL_KERN)) == SlotCollision::COLL_FIX + && !resolveCollisions(seg, s, start, shiftcoll, false, dir, moved, hasCollisions, dbgout)) + return false; + if (s != start && (c->flags() & SlotCollision::COLL_END)) + { + end = s->next(); + break; + } + } + +#if !defined GRAPHITE2_NTRACING + if (dbgout) + *dbgout << json::close << json::close; // phase-1 +#endif + + // phase 2 : loop until happy. + for (int i = 0; i < m_numCollRuns - 1; ++i) + { + if (hasCollisions || moved) + { + +#if !defined GRAPHITE2_NTRACING + if (dbgout) + *dbgout << json::object << "phase" << "2a" << "loop" << i << "moves" << json::array; +#endif + // phase 2a : if any shiftable glyphs are in collision, iterate backwards, + // fixing them and ignoring other non-collided glyphs. Note that this handles ONLY + // glyphs that are actually in collision from phases 1 or 2b, and working backwards + // has the intended effect of breaking logjams. + if (hasCollisions) + { + hasCollisions = false; + #if 0 + moved = true; + for (Slot *s = start; s != end; s = s->next()) + { + SlotCollision * c = seg->collisionInfo(s); + c->setShift(Position(0, 0)); + } + #endif + Slot *lend = end ? end->prev() : seg->last(); + Slot *lstart = start->prev(); + for (Slot *s = lend; s != lstart; s = s->prev()) + { + SlotCollision * c = seg->collisionInfo(s); + if (start && (c->flags() & (SlotCollision::COLL_FIX | SlotCollision::COLL_KERN | SlotCollision::COLL_ISCOL)) + == (SlotCollision::COLL_FIX | SlotCollision::COLL_ISCOL)) // ONLY if this glyph is still colliding + { + if (!resolveCollisions(seg, s, lend, shiftcoll, true, dir, moved, hasCollisions, dbgout)) + return false; + c->setFlags(c->flags() | SlotCollision::COLL_TEMPLOCK); + } + } + } + +#if !defined GRAPHITE2_NTRACING + if (dbgout) + *dbgout << json::close << json::close // phase 2a + << json::object << "phase" << "2b" << "loop" << i << "moves" << json::array; +#endif + + // phase 2b : redo basic diacritic positioning pass for ALL glyphs. Each successive loop adjusts + // glyphs from their current adjusted position, which has the effect of gradually minimizing the + // resulting adjustment; ie, the final result will be gradually closer to the original location. + // Also it allows more flexibility in the final adjustment, since it is moving along the + // possible 8 vectors from successively different starting locations. + if (moved) + { + moved = false; + for (Slot *s = start; s != end; s = s->next()) + { + SlotCollision * c = seg->collisionInfo(s); + if (start && (c->flags() & (SlotCollision::COLL_FIX | SlotCollision::COLL_TEMPLOCK + | SlotCollision::COLL_KERN)) == SlotCollision::COLL_FIX + && !resolveCollisions(seg, s, start, shiftcoll, false, dir, moved, hasCollisions, dbgout)) + return false; + else if (c->flags() & SlotCollision::COLL_TEMPLOCK) + c->setFlags(c->flags() & ~SlotCollision::COLL_TEMPLOCK); + } + } + // if (!hasCollisions) // no, don't leave yet because phase 2b will continue to improve things + // break; +#if !defined GRAPHITE2_NTRACING + if (dbgout) + *dbgout << json::close << json::close; // phase 2 +#endif + } + } + if (!end) + break; + start = NULL; + for (Slot *s = end->prev(); s; s = s->next()) + { + if (seg->collisionInfo(s)->flags() & SlotCollision::COLL_START) + { + start = s; + break; + } + } + } + return true; +} + +bool Pass::collisionKern(Segment *seg, int dir, json * const dbgout) const +{ + Slot *start = seg->first(); + float ymin = 1e38f; + float ymax = -1e38f; + const GlyphCache &gc = seg->getFace()->glyphs(); + + // phase 3 : handle kerning of clusters +#if !defined GRAPHITE2_NTRACING + if (dbgout) + *dbgout << json::object << "phase" << "3" << "moves" << json::array; +#endif + + for (Slot *s = seg->first(); s; s = s->next()) + { + if (!gc.check(s->gid())) + return false; + const SlotCollision * c = seg->collisionInfo(s); + const Rect &bbox = seg->theGlyphBBoxTemporary(s->gid()); + float y = s->origin().y + c->shift().y; + if (!(c->flags() & SlotCollision::COLL_ISSPACE)) + { + ymax = max(y + bbox.tr.y, ymax); + ymin = min(y + bbox.bl.y, ymin); + } + if (start && (c->flags() & (SlotCollision::COLL_KERN | SlotCollision::COLL_FIX)) + == (SlotCollision::COLL_KERN | SlotCollision::COLL_FIX)) + resolveKern(seg, s, start, dir, ymin, ymax, dbgout); + if (c->flags() & SlotCollision::COLL_END) + start = NULL; + if (c->flags() & SlotCollision::COLL_START) + start = s; + } + +#if !defined GRAPHITE2_NTRACING + if (dbgout) + *dbgout << json::close << json::close; // phase 3 +#endif + return true; +} + +bool Pass::collisionFinish(Segment *seg, GR_MAYBE_UNUSED json * const dbgout) const +{ + for (Slot *s = seg->first(); s; s = s->next()) + { + SlotCollision *c = seg->collisionInfo(s); + if (c->shift().x != 0 || c->shift().y != 0) + { + const Position newOffset = c->shift(); + const Position nullPosition(0, 0); + c->setOffset(newOffset + c->offset()); + c->setShift(nullPosition); + } + } +// seg->positionSlots(); + +#if !defined GRAPHITE2_NTRACING + if (dbgout) + *dbgout << json::close; +#endif + return true; +} + +// Can slot s be kerned, or is it attached to something that can be kerned? +static bool inKernCluster(Segment *seg, Slot *s) +{ + SlotCollision *c = seg->collisionInfo(s); + if (c->flags() & SlotCollision::COLL_KERN /** && c->flags() & SlotCollision::COLL_FIX **/ ) + return true; + while (s->attachedTo()) + { + s = s->attachedTo(); + c = seg->collisionInfo(s); + if (c->flags() & SlotCollision::COLL_KERN /** && c->flags() & SlotCollision::COLL_FIX **/ ) + return true; + } + return false; +} + +// Fix collisions for the given slot. +// Return true if everything was fixed, false if there are still collisions remaining. +// isRev means be we are processing backwards. +bool Pass::resolveCollisions(Segment *seg, Slot *slotFix, Slot *start, + ShiftCollider &coll, GR_MAYBE_UNUSED bool isRev, int dir, bool &moved, bool &hasCol, + json * const dbgout) const +{ + Slot * nbor; // neighboring slot + SlotCollision *cFix = seg->collisionInfo(slotFix); + if (!coll.initSlot(seg, slotFix, cFix->limit(), cFix->margin(), cFix->marginWt(), + cFix->shift(), cFix->offset(), dir, dbgout)) + return false; + bool collides = false; + // When we're processing forward, ignore kernable glyphs that preceed the target glyph. + // When processing backward, don't ignore these until we pass slotFix. + bool ignoreForKern = !isRev; + bool rtl = dir & 1; + Slot *base = slotFix; + while (base->attachedTo()) + base = base->attachedTo(); + Position zero(0., 0.); + + // Look for collisions with the neighboring glyphs. + for (nbor = start; nbor; nbor = isRev ? nbor->prev() : nbor->next()) + { + SlotCollision *cNbor = seg->collisionInfo(nbor); + bool sameCluster = nbor->isChildOf(base); + if (nbor != slotFix // don't process if this is the slot of interest + && !(cNbor->ignore()) // don't process if ignoring + && (nbor == base || sameCluster // process if in the same cluster as slotFix + || !inKernCluster(seg, nbor)) // or this cluster is not to be kerned +// || (rtl ^ ignoreForKern)) // or it comes before(ltr) or after(rtl) + && (!isRev // if processing forwards then good to merge otherwise only: + || !(cNbor->flags() & SlotCollision::COLL_FIX) // merge in immovable stuff + || ((cNbor->flags() & SlotCollision::COLL_KERN) && !sameCluster) // ignore other kernable clusters + || (cNbor->flags() & SlotCollision::COLL_ISCOL)) // test against other collided glyphs + && !coll.mergeSlot(seg, nbor, cNbor, cNbor->shift(), !ignoreForKern, sameCluster, collides, false, dbgout)) + return false; + else if (nbor == slotFix) + // Switching sides of this glyph - if we were ignoring kernable stuff before, don't anymore. + ignoreForKern = !ignoreForKern; + + if (nbor != start && (cNbor->flags() & (isRev ? SlotCollision::COLL_START : SlotCollision::COLL_END))) + break; + } + bool isCol = false; + if (collides || cFix->shift().x != 0.f || cFix->shift().y != 0.f) + { + Position shift = coll.resolve(seg, isCol, dbgout); + // isCol has been set to true if a collision remains. + if (std::fabs(shift.x) < 1e38f && std::fabs(shift.y) < 1e38f) + { + if (sqr(shift.x-cFix->shift().x) + sqr(shift.y-cFix->shift().y) >= m_colThreshold * m_colThreshold) + moved = true; + cFix->setShift(shift); + if (slotFix->firstChild()) + { + Rect bbox; + Position here = slotFix->origin() + shift; + float clusterMin = here.x; + slotFix->firstChild()->finalise(seg, NULL, here, bbox, 0, clusterMin, rtl, false); + } + } + } + else + { + // This glyph is not colliding with anything. +#if !defined GRAPHITE2_NTRACING + if (dbgout) + { + *dbgout << json::object + << "missed" << objectid(dslot(seg, slotFix)); + coll.outputJsonDbg(dbgout, seg, -1); + *dbgout << json::close; + } +#endif + } + + // Set the is-collision flag bit. + if (isCol) + { cFix->setFlags(cFix->flags() | SlotCollision::COLL_ISCOL | SlotCollision::COLL_KNOWN); } + else + { cFix->setFlags((cFix->flags() & ~SlotCollision::COLL_ISCOL) | SlotCollision::COLL_KNOWN); } + hasCol |= isCol; + return true; +} + +float Pass::resolveKern(Segment *seg, Slot *slotFix, GR_MAYBE_UNUSED Slot *start, int dir, + float &ymin, float &ymax, json *const dbgout) const +{ + Slot *nbor; // neighboring slot + float currSpace = 0.; + bool collides = false; + unsigned int space_count = 0; + Slot *base = slotFix; + while (base->attachedTo()) + base = base->attachedTo(); + SlotCollision *cFix = seg->collisionInfo(base); + const GlyphCache &gc = seg->getFace()->glyphs(); + const Rect &bbb = seg->theGlyphBBoxTemporary(slotFix->gid()); + const float by = slotFix->origin().y + cFix->shift().y; + + if (base != slotFix) + { + cFix->setFlags(cFix->flags() | SlotCollision::COLL_KERN | SlotCollision::COLL_FIX); + return 0; + } + bool seenEnd = (cFix->flags() & SlotCollision::COLL_END) != 0; + bool isInit = false; + KernCollider coll(dbgout); + + ymax = max(by + bbb.tr.y, ymax); + ymin = min(by + bbb.bl.y, ymin); + for (nbor = slotFix->next(); nbor; nbor = nbor->next()) + { + if (nbor->isChildOf(base)) + continue; + if (!gc.check(nbor->gid())) + return 0.; + const Rect &bb = seg->theGlyphBBoxTemporary(nbor->gid()); + SlotCollision *cNbor = seg->collisionInfo(nbor); + if ((bb.bl.y == 0.f && bb.tr.y == 0.f) || (cNbor->flags() & SlotCollision::COLL_ISSPACE)) + { + if (m_kernColls == InWord) + break; + // Add space for a space glyph. + currSpace += nbor->advance(); + ++space_count; + } + else + { + space_count = 0; + if (nbor != slotFix && !cNbor->ignore()) + { + seenEnd = true; + if (!isInit) + { + if (!coll.initSlot(seg, slotFix, cFix->limit(), cFix->margin(), + cFix->shift(), cFix->offset(), dir, ymin, ymax, dbgout)) + return 0.; + isInit = true; + } + collides |= coll.mergeSlot(seg, nbor, cNbor->shift(), currSpace, dir, dbgout); + } + } + if (cNbor->flags() & SlotCollision::COLL_END) + { + if (seenEnd && space_count < 2) + break; + else + seenEnd = true; + } + } + if (collides) + { + Position mv = coll.resolve(seg, slotFix, dir, dbgout); + coll.shift(mv, dir); + Position delta = slotFix->advancePos() + mv - cFix->shift(); + slotFix->advance(delta); + cFix->setShift(mv); + return mv.x; + } + return 0.; +} diff --git a/source/libs/graphite2/graphite2-src/src/Position.cpp b/source/libs/graphite2/graphite2-src/src/Position.cpp new file mode 100644 index 000000000..d2fdbd4e7 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/Position.cpp @@ -0,0 +1,97 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include "inc/Position.h" +#include + +using namespace graphite2; + +bool Rect::hitTest(Rect &other) +{ + if (bl.x > other.tr.x) return false; + if (tr.x < other.bl.x) return false; + if (bl.y > other.tr.y) return false; + if (tr.y < other.bl.y) return false; + return true; +} + +Position Rect::overlap(Position &offset, Rect &other, Position &othero) +{ + float ax = (bl.x + offset.x) - (other.tr.x + othero.x); + float ay = (bl.y + offset.y) - (other.tr.y + othero.y); + float bx = (other.bl.x + othero.x) - (tr.x + offset.x); + float by = (other.bl.y + othero.y) - (tr.y + offset.y); + return Position((ax > bx ? ax : bx), (ay > by ? ay : by)); +} + +float boundmin(float move, float lim1, float lim2, float &error) +{ + // error is always positive for easy comparison + if (move < lim1 && move < lim2) + { error = 0.; return move; } + else if (lim1 < lim2) + { error = std::fabs(move - lim1); return lim1; } + else + { error = std::fabs(move - lim2); return lim2; } +} + +#if 0 +Position Rect::constrainedAvoid(Position &offset, Rect &box, Rect &sdbox, Position &other, Rect &obox, Rect &osdbox) +{ + // a = max, i = min, s = sum, d = diff + float eax, eay, eix, eiy, eas, eis, ead, eid; + float beste = INF; + Position res; + // calculate the movements in each direction and the error (amount of remaining overlap) + // first param is movement, second and third are movement over the constraining box + float ax = boundmin(obox.tr.x + other.x - box.bl.x - offset.x + 1, tr.x - offset.x, INF, &eax); + float ay = boundmin(obox.tr.y + other.y - box.bl.y - offset.y + 1, tr.y - offset.y, INF, &eay); + float ix = boundmin(obox.bl.x + other.x - box.tr.x - offset.x + 1, bl.x - offset.x, INF, &eix); + float iy = boundmin(obox.bl.y + other.y - box.tr.y - offset.y + 1, bl.y - offset.y, INF, &eiy); + float as = boundmin(ISQRT2 * (osdbox.tr.x + other.x + other.y - sdbox.bl.x - offset.x - offset.y) + 1, tr.x - offset.x, tr.y - offset.y, &eas); + float is = boundmin(ISQRT2 * (osdbox.bl.x + other.x + other.y - sdbox.tr.x - offset.x - offset.y) + 1, bl.x - offset.x, bl.y - offset.y, &eis); + float ad = boundmin(ISQRT2 * (osdbox.tr.y + other.x - other.y - sdbox.bl.y - offset.x + offset.y) + 1, tr.y - offset.y, tr.x - offset.x, &ead); + float id = boundmin(ISQRT2 * (osdbox.bl.y + other.x - other.y - sdbox.tr.y - offset.x + offset.y) + 1, bl.y - offset.y, bl.x - offset.x, &eid); + + if (eax < beste) + { res = Position(ax, 0); beste = eax; } + if (eay < beste) + { res = Position(0, ay); beste = eay; } + if (eix < beste) + { res = Position(ix, 0); beste = eix; } + if (eiy < beste) + { res = Position(0, iy); beste = eiy; } + if (SQRT2 * (eas) < beste) + { res = Position(as, ad); beste = SQRT2 * (eas); } + if (SQRT2 * (eis) < beste) + { res = Position(is, is); beste = SQRT2 * (eis); } + if (SQRT2 * (ead) < beste) + { res = Position(ad, ad); beste = SQRT2 * (ead); } + if (SQRT2 * (eid) < beste) + { res = Position(id, id); beste = SQRT2 * (eid); } + return res; +} +#endif diff --git a/source/libs/graphite2/graphite2-src/src/Segment.cpp b/source/libs/graphite2/graphite2-src/src/Segment.cpp new file mode 100644 index 000000000..62edd4250 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/Segment.cpp @@ -0,0 +1,423 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include "inc/UtfCodec.h" +#include +#include + +#include "inc/bits.h" +#include "inc/Segment.h" +#include "graphite2/Font.h" +#include "inc/CharInfo.h" +#include "inc/debug.h" +#include "inc/Slot.h" +#include "inc/Main.h" +#include "inc/CmapCache.h" +#include "inc/Collider.h" +#include "graphite2/Segment.h" + + +using namespace graphite2; + +Segment::Segment(size_t numchars, const Face* face, uint32 script, int textDir) +: m_freeSlots(NULL), + m_freeJustifies(NULL), + m_charinfo(new CharInfo[numchars]), + m_collisions(NULL), + m_face(face), + m_silf(face->chooseSilf(script)), + m_first(NULL), + m_last(NULL), + m_bufSize(numchars + 10), + m_numGlyphs(numchars), + m_numCharinfo(numchars), + m_defaultOriginal(0), + m_dir(textDir), + m_flags(((m_silf->flags() & 0x20) != 0) << 1), + m_passBits(m_silf->aPassBits() ? -1 : 0) +{ + freeSlot(newSlot()); + m_bufSize = log_binary(numchars)+1; +} + +Segment::~Segment() +{ + for (SlotRope::iterator i = m_slots.begin(); i != m_slots.end(); ++i) + free(*i); + for (AttributeRope::iterator i = m_userAttrs.begin(); i != m_userAttrs.end(); ++i) + free(*i); + for (JustifyRope::iterator i = m_justifies.begin(); i != m_justifies.end(); ++i) + free(*i); + delete[] m_charinfo; + free(m_collisions); +} + +void Segment::appendSlot(int id, int cid, int gid, int iFeats, size_t coffset) +{ + Slot *aSlot = newSlot(); + + if (!aSlot) return; + m_charinfo[id].init(cid); + m_charinfo[id].feats(iFeats); + m_charinfo[id].base(coffset); + const GlyphFace * theGlyph = m_face->glyphs().glyphSafe(gid); + m_charinfo[id].breakWeight(theGlyph ? theGlyph->attrs()[m_silf->aBreak()] : 0); + + aSlot->child(NULL); + aSlot->setGlyph(this, gid, theGlyph); + aSlot->originate(id); + aSlot->before(id); + aSlot->after(id); + if (m_last) m_last->next(aSlot); + aSlot->prev(m_last); + m_last = aSlot; + if (!m_first) m_first = aSlot; + if (theGlyph && m_silf->aPassBits()) + m_passBits &= theGlyph->attrs()[m_silf->aPassBits()] + | (m_silf->numPasses() > 16 ? (theGlyph->attrs()[m_silf->aPassBits() + 1] << 16) : 0); +} + +Slot *Segment::newSlot() +{ + if (!m_freeSlots) + { + // check that the segment doesn't grow indefinintely + if (m_numGlyphs > m_numCharinfo * MAX_SEG_GROWTH_FACTOR) + return NULL; + int numUser = m_silf->numUser(); +#if !defined GRAPHITE2_NTRACING + if (m_face->logger()) ++numUser; +#endif + Slot *newSlots = grzeroalloc(m_bufSize); + int16 *newAttrs = grzeroalloc(m_bufSize * numUser); + if (!newSlots || !newAttrs) + { + free(newSlots); + free(newAttrs); + return NULL; + } + for (size_t i = 0; i < m_bufSize; i++) + { + ::new (newSlots + i) Slot(newAttrs + i * numUser); + newSlots[i].next(newSlots + i + 1); + } + newSlots[m_bufSize - 1].next(NULL); + newSlots[0].next(NULL); + m_slots.push_back(newSlots); + m_userAttrs.push_back(newAttrs); + m_freeSlots = (m_bufSize > 1)? newSlots + 1 : NULL; + return newSlots; + } + Slot *res = m_freeSlots; + m_freeSlots = m_freeSlots->next(); + res->next(NULL); + return res; +} + +void Segment::freeSlot(Slot *aSlot) +{ + if (aSlot == nullptr) return; + if (m_last == aSlot) m_last = aSlot->prev(); + if (m_first == aSlot) m_first = aSlot->next(); + if (aSlot->attachedTo()) + aSlot->attachedTo()->removeChild(aSlot); + while (aSlot->firstChild()) + { + if (aSlot->firstChild()->attachedTo() == aSlot) + { + aSlot->firstChild()->attachTo(nullptr); + aSlot->removeChild(aSlot->firstChild()); + } + else + aSlot->firstChild(nullptr); + } + // reset the slot incase it is reused + ::new (aSlot) Slot(aSlot->userAttrs()); + memset(aSlot->userAttrs(), 0, m_silf->numUser() * sizeof(int16)); + // Update generation counter for debug +#if !defined GRAPHITE2_NTRACING + if (m_face->logger()) + ++aSlot->userAttrs()[m_silf->numUser()]; +#endif + // update next pointer + if (!m_freeSlots) + aSlot->next(nullptr); + else + aSlot->next(m_freeSlots); + m_freeSlots = aSlot; +} + +SlotJustify *Segment::newJustify() +{ + if (!m_freeJustifies) + { + const size_t justSize = SlotJustify::size_of(m_silf->numJustLevels()); + byte *justs = grzeroalloc(justSize * m_bufSize); + if (!justs) return NULL; + for (ptrdiff_t i = m_bufSize - 2; i >= 0; --i) + { + SlotJustify *p = reinterpret_cast(justs + justSize * i); + SlotJustify *next = reinterpret_cast(justs + justSize * (i + 1)); + p->next = next; + } + m_freeJustifies = (SlotJustify *)justs; + m_justifies.push_back(m_freeJustifies); + } + SlotJustify *res = m_freeJustifies; + m_freeJustifies = m_freeJustifies->next; + res->next = NULL; + return res; +} + +void Segment::freeJustify(SlotJustify *aJustify) +{ + int numJust = m_silf->numJustLevels(); + if (m_silf->numJustLevels() <= 0) numJust = 1; + aJustify->next = m_freeJustifies; + memset(aJustify->values, 0, numJust*SlotJustify::NUMJUSTPARAMS*sizeof(int16)); + m_freeJustifies = aJustify; +} + +// reverse the slots but keep diacritics in their same position after their bases +void Segment::reverseSlots() +{ + m_dir = m_dir ^ 64; // invert the reverse flag + if (m_first == m_last) return; // skip 0 or 1 glyph runs + + Slot *t = 0; + Slot *curr = m_first; + Slot *tlast; + Slot *tfirst; + Slot *out = 0; + + while (curr && getSlotBidiClass(curr) == 16) + curr = curr->next(); + if (!curr) return; + tfirst = curr->prev(); + tlast = curr; + + while (curr) + { + if (getSlotBidiClass(curr) == 16) + { + Slot *d = curr->next(); + while (d && getSlotBidiClass(d) == 16) + d = d->next(); + + d = d ? d->prev() : m_last; + Slot *p = out->next(); // one after the diacritics. out can't be null + if (p) + p->prev(d); + else + tlast = d; + t = d->next(); + d->next(p); + curr->prev(out); + out->next(curr); + } + else // will always fire first time round the loop + { + if (out) + out->prev(curr); + t = curr->next(); + curr->next(out); + out = curr; + } + curr = t; + } + out->prev(tfirst); + if (tfirst) + tfirst->next(out); + else + m_first = out; + m_last = tlast; +} + +void Segment::linkClusters(Slot *s, Slot * end) +{ + end = end->next(); + + for (; s != end && !s->isBase(); s = s->next()); + Slot * ls = s; + + if (m_dir & 1) + { + for (; s != end; s = s->next()) + { + if (!s->isBase()) continue; + + s->sibling(ls); + ls = s; + } + } + else + { + for (; s != end; s = s->next()) + { + if (!s->isBase()) continue; + + ls->sibling(s); + ls = s; + } + } +} + +Position Segment::positionSlots(const Font *font, Slot * iStart, Slot * iEnd, bool isRtl, bool isFinal) +{ + Position currpos(0., 0.); + float clusterMin = 0.; + Rect bbox; + bool reorder = (currdir() != isRtl); + + if (reorder) + { + Slot *temp; + reverseSlots(); + temp = iStart; + iStart = iEnd; + iEnd = temp; + } + if (!iStart) iStart = m_first; + if (!iEnd) iEnd = m_last; + + if (!iStart || !iEnd) // only true for empty segments + return currpos; + + if (isRtl) + { + for (Slot * s = iEnd, * const end = iStart->prev(); s && s != end; s = s->prev()) + { + if (s->isBase()) + currpos = s->finalise(this, font, currpos, bbox, 0, clusterMin = currpos.x, isRtl, isFinal); + } + } + else + { + for (Slot * s = iStart, * const end = iEnd->next(); s && s != end; s = s->next()) + { + if (s->isBase()) + currpos = s->finalise(this, font, currpos, bbox, 0, clusterMin = currpos.x, isRtl, isFinal); + } + } + if (reorder) + reverseSlots(); + return currpos; +} + + +void Segment::associateChars(int offset, size_t numChars) +{ + int i = 0, j = 0; + CharInfo *c, *cend; + for (c = m_charinfo + offset, cend = m_charinfo + offset + numChars; c != cend; ++c) + { + c->before(-1); + c->after(-1); + } + for (Slot * s = m_first; s; s->index(i++), s = s->next()) + { + j = s->before(); + if (j < 0) continue; + + for (const int after = s->after(); j <= after; ++j) + { + c = charinfo(j); + if (c->before() == -1 || i < c->before()) c->before(i); + if (c->after() < i) c->after(i); + } + } + for (Slot *s = m_first; s; s = s->next()) + { + int a; + for (a = s->after() + 1; a < offset + int(numChars) && charinfo(a)->after() < 0; ++a) + { charinfo(a)->after(s->index()); } + --a; + s->after(a); + + for (a = s->before() - 1; a >= offset && charinfo(a)->before() < 0; --a) + { charinfo(a)->before(s->index()); } + ++a; + s->before(a); + } +} + + +template +inline void process_utf_data(Segment & seg, const Face & face, const int fid, utf_iter c, size_t n_chars) +{ + const Cmap & cmap = face.cmap(); + int slotid = 0; + + const typename utf_iter::codeunit_type * const base = c; + for (; n_chars; --n_chars, ++c, ++slotid) + { + const uint32 usv = *c; + uint16 gid = cmap[usv]; + if (!gid) gid = face.findPseudo(usv); + seg.appendSlot(slotid, usv, gid, fid, c - base); + } +} + + +bool Segment::read_text(const Face *face, const Features* pFeats/*must not be NULL*/, gr_encform enc, const void* pStart, size_t nChars) +{ + assert(face); + assert(pFeats); + if (!m_charinfo) return false; + + // utf iterator is self recovering so we don't care about the error state of the iterator. + switch (enc) + { + case gr_utf8: process_utf_data(*this, *face, addFeatures(*pFeats), utf8::const_iterator(pStart), nChars); break; + case gr_utf16: process_utf_data(*this, *face, addFeatures(*pFeats), utf16::const_iterator(pStart), nChars); break; + case gr_utf32: process_utf_data(*this, *face, addFeatures(*pFeats), utf32::const_iterator(pStart), nChars); break; + } + return true; +} + +void Segment::doMirror(uint16 aMirror) +{ + Slot * s; + for (s = m_first; s; s = s->next()) + { + unsigned short g = glyphAttr(s->gid(), aMirror); + if (g && (!(dir() & 4) || !glyphAttr(s->gid(), aMirror + 1))) + s->setGlyph(this, g); + } +} + +bool Segment::initCollisions() +{ + m_collisions = grzeroalloc(slotCount()); + if (!m_collisions) return false; + + for (Slot *p = m_first; p; p = p->next()) + if (p->index() < slotCount()) + ::new (collisionInfo(p)) SlotCollision(this, p); + else + return false; + return true; +} diff --git a/source/libs/graphite2/graphite2-src/src/Silf.cpp b/source/libs/graphite2/graphite2-src/src/Silf.cpp new file mode 100644 index 000000000..44d3c9617 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/Silf.cpp @@ -0,0 +1,439 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include +#include "graphite2/Segment.h" +#include "inc/debug.h" +#include "inc/Endian.h" +#include "inc/Silf.h" +#include "inc/Segment.h" +#include "inc/Rule.h" +#include "inc/Error.h" + + +using namespace graphite2; + +namespace { static const uint32 ERROROFFSET = 0xFFFFFFFF; } + +Silf::Silf() throw() +: m_passes(0), + m_pseudos(0), + m_classOffsets(0), + m_classData(0), + m_justs(0), + m_numPasses(0), + m_numJusts(0), + m_sPass(0), + m_pPass(0), + m_jPass(0), + m_bPass(0), + m_flags(0), + m_dir(0), + m_aPseudo(0), + m_aBreak(0), + m_aUser(0), + m_aBidi(0), + m_aMirror(0), + m_aPassBits(0), + m_iMaxComp(0), + m_aCollision(0), + m_aLig(0), + m_numPseudo(0), + m_nClass(0), + m_nLinear(0), + m_gEndLine(0) +{ + memset(&m_silfinfo, 0, sizeof m_silfinfo); +} + +Silf::~Silf() throw() +{ + releaseBuffers(); +} + +void Silf::releaseBuffers() throw() +{ + delete [] m_passes; + delete [] m_pseudos; + free(m_classOffsets); + free(m_classData); + free(m_justs); + m_passes= 0; + m_pseudos = 0; + m_classOffsets = 0; + m_classData = 0; + m_justs = 0; +} + + +bool Silf::readGraphite(const byte * const silf_start, size_t lSilf, Face& face, uint32 version) +{ + const byte * p = silf_start, + * const silf_end = p + lSilf; + Error e; + + if (e.test(version >= 0x00060000, E_BADSILFVERSION)) + { + releaseBuffers(); return face.error(e); + } + if (version >= 0x00030000) + { + if (e.test(lSilf < 28, E_BADSIZE)) { releaseBuffers(); return face.error(e); } + be::skip(p); // ruleVersion + be::skip(p,2); // passOffset & pseudosOffset + } + else if (e.test(lSilf < 20, E_BADSIZE)) { releaseBuffers(); return face.error(e); } + const uint16 maxGlyph = be::read(p); + m_silfinfo.extra_ascent = be::read(p); + m_silfinfo.extra_descent = be::read(p); + m_numPasses = be::read(p); + m_sPass = be::read(p); + m_pPass = be::read(p); + m_jPass = be::read(p); + m_bPass = be::read(p); + m_flags = be::read(p); + be::skip(p,2); // max{Pre,Post}Context. + m_aPseudo = be::read(p); + m_aBreak = be::read(p); + m_aBidi = be::read(p); + m_aMirror = be::read(p); + m_aPassBits = be::read(p); + + // Read Justification levels. + m_numJusts = be::read(p); + if (e.test(maxGlyph >= face.glyphs().numGlyphs(), E_BADMAXGLYPH) + || e.test(p + m_numJusts * 8 >= silf_end, E_BADNUMJUSTS)) + { + releaseBuffers(); return face.error(e); + } + + if (m_numJusts) + { + m_justs = gralloc(m_numJusts); + if (e.test(!m_justs, E_OUTOFMEM)) return face.error(e); + + for (uint8 i = 0; i < m_numJusts; i++) + { + ::new(m_justs + i) Justinfo(p[0], p[1], p[2], p[3]); + be::skip(p,8); + } + } + + if (e.test(p + sizeof(uint16) + sizeof(uint8)*8 >= silf_end, E_BADENDJUSTS)) { releaseBuffers(); return face.error(e); } + m_aLig = be::read(p); + m_aUser = be::read(p); + m_iMaxComp = be::read(p); + m_dir = be::read(p) - 1; + m_aCollision = be::read(p); + be::skip(p,3); + be::skip(p, be::read(p)); // don't need critical features yet + be::skip(p); // reserved + if (e.test(p >= silf_end, E_BADCRITFEATURES)) { releaseBuffers(); return face.error(e); } + be::skip(p, be::read(p)); // don't use scriptTag array. + if (e.test(p + sizeof(uint16) + sizeof(uint32) >= silf_end, E_BADSCRIPTTAGS)) { releaseBuffers(); return face.error(e); } + m_gEndLine = be::read(p); // lbGID + const byte * o_passes = p; + uint32 passes_start = be::read(p); + + const size_t num_attrs = face.glyphs().numAttrs(); + if (e.test(m_aPseudo >= num_attrs, E_BADAPSEUDO) + || e.test(m_aBreak >= num_attrs, E_BADABREAK) + || e.test(m_aBidi >= num_attrs, E_BADABIDI) + || e.test(m_aMirror>= num_attrs, E_BADAMIRROR) + || e.test(m_aCollision && m_aCollision >= num_attrs - 5, E_BADACOLLISION) + || e.test(m_numPasses > 128, E_BADNUMPASSES) || e.test(passes_start >= lSilf, E_BADPASSESSTART) + || e.test(m_pPass < m_sPass, E_BADPASSBOUND) || e.test(m_pPass > m_numPasses, E_BADPPASS) || e.test(m_sPass > m_numPasses, E_BADSPASS) + || e.test(m_jPass < m_pPass, E_BADJPASSBOUND) || e.test(m_jPass > m_numPasses, E_BADJPASS) + || e.test((m_bPass != 0xFF && (m_bPass < m_jPass || m_bPass > m_numPasses)), E_BADBPASS) + || e.test(m_aLig > 127, E_BADALIG)) + { + releaseBuffers(); + return face.error(e); + } + be::skip(p, m_numPasses); + if (e.test(unsigned(p - silf_start) + sizeof(uint16) >= passes_start, E_BADPASSESSTART)) { releaseBuffers(); return face.error(e); } + m_numPseudo = be::read(p); + be::skip(p, 3); // searchPseudo, pseudoSelector, pseudoShift + m_pseudos = new Pseudo[m_numPseudo]; + if (e.test(unsigned(p - silf_start) + m_numPseudo*(sizeof(uint32) + sizeof(uint16)) >= passes_start, E_BADNUMPSEUDO) + || e.test(!m_pseudos, E_OUTOFMEM)) + { + releaseBuffers(); return face.error(e); + } + for (int i = 0; i < m_numPseudo; i++) + { + m_pseudos[i].uid = be::read(p); + m_pseudos[i].gid = be::read(p); + } + + const size_t clen = readClassMap(p, passes_start + silf_start - p, version, e); + m_passes = new Pass[m_numPasses]; + if (e || e.test(clen > unsigned(passes_start + silf_start - p), E_BADPASSESSTART) + || e.test(!m_passes, E_OUTOFMEM)) + { releaseBuffers(); return face.error(e); } + + for (size_t i = 0; i < m_numPasses; ++i) + { + uint32 pass_start = be::read(o_passes); + uint32 pass_end = be::peek(o_passes); + face.error_context((face.error_context() & 0xFF00) + EC_ASILF + unsigned(i << 16)); + if (e.test(pass_start > pass_end, E_BADPASSSTART) + || e.test(pass_start < passes_start, E_BADPASSSTART) + || e.test(pass_end > lSilf, E_BADPASSEND)) { + releaseBuffers(); return face.error(e); + } + + enum passtype pt = PASS_TYPE_UNKNOWN; + if (i >= m_jPass) pt = PASS_TYPE_JUSTIFICATION; + else if (i >= m_pPass) pt = PASS_TYPE_POSITIONING; + else if (i >= m_sPass) pt = PASS_TYPE_SUBSTITUTE; + else pt = PASS_TYPE_LINEBREAK; + + m_passes[i].init(this); + if (!m_passes[i].readPass(silf_start + pass_start, pass_end - pass_start, pass_start, face, pt, + version, e)) + { + releaseBuffers(); + return false; + } + } + + // fill in gr_faceinfo + m_silfinfo.upem = face.glyphs().unitsPerEm(); + m_silfinfo.has_bidi_pass = (m_bPass != 0xFF); + m_silfinfo.justifies = (m_numJusts != 0) || (m_jPass < m_pPass); + m_silfinfo.line_ends = (m_flags & 1); + m_silfinfo.space_contextuals = gr_faceinfo::gr_space_contextuals((m_flags >> 2) & 0x7); + return true; +} + +template inline uint32 Silf::readClassOffsets(const byte *&p, size_t data_len, Error &e) +{ + const T cls_off = 2*sizeof(uint16) + sizeof(T)*(m_nClass+1); + const uint32 max_off = (be::peek(p + sizeof(T)*m_nClass) - cls_off)/sizeof(uint16); + // Check that the last+1 offset is less than or equal to the class map length. + if (e.test(be::peek(p) != cls_off, E_MISALIGNEDCLASSES) + || e.test(max_off > (data_len - cls_off)/sizeof(uint16), E_HIGHCLASSOFFSET)) + return ERROROFFSET; + + // Read in all the offsets. + m_classOffsets = gralloc(m_nClass+1); + if (e.test(!m_classOffsets, E_OUTOFMEM)) return ERROROFFSET; + for (uint32 * o = m_classOffsets, * const o_end = o + m_nClass + 1; o != o_end; ++o) + { + *o = (be::read(p) - cls_off)/sizeof(uint16); + if (e.test(*o > max_off, E_HIGHCLASSOFFSET)) + return ERROROFFSET; + } + return max_off; +} + +size_t Silf::readClassMap(const byte *p, size_t data_len, uint32 version, Error &e) +{ + if (e.test(data_len < sizeof(uint16)*2, E_BADCLASSSIZE)) return ERROROFFSET; + + m_nClass = be::read(p); + m_nLinear = be::read(p); + + // Check that numLinear < numClass, + // that there is at least enough data for numClasses offsets. + if (e.test(m_nLinear > m_nClass, E_TOOMANYLINEAR) + || e.test((m_nClass + 1) * (version >= 0x00040000 ? sizeof(uint32) : sizeof(uint16)) > (data_len - 4), E_CLASSESTOOBIG)) + return ERROROFFSET; + + uint32 max_off; + if (version >= 0x00040000) + max_off = readClassOffsets(p, data_len, e); + else + max_off = readClassOffsets(p, data_len, e); + + if (max_off == ERROROFFSET) return ERROROFFSET; + + if (e.test((int)max_off < m_nLinear + (m_nClass - m_nLinear) * 6, E_CLASSESTOOBIG)) + return ERROROFFSET; + + // Check the linear offsets are sane, these must be monotonically increasing. + assert(m_nClass >= m_nLinear); + for (const uint32 *o = m_classOffsets, * const o_end = o + m_nLinear; o != o_end; ++o) + if (e.test(o[0] > o[1], E_BADCLASSOFFSET)) + return ERROROFFSET; + + // Fortunately the class data is all uint16s so we can decode these now + m_classData = gralloc(max_off); + if (e.test(!m_classData, E_OUTOFMEM)) return ERROROFFSET; + for (uint16 *d = m_classData, * const d_end = d + max_off; d != d_end; ++d) + *d = be::read(p); + + // Check the lookup class invariants for each non-linear class + for (const uint32 *o = m_classOffsets + m_nLinear, * const o_end = m_classOffsets + m_nClass; o != o_end; ++o) + { + const uint16 * lookup = m_classData + *o; + if (e.test(*o + 4 > max_off, E_HIGHCLASSOFFSET) // LookupClass doesn't stretch over max_off + || e.test(lookup[0] == 0 // A LookupClass with no looks is a suspicious thing ... + || lookup[0] * 2 + *o + 4 > max_off // numIDs lookup pairs fits within (start of LookupClass' lookups array, max_off] + || lookup[3] + lookup[1] != lookup[0], E_BADCLASSLOOKUPINFO) // rangeShift: numIDs - searchRange + || e.test(((o[1] - *o) & 1) != 0, ERROROFFSET)) // glyphs are in pairs so difference must be even. + return ERROROFFSET; + } + + return max_off; +} + +uint16 Silf::findPseudo(uint32 uid) const +{ + for (int i = 0; i < m_numPseudo; i++) + if (m_pseudos[i].uid == uid) return m_pseudos[i].gid; + return 0; +} + +uint16 Silf::findClassIndex(uint16 cid, uint16 gid) const +{ + if (cid > m_nClass) return -1; + + const uint16 * cls = m_classData + m_classOffsets[cid]; + if (cid < m_nLinear) // output class being used for input, shouldn't happen + { + for (unsigned int i = 0, n = m_classOffsets[cid + 1] - m_classOffsets[cid]; i < n; ++i, ++cls) + if (*cls == gid) return i; + return -1; + } + else + { + const uint16 * min = cls + 4, // lookups array + * max = min + cls[0]*2; // lookups aray is numIDs (cls[0]) uint16 pairs long + do + { + const uint16 * p = min + (-2 & ((max-min)/2)); + if (p[0] > gid) max = p; + else min = p; + } + while (max - min > 2); + return min[0] == gid ? min[1] : -1; + } +} + +uint16 Silf::getClassGlyph(uint16 cid, unsigned int index) const +{ + if (cid > m_nClass) return 0; + + uint32 loc = m_classOffsets[cid]; + if (cid < m_nLinear) + { + if (index < m_classOffsets[cid + 1] - loc) + return m_classData[index + loc]; + } + else // input class being used for output. Shouldn't happen + { + for (unsigned int i = loc + 4; i < m_classOffsets[cid + 1]; i += 2) + if (m_classData[i + 1] == index) return m_classData[i]; + } + return 0; +} + + +bool Silf::runGraphite(Segment *seg, uint8 firstPass, uint8 lastPass, int dobidi) const +{ + assert(seg != 0); + size_t maxSize = seg->slotCount() * MAX_SEG_GROWTH_FACTOR; + SlotMap map(*seg, m_dir, maxSize); + FiniteStateMachine fsm(map, seg->getFace()->logger()); + vm::Machine m(map); + uint8 lbidi = m_bPass; +#if !defined GRAPHITE2_NTRACING + json * const dbgout = seg->getFace()->logger(); +#endif + + if (lastPass == 0) + { + if (firstPass == lastPass && lbidi == 0xFF) + return true; + lastPass = m_numPasses; + } + if ((firstPass < lbidi || (dobidi && firstPass == lbidi)) && (lastPass >= lbidi || (dobidi && lastPass + 1 == lbidi))) + lastPass++; + else + lbidi = 0xFF; + + for (size_t i = firstPass; i < lastPass; ++i) + { + // bidi and mirroring + if (i == lbidi) + { +#if !defined GRAPHITE2_NTRACING + if (dbgout) + { + *dbgout << json::item << json::object +// << "pindex" << i // for debugging + << "id" << -1 + << "slotsdir" << (seg->currdir() ? "rtl" : "ltr") + << "passdir" << (m_dir & 1 ? "rtl" : "ltr") + << "slots" << json::array; + seg->positionSlots(0, 0, 0, seg->currdir()); + for(Slot * s = seg->first(); s; s = s->next()) + *dbgout << dslot(seg, s); + *dbgout << json::close + << "rules" << json::array << json::close + << json::close; + } +#endif + if (seg->currdir() != (m_dir & 1)) + seg->reverseSlots(); + if (m_aMirror && (seg->dir() & 3) == 3) + seg->doMirror(m_aMirror); + --i; + lbidi = lastPass; + --lastPass; + continue; + } + +#if !defined GRAPHITE2_NTRACING + if (dbgout) + { + *dbgout << json::item << json::object +// << "pindex" << i // for debugging + << "id" << i+1 + << "slotsdir" << (seg->currdir() ? "rtl" : "ltr") + << "passdir" << ((m_dir & 1) ^ m_passes[i].reverseDir() ? "rtl" : "ltr") + << "slots" << json::array; + seg->positionSlots(0, 0, 0, seg->currdir()); + for(Slot * s = seg->first(); s; s = s->next()) + *dbgout << dslot(seg, s); + *dbgout << json::close; + } +#endif + + // test whether to reorder, prepare for positioning + bool reverse = (lbidi == 0xFF) && (seg->currdir() != ((m_dir & 1) ^ m_passes[i].reverseDir())); + if ((i >= 32 || (seg->passBits() & (1 << i)) == 0 || m_passes[i].collisionLoops()) + && !m_passes[i].runGraphite(m, fsm, reverse)) + return false; + // only subsitution passes can change segment length, cached subsegments are short for their text + if (m.status() != vm::Machine::finished + || (seg->slotCount() && seg->slotCount() > maxSize)) + return false; + } + return true; +} diff --git a/source/libs/graphite2/graphite2-src/src/Slot.cpp b/source/libs/graphite2/graphite2-src/src/Slot.cpp new file mode 100644 index 000000000..0fdb09895 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/Slot.cpp @@ -0,0 +1,529 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include "inc/Segment.h" +#include "inc/Slot.h" +#include "inc/Silf.h" +#include "inc/CharInfo.h" +#include "inc/Rule.h" +#include "inc/Collider.h" + + +using namespace graphite2; + +Slot::Slot(int16 *user_attrs) : + m_next(NULL), m_prev(NULL), + m_glyphid(0), m_realglyphid(0), m_original(0), m_before(0), m_after(0), + m_index(0), m_parent(NULL), m_child(NULL), m_sibling(NULL), + m_position(0, 0), m_shift(0, 0), m_advance(0, 0), + m_attach(0, 0), m_with(0, 0), m_just(0.), + m_flags(0), m_attLevel(0), m_bidiCls(-1), m_bidiLevel(0), + m_userAttr(user_attrs), m_justs(NULL) +{ +} + +// take care, this does not copy any of the GrSlot pointer fields +void Slot::set(const Slot & orig, int charOffset, size_t sizeAttr, size_t justLevels, size_t numChars) +{ + // leave m_next and m_prev unchanged + m_glyphid = orig.m_glyphid; + m_realglyphid = orig.m_realglyphid; + m_original = orig.m_original + charOffset; + if (charOffset + int(orig.m_before) < 0) + m_before = 0; + else + m_before = orig.m_before + charOffset; + if (charOffset <= 0 && orig.m_after + charOffset >= numChars) + m_after = int(numChars) - 1; + else + m_after = orig.m_after + charOffset; + m_parent = NULL; + m_child = NULL; + m_sibling = NULL; + m_position = orig.m_position; + m_shift = orig.m_shift; + m_advance = orig.m_advance; + m_attach = orig.m_attach; + m_with = orig.m_with; + m_flags = orig.m_flags; + m_attLevel = orig.m_attLevel; + m_bidiCls = orig.m_bidiCls; + m_bidiLevel = orig.m_bidiLevel; + if (m_userAttr && orig.m_userAttr) + memcpy(m_userAttr, orig.m_userAttr, sizeAttr * sizeof(*m_userAttr)); + if (m_justs && orig.m_justs) + memcpy(m_justs, orig.m_justs, SlotJustify::size_of(justLevels)); +} + +void Slot::update(int /*numGrSlots*/, int numCharInfo, Position &relpos) +{ + m_before += numCharInfo; + m_after += numCharInfo; + m_position = m_position + relpos; +} + +Position Slot::finalise(const Segment *seg, const Font *font, Position & base, Rect & bbox, uint8 attrLevel, float & clusterMin, bool rtl, bool isFinal, int depth) +{ + SlotCollision *coll = NULL; + if (depth > 100 || (attrLevel && m_attLevel > attrLevel)) return Position(0, 0); + float scale = font ? font->scale() : 1.0f; + Position shift(m_shift.x * (rtl * -2 + 1) + m_just, m_shift.y); + float tAdvance = m_advance.x + m_just; + if (isFinal && (coll = seg->collisionInfo(this))) + { + const Position &collshift = coll->offset(); + if (!(coll->flags() & SlotCollision::COLL_KERN) || rtl) + shift = shift + collshift; + } + const GlyphFace * glyphFace = seg->getFace()->glyphs().glyphSafe(glyph()); + if (font) + { + scale = font->scale(); + shift *= scale; + if (font->isHinted() && glyphFace) + tAdvance = (m_advance.x - glyphFace->theAdvance().x + m_just) * scale + font->advance(glyph()); + else + tAdvance *= scale; + } + Position res; + + m_position = base + shift; + if (!m_parent) + { + res = base + Position(tAdvance, m_advance.y * scale); + clusterMin = m_position.x; + } + else + { + float tAdv; + m_position += (m_attach - m_with) * scale; + tAdv = m_advance.x >= 0.5f ? m_position.x + tAdvance - shift.x : 0.f; + res = Position(tAdv, 0); + if ((m_advance.x >= 0.5f || m_position.x < 0) && m_position.x < clusterMin) clusterMin = m_position.x; + } + + if (glyphFace) + { + Rect ourBbox = glyphFace->theBBox() * scale + m_position; + bbox = bbox.widen(ourBbox); + } + + if (m_child && m_child != this && m_child->attachedTo() == this) + { + Position tRes = m_child->finalise(seg, font, m_position, bbox, attrLevel, clusterMin, rtl, isFinal, depth + 1); + if ((!m_parent || m_advance.x >= 0.5f) && tRes.x > res.x) res = tRes; + } + + if (m_parent && m_sibling && m_sibling != this && m_sibling->attachedTo() == m_parent) + { + Position tRes = m_sibling->finalise(seg, font, base, bbox, attrLevel, clusterMin, rtl, isFinal, depth + 1); + if (tRes.x > res.x) res = tRes; + } + + if (!m_parent && clusterMin < base.x) + { + Position adj = Position(m_position.x - clusterMin, 0.); + res += adj; + m_position += adj; + if (m_child) m_child->floodShift(adj); + } + return res; +} + +int32 Slot::clusterMetric(const Segment *seg, uint8 metric, uint8 attrLevel, bool rtl) +{ + Position base; + if (glyph() >= seg->getFace()->glyphs().numGlyphs()) + return 0; + Rect bbox = seg->theGlyphBBoxTemporary(glyph()); + float clusterMin = 0.; + Position res = finalise(seg, NULL, base, bbox, attrLevel, clusterMin, rtl, false); + + switch (metrics(metric)) + { + case kgmetLsb : + return int32(bbox.bl.x); + case kgmetRsb : + return int32(res.x - bbox.tr.x); + case kgmetBbTop : + return int32(bbox.tr.y); + case kgmetBbBottom : + return int32(bbox.bl.y); + case kgmetBbLeft : + return int32(bbox.bl.x); + case kgmetBbRight : + return int32(bbox.tr.x); + case kgmetBbWidth : + return int32(bbox.tr.x - bbox.bl.x); + case kgmetBbHeight : + return int32(bbox.tr.y - bbox.bl.y); + case kgmetAdvWidth : + return int32(res.x); + case kgmetAdvHeight : + return int32(res.y); + default : + return 0; + } +} + +#define SLOTGETCOLATTR(x) { SlotCollision *c = seg->collisionInfo(this); return c ? int(c-> x) : 0; } + +int Slot::getAttr(const Segment *seg, attrCode ind, uint8 subindex) const +{ + if (ind >= gr_slatJStretch && ind < gr_slatJStretch + 20 && ind != gr_slatJWidth) + { + int indx = ind - gr_slatJStretch; + return getJustify(seg, indx / 5, indx % 5); + } + + switch (ind) + { + case gr_slatAdvX : return int(m_advance.x); + case gr_slatAdvY : return int(m_advance.y); + case gr_slatAttTo : return m_parent ? 1 : 0; + case gr_slatAttX : return int(m_attach.x); + case gr_slatAttY : return int(m_attach.y); + case gr_slatAttXOff : + case gr_slatAttYOff : return 0; + case gr_slatAttWithX : return int(m_with.x); + case gr_slatAttWithY : return int(m_with.y); + case gr_slatAttWithXOff: + case gr_slatAttWithYOff:return 0; + case gr_slatAttLevel : return m_attLevel; + case gr_slatBreak : return seg->charinfo(m_original)->breakWeight(); + case gr_slatCompRef : return 0; + case gr_slatDir : return seg->dir() & 1; + case gr_slatInsert : return isInsertBefore(); + case gr_slatPosX : return int(m_position.x); // but need to calculate it + case gr_slatPosY : return int(m_position.y); + case gr_slatShiftX : return int(m_shift.x); + case gr_slatShiftY : return int(m_shift.y); + case gr_slatMeasureSol: return -1; // err what's this? + case gr_slatMeasureEol: return -1; + case gr_slatJWidth: return int(m_just); + case gr_slatUserDefnV1: subindex = 0; GR_FALLTHROUGH; + // no break + case gr_slatUserDefn : return subindex < seg->numAttrs() ? m_userAttr[subindex] : 0; + case gr_slatSegSplit : return seg->charinfo(m_original)->flags() & 3; + case gr_slatBidiLevel: return m_bidiLevel; + case gr_slatColFlags : { SlotCollision *c = seg->collisionInfo(this); return c ? c->flags() : 0; } + case gr_slatColLimitblx:SLOTGETCOLATTR(limit().bl.x) + case gr_slatColLimitbly:SLOTGETCOLATTR(limit().bl.y) + case gr_slatColLimittrx:SLOTGETCOLATTR(limit().tr.x) + case gr_slatColLimittry:SLOTGETCOLATTR(limit().tr.y) + case gr_slatColShiftx : SLOTGETCOLATTR(offset().x) + case gr_slatColShifty : SLOTGETCOLATTR(offset().y) + case gr_slatColMargin : SLOTGETCOLATTR(margin()) + case gr_slatColMarginWt:SLOTGETCOLATTR(marginWt()) + case gr_slatColExclGlyph:SLOTGETCOLATTR(exclGlyph()) + case gr_slatColExclOffx:SLOTGETCOLATTR(exclOffset().x) + case gr_slatColExclOffy:SLOTGETCOLATTR(exclOffset().y) + case gr_slatSeqClass : SLOTGETCOLATTR(seqClass()) + case gr_slatSeqProxClass:SLOTGETCOLATTR(seqProxClass()) + case gr_slatSeqOrder : SLOTGETCOLATTR(seqOrder()) + case gr_slatSeqAboveXoff:SLOTGETCOLATTR(seqAboveXoff()) + case gr_slatSeqAboveWt: SLOTGETCOLATTR(seqAboveWt()) + case gr_slatSeqBelowXlim:SLOTGETCOLATTR(seqBelowXlim()) + case gr_slatSeqBelowWt: SLOTGETCOLATTR(seqBelowWt()) + case gr_slatSeqValignHt:SLOTGETCOLATTR(seqValignHt()) + case gr_slatSeqValignWt:SLOTGETCOLATTR(seqValignWt()) + default : return 0; + } +} + +#define SLOTCOLSETATTR(x) { \ + SlotCollision *c = seg->collisionInfo(this); \ + if (c) { c-> x ; c->setFlags(c->flags() & ~SlotCollision::COLL_KNOWN); } \ + break; } +#define SLOTCOLSETCOMPLEXATTR(t, y, x) { \ + SlotCollision *c = seg->collisionInfo(this); \ + if (c) { \ + const t &s = c-> y; \ + c-> x ; c->setFlags(c->flags() & ~SlotCollision::COLL_KNOWN); } \ + break; } + +void Slot::setAttr(Segment *seg, attrCode ind, uint8 subindex, int16 value, const SlotMap & map) +{ + if (ind == gr_slatUserDefnV1) + { + ind = gr_slatUserDefn; + subindex = 0; + if (seg->numAttrs() == 0) + return; + } + else if (ind >= gr_slatJStretch && ind < gr_slatJStretch + 20 && ind != gr_slatJWidth) + { + int indx = ind - gr_slatJStretch; + return setJustify(seg, indx / 5, indx % 5, value); + } + + switch (ind) + { + case gr_slatAdvX : m_advance.x = value; break; + case gr_slatAdvY : m_advance.y = value; break; + case gr_slatAttTo : + { + const uint16 idx = uint16(value); + if (idx < map.size() && map[idx]) + { + Slot *other = map[idx]; + if (other == this || other == m_parent || other->isCopied()) break; + if (m_parent) { m_parent->removeChild(this); attachTo(NULL); } + Slot *pOther = other; + int count = 0; + bool foundOther = false; + while (pOther) + { + ++count; + if (pOther == this) foundOther = true; + pOther = pOther->attachedTo(); + } + for (pOther = m_child; pOther; pOther = pOther->m_child) + ++count; + for (pOther = m_sibling; pOther; pOther = pOther->m_sibling) + ++count; + if (count < 100 && !foundOther && other->child(this)) + { + attachTo(other); + if ((map.dir() != 0) ^ (idx > subindex)) + m_with = Position(advance(), 0); + else // normal match to previous root + m_attach = Position(other->advance(), 0); + } + } + break; + } + case gr_slatAttX : m_attach.x = value; break; + case gr_slatAttY : m_attach.y = value; break; + case gr_slatAttXOff : + case gr_slatAttYOff : break; + case gr_slatAttWithX : m_with.x = value; break; + case gr_slatAttWithY : m_with.y = value; break; + case gr_slatAttWithXOff : + case gr_slatAttWithYOff : break; + case gr_slatAttLevel : + m_attLevel = byte(value); + break; + case gr_slatBreak : + seg->charinfo(m_original)->breakWeight(value); + break; + case gr_slatCompRef : break; // not sure what to do here + case gr_slatDir : break; + case gr_slatInsert : + markInsertBefore(value? true : false); + break; + case gr_slatPosX : break; // can't set these here + case gr_slatPosY : break; + case gr_slatShiftX : m_shift.x = value; break; + case gr_slatShiftY : m_shift.y = value; break; + case gr_slatMeasureSol : break; + case gr_slatMeasureEol : break; + case gr_slatJWidth : just(value); break; + case gr_slatSegSplit : seg->charinfo(m_original)->addflags(value & 3); break; + case gr_slatUserDefn : m_userAttr[subindex] = value; break; + case gr_slatColFlags : { + SlotCollision *c = seg->collisionInfo(this); + if (c) + c->setFlags(value); + break; } + case gr_slatColLimitblx : SLOTCOLSETCOMPLEXATTR(Rect, limit(), setLimit(Rect(Position(value, s.bl.y), s.tr))) + case gr_slatColLimitbly : SLOTCOLSETCOMPLEXATTR(Rect, limit(), setLimit(Rect(Position(s.bl.x, value), s.tr))) + case gr_slatColLimittrx : SLOTCOLSETCOMPLEXATTR(Rect, limit(), setLimit(Rect(s.bl, Position(value, s.tr.y)))) + case gr_slatColLimittry : SLOTCOLSETCOMPLEXATTR(Rect, limit(), setLimit(Rect(s.bl, Position(s.tr.x, value)))) + case gr_slatColMargin : SLOTCOLSETATTR(setMargin(value)) + case gr_slatColMarginWt : SLOTCOLSETATTR(setMarginWt(value)) + case gr_slatColExclGlyph : SLOTCOLSETATTR(setExclGlyph(value)) + case gr_slatColExclOffx : SLOTCOLSETCOMPLEXATTR(Position, exclOffset(), setExclOffset(Position(value, s.y))) + case gr_slatColExclOffy : SLOTCOLSETCOMPLEXATTR(Position, exclOffset(), setExclOffset(Position(s.x, value))) + case gr_slatSeqClass : SLOTCOLSETATTR(setSeqClass(value)) + case gr_slatSeqProxClass : SLOTCOLSETATTR(setSeqProxClass(value)) + case gr_slatSeqOrder : SLOTCOLSETATTR(setSeqOrder(value)) + case gr_slatSeqAboveXoff : SLOTCOLSETATTR(setSeqAboveXoff(value)) + case gr_slatSeqAboveWt : SLOTCOLSETATTR(setSeqAboveWt(value)) + case gr_slatSeqBelowXlim : SLOTCOLSETATTR(setSeqBelowXlim(value)) + case gr_slatSeqBelowWt : SLOTCOLSETATTR(setSeqBelowWt(value)) + case gr_slatSeqValignHt : SLOTCOLSETATTR(setSeqValignHt(value)) + case gr_slatSeqValignWt : SLOTCOLSETATTR(setSeqValignWt(value)) + default : + break; + } +} + +int Slot::getJustify(const Segment *seg, uint8 level, uint8 subindex) const +{ + if (level && level >= seg->silf()->numJustLevels()) return 0; + + if (m_justs) + return m_justs->values[level * SlotJustify::NUMJUSTPARAMS + subindex]; + + if (level >= seg->silf()->numJustLevels()) return 0; + Justinfo *jAttrs = seg->silf()->justAttrs() + level; + + switch (subindex) { + case 0 : return seg->glyphAttr(gid(), jAttrs->attrStretch()); + case 1 : return seg->glyphAttr(gid(), jAttrs->attrShrink()); + case 2 : return seg->glyphAttr(gid(), jAttrs->attrStep()); + case 3 : return seg->glyphAttr(gid(), jAttrs->attrWeight()); + case 4 : return 0; // not been set yet, so clearly 0 + default: return 0; + } +} + +void Slot::setJustify(Segment *seg, uint8 level, uint8 subindex, int16 value) +{ + if (level && level >= seg->silf()->numJustLevels()) return; + if (!m_justs) + { + SlotJustify *j = seg->newJustify(); + if (!j) return; + j->LoadSlot(this, seg); + m_justs = j; + } + m_justs->values[level * SlotJustify::NUMJUSTPARAMS + subindex] = value; +} + +bool Slot::child(Slot *ap) +{ + if (this == ap) return false; + else if (ap == m_child) return true; + else if (!m_child) + m_child = ap; + else + return m_child->sibling(ap); + return true; +} + +bool Slot::sibling(Slot *ap) +{ + if (this == ap) return false; + else if (ap == m_sibling) return true; + else if (!m_sibling || !ap) + m_sibling = ap; + else + return m_sibling->sibling(ap); + return true; +} + +bool Slot::removeChild(Slot *ap) +{ + if (this == ap || !m_child || !ap) return false; + else if (ap == m_child) + { + Slot *nSibling = m_child->nextSibling(); + m_child->nextSibling(NULL); + m_child = nSibling; + return true; + } + for (Slot *p = m_child; p; p = p->m_sibling) + { + if (p->m_sibling && p->m_sibling == ap) + { + p->m_sibling = p->m_sibling->m_sibling; + ap->nextSibling(NULL); + return true; + } + } + return false; +} + +void Slot::setGlyph(Segment *seg, uint16 glyphid, const GlyphFace * theGlyph) +{ + m_glyphid = glyphid; + m_bidiCls = -1; + if (!theGlyph) + { + theGlyph = seg->getFace()->glyphs().glyphSafe(glyphid); + if (!theGlyph) + { + m_realglyphid = 0; + m_advance = Position(0.,0.); + return; + } + } + m_realglyphid = theGlyph->attrs()[seg->silf()->aPseudo()]; + if (m_realglyphid > seg->getFace()->glyphs().numGlyphs()) + m_realglyphid = 0; + const GlyphFace *aGlyph = theGlyph; + if (m_realglyphid) + { + aGlyph = seg->getFace()->glyphs().glyphSafe(m_realglyphid); + if (!aGlyph) aGlyph = theGlyph; + } + m_advance = Position(aGlyph->theAdvance().x, 0.); + if (seg->silf()->aPassBits()) + { + seg->mergePassBits(uint8(theGlyph->attrs()[seg->silf()->aPassBits()])); + if (seg->silf()->numPasses() > 16) + seg->mergePassBits(theGlyph->attrs()[seg->silf()->aPassBits()+1] << 16); + } +} + +void Slot::floodShift(Position adj, int depth) +{ + if (depth > 100) + return; + m_position += adj; + if (m_child) m_child->floodShift(adj, depth + 1); + if (m_sibling) m_sibling->floodShift(adj, depth + 1); +} + +void SlotJustify::LoadSlot(const Slot *s, const Segment *seg) +{ + for (int i = seg->silf()->numJustLevels() - 1; i >= 0; --i) + { + Justinfo *justs = seg->silf()->justAttrs() + i; + int16 *v = values + i * NUMJUSTPARAMS; + v[0] = seg->glyphAttr(s->gid(), justs->attrStretch()); + v[1] = seg->glyphAttr(s->gid(), justs->attrShrink()); + v[2] = seg->glyphAttr(s->gid(), justs->attrStep()); + v[3] = seg->glyphAttr(s->gid(), justs->attrWeight()); + } +} + +Slot * Slot::nextInCluster(const Slot *s) const +{ + Slot *base; + if (s->firstChild()) + return s->firstChild(); + else if (s->nextSibling()) + return s->nextSibling(); + while ((base = s->attachedTo())) + { + // if (base->firstChild() == s && base->nextSibling()) + if (base->nextSibling()) + return base->nextSibling(); + s = base; + } + return NULL; +} + +bool Slot::isChildOf(const Slot *base) const +{ + for (Slot *p = m_parent; p; p = p->m_parent) + if (p == base) + return true; + return false; +} diff --git a/source/libs/graphite2/graphite2-src/src/Sparse.cpp b/source/libs/graphite2/graphite2-src/src/Sparse.cpp new file mode 100644 index 000000000..aa4311366 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/Sparse.cpp @@ -0,0 +1,62 @@ +/* GRAPHITE2 LICENSING + + Copyright 2011, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include +#include "inc/Sparse.h" +#include "inc/bits.h" + +using namespace graphite2; + +const sparse::chunk sparse::empty_chunk = {0,0}; + +sparse::~sparse() throw() +{ + if (m_array.map == &empty_chunk) return; + free(m_array.values); +} + + +sparse::mapped_type sparse::operator [] (const key_type k) const throw() +{ + mapped_type g = key_type(k/SIZEOF_CHUNK - m_nchunks) >> (sizeof k*8 - 1); + const chunk & c = m_array.map[g*k/SIZEOF_CHUNK]; + const mask_t m = c.mask >> (SIZEOF_CHUNK - 1 - (k%SIZEOF_CHUNK)); + g *= m & 1; + + return g*m_array.values[g*(c.offset + bit_set_count(m >> 1))]; +} + + +size_t sparse::capacity() const throw() +{ + size_t n = m_nchunks, + s = 0; + + for (const chunk *ci=m_array.map; n; --n, ++ci) + s += bit_set_count(ci->mask); + + return s; +} diff --git a/source/libs/graphite2/graphite2-src/src/TtfUtil.cpp b/source/libs/graphite2/graphite2-src/src/TtfUtil.cpp new file mode 100644 index 000000000..2eb46a11f --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/TtfUtil.cpp @@ -0,0 +1,2053 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +/*--------------------------------------------------------------------*//*:Ignore this sentence. + +File: TtfUtil.cpp +Responsibility: Alan Ward +Last reviewed: Not yet. + +Description + Implements the methods for TtfUtil class. This file should remain portable to any C++ + environment by only using standard C++ and the TTF structurs defined in Tt.h. +-------------------------------------------------------------------------------*//*:End Ignore*/ + + +/*********************************************************************************************** + Include files +***********************************************************************************************/ +// Language headers +//#include +#include +#include +#include +#include +#include +//#include +// Platform headers +// Module headers +#include "inc/TtfUtil.h" +#include "inc/TtfTypes.h" +#include "inc/Endian.h" + +/*********************************************************************************************** + Forward declarations +***********************************************************************************************/ + +/*********************************************************************************************** + Local Constants and static variables +***********************************************************************************************/ +namespace +{ +#ifdef ALL_TTFUTILS + // max number of components allowed in composite glyphs + const int kMaxGlyphComponents = 8; +#endif + + template + inline float fixed_to_float(const T f) { + return float(f)/float(2^R); + } + +/*---------------------------------------------------------------------------------------------- + Table of standard Postscript glyph names. From Martin Hosken. Disagress with ttfdump.exe +---------------------------------------------------------------------------------------------*/ +#ifdef ALL_TTFUTILS + const int kcPostNames = 258; + + const char * rgPostName[kcPostNames] = { + ".notdef", ".null", "nonmarkingreturn", "space", "exclam", "quotedbl", "numbersign", + "dollar", "percent", "ampersand", "quotesingle", "parenleft", + "parenright", "asterisk", "plus", "comma", "hyphen", "period", "slash", + "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", + "nine", "colon", "semicolon", "less", "equal", "greater", "question", + "at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", + "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", + "bracketleft", "backslash", "bracketright", "asciicircum", + "underscore", "grave", "a", "b", "c", "d", "e", "f", "g", "h", "i", + "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", + "x", "y", "z", "braceleft", "bar", "braceright", "asciitilde", + "Adieresis", "Aring", "Ccedilla", "Eacute", "Ntilde", "Odieresis", + "Udieresis", "aacute", "agrave", "acircumflex", "adieresis", "atilde", + "aring", "ccedilla", "eacute", "egrave", "ecircumflex", "edieresis", + "iacute", "igrave", "icircumflex", "idieresis", "ntilde", "oacute", + "ograve", "ocircumflex", "odieresis", "otilde", "uacute", "ugrave", + "ucircumflex", "udieresis", "dagger", "degree", "cent", "sterling", + "section", "bullet", "paragraph", "germandbls", "registered", + "copyright", "trademark", "acute", "dieresis", "notequal", "AE", + "Oslash", "infinity", "plusminus", "lessequal", "greaterequal", "yen", + "mu", "partialdiff", "summation", "product", "pi", "integral", + "ordfeminine", "ordmasculine", "Omega", "ae", "oslash", "questiondown", + "exclamdown", "logicalnot", "radical", "florin", "approxequal", + "Delta", "guillemotleft", "guillemotright", "ellipsis", "nonbreakingspace", + "Agrave", "Atilde", "Otilde", "OE", "oe", "endash", "emdash", + "quotedblleft", "quotedblright", "quoteleft", "quoteright", "divide", + "lozenge", "ydieresis", "Ydieresis", "fraction", "currency", + "guilsinglleft", "guilsinglright", "fi", "fl", "daggerdbl", "periodcentered", + "quotesinglbase", "quotedblbase", "perthousand", "Acircumflex", + "Ecircumflex", "Aacute", "Edieresis", "Egrave", "Iacute", + "Icircumflex", "Idieresis", "Igrave", "Oacute", "Ocircumflex", + "apple", "Ograve", "Uacute", "Ucircumflex", "Ugrave", "dotlessi", + "circumflex", "tilde", "macron", "breve", "dotaccent", "ring", + "cedilla", "hungarumlaut", "ogonek", "caron", "Lslash", "lslash", + "Scaron", "scaron", "Zcaron", "zcaron", "brokenbar", "Eth", "eth", + "Yacute", "yacute", "Thorn", "thorn", "minus", "multiply", + "onesuperior", "twosuperior", "threesuperior", "onehalf", "onequarter", + "threequarters", "franc", "Gbreve", "gbreve", "Idotaccent", "Scedilla", + "scedilla", "Cacute", "cacute", "Ccaron", "ccaron", + "dcroat" }; +#endif + +} // end of namespace + +/*********************************************************************************************** + Methods +***********************************************************************************************/ + +/* Note on error processing: The code guards against bad glyph ids being used to look up data +in open ended tables (loca, hmtx). If the glyph id comes from a cmap this shouldn't happen +but it seems prudent to check for user errors here. The code does assume that data obtained +from the TTF file is valid otherwise (though the CheckTable method seeks to check for +obvious problems that might accompany a change in table versions). For example an invalid +offset in the loca table which could exceed the size of the glyf table is NOT trapped. +Likewise if numberOf_LongHorMetrics in the hhea table is wrong, this will NOT be trapped, +which could cause a lookup in the hmtx table to exceed the table length. Of course, TTF tables +that are completely corrupt will cause unpredictable results. */ + +/* Note on composite glyphs: Glyphs that have components that are themselves composites +are not supported. IsDeepComposite can be used to test for this. False is returned from many +of the methods in this cases. It is unclear how to build composite glyphs in some cases, +so this code represents my best guess until test cases can be found. See notes on the high- +level GlyfPoints method. */ +namespace graphite2 +{ +namespace TtfUtil +{ + + +/*---------------------------------------------------------------------------------------------- + Get offset and size of the offset table needed to find table directory. + Return true if success, false otherwise. + lSize excludes any table directory entries. +----------------------------------------------------------------------------------------------*/ +bool GetHeaderInfo(size_t & lOffset, size_t & lSize) +{ + lOffset = 0; + lSize = offsetof(Sfnt::OffsetSubTable, table_directory); + assert(sizeof(uint32) + 4*sizeof (uint16) == lSize); + return true; +} + +/*---------------------------------------------------------------------------------------------- + Check the offset table for expected data. + Return true if success, false otherwise. +----------------------------------------------------------------------------------------------*/ +bool CheckHeader(const void * pHdr) +{ + const Sfnt::OffsetSubTable * pOffsetTable + = reinterpret_cast(pHdr); + + return pHdr && be::swap(pOffsetTable->scaler_type) == Sfnt::OffsetSubTable::TrueTypeWin; +} + +/*---------------------------------------------------------------------------------------------- + Get offset and size of the table directory. + Return true if successful, false otherwise. +----------------------------------------------------------------------------------------------*/ +bool GetTableDirInfo(const void * pHdr, size_t & lOffset, size_t & lSize) +{ + const Sfnt::OffsetSubTable * pOffsetTable + = reinterpret_cast(pHdr); + + lOffset = offsetof(Sfnt::OffsetSubTable, table_directory); + lSize = be::swap(pOffsetTable->num_tables) + * sizeof(Sfnt::OffsetSubTable::Entry); + + return true; +} + + +/*---------------------------------------------------------------------------------------------- + Get offset and size of the specified table. + Return true if successful, false otherwise. On false, offset and size will be 0. +----------------------------------------------------------------------------------------------*/ +bool GetTableInfo(const Tag TableTag, const void * pHdr, const void * pTableDir, + size_t & lOffset, size_t & lSize) +{ + const Sfnt::OffsetSubTable * pOffsetTable + = reinterpret_cast(pHdr); + const size_t num_tables = be::swap(pOffsetTable->num_tables); + const Sfnt::OffsetSubTable::Entry + * entry_itr = reinterpret_cast( + pTableDir), + * const dir_end = entry_itr + num_tables; + + if (num_tables > 40) + return false; + + for (;entry_itr != dir_end; ++entry_itr) // 40 - safe guard + { + if (be::swap(entry_itr->tag) == TableTag) + { + lOffset = be::swap(entry_itr->offset); + lSize = be::swap(entry_itr->length); + return true; + } + } + + return false; +} + +/*---------------------------------------------------------------------------------------------- + Check the specified table. Tests depend on the table type. + Return true if successful, false otherwise. +----------------------------------------------------------------------------------------------*/ +bool CheckTable(const Tag TableId, const void * pTable, size_t lTableSize) +{ + using namespace Sfnt; + + if (pTable == 0 || lTableSize < 4) return false; + + switch(TableId) + { + case Tag::cmap: // cmap + { + const Sfnt::CharacterCodeMap * const pCmap + = reinterpret_cast(pTable); + if (lTableSize < sizeof(Sfnt::CharacterCodeMap)) + return false; + return be::swap(pCmap->version) == 0; + } + + case Tag::head: // head + { + const Sfnt::FontHeader * const pHead + = reinterpret_cast(pTable); + if (lTableSize < sizeof(Sfnt::FontHeader)) + return false; + bool r = be::swap(pHead->version) == OneFix + && be::swap(pHead->magic_number) == FontHeader::MagicNumber + && be::swap(pHead->glyph_data_format) + == FontHeader::GlypDataFormat + && (be::swap(pHead->index_to_loc_format) + == FontHeader::ShortIndexLocFormat + || be::swap(pHead->index_to_loc_format) + == FontHeader::LongIndexLocFormat) + && sizeof(FontHeader) <= lTableSize; + return r; + } + + case Tag::post: // post + { + const Sfnt::PostScriptGlyphName * const pPost + = reinterpret_cast(pTable); + if (lTableSize < sizeof(Sfnt::PostScriptGlyphName)) + return false; + const fixed format = be::swap(pPost->format); + bool r = format == PostScriptGlyphName::Format1 + || format == PostScriptGlyphName::Format2 + || format == PostScriptGlyphName::Format3 + || format == PostScriptGlyphName::Format25; + return r; + } + + case Tag::hhea: // hhea + { + const Sfnt::HorizontalHeader * pHhea = + reinterpret_cast(pTable); + if (lTableSize < sizeof(Sfnt::HorizontalHeader)) + return false; + bool r = be::swap(pHhea->version) == OneFix + && be::swap(pHhea->metric_data_format) == 0 + && sizeof (Sfnt::HorizontalHeader) <= lTableSize; + return r; + } + + case Tag::maxp: // maxp + { + const Sfnt::MaximumProfile * pMaxp = + reinterpret_cast(pTable); + if (lTableSize < sizeof(Sfnt::MaximumProfile)) + return false; + bool r = be::swap(pMaxp->version) == OneFix + && sizeof(Sfnt::MaximumProfile) <= lTableSize; + return r; + } + + case Tag::OS_2: // OS/2 + { + const Sfnt::Compatibility * pOs2 + = reinterpret_cast(pTable); + if (be::swap(pOs2->version) == 0) + { // OS/2 table version 1 size +// if (sizeof(Sfnt::Compatibility) +// - sizeof(uint32)*2 - sizeof(int16)*2 +// - sizeof(uint16)*3 <= lTableSize) + if (sizeof(Sfnt::Compatibility0) <= lTableSize) + return true; + } + else if (be::swap(pOs2->version) == 1) + { // OS/2 table version 2 size +// if (sizeof(Sfnt::Compatibility) +// - sizeof(int16) *2 +// - sizeof(uint16)*3 <= lTableSize) + if (sizeof(Sfnt::Compatibility1) <= lTableSize) + return true; + } + else if (be::swap(pOs2->version) == 2) + { // OS/2 table version 3 size + if (sizeof(Sfnt::Compatibility2) <= lTableSize) + return true; + } + else if (be::swap(pOs2->version) == 3 || be::swap(pOs2->version) == 4) + { // OS/2 table version 4 size - version 4 changed the meaning of some fields which we don't use + if (sizeof(Sfnt::Compatibility3) <= lTableSize) + return true; + } + else + return false; + break; + } + + case Tag::name: + { + const Sfnt::FontNames * pName + = reinterpret_cast(pTable); + if (lTableSize < sizeof(Sfnt::FontNames)) + return false; + return be::swap(pName->format) == 0; + } + + case Tag::glyf: + { + return (lTableSize >= sizeof(Sfnt::Glyph)); + } + + default: + break; + } + + return true; +} + +/*---------------------------------------------------------------------------------------------- + Return the number of glyphs in the font. Should never be less than zero. + + Note: this method is not currently used by the Graphite engine. +----------------------------------------------------------------------------------------------*/ +size_t GlyphCount(const void * pMaxp) +{ + const Sfnt::MaximumProfile * pTable = + reinterpret_cast(pMaxp); + return be::swap(pTable->num_glyphs); +} + +#ifdef ALL_TTFUTILS +/*---------------------------------------------------------------------------------------------- + Return the maximum number of components for any composite glyph in the font. + + Note: this method is not currently used by the Graphite engine. +----------------------------------------------------------------------------------------------*/ +size_t MaxCompositeComponentCount(const void * pMaxp) +{ + const Sfnt::MaximumProfile * pTable = + reinterpret_cast(pMaxp); + return be::swap(pTable->max_component_elements); +} + +/*---------------------------------------------------------------------------------------------- + Composite glyphs can be composed of glyphs that are themselves composites. + This method returns the maximum number of levels like this for any glyph in the font. + A non-composite glyph has a level of 1. + + Note: this method is not currently used by the Graphite engine. +----------------------------------------------------------------------------------------------*/ +size_t MaxCompositeLevelCount(const void * pMaxp) +{ + const Sfnt::MaximumProfile * pTable = + reinterpret_cast(pMaxp); + return be::swap(pTable->max_component_depth); +} + +/*---------------------------------------------------------------------------------------------- + Return the number of glyphs in the font according to a differt source. + Should never be less than zero. Return -1 on failure. + + Note: this method is not currently used by the Graphite engine. +----------------------------------------------------------------------------------------------*/ +size_t LocaGlyphCount(size_t lLocaSize, const void * pHead) //throw(std::domain_error) +{ + + const Sfnt::FontHeader * pTable + = reinterpret_cast(pHead); + + if (be::swap(pTable->index_to_loc_format) + == Sfnt::FontHeader::ShortIndexLocFormat) + // loca entries are two bytes and have been divided by two + return (lLocaSize >> 1) - 1; + + if (be::swap(pTable->index_to_loc_format) + == Sfnt::FontHeader::LongIndexLocFormat) + // loca entries are four bytes + return (lLocaSize >> 2) - 1; + + return -1; + //throw std::domain_error("head table in inconsistent state. The font may be corrupted"); +} +#endif + +/*---------------------------------------------------------------------------------------------- + Return the design units the font is designed with +----------------------------------------------------------------------------------------------*/ +int DesignUnits(const void * pHead) +{ + const Sfnt::FontHeader * pTable = + reinterpret_cast(pHead); + + return be::swap(pTable->units_per_em); +} + +#ifdef ALL_TTFUTILS +/*---------------------------------------------------------------------------------------------- + Return the checksum from the head table, which serves as a unique identifer for the font. +----------------------------------------------------------------------------------------------*/ +int HeadTableCheckSum(const void * pHead) +{ + const Sfnt::FontHeader * pTable = + reinterpret_cast(pHead); + + return be::swap(pTable->check_sum_adjustment); +} + +/*---------------------------------------------------------------------------------------------- + Return the create time from the head table. This consists of a 64-bit integer, which + we return here as two 32-bit integers. + + Note: this method is not currently used by the Graphite engine. +----------------------------------------------------------------------------------------------*/ +void HeadTableCreateTime(const void * pHead, + unsigned int * pnDateBC, unsigned int * pnDateAD) +{ + const Sfnt::FontHeader * pTable = + reinterpret_cast(pHead); + + *pnDateBC = be::swap(pTable->created[0]); + *pnDateAD = be::swap(pTable->created[1]); +} + +/*---------------------------------------------------------------------------------------------- + Return the modify time from the head table.This consists of a 64-bit integer, which + we return here as two 32-bit integers. + + Note: this method is not currently used by the Graphite engine. +----------------------------------------------------------------------------------------------*/ +void HeadTableModifyTime(const void * pHead, + unsigned int * pnDateBC, unsigned int *pnDateAD) +{ + const Sfnt::FontHeader * pTable = + reinterpret_cast(pHead); + ; + *pnDateBC = be::swap(pTable->modified[0]); + *pnDateAD = be::swap(pTable->modified[1]); +} + +/*---------------------------------------------------------------------------------------------- + Return true if the font is italic. +----------------------------------------------------------------------------------------------*/ +bool IsItalic(const void * pHead) +{ + const Sfnt::FontHeader * pTable = + reinterpret_cast(pHead); + + return ((be::swap(pTable->mac_style) & 0x00000002) != 0); +} + +/*---------------------------------------------------------------------------------------------- + Return the ascent for the font +----------------------------------------------------------------------------------------------*/ +int FontAscent(const void * pOs2) +{ + const Sfnt::Compatibility * pTable = reinterpret_cast(pOs2); + + return be::swap(pTable->win_ascent); +} + +/*---------------------------------------------------------------------------------------------- + Return the descent for the font +----------------------------------------------------------------------------------------------*/ +int FontDescent(const void * pOs2) +{ + const Sfnt::Compatibility * pTable = reinterpret_cast(pOs2); + + return be::swap(pTable->win_descent); +} + +/*---------------------------------------------------------------------------------------------- + Get the bold and italic style bits. + Return true if successful. false otherwise. + In addition to checking the OS/2 table, one could also check + the head table's macStyle field (overridden by the OS/2 table on Win) + the sub-family name in the name table (though this can contain oblique, dark, etc too) +----------------------------------------------------------------------------------------------*/ +bool FontOs2Style(const void *pOs2, bool & fBold, bool & fItalic) +{ + const Sfnt::Compatibility * pTable = reinterpret_cast(pOs2); + + fBold = (be::swap(pTable->fs_selection) & Sfnt::Compatibility::Bold) != 0; + fItalic = (be::swap(pTable->fs_selection) & Sfnt::Compatibility::Italic) != 0; + + return true; +} +#endif + +/*---------------------------------------------------------------------------------------------- + Method for searching name table. +----------------------------------------------------------------------------------------------*/ +bool GetNameInfo(const void * pName, int nPlatformId, int nEncodingId, + int nLangId, int nNameId, size_t & lOffset, size_t & lSize) +{ + lOffset = 0; + lSize = 0; + + const Sfnt::FontNames * pTable = reinterpret_cast(pName); + uint16 cRecord = be::swap(pTable->count); + uint16 nRecordOffset = be::swap(pTable->string_offset); + const Sfnt::NameRecord * pRecord = reinterpret_cast(pTable + 1); + + for (int i = 0; i < cRecord; ++i) + { + if (be::swap(pRecord->platform_id) == nPlatformId && + be::swap(pRecord->platform_specific_id) == nEncodingId && + be::swap(pRecord->language_id) == nLangId && + be::swap(pRecord->name_id) == nNameId) + { + lOffset = be::swap(pRecord->offset) + nRecordOffset; + lSize = be::swap(pRecord->length); + return true; + } + pRecord++; + } + + return false; +} + +#ifdef ALL_TTFUTILS +/*---------------------------------------------------------------------------------------------- + Return all the lang-IDs that have data for the given name-IDs. Assume that there is room + in the return array (langIdList) for 128 items. The purpose of this method is to return + a list of all possible lang-IDs. +----------------------------------------------------------------------------------------------*/ +int GetLangsForNames(const void * pName, int nPlatformId, int nEncodingId, + int * nameIdList, int cNameIds, short * langIdList) +{ + const Sfnt::FontNames * pTable = reinterpret_cast(pName); + int cLangIds = 0; + uint16 cRecord = be::swap(pTable->count); + if (cRecord > 127) return cLangIds; + //uint16 nRecordOffset = swapw(pTable->stringOffset); + const Sfnt::NameRecord * pRecord = reinterpret_cast(pTable + 1); + + for (int i = 0; i < cRecord; ++i) + { + if (be::swap(pRecord->platform_id) == nPlatformId && + be::swap(pRecord->platform_specific_id) == nEncodingId) + { + bool fNameFound = false; + int nLangId = be::swap(pRecord->language_id); + int nNameId = be::swap(pRecord->name_id); + for (int j = 0; j < cNameIds; j++) + { + if (nNameId == nameIdList[j]) + { + fNameFound = true; + break; + } + } + if (fNameFound) + { + // Add it if it's not there. + int ilang; + for (ilang = 0; ilang < cLangIds; ilang++) + if (langIdList[ilang] == nLangId) + break; + if (ilang >= cLangIds) + { + langIdList[cLangIds] = short(nLangId); + cLangIds++; + } + if (cLangIds == 128) + return cLangIds; + } + } + pRecord++; + } + + return cLangIds; +} + +/*---------------------------------------------------------------------------------------------- + Get the offset and size of the font family name in English for the MS Platform with Unicode + writing system. The offset is within the pName data. The string is double byte with MSB + first. +----------------------------------------------------------------------------------------------*/ +bool Get31EngFamilyInfo(const void * pName, size_t & lOffset, size_t & lSize) +{ + return GetNameInfo(pName, Sfnt::NameRecord::Microsoft, 1, 1033, + Sfnt::NameRecord::Family, lOffset, lSize); +} + +/*---------------------------------------------------------------------------------------------- + Get the offset and size of the full font name in English for the MS Platform with Unicode + writing system. The offset is within the pName data. The string is double byte with MSB + first. + + Note: this method is not currently used by the Graphite engine. +----------------------------------------------------------------------------------------------*/ +bool Get31EngFullFontInfo(const void * pName, size_t & lOffset, size_t & lSize) +{ + return GetNameInfo(pName, Sfnt::NameRecord::Microsoft, 1, 1033, + Sfnt::NameRecord::Fullname, lOffset, lSize); +} + +/*---------------------------------------------------------------------------------------------- + Get the offset and size of the font family name in English for the MS Platform with Symbol + writing system. The offset is within the pName data. The string is double byte with MSB + first. +----------------------------------------------------------------------------------------------*/ +bool Get30EngFamilyInfo(const void * pName, size_t & lOffset, size_t & lSize) +{ + return GetNameInfo(pName, Sfnt::NameRecord::Microsoft, 0, 1033, + Sfnt::NameRecord::Family, lOffset, lSize); +} + +/*---------------------------------------------------------------------------------------------- + Get the offset and size of the full font name in English for the MS Platform with Symbol + writing system. The offset is within the pName data. The string is double byte with MSB + first. + + Note: this method is not currently used by the Graphite engine. +----------------------------------------------------------------------------------------------*/ +bool Get30EngFullFontInfo(const void * pName, size_t & lOffset, size_t & lSize) +{ + return GetNameInfo(pName, Sfnt::NameRecord::Microsoft, 0, 1033, + Sfnt::NameRecord::Fullname, lOffset, lSize); +} + +/*---------------------------------------------------------------------------------------------- + Return the Glyph ID for a given Postscript name. This method finds the first glyph which + matches the requested Postscript name. Ideally every glyph should have a unique Postscript + name (except for special names such as .notdef), but this is not always true. + On failure return value less than zero. + -1 - table search failed + -2 - format 3 table (no Postscript glyph info) + -3 - other failures + + Note: this method is not currently used by the Graphite engine. +----------------------------------------------------------------------------------------------*/ +int PostLookup(const void * pPost, size_t lPostSize, const void * pMaxp, + const char * pPostName) +{ + using namespace Sfnt; + + const Sfnt::PostScriptGlyphName * pTable + = reinterpret_cast(pPost); + fixed format = be::swap(pTable->format); + + if (format == PostScriptGlyphName::Format3) + { // format 3 - no Postscript glyph info in font + return -2; + } + + // search for given Postscript name among the standard names + int iPostName = -1; // index in standard names + for (int i = 0; i < kcPostNames; i++) + { + if (!strcmp(pPostName, rgPostName[i])) + { + iPostName = i; + break; + } + } + + if (format == PostScriptGlyphName::Format1) + { // format 1 - use standard Postscript names + return iPostName; + } + + if (format == PostScriptGlyphName::Format25) + { + if (iPostName == -1) + return -1; + + const PostScriptGlyphName25 * pTable25 + = static_cast(pTable); + int cnGlyphs = GlyphCount(pMaxp); + for (gid16 nGlyphId = 0; nGlyphId < cnGlyphs && nGlyphId < kcPostNames; + nGlyphId++) + { // glyph_name_index25 contains bytes so no byte swapping needed + // search for first glyph id that uses the standard name + if (nGlyphId + pTable25->offset[nGlyphId] == iPostName) + return nGlyphId; + } + } + + if (format == PostScriptGlyphName::Format2) + { // format 2 + const PostScriptGlyphName2 * pTable2 + = static_cast(pTable); + + int cnGlyphs = be::swap(pTable2->number_of_glyphs); + + if (iPostName != -1) + { // did match a standard name, look for first glyph id mapped to that name + for (gid16 nGlyphId = 0; nGlyphId < cnGlyphs; nGlyphId++) + { + if (be::swap(pTable2->glyph_name_index[nGlyphId]) == iPostName) + return nGlyphId; + } + } + + { // did not match a standard name, search font specific names + size_t nStrSizeGoal = strlen(pPostName); + const char * pFirstGlyphName = reinterpret_cast( + &pTable2->glyph_name_index[0] + cnGlyphs); + const char * pGlyphName = pFirstGlyphName; + int iInNames = 0; // index in font specific names + bool fFound = false; + const char * const endOfTable + = reinterpret_cast(pTable2) + lPostSize; + while (pGlyphName < endOfTable && !fFound) + { // search Pascal strings for first matching name + size_t nStringSize = size_t(*pGlyphName); + if (nStrSizeGoal != nStringSize || + strncmp(pGlyphName + 1, pPostName, nStringSize)) + { // did not match + ++iInNames; + pGlyphName += nStringSize + 1; + } + else + { // did match + fFound = true; + } + } + if (!fFound) + return -1; // no font specific name matches request + + iInNames += kcPostNames; + for (gid16 nGlyphId = 0; nGlyphId < cnGlyphs; nGlyphId++) + { // search for first glyph id that maps to the found string index + if (be::swap(pTable2->glyph_name_index[nGlyphId]) == iInNames) + return nGlyphId; + } + return -1; // no glyph mapped to this index (very strange) + } + } + + return -3; +} + +/*---------------------------------------------------------------------------------------------- + Convert a Unicode character string from big endian (MSB first, Motorola) format to little + endian (LSB first, Intel) format. + nSize is the number of Unicode characters in the string. It should not include any + terminating null. If nSize is 0, it is assumed the string is null terminated. nSize + defaults to 0. + Return true if successful, false otherwise. +----------------------------------------------------------------------------------------------*/ +void SwapWString(void * pWStr, size_t nSize /* = 0 */) //throw (std::invalid_argument) +{ + if (pWStr == 0) + { +// throw std::invalid_argument("null pointer given"); + return; + } + + uint16 * pStr = reinterpret_cast(pWStr); + uint16 * const pStrEnd = pStr + (nSize == 0 ? wcslen((const wchar_t*)pStr) : nSize); + + for (; pStr != pStrEnd; ++pStr) + *pStr = be::swap(*pStr); +// std::transform(pStr, pStrEnd, pStr, read); + +// for (int i = 0; i < nSize; i++) +// { // swap the wide characters in the string +// pStr[i] = utf16(be::swap(uint16(pStr[i]))); +// } +} +#endif + +/*---------------------------------------------------------------------------------------------- + Get the left-side bearing and and advance width based on the given tables and Glyph ID + Return true if successful, false otherwise. On false, one or both value could be INT_MIN +----------------------------------------------------------------------------------------------*/ +bool HorMetrics(gid16 nGlyphId, const void * pHmtx, size_t lHmtxSize, const void * pHhea, + int & nLsb, unsigned int & nAdvWid) +{ + const Sfnt::HorizontalMetric * phmtx = + reinterpret_cast(pHmtx); + + const Sfnt::HorizontalHeader * phhea = + reinterpret_cast(pHhea); + + size_t cLongHorMetrics = be::swap(phhea->num_long_hor_metrics); + if (nGlyphId < cLongHorMetrics) + { // glyph id is acceptable + if ((nGlyphId + 1) * sizeof(Sfnt::HorizontalMetric) > lHmtxSize) return false; + nAdvWid = be::swap(phmtx[nGlyphId].advance_width); + nLsb = be::swap(phmtx[nGlyphId].left_side_bearing); + } + else + { + // guard against bad glyph id + size_t lLsbOffset = sizeof(Sfnt::HorizontalMetric) * cLongHorMetrics + + sizeof(int16) * (nGlyphId - cLongHorMetrics); // offset in bytes + // We test like this as LsbOffset is an offset not a length. + if (lLsbOffset >= lHmtxSize - sizeof(int16) || cLongHorMetrics == 0) + { + nLsb = 0; + return false; + } + nAdvWid = be::swap(phmtx[cLongHorMetrics - 1].advance_width); + nLsb = be::peek(reinterpret_cast(phmtx) + lLsbOffset); + } + + return true; +} + +/*---------------------------------------------------------------------------------------------- + Return a pointer to the requested cmap subtable. By default find the Microsoft Unicode + subtable. Pass nEncoding as -1 to find first table that matches only nPlatformId. + Return NULL if the subtable cannot be found. +----------------------------------------------------------------------------------------------*/ +const void * FindCmapSubtable(const void * pCmap, int nPlatformId, /* =3 */ int nEncodingId, /* = 1 */ size_t length) +{ + const Sfnt::CharacterCodeMap * pTable = reinterpret_cast(pCmap); + uint16 csuPlatforms = be::swap(pTable->num_subtables); + if (length && (sizeof(Sfnt::CharacterCodeMap) + 8 * (csuPlatforms - 1) > length)) + return NULL; + for (int i = 0; i < csuPlatforms; i++) + { + if (be::swap(pTable->encoding[i].platform_id) == nPlatformId && + (nEncodingId == -1 || be::swap(pTable->encoding[i].platform_specific_id) == nEncodingId)) + { + uint32 offset = be::swap(pTable->encoding[i].offset); + const uint8 * pRtn = reinterpret_cast(pCmap) + offset; + if (length) + { + if (offset > length - 2) return NULL; + uint16 format = be::read(pRtn); + if (format == 4) + { + if (offset > length - 4) return NULL; + uint16 subTableLength = be::peek(pRtn); + if (i + 1 == csuPlatforms) + { + if (subTableLength > length - offset) + return NULL; + } + else if (subTableLength > be::swap(pTable->encoding[i+1].offset)) + return NULL; + } + if (format == 12) + { + if (offset > length - 6) return NULL; + uint32 subTableLength = be::peek(pRtn); + if (i + 1 == csuPlatforms) + { + if (subTableLength > length - offset) + return NULL; + } + else if (subTableLength > be::swap(pTable->encoding[i+1].offset)) + return NULL; + } + } + return reinterpret_cast(pCmap) + offset; + } + } + + return 0; +} + +/*---------------------------------------------------------------------------------------------- + Check the Microsoft Unicode subtable for expected values +----------------------------------------------------------------------------------------------*/ +bool CheckCmapSubtable4(const void * pCmapSubtable4, const void * pCmapEnd /*, unsigned int maxgid*/) +{ + size_t table_len = (const byte *)pCmapEnd - (const byte *)pCmapSubtable4; + if (!pCmapSubtable4) return false; + const Sfnt::CmapSubTable * pTable = reinterpret_cast(pCmapSubtable4); + // Bob H say some freeware TT fonts have version 1 (eg, CALIGULA.TTF) + // so don't check subtable version. 21 Mar 2002 spec changes version to language. + if (table_len < sizeof(*pTable) || be::swap(pTable->format) != 4) return false; + const Sfnt::CmapSubTableFormat4 * pTable4 = reinterpret_cast(pCmapSubtable4); + if (table_len < sizeof(*pTable4)) + return false; + uint16 length = be::swap(pTable4->length); + if (length > table_len) + return false; + if (length < sizeof(Sfnt::CmapSubTableFormat4)) + return false; + uint16 nRanges = be::swap(pTable4->seg_count_x2) >> 1; + if (!nRanges || length < sizeof(Sfnt::CmapSubTableFormat4) + 4 * nRanges * sizeof(uint16)) + return false; + // check last range is properly terminated + uint16 chEnd = be::peek(pTable4->end_code + nRanges - 1); + if (chEnd != 0xFFFF) + return false; +#if 0 + int lastend = -1; + for (int i = 0; i < nRanges; ++i) + { + uint16 end = be::peek(pTable4->end_code + i); + uint16 start = be::peek(pTable4->end_code + nRanges + 1 + i); + int16 delta = be::peek(pTable4->end_code + 2*nRanges + 1 + i); + uint16 offset = be::peek(pTable4->end_code + 3*nRanges + 1 + i); + if (lastend >= end || lastend >= start) + return false; + if (offset) + { + const uint16 *gstart = pTable4->end_code + 3*nRanges + 1 + i + (offset >> 1); + const uint16 *gend = gstart + end - start; + if ((char *)gend >= (char *)pCmapSubtable4 + length) + return false; + while (gstart <= gend) + { + uint16 g = be::peek(gstart++); + if (g && ((g + delta) & 0xFFFF) > maxgid) + return false; + } + } + else if (((delta + end) & 0xFFFF) > maxgid) + return false; + lastend = end; + } +#endif + return true; +} + +/*---------------------------------------------------------------------------------------------- + Return the Glyph ID for the given Unicode ID in the Microsoft Unicode subtable. + (Actually this code only depends on subtable being format 4.) + Return 0 if the Unicode ID is not in the subtable. +----------------------------------------------------------------------------------------------*/ +gid16 CmapSubtable4Lookup(const void * pCmapSubtabel4, unsigned int nUnicodeId, int rangeKey) +{ + const Sfnt::CmapSubTableFormat4 * pTable = reinterpret_cast(pCmapSubtabel4); + + uint16 nSeg = be::swap(pTable->seg_count_x2) >> 1; + + uint16 n; + const uint16 * pLeft, * pMid; + uint16 cMid, chStart, chEnd; + + if (rangeKey) + { + pMid = &(pTable->end_code[rangeKey]); + chEnd = be::peek(pMid); + } + else + { + // Binary search of the endCode[] array + pLeft = &(pTable->end_code[0]); + n = nSeg; + while (n > 0) + { + cMid = n >> 1; // Pick an element in the middle + pMid = pLeft + cMid; + chEnd = be::peek(pMid); + if (nUnicodeId <= chEnd) + { + if (cMid == 0 || nUnicodeId > be::peek(pMid -1)) + break; // Must be this seg or none! + n = cMid; // Continue on left side, omitting mid point + } + else + { + pLeft = pMid + 1; // Continue on right side, omitting mid point + n -= (cMid + 1); + } + } + + if (!n) + return 0; + } + + // Ok, we're down to one segment and pMid points to the endCode element + // Either this is it or none is. + + chStart = be::peek(pMid += nSeg + 1); + if (chEnd >= nUnicodeId && nUnicodeId >= chStart) + { + // Found correct segment. Find Glyph Id + int16 idDelta = be::peek(pMid += nSeg); + uint16 idRangeOffset = be::peek(pMid += nSeg); + + if (idRangeOffset == 0) + return (uint16)(idDelta + nUnicodeId); // must use modulus 2^16 + + // Look up value in glyphIdArray + const ptrdiff_t offset = (nUnicodeId - chStart) + (idRangeOffset >> 1) + + (pMid - reinterpret_cast(pTable)); + if (offset * 2 + 1 >= be::swap(pTable->length)) + return 0; + gid16 nGlyphId = be::peek(reinterpret_cast(pTable)+offset); + // If this value is 0, return 0. Else add the idDelta + return nGlyphId ? nGlyphId + idDelta : 0; + } + + return 0; +} + +/*---------------------------------------------------------------------------------------------- + Return the next Unicode value in the cmap. Pass 0 to obtain the first item. + Returns 0xFFFF as the last item. + pRangeKey is an optional key that is used to optimize the search; its value is the range + in which the character is found. +----------------------------------------------------------------------------------------------*/ +unsigned int CmapSubtable4NextCodepoint(const void *pCmap31, unsigned int nUnicodeId, int * pRangeKey) +{ + const Sfnt::CmapSubTableFormat4 * pTable = reinterpret_cast(pCmap31); + + uint16 nRange = be::swap(pTable->seg_count_x2) >> 1; + + uint32 nUnicodePrev = (uint32)nUnicodeId; + + const uint16 * pStartCode = &(pTable->end_code[0]) + + nRange // length of end code array + + 1; // reserved word + + if (nUnicodePrev == 0) + { + // return the first codepoint. + if (pRangeKey) + *pRangeKey = 0; + return be::peek(pStartCode); + } + else if (nUnicodePrev >= 0xFFFF) + { + if (pRangeKey) + *pRangeKey = nRange - 1; + return 0xFFFF; + } + + int iRange = (pRangeKey) ? *pRangeKey : 0; + // Just in case we have a bad key: + while (iRange > 0 && be::peek(pStartCode + iRange) > nUnicodePrev) + iRange--; + while (iRange < nRange - 1 && be::peek(pTable->end_code + iRange) < nUnicodePrev) + iRange++; + + // Now iRange is the range containing nUnicodePrev. + unsigned int nStartCode = be::peek(pStartCode + iRange); + unsigned int nEndCode = be::peek(pTable->end_code + iRange); + + if (nStartCode > nUnicodePrev) + // Oops, nUnicodePrev is not in the cmap! Adjust so we get a reasonable + // answer this time around. + nUnicodePrev = nStartCode - 1; + + if (nEndCode > nUnicodePrev) + { + // Next is in the same range; it is the next successive codepoint. + if (pRangeKey) + *pRangeKey = iRange; + return nUnicodePrev + 1; + } + + // Otherwise the next codepoint is the first one in the next range. + // There is guaranteed to be a next range because there must be one that + // ends with 0xFFFF. + if (pRangeKey) + *pRangeKey = iRange + 1; + return (iRange + 1 >= nRange) ? 0xFFFF : be::peek(pStartCode + iRange + 1); +} + +/*---------------------------------------------------------------------------------------------- + Check the Microsoft UCS-4 subtable for expected values. +----------------------------------------------------------------------------------------------*/ +bool CheckCmapSubtable12(const void *pCmapSubtable12, const void *pCmapEnd /*, unsigned int maxgid*/) +{ + size_t table_len = (const byte *)pCmapEnd - (const byte *)pCmapSubtable12; + if (!pCmapSubtable12) return false; + const Sfnt::CmapSubTable * pTable = reinterpret_cast(pCmapSubtable12); + if (table_len < sizeof(*pTable) || be::swap(pTable->format) != 12) + return false; + const Sfnt::CmapSubTableFormat12 * pTable12 = reinterpret_cast(pCmapSubtable12); + if (table_len < sizeof(*pTable12)) + return false; + uint32 length = be::swap(pTable12->length); + if (length > table_len) + return false; + if (length < sizeof(Sfnt::CmapSubTableFormat12)) + return false; + uint32 num_groups = be::swap(pTable12->num_groups); + if (num_groups > 0x10000000 || length != (sizeof(Sfnt::CmapSubTableFormat12) + (num_groups - 1) * sizeof(uint32) * 3)) + return false; +#if 0 + for (unsigned int i = 0; i < num_groups; ++i) + { + if (be::swap(pTable12->group[i].end_char_code) - be::swap(pTable12->group[i].start_char_code) + be::swap(pTable12->group[i].start_glyph_id) > maxgid) + return false; + if (i > 0 && be::swap(pTable12->group[i].start_char_code) <= be::swap(pTable12->group[i-1].end_char_code)) + return false; + } +#endif + return true; +} + +/*---------------------------------------------------------------------------------------------- + Return the Glyph ID for the given Unicode ID in the Microsoft UCS-4 subtable. + (Actually this code only depends on subtable being format 12.) + Return 0 if the Unicode ID is not in the subtable. +----------------------------------------------------------------------------------------------*/ +gid16 CmapSubtable12Lookup(const void * pCmap310, unsigned int uUnicodeId, int rangeKey) +{ + const Sfnt::CmapSubTableFormat12 * pTable = reinterpret_cast(pCmap310); + + //uint32 uLength = be::swap(pTable->length); //could use to test for premature end of table + uint32 ucGroups = be::swap(pTable->num_groups); + + for (unsigned int i = rangeKey; i < ucGroups; i++) + { + uint32 uStartCode = be::swap(pTable->group[i].start_char_code); + uint32 uEndCode = be::swap(pTable->group[i].end_char_code); + if (uUnicodeId >= uStartCode && uUnicodeId <= uEndCode) + { + uint32 uDiff = uUnicodeId - uStartCode; + uint32 uStartGid = be::swap(pTable->group[i].start_glyph_id); + return static_cast(uStartGid + uDiff); + } + } + + return 0; +} + +/*---------------------------------------------------------------------------------------------- + Return the next Unicode value in the cmap. Pass 0 to obtain the first item. + Returns 0x10FFFF as the last item. + pRangeKey is an optional key that is used to optimize the search; its value is the range + in which the character is found. +----------------------------------------------------------------------------------------------*/ +unsigned int CmapSubtable12NextCodepoint(const void *pCmap310, unsigned int nUnicodeId, int * pRangeKey) +{ + const Sfnt::CmapSubTableFormat12 * pTable = reinterpret_cast(pCmap310); + + int nRange = be::swap(pTable->num_groups); + + uint32 nUnicodePrev = (uint32)nUnicodeId; + + if (nUnicodePrev == 0) + { + // return the first codepoint. + if (pRangeKey) + *pRangeKey = 0; + return be::swap(pTable->group[0].start_char_code); + } + else if (nUnicodePrev >= 0x10FFFF) + { + if (pRangeKey) + *pRangeKey = nRange; + return 0x10FFFF; + } + + int iRange = (pRangeKey) ? *pRangeKey : 0; + // Just in case we have a bad key: + while (iRange > 0 && be::swap(pTable->group[iRange].start_char_code) > nUnicodePrev) + iRange--; + while (iRange < nRange - 1 && be::swap(pTable->group[iRange].end_char_code) < nUnicodePrev) + iRange++; + + // Now iRange is the range containing nUnicodePrev. + + unsigned int nStartCode = be::swap(pTable->group[iRange].start_char_code); + unsigned int nEndCode = be::swap(pTable->group[iRange].end_char_code); + + if (nStartCode > nUnicodePrev) + // Oops, nUnicodePrev is not in the cmap! Adjust so we get a reasonable + // answer this time around. + nUnicodePrev = nStartCode - 1; + + if (nEndCode > nUnicodePrev) + { + // Next is in the same range; it is the next successive codepoint. + if (pRangeKey) + *pRangeKey = iRange; + return nUnicodePrev + 1; + } + + // Otherwise the next codepoint is the first one in the next range, or 10FFFF if we're done. + if (pRangeKey) + *pRangeKey = iRange + 1; + return (iRange + 1 >= nRange) ? 0x10FFFF : be::swap(pTable->group[iRange + 1].start_char_code); +} + +/*---------------------------------------------------------------------------------------------- + Return the offset stored in the loca table for the given Glyph ID. + (This offset is into the glyf table.) + Return -1 if the lookup failed. + Technically this method should return an unsigned long but it is unlikely the offset will + exceed 2^31. +----------------------------------------------------------------------------------------------*/ +size_t LocaLookup(gid16 nGlyphId, + const void * pLoca, size_t lLocaSize, + const void * pHead) // throw (std::out_of_range) +{ + const Sfnt::FontHeader * pTable = reinterpret_cast(pHead); + size_t res = -2; + + // CheckTable verifies the index_to_loc_format is valid + if (be::swap(pTable->index_to_loc_format) == Sfnt::FontHeader::ShortIndexLocFormat) + { // loca entries are two bytes and have been divided by two + if (lLocaSize > 1 && nGlyphId + 1u < lLocaSize >> 1) // allow sentinel value to be accessed + { + const uint16 * pShortTable = reinterpret_cast(pLoca); + res = be::peek(pShortTable + nGlyphId) << 1; + if (res == static_cast(be::peek(pShortTable + nGlyphId + 1) << 1)) + return -1; + } + } + else if (be::swap(pTable->index_to_loc_format) == Sfnt::FontHeader::LongIndexLocFormat) + { // loca entries are four bytes + if (lLocaSize > 3 && nGlyphId + 1u < lLocaSize >> 2) + { + const uint32 * pLongTable = reinterpret_cast(pLoca); + res = be::peek(pLongTable + nGlyphId); + if (res == static_cast(be::peek(pLongTable + nGlyphId + 1))) + return -1; + } + } + + // only get here if glyph id was bad + return res; + //throw std::out_of_range("glyph id out of range for font"); +} + +/*---------------------------------------------------------------------------------------------- + Return a pointer into the glyf table based on the given offset (from LocaLookup). + Return NULL on error. +----------------------------------------------------------------------------------------------*/ +void * GlyfLookup(const void * pGlyf, size_t nGlyfOffset, size_t nTableLen) +{ + const uint8 * pByte = reinterpret_cast(pGlyf); + if (OVERFLOW_OFFSET_CHECK(pByte, nGlyfOffset) || nGlyfOffset >= nTableLen - sizeof(Sfnt::Glyph)) + return NULL; + return const_cast(pByte + nGlyfOffset); +} + +/*---------------------------------------------------------------------------------------------- + Get the bounding box coordinates for a simple glyf entry (non-composite). + Return true if successful, false otherwise. +----------------------------------------------------------------------------------------------*/ +bool GlyfBox(const void * pSimpleGlyf, int & xMin, int & yMin, + int & xMax, int & yMax) +{ + const Sfnt::Glyph * pGlyph = reinterpret_cast(pSimpleGlyf); + + xMin = be::swap(pGlyph->x_min); + yMin = be::swap(pGlyph->y_min); + xMax = be::swap(pGlyph->x_max); + yMax = be::swap(pGlyph->y_max); + + return true; +} + +#ifdef ALL_TTFUTILS +/*---------------------------------------------------------------------------------------------- + Return the number of contours for a simple glyf entry (non-composite) + Returning -1 means this is a composite glyph +----------------------------------------------------------------------------------------------*/ +int GlyfContourCount(const void * pSimpleGlyf) +{ + const Sfnt::Glyph * pGlyph = reinterpret_cast(pSimpleGlyf); + return be::swap(pGlyph->number_of_contours); // -1 means composite glyph +} + +/*---------------------------------------------------------------------------------------------- + Get the point numbers for the end points of the glyph contours for a simple + glyf entry (non-composite). + cnPointsTotal - count of contours from GlyfContourCount(); (same as number of end points) + prgnContourEndPoints - should point to a buffer large enough to hold cnPoints integers + cnPoints - count of points placed in above range + Return true if successful, false otherwise. + False could indicate a multi-level composite glyphs. +----------------------------------------------------------------------------------------------*/ +bool GlyfContourEndPoints(const void * pSimpleGlyf, int * prgnContourEndPoint, + int cnPointsTotal, int & cnPoints) +{ + const Sfnt::SimpleGlyph * pGlyph = reinterpret_cast(pSimpleGlyf); + + int cContours = be::swap(pGlyph->number_of_contours); + if (cContours < 0) + return false; // this method isn't supposed handle composite glyphs + + for (int i = 0; i < cContours && i < cnPointsTotal; i++) + { + prgnContourEndPoint[i] = be::swap(pGlyph->end_pts_of_contours[i]); + } + + cnPoints = cContours; + return true; +} + +/*---------------------------------------------------------------------------------------------- + Get the points for a simple glyf entry (non-composite) + cnPointsTotal - count of points from largest end point obtained from GlyfContourEndPoints + prgnX & prgnY - should point to buffers large enough to hold cnPointsTotal integers + The ranges are parallel so that coordinates for point(n) are found at offset n in both + ranges. This is raw point data with relative coordinates. + prgbFlag - should point to a buffer a large enough to hold cnPointsTotal bytes + This range is parallel to the prgnX & prgnY + cnPoints - count of points placed in above ranges + Return true if successful, false otherwise. + False could indicate a composite glyph +----------------------------------------------------------------------------------------------*/ +bool GlyfPoints(const void * pSimpleGlyf, int * prgnX, int * prgnY, + char * prgbFlag, int cnPointsTotal, int & cnPoints) +{ + using namespace Sfnt; + + const Sfnt::SimpleGlyph * pGlyph = reinterpret_cast(pSimpleGlyf); + int cContours = be::swap(pGlyph->number_of_contours); + // return false for composite glyph + if (cContours <= 0) + return false; + int cPts = be::swap(pGlyph->end_pts_of_contours[cContours - 1]) + 1; + if (cPts > cnPointsTotal) + return false; + + // skip over bounding box data & point to byte count of instructions (hints) + const uint8 * pbGlyph = reinterpret_cast + (&pGlyph->end_pts_of_contours[cContours]); + + // skip over hints & point to first flag + int cbHints = be::swap(*(uint16 *)pbGlyph); + pbGlyph += sizeof(uint16); + pbGlyph += cbHints; + + // load flags & point to first x coordinate + int iFlag = 0; + while (iFlag < cPts) + { + if (!(*pbGlyph & SimpleGlyph::Repeat)) + { // flag isn't repeated + prgbFlag[iFlag] = (char)*pbGlyph; + pbGlyph++; + iFlag++; + } + else + { // flag is repeated; count specified by next byte + char chFlag = (char)*pbGlyph; + pbGlyph++; + int cFlags = (int)*pbGlyph; + pbGlyph++; + prgbFlag[iFlag] = chFlag; + iFlag++; + for (int i = 0; i < cFlags; i++) + { + prgbFlag[iFlag + i] = chFlag; + } + iFlag += cFlags; + } + } + if (iFlag != cPts) + return false; + + // load x coordinates + iFlag = 0; + while (iFlag < cPts) + { + if (prgbFlag[iFlag] & SimpleGlyph::XShort) + { + prgnX[iFlag] = *pbGlyph; + if (!(prgbFlag[iFlag] & SimpleGlyph::XIsPos)) + { + prgnX[iFlag] = -prgnX[iFlag]; + } + pbGlyph++; + } + else + { + if (prgbFlag[iFlag] & SimpleGlyph::XIsSame) + { + prgnX[iFlag] = 0; + // do NOT increment pbGlyph + } + else + { + prgnX[iFlag] = be::swap(*(int16 *)pbGlyph); + pbGlyph += sizeof(int16); + } + } + iFlag++; + } + + // load y coordinates + iFlag = 0; + while (iFlag < cPts) + { + if (prgbFlag[iFlag] & SimpleGlyph::YShort) + { + prgnY[iFlag] = *pbGlyph; + if (!(prgbFlag[iFlag] & SimpleGlyph::YIsPos)) + { + prgnY[iFlag] = -prgnY[iFlag]; + } + pbGlyph++; + } + else + { + if (prgbFlag[iFlag] & SimpleGlyph::YIsSame) + { + prgnY[iFlag] = 0; + // do NOT increment pbGlyph + } + else + { + prgnY[iFlag] = be::swap(*(int16 *)pbGlyph); + pbGlyph += sizeof(int16); + } + } + iFlag++; + } + + cnPoints = cPts; + return true; +} + +/*---------------------------------------------------------------------------------------------- + Fill prgnCompId with the component Glyph IDs from pSimpleGlyf. + Client must allocate space before calling. + pSimpleGlyf - assumed to point to a composite glyph + cCompIdTotal - the number of elements in prgnCompId + cCompId - the total number of Glyph IDs stored in prgnCompId + Return true if successful, false otherwise + False could indicate a non-composite glyph or the input array was not big enough +----------------------------------------------------------------------------------------------*/ +bool GetComponentGlyphIds(const void * pSimpleGlyf, int * prgnCompId, + size_t cnCompIdTotal, size_t & cnCompId) +{ + using namespace Sfnt; + + if (GlyfContourCount(pSimpleGlyf) >= 0) + return false; + + const Sfnt::SimpleGlyph * pGlyph = reinterpret_cast(pSimpleGlyf); + // for a composite glyph, the special data begins here + const uint8 * pbGlyph = reinterpret_cast(&pGlyph->end_pts_of_contours[0]); + + uint16 GlyphFlags; + size_t iCurrentComp = 0; + do + { + GlyphFlags = be::swap(*((uint16 *)pbGlyph)); + pbGlyph += sizeof(uint16); + prgnCompId[iCurrentComp++] = be::swap(*((uint16 *)pbGlyph)); + pbGlyph += sizeof(uint16); + if (iCurrentComp >= cnCompIdTotal) + return false; + int nOffset = 0; + nOffset += GlyphFlags & CompoundGlyph::Arg1Arg2Words ? 4 : 2; + nOffset += GlyphFlags & CompoundGlyph::HaveScale ? 2 : 0; + nOffset += GlyphFlags & CompoundGlyph::HaveXAndYScale ? 4 : 0; + nOffset += GlyphFlags & CompoundGlyph::HaveTwoByTwo ? 8 : 0; + pbGlyph += nOffset; + } while (GlyphFlags & CompoundGlyph::MoreComponents); + + cnCompId = iCurrentComp; + + return true; +} + +/*---------------------------------------------------------------------------------------------- + Return info on how a component glyph is to be placed + pSimpleGlyph - assumed to point to a composite glyph + nCompId - glyph id for component of interest + bOffset - if true, a & b are the x & y offsets for this component + if false, b is the point on this component that is attaching to point a on the + preceding glyph + Return true if successful, false otherwise + False could indicate a non-composite glyph or that component wasn't found +----------------------------------------------------------------------------------------------*/ +bool GetComponentPlacement(const void * pSimpleGlyf, int nCompId, + bool fOffset, int & a, int & b) +{ + using namespace Sfnt; + + if (GlyfContourCount(pSimpleGlyf) >= 0) + return false; + + const Sfnt::SimpleGlyph * pGlyph = reinterpret_cast(pSimpleGlyf); + // for a composite glyph, the special data begins here + const uint8 * pbGlyph = reinterpret_cast(&pGlyph->end_pts_of_contours[0]); + + uint16 GlyphFlags; + do + { + GlyphFlags = be::swap(*((uint16 *)pbGlyph)); + pbGlyph += sizeof(uint16); + if (be::swap(*((uint16 *)pbGlyph)) == nCompId) + { + pbGlyph += sizeof(uint16); // skip over glyph id of component + fOffset = (GlyphFlags & CompoundGlyph::ArgsAreXYValues) == CompoundGlyph::ArgsAreXYValues; + + if (GlyphFlags & CompoundGlyph::Arg1Arg2Words ) + { + a = be::swap(*(int16 *)pbGlyph); + pbGlyph += sizeof(int16); + b = be::swap(*(int16 *)pbGlyph); + pbGlyph += sizeof(int16); + } + else + { // args are signed bytes + a = *pbGlyph++; + b = *pbGlyph++; + } + return true; + } + pbGlyph += sizeof(uint16); // skip over glyph id of component + int nOffset = 0; + nOffset += GlyphFlags & CompoundGlyph::Arg1Arg2Words ? 4 : 2; + nOffset += GlyphFlags & CompoundGlyph::HaveScale ? 2 : 0; + nOffset += GlyphFlags & CompoundGlyph::HaveXAndYScale ? 4 : 0; + nOffset += GlyphFlags & CompoundGlyph::HaveTwoByTwo ? 8 : 0; + pbGlyph += nOffset; + } while (GlyphFlags & CompoundGlyph::MoreComponents); + + // didn't find requested component + fOffset = true; + a = 0; + b = 0; + return false; +} + +/*---------------------------------------------------------------------------------------------- + Return info on how a component glyph is to be transformed + pSimpleGlyph - assumed to point to a composite glyph + nCompId - glyph id for component of interest + flt11, flt11, flt11, flt11 - a 2x2 matrix giving the transform + bTransOffset - whether to transform the offset from above method + The spec is unclear about the meaning of this flag + Currently - initialize to true for MS rasterizer and false for Mac rasterizer, then + on return it will indicate whether transform should apply to offset (MSDN CD 10/99) + Return true if successful, false otherwise + False could indicate a non-composite glyph or that component wasn't found +----------------------------------------------------------------------------------------------*/ +bool GetComponentTransform(const void * pSimpleGlyf, int nCompId, + float & flt11, float & flt12, float & flt21, float & flt22, + bool & fTransOffset) +{ + using namespace Sfnt; + + if (GlyfContourCount(pSimpleGlyf) >= 0) + return false; + + const Sfnt::SimpleGlyph * pGlyph = reinterpret_cast(pSimpleGlyf); + // for a composite glyph, the special data begins here + const uint8 * pbGlyph = reinterpret_cast(&pGlyph->end_pts_of_contours[0]); + + uint16 GlyphFlags; + do + { + GlyphFlags = be::swap(*((uint16 *)pbGlyph)); + pbGlyph += sizeof(uint16); + if (be::swap(*((uint16 *)pbGlyph)) == nCompId) + { + pbGlyph += sizeof(uint16); // skip over glyph id of component + pbGlyph += GlyphFlags & CompoundGlyph::Arg1Arg2Words ? 4 : 2; // skip over placement data + + if (fTransOffset) // MS rasterizer + fTransOffset = !(GlyphFlags & CompoundGlyph::UnscaledOffset); + else // Apple rasterizer + fTransOffset = (GlyphFlags & CompoundGlyph::ScaledOffset) != 0; + + if (GlyphFlags & CompoundGlyph::HaveScale) + { + flt11 = fixed_to_float<14>(be::swap(*(uint16 *)pbGlyph)); + pbGlyph += sizeof(uint16); + flt12 = 0; + flt21 = 0; + flt22 = flt11; + } + else if (GlyphFlags & CompoundGlyph::HaveXAndYScale) + { + flt11 = fixed_to_float<14>(be::swap(*(uint16 *)pbGlyph)); + pbGlyph += sizeof(uint16); + flt12 = 0; + flt21 = 0; + flt22 = fixed_to_float<14>(be::swap(*(uint16 *)pbGlyph)); + pbGlyph += sizeof(uint16); + } + else if (GlyphFlags & CompoundGlyph::HaveTwoByTwo) + { + flt11 = fixed_to_float<14>(be::swap(*(uint16 *)pbGlyph)); + pbGlyph += sizeof(uint16); + flt12 = fixed_to_float<14>(be::swap(*(uint16 *)pbGlyph)); + pbGlyph += sizeof(uint16); + flt21 = fixed_to_float<14>(be::swap(*(uint16 *)pbGlyph)); + pbGlyph += sizeof(uint16); + flt22 = fixed_to_float<14>(be::swap(*(uint16 *)pbGlyph)); + pbGlyph += sizeof(uint16); + } + else + { // identity transform + flt11 = 1.0; + flt12 = 0.0; + flt21 = 0.0; + flt22 = 1.0; + } + return true; + } + pbGlyph += sizeof(uint16); // skip over glyph id of component + int nOffset = 0; + nOffset += GlyphFlags & CompoundGlyph::Arg1Arg2Words ? 4 : 2; + nOffset += GlyphFlags & CompoundGlyph::HaveScale ? 2 : 0; + nOffset += GlyphFlags & CompoundGlyph::HaveXAndYScale ? 4 : 0; + nOffset += GlyphFlags & CompoundGlyph::HaveTwoByTwo ? 8 : 0; + pbGlyph += nOffset; + } while (GlyphFlags & CompoundGlyph::MoreComponents); + + // didn't find requested component + fTransOffset = false; + flt11 = 1; + flt12 = 0; + flt21 = 0; + flt22 = 1; + return false; +} +#endif + +/*---------------------------------------------------------------------------------------------- + Return a pointer into the glyf table based on the given tables and Glyph ID + Since this method doesn't check for spaces, it is good to call IsSpace before using it. + Return NULL on error. +----------------------------------------------------------------------------------------------*/ +void * GlyfLookup(gid16 nGlyphId, const void * pGlyf, const void * pLoca, + size_t lGlyfSize, size_t lLocaSize, const void * pHead) +{ + // test for valid glyph id + // CheckTable verifies the index_to_loc_format is valid + + const Sfnt::FontHeader * pTable + = reinterpret_cast(pHead); + + if (be::swap(pTable->index_to_loc_format) == Sfnt::FontHeader::ShortIndexLocFormat) + { // loca entries are two bytes (and have been divided by two) + if (nGlyphId >= (lLocaSize >> 1) - 1) // don't allow nGlyphId to access sentinel + { +// throw std::out_of_range("glyph id out of range for font"); + return NULL; + } + } + if (be::swap(pTable->index_to_loc_format) == Sfnt::FontHeader::LongIndexLocFormat) + { // loca entries are four bytes + if (nGlyphId >= (lLocaSize >> 2) - 1) + { +// throw std::out_of_range("glyph id out of range for font"); + return NULL; + } + } + + size_t lGlyfOffset = LocaLookup(nGlyphId, pLoca, lLocaSize, pHead); + void * pSimpleGlyf = GlyfLookup(pGlyf, lGlyfOffset, lGlyfSize); // invalid loca offset returns null + return pSimpleGlyf; +} + +#ifdef ALL_TTFUTILS +/*---------------------------------------------------------------------------------------------- + Determine if a particular Glyph ID has any data in the glyf table. If it is white space, + there will be no glyf data, though there will be metric data in hmtx, etc. +----------------------------------------------------------------------------------------------*/ +bool IsSpace(gid16 nGlyphId, const void * pLoca, size_t lLocaSize, const void * pHead) +{ + size_t lGlyfOffset = LocaLookup(nGlyphId, pLoca, lLocaSize, pHead); + + // the +1 should always work because there is a sentinel value at the end of the loca table + size_t lNextGlyfOffset = LocaLookup(nGlyphId + 1, pLoca, lLocaSize, pHead); + + return (lNextGlyfOffset - lGlyfOffset) == 0; +} + +/*---------------------------------------------------------------------------------------------- + Determine if a particular Glyph ID is a multi-level composite. +----------------------------------------------------------------------------------------------*/ +bool IsDeepComposite(gid16 nGlyphId, const void * pGlyf, const void * pLoca, + size_t lGlyfSize, long lLocaSize, const void * pHead) +{ + if (IsSpace(nGlyphId, pLoca, lLocaSize, pHead)) {return false;} + + void * pSimpleGlyf = GlyfLookup(nGlyphId, pGlyf, pLoca, lGlyfSize, lLocaSize, pHead); + if (pSimpleGlyf == NULL) + return false; // no way to really indicate an error occured here + + if (GlyfContourCount(pSimpleGlyf) >= 0) + return false; + + int rgnCompId[kMaxGlyphComponents]; // assumes only a limited number of glyph components + size_t cCompIdTotal = kMaxGlyphComponents; + size_t cCompId = 0; + + if (!GetComponentGlyphIds(pSimpleGlyf, rgnCompId, cCompIdTotal, cCompId)) + return false; + + for (size_t i = 0; i < cCompId; i++) + { + pSimpleGlyf = GlyfLookup(static_cast(rgnCompId[i]), + pGlyf, pLoca, lGlyfSize, lLocaSize, pHead); + if (pSimpleGlyf == NULL) {return false;} + + if (GlyfContourCount(pSimpleGlyf) < 0) + return true; + } + + return false; +} + +/*---------------------------------------------------------------------------------------------- + Get the bounding box coordinates based on the given tables and Glyph ID + Handles both simple and composite glyphs. + Return true if successful, false otherwise. On false, all point values will be INT_MIN + False may indicate a white space glyph +----------------------------------------------------------------------------------------------*/ +bool GlyfBox(gid16 nGlyphId, const void * pGlyf, const void * pLoca, + size_t lGlyfSize, size_t lLocaSize, const void * pHead, int & xMin, int & yMin, int & xMax, int & yMax) +{ + xMin = yMin = xMax = yMax = INT_MIN; + + if (IsSpace(nGlyphId, pLoca, lLocaSize, pHead)) {return false;} + + void * pSimpleGlyf = GlyfLookup(nGlyphId, pGlyf, pLoca, lGlyfSize, lLocaSize, pHead); + if (pSimpleGlyf == NULL) {return false;} + + return GlyfBox(pSimpleGlyf, xMin, yMin, xMax, yMax); +} + +/*---------------------------------------------------------------------------------------------- + Get the number of contours based on the given tables and Glyph ID + Handles both simple and composite glyphs. + Return true if successful, false otherwise. On false, cnContours will be INT_MIN + False may indicate a white space glyph or a multi-level composite glyph. +----------------------------------------------------------------------------------------------*/ +bool GlyfContourCount(gid16 nGlyphId, const void * pGlyf, const void * pLoca, + size_t lGlyfSize, size_t lLocaSize, const void * pHead, size_t & cnContours) +{ + cnContours = static_cast(INT_MIN); + + if (IsSpace(nGlyphId, pLoca, lLocaSize, pHead)) {return false;} + + void * pSimpleGlyf = GlyfLookup(nGlyphId, pGlyf, pLoca, lGlyfSize, lLocaSize, pHead); + if (pSimpleGlyf == NULL) {return false;} + + int cRtnContours = GlyfContourCount(pSimpleGlyf); + if (cRtnContours >= 0) + { + cnContours = size_t(cRtnContours); + return true; + } + + //handle composite glyphs + + int rgnCompId[kMaxGlyphComponents]; // assumes no glyph will be made of more than 8 components + size_t cCompIdTotal = kMaxGlyphComponents; + size_t cCompId = 0; + + if (!GetComponentGlyphIds(pSimpleGlyf, rgnCompId, cCompIdTotal, cCompId)) + return false; + + cRtnContours = 0; + int cTmp = 0; + for (size_t i = 0; i < cCompId; i++) + { + if (IsSpace(static_cast(rgnCompId[i]), pLoca, lLocaSize, pHead)) {return false;} + pSimpleGlyf = GlyfLookup(static_cast(rgnCompId[i]), + pGlyf, pLoca, lGlyfSize, lLocaSize, pHead); + if (pSimpleGlyf == 0) {return false;} + // return false on multi-level composite + if ((cTmp = GlyfContourCount(pSimpleGlyf)) < 0) + return false; + cRtnContours += cTmp; + } + + cnContours = size_t(cRtnContours); + return true; +} + +/*---------------------------------------------------------------------------------------------- + Get the point numbers for the end points of the glyph contours based on the given tables + and Glyph ID + Handles both simple and composite glyphs. + cnPoints - count of contours from GlyfContourCount (same as number of end points) + prgnContourEndPoints - should point to a buffer large enough to hold cnPoints integers + Return true if successful, false otherwise. On false, all end points are INT_MIN + False may indicate a white space glyph or a multi-level composite glyph. +----------------------------------------------------------------------------------------------*/ +bool GlyfContourEndPoints(gid16 nGlyphId, const void * pGlyf, const void * pLoca, + size_t lGlyfSize, size_t lLocaSize, const void * pHead, + int * prgnContourEndPoint, size_t cnPoints) +{ + memset(prgnContourEndPoint, 0xFF, cnPoints * sizeof(int)); + // std::fill_n(prgnContourEndPoint, cnPoints, INT_MIN); + + if (IsSpace(nGlyphId, pLoca, lLocaSize, pHead)) {return false;} + + void * pSimpleGlyf = GlyfLookup(nGlyphId, pGlyf, pLoca, lGlyfSize, lLocaSize, pHead); + if (pSimpleGlyf == NULL) {return false;} + + int cContours = GlyfContourCount(pSimpleGlyf); + int cActualPts = 0; + if (cContours > 0) + return GlyfContourEndPoints(pSimpleGlyf, prgnContourEndPoint, cnPoints, cActualPts); + + // handle composite glyphs + + int rgnCompId[kMaxGlyphComponents]; // assumes no glyph will be made of more than 8 components + size_t cCompIdTotal = kMaxGlyphComponents; + size_t cCompId = 0; + + if (!GetComponentGlyphIds(pSimpleGlyf, rgnCompId, cCompIdTotal, cCompId)) + return false; + + int * prgnCurrentEndPoint = prgnContourEndPoint; + int cCurrentPoints = cnPoints; + int nPrevPt = 0; + for (size_t i = 0; i < cCompId; i++) + { + if (IsSpace(static_cast(rgnCompId[i]), pLoca, lLocaSize, pHead)) {return false;} + pSimpleGlyf = GlyfLookup(static_cast(rgnCompId[i]), pGlyf, pLoca, lGlyfSize, lLocaSize, pHead); + if (pSimpleGlyf == NULL) {return false;} + // returns false on multi-level composite + if (!GlyfContourEndPoints(pSimpleGlyf, prgnCurrentEndPoint, cCurrentPoints, cActualPts)) + return false; + // points in composite are numbered sequentially as components are added + // must adjust end point numbers for new point numbers + for (int j = 0; j < cActualPts; j++) + prgnCurrentEndPoint[j] += nPrevPt; + nPrevPt = prgnCurrentEndPoint[cActualPts - 1] + 1; + + prgnCurrentEndPoint += cActualPts; + cCurrentPoints -= cActualPts; + } + + return true; +} + +/*---------------------------------------------------------------------------------------------- + Get the points for a glyph based on the given tables and Glyph ID + Handles both simple and composite glyphs. + cnPoints - count of points from largest end point obtained from GlyfContourEndPoints + prgnX & prgnY - should point to buffers large enough to hold cnPoints integers + The ranges are parallel so that coordinates for point(n) are found at offset n in + both ranges. These points are in absolute coordinates. + prgfOnCurve - should point to a buffer a large enough to hold cnPoints bytes (bool) + This range is parallel to the prgnX & prgnY + Return true if successful, false otherwise. On false, all points may be INT_MIN + False may indicate a white space glyph, a multi-level composite, or a corrupt font + It's not clear from the TTF spec when the transforms should be applied. Should the + transform be done before or after attachment point calcs? (current code - before) + Should the transform be applied to other offsets? (currently - no; however commented + out code is in place so that if CompoundGlyph::UnscaledOffset on the MS rasterizer is + clear (typical) then yes, and if CompoundGlyph::ScaledOffset on the Apple rasterizer is + clear (typical?) then no). See GetComponentTransform. + It's also unclear where point numbering with attachment poinst starts + (currently - first point number is relative to whole glyph, second point number is + relative to current glyph). +----------------------------------------------------------------------------------------------*/ +bool GlyfPoints(gid16 nGlyphId, const void * pGlyf, + const void * pLoca, size_t lGlyfSize, size_t lLocaSize, const void * pHead, + const int * /*prgnContourEndPoint*/, size_t /*cnEndPoints*/, + int * prgnX, int * prgnY, bool * prgfOnCurve, size_t cnPoints) +{ + memset(prgnX, 0x7F, cnPoints * sizeof(int)); + memset(prgnY, 0x7F, cnPoints * sizeof(int)); + + if (IsSpace(nGlyphId, pLoca, lLocaSize, pHead)) + return false; + + void * pSimpleGlyf = GlyfLookup(nGlyphId, pGlyf, pLoca, lGlyfSize, lLocaSize, pHead); + if (pSimpleGlyf == NULL) + return false; + + int cContours = GlyfContourCount(pSimpleGlyf); + int cActualPts; + if (cContours > 0) + { + if (!GlyfPoints(pSimpleGlyf, prgnX, prgnY, (char *)prgfOnCurve, cnPoints, cActualPts)) + return false; + CalcAbsolutePoints(prgnX, prgnY, cnPoints); + SimplifyFlags((char *)prgfOnCurve, cnPoints); + return true; + } + + // handle composite glyphs + int rgnCompId[kMaxGlyphComponents]; // assumes no glyph will be made of more than 8 components + size_t cCompIdTotal = kMaxGlyphComponents; + size_t cCompId = 0; + + // this will fail if there are more components than there is room for + if (!GetComponentGlyphIds(pSimpleGlyf, rgnCompId, cCompIdTotal, cCompId)) + return false; + + int * prgnCurrentX = prgnX; + int * prgnCurrentY = prgnY; + char * prgbCurrentFlag = (char *)prgfOnCurve; // converting bool to char should be safe + int cCurrentPoints = cnPoints; + bool fOffset = true, fTransOff = true; + int a, b; + float flt11, flt12, flt21, flt22; + // int * prgnPrevX = prgnX; // in case first att pt number relative to preceding glyph + // int * prgnPrevY = prgnY; + for (size_t i = 0; i < cCompId; i++) + { + if (IsSpace(static_cast(rgnCompId[i]), pLoca, lLocaSize, pHead)) {return false;} + void * pCompGlyf = GlyfLookup(static_cast(rgnCompId[i]), pGlyf, pLoca, lGlyfSize, lLocaSize, pHead); + if (pCompGlyf == NULL) {return false;} + // returns false on multi-level composite + if (!GlyfPoints(pCompGlyf, prgnCurrentX, prgnCurrentY, prgbCurrentFlag, + cCurrentPoints, cActualPts)) + return false; + if (!GetComponentPlacement(pSimpleGlyf, rgnCompId[i], fOffset, a, b)) + return false; + if (!GetComponentTransform(pSimpleGlyf, rgnCompId[i], + flt11, flt12, flt21, flt22, fTransOff)) + return false; + bool fIdTrans = flt11 == 1.0 && flt12 == 0.0 && flt21 == 0.0 && flt22 == 1.0; + + // convert points to absolute coordinates + // do before transform and attachment point placement are applied + CalcAbsolutePoints(prgnCurrentX, prgnCurrentY, cActualPts); + + // apply transform - see main method note above + // do before attachment point calcs + if (!fIdTrans) + for (int j = 0; j < cActualPts; j++) + { + int x = prgnCurrentX[j]; // store before transform applied + int y = prgnCurrentY[j]; + prgnCurrentX[j] = (int)(x * flt11 + y * flt12); + prgnCurrentY[j] = (int)(x * flt21 + y * flt22); + } + + // apply placement - see main method note above + int nXOff, nYOff; + if (fOffset) // explicit x & y offsets + { + /* ignore fTransOff for now + if (fTransOff && !fIdTrans) + { // transform x & y offsets + nXOff = (int)(a * flt11 + b * flt12); + nYOff = (int)(a * flt21 + b * flt22); + } + else */ + { // don't transform offset + nXOff = a; + nYOff = b; + } + } + else // attachment points + { // in case first point is relative to preceding glyph and second relative to current + // nXOff = prgnPrevX[a] - prgnCurrentX[b]; + // nYOff = prgnPrevY[a] - prgnCurrentY[b]; + // first point number relative to whole composite, second relative to current glyph + nXOff = prgnX[a] - prgnCurrentX[b]; + nYOff = prgnY[a] - prgnCurrentY[b]; + } + for (int j = 0; j < cActualPts; j++) + { + prgnCurrentX[j] += nXOff; + prgnCurrentY[j] += nYOff; + } + + // prgnPrevX = prgnCurrentX; + // prgnPrevY = prgnCurrentY; + prgnCurrentX += cActualPts; + prgnCurrentY += cActualPts; + prgbCurrentFlag += cActualPts; + cCurrentPoints -= cActualPts; + } + + SimplifyFlags((char *)prgfOnCurve, cnPoints); + + return true; +} + +/*---------------------------------------------------------------------------------------------- + Simplify the meaning of flags to just indicate whether point is on-curve or off-curve. +---------------------------------------------------------------------------------------------*/ +bool SimplifyFlags(char * prgbFlags, int cnPoints) +{ + for (int i = 0; i < cnPoints; i++) + prgbFlags[i] = static_cast(prgbFlags[i] & Sfnt::SimpleGlyph::OnCurve); + return true; +} + +/*---------------------------------------------------------------------------------------------- + Convert relative point coordinates to absolute coordinates + Points are stored in the font such that they are offsets from one another except for the + first point of a glyph. +---------------------------------------------------------------------------------------------*/ +bool CalcAbsolutePoints(int * prgnX, int * prgnY, int cnPoints) +{ + int nX = prgnX[0]; + int nY = prgnY[0]; + for (int i = 1; i < cnPoints; i++) + { + prgnX[i] += nX; + nX = prgnX[i]; + prgnY[i] += nY; + nY = prgnY[i]; + } + + return true; +} +#endif + +/*---------------------------------------------------------------------------------------------- + Return the length of the 'name' table in bytes. + Currently used. +---------------------------------------------------------------------------------------------*/ +#if 0 +size_t NameTableLength(const byte * pTable) +{ + byte * pb = (const_cast(pTable)) + 2; // skip format + size_t cRecords = *pb++ << 8; cRecords += *pb++; + int dbStringOffset0 = (*pb++) << 8; dbStringOffset0 += *pb++; + int dbMaxStringOffset = 0; + for (size_t irec = 0; irec < cRecords; irec++) + { + int nPlatform = (*pb++) << 8; nPlatform += *pb++; + int nEncoding = (*pb++) << 8; nEncoding += *pb++; + int nLanguage = (*pb++) << 8; nLanguage += *pb++; + int nName = (*pb++) << 8; nName += *pb++; + int cbStringLen = (*pb++) << 8; cbStringLen += *pb++; + int dbStringOffset = (*pb++) << 8; dbStringOffset += *pb++; + if (dbMaxStringOffset < dbStringOffset + cbStringLen) + dbMaxStringOffset = dbStringOffset + cbStringLen; + } + return dbStringOffset0 + dbMaxStringOffset; +} +#endif + +} // end of namespace TtfUtil +} // end of namespace graphite diff --git a/source/libs/graphite2/graphite2-src/src/UtfCodec.cpp b/source/libs/graphite2/graphite2-src/src/UtfCodec.cpp new file mode 100644 index 000000000..a944bbf9d --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/UtfCodec.cpp @@ -0,0 +1,45 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include "inc/UtfCodec.h" +//using namespace graphite2; + +namespace graphite2 { + +} + +using namespace graphite2; + +const int8 _utf_codec<8>::sz_lut[16] = +{ + 1,1,1,1,1,1,1,1, // 1 byte + 0,0,0,0, // trailing byte + 2,2, // 2 bytes + 3, // 3 bytes + 4 // 4 bytes +}; + +const byte _utf_codec<8>::mask_lut[5] = {0x7f, 0xff, 0x3f, 0x1f, 0x0f}; diff --git a/source/libs/graphite2/graphite2-src/src/call_machine.cpp b/source/libs/graphite2/graphite2-src/src/call_machine.cpp new file mode 100644 index 000000000..fcd8a0c2c --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/call_machine.cpp @@ -0,0 +1,138 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +// This call threaded interpreter implmentation for machine.h +// Author: Tim Eves + +// Build either this interpreter or the direct_machine implementation. +// The call threaded interpreter is portable across compilers and +// architectures as well as being useful to debug (you can set breakpoints on +// opcodes) but is slower that the direct threaded interpreter by a factor of 2 + +#include +#include +#include +#include "inc/Machine.h" +#include "inc/Segment.h" +#include "inc/Slot.h" +#include "inc/Rule.h" + +// Disable the unused parameter warning as th compiler is mistaken since dp +// is always updated (even if by 0) on every opcode. +#ifdef __GNUC__ +#pragma GCC diagnostic ignored "-Wunused-parameter" +#endif + +#define registers const byte * & dp, vm::Machine::stack_t * & sp, \ + vm::Machine::stack_t * const sb, regbank & reg + +// These are required by opcodes.h and should not be changed +#define STARTOP(name) bool name(registers) REGPARM(4);\ + bool name(registers) { +#define ENDOP return (sp - sb)/Machine::STACK_MAX==0; \ + } + +#define EXIT(status) { push(status); return false; } + +// This is required by opcode_table.h +#define do_(name) instr(name) + + +using namespace graphite2; +using namespace vm; + +struct regbank { + slotref is; + slotref * map; + SlotMap & smap; + slotref * const map_base; + const instr * & ip; + uint8 direction; + int8 flags; + Machine::status_t & status; +}; + +typedef bool (* ip_t)(registers); + +// Pull in the opcode definitions +// We pull these into a private namespace so these otherwise common names dont +// pollute the toplevel namespace. +namespace { +#define smap reg.smap +#define seg smap.segment +#define is reg.is +#define ip reg.ip +#define map reg.map +#define mapb reg.map_base +#define flags reg.flags +#define dir reg.direction +#define status reg.status + +#include "inc/opcodes.h" + +#undef smap +#undef seg +#undef is +#undef ip +#undef map +#undef mapb +#undef flags +#undef dir +} + +Machine::stack_t Machine::run(const instr * program, + const byte * data, + slotref * & map) + +{ + assert(program != 0); + + // Declare virtual machine registers + const instr * ip = program-1; + const byte * dp = data; + stack_t * sp = _stack + Machine::STACK_GUARD, + * const sb = sp; + regbank reg = {*map, map, _map, _map.begin()+_map.context(), ip, _map.dir(), 0, _status}; + + // Run the program + while ((reinterpret_cast(*++ip))(dp, sp, sb, reg)) {} + const stack_t ret = sp == _stack+STACK_GUARD+1 ? *sp-- : 0; + + check_final_stack(sp); + map = reg.map; + *map = reg.is; + return ret; +} + +// Pull in the opcode table +namespace { +#include "inc/opcode_table.h" +} + +const opcode_t * Machine::getOpcodeTable() throw() +{ + return opcode_table; +} diff --git a/source/libs/graphite2/graphite2-src/src/direct_machine.cpp b/source/libs/graphite2/graphite2-src/src/direct_machine.cpp new file mode 100644 index 000000000..e65452236 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/direct_machine.cpp @@ -0,0 +1,120 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +// This direct threaded interpreter implmentation for machine.h +// Author: Tim Eves + +// Build either this interpreter or the call_machine implementation. +// The direct threaded interpreter is relies upon a gcc feature called +// labels-as-values so is only portable to compilers that support the +// extension (gcc only as far as I know) however it should build on any +// architecture gcc supports. +// This is twice as fast as the call threaded model and is likely faster on +// inorder processors with short pipelines and little branch prediction such +// as the ARM and possibly Atom chips. + + +#include +#include +#include "inc/Machine.h" +#include "inc/Segment.h" +#include "inc/Slot.h" +#include "inc/Rule.h" + +#define STARTOP(name) name: { +#define ENDOP }; goto *((sp - sb)/Machine::STACK_MAX ? &&end : *++ip); +#define EXIT(status) { push(status); goto end; } + +#define do_(name) &&name + + +using namespace graphite2; +using namespace vm; + +namespace { + +const void * direct_run(const bool get_table_mode, + const instr * program, + const byte * data, + Machine::stack_t * stack, + slotref * & __map, + uint8 _dir, + Machine::status_t & status, + SlotMap * __smap=0) +{ + // We need to define and return to opcode table from within this function + // other inorder to take the addresses of the instruction bodies. + #include "inc/opcode_table.h" + if (get_table_mode) + return opcode_table; + + // Declare virtual machine registers + const instr * ip = program; + const byte * dp = data; + Machine::stack_t * sp = stack + Machine::STACK_GUARD, + * const sb = sp; + SlotMap & smap = *__smap; + Segment & seg = smap.segment; + slotref is = *__map, + * map = __map, + * const mapb = smap.begin()+smap.context(); + uint8 dir = _dir; + int8 flags = 0; + + // start the program + goto **ip; + + // Pull in the opcode definitions + #include "inc/opcodes.h" + + end: + __map = map; + *__map = is; + return sp; +} + +} + +const opcode_t * Machine::getOpcodeTable() throw() +{ + slotref * dummy; + Machine::status_t dumstat = Machine::finished; + return static_cast(direct_run(true, 0, 0, 0, dummy, 0, dumstat)); +} + + +Machine::stack_t Machine::run(const instr * program, + const byte * data, + slotref * & is) +{ + assert(program != 0); + + const stack_t *sp = static_cast( + direct_run(false, program, data, _stack, is, _map.dir(), _status, &_map)); + const stack_t ret = sp == _stack+STACK_GUARD+1 ? *sp-- : 0; + check_final_stack(sp); + return ret; +} diff --git a/source/libs/graphite2/graphite2-src/src/files.mk b/source/libs/graphite2/graphite2-src/src/files.mk new file mode 100644 index 000000000..15ebb2ef0 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/files.mk @@ -0,0 +1,116 @@ +# GRAPHITE2 LICENSING +# +# Copyright 2011, SIL International +# All rights reserved. +# +# This library is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published +# by the Free Software Foundation; either version 2.1 of License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should also have received a copy of the GNU Lesser General Public +# License along with this library in the file named "LICENSE". +# If not, write to the Free Software Foundation, 51 Franklin Street, +# Suite 500, Boston, MA 02110-1335, USA or visit their web page on the +# internet at http://www.fsf.org/licenses/lgpl.html. +# +# Alternatively, the contents of this file may be used under the terms of the +# Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +# License, as published by the Free Software Foundation, either version 2 +# of the License or (at your option) any later version. + +# Makefile helper file for those wanting to build Graphite2 using make +# The including makefile should set the following variables +# _NS Prefix to all variables this file creates (namespace) +# $(_NS)_MACHINE Set to direct or call. Set to direct if using gcc else +# set to call +# $(_NS)_BASE path to root of graphite2 project +# +# Returns: +# $(_NS)_SOURCES List of source files (with .cpp extension) +# $(_NS)_PRIVATE_HEADERS List of private header files (with .h extension) +# $(_NS)_PUBLIC_HEADERS List of public header files (with .h extension) + + +$(_NS)_SOURCES = \ + $($(_NS)_BASE)/src/$($(_NS)_MACHINE)_machine.cpp \ + $($(_NS)_BASE)/src/gr_char_info.cpp \ + $($(_NS)_BASE)/src/gr_face.cpp \ + $($(_NS)_BASE)/src/gr_features.cpp \ + $($(_NS)_BASE)/src/gr_font.cpp \ + $($(_NS)_BASE)/src/gr_logging.cpp \ + $($(_NS)_BASE)/src/gr_segment.cpp \ + $($(_NS)_BASE)/src/gr_slot.cpp \ + $($(_NS)_BASE)/src/json.cpp \ + $($(_NS)_BASE)/src/CachedFace.cpp \ + $($(_NS)_BASE)/src/CmapCache.cpp \ + $($(_NS)_BASE)/src/Code.cpp \ + $($(_NS)_BASE)/src/Collider.cpp \ + $($(_NS)_BASE)/src/Decompressor.cpp \ + $($(_NS)_BASE)/src/Face.cpp \ + $($(_NS)_BASE)/src/FeatureMap.cpp \ + $($(_NS)_BASE)/src/FileFace.cpp \ + $($(_NS)_BASE)/src/Font.cpp \ + $($(_NS)_BASE)/src/GlyphCache.cpp \ + $($(_NS)_BASE)/src/GlyphFace.cpp \ + $($(_NS)_BASE)/src/Intervals.cpp \ + $($(_NS)_BASE)/src/Justifier.cpp \ + $($(_NS)_BASE)/src/NameTable.cpp \ + $($(_NS)_BASE)/src/Pass.cpp \ + $($(_NS)_BASE)/src/Position.cpp \ + $($(_NS)_BASE)/src/Segment.cpp \ + $($(_NS)_BASE)/src/Silf.cpp \ + $($(_NS)_BASE)/src/Slot.cpp \ + $($(_NS)_BASE)/src/Sparse.cpp \ + $($(_NS)_BASE)/src/TtfUtil.cpp \ + $($(_NS)_BASE)/src/UtfCodec.cpp + +$(_NS)_PRIVATE_HEADERS = \ + $($(_NS)_BASE)/src/inc/bits.h \ + $($(_NS)_BASE)/src/inc/debug.h \ + $($(_NS)_BASE)/src/inc/json.h \ + $($(_NS)_BASE)/src/inc/CachedFace.h \ + $($(_NS)_BASE)/src/inc/CharInfo.h \ + $($(_NS)_BASE)/src/inc/CmapCache.h \ + $($(_NS)_BASE)/src/inc/Code.h \ + $($(_NS)_BASE)/src/inc/Collider.h \ + $($(_NS)_BASE)/src/inc/Compression.h \ + $($(_NS)_BASE)/src/inc/Decompressor.h \ + $($(_NS)_BASE)/src/inc/Endian.h \ + $($(_NS)_BASE)/src/inc/Error.h \ + $($(_NS)_BASE)/src/inc/Face.h \ + $($(_NS)_BASE)/src/inc/FeatureMap.h \ + $($(_NS)_BASE)/src/inc/FeatureVal.h \ + $($(_NS)_BASE)/src/inc/FileFace.h \ + $($(_NS)_BASE)/src/inc/Font.h \ + $($(_NS)_BASE)/src/inc/GlyphCache.h \ + $($(_NS)_BASE)/src/inc/GlyphFace.h \ + $($(_NS)_BASE)/src/inc/Intervals.h \ + $($(_NS)_BASE)/src/inc/List.h \ + $($(_NS)_BASE)/src/inc/locale2lcid.h \ + $($(_NS)_BASE)/src/inc/Machine.h \ + $($(_NS)_BASE)/src/inc/Main.h \ + $($(_NS)_BASE)/src/inc/NameTable.h \ + $($(_NS)_BASE)/src/inc/opcode_table.h \ + $($(_NS)_BASE)/src/inc/opcodes.h \ + $($(_NS)_BASE)/src/inc/Pass.h \ + $($(_NS)_BASE)/src/inc/Position.h \ + $($(_NS)_BASE)/src/inc/Rule.h \ + $($(_NS)_BASE)/src/inc/Segment.h \ + $($(_NS)_BASE)/src/inc/Silf.h \ + $($(_NS)_BASE)/src/inc/Slot.h \ + $($(_NS)_BASE)/src/inc/Sparse.h \ + $($(_NS)_BASE)/src/inc/TtfTypes.h \ + $($(_NS)_BASE)/src/inc/TtfUtil.h \ + $($(_NS)_BASE)/src/inc/UtfCodec.h + +$(_NS)_PUBLIC_HEADERS = \ + $($(_NS)_BASE)/include/graphite2/Font.h \ + $($(_NS)_BASE)/include/graphite2/Log.h \ + $($(_NS)_BASE)/include/graphite2/Segment.h \ + $($(_NS)_BASE)/include/graphite2/Types.h diff --git a/source/libs/graphite2/graphite2-src/src/gr_char_info.cpp b/source/libs/graphite2/graphite2-src/src/gr_char_info.cpp new file mode 100644 index 000000000..612f9ba69 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/gr_char_info.cpp @@ -0,0 +1,65 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include +#include "graphite2/Segment.h" +#include "inc/CharInfo.h" + +extern "C" +{ + +unsigned int gr_cinfo_unicode_char(const gr_char_info* p/*not NULL*/) +{ + assert(p); + return p->unicodeChar(); +} + + +int gr_cinfo_break_weight(const gr_char_info* p/*not NULL*/) +{ + assert(p); + return p->breakWeight(); +} + +int gr_cinfo_after(const gr_char_info *p/*not NULL*/) +{ + assert(p); + return p->after(); +} + +int gr_cinfo_before(const gr_char_info *p/*not NULL*/) +{ + assert(p); + return p->before(); +} + +size_t gr_cinfo_base(const gr_char_info *p/*not NULL*/) +{ + assert(p); + return p->base(); +} + +} // extern "C" diff --git a/source/libs/graphite2/graphite2-src/src/gr_face.cpp b/source/libs/graphite2/graphite2-src/src/gr_face.cpp new file mode 100644 index 000000000..712aa115f --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/gr_face.cpp @@ -0,0 +1,256 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include "graphite2/Font.h" +#include "inc/Face.h" +#include "inc/FileFace.h" +#include "inc/GlyphCache.h" +#include "inc/CmapCache.h" +#include "inc/Silf.h" +#include "inc/json.h" + +using namespace graphite2; + +#if !defined GRAPHITE2_NTRACING +extern json *global_log; +#endif + +namespace +{ + bool load_face(Face & face, unsigned int options) + { +#ifdef GRAPHITE2_TELEMETRY + telemetry::category _misc_cat(face.tele.misc); +#endif + Face::Table silf(face, Tag::Silf, 0x00050000); + if (!silf) + return false; + + if (!face.readGlyphs(options)) + return false; + + if (silf) + { + if (!face.readFeatures() || !face.readGraphite(silf)) + { +#if !defined GRAPHITE2_NTRACING + if (global_log) + { + *global_log << json::object + << "type" << "fontload" + << "failure" << face.error() + << "context" << face.error_context() + << json::close; + } +#endif + return false; + } + else + return true; + } + else + return false; + } + + inline + uint32 zeropad(const uint32 x) + { + if (x == 0x20202020) return 0; + if ((x & 0x00FFFFFF) == 0x00202020) return x & 0xFF000000; + if ((x & 0x0000FFFF) == 0x00002020) return x & 0xFFFF0000; + if ((x & 0x000000FF) == 0x00000020) return x & 0xFFFFFF00; + return x; + } +} + +extern "C" { + +gr_face* gr_make_face_with_ops(const void* appFaceHandle/*non-NULL*/, const gr_face_ops *ops, unsigned int faceOptions) + //the appFaceHandle must stay alive all the time when the gr_face is alive. When finished with the gr_face, call destroy_face +{ + if (ops == 0) return 0; + + Face *res = new Face(appFaceHandle, *ops); + if (res && load_face(*res, faceOptions)) + return static_cast(res); + + delete res; + return 0; +} + +gr_face* gr_make_face(const void* appFaceHandle/*non-NULL*/, gr_get_table_fn tablefn, unsigned int faceOptions) +{ + const gr_face_ops ops = {sizeof(gr_face_ops), tablefn, NULL}; + return gr_make_face_with_ops(appFaceHandle, &ops, faceOptions); +} + + +gr_face* gr_make_face_with_seg_cache_and_ops(const void* appFaceHandle/*non-NULL*/, const gr_face_ops *ops, unsigned int , unsigned int faceOptions) +{ + return gr_make_face_with_ops(appFaceHandle, ops, faceOptions); +} + +gr_face* gr_make_face_with_seg_cache(const void* appFaceHandle/*non-NULL*/, gr_get_table_fn tablefn, unsigned int, unsigned int faceOptions) +{ + const gr_face_ops ops = {sizeof(gr_face_ops), tablefn, NULL}; + return gr_make_face_with_ops(appFaceHandle, &ops, faceOptions); +} + +gr_uint32 gr_str_to_tag(const char *str) +{ + uint32 res = 0; + switch(max(strlen(str),size_t(4))) + { + case 4: res |= str[3]; GR_FALLTHROUGH; + case 3: res |= str[2] << 8; GR_FALLTHROUGH; + case 2: res |= str[1] << 16; GR_FALLTHROUGH; + case 1: res |= str[0] << 24; GR_FALLTHROUGH; + default: break; + } + return res; +} + +void gr_tag_to_str(gr_uint32 tag, char *str) +{ + if (!str) return; + + *str++ = char(tag >> 24); + *str++ = char(tag >> 16); + *str++ = char(tag >> 8); + *str++ = char(tag); + *str = '\0'; +} + +gr_feature_val* gr_face_featureval_for_lang(const gr_face* pFace, gr_uint32 langname/*0 means clone default*/) //clones the features. if none for language, clones the default +{ + assert(pFace); + langname = zeropad(langname); + return static_cast(pFace->theSill().cloneFeatures(langname)); +} + + +const gr_feature_ref* gr_face_find_fref(const gr_face* pFace, gr_uint32 featId) //When finished with the FeatureRef, call destroy_FeatureRef +{ + assert(pFace); + featId = zeropad(featId); + const FeatureRef* pRef = pFace->featureById(featId); + return static_cast(pRef); +} + +unsigned short gr_face_n_fref(const gr_face* pFace) +{ + assert(pFace); + return pFace->numFeatures(); +} + +const gr_feature_ref* gr_face_fref(const gr_face* pFace, gr_uint16 i) //When finished with the FeatureRef, call destroy_FeatureRef +{ + assert(pFace); + const FeatureRef* pRef = pFace->feature(i); + return static_cast(pRef); +} + +unsigned short gr_face_n_languages(const gr_face* pFace) +{ + assert(pFace); + return pFace->theSill().numLanguages(); +} + +gr_uint32 gr_face_lang_by_index(const gr_face* pFace, gr_uint16 i) +{ + assert(pFace); + return pFace->theSill().getLangName(i); +} + + +void gr_face_destroy(gr_face *face) +{ + delete static_cast(face); +} + + +gr_uint16 gr_face_name_lang_for_locale(gr_face *face, const char * locale) +{ + if (face) + { + return face->languageForLocale(locale); + } + return 0; +} + +unsigned short gr_face_n_glyphs(const gr_face* pFace) +{ + return pFace->glyphs().numGlyphs(); +} + +const gr_faceinfo *gr_face_info(const gr_face *pFace, gr_uint32 script) +{ + if (!pFace) return 0; + const Silf *silf = pFace->chooseSilf(script); + if (silf) return silf->silfInfo(); + return 0; +} + +int gr_face_is_char_supported(const gr_face* pFace, gr_uint32 usv, gr_uint32 script) +{ + const Cmap & cmap = pFace->cmap(); + gr_uint16 gid = cmap[usv]; + if (!gid) + { + const Silf * silf = pFace->chooseSilf(script); + gid = silf->findPseudo(usv); + } + return (gid != 0); +} + +#ifndef GRAPHITE2_NFILEFACE +gr_face* gr_make_file_face(const char *filename, unsigned int faceOptions) +{ + FileFace* pFileFace = new FileFace(filename); + if (*pFileFace) + { + gr_face* pRes = gr_make_face_with_ops(pFileFace, &FileFace::ops, faceOptions); + if (pRes) + { + pRes->takeFileFace(pFileFace); //takes ownership + return pRes; + } + } + + //error when loading + + delete pFileFace; + return NULL; +} + +gr_face* gr_make_file_face_with_seg_cache(const char* filename, unsigned int, unsigned int faceOptions) //returns NULL on failure. //TBD better error handling + //when finished with, call destroy_face +{ + return gr_make_file_face(filename, faceOptions); +} +#endif //!GRAPHITE2_NFILEFACE + +} // extern "C" diff --git a/source/libs/graphite2/graphite2-src/src/gr_features.cpp b/source/libs/graphite2/graphite2-src/src/gr_features.cpp new file mode 100644 index 000000000..a560e053f --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/gr_features.cpp @@ -0,0 +1,138 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include "graphite2/Font.h" +#include "inc/Face.h" +#include "inc/FeatureMap.h" +#include "inc/FeatureVal.h" +#include "inc/NameTable.h" + +using namespace graphite2; + +extern "C" { + + +gr_uint16 gr_fref_feature_value(const gr_feature_ref* pfeatureref, const gr_feature_val* feats) //returns 0 if either pointer is NULL +{ + if (!pfeatureref || !feats) return 0; + + return pfeatureref->getFeatureVal(*feats); +} + + +int gr_fref_set_feature_value(const gr_feature_ref* pfeatureref, gr_uint16 val, gr_feature_val* pDest) +{ + if (!pfeatureref || !pDest) return 0; + + return pfeatureref->applyValToFeature(val, *pDest); +} + + +gr_uint32 gr_fref_id(const gr_feature_ref* pfeatureref) //returns 0 if pointer is NULL +{ + if (!pfeatureref) + return 0; + + return pfeatureref->getId(); +} + + +gr_uint16 gr_fref_n_values(const gr_feature_ref* pfeatureref) +{ + if(!pfeatureref) + return 0; + return pfeatureref->getNumSettings(); +} + + +gr_int16 gr_fref_value(const gr_feature_ref* pfeatureref, gr_uint16 settingno) +{ + if(!pfeatureref || (settingno >= pfeatureref->getNumSettings())) + { + return 0; + } + return pfeatureref->getSettingValue(settingno); +} + + +void* gr_fref_label(const gr_feature_ref* pfeatureref, gr_uint16 *langId, gr_encform utf, gr_uint32 *length) +{ + if(!pfeatureref) + { + langId = 0; + length = 0; + return NULL; + } + uint16 label = pfeatureref->getNameId(); + NameTable * names = pfeatureref->getFace().nameTable(); + if (!names) + { + langId = 0; + length = 0; + return NULL; + } + return names->getName(*langId, label, utf, *length); +} + + +void* gr_fref_value_label(const gr_feature_ref*pfeatureref, gr_uint16 setting, + gr_uint16 *langId, gr_encform utf, gr_uint32 *length) +{ + if(!pfeatureref || (setting >= pfeatureref->getNumSettings())) + { + langId = 0; + length = 0; + return NULL; + } + uint16 label = pfeatureref->getSettingName(setting); + NameTable * names = pfeatureref->getFace().nameTable(); + if (!names) + { + langId = 0; + length = 0; + return NULL; + } + return names->getName(*langId, label, utf, *length); +} + + +void gr_label_destroy(void * label) +{ + free(label); +} + +gr_feature_val* gr_featureval_clone(const gr_feature_val* pfeatures/*may be NULL*/) +{ //When finished with the Features, call features_destroy + return static_cast(pfeatures ? new Features(*pfeatures) : new Features); +} + +void gr_featureval_destroy(gr_feature_val *p) +{ + delete static_cast(p); +} + + +} // extern "C" diff --git a/source/libs/graphite2/graphite2-src/src/gr_font.cpp b/source/libs/graphite2/graphite2-src/src/gr_font.cpp new file mode 100644 index 000000000..724cc83c1 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/gr_font.cpp @@ -0,0 +1,74 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include "graphite2/Font.h" +#include "inc/Font.h" + + +using namespace graphite2; + +extern "C" { + +void gr_engine_version(int *nMajor, int *nMinor, int *nBugFix) +{ + if (nMajor) *nMajor = GR2_VERSION_MAJOR; + if (nMinor) *nMinor = GR2_VERSION_MINOR; + if (nBugFix) *nBugFix = GR2_VERSION_BUGFIX; +} + +gr_font* gr_make_font(float ppm/*pixels per em*/, const gr_face *face) +{ + return gr_make_font_with_advance_fn(ppm, 0, 0, face); +} + + +gr_font* gr_make_font_with_ops(float ppm/*pixels per em*/, const void* appFontHandle/*non-NULL*/, const gr_font_ops * font_ops, const gr_face * face/*needed for scaling*/) +{ //the appFontHandle must stay alive all the time when the gr_font is alive. When finished with the gr_font, call destroy_gr_font + if (face == 0 || ppm <= 0) return 0; + + Font * const res = new Font(ppm, *face, appFontHandle, font_ops); + if (*res) + return static_cast(res); + else + { + delete res; + return 0; + } +} + +gr_font* gr_make_font_with_advance_fn(float ppm/*pixels per em*/, const void* appFontHandle/*non-NULL*/, gr_advance_fn getAdvance, const gr_face * face/*needed for scaling*/) +{ + const gr_font_ops ops = {sizeof(gr_font_ops), getAdvance, NULL}; + return gr_make_font_with_ops(ppm, appFontHandle, &ops, face); +} + +void gr_font_destroy(gr_font *font) +{ + delete static_cast(font); +} + + +} // extern "C" diff --git a/source/libs/graphite2/graphite2-src/src/gr_logging.cpp b/source/libs/graphite2/graphite2-src/src/gr_logging.cpp new file mode 100644 index 000000000..8f1e675e6 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/gr_logging.cpp @@ -0,0 +1,267 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include + +#include "graphite2/Log.h" +#include "inc/debug.h" +#include "inc/CharInfo.h" +#include "inc/Slot.h" +#include "inc/Segment.h" +#include "inc/json.h" +#include "inc/Collider.h" + +#if defined _WIN32 +#include "windows.h" +#endif + +using namespace graphite2; + +#if !defined GRAPHITE2_NTRACING +json *global_log = 0; +#endif + +extern "C" { + +bool gr_start_logging(GR_MAYBE_UNUSED gr_face * face, const char *log_path) +{ + if (!log_path) return false; + +#if !defined GRAPHITE2_NTRACING + gr_stop_logging(face); +#if defined _WIN32 + int n = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, log_path, -1, 0, 0); + if (n == 0 || n > MAX_PATH - 12) return false; + + LPWSTR wlog_path = gralloc(n); + if (!wlog_path) return false; + FILE *log = 0; + if (wlog_path && MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, log_path, -1, wlog_path, n)) + log = _wfopen(wlog_path, L"wt"); + + free(wlog_path); +#else // _WIN32 + FILE *log = fopen(log_path, "wt"); +#endif // _WIN32 + if (!log) return false; + + if (face) + { + face->setLogger(log); + if (!face->logger()) return false; + + *face->logger() << json::array; +#ifdef GRAPHITE2_TELEMETRY + *face->logger() << face->tele; +#endif + } + else + { + global_log = new json(log); + *global_log << json::array; + } + + return true; +#else // GRAPHITE2_NTRACING + return false; +#endif // GRAPHITE2_NTRACING +} + +bool graphite_start_logging(FILE * /* log */, GrLogMask /* mask */) +{ +//#if !defined GRAPHITE2_NTRACING +// graphite_stop_logging(); +// +// if (!log) return false; +// +// dbgout = new json(log); +// if (!dbgout) return false; +// +// *dbgout << json::array; +// return true; +//#else + return false; +//#endif +} + +void gr_stop_logging(GR_MAYBE_UNUSED gr_face * face) +{ +#if !defined GRAPHITE2_NTRACING + if (face && face->logger()) + { + FILE * log = face->logger()->stream(); + face->setLogger(0); + fclose(log); + } + else if (!face && global_log) + { + FILE * log = global_log->stream(); + delete global_log; + global_log = 0; + fclose(log); + } +#endif +} + +void graphite_stop_logging() +{ +// if (dbgout) delete dbgout; +// dbgout = 0; +} + +} // extern "C" + +#ifdef GRAPHITE2_TELEMETRY +size_t * graphite2::telemetry::_category = 0UL; +#endif + +#if !defined GRAPHITE2_NTRACING + +#ifdef GRAPHITE2_TELEMETRY + +json & graphite2::operator << (json & j, const telemetry & t) throw() +{ + j << json::object + << "type" << "telemetry" + << "silf" << t.silf + << "states" << t.states + << "starts" << t.starts + << "transitions" << t.transitions + << "glyphs" << t.glyph + << "code" << t.code + << "misc" << t.misc + << "total" << (t.silf + t.states + t.starts + t.transitions + t.glyph + t.code + t.misc) + << json::close; + return j; +} +#else +json & graphite2::operator << (json & j, const telemetry &) throw() +{ + return j; +} +#endif + + +json & graphite2::operator << (json & j, const CharInfo & ci) throw() +{ + return j << json::object + << "offset" << ci.base() + << "unicode" << ci.unicodeChar() + << "break" << ci.breakWeight() + << "flags" << ci.flags() + << "slot" << json::flat << json::object + << "before" << ci.before() + << "after" << ci.after() + << json::close + << json::close; +} + + +json & graphite2::operator << (json & j, const dslot & ds) throw() +{ + assert(ds.first); + assert(ds.second); + const Segment & seg = *ds.first; + const Slot & s = *ds.second; + const SlotCollision *cslot = seg.collisionInfo(ds.second); + + j << json::object + << "id" << objectid(ds) + << "gid" << s.gid() + << "charinfo" << json::flat << json::object + << "original" << s.original() + << "before" << s.before() + << "after" << s.after() + << json::close + << "origin" << s.origin() + << "shift" << Position(float(s.getAttr(0, gr_slatShiftX, 0)), + float(s.getAttr(0, gr_slatShiftY, 0))) + << "advance" << s.advancePos() + << "insert" << s.isInsertBefore() + << "break" << s.getAttr(&seg, gr_slatBreak, 0); + if (s.just() > 0) + j << "justification" << s.just(); + if (s.getBidiLevel() > 0) + j << "bidi" << s.getBidiLevel(); + if (!s.isBase()) + j << "parent" << json::flat << json::object + << "id" << objectid(dslot(&seg, s.attachedTo())) + << "level" << s.getAttr(0, gr_slatAttLevel, 0) + << "offset" << s.attachOffset() + << json::close; + j << "user" << json::flat << json::array; + for (int n = 0; n!= seg.numAttrs(); ++n) + j << s.userAttrs()[n]; + j << json::close; + if (s.firstChild()) + { + j << "children" << json::flat << json::array; + for (const Slot *c = s.firstChild(); c; c = c->nextSibling()) + j << objectid(dslot(&seg, c)); + j << json::close; + } + if (cslot) + { + // Note: the reason for using Positions to lump together related attributes is to make the + // JSON output slightly more compact. + j << "collision" << json::flat << json::object +// << "shift" << cslot->shift() -- not used pass level, only within the collision routine itself + << "offset" << cslot->offset() + << "limit" << cslot->limit() + << "flags" << cslot->flags() + << "margin" << Position(cslot->margin(), cslot->marginWt()) + << "exclude" << cslot->exclGlyph() + << "excludeoffset" << cslot->exclOffset(); + if (cslot->seqOrder() != 0) + { + j << "seqclass" << Position(cslot->seqClass(), cslot->seqProxClass()) + << "seqorder" << cslot->seqOrder() + << "seqabove" << Position(cslot->seqAboveXoff(), cslot->seqAboveWt()) + << "seqbelow" << Position(cslot->seqBelowXlim(), cslot->seqBelowWt()) + << "seqvalign" << Position(cslot->seqValignHt(), cslot->seqValignWt()); + } + j << json::close; + } + return j << json::close; +} + + +graphite2::objectid::objectid(const dslot & ds) throw() +{ + const Slot * const p = ds.second; + uint32 s = uint32(reinterpret_cast(p)); + sprintf(name, "%.4x-%.2x-%.4hx", uint16(s >> 16), uint16(p ? p->userAttrs()[ds.first->silf()->numUser()] : 0), uint16(s)); + name[sizeof name-1] = 0; +} + +graphite2::objectid::objectid(const Segment * const p) throw() +{ + uint32 s = uint32(reinterpret_cast(p)); + sprintf(name, "%.4x-%.2x-%.4hx", uint16(s >> 16), 0, uint16(s)); + name[sizeof name-1] = 0; +} + +#endif diff --git a/source/libs/graphite2/graphite2-src/src/gr_segment.cpp b/source/libs/graphite2/graphite2-src/src/gr_segment.cpp new file mode 100644 index 000000000..7a27e9c56 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/gr_segment.cpp @@ -0,0 +1,175 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include "graphite2/Segment.h" +#include "inc/UtfCodec.h" +#include "inc/Segment.h" + +using namespace graphite2; + +namespace +{ + + gr_segment* makeAndInitialize(const Font *font, const Face *face, uint32 script, const Features* pFeats/*must not be NULL*/, gr_encform enc, const void* pStart, size_t nChars, int dir) + { + if (script == 0x20202020) script = 0; + else if ((script & 0x00FFFFFF) == 0x00202020) script = script & 0xFF000000; + else if ((script & 0x0000FFFF) == 0x00002020) script = script & 0xFFFF0000; + else if ((script & 0x000000FF) == 0x00000020) script = script & 0xFFFFFF00; + // if (!font) return NULL; + Segment* pRes=new Segment(nChars, face, script, dir); + + + if (!pRes->read_text(face, pFeats, enc, pStart, nChars) || !pRes->runGraphite()) + { + delete pRes; + return NULL; + } + pRes->finalise(font, true); + + return static_cast(pRes); + } + + template + inline size_t count_unicode_chars(utf_iter first, const utf_iter last, const void **error) + { + size_t n_chars = 0; + uint32 usv = 0; + + if (last) + { + if (!first.validate(last)) + { + if (error) *error = last - 1; + return 0; + } + for (;first != last; ++first, ++n_chars) + if ((usv = *first) == 0 || first.error()) break; + } + else + { + while ((usv = *first) != 0 && !first.error()) + { + ++first; + ++n_chars; + } + } + + if (error) *error = first.error() ? first : 0; + return n_chars; + } +} + + +extern "C" { + +size_t gr_count_unicode_characters(gr_encform enc, const void* buffer_begin, const void* buffer_end/*don't go on or past end, If NULL then ignored*/, const void** pError) //Also stops on nul. Any nul is not in the count +{ + assert(buffer_begin); + + switch (enc) + { + case gr_utf8: return count_unicode_chars(buffer_begin, buffer_end, pError); break; + case gr_utf16: return count_unicode_chars(buffer_begin, buffer_end, pError); break; + case gr_utf32: return count_unicode_chars(buffer_begin, buffer_end, pError); break; + default: return 0; + } +} + + +gr_segment* gr_make_seg(const gr_font *font, const gr_face *face, gr_uint32 script, const gr_feature_val* pFeats, gr_encform enc, const void* pStart, size_t nChars, int dir) +{ + if (!face) return nullptr; + + const gr_feature_val * tmp_feats = 0; + if (pFeats == 0) + pFeats = tmp_feats = static_cast(face->theSill().cloneFeatures(0)); + gr_segment * seg = makeAndInitialize(font, face, script, pFeats, enc, pStart, nChars, dir); + delete static_cast(tmp_feats); + + return seg; +} + + +void gr_seg_destroy(gr_segment* p) +{ + delete static_cast(p); +} + + +float gr_seg_advance_X(const gr_segment* pSeg/*not NULL*/) +{ + assert(pSeg); + return pSeg->advance().x; +} + + +float gr_seg_advance_Y(const gr_segment* pSeg/*not NULL*/) +{ + assert(pSeg); + return pSeg->advance().y; +} + + +unsigned int gr_seg_n_cinfo(const gr_segment* pSeg/*not NULL*/) +{ + assert(pSeg); + return static_cast(pSeg->charInfoCount()); +} + + +const gr_char_info* gr_seg_cinfo(const gr_segment* pSeg/*not NULL*/, unsigned int index/*must be (pSeg->charinfo(index)); +} + +unsigned int gr_seg_n_slots(const gr_segment* pSeg/*not NULL*/) +{ + assert(pSeg); + return static_cast(pSeg->slotCount()); +} + +const gr_slot* gr_seg_first_slot(gr_segment* pSeg/*not NULL*/) +{ + assert(pSeg); + return static_cast(pSeg->first()); +} + +const gr_slot* gr_seg_last_slot(gr_segment* pSeg/*not NULL*/) +{ + assert(pSeg); + return static_cast(pSeg->last()); +} + +float gr_seg_justify(gr_segment* pSeg/*not NULL*/, const gr_slot* pSlot/*not NULL*/, const gr_font *pFont, double width, enum gr_justFlags flags, const gr_slot *pFirst, const gr_slot *pLast) +{ + assert(pSeg); + assert(pSlot); + return pSeg->justify(const_cast(pSlot), pFont, float(width), justFlags(flags), const_cast(pFirst), const_cast(pLast)); +} + +} // extern "C" diff --git a/source/libs/graphite2/graphite2-src/src/gr_slot.cpp b/source/libs/graphite2/graphite2-src/src/gr_slot.cpp new file mode 100644 index 000000000..21a00fdcd --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/gr_slot.cpp @@ -0,0 +1,172 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#include "graphite2/Segment.h" +#include "inc/Segment.h" +#include "inc/Slot.h" +#include "inc/Font.h" + + +extern "C" { + + +const gr_slot* gr_slot_next_in_segment(const gr_slot* p/*not NULL*/) +{ + assert(p); + return static_cast(p->next()); +} + +const gr_slot* gr_slot_prev_in_segment(const gr_slot* p/*not NULL*/) +{ + assert(p); + return static_cast(p->prev()); +} + +const gr_slot* gr_slot_attached_to(const gr_slot* p/*not NULL*/) //returns NULL iff base. If called repeatedly on result, will get to a base +{ + assert(p); + return static_cast(p->attachedTo()); +} + + +const gr_slot* gr_slot_first_attachment(const gr_slot* p/*not NULL*/) //returns NULL iff no attachments. +{ //if slot_first_attachment(p) is not NULL, then slot_attached_to(slot_first_attachment(p))==p. + assert(p); + return static_cast(p->firstChild()); +} + + +const gr_slot* gr_slot_next_sibling_attachment(const gr_slot* p/*not NULL*/) //returns NULL iff no more attachments. +{ //if slot_next_sibling_attachment(p) is not NULL, then slot_attached_to(slot_next_sibling_attachment(p))==slot_attached_to(p). + assert(p); + return static_cast(p->nextSibling()); +} + + +unsigned short gr_slot_gid(const gr_slot* p/*not NULL*/) +{ + assert(p); + return p->glyph(); +} + + +float gr_slot_origin_X(const gr_slot* p/*not NULL*/) +{ + assert(p); + return p->origin().x; +} + + +float gr_slot_origin_Y(const gr_slot* p/*not NULL*/) +{ + assert(p); + return p->origin().y; +} + + +float gr_slot_advance_X(const gr_slot* p/*not NULL*/, const gr_face *face, const gr_font *font) +{ + assert(p); + float scale = 1.0; + float res = p->advance(); + if (font) + { + scale = font->scale(); + if (face && font->isHinted()) + res = (res - face->glyphs().glyph(p->gid())->theAdvance().x) * scale + font->advance(p->gid()); + else + res = res * scale; + } + return res; +} + +float gr_slot_advance_Y(const gr_slot *p/*not NULL*/, GR_MAYBE_UNUSED const gr_face *face, const gr_font *font) +{ + assert(p); + float res = p->advancePos().y; + if (font) + return res * font->scale(); + else + return res; +} + +int gr_slot_before(const gr_slot* p/*not NULL*/) +{ + assert(p); + return p->before(); +} + + +int gr_slot_after(const gr_slot* p/*not NULL*/) +{ + assert(p); + return p->after(); +} + +unsigned int gr_slot_index(const gr_slot *p/*not NULL*/) +{ + assert(p); + return p->index(); +} + +int gr_slot_attr(const gr_slot* p/*not NULL*/, const gr_segment* pSeg/*not NULL*/, gr_attrCode index, gr_uint8 subindex) +{ + assert(p); + return p->getAttr(pSeg, index, subindex); +} + + +int gr_slot_can_insert_before(const gr_slot* p/*not NULL*/) +{ + assert(p); + return (p->isInsertBefore())? 1 : 0; +} + + +int gr_slot_original(const gr_slot* p/*not NULL*/) +{ + assert(p); + return p->original(); +} + +void gr_slot_linebreak_before(gr_slot* p/*not NULL*/) +{ + assert(p); + gr_slot *prev = (gr_slot *)p->prev(); + prev->sibling(NULL); + prev->next(NULL); + p->prev(NULL); +} + +#if 0 //what should this be +size_t id(const gr_slot* p/*not NULL*/) +{ + return (size_t)p->id(); +} +#endif + + +} // extern "C" diff --git a/source/libs/graphite2/graphite2-src/src/inc/CharInfo.h b/source/libs/graphite2/graphite2-src/src/inc/CharInfo.h new file mode 100644 index 000000000..01e7e31ac --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/CharInfo.h @@ -0,0 +1,66 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once +#include "inc/Main.h" + + +namespace graphite2 { + +class CharInfo +{ + +public: + CharInfo() : m_char(0), m_before(-1), m_after(-1), m_base(0), m_featureid(0), m_break(0), m_flags(0) {} + void init(int cid) { m_char = cid; } + unsigned int unicodeChar() const { return m_char; } + void feats(int offset) { m_featureid = offset; } + int fid() const { return m_featureid; } + int breakWeight() const { return m_break; } + void breakWeight(int val) { m_break = val; } + int after() const { return m_after; } + void after(int val) { m_after = val; } + int before() const { return m_before; } + void before(int val) { m_before = val; } + size_t base() const { return m_base; } + void base(size_t offset) { m_base = offset; } + void addflags(uint8 val) { m_flags |= val; } + uint8 flags() const { return m_flags; } + + CLASS_NEW_DELETE +private: + int m_char; // Unicode character from character stream + int m_before; // slot index before us, comes before + int m_after; // slot index after us, comes after + size_t m_base; // offset into input string corresponding to this charinfo + uint8 m_featureid; // index into features list in the segment + int8 m_break; // breakweight coming from lb table + uint8 m_flags; // 0,1 segment split. +}; + +} // namespace graphite2 + +struct gr_char_info : public graphite2::CharInfo {}; diff --git a/source/libs/graphite2/graphite2-src/src/inc/CmapCache.h b/source/libs/graphite2/graphite2-src/src/inc/CmapCache.h new file mode 100644 index 000000000..7820c958b --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/CmapCache.h @@ -0,0 +1,82 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once + +#include "inc/Main.h" +#include "inc/Face.h" + +namespace graphite2 { + +class Face; + +class Cmap +{ +public: + + virtual ~Cmap() throw() {} + + virtual uint16 operator [] (const uint32) const throw() { return 0; } + + virtual operator bool () const throw() { return false; } + + CLASS_NEW_DELETE; +}; + +class DirectCmap : public Cmap +{ + DirectCmap(const DirectCmap &); + DirectCmap & operator = (const DirectCmap &); + +public: + DirectCmap(const Face &); + virtual uint16 operator [] (const uint32 usv) const throw(); + virtual operator bool () const throw(); + + CLASS_NEW_DELETE; +private: + const Face::Table _cmap; + const void * _smp, + * _bmp; +}; + +class CachedCmap : public Cmap +{ + CachedCmap(const CachedCmap &); + CachedCmap & operator = (const CachedCmap &); + +public: + CachedCmap(const Face &); + virtual ~CachedCmap() throw(); + virtual uint16 operator [] (const uint32 usv) const throw(); + virtual operator bool () const throw(); + CLASS_NEW_DELETE; +private: + bool m_isBmpOnly; + uint16 ** m_blocks; +}; + +} // namespace graphite2 diff --git a/source/libs/graphite2/graphite2-src/src/inc/Code.h b/source/libs/graphite2/graphite2-src/src/inc/Code.h new file mode 100644 index 000000000..3cee67c81 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/Code.h @@ -0,0 +1,171 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +// This class represents loaded graphite stack machine code. It performs +// basic sanity checks, on the incoming code to prevent more obvious problems +// from crashing graphite. +// Author: Tim Eves + +#pragma once + +#include +#include +#include "inc/Main.h" +#include "inc/Machine.h" + +namespace graphite2 { + +class Silf; +class Face; + +enum passtype { + PASS_TYPE_UNKNOWN = 0, + PASS_TYPE_LINEBREAK, + PASS_TYPE_SUBSTITUTE, + PASS_TYPE_POSITIONING, + PASS_TYPE_JUSTIFICATION +}; + +namespace vm { + +class Machine::Code +{ +public: + enum status_t + { + loaded, + alloc_failed, + invalid_opcode, + unimplemented_opcode_used, + out_of_range_data, + jump_past_end, + arguments_exhausted, + missing_return, + nested_context_item, + underfull_stack + }; + +private: + class decoder; + + instr * _code; + byte * _data; + size_t _data_size, + _instr_count; + byte _max_ref; + mutable status_t _status; + bool _constraint, + _modify, + _delete; + mutable bool _own; + + void release_buffers() throw (); + void failure(const status_t) throw(); + +public: + static size_t estimateCodeDataOut(size_t num_bytecodes, int nRules, int nSlots); + + Code() throw(); + Code(bool is_constraint, const byte * bytecode_begin, const byte * const bytecode_end, + uint8 pre_context, uint16 rule_length, const Silf &, const Face &, + enum passtype pt, byte * * const _out = 0); + Code(const Machine::Code &) throw(); + ~Code() throw(); + + Code & operator=(const Code &rhs) throw(); + operator bool () const throw() { return _code && status() == loaded; } + status_t status() const throw() { return _status; } + bool constraint() const throw() { return _constraint; } + size_t dataSize() const throw() { return _data_size; } + size_t instructionCount() const throw() { return _instr_count; } + bool immutable() const throw() { return !(_delete || _modify); } + bool deletes() const throw() { return _delete; } + size_t maxRef() const throw() { return _max_ref; } + void externalProgramMoved(ptrdiff_t) throw(); + + int32 run(Machine &m, slotref * & map) const; + + CLASS_NEW_DELETE; +}; + +inline +size_t Machine::Code::estimateCodeDataOut(size_t n_bc, int nRules, int nSlots) +{ + // max is: all codes are instructions + 1 for each rule + max tempcopies + // allocate space for separate maximal code and data then merge them later + return (n_bc + nRules + nSlots) * sizeof(instr) + n_bc * sizeof(byte); +} + + +inline Machine::Code::Code() throw() +: _code(0), _data(0), _data_size(0), _instr_count(0), _max_ref(0), + _status(loaded), _constraint(false), _modify(false), _delete(false), + _own(false) +{ +} + +inline Machine::Code::Code(const Machine::Code &obj) throw () + : _code(obj._code), + _data(obj._data), + _data_size(obj._data_size), + _instr_count(obj._instr_count), + _max_ref(obj._max_ref), + _status(obj._status), + _constraint(obj._constraint), + _modify(obj._modify), + _delete(obj._delete), + _own(obj._own) +{ + obj._own = false; +} + +inline Machine::Code & Machine::Code::operator=(const Machine::Code &rhs) throw() { + if (_instr_count > 0) + release_buffers(); + _code = rhs._code; + _data = rhs._data; + _data_size = rhs._data_size; + _instr_count = rhs._instr_count; + _status = rhs._status; + _constraint = rhs._constraint; + _modify = rhs._modify; + _delete = rhs._delete; + _own = rhs._own; + rhs._own = false; + return *this; +} + +inline void Machine::Code::externalProgramMoved(ptrdiff_t dist) throw() +{ + if (_code && !_own) + { + _code += dist / signed(sizeof(instr)); + _data += dist; + } +} + +} // namespace vm +} // namespace graphite2 diff --git a/source/libs/graphite2/graphite2-src/src/inc/Collider.h b/source/libs/graphite2/graphite2-src/src/inc/Collider.h new file mode 100644 index 000000000..71e840050 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/Collider.h @@ -0,0 +1,245 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once + +#include "inc/List.h" +#include "inc/Position.h" +#include "inc/Intervals.h" +#include "inc/debug.h" + +namespace graphite2 { + +class json; +class Slot; +class Segment; + +#define SLOTCOLSETUINTPROP(x, y) uint16 x() const { return _ ##x; } void y (uint16 v) { _ ##x = v; } +#define SLOTCOLSETINTPROP(x, y) int16 x() const { return _ ##x; } void y (int16 v) { _ ##x = v; } +#define SLOTCOLSETPOSITIONPROP(x, y) const Position &x() const { return _ ##x; } void y (const Position &v) { _ ##x = v; } + +// Slot attributes related to collision-fixing +class SlotCollision +{ +public: + enum { + // COLL_TESTONLY = 0, // default - test other glyphs for collision with this one, but don't move this one + COLL_FIX = 1, // fix collisions involving this glyph + COLL_IGNORE = 2, // ignore this glyph altogether + COLL_START = 4, // start of range of possible collisions + COLL_END = 8, // end of range of possible collisions + COLL_KERN = 16, // collisions with this glyph are fixed by adding kerning space after it + COLL_ISCOL = 32, // this glyph has a collision + COLL_KNOWN = 64, // we've figured out what's happening with this glyph + COLL_ISSPACE = 128, // treat this glyph as a space with regard to kerning + COLL_TEMPLOCK = 256, // Lock glyphs that have been given priority positioning + ////COLL_JUMPABLE = 128, // moving glyphs may jump this stationary glyph in any direction - DELETE + ////COLL_OVERLAP = 256, // use maxoverlap to restrict - DELETE + }; + + // Behavior for the collision.order attribute. To GDL this is an enum, to us it's a bitfield, with only 1 bit set + // Allows for easier inversion. + enum { + SEQ_ORDER_LEFTDOWN = 1, + SEQ_ORDER_RIGHTUP = 2, + SEQ_ORDER_NOABOVE = 4, + SEQ_ORDER_NOBELOW = 8, + SEQ_ORDER_NOLEFT = 16, + SEQ_ORDER_NORIGHT = 32 + }; + + SlotCollision(Segment *seg, Slot *slot); + void initFromSlot(Segment *seg, Slot *slot); + + const Rect &limit() const { return _limit; } + void setLimit(const Rect &r) { _limit = r; } + SLOTCOLSETPOSITIONPROP(shift, setShift) + SLOTCOLSETPOSITIONPROP(offset, setOffset) + SLOTCOLSETPOSITIONPROP(exclOffset, setExclOffset) + SLOTCOLSETUINTPROP(margin, setMargin) + SLOTCOLSETUINTPROP(marginWt, setMarginWt) + SLOTCOLSETUINTPROP(flags, setFlags) + SLOTCOLSETUINTPROP(exclGlyph, setExclGlyph) + SLOTCOLSETUINTPROP(seqClass, setSeqClass) + SLOTCOLSETUINTPROP(seqProxClass, setSeqProxClass) + SLOTCOLSETUINTPROP(seqOrder, setSeqOrder) + SLOTCOLSETINTPROP(seqAboveXoff, setSeqAboveXoff) + SLOTCOLSETUINTPROP(seqAboveWt, setSeqAboveWt) + SLOTCOLSETINTPROP(seqBelowXlim, setSeqBelowXlim) + SLOTCOLSETUINTPROP(seqBelowWt, setSeqBelowWt) + SLOTCOLSETUINTPROP(seqValignHt, setSeqValignHt) + SLOTCOLSETUINTPROP(seqValignWt, setSeqValignWt) + + float getKern(int dir) const; + bool ignore() const; + +private: + Rect _limit; + Position _shift; // adjustment within the given pass + Position _offset; // total adjustment for collisions + Position _exclOffset; + uint16 _margin; + uint16 _marginWt; + uint16 _flags; + uint16 _exclGlyph; + uint16 _seqClass; + uint16 _seqProxClass; + uint16 _seqOrder; + int16 _seqAboveXoff; + uint16 _seqAboveWt; + int16 _seqBelowXlim; + uint16 _seqBelowWt; + uint16 _seqValignHt; + uint16 _seqValignWt; + +}; // end of class SlotColllision + +struct BBox; +struct SlantBox; + +class ShiftCollider +{ +public: + typedef std::pair fpair; + typedef Vector vfpairs; + typedef vfpairs::iterator ivfpairs; + + ShiftCollider(json *dbgout); + ~ShiftCollider() throw() { }; + + bool initSlot(Segment *seg, Slot *aSlot, const Rect &constraint, + float margin, float marginMin, const Position &currShift, + const Position &currOffset, int dir, GR_MAYBE_UNUSED json * const dbgout); + bool mergeSlot(Segment *seg, Slot *slot, const SlotCollision *cinfo, const Position &currShift, bool isAfter, + bool sameCluster, bool &hasCol, bool isExclusion, GR_MAYBE_UNUSED json * const dbgout); + Position resolve(Segment *seg, bool &isCol, GR_MAYBE_UNUSED json * const dbgout); + void addBox_slope(bool isx, const Rect &box, const BBox &bb, const SlantBox &sb, const Position &org, float weight, float m, bool minright, int mode); + void removeBox(const Rect &box, const BBox &bb, const SlantBox &sb, const Position &org, int mode); + const Position &origin() const { return _origin; } + +#if !defined GRAPHITE2_NTRACING + void outputJsonDbg(json * const dbgout, Segment *seg, int axis); + void outputJsonDbgStartSlot(json * const dbgout, Segment *seg); + void outputJsonDbgEndSlot(json * const dbgout, Position resultPos, int bestAxis, bool isCol); + void outputJsonDbgOneVector(json * const dbgout, Segment *seg, int axis, float tleft, float bestCost, float bestVal); + void outputJsonDbgRawRanges(json * const dbgout, int axis); + void outputJsonDbgRemovals(json * const dbgout, int axis, Segment *seg); +#endif + + CLASS_NEW_DELETE; + +protected: + Zones _ranges[4]; // possible movements in 4 directions (horizontally, vertically, diagonally); + Slot * _target; // the glyph to fix + Rect _limit; + Position _currShift; + Position _currOffset; + Position _origin; // Base for all relative calculations + float _margin; + float _marginWt; + float _len[4]; + uint16 _seqClass; + uint16 _seqProxClass; + uint16 _seqOrder; + + //bool _scraping[4]; + +}; // end of class ShiftCollider + +inline +ShiftCollider::ShiftCollider(GR_MAYBE_UNUSED json *dbgout) +: _target(0), + _margin(0.0), + _marginWt(0.0), + _seqClass(0), + _seqProxClass(0), + _seqOrder(0) +{ +#if !defined GRAPHITE2_NTRACING + for (int i = 0; i < 4; ++i) + _ranges[i].setdebug(dbgout); +#endif +} + +class KernCollider +{ +public: + KernCollider(json *dbg); + ~KernCollider() throw() { }; + bool initSlot(Segment *seg, Slot *aSlot, const Rect &constraint, float margin, + const Position &currShift, const Position &offsetPrev, int dir, + float ymin, float ymax, json * const dbgout); + bool mergeSlot(Segment *seg, Slot *slot, const Position &currShift, float currSpace, int dir, json * const dbgout); + Position resolve(Segment *seg, Slot *slot, int dir, json * const dbgout); + void shift(const Position &mv, int dir); + + CLASS_NEW_DELETE; + +private: + Slot * _target; // the glyph to fix + Rect _limit; + float _margin; + Position _offsetPrev; // kern from a previous pass + Position _currShift; // NOT USED?? + float _miny; // y-coordinates offset by global slot position + float _maxy; + Vector _edges; // edges of horizontal slices + float _sliceWidth; // width of each slice + float _mingap; + float _xbound; // max or min edge + bool _hit; + +#if !defined GRAPHITE2_NTRACING + // Debugging + Segment * _seg; + Vector _nearEdges; // closest potential collision in each slice + Vector _slotNear; +#endif +}; // end of class KernCollider + + +inline +float sqr(float x) { + return x * x; +} + +inline +KernCollider::KernCollider(GR_MAYBE_UNUSED json *dbg) +: _target(0), + _margin(0.0f), + _miny(-1e38f), + _maxy(1e38f), + _sliceWidth(0.0f), + _mingap(0.0f), + _xbound(0.0), + _hit(false) +{ +#if !defined GRAPHITE2_NTRACING + _seg = 0; +#endif +}; + +}; // end of namespace graphite2 diff --git a/source/libs/graphite2/graphite2-src/src/inc/Compression.h b/source/libs/graphite2/graphite2-src/src/inc/Compression.h new file mode 100644 index 000000000..9fe10e025 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/Compression.h @@ -0,0 +1,104 @@ +/* GRAPHITE2 LICENSING + + Copyright 2015, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ + +#pragma once + +#include +#include +#include + +namespace +{ + +#if defined(_MSC_VER) +typedef unsigned __int8 u8; +typedef unsigned __int16 u16; +typedef unsigned __int32 u32; +typedef unsigned __int64 u64; +#else +#include +typedef uint8_t u8; +typedef uint16_t u16; +typedef uint32_t u32; +typedef uint64_t u64; +#endif + +ptrdiff_t const MINMATCH = 4, + LASTLITERALS = 5, + MINCODA = LASTLITERALS+1, + MINSRCSIZE = 13; + +template +inline +void unaligned_copy(void * d, void const * s) { + ::memcpy(d, s, S); +} + +inline +size_t align(size_t p) { + return (p + sizeof(unsigned long)-1) & ~(sizeof(unsigned long)-1); +} + +inline +u8 * safe_copy(u8 * d, u8 const * s, size_t n) { + while (n--) *d++ = *s++; + return d; +} + +inline +u8 * overrun_copy(u8 * d, u8 const * s, size_t n) { + size_t const WS = sizeof(unsigned long); + u8 const * e = s + n; + do + { + unaligned_copy(d, s); + d += WS; + s += WS; + } + while (s < e); + d-=(s-e); + + return d; +} + + +inline +u8 * fast_copy(u8 * d, u8 const * s, size_t n) { + size_t const WS = sizeof(unsigned long); + size_t wn = n/WS; + while (wn--) + { + unaligned_copy(d, s); + d += WS; + s += WS; + } + n &= WS-1; + return safe_copy(d, s, n); +} + + +} // end of anonymous namespace diff --git a/source/libs/graphite2/graphite2-src/src/inc/Decompressor.h b/source/libs/graphite2/graphite2-src/src/inc/Decompressor.h new file mode 100644 index 000000000..10f21b7af --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/Decompressor.h @@ -0,0 +1,54 @@ +/* GRAPHITE2 LICENSING + + Copyright 2015, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ + +#pragma once + +#include + +namespace lz4 +{ + +// decompress an LZ4 block +// Parameters: +// @in - Input buffer containing an LZ4 block. +// @in_size - Size of the input LZ4 block in bytes. +// @out - Output buffer to hold decompressed results. +// @out_size - The size of the buffer pointed to by @out. +// Invariants: +// @in - This buffer must be at least 1 machine word in length, +// regardless of the actual LZ4 block size. +// @in_size - This must be at least 4 and must also be <= to the +// allocated buffer @in. +// @out - This must be bigger than the input buffer and at least +// 13 bytes. +// @out_size - Must always be big enough to hold the expected size. +// Return: +// -1 - Decompression failed. +// size - Actual number of bytes decompressed. +int decompress(void const *in, size_t in_size, void *out, size_t out_size); + +} // end of namespace shrinker diff --git a/source/libs/graphite2/graphite2-src/src/inc/Endian.h b/source/libs/graphite2/graphite2-src/src/inc/Endian.h new file mode 100644 index 000000000..56ecfd866 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/Endian.h @@ -0,0 +1,111 @@ +/* GRAPHITE2 LICENSING + + Copyright 2011, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ + +/* +Description: + A set of fast template based decoders for decoding values of any C integer + type up to long int size laid out with most significant byte first or least + significant byte first (aka big endian or little endian). These are CPU + byte order agnostic and will function the same regardless of the CPUs native + byte order. + + Being template based means if the either le or be class is not used then + template code of unused functions will not be instantiated by the compiler + and thus shouldn't cause any overhead. +*/ + +#include + +#pragma once + + +class be +{ + template + inline static unsigned long int _peek(const unsigned char * p) { + return _peek(p) << (S/2)*8 | _peek(p+S/2); + } +public: + template + inline static T peek(const void * p) { + return T(_peek(static_cast(p))); + } + + template + inline static T read(const unsigned char * &p) { + const T r = T(_peek(p)); + p += sizeof r; + return r; + } + + template + inline static T swap(const T x) { + return T(_peek(reinterpret_cast(&x))); + } + + template + inline static void skip(const unsigned char * &p, size_t n=1) { + p += sizeof(T)*n; + } +}; + +template<> +inline unsigned long int be::_peek<1>(const unsigned char * p) { return *p; } + + +class le +{ + template + inline static unsigned long int _peek(const unsigned char * p) { + return _peek(p) | _peek(p+S/2) << (S/2)*8; + } +public: + template + inline static T peek(const void * p) { + return T(_peek(static_cast(p))); + } + + template + inline static T read(const unsigned char * &p) { + const T r = T(_peek(p)); + p += sizeof r; + return r; + } + + template + inline static T swap(const T x) { + return T(_peek(reinterpret_cast(&x))); + } + + template + inline static void skip(const unsigned char * &p, size_t n=1) { + p += sizeof(T)*n; + } +}; + +template<> +inline unsigned long int le::_peek<1>(const unsigned char * p) { return *p; } diff --git a/source/libs/graphite2/graphite2-src/src/inc/Error.h b/source/libs/graphite2/graphite2-src/src/inc/Error.h new file mode 100644 index 000000000..2b7ab763a --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/Error.h @@ -0,0 +1,134 @@ +/* GRAPHITE2 LICENSING + + Copyright 2013, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once + +// numbers are explicitly assigned for future proofing + +namespace graphite2 +{ + +class Error +{ +public: + Error() : _e(0) {}; + operator bool() { return (_e != 0); } + int error() { return _e; } + void error(int e) { _e = e; } + bool test(bool pr, int err) { return (_e = int(pr) * err); } + +private: + int _e; +}; + +enum errcontext { + EC_READGLYPHS = 1, // while reading glyphs + EC_READSILF = 2, // in Silf table + EC_ASILF = 3, // in Silf %d + EC_APASS = 4, // in Silf %d, pass %d + EC_PASSCCODE = 5, // in pass constraint code for Silf %d, pass %d + EC_ARULE = 6, // in Silf %d, pass %d, rule %d + EC_ASTARTS = 7, // in Silf %d, pass %d, start state %d + EC_ATRANS = 8, // in Silf %d, pass %d, fsm state %d + EC_ARULEMAP = 9 // in Silf %d, pass %d, state %d +}; + +enum errors { + E_OUTOFMEM = 1, // Out of memory + E_NOGLYPHS = 2, // There are no glyphs in the font + E_BADUPEM = 3, // The units per em for the font is bad (0) + E_BADCMAP = 4, // The font does not contain any useful cmaps + E_NOSILF = 5, // Missing Silf table + E_TOOOLD = 6, // Silf table version is too old + E_BADSIZE = 7, // context object has the wrong structural size +// Silf Subtable Errors take a Silf subtable number * 256 in the context + E_BADMAXGLYPH = 8, // Silf max glyph id is too high + E_BADNUMJUSTS = 9, // Number of Silf justification blocks is too high + E_BADENDJUSTS = 10, // Silf justification blocks take too much of the Silf table space + E_BADCRITFEATURES = 11, // Critical features section in a Silf table is too big + E_BADSCRIPTTAGS = 12, // Silf script tags area is too big + E_BADAPSEUDO = 13, // The pseudo glyph attribute number is too high + E_BADABREAK = 14, // The linebreak glyph attribute number is too high + E_BADABIDI = 15, // The bidi glyph attribute number is too high + E_BADAMIRROR = 16, // The mirrored glyph attribute number is too high + E_BADNUMPASSES = 17, // The number of passes is > 128 + E_BADPASSESSTART = 18, // The Silf table is too small to hold any passes + E_BADPASSBOUND = 19, // The positioning pass number is too low or the substitution pass number is too high + E_BADPPASS = 20, // The positioning pass number is too high + E_BADSPASS = 21, // the substitution pass number is too high + E_BADJPASSBOUND = 22, // the justification pass must be higher than the positioning pass + E_BADJPASS = 23, // the justification pass is too high + E_BADALIG = 24, // the number of initial ligature component glyph attributes is too high + E_BADBPASS = 25, // the bidi pass number is specified and is either too high or too low + E_BADNUMPSEUDO = 26, // The number of pseudo glyphs is too high + E_BADCLASSSIZE = 27, // The size of the classes block is bad + E_TOOMANYLINEAR = 28, // The number of linear classes in the silf table is too high + E_CLASSESTOOBIG = 29, // There are too many classes for the space allocated in the Silf subtable + E_MISALIGNEDCLASSES = 30, // The class offsets in the class table don't line up with the number of classes + E_HIGHCLASSOFFSET = 31, // The class offsets point out of the class table + E_BADCLASSOFFSET = 32, // A class offset is less than one following it + E_BADCLASSLOOKUPINFO = 33, // The search header info for a non-linear class has wrong values in it +// Pass subtable errors. Context has pass number * 65536 + E_BADPASSSTART = 34, // The start offset for a particular pass is bad + E_BADPASSEND = 35, // The end offset for a particular pass is bad + E_BADPASSLENGTH = 36, // The length of the pass is too small + E_BADNUMTRANS = 37, // The number of transition states in the fsm is bad + E_BADNUMSUCCESS = 38, // The number of success states in the fsm is bad + E_BADNUMSTATES = 39, // The number of states in the fsm is bad + E_NORANGES = 40, // There are no columns in the fsm + E_BADRULEMAPLEN = 41, // The size of the success state to rule mapping is bad + E_BADCTXTLENBOUNDS = 42, // The precontext maximum is greater than its minimum + E_BADCTXTLENS = 43, // The lists of rule lengths or pre context lengths is bad + E_BADPASSCCODEPTR = 44, // The pass constraint code position does not align with where the forward reference says it should be + E_BADRULECCODEPTR = 45, // The rule constraint code position does not align with where the forward reference says it should be + E_BADCCODELEN = 46, // Bad rule/pass constraint code length + E_BADACTIONCODEPTR = 47, // The action code position does not align with where the forward reference says it should be + E_MUTABLECCODE = 48, // Constraint code edits slots. It shouldn't. + E_BADSTATE = 49, // Bad state transition referencing an illegal state + E_BADRULEMAPPING = 50, // The structure of the rule mapping is bad + E_BADRANGE = 51, // Bad column range structure including a glyph in more than one column + E_BADRULENUM = 52, // A reference to a rule is out of range (too high) + E_BADACOLLISION = 53, // Bad Silf table collision attribute number (too high) + E_BADEMPTYPASS = 54, // Can't have empty passes (no rules) except for collision passes + E_BADSILFVERSION = 55, // The Silf table has a bad version (probably too high) + E_BADCOLLISIONPASS = 56, // Collision flags set on a non positioning pass + E_BADNUMCOLUMNS = 57, // Arbitrarily limit number of columns in fsm +// Code errors + E_CODEFAILURE = 60, // Base code error. The following subcodes must align with Machine::Code::status_t in Code.h + E_CODEALLOC = 61, // Out of memory + E_INVALIDOPCODE = 62, // Invalid op code + E_UNIMPOPCODE = 63, // Unimplemented op code encountered + E_OUTOFRANGECODE = 64, // Code argument out of range + E_BADJUMPCODE = 65, // Code jumps past end of op codes + E_CODEBADARGS = 66, // Code arguments exhausted + E_CODENORETURN = 67, // Missing return type op code at end of code + E_CODENESTEDCTXT = 68, // Nested context encountered in code +// Compression errors + E_BADSCHEME = 69, + E_SHRINKERFAILED = 70, +}; + +} diff --git a/source/libs/graphite2/graphite2-src/src/inc/Face.h b/source/libs/graphite2/graphite2-src/src/inc/Face.h new file mode 100644 index 000000000..355c5aa0d --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/Face.h @@ -0,0 +1,225 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once + +#include + +#include "graphite2/Font.h" + +#include "inc/Main.h" +#include "inc/FeatureMap.h" +#include "inc/TtfUtil.h" +#include "inc/Silf.h" +#include "inc/Error.h" + +namespace graphite2 { + +class Cmap; +class FileFace; +class GlyphCache; +class NameTable; +class json; +class Font; + + +using TtfUtil::Tag; + +// These are the actual tags, as distinct from the consecutive IDs in TtfUtil.h + +class Face +{ + // Prevent any kind of copying + Face(const Face&); + Face& operator=(const Face&); + +public: + class Table; + static float default_glyph_advance(const void* face_ptr, gr_uint16 glyphid); + + Face(const void* appFaceHandle/*non-NULL*/, const gr_face_ops & ops); + virtual ~Face(); + + virtual bool runGraphite(Segment *seg, const Silf *silf) const; + +public: + bool readGlyphs(uint32 faceOptions); + bool readGraphite(const Table & silf); + bool readFeatures(); + void takeFileFace(FileFace* pFileFace/*takes ownership*/); + + const SillMap & theSill() const; + const GlyphCache & glyphs() const; + Cmap & cmap() const; + NameTable * nameTable() const; + void setLogger(FILE *log_file); + json * logger() const throw(); + + const Silf * chooseSilf(uint32 script) const; + uint16 languageForLocale(const char * locale) const; + + // Features + uint16 numFeatures() const; + const FeatureRef * featureById(uint32 id) const; + const FeatureRef * feature(uint16 index) const; + + // Glyph related + int32 getGlyphMetric(uint16 gid, uint8 metric) const; + uint16 findPseudo(uint32 uid) const; + + // Errors + unsigned int error() const { return m_error; } + bool error(Error e) { m_error = e.error(); return false; } + unsigned int error_context() const { return m_error; } + void error_context(unsigned int errcntxt) { m_errcntxt = errcntxt; } + + CLASS_NEW_DELETE; +private: + SillMap m_Sill; + gr_face_ops m_ops; + const void * m_appFaceHandle; // non-NULL + FileFace * m_pFileFace; //owned + mutable GlyphCache * m_pGlyphFaceCache; // owned - never NULL + mutable Cmap * m_cmap; // cmap cache if available + mutable NameTable * m_pNames; + mutable json * m_logger; + unsigned int m_error; + unsigned int m_errcntxt; +protected: + Silf * m_silfs; // silf subtables. + uint16 m_numSilf; // num silf subtables in the silf table +private: + uint16 m_ascent, + m_descent; +#ifdef GRAPHITE2_TELEMETRY +public: + mutable telemetry tele; +#endif +}; + + + +inline +const SillMap & Face::theSill() const +{ + return m_Sill; +} + +inline +uint16 Face::numFeatures() const +{ + return m_Sill.theFeatureMap().numFeats(); +} + +inline +const FeatureRef * Face::featureById(uint32 id) const +{ + return m_Sill.theFeatureMap().findFeatureRef(id); +} + +inline +const FeatureRef *Face::feature(uint16 index) const +{ + return m_Sill.theFeatureMap().feature(index); +} + +inline +const GlyphCache & Face::glyphs() const +{ + return *m_pGlyphFaceCache; +} + +inline +Cmap & Face::cmap() const +{ + return *m_cmap; +}; + +inline +json * Face::logger() const throw() +{ + return m_logger; +} + + + +class Face::Table +{ + const Face * _f; + mutable const byte * _p; + size_t _sz; + bool _compressed; + + Error decompress(); + + void release(); + +public: + Table() throw(); + Table(const Face & face, const Tag n, uint32 version=0xffffffff) throw(); + ~Table() throw(); + Table(const Table && rhs) throw(); + + operator const byte * () const throw(); + + size_t size() const throw(); + Table & operator = (const Table && rhs) throw(); +}; + +inline +Face::Table::Table() throw() +: _f(0), _p(0), _sz(0), _compressed(false) +{ +} + +inline +Face::Table::Table(const Table && rhs) throw() +: _f(rhs._f), _p(rhs._p), _sz(rhs._sz), _compressed(rhs._compressed) +{ + rhs._p = 0; +} + +inline +Face::Table::~Table() throw() +{ + release(); +} + +inline +Face::Table::operator const byte * () const throw() +{ + return _p; +} + +inline +size_t Face::Table::size() const throw() +{ + return _sz; +} + +} // namespace graphite2 + +struct gr_face : public graphite2::Face {}; diff --git a/source/libs/graphite2/graphite2-src/src/inc/FeatureMap.h b/source/libs/graphite2/graphite2-src/src/inc/FeatureMap.h new file mode 100644 index 000000000..142a00e7e --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/FeatureMap.h @@ -0,0 +1,194 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once +#include "inc/Main.h" +#include "inc/FeatureVal.h" + +namespace graphite2 { + +// Forward declarations for implmentation types +class FeatureMap; +class Face; + + +class FeatureSetting +{ +public: + FeatureSetting(int16 theValue, uint16 labelId) : m_label(labelId), m_value(theValue) {}; + uint16 label() const { return m_label; } + int16 value() const { return m_value; } + + CLASS_NEW_DELETE; +private: + FeatureSetting(const FeatureSetting & fs) : m_label(fs.m_label), m_value(fs.m_value) {}; + + uint16 m_label; + int16 m_value; +}; + +class FeatureRef +{ + typedef uint32 chunk_t; + static const uint8 SIZEOF_CHUNK = sizeof(chunk_t)*8; + +public: + FeatureRef() throw(); + FeatureRef(const Face & face, unsigned short & bits_offset, uint32 max_val, + uint32 name, uint16 uiName, uint16 flags, + FeatureSetting *settings, uint16 num_set) throw(); + ~FeatureRef() throw(); + + bool applyValToFeature(uint32 val, Features& pDest) const; //defined in GrFaceImp.h + void maskFeature(Features & pDest) const { + if (m_index < pDest.size()) //defensive + pDest[m_index] |= m_mask; + } + + uint32 getFeatureVal(const Features& feats) const; //defined in GrFaceImp.h + + uint32 getId() const { return m_id; } + uint16 getNameId() const { return m_nameid; } + uint16 getNumSettings() const { return m_numSet; } + uint16 getSettingName(uint16 index) const { return m_nameValues[index].label(); } + int16 getSettingValue(uint16 index) const { return m_nameValues[index].value(); } + uint32 maxVal() const { return m_max; } + const Face & getFace() const { assert(m_face); return *m_face;} + const FeatureMap* getFeatureMap() const;// { return m_pFace;} + + CLASS_NEW_DELETE; +private: + FeatureRef(const FeatureRef & rhs); + + const Face * m_face; + FeatureSetting * m_nameValues; // array of name table ids for feature values + chunk_t m_mask, // bit mask to get the value from the vector + m_max; // max value the value can take + uint32 m_id; // feature identifier/name + uint16 m_nameid, // Name table id for feature name + m_flags, // feature flags (unused at the moment but read from the font) + m_numSet; // number of values (number of entries in m_nameValues) + byte m_bits, // how many bits to shift the value into place + m_index; // index into the array to find the ulong to mask + +private: //unimplemented + FeatureRef& operator=(const FeatureRef&); +}; + +inline +FeatureRef::FeatureRef() throw() +: m_face(0), + m_nameValues(0), + m_mask(0), m_max(0), + m_id(0), + m_nameid(0), m_flags(0), m_numSet(0), + m_bits(0), m_index(0) +{ +} + + +class NameAndFeatureRef +{ + public: + NameAndFeatureRef(uint32 name = 0) : m_name(name) , m_pFRef(NULL){} + NameAndFeatureRef(FeatureRef const & p) : m_name(p.getId()), m_pFRef(&p) {} + + bool operator<(const NameAndFeatureRef& rhs) const //orders by m_name + { return m_name +#include +#include "inc/Main.h" +#include "inc/List.h" + +namespace graphite2 { + +class FeatureRef; +class FeatureMap; + +class FeatureVal : public Vector +{ +public: + FeatureVal() : m_pMap(0) { } + FeatureVal(int num, const FeatureMap & pMap) : Vector(num), m_pMap(&pMap) {} + FeatureVal(const FeatureVal & rhs) : Vector(rhs), m_pMap(rhs.m_pMap) {} + + FeatureVal & operator = (const FeatureVal & rhs) { Vector::operator = (rhs); m_pMap = rhs.m_pMap; return *this; } + + bool operator ==(const FeatureVal & b) const + { + size_t n = size(); + if (n != b.size()) return false; + + for(const_iterator l = begin(), r = b.begin(); n && *l == *r; --n, ++l, ++r); + + return n == 0; + } + + CLASS_NEW_DELETE +private: + friend class FeatureRef; //so that FeatureRefs can manipulate m_vec directly + const FeatureMap* m_pMap; +}; + +typedef FeatureVal Features; + +} // namespace graphite2 + + +struct gr_feature_val : public graphite2::FeatureVal {}; diff --git a/source/libs/graphite2/graphite2-src/src/inc/FileFace.h b/source/libs/graphite2/graphite2-src/src/inc/FileFace.h new file mode 100644 index 000000000..35927847f --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/FileFace.h @@ -0,0 +1,80 @@ +/* GRAPHITE2 LICENSING + + Copyright 2012, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once + +//#include "inc/FeatureMap.h" +//#include "inc/GlyphsCache.h" +//#include "inc/Silf.h" + +#ifndef GRAPHITE2_NFILEFACE + +#include +#include + +#include "graphite2/Font.h" + +#include "inc/Main.h" +#include "inc/TtfTypes.h" +#include "inc/TtfUtil.h" + +namespace graphite2 { + + +class FileFace +{ + static const void * get_table_fn(const void* appFaceHandle, unsigned int name, size_t *len); + static void rel_table_fn(const void* appFaceHandle, const void *table_buffer); + +public: + static const gr_face_ops ops; + + FileFace(const char *filename); + ~FileFace(); + + operator bool () const throw(); + CLASS_NEW_DELETE; + +private: //defensive + FILE * _file; + size_t _file_len; + + TtfUtil::Sfnt::OffsetSubTable * _header_tbl; + TtfUtil::Sfnt::OffsetSubTable::Entry * _table_dir; + + FileFace(const FileFace&); + FileFace& operator=(const FileFace&); +}; + +inline +FileFace::operator bool() const throw() +{ + return _file && _header_tbl && _table_dir; +} + +} // namespace graphite2 + +#endif //!GRAPHITE2_NFILEFACE diff --git a/source/libs/graphite2/graphite2-src/src/inc/Font.h b/source/libs/graphite2/graphite2-src/src/inc/Font.h new file mode 100644 index 000000000..9bc9ffb51 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/Font.h @@ -0,0 +1,90 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once +#include +#include "graphite2/Font.h" +#include "inc/Main.h" +#include "inc/Face.h" + +namespace graphite2 { + +#define INVALID_ADVANCE -1e38f // can't be a static const because non-integral + +class Font +{ +public: + Font(float ppm, const Face & face, const void * appFontHandle=0, const gr_font_ops * ops=0); + virtual ~Font(); + + float advance(unsigned short glyphid) const; + float scale() const; + bool isHinted() const; + const Face & face() const; + operator bool () const throw() { return m_advances; } + + CLASS_NEW_DELETE; +private: + gr_font_ops m_ops; + const void * const m_appFontHandle; + float * m_advances; // One advance per glyph in pixels. Nan if not defined + const Face & m_face; + float m_scale; // scales from design units to ppm + bool m_hinted; + + Font(const Font&); + Font& operator=(const Font&); +}; + +inline +float Font::advance(unsigned short glyphid) const +{ + if (m_advances[glyphid] == INVALID_ADVANCE) + m_advances[glyphid] = (*m_ops.glyph_advance_x)(m_appFontHandle, glyphid); + return m_advances[glyphid]; +} + +inline +float Font::scale() const +{ + return m_scale; +} + +inline +bool Font::isHinted() const +{ + return m_hinted; +} + +inline +const Face & Font::face() const +{ + return m_face; +} + +} // namespace graphite2 + +struct gr_font : public graphite2::Font {}; diff --git a/source/libs/graphite2/graphite2-src/src/inc/GlyphCache.h b/source/libs/graphite2/graphite2-src/src/inc/GlyphCache.h new file mode 100644 index 000000000..7d5324e52 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/GlyphCache.h @@ -0,0 +1,223 @@ +/* GRAPHITE2 LICENSING + + Copyright 2012, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once + + +#include "graphite2/Font.h" +#include "inc/Main.h" +#include "inc/Position.h" +#include "inc/GlyphFace.h" + +namespace graphite2 { + +class Face; +class FeatureVal; +class Segment; + + +struct SlantBox +{ + static const SlantBox empty; + +// SlantBox(float psi = 0., float pdi = 0., float psa = 0., float pda = 0.) : si(psi), di(pdi), sa(psa), da(pda) {}; + float width() const { return sa - si; } + float height() const { return da - di; } + float si; // min + float di; // min + float sa; // max + float da; // max +}; + + +struct BBox +{ + BBox(float pxi = 0, float pyi = 0., float pxa = 0., float pya = 0.) : xi(pxi), yi(pyi), xa(pxa), ya(pya) {}; + float width() const { return xa - xi; } + float height() const { return ya - yi; } + float xi; // min + float yi; // min + float xa; // max + float ya; // max +}; + + +class GlyphBox +{ + GlyphBox(const GlyphBox &); + GlyphBox & operator = (const GlyphBox &); + +public: + GlyphBox(uint8 numsubs, unsigned short bitmap, Rect *slanted) : _num(numsubs), _bitmap(bitmap), _slant(*slanted) {}; + + void addSubBox(int subindex, int boundary, Rect *val) { _subs[subindex * 2 + boundary] = *val; } + Rect &subVal(int subindex, int boundary) { return _subs[subindex * 2 + boundary]; } + const Rect &slant() const { return _slant; } + uint8 num() const { return _num; } + const Rect *subs() const { return _subs; } + +private: + uint8 _num; + unsigned short _bitmap; + Rect _slant; + Rect _subs[1]; +}; + +class GlyphCache +{ + class Loader; + + GlyphCache(const GlyphCache&); + GlyphCache& operator=(const GlyphCache&); + +public: + GlyphCache(const Face & face, const uint32 face_options); + ~GlyphCache(); + + unsigned short numGlyphs() const throw(); + unsigned short numAttrs() const throw(); + unsigned short unitsPerEm() const throw(); + + const GlyphFace *glyph(unsigned short glyphid) const; //result may be changed by subsequent call with a different glyphid + const GlyphFace *glyphSafe(unsigned short glyphid) const; + float getBoundingMetric(unsigned short glyphid, uint8 metric) const; + uint8 numSubBounds(unsigned short glyphid) const; + float getSubBoundingMetric(unsigned short glyphid, uint8 subindex, uint8 metric) const; + const Rect & slant(unsigned short glyphid) const { return _boxes[glyphid] ? _boxes[glyphid]->slant() : _empty_slant_box; } + const SlantBox & getBoundingSlantBox(unsigned short glyphid) const; + const BBox & getBoundingBBox(unsigned short glyphid) const; + const SlantBox & getSubBoundingSlantBox(unsigned short glyphid, uint8 subindex) const; + const BBox & getSubBoundingBBox(unsigned short glyphid, uint8 subindex) const; + bool check(unsigned short glyphid) const; + bool hasBoxes() const { return _boxes != 0; } + + CLASS_NEW_DELETE; + +private: + const Rect _empty_slant_box; + const Loader * _glyph_loader; + const GlyphFace * * _glyphs; + GlyphBox * * _boxes; + unsigned short _num_glyphs, + _num_attrs, + _upem; +}; + +inline +unsigned short GlyphCache::numGlyphs() const throw() +{ + return _num_glyphs; +} + +inline +unsigned short GlyphCache::numAttrs() const throw() +{ + return _num_attrs; +} + +inline +unsigned short GlyphCache::unitsPerEm() const throw() +{ + return _upem; +} + +inline +bool GlyphCache::check(unsigned short glyphid) const +{ + return _boxes && glyphid < _num_glyphs; +} + +inline +const GlyphFace *GlyphCache::glyphSafe(unsigned short glyphid) const +{ + return glyphid < _num_glyphs ? glyph(glyphid) : NULL; +} + +inline +float GlyphCache::getBoundingMetric(unsigned short glyphid, uint8 metric) const +{ + if (glyphid >= _num_glyphs) return 0.; + switch (metric) { + case 0: return (float)(glyph(glyphid)->theBBox().bl.x); // x_min + case 1: return (float)(glyph(glyphid)->theBBox().bl.y); // y_min + case 2: return (float)(glyph(glyphid)->theBBox().tr.x); // x_max + case 3: return (float)(glyph(glyphid)->theBBox().tr.y); // y_max + case 4: return (float)(_boxes[glyphid] ? _boxes[glyphid]->slant().bl.x : 0.f); // sum_min + case 5: return (float)(_boxes[glyphid] ? _boxes[glyphid]->slant().bl.y : 0.f); // diff_min + case 6: return (float)(_boxes[glyphid] ? _boxes[glyphid]->slant().tr.x : 0.f); // sum_max + case 7: return (float)(_boxes[glyphid] ? _boxes[glyphid]->slant().tr.y : 0.f); // diff_max + default: return 0.; + } +} + +inline const SlantBox &GlyphCache::getBoundingSlantBox(unsigned short glyphid) const +{ + return _boxes[glyphid] ? *(SlantBox *)(&(_boxes[glyphid]->slant())) : SlantBox::empty; +} + +inline const BBox &GlyphCache::getBoundingBBox(unsigned short glyphid) const +{ + return *(BBox *)(&(glyph(glyphid)->theBBox())); +} + +inline +float GlyphCache::getSubBoundingMetric(unsigned short glyphid, uint8 subindex, uint8 metric) const +{ + GlyphBox *b = _boxes[glyphid]; + if (b == NULL || subindex >= b->num()) return 0; + + switch (metric) { + case 0: return b->subVal(subindex, 0).bl.x; + case 1: return b->subVal(subindex, 0).bl.y; + case 2: return b->subVal(subindex, 0).tr.x; + case 3: return b->subVal(subindex, 0).tr.y; + case 4: return b->subVal(subindex, 1).bl.x; + case 5: return b->subVal(subindex, 1).bl.y; + case 6: return b->subVal(subindex, 1).tr.x; + case 7: return b->subVal(subindex, 1).tr.y; + default: return 0.; + } +} + +inline const SlantBox &GlyphCache::getSubBoundingSlantBox(unsigned short glyphid, uint8 subindex) const +{ + GlyphBox *b = _boxes[glyphid]; + return *(SlantBox *)(b->subs() + 2 * subindex + 1); +} + +inline const BBox &GlyphCache::getSubBoundingBBox(unsigned short glyphid, uint8 subindex) const +{ + GlyphBox *b = _boxes[glyphid]; + return *(BBox *)(b->subs() + 2 * subindex); +} + +inline +uint8 GlyphCache::numSubBounds(unsigned short glyphid) const +{ + return _boxes[glyphid] ? _boxes[glyphid]->num() : 0; +} + +} // namespace graphite2 diff --git a/source/libs/graphite2/graphite2-src/src/inc/GlyphFace.h b/source/libs/graphite2/graphite2-src/src/inc/GlyphFace.h new file mode 100644 index 000000000..fc2905614 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/GlyphFace.h @@ -0,0 +1,83 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once + +#include "inc/Main.h" +#include "inc/Position.h" +#include "inc/Sparse.h" + +namespace graphite2 { + +enum metrics { + kgmetLsb = 0, kgmetRsb, + kgmetBbTop, kgmetBbBottom, kgmetBbLeft, kgmetBbRight, + kgmetBbHeight, kgmetBbWidth, + kgmetAdvWidth, kgmetAdvHeight, + kgmetAscent, kgmetDescent +}; + + +class GlyphFace +{ +public: + GlyphFace(); + template + GlyphFace(const Rect & bbox, const Position & adv, I first, const I last); + + const Position & theAdvance() const; + const Rect & theBBox() const { return m_bbox; } + const sparse & attrs() const { return m_attrs; } + int32 getMetric(uint8 metric) const; + + CLASS_NEW_DELETE; +private: + Rect m_bbox; // bounding box metrics in design units + Position m_advance; // Advance width and height in design units + sparse m_attrs; +}; + + +// Inlines: class GlyphFace +// +inline +GlyphFace::GlyphFace() +{} + +template +GlyphFace::GlyphFace(const Rect & bbox, const Position & adv, I first, const I last) +: m_bbox(bbox), + m_advance(adv), + m_attrs(first, last) +{ +} + +inline +const Position & GlyphFace::theAdvance() const { + return m_advance; +} + +} // namespace graphite2 diff --git a/source/libs/graphite2/graphite2-src/src/inc/Intervals.h b/source/libs/graphite2/graphite2-src/src/inc/Intervals.h new file mode 100644 index 000000000..81d23187b --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/Intervals.h @@ -0,0 +1,234 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once + +#include + +#include "inc/Main.h" +#include "inc/List.h" +#include "inc/json.h" +#include "inc/Position.h" + +// An IntervalSet represents the possible movement of a given glyph in a given direction +// (horizontally, vertically, or diagonally). +// A vector is needed to represent disjoint ranges, eg, -300..-150, 20..200, 500..750. +// Each pair represents the min/max of a sub-range. + +namespace graphite2 { + +class Segment; + +enum zones_t {SD, XY}; + +class Zones +{ + struct Exclusion + { + template + static Exclusion weighted(float xmin, float xmax, float f, float a0, + float m, float xi, float ai, float c, bool nega); + + float x, // x position + xm, // xmax position + c, // constant + sum(MiXi^2) + sm, // sum(Mi) + smx; // sum(MiXi) + bool open; + + Exclusion(float x, float w, float smi, float smxi, float c); + Exclusion & operator += (Exclusion const & rhs); + uint8 outcode(float p) const; + + Exclusion split_at(float p); + void left_trim(float p); + + bool track_cost(float & cost, float & x, float origin) const; + + private: + float test_position(float origin) const; + float cost(float x) const; + }; + + typedef Vector exclusions; + + typedef exclusions::iterator iterator; + typedef Exclusion * pointer; + typedef Exclusion & reference; + typedef std::reverse_iterator reverse_iterator; + +public: + typedef exclusions::const_iterator const_iterator; + typedef Exclusion const * const_pointer; + typedef Exclusion const & const_reference; + typedef std::reverse_iterator const_reverse_iterator; + +#if !defined GRAPHITE2_NTRACING + struct Debug + { + Exclusion _excl; + bool _isdel; + Vector _env; + + Debug(Exclusion *e, bool isdel, json *dbg) : _excl(*e), _isdel(isdel), _env(dbg->getenvs()) { }; + }; + + typedef Vector debugs; + typedef debugs::const_iterator idebugs; + void addDebug(Exclusion *e); + void removeDebug(float pos, float posm); + void setdebug(json *dbgout) { _dbg = dbgout; } + idebugs dbgs_begin() const { return _dbgs.begin(); } + idebugs dbgs_end() const { return _dbgs.end(); } + void jsonDbgOut(Segment *seg) const; + Position position() const { return Position(_pos, _posm); } +#endif + + Zones(); + template + void initialise(float xmin, float xmax, float margin_len, float margin_weight, float ao); + + void exclude(float xmin, float xmax); + void exclude_with_margins(float xmin, float xmax, int axis); + + template + void weighted(float xmin, float xmax, float f, float a0, float mi, float xi, float ai, float c, bool nega); + void weightedAxis(int axis, float xmin, float xmax, float f, float a0, float mi, float xi, float ai, float c, bool nega); + + float closest( float origin, float &cost) const; + + const_iterator begin() const { return _exclusions.begin(); } + const_iterator end() const { return _exclusions.end(); } + +private: + exclusions _exclusions; +#if !defined GRAPHITE2_NTRACING + json * _dbg; + debugs _dbgs; +#endif + float _margin_len, + _margin_weight, + _pos, + _posm; + + void insert(Exclusion e); + void remove(float x, float xm); + const_iterator find_exclusion_under(float x) const; +}; + + +inline +Zones::Zones() +: _margin_len(0), _margin_weight(0), _pos(0), _posm(0) +{ +#if !defined GRAPHITE2_NTRACING + _dbg = 0; +#endif + _exclusions.reserve(8); +} + +inline +Zones::Exclusion::Exclusion(float x_, float xm_, float smi, float smxi, float c_) +: x(x_), xm(xm_), c(c_), sm(smi), smx(smxi), open(false) +{ } + +template +inline +void Zones::initialise(float xmin, float xmax, float margin_len, + float margin_weight, float a0) +{ + _margin_len = margin_len; + _margin_weight = margin_weight; + _pos = xmin; + _posm = xmax; + _exclusions.clear(); + _exclusions.push_back(Exclusion::weighted(xmin, xmax, 1, a0, 0, 0, 0, 0, false)); + _exclusions.front().open = true; +#if !defined GRAPHITE2_NTRACING + _dbgs.clear(); +#endif +} + +inline +void Zones::exclude(float xmin, float xmax) { + remove(xmin, xmax); +} + +template +inline +void Zones::weighted(float xmin, float xmax, float f, float a0, + float m, float xi, float ai, float c, bool nega) { + insert(Exclusion::weighted(xmin, xmax, f, a0, m, xi, ai, c, nega)); +} + +inline +void Zones::weightedAxis(int axis, float xmin, float xmax, float f, float a0, + float m, float xi, float ai, float c, bool nega) { + if (axis < 2) + weighted(xmin, xmax, f, a0, m, xi, ai, c, nega); + else + weighted(xmin, xmax, f, a0, m, xi, ai, c, nega); +} + +#if !defined GRAPHITE2_NTRACING +inline +void Zones::addDebug(Exclusion *e) { + if (_dbg) + _dbgs.push_back(Debug(e, false, _dbg)); +} + +inline +void Zones::removeDebug(float pos, float posm) { + if (_dbg) + { + Exclusion e(pos, posm, 0, 0, 0); + _dbgs.push_back(Debug(&e, true, _dbg)); + } +} +#endif + +template<> +inline +Zones::Exclusion Zones::Exclusion::weighted(float xmin, float xmax, float f, float a0, + float m, float xi, GR_MAYBE_UNUSED float ai, float c, GR_MAYBE_UNUSED bool nega) { + return Exclusion(xmin, xmax, + m + f, + m * xi, + m * xi * xi + f * a0 * a0 + c); +} + +template<> +inline +Zones::Exclusion Zones::Exclusion::weighted(float xmin, float xmax, float f, float a0, + float m, float xi, float ai,float c, bool nega) { + float xia = nega ? xi - ai : xi + ai; + return Exclusion(xmin, xmax, + 0.25f * (m + 2.f * f), + 0.25f * m * xia, + 0.25f * (m * xia * xia + 2.f * f * a0 * a0) + c); +} + +} // end of namespace graphite2 diff --git a/source/libs/graphite2/graphite2-src/src/inc/List.h b/source/libs/graphite2/graphite2-src/src/inc/List.h new file mode 100644 index 000000000..a3b7a7796 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/List.h @@ -0,0 +1,168 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ + +// designed to have a limited subset of the std::vector api +#pragma once + +#include +#include +#include +#include +#include + +#include "Main.h" + +namespace graphite2 { + +template +inline +ptrdiff_t distance(T* first, T* last) { return last-first; } + + +template +class Vector +{ + T * m_first, *m_last, *m_end; +public: + typedef T & reference; + typedef const T & const_reference; + typedef T * iterator; + typedef const T * const_iterator; + + Vector() : m_first(0), m_last(0), m_end(0) {} + Vector(size_t n, const T& value = T()) : m_first(0), m_last(0), m_end(0) { insert(begin(), n, value); } + Vector(const Vector &rhs) : m_first(0), m_last(0), m_end(0) { insert(begin(), rhs.begin(), rhs.end()); } + template + Vector(I first, const I last) : m_first(0), m_last(0), m_end(0) { insert(begin(), first, last); } + ~Vector() { clear(); free(m_first); } + + iterator begin() { return m_first; } + const_iterator begin() const { return m_first; } + + iterator end() { return m_last; } + const_iterator end() const { return m_last; } + + bool empty() const { return m_first == m_last; } + size_t size() const { return m_last - m_first; } + size_t capacity() const{ return m_end - m_first; } + + void reserve(size_t n); + void resize(size_t n, const T & v = T()); + + reference front() { assert(size() > 0); return *begin(); } + const_reference front() const { assert(size() > 0); return *begin(); } + reference back() { assert(size() > 0); return *(end()-1); } + const_reference back() const { assert(size() > 0); return *(end()-1); } + + Vector & operator = (const Vector & rhs) { assign(rhs.begin(), rhs.end()); return *this; } + reference operator [] (size_t n) { assert(size() > n); return m_first[n]; } + const_reference operator [] (size_t n) const { assert(size() > n); return m_first[n]; } + + void assign(size_t n, const T& u) { clear(); insert(begin(), n, u); } + void assign(const_iterator first, const_iterator last) { clear(); insert(begin(), first, last); } + iterator insert(iterator p, const T & x) { p = _insert_default(p, 1); new (p) T(x); return p; } + void insert(iterator p, size_t n, const T & x); + void insert(iterator p, const_iterator first, const_iterator last); + void pop_back() { assert(size() > 0); --m_last; } + void push_back(const T &v) { if (m_last == m_end) reserve(size()+1); new (m_last++) T(v); } + + void clear() { erase(begin(), end()); } + iterator erase(iterator p) { return erase(p, p+1); } + iterator erase(iterator first, iterator last); + +private: + iterator _insert_default(iterator p, size_t n); +}; + +template +inline +void Vector::reserve(size_t n) +{ + if (n > capacity()) + { + const ptrdiff_t sz = size(); + size_t requested; + if (checked_mul(n,sizeof(T), requested)) std::abort(); + m_first = static_cast(realloc(m_first, requested)); + if (!m_first) std::abort(); + m_last = m_first + sz; + m_end = m_first + n; + } +} + +template +inline +void Vector::resize(size_t n, const T & v) { + const ptrdiff_t d = n-size(); + if (d < 0) erase(end()+d, end()); + else if (d > 0) insert(end(), d, v); +} + +template +inline +typename Vector::iterator Vector::_insert_default(iterator p, size_t n) +{ + assert(begin() <= p && p <= end()); + const ptrdiff_t i = p - begin(); + reserve(((size() + n + 7) >> 3) << 3); + p = begin() + i; + // Move tail if there is one + if (p != end()) memmove(p + n, p, distance(p,end())*sizeof(T)); + m_last += n; + return p; +} + +template +inline +void Vector::insert(iterator p, size_t n, const T & x) +{ + p = _insert_default(p, n); + // Copy in elements + for (; n; --n, ++p) { new (p) T(x); } +} + +template +inline +void Vector::insert(iterator p, const_iterator first, const_iterator last) +{ + p = _insert_default(p, distance(first, last)); + // Copy in elements + for (;first != last; ++first, ++p) { new (p) T(*first); } +} + +template +inline +typename Vector::iterator Vector::erase(iterator first, iterator last) +{ + for (iterator e = first; e != last; ++e) e->~T(); + const size_t sz = distance(first, last); + if (m_last != last) memmove(first, last, distance(last,end())*sizeof(T)); + m_last -= sz; + return first; +} + +} // namespace graphite2 diff --git a/source/libs/graphite2/graphite2-src/src/inc/Machine.h b/source/libs/graphite2/graphite2-src/src/inc/Machine.h new file mode 100644 index 000000000..b23819fb9 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/Machine.h @@ -0,0 +1,207 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +// This general interpreter interface. +// Author: Tim Eves + +// Build one of direct_machine.cpp or call_machine.cpp to implement this +// interface. + +#pragma once +#include +#include +#include +#include "inc/Main.h" + +#if defined(__GNUC__) +#if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ * 10) < 430 +#define HOT +#if defined(__x86_64) +#define REGPARM(n) __attribute__((regparm(n))) +#else +#define REGPARM(n) +#endif +#else +#define HOT __attribute__((hot)) +#if defined(__x86_64) +#define REGPARM(n) __attribute__((hot, regparm(n))) +#else +#define REGPARM(n) +#endif +#endif +#else +#define HOT +#define REGPARM(n) +#endif + +#if defined(__MINGW32__) +// MinGW's at some point includes winnt.h which #define's a +// DELETE macro, which conflicts with enum opcode below, so we undefine +// it here. +#undef DELETE +#endif + +namespace graphite2 { + +// Forward declarations +class Segment; +class Slot; +class SlotMap; + + +namespace vm +{ + + +typedef void * instr; +typedef Slot * slotref; + +enum {VARARGS = 0xff, MAX_NAME_LEN=32}; + +enum opcode { + NOP = 0, + + PUSH_BYTE, PUSH_BYTEU, PUSH_SHORT, PUSH_SHORTU, PUSH_LONG, + + ADD, SUB, MUL, DIV, + MIN_, MAX_, + NEG, + TRUNC8, TRUNC16, + + COND, + + AND, OR, NOT, + EQUAL, NOT_EQ, + LESS, GTR, LESS_EQ, GTR_EQ, + + NEXT, NEXT_N, COPY_NEXT, + PUT_GLYPH_8BIT_OBS, PUT_SUBS_8BIT_OBS, PUT_COPY, + INSERT, DELETE, + ASSOC, + CNTXT_ITEM, + + ATTR_SET, ATTR_ADD, ATTR_SUB, + ATTR_SET_SLOT, + IATTR_SET_SLOT, + PUSH_SLOT_ATTR, PUSH_GLYPH_ATTR_OBS, + PUSH_GLYPH_METRIC, PUSH_FEAT, + PUSH_ATT_TO_GATTR_OBS, PUSH_ATT_TO_GLYPH_METRIC, + PUSH_ISLOT_ATTR, + + PUSH_IGLYPH_ATTR, // not implemented + + POP_RET, RET_ZERO, RET_TRUE, + IATTR_SET, IATTR_ADD, IATTR_SUB, + PUSH_PROC_STATE, PUSH_VERSION, + PUT_SUBS, PUT_SUBS2, PUT_SUBS3, + PUT_GLYPH, PUSH_GLYPH_ATTR, PUSH_ATT_TO_GLYPH_ATTR, + BITOR, BITAND, BITNOT, + BITSET, SET_FEAT, + MAX_OPCODE, + // private opcodes for internal use only, comes after all other on disk opcodes + TEMP_COPY = MAX_OPCODE +}; + +struct opcode_t +{ + instr impl[2]; + uint8 param_sz; + char name[MAX_NAME_LEN]; +}; + + +class Machine +{ +public: + typedef int32 stack_t; + static size_t const STACK_ORDER = 10, + STACK_MAX = 1 << STACK_ORDER, + STACK_GUARD = 2; + + class Code; + + enum status_t { + finished = 0, + stack_underflow, + stack_not_empty, + stack_overflow, + slot_offset_out_bounds, + died_early + }; + + Machine(SlotMap &) throw(); + static const opcode_t * getOpcodeTable() throw(); + + CLASS_NEW_DELETE; + + SlotMap & slotMap() const throw(); + status_t status() const throw(); +// operator bool () const throw(); + +private: + void check_final_stack(const stack_t * const sp); + stack_t run(const instr * program, const byte * data, + slotref * & map) HOT; + + SlotMap & _map; + stack_t _stack[STACK_MAX + 2*STACK_GUARD]; + status_t _status; +}; + +inline Machine::Machine(SlotMap & map) throw() +: _map(map), _status(finished) +{ + // Initialise stack guard +1 entries as the stack pointer points to the + // current top of stack, hence the first push will never write entry 0. + // Initialising the guard space like this is unnecessary and is only + // done to keep valgrind happy during fuzz testing. Hopefully loop + // unrolling will flatten this. + for (size_t n = STACK_GUARD + 1; n; --n) _stack[n-1] = 0; +} + +inline SlotMap& Machine::slotMap() const throw() +{ + return _map; +} + +inline Machine::status_t Machine::status() const throw() +{ + return _status; +} + +inline void Machine::check_final_stack(const stack_t * const sp) +{ + if (_status != finished) return; + + stack_t const * const base = _stack + STACK_GUARD, + * const limit = base + STACK_MAX; + if (sp < base) _status = stack_underflow; // This should be impossible now. + else if (sp >= limit) _status = stack_overflow; // So should this. + else if (sp != base) _status = stack_not_empty; +} + +} // namespace vm +} // namespace graphite2 diff --git a/source/libs/graphite2/graphite2-src/src/inc/Main.h b/source/libs/graphite2/graphite2-src/src/inc/Main.h new file mode 100644 index 000000000..ebf02dd55 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/Main.h @@ -0,0 +1,199 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once + +#include +#include "graphite2/Types.h" + +#ifdef GRAPHITE2_CUSTOM_HEADER +#include GRAPHITE2_CUSTOM_HEADER +#endif + +namespace graphite2 { + +typedef gr_uint8 uint8; +typedef gr_uint8 byte; +typedef gr_uint16 uint16; +typedef gr_uint32 uint32; +typedef gr_int8 int8; +typedef gr_int16 int16; +typedef gr_int32 int32; +typedef size_t uintptr; + +#ifdef GRAPHITE2_TELEMETRY +struct telemetry +{ + class category; + + static size_t * _category; + static void set_category(size_t & t) throw() { _category = &t; } + static void stop() throw() { _category = 0; } + static void count_bytes(size_t n) throw() { if (_category) *_category += n; } + + size_t misc, + silf, + glyph, + code, + states, + starts, + transitions; + + telemetry() : misc(0), silf(0), glyph(0), code(0), states(0), starts(0), transitions(0) {} +}; + +class telemetry::category +{ + size_t * _prev; +public: + category(size_t & t) : _prev(_category) { _category = &t; } + ~category() { _category = _prev; } +}; + +#else +struct telemetry {}; +#endif + +// Checked multiplaction to catch overflow or underflow when allocating memory +#if defined(__has_builtin) + #if __has_builtin(__builtin_mul_overflow) + #define HAVE_BUILTIN_OVERFLOW + #endif +#elif defined(__GNUC__) && (__GNUC__ >= 5) && !defined(__INTEL_COMPILER) + #define HAVE_BUILTIN_OVERFLOW +#endif +#if defined(__has_include) + #if __has_include() && !defined(__CYGWIN__) + #define HAVE_INTSAFE_H + #endif +#elif defined(_WIN32) + #define HAVE_INTSAFE_H +#endif + +// Need to import intsafe into the top level namespace +#if defined(HAVE_INTSAFE_H) +} // namespace graphite2 + +#include + +namespace graphite2 { +#endif + +#if defined(HAVE_BUILTIN_OVERFLOW) +inline +bool checked_mul(const size_t a, const size_t b, size_t & t) { + return __builtin_mul_overflow(a, b, &t); +} +#elif defined(HAVE_INTSAFE_H) +inline +bool checked_mul(const size_t a, const size_t b, size_t & t) { + return SizeTMult(a, b, &t) == INTSAFE_E_ARITHMETIC_OVERFLOW; +} +#else +inline +bool checked_mul(const size_t a, const size_t b, size_t & t) { + t = a*b; + return (((a | b) & (~size_t(0) << (sizeof(size_t) << 2))) && (t / a != b)); +} +#endif + +// typesafe wrapper around malloc for simple types +// use free(pointer) to deallocate + +template T * gralloc(size_t n) +{ + size_t total; + if (checked_mul(n, sizeof(T), total)) + return 0; +#ifdef GRAPHITE2_TELEMETRY + telemetry::count_bytes(total); +#endif + return static_cast(malloc(total)); +} + +template T * grzeroalloc(size_t n) +{ +#ifdef GRAPHITE2_TELEMETRY + telemetry::count_bytes(sizeof(T) * n); +#endif + return static_cast(calloc(n, sizeof(T))); +} + +template +inline T min(const T a, const T b) +{ + return a < b ? a : b; +} + +template +inline T max(const T a, const T b) +{ + return a > b ? a : b; +} + +} // namespace graphite2 + +#define CLASS_NEW_DELETE \ + void * operator new (size_t size){ return gralloc(size);} \ + void * operator new (size_t, void * p) throw() { return p; } \ + void * operator new[] (size_t size) {return gralloc(size);} \ + void * operator new[] (size_t, void * p) throw() { return p; } \ + void operator delete (void * p) throw() { free(p);} \ + void operator delete (void *, void *) throw() {} \ + void operator delete[] (void * p)throw() { free(p); } \ + void operator delete[] (void *, void *) throw() {} + +#if defined(__GNUC__) || defined(__clang__) +#define GR_MAYBE_UNUSED __attribute__((unused)) +#else +#define GR_MAYBE_UNUSED +#endif + +#ifndef __has_cpp_attribute +# define __has_cpp_attribute(x) 0 +#endif + +#if __has_cpp_attribute(clang::fallthrough) +# define GR_FALLTHROUGH [[clang::fallthrough]] +#elif __has_cpp_attribute(gnu::fallthrough) +# define GR_FALLTHROUGH [[gnu::fallthrough]] +#elif defined(_MSC_VER) + /* + * MSVC's __fallthrough annotations are checked by /analyze (Code Analysis): + * https://msdn.microsoft.com/en-us/library/ms235402%28VS.80%29.aspx + */ + #include + #define GR_FALLTHROUGH __fallthrough +#elif __GNUC__ >= 7 + #define GR_FALLTHROUGH __attribute__ ((fallthrough)) +#else + #define GR_FALLTHROUGH /* fallthrough */ +#endif + +#ifdef _MSC_VER +#pragma warning(disable: 4800) +#pragma warning(disable: 4355) +#endif diff --git a/source/libs/graphite2/graphite2-src/src/inc/NameTable.h b/source/libs/graphite2/graphite2-src/src/inc/NameTable.h new file mode 100644 index 000000000..0fdbeb4d8 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/NameTable.h @@ -0,0 +1,65 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once + +#include +#include "inc/TtfTypes.h" +#include "inc/locale2lcid.h" + +namespace graphite2 { + +class NameTable +{ + NameTable(const NameTable &); + NameTable & operator = (const NameTable &); + +public: + NameTable(const void * data, size_t length, uint16 platfromId=3, uint16 encodingID = 1); + ~NameTable() { free(const_cast(m_table)); } + enum eNameFallback { + eNoFallback = 0, + eEnUSFallbackOnly = 1, + eEnOrAnyFallback = 2 + }; + uint16 setPlatformEncoding(uint16 platfromId=3, uint16 encodingID = 1); + void * getName(uint16 & languageId, uint16 nameId, gr_encform enc, uint32 & length); + uint16 getLanguageId(const char * bcp47Locale); + + CLASS_NEW_DELETE +private: + uint16 m_platformId; + uint16 m_encodingId; + uint16 m_languageCount; + uint16 m_platformOffset; // offset of first NameRecord with for platform 3, encoding 1 + uint16 m_platformLastRecord; + uint16 m_nameDataLength; + const TtfUtil::Sfnt::FontNames * m_table; + const uint8 * m_nameData; + Locale2Lang m_locale2Lang; +}; + +} // namespace graphite2 diff --git a/source/libs/graphite2/graphite2-src/src/inc/Pass.h b/source/libs/graphite2/graphite2-src/src/inc/Pass.h new file mode 100644 index 000000000..e687a87d8 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/Pass.h @@ -0,0 +1,118 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once + +#include +#include "inc/Code.h" + +namespace graphite2 { + +class Segment; +class Face; +class Silf; +struct Rule; +struct RuleEntry; +struct State; +class FiniteStateMachine; +class Error; +class ShiftCollider; +class KernCollider; +class json; + +enum passtype; + +class Pass +{ +public: + Pass(); + ~Pass(); + + bool readPass(const byte * pPass, size_t pass_length, size_t subtable_base, Face & face, + enum passtype pt, uint32 version, Error &e); + bool runGraphite(vm::Machine & m, FiniteStateMachine & fsm, bool reverse) const; + void init(Silf *silf) { m_silf = silf; } + byte collisionLoops() const { return m_numCollRuns; } + bool reverseDir() const { return m_isReverseDir; } + + CLASS_NEW_DELETE +private: + void findNDoRule(Slot* & iSlot, vm::Machine &, FiniteStateMachine& fsm) const; + int doAction(const vm::Machine::Code* codeptr, Slot * & slot_out, vm::Machine &) const; + bool testPassConstraint(vm::Machine & m) const; + bool testConstraint(const Rule & r, vm::Machine &) const; + bool readRules(const byte * rule_map, const size_t num_entries, + const byte *precontext, const uint16 * sort_key, + const uint16 * o_constraint, const byte *constraint_data, + const uint16 * o_action, const byte * action_data, + Face &, enum passtype pt, Error &e); + bool readStates(const byte * starts, const byte * states, const byte * o_rule_map, Face &, Error &e); + bool readRanges(const byte * ranges, size_t num_ranges, Error &e); + uint16 glyphToCol(const uint16 gid) const; + bool runFSM(FiniteStateMachine & fsm, Slot * slot) const; + void dumpRuleEventConsidered(const FiniteStateMachine & fsm, const RuleEntry & re) const; + void dumpRuleEventOutput(const FiniteStateMachine & fsm, const Rule & r, Slot * os) const; + void adjustSlot(int delta, Slot * & slot_out, SlotMap &) const; + bool collisionShift(Segment *seg, int dir, json * const dbgout) const; + bool collisionKern(Segment *seg, int dir, json * const dbgout) const; + bool collisionFinish(Segment *seg, GR_MAYBE_UNUSED json * const dbgout) const; + bool resolveCollisions(Segment *seg, Slot *slot, Slot *start, ShiftCollider &coll, bool isRev, + int dir, bool &moved, bool &hasCol, json * const dbgout) const; + float resolveKern(Segment *seg, Slot *slot, Slot *start, int dir, + float &ymin, float &ymax, json *const dbgout) const; + + const Silf * m_silf; + uint16 * m_cols; + Rule * m_rules; // rules + RuleEntry * m_ruleMap; + uint16 * m_startStates; // prectxt length + uint16 * m_transitions; + State * m_states; + vm::Machine::Code * m_codes; + byte * m_progs; + + byte m_numCollRuns; + byte m_kernColls; + byte m_iMaxLoop; + uint16 m_numGlyphs; + uint16 m_numRules; + uint16 m_numStates; + uint16 m_numTransition; + uint16 m_numSuccess; + uint16 m_successStart; + uint16 m_numColumns; + byte m_minPreCtxt; + byte m_maxPreCtxt; + byte m_colThreshold; + bool m_isReverseDir; + vm::Machine::Code m_cPConstraint; + +private: //defensive + Pass(const Pass&); + Pass& operator=(const Pass&); +}; + +} // namespace graphite2 diff --git a/source/libs/graphite2/graphite2-src/src/inc/Position.h b/source/libs/graphite2/graphite2-src/src/inc/Position.h new file mode 100644 index 000000000..510e4f4c4 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/Position.h @@ -0,0 +1,68 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once + +namespace graphite2 { + +class Position +{ +public: + Position() : x(0), y(0) { } + Position(const float inx, const float iny) : x(inx), y(iny) {} + Position operator + (const Position& a) const { return Position(x + a.x, y + a.y); } + Position operator - (const Position& a) const { return Position(x - a.x, y - a.y); } + Position operator * (const float m) const { return Position(x * m, y * m); } + Position &operator += (const Position &a) { x += a.x; y += a.y; return *this; } + Position &operator *= (const float m) { x *= m; y *= m; return *this; } + + float x; + float y; +}; + +class Rect +{ +public : + Rect() {} + Rect(const Position& botLeft, const Position& topRight): bl(botLeft), tr(topRight) {} + Rect widen(const Rect& other) { return Rect(Position(bl.x > other.bl.x ? other.bl.x : bl.x, bl.y > other.bl.y ? other.bl.y : bl.y), Position(tr.x > other.tr.x ? tr.x : other.tr.x, tr.y > other.tr.y ? tr.y : other.tr.y)); } + Rect operator + (const Position &a) const { return Rect(Position(bl.x + a.x, bl.y + a.y), Position(tr.x + a.x, tr.y + a.y)); } + Rect operator - (const Position &a) const { return Rect(Position(bl.x - a.x, bl.y - a.y), Position(tr.x - a.x, tr.y - a.y)); } + Rect operator * (float m) const { return Rect(Position(bl.x, bl.y) * m, Position(tr.x, tr.y) * m); } + float width() const { return tr.x - bl.x; } + float height() const { return tr.y - bl.y; } + + bool hitTest(Rect &other); + + // returns Position(overlapx, overlapy) where overlap<0 if overlapping else positive) + Position overlap(Position &offset, Rect &other, Position &otherOffset); + //Position constrainedAvoid(Position &offset, Rect &box, Rect &sdbox, Position &other, Rect &obox, Rect &osdbox); + + Position bl; + Position tr; +}; + +} // namespace graphite2 diff --git a/source/libs/graphite2/graphite2-src/src/inc/Rule.h b/source/libs/graphite2/graphite2-src/src/inc/Rule.h new file mode 100644 index 000000000..5964e003a --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/Rule.h @@ -0,0 +1,305 @@ +/* GRAPHITE2 LICENSING + + Copyright 2011, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ + +#pragma once + +#include "inc/Code.h" +#include "inc/Slot.h" + +namespace graphite2 { + +struct Rule { + const vm::Machine::Code * constraint, + * action; + unsigned short sort; + byte preContext; +#ifndef NDEBUG + uint16 rule_idx; +#endif + + Rule(); + ~Rule() {} + + CLASS_NEW_DELETE; + +private: + Rule(const Rule &); + Rule & operator = (const Rule &); +}; + +inline +Rule::Rule() +: constraint(0), + action(0), + sort(0), + preContext(0) +{ +#ifndef NDEBUG + rule_idx = 0; +#endif +} + + +struct RuleEntry +{ + const Rule * rule; + + inline + bool operator < (const RuleEntry &r) const + { + const unsigned short lsort = rule->sort, rsort = r.rule->sort; + return lsort > rsort || (lsort == rsort && rule < r.rule); + } + + inline + bool operator == (const RuleEntry &r) const + { + return rule == r.rule; + } +}; + + +struct State +{ + const RuleEntry * rules, + * rules_end; + + bool empty() const; +}; + +inline +bool State::empty() const +{ + return rules_end == rules; +} + + +class SlotMap +{ +public: + enum {MAX_SLOTS=64}; + SlotMap(Segment & seg, uint8 direction, size_t maxSize); + + Slot * * begin(); + Slot * * end(); + size_t size() const; + unsigned short context() const; + void reset(Slot &, unsigned short); + + Slot * const & operator[](int n) const; + Slot * & operator [] (int); + void pushSlot(Slot * const slot); + void collectGarbage(Slot *& aSlot); + + Slot * highwater() { return m_highwater; } + void highwater(Slot *s) { m_highwater = s; m_highpassed = false; } + bool highpassed() const { return m_highpassed; } + void highpassed(bool v) { m_highpassed = v; } + + uint8 dir() const { return m_dir; } + int decMax() { return --m_maxSize; } + + Segment & segment; +private: + Slot * m_slot_map[MAX_SLOTS+1]; + unsigned short m_size; + unsigned short m_precontext; + Slot * m_highwater; + int m_maxSize; + uint8 m_dir; + bool m_highpassed; +}; + + +class FiniteStateMachine +{ +public: + enum {MAX_RULES=128}; + +private: + class Rules + { + public: + Rules(); + void clear(); + const RuleEntry * begin() const; + const RuleEntry * end() const; + size_t size() const; + + void accumulate_rules(const State &state); + + private: + RuleEntry * m_begin, + * m_end, + m_rules[MAX_RULES*2]; + }; + +public: + FiniteStateMachine(SlotMap & map, json * logger); + void reset(Slot * & slot, const short unsigned int max_pre_ctxt); + + Rules rules; + SlotMap & slots; + json * const dbgout; +}; + + +inline +FiniteStateMachine::FiniteStateMachine(SlotMap& map, json * logger) +: slots(map), + dbgout(logger) +{ +} + +inline +void FiniteStateMachine::reset(Slot * & slot, const short unsigned int max_pre_ctxt) +{ + rules.clear(); + int ctxt = 0; + for (; ctxt != max_pre_ctxt && slot->prev(); ++ctxt, slot = slot->prev()); + slots.reset(*slot, ctxt); +} + +inline +FiniteStateMachine::Rules::Rules() + : m_begin(m_rules), m_end(m_rules) +{ +} + +inline +void FiniteStateMachine::Rules::clear() +{ + m_end = m_begin; +} + +inline +const RuleEntry * FiniteStateMachine::Rules::begin() const +{ + return m_begin; +} + +inline +const RuleEntry * FiniteStateMachine::Rules::end() const +{ + return m_end; +} + +inline +size_t FiniteStateMachine::Rules::size() const +{ + return m_end - m_begin; +} + +inline +void FiniteStateMachine::Rules::accumulate_rules(const State &state) +{ + // Only bother if there are rules in the State object. + if (state.empty()) return; + + // Merge the new sorted rules list into the current sorted result set. + const RuleEntry * lre = begin(), * rre = state.rules; + RuleEntry * out = m_rules + (m_begin == m_rules)*MAX_RULES; + const RuleEntry * const lrend = out + MAX_RULES, + * const rrend = state.rules_end; + m_begin = out; + while (lre != end() && out != lrend) + { + if (*lre < *rre) *out++ = *lre++; + else if (*rre < *lre) { *out++ = *rre++; } + else { *out++ = *lre++; ++rre; } + + if (rre == rrend) + { + while (lre != end() && out != lrend) { *out++ = *lre++; } + m_end = out; + return; + } + } + while (rre != rrend && out != lrend) { *out++ = *rre++; } + m_end = out; +} + +inline +SlotMap::SlotMap(Segment & seg, uint8 direction, size_t maxSize) +: segment(seg), m_size(0), m_precontext(0), m_highwater(0), + m_maxSize(int(maxSize)), m_dir(direction), m_highpassed(false) +{ + m_slot_map[0] = 0; +} + +inline +Slot * * SlotMap::begin() +{ + return &m_slot_map[1]; // allow map to go 1 before slot_map when inserting + // at start of segment. +} + +inline +Slot * * SlotMap::end() +{ + return m_slot_map + m_size + 1; +} + +inline +size_t SlotMap::size() const +{ + return m_size; +} + +inline +short unsigned int SlotMap::context() const +{ + return m_precontext; +} + +inline +void SlotMap::reset(Slot & slot, short unsigned int ctxt) +{ + m_size = 0; + m_precontext = ctxt; + *m_slot_map = slot.prev(); +} + +inline +void SlotMap::pushSlot(Slot*const slot) +{ + m_slot_map[++m_size] = slot; +} + +inline +Slot * const & SlotMap::operator[](int n) const +{ + return m_slot_map[n + 1]; +} + +inline +Slot * & SlotMap::operator[](int n) +{ + return m_slot_map[n + 1]; +} + +} // namespace graphite2 diff --git a/source/libs/graphite2/graphite2-src/src/inc/Segment.h b/source/libs/graphite2/graphite2-src/src/inc/Segment.h new file mode 100644 index 000000000..6cf83408d --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/Segment.h @@ -0,0 +1,236 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once + +#include "inc/Main.h" + +#include + +#include "inc/CharInfo.h" +#include "inc/Face.h" +#include "inc/FeatureVal.h" +#include "inc/GlyphCache.h" +#include "inc/GlyphFace.h" +#include "inc/Slot.h" +#include "inc/Position.h" +#include "inc/List.h" +#include "inc/Collider.h" + +#define MAX_SEG_GROWTH_FACTOR 64 + +namespace graphite2 { + +typedef Vector FeatureList; +typedef Vector SlotRope; +typedef Vector AttributeRope; +typedef Vector JustifyRope; + +class Font; +class Segment; +class Silf; + +enum SpliceParam { +/** sub-Segments longer than this are not cached + * (in Unicode code points) */ + eMaxSpliceSize = 96 +}; + +enum justFlags { + gr_justStartInline = 1, + gr_justEndInline = 2 +}; + +class SegmentScopeState +{ +private: + friend class Segment; + Slot * realFirstSlot; + Slot * slotBeforeScope; + Slot * slotAfterScope; + Slot * realLastSlot; + size_t numGlyphsOutsideScope; +}; + +class Segment +{ + // Prevent copying of any kind. + Segment(const Segment&); + Segment& operator=(const Segment&); + +public: + + enum { + SEG_INITCOLLISIONS = 1, + SEG_HASCOLLISIONS = 2 + }; + + size_t slotCount() const { return m_numGlyphs; } //one slot per glyph + void extendLength(ptrdiff_t num) { m_numGlyphs += num; } + Position advance() const { return m_advance; } + bool runGraphite() { if (m_silf) return m_face->runGraphite(this, m_silf); else return true;}; + void chooseSilf(uint32 script) { m_silf = m_face->chooseSilf(script); } + const Silf *silf() const { return m_silf; } + size_t charInfoCount() const { return m_numCharinfo; } + const CharInfo *charinfo(unsigned int index) const { return index < m_numCharinfo ? m_charinfo + index : NULL; } + CharInfo *charinfo(unsigned int index) { return index < m_numCharinfo ? m_charinfo + index : NULL; } + + Segment(size_t numchars, const Face* face, uint32 script, int dir); + ~Segment(); + uint8 flags() const { return m_flags; } + void flags(uint8 f) { m_flags = f; } + Slot *first() { return m_first; } + void first(Slot *p) { m_first = p; } + Slot *last() { return m_last; } + void last(Slot *p) { m_last = p; } + void appendSlot(int i, int cid, int gid, int fid, size_t coffset); + Slot *newSlot(); + void freeSlot(Slot *); + SlotJustify *newJustify(); + void freeJustify(SlotJustify *aJustify); + Position positionSlots(const Font *font=0, Slot *first=0, Slot *last=0, bool isRtl = false, bool isFinal = true); + void associateChars(int offset, size_t num); + void linkClusters(Slot *first, Slot *last); + uint16 getClassGlyph(uint16 cid, uint16 offset) const { return m_silf->getClassGlyph(cid, offset); } + uint16 findClassIndex(uint16 cid, uint16 gid) const { return m_silf->findClassIndex(cid, gid); } + int addFeatures(const Features& feats) { m_feats.push_back(feats); return int(m_feats.size()) - 1; } + uint32 getFeature(int index, uint8 findex) const { const FeatureRef* pFR=m_face->theSill().theFeatureMap().featureRef(findex); if (!pFR) return 0; else return pFR->getFeatureVal(m_feats[index]); } + void setFeature(int index, uint8 findex, uint32 val) { + const FeatureRef* pFR=m_face->theSill().theFeatureMap().featureRef(findex); + if (pFR) + { + if (val > pFR->maxVal()) val = pFR->maxVal(); + pFR->applyValToFeature(val, m_feats[index]); + } } + int8 dir() const { return m_dir; } + void dir(int8 val) { m_dir = val; } + bool currdir() const { return ((m_dir >> 6) ^ m_dir) & 1; } + uint8 passBits() const { return m_passBits; } + void mergePassBits(const uint8 val) { m_passBits &= val; } + int16 glyphAttr(uint16 gid, uint16 gattr) const { const GlyphFace * p = m_face->glyphs().glyphSafe(gid); return p ? p->attrs()[gattr] : 0; } + int32 getGlyphMetric(Slot *iSlot, uint8 metric, uint8 attrLevel, bool rtl) const; + float glyphAdvance(uint16 gid) const { return m_face->glyphs().glyph(gid)->theAdvance().x; } + const Rect &theGlyphBBoxTemporary(uint16 gid) const { return m_face->glyphs().glyph(gid)->theBBox(); } //warning value may become invalid when another glyph is accessed + Slot *findRoot(Slot *is) const { return is->attachedTo() ? findRoot(is->attachedTo()) : is; } + int numAttrs() const { return m_silf->numUser(); } + int defaultOriginal() const { return m_defaultOriginal; } + const Face * getFace() const { return m_face; } + const Features & getFeatures(unsigned int /*charIndex*/) { assert(m_feats.size() == 1); return m_feats[0]; } + void bidiPass(int paradir, uint8 aMirror); + int8 getSlotBidiClass(Slot *s) const; + void doMirror(uint16 aMirror); + Slot *addLineEnd(Slot *nSlot); + void delLineEnd(Slot *s); + bool hasJustification() const { return m_justifies.size() != 0; } + void reverseSlots(); + + bool isWhitespace(const int cid) const; + bool hasCollisionInfo() const { return (m_flags & SEG_HASCOLLISIONS) && m_collisions; } + SlotCollision *collisionInfo(const Slot *s) const { return m_collisions ? m_collisions + s->index() : 0; } + CLASS_NEW_DELETE + +public: //only used by: GrSegment* makeAndInitialize(const GrFont *font, const GrFace *face, uint32 script, const FeaturesHandle& pFeats/*must not be IsNull*/, encform enc, const void* pStart, size_t nChars, int dir); + bool read_text(const Face *face, const Features* pFeats/*must not be NULL*/, gr_encform enc, const void*pStart, size_t nChars); + void finalise(const Font *font, bool reverse=false); + float justify(Slot *pSlot, const Font *font, float width, enum justFlags flags, Slot *pFirst, Slot *pLast); + bool initCollisions(); + +private: + Position m_advance; // whole segment advance + SlotRope m_slots; // Vector of slot buffers + AttributeRope m_userAttrs; // Vector of userAttrs buffers + JustifyRope m_justifies; // Slot justification info buffers + FeatureList m_feats; // feature settings referenced by charinfos in this segment + Slot * m_freeSlots; // linked list of free slots + SlotJustify * m_freeJustifies; // Slot justification blocks free list + CharInfo * m_charinfo; // character info, one per input character + SlotCollision * m_collisions; + const Face * m_face; // GrFace + const Silf * m_silf; + Slot * m_first; // first slot in segment + Slot * m_last; // last slot in segment + size_t m_bufSize, // how big a buffer to create when need more slots + m_numGlyphs, + m_numCharinfo; // size of the array and number of input characters + int m_defaultOriginal; // number of whitespace chars in the string + int8 m_dir; + uint8 m_flags, // General purpose flags + m_passBits; // if bit set then skip pass +}; + +inline +int8 Segment::getSlotBidiClass(Slot *s) const +{ + int8 res = s->getBidiClass(); + if (res != -1) return res; + res = int8(glyphAttr(s->gid(), m_silf->aBidi())); + s->setBidiClass(res); + return res; +} + +inline +void Segment::finalise(const Font *font, bool reverse) +{ + if (!m_first || !m_last) return; + + m_advance = positionSlots(font, m_first, m_last, m_silf->dir(), true); + //associateChars(0, m_numCharinfo); + if (reverse && currdir() != (m_dir & 1)) + reverseSlots(); + linkClusters(m_first, m_last); +} + +inline +int32 Segment::getGlyphMetric(Slot *iSlot, uint8 metric, uint8 attrLevel, bool rtl) const { + if (attrLevel > 0) + { + Slot *is = findRoot(iSlot); + return is->clusterMetric(this, metric, attrLevel, rtl); + } + else + return m_face->getGlyphMetric(iSlot->gid(), metric); +} + +inline +bool Segment::isWhitespace(const int cid) const +{ + return ((cid >= 0x0009) * (cid <= 0x000D) + + (cid == 0x0020) + + (cid == 0x0085) + + (cid == 0x00A0) + + (cid == 0x1680) + + (cid == 0x180E) + + (cid >= 0x2000) * (cid <= 0x200A) + + (cid == 0x2028) + + (cid == 0x2029) + + (cid == 0x202F) + + (cid == 0x205F) + + (cid == 0x3000)) != 0; +} + +} // namespace graphite2 + +struct gr_segment : public graphite2::Segment {}; diff --git a/source/libs/graphite2/graphite2-src/src/inc/Silf.h b/source/libs/graphite2/graphite2-src/src/inc/Silf.h new file mode 100644 index 000000000..edc0c3a16 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/Silf.h @@ -0,0 +1,128 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once + +#include "graphite2/Font.h" +#include "inc/Main.h" +#include "inc/Pass.h" + +namespace graphite2 { + +class Face; +class Segment; +class FeatureVal; +class VMScratch; +class Error; + +class Pseudo +{ +public: + uint32 uid; + uint32 gid; + CLASS_NEW_DELETE; +}; + +class Justinfo +{ +public: + Justinfo(uint8 stretch, uint8 shrink, uint8 step, uint8 weight) : + m_astretch(stretch), m_ashrink(shrink), m_astep(step), + m_aweight(weight) {}; + uint8 attrStretch() const { return m_astretch; } + uint8 attrShrink() const { return m_ashrink; } + uint8 attrStep() const { return m_astep; } + uint8 attrWeight() const { return m_aweight; } + +private: + uint8 m_astretch; + uint8 m_ashrink; + uint8 m_astep; + uint8 m_aweight; +}; + +class Silf +{ + // Prevent copying + Silf(const Silf&); + Silf& operator=(const Silf&); + +public: + Silf() throw(); + ~Silf() throw(); + + bool readGraphite(const byte * const pSilf, size_t lSilf, Face &face, uint32 version); + bool runGraphite(Segment *seg, uint8 firstPass=0, uint8 lastPass=0, int dobidi = 0) const; + uint16 findClassIndex(uint16 cid, uint16 gid) const; + uint16 getClassGlyph(uint16 cid, unsigned int index) const; + uint16 findPseudo(uint32 uid) const; + uint8 numUser() const { return m_aUser; } + uint8 aPseudo() const { return m_aPseudo; } + uint8 aBreak() const { return m_aBreak; } + uint8 aMirror() const {return m_aMirror; } + uint8 aPassBits() const { return m_aPassBits; } + uint8 aBidi() const { return m_aBidi; } + uint8 aCollision() const { return m_aCollision; } + uint8 substitutionPass() const { return m_sPass; } + uint8 positionPass() const { return m_pPass; } + uint8 justificationPass() const { return m_jPass; } + uint8 bidiPass() const { return m_bPass; } + uint8 numPasses() const { return m_numPasses; } + uint8 maxCompPerLig() const { return m_iMaxComp; } + uint16 numClasses() const { return m_nClass; } + byte flags() const { return m_flags; } + byte dir() const { return m_dir; } + uint8 numJustLevels() const { return m_numJusts; } + Justinfo *justAttrs() const { return m_justs; } + uint16 endLineGlyphid() const { return m_gEndLine; } + const gr_faceinfo *silfInfo() const { return &m_silfinfo; } + + CLASS_NEW_DELETE; + +private: + size_t readClassMap(const byte *p, size_t data_len, uint32 version, Error &e); + template inline uint32 readClassOffsets(const byte *&p, size_t data_len, Error &e); + + Pass * m_passes; + Pseudo * m_pseudos; + uint32 * m_classOffsets; + uint16 * m_classData; + Justinfo * m_justs; + uint8 m_numPasses; + uint8 m_numJusts; + uint8 m_sPass, m_pPass, m_jPass, m_bPass, + m_flags, m_dir; + + uint8 m_aPseudo, m_aBreak, m_aUser, m_aBidi, m_aMirror, m_aPassBits, + m_iMaxComp, m_aCollision; + uint16 m_aLig, m_numPseudo, m_nClass, m_nLinear, + m_gEndLine; + gr_faceinfo m_silfinfo; + + void releaseBuffers() throw(); +}; + +} // namespace graphite2 diff --git a/source/libs/graphite2/graphite2-src/src/inc/Slot.h b/source/libs/graphite2/graphite2-src/src/inc/Slot.h new file mode 100644 index 000000000..df39d9a3b --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/Slot.h @@ -0,0 +1,170 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once + +#include "graphite2/Types.h" +#include "graphite2/Segment.h" +#include "inc/Main.h" +#include "inc/Font.h" +#include "inc/Position.h" + +namespace graphite2 { + +typedef gr_attrCode attrCode; + +class GlyphFace; +class Segment; + +struct SlotJustify +{ + static const int NUMJUSTPARAMS = 5; + + SlotJustify(const SlotJustify &); + SlotJustify & operator = (const SlotJustify &); + +public: + static size_t size_of(size_t levels) { return sizeof(SlotJustify) + ((levels > 1 ? levels : 1)*NUMJUSTPARAMS - 1)*sizeof(int16); } + + void LoadSlot(const Slot *s, const Segment *seg); + + SlotJustify *next; + int16 values[1]; +}; + +class Slot +{ + enum Flag + { + DELETED = 1, + INSERTED = 2, + COPIED = 4, + POSITIONED = 8, + ATTACHED = 16 + }; + +public: + struct iterator; + + unsigned short gid() const { return m_glyphid; } + Position origin() const { return m_position; } + float advance() const { return m_advance.x; } + void advance(Position &val) { m_advance = val; } + Position advancePos() const { return m_advance; } + int before() const { return m_before; } + int after() const { return m_after; } + uint32 index() const { return m_index; } + void index(uint32 val) { m_index = val; } + + Slot(int16 *m_userAttr = NULL); + void set(const Slot & slot, int charOffset, size_t numUserAttr, size_t justLevels, size_t numChars); + Slot *next() const { return m_next; } + void next(Slot *s) { m_next = s; } + Slot *prev() const { return m_prev; } + void prev(Slot *s) { m_prev = s; } + uint16 glyph() const { return m_realglyphid ? m_realglyphid : m_glyphid; } + void setGlyph(Segment *seg, uint16 glyphid, const GlyphFace * theGlyph = NULL); + void setRealGid(uint16 realGid) { m_realglyphid = realGid; } + void adjKern(const Position &pos) { m_shift = m_shift + pos; m_advance = m_advance + pos; } + void origin(const Position &pos) { m_position = pos + m_shift; } + void originate(int ind) { m_original = ind; } + int original() const { return m_original; } + void before(int ind) { m_before = ind; } + void after(int ind) { m_after = ind; } + bool isBase() const { return (!m_parent); } + void update(int numSlots, int numCharInfo, Position &relpos); + Position finalise(const Segment* seg, const Font* font, Position & base, Rect & bbox, uint8 attrLevel, float & clusterMin, bool rtl, bool isFinal, int depth = 0); + bool isDeleted() const { return (m_flags & DELETED) ? true : false; } + void markDeleted(bool state) { if (state) m_flags |= DELETED; else m_flags &= ~DELETED; } + bool isCopied() const { return (m_flags & COPIED) ? true : false; } + void markCopied(bool state) { if (state) m_flags |= COPIED; else m_flags &= ~COPIED; } + bool isPositioned() const { return (m_flags & POSITIONED) ? true : false; } + void markPositioned(bool state) { if (state) m_flags |= POSITIONED; else m_flags &= ~POSITIONED; } + bool isInsertBefore() const { return !(m_flags & INSERTED); } + uint8 getBidiLevel() const { return m_bidiLevel; } + void setBidiLevel(uint8 level) { m_bidiLevel = level; } + int8 getBidiClass(const Segment *seg); + int8 getBidiClass() const { return m_bidiCls; } + void setBidiClass(int8 cls) { m_bidiCls = cls; } + int16 *userAttrs() const { return m_userAttr; } + void userAttrs(int16 *p) { m_userAttr = p; } + void markInsertBefore(bool state) { if (!state) m_flags |= INSERTED; else m_flags &= ~INSERTED; } + void setAttr(Segment* seg, attrCode ind, uint8 subindex, int16 val, const SlotMap & map); + int getAttr(const Segment *seg, attrCode ind, uint8 subindex) const; + int getJustify(const Segment *seg, uint8 level, uint8 subindex) const; + void setJustify(Segment *seg, uint8 level, uint8 subindex, int16 value); + bool isLocalJustify() const { return m_justs != NULL; }; + void attachTo(Slot *ap) { m_parent = ap; } + Slot *attachedTo() const { return m_parent; } + Position attachOffset() const { return m_attach - m_with; } + Slot* firstChild() const { return m_child; } + void firstChild(Slot *ap) { m_child = ap; } + bool child(Slot *ap); + Slot* nextSibling() const { return m_sibling; } + void nextSibling(Slot *ap) { m_sibling = ap; } + bool sibling(Slot *ap); + bool removeChild(Slot *ap); + int32 clusterMetric(const Segment* seg, uint8 metric, uint8 attrLevel, bool rtl); + void positionShift(Position a) { m_position += a; } + void floodShift(Position adj, int depth = 0); + float just() const { return m_just; } + void just(float j) { m_just = j; } + Slot *nextInCluster(const Slot *s) const; + bool isChildOf(const Slot *base) const; + + CLASS_NEW_DELETE + +private: + Slot *m_next; // linked list of slots + Slot *m_prev; + unsigned short m_glyphid; // glyph id + uint16 m_realglyphid; + uint32 m_original; // charinfo that originated this slot (e.g. for feature values) + uint32 m_before; // charinfo index of before association + uint32 m_after; // charinfo index of after association + uint32 m_index; // slot index given to this slot during finalising + Slot *m_parent; // index to parent we are attached to + Slot *m_child; // index to first child slot that attaches to us + Slot *m_sibling; // index to next child that attaches to our parent + Position m_position; // absolute position of glyph + Position m_shift; // .shift slot attribute + Position m_advance; // .advance slot attribute + Position m_attach; // attachment point on us + Position m_with; // attachment point position on parent + float m_just; // Justification inserted space + uint8 m_flags; // holds bit flags + byte m_attLevel; // attachment level + int8 m_bidiCls; // bidirectional class + byte m_bidiLevel; // bidirectional level + int16 *m_userAttr; // pointer to user attributes + SlotJustify *m_justs; // pointer to justification parameters + + friend class Segment; +}; + +} // namespace graphite2 + +struct gr_slot : public graphite2::Slot {}; diff --git a/source/libs/graphite2/graphite2-src/src/inc/Sparse.h b/source/libs/graphite2/graphite2-src/src/inc/Sparse.h new file mode 100644 index 000000000..fcda89017 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/Sparse.h @@ -0,0 +1,168 @@ +/* GRAPHITE2 LICENSING + + Copyright 2011, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once +#include +#include + +#include "inc/Main.h" + +namespace graphite2 { + + +// A read-only packed fast sparse array of uint16 with uint16 keys. +// Like most container classes this has capacity and size properties and these +// refer to the number of stored entries and the number of addressable entries +// as normal. However due the sparse nature the capacity is always <= than the +// size. +class sparse +{ +public: + typedef uint16 key_type; + typedef uint16 mapped_type; + typedef std::pair value_type; + +private: + typedef unsigned long mask_t; + + static const unsigned char SIZEOF_CHUNK = (sizeof(mask_t) - sizeof(key_type))*8; + + struct chunk + { + mask_t mask:SIZEOF_CHUNK; + key_type offset; + }; + + static const chunk empty_chunk; + sparse(const sparse &); + sparse & operator = (const sparse &); + +public: + template + sparse(I first, const I last); + sparse() throw(); + ~sparse() throw(); + + operator bool () const throw(); + mapped_type operator [] (const key_type k) const throw(); + + size_t capacity() const throw(); + size_t size() const throw(); + + size_t _sizeof() const throw(); + + CLASS_NEW_DELETE; + +private: + union { + chunk * map; + mapped_type * values; + } m_array; + key_type m_nchunks; +}; + + +inline +sparse::sparse() throw() : m_nchunks(0) +{ + m_array.map = const_cast(&empty_chunk); +} + + +template +sparse::sparse(I attr, const I last) +: m_nchunks(0) +{ + m_array.map = 0; + + // Find the maximum extent of the key space. + size_t n_values=0; + long lastkey = -1; + for (I i = attr; i != last; ++i, ++n_values) + { + const typename std::iterator_traits::value_type v = *i; + if (v.second == 0) { --n_values; continue; } + if (v.first <= lastkey) { m_nchunks = 0; return; } + + lastkey = v.first; + const key_type k = v.first / SIZEOF_CHUNK; + if (k >= m_nchunks) m_nchunks = k+1; + } + if (m_nchunks == 0) + { + m_array.map=const_cast(&empty_chunk); + return; + } + + m_array.values = grzeroalloc((m_nchunks*sizeof(chunk) + sizeof(mapped_type)-1) + / sizeof(mapped_type) + + n_values); + + if (m_array.values == 0) + return; + + // coverity[forward_null : FALSE] Since m_array is union and m_array.values is not NULL + chunk * ci = m_array.map; + ci->offset = (m_nchunks*sizeof(chunk) + sizeof(mapped_type)-1)/sizeof(mapped_type); + mapped_type * vi = m_array.values + ci->offset; + for (; attr != last; ++attr, ++vi) + { + const typename std::iterator_traits::value_type v = *attr; + if (v.second == 0) { --vi; continue; } + + chunk * const ci_ = m_array.map + v.first/SIZEOF_CHUNK; + + if (ci != ci_) + { + ci = ci_; + ci->offset = key_type(vi - m_array.values); + } + + ci->mask |= 1UL << (SIZEOF_CHUNK - 1 - (v.first % SIZEOF_CHUNK)); + *vi = v.second; + } +} + + +inline +sparse::operator bool () const throw() +{ + return m_array.map != 0; +} + +inline +size_t sparse::size() const throw() +{ + return m_nchunks*SIZEOF_CHUNK; +} + +inline +size_t sparse::_sizeof() const throw() +{ + return sizeof(sparse) + capacity()*sizeof(mapped_type) + m_nchunks*sizeof(chunk); +} + +} // namespace graphite2 diff --git a/source/libs/graphite2/graphite2-src/src/inc/TtfTypes.h b/source/libs/graphite2/graphite2-src/src/inc/TtfTypes.h new file mode 100644 index 000000000..ae6791530 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/TtfTypes.h @@ -0,0 +1,419 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once +/*--------------------------------------------------------------------*//*:Ignore this sentence. + +File: TtfTypes.h +Responsibility: Tim Eves +Last reviewed: Not yet. + +Description: +Provides types required to represent the TTF basic types. +-------------------------------------------------------------------------------*//*:End Ignore*/ + + +//********************************************************************************************** +// Include files +//********************************************************************************************** +namespace graphite2 +{ +namespace TtfUtil +{ +//********************************************************************************************** +// Forward declarations +//********************************************************************************************** + + +//********************************************************************************************** +// Type declarations +//********************************************************************************************** +typedef unsigned char uint8; +typedef uint8 byte; +typedef signed char int8; +typedef unsigned short uint16; +typedef short int16; +typedef unsigned int uint32; +typedef int int32; + +typedef int16 short_frac; +typedef int32 fixed; +typedef int16 fword; +typedef uint16 ufword; +typedef int16 f2dot14; +typedef uint32 long_date_time[2]; + +//********************************************************************************************** +// Constants and enum types +//**********************************************************************************************/ +enum +{ + OneFix = 1<<16 +}; + +//********************************************************************************************** +// Table declarations +//********************************************************************************************** +namespace Sfnt +{ +#pragma pack(push,1) // We need this or the structure members aren't aligned + // correctly. Fortunately this form of pragma is supposed + // to be recognised by VS C++ too (at least according to + // MSDN). + + struct OffsetSubTable + { + uint32 scaler_type; + uint16 num_tables, + search_range, + entry_selector, + range_shift; + struct Entry + { + uint32 tag, + checksum, + offset, + length; + } table_directory[1]; + + enum ScalerType + { + TrueTypeMac = 0x74727565U, + TrueTypeWin = 0x00010000U, + Type1 = 0x74797031U + }; + }; + + + + + struct CharacterCodeMap + { + uint16 version, + num_subtables; + struct + { + uint16 platform_id, + platform_specific_id; + uint32 offset; + } encoding[1]; + }; + + struct CmapSubTable + { + uint16 format, + length, + language; + }; + + struct CmapSubTableFormat4 : CmapSubTable + { + uint16 seg_count_x2, + search_range, + entry_selector, + range_shift, + end_code[1]; + // There are arrarys after this which need their + // start positions calculated since end_code is + // seg_count uint16s long. + }; + + struct CmapSubTableFormat12 + { + fixed format; + uint32 length, + language, + num_groups; + struct + { + uint32 start_char_code, + end_char_code, + start_glyph_id; + } group[1]; + }; + + + + struct FontHeader + { + fixed version, + font_revision; + uint32 check_sum_adjustment, + magic_number; + uint16 flags, + units_per_em; + long_date_time created, + modified; + fword x_min, + y_min, + x_max, + y_max; + uint16 mac_style, + lowest_rec_ppem; + int16 font_direction_hint, + index_to_loc_format, + glyph_data_format; + enum + { + MagicNumber = 0x5F0F3CF5, + GlypDataFormat = 0 + }; + enum {ShortIndexLocFormat, LongIndexLocFormat}; + }; + + + + + struct PostScriptGlyphName + { + fixed format, + italic_angle; + fword underline_position, + underline_thickness; + uint32 is_fixed_pitch, + min_mem_type42, + max_mem_type42, + min_mem_type1, + max_mem_type1; + enum + { + Format1 = 0x10000, + Format2 = 0x20000, + Format25 = 0x28000, + Format3 = 0x30000, + Format4 = 0x40000 + }; + }; + + struct PostScriptGlyphName2 : PostScriptGlyphName + { + uint16 number_of_glyphs, + glyph_name_index[1]; + }; + + struct PostScriptGlyphName25 : PostScriptGlyphName + { + uint16 number_of_glyphs; + int8 offset[1]; + }; + + struct PostScriptGlyphName3 : PostScriptGlyphName {}; + + struct PostScriptGlyphName4 : PostScriptGlyphName + { + uint16 glyph_to_char_map[1]; + }; + + + struct HorizontalHeader + { + fixed version; + fword ascent, + descent, + line_gap; + ufword advance_width_max; + fword min_left_side_bearing, + max_left_side_bearing, + x_max_element; + int16 caret_slope_rise, + caret_slope_run; + fword caret_offset; + int16 reserved[4], + metric_data_format; + uint16 num_long_hor_metrics; + }; + + struct MaximumProfile + { + fixed version; + uint16 num_glyphs, + max_points, + max_contours, + max_component_points, + max_component_contours, + max_zones, + max_twilight_points, + max_storage, + max_function_defs, + max_instruction_defs, + max_stack_elements, + max_size_of_instructions, + max_component_elements, + max_component_depth; + }; + + + typedef byte Panose[10]; + + struct Compatibility0 + { + uint16 version; + int16 x_avg_char_width; + uint16 weight_class, + width_class; + int16 fs_type, + y_subscript_x_size, + y_subscript_y_size, + y_subscript_x_offset, + y_subscript_y_offset, + y_superscript_x_size, + y_superscript_y_size, + y_superscript_x_offset, + y_superscript_y_offset, + y_strikeout_size, + y_strikeout_position, + family_class; + Panose panose; + uint32 unicode_range[4]; + int8 ach_vend_id[4]; + uint16 fs_selection, + fs_first_char_index, + fs_last_char_index, // Acording to Apple's spec this is where v0 should end + typo_ascender, + typo_descender, + type_linegap, + win_ascent, + win_descent; + + enum + { + Italic =0x01, + Underscore=0x02, + Negative =0x04, + Outlined =0x08, + StrikeOut =0x10, + Bold =0x20 + }; + }; + + struct Compatibility1 : Compatibility0 + { + uint32 codepage_range[2]; + }; + + struct Compatibility2 : Compatibility1 + { + int16 x_height, + cap_height; + uint16 default_char, + break_char, + max_context; + }; + + struct Compatibility3 : Compatibility2 {}; + + typedef Compatibility3 Compatibility; + + + struct NameRecord + { + uint16 platform_id, + platform_specific_id, + language_id, + name_id, + length, + offset; + enum {Unicode, Mactintosh, Reserved, Microsoft}; + enum + { + Copyright, Family, Subfamily, UniqueSubfamily, + Fullname, Version, PostScript + }; + }; + + struct LangTagRecord + { + uint16 length, + offset; + }; + + struct FontNames + { + uint16 format, + count, + string_offset; + NameRecord name_record[1]; + }; + + + struct HorizontalMetric + { + uint16 advance_width; + int16 left_side_bearing; + }; + + + struct Glyph + { + int16 number_of_contours; + fword x_min, + y_min, + x_max, + y_max; + }; + + struct SimpleGlyph : Glyph + { + uint16 end_pts_of_contours[1]; + enum + { + OnCurve = 0x01, + XShort = 0x02, + YShort = 0x04, + Repeat = 0x08, + XIsSame = 0x10, + XIsPos = 0x10, + YIsSame = 0x20, + YIsPos = 0x20 + }; + }; + + struct CompoundGlyph : Glyph + { + uint16 flags, + glyph_index; + enum + { + Arg1Arg2Words = 0x01, + ArgsAreXYValues = 0x02, + RoundXYToGrid = 0x04, + HaveScale = 0x08, + MoreComponents = 0x20, + HaveXAndYScale = 0x40, + HaveTwoByTwo = 0x80, + HaveInstructions = 0x100, + UseMyMetrics = 0x200, + OverlapCompund = 0x400, + ScaledOffset = 0x800, + UnscaledOffset = 0x1000 + }; + }; + +#pragma pack(pop) +} // end of namespace Sfnt + +} // end of namespace TtfUtil +} // end of namespace graphite2 diff --git a/source/libs/graphite2/graphite2-src/src/inc/TtfUtil.h b/source/libs/graphite2/graphite2-src/src/inc/TtfUtil.h new file mode 100644 index 000000000..3952bc06f --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/TtfUtil.h @@ -0,0 +1,208 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once +/*--------------------------------------------------------------------*//*:Ignore this sentence. + +File: TtfUtil.h +Responsibility: Alan Ward +Last reviewed: Not yet. + +Description: + Utility class for handling TrueType font files. +----------------------------------------------------------------------------------------------*/ + + +#include + +namespace graphite2 +{ +namespace TtfUtil +{ + +#define OVERFLOW_OFFSET_CHECK(p, o) (o + reinterpret_cast(p) < reinterpret_cast(p)) + +typedef long fontTableId32; +typedef unsigned short gid16; + +#define TTF_TAG(a,b,c,d) ((a << 24UL) + (b << 16UL) + (c << 8UL) + (d)) + +// Enumeration used to specify a table in a TTF file +class Tag +{ + unsigned int _v; +public: + Tag(const char n[5]) throw() : _v(TTF_TAG(n[0],n[1],n[2],n[3])) {} + Tag(const unsigned int tag) throw() : _v(tag) {} + + operator unsigned int () const throw () { return _v; } + + enum + { + Feat = TTF_TAG('F','e','a','t'), + Glat = TTF_TAG('G','l','a','t'), + Gloc = TTF_TAG('G','l','o','c'), + Sile = TTF_TAG('S','i','l','e'), + Silf = TTF_TAG('S','i','l','f'), + Sill = TTF_TAG('S','i','l','l'), + cmap = TTF_TAG('c','m','a','p'), + cvt = TTF_TAG('c','v','t',' '), + cryp = TTF_TAG('c','r','y','p'), + head = TTF_TAG('h','e','a','d'), + fpgm = TTF_TAG('f','p','g','m'), + gdir = TTF_TAG('g','d','i','r'), + glyf = TTF_TAG('g','l','y','f'), + hdmx = TTF_TAG('h','d','m','x'), + hhea = TTF_TAG('h','h','e','a'), + hmtx = TTF_TAG('h','m','t','x'), + loca = TTF_TAG('l','o','c','a'), + kern = TTF_TAG('k','e','r','n'), + LTSH = TTF_TAG('L','T','S','H'), + maxp = TTF_TAG('m','a','x','p'), + name = TTF_TAG('n','a','m','e'), + OS_2 = TTF_TAG('O','S','/','2'), + post = TTF_TAG('p','o','s','t'), + prep = TTF_TAG('p','r','e','p') + }; +}; + +/*---------------------------------------------------------------------------------------------- + Class providing utility methods to parse a TrueType font file (TTF). + Callling application handles all file input and memory allocation. + Assumes minimal knowledge of TTF file format. +----------------------------------------------------------------------------------------------*/ + ////////////////////////////////// tools to find & check TTF tables + bool GetHeaderInfo(size_t & lOffset, size_t & lSize); + bool CheckHeader(const void * pHdr); + bool GetTableDirInfo(const void * pHdr, size_t & lOffset, size_t & lSize); + bool GetTableInfo(const Tag TableTag, const void * pHdr, const void * pTableDir, + size_t & lOffset, size_t & lSize); + bool CheckTable(const Tag TableId, const void * pTable, size_t lTableSize); + + ////////////////////////////////// simple font wide info + size_t GlyphCount(const void * pMaxp); +#ifdef ALL_TTFUTILS + size_t MaxCompositeComponentCount(const void * pMaxp); + size_t MaxCompositeLevelCount(const void * pMaxp); + size_t LocaGlyphCount(size_t lLocaSize, const void * pHead); // throw (std::domain_error); +#endif + int DesignUnits(const void * pHead); +#ifdef ALL_TTFUTILS + int HeadTableCheckSum(const void * pHead); + void HeadTableCreateTime(const void * pHead, unsigned int * pnDateBC, unsigned int * pnDateAD); + void HeadTableModifyTime(const void * pHead, unsigned int * pnDateBC, unsigned int * pnDateAD); + bool IsItalic(const void * pHead); + int FontAscent(const void * pOs2); + int FontDescent(const void * pOs2); + bool FontOs2Style(const void *pOs2, bool & fBold, bool & fItalic); + bool Get31EngFamilyInfo(const void * pName, size_t & lOffset, size_t & lSize); + bool Get31EngFullFontInfo(const void * pName, size_t & lOffset, size_t & lSize); + bool Get30EngFamilyInfo(const void * pName, size_t & lOffset, size_t & lSize); + bool Get30EngFullFontInfo(const void * pName, size_t & lOffset, size_t & lSize); + int PostLookup(const void * pPost, size_t lPostSize, const void * pMaxp, + const char * pPostName); +#endif + + ////////////////////////////////// utility methods helpful for name table + bool GetNameInfo(const void * pName, int nPlatformId, int nEncodingId, + int nLangId, int nNameId, size_t & lOffset, size_t & lSize); + //size_t NameTableLength(const byte * pTable); +#ifdef ALL_TTFUTILS + int GetLangsForNames(const void * pName, int nPlatformId, int nEncodingId, + int *nameIdList, int cNameIds, short *langIdList); + void SwapWString(void * pWStr, size_t nSize = 0); // throw (std::invalid_argument); +#endif + + ////////////////////////////////// cmap lookup tools + const void * FindCmapSubtable(const void * pCmap, int nPlatformId = 3, + int nEncodingId = 1, size_t length = 0); + bool CheckCmapSubtable4(const void * pCmap31, const void * pCmapEnd /*, unsigned int maxgid*/); + gid16 CmapSubtable4Lookup(const void * pCmapSubtabel4, unsigned int nUnicodeId, int rangeKey = 0); + unsigned int CmapSubtable4NextCodepoint(const void *pCmap31, unsigned int nUnicodeId, + int * pRangeKey = 0); + bool CheckCmapSubtable12(const void *pCmap310, const void * pCmapEnd /*, unsigned int maxgid*/); + gid16 CmapSubtable12Lookup(const void * pCmap310, unsigned int uUnicodeId, int rangeKey = 0); + unsigned int CmapSubtable12NextCodepoint(const void *pCmap310, unsigned int nUnicodeId, + int * pRangeKey = 0); + + ///////////////////////////////// horizontal metric data for a glyph + bool HorMetrics(gid16 nGlyphId, const void * pHmtx, size_t lHmtxSize, + const void * pHhea, int & nLsb, unsigned int & nAdvWid); + + ////////////////////////////////// primitives for loca and glyf lookup + size_t LocaLookup(gid16 nGlyphId, const void * pLoca, size_t lLocaSize, + const void * pHead); // throw (std::out_of_range); + void * GlyfLookup(const void * pGlyf, size_t lGlyfOffset, size_t lTableLen); + + ////////////////////////////////// primitves for simple glyph data + bool GlyfBox(const void * pSimpleGlyf, int & xMin, int & yMin, + int & xMax, int & yMax); + +#ifdef ALL_TTFUTILS + int GlyfContourCount(const void * pSimpleGlyf); + bool GlyfContourEndPoints(const void * pSimpleGlyf, int * prgnContourEndPoint, + int cnPointsTotal, size_t & cnPoints); + bool GlyfPoints(const void * pSimpleGlyf, int * prgnX, int * prgnY, + char * prgbFlag, int cnPointsTotal, int & cnPoints); + + // primitive to find the glyph ids in a composite glyph + bool GetComponentGlyphIds(const void * pSimpleGlyf, int * prgnCompId, + size_t cnCompIdTotal, size_t & cnCompId); + // primitive to find the placement data for a component in a composite glyph + bool GetComponentPlacement(const void * pSimpleGlyf, int nCompId, + bool fOffset, int & a, int & b); + // primitive to find the transform data for a component in a composite glyph + bool GetComponentTransform(const void * pSimpleGlyf, int nCompId, + float & flt11, float & flt12, float & flt21, float & flt22, bool & fTransOffset); +#endif + + ////////////////////////////////// operate on composite or simple glyph (auto glyf lookup) + void * GlyfLookup(gid16 nGlyphId, const void * pGlyf, const void * pLoca, + size_t lGlyfSize, size_t lLocaSize, const void * pHead); // primitive used by below methods + +#ifdef ALL_TTFUTILS + // below are primary user methods for handling glyf data + bool IsSpace(gid16 nGlyphId, const void * pLoca, size_t lLocaSize, const void * pHead); + bool IsDeepComposite(gid16 nGlyphId, const void * pGlyf, const void * pLoca, + size_t lGlyfSize, size_t lLocaSize, const void * pHead); + + bool GlyfBox(gid16 nGlyphId, const void * pGlyf, const void * pLoca, size_t lGlyfSize, size_t lLocaSize, + const void * pHead, int & xMin, int & yMin, int & xMax, int & yMax); + bool GlyfContourCount(gid16 nGlyphId, const void * pGlyf, const void * pLoca, + size_t lGlyfSize, size_t lLocaSize, const void *pHead, size_t & cnContours); + bool GlyfContourEndPoints(gid16 nGlyphId, const void * pGlyf, const void * pLoca, + size_t lGlyfSize, size_t lLocaSize, const void * pHead, int * prgnContourEndPoint, size_t cnPoints); + bool GlyfPoints(gid16 nGlyphId, const void * pGlyf, const void * pLoca, + size_t lGlyfSize, size_t lLocaSize, const void * pHead, const int * prgnContourEndPoint, size_t cnEndPoints, + int * prgnX, int * prgnY, bool * prgfOnCurve, size_t cnPoints); + + // utitily method used by high-level GlyfPoints + bool SimplifyFlags(char * prgbFlags, int cnPoints); + bool CalcAbsolutePoints(int * prgnX, int * prgnY, int cnPoints); +#endif + +} // end of namespace TtfUtil +} // end of namespace graphite2 diff --git a/source/libs/graphite2/graphite2-src/src/inc/UtfCodec.h b/source/libs/graphite2/graphite2-src/src/inc/UtfCodec.h new file mode 100644 index 000000000..24a343d8d --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/UtfCodec.h @@ -0,0 +1,251 @@ +/* GRAPHITE2 LICENSING + + Copyright 2011, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once + +#include +#include "inc/Main.h" + +namespace graphite2 { + +typedef uint32 uchar_t; + +template +struct _utf_codec +{ + typedef uchar_t codeunit_t; + + static void put(codeunit_t * cp, const uchar_t , int8 & len) throw(); + static uchar_t get(const codeunit_t * cp, int8 & len) throw(); + static bool validate(const codeunit_t * s, const codeunit_t * const e) throw(); +}; + + +template <> +struct _utf_codec<32> +{ +private: + static const uchar_t limit = 0x110000; +public: + typedef uint32 codeunit_t; + + inline + static void put(codeunit_t * cp, const uchar_t usv, int8 & l) throw() + { + *cp = usv; l = 1; + } + + inline + static uchar_t get(const codeunit_t * cp, int8 & l) throw() + { + if (cp[0] < limit) { l = 1; return cp[0]; } + else { l = -1; return 0xFFFD; } + } + + inline + static bool validate(const codeunit_t * s, const codeunit_t * const e) throw() + { + return s <= e; + } +}; + + +template <> +struct _utf_codec<16> +{ +private: + static const int32 lead_offset = 0xD800 - (0x10000 >> 10); + static const int32 surrogate_offset = 0x10000 - (0xD800 << 10) - 0xDC00; +public: + typedef uint16 codeunit_t; + + inline + static void put(codeunit_t * cp, const uchar_t usv, int8 & l) throw() + { + if (usv < 0x10000) { l = 1; cp[0] = codeunit_t(usv); } + else + { + cp[0] = codeunit_t(lead_offset + (usv >> 10)); + cp[1] = codeunit_t(0xDC00 + (usv & 0x3FF)); + l = 2; + } + } + + inline + static uchar_t get(const codeunit_t * cp, int8 & l) throw() + { + const uint32 uh = cp[0]; + l = 1; + + if (uh < 0xD800|| uh > 0xDFFF) { return uh; } + if (uh > 0xDBFF) { l = -1; return 0xFFFD; } + const uint32 ul = cp[1]; + if (ul < 0xDC00 || ul > 0xDFFF) { l = -1; return 0xFFFD; } + ++l; + return (uh<<10) + ul + surrogate_offset; + } + + inline + static bool validate(const codeunit_t * s, const codeunit_t * const e) throw() + { + const ptrdiff_t n = e-s; + if (n <= 0) return n == 0; + const uint32 u = *(e-1); // Get the last codepoint + return (u < 0xD800 || u > 0xDBFF); + } +}; + + +template <> +struct _utf_codec<8> +{ +private: + static const int8 sz_lut[16]; + static const byte mask_lut[5]; + static const uchar_t limit = 0x110000; + +public: + typedef uint8 codeunit_t; + + inline + static void put(codeunit_t * cp, const uchar_t usv, int8 & l) throw() + { + if (usv < 0x80) {l = 1; cp[0] = usv; return; } + if (usv < 0x0800) {l = 2; cp[0] = 0xC0 + (usv >> 6); cp[1] = 0x80 + (usv & 0x3F); return; } + if (usv < 0x10000) {l = 3; cp[0] = 0xE0 + (usv >> 12); cp[1] = 0x80 + ((usv >> 6) & 0x3F); cp[2] = 0x80 + (usv & 0x3F); return; } + else {l = 4; cp[0] = 0xF0 + (usv >> 18); cp[1] = 0x80 + ((usv >> 12) & 0x3F); cp[2] = 0x80 + ((usv >> 6) & 0x3F); cp[3] = 0x80 + (usv & 0x3F); return; } + } + + inline + static uchar_t get(const codeunit_t * cp, int8 & l) throw() + { + const int8 seq_sz = sz_lut[*cp >> 4]; + uchar_t u = *cp & mask_lut[seq_sz]; + l = 1; + bool toolong = false; + + switch(seq_sz) { + case 4: u <<= 6; u |= *++cp & 0x3F; if (*cp >> 6 != 2) break; ++l; toolong = (u < 0x10); GR_FALLTHROUGH; + // no break + case 3: u <<= 6; u |= *++cp & 0x3F; if (*cp >> 6 != 2) break; ++l; toolong |= (u < 0x20); GR_FALLTHROUGH; + // no break + case 2: u <<= 6; u |= *++cp & 0x3F; if (*cp >> 6 != 2) break; ++l; toolong |= (u < 0x80); GR_FALLTHROUGH; + // no break + case 1: break; + case 0: l = -1; return 0xFFFD; + } + + if (l != seq_sz || toolong || u >= limit) + { + l = -l; + return 0xFFFD; + } + return u; + } + + inline + static bool validate(const codeunit_t * s, const codeunit_t * const e) throw() + { + const ptrdiff_t n = e-s; + if (n <= 0) return n == 0; + s += (n-1); + if (*s < 0x80) return true; + if (*s >= 0xC0) return false; + if (n == 1) return true; + if (*--s < 0x80) return true; + if (*s >= 0xE0) return false; + if (n == 2 || *s >= 0xC0) return true; + if (*--s < 0x80) return true; + if (*s >= 0xF0) return false; + return true; + } + +}; + + +template +class _utf_iterator +{ + typedef _utf_codec codec; + + C * cp; + mutable int8 sl; + +public: + typedef C codeunit_type; + typedef uchar_t value_type; + typedef uchar_t * pointer; + + class reference + { + const _utf_iterator & _i; + + reference(const _utf_iterator & i): _i(i) {} + public: + operator value_type () const throw () { return codec::get(_i.cp, _i.sl); } + reference & operator = (const value_type usv) throw() { codec::put(_i.cp, usv, _i.sl); return *this; } + + friend class _utf_iterator; + }; + + + _utf_iterator(const void * us=0) : cp(reinterpret_cast(const_cast(us))), sl(1) { } + + _utf_iterator & operator ++ () { cp += abs(sl); return *this; } + _utf_iterator operator ++ (int) { _utf_iterator tmp(*this); operator++(); return tmp; } + + bool operator == (const _utf_iterator & rhs) const throw() { return cp >= rhs.cp; } + bool operator != (const _utf_iterator & rhs) const throw() { return !operator==(rhs); } + + reference operator * () const throw() { return *this; } + pointer operator ->() const throw() { return &operator *(); } + + operator codeunit_type * () const throw() { return cp; } + + bool error() const throw() { return sl < 1; } + bool validate(const _utf_iterator & e) { return codec::validate(cp, e.cp); } +}; + +template +struct utf +{ + typedef typename _utf_codec::codeunit_t codeunit_t; + + typedef _utf_iterator iterator; + typedef _utf_iterator const_iterator; + + inline + static bool validate(codeunit_t * s, codeunit_t * e) throw() { + return _utf_codec::validate(s,e); + } +}; + + +typedef utf utf32; +typedef utf utf16; +typedef utf utf8; + +} // namespace graphite2 diff --git a/source/libs/graphite2/graphite2-src/src/inc/bits.h b/source/libs/graphite2/graphite2-src/src/inc/bits.h new file mode 100644 index 000000000..9365986a1 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/bits.h @@ -0,0 +1,150 @@ +/* GRAPHITE2 LICENSING + + Copyright 2012, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once + +namespace graphite2 +{ + + +#if defined GRAPHITE2_BUILTINS && (defined __GNUC__ || defined __clang__) + +template +inline unsigned int bit_set_count(T v) +{ + return __builtin_popcount(v); +} + +template<> +inline unsigned int bit_set_count(int16 v) +{ + return __builtin_popcount(static_cast(v)); +} + +template<> +inline unsigned int bit_set_count(int8 v) +{ + return __builtin_popcount(static_cast(v)); +} + +template<> +inline unsigned int bit_set_count(unsigned long v) +{ + return __builtin_popcountl(v); +} + +template<> +inline unsigned int bit_set_count(signed long v) +{ + return __builtin_popcountl(v); +} + +template<> +inline unsigned int bit_set_count(unsigned long long v) +{ + return __builtin_popcountll(v); +} + +template<> +inline unsigned int bit_set_count(signed long long v) +{ + return __builtin_popcountll(v); +} + +#else + +template +inline unsigned int bit_set_count(T v) +{ + static size_t const ONES = ~0; + + v = v - ((v >> 1) & T(ONES/3)); // temp + v = (v & T(ONES/15*3)) + ((v >> 2) & T(ONES/15*3)); // temp + v = (v + (v >> 4)) & T(ONES/255*15); // temp + return (T)(v * T(ONES/255)) >> (sizeof(T)-1)*8; // count +} + +#endif + +//TODO: Changed these to uintmax_t when we go to C++11 +template +inline size_t _mask_over_val(size_t v) +{ + v = _mask_over_val(v); + v |= v >> S*4; + return v; +} + +//TODO: Changed these to uintmax_t when we go to C++11 +template<> +inline size_t _mask_over_val<1>(size_t v) +{ + v |= v >> 1; + v |= v >> 2; + v |= v >> 4; + return v; +} + +template +inline T mask_over_val(T v) +{ + return T(_mask_over_val(v)); +} + +template +inline unsigned long next_highest_power2(T v) +{ + return _mask_over_val(v-1)+1; +} + +template +inline unsigned int log_binary(T v) +{ + return bit_set_count(mask_over_val(v))-1; +} + +template +inline T has_zero(const T x) +{ + return (x - T(~T(0)/255)) & ~x & T(~T(0)/255*128); +} + +template +inline T zero_bytes(const T x, unsigned char n) +{ + const T t = T(~T(0)/255*n); + return T((has_zero(x^t) >> 7)*n); +} + +#if 0 +inline float float_round(float x, uint32 m) +{ + *reinterpret_cast(&x) &= m; + return *reinterpret_cast(&x); +} +#endif + +} diff --git a/source/libs/graphite2/graphite2-src/src/inc/debug.h b/source/libs/graphite2/graphite2-src/src/inc/debug.h new file mode 100644 index 000000000..97175eb2c --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/debug.h @@ -0,0 +1,89 @@ +/* GRAPHITE2 LICENSING + + Copyright 2011, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +// debug.h +// +// Created on: 22 Dec 2011 +// Author: tim + +#pragma once + +#if !defined GRAPHITE2_NTRACING + +#include +#include "inc/json.h" +#include "inc/Position.h" + +namespace graphite2 +{ + +class CharInfo; +class Segment; +class Slot; + +typedef std::pair dslot; +struct objectid +{ + char name[16]; + objectid(const dslot &) throw(); + objectid(const Segment * const p) throw(); +}; + + +json & operator << (json & j, const Position &) throw(); +json & operator << (json & j, const Rect &) throw(); +json & operator << (json & j, const CharInfo &) throw(); +json & operator << (json & j, const dslot &) throw(); +json & operator << (json & j, const objectid &) throw(); +json & operator << (json & j, const telemetry &) throw(); + + + +inline +json & operator << (json & j, const Position & p) throw() +{ + return j << json::flat << json::array << p.x << p.y << json::close; +} + + +inline +json & operator << (json & j, const Rect & p) throw() +{ + return j << json::flat << json::array << p.bl.x << p.bl.y << p.tr.x << p.tr.y << json::close; +} + + +inline +json & operator << (json & j, const objectid & sid) throw() +{ + return j << sid.name; +} + + +} // namespace graphite2 + +#endif //!defined GRAPHITE2_NTRACING + diff --git a/source/libs/graphite2/graphite2-src/src/inc/json.h b/source/libs/graphite2/graphite2-src/src/inc/json.h new file mode 100644 index 000000000..554cd9a3d --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/json.h @@ -0,0 +1,178 @@ +/* GRAPHITE2 LICENSING + + Copyright 2011, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +// JSON pretty printer for graphite font debug output logging. +// Created on: 15 Dec 2011 +// Author: Tim Eves + +#pragma once + +#include "inc/Main.h" +#include +#include +#include +#include "inc/List.h" + +namespace graphite2 { + +class json +{ + // Prevent copying + json(const json &); + json & operator = (const json &); + + typedef void (*_context_t)(json &); + + FILE * const _stream; + char _contexts[128], // context stack + * _context, // current context (top of stack) + * _flatten; // if !0 points to context above which + // pretty printed output should occur. + Vector _env; + + void context(const char current) throw(); + void indent(const int d=0) throw(); + void push_context(const char, const char) throw(); + void pop_context() throw(); + +public: + class closer; + + using string = const char *; + using number = double; + enum class integer : std::intmax_t {}; + enum class integer_u : std::uintmax_t {}; + using boolean = bool; + static const std::nullptr_t null; + + void setenv(unsigned int index, void *val) { _env.reserve(index + 1); if (index >= _env.size()) _env.insert(_env.end(), _env.size() - index + 1, 0); _env[index] = val; } + void *getenv(unsigned int index) const { return _env[index]; } + const Vector &getenvs() const { return _env; } + + static void flat(json &) throw(); + static void close(json &) throw(); + static void object(json &) throw(); + static void array(json &) throw(); + static void item(json &) throw(); + + json(FILE * stream) throw(); + ~json() throw (); + + FILE * stream() const throw(); + + json & operator << (string) throw(); + json & operator << (number) throw(); + json & operator << (integer) throw(); + json & operator << (integer_u) throw(); + json & operator << (boolean) throw(); + json & operator << (std::nullptr_t) throw(); + json & operator << (_context_t) throw(); + + operator bool() const throw(); + bool good() const throw(); + bool eof() const throw(); + + CLASS_NEW_DELETE; +}; + +class json::closer +{ + // Prevent copying. + closer(const closer &); + closer & operator = (const closer &); + + json * const _j; +public: + closer(json * const j) : _j(j) {} + ~closer() throw() { if (_j) *_j << close; } +}; + +inline +json::json(FILE * s) throw() +: _stream(s), _context(_contexts), _flatten(0) +{ + if (good()) + fflush(s); +} + + +inline +json::~json() throw () +{ + while (_context > _contexts) pop_context(); +} + +inline +FILE * json::stream() const throw() { return _stream; } + + +inline +json & json::operator << (json::_context_t ctxt) throw() +{ + ctxt(*this); + return *this; +} + +inline +json & operator << (json & j, signed char d) throw() { return j << json::integer(d); } + +inline +json & operator << (json & j, unsigned char d) throw() { return j << json::integer_u(d); } + +inline +json & operator << (json & j, short int d) throw() { return j << json::integer(d); } + +inline +json & operator << (json & j, unsigned short int d) throw() { return j << json::integer_u(d); } + +inline +json & operator << (json & j, int d) throw() { return j << json::integer(d); } + +inline +json & operator << (json & j, unsigned int d) throw() { return j << json::integer_u(d); } + +inline +json & operator << (json & j, long int d) throw() { return j << json::integer(d); } + +inline +json & operator << (json & j, unsigned long int d) throw() { return j << json::integer_u(d); } + +inline +json & operator << (json & j, long long int d) throw() { return j << json::integer(d); } + +inline +json & operator << (json & j, unsigned long long int d) throw() { return j << json::integer_u(d); } + +inline +json::operator bool() const throw() { return good(); } + +inline +bool json::good() const throw() { return _stream && ferror(_stream) == 0; } + +inline +bool json::eof() const throw() { return feof(_stream) != 0; } + +} // namespace graphite2 diff --git a/source/libs/graphite2/graphite2-src/src/inc/locale2lcid.h b/source/libs/graphite2/graphite2-src/src/inc/locale2lcid.h new file mode 100644 index 000000000..25d5c0a3c --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/locale2lcid.h @@ -0,0 +1,450 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once +#include +#include + +#include "inc/Main.h" + + +namespace graphite2 { + +struct IsoLangEntry +{ + unsigned short mnLang; + char maLangStr[4]; + char maCountry[3]; +}; + +// Windows Language ID, Locale ISO-639 language, country code as used in +// naming table of OpenType fonts +const IsoLangEntry LANG_ENTRIES[] = { + { 0x0401, "ar","SA" }, // Arabic Saudi Arabia + { 0x0402, "bg","BG" }, // Bulgarian Bulgaria + { 0x0403, "ca","ES" }, // Catalan Catalan + { 0x0404, "zh","TW" }, // Chinese Taiwan + { 0x0405, "cs","CZ" }, // Czech Czech Republic + { 0x0406, "da","DK" }, // Danish Denmark + { 0x0407, "de","DE" }, // German Germany + { 0x0408, "el","GR" }, // Greek Greece + { 0x0409, "en","US" }, // English United States + { 0x040A, "es","ES" }, // Spanish (Traditional Sort) Spain + { 0x040B, "fi","FI" }, // Finnish Finland + { 0x040C, "fr","FR" }, // French France + { 0x040D, "he","IL" }, // Hebrew Israel + { 0x040E, "hu","HU" }, // Hungarian Hungary + { 0x040F, "is","IS" }, // Icelandic Iceland + { 0x0410, "it","IT" }, // Italian Italy + { 0x0411, "jp","JP" }, // Japanese Japan + { 0x0412, "ko","KR" }, // Korean Korea + { 0x0413, "nl","NL" }, // Dutch Netherlands + { 0x0414, "no","NO" }, // Norwegian (Bokmal) Norway + { 0x0415, "pl","PL" }, // Polish Poland + { 0x0416, "pt","BR" }, // Portuguese Brazil + { 0x0417, "rm","CH" }, // Romansh Switzerland + { 0x0418, "ro","RO" }, // Romanian Romania + { 0x0419, "ru","RU" }, // Russian Russia + { 0x041A, "hr","HR" }, // Croatian Croatia + { 0x041B, "sk","SK" }, // Slovak Slovakia + { 0x041C, "sq","AL" }, // Albanian Albania + { 0x041D, "sv","SE" }, // Swedish Sweden + { 0x041E, "th","TH" }, // Thai Thailand + { 0x041F, "tr","TR" }, // Turkish Turkey + { 0x0420, "ur","PK" }, // Urdu Islamic Republic of Pakistan + { 0x0421, "id","ID" }, // Indonesian Indonesia + { 0x0422, "uk","UA" }, // Ukrainian Ukraine + { 0x0423, "be","BY" }, // Belarusian Belarus + { 0x0424, "sl","SI" }, // Slovenian Slovenia + { 0x0425, "et","EE" }, // Estonian Estonia + { 0x0426, "lv","LV" }, // Latvian Latvia + { 0x0427, "lt","LT" }, // Lithuanian Lithuania + { 0x0428, "tg","TJ" }, // Tajik (Cyrillic) Tajikistan + { 0x042A, "vi","VN" }, // Vietnamese Vietnam + { 0x042B, "hy","AM" }, // Armenian Armenia + { 0x042C, "az","AZ" }, // Azeri (Latin) Azerbaijan + { 0x042D, "eu","" }, // Basque Basque + { 0x042E, "hsb","DE" }, // Upper Sorbian Germany + { 0x042F, "mk","MK" }, // Macedonian (FYROM) Former Yugoslav Republic of Macedonia + { 0x0432, "tn","ZA" }, // Setswana South Africa + { 0x0434, "xh","ZA" }, // isiXhosa South Africa + { 0x0435, "zu","ZA" }, // isiZulu South Africa + { 0x0436, "af","ZA" }, // Afrikaans South Africa + { 0x0437, "ka","GE" }, // Georgian Georgia + { 0x0438, "fo","FO" }, // Faroese Faroe Islands + { 0x0439, "hi","IN" }, // Hindi India + { 0x043A, "mt","MT" }, // Maltese Malta + { 0x043B, "se","NO" }, // Sami (Northern) Norway + { 0x043E, "ms","MY" }, // Malay Malaysia + { 0x043F, "kk","KZ" }, // Kazakh Kazakhstan + { 0x0440, "ky","KG" }, // Kyrgyz Kyrgyzstan + { 0x0441, "sw","KE" }, // Kiswahili Kenya + { 0x0442, "tk","TM" }, // Turkmen Turkmenistan + { 0x0443, "uz","UZ" }, // Uzbek (Latin) Uzbekistan + { 0x0444, "tt","RU" }, // Tatar Russia + { 0x0445, "bn","IN" }, // Bengali India + { 0x0446, "pa","IN" }, // Punjabi India + { 0x0447, "gu","IN" }, // Gujarati India + { 0x0448, "or","IN" }, // Oriya India + { 0x0448, "wo","SN" }, // Wolof Senegal + { 0x0449, "ta","IN" }, // Tamil India + { 0x044A, "te","IN" }, // Telugu India + { 0x044B, "kn","IN" }, // Kannada India + { 0x044C, "ml","IN" }, // Malayalam India + { 0x044D, "as","IN" }, // Assamese India + { 0x044E, "mr","IN" }, // Marathi India + { 0x044F, "sa","IN" }, // Sanskrit India + { 0x0450, "mn","MN" }, // Mongolian (Cyrillic) Mongolia + { 0x0451, "bo","CN" }, // Tibetan PRC + { 0x0452, "cy","GB" }, // Welsh United Kingdom + { 0x0453, "km","KH" }, // Khmer Cambodia + { 0x0454, "lo","LA" }, // Lao Lao P.D.R. + { 0x0455, "my","MM" }, // Burmese Myanmar - not listed in Microsoft docs anymore + { 0x0456, "gl","ES" }, // Galician Galician + { 0x0457, "kok","IN" }, // Konkani India + { 0x045A, "syr","TR" }, // Syriac Syria + { 0x045B, "si","LK" }, // Sinhala Sri Lanka + { 0x045D, "iu","CA" }, // Inuktitut Canada + { 0x045E, "am","ET" }, // Amharic Ethiopia + { 0x0461, "ne","NP" }, // Nepali Nepal + { 0x0462, "fy","NL" }, // Frisian Netherlands + { 0x0463, "ps","AF" }, // Pashto Afghanistan + { 0x0464, "fil","PH" }, // Filipino Philippines + { 0x0465, "dv","MV" }, // Divehi Maldives + { 0x0468, "ha","NG" }, // Hausa (Latin) Nigeria + { 0x046A, "yo","NG" }, // Yoruba Nigeria + { 0x046B, "qu","BO" }, // Quechua Bolivia + { 0x046C, "st","ZA" }, // Sesotho sa Leboa South Africa + { 0x046D, "ba","RU" }, // Bashkir Russia + { 0x046E, "lb","LU" }, // Luxembourgish Luxembourg + { 0x046F, "kl","GL" }, // Greenlandic Greenland + { 0x0470, "ig","NG" }, // Igbo Nigeria + { 0x0478, "ii","CN" }, // Yi PRC + { 0x047A, "arn","CL" }, // Mapudungun Chile + { 0x047C, "moh","CA" }, // Mohawk Mohawk + { 0x047E, "br","FR" }, // Breton France + { 0x0480, "ug","CN" }, // Uighur PRC + { 0x0481, "mi","NZ" }, // Maori New Zealand + { 0x0482, "oc","FR" }, // Occitan France + { 0x0483, "co","FR" }, // Corsican France + { 0x0484, "gsw","FR" }, // Alsatian France + { 0x0485, "sah","RU" }, // Yakut Russia + { 0x0486, "qut","GT" }, // K'iche Guatemala + { 0x0487, "rw","RW" }, // Kinyarwanda Rwanda + { 0x048C, "gbz","AF" }, // Dari Afghanistan + { 0x0801, "ar","IQ" }, // Arabic Iraq + { 0x0804, "zn","CH" }, // Chinese People's Republic of China + { 0x0807, "de","CH" }, // German Switzerland + { 0x0809, "en","GB" }, // English United Kingdom + { 0x080A, "es","MX" }, // Spanish Mexico + { 0x080C, "fr","BE" }, // French Belgium + { 0x0810, "it","CH" }, // Italian Switzerland + { 0x0813, "nl","BE" }, // Dutch Belgium + { 0x0814, "nn","NO" }, // Norwegian (Nynorsk) Norway + { 0x0816, "pt","PT" }, // Portuguese Portugal + { 0x081A, "sh","RS" }, // Serbian (Latin) Serbia + { 0x081D, "sv","FI" }, // Sweden Finland + { 0x082C, "az","AZ" }, // Azeri (Cyrillic) Azerbaijan + { 0x082E, "dsb","DE" }, // Lower Sorbian Germany + { 0x083B, "se","SE" }, // Sami (Northern) Sweden + { 0x083C, "ga","IE" }, // Irish Ireland + { 0x083E, "ms","BN" }, // Malay Brunei Darussalam + { 0x0843, "uz","UZ" }, // Uzbek (Cyrillic) Uzbekistan + { 0x0845, "bn","BD" }, // Bengali Bangladesh + { 0x0850, "mn","MN" }, // Mongolian (Traditional) People's Republic of China + { 0x085D, "iu","CA" }, // Inuktitut (Latin) Canada + { 0x085F, "ber","DZ" }, // Tamazight (Latin) Algeria + { 0x086B, "es","EC" }, // Quechua Ecuador + { 0x0C01, "ar","EG" }, // Arabic Egypt + { 0x0C04, "zh","HK" }, // Chinese Hong Kong S.A.R. + { 0x0C07, "de","AT" }, // German Austria + { 0x0C09, "en","AU" }, // English Australia + { 0x0C0A, "es","ES" }, // Spanish (Modern Sort) Spain + { 0x0C0C, "fr","CA" }, // French Canada + { 0x0C1A, "sr","CS" }, // Serbian (Cyrillic) Serbia + { 0x0C3B, "se","FI" }, // Sami (Northern) Finland + { 0x0C6B, "qu","PE" }, // Quechua Peru + { 0x1001, "ar","LY" }, // Arabic Libya + { 0x1004, "zh","SG" }, // Chinese Singapore + { 0x1007, "de","LU" }, // German Luxembourg + { 0x1009, "en","CA" }, // English Canada + { 0x100A, "es","GT" }, // Spanish Guatemala + { 0x100C, "fr","CH" }, // French Switzerland + { 0x101A, "hr","BA" }, // Croatian (Latin) Bosnia and Herzegovina + { 0x103B, "smj","NO" }, // Sami (Lule) Norway + { 0x1401, "ar","DZ" }, // Arabic Algeria + { 0x1404, "zh","MO" }, // Chinese Macao S.A.R. + { 0x1407, "de","LI" }, // German Liechtenstein + { 0x1409, "en","NZ" }, // English New Zealand + { 0x140A, "es","CR" }, // Spanish Costa Rica + { 0x140C, "fr","LU" }, // French Luxembourg + { 0x141A, "bs","BA" }, // Bosnian (Latin) Bosnia and Herzegovina + { 0x143B, "smj","SE" }, // Sami (Lule) Sweden + { 0x1801, "ar","MA" }, // Arabic Morocco + { 0x1809, "en","IE" }, // English Ireland + { 0x180A, "es","PA" }, // Spanish Panama + { 0x180C, "fr","MC" }, // French Principality of Monoco + { 0x181A, "sh","BA" }, // Serbian (Latin) Bosnia and Herzegovina + { 0x183B, "sma","NO" }, // Sami (Southern) Norway + { 0x1C01, "ar","TN" }, // Arabic Tunisia + { 0x1C09, "en","ZA" }, // English South Africa + { 0x1C0A, "es","DO" }, // Spanish Dominican Republic + { 0x1C1A, "sr","BA" }, // Serbian (Cyrillic) Bosnia and Herzegovina + { 0x1C3B, "sma","SE" }, // Sami (Southern) Sweden + { 0x2001, "ar","OM" }, // Arabic Oman + { 0x2009, "en","JM" }, // English Jamaica + { 0x200A, "es","VE" }, // Spanish Venezuela + { 0x201A, "bs","BA" }, // Bosnian (Cyrillic) Bosnia and Herzegovina + { 0x203B, "sms","FI" }, // Sami (Skolt) Finland + { 0x2401, "ar","YE" }, // Arabic Yemen + { 0x2409, "en","BS" }, // English Caribbean + { 0x240A, "es","CO" }, // Spanish Colombia + { 0x243B, "smn","FI" }, // Sami (Inari) Finland + { 0x2801, "ar","SY" }, // Arabic Syria + { 0x2809, "en","BZ" }, // English Belize + { 0x280A, "es","PE" }, // Spanish Peru + { 0x2C01, "ar","JO" }, // Arabic Jordan + { 0x2C09, "en","TT" }, // English Trinidad and Tobago + { 0x2C0A, "es","AR" }, // Spanish Argentina + { 0x3001, "ar","LB" }, // Arabic Lebanon + { 0x3009, "en","ZW" }, // English Zimbabwe + { 0x300A, "es","EC" }, // Spanish Ecuador + { 0x3401, "ar","KW" }, // Arabic Kuwait + { 0x3409, "en","PH" }, // English Republic of the Philippines + { 0x340A, "es","CL" }, // Spanish Chile + { 0x3801, "ar","AE" }, // Arabic U.A.E. + { 0x380A, "es","UY" }, // Spanish Uruguay + { 0x3C01, "ar","BH" }, // Arabic Bahrain + { 0x3C0A, "es","PY" }, // Spanish Paraguay + { 0x4001, "ar","QA" }, // Arabic Qatar + { 0x4009, "en","IN" }, // English India + { 0x400A, "es","BO" }, // Spanish Bolivia + { 0x4409, "en","MY" }, // English Malaysia + { 0x440A, "es","SV" }, // Spanish El Salvador + { 0x4809, "en","SG" }, // English Singapore + { 0x480A, "es","HN" }, // Spanish Honduras + { 0x4C0A, "es","NI" }, // Spanish Nicaragua + { 0x500A, "es","PR" }, // Spanish Puerto Rico + { 0x540A, "es","US" } // Spanish United States +}; + +class Locale2Lang +{ + Locale2Lang(const Locale2Lang &); + Locale2Lang & operator = (const Locale2Lang &); + +public: + Locale2Lang() : mSeedPosition(128) + { + memset((void*)mLangLookup, 0, sizeof(mLangLookup)); + // create a tri lookup on first 2 letters of language code + static const int maxIndex = sizeof(LANG_ENTRIES)/sizeof(IsoLangEntry); + for (int i = 0; i < maxIndex; i++) + { + size_t a = LANG_ENTRIES[i].maLangStr[0] - 'a'; + size_t b = LANG_ENTRIES[i].maLangStr[1] - 'a'; + if (mLangLookup[a][b]) + { + const IsoLangEntry ** old = mLangLookup[a][b]; + int len = 1; + while (old[len]) len++; + len += 2; + mLangLookup[a][b] = gralloc(len); + if (!mLangLookup[a][b]) + { + mLangLookup[a][b] = old; + continue; + } + mLangLookup[a][b][--len] = NULL; + mLangLookup[a][b][--len] = &LANG_ENTRIES[i]; + while (--len >= 0) + { + assert(len >= 0); + mLangLookup[a][b][len] = old[len]; + } + free(old); + } + else + { + mLangLookup[a][b] = gralloc(2); + if (!mLangLookup[a][b]) continue; + mLangLookup[a][b][1] = NULL; + mLangLookup[a][b][0] = &LANG_ENTRIES[i]; + } + } + while (2 * mSeedPosition < maxIndex) + mSeedPosition *= 2; + }; + ~Locale2Lang() + { + for (int i = 0; i != 26; ++i) + for (int j = 0; j != 26; ++j) + free(mLangLookup[i][j]); + } + unsigned short getMsId(const char * locale) const + { + size_t length = strlen(locale); + size_t langLength = length; + const char * language = locale; + const char * script = NULL; + const char * region = NULL; + size_t regionLength = 0; + const char * dash = strchr(locale, '-'); + if (dash && (dash != locale)) + { + langLength = (dash - locale); + size_t nextPartLength = length - langLength - 1; + if (nextPartLength >= 2) + { + script = ++dash; + dash = strchr(dash, '-'); + if (dash) + { + nextPartLength = (dash - script); + region = ++dash; + } + if (nextPartLength == 2 && + (locale[langLength+1] > 0x40) && (locale[langLength+1] < 0x5B) && + (locale[langLength+2] > 0x40) && (locale[langLength+2] < 0x5B)) + { + region = script; + regionLength = nextPartLength; + script = NULL; + } + else if (nextPartLength == 4) + { + if (dash) + { + dash = strchr(dash, '-'); + if (dash) + { + nextPartLength = (dash - region); + } + else + { + nextPartLength = langLength - (region - locale); + } + regionLength = nextPartLength; + } + } + } + } + size_t a = 'e' - 'a'; + size_t b = 'n' - 'a'; + unsigned short langId = 0; + int i = 0; + switch (langLength) + { + case 2: + { + a = language[0] - 'a'; + b = language[1] - 'a'; + if ((a < 26) && (b < 26) && mLangLookup[a][b]) + { + while (mLangLookup[a][b][i]) + { + if (mLangLookup[a][b][i]->maLangStr[2] != '\0') + { + ++i; + continue; + } + if (region && (strncmp(mLangLookup[a][b][i]->maCountry, region, regionLength) == 0)) + { + langId = mLangLookup[a][b][i]->mnLang; + break; + } + else if (langId == 0) + { + // possible fallback code + langId = mLangLookup[a][b][i]->mnLang; + } + ++i; + } + } + } + break; + case 3: + { + a = language[0] - 'a'; + b = language[1] - 'a'; + if (mLangLookup[a][b]) + { + while (mLangLookup[a][b][i]) + { + if (mLangLookup[a][b][i]->maLangStr[2] != language[2]) + { + ++i; + continue; + } + if (region && (strncmp(mLangLookup[a][b][i]->maCountry, region, regionLength) == 0)) + { + langId = mLangLookup[a][b][i]->mnLang; + break; + } + else if (langId == 0) + { + // possible fallback code + langId = mLangLookup[a][b][i]->mnLang; + } + ++i; + } + } + } + break; + default: + break; + } + if (langId == 0) langId = 0x409; + return langId; + } + const IsoLangEntry * findEntryById(unsigned short langId) const + { + static const int maxIndex = sizeof(LANG_ENTRIES)/sizeof(IsoLangEntry); + int window = mSeedPosition; + int guess = mSeedPosition - 1; + while (LANG_ENTRIES[guess].mnLang != langId) + { + window /= 2; + if (window == 0) return NULL; + guess += (LANG_ENTRIES[guess].mnLang > langId)? -window : window; + while (guess >= maxIndex) + { + window /= 2; + guess -= window; + assert(window); + } + } + return &LANG_ENTRIES[guess]; + } + + CLASS_NEW_DELETE; + +private: + const IsoLangEntry ** mLangLookup[26][26]; + int mSeedPosition; +}; + +} // namespace graphite2 diff --git a/source/libs/graphite2/graphite2-src/src/inc/opcode_table.h b/source/libs/graphite2/graphite2-src/src/inc/opcode_table.h new file mode 100644 index 000000000..cb5acde9a --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/opcode_table.h @@ -0,0 +1,124 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +// This file will be pulled into and integrated into a machine implmentation +// DO NOT build directly +#pragma once + +#define do2(n) do_(n) ,do_(n) +#define NILOP 0U + +// types or parameters are: (.. is inclusive) +// number - any byte +// output_class - 0 .. silf.m_nClass +// input_class - 0 .. silf.m_nClass +// sattrnum - 0 .. 29 (gr_slatJWidth) , 55 (gr_slatUserDefn) +// attrid - 0 .. silf.numUser() where sattrnum == 55; 0..silf.m_iMaxComp where sattrnum == 15 otherwise 0 +// gattrnum - 0 .. face->getGlyphFaceCache->numAttrs() +// gmetric - 0 .. 11 (kgmetDescent) +// featidx - 0 .. face.numFeatures() +// level - any byte +static const opcode_t opcode_table[] = +{ + {{do2(nop)}, 0, "NOP"}, + + {{do2(push_byte)}, 1, "PUSH_BYTE"}, // number + {{do2(push_byte_u)}, 1, "PUSH_BYTE_U"}, // number + {{do2(push_short)}, 2, "PUSH_SHORT"}, // number number + {{do2(push_short_u)}, 2, "PUSH_SHORT_U"}, // number number + {{do2(push_long)}, 4, "PUSH_LONG"}, // number number number number + + {{do2(add)}, 0, "ADD"}, + {{do2(sub)}, 0, "SUB"}, + {{do2(mul)}, 0, "MUL"}, + {{do2(div_)}, 0, "DIV"}, + {{do2(min_)}, 0, "MIN"}, + {{do2(max_)}, 0, "MAX"}, + {{do2(neg)}, 0, "NEG"}, + {{do2(trunc8)}, 0, "TRUNC8"}, + {{do2(trunc16)}, 0, "TRUNC16"}, + + {{do2(cond)}, 0, "COND"}, + {{do2(and_)}, 0, "AND"}, // 0x10 + {{do2(or_)}, 0, "OR"}, + {{do2(not_)}, 0, "NOT"}, + {{do2(equal)}, 0, "EQUAL"}, + {{do2(not_eq_)}, 0, "NOT_EQ"}, + {{do2(less)}, 0, "LESS"}, + {{do2(gtr)}, 0, "GTR"}, + {{do2(less_eq)}, 0, "LESS_EQ"}, + {{do2(gtr_eq)}, 0, "GTR_EQ"}, // 0x18 + + {{do_(next), NILOP}, 0, "NEXT"}, + {{NILOP, NILOP}, 1, "NEXT_N"}, // number <= smap.end - map + {{do_(next), NILOP}, 0, "COPY_NEXT"}, + {{do_(put_glyph_8bit_obs), NILOP}, 1, "PUT_GLYPH_8BIT_OBS"}, // output_class + {{do_(put_subs_8bit_obs), NILOP}, 3, "PUT_SUBS_8BIT_OBS"}, // slot input_class output_class + {{do_(put_copy), NILOP}, 1, "PUT_COPY"}, // slot + {{do_(insert), NILOP}, 0, "INSERT"}, + {{do_(delete_), NILOP}, 0, "DELETE"}, // 0x20 + {{do_(assoc), NILOP}, VARARGS, "ASSOC"}, + {{NILOP ,do_(cntxt_item)}, 2, "CNTXT_ITEM"}, // slot offset + + {{do_(attr_set), NILOP}, 1, "ATTR_SET"}, // sattrnum + {{do_(attr_add), NILOP}, 1, "ATTR_ADD"}, // sattrnum + {{do_(attr_sub), NILOP}, 1, "ATTR_SUB"}, // sattrnum + {{do_(attr_set_slot), NILOP}, 1, "ATTR_SET_SLOT"}, // sattrnum + {{do_(iattr_set_slot), NILOP}, 2, "IATTR_SET_SLOT"}, // sattrnum attrid + {{do2(push_slot_attr)}, 2, "PUSH_SLOT_ATTR"}, // sattrnum slot + {{do2(push_glyph_attr_obs)}, 2, "PUSH_GLYPH_ATTR_OBS"}, // gattrnum slot + {{do2(push_glyph_metric)}, 3, "PUSH_GLYPH_METRIC"}, // gmetric slot level + {{do2(push_feat)}, 2, "PUSH_FEAT"}, // featidx slot + + {{do2(push_att_to_gattr_obs)}, 2, "PUSH_ATT_TO_GATTR_OBS"}, // gattrnum slot + {{do2(push_att_to_glyph_metric)}, 3, "PUSH_ATT_TO_GLYPH_METRIC"}, // gmetric slot level + {{do2(push_islot_attr)}, 3, "PUSH_ISLOT_ATTR"}, // sattrnum slot attrid + + {{NILOP,NILOP}, 3, "PUSH_IGLYPH_ATTR"}, + + {{do2(pop_ret)}, 0, "POP_RET"}, // 0x30 + {{do2(ret_zero)}, 0, "RET_ZERO"}, + {{do2(ret_true)}, 0, "RET_TRUE"}, + + {{do_(iattr_set), NILOP}, 2, "IATTR_SET"}, // sattrnum attrid + {{do_(iattr_add), NILOP}, 2, "IATTR_ADD"}, // sattrnum attrid + {{do_(iattr_sub), NILOP}, 2, "IATTR_SUB"}, // sattrnum attrid + {{do2(push_proc_state)}, 1, "PUSH_PROC_STATE"}, // dummy + {{do2(push_version)}, 0, "PUSH_VERSION"}, + {{do_(put_subs), NILOP}, 5, "PUT_SUBS"}, // slot input_class input_class output_class output_class + {{NILOP,NILOP}, 0, "PUT_SUBS2"}, + {{NILOP,NILOP}, 0, "PUT_SUBS3"}, + {{do_(put_glyph), NILOP}, 2, "PUT_GLYPH"}, // output_class output_class + {{do2(push_glyph_attr)}, 3, "PUSH_GLYPH_ATTR"}, // gattrnum gattrnum slot + {{do2(push_att_to_glyph_attr)}, 3, "PUSH_ATT_TO_GLYPH_ATTR"}, // gattrnum gattrnum slot + {{do2(bor)}, 0, "BITOR"}, + {{do2(band)}, 0, "BITAND"}, + {{do2(bnot)}, 0, "BITNOT"}, // 0x40 + {{do2(setbits)}, 4, "BITSET"}, + {{do_(set_feat), NILOP}, 2, "SET_FEAT"}, // featidx slot + // private opcodes for internal use only, comes after all other on disk opcodes. + {{do_(temp_copy), NILOP}, 0, "TEMP_COPY"} +}; diff --git a/source/libs/graphite2/graphite2-src/src/inc/opcodes.h b/source/libs/graphite2/graphite2-src/src/inc/opcodes.h new file mode 100644 index 000000000..ff2f1741e --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/inc/opcodes.h @@ -0,0 +1,691 @@ +/* GRAPHITE2 LICENSING + + Copyright 2010, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +#pragma once +// This file will be pulled into and integrated into a machine implmentation +// DO NOT build directly and under no circumstances ever #include headers in +// here or you will break the direct_machine. +// +// Implementers' notes +// ================== +// You have access to a few primitives and the full C++ code: +// declare_params(n) Tells the interpreter how many bytes of parameter +// space to claim for this instruction uses and +// initialises the param pointer. You *must* before the +// first use of param. +// use_params(n) Claim n extra bytes of param space beyond what was +// claimed using delcare_param. +// param A const byte pointer for the parameter space claimed by +// this instruction. +// binop(op) Implement a binary operation on the stack using the +// specified C++ operator. +// NOT_IMPLEMENTED Any instruction body containing this will exit the +// program with an assertion error. Instructions that are +// not implemented should also be marked NILOP in the +// opcodes tables this will cause the code class to spot +// them in a live code stream and throw a runtime_error +// instead. +// push(n) Push the value n onto the stack. +// pop() Pop the top most value and return it. +// +// You have access to the following named fast 'registers': +// sp = The pointer to the current top of stack, the last value +// pushed. +// seg = A reference to the Segment this code is running over. +// is = The current slot index +// isb = The original base slot index at the start of this rule +// isf = The first positioned slot +// isl = The last positioned slot +// ip = The current instruction pointer +// endPos = Position of advance of last cluster +// dir = writing system directionality of the font + + +// #define NOT_IMPLEMENTED assert(false) +// #define NOT_IMPLEMENTED + +#define binop(op) const uint32 a = pop(); *sp = uint32(*sp) op a +#define sbinop(op) const int32 a = pop(); *sp = int32(*sp) op a +#define use_params(n) dp += n + +#define declare_params(n) const byte * param = dp; \ + use_params(n); + +#define push(n) { *++sp = n; } +#define pop() (*sp--) +#define slotat(x) (map[(x)]) +#define DIE { is=seg.last(); status = Machine::died_early; EXIT(1); } +#define POSITIONED 1 + +STARTOP(nop) + do {} while (0); +ENDOP + +STARTOP(push_byte) + declare_params(1); + push(int8(*param)); +ENDOP + +STARTOP(push_byte_u) + declare_params(1); + push(uint8(*param)); +ENDOP + +STARTOP(push_short) + declare_params(2); + const int16 r = int16(param[0]) << 8 + | uint8(param[1]); + push(r); +ENDOP + +STARTOP(push_short_u) + declare_params(2); + const uint16 r = uint16(param[0]) << 8 + | uint8(param[1]); + push(r); +ENDOP + +STARTOP(push_long) + declare_params(4); + const int32 r = int32(param[0]) << 24 + | uint32(param[1]) << 16 + | uint32(param[2]) << 8 + | uint8(param[3]); + push(r); +ENDOP + +STARTOP(add) + binop(+); +ENDOP + +STARTOP(sub) + binop(-); +ENDOP + +STARTOP(mul) + binop(*); +ENDOP + +STARTOP(div_) + const int32 b = pop(); + const int32 a = int32(*sp); + if (b == 0 || (a == std::numeric_limits::min() && b == -1)) DIE; + *sp = int32(*sp) / b; +ENDOP + +STARTOP(min_) + const int32 a = pop(), b = *sp; + if (a < b) *sp = a; +ENDOP + +STARTOP(max_) + const int32 a = pop(), b = *sp; + if (a > b) *sp = a; +ENDOP + +STARTOP(neg) + *sp = uint32(-int32(*sp)); +ENDOP + +STARTOP(trunc8) + *sp = uint8(*sp); +ENDOP + +STARTOP(trunc16) + *sp = uint16(*sp); +ENDOP + +STARTOP(cond) + const uint32 f = pop(), t = pop(), c = pop(); + push(c ? t : f); +ENDOP + +STARTOP(and_) + binop(&&); +ENDOP + +STARTOP(or_) + binop(||); +ENDOP + +STARTOP(not_) + *sp = !*sp; +ENDOP + +STARTOP(equal) + binop(==); +ENDOP + +STARTOP(not_eq_) + binop(!=); +ENDOP + +STARTOP(less) + sbinop(<); +ENDOP + +STARTOP(gtr) + sbinop(>); +ENDOP + +STARTOP(less_eq) + sbinop(<=); +ENDOP + +STARTOP(gtr_eq) + sbinop(>=); +ENDOP + +STARTOP(next) + if (map - &smap[0] >= int(smap.size())) DIE + if (is) + { + if (is == smap.highwater()) + smap.highpassed(true); + is = is->next(); + } + ++map; +ENDOP + +//STARTOP(next_n) +// use_params(1); +// NOT_IMPLEMENTED; + //declare_params(1); + //const size_t num = uint8(*param); +//ENDOP + +//STARTOP(copy_next) +// if (is) is = is->next(); +// ++map; +// ENDOP + +STARTOP(put_glyph_8bit_obs) + declare_params(1); + const unsigned int output_class = uint8(*param); + is->setGlyph(&seg, seg.getClassGlyph(output_class, 0)); +ENDOP + +STARTOP(put_subs_8bit_obs) + declare_params(3); + const int slot_ref = int8(param[0]); + const unsigned int input_class = uint8(param[1]), + output_class = uint8(param[2]); + uint16 index; + slotref slot = slotat(slot_ref); + if (slot) + { + index = seg.findClassIndex(input_class, slot->gid()); + is->setGlyph(&seg, seg.getClassGlyph(output_class, index)); + } +ENDOP + +STARTOP(put_copy) + declare_params(1); + const int slot_ref = int8(*param); + if (is && !is->isDeleted()) + { + slotref ref = slotat(slot_ref); + if (ref && ref != is) + { + int16 *tempUserAttrs = is->userAttrs(); + if (is->attachedTo() || is->firstChild()) DIE + Slot *prev = is->prev(); + Slot *next = is->next(); + memcpy(tempUserAttrs, ref->userAttrs(), seg.numAttrs() * sizeof(uint16)); + memcpy(is, ref, sizeof(Slot)); + is->firstChild(NULL); + is->nextSibling(NULL); + is->userAttrs(tempUserAttrs); + is->next(next); + is->prev(prev); + if (is->attachedTo()) + is->attachedTo()->child(is); + } + is->markCopied(false); + is->markDeleted(false); + } +ENDOP + +STARTOP(insert) + if (smap.decMax() <= 0) DIE; + Slot *newSlot = seg.newSlot(); + if (!newSlot) DIE; + Slot *iss = is; + while (iss && iss->isDeleted()) iss = iss->next(); + if (!iss) + { + if (seg.last()) + { + seg.last()->next(newSlot); + newSlot->prev(seg.last()); + newSlot->before(seg.last()->before()); + seg.last(newSlot); + } + else + { + seg.first(newSlot); + seg.last(newSlot); + } + } + else if (iss->prev()) + { + iss->prev()->next(newSlot); + newSlot->prev(iss->prev()); + newSlot->before(iss->prev()->after()); + } + else + { + newSlot->prev(NULL); + newSlot->before(iss->before()); + seg.first(newSlot); + } + newSlot->next(iss); + if (iss) + { + iss->prev(newSlot); + newSlot->originate(iss->original()); + newSlot->after(iss->before()); + } + else if (newSlot->prev()) + { + newSlot->originate(newSlot->prev()->original()); + newSlot->after(newSlot->prev()->after()); + } + else + { + newSlot->originate(seg.defaultOriginal()); + } + if (is == smap.highwater()) + smap.highpassed(false); + is = newSlot; + seg.extendLength(1); + if (map != &smap[-1]) + --map; +ENDOP + +STARTOP(delete_) + if (!is || is->isDeleted()) DIE + is->markDeleted(true); + if (is->prev()) + is->prev()->next(is->next()); + else + seg.first(is->next()); + + if (is->next()) + is->next()->prev(is->prev()); + else + seg.last(is->prev()); + + + if (is == smap.highwater()) + smap.highwater(is->next()); + if (is->prev()) + is = is->prev(); + seg.extendLength(-1); +ENDOP + +STARTOP(assoc) + declare_params(1); + unsigned int num = uint8(*param); + const int8 * assocs = reinterpret_cast(param+1); + use_params(num); + int max = -1; + int min = -1; + + while (num-- > 0) + { + int sr = *assocs++; + slotref ts = slotat(sr); + if (ts && (min == -1 || ts->before() < min)) min = ts->before(); + if (ts && ts->after() > max) max = ts->after(); + } + if (min > -1) // implies max > -1 + { + is->before(min); + is->after(max); + } +ENDOP + +STARTOP(cntxt_item) + // It turns out this is a cunningly disguised condition forward jump. + declare_params(3); + const int is_arg = int8(param[0]); + const size_t iskip = uint8(param[1]), + dskip = uint8(param[2]); + + if (mapb + is_arg != map) + { + ip += iskip; + dp += dskip; + push(true); + } +ENDOP + +STARTOP(attr_set) + declare_params(1); + const attrCode slat = attrCode(uint8(*param)); + const int val = pop(); + is->setAttr(&seg, slat, 0, val, smap); +ENDOP + +STARTOP(attr_add) + declare_params(1); + const attrCode slat = attrCode(uint8(*param)); + const uint32_t val = pop(); + if ((slat == gr_slatPosX || slat == gr_slatPosY) && (flags & POSITIONED) == 0) + { + seg.positionSlots(0, *smap.begin(), *(smap.end()-1), seg.currdir()); + flags |= POSITIONED; + } + uint32_t res = uint32_t(is->getAttr(&seg, slat, 0)); + is->setAttr(&seg, slat, 0, int32_t(val + res), smap); +ENDOP + +STARTOP(attr_sub) + declare_params(1); + const attrCode slat = attrCode(uint8(*param)); + const uint32_t val = pop(); + if ((slat == gr_slatPosX || slat == gr_slatPosY) && (flags & POSITIONED) == 0) + { + seg.positionSlots(0, *smap.begin(), *(smap.end()-1), seg.currdir()); + flags |= POSITIONED; + } + uint32_t res = uint32_t(is->getAttr(&seg, slat, 0)); + is->setAttr(&seg, slat, 0, int32_t(res - val), smap); +ENDOP + +STARTOP(attr_set_slot) + declare_params(1); + const attrCode slat = attrCode(uint8(*param)); + const int offset = int(map - smap.begin())*int(slat == gr_slatAttTo); + const int val = pop() + offset; + is->setAttr(&seg, slat, offset, val, smap); +ENDOP + +STARTOP(iattr_set_slot) + declare_params(2); + const attrCode slat = attrCode(uint8(param[0])); + const uint8 idx = uint8(param[1]); + const int val = int(pop() + (map - smap.begin())*int(slat == gr_slatAttTo)); + is->setAttr(&seg, slat, idx, val, smap); +ENDOP + +STARTOP(push_slot_attr) + declare_params(2); + const attrCode slat = attrCode(uint8(param[0])); + const int slot_ref = int8(param[1]); + if ((slat == gr_slatPosX || slat == gr_slatPosY) && (flags & POSITIONED) == 0) + { + seg.positionSlots(0, *smap.begin(), *(smap.end()-1), seg.currdir()); + flags |= POSITIONED; + } + slotref slot = slotat(slot_ref); + if (slot) + { + int res = slot->getAttr(&seg, slat, 0); + push(res); + } +ENDOP + +STARTOP(push_glyph_attr_obs) + declare_params(2); + const unsigned int glyph_attr = uint8(param[0]); + const int slot_ref = int8(param[1]); + slotref slot = slotat(slot_ref); + if (slot) + push(int32(seg.glyphAttr(slot->gid(), glyph_attr))); +ENDOP + +STARTOP(push_glyph_metric) + declare_params(3); + const unsigned int glyph_attr = uint8(param[0]); + const int slot_ref = int8(param[1]); + const signed int attr_level = uint8(param[2]); + slotref slot = slotat(slot_ref); + if (slot) + push(seg.getGlyphMetric(slot, glyph_attr, attr_level, dir)); +ENDOP + +STARTOP(push_feat) + declare_params(2); + const unsigned int feat = uint8(param[0]); + const int slot_ref = int8(param[1]); + slotref slot = slotat(slot_ref); + if (slot) + { + uint8 fid = seg.charinfo(slot->original())->fid(); + push(seg.getFeature(fid, feat)); + } +ENDOP + +STARTOP(push_att_to_gattr_obs) + declare_params(2); + const unsigned int glyph_attr = uint8(param[0]); + const int slot_ref = int8(param[1]); + slotref slot = slotat(slot_ref); + if (slot) + { + slotref att = slot->attachedTo(); + if (att) slot = att; + push(int32(seg.glyphAttr(slot->gid(), glyph_attr))); + } +ENDOP + +STARTOP(push_att_to_glyph_metric) + declare_params(3); + const unsigned int glyph_attr = uint8(param[0]); + const int slot_ref = int8(param[1]); + const signed int attr_level = uint8(param[2]); + slotref slot = slotat(slot_ref); + if (slot) + { + slotref att = slot->attachedTo(); + if (att) slot = att; + push(int32(seg.getGlyphMetric(slot, glyph_attr, attr_level, dir))); + } +ENDOP + +STARTOP(push_islot_attr) + declare_params(3); + const attrCode slat = attrCode(uint8(param[0])); + const int slot_ref = int8(param[1]), + idx = uint8(param[2]); + if ((slat == gr_slatPosX || slat == gr_slatPosY) && (flags & POSITIONED) == 0) + { + seg.positionSlots(0, *smap.begin(), *(smap.end()-1), seg.currdir()); + flags |= POSITIONED; + } + slotref slot = slotat(slot_ref); + if (slot) + { + int res = slot->getAttr(&seg, slat, idx); + push(res); + } +ENDOP + +#if 0 +STARTOP(push_iglyph_attr) // not implemented + NOT_IMPLEMENTED; +ENDOP +#endif + +STARTOP(pop_ret) + const uint32 ret = pop(); + EXIT(ret); +ENDOP + +STARTOP(ret_zero) + EXIT(0); +ENDOP + +STARTOP(ret_true) + EXIT(1); +ENDOP + +STARTOP(iattr_set) + declare_params(2); + const attrCode slat = attrCode(uint8(param[0])); + const uint8 idx = uint8(param[1]); + const int val = pop(); + is->setAttr(&seg, slat, idx, val, smap); +ENDOP + +STARTOP(iattr_add) + declare_params(2); + const attrCode slat = attrCode(uint8(param[0])); + const uint8 idx = uint8(param[1]); + const uint32_t val = pop(); + if ((slat == gr_slatPosX || slat == gr_slatPosY) && (flags & POSITIONED) == 0) + { + seg.positionSlots(0, *smap.begin(), *(smap.end()-1), seg.currdir()); + flags |= POSITIONED; + } + uint32_t res = uint32_t(is->getAttr(&seg, slat, idx)); + is->setAttr(&seg, slat, idx, int32_t(val + res), smap); +ENDOP + +STARTOP(iattr_sub) + declare_params(2); + const attrCode slat = attrCode(uint8(param[0])); + const uint8 idx = uint8(param[1]); + const uint32_t val = pop(); + if ((slat == gr_slatPosX || slat == gr_slatPosY) && (flags & POSITIONED) == 0) + { + seg.positionSlots(0, *smap.begin(), *(smap.end()-1), seg.currdir()); + flags |= POSITIONED; + } + uint32_t res = uint32_t(is->getAttr(&seg, slat, idx)); + is->setAttr(&seg, slat, idx, int32_t(res - val), smap); +ENDOP + +STARTOP(push_proc_state) + use_params(1); + push(1); +ENDOP + +STARTOP(push_version) + push(0x00030000); +ENDOP + +STARTOP(put_subs) + declare_params(5); + const int slot_ref = int8(param[0]); + const unsigned int input_class = uint8(param[1]) << 8 + | uint8(param[2]); + const unsigned int output_class = uint8(param[3]) << 8 + | uint8(param[4]); + slotref slot = slotat(slot_ref); + if (slot) + { + int index = seg.findClassIndex(input_class, slot->gid()); + is->setGlyph(&seg, seg.getClassGlyph(output_class, index)); + } +ENDOP + +#if 0 +STARTOP(put_subs2) // not implemented + NOT_IMPLEMENTED; +ENDOP + +STARTOP(put_subs3) // not implemented + NOT_IMPLEMENTED; +ENDOP +#endif + +STARTOP(put_glyph) + declare_params(2); + const unsigned int output_class = uint8(param[0]) << 8 + | uint8(param[1]); + is->setGlyph(&seg, seg.getClassGlyph(output_class, 0)); +ENDOP + +STARTOP(push_glyph_attr) + declare_params(3); + const unsigned int glyph_attr = uint8(param[0]) << 8 + | uint8(param[1]); + const int slot_ref = int8(param[2]); + slotref slot = slotat(slot_ref); + if (slot) + push(int32(seg.glyphAttr(slot->gid(), glyph_attr))); +ENDOP + +STARTOP(push_att_to_glyph_attr) + declare_params(3); + const unsigned int glyph_attr = uint8(param[0]) << 8 + | uint8(param[1]); + const int slot_ref = int8(param[2]); + slotref slot = slotat(slot_ref); + if (slot) + { + slotref att = slot->attachedTo(); + if (att) slot = att; + push(int32(seg.glyphAttr(slot->gid(), glyph_attr))); + } +ENDOP + +STARTOP(temp_copy) + slotref newSlot = seg.newSlot(); + if (!newSlot || !is) DIE; + int16 *tempUserAttrs = newSlot->userAttrs(); + memcpy(newSlot, is, sizeof(Slot)); + memcpy(tempUserAttrs, is->userAttrs(), seg.numAttrs() * sizeof(uint16)); + newSlot->userAttrs(tempUserAttrs); + newSlot->markCopied(true); + *map = newSlot; +ENDOP + +STARTOP(band) + binop(&); +ENDOP + +STARTOP(bor) + binop(|); +ENDOP + +STARTOP(bnot) + *sp = ~*sp; +ENDOP + +STARTOP(setbits) + declare_params(4); + const uint16 m = uint16(param[0]) << 8 + | uint8(param[1]); + const uint16 v = uint16(param[2]) << 8 + | uint8(param[3]); + *sp = ((*sp) & ~m) | v; +ENDOP + +STARTOP(set_feat) + declare_params(2); + const unsigned int feat = uint8(param[0]); + const int slot_ref = int8(param[1]); + slotref slot = slotat(slot_ref); + if (slot) + { + uint8 fid = seg.charinfo(slot->original())->fid(); + seg.setFeature(fid, feat, pop()); + } +ENDOP diff --git a/source/libs/graphite2/graphite2-src/src/json.cpp b/source/libs/graphite2/graphite2-src/src/json.cpp new file mode 100644 index 000000000..25f2190f7 --- /dev/null +++ b/source/libs/graphite2/graphite2-src/src/json.cpp @@ -0,0 +1,147 @@ +/* GRAPHITE2 LICENSING + + Copyright 2011, SIL International + All rights reserved. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should also have received a copy of the GNU Lesser General Public + License along with this library in the file named "LICENSE". + If not, write to the Free Software Foundation, 51 Franklin Street, + Suite 500, Boston, MA 02110-1335, USA or visit their web page on the + internet at http://www.fsf.org/licenses/lgpl.html. + +Alternatively, the contents of this file may be used under the terms of the +Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public +License, as published by the Free Software Foundation, either version 2 +of the License or (at your option) any later version. +*/ +// JSON debug logging +// Author: Tim Eves + +#if !defined GRAPHITE2_NTRACING + +#include +#include +#include "inc/json.h" + +#if defined(_MSC_VER) +#define FORMAT_INTMAX "%lli" +#define FORMAT_UINTMAX "%llu" +#else +#define FORMAT_INTMAX "%ji" +#define FORMAT_UINTMAX "%ju" +#endif + +using namespace graphite2; + +namespace +{ + enum + { + seq = ',', + obj='}', member=':', empty_obj='{', + arr=']', empty_arr='[' + }; +} + +const std::nullptr_t json::null = nullptr; + +inline +void json::context(const char current) throw() +{ + fprintf(_stream, "%c", *_context); + indent(); + *_context = current; +} + + +void json::indent(const int d) throw() +{ + if (*_context == member || (_flatten && _flatten < _context)) + fputc(' ', _stream); + else + fprintf(_stream, "\n%*s", 4*int(_context - _contexts + d), ""); +} + + +inline +void json::push_context(const char prefix, const char suffix) throw() +{ + assert(_context - _contexts < ptrdiff_t(sizeof _contexts)); + + if (_context == _contexts) + *_context = suffix; + else + context(suffix); + *++_context = prefix; +} + + +void json::pop_context() throw() +{ + assert(_context > _contexts); + + if (*_context == seq) indent(-1); + else fputc(*_context, _stream); + + fputc(*--_context, _stream); + if (_context == _contexts) fputc('\n', _stream); + fflush(_stream); + + if (_flatten >= _context) _flatten = 0; + *_context = seq; +} + + +// These four functions cannot be inlined as pointers to these +// functions are needed for operator << (_context_t) to work. +void json::flat(json & j) throw() { if (!j._flatten) j._flatten = j._context; } +void json::close(json & j) throw() { j.pop_context(); } +void json::object(json & j) throw() { j.push_context('{', '}'); } +void json::array(json & j) throw() { j.push_context('[', ']'); } +void json::item(json & j) throw() +{ + while (j._context > j._contexts+1 && j._context[-1] != arr) + j.pop_context(); +} + + +json & json::operator << (json::string s) throw() +{ + const char ctxt = _context[-1] == obj ? *_context == member ? seq : member : seq; + context(ctxt); + fprintf(_stream, "\"%s\"", s); + if (ctxt == member) fputc(' ', _stream); + + return *this; +} + +json & json::operator << (json::number f) throw() +{ + context(seq); + if (std::numeric_limits::infinity() == f) + fputs("Infinity", _stream); + else if (-std::numeric_limits::infinity() == f) + fputs("-Infinity", _stream); + else if (std::numeric_limits::quiet_NaN() == f || + std::numeric_limits::signaling_NaN() == f) + fputs("NaN", _stream); + else + fprintf(_stream, "%g", f); + return *this; +} +json & json::operator << (json::integer d) throw() { context(seq); fprintf(_stream, FORMAT_INTMAX, intmax_t(d)); return *this; } +json & json::operator << (json::integer_u d) throw() { context(seq); fprintf(_stream, FORMAT_UINTMAX, uintmax_t(d)); return *this; } +json & json::operator << (json::boolean b) throw() { context(seq); fputs(b ? "true" : "false", _stream); return *this; } +json & json::operator << (std::nullptr_t) throw() { context(seq); fputs("null",_stream); return *this; } + +#endif diff --git a/source/libs/graphite2/graphite2.test b/source/libs/graphite2/graphite2.test new file mode 100755 index 000000000..5121e84be --- /dev/null +++ b/source/libs/graphite2/graphite2.test @@ -0,0 +1,8 @@ +#! /bin/sh -vx +# $Id: graphite2.test 45809 2017-11-15 00:36:56Z karl $ +# Copyright 2017 Karl Berry +# Copyright 2013 Peter Breitenlohner +# You may freely use, modify and/or distribute this file. + +./gr2test || exit 1 + diff --git a/source/libs/graphite2/include/graphite2/Makefile.am b/source/libs/graphite2/include/graphite2/Makefile.am new file mode 100644 index 000000000..dfd6947a7 --- /dev/null +++ b/source/libs/graphite2/include/graphite2/Makefile.am @@ -0,0 +1,18 @@ +## Proxy Makefile.am to install graphite2 headers for TeX Live. +## +## Copyright (C) 2013 Peter Breitenlohner +## +## This file is free software; the copyright holder +## gives unlimited permission to copy and/or distribute it, +## with or without modifications, as long as this notice is preserved. +## +GRAPHITE2_INC = $(top_srcdir)/$(GRAPHITE2_TREE)/include/graphite2 + +hdr_links = \ + $(GRAPHITE2_INC)/Font.h \ + $(GRAPHITE2_INC)/Log.h \ + $(GRAPHITE2_INC)/Segment.h \ + $(GRAPHITE2_INC)/Types.h + +include $(top_srcdir)/../../am/hdr_links.am + diff --git a/source/libs/graphite2/include/graphite2/Makefile.in b/source/libs/graphite2/include/graphite2/Makefile.in new file mode 100644 index 000000000..f5080f7f8 --- /dev/null +++ b/source/libs/graphite2/include/graphite2/Makefile.in @@ -0,0 +1,431 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +subdir = include/graphite2 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/../../m4/ax_cxx_compile_stdcxx.m4 \ + $(top_srcdir)/../../m4/kpse-common.m4 \ + $(top_srcdir)/../../m4/kpse-warnings.m4 \ + $(top_srcdir)/version.ac $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/../../am/hdr_links.am +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EXEEXT = @EXEEXT@ +GRAPHITE2_TREE = @GRAPHITE2_TREE@ +HAVE_CXX11 = @HAVE_CXX11@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +WARNING_CFLAGS = @WARNING_CFLAGS@ +WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build_alias = @build_alias@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host_alias = @host_alias@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +GRAPHITE2_INC = $(top_srcdir)/$(GRAPHITE2_TREE)/include/graphite2 +hdr_links = \ + $(GRAPHITE2_INC)/Font.h \ + $(GRAPHITE2_INC)/Log.h \ + $(GRAPHITE2_INC)/Segment.h \ + $(GRAPHITE2_INC)/Types.h + +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/hdr_links.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/graphite2/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign include/graphite2/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; +$(top_srcdir)/../../am/hdr_links.am $(am__empty): + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile all-local +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-local + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am all-local check check-am clean clean-generic \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-local distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am + +.PRECIOUS: Makefile + +all-local: + @for file in $(hdr_links); do \ + test -f $$file || continue; \ + inst=`echo $$file | sed -e 's/^.*\///'`; \ + test -f $$inst || { \ + rm -f $$inst; \ + if $(AM_V_P); then echo "$(LN_S) $$file $$inst"; \ + else echo " INST $$inst"; fi; \ + $(LN_S) $$file $$inst; } || exit 1; \ + done + +distclean-local: + rm -f *.h + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/source/libs/graphite2/version.ac b/source/libs/graphite2/version.ac new file mode 100644 index 000000000..3cab71ac1 --- /dev/null +++ b/source/libs/graphite2/version.ac @@ -0,0 +1,11 @@ +dnl +dnl Copyright (C) 2012-2015 Peter Breitenlohner +dnl +dnl This file is free software; the copyright holder +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl -------------------------------------------------------- +dnl +dnl m4-include this file to define the current graphite2 version +m4_define([graphite2_version], [1.3.13]) diff --git a/source/libs/harfbuzz/ChangeLog b/source/libs/harfbuzz/ChangeLog new file mode 100644 index 000000000..737ad49db --- /dev/null +++ b/source/libs/harfbuzz/ChangeLog @@ -0,0 +1,597 @@ +2019-10-01 Akira Kakuto + + Import harfbuzz-2.6.2. + * Makefile.am, version.ac: Adjusted. + +2019-08-24 Akira Kakuto + + Import harfbuzz-2.6.1. + * version.ac: Adjusted. + +2019-08-15 Akira Kakuto + + Import harfbuzz-2.6.0. + * version.ac, Makefile.am, include/Makefile.am: Adjusted. + +2019-06-27 Akira Kakuto + + Import harfbuzz-2.5.3. + * version.ac, Makefile.am: Adjusted. + +2019-06-21 Akira Kakuto + + Import harfbuzz-2.5.2. + * version.ac, Makefile.am: Adjusted. + +2019-06-01 Akira Kakuto + + Import harfbuzz-2.5.1. + * version.ac: Adjusted. + +2019-05-30 Khaled Hosny + + * Makefile.am: Fix missing Unicode functions with + HarfBuzz 2.5.0. Drop ICU dependency. + * aclocal.m4, configure.ac, hbtest.c, include/Makefile.am: + Drop ICU dependency. + +2019-05-25 Akira Kakuto + + Import harfbuzz-2.5.0. + * version.ac, configure.ac, Makefile.am: Adjusted. + +2019-05-03 Akira Kakuto + + Import harfbuzz-2.4.0. + * version.ac: Adjusted. + +2019-01-31 Akira Kakuto + + Import harfbuzz-2.3.1. + * version.ac, Makefile.am: Adjusted. + +2018-12-22 Akira Kakuto + + Import harfbuzz-2.3.0. + * version.ac, Makefile.am, include/Makefile.am: Adjusted. + +2018-11-30 Akira Kakuto + + Import harfbuzz-2.2.0. + * version.ac, include/Makefile.am: Adjusted. + +2018-11-19 Akira Kakuto + + Import harfbuzz-2.1.3. + * version.ac, Makefile.am: Adjusted. + +2018-11-06 Akira Kakuto + + Import harfbuzz-2.1.1. + * version.ac: Adjusted. + +2018-10-31 Akira Kakuto + + Import harfbuzz-2.1.0. + * version.ac, Makefile.am, include/Makefile.am: Adjusted. + +2018-10-21 Akira Kakuto + + Import harfbuzz-2.0.2. + * version.ac: Adjusted. + +2018-10-20 Akira Kakuto + + Import harfbuzz-2.0.1. + * version.ac: Adjusted. + +2018-10-20 Akira Kakuto + + Import harfbuzz-2.0.0. + * version.ac, Makefile.am, include/Makefile.am: Adjusted. + +2018-10-20 Khaled Hosny + + * configure.ac: Set HAVE_ICU_BUILTIN. + +2018-09-11 Akira Kakuto + + Import harfbuzz-1.9.0. + * version.ac, Makefile.am: Adjusted. + +2018-08-15 Akira Kakuto + + Import harfbuzz-1.8.8. + * version.ac: Adjusted. + +2018-08-09 Akira Kakuto + + Import harfbuzz-1.8.7. + * version.ac: Adjusted. + +2018-08-07 Akira Kakuto + + Import harfbuzz-1.8.6. + * version.ac, Makefile.am: Adjusted. + +2018-08-03 Akira Kakuto + + Import harfbuzz-1.8.5. + * version.ac, Makefile.am: Adjusted. + +2018-07-18 Akira Kakuto + + Import harfbuzz-1.8.4. + * version.ac: Adjusted. + +2018-07-13 Akira Kakuto + + Import harfbuzz-1.8.3. + * configure.ac, version.ac: Adjusted. + +2018-07-04 Akira Kakuto + + Import harfbuzz-1.8.2. + +2018-06-15 Akira Kakuto + + Import harfbuzz-1.8.1. + +2018-06-06 Akira Kakuto + + Import harfbuzz-1.8.0. + * configure.ac, Makefile.am, version.ac, + include/Makefile.am: Adjusted. + +2018-03-07 Akira Kakuto + + Import harfbuzz-1.7.6. + * Makefile.am, version.ac, include/Makefile.am: Adjusted. + +2018-01-31 Akira Kakuto + + Import harfbuzz-1.7.5. + * Makefile.am, version.ac: Adjusted. + +2018-01-09 Karl Berry + + * configure.ac: use AX_CXX_COMPILE_STDCXX([11],,[optional]) + since this is supposed to work with C++11. + (KPSE_COMPILER_VISIBILITY): call this instead of hardwiring + -fvisibility-inlines-hidden. + +2017-12-26 Karl Berry + + * configure.ac (CXXFLAGS): add -D_GNU_SOURCE. + From Ken Brown, tlbuild mail 26 Dec 2017 11:09:01. + +2017-12-20 Akira Kakuto + + Import harfbuzz-1.7.4. + * version.ac: Adjusted. + +2017-12-18 Akira Kakuto + + Import harfbuzz-1.7.3. + * version.ac: Adjusted. + +2017-12-05 Akira Kakuto + + Import harfbuzz-1.7.2. + * version.ac: Adjusted. + +2017-11-15 Akira Kakuto + + Import harfbuzz-1.7.1. + * version.ac: Adjusted. + +2017-11-14 Karl Berry + + * configure.ac (KPSE_BASIC): pass Automake option no-define + to stop the #define of VERSION (and PACKAGE), which harfbuzz + and/or C++ is apparently now using for its own incompatible purposes. + * config.h.in (PACKAGE, VERSION): hence auto-removed (by aclocal). + +2017-11-13 Akira Kakuto + + Import harfbuzz-1.7.0. + * Makefile.am, version.ac: Adjusted. + +2017-10-31 Karl Berry + + * configure.ac: update AC_CHECK_FUNCS and AC_CHECK_HEADERS + for 1.6.3. + (CXXFLAGS): merge gcc additions from distribution source, + most notably including -std=c++11. + (HAVE_GCC): new conditional, also from dist source. + +2017-10-26 Akira Kakuto + + Import harfbuzz-1.6.3. + * version.ac: Adjusted. + Note that c++11 is required from the version 1.6.1. Works for + the c++11 configuration are not yet done. + +2017-10-24 Akira Kakuto + + Import harfbuzz-1.6.2. + * version.ac: Adjusted. + Note that c++11 is required from the version 1.6.1. Works for + the c++11 configuration are not yet done. + +2017-10-23 Akira Kakuto + + Import harfbuzz-1.6.1. + * Makefile.am, version.ac: Adjusted. + +2017-10-13 Akira Kakuto + + Import harfbuzz-1.6.0. + * version.ac: Adjusted. + +2017-09-06 Akira Kakuto + + Import harfbuzz-1.5.1. + * version.ac: Adjusted. + +2017-08-24 Akira Kakuto + + Import harfbuzz-1.5.0. + * version.ac: Adjusted. + +2017-08-09 Akira Kakuto + + Import harfbuzz-1.4.8. + * version.ac: Adjusted. + +2017-07-18 Akira Kakuto + + Import harfbuzz-1.4.7. + * version.ac: Adjusted. + +2017-04-27 Karl Berry + + * Makefile.am (LDADD): add $(ICU_LIBS_EXTRA). + +2017-04-24 Akira Kakuto + + Import harfbuzz-1.4.6. + * version.ac: Adjusted. + +2017-03-11 Akira Kakuto + + Import harfbuzz-1.4.5. + * version.ac: Adjusted. + +2017-03-06 Akira Kakuto + + Import harfbuzz-1.4.4. + * version.ac: Adjusted. + +2017-02-25 Akira Kakuto + + Import harfbuzz-1.4.3. + * Makefile.am, version.ac: Adjusted. + +2017-01-25 Akira Kakuto + + Import harfbuzz-1.4.2. + * include/Makefile.am, Makefile.am, version.ac: Adjusted. + +2017-01-06 Akira Kakuto + + Import harfbuzz-1.4.1. + * version.ac: Adjusted. + +2017-01-05 Akira Kakuto + + Import harfbuzz-1.4.0. + * Makefile.am, version.ac: Adjusted. + +2016-12-06 Akira Kakuto + + Import harfbuzz-1.3.4. + * Makefile.am, version.ac: Adjusted. + +2016-10-31 Karl Berry + + * include/Makefile.am (hdr_links): add hb-ot-math.h + (else xetex build fails). + +2016-10-26 Akira Kakuto + + Import harfbuzz-1.3.3. + * Makefile.am, version.ac: Adjusted. + +2016-09-28 Akira Kakuto + + Import harfbuzz-1.3.2. + * version.ac: Adjusted. + +2016-09-07 Akira Kakuto + + Import harfbuzz-1.3.1. + * version.ac: Adjusted. + +2016-07-22 Akira Kakuto + + Import harfbuzz-1.3.0. + * version.ac: Adjusted. + +2016-05-02 Akira Kakuto + + Import harfbuzz-1.2.7. + * version.ac: Adjusted. + +2016-04-09 Akira Kakuto + + Import harfbuzz-1.2.6. + * version.ac: Adjusted. + +2016-04-05 Akira Kakuto + + Import harfbuzz-1.2.5. + * version.ac: Adjusted. + +2016-03-17 Akira Kakuto + + Import harfbuzz-1.2.4. + * version.ac: Adjusted. + +2016-02-25 Akira Kakuto + + Import harfbuzz-1.2.3. + * version.ac: Adjusted. + +2016-02-24 Akira Kakuto + + Import harfbuzz-1.2.1. + * version.ac: Adjusted. + +2016-02-19 Akira Kakuto + + Import harfbuzz-1.2.0. + * version.ac: Adjusted. + +2016-02-15 Karl Berry + + * harfbuzz-PATCHES: rename from harfbuzz-src-PATCHES. + * Makefile.am (EXTRA_DIST): likewise. + +2016-01-12 Akira Kakuto + + Import harfbuzz-1.1.3. + * Makefile.am: Add hb-ot-os2-table.hh. + * version.ac: Adjusted. + +2015-12-28 Akira Kakuto + + Import harfbuzz-1.1.2. + * version.ac: Adjusted. + +2015-10-01 Peter Breitenlohner + + Import harfbuzz-1.0.4. + * version.ac: Adjusted. + +2015-09-02 Peter Breitenlohner + + Import harfbuzz-1.0.3. + * version.ac: Adjust. + +2015-08-20 Peter Breitenlohner + + Import harfbuzz-1.0.2. + * version.ac, Makefile.am: Adjust. + +2015-07-28 Peter Breitenlohner + + Import harfbuzz-1.0.1. + * version.ac, Makefile.am: Adjust. + +2015-07-06 Peter Breitenlohner + + * Makefile.am: Better dependencies for 'make check'. + +2015-06-19 Peter Breitenlohner + + Import harfbuzz-0.9.41. + * version.ac: Adjust. + +2015-03-21 Peter Breitenlohner + + Import harfbuzz-0.9.40. + * version.ac: Adjust. + +2015-03-05 Peter Breitenlohner + + Import harfbuzz-0.9.39. + * version.ac: Adjust. + +2015-02-16 Peter Breitenlohner + + * Makefile.am: Use the fragment ../../am/dist_hook.am. + +2015-01-26 Peter Breitenlohner + + Import harfbuzz-0.9.38. + * version.ac: Adjust. + +2014-12-18 Peter Breitenlohner + + Import harfbuzz-0.9.37. + * version.ac: Adjust. + +2014-11-21 Peter Breitenlohner + + Import harfbuzz-0.9.36. + * version.ac: Adjust. + +2014-08-14 Peter Breitenlohner + + Import harfbuzz-0.9.35. + * version.ac: Adjust. + +2014-08-03 Peter Breitenlohner + + Import harfbuzz-0.9.34. + * version.ac: Adjust. + +2014-07-23 Peter Breitenlohner + + Import harfbuzz-0.9.33. + * version.ac: Adjust. + +2014-07-18 Peter Breitenlohner + + Import harfbuzz-0.9.32. + * version.ac: Adjust. + +2014-07-17 Peter Breitenlohner + + Import harfbuzz-0.9.31. + * version.ac: Adjust. + +2014-07-10 Peter Breitenlohner + + Import harfbuzz-0.9.30. + * configure.ac, version.ac: Adjust. + +2014-06-16 Peter Breitenlohner + + Import harfbuzz-0.9.29. + * version.ac: Adjust. + +2014-04-29 Peter Breitenlohner + + Import harfbuzz-0.9.28. + * version.ac, Makefile.am, include/Makefile.am: Adjust. + +2014-03-19 Peter Breitenlohner + + Import harfbuzz-0.9.27. + * version.ac: Adjust. + +2014-01-31 Peter Breitenlohner + + Import harfbuzz-0.9.26. + * version.ac, Makefile.am, include/Makefile.am: Adjust. + +2013-12-05 Peter Breitenlohner + + Import harfbuzz-0.9.25. + * version.ac: Adjust. + +2013-11-14 Peter Breitenlohner + + Import harfbuzz-0.9.24. + * version.ac: Adjust. + +2013-10-29 Peter Breitenlohner + + * hbtest.c: Print more info. + +2013-10-29 Peter Breitenlohner + + Import harfbuzz-0.9.23. + * version.ac: Adjust. + +2013-10-04 Peter Breitenlohner + + Import harfbuzz-0.9.22. + * version.ac: Adjust. + +2013-09-17 Peter Breitenlohner + + Import harfbuzz-0.9.21. + * version.ac, configure.ac, Makefile.am: Adjust. + +2013-09-10 Peter Breitenlohner + + Import harfbuzz-0.9.20. + * version.ac, Makefile.am, include/Makefile.am: Adjust. + +2013-09-01 Peter Breitenlohner + + * configure.ac: Drop LT_INIT, not using Libtool. + +2013-06-02 Peter Breitenlohner + + Import harfbuzz-0.9.19. + * version.ac: Adjust. + +2012-07-06 Peter Breitenlohner + + * Makefile.am: Use ../../am/reconfig.am and ../../am/rebuild.am. + + * harfbuzz.test (new): Shell script for a basic test. + * hbtest.c (new): Source code for test program. + +2013-07-05 Peter Breitenlohner + + * include/Makefile.am: Moved Makefile fragments to ../../am/. + +2013-06-02 Peter Breitenlohner + + Import harfbuzz-0.9.18. + * version.ac, Makefile.am, configure.ac: Adjust. + +2013-04-06 Khaled Hosny + + Import harfbuzz-0.9.15. + * version.ac: Adjust. + +2013-03-22 Khaled Hosny + + Import harfbuzz-0.9.14. + * version.ac, Makefile.am: Adjust. + +2013-03-07 Khaled Hosny + + * ac/withenable.ac, configure.ac: Drop FreeType2 dependency. + * Makefile.am: Don't build hb-ft.cc, drop FreeType2 dependency. + * include/Makefile.am: Don't install hb-ft.h. + +2013-01-19 Peter Breitenlohner + + Import harfbuzz-0.9.13. + * version.ac, Makefile.am: Adjust. + +2013-01-29 Peter Breitenlohner + + * Makefile.am: Allow subdir-objects. + +2013-01-19 Peter Breitenlohner + + Import harfbuzz-0.9.12. + * version.ac: Adjust. + +2013-01-11 Peter Breitenlohner + + Import harfbuzz-0.9.11. + * version.ac: Adjust. + +2013-01-03 Khaled Hosny + + Import harfbuzz-0.9.10. + * version.ac: Adjust. + +2012-12-15 Peter Breitenlohner + + * configure.ac: Use KPSE_BASIC to enable silent rules. + +2012-12-05 Peter Breitenlohner + + Import harfbuzz-0.9.8. + * version.ac: Adjust. + * include/Makefile.am (hdr_links): Add hb-graphite2.h. + +2012-12-02 Akira Kakuto + + * hb-blob.h hb-buffer.h hb-common.h hb-font.h hb-ot-layout.h + hb-ot-tag.h hb-set.h hb-shape-plan.h hb-shape.h hb-unicode.h + hb-version.h.in in harfbuzz-0.9.7/src: disable '#error' for MSVC. + +2012-11-30 Peter Breitenlohner + + Import harfbuzz-0.9.7. diff --git a/source/libs/harfbuzz/Makefile.am b/source/libs/harfbuzz/Makefile.am new file mode 100644 index 000000000..1dc1302bb --- /dev/null +++ b/source/libs/harfbuzz/Makefile.am @@ -0,0 +1,257 @@ +## $Id: Makefile.am 52233 2019-09-30 22:08:36Z kakuto $ +## Proxy Makefile.am to build harfbuzz for TeX Live. +## +## Copyright 2016-2017 Karl Berry +## Copyright 2012-2015 Peter Breitenlohner +## +## This file is free software; the copyright holder +## gives unlimited permission to copy and/or distribute it, +## with or without modifications, as long as this notice is preserved. +## +## We want to re-distribute the whole original harfbuzz source tree. +## +EXTRA_DIST = $(HARFBUZZ_TREE) + +## Changes applied to the original source tree +## +EXTRA_DIST += TLpatches + +HARFBUZZ_SRC = $(HARFBUZZ_TREE)/src + +# Files not to be distributed +include $(srcdir)/../../am/dist_hook.am +NEVER_NAMES += $(NEVER_NAMES_SUB) + +SUBDIRS = . include + +noinst_LIBRARIES = libharfbuzz.a + +## common +AM_CPPFLAGS = -DHB_NO_MT -DHAVE_FALLBACK=1 \ + -I$(top_srcdir)/$(HARFBUZZ_SRC) +## For luahbtex we need this (and the rest ?) +AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) $(WARNING_CXXFLAGS) + +libharfbuzz_dependencies = +libharfbuzz_a_SOURCES = \ + @HARFBUZZ_TREE@/src/hb-algs.hh \ + @HARFBUZZ_TREE@/src/hb-atomic.hh \ + @HARFBUZZ_TREE@/src/hb-bimap.hh \ + @HARFBUZZ_TREE@/src/hb-blob.hh \ + @HARFBUZZ_TREE@/src/hb-blob.cc \ + @HARFBUZZ_TREE@/src/hb-buffer.hh \ + @HARFBUZZ_TREE@/src/hb-buffer-serialize.cc \ + @HARFBUZZ_TREE@/src/hb-buffer.cc \ + @HARFBUZZ_TREE@/src/hb-cache.hh \ + @HARFBUZZ_TREE@/src/hb-cff-interp-common.hh \ + @HARFBUZZ_TREE@/src/hb-cff-interp-cs-common.hh \ + @HARFBUZZ_TREE@/src/hb-cff-interp-dict-common.hh \ + @HARFBUZZ_TREE@/src/hb-cff1-interp-cs.hh \ + @HARFBUZZ_TREE@/src/hb-cff2-interp-cs.hh \ + @HARFBUZZ_TREE@/src/hb-common.cc \ + @HARFBUZZ_TREE@/src/hb-config.hh \ + @HARFBUZZ_TREE@/src/hb-debug.hh \ + @HARFBUZZ_TREE@/src/hb-dispatch.hh \ + @HARFBUZZ_TREE@/src/hb-face.hh \ + @HARFBUZZ_TREE@/src/hb-face.cc \ + @HARFBUZZ_TREE@/src/hb-font.hh \ + @HARFBUZZ_TREE@/src/hb-font.cc \ + @HARFBUZZ_TREE@/src/hb-iter.hh \ + @HARFBUZZ_TREE@/src/hb-kern.hh \ + @HARFBUZZ_TREE@/src/hb-map.hh \ + @HARFBUZZ_TREE@/src/hb-map.cc \ + @HARFBUZZ_TREE@/src/hb-machinery.hh \ + @HARFBUZZ_TREE@/src/hb-meta.hh \ + @HARFBUZZ_TREE@/src/hb-mutex.hh \ + @HARFBUZZ_TREE@/src/hb-null.hh \ + @HARFBUZZ_TREE@/src/hb-number-parser.hh \ + @HARFBUZZ_TREE@/src/hb-number.cc \ + @HARFBUZZ_TREE@/src/hb-number.hh \ + @HARFBUZZ_TREE@/src/hb-object.hh \ + @HARFBUZZ_TREE@/src/hb-open-file.hh \ + @HARFBUZZ_TREE@/src/hb-open-type.hh \ + @HARFBUZZ_TREE@/src/hb-ot-cff-common.hh \ + @HARFBUZZ_TREE@/src/hb-ot-cff1-table.cc \ + @HARFBUZZ_TREE@/src/hb-ot-cff1-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-cff2-table.cc \ + @HARFBUZZ_TREE@/src/hb-ot-cff2-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-gasp-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-color-cbdt-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-cmap-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-face.cc \ + @HARFBUZZ_TREE@/src/hb-ot-face.hh \ + @HARFBUZZ_TREE@/src/hb-ot-face-table-list.hh \ + @HARFBUZZ_TREE@/src/hb-ot-glyf-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-hdmx-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-head-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-hhea-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-hmtx-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-kern-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-maxp-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-name-language-static.hh \ + @HARFBUZZ_TREE@/src/hb-ot-name-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-stat-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-name-language.hh \ + @HARFBUZZ_TREE@/src/hb-ot-name.cc \ + @HARFBUZZ_TREE@/src/hb-ot-os2-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-os2-unicode-ranges.hh \ + @HARFBUZZ_TREE@/src/hb-pool.hh \ + @HARFBUZZ_TREE@/src/hb-ot-post-macroman.hh \ + @HARFBUZZ_TREE@/src/hb-ot-post-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-tag.cc \ + @HARFBUZZ_TREE@/src/hb-ot-tag-table.hh \ + @HARFBUZZ_TREE@/src/hb-sanitize.hh \ + @HARFBUZZ_TREE@/src/hb-serialize.hh \ + @HARFBUZZ_TREE@/src/hb-set-digest.hh \ + @HARFBUZZ_TREE@/src/hb-set.hh \ + @HARFBUZZ_TREE@/src/hb-set.cc \ + @HARFBUZZ_TREE@/src/hb-shape.cc \ + @HARFBUZZ_TREE@/src/hb-shape-plan.hh \ + @HARFBUZZ_TREE@/src/hb-shape-plan.cc \ + @HARFBUZZ_TREE@/src/hb-shaper-list.hh \ + @HARFBUZZ_TREE@/src/hb-shaper-impl.hh \ + @HARFBUZZ_TREE@/src/hb-shaper.hh \ + @HARFBUZZ_TREE@/src/hb-shaper.cc \ + @HARFBUZZ_TREE@/src/hb-static.cc \ + @HARFBUZZ_TREE@/src/hb-string-array.hh \ + @HARFBUZZ_TREE@/src/hb-subset-cff-common.cc \ + @HARFBUZZ_TREE@/src/hb-subset-cff-common.hh \ + @HARFBUZZ_TREE@/src/hb-subset-cff1.cc \ + @HARFBUZZ_TREE@/src/hb-subset-cff1.hh \ + @HARFBUZZ_TREE@/src/hb-subset-cff2.cc \ + @HARFBUZZ_TREE@/src/hb-subset-cff2.hh \ + @HARFBUZZ_TREE@/src/hb-subset-input.hh \ + @HARFBUZZ_TREE@/src/hb-subset.hh \ + @HARFBUZZ_TREE@/src/hb-ucd-table.hh \ + @HARFBUZZ_TREE@/src/hb-ucd.cc \ + @HARFBUZZ_TREE@/src/hb-unicode.hh \ + @HARFBUZZ_TREE@/src/hb-unicode.cc \ + @HARFBUZZ_TREE@/src/hb-unicode-emoji-table.hh \ + @HARFBUZZ_TREE@/src/hb-vector.hh \ + @HARFBUZZ_TREE@/src/hb-utf.hh \ + @HARFBUZZ_TREE@/src/hb-warning.cc \ + @HARFBUZZ_TREE@/src/hb-buffer-deserialize-json.hh \ + @HARFBUZZ_TREE@/src/hb-buffer-deserialize-text.hh \ + @HARFBUZZ_TREE@/src/hb-fallback-shape.cc \ + @HARFBUZZ_TREE@/src/hb.hh + +## native OpenType Layout backend +libharfbuzz_a_SOURCES += \ + @HARFBUZZ_TREE@/src/hb-aat-fdsc-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout.cc \ + @HARFBUZZ_TREE@/src/hb-aat-layout-common.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout-ankr-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout-bsln-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout-feat-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout-just-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout-kerx-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout-lcar-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout-morx-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout-opbd-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout-trak-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout.hh \ + @HARFBUZZ_TREE@/src/hb-aat-ltag-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-map.cc \ + @HARFBUZZ_TREE@/src/hb-aat-map.hh \ + @HARFBUZZ_TREE@/src/hb-array.hh \ + @HARFBUZZ_TREE@/src/hb-ot-font.cc \ + @HARFBUZZ_TREE@/src/hb-ot-layout.cc \ + @HARFBUZZ_TREE@/src/hb-ot-layout-base-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-layout-common.hh \ + @HARFBUZZ_TREE@/src/hb-ot-layout-gdef-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-layout-gpos-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-layout-gsubgpos.hh \ + @HARFBUZZ_TREE@/src/hb-ot-layout-gsub-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-layout-jstf-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-layout.hh \ + @HARFBUZZ_TREE@/src/hb-ot-color.cc \ + @HARFBUZZ_TREE@/src/hb-ot-color-colr-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-color-cpal-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-color-sbix-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-color-svg-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-map.cc \ + @HARFBUZZ_TREE@/src/hb-ot-map.hh \ + @HARFBUZZ_TREE@/src/hb-ot-math.cc \ + @HARFBUZZ_TREE@/src/hb-ot-math-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-meta-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-meta.cc \ + @HARFBUZZ_TREE@/src/hb-ot-metrics.cc \ + @HARFBUZZ_TREE@/src/hb-ot-metrics.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-arabic.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-arabic-fallback.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-arabic.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-arabic-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-arabic-win1256.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-default.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-hangul.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-hebrew.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-indic.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-indic.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-indic-table.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-khmer.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-khmer.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-myanmar.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-myanmar.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-thai.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-use.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-vowel-constraints.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-vowel-constraints.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-use-table.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-use.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-normalize.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-normalize.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-fallback.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-fallback.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape.hh \ + @HARFBUZZ_TREE@/src/hb-ot-var.cc \ + @HARFBUZZ_TREE@/src/hb-ot-var-avar-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-var-fvar-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-var-hvar-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-var-mvar-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-vorg-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-indic-machine.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-khmer-machine.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-myanmar-machine.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-use-machine.hh + +## Graphite library +AM_CPPFLAGS += $(GRAPHITE2_INCLUDES) +libharfbuzz_dependencies += $(GRAPHITE2_DEPEND) +libharfbuzz_a_SOURCES += @HARFBUZZ_TREE@/src/hb-graphite2.cc + +$(libharfbuzz_a_OBJECTS): config.force + +if build +check_PROGRAMS = hbtest +dist_check_SCRIPTS = harfbuzz.test +TESTS = harfbuzz.test +endif build +harfbuzz.log: hbtest$(EXEEXT) + +hbtest_SOURCES = hbtest.c + +# Force Automake to use CXXLD for linking +nodist_EXTRA_hbtest_SOURCES = dummy.cxx + +hbtest_CPPFLAGS = -Iinclude $(GRAPHITE2_INCLUDES) + +LDADD = libharfbuzz.a $(GRAPHITE2_LIBS) + +## Rebuild libgraphite2 +@GRAPHITE2_RULE@ + +# Reconfig +reconfig_prereq = $(libharfbuzz_dependencies) +DISTCLEANFILES = + +include $(srcdir)/../../am/reconfig.am + +# Rebuild +rebuild_prereq = +rebuild_target = all +CLEANFILES = + +include $(srcdir)/../../am/rebuild.am + diff --git a/source/libs/harfbuzz/Makefile.in b/source/libs/harfbuzz/Makefile.in new file mode 100644 index 000000000..861fbbae6 --- /dev/null +++ b/source/libs/harfbuzz/Makefile.in @@ -0,0 +1,2019 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +@build_TRUE@check_PROGRAMS = hbtest$(EXEEXT) +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/../../m4/ax_cxx_compile_stdcxx.m4 \ + $(top_srcdir)/../../m4/kpse-common.m4 \ + $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \ + $(top_srcdir)/../../m4/kpse-lib-version.m4 \ + $(top_srcdir)/../../m4/kpse-visibility.m4 \ + $(top_srcdir)/../../m4/kpse-warnings.m4 \ + $(top_srcdir)/version.ac $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__dist_check_SCRIPTS_DIST) \ + $(am__DIST_COMMON) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = hb-version.h +CONFIG_CLEAN_VPATH_FILES = +LIBRARIES = $(noinst_LIBRARIES) +AR = ar +ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = +libharfbuzz_a_AR = $(AR) $(ARFLAGS) +libharfbuzz_a_LIBADD = +am__dirstamp = $(am__leading_dot)dirstamp +am_libharfbuzz_a_OBJECTS = @HARFBUZZ_TREE@/src/hb-blob.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-buffer-serialize.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-buffer.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-common.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-face.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-font.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-map.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-number.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-cff1-table.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-cff2-table.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-face.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-name.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-tag.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-set.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-shape.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-shape-plan.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-shaper.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-static.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-subset-cff-common.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-subset-cff1.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-subset-cff2.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ucd.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-unicode.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-warning.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-fallback-shape.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-aat-layout.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-aat-map.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-font.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-layout.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-color.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-map.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-math.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-meta.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-metrics.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-shape.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-arabic.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-default.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-hangul.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-hebrew.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-indic.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-indic-table.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-khmer.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-myanmar.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-thai.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-use.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-vowel-constraints.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-use-table.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-shape-normalize.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-shape-fallback.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-ot-var.$(OBJEXT) \ + @HARFBUZZ_TREE@/src/hb-graphite2.$(OBJEXT) +libharfbuzz_a_OBJECTS = $(am_libharfbuzz_a_OBJECTS) +am_hbtest_OBJECTS = hbtest-hbtest.$(OBJEXT) +hbtest_OBJECTS = $(am_hbtest_OBJECTS) +hbtest_LDADD = $(LDADD) +am__DEPENDENCIES_1 = +hbtest_DEPENDENCIES = libharfbuzz.a $(am__DEPENDENCIES_1) +am__dist_check_SCRIPTS_DIST = harfbuzz.test +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ +depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/hbtest-dummy.Po \ + ./$(DEPDIR)/hbtest-hbtest.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-aat-layout.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-aat-map.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-blob.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer-serialize.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-common.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-face.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-fallback-shape.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-font.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-graphite2.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-map.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-number.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-cff1-table.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-cff2-table.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-color.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-face.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-font.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-layout.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-map.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-math.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-meta.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-metrics.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-name.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-arabic.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-default.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-hangul.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-hebrew.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-indic-table.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-indic.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-khmer.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-myanmar.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-thai.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-use-table.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-use.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-vowel-constraints.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-fallback.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-normalize.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-tag.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-var.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-set.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shape-plan.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shape.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shaper.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-static.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff-common.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff1.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff2.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ucd.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-unicode.Po \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-warning.Po +am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +SOURCES = $(libharfbuzz_a_SOURCES) $(hbtest_SOURCES) \ + $(nodist_EXTRA_hbtest_SOURCES) +DIST_SOURCES = $(libharfbuzz_a_SOURCES) $(hbtest_SOURCES) +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope check recheck distdir distdir-am dist dist-all \ + distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +CSCOPE = cscope +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \ + $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/../../build-aux/compile \ + $(top_srcdir)/../../build-aux/config.guess \ + $(top_srcdir)/../../build-aux/config.sub \ + $(top_srcdir)/../../build-aux/depcomp \ + $(top_srcdir)/../../build-aux/install-sh \ + $(top_srcdir)/../../build-aux/missing \ + $(top_srcdir)/../../build-aux/test-driver \ + $(top_srcdir)/harfbuzz-src/src/hb-version.h.in \ + ../../build-aux/ar-lib ../../build-aux/compile \ + ../../build-aux/config.guess ../../build-aux/config.sub \ + ../../build-aux/depcomp ../../build-aux/install-sh \ + ../../build-aux/ltmain.sh ../../build-aux/missing \ + ../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +DIST_ARCHIVES = $(distdir).tar.gz +GZIP_ENV = --best +DIST_TARGETS = dist-gzip +distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) $(WARNING_CXXFLAGS) +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GRAPHITE2_DEPEND = @GRAPHITE2_DEPEND@ +GRAPHITE2_INCLUDES = @GRAPHITE2_INCLUDES@ +GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ +GREP = @GREP@ +HARFBUZZ_TREE = @HARFBUZZ_TREE@ +HAVE_CXX11 = @HAVE_CXX11@ +HB_VERSION = @HB_VERSION@ +HB_VERSION_MAJOR = @HB_VERSION_MAJOR@ +HB_VERSION_MICRO = @HB_VERSION_MICRO@ +HB_VERSION_MINOR = @HB_VERSION_MINOR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ +VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@ +WARNING_CFLAGS = @WARNING_CFLAGS@ +WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = $(HARFBUZZ_TREE) TLpatches +HARFBUZZ_SRC = $(HARFBUZZ_TREE)/src +NEVER_DIST = `find . $(NEVER_NAMES)` + +# Files not to be distributed +NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB) +NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)' +NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' +SUBDIRS = . include +noinst_LIBRARIES = libharfbuzz.a +AM_CPPFLAGS = -DHB_NO_MT -DHAVE_FALLBACK=1 \ + -I$(top_srcdir)/$(HARFBUZZ_SRC) $(GRAPHITE2_INCLUDES) +libharfbuzz_dependencies = $(GRAPHITE2_DEPEND) +libharfbuzz_a_SOURCES = @HARFBUZZ_TREE@/src/hb-algs.hh \ + @HARFBUZZ_TREE@/src/hb-atomic.hh \ + @HARFBUZZ_TREE@/src/hb-bimap.hh @HARFBUZZ_TREE@/src/hb-blob.hh \ + @HARFBUZZ_TREE@/src/hb-blob.cc \ + @HARFBUZZ_TREE@/src/hb-buffer.hh \ + @HARFBUZZ_TREE@/src/hb-buffer-serialize.cc \ + @HARFBUZZ_TREE@/src/hb-buffer.cc \ + @HARFBUZZ_TREE@/src/hb-cache.hh \ + @HARFBUZZ_TREE@/src/hb-cff-interp-common.hh \ + @HARFBUZZ_TREE@/src/hb-cff-interp-cs-common.hh \ + @HARFBUZZ_TREE@/src/hb-cff-interp-dict-common.hh \ + @HARFBUZZ_TREE@/src/hb-cff1-interp-cs.hh \ + @HARFBUZZ_TREE@/src/hb-cff2-interp-cs.hh \ + @HARFBUZZ_TREE@/src/hb-common.cc \ + @HARFBUZZ_TREE@/src/hb-config.hh \ + @HARFBUZZ_TREE@/src/hb-debug.hh \ + @HARFBUZZ_TREE@/src/hb-dispatch.hh \ + @HARFBUZZ_TREE@/src/hb-face.hh @HARFBUZZ_TREE@/src/hb-face.cc \ + @HARFBUZZ_TREE@/src/hb-font.hh @HARFBUZZ_TREE@/src/hb-font.cc \ + @HARFBUZZ_TREE@/src/hb-iter.hh @HARFBUZZ_TREE@/src/hb-kern.hh \ + @HARFBUZZ_TREE@/src/hb-map.hh @HARFBUZZ_TREE@/src/hb-map.cc \ + @HARFBUZZ_TREE@/src/hb-machinery.hh \ + @HARFBUZZ_TREE@/src/hb-meta.hh @HARFBUZZ_TREE@/src/hb-mutex.hh \ + @HARFBUZZ_TREE@/src/hb-null.hh \ + @HARFBUZZ_TREE@/src/hb-number-parser.hh \ + @HARFBUZZ_TREE@/src/hb-number.cc \ + @HARFBUZZ_TREE@/src/hb-number.hh \ + @HARFBUZZ_TREE@/src/hb-object.hh \ + @HARFBUZZ_TREE@/src/hb-open-file.hh \ + @HARFBUZZ_TREE@/src/hb-open-type.hh \ + @HARFBUZZ_TREE@/src/hb-ot-cff-common.hh \ + @HARFBUZZ_TREE@/src/hb-ot-cff1-table.cc \ + @HARFBUZZ_TREE@/src/hb-ot-cff1-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-cff2-table.cc \ + @HARFBUZZ_TREE@/src/hb-ot-cff2-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-gasp-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-color-cbdt-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-cmap-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-face.cc \ + @HARFBUZZ_TREE@/src/hb-ot-face.hh \ + @HARFBUZZ_TREE@/src/hb-ot-face-table-list.hh \ + @HARFBUZZ_TREE@/src/hb-ot-glyf-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-hdmx-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-head-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-hhea-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-hmtx-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-kern-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-maxp-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-name-language-static.hh \ + @HARFBUZZ_TREE@/src/hb-ot-name-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-stat-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-name-language.hh \ + @HARFBUZZ_TREE@/src/hb-ot-name.cc \ + @HARFBUZZ_TREE@/src/hb-ot-os2-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-os2-unicode-ranges.hh \ + @HARFBUZZ_TREE@/src/hb-pool.hh \ + @HARFBUZZ_TREE@/src/hb-ot-post-macroman.hh \ + @HARFBUZZ_TREE@/src/hb-ot-post-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-tag.cc \ + @HARFBUZZ_TREE@/src/hb-ot-tag-table.hh \ + @HARFBUZZ_TREE@/src/hb-sanitize.hh \ + @HARFBUZZ_TREE@/src/hb-serialize.hh \ + @HARFBUZZ_TREE@/src/hb-set-digest.hh \ + @HARFBUZZ_TREE@/src/hb-set.hh @HARFBUZZ_TREE@/src/hb-set.cc \ + @HARFBUZZ_TREE@/src/hb-shape.cc \ + @HARFBUZZ_TREE@/src/hb-shape-plan.hh \ + @HARFBUZZ_TREE@/src/hb-shape-plan.cc \ + @HARFBUZZ_TREE@/src/hb-shaper-list.hh \ + @HARFBUZZ_TREE@/src/hb-shaper-impl.hh \ + @HARFBUZZ_TREE@/src/hb-shaper.hh \ + @HARFBUZZ_TREE@/src/hb-shaper.cc \ + @HARFBUZZ_TREE@/src/hb-static.cc \ + @HARFBUZZ_TREE@/src/hb-string-array.hh \ + @HARFBUZZ_TREE@/src/hb-subset-cff-common.cc \ + @HARFBUZZ_TREE@/src/hb-subset-cff-common.hh \ + @HARFBUZZ_TREE@/src/hb-subset-cff1.cc \ + @HARFBUZZ_TREE@/src/hb-subset-cff1.hh \ + @HARFBUZZ_TREE@/src/hb-subset-cff2.cc \ + @HARFBUZZ_TREE@/src/hb-subset-cff2.hh \ + @HARFBUZZ_TREE@/src/hb-subset-input.hh \ + @HARFBUZZ_TREE@/src/hb-subset.hh \ + @HARFBUZZ_TREE@/src/hb-ucd-table.hh \ + @HARFBUZZ_TREE@/src/hb-ucd.cc \ + @HARFBUZZ_TREE@/src/hb-unicode.hh \ + @HARFBUZZ_TREE@/src/hb-unicode.cc \ + @HARFBUZZ_TREE@/src/hb-unicode-emoji-table.hh \ + @HARFBUZZ_TREE@/src/hb-vector.hh @HARFBUZZ_TREE@/src/hb-utf.hh \ + @HARFBUZZ_TREE@/src/hb-warning.cc \ + @HARFBUZZ_TREE@/src/hb-buffer-deserialize-json.hh \ + @HARFBUZZ_TREE@/src/hb-buffer-deserialize-text.hh \ + @HARFBUZZ_TREE@/src/hb-fallback-shape.cc \ + @HARFBUZZ_TREE@/src/hb.hh \ + @HARFBUZZ_TREE@/src/hb-aat-fdsc-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout.cc \ + @HARFBUZZ_TREE@/src/hb-aat-layout-common.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout-ankr-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout-bsln-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout-feat-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout-just-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout-kerx-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout-lcar-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout-morx-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout-opbd-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout-trak-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-layout.hh \ + @HARFBUZZ_TREE@/src/hb-aat-ltag-table.hh \ + @HARFBUZZ_TREE@/src/hb-aat-map.cc \ + @HARFBUZZ_TREE@/src/hb-aat-map.hh \ + @HARFBUZZ_TREE@/src/hb-array.hh \ + @HARFBUZZ_TREE@/src/hb-ot-font.cc \ + @HARFBUZZ_TREE@/src/hb-ot-layout.cc \ + @HARFBUZZ_TREE@/src/hb-ot-layout-base-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-layout-common.hh \ + @HARFBUZZ_TREE@/src/hb-ot-layout-gdef-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-layout-gpos-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-layout-gsubgpos.hh \ + @HARFBUZZ_TREE@/src/hb-ot-layout-gsub-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-layout-jstf-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-layout.hh \ + @HARFBUZZ_TREE@/src/hb-ot-color.cc \ + @HARFBUZZ_TREE@/src/hb-ot-color-colr-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-color-cpal-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-color-sbix-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-color-svg-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-map.cc \ + @HARFBUZZ_TREE@/src/hb-ot-map.hh \ + @HARFBUZZ_TREE@/src/hb-ot-math.cc \ + @HARFBUZZ_TREE@/src/hb-ot-math-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-meta-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-meta.cc \ + @HARFBUZZ_TREE@/src/hb-ot-metrics.cc \ + @HARFBUZZ_TREE@/src/hb-ot-metrics.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-arabic.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-arabic-fallback.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-arabic.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-arabic-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-arabic-win1256.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-default.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-hangul.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-hebrew.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-indic.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-indic.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-indic-table.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-khmer.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-khmer.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-myanmar.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-myanmar.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-thai.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-use.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-vowel-constraints.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-vowel-constraints.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-use-table.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-use.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-normalize.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-normalize.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape-fallback.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-fallback.cc \ + @HARFBUZZ_TREE@/src/hb-ot-shape.hh \ + @HARFBUZZ_TREE@/src/hb-ot-var.cc \ + @HARFBUZZ_TREE@/src/hb-ot-var-avar-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-var-fvar-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-var-hvar-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-var-mvar-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-vorg-table.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-indic-machine.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-khmer-machine.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-myanmar-machine.hh \ + @HARFBUZZ_TREE@/src/hb-ot-shape-complex-use-machine.hh \ + @HARFBUZZ_TREE@/src/hb-graphite2.cc +@build_TRUE@dist_check_SCRIPTS = harfbuzz.test +@build_TRUE@TESTS = harfbuzz.test +hbtest_SOURCES = hbtest.c + +# Force Automake to use CXXLD for linking +nodist_EXTRA_hbtest_SOURCES = dummy.cxx +hbtest_CPPFLAGS = -Iinclude $(GRAPHITE2_INCLUDES) +LDADD = libharfbuzz.a $(GRAPHITE2_LIBS) + +# Reconfig +reconfig_prereq = $(libharfbuzz_dependencies) +DISTCLEANFILES = config.force + +# Rebuild +rebuild_prereq = +rebuild_target = all +CLEANFILES = rebuild.stamp +all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +.SUFFIXES: +.SUFFIXES: .c .cc .cxx .log .o .obj .test .test$(EXEEXT) .trs +am--refresh: Makefile + @: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ + esac; +$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty): + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + $(am__cd) $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): + +config.h: stamp-h1 + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) + rm -f stamp-h1 + touch $@ + +distclean-hdr: + -rm -f config.h stamp-h1 +hb-version.h: $(top_builddir)/config.status $(top_srcdir)/harfbuzz-src/src/hb-version.h.in + cd $(top_builddir) && $(SHELL) ./config.status $@ + +clean-checkPROGRAMS: + -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) +@HARFBUZZ_TREE@/src/$(am__dirstamp): + @$(MKDIR_P) @HARFBUZZ_TREE@/src + @: > @HARFBUZZ_TREE@/src/$(am__dirstamp) +@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) @HARFBUZZ_TREE@/src/$(DEPDIR) + @: > @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-blob.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-buffer-serialize.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-buffer.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-common.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-face.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-font.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-map.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-number.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-cff1-table.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-cff2-table.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-face.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-name.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-tag.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-set.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-shape.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-shape-plan.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-shaper.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-static.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-subset-cff-common.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-subset-cff1.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-subset-cff2.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ucd.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-unicode.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-warning.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-fallback-shape.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-aat-layout.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-aat-map.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-font.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-layout.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-color.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-map.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-math.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-meta.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-metrics.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-shape.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-shape-complex-arabic.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-shape-complex-default.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-shape-complex-hangul.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-shape-complex-hebrew.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-shape-complex-indic.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-shape-complex-indic-table.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-shape-complex-khmer.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-shape-complex-myanmar.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-shape-complex-thai.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-shape-complex-use.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-shape-complex-vowel-constraints.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-shape-complex-use-table.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-shape-normalize.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-shape-fallback.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-ot-var.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@HARFBUZZ_TREE@/src/hb-graphite2.$(OBJEXT): \ + @HARFBUZZ_TREE@/src/$(am__dirstamp) \ + @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) + +libharfbuzz.a: $(libharfbuzz_a_OBJECTS) $(libharfbuzz_a_DEPENDENCIES) $(EXTRA_libharfbuzz_a_DEPENDENCIES) + $(AM_V_at)-rm -f libharfbuzz.a + $(AM_V_AR)$(libharfbuzz_a_AR) libharfbuzz.a $(libharfbuzz_a_OBJECTS) $(libharfbuzz_a_LIBADD) + $(AM_V_at)$(RANLIB) libharfbuzz.a + +hbtest$(EXEEXT): $(hbtest_OBJECTS) $(hbtest_DEPENDENCIES) $(EXTRA_hbtest_DEPENDENCIES) + @rm -f hbtest$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(hbtest_OBJECTS) $(hbtest_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + -rm -f @HARFBUZZ_TREE@/src/*.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hbtest-dummy.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hbtest-hbtest.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-aat-layout.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-aat-map.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-blob.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer-serialize.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-common.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-face.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-fallback-shape.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-font.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-graphite2.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-map.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-number.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-cff1-table.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-cff2-table.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-color.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-face.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-font.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-layout.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-map.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-math.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-meta.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-metrics.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-name.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-arabic.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-default.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-hangul.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-hebrew.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-indic-table.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-indic.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-khmer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-myanmar.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-thai.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-use-table.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-use.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-vowel-constraints.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-fallback.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-normalize.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-tag.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-var.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-set.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shape-plan.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shape.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shaper.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-static.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff-common.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff1.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff2.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ucd.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-unicode.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-warning.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +hbtest-hbtest.o: hbtest.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hbtest-hbtest.o -MD -MP -MF $(DEPDIR)/hbtest-hbtest.Tpo -c -o hbtest-hbtest.o `test -f 'hbtest.c' || echo '$(srcdir)/'`hbtest.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hbtest-hbtest.Tpo $(DEPDIR)/hbtest-hbtest.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hbtest.c' object='hbtest-hbtest.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hbtest-hbtest.o `test -f 'hbtest.c' || echo '$(srcdir)/'`hbtest.c + +hbtest-hbtest.obj: hbtest.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hbtest-hbtest.obj -MD -MP -MF $(DEPDIR)/hbtest-hbtest.Tpo -c -o hbtest-hbtest.obj `if test -f 'hbtest.c'; then $(CYGPATH_W) 'hbtest.c'; else $(CYGPATH_W) '$(srcdir)/hbtest.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hbtest-hbtest.Tpo $(DEPDIR)/hbtest-hbtest.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hbtest.c' object='hbtest-hbtest.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hbtest-hbtest.obj `if test -f 'hbtest.c'; then $(CYGPATH_W) 'hbtest.c'; else $(CYGPATH_W) '$(srcdir)/hbtest.c'; fi` + +.cc.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cc.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +hbtest-dummy.o: dummy.cxx +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbtest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hbtest-dummy.o -MD -MP -MF $(DEPDIR)/hbtest-dummy.Tpo -c -o hbtest-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hbtest-dummy.Tpo $(DEPDIR)/hbtest-dummy.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='dummy.cxx' object='hbtest-dummy.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbtest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hbtest-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx + +hbtest-dummy.obj: dummy.cxx +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbtest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hbtest-dummy.obj -MD -MP -MF $(DEPDIR)/hbtest-dummy.Tpo -c -o hbtest-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hbtest-dummy.Tpo $(DEPDIR)/hbtest-dummy.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='dummy.cxx' object='hbtest-dummy.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbtest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hbtest-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi` + +.cxx.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cxx.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +# This directory's subdirectories are mostly independent; you can cd +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files + +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ + fi; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ + else \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ + fi; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ + else \ + color_start= color_end=; \ + fi; \ + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: $(check_PROGRAMS) $(dist_check_SCRIPTS) + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) $(dist_check_SCRIPTS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + $(am__remove_distdir) + test -d "$(distdir)" || mkdir "$(distdir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r "$(distdir)" +dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz + $(am__post_remove_distdir) + +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) + +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) + +dist-tarZ: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__post_remove_distdir) + +dist-shar: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz + $(am__post_remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__post_remove_distdir) + +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst + chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=../.. --prefix="$$dc_install_base" \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 + $(am__post_remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' +distuninstallcheck: + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) \ + $(dist_check_SCRIPTS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS +check: check-recursive +all-am: Makefile $(LIBRARIES) config.h +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) + -rm -f @HARFBUZZ_TREE@/src/$(am__dirstamp) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-checkPROGRAMS clean-generic clean-noinstLIBRARIES \ + mostlyclean-am + +distclean: distclean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f ./$(DEPDIR)/hbtest-dummy.Po + -rm -f ./$(DEPDIR)/hbtest-hbtest.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-aat-layout.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-aat-map.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-blob.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer-serialize.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-common.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-face.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-fallback-shape.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-font.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-graphite2.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-map.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-number.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-cff1-table.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-cff2-table.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-color.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-face.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-font.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-layout.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-map.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-math.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-meta.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-metrics.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-name.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-arabic.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-default.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-hangul.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-hebrew.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-indic-table.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-indic.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-khmer.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-myanmar.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-thai.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-use-table.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-use.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-vowel-constraints.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-fallback.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-normalize.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-tag.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-var.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-set.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shape-plan.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shape.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shaper.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-static.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff-common.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff1.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff2.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ucd.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-unicode.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-warning.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-hdr distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f ./$(DEPDIR)/hbtest-dummy.Po + -rm -f ./$(DEPDIR)/hbtest-hbtest.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-aat-layout.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-aat-map.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-blob.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer-serialize.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-common.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-face.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-fallback-shape.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-font.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-graphite2.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-map.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-number.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-cff1-table.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-cff2-table.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-color.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-face.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-font.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-layout.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-map.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-math.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-meta.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-metrics.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-name.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-arabic.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-default.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-hangul.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-hebrew.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-indic-table.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-indic.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-khmer.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-myanmar.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-thai.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-use-table.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-use.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-complex-vowel-constraints.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-fallback.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-normalize.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-tag.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-var.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-set.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shape-plan.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shape.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shaper.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-static.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff-common.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff1.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff2.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ucd.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-unicode.Po + -rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-warning.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(am__recursive_targets) all check-am install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--depfiles am--refresh check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-cscope clean-generic \ + clean-noinstLIBRARIES cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-compile distclean-generic distclean-hdr \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile + +dist-hook: + cd "$(distdir)" && rm -rf $(NEVER_DIST) + +$(libharfbuzz_a_OBJECTS): config.force +harfbuzz.log: hbtest$(EXEEXT) + +@GRAPHITE2_RULE@ +config.force: $(reconfig_prereq) + @if test -f $@; then :; else \ + trap 'rm -rf reconfig.lock' 1 2 13 15; \ + if mkdir reconfig.lock 2>/dev/null; then \ + echo timestamp >$@; \ + $(SHELL) ./config.status --recheck; \ + rmdir reconfig.lock; \ + else \ + while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ + test -f $@; \ + fi; \ + fi +rebuild.stamp: $(rebuild_target) + echo timestamp >$@ + +.PHONY: rebuild +rebuild: $(rebuild_prereq) + @dry=; for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=*|--*);; \ + *n*) dry=:;; \ + esac; \ + done; \ + if test -f rebuild.stamp; then :; else \ + $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \ + if $$dry mkdir rebuild.lock 2>/dev/null; then \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ + $$dry rmdir rebuild.lock; \ + else \ + while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ + fi; \ + $$dry test -f rebuild.stamp; exit $$?; \ + fi + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/source/libs/harfbuzz/TLpatches/ChangeLog b/source/libs/harfbuzz/TLpatches/ChangeLog new file mode 100644 index 000000000..29bc18d0d --- /dev/null +++ b/source/libs/harfbuzz/TLpatches/ChangeLog @@ -0,0 +1,399 @@ +2019-10-01 Akira Kakuto + + Imported harfbuzz-2.6.2 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2019-08-24 Akira Kakuto + + Imported harfbuzz-2.6.1 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2019-08-15 Akira Kakuto + + Imported harfbuzz-2.6.0 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2019-06-27 Akira Kakuto + + Imported harfbuzz-2.5.3 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2019-06-21 Akira Kakuto + + Imported harfbuzz-2.5.2 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2019-06-01 Akira Kakuto + + Imported harfbuzz-2.5.1 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2019-05-25 Akira Kakuto + + Imported harfbuzz-2.5.0 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2019-05-03 Akira Kakuto + + Imported harfbuzz-2.4.0 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + patch-01-solaris: Removed. + +2019-02-01 Mojca Miklavec + + Upstream patch to fix build issue on Solaris + +2019-01-31 Akira Kakuto + + Imported harfbuzz-2.3.1 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-12-22 Akira Kakuto + + Imported harfbuzz-2.3.0 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-11-30 Akira Kakuto + + Imported harfbuzz-2.2.0 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-11-19 Akira Kakuto + + Imported harfbuzz-2.1.3 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-11-06 Akira Kakuto + + Imported harfbuzz-2.1.1 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-10-31 Akira Kakuto + + Imported harfbuzz-2.1.0 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-10-21 Akira Kakuto + + Imported harfbuzz-2.0.2 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-10-20 Akira Kakuto + + Imported harfbuzz-2.0.1 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-10-20 Akira Kakuto + + Imported harfbuzz-2.0.0 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-09-11 Akira Kakuto + + Imported harfbuzz-1.9.0 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-08-15 Akira Kakuto + + Imported harfbuzz-1.8.8 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-08-09 Akira Kakuto + + Imported harfbuzz-1.8.7 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-08-07 Akira Kakuto + + Imported harfbuzz-1.8.6 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-08-03 Akira Kakuto + + Imported harfbuzz-1.8.5 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-07-18 Akira Kakuto + + Imported harfbuzz-1.8.4 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-07-13 Akira Kakuto + + Imported harfbuzz-1.8.3 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-07-04 Akira Kakuto + + Imported harfbuzz-1.8.2 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-06-15 Akira Kakuto + + Imported harfbuzz-1.8.1 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-06-06 Akira Kakuto + + Imported harfbuzz-1.8.0 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-03-07 Akira Kakuto + + Imported harfbuzz-1.7.6 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2018-01-31 Akira Kakuto + + Imported harfbuzz-1.7.5 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-12-20 Akira Kakuto + + Imported harfbuzz-1.7.4 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-12-18 Akira Kakuto + + Imported harfbuzz-1.7.3 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-12-05 Akira Kakuto + + Imported harfbuzz-1.7.2 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-11-15 Akira Kakuto + + Imported harfbuzz-1.7.1 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-11-13 Akira Kakuto + + Imported harfbuzz-1.7.0 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-10-26 Akira Kakuto + + Imported harfbuzz-1.6.3 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-10-24 Akira Kakuto + + Imported harfbuzz-1.6.2 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-10-23 Akira Kakuto + + Imported harfbuzz-1.6.1 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-10-13 Akira Kakuto + + Imported harfbuzz-1.6.0 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-09-06 Akira Kakuto + + Imported harfbuzz-1.5.1 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-08-24 Akira Kakuto + + Imported harfbuzz-1.5.0 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-08-09 Akira Kakuto + + Imported harfbuzz-1.4.8 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-07-18 Akira Kakuto + + Imported harfbuzz-1.4.7 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-04-24 Akira Kakuto + + Imported harfbuzz-1.4.6 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-03-11 Akira Kakuto + + Imported harfbuzz-1.4.5 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-03-06 Akira Kakuto + + Imported harfbuzz-1.4.4 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-02-25 Akira Kakuto + + Imported harfbuzz-1.4.3 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-01-25 Akira Kakuto + + Imported harfbuzz-1.4.2 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-01-06 Akira Kakuto + + Imported harfbuzz-1.4.1 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-01-05 Akira Kakuto + + Imported harfbuzz-1.4.0 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-12-06 Akira Kakuto + + Imported harfbuzz-1.3.4 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-10-26 Akira Kakuto + + Imported harfbuzz-1.3.3 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-09-28 Akira Kakuto + + Imported harfbuzz-1.3.2 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-09-07 Akira Kakuto + + Imported harfbuzz-1.3.1 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-07-22 Akira Kakuto + + Imported harfbuzz-1.3.0 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-05-02 Akira Kakuto + + Imported harfbuzz-1.2.7 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-04-09 Akira Kakuto + + Imported harfbuzz-1.2.6 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-04-05 Akira Kakuto + + Imported harfbuzz-1.2.5 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-03-17 Akira Kakuto + + Imported harfbuzz-1.2.4 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-02-25 Akira Kakuto + + Imported harfbuzz-1.2.3 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-02-24 Akira Kakuto + + Imported harfbuzz-1.2.1 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-02-19 Akira Kakuto + + Imported harfbuzz-1.2.0 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-01-12 Akira Kakuto + + Imported harfbuzz-1.1.3 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2015-12-28 Akira Kakuto + + Imported harfbuzz-1.1.2 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2014-07-23 Peter Breitenlohner + + Imported harfbuzz-0.9.33 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + + * patch-01-cygwin (removed): Applied upstream. + +2014-07-18 Peter Breitenlohner + + Imported harfbuzz-0.9.32 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + + * patch-01-cygwin: Adapted. + +2014-07-17 Peter Breitenlohner + + Imported harfbuzz-0.9.31 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + + * patch-01-cygwin: Adapted. + +2014-07-10 Peter Breitenlohner + + Imported harfbuzz-0.9.30 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + + * patch-01-cygwin: Adapted. + +2014-06-23 Peter Breitenlohner + + * patch-01-cygwin (new): Avoid 'not supported' warnings. + +2014-06-16 Peter Breitenlohner + + Imported harfbuzz-0.9.29 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2013-01-11 Peter Breitenlohner + + Imported harfbuzz-0.9.11 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + * patch-01-const (removed): Applied upstream. + +2013-01-04 Peter Breitenlohner + + * patch-01-const (new): Backport from upstream. + +2013-01-03 Khaled Hosny + + Imported harfbuzz-0.9.10 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + * patch-03-VOID (removed): Applied upstream. + * patch-04-MSV (removed): ditto. + +2012-12-06 Peter Breitenlohner + + * patch-04-MSV (new): From Akira for MS Visual Studio 2005. + +2012-12-05 Peter Breitenlohner + + Imported harfbuzz-0.9.8 source tree from: + http://cgit.freedesktop.org/harfbuzz/ + * patch-01-Khaled (removed): Now distributed, with + hb_ot_layout_position_get_size() renamed into + hb_ot_layout_get_size_params(). + * patch-02-oldmsvc (removed): Not needed. + +2012-12-02 Akira Kakuto + + * patch-02-oldmsvc (new): #error is not recognized by old msvcs. + +2012-11-30 Peter Breitenlohner + + * patch-01-Khaled (new): Partial update from git, from Khaled. + +2012-11-29 Peter Breitenlohner + + Imported harfbuzz-0.9.7 source tree from: + http://cgit.freedesktop.org/harfbuzz/ diff --git a/source/libs/harfbuzz/TLpatches/TL-Changes b/source/libs/harfbuzz/TLpatches/TL-Changes new file mode 100644 index 000000000..0151695d8 --- /dev/null +++ b/source/libs/harfbuzz/TLpatches/TL-Changes @@ -0,0 +1,26 @@ +Changes applied to the harfbuzz-2.6.2/ tree as obtained from: + http://www.freedesktop.org/software/harfbuzz/release/ + +Removed: + COPYING + INSTALL + Makefile.in + aclocal.m4 + ar-lib + compile + config.guess + config.sub + configure + depcomp + install-sh + ltmain.sh + missing + src/Makefile.in + src/hb-version.h + test-driver + +Removed unused dirs: + docs + m4 + test + util diff --git a/source/libs/harfbuzz/ac/harfbuzz.ac b/source/libs/harfbuzz/ac/harfbuzz.ac new file mode 100644 index 000000000..8e1a17c3a --- /dev/null +++ b/source/libs/harfbuzz/ac/harfbuzz.ac @@ -0,0 +1,9 @@ +## libs/harfbuzz/ac/harfbuzz.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/ +dnl +dnl Copyright (C) 2012 Peter Breitenlohner +dnl You may freely use, modify and/or distribute this file. +dnl +## basic check of system harfbuzz +KPSE_TRY_LIB([harfbuzz], + [#include ], + [const char *v = hb_version_string();]) diff --git a/source/libs/harfbuzz/ac/withenable.ac b/source/libs/harfbuzz/ac/withenable.ac new file mode 100644 index 000000000..bf93d3c17 --- /dev/null +++ b/source/libs/harfbuzz/ac/withenable.ac @@ -0,0 +1,7 @@ +## libs/harfbuzz/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/ +dnl +dnl Copyright (C) 2012 Peter Breitenlohner +dnl You may freely use, modify and/or distribute this file. +dnl +## configure options and TL libraries required for harfbuzz +KPSE_WITH_LIB([harfbuzz], [graphite2 icu]) diff --git a/source/libs/harfbuzz/aclocal.m4 b/source/libs/harfbuzz/aclocal.m4 new file mode 100644 index 000000000..dcdd42ded --- /dev/null +++ b/source/libs/harfbuzz/aclocal.m4 @@ -0,0 +1,1177 @@ +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- + +# Copyright (C) 1996-2018 Free Software Foundation, Inc. + +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) + +# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.16' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.16.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.16.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is '.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + + +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) + shift + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf + do + # Strip MF so we end up with the name of the file. + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? + done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.65])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST([install_sh])]) + +# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MAKE_INCLUDE() +# ----------------- +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. +AC_DEFUN([AM_MAKE_INCLUDE], +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' +am__doit: + @echo this is the am__doit target >confinc.out +.PHONY: am__doit +END +am__include="#" +am__quote= +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + AC_MSG_WARN(['missing' script is too old or missing]) +fi +]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# -------------------- +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) + +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) + +# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor 'install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in "make install-strip", and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +# +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' + +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + +m4_include([../../m4/ax_cxx_compile_stdcxx.m4]) +m4_include([../../m4/kpse-common.m4]) +m4_include([../../m4/kpse-graphite2-flags.m4]) +m4_include([../../m4/kpse-lib-version.m4]) +m4_include([../../m4/kpse-visibility.m4]) +m4_include([../../m4/kpse-warnings.m4]) diff --git a/source/libs/harfbuzz/config.h.in b/source/libs/harfbuzz/config.h.in new file mode 100644 index 000000000..cd59a8d1a --- /dev/null +++ b/source/libs/harfbuzz/config.h.in @@ -0,0 +1,131 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* The normal alignment of `struct{char;}', in bytes. */ +#undef ALIGNOF_STRUCT_CHAR__ + +/* Define to 1 if you have the `atexit' function. */ +#undef HAVE_ATEXIT + +/* Use cairo graphics library */ +#undef HAVE_CAIRO + +/* Use cairo-ft support in cairo graphics library */ +#undef HAVE_CAIRO_FT + +/* Use Core Text backend */ +#undef HAVE_CORETEXT + +/* define if the compiler supports basic C++11 syntax */ +#undef HAVE_CXX11 + +/* Define to 1 if you have the declaration of `round', and to 0 if you don't. + */ +#undef HAVE_DECL_ROUND + +/* Define to 1 if you have the `getpagesize' function. */ +#undef HAVE_GETPAGESIZE + +/* Use glib2 library */ +#undef HAVE_GLIB + +/* Use gobject2 library */ +#undef HAVE_GOBJECT + +/* Use Graphite library */ +#undef HAVE_GRAPHITE2 + +/* Use gthread2 library */ +#undef HAVE_GTHREAD + +/* Use Intel __sync_* atomic primitives */ +#undef HAVE_INTEL_ATOMIC_PRIMITIVES + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `isatty' function. */ +#undef HAVE_ISATTY + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `mmap' function. */ +#undef HAVE_MMAP + +/* Define to 1 if you have the `mprotect' function. */ +#undef HAVE_MPROTECT + +/* Define to 1 if you have the `newlocale' function. */ +#undef HAVE_NEWLOCALE + +/* Use native OpenType Layout backend */ +#undef HAVE_OT + +/* Define to 1 if you have the `posix_memalign' function. */ +#undef HAVE_POSIX_MEMALIGN + +/* Use POSIX threads */ +#undef HAVE_PTHREAD + +/* Define to 1 if you have the `round' function. */ +#undef HAVE_ROUND + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDBOOL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strtod_l' function. */ +#undef HAVE_STRTOD_L + +/* Define to 1 if you have the `sysconf' function. */ +#undef HAVE_SYSCONF + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_MMAN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Use Uniscribe backend */ +#undef HAVE_UNISCRIBE + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_XLOCALE_H + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS diff --git a/source/libs/harfbuzz/configure b/source/libs/harfbuzz/configure new file mode 100755 index 000000000..ebf0c8f11 --- /dev/null +++ b/source/libs/harfbuzz/configure @@ -0,0 +1,8848 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. +# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 2.6.2. +# +# Report bugs to . +# +# +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false +done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org and tex-k@tug.org +$0: about your system, including any error possibly output +$0: before this message. Then install a modern shell, or +$0: manually run the script under such a shell if you do +$0: have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + + + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +test -n "$DJDIR" || exec 7<&0 &1 + +# Name of the host. +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +# +# Initializations. +# +ac_default_prefix=/usr/local +ac_clean_files= +ac_config_libobj_dir=. +LIBOBJS= +cross_compiling=no +subdirs= +MFLAGS= +MAKEFLAGS= + +# Identity of this package. +PACKAGE_NAME='harfbuzz (TeX Live)' +PACKAGE_TARNAME='harfbuzz--tex-live-' +PACKAGE_VERSION='2.6.2' +PACKAGE_STRING='harfbuzz (TeX Live) 2.6.2' +PACKAGE_BUGREPORT='tex-k@tug.org' +PACKAGE_URL='' + +ac_unique_file="harfbuzz-src/src/harfbuzz.pc.in" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include +# endif +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_INTTYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif" + +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS +LIBOBJS +HARFBUZZ_TREE +build_FALSE +build_TRUE +AM_CXXFLAGS +HAVE_GCC_FALSE +HAVE_GCC_TRUE +EGREP +GREP +CPP +GRAPHITE2_RULE +GRAPHITE2_DEPEND +GRAPHITE2_LIBS +GRAPHITE2_INCLUDES +PKG_CONFIG +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +VISIBILITY_CXXFLAGS +VISIBILITY_CFLAGS +HAVE_CXX11 +LN_S +RANLIB +WARNING_CXXFLAGS +am__fastdepCXX_FALSE +am__fastdepCXX_TRUE +CXXDEPMODE +ac_ct_CXX +CXXFLAGS +CXX +HB_VERSION +HB_VERSION_MICRO +HB_VERSION_MINOR +HB_VERSION_MAJOR +WARNING_CFLAGS +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +am__nodep +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__include +DEPDIR +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +MAINT +MAINTAINER_MODE_FALSE +MAINTAINER_MODE_TRUE +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL +am__quote' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_silent_rules +enable_maintainer_mode +enable_dependency_tracking +enable_compiler_warnings +with_system_graphite2 +' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CXX +CXXFLAGS +CCC +CPP' + + +# Initialize some variables set by options. +ac_init_help= +ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= +# The variables have the same names as the options, with +# dashes changed to underlines. +cache_file=/dev/null +exec_prefix=NONE +no_create= +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +verbose= +x_includes=NONE +x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datarootdir='${prefix}/share' +datadir='${datarootdir}' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +includedir='${prefix}/include' +oldincludedir='/usr/include' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' + +ac_prev= +ac_dashdash= +for ac_option +do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval $ac_prev=\$ac_option + ac_prev= + continue + fi + + case $ac_option in + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; + + -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; + + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; + + -with-* | --with-*) + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac +done + +if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + as_fn_error $? "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir +do + eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" +done + +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi + +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- + +test "$silent" = yes && exec 6>/dev/null + + +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + as_fn_error $? "working directory cannot be determined" +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + as_fn_error $? "pwd does not report name of working directory" + + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done + +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +\`configure' configures harfbuzz (TeX Live) 2.6.2 to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root + [DATAROOTDIR/doc/harfbuzz--tex-live-] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] +_ACEOF + + cat <<\_ACEOF + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] +_ACEOF +fi + +if test -n "$ac_init_help"; then + case $ac_init_help in + short | recursive ) echo "Configuration of harfbuzz (TeX Live) 2.6.2:";; + esac + cat <<\_ACEOF + +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build + --enable-compiler-warnings=[no|min|yes|max|all] + Turn on compiler warnings [default: yes if + maintainer-mode, min otherwise] + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-system-graphite2 use installed graphite2 headers and library + (requires pkg-config) + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CXX C++ compiler command + CXXFLAGS C++ compiler flags + CPP C preprocessor + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to . +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +fi + +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +harfbuzz (TeX Live) configure 2.6.2 +generated by GNU Autoconf 2.69 + +Copyright (C) 2012 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit +fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_cxx_try_compile LINENO +# ---------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_compile + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func + +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. +ac_fn_c_check_decl () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_decl + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( $as_echo "## ---------------------------- ## +## Report this to tex-k@tug.org ## +## ---------------------------- ##" + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_mongrel + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + +# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES +# -------------------------------------------- +# Tries to find the compile-time value of EXPR in a program that includes +# INCLUDES, setting VAR accordingly. Returns whether the value could be +# computed +ac_fn_c_compute_int () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= 0)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=0 ac_mid=0 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid; break +else + as_fn_arith $ac_mid + 1 && ac_lo=$as_val + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) < 0)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=-1 ac_mid=-1 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=$ac_mid; break +else + as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + ac_lo= ac_hi= +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid +else + as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in #(( +?*) eval "$3=\$ac_lo"; ac_retval=0 ;; +'') ac_retval=1 ;; +esac + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +static long int longval () { return $2; } +static unsigned long int ulongval () { return $2; } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (($2) < 0) + { + long int i = longval (); + if (i != ($2)) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ($2)) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + echo >>conftest.val; read $3 config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by harfbuzz (TeX Live) $as_me 2.6.2, which was +generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + $as_echo "## ---------------- ## +## Cache variables. ## +## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + $as_echo "## ----------------- ## +## Output variables. ## +## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + $as_echo "## ------------------- ## +## File substitutions. ## +## ------------------- ##" + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + $as_echo "## ----------- ## +## confdefs.h. ## +## ----------- ##" + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h + +$as_echo "/* confdefs.h */" > confdefs.h + +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site +fi +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } + fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + +ac_aux_dir= +for ac_dir in ../../build-aux "$srcdir"/../../build-aux; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../build-aux \"$srcdir\"/../../build-aux" "$LINENO" 5 +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + + + +am__api_version='1.16' + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$2" = conftest.file + ) +then + # Ok. + : +else + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + +test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# Double any \ or $. +# By default was `s,x,x', remove it if useless. +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` + +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} +fi + +if test x"${install_sh+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi + +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done +IFS=$as_save_IFS + +fi + + test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + MKDIR_P="$ac_install_sh -d" + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AWK" && break +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + SET_MAKE= +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi + +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null + +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' +am__doit: + @echo this is the am__doit target >confinc.out +.PHONY: am__doit +END +am__include="#" +am__quote= +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : + ;; +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; +fi + +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } + +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { { ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else + ac_file='' +fi +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +ac_exeext=$ac_cv_exeext + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +else + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +depcc="$CC" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + + +# Check whether --enable-compiler-warnings was given. +if test "${enable_compiler_warnings+set}" = set; then : + enableval=$enable_compiler_warnings; +fi +case $enable_compiler_warnings in #( + no | min | yes | max | all) : + ;; #( + *) : + if test "x$enable_maintainer_mode" = xyes; then : + enable_compiler_warnings=yes +else + enable_compiler_warnings=min +fi ;; +esac + +##tldbg KPSE_BASIC: Remember harfbuzz (no-define) as Kpse_Package (for future messages). + +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi + + +# Define the identity of the package. + PACKAGE='harfbuzz--tex-live-' + VERSION='2.6.2' + + +# Some tools Automake needs. + +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + + +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + + +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} + + +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + + + + + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + + MAINT=$MAINTAINER_MODE_TRUE + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 +$as_echo_n "checking whether the compiler accepts prototypes... " >&6; } +if ${kb_cv_c_prototypes+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +extern void foo(int i,...); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kb_cv_c_prototypes=yes +else + kb_cv_c_prototypes=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kb_cv_c_prototypes" >&5 +$as_echo "$kb_cv_c_prototypes" >&6; } +if test "x$kb_cv_c_prototypes" = xno; then + as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 +$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; } +if ${kpse_cv_warning_cflags+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$GCC" = xyes; then + kpse_cv_warning_cflags= +if test "x$enable_compiler_warnings" != xno; then + kpse_cv_warning_cflags="-Wimplicit -Wreturn-type" + case `$CC -dumpversion` in #( + 3.4.* | 4.* | 5.*) : + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #( + *) : + ;; +esac + case `$CC -dumpversion` in #( + 3.[234].* | 4.* | 5.*) : + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #( + *) : + ;; +esac + if test "x$enable_compiler_warnings" != xmin; then + kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags" + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations" + if test "x$enable_compiler_warnings" != xyes; then + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith" + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings" + case `$CC -dumpversion` in #( + 3.4.* | 4.* | 5.*) : + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #( + *) : + ;; +esac + if test "x$enable_compiler_warnings" != xmax; then + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow" + fi + fi + fi +fi +elif test "x$enable_compiler_warnings" = xno; then + kpse_cv_warning_cflags= +else + kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_warning_cflags" >&5 +$as_echo "$kpse_cv_warning_cflags" >&6; } +WARNING_CFLAGS=$kpse_cv_warning_cflags + + + + + + + + +HB_VERSION_MAJOR=2 +HB_VERSION_MINOR=6 +HB_VERSION_MICRO=2 +HB_VERSION=2.6.2 + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } + +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +else + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +depcc="$CC" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +$as_echo "$CXX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CXX" && break + done +fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CXX" && break +done + + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi +fi + + fi +fi +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +if ${ac_cv_cxx_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } +if ${ac_cv_prog_cxx_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +else + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + +else + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +depcc="$CXX" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CXX_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CXX_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CXX_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' +else + am__fastdepCXX_TRUE='#' + am__fastdepCXX_FALSE= +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C++ compiler" >&5 +$as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; } +if ${kpse_cv_warning_cxxflags+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$GXX" = xyes; then + kpse_cv_warning_cxxflags= +kpse_warn_strings="-Wno-write-strings" +if test "x$enable_compiler_warnings" != xno; then + kpse_cv_warning_cxxflags="-Wreturn-type" + case `$CXX -dumpversion` in #( + 3.* | 4.[012345].*) : + kpse_cv_warning_cxxflags="-Wimplicit $kpse_cv_warning_cxxflags" ;; #( + *) : + ;; +esac + case `$CXX -dumpversion` in #( + 3.[234].* | 4.* | 5.*) : + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #( + *) : + ;; +esac + if test "x$enable_compiler_warnings" != xmin; then + kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags" + if test "x$enable_compiler_warnings" != xyes; then + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith" + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align" + kpse_warn_strings="-Wwrite-strings" + if test "x$enable_compiler_warnings" != xmax; then + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow" + fi + fi + fi +fi +kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags $kpse_warn_strings" +elif test "x$enable_compiler_warnings" = xno; then + kpse_cv_warning_cxxflags= +else + kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_warning_cxxflags" >&5 +$as_echo "$kpse_cv_warning_cxxflags" >&6; } +WARNING_CXXFLAGS=$kpse_cv_warning_cxxflags + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi +else + RANLIB="$ac_cv_prog_RANLIB" +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } +fi + + +# Theoretically harfbuzz does not require C++11? + + ax_cxx_compile_alternatives="11 0x" ax_cxx_compile_cxx11_required=false + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + ac_success=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features by default" >&5 +$as_echo_n "checking whether $CXX supports C++11 features by default... " >&6; } +if ${ax_cv_cxx_compile_cxx11+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +// If the compiler admits that it is not ready for C++11, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201103L + +#error "This is not a C++11 compiler" + +#else + +namespace cxx11 +{ + + namespace test_static_assert + { + + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + } + + namespace test_final_override + { + + struct Base + { + virtual void f() {} + }; + + struct Derived : public Base + { + virtual void f() override {} + }; + + } + + namespace test_double_right_angle_brackets + { + + template < typename T > + struct check {}; + + typedef check single_type; + typedef check> double_type; + typedef check>> triple_type; + typedef check>>> quadruple_type; + + } + + namespace test_decltype + { + + int + f() + { + int a = 1; + decltype(a) b = 2; + return a + b; + } + + } + + namespace test_type_deduction + { + + template < typename T1, typename T2 > + struct is_same + { + static const bool value = false; + }; + + template < typename T > + struct is_same + { + static const bool value = true; + }; + + template < typename T1, typename T2 > + auto + add(T1 a1, T2 a2) -> decltype(a1 + a2) + { + return a1 + a2; + } + + int + test(const int c, volatile int v) + { + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == true, ""); + return (sumf > 0.0) ? sumi : add(c, v); + } + + } + + namespace test_noexcept + { + + int f() { return 0; } + int g() noexcept { return 0; } + + static_assert(noexcept(f()) == false, ""); + static_assert(noexcept(g()) == true, ""); + + } + + namespace test_constexpr + { + + template < typename CharT > + unsigned long constexpr + strlen_c_r(const CharT *const s, const unsigned long acc) noexcept + { + return *s ? strlen_c_r(s + 1, acc + 1) : acc; + } + + template < typename CharT > + unsigned long constexpr + strlen_c(const CharT *const s) noexcept + { + return strlen_c_r(s, 0UL); + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("1") == 1UL, ""); + static_assert(strlen_c("example") == 7UL, ""); + static_assert(strlen_c("another\0example") == 7UL, ""); + + } + + namespace test_rvalue_references + { + + template < int N > + struct answer + { + static constexpr int value = N; + }; + + answer<1> f(int&) { return answer<1>(); } + answer<2> f(const int&) { return answer<2>(); } + answer<3> f(int&&) { return answer<3>(); } + + void + test() + { + int i = 0; + const int c = 0; + static_assert(decltype(f(i))::value == 1, ""); + static_assert(decltype(f(c))::value == 2, ""); + static_assert(decltype(f(0))::value == 3, ""); + } + + } + + namespace test_uniform_initialization + { + + struct test + { + static const int zero {}; + static const int one {1}; + }; + + static_assert(test::zero == 0, ""); + static_assert(test::one == 1, ""); + + } + + namespace test_lambdas + { + + void + test1() + { + auto lambda1 = [](){}; + auto lambda2 = lambda1; + lambda1(); + lambda2(); + } + + int + test2() + { + auto a = [](int i, int j){ return i + j; }(1, 2); + auto b = []() -> int { return '0'; }(); + auto c = [=](){ return a + b; }(); + auto d = [&](){ return c; }(); + auto e = [a, &b](int x) mutable { + const auto identity = [](int y){ return y; }; + for (auto i = 0; i < a; ++i) + a += b--; + return x + identity(a + b); + }(0); + return a + b + c + d + e; + } + + int + test3() + { + const auto nullary = [](){ return 0; }; + const auto unary = [](int x){ return x; }; + using nullary_t = decltype(nullary); + using unary_t = decltype(unary); + const auto higher1st = [](nullary_t f){ return f(); }; + const auto higher2nd = [unary](nullary_t f1){ + return [unary, f1](unary_t f2){ return f2(unary(f1())); }; + }; + return higher1st(nullary) + higher2nd(nullary)(unary); + } + + } + + namespace test_variadic_templates + { + + template + struct sum; + + template + struct sum + { + static constexpr auto value = N0 + sum::value; + }; + + template <> + struct sum<> + { + static constexpr auto value = 0; + }; + + static_assert(sum<>::value == 0, ""); + static_assert(sum<1>::value == 1, ""); + static_assert(sum<23>::value == 23, ""); + static_assert(sum<1, 2>::value == 3, ""); + static_assert(sum<5, 5, 11>::value == 21, ""); + static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); + + } + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function + // because of this. + namespace test_template_alias_sfinae + { + + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { func(0); } + + } + +} // namespace cxx11 + +#endif // __cplusplus >= 201103L + + + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ax_cv_cxx_compile_cxx11=yes +else + ax_cv_cxx_compile_cxx11=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx11" >&5 +$as_echo "$ax_cv_cxx_compile_cxx11" >&6; } + if test x$ax_cv_cxx_compile_cxx11 = xyes; then + ac_success=yes + fi + + if test x$ac_success = xno; then + for alternative in ${ax_cxx_compile_alternatives}; do + switch="-std=gnu++${alternative}" + cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5 +$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; } +if eval \${$cachevar+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_CXX="$CXX" + CXX="$CXX $switch" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +// If the compiler admits that it is not ready for C++11, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201103L + +#error "This is not a C++11 compiler" + +#else + +namespace cxx11 +{ + + namespace test_static_assert + { + + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + } + + namespace test_final_override + { + + struct Base + { + virtual void f() {} + }; + + struct Derived : public Base + { + virtual void f() override {} + }; + + } + + namespace test_double_right_angle_brackets + { + + template < typename T > + struct check {}; + + typedef check single_type; + typedef check> double_type; + typedef check>> triple_type; + typedef check>>> quadruple_type; + + } + + namespace test_decltype + { + + int + f() + { + int a = 1; + decltype(a) b = 2; + return a + b; + } + + } + + namespace test_type_deduction + { + + template < typename T1, typename T2 > + struct is_same + { + static const bool value = false; + }; + + template < typename T > + struct is_same + { + static const bool value = true; + }; + + template < typename T1, typename T2 > + auto + add(T1 a1, T2 a2) -> decltype(a1 + a2) + { + return a1 + a2; + } + + int + test(const int c, volatile int v) + { + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == true, ""); + return (sumf > 0.0) ? sumi : add(c, v); + } + + } + + namespace test_noexcept + { + + int f() { return 0; } + int g() noexcept { return 0; } + + static_assert(noexcept(f()) == false, ""); + static_assert(noexcept(g()) == true, ""); + + } + + namespace test_constexpr + { + + template < typename CharT > + unsigned long constexpr + strlen_c_r(const CharT *const s, const unsigned long acc) noexcept + { + return *s ? strlen_c_r(s + 1, acc + 1) : acc; + } + + template < typename CharT > + unsigned long constexpr + strlen_c(const CharT *const s) noexcept + { + return strlen_c_r(s, 0UL); + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("1") == 1UL, ""); + static_assert(strlen_c("example") == 7UL, ""); + static_assert(strlen_c("another\0example") == 7UL, ""); + + } + + namespace test_rvalue_references + { + + template < int N > + struct answer + { + static constexpr int value = N; + }; + + answer<1> f(int&) { return answer<1>(); } + answer<2> f(const int&) { return answer<2>(); } + answer<3> f(int&&) { return answer<3>(); } + + void + test() + { + int i = 0; + const int c = 0; + static_assert(decltype(f(i))::value == 1, ""); + static_assert(decltype(f(c))::value == 2, ""); + static_assert(decltype(f(0))::value == 3, ""); + } + + } + + namespace test_uniform_initialization + { + + struct test + { + static const int zero {}; + static const int one {1}; + }; + + static_assert(test::zero == 0, ""); + static_assert(test::one == 1, ""); + + } + + namespace test_lambdas + { + + void + test1() + { + auto lambda1 = [](){}; + auto lambda2 = lambda1; + lambda1(); + lambda2(); + } + + int + test2() + { + auto a = [](int i, int j){ return i + j; }(1, 2); + auto b = []() -> int { return '0'; }(); + auto c = [=](){ return a + b; }(); + auto d = [&](){ return c; }(); + auto e = [a, &b](int x) mutable { + const auto identity = [](int y){ return y; }; + for (auto i = 0; i < a; ++i) + a += b--; + return x + identity(a + b); + }(0); + return a + b + c + d + e; + } + + int + test3() + { + const auto nullary = [](){ return 0; }; + const auto unary = [](int x){ return x; }; + using nullary_t = decltype(nullary); + using unary_t = decltype(unary); + const auto higher1st = [](nullary_t f){ return f(); }; + const auto higher2nd = [unary](nullary_t f1){ + return [unary, f1](unary_t f2){ return f2(unary(f1())); }; + }; + return higher1st(nullary) + higher2nd(nullary)(unary); + } + + } + + namespace test_variadic_templates + { + + template + struct sum; + + template + struct sum + { + static constexpr auto value = N0 + sum::value; + }; + + template <> + struct sum<> + { + static constexpr auto value = 0; + }; + + static_assert(sum<>::value == 0, ""); + static_assert(sum<1>::value == 1, ""); + static_assert(sum<23>::value == 23, ""); + static_assert(sum<1, 2>::value == 3, ""); + static_assert(sum<5, 5, 11>::value == 21, ""); + static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); + + } + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function + // because of this. + namespace test_template_alias_sfinae + { + + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { func(0); } + + } + +} // namespace cxx11 + +#endif // __cplusplus >= 201103L + + + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + eval $cachevar=yes +else + eval $cachevar=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CXX="$ac_save_CXX" +fi +eval ac_res=\$$cachevar + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + fi + + if test x$ac_success = xno; then + for alternative in ${ax_cxx_compile_alternatives}; do + for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do + cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5 +$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; } +if eval \${$cachevar+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_CXX="$CXX" + CXX="$CXX $switch" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +// If the compiler admits that it is not ready for C++11, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201103L + +#error "This is not a C++11 compiler" + +#else + +namespace cxx11 +{ + + namespace test_static_assert + { + + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + } + + namespace test_final_override + { + + struct Base + { + virtual void f() {} + }; + + struct Derived : public Base + { + virtual void f() override {} + }; + + } + + namespace test_double_right_angle_brackets + { + + template < typename T > + struct check {}; + + typedef check single_type; + typedef check> double_type; + typedef check>> triple_type; + typedef check>>> quadruple_type; + + } + + namespace test_decltype + { + + int + f() + { + int a = 1; + decltype(a) b = 2; + return a + b; + } + + } + + namespace test_type_deduction + { + + template < typename T1, typename T2 > + struct is_same + { + static const bool value = false; + }; + + template < typename T > + struct is_same + { + static const bool value = true; + }; + + template < typename T1, typename T2 > + auto + add(T1 a1, T2 a2) -> decltype(a1 + a2) + { + return a1 + a2; + } + + int + test(const int c, volatile int v) + { + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == true, ""); + return (sumf > 0.0) ? sumi : add(c, v); + } + + } + + namespace test_noexcept + { + + int f() { return 0; } + int g() noexcept { return 0; } + + static_assert(noexcept(f()) == false, ""); + static_assert(noexcept(g()) == true, ""); + + } + + namespace test_constexpr + { + + template < typename CharT > + unsigned long constexpr + strlen_c_r(const CharT *const s, const unsigned long acc) noexcept + { + return *s ? strlen_c_r(s + 1, acc + 1) : acc; + } + + template < typename CharT > + unsigned long constexpr + strlen_c(const CharT *const s) noexcept + { + return strlen_c_r(s, 0UL); + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("1") == 1UL, ""); + static_assert(strlen_c("example") == 7UL, ""); + static_assert(strlen_c("another\0example") == 7UL, ""); + + } + + namespace test_rvalue_references + { + + template < int N > + struct answer + { + static constexpr int value = N; + }; + + answer<1> f(int&) { return answer<1>(); } + answer<2> f(const int&) { return answer<2>(); } + answer<3> f(int&&) { return answer<3>(); } + + void + test() + { + int i = 0; + const int c = 0; + static_assert(decltype(f(i))::value == 1, ""); + static_assert(decltype(f(c))::value == 2, ""); + static_assert(decltype(f(0))::value == 3, ""); + } + + } + + namespace test_uniform_initialization + { + + struct test + { + static const int zero {}; + static const int one {1}; + }; + + static_assert(test::zero == 0, ""); + static_assert(test::one == 1, ""); + + } + + namespace test_lambdas + { + + void + test1() + { + auto lambda1 = [](){}; + auto lambda2 = lambda1; + lambda1(); + lambda2(); + } + + int + test2() + { + auto a = [](int i, int j){ return i + j; }(1, 2); + auto b = []() -> int { return '0'; }(); + auto c = [=](){ return a + b; }(); + auto d = [&](){ return c; }(); + auto e = [a, &b](int x) mutable { + const auto identity = [](int y){ return y; }; + for (auto i = 0; i < a; ++i) + a += b--; + return x + identity(a + b); + }(0); + return a + b + c + d + e; + } + + int + test3() + { + const auto nullary = [](){ return 0; }; + const auto unary = [](int x){ return x; }; + using nullary_t = decltype(nullary); + using unary_t = decltype(unary); + const auto higher1st = [](nullary_t f){ return f(); }; + const auto higher2nd = [unary](nullary_t f1){ + return [unary, f1](unary_t f2){ return f2(unary(f1())); }; + }; + return higher1st(nullary) + higher2nd(nullary)(unary); + } + + } + + namespace test_variadic_templates + { + + template + struct sum; + + template + struct sum + { + static constexpr auto value = N0 + sum::value; + }; + + template <> + struct sum<> + { + static constexpr auto value = 0; + }; + + static_assert(sum<>::value == 0, ""); + static_assert(sum<1>::value == 1, ""); + static_assert(sum<23>::value == 23, ""); + static_assert(sum<1, 2>::value == 3, ""); + static_assert(sum<5, 5, 11>::value == 21, ""); + static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); + + } + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function + // because of this. + namespace test_template_alias_sfinae + { + + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { func(0); } + + } + +} // namespace cxx11 + +#endif // __cplusplus >= 201103L + + + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + eval $cachevar=yes +else + eval $cachevar=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CXX="$ac_save_CXX" +fi +eval ac_res=\$$cachevar + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + if test x$ac_success = xyes; then + break + fi + done + fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + if test x$ax_cxx_compile_cxx11_required = xtrue; then + if test x$ac_success = xno; then + as_fn_error $? "*** A compiler with support for C++11 language features is required." "$LINENO" 5 + fi + fi + if test x$ac_success = xno; then + HAVE_CXX11=0 + { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5 +$as_echo "$as_me: No compiler with C++11 support was found" >&6;} + else + HAVE_CXX11=1 + +$as_echo "#define HAVE_CXX11 1" >>confdefs.h + + fi + + + + +echo 'tldbg:KPSE_COMPILER_VISIBILITY called.' >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for C to hide external symbols" >&5 +$as_echo_n "checking CFLAGS for C to hide external symbols... " >&6; } +if ${kpse_cv_visibility_cflags+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +kpse_cv_visibility_cflags=unknown +kpse_save_flags=$CFLAGS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + extern void foo(void); + void foo(void){printf("foo\n");} +_ACEOF +# FIXME: Add tests for non-GNU compilers +for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do + CFLAGS="$kpse_save_flags -Werror $kpse_flag" + if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_visibility_cflags=$kpse_flag; break +fi +rm -f core conftest.err conftest.$ac_objext +done +CFLAGS=$kpse_save_flags +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_visibility_cflags" >&5 +$as_echo "$kpse_cv_visibility_cflags" >&6; } +case $kpse_cv_visibility_cflags in #( + unknown) : + ;; #( + *) : + VISIBILITY_CFLAGS=$kpse_cv_visibility_cflags + ;; +esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS for C++ to hide external symbols" >&5 +$as_echo_n "checking CXXFLAGS for C++ to hide external symbols... " >&6; } +if ${kpse_cv_visibility_cxxflags+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +kpse_cv_visibility_cxxflags=unknown +kpse_save_flags=$CXXFLAGS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + extern void foo(void); + void foo(void){printf("foo\n");} +_ACEOF +# FIXME: Add tests for non-GNU compilers +for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do + CXXFLAGS="$kpse_save_flags -Werror $kpse_flag" + if ac_fn_cxx_try_compile "$LINENO"; then : + kpse_cv_visibility_cxxflags=$kpse_flag; break +fi +rm -f core conftest.err conftest.$ac_objext +done +CXXFLAGS=$kpse_save_flags +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_visibility_cxxflags" >&5 +$as_echo "$kpse_cv_visibility_cxxflags" >&6; } +case $kpse_cv_visibility_cxxflags in #( + unknown) : + ;; #( + *) : + VISIBILITY_CXXFLAGS=$kpse_cv_visibility_cxxflags + ;; +esac + + + + +##tldbg _KPSE_INIT: Initialize TL infrastructure. +kpse_BLD=`(cd "./../../." && pwd)` +kpse_SRC=`(cd "$srcdir/../../." && pwd)` + +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$PKG_CONFIG"; then + ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +PKG_CONFIG=$ac_cv_prog_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_PKG_CONFIG"; then + ac_ct_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_PKG_CONFIG"; then + ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG +if test -n "$ac_ct_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5 +$as_echo "$ac_ct_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_PKG_CONFIG" = x; then + PKG_CONFIG="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_ct_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" +fi + +##tldbg _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags. +echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=graphite2, libname=graphite2, options=, tlincl=-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC, tllib=BLD/libs/graphite2/libgraphite2.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/graphite2/include/graphite2/Font.h.' >&5 +##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) . + +# Check whether --with-system-graphite2 was given. +if test "${with_system_graphite2+set}" = set; then : + withval=$with_system_graphite2; +fi +if test "x$with_system_graphite2" = xyes; then + if $PKG_CONFIG graphite2; then + GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags` + GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs` +elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then + as_fn_error $? "did not find graphite2" "$LINENO" 5 +fi +else + GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC" + GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a" + GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a' + GRAPHITE2_RULE='# Rebuild libgraphite2 +$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h + cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild +${top_builddir}/../../libs/graphite2/include/graphite2/Font.h: + cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' +fi + + +# Functions and headers +for ac_func in atexit mprotect sysconf getpagesize mmap isatty newlocale strtod_l posix_memalign +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + +save_libs="$LIBS" +LIBS="$LIBS -lm" +for ac_func in round +do : + ac_fn_c_check_func "$LINENO" "round" "ac_cv_func_round" +if test "x$ac_cv_func_round" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ROUND 1 +_ACEOF + +else + ac_fn_c_check_decl "$LINENO" "round" "ac_cv_have_decl_round" "#include +" +if test "x$ac_cv_have_decl_round" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_ROUND $ac_have_decl +_ACEOF + +fi +done + +LIBS="$save_libs" + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +for ac_header in unistd.h sys/mman.h xlocale.h stdbool.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +# Compiler flags + +# The cast to long int works around a bug in the HP C Compiler, +# see AC_CHECK_SIZEOF for more information. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of struct{char;}" >&5 +$as_echo_n "checking alignment of struct{char;}... " >&6; } +if ${ac_cv_alignof_struct_char__+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_struct_char__" "$ac_includes_default +#ifndef offsetof +# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0) +#endif +typedef struct { char x; struct{char;} y; } ac__type_alignof_;"; then : + +else + if test "$ac_cv_type_struct_char__" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute alignment of struct{char;} +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_alignof_struct_char__=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_struct_char__" >&5 +$as_echo "$ac_cv_alignof_struct_char__" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define ALIGNOF_STRUCT_CHAR__ $ac_cv_alignof_struct_char__ +_ACEOF + + +if test "x$GCC" = "xyes"; then + + # Make symbols link locally + LDFLAGS="$LDFLAGS -Bsymbolic-functions" + + # Make sure we don't link to libstdc++ + CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" + + # Assorted warnings + CXXFLAGS="$CXXFLAGS -Wcast-align" + + case "$host" in + arm-*-*) + if test "x$ac_cv_alignof_struct_char__" != x1; then + # Request byte alignment + CXXFLAGS="$CXXFLAGS -mstructure-size-boundary=8" + fi + ;; + esac +fi + if test "x$GCC" = "xyes"; then + HAVE_GCC_TRUE= + HAVE_GCC_FALSE='#' +else + HAVE_GCC_TRUE='#' + HAVE_GCC_FALSE= +fi + + + + +ac_config_headers="$ac_config_headers config.h" + + + if test "x$enable_build" != xno; then + build_TRUE= + build_FALSE='#' +else + build_TRUE='#' + build_FALSE= +fi + + +if test "x$enable_build" != xno || test -f config.force; then + +echo timestamp >config.force +fi + +if :; then + +$as_echo "#define HAVE_OT 1" >>confdefs.h + + +$as_echo "#define HAVE_GRAPHITE2 1" >>confdefs.h + +else + +$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h + + +$as_echo "#define HAVE_GLIB 1" >>confdefs.h + + +$as_echo "#define HAVE_GTHREAD 1" >>confdefs.h + + +$as_echo "#define HAVE_GOBJECT 1" >>confdefs.h + + +$as_echo "#define HAVE_CAIRO 1" >>confdefs.h + + +$as_echo "#define HAVE_CAIRO_FT 1" >>confdefs.h + + +$as_echo "#define HAVE_UNISCRIBE 1" >>confdefs.h + + +$as_echo "#define HAVE_CORETEXT 1" >>confdefs.h + + +$as_echo "#define HAVE_INTEL_ATOMIC_PRIMITIVES 1" >>confdefs.h + +fi + +HARFBUZZ_TREE=harfbuzz-src + + +if test -f $srcdir/$HARFBUZZ_TREE/src/hb-version.h; then + as_fn_error $? "Sorry, you must remove the file $HARFBUZZ_TREE/src/hb-version.h" "$LINENO" 5 +fi + +ac_config_files="$ac_config_files Makefile include/Makefile hb-version.h:harfbuzz-src/src/hb-version.h.in" + + +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi +fi +rm -f confcache + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +DEFS=-DHAVE_CONFIG_H + +ac_libobjs= +ac_ltlibobjs= +U= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +else + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +fi + +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_GCC_TRUE}" && test -z "${HAVE_GCC_FALSE}"; then + as_fn_error $? "conditional \"HAVE_GCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${build_TRUE}" && test -z "${build_FALSE}"; then + as_fn_error $? "conditional \"build\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi + +: "${CONFIG_STATUS=./config.status}" +ac_write_fail=0 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. + +debug=false +ac_cs_recheck=false +ac_cs_silent=false + +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by harfbuzz (TeX Live) $as_me 2.6.2, which was +generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + +_ACEOF + +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# Files that config.status was made for. +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +ac_cs_usage="\ +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. + +Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Configuration commands: +$config_commands + +Report bugs to ." + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_version="\\ +harfbuzz (TeX Live) config.status 2.6.2 +configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +Copyright (C) 2012 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac + shift +done + +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +if \$ac_cs_recheck; then + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + $as_echo "$ac_log" +} >&5 + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# +# INIT-COMMANDS +# +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; + "hb-version.h") CONFIG_FILES="$CONFIG_FILES hb-version.h:harfbuzz-src/src/hb-version.h.in" ;; + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +done + + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= ac_tmp= + trap 'exit_status=$? + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status +' 0 + trap 'as_fn_exit 1' 1 2 13 15 +} +# Create a (secure) tmp directory for tmp files. + +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp + +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then + + +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +_ACEOF + + +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +_ACEOF + +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// +s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" + +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$ac_tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + + +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac + + case $ac_tag in + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= +ac_sed_dataroot=' +/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t +$ac_datarootdir_hack +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$ac_tmp/stdin" + case $ac_file in + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # + # CONFIG_HEADER + # + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 + fi +# Compute "$ac_file"'s index in $config_headers. +_am_arg="$ac_file" +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; + + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac + + + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac + shift + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf + do + # Strip MF so we end up with the name of the file. + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$am_mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? + done + if test $am_rc -ne 0; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk +} + ;; + + esac +done # for ac_tag + + +as_fn_exit 0 +_ACEOF +ac_clean_files=$ac_clean_files_save + +test $ac_write_fail = 0 || + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || as_fn_exit 1 +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi + diff --git a/source/libs/harfbuzz/configure.ac b/source/libs/harfbuzz/configure.ac new file mode 100644 index 000000000..b4d459b89 --- /dev/null +++ b/source/libs/harfbuzz/configure.ac @@ -0,0 +1,110 @@ +dnl $Id: configure.ac 51270 2019-05-30 03:43:42Z kakuto $ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl Copyright 2016-2017 Karl Berry +dnl Copyright 2012-2015 Peter Breitenlohner +dnl +dnl This file is free software; the copyright holder +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +m4_include([version.ac])[] dnl define harfbuzz_version +AC_INIT([harfbuzz (TeX Live)], harfbuzz_version, [tex-k@tug.org]) +AC_PREREQ([2.65]) +AC_CONFIG_SRCDIR([harfbuzz-src/src/harfbuzz.pc.in]) +AC_CONFIG_AUX_DIR([../../build-aux]) +AC_CONFIG_MACRO_DIR([../../m4]) + +KPSE_BASIC([harfbuzz], no-define) + +KPSE_LIB_VERSION([harfbuzz])[]dnl +AC_SUBST([HB_VERSION_MAJOR], [harfbuzz_major])[]dnl +AC_SUBST([HB_VERSION_MINOR], [harfbuzz_minor])[]dnl +AC_SUBST([HB_VERSION_MICRO], [harfbuzz_micro])[]dnl +AC_SUBST([HB_VERSION], [harfbuzz_version])[]dnl + +AC_PROG_CC +AC_PROG_CXX +AC_PROG_RANLIB +AC_PROG_LN_S + +# Theoretically harfbuzz does not require C++11? +AX_CXX_COMPILE_STDCXX([11],,[optional]) + +KPSE_COMPILER_VISIBILITY + +KPSE_GRAPHITE2_FLAGS + +# Functions and headers +AC_CHECK_FUNCS(atexit mprotect sysconf getpagesize mmap isatty newlocale strtod_l posix_memalign) + +save_libs="$LIBS" +LIBS="$LIBS -lm" +AC_CHECK_FUNCS([round], ,[AC_CHECK_DECLS([round], , ,[#include ])]) +LIBS="$save_libs" + +AC_CHECK_HEADERS(unistd.h sys/mman.h xlocale.h stdbool.h) + +# Compiler flags +AC_CANONICAL_HOST +AC_CHECK_ALIGNOF([struct{char;}]) +if test "x$GCC" = "xyes"; then + + # Make symbols link locally + LDFLAGS="$LDFLAGS -Bsymbolic-functions" + + # Make sure we don't link to libstdc++ + CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" + + # Assorted warnings + CXXFLAGS="$CXXFLAGS -Wcast-align" + + case "$host" in + arm-*-*) + if test "x$ac_cv_alignof_struct_char__" != x1; then + # Request byte alignment + CXXFLAGS="$CXXFLAGS -mstructure-size-boundary=8" + fi + ;; + esac +fi +AM_CONDITIONAL(HAVE_GCC, test "x$GCC" = "xyes") + +AC_SUBST([AM_CXXFLAGS]) + +AC_CONFIG_HEADERS([config.h]) + +AM_CONDITIONAL([build], [test "x$enable_build" != xno]) + +if test "x$enable_build" != xno || test -f config.force; then + +echo timestamp >config.force +fi + +if :; then + AC_DEFINE([HAVE_OT], 1, [Use native OpenType Layout backend]) + AC_DEFINE([HAVE_GRAPHITE2], 1, [Use Graphite library]) +else +dnl add all these to config.h.in but do not define them in config.h + AC_DEFINE([HAVE_PTHREAD], 1, [Use POSIX threads]) + AC_DEFINE([HAVE_GLIB], 1, [Use glib2 library]) + AC_DEFINE([HAVE_GTHREAD], 1, [Use gthread2 library]) + AC_DEFINE([HAVE_GOBJECT], 1, [Use gobject2 library]) + AC_DEFINE([HAVE_CAIRO], 1, [Use cairo graphics library]) + AC_DEFINE([HAVE_CAIRO_FT], 1, [Use cairo-ft support in cairo graphics library]) + AC_DEFINE([HAVE_UNISCRIBE], 1, [Use Uniscribe backend]) + AC_DEFINE([HAVE_CORETEXT], 1, [Use Core Text backend]) + AC_DEFINE([HAVE_INTEL_ATOMIC_PRIMITIVES], 1, [Use Intel __sync_* atomic primitives]) +fi + +AC_SUBST([HARFBUZZ_TREE], [harfbuzz-src]) + +if test -f $srcdir/$HARFBUZZ_TREE/src/hb-version.h; then + AC_MSG_ERROR([Sorry, you must remove the file $HARFBUZZ_TREE/src/hb-version.h]) +fi + +AC_CONFIG_FILES([Makefile + include/Makefile + hb-version.h:harfbuzz-src/src/hb-version.h.in]) + +AC_OUTPUT diff --git a/source/libs/harfbuzz/harfbuzz-src/AUTHORS b/source/libs/harfbuzz/harfbuzz-src/AUTHORS new file mode 100644 index 000000000..83c0c66f9 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/AUTHORS @@ -0,0 +1,14 @@ +Behdad Esfahbod +David Corbett +David Turner +Ebrahim Byagowi +Garret Rieger +Jonathan Kew +Khaled Hosny +Lars Knoll +Martin Hosken +Owen Taylor +Roderick Sheeter +Roozbeh Pournader +Simon Hausmann +Werner Lemberg diff --git a/source/libs/harfbuzz/harfbuzz-src/BUILD.md b/source/libs/harfbuzz/harfbuzz-src/BUILD.md new file mode 100644 index 000000000..4c1c30645 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/BUILD.md @@ -0,0 +1,50 @@ +On Linux, install the development packages for FreeType, +Cairo, and GLib. For example, on Ubuntu / Debian, you would do: + + sudo apt-get install gcc g++ libfreetype6-dev libglib2.0-dev libcairo2-dev + +whereas on Fedora, RHEL, CentOS, and other Red Hat based systems you would do: + + sudo yum install gcc gcc-c++ freetype-devel glib2-devel cairo-devel + +on Windows, consider using [vcpkg](https://github.com/Microsoft/vcpkg), +provided by Microsoft, for building HarfBuzz and other open-source libraries +but if you need to build harfbuzz from source, put ragel binary on your +PATH and follow appveyor CI's cmake +[build steps](https://github.com/harfbuzz/harfbuzz/blob/master/appveyor.yml). + +on macOS, using MacPorts: + + sudo port install freetype glib2 cairo + +or using Homebrew: + + brew install freetype glib cairo + +If you are using a tarball, you can now proceed to running configure and make +as with any other standard package. That should leave you with a shared +library in `src/`, and a few utility programs including `hb-view` and `hb-shape` +under `util/`. + +If you are bootstrapping from git, you need a few more tools before you can +run `autogen.sh` for the first time. Namely, `pkg-config` and `ragel`. + +Again, on Ubuntu / Debian: + + sudo apt-get install autoconf automake libtool pkg-config ragel gtk-doc-tools + +and on Fedora, RHEL, CentOS: + + sudo yum install autoconf automake libtool pkgconfig ragel gtk-doc + +on the Mac, using MacPorts: + + sudo port install autoconf automake libtool pkgconfig ragel gtk-doc + +or using Homebrew: + + brew install autoconf automake libtool pkgconfig ragel gtk-doc + +To build the Python bindings, you also need: + + brew install pygobject3 diff --git a/source/libs/harfbuzz/harfbuzz-src/CMakeLists.txt b/source/libs/harfbuzz/harfbuzz-src/CMakeLists.txt new file mode 100644 index 000000000..2a8fd8b97 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/CMakeLists.txt @@ -0,0 +1,820 @@ +cmake_minimum_required(VERSION 2.8.0) +project(harfbuzz) + +enable_testing() + +## Limit framework build to Xcode generator +if (BUILD_FRAMEWORK) + # for a framework build on macOS, use: + # cmake -DBUILD_FRAMEWORK=ON -Bbuild -H. -GXcode && cmake --build build + if (NOT "${CMAKE_GENERATOR}" STREQUAL "Xcode") + message(FATAL_ERROR + "You should use Xcode generator with BUILD_FRAMEWORK enabled") + endif () + set (CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD_32_64_BIT)") + set (CMAKE_MACOSX_RPATH ON) + set (BUILD_SHARED_LIBS ON) +endif () + + +## Disallow in-source builds, as CMake generated make files can collide with autotools ones +if (NOT MSVC AND "${PROJECT_BINARY_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}") + message(FATAL_ERROR + " +In-source builds are not permitted! Make a separate folder for" + " building, e.g.," + " + mkdir build; cd build; cmake .." + " +Before that, remove the files created by this failed run with" + " + rm -rf CMakeCache.txt CMakeFiles") +endif () + + +## HarfBuzz build configurations +option(HB_HAVE_FREETYPE "Enable freetype interop helpers" OFF) +option(HB_HAVE_GRAPHITE2 "Enable Graphite2 complementary shaper" OFF) +option(HB_HAVE_GLIB "Enable glib unicode functions" OFF) +option(HB_HAVE_ICU "Enable icu unicode functions" OFF) +if (APPLE) + option(HB_HAVE_CORETEXT "Enable CoreText shaper backend on macOS" ON) + set (CMAKE_MACOSX_RPATH ON) +endif () +if (WIN32) + option(HB_HAVE_UNISCRIBE "Enable Uniscribe shaper backend on Windows" OFF) + option(HB_HAVE_GDI "Enable GDI integration helpers on Windows" OFF) + option(HB_HAVE_DIRECTWRITE "Enable DirectWrite shaper backend on Windows" OFF) +endif () +option(HB_BUILD_UTILS "Build harfbuzz utils, needs cairo, freetype, and glib properly be installed" OFF) +if (HB_BUILD_UTILS) + set (HB_HAVE_GLIB ON) + set (HB_HAVE_FREETYPE ON) +endif () + +option(HB_BUILD_SUBSET "Build harfbuzz-subset" ON) +option(HB_BUILD_TESTS "Build harfbuzz tests" ON) + +option(HB_HAVE_GOBJECT "Enable GObject Bindings" OFF) +if (HB_HAVE_GOBJECT) + set (HB_HAVE_GLIB ON) +endif () + +option(HB_HAVE_INTROSPECTION "Enable building introspection (.gir/.typelib) files" OFF) +if (HB_HAVE_INTROSPECTION) + set (HB_HAVE_GOBJECT ON) + set (HB_HAVE_GLIB ON) +endif () + +option(HB_CHECK OFF "Do a configuration suitable for testing (shared library and enable all options)") +if (HB_CHECK) + set (BUILD_SHARED_LIBS ON) + set (HB_BUILD_UTILS ON) + set (HB_HAVE_ICU) + set (HB_HAVE_GLIB ON) + #set (HB_HAVE_GOBJECT ON) + #set (HB_HAVE_INTROSPECTION ON) + set (HB_HAVE_FREETYPE ON) + set (HB_HAVE_GRAPHITE2 ON) + if (WIN32) + set (HB_HAVE_UNISCRIBE ON) + set (HB_HAVE_GDI ON) + set (HB_HAVE_DIRECTWRITE ON) + elseif (APPLE) + set (HB_HAVE_CORETEXT ON) + endif () +endif () + +include_directories(AFTER + ${PROJECT_SOURCE_DIR}/src + ${PROJECT_BINARY_DIR}/src +) + +# We need PYTHON_EXECUTABLE to be set for running the tests... +include (FindPythonInterp) + +## Functions and headers +include (CheckFunctionExists) +include (CheckIncludeFile) +macro (check_funcs) # Similar to AC_CHECK_FUNCS of autotools + foreach (func_name ${ARGN}) + string(TOUPPER ${func_name} definition_to_add) + check_function_exists(${func_name} HAVE_${definition_to_add}) + if (${HAVE_${definition_to_add}}) + add_definitions(-DHAVE_${definition_to_add}) + endif () + endforeach () +endmacro () +if (UNIX) + list(APPEND CMAKE_REQUIRED_LIBRARIES m) +endif () +check_funcs(atexit mprotect sysconf getpagesize mmap isatty newlocale strtod_l roundf) +check_include_file(unistd.h HAVE_UNISTD_H) +if (${HAVE_UNISTD_H}) + add_definitions(-DHAVE_UNISTD_H) +endif () +check_include_file(sys/mman.h HAVE_SYS_MMAN_H) +if (${HAVE_SYS_MMAN_H}) + add_definitions(-DHAVE_SYS_MMAN_H) +endif () +check_include_file(xlocale.h HAVE_XLOCALE_H) +if (${HAVE_XLOCALE_H}) + add_definitions(-DHAVE_XLOCALE_H) +endif () +check_include_file(stdbool.h HAVE_STDBOOL_H) +if (${HAVE_STDBOOL_H}) + add_definitions(-DHAVE_STDBOOL_H) +endif () + + +if (MSVC) + add_definitions(-wd4244 -wd4267 -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS) +endif () + + +## Detect if we are running inside a distribution or regular repository folder +# if (EXISTS "${PROJECT_SOURCE_DIR}/ChangeLog") +# # perhaps we are on dist directory +# set (IN_HB_DIST TRUE) +# #set (HB_VERSION_H "${PROJECT_SOURCE_DIR}/src/hb-version.h") +# endif () + + +## Extract variables from Makefile files +function (extract_make_variable variable makefile_source) + string(REGEX MATCH "${variable} = ([^$]+)\\$" temp "${makefile_source}") + string(REGEX MATCHALL "[^ \n\t\\]+" listVar "${CMAKE_MATCH_1}") + set (${variable} ${listVar} PARENT_SCOPE) +endfunction () + +# http://stackoverflow.com/a/27630120 +function (add_prefix_to_list var prefix) + set (listVar "") + foreach (f ${${var}}) + list(APPEND listVar "${prefix}${f}") + endforeach () + set (${var} "${listVar}" PARENT_SCOPE) +endfunction () + +file(READ ${PROJECT_SOURCE_DIR}/src/Makefile.sources SRCSOURCES) +file(READ ${PROJECT_SOURCE_DIR}/util/Makefile.sources UTILSOURCES) + +extract_make_variable(HB_BASE_headers ${SRCSOURCES}) +add_prefix_to_list(HB_BASE_headers "${PROJECT_SOURCE_DIR}/src/") + +extract_make_variable(HB_SUBSET_sources ${SRCSOURCES}) +add_prefix_to_list(HB_SUBSET_sources "${PROJECT_SOURCE_DIR}/src/") + +extract_make_variable(HB_SUBSET_headers ${SRCSOURCES}) +add_prefix_to_list(HB_SUBSET_headers "${PROJECT_SOURCE_DIR}/src/") + +extract_make_variable(HB_BASE_RAGEL_GENERATED_sources ${SRCSOURCES}) +#if (IN_HB_DIST) + add_prefix_to_list(HB_BASE_RAGEL_GENERATED_sources "${PROJECT_SOURCE_DIR}/src/") +#else () +# add_prefix_to_list(HB_BASE_RAGEL_GENERATED_sources "${PROJECT_BINARY_DIR}/src/") +#endif () + +extract_make_variable(HB_VIEW_sources ${UTILSOURCES}) +add_prefix_to_list(HB_VIEW_sources "${PROJECT_SOURCE_DIR}/util/") +extract_make_variable(HB_SHAPE_sources ${UTILSOURCES}) +add_prefix_to_list(HB_SHAPE_sources "${PROJECT_SOURCE_DIR}/util/") +extract_make_variable(HB_SUBSET_CLI_sources ${UTILSOURCES}) +add_prefix_to_list(HB_SUBSET_CLI_sources "${PROJECT_SOURCE_DIR}/util/") +extract_make_variable(HB_OT_SHAPE_CLOSURE_sources ${UTILSOURCES}) +add_prefix_to_list(HB_OT_SHAPE_CLOSURE_sources "${PROJECT_SOURCE_DIR}/util/") + + +file(READ configure.ac CONFIGUREAC) +string(REGEX MATCH "\\[(([0-9]+)\\.([0-9]+)\\.([0-9]+))\\]" HB_VERSION_MATCH ${CONFIGUREAC}) +set (HB_VERSION ${CMAKE_MATCH_1}) +set (HB_VERSION_MAJOR ${CMAKE_MATCH_2}) +set (HB_VERSION_MINOR ${CMAKE_MATCH_3}) +set (HB_VERSION_MICRO ${CMAKE_MATCH_4}) + +## Define sources and headers of the project +set (project_sources ${PROJECT_SOURCE_DIR}/src/harfbuzz.cc) # use amalgam source +set (subset_project_sources ${HB_SUBSET_sources}) +set (project_extra_sources) +set (project_headers ${HB_BASE_headers}) +set (subset_project_headers ${HB_SUBSET_headers}) + +## Find and include needed header folders and libraries +if (HB_HAVE_FREETYPE) + include (FindFreetype) + if (NOT FREETYPE_FOUND) + message(FATAL_ERROR "HB_HAVE_FREETYPE was set, but we failed to find it. Maybe add a CMAKE_PREFIX_PATH= to your Freetype2 install prefix") + endif () + + list(APPEND THIRD_PARTY_LIBS ${FREETYPE_LIBRARIES}) + include_directories(AFTER ${FREETYPE_INCLUDE_DIRS}) + add_definitions(-DHAVE_FREETYPE=1) + + list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-ft.h) + + # So check_funcs can find its headers + set (CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${FREETYPE_INCLUDE_DIRS}) + set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${FREETYPE_LIBRARIES}) + + check_funcs(FT_Get_Var_Blend_Coordinates FT_Set_Var_Blend_Coordinates FT_Done_MM_Var) +endif () + +if (HB_HAVE_GRAPHITE2) + add_definitions(-DHAVE_GRAPHITE2) + + find_path(GRAPHITE2_INCLUDE_DIR graphite2/Font.h) + find_library(GRAPHITE2_LIBRARY graphite2) + + include_directories(${GRAPHITE2_INCLUDE_DIR}) + + list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-graphite2.h) + + list(APPEND THIRD_PARTY_LIBS ${GRAPHITE2_LIBRARY}) + + mark_as_advanced(GRAPHITE2_INCLUDE_DIR GRAPHITE2_LIBRARY) +endif () + +if (HB_HAVE_GLIB) + add_definitions(-DHAVE_GLIB) + + # https://github.com/WebKit/webkit/blob/master/Source/cmake/FindGLIB.cmake + find_package(PkgConfig) + pkg_check_modules(PC_GLIB QUIET glib-2.0) + + find_library(GLIB_LIBRARIES NAMES glib-2.0 HINTS ${PC_GLIB_LIBDIR} ${PC_GLIB_LIBRARY_DIRS}) + find_path(GLIBCONFIG_INCLUDE_DIR NAMES glibconfig.h HINTS ${PC_LIBDIR} ${PC_LIBRARY_DIRS} ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0/include) + find_path(GLIB_INCLUDE_DIR NAMES glib.h HINTS ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0) + + include_directories(${GLIBCONFIG_INCLUDE_DIR} ${GLIB_INCLUDE_DIR}) + + list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-glib.h) + + list(APPEND THIRD_PARTY_LIBS ${GLIB_LIBRARIES}) + + mark_as_advanced(GLIB_LIBRARIES GLIBCONFIG_INCLUDE_DIR GLIB_INCLUDE_DIR) +endif () + +if (HB_HAVE_ICU) + add_definitions(-DHAVE_ICU) + + # https://github.com/WebKit/webkit/blob/master/Source/cmake/FindICU.cmake + find_package(PkgConfig) + pkg_check_modules(PC_ICU QUIET icu-uc) + + find_path(ICU_INCLUDE_DIR NAMES unicode/utypes.h HINTS ${PC_ICU_INCLUDE_DIRS} ${PC_ICU_INCLUDEDIR}) + find_library(ICU_LIBRARY NAMES libicuuc cygicuuc cygicuuc32 icuuc HINTS ${PC_ICU_LIBRARY_DIRS} ${PC_ICU_LIBDIR}) + + include_directories(${ICU_INCLUDE_DIR}) + + list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-icu.h) + + list(APPEND THIRD_PARTY_LIBS ${ICU_LIBRARY}) + + mark_as_advanced(ICU_INCLUDE_DIR ICU_LIBRARY) +endif () + +if (APPLE AND HB_HAVE_CORETEXT) + # Apple Advanced Typography + add_definitions(-DHAVE_CORETEXT) + + list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-coretext.h) + + if (HB_IOS) + find_library(COREFOUNDATION CoreFoundation) + if (COREFOUNDATION) + list(APPEND THIRD_PARTY_LIBS ${COREFOUNDATION}) + endif () + mark_as_advanced(COREFOUNDATION) + + find_library(CORETEXT CoreText) + if (CORETEXT) + list(APPEND THIRD_PARTY_LIBS ${CORETEXT}) + endif () + mark_as_advanced(CORETEXT) + + find_library(COREGRAPHICS CoreGraphics) + if (COREGRAPHICS) + list(APPEND THIRD_PARTY_LIBS ${COREGRAPHICS}) + endif () + mark_as_advanced(COREGRAPHICS) + else () + find_library(APPLICATION_SERVICES_FRAMEWORK ApplicationServices) + if (APPLICATION_SERVICES_FRAMEWORK) + list(APPEND THIRD_PARTY_LIBS ${APPLICATION_SERVICES_FRAMEWORK}) + endif () + + mark_as_advanced(APPLICATION_SERVICES_FRAMEWORK) + endif () +endif () + +if (WIN32 AND HB_HAVE_GDI) + add_definitions(-DHAVE_GDI) + list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-gdi.h) + list(APPEND THIRD_PARTY_LIBS gdi32) +endif () + +if (WIN32 AND HB_HAVE_UNISCRIBE) + add_definitions(-DHAVE_UNISCRIBE) + list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-uniscribe.h) + list(APPEND THIRD_PARTY_LIBS usp10 gdi32 rpcrt4) +endif () + +if (WIN32 AND HB_HAVE_DIRECTWRITE) + add_definitions(-DHAVE_DIRECTWRITE) + list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-directwrite.h) + list(APPEND THIRD_PARTY_LIBS dwrite rpcrt4) +endif () + +if (HB_HAVE_GOBJECT) + include (FindPerl) + + # Use the hints from glib-2.0.pc to find glib-mkenums + find_package(PkgConfig) + pkg_check_modules(PC_GLIB QUIET glib-2.0) + find_program(GLIB_MKENUMS glib-mkenums + HINTS ${PC_glib_mkenums} + ) + set (GLIB_MKENUMS_CMD) + + if (WIN32 AND NOT MINGW) + # In Visual Studio builds, shebang lines are not supported + # in the standard cmd.exe shell that we use, so we need to + # first determine whether glib-mkenums is a Python or PERL + # script + execute_process(COMMAND "${PYTHON_EXECUTABLE}" "${GLIB_MKENUMS}" --version + RESULT_VARIABLE GLIB_MKENUMS_PYTHON + OUTPUT_QUIET ERROR_QUIET + ) + if (GLIB_MKENUMS_PYTHON EQUAL 0) + message("${GLIB_MKENUMS} is a Python script.") + set (GLIB_MKENUMS_CMD "${PYTHON_EXECUTABLE}" "${GLIB_MKENUMS}") + else () + execute_process(COMMAND "${PERL_EXECUTABLE}" "${GLIB_MKENUMS}" --version + RESULT_VARIABLE GLIB_MKENUMS_PERL + OUTPUT_QUIET ERROR_QUIET + ) + if (GLIB_MKENUMS_PERL EQUAL 0) + message("${GLIB_MKENUMS} is a PERL script.") + set (GLIB_MKENUMS_CMD "${PERL_EXECUTABLE}" "${GLIB_MKENUMS}") + endif () + if (NOT GLIB_MKENUMS_PERL EQUAL 0 AND NOT GLIB_MKENUMS_PYTHON EQUAL 0) + message(FATAL_ERROR "Unable to determine type of glib-mkenums script") + endif () + endif () + else () + set (GLIB_MKENUMS_CMD "${GLIB_MKENUMS}") + endif () + if (NOT GLIB_MKENUMS_CMD) + message(FATAL_ERROR "HB_HAVE_GOBJECT was set, but we failed to find glib-mkenums, which is required") + endif () + + pkg_check_modules(PC_GOBJECT QUIET gobject-2.0) + + find_library(GOBJECT_LIBRARIES NAMES gobject-2.0 HINTS ${PC_GLIB_LIBDIR} ${PC_GLIB_LIBRARY_DIRS}) + find_path(GOBJECT_INCLUDE_DIR NAMES glib-object.h HINTS ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0) + + include_directories(${GOBJECTCONFIG_INCLUDE_DIR} ${GOBJECT_INCLUDE_DIR}) + mark_as_advanced(GOBJECT_LIBRARIES GOBJECT_INCLUDE_DIR) + + list(APPEND hb_gobject_sources ${PROJECT_SOURCE_DIR}/src/hb-gobject-structs.cc) + list(APPEND hb_gobject_gen_sources + ${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.cc + ) + list(APPEND hb_gobject_structs_headers + ${PROJECT_SOURCE_DIR}/src/hb-gobject-structs.h + ) + list(APPEND hb_gobject_headers + ${PROJECT_SOURCE_DIR}/src/hb-gobject.h + ${hb_gobject_structs_headers} + ) + list(APPEND hb_gobject_gen_headers + ${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.h + ) + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.h + COMMAND ${GLIB_MKENUMS_CMD} + --template=${PROJECT_SOURCE_DIR}/src/hb-gobject-enums.h.tmpl + --identifier-prefix hb_ + --symbol-prefix hb_gobject + ${hb_gobject_structs_headers} + ${project_headers} + > ${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.h.tmp + COMMAND "${CMAKE_COMMAND}" + "-DENUM_INPUT_SRC=${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.h.tmp" + "-DENUM_OUTPUT_SRC=${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.h" + -P ${PROJECT_SOURCE_DIR}/replace-enum-strings.cmake + DEPENDS ${PROJECT_SOURCE_DIR}/src/hb-gobject-enums.h.tmpl + ${hb_gobject_header} + ${project_headers} + ) + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.cc + COMMAND ${GLIB_MKENUMS_CMD} + --template=${PROJECT_SOURCE_DIR}/src/hb-gobject-enums.cc.tmpl + --identifier-prefix hb_ + --symbol-prefix hb_gobject + ${hb_gobject_header} + ${project_headers} + > ${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.cc.tmp + COMMAND "${CMAKE_COMMAND}" + "-DENUM_INPUT_SRC=${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.cc.tmp" + "-DENUM_OUTPUT_SRC=${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.cc" + -P ${PROJECT_SOURCE_DIR}/replace-enum-strings.cmake + DEPENDS ${PROJECT_SOURCE_DIR}/src/hb-gobject-enums.cc.tmpl + ${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.h + ${hb_gobject_header} + ${project_headers} + ) +endif () + +## Atomic ops availability detection +file(WRITE "${PROJECT_BINARY_DIR}/try_compile_intel_atomic_primitives.c" +" void memory_barrier (void) { __sync_synchronize (); } + int atomic_add (int *i) { return __sync_fetch_and_add (i, 1); } + int mutex_trylock (int *m) { return __sync_lock_test_and_set (m, 1); } + void mutex_unlock (int *m) { __sync_lock_release (m); } + int main () { return 0; } +") +try_compile(HB_HAVE_INTEL_ATOMIC_PRIMITIVES + ${PROJECT_BINARY_DIR}/try_compile_intel_atomic_primitives + ${PROJECT_BINARY_DIR}/try_compile_intel_atomic_primitives.c) +if (HB_HAVE_INTEL_ATOMIC_PRIMITIVES) + add_definitions(-DHAVE_INTEL_ATOMIC_PRIMITIVES) +endif () + +file(WRITE "${PROJECT_BINARY_DIR}/try_compile_solaris_atomic_ops.c" +" #include + /* This requires Solaris Studio 12.2 or newer: */ + #include + void memory_barrier (void) { __machine_rw_barrier (); } + int atomic_add (volatile unsigned *i) { return atomic_add_int_nv (i, 1); } + void *atomic_ptr_cmpxchg (volatile void **target, void *cmp, void *newval) { return atomic_cas_ptr (target, cmp, newval); } + int main () { return 0; } +") +try_compile(HB_HAVE_SOLARIS_ATOMIC_OPS + ${PROJECT_BINARY_DIR}/try_compile_solaris_atomic_ops + ${PROJECT_BINARY_DIR}/try_compile_solaris_atomic_ops.c) +if (HB_HAVE_SOLARIS_ATOMIC_OPS) + add_definitions(-DHAVE_SOLARIS_ATOMIC_OPS) +endif () + + +## Define harfbuzz library +add_library(harfbuzz ${project_sources} ${project_extra_sources} ${project_headers}) +target_link_libraries(harfbuzz ${THIRD_PARTY_LIBS}) + +## Define harfbuzz-subset library +if (HB_BUILD_SUBSET) + add_library(harfbuzz-subset ${subset_project_sources} ${subset_project_headers}) + add_dependencies(harfbuzz-subset harfbuzz) + target_link_libraries(harfbuzz-subset harfbuzz ${THIRD_PARTY_LIBS}) + + if (BUILD_SHARED_LIBS) + set_target_properties(harfbuzz harfbuzz-subset PROPERTIES VISIBILITY_INLINES_HIDDEN TRUE) + endif () +endif () + +if (UNIX OR MINGW) + # Make symbols link locally + include (CheckCXXCompilerFlag) + CHECK_CXX_COMPILER_FLAG(-Bsymbolic-functions CXX_SUPPORTS_FLAG_BSYMB_FUNCS) + if (CXX_SUPPORTS_FLAG_BSYMB_FUNCS) + link_libraries(-Bsymbolic-functions) + endif () + + if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + # Make sure we don't link to libstdc++ + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -fno-exceptions") + set (CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "m") # libm + set (CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "") + set_target_properties(harfbuzz PROPERTIES LINKER_LANGUAGE C) + if (HB_BUILD_SUBSET) + set_target_properties(harfbuzz-subset PROPERTIES LINKER_LANGUAGE C) + endif () + + # No threadsafe statics as we do it ourselves + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-threadsafe-statics") + endif () + + CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) + if (COMPILER_SUPPORTS_CXX11) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + else() + message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.") + endif() +endif () + + +## Define harfbuzz-gobject library +if (HB_HAVE_GOBJECT) + add_library(harfbuzz-gobject + ${hb_gobject_sources} + ${hb_gobject_gen_sources} + ${hb_gobject_headers} + ${hb_gobject_gen_headers} + ) + include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/src) + add_dependencies(harfbuzz-gobject harfbuzz) + target_link_libraries(harfbuzz-gobject harfbuzz ${GOBJECT_LIBRARIES} ${THIRD_PARTY_LIBS}) + + if (BUILD_SHARED_LIBS) + set_target_properties(harfbuzz-gobject PROPERTIES VISIBILITY_INLINES_HIDDEN TRUE) + endif () +endif () + +if (BUILD_SHARED_LIBS AND WIN32 AND NOT MINGW) + add_definitions("-DHB_DLL_EXPORT") +endif () + +# On Windows, g-ir-scanner requires a DLL build in order for it to work +if (WIN32) + if (NOT BUILD_SHARED_LIBS) + message("Building introspection files on Windows requires BUILD_SHARED_LIBS to be enabled.") + set (HB_HAVE_INTROSPECTION OFF) + endif () +endif () + +if (HB_HAVE_INTROSPECTION) + find_package(PkgConfig) + pkg_check_modules(PC_GI QUIET gobject-introspection-1.0) + + find_program(G_IR_SCANNER g-ir-scanner + HINTS ${PC_g_ir_scanner} + ) + + find_program(G_IR_COMPILER g-ir-compiler + HINTS ${PC_g_ir_compiler} + ) + + if (WIN32 AND NOT MINGW) + # Note that since we already enable HB_HAVE_GOBJECT + # we would already have PYTHON_EXECUTABLE handy + set (G_IR_SCANNER_CMD "${PYTHON_EXECUTABLE}" "${G_IR_SCANNER}") + else () + set (G_IR_SCANNER_CMD "${G_IR_SCANNER}") + endif () + + # We need to account for the varying output directories + # when we build using Visual Studio projects + if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio*") + set (hb_libpath "${CMAKE_CURRENT_BINARY_DIR}/$") + else () + set (hb_libpath "$") + endif () + + # Get the CFlags that we used to build HarfBuzz/HarfBuzz-GObject + set (hb_defines_cflags "") + foreach (hb_cflag ${hb_cflags}) + list(APPEND hb_defines_cflags "-D${hb_cflag}") + endforeach (hb_cflag) + + # Get the other dependent libraries we used to build HarfBuzz/HarfBuzz-GObject + set (extra_libs "") + foreach (extra_lib ${THIRD_PARTY_LIBS}) + # We don't want the .lib extension here... + string(REPLACE ".lib" "" extra_lib_stripped "${extra_lib}") + list(APPEND extra_libs "--extra-library=${extra_lib_stripped}") + endforeach () + + set (introspected_sources) + foreach (f + ${project_headers} + ${project_sources} + ${hb_gobject_gen_sources} + ${hb_gobject_gen_headers} + ${hb_gobject_sources} + ${hb_gobject_headers} + ) + if (WIN32) + # Nasty issue: We need to make drive letters lower case, + # otherwise g-ir-scanner won't like it and give us a bunch + # of invalid items and unresolved types... + STRING(SUBSTRING "${f}" 0 1 drive) + STRING(SUBSTRING "${f}" 1 -1 path) + if (drive MATCHES "[A-Z]") + STRING(TOLOWER ${drive} drive_lower) + list(APPEND introspected_sources "${drive_lower}${path}") + else () + list(APPEND introspected_sources "${f}") + endif () + else () + list(APPEND introspected_sources "${f}") + endif () + endforeach () + + file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/src/hb_gir_list) + foreach (s ${introspected_sources}) + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/src/hb_gir_list "${s}\n") + endforeach () + + # Finally, build the introspection files... + add_custom_command( + TARGET harfbuzz-gobject + POST_BUILD + COMMAND ${G_IR_SCANNER_CMD} + --warn-all --no-libtool --verbose + -n hb + --namespace=HarfBuzz + --nsversion=0.0 + --identifier-prefix=hb_ + --include GObject-2.0 + --pkg-export=harfbuzz + --cflags-begin + -I${PROJECT_SOURCE_DIR}/src + -I${PROJECT_BINARY_DIR}/src + ${hb_includedir_cflags} + ${hb_defines_cflags} + -DHB_H + -DHB_H_IN + -DHB_OT_H + -DHB_OT_H_IN + -DHB_AAT_H + -DHB_AAT_H_IN + -DHB_GOBJECT_H + -DHB_GOBJECT_H_IN + -DHB_EXTERN= + --cflags-end + --library=harfbuzz-gobject + --library=harfbuzz + -L${hb_libpath} + ${extra_libs} + --filelist ${CMAKE_CURRENT_BINARY_DIR}/src/hb_gir_list + -o ${hb_libpath}/HarfBuzz-0.0.gir + DEPENDS harfbuzz-gobject harfbuzz ${CMAKE_CURRENT_BINARY_DIR}/src/hb_gir_list + ) + + add_custom_command( + TARGET harfbuzz-gobject + POST_BUILD + COMMAND "${G_IR_COMPILER}" + --verbose --debug + --includedir ${CMAKE_CURRENT_BINARY_DIR} + ${hb_libpath}/HarfBuzz-0.0.gir + -o ${hb_libpath}/HarfBuzz-0.0.typelib + DEPENDS ${hb_libpath}/HarfBuzz-0.0.gir harfbuzz-gobject + ) +endif () + + +## Additional framework build configs +if (BUILD_FRAMEWORK) + set (CMAKE_MACOSX_RPATH ON) + set_target_properties(harfbuzz PROPERTIES + FRAMEWORK TRUE + PUBLIC_HEADER "${project_headers}" + XCODE_ATTRIBUTE_INSTALL_PATH "@rpath" + ) + set (MACOSX_FRAMEWORK_IDENTIFIER "harfbuzz") + set (MACOSX_FRAMEWORK_SHORT_VERSION_STRING "${HB_VERSION}") + set (MACOSX_FRAMEWORK_BUNDLE_VERSION "${HB_VERSION}") +endif () + + +## Additional harfbuzz build artifacts +if (HB_BUILD_UTILS) + # https://github.com/WebKit/webkit/blob/master/Source/cmake/FindCairo.cmake + find_package(PkgConfig) + pkg_check_modules(PC_CAIRO QUIET cairo) + + find_path(CAIRO_INCLUDE_DIRS NAMES cairo.h HINTS ${PC_CAIRO_INCLUDEDIR} ${PC_CAIRO_INCLUDE_DIRS} PATH_SUFFIXES cairo) + find_library(CAIRO_LIBRARIESNAMES cairo HINTS ${PC_CAIRO_LIBDIR} ${PC_CAIRO_LIBRARY_DIRS}) + + add_definitions("-DPACKAGE_NAME=\"HarfBuzz\"") + add_definitions("-DPACKAGE_VERSION=\"${HB_VERSION}\"") + include_directories(${CAIRO_INCLUDE_DIRS}) + + add_executable(hb-view ${HB_VIEW_sources}) + target_link_libraries(hb-view harfbuzz ${CAIRO_LIBRARIESNAMES}) + + add_executable(hb-shape ${HB_SHAPE_sources}) + target_link_libraries(hb-shape harfbuzz) + + add_executable(hb-subset ${HB_SUBSET_CLI_sources}) + target_link_libraries(hb-subset harfbuzz harfbuzz-subset) + + add_executable(hb-ot-shape-closure ${HB_OT_SHAPE_CLOSURE_sources}) + target_link_libraries(hb-ot-shape-closure harfbuzz) + + mark_as_advanced(CAIRO_INCLUDE_DIRS CAIRO_LIBRARIESNAMES) +endif () + + +## Install +include (GNUInstallDirs) + +if (NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL) + install(FILES ${project_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/harfbuzz) + if (HB_HAVE_GOBJECT) + install(FILES ${hb_gobject_headers} ${hb_gobject_gen_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/harfbuzz) + endif () +endif () + +if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) + install(TARGETS harfbuzz + EXPORT harfbuzzConfig + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + FRAMEWORK DESTINATION Library/Frameworks + ) + install(EXPORT harfbuzzConfig + NAMESPACE harfbuzz:: + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/harfbuzz + ) + if (HB_BUILD_UTILS) + if (WIN32 AND BUILD_SHARED_LIBS) + install(TARGETS harfbuzz-subset + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + endif () + install(TARGETS hb-view + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + install(TARGETS hb-subset + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + + install(TARGETS hb-shape + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + + install(TARGETS hb-ot-shape-closure + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + endif () + if (HB_HAVE_GOBJECT) + install(TARGETS harfbuzz-gobject + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + if (HB_HAVE_INTROSPECTION) + if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio*") + set (hb_libpath "${CMAKE_CURRENT_BINARY_DIR}/$") + else () + set (hb_libpath "$") + endif () + + install(FILES "${hb_libpath}/HarfBuzz-0.0.gir" + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/gir-1.0 + ) + + install(FILES "${hb_libpath}/HarfBuzz-0.0.typelib" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/girepository-1.0 + ) + endif () + endif () +endif () + +if (HB_BUILD_TESTS) + ## src/ executables + foreach (prog main test test-gsub-would-substitute test-gpos-size-params test-buffer-serialize test-unicode-ranges) # hb-ot-tag + set (prog_name ${prog}) + if (${prog_name} STREQUAL "test") + # test can not be used as a valid executable name on cmake, lets special case it + set (prog_name test-test) + endif () + add_executable(${prog_name} ${PROJECT_SOURCE_DIR}/src/${prog}.cc) + target_link_libraries(${prog_name} harfbuzz ${THIRD_PARTY_LIBS}) + endforeach () + # set_target_properties(hb-ot-tag PROPERTIES COMPILE_FLAGS "-DMAIN") + + ## Tests + if (UNIX OR MINGW) + if (BUILD_SHARED_LIBS) + # generate harfbuzz.def after build completion + add_custom_command(TARGET harfbuzz POST_BUILD + COMMAND "${PYTHON_EXECUTABLE}" ${PROJECT_SOURCE_DIR}/src/gen-def.py ${PROJECT_BINARY_DIR}/harfbuzz.def ${project_headers} + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src) + + add_test(NAME check-static-inits.sh + COMMAND ${PROJECT_SOURCE_DIR}/src/check-static-inits.sh + WORKING_DIRECTORY ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/harfbuzz.dir/src # ugly hack + ) + add_test(NAME check-libstdc++.sh COMMAND ${PROJECT_SOURCE_DIR}/src/check-libstdc++.sh) + add_test(NAME check-symbols.sh COMMAND ${PROJECT_SOURCE_DIR}/src/check-symbols.sh) + + set_tests_properties( + check-static-inits.sh check-libstdc++.sh check-symbols.sh + PROPERTIES + ENVIRONMENT "libs=.;srcdir=${PROJECT_SOURCE_DIR}/src" + SKIP_RETURN_CODE 77) + endif () + + add_test(NAME check-c-linkage-decls.sh COMMAND ./check-c-linkage-decls.sh) + add_test(NAME check-header-guards.sh COMMAND ./check-header-guards.sh) + add_test(NAME check-externs.sh COMMAND ./check-externs.sh) + add_test(NAME check-includes.sh COMMAND ./check-includes.sh) + set_tests_properties( + check-c-linkage-decls.sh check-header-guards.sh check-externs.sh check-includes.sh + PROPERTIES + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src + SKIP_RETURN_CODE 77) + endif () + + # Needs to come last so that variables defined above are passed to + # subdirectories. + add_subdirectory(test) +endif () diff --git a/source/libs/harfbuzz/harfbuzz-src/CONFIG.md b/source/libs/harfbuzz/harfbuzz-src/CONFIG.md new file mode 100644 index 000000000..46971b0f2 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/CONFIG.md @@ -0,0 +1,151 @@ +# Configuring HarfBuzz + +Most of the time you will not need any custom configuration. The configuration +options provided by `configure` or `cmake` should be enough. In particular, +if you just want HarfBuzz library plus hb-shape / hb-view utilities, make sure +FreeType and Cairo are available and found during configuration. + +If you are building for distribution, you should more carefully consider whether +you need Glib, ICU, Graphite2, as well as CoreText / Uniscribe / DWrite. Make +sure the relevant ones are enabled. + +If you are building for custom environment (embedded, downloadable app, etc) +where you mostly just want to call `hb_shape()` and the binary size of the +resulting library is very important to you, the rest of this file guides you +through your options to disable features you may not need, in exchange for +binary size savings. + +## Compiler Options + +Make sure you build with your compiler's "optimize for size" option. On `gcc` +this is `-Os`, and can be enabled by passing `CXXFLAGS=-Os` either to `configure` +(sticky) or to `make` (non-sticky). On clang there is an even more extreme flag, +`-Oz`. + +HarfBuzz heavily uses inline functions and the optimize-size flag can make the +library smaller by 20% or more. Moreover, sometimes, based on the target CPU, +the optimize-size builds perform *faster* as well, thanks to lower code +footprint and caching effects. So, definitely try that even if size is not +extremely tight but you have a huge application. For example, Chrome does +that. Note that this configuration also automatically enables certain internal +optimizations. Search for `HB_OPTIMIZE_SIZE` for details, if you are using +other compilers, or continue reading. + +Another compiler option to consider is "link-time optimization", also known as +'lto'. To enable that, with `gcc` or `clang`, add `-flto` to both `CXXFLAGS` +and `LDFLAGS`, either on `configure` invocation (sticky) or on `make` (non-sticky). +This, also, can have a huge impact on the final size, 20% or more. + +Finally, if you are making a static library build or otherwise linking the +library into your app, make sure your linker removes unused functions. This +can be tricky and differ from environment to environment, but you definitely +want to make sure this happens. Otherwise, every unused public function will +be adding unneeded bytes to your binary. The following pointers might come +handy: + + * https://lwn.net/Articles/741494/ (all of the four-part series) + * https://elinux.org/images/2/2d/ELC2010-gc-sections_Denys_Vlasenko.pdf + +Combining the above three build options should already shrink your library a lot. +The rest of this file shows you ways to shrink the library even further at the +expense of removing functionality (that may not be needed). The remaining +options are all enabled by defining pre-processor macros, which can be done +via `CXXFLAGS` or `CPPFLAGS` similarly. + + +## Unicode-functions + +Access to Unicode data can be configured at compile time as well as run-time. +By default, HarfBuzz ships with its own compact subset of properties from +Unicode Character Database that it needs. This is a highly-optimized +implementation that depending on compile settings (optimize-size or not) +takes around ~40kb or ~60kb. Using this implementation (default) is highly +recommended, as HarfBuzz always ships with data from latest version of Unicode. +This implementation can be disabled by defining `HB_NO_UCD`. + +For example, if you are enabling ICU as a built-in option, or GLib, those +can provide Unicode data as well, so defining `HB_NO_UCD` might save you +space without reducing functionality (to the extent that the Unicode version +of those implementations is recent.) + +If, however, you provide your own Unicode data to HarfBuzz at run-time by +calling `hb_buffer_set_unicode_funcs` on every buffer you create, and you do +not rely on `hb_unicode_funcs_get_default()` results, you can disable the +internal implementation by defining both `HB_NO_UCD` and `HB_NO_UNICODE_FUNCS`. +The latter is needed to guard against accidentally building a library without +any default Unicode implementations. + + +## Font-functions + +Access to certain font functionalities can also be configured at run-time. By +default, HarfBuzz uses an efficient internal implementation of OpenType +functionality for this. This internal implementation is called `hb-ot-font`. +All newly-created `hb_font_t` objects by default use `hb-ot-font`. Using this +is highly recommended, and is what fonts use by default when they are created. + +Most embedded uses will probably use HarfBuzz with FreeType using `hb-ft.h`. +In that case, or if you otherwise provide those functions by calling +`hb_font_set_funcs()` on every font you create, you can disable `hb-ot-font` +without loss of functionality by defining `HB_NO_OT_FONT`. + + +## Shapers + +Most HarfBuzz clients use it for the main shaper, called "ot". However, it +is legitimate to want to compile HarfBuzz with only another backend, eg. +CoreText, for example for an iOS app. For that, you want `HB_NO_OT_SHAPE`. +If you are going down that route, check if you want `HB_NO_OT`. + +This is very rarely what you need. Make sure you understand exactly what you +are doing. + +Defining `HB_NO_FALLBACK_SHAPE` however is pretty harmless. That removes the +(unused) "fallback" shaper. + + +## Thread-safety + +By default HarfBuzz builds as a thread-safe library. The exception is that +the `HB_TINY` predefined configuring (more below) disables thread-safety. + +If you do /not/ need thread-safety in the library (eg. you always call into +HarfBuzz from the same thread), you can disable thread-safety by defining +`HB_NO_MT`. As noted already, this is enabled by `HB_TINY`. + + +## Pre-defined configurations + +The [`hb-config.hh`](src/hb-config.hh) internal header supports three +pre-defined configurations as well grouping of various configuration options. +The pre-defined configurations are: + + * `HB_MINI`: Disables shaping of AAT as well as legacy fonts. Ie. it produces + a capable OpenType shaper only. + + * `HB_LEAN`: Disables various non-shaping functionality in the library, as well + as esoteric or rarely-used shaping features. See the definition for details. + + * `HB_TINY`: Enables both `HB_MINI` and `HB_LEAN` configurations, as well as + disabling thread-safety and debugging, and use even more size-optimized data + tables. + + +## Tailoring configuration + +Most of the time, one of the pre-defined configuration is exactly what one needs. +Sometimes, however, the pre-defined configuration cuts out features that might +be desired in the library. Unfortunately there is no quick way to undo those +configurations from the command-line. But one can add a header file called +`config-override.h` to undefine certain `HB_NO_*` symbols as desired. Then +define `HAVE_CONFIG_OVERRIDE_H` to make `hb-config.hh` include your configuration +overrides at the end. + + +## Notes + +Note that the config option `HB_NO_CFF`, which is enabled by `HB_LEAN` and +`HB_TINY` does /not/ mean that the resulting library won't work with CFF fonts. +The library can shape valid CFF fonts just fine, with or without this option. +This option disables (among other things) the code to calculate glyph exntents +for CFF fonts. diff --git a/source/libs/harfbuzz/harfbuzz-src/ChangeLog b/source/libs/harfbuzz/harfbuzz-src/ChangeLog new file mode 100644 index 000000000..5432e12cb --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/ChangeLog @@ -0,0 +1,116531 @@ +commit e48ef0804ad7e4abd35ff3646fa6ed10ad32f1ef +Author: Behdad Esfahbod +Date: Mon Sep 30 12:39:06 2019 -0700 + + 2.6.2 + + NEWS | 6 ++++++ + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 3 files changed, 9 insertions(+), 3 deletions(-) + +commit d6ad613159aabce42fc21d57f6f1a4762c5617bf +Author: Behdad Esfahbod +Date: Tue Sep 10 15:31:44 2019 -0700 + + [docs] Misc fixes + + docs/harfbuzz-sections.txt | 4 ++-- + src/hb-gdi.cc | 2 +- + src/hb-ot-layout.cc | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 2dce85ed06a8cc7ca20900c65662af659c53e717 +Author: Ebrahim Byagowi +Date: Thu Sep 26 21:15:59 2019 +0330 + + [icu] Remove HB_ICU_STMT (#1993) + + And ignore extra semicolon error to ICU versions < 65 + + src/hb-icu.cc | 43 ++++++++++++++++++++++++------------------- + 1 file changed, 24 insertions(+), 19 deletions(-) + +commit d6a83abd6a0c684bd9a27f593d5be388819022b7 +Author: Iceflower +Date: Thu Sep 26 11:42:11 2019 +0200 + + Define HB_UNUSED for clang + + src/hb.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c4567968cd175dc367ab951c9e3141ab5c03c2d6 +Author: Iceflower +Date: Thu Sep 26 11:35:27 2019 +0200 + + [dwrite] Fix extra semicolon issue + + src/hb-directwrite.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b0c3eb06b64dcfcfee09a25dde8250804484f77d +Author: Qunxin Liu +Date: Wed Sep 18 16:11:44 2019 -0700 + + [subset] GPOS Lookup Type 3: CursivePos + + src/hb-ot-layout-common.hh | 33 ++++++++ + src/hb-ot-layout-gpos-table.hh | 87 ++++++++++++++++++++- + test/subset/data/Makefile.am | 1 + + test/subset/data/Makefile.sources | 1 + + .../gpos3_font3.keep-layout-retain-gids.28,29.otf | Bin 0 -> 1712 bytes + .../gpos3_font3.keep-layout-retain-gids.28,2B.otf | Bin 0 -> 1860 bytes + .../gpos3_font3.keep-layout-retain-gids.29,2B.otf | Bin 0 -> 1772 bytes + ...eep-layout-retain-gids.retain-all-codepoint.otf | Bin 0 -> 3692 bytes + .../layout.gpos3/gpos3_font3.keep-layout.28,29.otf | Bin 0 -> 1328 bytes + .../layout.gpos3/gpos3_font3.keep-layout.28,2B.otf | Bin 0 -> 1456 bytes + .../layout.gpos3/gpos3_font3.keep-layout.29,2B.otf | Bin 0 -> 1368 bytes + ...pos3_font3.keep-layout.retain-all-codepoint.otf | Bin 0 -> 3692 bytes + test/subset/data/fonts/gpos3_font3.otf | Bin 0 -> 4624 bytes + test/subset/data/tests/layout.gpos3.tests | 12 +++ + 14 files changed, 132 insertions(+), 2 deletions(-) + +commit 68d39ea4866a9d2bae60107619aad25dac6da241 +Author: Ebrahim Byagowi +Date: Tue Sep 24 13:52:46 2019 +0330 + + Revert previous change and fix -Wrange-loop-analysis complains + + src/hb-ot-layout-gpos-table.hh | 6 +++--- + src/hb-ot-vorg-table.hh | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit cbc0646a6cfc0f6a04804d6888636f12130cd51b +Author: Ebrahim Byagowi +Date: Tue Sep 24 12:08:12 2019 +0330 + + Minor, normalize for each calls + + src/hb-ot-glyf-table.hh | 5 +---- + src/hb-ot-layout-gpos-table.hh | 10 +++++----- + src/hb-ot-name-table.hh | 3 +-- + src/hb-ot-vorg-table.hh | 3 +-- + 4 files changed, 8 insertions(+), 13 deletions(-) + +commit 22b6c6a5c7b9bebe123822c702b9661e144ebd6b +Author: Ebrahim Byagowi +Date: Tue Sep 24 12:06:28 2019 +0330 + + [serialize] use for each as #resolve_links, format + + src/hb-serialize.hh | 22 +++++++--------------- + 1 file changed, 7 insertions(+), 15 deletions(-) + +commit 512551f27600adac875de3381533b52d78f6b22d +Author: Qunxin Liu <48925186+qxliu76@users.noreply.github.com> +Date: Mon Sep 23 17:28:16 2019 -0700 + + memory leak fix in serializer (#1988) + + src/hb-serialize.hh | 1 + + 1 file changed, 1 insertion(+) + +commit f0a7677993e51ba4076a0f9a0e7d032d99917d34 +Author: Ebrahim Byagowi +Date: Mon Sep 23 21:09:39 2019 +0330 + + [gpos] minor + + src/hb-ot-layout-gpos-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 035ec3d1b46b8e60bea3aa8dcf29cf47a5a42d57 +Author: Ebrahim Byagowi +Date: Mon Sep 23 20:51:43 2019 +0330 + + [cmap] remove has_format14, minor format + + fixes #1986 + + src/hb-ot-cmap-table.hh | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit c1a585fab0c17fe47b0728cf67920791c2173019 +Author: Ebrahim Byagowi +Date: Sat Sep 21 23:30:52 2019 +0430 + + [gpos] minor + + src/hb-ot-layout-gpos-table.hh | 22 +++++++--------------- + 1 file changed, 7 insertions(+), 15 deletions(-) + +commit d87d38998a4ff7bec3d8fb658dc9299f144a2fcb +Author: Ebrahim Byagowi +Date: Sat Sep 21 17:27:39 2019 +0430 + + Fix clang -Wrange-loop-analysis complains + + ./hb-ot-layout-gpos-table.hh:674:43: error: loop variable '_' is always a copy because the range of type 'hb_zip_iter_t > &>, hb_iter_type > &> >' (aka 'hb_zip_iter_t >, hb_array_t > >') does not return a reference [-Werror,-Wrange-loop-analysis] + for (const hb_pair_t& _ : hb_zip (val_iter, first_val_iter)) + ^ + ./hb-ot-layout-gpos-table.hh:674:12: note: use non-reference type 'hb_pair_t' (aka 'hb_pair_t, IntType >') + for (const hb_pair_t& _ : hb_zip (val_iter, first_val_iter)) + + and + + In file included from hb-subset.cc:44: + ./hb-ot-vorg-table.hh:87:34: error: loop variable '_' is always a copy because the range of type 'hb_map_iter_t, const hb_set_t *, OT::HBGlyphID OT::VertOriginMetric::*, nullptr>, (lambda at ./hb-ot-vorg-table.hh:100:15), hb_function_sortedness_t::NOT_SORTED, nullptr>' does not return a reference [-Werror,-Wrange-loop-analysis] + for (const VertOriginMetric& _ : it) + ^ + ./hb-ot-vorg-table.hh:113:17: note: in instantiation of function template specialization 'OT::VORG::serialize, const hb_set_t *, OT::HBGlyphID OT::VertOriginMetric::*, nullptr>, (lambda at ./hb-ot-vorg-table.hh:100:15), hb_function_sortedness_t::NOT_SORTED, nullptr>, nullptr>' requested here + vorg_prime->serialize (c->serializer, it, defaultVertOriginY); + ^ + ./hb-ot-vorg-table.hh:87:10: note: use non-reference type 'OT::VertOriginMetric' + for (const VertOriginMetric& _ : it) + ^~~~~~~~~~~~~~~~~~~~~~~~~~~ + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-vorg-table.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 6e42a418c8fe4231c3cc080bc771455578b0cce0 +Author: Ebrahim Byagowi +Date: Sat Sep 21 16:25:54 2019 +0430 + + Minor, turn more of hb_apply to for each + + src/hb-ot-glyf-table.hh | 5 ++--- + src/hb-ot-layout-gpos-table.hh | 42 ++++++++++++++---------------------------- + src/hb-ot-name-table.hh | 5 ++--- + src/hb-ot-vorg-table.hh | 5 ++--- + 4 files changed, 20 insertions(+), 37 deletions(-) + +commit 0665dce1163317390adbed9394cce2b1325ddb6c +Author: Ebrahim Byagowi +Date: Sat Sep 21 17:22:02 2019 +0430 + + [fuzzer] Don't process output in debug mode as it causes timeout + + test/fuzzing/run-shape-fuzzer-tests.py | 7 ++++++- + test/fuzzing/run-subset-fuzzer-tests.py | 7 ++++++- + 2 files changed, 12 insertions(+), 2 deletions(-) + +commit dc886f6638f50e45e73d01e49db77b4bcefc85e1 +Author: Ebrahim Byagowi +Date: Sat Sep 14 11:18:47 2019 +0430 + + [ci] Re-enable debug builds on fedora bot + + .circleci/config.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 70228f68ac413ee19281861e3039a82d90c17f2a +Author: Ebrahim Byagowi +Date: Sat Sep 21 16:24:41 2019 +0430 + + [ci] Enable HB_WITH_WIN1256 on -Weverything bot + + To catch its compile warnings, #1969 related + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 385741d565de1cc90de23664f8e66fc77c31efae +Author: Ebrahim Byagowi +Date: Sat Sep 21 15:26:14 2019 +0430 + + [cmap] Turn hb_apply into foreach where possible + + src/hb-ot-cmap-table.hh | 151 +++++++++++++++++++----------------------------- + 1 file changed, 61 insertions(+), 90 deletions(-) + +commit 1023c2cc6de0f33602df8709134bef8cdb66ba0c +Author: Ebrahim Byagowi +Date: Sat Sep 21 14:33:43 2019 +0430 + + [cmap] minor + + src/hb-ot-cmap-table.hh | 62 ++++++++++++++++++------------------------------- + 1 file changed, 22 insertions(+), 40 deletions(-) + +commit ead46eefe3bf2bea61c86689f4c5a1da9b7e446b +Author: Ebrahim Byagowi +Date: Sat Sep 21 14:25:11 2019 +0430 + + minor, use internal API instead public hb_set_has + + src/hb-ot-cmap-table.hh | 4 ++-- + src/hb-subset-plan.cc | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit d8af4e7701fe63d63f6669706ce7a5bb3a15a19d +Author: Ebrahim Byagowi +Date: Sat Sep 21 14:19:14 2019 +0430 + + [cmap] minor, turn 8 spaces to tab + + src/hb-ot-cmap-table.hh | 228 ++++++++++++++++++++++++------------------------ + src/hb-subset-plan.cc | 6 +- + 2 files changed, 117 insertions(+), 117 deletions(-) + +commit 4315666283a7d1b175d1c3ed43b5ac85fdc84a50 +Author: Qunxin Liu +Date: Thu Aug 29 11:17:20 2019 -0700 + + [subset] updates according to review comments + + src/hb-ot-cmap-table.hh | 95 ++++++++++++++++++++++++------------------------- + 1 file changed, 47 insertions(+), 48 deletions(-) + +commit bf66d1bf589b6af2ceb30c18619f210b718c9db9 +Author: Qunxin Liu +Date: Wed Aug 21 14:24:33 2019 -0700 + + [subset] Add integration tests for cmap14 + + test/subset/data/Makefile.am | 1 + + test/subset/data/Makefile.sources | 1 + + .../cmap14/cmap14_font1.default.4E00,4E02,4E03.otf | Bin 0 -> 1360 bytes + .../cmap14/cmap14_font1.default.4E00,4E03.otf | Bin 0 -> 1236 bytes + .../cmap14/cmap14_font1.default.4E00,4E05,4E07.otf | Bin 0 -> 1328 bytes + .../cmap14/cmap14_font1.default.4E02,4E03,4E08.otf | Bin 0 -> 1576 bytes + .../expected/cmap14/cmap14_font1.default.4E02.otf | Bin 0 -> 996 bytes + .../expected/cmap14/cmap14_font1.default.4E03.otf | Bin 0 -> 1080 bytes + .../cmap14_font1.default.4E05,4E07,4E08,4E09.otf | Bin 0 -> 1848 bytes + .../cmap14/cmap14_font1.default.4E08,4E09.otf | Bin 0 -> 1720 bytes + .../expected/cmap14/cmap14_font1.default.4E08.otf | Bin 0 -> 1384 bytes + .../cmap14_font1.default.retain-all-codepoint.otf | Bin 0 -> 2348 bytes + ...font1.drop-hints-retain-gids.4E00,4E02,4E03.otf | Bin 0 -> 1388 bytes + ...ap14_font1.drop-hints-retain-gids.4E00,4E03.otf | Bin 0 -> 1272 bytes + ...font1.drop-hints-retain-gids.4E00,4E05,4E07.otf | Bin 0 -> 1396 bytes + ...font1.drop-hints-retain-gids.4E02,4E03,4E08.otf | Bin 0 -> 1720 bytes + .../cmap14_font1.drop-hints-retain-gids.4E02.otf | Bin 0 -> 1028 bytes + .../cmap14_font1.drop-hints-retain-gids.4E03.otf | Bin 0 -> 1124 bytes + ....drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf | Bin 0 -> 1984 bytes + ...ap14_font1.drop-hints-retain-gids.4E08,4E09.otf | Bin 0 -> 1872 bytes + .../cmap14_font1.drop-hints-retain-gids.4E08.otf | Bin 0 -> 1544 bytes + ...drop-hints-retain-gids.retain-all-codepoint.otf | Bin 0 -> 2436 bytes + .../cmap14_font1.drop-hints.4E00,4E02,4E03.otf | Bin 0 -> 1292 bytes + .../cmap14/cmap14_font1.drop-hints.4E00,4E03.otf | Bin 0 -> 1168 bytes + .../cmap14_font1.drop-hints.4E00,4E05,4E07.otf | Bin 0 -> 1260 bytes + .../cmap14_font1.drop-hints.4E02,4E03,4E08.otf | Bin 0 -> 1512 bytes + .../cmap14/cmap14_font1.drop-hints.4E02.otf | Bin 0 -> 928 bytes + .../cmap14/cmap14_font1.drop-hints.4E03.otf | Bin 0 -> 1012 bytes + ...cmap14_font1.drop-hints.4E05,4E07,4E08,4E09.otf | Bin 0 -> 1780 bytes + .../cmap14/cmap14_font1.drop-hints.4E08,4E09.otf | Bin 0 -> 1652 bytes + .../cmap14/cmap14_font1.drop-hints.4E08.otf | Bin 0 -> 1316 bytes + ...map14_font1.drop-hints.retain-all-codepoint.otf | Bin 0 -> 2280 bytes + .../cmap14_font1.name-ids.4E00,4E02,4E03.otf | Bin 0 -> 1292 bytes + .../cmap14/cmap14_font1.name-ids.4E00,4E03.otf | Bin 0 -> 1168 bytes + .../cmap14_font1.name-ids.4E00,4E05,4E07.otf | Bin 0 -> 1260 bytes + .../cmap14_font1.name-ids.4E02,4E03,4E08.otf | Bin 0 -> 1508 bytes + .../expected/cmap14/cmap14_font1.name-ids.4E02.otf | Bin 0 -> 928 bytes + .../expected/cmap14/cmap14_font1.name-ids.4E03.otf | Bin 0 -> 1012 bytes + .../cmap14_font1.name-ids.4E05,4E07,4E08,4E09.otf | Bin 0 -> 1780 bytes + .../cmap14/cmap14_font1.name-ids.4E08,4E09.otf | Bin 0 -> 1652 bytes + .../expected/cmap14/cmap14_font1.name-ids.4E08.otf | Bin 0 -> 1316 bytes + .../cmap14_font1.name-ids.retain-all-codepoint.otf | Bin 0 -> 2280 bytes + .../cmap14_font1.retain-gids.4E00,4E02,4E03.otf | Bin 0 -> 1452 bytes + .../cmap14/cmap14_font1.retain-gids.4E00,4E03.otf | Bin 0 -> 1340 bytes + .../cmap14_font1.retain-gids.4E00,4E05,4E07.otf | Bin 0 -> 1464 bytes + .../cmap14_font1.retain-gids.4E02,4E03,4E08.otf | Bin 0 -> 1788 bytes + .../cmap14/cmap14_font1.retain-gids.4E02.otf | Bin 0 -> 1096 bytes + .../cmap14/cmap14_font1.retain-gids.4E03.otf | Bin 0 -> 1192 bytes + ...map14_font1.retain-gids.4E05,4E07,4E08,4E09.otf | Bin 0 -> 2048 bytes + .../cmap14/cmap14_font1.retain-gids.4E08,4E09.otf | Bin 0 -> 1940 bytes + .../cmap14/cmap14_font1.retain-gids.4E08.otf | Bin 0 -> 1608 bytes + ...ap14_font1.retain-gids.retain-all-codepoint.otf | Bin 0 -> 2500 bytes + test/subset/data/fonts/cmap14_font1.otf | Bin 0 -> 4484 bytes + test/subset/data/tests/cmap14.tests | 21 +++++++++++++++++++++ + 54 files changed, 23 insertions(+) + +commit 2583afa0eb90134274ddd92864ea5270eeebc52e +Author: Qunxin Liu +Date: Fri Aug 16 13:54:24 2019 -0700 + + [subset] subsetting cmap14 + + src/hb-ot-cmap-table.hh | 295 +++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 265 insertions(+), 30 deletions(-) + +commit 078ddbd0f6ad660e740809b7f4c067e02309b98d +Author: Qunxin Liu +Date: Wed Aug 7 13:17:26 2019 -0700 + + [subset] glyph closure for CMAP14 + + src/hb-ot-cmap-table.hh | 34 +++++++++++++++++++++++++++++++++- + src/hb-subset-plan.cc | 10 ++++++++++ + 2 files changed, 43 insertions(+), 1 deletion(-) + +commit bbe878006d347893fc70e282c2aaafef5dd622b4 +Author: Ebrahim Byagowi +Date: Wed Sep 18 22:22:01 2019 +0430 + + Avoid bitwise negate of enum value + + Fixes this -fno-sanitize-recover=undefined fail, + + hb-ot-map.hh:188:1: runtime error: load of value 4294967294, which is not a valid value for type 'hb_ot_map_feature_flags_t' + #0 0x7f62bfa9b227 in operator&=(hb_ot_map_feature_flags_t&, hb_ot_map_feature_flags_t) /home/ebrahim/Desktop/harfbuzz/src/./hb-ot-map.hh:188:1 + #1 0x7f62bfa9b227 in hb_ot_map_builder_t::compile(hb_ot_map_t&, hb_ot_shape_plan_key_t const&) /home/ebrahim/Desktop/harfbuzz/src/hb-ot-map.cc:194 + #2 0x7f62bface650 in hb_ot_shape_planner_t::compile(hb_ot_shape_plan_t&, hb_ot_shape_plan_key_t const&) /home/ebrahim/Desktop/harfbuzz/src/hb-ot-shape.cc:108:7 + #3 0x7f62bfacec1e in hb_ot_shape_plan_t::init0(hb_face_t*, hb_shape_plan_key_t const*) /home/ebrahim/Desktop/harfbuzz/src/hb-ot-shape.cc:225:11 + #4 0x7f62bfae1318 in hb_shape_plan_create2 /home/ebrahim/Desktop/harfbuzz/src/hb-shape-plan.cc:232:7 + #5 0x7f62bfae1d2a in hb_shape_plan_create_cached2 /home/ebrahim/Desktop/harfbuzz/src/hb-shape-plan.cc:489:33 + #6 0x7f62bfae2527 in hb_shape_full /home/ebrahim/Desktop/harfbuzz/src/hb-shape.cc:135:33 + #7 0x55ed360b6588 in shape_options_t::shape(hb_font_t*, hb_buffer_t*, char const**) /home/ebrahim/Desktop/harfbuzz/util/./options.hh:242:10 + #8 0x55ed360b5d9c in shape_consumer_t::consume_line(char const*, unsigned int, char const*, char const*) /home/ebrahim/Desktop/harfbuzz/util/./shape-consumer.hh:67:19 + #9 0x55ed360b549f in main_font_text_t, 2147483647, 0>::main(int, char**) /home/ebrahim/Desktop/harfbuzz/util/./main-font-text.hh:81:16 + #10 0x55ed360b4e23 in main /home/ebrahim/Desktop/harfbuzz/util/hb-shape.cc:189:17 + #11 0x7f62bf104ee2 in __libc_start_main (/usr/lib/libc.so.6+0x26ee2) + #12 0x55ed3608f7ad in _start (/home/ebrahim/Desktop/harfbuzz/util/.libs/lt-hb-shape+0xd7ad) + + src/hb-ot-map.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e6909ee58d0f7b954f3bb227c2f90ca4cfd0c858 +Author: Ebrahim Byagowi +Date: Wed Sep 18 22:12:25 2019 +0430 + + minor + + src/hb-buffer.cc | 2 +- + src/hb-common.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit bb41b74fd1fb42b08e9069c22ee046daeee98e6b +Author: Ebrahim Byagowi +Date: Wed Sep 18 00:55:24 2019 +0430 + + Don't rely on undefined left shift of negative value behavior + + Fixes this -fno-sanitize-recover=undefined check, + + hb-ft.cc:869:27: runtime error: left shift of negative value -16384 + #0 0x7ff8f47da843 in hb_ft_font_set_funcs /home/ebrahim/Desktop/harfbuzz/src/hb-ft.cc:869:27 + #1 0x55f20a66c7d6 in font_options_t::get_font() const /home/ebrahim/Desktop/harfbuzz/util/options.cc:731:3 + #2 0x55f20a668c1f in shape_consumer_t::init(hb_buffer_t*, font_options_t const*) /home/ebrahim/Desktop/harfbuzz/util/./shape-consumer.hh:47:42 + #3 0x55f20a668441 in main_font_text_t, 2147483647, 0>::main(int, char**) /home/ebrahim/Desktop/harfbuzz/util/./main-font-text.hh:75:14 + #4 0x55f20a667f91 in main /home/ebrahim/Desktop/harfbuzz/util/hb-shape.cc:180:21 + #5 0x7ff8f3df7ee2 in __libc_start_main (/usr/lib/libc.so.6+0x26ee2) + #6 0x55f20a6427ad in _start (/home/ebrahim/Desktop/harfbuzz/util/.libs/lt-hb-shape+0xd7ad) + + src/hb-ft.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b73313ade75130bf86ad1efbd312ce4106166089 +Author: Ebrahim Byagowi +Date: Wed Sep 18 00:50:32 2019 +0430 + + Don't seek of out-of-bound value even if the result is not used + + Fixes this -fno-sanitize-recover=undefined fail, + + /set/iter: hb-algs.hh:1016:60: runtime error: index 4294967295 out of bounds for type 'unsigned long long const[8]' + #0 0x4d1e09 in hb_vector_size_t::operator[](unsigned int) const /home/user/code/harfbuzz/src/./hb-algs.hh:1016:60 + #1 0x4d8b5f in hb_set_t::page_t::previous(unsigned int*) const /home/user/code/harfbuzz/src/./hb-set.hh:139:53 + #2 0x4d0ada in hb_set_t::previous(unsigned int*) const /home/user/code/harfbuzz/src/./hb-set.hh:602:36 + #3 0x4cd76f in hb_set_previous /home/user/code/harfbuzz/src/hb-set.cc:494:15 + #4 0x4ca8af in test_set_iter /home/user/code/harfbuzz/test/api/test-set.c:310:3 + #5 0x7f3a4f3e0f49 (/usr/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x72f49) + #6 0x7f3a4f3e0e7a (/usr/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x72e7a) + #7 0x7f3a4f3e1121 in g_test_run_suite (/usr/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x73121) + #8 0x7f3a4f3e1140 in g_test_run (/usr/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x73140) + #9 0x4c8894 in hb_test_run /home/user/code/harfbuzz/test/api/./hb-test.h:88:10 + #10 0x4c8894 in main /home/user/code/harfbuzz/test/api/test-set.c:408:10 + #11 0x7f3a4e3d2b96 in __libc_start_main /build/glibc-OTsEL5/glibc-2.27/csu/../csu/libc-start.c:310 + #12 0x41e7d9 in _start (/home/user/code/harfbuzz/test/api/test-set+0x41e7d9) + + src/hb-set.hh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit d8af9ee017ed1018343d30272f55b90dd03a3559 +Author: Ebrahim Byagowi +Date: Wed Sep 18 00:47:55 2019 +0430 + + Don't rely on nullptr deref recovery + + Fixes this -fno-sanitize-recover=undefined fail, + + /types/language: hb-common.cc:385:20: runtime error: member access within null pointer of type 'const struct hb_language_impl_t' + #0 0x4caa34 in hb_language_to_string /home/user/code/harfbuzz/src/hb-common.cc:385:20 + #1 0x4c9be8 in test_types_language /home/user/code/harfbuzz/test/api/test-common.c:205:3 + #2 0x7f9557e72f49 (/usr/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x72f49) + #3 0x7f9557e72e7a (/usr/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x72e7a) + #4 0x7f9557e73121 in g_test_run_suite (/usr/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x73121) + #5 0x7f9557e73140 in g_test_run (/usr/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x73140) + #6 0x4c88a3 in hb_test_run /home/user/code/harfbuzz/test/api/./hb-test.h:88:10 + #7 0x4c88a3 in main /home/user/code/harfbuzz/test/api/test-common.c:224:10 + #8 0x7f9556e64b96 in __libc_start_main /build/glibc-OTsEL5/glibc-2.27/csu/../csu/libc-start.c:310 + #9 0x41e7d9 in _start (/home/user/code/harfbuzz/test/api/test-common+0x41e7d9) + + src/hb-common.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit bfb155a5f19b26f9dcff667a76a24cd5c3b83234 +Author: Ebrahim Byagowi +Date: Wed Sep 18 00:44:52 2019 +0430 + + Don't call memset when length is zero + + Fixes this -fno-sanitize-recover=undefined check, + + /buffer/positions/empty: hb-buffer.cc:327:11: runtime error: null pointer passed as argument 1, which is declared to never be null + + /usr/include/string.h:60:62: note: nonnull attribute specified here + #0 0x4cf31c in hb_buffer_t::clear_positions() /home/user/code/harfbuzz/src/hb-buffer.cc:327:3 + #1 0x4d4dd4 in hb_buffer_get_glyph_positions /home/user/code/harfbuzz/src/hb-buffer.cc:1418:13 + #2 0x4cb553 in test_buffer_positions /home/user/code/harfbuzz/test/api/test-buffer.c:305:3 + #3 0x7f324187bf49 (/usr/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x72f49) + #4 0x7f324187be7a (/usr/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x72e7a) + #5 0x7f324187be7a (/usr/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x72e7a) + #6 0x7f324187c121 in g_test_run_suite (/usr/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x73121) + #7 0x7f324187c140 in g_test_run (/usr/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x73140) + #8 0x4c8bd3 in hb_test_run /home/user/code/harfbuzz/test/api/./hb-test.h:88:10 + #9 0x4c8bd3 in main /home/user/code/harfbuzz/test/api/test-buffer.c:884:10 + #10 0x7f324086db96 in __libc_start_main /build/glibc-OTsEL5/glibc-2.27/csu/../csu/libc-start.c:310 + #11 0x41e919 in _start (/home/user/code/harfbuzz/test/api/test-buffer+0x41e919) + + src/hb-buffer.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 5a1cc199ab7b619935af04584ecc650216a83d66 +Author: Ebrahim Byagowi +Date: Wed Sep 18 00:43:44 2019 +0430 + + [ci] Run -fno-sanitize-recover=undefined checks + + .circleci/config.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c930ae2bd8b6f626ddec0628ae6b38e3134e3c97 +Author: Ebrahim Byagowi +Date: Mon Sep 16 14:04:34 2019 +0430 + + Avoid stdint.h in Kernel module compiles + + src/hb-common.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit 412d6cac3a46d710159ed4b3cc3bb59fd5876d5f +Author: Ebrahim Byagowi +Date: Mon Sep 16 13:50:11 2019 +0430 + + Extract an avoid errno compile flag + + src/hb-blob.cc | 1 - + src/hb-config.hh | 1 + + src/hb.hh | 9 +++++++-- + 3 files changed, 8 insertions(+), 3 deletions(-) + +commit 8a16d6f1c13388e6d9ca844a309632ec583ee1a2 +Author: Ebrahim Byagowi +Date: Sun Sep 15 20:43:33 2019 +0430 + + [doc] fix minor typo + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit aab279b33dda45ae0e45c887f2fad6381b5138dc +Author: Ebrahim Byagowi +Date: Sat Sep 14 11:20:09 2019 +0430 + + [ci] Install cmake on macOS cmake/amalgam tester + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f3214df6f63919ebe73c713b1e80bba1097a0cea +Author: Ebrahim Byagowi +Date: Sat Sep 14 10:56:00 2019 +0430 + + [coretext] Fix double promotion warnings by making casts explicit + + src/hb-coretext.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit cbbb6fa45519a8670870c784841d7b9e1ab71dd1 +Author: Ebrahim Byagowi +Date: Sat Sep 14 10:53:12 2019 +0430 + + [ci] Don't build cmake tests in macOS bot + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6e4736a3c5acc0eea1b16c79b95d1a3082baa320 +Author: Ebrahim Byagowi +Date: Sat Sep 14 10:38:52 2019 +0430 + + [name] Undef entry_{index,score} to avoid collision in amalgam builds + + src/hb-ot-name-table.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit d512087e4dfb5d9483b78eaf8443b4fa8724b8e1 +Author: Ebrahim Byagowi +Date: Sat Sep 14 10:36:29 2019 +0430 + + Rename GlyphID to HBGlyphID + + Avoid collision with macOS's ATSUnicodeTypes.h GlyphID + + src/hb-aat-layout-bsln-table.hh | 4 +- + src/hb-aat-layout-common.hh | 16 +++---- + src/hb-aat-layout-just-table.hh | 8 ++-- + src/hb-aat-layout-kerx-table.hh | 4 +- + src/hb-aat-layout-morx-table.hh | 32 ++++++------- + src/hb-open-type.hh | 4 +- + src/hb-ot-cmap-table.hh | 4 +- + src/hb-ot-color-cbdt-table.hh | 8 ++-- + src/hb-ot-color-colr-table.hh | 4 +- + src/hb-ot-glyf-table.hh | 2 +- + src/hb-ot-layout-base-table.hh | 2 +- + src/hb-ot-layout-common.hh | 22 ++++----- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 72 +++++++++++++++--------------- + src/hb-ot-layout-jstf-table.hh | 2 +- + src/hb-ot-math-table.hh | 4 +- + src/hb-ot-shape-complex-arabic-fallback.hh | 14 +++--- + src/hb-ot-vorg-table.hh | 2 +- + 18 files changed, 103 insertions(+), 103 deletions(-) + +commit bf08611044d83b6f5d6dec443f5216db259b4085 +Author: Ebrahim Byagowi +Date: Sat Sep 14 10:35:08 2019 +0430 + + [ci] Update and compile cmake/amalgam on macOS bot + + .circleci/config.yml | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 229ef1d29d5c7a370ebb10a1131c04719f34dc81 +Author: Behdad Esfahbod +Date: Tue Sep 10 10:31:07 2019 -0700 + + Rename Fixed to HBFixed + + Fixes(!!) https://github.com/harfbuzz/harfbuzz/issues/1966 + + src/hb-aat-fdsc-table.hh | 4 ++-- + src/hb-aat-layout-just-table.hh | 20 ++++++++++---------- + src/hb-aat-layout-trak-table.hh | 8 ++++---- + src/hb-open-type.hh | 4 ++-- + src/hb-ot-post-table.hh | 2 +- + src/hb-ot-stat-table.hh | 14 +++++++------- + src/hb-ot-var-fvar-table.hh | 16 ++++++++-------- + 7 files changed, 34 insertions(+), 34 deletions(-) + +commit 170b5dd856b1ba8f26e79863fe0c64a52eb68951 +Author: Behdad Esfahbod +Date: Sun Sep 8 16:34:11 2019 -0400 + + [aat] Minor + + src/hb-aat-layout-morx-table.hh | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +commit a0695687eb03bcf80c4dec19917127cdd8d8797d +Author: Behdad Esfahbod +Date: Sun Sep 8 16:32:12 2019 -0400 + + [aat] Minor + + src/hb-aat-layout-morx-table.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit 4905a2198b4c47c12c6356f72ae0d2b178630d25 +Author: Ebrahim Byagowi +Date: Mon Sep 9 12:36:12 2019 +0430 + + [number] Add static to hb-number-parser.hh functions + + src/hb-number-parser.hh | 4 ++-- + src/hb-number-parser.rl | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 30e5cdfbf1ce2aadadf29ccfd0733355ced2d065 +Author: Ebrahim Byagowi +Date: Mon Sep 9 00:28:16 2019 +0430 + + [number] Optimize _pow10 constants (#1963) + + src/hb-number-parser.hh | 43 +++++++++++++++++++------------------------ + src/hb-number-parser.rl | 31 +++++++++++++------------------ + 2 files changed, 32 insertions(+), 42 deletions(-) + +commit 3f2cdf07a417f81aeeb1e296db493b6e02d76ba8 +Author: Behdad Esfahbod +Date: Sun Sep 8 15:08:02 2019 -0400 + + Change HB_VAR_ARRAY to 1 again + + To fix MSVC bots, while I work on changing this to 0 permanently. + + src/hb.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 39cf8e21be2bf69717cf60a339b3ad26c6f7985b +Author: Ebrahim Byagowi +Date: Sat Sep 7 15:27:30 2019 +0430 + + [number] Add overflow checks used to be done in parse_bcd + + Which were removed in 1083df8 + + src/hb-number-parser.hh | 60 +++++++++++++++++++++++++++++++++---------------- + src/hb-number-parser.rl | 38 ++++++++++++++++++++++++------- + 2 files changed, 71 insertions(+), 27 deletions(-) + +commit 47d82713a144e06e00a486b3aa7d3934d62d68fd +Author: Ebrahim Byagowi +Date: Fri Sep 6 20:33:10 2019 +0430 + + Replace strtod with a ragel implementation + + Use a ragel based number parser when strtod_l couldn't be found + as libc's strtod may is locale sensetivity which we need to not. + + src/Makefile.sources | 2 + + src/hb-number-parser.hh | 223 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-number-parser.rl | 122 ++++++++++++++++++++++++++ + src/hb-number.cc | 3 +- + src/test-number.cc | 30 +++++++ + 5 files changed, 379 insertions(+), 1 deletion(-) + +commit 80613e5b9ee31125f4390012719e6f39970118d3 +Author: Ebrahim Byagowi +Date: Sat Sep 7 14:25:54 2019 +0430 + + Minor, remove unused header + + src/hb-common.cc | 3 --- + 1 file changed, 3 deletions(-) + +commit 5902198cee9b9939ae310f459f9f18f5f1b07424 +Author: Behdad Esfahbod +Date: Fri Sep 6 21:36:31 2019 -0400 + + [kerx] Fix offset issue in kern format 2 + + Fixes tests with HB_VAR_ARRAY != 1, as done in previous commit. + + src/hb-aat-layout-common.hh | 2 +- + src/hb-aat-layout-kerx-table.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 861547d5315be4cb22f3a1e7cd59696d8657ca49 +Author: Behdad Esfahbod +Date: Fri Sep 6 16:55:00 2019 -0400 + + Change HB_VAR_ARRAY from 1 to 0 + + Going to see which compilers it breaks and special-case those... + + src/hb.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 0e294c455e7f2e50172f65463ab016f1372d4c59 +Author: Behdad Esfahbod +Date: Fri Sep 6 16:54:27 2019 -0400 + + Rename VAR to HB_VAR_ARRAY + + src/hb-machinery.hh | 2 +- + src/hb-open-type.hh | 8 ++++---- + src/hb-ot-cff-common.hh | 6 +++--- + src/hb-ot-cff1-table.hh | 4 ++-- + src/hb-ot-layout-common.hh | 2 +- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-string-array.hh | 2 +- + src/hb.hh | 2 +- + 8 files changed, 14 insertions(+), 14 deletions(-) + +commit c379faed2bcca1cc1a81b0de132fc3c4f7f7a080 +Author: Behdad Esfahbod +Date: Fri Sep 6 16:41:12 2019 -0400 + + Fix a few struct size declarations + + Was wrong. As excercised by defining VAR to other than 1 in hb.hh. + + src/hb-aat-layout-feat-table.hh | 2 +- + src/hb-ot-cff-common.hh | 2 +- + src/hb-ot-color-sbix-table.hh | 2 +- + src/hb-ot-layout-common.hh | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 7d4da8b86242d5a541e501937ddf321716b43f07 +Author: Evgeniy Reizner +Date: Fri Sep 6 19:24:32 2019 +0300 + + Remove duplicated tests from test-ot-tag (#1958) + + test/api/test-ot-tag.c | 3 --- + 1 file changed, 3 deletions(-) + +commit 3aceee2527ad921e0d589e42a1fe451e0fc67ee0 +Author: Behdad Esfahbod +Date: Fri Sep 6 12:17:18 2019 -0400 + + Revert "[null] Silence undefined-behavior complaints with too-small null bytes" + + This reverts commit 911c76abcdfe89770b252eb0d4eb621c0db00ad5. + + Broke tests. I'm not sure I understand why. At any rate, this was a + bad way to fix. I'll look into understanding as well as better fix. + + src/hb-null.hh | 6 ------ + 1 file changed, 6 deletions(-) + +commit 911c76abcdfe89770b252eb0d4eb621c0db00ad5 +Author: Behdad Esfahbod +Date: Fri Sep 6 11:53:11 2019 -0400 + + [null] Silence undefined-behavior complaints with too-small null bytes + + Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1577584 + + src/hb-null.hh | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 3c81246f66585edd8ee4515d226b133c290e9d7c +Author: Behdad Esfahbod +Date: Sun Sep 1 19:25:50 2019 -0500 + + [subset] Use newer iter tools in SinglePosFormat1 + + src/hb-ot-layout-gpos-table.hh | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +commit 9510e918f72d2496f5e2ec84c58e79af944c8a0b +Author: Behdad Esfahbod +Date: Sun Sep 1 16:25:33 2019 -0500 + + [iter] Partialize hb_zip() + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 52d19ba4591e822708e52a8fc96d9821fe2668f4 +Author: Behdad Esfahbod +Date: Sun Sep 1 19:42:08 2019 -0500 + + Minor + + test/subset/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit cad698568a36ea6c929b4c888bd5e8aafe8d39e3 +Author: Ebrahim Byagowi +Date: Wed Sep 4 10:59:19 2019 +0430 + + Use roundf to fix cast to int difference of msys2 w64 + + src/test-number.cc | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 88c73359da3f7078d02f27087790c7109ab4d248 +Author: Ebrahim Byagowi +Date: Wed Sep 4 11:16:18 2019 +0430 + + Check roundf availibity in autotools + + Hmm, not sure how I missed it. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1083df8b80b08aa1a4f2dabfe414aaa4a0ec8aa1 +Author: Ebrahim Byagowi +Date: Wed Sep 4 01:22:21 2019 +0430 + + Use hb_parse_double in CFF::dict_opset_t::parse_bcd + + src/Makefile.sources | 2 + + src/hb-cff-interp-dict-common.hh | 136 +++++++++------------------------------ + 2 files changed, 31 insertions(+), 107 deletions(-) + +commit 57f88e11d4c48f40a2e56625a54bdfed4aae601a +Author: Ebrahim Byagowi +Date: Wed Sep 4 01:20:50 2019 +0430 + + [number] Turn hb_parse_float into hb_parse_double + + src/hb-common.cc | 6 +++++- + src/hb-number.cc | 16 ++++++++-------- + src/hb-number.hh | 4 ++-- + src/test-number.cc | 44 ++++++++++++++++++++++---------------------- + 4 files changed, 37 insertions(+), 33 deletions(-) + +commit 65690b5a4bf1186a072e8e918c5e01464f918d46 +Author: Ebrahim Byagowi +Date: Tue Sep 3 23:09:47 2019 +0430 + + [number] Add whole buffer check and test it + + src/hb-algs.hh | 6 ++---- + src/hb-buffer-serialize.cc | 12 ++++-------- + src/hb-number.cc | 39 ++++++++++++++++++++++++--------------- + src/hb-number.hh | 9 ++++++--- + src/test-number.cc | 19 ++++++++++++++++--- + 5 files changed, 52 insertions(+), 33 deletions(-) + +commit 3661eb6105a33a763736d8dc4a2cd95c01aa4332 +Author: Ebrahim Byagowi +Date: Tue Sep 3 19:43:14 2019 +0430 + + Don't check null terminaion of source in hb_codepoint_parse + + This isn't what intended originally, just checking if consumed + all the buffer is enough. + + src/hb-algs.hh | 4 ++-- + src/test-number.cc | 32 +++++++++++++++++++++++++++++++- + 2 files changed, 33 insertions(+), 3 deletions(-) + +commit 3a162727501ad0c56d5d6561cace115d858eacb7 +Author: Ebrahim Byagowi +Date: Tue Sep 3 17:19:33 2019 +0430 + + [test] resolve msvc complain on signedness comparing + + src/test-number.cc | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 005389beb5a28e2a94b40d0bb8229e9598b84b1d +Author: Ebrahim Byagowi +Date: Tue Sep 3 17:00:46 2019 +0430 + + Use hb_parse_uint in deserializer token parser + + src/hb-buffer-serialize.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 3d5b1df7ab689871db37ec9a2f5b1ff1665fdb20 +Author: Ebrahim Byagowi +Date: Tue Sep 3 16:58:16 2019 +0430 + + [number] Add test + + src/Makefile.am | 6 +- + src/test-number.cc | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 185 insertions(+), 1 deletion(-) + +commit b5e6805ee777347ae13ba0133ca0d64252ef9d55 +Author: Ebrahim Byagowi +Date: Tue Sep 3 15:23:40 2019 +0430 + + [number] Minor tweak on parser related codes + + src/hb-algs.hh | 6 +++--- + src/hb-buffer-serialize.cc | 6 ++---- + src/hb-common.cc | 14 ++++++-------- + src/hb-number.cc | 6 ++---- + 4 files changed, 13 insertions(+), 19 deletions(-) + +commit e2cecf1f34fe1cc62fd8260172f9bd694a17fac5 +Author: Ebrahim Byagowi +Date: Tue Sep 3 15:14:21 2019 +0430 + + [number] Remove parsing code duplication of the calls using lambda + + src/hb-number.cc | 57 +++++++++++++++++++------------------------------------- + 1 file changed, 19 insertions(+), 38 deletions(-) + +commit a77bb7eb41d34b19a672bb4ede038cc1b19a3945 +Author: Ebrahim Byagowi +Date: Tue Sep 3 14:49:14 2019 +0430 + + Move hb_codepoint_parse to hb_parse_uint + + src/hb-algs.hh | 20 +++++++++----------- + src/hb-buffer-serialize.cc | 1 - + src/hb-common.cc | 1 - + src/hb-number.cc | 26 +++++++++++++++++++++++--- + src/hb-number.hh | 3 +++ + src/hb.hh | 3 ++- + 6 files changed, 37 insertions(+), 17 deletions(-) + +commit 43372fbb5afe31ea1e66d450f29de718b6190828 +Author: Ebrahim Byagowi +Date: Tue Sep 3 01:02:40 2019 +0430 + + Merge and aggregate number parsing logics to form hb-number + + src/Makefile.sources | 2 + + src/harfbuzz.cc | 1 + + src/hb-buffer-serialize.cc | 41 +++++--------- + src/hb-common.cc | 121 +++------------------------------------ + src/hb-number.cc | 138 +++++++++++++++++++++++++++++++++++++++++++++ + src/hb-number.hh | 35 ++++++++++++ + 6 files changed, 197 insertions(+), 141 deletions(-) + +commit d50d2fcbc7233f0473493e17ab3fb243d8d30edd +Author: Ebrahim Byagowi +Date: Tue Sep 3 05:02:06 2019 +0430 + + Fallback if roundf didn't exist, like in dietlibc (#1953) + + CMakeLists.txt | 2 +- + src/hb.hh | 9 +++++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +commit d3b984d3790d61931d4427ad7c0ae6547f8f1076 +Author: Ebrahim Byagowi +Date: Mon Sep 2 18:18:25 2019 +0430 + + Revert in-house pow10 (d80a3ea) and fix oss-fuzz/16922 + + Probably can be fixed but merging it was wrong so let's revert. + + src/hb-cff-interp-dict-common.hh | 37 ++------------------- + ...ase-minimized-hb-subset-fuzzer-5728664968232960 | Bin 0 -> 28 bytes + 2 files changed, 3 insertions(+), 34 deletions(-) + +commit 41d6e95b0d47c874b73b314cd147e6ea8ec5ddfb +Author: Ebrahim Byagowi +Date: Mon Sep 2 01:41:48 2019 +0430 + + [subset] Use internal API of hb_set_t + + src/hb-subset.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 8ccf328d548a51140e22fe61ba6fdae3f7194aa2 +Author: Ebrahim Byagowi +Date: Mon Sep 2 00:02:06 2019 +0430 + + [subset] Run once for a tag + + src/hb-subset.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 0954c8f7a003b4130cfdc1b3f29db8c57953a78f +Author: Khaled Hosny +Date: Sun Sep 1 17:09:08 2019 +0200 + + [ft] Prefer symbol cmap subtable if found (#1948) + + Similar to commit d304d60e4d49df14ed85d6646680085f27bafbf2 for ot-font. + + src/hb-ft.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4375858792f3e3cc2fae72c3ae3327f52884f780 +Author: Ebrahim Byagowi +Date: Sun Sep 1 15:13:05 2019 +0430 + + [editorconfig] Treat Ragel files also as C sources + + .editorconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d80a3ea983534e291aee273dba5b1c6e889dadfa +Author: Ebrahim Byagowi +Date: Sun Sep 1 14:05:16 2019 +0430 + + [cff] Implement in-house power of 10 + + A minimal power only for natural numbers exponents of ten, for portability. + + Found the idea in Tcl/Tk but wrote it myself after weeks and it turned out + being a different implementation, reverse direction, constexpr, etc. + + src/hb-cff-interp-dict-common.hh | 37 ++++++++++++++++++++++++++++++++++--- + 1 file changed, 34 insertions(+), 3 deletions(-) + +commit f441a7c00837fbe7843df6faedd5f6383c2258c3 +Author: Ebrahim Byagowi +Date: Sun Sep 1 02:18:09 2019 +0430 + + Don't allow reference blob be accessed using empty tag in hb_face_reference_table (#1947) + + src/hb-face.cc | 3 +++ + src/hb-subset.cc | 5 ----- + 2 files changed, 3 insertions(+), 5 deletions(-) + +commit c9eb913f4cf3d9d4a28059c7ecf7145ad3c49c65 +Author: Behdad Esfahbod +Date: Sat Aug 31 15:21:02 2019 -0500 + + [iter] Simplify hb_chop() + + src/hb-iter.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 67ec9fa9e48714f595ab17bb8a673b5ee7c73aa8 +Author: Behdad Esfahbod +Date: Sat Aug 31 14:51:49 2019 -0500 + + [iter] Add hb_chop() + + src/hb-iter.hh | 14 ++++++++++++++ + src/test-iter.cc | 2 +- + 2 files changed, 15 insertions(+), 1 deletion(-) + +commit 5828d8e83c023547f0add77b6413967056c2a13c +Author: Behdad Esfahbod +Date: Sat Aug 31 14:36:44 2019 -0500 + + [iter] Add hb_take() specialization for arrays + + src/hb-iter.hh | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 398b296f3b205daa8964de1a63957efeb59f6bdf +Author: Behdad Esfahbod +Date: Sat Aug 31 12:44:24 2019 -0500 + + [iter] Add hb_len() + + src/hb-iter.hh | 8 ++++++++ + src/test-iter.cc | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 875131d47854c162c1d0a39a5c0f8f8d0c5f24e0 +Author: Behdad Esfahbod +Date: Sat Aug 31 12:42:52 2019 -0500 + + [iter] Add hb_take() + + src/hb-iter.hh | 12 ++++++++++-- + src/test-iter.cc | 1 + + 2 files changed, 11 insertions(+), 2 deletions(-) + +commit 1f88dae9f54d18cd740f149d020b2bb435dc9378 +Author: Behdad Esfahbod +Date: Sat Aug 31 12:24:42 2019 -0500 + + [iter] Make iota() accept invokable for increasing to next item + + src/hb-iter.hh | 21 ++++++++++++++++----- + src/test-iter.cc | 1 + + 2 files changed, 17 insertions(+), 5 deletions(-) + +commit 3bc86fb237b668e738a78397be04c603e7cf083b +Author: Behdad Esfahbod +Date: Fri Aug 30 16:39:52 2019 -0500 + + [algs] Fix hb_inc/dec signature + + src/hb-algs.hh | 5 +++-- + src/test-algs.cc | 4 ++++ + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit b1378d8a217a53e17562abebee22276e09528f8c +Author: Behdad Esfahbod +Date: Fri Aug 30 12:10:45 2019 -0500 + + [iter] Add hb_repeat() + + src/hb-iter.hh | 37 +++++++++++++++++++++++++++++++++---- + src/test-iter.cc | 3 +++ + 2 files changed, 36 insertions(+), 4 deletions(-) + +commit 966a18b92a8b95d8024ae67bc237eeffe5019711 +Author: Behdad Esfahbod +Date: Fri Aug 30 12:07:17 2019 -0500 + + [iter] Remove some && + + src/hb-iter.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit de45775c37873dd5818058dfe316cc0e98590334 +Author: Behdad Esfahbod +Date: Fri Aug 30 12:02:46 2019 -0500 + + [iter] Use hb_ridentity instead of lazy + + + src/hb-iter.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ce4d63beec08995aaa6b8b45f7986f074a73f295 +Author: Behdad Esfahbod +Date: Fri Aug 30 11:59:50 2019 -0500 + + [iter] Separate hb_iota implementation from hb_range + + src/hb-iter.hh | 29 +++++++++++++++++++++++++++-- + 1 file changed, 27 insertions(+), 2 deletions(-) + +commit 814dc3cbe5a5e51b48cb962a6f7053797bbb8e0d +Author: Behdad Esfahbod +Date: Fri Aug 30 10:20:30 2019 -0500 + + [iter] Rename + + Moving towards making iota useful for non-integers. + + src/hb-iter.hh | 35 ++++++++++++++++++----------------- + 1 file changed, 18 insertions(+), 17 deletions(-) + +commit 2d5643aed4a5a4bc3ea129d4af3dcbe7af7b9995 +Author: Behdad Esfahbod +Date: Fri Aug 30 09:51:22 2019 -0500 + + [algs] Add hb_inc() and hb_dec()) + + src/hb-algs.hh | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 7eafe94705bb818aac71fbc142158a22da622d19 +Author: Behdad Esfahbod +Date: Fri Aug 30 09:40:40 2019 -0500 + + Revert "[array] Add chop()" + + This reverts commit 545fe9d9f0870568c40c17591f3f224c228feba6. + + Breaks gcc 4.8 and MSVC all versions. + + Will add hb_chop() that works on all iterators instead. + + src/hb-array.hh | 14 -------------- + 1 file changed, 14 deletions(-) + +commit 28c8dcb53f0af0dd3f4e7909285e67865a10b67b +Author: Ebrahim Byagowi +Date: Sat Aug 31 12:27:14 2019 +0430 + + [subset] minor + + src/hb-subset.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 545fe9d9f0870568c40c17591f3f224c228feba6 +Author: Behdad Esfahbod +Date: Thu Aug 29 15:48:21 2019 -0700 + + [array] Add chop() + + Takes n, and returns iterator of iterators that contain up to + n items each. Basically cuts the array into subarrays of size n. + The last sub-array might contain fewer. + + Ideally this should become a generic iter tool, not array-specific, + so we can use it in GPOS to chop a value matrix into rows and elements. + + src/hb-array.hh | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit c72589f13f24ca24a0613f7d9bc28b7fe1ef25c0 +Author: Behdad Esfahbod +Date: Thu Aug 29 15:45:21 2019 -0700 + + [iter] Change item_size to get_item_size() + + By moving access to hb_static_size(Type) into a function instead of + a class-const, we can refer to iter types of incomplete types, which + come handy when a method of hb_array_t wants to return iterator + of hb_array_t. That kind of stuff. Next commit needs this to + build on clang... + + src/hb-array.hh | 8 ++++---- + src/hb-iter.hh | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit d58e248df62457bdc8a5bab743e5de26c6fc57be +Author: Behdad Esfahbod +Date: Thu Aug 29 15:23:48 2019 -0700 + + [array] Add truncate() method + + src/hb-array.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit a06edf1430ba73d24104fce5406f2bc787ce5f11 +Author: Behdad Esfahbod +Date: Thu Aug 29 15:21:18 2019 -0700 + + [array] Use injected class name more + + src/hb-array.hh | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit e0e0c8c10948212e97426e987b6f296dc4270c43 +Author: Behdad Esfahbod +Date: Thu Aug 29 14:58:16 2019 -0700 + + Minor + + src/hb-ot-layout-gpos-table.hh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 0313ef86e32a217e14950d46a3c3b98362a53dee +Author: qxliu76 <48925186+qxliu76@users.noreply.github.com> +Date: Thu Aug 29 14:09:05 2019 -0700 + + bug fix in optimizing coverage table format (#1942) + + We are comparing number of shorts, NOT number of bytes. + + src/hb-ot-layout-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 38f95baf6b7a74547906e8e813c826ee8f8c272f +Author: Behdad Esfahbod +Date: Thu Aug 29 13:40:46 2019 -0700 + + [subset] in SingleSubst subsetting, check for substitute in glyphset + + That matches what fonttools does and allows for specifying exact + glyphset for subset. + + src/hb-ot-layout-gsub-table.hh | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 499029644f35be7feedca7edf4610b2594855f01 +Author: Ebrahim Byagowi +Date: Thu Aug 29 15:09:39 2019 +0430 + + [gsub] Fix clang's semicolon complains + + src/hb-ot-layout-gsub-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 28620310b8a86092074d5a1c40c87fdc9a91ba61 +Author: Ebrahim Byagowi +Date: Thu Aug 29 14:55:54 2019 +0430 + + [test] Avoid alloca use as clang complain + + Fixes https://circleci.com/gh/harfbuzz/harfbuzz/108171 complain + + test/api/test-ot-color.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 875985cd481f1609d10ad0472f1e77af075c93bc +Author: Ebrahim Byagowi +Date: Thu Aug 29 14:51:22 2019 +0430 + + [subset] Don't allow malicious fonts to insert unlimited table headers + + Fixes https://crbug.com/oss-fuzz/16810 + + src/hb-subset.cc | 5 +++++ + ...estcase-minimized-hb-subset-fuzzer-5675720390475776 | Bin 0 -> 299037 bytes + 2 files changed, 5 insertions(+) + +commit dc9222b1dd197ba50f7b63eb97f3fe0891a7b7b5 +Author: Behdad Esfahbod +Date: Wed Aug 28 15:38:46 2019 -0700 + + [subset] Implement AlternateSubst subsetting + + src/hb-ot-layout-gsub-table.hh | 61 +++++++++++++++++++++++++++++++++++++----- + 1 file changed, 55 insertions(+), 6 deletions(-) + +commit 23681b6da4368895fc049beda5a79af58aad8d69 +Author: Behdad Esfahbod +Date: Wed Aug 28 15:30:37 2019 -0700 + + Minor + + src/hb-ot-layout-gsub-table.hh | 21 ++++++++------------- + 1 file changed, 8 insertions(+), 13 deletions(-) + +commit 33c8e2303c23e8dfacb79ac15d8a0e6c7f866c89 +Author: Behdad Esfahbod +Date: Wed Aug 28 15:25:55 2019 -0700 + + [subset] Implement MultipleSubst subsetting + + src/hb-ot-layout-gsub-table.hh | 50 ++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 48 insertions(+), 2 deletions(-) + +commit 5c43a7ba7e4cac229593f9cbe1017d3c55b111ac +Author: Behdad Esfahbod +Date: Wed Aug 28 15:09:58 2019 -0700 + + [GSUB] Use dagger in Ligature::intersects() + + src/hb-ot-layout-gsub-table.hh | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +commit b8c642c1f597fb28ef323ac3cd78541eb462a2f7 +Author: Behdad Esfahbod +Date: Wed Aug 28 15:06:45 2019 -0700 + + Minor + + src/hb-ot-layout-gsub-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dc2c9aa0c398ac068e1385fffe1fb2b28c80d099 +Author: Behdad Esfahbod +Date: Wed Aug 28 15:05:49 2019 -0700 + + Rename + + src/hb-open-type.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit bc5ef765a874ecd9fc0634dccf0848d1ee839c9a +Author: Behdad Esfahbod +Date: Wed Aug 28 14:51:28 2019 -0700 + + [subset] Subset ligature substitutes! + + Test with: + + $ ./hb-subset -o out.ttf NotoSansArabic-Regular.ttf --drop-tables= سلام && ./hb-view out.ttf سلام + + src/hb-ot-layout-gsub-table.hh | 79 ++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 76 insertions(+), 3 deletions(-) + +commit 42d887bd221879f57ef939838d4f72bf38268943 +Author: Behdad Esfahbod +Date: Wed Aug 28 14:47:14 2019 -0700 + + Beef up HeadlessArrayOf<> + + Should be merged with ArrayOf... + https://github.com/harfbuzz/harfbuzz/issues/1937 + + src/hb-open-type.hh | 37 ++++++++++++++++++++++++++++++------- + 1 file changed, 30 insertions(+), 7 deletions(-) + +commit 3ca809e3623e59b9a99bc0b9e5d10b02238bba3c +Author: Behdad Esfahbod +Date: Wed Aug 28 13:49:35 2019 -0700 + + Add ArrayOf::pop() + + src/hb-open-type.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 307bd6d79f11eb175f06c08c321947a447496291 +Author: Behdad Esfahbod +Date: Wed Aug 28 13:49:17 2019 -0700 + + Add arithmetic operators to IntType<> + + src/hb-open-type.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 2e1d00c85bba98f08a728c4f6f8112d5a25d8062 +Author: Behdad Esfahbod +Date: Wed Aug 28 13:49:04 2019 -0700 + + [debug] Minor + + src/hb-debug.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 062cad5e28574f9f004f917afa7d010fa68fdad0 +Author: Behdad Esfahbod +Date: Wed Aug 28 13:33:08 2019 -0700 + + Add ArrayOf::serialize_append + + src/hb-open-type.hh | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit b66076812d067f893a5a422af2656916ff479d8f +Author: Adrian Wong +Date: Wed Aug 28 21:31:27 2019 +1000 + + Adjustments to the generated Indic table output (#1936) + + * Add empty parentheses after print call + + * Minor: newlines. Move #pragma pop down one; #endif up one + + * Adjust #define ISC/IMC output + + * Regenerate Indic table + + src/gen-indic-table.py | 21 ++++--- + src/hb-ot-shape-complex-indic-table.cc | 109 +++++++++++++++++---------------- + 2 files changed, 70 insertions(+), 60 deletions(-) + +commit 4ef08dbce1a9acd7e941168245c96e010248ecb6 +Author: Ebrahim Byagowi +Date: Tue Aug 27 14:49:46 2019 +0430 + + Use hb_bytes_t as in hb_blob_t + + src/hb-blob.hh | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +commit dce42cef2b769379a0690053da0e7467ff086195 +Author: Ebrahim Byagowi +Date: Tue Aug 27 14:32:05 2019 +0430 + + [glyf] Move GlyphHeader::from_bytes to hb_bytes_t, introduce .as () + + src/hb-array.hh | 6 ++++++ + src/hb-ot-glyf-table.hh | 24 +++++++++--------------- + 2 files changed, 15 insertions(+), 15 deletions(-) + +commit 6e82d59b4f72e8f2ff1830fb384907dcba95962a +Author: Ebrahim Byagowi +Date: Tue Aug 27 12:33:42 2019 +0430 + + [glyf] Revert the way indexToLocFormat is set + + src/hb-ot-glyf-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 88e9db19d29480fadcd4f49f0f4d9029ac64b429 +Author: Ebrahim Byagowi +Date: Tue Aug 27 02:44:26 2019 +0430 + + [subset] Remove subset table size assertion + + As https://github.com/harfbuzz/harfbuzz/pull/1930#issuecomment-525036802 + + src/hb-subset.cc | 1 - + 1 file changed, 1 deletion(-) + +commit a0b4ac4dce392326284138fc47cf3741e2798e21 +Author: Ebrahim Byagowi +Date: Sat Aug 24 17:57:14 2019 +0430 + + Turn 8 spaces to tab across the project + + According to the current code style of the project + + src/hb-aat-layout-kerx-table.hh | 12 +- + src/hb-aat-layout-morx-table.hh | 16 +-- + src/hb-aat-layout-trak-table.hh | 6 +- + src/hb-array.hh | 4 +- + src/hb-blob.cc | 4 +- + src/hb-buffer-serialize.cc | 2 +- + src/hb-buffer.cc | 22 ++-- + src/hb-buffer.h | 4 +- + src/hb-common.cc | 4 +- + src/hb-coretext.cc | 50 ++++---- + src/hb-dispatch.hh | 2 +- + src/hb-font.cc | 16 +-- + src/hb-ft.cc | 2 +- + src/hb-graphite2.cc | 10 +- + src/hb-iter.hh | 4 +- + src/hb-kern.hh | 6 +- + src/hb-machinery.hh | 2 +- + src/hb-object.hh | 2 +- + src/hb-open-file.hh | 4 +- + src/hb-open-type.hh | 2 +- + src/hb-ot-cmap-table.hh | 252 ++++++++++++++++++------------------- + src/hb-ot-color-cbdt-table.hh | 2 +- + src/hb-ot-color-cpal-table.hh | 2 +- + src/hb-ot-color-sbix-table.hh | 8 +- + src/hb-ot-font.cc | 16 +-- + src/hb-ot-hmtx-table.hh | 62 ++++----- + src/hb-ot-layout-common.hh | 16 +-- + src/hb-ot-layout-gdef-table.hh | 4 +- + src/hb-ot-layout-gpos-table.hh | 74 +++++------ + src/hb-ot-layout.cc | 26 ++-- + src/hb-ot-layout.h | 18 +-- + src/hb-ot-map.cc | 2 +- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-name-table.hh | 8 +- + src/hb-ot-name.cc | 2 +- + src/hb-ot-shape-complex-arabic.cc | 14 +-- + src/hb-ot-shape-complex-hangul.cc | 12 +- + src/hb-ot-shape-complex-indic.cc | 34 ++--- + src/hb-ot-shape-complex-khmer.cc | 2 +- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape-complex-use.cc | 2 +- + src/hb-ot-shape-fallback.cc | 46 +++---- + src/hb-ot-shape-normalize.cc | 4 +- + src/hb-ot-shape.cc | 16 +-- + src/hb-ot-stat-table.hh | 4 +- + src/hb-ot-var-avar-table.hh | 2 +- + src/hb-ot-var-fvar-table.hh | 6 +- + src/hb-ot-vorg-table.hh | 28 ++--- + src/hb-pool.hh | 2 +- + src/hb-sanitize.hh | 6 +- + src/hb-set.hh | 36 +++--- + src/hb-shape-plan.cc | 50 ++++---- + src/hb-subset-cff2.cc | 18 +-- + src/hb-subset-input.cc | 2 +- + src/hb-subset-plan.cc | 34 ++--- + src/hb-subset-plan.hh | 8 +- + src/hb-subset.h | 2 +- + src/hb-uniscribe.cc | 8 +- + src/hb-utf.hh | 8 +- + src/hb-vector.hh | 2 +- + src/hb.hh | 12 +- + src/test-ot-color.cc | 4 +- + src/test-unicode-ranges.cc | 6 +- + test/api/hb-subset-test.h | 6 +- + test/api/test-buffer.c | 2 +- + test/api/test-object.c | 2 +- + test/api/test-ot-math.c | 132 +++++++++---------- + test/api/test-unicode.c | 16 +-- + util/ansi-print.cc | 26 ++-- + util/hb-fc-list.c | 2 +- + util/hb-fc.cc | 4 +- + util/hb-shape.cc | 2 +- + util/hb-subset.cc | 10 +- + util/helper-cairo-ansi.cc | 4 +- + util/helper-cairo.cc | 2 +- + util/options-subset.cc | 26 ++-- + util/options.cc | 50 ++++---- + util/options.hh | 8 +- + 78 files changed, 662 insertions(+), 668 deletions(-) + +commit 269a120f137ca69ca83b6fa00bb6a0ff1a87ae3e +Author: Ebrahim Byagowi +Date: Sun Aug 25 20:37:00 2019 +0430 + + [subset] Raise the bar in new vs old table size + + https://crbug.com/oss-fuzz/16740 + + This is actually an interesting thing that {h,v}mtx allocates as + much as a font pretends to have glyphs but the solution is not + that obvious as regular fonts can have less than actually containing + metrics in their {h,v}mtx. This change raises the bar to consider this + hmtx 4 byte for every glyph case. + + Initially we wanted to just find things allocating crazy amount of + memory but having the assert has led to interesting findings also + so let's don't remove the assert and see what we can find elsewhere. + + src/hb-subset.cc | 2 +- + ...z-testcase-minimized-hb-subset-fuzzer-5667673584697344 | Bin 0 -> 178 bytes + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit 2f8e823331aca2c73b940f057f4b149a89af0502 +Author: Ebrahim Byagowi +Date: Sun Aug 25 12:37:40 2019 +0430 + + [glyf] minor + + src/hb-ot-glyf-table.hh | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 07e467a30e2bab9731900d72dbf926dbe6fc6e1d +Author: Ebrahim Byagowi +Date: Sun Aug 25 00:36:58 2019 +0430 + + [glyf] Move GlyphHeader size checking to a static method + + src/hb-ot-glyf-table.hh | 69 ++++++++++++++++++++++++++----------------------- + 1 file changed, 36 insertions(+), 33 deletions(-) + +commit 139d14dc899250cf06a8d03b70504687184d5c7f +Author: Ebrahim Byagowi +Date: Sat Aug 24 17:23:16 2019 +0430 + + [glyf] Move GlyphHeader related logics to its, making its fields protected + + src/hb-ot-glyf-table.hh | 73 +++++++++++++++++++++++++------------------------ + 1 file changed, 38 insertions(+), 35 deletions(-) + +commit d57819cbdbab18ccf20caa25cb72cd66efe30848 +Author: Ebrahim Byagowi +Date: Sat Aug 24 16:26:42 2019 +0430 + + [glyf] format source + + src/hb-ot-glyf-table.hh | 282 ++++++++++++++++++++++++++---------------------- + 1 file changed, 154 insertions(+), 128 deletions(-) + +commit 2aef3013f3e6d71eacd0123f4faa63445034c32b +Author: Ebrahim Byagowi +Date: Sat Aug 24 02:59:18 2019 +0430 + + [subset] Consider instruction length place itself + + Now fixes https://crbug.com/oss-fuzz/16639 completely + + src/hb-ot-glyf-table.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 922898c814b328712fac6c3259740804679dae11 +Author: Ebrahim Byagowi +Date: Fri Aug 23 22:04:14 2019 +0430 + + [subset] Fail on table grow more than 16x+4096 + + src/hb-subset.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 28aba780c4035cc85a31b778db0f5553c896dd6a +Author: Ebrahim Byagowi +Date: Fri Aug 23 16:47:15 2019 +0430 + + [subset] Fix blob leak of _subset2 when returns early + + Fixes https://crbug.com/oss-fuzz/16639 + + src/hb-subset.cc | 2 ++ + ...z-testcase-minimized-hb-subset-fuzzer-5754526379802624 | Bin 0 -> 288 bytes + 2 files changed, 2 insertions(+) + +commit 541f3c2d7dcae47eb55650082e372286369d4a55 +Author: Behdad Esfahbod +Date: Fri Aug 23 12:25:58 2019 -0700 + + [debug] Fix extra semicolon issue + + https://github.com/harfbuzz/harfbuzz/issues/1923 + + src/hb-debug.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 4dcaca84115bf8de130fc2c9e03bd7e63fcf9607 +Author: Behdad Esfahbod +Date: Fri Aug 23 12:24:15 2019 -0700 + + Whitespace + + src/hb-debug.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 569426d861ac9336f4083e55f98284b4c647c795 +Author: Behdad Esfahbod +Date: Fri Aug 23 11:54:20 2019 -0700 + + [debug] Fix build with HB_DEBUG + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1923 + + src/hb-debug.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit f233e6c8014cde9b2396c5350c29a3277cd3a657 +Author: Khaled Hosny +Date: Fri Aug 23 13:15:37 2019 +0200 + + [doc] Update list of default features in the manual + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1921 + + docs/usermanual-opentype-features.xml | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit be97e9d678017d4ec66625fa2b17ef3485552cad +Author: Behdad Esfahbod +Date: Thu Aug 22 15:52:24 2019 -0700 + + 2.6.1 + + NEWS | 11 +++++++++++ + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 3 files changed, 14 insertions(+), 3 deletions(-) + +commit d304d60e4d49df14ed85d6646680085f27bafbf2 +Author: Behdad Esfahbod +Date: Wed Aug 21 12:30:22 2019 -0700 + + [ot-font] Prefer symbol cmap subtable if found + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1918 + + Hopefully doesn't break anyone... + + src/hb-ot-cmap-table.hh | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +commit 2a3d4987a75fb2cd51ccf4c1d08baba383ceda7b +Author: Ebrahim Byagowi +Date: Wed Aug 21 03:02:01 2019 +0430 + + Remove hb_directwrite_shape_experimental_width public API + + I had specially exposed the API as I didn't know how to embed harfbuzz + easily elsewhere but now with harfbuzz.cc it has become very easy + and I don't like to see its use anywhere as it has a bad naming and + its Kashida adding is bogus and only useful to check where it should + be added, not visually useful however. + + src/hb-directwrite.cc | 29 ++++++----------------------- + src/hb-directwrite.h | 5 ----- + 2 files changed, 6 insertions(+), 28 deletions(-) + +commit 163a66dc737645852d7515381304d69706688e16 +Author: Behdad Esfahbod +Date: Tue Aug 20 14:22:57 2019 -0700 + + [test] Add test for aaa85931f3542639cd9d0dfb92fd6baab5b0298d + + test/api/test-shape.c | 48 ++++++++++++++++++++++++++++++------------------ + 1 file changed, 30 insertions(+), 18 deletions(-) + +commit aaa85931f3542639cd9d0dfb92fd6baab5b0298d +Author: Behdad Esfahbod +Date: Tue Aug 20 13:06:10 2019 -0700 + + [font] Update multipliers when creating sub_font + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1910 + + src/hb-font.cc | 1 + + 1 file changed, 1 insertion(+) + +commit bbad1b8298125d78c159ed7fdd7bde6a3f3fff56 +Author: Ebrahim Byagowi +Date: Tue Aug 20 14:46:48 2019 +0430 + + [trak] minor, use roundf instead round to normalize the use + + The change to `round` wasn't intended + + src/hb-aat-layout-trak-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e67cb500e9c5f6717d0d1cd152de84d88ec7370e +Author: Ebrahim Byagowi +Date: Tue Aug 20 13:30:34 2019 +0430 + + [readme] add oss-fuzz badge + + Related: + https://github.com/google/oss-fuzz/pull/2513 + https://github.com/systemd/systemd/commit/ce2098b7e9443cd6f31fb70af7f72308cd2962a3 + + README.md | 1 + + 1 file changed, 1 insertion(+) + +commit d59d89b28128cf644d76098c709b9309b834eb09 +Author: Ebrahim Byagowi +Date: Tue Aug 20 13:07:17 2019 +0430 + + [test] Rebase 10.14 trak related test + + test/shaping/data/in-house/tests/macos.tests | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 20b1a27c8a319d43a582c3efa8233b9f2c3cc73e +Merge: 5ee1e451 37de38ad +Author: Ebrahim Byagowi +Date: Tue Aug 20 13:04:51 2019 +0430 + + Merge remove-coretext-96dpi-assumption, @drott + + Remove assumption about Core Text working in 96 DPI + +commit 37de38adeae48e1855c2431a39639db873a74554 +Merge: f401f85a 5ee1e451 +Author: Ebrahim Byagowi +Date: Tue Aug 20 12:59:33 2019 +0430 + + Merge branch 'master' into remove-coretext-96dpi-assumption + +commit 5ee1e451cfc75dc6ddbc3ae300ba7394a0cd560e +Author: Behdad Esfahbod +Date: Mon Aug 19 14:23:17 2019 -0700 + + Minor touch-up for recent change + + src/hb-ot-var-avar-table.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 33489928444b94bdd2cc523dac14707eb29d667e +Author: Ebrahim Byagowi +Date: Wed Aug 7 20:07:58 2019 +0430 + + [avar] Implement inverse map, unmap + + src/hb-ot-var-avar-table.hh | 30 ++++++++++++++++++++++++------ + 1 file changed, 24 insertions(+), 6 deletions(-) + +commit 981f5a54c3cbc1de45ba941fdf5315c62d86b6f3 +Author: Ebrahim Byagowi +Date: Wed Aug 7 18:45:39 2019 +0430 + + [fvar] Implement inverse normalize, unnormalize + + src/hb-ot-var-fvar-table.hh | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit dcb4cd400fb44172872a20ba54baa011d748b61d +Author: Behdad Esfahbod +Date: Mon Aug 19 11:35:37 2019 -0700 + + Minor + + src/hb-font.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit ca54440324745afc388edac40ad1047e92567fdb +Author: Ebrahim Byagowi +Date: Sun Aug 18 11:58:04 2019 +0430 + + Remove continuous development helper script + + Not have used it personally for a long time, lets remove it + + src/dev-run.sh | 99 ---------------------------------------------------------- + 1 file changed, 99 deletions(-) + +commit 40aef1b473f63701ab901880d764e33682f13414 +Author: Khaled Hosny +Date: Fri Aug 16 01:00:30 2019 +0200 + + [ot-shape] Keep horizontal_features array sorted + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit da5118da77898ae4778af1ace4af52334b210dd6 +Author: Khaled Hosny +Date: Fri Aug 16 00:48:26 2019 +0200 + + [ot-shape] Enable abvm/blwm features by default + + Core Text seems to apply them to Latin text, but Uniscribe doesn’t. + + See https://github.com/harfbuzz/harfbuzz/pull/1908#issuecomment-521819343 + + src/hb-ot-shape-complex-indic.cc | 9 --------- + src/hb-ot-shape-complex-khmer.cc | 9 --------- + src/hb-ot-shape-complex-myanmar.cc | 21 --------------------- + src/hb-ot-shape-complex-use.cc | 14 -------------- + src/hb-ot-shape.cc | 2 ++ + test/shaping/data/in-house/Makefile.sources | 2 +- + .../ea3f63620511b2097200d23774ffef197e829e69.ttf | Bin 0 -> 1804 bytes + .../f79eb71df4e4c9c273b67b89a06e5ff9e3c1f834.ttf | Bin 0 -> 1860 bytes + test/shaping/data/in-house/tests/dist.tests | 1 - + .../data/in-house/tests/positioning-features.tests | 3 +++ + 10 files changed, 6 insertions(+), 55 deletions(-) + +commit 2164bd6f29df265acdc04b84f5f94cf63b2cea8a +Author: Khaled Hosny +Date: Fri Aug 16 00:28:41 2019 +0200 + + [ot-shape] Enable dist feature by default (#1908) + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1907 + + src/hb-ot-shape-complex-indic.cc | 2 -- + src/hb-ot-shape-complex-khmer.cc | 2 -- + src/hb-ot-shape-complex-myanmar.cc | 1 - + src/hb-ot-shape-complex-use.cc | 1 - + src/hb-ot-shape.cc | 1 + + test/shaping/data/in-house/Makefile.sources | 1 + + .../fonts/53a91c20e33a596f2be17fb68b382d6b7eb85d5c.ttf | Bin 0 -> 2020 bytes + test/shaping/data/in-house/tests/dist.tests | 1 + + 8 files changed, 3 insertions(+), 6 deletions(-) + +commit bc27f86ffef537835f6c9dbbecbc2ee6792cb127 +Author: Ebrahim Byagowi +Date: Wed Aug 14 22:37:00 2019 +0430 + + Move HB_NO_VAR to a better place in hb-font.cc + + Needed for other works + + src/hb-font.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 1cc844da66ab527991ff96efdf10d97f6b626bfe +Author: Ebrahim Byagowi +Date: Wed Aug 14 19:10:02 2019 +0430 + + minor + + Use hb_font_t coords directly + + src/hb-ot-cff2-table.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 6a194b6876db12f083ae5391ca01972168d4e68a +Author: Ebrahim Byagowi +Date: Wed Aug 14 18:49:57 2019 +0430 + + Minor, remove trailing spaces in hb-font.{cc,h} as .editorconfig + + src/hb-font.cc | 338 ++++++++++++++++++++++++++++----------------------------- + src/hb-font.h | 26 ++--- + 2 files changed, 182 insertions(+), 182 deletions(-) + +commit 3ae44645d60fe8271ad18b004434d475eaeb7ad6 +Author: Ebrahim Byagowi +Date: Wed Aug 14 14:34:55 2019 +0430 + + Fix caret_count value when AAT is disabled + + Set caret_count to zero as that is what we want to happen inside lcar when + there is no result. + + src/hb-ot-layout.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit a5aa67b9f288687e21ca7a9887483f7fe1cbce54 +Author: Ebrahim Byagowi +Date: Wed Aug 14 14:29:01 2019 +0430 + + [lcar] Use multiformat convention + + src/hb-aat-layout-lcar-table.hh | 115 +++++++++++++++++++++++++++++++--------- + 1 file changed, 90 insertions(+), 25 deletions(-) + +commit bfffe85dd7d7557e10ec9f9886b86fe0d8b4a7a2 +Author: Ebrahim Byagowi +Date: Wed Aug 14 13:55:49 2019 +0430 + + [opbd] Use multiformat convention on the table + + src/hb-aat-layout-opbd-table.hh | 116 ++++++++++++++++++++++++++++++---------- + 1 file changed, 89 insertions(+), 27 deletions(-) + +commit d6206dbcc4e4ef8c034ee714e74d3a76c5333a12 +Author: Ebrahim Byagowi +Date: Wed Aug 14 11:24:06 2019 +0430 + + [opbd] Turn OpticalBounds fields to FWORD + + src/hb-aat-layout-opbd-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 6461143b44f81a4190d3f1cb02238750536f08e4 +Author: Behdad Esfahbod +Date: Tue Aug 13 22:20:54 2019 -0700 + + 2.6.0 + + NEWS | 23 +++++++++++++++++++++++ + configure.ac | 2 +- + docs/harfbuzz-docs.xml | 4 ++++ + src/hb-font.cc | 2 +- + src/hb-gdi.cc | 2 +- + src/hb-ot-layout.cc | 2 ++ + src/hb-ot-layout.h | 2 +- + src/hb-ot-meta.cc | 4 ++-- + src/hb-ot-meta.h | 2 +- + src/hb-ot-metrics.cc | 8 ++++---- + src/hb-ot-metrics.h | 2 +- + src/hb-version.h | 6 +++--- + 12 files changed, 44 insertions(+), 15 deletions(-) + +commit e56d4ff43b97ca35a8324be2acf1c8644f3b0a24 +Author: Behdad Esfahbod +Date: Tue Aug 13 21:02:47 2019 -0700 + + Rename hb_ot_meta_get_entries() to +hb_ot_meta_get_entry_tags() + + docs/harfbuzz-sections.txt | 2 +- + src/hb-ot-meta.cc | 8 ++++---- + src/hb-ot-meta.h | 8 ++++---- + src/test-ot-meta.cc | 4 ++-- + test/api/test-ot-face.c | 2 +- + test/api/test-ot-meta.c | 6 +++--- + 6 files changed, 15 insertions(+), 15 deletions(-) + +commit aade9b70aabd8a97dd8a28cda2cf4d0694dd7350 +Author: Behdad Esfahbod +Date: Tue Aug 13 16:09:20 2019 -0700 + + [pool] Fix alignment assertion + + I *think* it should fix https://github.com/harfbuzz/harfbuzz/issues/1901 + + Ie. if on a system, alignof(void*) < sizeof(void*)... + + src/hb-pool.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b31d627f151c8eeeb12ed84c3282392d6adbc5b4 +Author: Ebrahim Byagowi +Date: Sun Aug 11 23:34:48 2019 +0430 + + Increase subset fuzzer timeout to 16s + + To satisfy -valgrind and -tsan bots, very ugly + + test/fuzzing/run-subset-fuzzer-tests.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5b9cf191fe1fb13bd4bf914e0f4c03c3b2795a73 +Author: Ebrahim Byagowi +Date: Sun Aug 11 23:07:29 2019 +0430 + + [ci] Disable vcpkg thus running the test suit in Windows + + vcpkg apparently doesn't like to work the same way used to anymore, lets disable it + + appveyor.yml | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit 60d9f0097580a339c7ffe582cc0657698e315cea +Author: Ebrahim Byagowi +Date: Sun Aug 11 16:15:19 2019 +0430 + + Implement opbd table parsing + + https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6opbd.html + + src/Makefile.sources | 1 + + src/hb-aat-layout-opbd-table.hh | 111 ++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-face-table-list.hh | 1 + + src/hb-ot-layout.cc | 1 + + 4 files changed, 114 insertions(+) + +commit 8762676e34cef13f4b263b377b485b199b66d4d1 +Author: Ebrahim Byagowi +Date: Sat Aug 10 01:26:55 2019 +0430 + + [os2] Replace null pool addr compare by checking vital fields (#1896) + + src/hb-ot-os2-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1f926fb2b642094a15e686be6a910e709b15ebd0 +Author: Ebrahim Byagowi +Date: Wed Aug 7 20:22:20 2019 +0430 + + [fvar] Use roundf instead hardcoding round logic + + src/hb-ot-var-fvar-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 60485ab0473630c585bb96fcdc14dbe415edf4f2 +Author: Ebrahim Byagowi +Date: Wed Aug 7 23:23:06 2019 +0430 + + [os2] Get defined lower/upper optical size + + src/hb-ot-os2-table.hh | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit 321d5588d4fa96bcc4aa558d2f982430031f242e +Author: Qunxin Liu +Date: Tue Jul 2 16:30:57 2019 -0700 + + [subset] Add subsetting for GPOS Lookup Type 1: Single Adjustment Positioning Subtable + + src/hb-ot-layout-gpos-table.hh | 157 ++++++++++++++++++++- + test/subset/data/Makefile.am | 1 + + test/subset/data/Makefile.sources | 1 + + .../gpos1_2_font.keep-layout-retain-gids.41,43.otf | Bin 0 -> 2068 bytes + .../gpos1_2_font.keep-layout-retain-gids.41,46.otf | Bin 0 -> 2232 bytes + .../gpos1_2_font.keep-layout-retain-gids.43,46.otf | Bin 0 -> 2096 bytes + ...eep-layout-retain-gids.retain-all-codepoint.otf | Bin 0 -> 3668 bytes + test/subset/data/fonts/gpos1_2_font.otf | Bin 0 -> 4564 bytes + test/subset/data/tests/layout.gpos.tests | 11 ++ + 9 files changed, 166 insertions(+), 4 deletions(-) + +commit 37572882e7a685d804384eaf11f0f3e53af38341 +Author: Qunxin Liu +Date: Tue Jun 25 13:17:30 2019 -0700 + + [subset] cmap table to use _subset2 and new iterator frameworks + + src/hb-ot-cmap-table.hh | 670 +++++++++++------------ + src/hb-subset.cc | 2 +- + test/api/fonts/Roboto-Regular.D7,D8,D9,DA,DE.ttf | Bin 2816 -> 2532 bytes + test/api/fonts/Roboto-Regular.abc.ttf | Bin 2460 -> 2168 bytes + test/api/fonts/Roboto-Regular.ac.ttf | Bin 2268 -> 1988 bytes + 5 files changed, 320 insertions(+), 352 deletions(-) + +commit 06596cf90700ff76f23297141c656dfc317eece6 +Author: Khaled Hosny +Date: Sat Aug 3 13:55:34 2019 +0200 + + Some styling + + README.python.md | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 5848c890cf2f8a14c9d9e329c4f8283feac1f0c3 +Author: Ebrahim Byagowi +Date: Sat Aug 3 14:19:28 2019 +0430 + + [metrics] Add metrics tags documentation + + src/hb-ot-metrics.h | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +commit 4d1872b8e019659a92a59b1d7cba6fd81ed3607d +Author: Ebrahim Byagowi +Date: Sat Aug 3 14:06:46 2019 +0430 + + [base] Add documentation for baseline tags from ot spec + + src/hb-ot-layout.h | 19 ++++++++++++++++++- + 1 file changed, 18 insertions(+), 1 deletion(-) + +commit bbeee84a7f048633b0aaa95aa6129871a3a22164 +Author: Ebrahim Byagowi +Date: Sat Aug 3 13:47:55 2019 +0430 + + [meta] Add metadata tags documentation from ot spec + + src/hb-ot-meta.h | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 521c7013abab84a0994fda3977ccd1ba3d496242 +Author: Ebrahim Byagowi +Date: Tue Jul 30 18:10:40 2019 +0430 + + [cpal] revert port to dagger + + It has a different semantic, maybe we should just do a zero memset, + letting Behdad to decide. + + src/hb-ot-color-cpal-table.hh | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 8014ce198a09d20cb947e4a465c7d893a84c55be +Author: Ebrahim Byagowi +Date: Tue Jul 30 17:31:34 2019 +0430 + + [cpal] port to dagger (#1887) + + src/hb-ot-color-cpal-table.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit d67201da5a2142cb9d039a8cb2cb713556d945af +Author: Ebrahim Byagowi +Date: Tue Jul 30 17:20:18 2019 +0430 + + [colr] minor + + src/hb-ot-color-colr-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8c0a2e68ad91e55a11162da0cddb355810a4c8a0 +Author: Ebrahim Byagowi +Date: Tue Jul 30 13:16:15 2019 +0430 + + [fuzz] Add dummy call of the added APIs (#1886) + + test/api/test-ot-face.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit e5cf9718c07c8bf1fc20cd573cef2d125c28281f +Author: Ebrahim Byagowi +Date: Tue Jul 30 04:44:23 2019 +0430 + + [colr][feat][meta] Port sub_array iteration to dagger (#1868) + + src/hb-aat-layout-feat-table.hh | 37 ++++++++++++++++++------------------- + src/hb-ot-color-colr-table.hh | 14 ++++++-------- + src/hb-ot-meta-table.hh | 8 +++++--- + 3 files changed, 29 insertions(+), 30 deletions(-) + +commit 9f2b4956b484b802eb37f36974c11785c90493ce +Author: Ebrahim Byagowi +Date: Tue Jul 30 04:42:51 2019 +0430 + + [base] Add hb_ot_layout_get_baseline API + + docs/harfbuzz-sections.txt | 2 + + src/hb-ot-face-table-list.hh | 6 ++- + src/hb-ot-layout.cc | 87 ++++++++++++-------------------------------- + src/hb-ot-layout.h | 32 ++++++++++++++++ + test/api/test-baseline.c | 4 +- + 5 files changed, 63 insertions(+), 68 deletions(-) + +commit 40a4b6ddbdc84a25f76bd4d7ff41b1322fe95b83 +Author: Ebrahim Byagowi +Date: Sat Jul 27 13:33:46 2019 +0430 + + [var] Add a new API, hb_font_set_var_named_instance + + docs/harfbuzz-sections.txt | 1 + + src/hb-font.cc | 28 ++++++++++++++++++++++++++++ + src/hb-font.h | 4 ++++ + test/api/test-ot-extents-cff.c | 32 ++++++++++++++++++++++++++++++++ + 4 files changed, 65 insertions(+) + +commit b6a2281f1a2d29cc5797f4f266800f7141591585 +Author: Ebrahim Byagowi +Date: Tue Jul 30 03:45:45 2019 +0430 + + [meta] Make values match their enum type naming + + src/hb-ot-meta.h | 10 +++++----- + test/api/test-ot-meta.c | 4 ++-- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 20072a2eca8943a82e36cbb603ad31481cfc56cd +Author: Ebrahim Byagowi +Date: Tue Jul 30 03:43:15 2019 +0430 + + [metrics] Make values match their enum type naming + + src/hb-ot-font.cc | 12 +++--- + src/hb-ot-metrics.cc | 100 ++++++++++++++++++++++----------------------- + src/hb-ot-metrics.h | 58 +++++++++++++------------- + test/api/test-ot-metrics.c | 26 ++++++------ + 4 files changed, 98 insertions(+), 98 deletions(-) + +commit ed2965a8527ee89994c8eecf451bf71846b3ca86 +Author: Ebrahim Byagowi +Date: Tue Jul 30 03:34:10 2019 +0430 + + [base] Don't use enum inside the table + + src/hb-ot-layout-base-table.hh | 31 ++++++++++++++----------------- + 1 file changed, 14 insertions(+), 17 deletions(-) + +commit 388fa9b32611a8726b9bbfe7ccf8cdbcd818fd70 +Author: Ebrahim Byagowi +Date: Sat Jul 27 14:56:18 2019 +0430 + + [lcar] flip for and switch position + + src/hb-aat-layout-lcar-table.hh | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +commit 4e1da6bb612b0c6386ab143dbb4ca19ff25bc2ba +Author: Ebrahim Byagowi +Date: Mon Jul 29 22:03:56 2019 +0430 + + [metrics] Rename hb_ot_metrics_t to hb_ot_metrics_tag_t + + src/hb-ot-metrics.cc | 22 +++++++++++----------- + src/hb-ot-metrics.h | 16 ++++++++-------- + src/hb-ot-metrics.hh | 6 +++--- + 3 files changed, 22 insertions(+), 22 deletions(-) + +commit 2c2a2b97dbe24ae2e09018f435559c97a460bdcb +Author: Ebrahim Byagowi +Date: Mon Jul 29 22:01:13 2019 +0430 + + [meta] Rename hb_ot_meta_t to hb_ot_meta_tag_t + + src/hb-ot-meta-table.hh | 10 +++++----- + src/hb-ot-meta.cc | 10 +++++----- + src/hb-ot-meta.h | 14 +++++++------- + src/test-ot-meta.cc | 4 ++-- + test/api/test-ot-meta.c | 6 +++--- + 5 files changed, 22 insertions(+), 22 deletions(-) + +commit 7bcc5dfa97a43d9c5f6dfdb87b4f0d5a589ecd48 +Author: Behdad Esfahbod +Date: Sun Jul 28 20:55:50 2019 -0700 + + [iter] Fix accumulate to accept const types + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e21bdf500d4ecc3a5fd6f79aabf6232f3967035e +Author: Ebrahim Byagowi +Date: Sun Jul 28 22:59:09 2019 +0430 + + Increase subset fuzzer timeout to 8s + + Probably we should just remove timeout when running tsan and vaglrind here, the flaky bots + + test/fuzzing/run-subset-fuzzer-tests.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 87454c447d705327a26c1f879e0a4f3002ae2667 +Author: Ebrahim Byagowi +Date: Sun Jul 28 20:46:47 2019 +0430 + + [base] fix logic + + src/hb-ot-layout-base-table.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 69655d5bc3c7b240424545bdef197d9d7251e509 +Author: Ebrahim Byagowi +Date: Sun Jul 28 20:39:20 2019 +0430 + + [base] minor + + src/hb-ot-layout-base-table.hh | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit d9c44e7239daf59e283fecd4166c984b43d48e24 +Author: Ebrahim Byagowi +Date: Sun Jul 28 20:35:32 2019 +0430 + + [base] Check if the returned base_coord is valid + + src/hb-ot-layout-base-table.hh | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +commit 53853c044a6382ece51393dfc3a4fe6a5f8a5a23 +Author: Ebrahim Byagowi +Date: Sun Jul 28 20:23:48 2019 +0430 + + [meta] minor + + src/hb-ot-meta-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ed126d8c37c45d8d60eb0368143c6776d1fcfbff +Author: Ebrahim Byagowi +Date: Sun Jul 28 20:21:59 2019 +0430 + + [base] fix build + + src/hb-ot-layout-base-table.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit c7b22b96cc64c81248362a70f2d60d93ee520f2d +Author: Ebrahim Byagowi +Date: Sun Jul 28 19:46:57 2019 +0430 + + [base] minor + + src/hb-ot-layout-base-table.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit a157342fce2616141ee62d68ad8e3fb93e52187e +Author: Ebrahim Byagowi +Date: Sun Jul 28 18:54:13 2019 +0430 + + [base] Fix use of bsearch + + src/hb-ot-layout-base-table.hh | 94 ++++++++++++++---------------------------- + 1 file changed, 31 insertions(+), 63 deletions(-) + +commit eddd45653282ffff8ef002ad2163bcf8bf4f3df1 +Author: Ebrahim Byagowi +Date: Sun Jul 28 02:21:54 2019 +0430 + + [base] minor spacing + + src/hb-ot-layout-base-table.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 0a18efd766b3b6cc987ee18785f7858fe2bd1c67 +Author: Behdad Esfahbod +Date: Fri Jul 26 14:34:26 2019 -0700 + + Minor + + src/hb-ot-layout-gsub-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 60d0fe2eda9c0eb67f50d61e905b584b8edc3e95 +Merge: 6d53cda1 658424b2 +Author: Ebrahim Byagowi +Date: Sat Jul 27 01:20:55 2019 +0430 + + Merge pull request #1872 from darktohka/cmake-regex-fix + + [cmake] Fix CMake build on newer CMake versions + +commit 658424b29efbc758541a790193c42171bb7fa965 +Author: Derzsi Dániel +Date: Fri Jul 26 22:52:03 2019 +0300 + + [cmake] Fix CMake build on newer CMake versions + + Unfortunately, newer CMake versions die during regex variable extraction, causing the build to fail. + + This is caused by the lack of escaping used around variables in the extract_make_variable function, causing these variables to be automatically unwrapped into empty strings. + + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6d53cda1baf130853e5725fe8fea1d1c5f766a79 +Author: Zero King +Date: Fri Jul 26 15:43:51 2019 +0000 + + [util] Fix memory leak + + util/options.cc | 1 + + 1 file changed, 1 insertion(+) + +commit d3d99f8bb6ad77d1ac73901885acfffd3bb3e7f7 +Author: Ebrahim Byagowi +Date: Fri Jul 26 16:46:04 2019 +0430 + + [metrics] Expose raw OS2/HHEA asc/dsc values using private tags (#1867) + + src/hb-ot-metrics.cc | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit aaffe41094f8ddefad6f33e86cbd04a24dd9bfff +Author: Ebrahim Byagowi +Date: Fri Jul 26 01:14:37 2019 +0430 + + [meta] minor, simplify iterator + + src/hb-ot-meta-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 62932c14bd256f10031380047ededd93a2aacd88 +Author: Ebrahim Byagowi +Date: Fri Jul 26 00:30:29 2019 +0430 + + [meta] Rename ot-metadata to ot-meta per review + + docs/harfbuzz-sections.txt | 7 +++--- + src/Makefile.am | 8 +++---- + src/Makefile.sources | 4 ++-- + src/harfbuzz.cc | 2 +- + src/hb-ot-meta-table.hh | 8 +++---- + src/{hb-ot-metadata.cc => hb-ot-meta.cc} | 22 +++++++++--------- + src/{hb-ot-metadata.h => hb-ot-meta.h} | 30 ++++++++++++------------- + src/hb-ot.h | 2 +- + src/{test-ot-metadata.cc => test-ot-meta.cc} | 10 ++++----- + test/api/Makefile.am | 2 +- + test/api/{test-ot-metadata.c => test-ot-meta.c} | 26 ++++++++++----------- + 11 files changed, 61 insertions(+), 60 deletions(-) + +commit 821d9e9034c57c5c593741284b134c76cc3c7c0f +Author: Ebrahim Byagowi +Date: Fri Jul 26 00:08:58 2019 +0430 + + Use .sub_array for DataMap tags iteration + + src/hb-ot-meta-table.hh | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +commit a250af98ae74c94ac3aa069e6e5958a937586bfc +Author: Ebrahim Byagowi +Date: Wed Jul 24 03:10:41 2019 +0430 + + [meta] Add max value to hb_ot_metadata_t + + src/hb-ot-metadata.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 80e246a1f2b3c4e3c25a4a3ec042e7610944abd4 +Author: Ebrahim Byagowi +Date: Wed Jul 24 03:08:34 2019 +0430 + + [meta] Add a test program for metadata + + src/Makefile.am | 5 ++++ + src/test-ot-metadata.cc | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 75 insertions(+) + +commit bc65ebbce765545bc4455d8ae5ba4a6a99201e41 +Author: Ebrahim Byagowi +Date: Wed Jul 24 02:28:09 2019 +0430 + + [meta] hb_ot_metadata_get_entries, tags iteration API + + src/hb-ot-meta-table.hh | 17 +++++++++++++++++ + src/hb-ot-metadata.cc | 28 ++++++++++++++++++++++++---- + src/hb-ot-metadata.h | 8 +++++++- + test/api/test-ot-metadata.c | 26 ++++++++++++++++++++++++++ + 4 files changed, 74 insertions(+), 5 deletions(-) + +commit 3ac03bd67cb9f4a72e636bf56bc4a79e04bcba62 +Author: Ebrahim Byagowi +Date: Mon Jul 22 23:35:08 2019 +0430 + + [meta] New API, hb_ot_metadata_reference_entry for fetching meta entries + + docs/harfbuzz-sections.txt | 6 +++++ + src/Makefile.sources | 2 ++ + src/harfbuzz.cc | 1 + + src/hb-config.hh | 1 + + src/hb-ot-face-table-list.hh | 4 ++- + src/hb-ot-face.cc | 1 + + src/hb-ot-layout.cc | 1 - + src/hb-ot-meta-table.hh | 20 +++++++++++++++ + src/hb-ot-metadata.cc | 57 ++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-metadata.h | 57 ++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot.h | 1 + + test/api/Makefile.am | 1 + + test/api/fonts/meta.ttf | Bin 0 -> 320 bytes + test/api/test-ot-metadata.c | 58 +++++++++++++++++++++++++++++++++++++++++++ + 14 files changed, 208 insertions(+), 2 deletions(-) + +commit aab8e084873eb098c55ed2569c15bb308c59e436 +Author: Ebrahim Byagowi +Date: Fri Jul 26 02:19:22 2019 +0430 + + minor spacing fix (#1869) + + src/hb-open-type.hh | 16 ++++++++-------- + src/hb-ot-vorg-table.hh | 2 +- + src/hb-vector.hh | 8 ++++---- + 3 files changed, 13 insertions(+), 13 deletions(-) + +commit d791446a930f8e2009c5ab5ea389da98d1ed9b95 +Author: Ebrahim Byagowi +Date: Fri Jul 26 02:12:06 2019 +0430 + + [feat] minor + + src/hb-aat-layout-feat-table.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 356b68a00afaf972908cb2a478170e3933eaf974 +Author: Ebrahim Byagowi +Date: Thu Jul 25 23:22:00 2019 +0430 + + [metrics] Add a test that actually practices variation (#1858) + + test/api/fonts/TestCFF2VF.otf | Bin 0 -> 3636 bytes + test/api/test-ot-metrics.c | 28 ++++++++++++++++++++++++++-- + 2 files changed, 26 insertions(+), 2 deletions(-) + +commit a744fdc6c8217d0d4bfce30e638ed2e5200cf380 +Author: Ebrahim Byagowi +Date: Thu Jul 25 14:49:02 2019 +0430 + + Add _MAX_VALUE to hb_ot_metrics_t (#1861) + + src/hb-ot-metrics.cc | 4 ++-- + src/hb-ot-metrics.h | 4 +++- + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit 069872c51b31fe1a618e3ca5c3b0ab8ccba0cf81 +Author: Ebrahim Byagowi +Date: Thu Jul 25 14:27:43 2019 +0430 + + minor + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 737eb85a4ec8861791157d83dd170ac48fa2cfc7 +Author: Ebrahim Byagowi +Date: Thu Jul 25 14:26:30 2019 +0430 + + Add _MAX_VALUE to disabled baseline types enum + + src/hb-ot-layout.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit dd9a0ed3f0c0a8a94e107689318463d62414cf60 +Author: Ebrahim Byagowi +Date: Wed Jul 24 00:47:19 2019 +0430 + + Replace 0x7FFFFFFFu in enums with HB_TAG_MAX_SIGNED + + src/hb-aat-layout.h | 4 ++-- + src/hb-ot-var.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 636ae422372ed7f17b695e78c9c9015188b204e8 +Author: Ebrahim Byagowi +Date: Mon Jul 22 22:50:21 2019 +0430 + + minor, comment out meta table in list till its use + + src/hb-ot-face-table-list.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 04c11a19b75663af35d16c827e295aa2e555d110 +Merge: 41ab56e0 c9796d15 +Author: Khaled Hosny +Date: Mon Jul 22 16:44:47 2019 +0200 + + Merge pull request #1851 from khaledhosny/fix-sbix-extents + + Fix sbix glyph extents + +commit 41ab56e09586b675b1c5de745cf5f520a808bba1 +Author: Ebrahim Byagowi +Date: Mon Jul 22 18:46:52 2019 +0430 + + Implement meta table parsing + + src/Makefile.sources | 1 + + src/hb-ot-face-table-list.hh | 1 + + src/hb-ot-layout.cc | 15 ++++---- + src/hb-ot-meta-table.hh | 89 ++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 99 insertions(+), 7 deletions(-) + +commit a51aa951b5ad8da4ac7effc891437345e012a0ac +Author: Ebrahim Byagowi +Date: Mon Jul 22 18:35:55 2019 +0430 + + [metrics] Fix _get_variation API to works with actual coord values + + src/hb-ot-metrics.cc | 16 ++++++++-------- + src/hb-ot-metrics.h | 2 +- + test/api/test-ot-metrics.c | 2 +- + 3 files changed, 10 insertions(+), 10 deletions(-) + +commit 77141dff7d73fa6290f51c9e1ca56ce51a5deec0 +Author: Behdad Esfahbod +Date: Mon Jul 22 07:48:32 2019 -0400 + + [metrics] _-prefix internal symbol + + src/hb-ot-font.cc | 12 ++++++------ + src/hb-ot-metrics.cc | 8 ++++---- + src/hb-ot-metrics.hh | 6 +++--- + 3 files changed, 13 insertions(+), 13 deletions(-) + +commit 89228ccb9a81b728bc9955082c17c68c848c50c4 +Author: Behdad Esfahbod +Date: Mon Jul 22 07:07:37 2019 -0400 + + Fix warning on IBM compilers + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1852 + + src/hb.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit c9796d15e1ec5f8939f8b1ae368cb3352b6a9cb9 +Author: Khaled Hosny +Date: Mon Jul 22 03:57:24 2019 +0200 + + Fix sbix glyph extents + + * The ‘height’ needs to be negated since the API returns “distance from + top to bottom side”. + * Similarly, the ‘y_offset‘ needs to be added to the height to get the + ‘y_bearing’, since sbix’s offset is “the point in the glyph relative + to its lower-left corner which corresponds to the origin” while + ‘y_bearing’ is the “top side of glyph from origin”. + + With these changes the sbix glyph metrics return values similar to other + tables, as they were otherwise unusable. + + src/hb-ot-color-sbix-table.hh | 4 ++-- + test/api/test-ot-color.c | 4 ++-- + .../fonts/fcbaa518d3cce441ed37ae3b1fed6a19e9b54efd.ttf | Bin 0 -> 3128 bytes + test/shaping/data/in-house/tests/color-fonts.tests | 1 + + 4 files changed, 5 insertions(+), 4 deletions(-) + +commit 759f3bd486c99bb09fb9fa5f42e621ec21399df8 +Author: Ebrahim Byagowi +Date: Mon Jul 22 02:06:07 2019 +0430 + + [metrics] Don't use metrics API in _common + + As it is exposed with a different condition + + src/hb-ot-metrics.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit eb8bd2f7eccde483d33406f102c69260fde6fe23 +Author: Ebrahim Byagowi +Date: Tue Jul 16 22:27:01 2019 +0430 + + Add hb_gdi_face_create API + + Based on Konstantin Ritt work posted on mailing list + + CMakeLists.txt | 8 +++++ + appveyor.yml | 2 +- + configure.ac | 23 +++++++++++++++ + docs/harfbuzz-sections.txt | 5 ++++ + src/Makefile.am | 8 +++++ + src/Makefile.sources | 3 ++ + src/harfbuzz.cc | 1 + + src/hb-directwrite.cc | 9 ++---- + src/hb-gdi.cc | 73 ++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-gdi.h | 39 +++++++++++++++++++++++++ + src/hb-uniscribe.cc | 7 ----- + src/hb.hh | 5 ++++ + 12 files changed, 168 insertions(+), 15 deletions(-) + +commit 3d03bb84d44bc9ef8a77e974d0e937a3385ffb92 +Author: Ebrahim Byagowi +Date: Sun Jul 21 12:38:04 2019 +0430 + + [metrics] minor, tweak comment + + src/hb-ot-metrics.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit e540d402f6120e8761ff655bdbffb07d91a5f643 +Author: Behdad Esfahbod +Date: Fri Jul 19 11:19:31 2019 -0700 + + [docs] Minor + + docs/harfbuzz-sections.txt | 2 ++ + src/hb-ot-math.h | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit 00e13985fbc5291850b8ea3d021e5f83c8a297e3 +Author: Ebrahim Byagowi +Date: Sat Jul 20 23:03:51 2019 +0430 + + Revert hhea fallback to OS/2 to its reverse way + + As searching number of hhea having fonts beats the number of OS/2 + having ones in macOS 10.14.2 + + src/hb-ot-metrics.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit c13ef9cc64a447e74abfed75f4f418bf644be88d +Author: Ebrahim Byagowi +Date: Sat Jul 20 15:01:37 2019 +0430 + + Bring back asc/desc abs logic used to be in hmtx table + + src/hb-ot-metrics.cc | 21 ++++++++++++++++++--- + 1 file changed, 18 insertions(+), 3 deletions(-) + +commit 772e62688cd72c02910f623653d2ec8ef6990928 +Author: Ebrahim Byagowi +Date: Sat Jul 20 14:50:31 2019 +0430 + + Make HB_TINY builds work again by separating the always needed part + + src/hb-ot-font.cc | 12 +++++----- + src/hb-ot-metrics.cc | 62 ++++++++++++++++++++++++++++++++++++++++------------ + src/hb-ot-metrics.hh | 5 +++++ + 3 files changed, 59 insertions(+), 20 deletions(-) + +commit cb704337407ae9ccb57ae7631567002028b93c84 +Author: Ebrahim Byagowi +Date: Sat Jul 20 14:33:57 2019 +0430 + + Merge _get_position_internal into _get_position + + src/hb-ot-metrics.cc | 143 ++++++++++++++++++--------------------------------- + src/hb-ot-metrics.hh | 5 -- + 2 files changed, 49 insertions(+), 99 deletions(-) + +commit ac3518af58464b33f1b16b34b8846c302b935208 +Author: Ebrahim Byagowi +Date: Sat Jul 20 14:03:36 2019 +0430 + + Define post table only when used + + src/hb-ot-face-table-list.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 471f798ace08b4551f0c9ead6855a4e49b72ba25 +Author: Ebrahim Byagowi +Date: Sat Jul 20 14:00:20 2019 +0430 + + Merge ot-metrics-internal.cc with ot-metrics now that isn't needed in subset + + src/Makefile.sources | 3 -- + src/harfbuzz.cc | 1 - + src/hb-ot-metrics-internal.cc | 100 ------------------------------------------ + src/hb-ot-metrics.cc | 71 +++++++++++++++++++++++++++++- + 4 files changed, 70 insertions(+), 105 deletions(-) + +commit 29444d7e9fd5007bf39efa2cf57a0117aabfc770 +Author: Ebrahim Byagowi +Date: Sat Jul 20 13:52:21 2019 +0430 + + Don't cache ascender/descender metrics + + src/hb-ot-font.cc | 24 ++++++++---------------- + src/hb-ot-hmtx-table.hh | 20 -------------------- + 2 files changed, 8 insertions(+), 36 deletions(-) + +commit 5e28c2654d030655d7b93ec0d6213d2b9fb2956e +Author: Ebrahim Byagowi +Date: Sat Jul 20 14:08:11 2019 +0430 + + [doc] minor, improve hb-ot-metrics doc a bit + + src/hb-ot-metrics.cc | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit ac8b6e330a443a66c3e0fb83af9794310688d848 +Merge: ec8dde81 08b48e89 +Author: Ebrahim Byagowi +Date: Sat Jul 20 13:16:16 2019 +0430 + + Merge pull request #1844 from ebraminio/hhea + + Fallback hhea's ascender/descender to OS2 + +commit 08b48e89d3c1bafe252badc7c65a9fc2f166a693 +Author: Ebrahim Byagowi +Date: Sat Jul 20 12:53:40 2019 +0430 + + [os2] minor spacing tweaks + + src/hb-ot-os2-table.hh | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit 54b9ab704dbf62e2916f1d5276ffef2543bcc2a7 +Author: Ebrahim Byagowi +Date: Sat Jul 20 12:51:38 2019 +0430 + + Fallback hhea's ascender/descender to OS2 + + src/hb-ot-metrics-internal.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit ec8dde8142fbf9e5bc0aee9318a7c4e73d61c758 +Author: Behdad Esfahbod +Date: Fri Jul 19 11:13:50 2019 -0700 + + [metrics] Fall back to hhea if OS2 metrics are empty + + Reinstates previous logic, even if it might be unnecessary. + + src/hb-ot-metrics-internal.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 2e5b49d11d1dbfd44d8c640cb9ce5de7d26ca873 +Author: Ebrahim Byagowi +Date: Fri Jul 19 11:41:07 2019 +0430 + + Add HB_NO_METRICS and fix HB_TINY build (#1839) + + src/hb-config.hh | 1 + + src/hb-ot-face-table-list.hh | 2 -- + src/hb-ot-metrics-internal.cc | 8 +++++++- + src/hb-ot-metrics.cc | 6 ++++++ + 4 files changed, 14 insertions(+), 3 deletions(-) + +commit bdfdac0f26aafb3e9ff2db123116f0406fa49efc +Author: Ebrahim Byagowi +Date: Fri Jul 19 10:33:00 2019 +0430 + + [ci][fuzzer] print valgrind failure if an error happened + + test/fuzzing/run-shape-fuzzer-tests.py | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +commit 2bd953ff4f656f042dba2845f0479a7fe7c439a6 +Author: Behdad Esfahbod +Date: Thu Jul 18 14:25:45 2019 -0700 + + [metrics] Fix weird use of xor + + I believe that was a try to use one approach as fallback to other. But + felt wrong. Just believe what's in OS/2 table to be correct. + + src/hb-ot-metrics-internal.cc | 12 ++++++------ + src/hb-ot-os2-table.hh | 2 +- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 9675a067bf1cc0e5d4707c1345736fda4be75b82 +Author: Behdad Esfahbod +Date: Thu Jul 18 14:15:08 2019 -0700 + + [ot-metrics] Touch up + + src/harfbuzz.cc | 2 ++ + src/hb-ot-hmtx-table.hh | 19 +++++++++---------- + 2 files changed, 11 insertions(+), 10 deletions(-) + +commit 87e628436e32786635796fbb07ed200f8c0da68f +Author: Ebrahim Byagowi +Date: Tue Nov 20 23:26:46 2018 +0330 + + Implement a simple API for fetching opentype metrics + + Fixes https://github.com/harfbuzz/harfbuzz/pull/1432 + + docs/harfbuzz-sections.txt | 9 +++ + src/Makefile.sources | 6 ++ + src/hb-ot-face-table-list.hh | 2 + + src/hb-ot-hhea-table.hh | 2 + + src/hb-ot-hmtx-table.hh | 62 +++++++++---------- + src/hb-ot-layout.cc | 1 - + src/hb-ot-metrics-internal.cc | 94 +++++++++++++++++++++++++++++ + src/hb-ot-metrics.cc | 135 ++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-metrics.h | 92 ++++++++++++++++++++++++++++ + src/hb-ot-metrics.hh | 35 +++++++++++ + src/hb-ot-os2-table.hh | 4 ++ + src/hb-ot-post-table.hh | 5 +- + src/hb-ot.h | 1 + + test/api/Makefile.am | 1 + + test/api/test-ot-metrics.c | 54 +++++++++++++++++ + 15 files changed, 467 insertions(+), 36 deletions(-) + +commit ed67efcc8c3638c625b2904833af3f27ef51db14 +Author: David Corbett +Date: Mon Jun 17 10:16:24 2019 -0400 + + Revert "[Myanmar] Prevent reordering between Asat and Dot below" + + This reverts commit 1c8654ead41ca746d577549c92d2a41c594ab639. + + src/hb-unicode.hh | 3 --- + 1 file changed, 3 deletions(-) + +commit 504bb17287c978d60a4a515555852465319f74ed +Author: Ebrahim Byagowi +Date: Wed Jul 17 22:57:46 2019 +0430 + + [ci] Bring back -linux-arm64 bot + + Let's see if 576065b has fixed it + + .circleci/config.yml | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 6157bbe5127bbcbd17348622601976cffcd11c63 +Author: Behdad Esfahbod +Date: Wed Jul 17 11:20:08 2019 -0700 + + Revert "Revert previous change" + + This reverts commit b8e90ca1a10fbd472eda1aa8cc3797011da52356. + + Works now. + + src/hb-subset-plan.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 576065b4429109359c3af491b34b9ab0c6b149ee +Author: Behdad Esfahbod +Date: Wed Jul 17 11:19:34 2019 -0700 + + [iter] Fix reduce type deduction + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4552864c82c876da738ec3bf772cc089216f2fd2 +Author: Ebrahim Byagowi +Date: Wed Jul 17 22:08:39 2019 +0430 + + [ci] Disable -linux-arm64 bot + + This is its failure https://circleci.com/gh/harfbuzz/harfbuzz/99864 + + Trying to fix like ee05627, interestingly, makes the bot and the + others to fail like this https://circleci.com/gh/harfbuzz/harfbuzz/99841 + + .circleci/config.yml | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit b8e90ca1a10fbd472eda1aa8cc3797011da52356 +Author: Ebrahim Byagowi +Date: Wed Jul 17 21:38:19 2019 +0430 + + Revert previous change + + Interestingly all of the bots disagreed with the change and the complain is... weird. + + src/hb-subset-plan.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ee05627aff2993c51ed8a4bff3170450c000a28a +Author: Ebrahim Byagowi +Date: Wed Jul 17 21:28:25 2019 +0430 + + Improve syntax to make out linux-arm64 a little happy + + Decided to apply is we did the same on other places however this won't + fix all of its complains + + src/hb-subset-plan.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6a6bf7b7bc4a0b375fcf04ff7c674bf76e6d51aa +Author: Ebrahim Byagowi +Date: Wed Jul 17 21:22:38 2019 +0430 + + Downgrade -Wdeprecated-declarations to warning + + Fixes #1834 at least till fix of #1829 + + src/hb.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 25e2562fdff6c14a9cb70999a1ad71ee1bdff494 +Author: Behdad Esfahbod +Date: Wed Jul 17 09:35:56 2019 -0700 + + [amalgam] Fix redundant-declaration warning/error + + src/hb-unicode.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit c184180228540c23405aaa03b6b571bb41103b45 +Author: Ali Javadi +Date: Tue Jul 16 22:10:24 2019 +0430 + + Fix C++20 compile warning on implicit capture of this with '=' default capture (#1833) + + Happens when compiled with -std=c++2a, the fix just makes the captures explicit to resolve the issue. Just adding this in addition to = doesn't work in C++11. + + src/hb-ot-layout-gpos-table.hh:737:18: warning: implicit capture of 'this' with a capture default of '=' is deprecated [-Wdeprecated-this-capture] + { return (this+_).intersects (glyphs, valueFormat); }) + ^ + src/hb-ot-layout-gpos-table.hh:736:16: note: add an explicit capture of 'this' to capture '*this' by reference + | hb_map ([=] (const OffsetTo &_) + ^ + , this + + src/hb-ot-layout-gpos-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1f94388516befe137d265c261f687a47ce6f8e69 +Author: Ebrahim Byagowi +Date: Tue Jul 16 11:24:29 2019 +0430 + + [usp] define atfree callback only if used + + src/hb-uniscribe.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 1da1b4dc94c500e4c9c833ab74fced07364d13fb +Author: Qunxin Liu +Date: Wed Jun 26 13:23:24 2019 -0700 + + [subset] For option "--unicodes", add support for "*" to retain all code points + + ...aa-Regular-new.default.retain-all-codepoint.ttf | Bin 0 -> 97204 bytes + ...drop-hints-retain-gids.retain-all-codepoint.ttf | Bin 0 -> 65976 bytes + ...Regular-new.drop-hints.retain-all-codepoint.ttf | Bin 0 -> 65936 bytes + ...a-Regular-new.name-ids.retain-all-codepoint.ttf | Bin 0 -> 96948 bytes + ...egular-new.retain-gids.retain-all-codepoint.ttf | Bin 0 -> 97244 bytes + ...to-Regular.abc.default.retain-all-codepoint.ttf | Bin 0 -> 2168 bytes + ...drop-hints-retain-gids.retain-all-codepoint.ttf | Bin 0 -> 924 bytes + ...Regular.abc.drop-hints.retain-all-codepoint.ttf | Bin 0 -> 924 bytes + ...o-Regular.abc.name-ids.retain-all-codepoint.ttf | Bin 0 -> 2168 bytes + ...egular.abc.retain-gids.retain-all-codepoint.ttf | Bin 0 -> 2168 bytes + test/subset/data/tests/basics.tests | 1 + + test/subset/subset_test_suite.py | 20 +++++++--- + util/hb-subset.cc | 7 ++++ + util/options.cc | 44 ++++++++++++--------- + 14 files changed, 48 insertions(+), 24 deletions(-) + +commit 4730b350b7ee90338caf3e962343af42412ce3df +Author: Behdad Esfahbod +Date: Fri Jul 12 15:38:35 2019 -0700 + + Revert "Update Graphite API to latest (#1215)" + + This reverts commit e4e74c2751ac24178086cce2811d34d8019b6f85. + + See https://github.com/harfbuzz/harfbuzz/issues/1829 + + src/hb-graphite2.cc | 28 +--------------------------- + 1 file changed, 1 insertion(+), 27 deletions(-) + +commit f8242b61ab01002e9f7374daa8755e92c6a92eb4 +Author: Ebrahim Byagowi +Date: Thu Jul 11 15:10:36 2019 +0430 + + [fuzz] Increase subset runner timeout for tsan bot + + Now is flaky let's just increase and maybe investigate later + + test/fuzzing/run-subset-fuzzer-tests.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b65bad18aa527684af999b5808a9087404c0759a +Author: Ebrahim Byagowi +Date: Thu Jul 11 14:31:55 2019 +0430 + + [fuzz] Don't fail when blob is empty + + And enable more tests able to trig the issue. + + ...zz-testcase-minimized-hb-subset-fuzzer-5738978499624960 | Bin 0 -> 28 bytes + test/fuzzing/hb-subset-fuzzer.cc | 2 +- + test/fuzzing/run-subset-fuzzer-tests.py | 9 +++++---- + 3 files changed, 6 insertions(+), 5 deletions(-) + +commit 7a9d643c297990f9889a2f7b4a470ef933bac131 +Author: Ebrahim Byagowi +Date: Thu Jul 11 01:35:06 2019 +0430 + + Fix unintialized memory read in cmap subset (#1826) + + src/hb-ot-cmap-table.hh | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit a6065d05cf38620c06b6dd10b8a841ed236f76c2 +Author: Ebrahim Byagowi +Date: Wed Jul 10 16:41:40 2019 +0430 + + Don't call memcpy when a table is empty + + src/hb-open-file.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit c85f624b519df1db141bf55d9452bc2837ef35c4 +Author: Ebrahim Byagowi +Date: Wed Jul 10 14:28:06 2019 +0430 + + Force blob generation and memory check in hb-subset-fuzzer + + test/fuzzing/hb-subset-fuzzer.cc | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit 2e7021da7d1726a37822e6a001b9218f82255bc8 +Author: Dominik Röttsches +Date: Mon Jul 8 10:19:49 2019 +0300 + + Revert "Minor" - revert moving extern "C" definitions in-function + + This reverts commit 62e60322cb9e18b3ee75f1b4a2a6d3069f587407 since it + breaks building HarfBuzz as part of Chromium. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1821. + + src/hb-unicode.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit f18ea1dd3a9961661a383b2966de57ea68a267e7 +Author: Behdad Esfahbod +Date: Fri Jul 5 13:56:45 2019 -0700 + + [font] Remove division when scaling + + Yoohoo. This seems to be precise enough! Let's see if it sticks. + I'm asking Dominik to run this in Chrome test suite and report. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1801 + + src/hb-font.hh | 23 +++++++++-------------- + src/hb-ot-math-table.hh | 16 ++++++++-------- + 2 files changed, 17 insertions(+), 22 deletions(-) + +commit b847769292aca13345fd1facae35aaf999198ad4 +Author: Behdad Esfahbod +Date: Fri Jul 5 13:52:09 2019 -0700 + + [font] Keep font-space to user-space multiplier + + Part of https://github.com/harfbuzz/harfbuzz/issues/1801 + + src/hb-font.cc | 5 +++++ + src/hb-font.hh | 13 +++++++++++-- + 2 files changed, 16 insertions(+), 2 deletions(-) + +commit df6edcd44ceb63d01d9c0d6d2aa06b6c6cbb914d +Author: Behdad Esfahbod +Date: Fri Jul 5 13:45:15 2019 -0700 + + Make face immutable in hb_font_set_face() + + src/hb-font.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 0d425e1eeaea97bf5e4fc9ce40e549332bc0cea1 +Author: Behdad Esfahbod +Date: Fri Jul 5 13:18:05 2019 -0700 + + [ot-font] Optimize rounding + + Part of https://github.com/harfbuzz/harfbuzz/issues/1801 + + The assumption that compiler optimizes "upem/2" to a shift only + works if upem is unsigned... Anyway, spoon-feed the compiler. + + src/hb-font.hh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 144326e215671a42fb3ac9f00ddef779ba354345 +Author: Simon Sapin +Date: Fri Jul 5 19:05:11 2019 +0200 + + Clusters are reversed based on the direction, not script + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1818 + + docs/usermanual-clusters.xml | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit cf1a782a5ca82a880906cae3d4cb76b10ec2aad2 +Author: Simon Sapin +Date: Thu Jul 4 21:06:59 2019 +0200 + + Docs: fix a typo in function name + + docs/usermanual-fonts-and-faces.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ffa736f151f27adb76fb0bf91e18e1ec5cb8fe8d +Author: Simon Sapin +Date: Thu Jul 4 23:05:50 2019 +0200 + + hb_set_previous_range docs: fix presumed copy/paste error + + src/hb-set.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 641f33738089ef7ccbedce09886309edcd2e1718 +Author: Simon Sapin +Date: Thu Jul 4 23:03:45 2019 +0200 + + Docs typo fix: slower → lower + + src/hb-set.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9fea6b4dd41bfe2b85f788523162658a7ab9bd49 +Author: Ebrahim Byagowi +Date: Fri Jul 5 18:46:41 2019 +0430 + + [amalgam] Use it in cmake port and fix conflicts (#1812) + + .circleci/config.yml | 8 ++--- + CMakeLists.txt | 74 ++++-------------------------------------- + src/Makefile.am | 2 ++ + src/hb-cff-interp-common.hh | 6 ++-- + src/hb-cff-interp-cs-common.hh | 2 +- + src/hb-coretext.cc | 4 +-- + src/hb-directwrite.cc | 14 ++++---- + src/hb-ft.cc | 4 +-- + 8 files changed, 27 insertions(+), 87 deletions(-) + +commit b240d701fd98efa59a7f772ff39654fc95b8fc8f +Author: Behdad Esfahbod +Date: Wed Jul 3 12:17:57 2019 -0700 + + [amalgam] Include integration source files as well + + Just for those that are normally built into libharfbuzz itself. + + Part of https://github.com/harfbuzz/harfbuzz/issues/1809 + + src/Makefile.am | 12 ++++++++++-- + src/harfbuzz.cc | 6 ++++++ + 2 files changed, 16 insertions(+), 2 deletions(-) + +commit d51524204528b36907ab0f48bf2a48ec124c93d9 +Author: Behdad Esfahbod +Date: Wed Jul 3 12:10:03 2019 -0700 + + [amalgam] Rename hb.cc to harfbuzz.cc + + Part of https://github.com/harfbuzz/harfbuzz/issues/1809 + + src/Makefile.am | 8 ++++---- + src/{hb.cc => harfbuzz.cc} | 0 + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 4cb180d227c1adc32e921c241a93cd1f50a98d33 +Author: Behdad Esfahbod +Date: Tue Jul 2 19:44:18 2019 -0700 + + Revert "Use constexpr to replace passthru_ bools" + + This reverts commit c4aa10ebc8dc28b1f9c90af2ca2092a7535f8395. + + Broke several compilers... Sigh. The version without constexpr + didn't fully optimize out the unreachable code on clang. + So, revert it is... + + src/hb-algs.hh | 8 ++++++++ + src/hb-set.hh | 18 ++++++++---------- + 2 files changed, 16 insertions(+), 10 deletions(-) + +commit c4aa10ebc8dc28b1f9c90af2ca2092a7535f8395 +Author: Behdad Esfahbod +Date: Tue Jul 2 19:15:03 2019 -0700 + + Use constexpr to replace passthru_ bools + + src/hb-algs.hh | 8 -------- + src/hb-set.hh | 18 ++++++++++-------- + 2 files changed, 10 insertions(+), 16 deletions(-) + +commit 2e48fd077954410f59156b3100c16bf56a507948 +Author: Behdad Esfahbod +Date: Tue Jul 2 17:55:58 2019 -0700 + + Sprinkle constexpr around + + Being conservative. Also not sure it makes any real difference + in our codebase. + + src/hb-algs.hh | 48 ++++++++++++++++++++++++------------------------ + src/hb-meta.hh | 18 +++++++++--------- + 2 files changed, 33 insertions(+), 33 deletions(-) + +commit df4448064e370a410404708a15ce819daf1d9386 +Author: Behdad Esfahbod +Date: Tue Jul 2 17:11:09 2019 -0700 + + Remove unused 'inline' specifier + + src/hb-ot-map.hh | 4 ++-- + src/hb-shape-plan.hh | 18 +++++++++--------- + 2 files changed, 11 insertions(+), 11 deletions(-) + +commit 04a4957040380bba58880ff51d529c5cccf1d2c7 +Author: Behdad Esfahbod +Date: Tue Jul 2 16:19:18 2019 -0700 + + [amalgam] Add hb.cc to git + + Part of https://github.com/harfbuzz/harfbuzz/issues/1809 + + src/Makefile.am | 1 + + src/hb.cc | 44 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 45 insertions(+) + +commit 62e60322cb9e18b3ee75f1b4a2a6d3069f587407 +Author: Behdad Esfahbod +Date: Tue Jul 2 16:07:03 2019 -0700 + + Minor + + src/hb-unicode.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit ceb4c212dc91a277f646c4a5354e4362f548a9f6 +Author: Behdad Esfahbod +Date: Tue Jul 2 16:02:13 2019 -0700 + + [amalgam] Fix UCD issue + + This actually makes it build now! + + Part https://github.com/harfbuzz/harfbuzz/issues/1809 + + Keeping open to add tests, CI, etc. + + src/hb-ucd.cc | 5 +---- + src/hb-unicode.cc | 2 -- + src/hb-unicode.hh | 3 +++ + 3 files changed, 4 insertions(+), 6 deletions(-) + +commit 7ca54811f471a28163de6b3c561990c85aa39880 +Author: Behdad Esfahbod +Date: Tue Jul 2 16:00:58 2019 -0700 + + [amalgam] Fix CFF + + Part of https://github.com/harfbuzz/harfbuzz/issues/1809 + + src/hb-ot-cff1-table.cc | 18 +++++++++--------- + src/hb-ot-cff2-table.cc | 16 ++++++++-------- + 2 files changed, 17 insertions(+), 17 deletions(-) + +commit 3724f13ba0292055197efdbfcacfe3d7b067175c +Author: Behdad Esfahbod +Date: Tue Jul 2 15:23:00 2019 -0700 + + [amalgam] Finish fixing Indic-like shapers + + Part of https://github.com/harfbuzz/harfbuzz/issues/1809 + + src/hb-ot-shape-complex-indic.cc | 34 +++++++++++++++++----------------- + src/hb-ot-shape-complex-indic.hh | 9 ++++++++- + src/hb-ot-shape-complex-khmer.cc | 18 +++++++++--------- + src/hb-ot-shape-complex-khmer.hh | 17 ++++++++--------- + src/hb-ot-shape-complex-myanmar.cc | 8 ++++---- + src/hb-ot-shape-complex-myanmar.hh | 16 ++++++++-------- + src/hb-ot-shape-complex-use.cc | 14 +++++++------- + 7 files changed, 61 insertions(+), 55 deletions(-) + +commit eb37bc9d93b3abebee24390708940510fe37477a +Author: Behdad Esfahbod +Date: Tue Jul 2 15:19:39 2019 -0700 + + [use] Remove Syriac features + + This was non-standard, and unused anyway. + + src/hb-ot-shape-complex-use.cc | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +commit dc480fc4717937d53cf38860a5c5d48211e8cbc8 +Author: Behdad Esfahbod +Date: Tue Jul 2 15:17:56 2019 -0700 + + [amalgam] More Indic-like issues + + Part of https://github.com/harfbuzz/harfbuzz/issues/1809 + + src/hb-ot-shape-complex-indic.cc | 76 +++++++++++++++++++++------------------- + src/hb-ot-shape-complex-khmer.cc | 36 ++++++++++--------- + src/hb-ot-shape-complex-use.cc | 32 ++++++++--------- + 3 files changed, 74 insertions(+), 70 deletions(-) + +commit d8b5353e07650cf243ba182dbf52e7f198719762 +Author: Behdad Esfahbod +Date: Tue Jul 2 15:09:26 2019 -0700 + + [amalgam] More + + Part of https://github.com/harfbuzz/harfbuzz/issues/1809 + + src/hb-ot-shape-complex-myanmar.cc | 28 ++++++++++++++-------------- + src/hb-ot-shape-complex-use.cc | 28 ++++++++++++++-------------- + 2 files changed, 28 insertions(+), 28 deletions(-) + +commit d115a9e022c0b687fb402cfd2b90d516beded5c0 +Author: Behdad Esfahbod +Date: Tue Jul 2 14:42:45 2019 -0700 + + [amalgam] Fix most duplicate-id instances in Indic-like shapers + + Part of https://github.com/harfbuzz/harfbuzz/issues/1809 + + src/hb-ot-layout.hh | 22 +++++ + src/hb-ot-shape-complex-indic-machine.hh | 6 +- + src/hb-ot-shape-complex-indic-machine.rl | 6 +- + src/hb-ot-shape-complex-indic.cc | 130 +++++++++---------------- + src/hb-ot-shape-complex-indic.hh | 26 +++++ + src/hb-ot-shape-complex-khmer-machine.hh | 6 +- + src/hb-ot-shape-complex-khmer-machine.rl | 6 +- + src/hb-ot-shape-complex-khmer.cc | 97 ++++++------------- + src/hb-ot-shape-complex-myanmar-machine.hh | 4 +- + src/hb-ot-shape-complex-myanmar-machine.rl | 4 +- + src/hb-ot-shape-complex-myanmar.cc | 69 ++++++-------- + src/hb-ot-shape-complex-use-machine.hh | 4 +- + src/hb-ot-shape-complex-use-machine.rl | 4 +- + src/hb-ot-shape-complex-use.cc | 148 ++++++++++++----------------- + 14 files changed, 230 insertions(+), 302 deletions(-) + +commit c073233f45da6ad8131dd38cb43b125f48c17432 +Author: Behdad Esfahbod +Date: Tue Jul 2 14:26:45 2019 -0700 + + Add make rule to build hb.cc + + Part of https://github.com/harfbuzz/harfbuzz/issues/1809 + + src/Makefile.am | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit f1d20d9b4dcbeead3757650b9286393918b4be8a +Author: Behdad Esfahbod +Date: Tue Jul 2 14:18:38 2019 -0700 + + Add ucd-table make target + + src/Makefile.am | 23 +++++++++++++++-------- + src/gen-ucd-table.py | 8 +++++--- + 2 files changed, 20 insertions(+), 11 deletions(-) + +commit 040b261deeed8924edcb087e27a61392d1f85023 +Author: Michiharu Ariza +Date: Sun Jun 30 16:13:07 2019 -0700 + + add bimap test along with bug fix/tweaks + + src/Makefile.am | 6 ++++- + src/hb-bimap.hh | 4 +++ + src/test-bimap.cc | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 85 insertions(+), 1 deletion(-) + +commit 9c93f5cc2de5c60d5464a65890fc7d8c25aa9702 +Merge: ad341d5f 4ab2d1d6 +Author: Ebrahim Byagowi +Date: Mon Jul 1 20:08:22 2019 +0430 + + Merge pull request #1806 from carlo-bramini/master + + Make harfbuzz working on all existing versions of Windows + +commit 4ab2d1d6767568c45495be515e016805cce0c69a +Author: Ebrahim Byagowi +Date: Mon Jul 1 19:30:21 2019 +0430 + + [dwrite] Apply minor style improves + + src/hb-directwrite.cc | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 5ebd265e66cbcd167469837dcf8647484310dfb5 +Author: Carlo Bramini <30959007+carlo-bramini@users.noreply.github.com> +Date: Mon Jul 1 16:06:43 2019 +0200 + + Fix error rised by GCC8+ + + src/hb-directwrite.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 693dacbb1c0bc805e3e6aedaca5a57f04eb6ec9c +Author: Carlo Bramini <30959007+carlo-bramini@users.noreply.github.com> +Date: Mon Jul 1 13:31:26 2019 +0200 + + Use lower case file name with #include + + I tried to cross compile harfbuzz for Windows and an error was generated because `DWrite_1.h` was not found. + This happened because the filesystem is case sensitive and for this reason that include file was not found. + The right name of the file to be used is `dwrite_1.h`, with all letters not capitalized: + https://docs.microsoft.com/en-us/windows/desktop/api/dwrite_1/ + I also verified in the installation of VS2017 with Windows Kit v10 and in that place it was also lower case. + So, in my opinion it should be better to change this. + + src/hb-directwrite.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a4543d408b31376c38bab878b2f72d4323abc564 +Author: Carlo Bramini <30959007+carlo-bramini@users.noreply.github.com> +Date: Sun Jun 30 15:06:30 2019 +0200 + + Empty DIRECTWRITE_LIBS + + Not used anymore since DWRITE is loaded dynamically. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 601b6825b05f67354b48dd3629b95e0d8bf68a14 +Author: Carlo Bramini <30959007+carlo-bramini@users.noreply.github.com> +Date: Sun Jun 30 15:03:44 2019 +0200 + + Dynamically load DWRITE + + Also checks if DWriteCreateFactory() has been executed successfully. + + src/hb-directwrite.cc | 41 +++++++++++++++++++++++++++++++++-------- + 1 file changed, 33 insertions(+), 8 deletions(-) + +commit ad341d5f1624f4e30b2d0eb2a171054a973053b5 +Author: Behdad Esfahbod +Date: Fri Jun 28 16:00:37 2019 -0700 + + [config] Fix CoreText build with NO_AAT + + src/hb-aat-layout.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 3f806673fbeacdbe1b31399394ccc26c773a794b +Author: Ebrahim Byagowi +Date: Sat Jun 29 00:00:00 2019 +0430 + + Apply some minor improves on CFFIndex + + src/hb-ot-cff-common.hh | 38 +++++++++++++------------------------- + 1 file changed, 13 insertions(+), 25 deletions(-) + +commit ddd29e5594ccc9d0281e6da7373a1f115f6f6f3a +Author: Ebrahim Byagowi +Date: Fri Jun 28 23:44:14 2019 +0430 + + minor, reuse StructAtOffset logic in StructAtOffsetOrNull + + src/hb-ot-cff-common.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 9db7ce73d7ac6566837cdd70d38c45f3aefd7769 +Author: Ebrahim Byagowi +Date: Fri Jun 28 23:11:52 2019 +0430 + + minor style improve in hb-cff-interp-common.hh + + src/hb-cff-interp-common.hh | 91 +++++++++++++++------------------------------ + 1 file changed, 30 insertions(+), 61 deletions(-) + +commit 9a7b7bd9fc5bde7796ffdd997ee65cb33cbf6b29 +Author: Ebrahim Byagowi +Date: Fri Jun 28 22:53:51 2019 +0430 + + style fix for pylint complain + + src/gen-emoji-table.py | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit 8d36ef50c8712be476572514d73b7bddf43e5951 +Author: Behdad Esfahbod +Date: Thu Jun 27 14:48:10 2019 -0700 + + [config] Add links + + CONFIG.md | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit f53590971c5326dd15f4296764bfd1255ec0506a +Author: Behdad Esfahbod +Date: Thu Jun 27 13:42:51 2019 -0700 + + [test] Make Unicode tests strict against internal UCD + + https://github.com/harfbuzz/harfbuzz/pull/1799 + + test/api/test-unicode.c | 30 ++++++++++++++++++++++-------- + 1 file changed, 22 insertions(+), 8 deletions(-) + +commit d42264f151a61a4a77e5d5712e535fc6e2daf338 +Author: David Corbett +Date: Wed Jun 26 21:10:11 2019 -0400 + + Test at least one character per Unicode version + + test/api/test-unicode.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 138 insertions(+), 4 deletions(-) + +commit 7185bd6ffb4dd8c0efebdab5b930e62c5695e3ab +Merge: cd65305b 8341c0b3 +Author: Ebrahim Byagowi +Date: Thu Jun 27 22:09:28 2019 +0430 + + Merge pull request #1800 from harfbuzz/harfbuzz/cffnull_fix2 + + [CFF] fix for Subrs null ptr access + +commit 8341c0b304ee3bb0b7d150bcfb42a8b9e6448687 +Author: Michiharu Ariza +Date: Thu Jun 27 08:43:31 2019 -0700 + + add test case file + + ...z-testcase-minimized-harfbuzz_fuzzer-5093685255077888 | Bin 0 -> 1160 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 01832fd16b605971466fc3b174cb932787ef4bfb +Author: Michiharu Ariza +Date: Wed Jun 26 15:58:38 2019 -0700 + + alternate fix for https://crbug.com/971933 + + src/hb-cff-interp-cs-common.hh | 6 +++--- + src/hb-cff1-interp-cs.hh | 2 +- + src/hb-cff2-interp-cs.hh | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit cd65305b059e7495f4f993d25cfda4d88781589b +Author: Behdad Esfahbod +Date: Wed Jun 26 14:57:48 2019 -0700 + + [config] Don't disable emoji sequences in HB_TINY + + It makes sense to disable this code these if editing is not needed. + However, this is also necessary to correctly display emoji sequences + in right-to-left direction. For that reason, don't auto-disable it. + + src/hb-config.hh | 1 - + src/hb-ot-shape.cc | 2 +- + src/hb-unicode.cc | 2 +- + 3 files changed, 2 insertions(+), 3 deletions(-) + +commit 7298716a3cfbdabedd15960404623317a64db3ae +Author: Behdad Esfahbod +Date: Wed Jun 26 14:51:17 2019 -0700 + + [config] Compile out modified combining-class if HB_NO_OT_SHAPE + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-unicode.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 1cdd0fa60d9a6aaddc20e646d294d642e2db9be4 +Author: Behdad Esfahbod +Date: Wed Jun 26 14:49:15 2019 -0700 + + [emoji] Port generator to packtab + + src/gen-emoji-table.py | 18 ++++-- + src/hb-unicode-emoji-table.hh | 126 ++++++++++++++++-------------------------- + src/hb-unicode.cc | 5 +- + 3 files changed, 60 insertions(+), 89 deletions(-) + +commit 5130c90ac0173c542b550049c93738ab5de84bb9 +Author: Behdad Esfahbod +Date: Wed Jun 26 14:29:39 2019 -0700 + + [config] Add HB_NO_EMOJI + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 1 + + src/hb-ot-shape.cc | 2 ++ + src/hb-unicode.cc | 2 ++ + 3 files changed, 5 insertions(+) + +commit 9d5b5348c7ca1e39faa9e197fdebfb8f5d3aeece +Author: Behdad Esfahbod +Date: Wed Jun 26 13:58:40 2019 -0700 + + [config] Add HB_NO_SHAPER + + Don't know who would want when why. But makes sense to have. + + src/hb-shaper-list.hh | 6 ++++++ + src/hb-shaper.cc | 2 ++ + 2 files changed, 8 insertions(+) + +commit 8fe15485cbc2f56adb29d4d5f0c3957869bd0e1a +Author: Behdad Esfahbod +Date: Wed Jun 26 13:49:42 2019 -0700 + + [config] Add HB_NO_OT_TAG + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 1 + + src/hb-ot-layout.cc | 4 ++++ + src/hb-ot-tag.cc | 5 +++++ + src/hb-uniscribe.cc | 4 ++++ + 4 files changed, 14 insertions(+) + +commit 7dcf8e126ecf52c67f59745e04d21df68b1a6992 +Author: Behdad Esfahbod +Date: Wed Jun 26 13:44:10 2019 -0700 + + [config] Fix build with HB_NO_OT_LAYOUT + + src/hb-ot-face-table-list.hh | 2 ++ + src/hb-ot-layout-gpos-table.hh | 3 ++- + src/hb-ot-layout-gsub-table.hh | 5 +++-- + src/hb-ot-layout-gsubgpos.hh | 8 +++++++- + 4 files changed, 14 insertions(+), 4 deletions(-) + +commit 2804790bceb9398cc9b668ca63f5aa9ffe29beeb +Author: Behdad Esfahbod +Date: Wed Jun 26 13:38:14 2019 -0700 + + [config] Add dependency + + src/hb-ot-shape.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit b0fd16eec62dea29d984bab879064ae9d91afdfc +Author: Behdad Esfahbod +Date: Wed Jun 26 13:31:51 2019 -0700 + + [config] Add dependency + + src/hb-config.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 12092a46d8826eec5dcf69e7817921380e4bc507 +Author: Behdad Esfahbod +Date: Wed Jun 26 13:31:01 2019 -0700 + + [config] Rename HB_NO_SHAPE_AAT to HB_NO_AAT_SHAPE + + src/hb-aat-map.cc | 2 +- + src/hb-config.hh | 2 +- + src/hb-ot-kern-table.hh | 14 +++++++------- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-shape.cc | 36 ++++++++++++++++++------------------ + src/hb-ot-shape.hh | 8 ++++---- + 6 files changed, 32 insertions(+), 32 deletions(-) + +commit bb4bbe617d3878ca7e5e359ada493c68ec7f0a90 +Author: Behdad Esfahbod +Date: Wed Jun 26 13:29:58 2019 -0700 + + [config] Add HB_NO_OT_LAYOUT + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 1 + + src/hb-ot-layout.cc | 7 +++++++ + src/hb-ot-map.cc | 7 +++++++ + 3 files changed, 15 insertions(+) + +commit ab40a2feecf53d2ef787b7785132bf57e5bdcff9 +Author: Behdad Esfahbod +Date: Wed Jun 26 13:25:02 2019 -0700 + + [config] Enable HB_NO_OT_FONT in HB_NO_OT + + CONFIG.md | 4 ++-- + src/hb-config.hh | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 7aad53657eb23264f658711a71da3e50f2264455 +Author: Behdad Esfahbod +Date: Wed Jun 26 13:21:03 2019 -0700 + + [config] Add HB_NO_OT_SHAPE / HB_NO_OT + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + CONFIG.md | 14 ++++++++++++++ + src/gen-indic-table.py | 6 ++++++ + src/gen-use-table.py | 6 ++++++ + src/gen-vowel-constraints.py | 7 +++++++ + src/hb-config.hh | 4 ++++ + src/hb-ot-shape-complex-arabic.cc | 6 ++++++ + src/hb-ot-shape-complex-default.cc | 7 +++++++ + src/hb-ot-shape-complex-hangul.cc | 7 +++++++ + src/hb-ot-shape-complex-hebrew.cc | 7 +++++++ + src/hb-ot-shape-complex-indic-table.cc | 6 ++++++ + src/hb-ot-shape-complex-indic.cc | 7 +++++++ + src/hb-ot-shape-complex-khmer.cc | 7 +++++++ + src/hb-ot-shape-complex-myanmar.cc | 7 +++++++ + src/hb-ot-shape-complex-thai.cc | 7 +++++++ + src/hb-ot-shape-complex-use-table.cc | 6 ++++++ + src/hb-ot-shape-complex-use.cc | 7 +++++++ + src/hb-ot-shape-complex-vowel-constraints.cc | 6 ++++++ + src/hb-ot-shape-fallback.cc | 7 +++++++ + src/hb-ot-shape-normalize.cc | 7 +++++++ + src/hb-ot-shape.cc | 7 +++++++ + src/hb-shape-plan.cc | 10 ++++++++++ + src/hb-shape-plan.hh | 4 ++++ + src/hb-shaper-list.hh | 2 ++ + 23 files changed, 154 insertions(+) + +commit cee9f6e044278b590694f4dff6f22eaad9371385 +Author: Behdad Esfahbod +Date: Wed Jun 26 13:01:58 2019 -0700 + + Fail compile if no shapers enabled + + src/hb-shaper.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 8786820a5a7406be95bc4a6b6e2aca736126420c +Author: Behdad Esfahbod +Date: Wed Jun 26 12:53:57 2019 -0700 + + [src] Add make targets "tiny" and "tinyz" + + src/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +commit b14e413fae8f14b75c5956e9b38e413c878ded0c +Author: Behdad Esfahbod +Date: Wed Jun 26 10:44:10 2019 -0700 + + 2.5.3 + + NEWS | 7 +++++++ + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 3 files changed, 10 insertions(+), 3 deletions(-) + +commit 3bfa878c98cceeaae074d81c14329e358bea8912 +Author: Behdad Esfahbod +Date: Tue Jun 25 19:07:07 2019 -0700 + + [gen-ucd] Protect against accidents like previous commit + + https://github.com/harfbuzz/harfbuzz/pull/1796 + + src/gen-ucd-table.py | 24 +++++++++++------------- + 1 file changed, 11 insertions(+), 13 deletions(-) + +commit f4ea1a9afb4849e7cfb7a5eb9e81e4f656c3f89e +Author: David Corbett +Date: Tue Jun 25 21:08:14 2019 -0400 + + [ucd] Include scripts added in Unicode 10 or later + + src/gen-ucd-table.py | 2 +- + src/hb-ucd-table.hh | 970 +++++++++++++++++++++++++++------------------------ + 2 files changed, 511 insertions(+), 461 deletions(-) + +commit 10bd6b8d913a57260b35c1ef830db37c06eebd18 +Author: Michiharu Ariza +Date: Thu Jun 20 16:22:08 2019 -0700 + + minor + + src/hb-bimap.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f3ee2bd020f8ca313fae783cc49a374f1377e877 +Author: Michiharu Ariza +Date: Thu Jun 20 14:33:09 2019 -0700 + + add ops & methods to hb_bimap_t making it more like hb_map_t + moved has () to hb_bimap_t from hb_inc_bimap_t + moved identity () to hb_inc_bimap_t + removed forward() + + src/hb-bimap.hh | 38 ++++++++++++++++++++++++-------------- + src/hb-ot-cff-common.hh | 2 +- + src/hb-ot-cff1-table.hh | 4 ++-- + src/hb-subset-cff-common.cc | 2 +- + src/hb-subset-cff-common.hh | 4 ++-- + src/hb-subset-cff1.cc | 4 ++-- + src/hb-subset-cff2.cc | 2 +- + 7 files changed, 33 insertions(+), 23 deletions(-) + +commit 094966959f96d9a41fb612fd0b870f5ae8f5a954 +Author: Michiharu Ariza +Date: Mon Jun 17 22:12:40 2019 -0700 + + add hb_bimap_t, subclass hb_inc_bimap_t replacing CFF::remap_t + + src/Makefile.sources | 1 + + src/hb-bimap.hh | 129 ++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-cff-common.hh | 64 +++------------------- + src/hb-ot-cff1-table.hh | 16 +++--- + src/hb-subset-cff-common.cc | 12 ++--- + src/hb-subset-cff-common.hh | 40 ++++++-------- + src/hb-subset-cff1.cc | 26 ++++----- + src/hb-subset-cff2.cc | 31 +++++------ + 8 files changed, 191 insertions(+), 128 deletions(-) + +commit 0660175dc82d82bbb38c45b9cb53190e06f55750 +Author: David Corbett +Date: Tue Jun 25 10:14:03 2019 -0400 + + Categorize U+1133B for use in Tamil + + src/hb-ot-shape-complex-indic.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fb0df17b2701c1c5623198440aa88a676985bd4f +Author: David Corbett +Date: Mon Jun 24 21:54:26 2019 -0400 + + Correct "nonunihan" to "nounihan" + + src/gen-ucd-table.py | 4 ++-- + src/hb-ucd-table.hh | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit bb4cdf8e0bcc98a036c22cfd44242502b107fb32 +Author: Ebrahim Byagowi +Date: Tue Jun 25 01:42:42 2019 +0430 + + Replace create_from_file with empty blob if HB_NO_OPEN is defined + + src/main.cc | 4 ++++ + src/test-buffer-serialize.cc | 4 ++++ + src/test-gpos-size-params.cc | 4 ++++ + src/test-gsub-would-substitute.cc | 4 ++++ + src/test-ot-color.cc | 4 ++++ + src/test-ot-name.cc | 4 ++++ + src/test.cc | 4 ++++ + 7 files changed, 28 insertions(+) + +commit ccf1448238c91da3cba8370ee527229013f6d362 +Author: GaryQian +Date: Mon Jun 24 12:57:13 2019 -0700 + + Cast long->size_t to ensure comparison of similar types + + src/hb-common.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ec8e635e0c1a8e5c631a90820be68cf07c52c1a0 +Author: Behdad Esfahbod +Date: Mon Jun 24 12:37:23 2019 -0700 + + [ucd] Use custom encoding to shrink composition data + + Saves another 2.5kb. + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/gen-ucd-table.py | 22 +- + src/hb-algs.hh | 5 + + src/hb-ucd-table.hh | 963 ++++++++++++++++++++++++++++++++++----------------- + src/hb-ucd.cc | 49 ++- + 4 files changed, 704 insertions(+), 335 deletions(-) + +commit 9c933acaa443889bc2484dbe3ef3e990b299cd52 +Author: Behdad Esfahbod +Date: Sun Jun 23 17:14:27 2019 -0700 + + [ucd] Save a few more bytes + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/gen-ucd-table.py | 11 ++++++----- + src/hb-ucd-table.hh | 34 +++++++++++++++++----------------- + src/hb-ucd.cc | 12 ++++++------ + 3 files changed, 29 insertions(+), 28 deletions(-) + +commit 9bd8d66c2ba97aec57597ff85e059a7618260a1c +Author: Qunxin Liu +Date: Wed Jun 12 11:02:48 2019 -0700 + + [subset] VORG table to use _subset2 method and new iterator frameworks + + src/hb-ot-vorg-table.hh | 128 ++++++++++++++---------------------------------- + src/hb-subset.cc | 2 +- + 2 files changed, 39 insertions(+), 91 deletions(-) + +commit 8062979990d348671b465c877e4dd672e1337665 +Merge: ad97ec95 c2d7dfc6 +Author: Ebrahim Byagowi +Date: Sun Jun 23 11:19:48 2019 +0430 + + Merge pull request #1788 from jameshilliard/configure-svg + + Add missing cairo-svg dependency to test-ot-color + +commit c2d7dfc68ffcb389c9f73b5ef94da7b270bdcf9e +Author: James Hilliard +Date: Sat Jun 22 19:38:48 2019 -0600 + + Add missing cairo-svg dependency to test-ot-color + + src/test-ot-color.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit ad97ec95019b1e5170d00953d4dfe392cfb4abb0 +Author: Behdad Esfahbod +Date: Fri Jun 21 00:44:29 2019 -0700 + + [config/ucd] Add HB_NO_UNICODE_UNASSIGNED and activate in HB_TINY + + Saves another 12kb: + + $ python ./gen-ucd-table.py ucd.nounihan.grouped.zip > hb-ucd-table.hh && make -j5 CPPFLAGS='-Os -DHB_TINY' -C ~/hb/build/src/ && size ~/hb/build/src/.libs/libharfbuzz_la-hb-ucd.o + INFO: Loading UCDXML... + INFO: Preparing data tables... + INFO: Generating output... + INFO: Compression=1: + INFO: Dataset=gc FullCost=18612 + INFO: Dataset=ccc FullCost=3550 + INFO: Dataset=bmg FullCost=1548 + INFO: Dataset=sc FullCost=17765 + INFO: Dataset=dm FullCost=13325 + INFO: Compression=3: + INFO: Dataset=gc FullCost=10726 + INFO: Dataset=ccc FullCost=2389 + INFO: Dataset=bmg FullCost=1052 + INFO: Dataset=sc FullCost=13669 + INFO: Dataset=dm FullCost=7780 + INFO: Compression=5: + INFO: Dataset=gc FullCost=8274 + INFO: Dataset=ccc FullCost=2055 + INFO: Dataset=bmg FullCost=908 + INFO: Dataset=sc FullCost=4073 + INFO: Dataset=dm FullCost=7780 + INFO: Done. + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + CONFIG.md | 3 +- + src/gen-ucd-table.py | 27 +- + src/hb-config.hh | 1 + + src/hb-ucd-table.hh | 1161 +++++++++++++++++++++++++++++++++++++++++++++++++- + 4 files changed, 1185 insertions(+), 7 deletions(-) + +commit ccea7fa119d139b6a3a429b3b81fac8448f3bab1 +Author: Behdad Esfahbod +Date: Fri Jun 21 00:42:06 2019 -0700 + + [config] Make test build under HB_TINY + + src/test-gpos-size-params.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 12cec6c12ec1856e483097e702126214dd25a34a +Author: Ebrahim Byagowi +Date: Fri Jun 21 22:39:42 2019 +0430 + + Don't define hb_blob_create_from_file if HB_NO_OPEN is defined + + src/hb-blob.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 7f3b409e85897ff267f1b6a5ce1b5cdafbfe7afe +Author: Behdad Esfahbod +Date: Thu Jun 20 14:24:43 2019 -0700 + + Fix build with -O0 + + message_impl was not defined. That causes trouble if compiler didn't + optimize the unreachable call out... + + src/hb-buffer.cc | 1 - + src/hb-buffer.hh | 4 ++++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 6b44bf85382146b355a5a3cbbfde48166721ce52 +Author: Behdad Esfahbod +Date: Thu Jun 20 11:57:19 2019 -0700 + + 2.5.2 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 3 files changed, 15 insertions(+), 3 deletions(-) + +commit e9f7b338ef599b9cbffa125fe594a9939b8517cb +Author: Behdad Esfahbod +Date: Thu Jun 20 11:48:44 2019 -0700 + + [config] Adjust description of HB_LEAN + + https://github.com/harfbuzz/harfbuzz/commit/d84932ba50482b3b47e393714eb77b19173d1f14 + + CONFIG.md | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit fce3bf8127321bb53b14eb8a5528a2347cd9be8a +Author: Behdad Esfahbod +Date: Wed Jun 19 20:34:29 2019 -0700 + + [config] Add HB_NO_LAYOUT_COLLECT_GLYPHS + + Part of + + src/hb-config.hh | 1 + + src/hb-ot-layout.cc | 2 ++ + 2 files changed, 3 insertions(+) + +commit 6c725c7799bf4870fb8b4f896a537a2c0f7a1ccc +Author: Behdad Esfahbod +Date: Wed Jun 19 20:12:25 2019 -0700 + + [config] Add HB_NO_LAYOUT_FEATURE_PARAMS + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 1 + + src/hb-ot-layout-common.hh | 7 +++++-- + src/hb-ot-layout.cc | 6 ++---- + 3 files changed, 8 insertions(+), 6 deletions(-) + +commit 27de7c44fe80e69c527578c99c26280ba9f26c15 +Author: Behdad Esfahbod +Date: Wed Jun 19 20:07:02 2019 -0700 + + [config] Add HB_NO_FACE_COLLECT_UNICODES + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 1 + + src/hb-face.cc | 5 ++--- + src/hb-ot-face-table-list.hh | 2 ++ + 3 files changed, 5 insertions(+), 3 deletions(-) + +commit 3caa32d737e7c2b4fe6ccd10950760998524f573 +Author: Behdad Esfahbod +Date: Wed Jun 19 19:50:54 2019 -0700 + + [config] Add HB_NO_CMAP_LEGACY_SUBTABLES + + Part of https://vimeo.com/331852453/06eec89c65 + + src/hb-config.hh | 1 + + src/hb-ot-cmap-table.hh | 16 ++++++++++++---- + 2 files changed, 13 insertions(+), 4 deletions(-) + +commit 8e3cde67dfa4aa17c0f1156b4a4acd0c95bdbe6f +Author: Behdad Esfahbod +Date: Wed Jun 19 19:58:24 2019 -0700 + + Fix MSVC build + + MSVC warning: + + c:\projects\harfbuzz\src\hb-ot-layout-gsubgpos.hh(2732): error C2121: '#': invalid character: possibly the result of a macro expansion [C:\projects\harfbuzz\build\harfbuzz.vcxproj] + + Clang warning for it: + + ./hb-ot-layout-gsubgpos.hh:2729:2: error: embedding a directive within macro arguments has undefined behavior [-Werror,-Wembedded-directive] + + src/hb-ot-layout-gsubgpos.hh | 18 +++++++++++------- + src/hb.hh | 1 + + 2 files changed, 12 insertions(+), 7 deletions(-) + +commit c8f529a07eca06acf2216935921377e7cad8436f +Author: Behdad Esfahbod +Date: Wed Jun 19 19:33:15 2019 -0700 + + [config] Add HB_NO_HINTING, enabled by HB_TINY + + Disables HintingDevice tables and Anchors addressing contour points. + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 3 ++- + src/hb-ot-layout-common.hh | 6 ++++++ + src/hb-ot-layout-gpos-table.hh | 7 +++++++ + 3 files changed, 15 insertions(+), 1 deletion(-) + +commit a849873124efea6577b4938b23501d9e4f4af2f4 +Author: Behdad Esfahbod +Date: Wed Jun 19 19:26:22 2019 -0700 + + [config] Add HB_NO_VAR to disable variations support, enabled by HB_TINY + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 1 + + src/hb-font.cc | 3 ++- + src/hb-ot-face-table-list.hh | 2 ++ + src/hb-ot-layout-common.hh | 34 ++++++++++++++++++++++++++++------ + src/hb-ot-layout-gsubgpos.hh | 18 +++++++++++++++--- + src/hb-ot-var.cc | 7 ++++++- + src/hb-subset-plan.cc | 2 ++ + 7 files changed, 56 insertions(+), 11 deletions(-) + +commit 230adf2c417bbb6b5f367eb857dd6f98bea3ef26 +Author: Behdad Esfahbod +Date: Wed Jun 19 18:49:52 2019 -0700 + + [config] Add HB_NO_OT_FONT_GLYPH_NAMES + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 1 + + src/hb-ot-face-table-list.hh | 4 +++- + src/hb-ot-font.cc | 5 ++++- + 3 files changed, 8 insertions(+), 2 deletions(-) + +commit b0debc32f6cedfa76a4851aa391f88ed1860955d +Author: Behdad Esfahbod +Date: Wed Jun 19 18:42:39 2019 -0700 + + [subset] Simplify collect_name_ids + + src/hb-subset-plan.cc | 19 ++----------------- + 1 file changed, 2 insertions(+), 17 deletions(-) + +commit a5897463d4d0b83cb1bfe4ae1477dac4e3851252 +Author: Behdad Esfahbod +Date: Wed Jun 19 18:36:35 2019 -0700 + + [config] Add HB_NO_STAT + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 1 + + src/hb-ot-face-table-list.hh | 2 ++ + src/hb-subset-plan.cc | 2 ++ + 3 files changed, 5 insertions(+) + +commit ffc2b8d56e5d35b4dc19499c830d8fc4b643213a +Author: Behdad Esfahbod +Date: Wed Jun 19 18:33:29 2019 -0700 + + [config] Don't include name table in face if HB_NO_NAME + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-face-table-list.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 1432df102ebf206592f92677f48bb950871675b3 +Author: Behdad Esfahbod +Date: Wed Jun 19 18:32:40 2019 -0700 + + [config] Disable hb-ot-font code if HB_NO_OT_FONT + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-font.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit b1a2384a5244ea3ea63ca94eb095c4add2cd451d +Author: Behdad Esfahbod +Date: Wed Jun 19 17:34:12 2019 -0700 + + [ucd] Print out table sizes + + src/gen-ucd-table.py | 27 +++++++++++++++++++-------- + src/hb-ucd-table.hh | 1 - + 2 files changed, 19 insertions(+), 9 deletions(-) + +commit f4de0c775408e34474a688361fa319251e1a9c18 +Author: Behdad Esfahbod +Date: Wed Jun 19 17:08:26 2019 -0700 + + [config] Disable AAT map + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-aat-map.cc | 15 +++++++-------- + src/hb-ot-shape.cc | 6 ++++++ + 2 files changed, 13 insertions(+), 8 deletions(-) + +commit d8bf6723a1176ca26e97e8015044c8829ec77c36 +Author: Behdad Esfahbod +Date: Wed Jun 19 17:04:16 2019 -0700 + + [config] Disable more legacy kerning + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-shape.cc | 4 +++- + src/hb-ot-shape.hh | 8 ++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 43d7048d59b1a0af62b80bd914805bdec74a29d2 +Author: Behdad Esfahbod +Date: Wed Jun 19 17:02:32 2019 -0700 + + [config] More trak disabling + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-shape.cc | 4 +++- + src/hb-ot-shape.hh | 8 ++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit d84932ba50482b3b47e393714eb77b19173d1f14 +Author: Behdad Esfahbod +Date: Wed Jun 19 16:57:48 2019 -0700 + + [config] add HB_NO_OT_SHAPE_FRACTIONS, enabled in HB_LEAN + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 1 + + src/hb-ot-shape.cc | 9 +++++++++ + src/hb-ot-shape.hh | 10 ++++++++++ + 3 files changed, 20 insertions(+) + +commit eaf4a7364c28663720a9da57bf4d576b6009e17d +Author: Behdad Esfahbod +Date: Wed Jun 19 16:51:13 2019 -0700 + + [config] Minor trak disable + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-shape.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 971330c0588307bcd73934e44c6343db55b1f5b6 +Author: Behdad Esfahbod +Date: Wed Jun 19 16:37:35 2019 -0700 + + [config] Add HB_NO_LANGUAGE_PRIVATE_SUBTAG + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 1 + + src/hb-ot-tag.cc | 4 ++++ + 2 files changed, 5 insertions(+) + +commit f642a5fa6c42b145574593a0e18815dc74d3c617 +Author: Behdad Esfahbod +Date: Wed Jun 19 16:36:09 2019 -0700 + + Restructure code + + src/hb-ot-tag.cc | 44 ++++++++++++++++++++------------------------ + 1 file changed, 20 insertions(+), 24 deletions(-) + +commit d2ff73b256599a655e4ddedbe1ca75abdf837d23 +Author: Behdad Esfahbod +Date: Wed Jun 19 16:28:08 2019 -0700 + + [config] Remove remaining AAT context bits if HB_NO_OT_KERN + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-aat-layout.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 588697afd0ddf411e8201866ade1f593ccb61aab +Author: Behdad Esfahbod +Date: Wed Jun 19 16:24:51 2019 -0700 + + [config] Add HB_NO_OT_KERN, enabled by HB_MINI / HB_NO_LEGACY + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 1 + + src/hb-ot-face-table-list.hh | 6 +++++- + src/hb-ot-layout.cc | 4 ++-- + src/hb-ot-shape.cc | 16 ++++++++++++++-- + src/hb-ot-shape.hh | 4 ++++ + 5 files changed, 26 insertions(+), 5 deletions(-) + +commit 2e3e929d2b0fa6026c55eb92f91de0498fb22646 +Author: Behdad Esfahbod +Date: Wed Jun 19 15:50:13 2019 -0700 + + Fix build + + src/hb-ot-face-table-list.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 631da9d816da381c5fd4b3cc640c41fda736a96f +Author: Behdad Esfahbod +Date: Wed Jun 19 15:36:14 2019 -0700 + + [config] Remove tables from hb_face_t for disabled features + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/Makefile.sources | 1 + + src/hb-ot-face-table-list.hh | 112 +++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-face.cc | 8 +--- + src/hb-ot-face.hh | 52 ++------------------ + src/hb-ot-layout.cc | 2 + + 5 files changed, 120 insertions(+), 55 deletions(-) + +commit e710888188ff3285a162c25c89d886d9535d9f02 +Author: Misty De Meo +Date: Tue Jun 18 15:20:38 2019 -0700 + + coretext: remove trailing macro from SCRATCH_RESTORE + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 10bac21bb5b25cf20c2198934e99e444625dfd97 +Author: Behdad Esfahbod +Date: Tue Jun 18 15:15:06 2019 -0700 + + [coretext/uniscribe/directwrite] Remove extra semicolons + + Fixes https://github.com/harfbuzz/harfbuzz/pull/1783 + + src/hb-coretext.cc | 2 +- + src/hb-directwrite.cc | 2 +- + src/hb-uniscribe.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit f0b0fd4e78e94315c9d01b9232ebfb09bbfef556 +Author: Behdad Esfahbod +Date: Tue Jun 18 14:40:24 2019 -0700 + + Remove dead code + + src/hb-ot-layout.cc | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +commit d7e27cd65a085a76c85cddd93cea48ce4b7be03f +Author: Behdad Esfahbod +Date: Tue Jun 18 14:38:05 2019 -0700 + + [config] Don't use VORG table if HB_NO_OT_FONT_CFF + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-font.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 37f8ebff5f1973423c7e4ed9dea88881d0642b61 +Author: Behdad Esfahbod +Date: Tue Jun 18 14:33:49 2019 -0700 + + [config] Fixup for AAT ltag table access + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-aat-layout.hh | 8 -------- + src/hb-ot-name-table.hh | 2 +- + 2 files changed, 1 insertion(+), 9 deletions(-) + +commit f08066ce9a41469e2a7396f0accd61e1c02e5649 +Author: Behdad Esfahbod +Date: Tue Jun 18 14:29:27 2019 -0700 + + [config] One more morx disabling + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-layout.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 231d0257883ec9e8904afae1adfd73f3c225f177 +Author: Behdad Esfahbod +Date: Tue Jun 18 14:25:52 2019 -0700 + + [config] Don't compile AAT API if HB_NO_AAT + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-aat-layout.cc | 131 ++++++++++++++++----------------------------------- + src/hb-ot-shape.cc | 19 ++++++-- + 2 files changed, 56 insertions(+), 94 deletions(-) + +commit bf9424a9a198b99d49c005536a10f27387630064 +Author: Behdad Esfahbod +Date: Tue Jun 18 13:31:35 2019 -0700 + + [config] Don't compile unused layout API if HB_NO_LAYOUT_UNUSED + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-layout.cc | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) + +commit eb9798ef733da53e69966054b67752cd8937eb7b +Author: Behdad Esfahbod +Date: Tue Jun 18 13:29:55 2019 -0700 + + [config] Dont' compile buffer message API if HB_NO_BUFFER_MESSAGE + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-buffer.cc | 2 ++ + src/hb-buffer.hh | 5 ++++- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit be1c0ab2186a728eabdf6666632a9f759474f901 +Author: Behdad Esfahbod +Date: Tue Jun 18 13:26:03 2019 -0700 + + [config] Don't compile buffer serialize API if HB_NO_BUFFER_SERIALIZE + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-buffer-serialize.cc | 19 +++++++------------ + src/test-buffer-serialize.cc | 7 ++++++- + 2 files changed, 13 insertions(+), 13 deletions(-) + +commit bdbabd110cfdb4c59cf24bd500ce63073a5213e4 +Author: Behdad Esfahbod +Date: Tue Jun 18 13:21:25 2019 -0700 + + Minor header include cleanup + + src/hb-aat-layout.cc | 1 - + src/hb-ot-math.cc | 3 --- + src/hb-ot-name.cc | 1 - + src/hb-ot-var.cc | 4 ++-- + 4 files changed, 2 insertions(+), 7 deletions(-) + +commit 83de3a60ab7383cf3ee25c1f8c33a45a7778d003 +Author: Behdad Esfahbod +Date: Tue Jun 18 13:18:15 2019 -0700 + + [config] Don't compile color API if HB_NO_COLOR + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-color.cc | 55 +++++++++------------------------------------------- + src/test-ot-color.cc | 9 ++++++++- + 2 files changed, 17 insertions(+), 47 deletions(-) + +commit 350f98ea47aaf0fe008065b92c8b6fe2bc519fa7 +Author: Behdad Esfahbod +Date: Tue Jun 18 13:11:41 2019 -0700 + + [config] Don't compile name table API if HB_NO_NAME + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-name.cc | 25 +++++-------------------- + src/test-ot-name.cc | 5 ++++- + 2 files changed, 9 insertions(+), 21 deletions(-) + +commit da51a2cb0efae664d4ee83c6036f29a21621e993 +Author: Behdad Esfahbod +Date: Tue Jun 18 13:09:22 2019 -0700 + + [config] Don't compile math API if HB_NO_MATH + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-math.cc | 47 +++++++---------------------------------------- + 1 file changed, 7 insertions(+), 40 deletions(-) + +commit 737436d3f8aacfd0bd586cd54d7034bae3afc4e1 +Author: Behdad Esfahbod +Date: Tue Jun 18 13:07:44 2019 -0700 + + Streamline HB_NO_CFF + + src/hb-ot-cff1-table.cc | 7 +++++-- + src/hb-ot-cff2-table.cc | 7 +++++-- + src/hb-subset-cff-common.cc | 7 +++++++ + src/hb-subset-cff1.cc | 7 +++++-- + src/hb-subset-cff2.cc | 7 +++++-- + 5 files changed, 27 insertions(+), 8 deletions(-) + +commit 60653a7adbbd8143d187b3edf33cb7a2dddadf74 +Author: Behdad Esfahbod +Date: Tue Jun 18 13:01:11 2019 -0700 + + Remove HB_VECTOR_SIZE + + It was cumbersome to get it to work reliably, for dubious performance + gain, mostly in the subsetter maybe... + + Life is easier without. It was disabled forever anyway. + + src/hb-algs.hh | 36 +++++++++--------------------------- + src/hb-null.hh | 4 ++-- + src/hb-static.cc | 4 ++-- + src/hb.hh | 32 -------------------------------- + 4 files changed, 13 insertions(+), 63 deletions(-) + +commit 24060d3aa77f1e1a18960cc61c3d1ac241875507 +Author: Behdad Esfahbod +Date: Tue Jun 18 12:50:42 2019 -0700 + + Add hb_bitwise_neg + + src/hb-algs.hh | 33 +++++++++++++++++++++------------ + 1 file changed, 21 insertions(+), 12 deletions(-) + +commit 7cf9169078f35299ec0633a7b212256acdd71661 +Author: Behdad Esfahbod +Date: Tue Jun 18 12:44:03 2019 -0700 + + Remove accidentally left cruft + + src/hb-algs.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6172ec5d879653c536d7cb3d3b3760fbb6d0f3f3 +Author: Behdad Esfahbod +Date: Tue Jun 18 12:41:56 2019 -0700 + + Remove (unused) posix_memalign fallback + + Was wrong. The returned pointer couldn't be passed to free(). Ouch! + + configure.ac | 2 +- + src/hb.hh | 34 ---------------------------------- + 2 files changed, 1 insertion(+), 35 deletions(-) + +commit eb28d6e48b02a8c49875cfcd084a16c1c66c367e +Author: Ebrahim Byagowi +Date: Tue Jun 18 12:14:10 2019 +0430 + + [ci] Test no build system builds + + Introduced in aa3450c, let's preserve it + + .circleci/config.yml | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit efef672911dd6c3b80e53294f3fcd59dbb64597a +Author: Behdad Esfahbod +Date: Mon Jun 17 22:57:51 2019 -0700 + + Fix cmake build + + Hopefullly. + + CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +commit aa3450cac148280f747fb88864b6fcc4ec70cc51 +Author: Behdad Esfahbod +Date: Mon Jun 17 22:41:49 2019 -0700 + + [config] Don't compile disabled features + + This makes it possible to include all .cc files into build, even if not + building CoreText, Uniscribe, etc. + + This was mostly to help custom builders. But also means that we can + include all files in our own build system. Not sure if we should. + Definitely simplifies things, but slightly only. + + src/Makefile.am | 1 + + src/hb-coretext.cc | 6 ++++++ + src/hb-directwrite.cc | 6 ++++++ + src/hb-ft.cc | 5 +++++ + src/hb-glib.cc | 5 +++++ + src/hb-gobject-enums.cc.tmpl | 7 +++++++ + src/hb-gobject-structs.cc | 5 +++++ + src/hb-graphite2.cc | 7 +++++++ + src/hb-icu.cc | 5 +++++ + src/hb-uniscribe.cc | 4 ++++ + 10 files changed, 51 insertions(+) + +commit 33d8b76e74579a27b06fa788d0bf696a9dd44cc4 +Author: Behdad Esfahbod +Date: Mon Jun 17 21:54:20 2019 -0700 + + [config] Flesh out CONFIG.md + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + CONFIG.md | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 84 insertions(+), 3 deletions(-) + +commit 23ccd00a3d5033b812f2bebcc5b793a4415b252b +Author: Behdad Esfahbod +Date: Mon Jun 17 20:35:04 2019 -0700 + + Minor + + src/hb-config.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 23768a99e08cbe691772b7514c023d3184989ff8 +Author: Behdad Esfahbod +Date: Mon Jun 17 20:29:29 2019 -0700 + + [config] Replace HAVE_FALLBACK with HB_NO_FALLBACK_SHAPE + + This disables fallback shaper in tiny builds. Projects that don't + use our build system and want to disable fallback shaper (eg. Firefox) + should define HB_NO_FALLBACK_SHAPE now. + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + CMakeLists.txt | 2 -- + configure.ac | 8 -------- + src/Makefile.am | 4 ---- + src/Makefile.sources | 5 +---- + src/hb-config.hh | 1 + + src/hb-fallback-shape.cc | 3 +++ + src/hb-shaper-list.hh | 2 +- + 7 files changed, 6 insertions(+), 19 deletions(-) + +commit 3a9394635ffd663d8acd0715236dd01d9f22f3b8 +Author: Behdad Esfahbod +Date: Mon Jun 17 20:10:36 2019 -0700 + + Add CONFIG.md + + https://github.com/harfbuzz/harfbuzz/issues/1652 + + CONFIG.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ + Makefile.am | 1 + + README.md | 2 ++ + 3 files changed, 54 insertions(+) + +commit 1c56b5d1d8307efd12519556e41fc50c5371f136 +Author: Behdad Esfahbod +Date: Mon Jun 17 14:23:04 2019 -0700 + + [serialize] Fix copy() calling operator= + + https://github.com/googlefonts/harfbuzz/commit/9f610ae239a11e86f94621e26bc15849b65ce41b#commitcomment-33944686 + + src/hb-serialize.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6492b2345cd913223b0eb931e9e11f7e5ad33049 +Author: Behdad Esfahbod +Date: Mon Jun 17 14:19:13 2019 -0700 + + Minor + + src/hb-open-type.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8938dd23c64f80dbd31f87133d9df88cd0c98c1a +Author: Behdad Esfahbod +Date: Mon Jun 17 14:12:11 2019 -0700 + + Use injected class name + + src/hb-open-type.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit bfb5569d530a2b65dafd0d9be45d594af9e742ce +Author: Behdad Esfahbod +Date: Mon Jun 17 14:06:04 2019 -0700 + + Disable non-OpenType kerning with hb-ft in HB_TINY + + src/hb-ft.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 0819f3ca863af520fe546e6ef0596300e9e28b01 +Author: Behdad Esfahbod +Date: Mon Jun 17 14:02:47 2019 -0700 + + Deprecate v_kerning callback again + + Part of https://github.com/harfbuzz/harfbuzz/issues/1682 + + docs/harfbuzz-sections.txt | 6 +++--- + src/hb-deprecated.h | 23 +++++++++++++++++++++++ + src/hb-font.cc | 7 +++---- + src/hb-font.h | 20 -------------------- + src/hb-font.hh | 2 +- + 5 files changed, 30 insertions(+), 28 deletions(-) + +commit eb2825c7f140185f41922a371434873a0114ef67 +Author: Behdad Esfahbod +Date: Mon Jun 17 13:42:53 2019 -0700 + + Minor + + src/hb-ot-font.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 896416bd4c6ac486eb4e1926eaa09d5a9b693763 +Author: Behdad Esfahbod +Date: Mon Jun 17 13:39:49 2019 -0700 + + Partially revert "[ft/ot] Remove implementation of deprecated kerning funcs" + + This reverts commit 47030b1855f04c0d75899ffb6f5021fea3c19b90. + + Reverts only the hb-ft part, to reinstate non-OpenType kerning with + FreeType. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1682 + + src/hb-ft.cc | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +commit 2682efb02df72fb254c819cb76fc23592c30fc45 +Author: Behdad Esfahbod +Date: Mon Jun 17 13:38:08 2019 -0700 + + Revert "Deprecate font kern API" + + This reverts commit d219f899f4b2fb4b39ebc1dff9fb648fc5d6d112. + + API change: Un-deprecate font kern API. + + Part of https://github.com/harfbuzz/harfbuzz/issues/1682 + + We should document that this API is only necessary to hook up + non-OpenType kerning. hb-ot-font will continue to NOT implement them. + + docs/harfbuzz-sections.txt | 16 +++++++------- + src/hb-deprecated.h | 54 ---------------------------------------------- + src/hb-font.cc | 3 --- + src/hb-font.h | 51 +++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 59 insertions(+), 65 deletions(-) + +commit d6cb244f7d63338e0cbfa774c2a32e6e7e06f15b +Author: David Corbett +Date: Sat Jun 15 21:38:27 2019 -0400 + + Canonically reorder U+0C55 and U+0C56 + + src/hb-unicode.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 82d4bfb8f3ac30fecce41f8abe59f58ad64ba98a +Author: Michiharu Ariza +Date: Fri Jun 14 10:49:42 2019 -0700 + + enable cff subset tests + + add Unicode UCS-4 cmap + fix Unicode bits in OS/2 + add Unicode cmap sub-table in SourceHanSans-Regular_subset.otf + regenerate cff subset test expected results + + src/hb-ot-cmap-table.hh | 73 +++++++++++++++++---- + src/hb-ot-os2-table.hh | 10 ++- + test/subset/data/Makefile.am | 2 + + test/subset/data/Makefile.sources | 2 + + ...subroutinize-retain-gids.1FC,21,41,20,62,63.otf | Bin 32124 -> 20000 bytes + ...Regular.desubroutinize-retain-gids.61,62,63.otf | Bin 29688 -> 2196 bytes + ...r.desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf | Bin 33316 -> 30412 bytes + ...subroutinize-retain-gids.1FC,21,41,20,62,63.otf | Bin 31960 -> 19840 bytes + ...p-hints-desubroutinize-retain-gids.61,62,63.otf | Bin 29564 -> 2072 bytes + ...s-desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf | Bin 33168 -> 30264 bytes + ...r.drop-hints-retain-gids.1FC,21,41,20,62,63.otf | Bin 32052 -> 19932 bytes + ...Pro-Regular.drop-hints-retain-gids.61,62,63.otf | Bin 29632 -> 2108 bytes + ...gular.drop-hints-retain-gids.D7,D8,D9,DA,DE.otf | Bin 33180 -> 30276 bytes + ...sPro-Regular.retain-gids.1FC,21,41,20,62,63.otf | Bin 32276 -> 20152 bytes + .../SourceSansPro-Regular.retain-gids.61,62,63.otf | Bin 29788 -> 2264 bytes + ...eSansPro-Regular.retain-gids.D7,D8,D9,DA,DE.otf | Bin 33332 -> 30428 bytes + ...ubset.default.3042,3044,3046,3048,304A,304B.otf | Bin 3028 -> 3036 bytes + ...ubset.default.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 3240 -> 3248 bytes + ...eHanSans-Regular_subset.default.61,63,65,6B.otf | Bin 2200 -> 2208 bytes + ...ubset.default.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 3460 -> 3468 bytes + .../SourceHanSans-Regular_subset.default.660E.otf | Bin 1920 -> 1928 bytes + ...e-retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 90956 -> 8932 bytes + ...e-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 125820 -> 116080 bytes + ...bset.desubroutinize-retain-gids.61,63,65,6B.otf | Bin 88392 -> 3016 bytes + ...e-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 126004 -> 116264 bytes + ...ular_subset.desubroutinize-retain-gids.660E.otf | Bin 103780 -> 50224 bytes + ...esubroutinize.3042,3044,3046,3048,304A,304B.otf | Bin 2952 -> 2960 bytes + ...esubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 3136 -> 3144 bytes + ...s-Regular_subset.desubroutinize.61,63,65,6B.otf | Bin 2132 -> 2140 bytes + ...esubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 3256 -> 3264 bytes + ...eHanSans-Regular_subset.desubroutinize.660E.otf | Bin 1896 -> 1904 bytes + ...e-retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 90656 -> 8672 bytes + ...e-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 125468 -> 115768 bytes + ...ints-desubroutinize-retain-gids.61,63,65,6B.otf | Bin 88156 -> 2892 bytes + ...e-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 125584 -> 115884 bytes + ....drop-hints-desubroutinize-retain-gids.660E.otf | Bin 103556 -> 50040 bytes + ...esubroutinize.3042,3044,3046,3048,304A,304B.otf | Bin 2792 -> 2800 bytes + ...esubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 2896 -> 2904 bytes + ...ubset.drop-hints-desubroutinize.61,63,65,6B.otf | Bin 2028 -> 2036 bytes + ...esubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 2964 -> 2972 bytes + ...gular_subset.drop-hints-desubroutinize.660E.otf | Bin 1804 -> 1812 bytes + ...s-retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 90724 -> 8740 bytes + ...s-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 125560 -> 115864 bytes + ...r_subset.drop-hints-retain-gids.61,63,65,6B.otf | Bin 88196 -> 2852 bytes + ...s-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 125780 -> 116084 bytes + ...-Regular_subset.drop-hints-retain-gids.660E.otf | Bin 103572 -> 50060 bytes + ...et.drop-hints.3042,3044,3046,3048,304A,304B.otf | Bin 2848 -> 2856 bytes + ...et.drop-hints.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 2988 -> 2996 bytes + ...nSans-Regular_subset.drop-hints.61,63,65,6B.otf | Bin 2060 -> 2068 bytes + ...et.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 3164 -> 3172 bytes + ...ourceHanSans-Regular_subset.drop-hints.660E.otf | Bin 1824 -> 1832 bytes + ...t.retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 91040 -> 9016 bytes + ...t.retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 125924 -> 116184 bytes + ...Sans-Regular_subset.retain-gids.61,63,65,6B.otf | Bin 88468 -> 3012 bytes + ...t.retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 126208 -> 116468 bytes + ...urceHanSans-Regular_subset.retain-gids.660E.otf | Bin 103800 -> 50244 bytes + .../data/fonts/SourceHanSans-Regular_subset.otf | Bin 2707728 -> 2707736 bytes + 57 files changed, 70 insertions(+), 17 deletions(-) + +commit 6bcbe495bff221169f8c0769dde1b4b2c165a211 +Author: Ebrahim Byagowi +Date: Thu Jun 13 15:04:51 2019 +0430 + + [cff] minor format (#1774) + + src/hb-subset-cff-common.cc | 104 ++++++++++++++++++++------------------------ + 1 file changed, 48 insertions(+), 56 deletions(-) + +commit 4f37c0db9bf4e3d536a50126d17b36009b12f9cb +Author: David Corbett +Date: Tue Jun 11 17:55:31 2019 -0400 + + Remove 'mym3' + + src/hb-ot-tag.cc | 4 +++- + test/api/test-ot-tag.c | 2 +- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit 90872a29ee5d0bef6df1c2900f7001c11106c4da +Author: Michiharu Ariza +Date: Tue Jun 11 12:28:30 2019 -0700 + + change assert(false) to failure + + src/hb-subset-cff-common.cc | 2 +- + ...z-testcase-minimized-hb-subset-fuzzer-5680398559870976 | Bin 0 -> 145 bytes + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit 0c5da57d1aab91d7677a5c6517a3da254d53267f +Author: Behdad Esfahbod +Date: Mon Jun 10 14:06:25 2019 -0700 + + Fix typo :) + + src/hb-blob.cc | 3 ++- + src/hb-config.hh | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 19b8eb08e5457cd643aee5f9b9ad1c80b2243895 +Author: Ebrahim Byagowi +Date: Tue Jun 11 01:33:30 2019 +0430 + + Move HB_NO_SETLOCALE to closer place to its to unbreak HB_TINY build (#1768) + + src/hb-common.cc | 3 +++ + src/hb.hh | 4 ---- + 2 files changed, 3 insertions(+), 4 deletions(-) + +commit b4a5a69ad8625e3b90eb907a1b70e3ed24d4ff97 +Author: Ebrahim Byagowi +Date: Tue Jun 11 01:33:09 2019 +0430 + + Add HB_NO_OEPN (#1767) + + src/hb-blob.cc | 3 +++ + src/hb-config.hh | 2 ++ + 2 files changed, 5 insertions(+) + +commit a36ff941710b5a5f7e464e6d72aff36cf5549a91 +Author: Ebrahim Byagowi +Date: Mon Jun 10 15:48:28 2019 +0430 + + Add HB_NO_SETLOCALE + + src/hb-config.hh | 1 + + src/hb.hh | 6 +++++- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit c4cae81a26a816979f3206418c47856b5ed2d8bb +Author: Ebrahim Byagowi +Date: Mon Jun 10 15:32:54 2019 +0430 + + Remove round polyfill + + Added in 01dff1e and 19256bef, this was targeted at older + msvc versions that don't support C99 but now as we require + C++11 we don't target places those envs thus removing this. + + CMakeLists.txt | 2 +- + configure.ac | 6 ------ + src/hb.hh | 14 -------------- + 3 files changed, 1 insertion(+), 21 deletions(-) + +commit ff9b9b1c89d5529fafc74ce84c0acb71b5d6031b +Author: Behdad Esfahbod +Date: Mon Jun 10 12:48:25 2019 -0700 + + Simplify HB_PARTIALIZE impl + + +this works on gcc 4.8 as well as default code path. + + src/hb-algs.hh | 17 +++++------------ + 1 file changed, 5 insertions(+), 12 deletions(-) + +commit 451edbd4d063a4b43c1ca3d2b60c7392602ae7b7 +Author: Behdad Esfahbod +Date: Mon Jun 10 12:46:54 2019 -0700 + + Revert "Test new solution for HB_PARTIALIZE" + + This reverts commit a0c4900799c26e4ff34180842a5ff21048fe31a0. + + src/hb-algs.hh | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +commit a0c4900799c26e4ff34180842a5ff21048fe31a0 +Author: Behdad Esfahbod +Date: Mon Jun 10 12:33:23 2019 -0700 + + Test new solution for HB_PARTIALIZE + + Just testing bots. Will finish based on results. + + src/hb-algs.hh | 18 +----------------- + 1 file changed, 1 insertion(+), 17 deletions(-) + +commit 4a2b58555f173b692b767c933d280a51142926dd +Author: Ebrahim Byagowi +Date: Mon Jun 10 08:16:51 2019 -0700 + + [ci] Use HB_OPTIMIZE_SIZE instead of __OPTIMIZE_SIZE__ + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a228bb5f1d471a334bc9727f5d4f5b59dbe829ff +Author: Ebrahim Byagowi +Date: Mon Jun 10 15:56:36 2019 +0430 + + [ci] Test -Os and optimize size in Alpine bot + + __OPTIMIZE_SIZE__ should be defined whenever -Os but some Internet thread + indicate may not so lets do that ourselves as that is the main intention + + .circleci/config.yml | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 9407ef8d4bb96346b1f8b07757d79d3f8cc61cf7 +Author: Ebrahim Byagowi +Date: Mon Jun 10 15:17:43 2019 +0430 + + minor, add HB_USE_INTERNAL_QSORT + + The only thing I need for a working wasm in a minimum libc, + otherwise I have to provide the very same qsort inside that libc + + src/hb-algs.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 801d93fc58aa13082dea86fb2c3821bc6362f593 +Author: Ebrahim Byagowi +Date: Mon Jun 10 14:53:14 2019 +0430 + + [ci] remove wine from fedora bot + + We are not testing Windows exes in fedora mingw bot, we don't have to as + probably won't go that smoothly and we have real Windows bots anyway + and as wine installation itself is time taking let's remove it + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7dcfc5357df879491f847bd7d2941645e58f268c +Author: Ebrahim Byagowi +Date: Sun Jun 9 11:58:08 2019 +0430 + + [stat] minor format + + src/hb-ot-stat-table.hh | 72 ++++++++++++++++++++++++------------------------- + 1 file changed, 36 insertions(+), 36 deletions(-) + +commit 2646c7149ce49d3b6cf90e354658df35254bcce0 +Author: Ebrahim Byagowi +Date: Sun Jun 9 11:51:58 2019 +0430 + + [stat] minor + + src/hb-ot-stat-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit c4669fda7890bc741ef934ebc360e366eba94866 +Author: Ebrahim Byagowi +Date: Sun Jun 9 11:50:36 2019 +0430 + + [algs] minor + + src/hb-algs.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 9b853f755dd05ccef3429d3d3d0d561a99cc4c2d +Author: Ebrahim Byagowi +Date: Sun Jun 9 11:49:25 2019 +0430 + + [cff] Use switch on multi-format structs (#1762) + + src/hb-cff-interp-cs-common.hh | 4 +- + src/hb-cff-interp-dict-common.hh | 12 +-- + src/hb-ot-cff-common.hh | 135 ++++++++++++------------ + src/hb-ot-cff1-table.hh | 215 ++++++++++++++++++++++----------------- + src/hb-ot-cff2-table.hh | 68 +++++++------ + src/hb-subset-cff1.cc | 2 +- + src/hb-subset-cff2.cc | 2 +- + 7 files changed, 233 insertions(+), 205 deletions(-) + +commit eff579f743a91c0b1c543f4b69ab33580cae6392 +Author: Ebrahim Byagowi +Date: Fri Jun 7 12:58:09 2019 +0430 + + Update and use internal qsort everywhere + + src/hb-algs.hh | 210 +++++++++++++++++++++++++++++++++++------------- + src/hb-array.hh | 6 +- + src/hb-ot-post-table.hh | 2 +- + 3 files changed, 158 insertions(+), 60 deletions(-) + +commit 5074d665a8b0980f202a5986bda52808674cfb54 +Author: Behdad Esfahbod +Date: Fri Jun 7 14:20:45 2019 -0700 + + [ucd] Save another 1.5kb + + https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/gen-ucd-table.py | 8 +++++--- + src/hb-ucd-table.hh | 37 +++++++++++++++++++++---------------- + src/hb-ucd.cc | 12 +++++++++--- + 3 files changed, 35 insertions(+), 22 deletions(-) + +commit 6d58b45782833f8c6c8efd9426e2785c78e6462a +Author: Ebrahim Byagowi +Date: Sat Jun 8 00:40:18 2019 +0430 + + [ci] use trusty for its gcc 4.8 again + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 973699c49b905e142ecc5cefd1f4fa15aad8e309 +Author: Behdad Esfahbod +Date: Fri Jun 7 12:49:06 2019 -0700 + + Disable clang gcc impersonator + + src/hb-algs.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e4e518f33d933a02058bad86a6aae714e59814db +Author: Behdad Esfahbod +Date: Fri Jun 7 12:41:09 2019 -0700 + + Fix build on gcc 4.8 + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1724 + + src/hb-algs.hh | 29 +++++++++++++++++++++++++++-- + 1 file changed, 27 insertions(+), 2 deletions(-) + +commit 3c240bd3dc0aaca38154da555d0aef350da62ee6 +Author: Behdad Esfahbod +Date: Fri Jun 7 10:56:24 2019 -0700 + + Downgrade double-promotion from error to warning + + https://github.com/harfbuzz/harfbuzz/issues/1740 + + src/hb.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 385e436692e94588fc4cb3a7afbeb862035db09b +Author: Ebrahim Byagowi +Date: Fri Jun 7 10:44:53 2019 -0700 + + Minor, fix gcc maybe-uninitialized complain + + I guess all of its field will be initialized anyway here but lets make it more defensive + + src/hb-ot-glyf-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1bada656a86e9cb27d4a6b9fcc50748f0bd9c1d9 +Author: Ebrahim Byagowi +Date: Fri Jun 7 02:01:27 2019 +0430 + + Minor, remove unnecessary semicolon + + Causing -Wextra-semi-stmt build error when no primitive has chosen + Interesting that nobody has noticed it yet. + + src/hb-mutex.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f9b1ae73360054d9f121a2d36820377909888b35 +Author: Garret Rieger +Date: Wed Jun 5 17:40:59 2019 -0700 + + [subset] Move OS/2 to subset2. + + src/hb-ot-os2-table.hh | 32 ++++++++++++++++---------------- + src/hb-subset.cc | 2 +- + 2 files changed, 17 insertions(+), 17 deletions(-) + +commit 93d592e0e181f436ea47038fef419134007208aa +Author: Qunxin Liu +Date: Wed Jun 5 16:51:31 2019 -0700 + + [subset] post table to use _subset2 + + src/hb-ot-post-table.hh | 31 +++++++++++++++---------------- + src/hb-subset.cc | 2 +- + 2 files changed, 16 insertions(+), 17 deletions(-) + +commit db938479d7b1e3ec35a39a9ad31c945e09e6d5e5 +Author: Qunxin Liu +Date: Tue Jun 4 10:30:53 2019 -0700 + + [subset] maxp table to use _subset2 + + src/hb-ot-maxp-table.hh | 48 ++++++++++++++++++++++-------------------------- + src/hb-subset.cc | 2 +- + 2 files changed, 23 insertions(+), 27 deletions(-) + +commit d5e5f378329b6ce21944b79b568369ea7bc36cf3 +Author: Eli Zaretskii +Date: Wed Jun 5 22:20:03 2019 +0300 + + This makes minor changes to allow building HarfBuzz with + mingw.org's MinGW. + + src/hb-algs.hh: Don't compile _BitScanForward and _BitScanReverse + for GCC >= 4. mingw.org's MinGW doesn't have these functions. + + src/hb-atomic.hh: MemoryBarrier does exist in mingw.org's MinGW, + but it is not a macro, it is an inline function. __MINGW32_VERSION + is a macro that exists only in mingw.org's MinGW, so conditioning + on it should not affect MinGW64, where MemoryBarrier is a macro. + + src/hb-uniscribe.cc: Define E_NOT_SUFFICIENT_BUFFER if it is not + defined (mingw.org's MinGW doesn't). + + src/hb.hh: Don't include intrin.h for mingw.org's MinGW, since that + header is not available; instead, include windows.h. Conditioned + on __MINGW32_VERSION to avoid affecting MinGW64. + + src/hb-algs.hh | 4 ++-- + src/hb-atomic.hh | 2 +- + src/hb-uniscribe.cc | 4 ++++ + src/hb.hh | 7 +++++++ + 4 files changed, 14 insertions(+), 3 deletions(-) + +commit c7439d4e3a76d596845aad4e4bc860bd61ee47e3 +Author: Behdad Esfahbod +Date: Wed Jun 5 12:13:49 2019 -0700 + + Slightly massage buffer-messaging commit + + Saves a few bytes. + + src/hb-buffer.cc | 3 --- + src/hb-buffer.hh | 8 +++++++- + 2 files changed, 7 insertions(+), 4 deletions(-) + +commit 4b1b0bf2f51f806d3285a7e7dec378b9eab9333e +Merge: 659eeddb 815f002b +Author: Ebrahim Byagowi +Date: Wed Jun 5 12:57:28 2019 +0430 + + Merge pull request #1755 from ebraminio/slim + + Don't use vsnprintf when HB_NO_BUFFER_MESSAGE is defined + +commit 815f002bb9230a52768a165383497cc98c58eadb +Author: Ebrahim Byagowi +Date: Wed Jun 5 10:38:06 2019 +0430 + + Don't use vsnprintf when HB_NO_BUFFER_MESSAGE is defined + + src/hb-buffer.cc | 5 ++++- + src/hb-config.hh | 1 + + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 659eeddb2df5b97cc01bd39e106381f65c9f41f1 +Author: Bruce Mitchener +Date: Mon Jun 3 22:31:50 2019 +0700 + + Use C++11 override keyword. + + util/hb-ot-shape-closure.cc | 2 +- + util/options.hh | 30 +++++++++++++++--------------- + 2 files changed, 16 insertions(+), 16 deletions(-) + +commit 2e16593b70688dfcee1788f38c6af03c5a589f6e +Author: David Corbett +Date: Sat Jun 1 20:54:46 2019 -0400 + + [myanmar] Make medial_group match the OT spec + + Sometime between [July 2018] and [January 2019], the OpenType Myanmar + grammar changed: one asat is now allowed after a medial ya, before any + other medial consonant. + + [July 2018]: http://web.archive.org/web/20180711011550/https://docs.microsoft.com/en-us/typography/script-development/myanmar + [January 2019]: http://web.archive.org/web/20190115044451/https://docs.microsoft.com/en-us/typography/script-development/myanmar + + This also reverts commit 439b05867c0856a81fa8f9bea3a7465b4b4bdd91, which + allowed an asat immediately after a medial ra. + + src/hb-ot-shape-complex-myanmar-machine.hh | 249 +++++++++++++++-------------- + src/hb-ot-shape-complex-myanmar-machine.rl | 2 +- + 2 files changed, 129 insertions(+), 122 deletions(-) + +commit 209491fc37c46281e063c3e6707d686d5f2b2ba4 +Author: Qunxin Liu +Date: Wed May 29 14:03:17 2019 -0700 + + [subset] Hmtx/vmtx tables to use subset2 and new iterator frameworks + + src/hb-ot-hmtx-table.hh | 115 +++++++++++++++++++++++------------------------- + src/hb-subset.cc | 6 +-- + 2 files changed, 59 insertions(+), 62 deletions(-) + +commit 89a7a880a1d5cd5e585d43fdde6d44c6dba559cf +Merge: 760eb1bf 12febd68 +Author: Ebrahim Byagowi +Date: Tue Jun 4 10:52:16 2019 +0430 + + Merge pull request #1747 from harfbuzz/cff2-fdselect-fix + + fixed faulty FDSelect::sanitize + +commit 12febd68d694cc1bae44b0b672d88bf9fbe8568d +Author: Michiharu Ariza +Date: Mon Jun 3 16:40:03 2019 -0700 + + added parentheses to FDSelect::sanitize as well + + src/hb-ot-cff-common.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 65e66a2d371f42d018b1a22f31a6428d19a90284 +Author: Michiharu Ariza +Date: Mon Jun 3 16:31:41 2019 -0700 + + added test data + + ...zz-testcase-minimized-harfbuzz_fuzzer-6252118652092416 | Bin 0 -> 126 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit be82a2fc0c7ad3553f2e6dc8082a3255cb6c917c +Author: Michiharu Ariza +Date: Mon Jun 3 15:52:23 2019 -0700 + + parenthesized cond-exp in CFF2FDSelect::sanitize + + src/hb-ot-cff2-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 760eb1bf9398bd37103ca879e825fad9bef4bfdd +Author: Ebrahim Byagowi +Date: Mon Jun 3 05:48:04 2019 -0700 + + Reapply possible bsearch overflow fix + + Originally introduced in 21ede86 (#1314) but as it wasn't applied to hb_bsearch + accidentally removed while merging hb_bsearch_r to it. + + src/hb-algs.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5846884f86cae61c1b0c369c81427712fb97ed83 +Author: Bruce Mitchener +Date: Mon Jun 3 15:00:25 2019 +0700 + + test: Use nullptr in C++ code. (#1744) + + src/test-ot-color.cc | 8 ++++---- + test/fuzzing/hb-shape-fuzzer.cc | 6 +++--- + test/fuzzing/hb-subset-fuzzer.cc | 2 +- + util/options-subset.cc | 2 +- + 4 files changed, 9 insertions(+), 9 deletions(-) + +commit 7c14b9014587e1423ef7481058e48dae84a65fce +Author: Ebrahim Byagowi +Date: Sun Jun 2 13:51:26 2019 +0430 + + [ci] revert to xenial + + It should've done in a branch + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8278ff7dce41e6694eba15a7c94a0c0eb3bca427 +Author: Ebrahim Byagowi +Date: Sun Jun 2 00:36:30 2019 +0430 + + minor + + src/hb-algs.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 33d38e793e2e4882337e5f42fbbae7d00d343940 +Author: Ebrahim Byagowi +Date: Sun Jun 2 00:19:57 2019 +0430 + + Use a unified bsearch (#1741) + + A part of #593 + + src/hb-aat-layout.cc | 10 +++++----- + src/hb-algs.hh | 29 ++++------------------------- + src/hb-ot-post-table.hh | 4 ++-- + src/hb-ot-var-mvar-table.hh | 6 +++--- + 4 files changed, 14 insertions(+), 35 deletions(-) + +commit 97b92685775983a280f335423263a6a8d82c3941 +Author: Ebrahim Byagowi +Date: Sat Jun 1 21:25:09 2019 +0430 + + [ci] Downgrade Travis distribution upon Behdad request + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit faf69e03f5ab9f3926442525f6c6e30fbc7a93d5 +Author: Ebrahim Byagowi +Date: Sat Jun 1 11:02:25 2019 +0430 + + [ci] Install ragel on appveyor mingw bots + + Hopefully autotools timestamps issues will go + + appveyor.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c91f3fa3eaf77fa255292c779f88da4feaaae8a0 +Author: Ebrahim Byagowi +Date: Sat Jun 1 10:55:37 2019 +0430 + + [dwrite] Replace REPLACEME with release version the symbol had + + src/hb-directwrite.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 93c455567fe3d92a7efe65bf0e9ac2af794e2c4f +Author: Behdad Esfahbod +Date: Fri May 31 22:53:27 2019 -0700 + + 2.5.1 + + NEWS | 11 +++++++++++ + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 3 files changed, 14 insertions(+), 3 deletions(-) + +commit 10e3cb9246ab3d288af4effe484f4d8beb2243d6 +Author: Behdad Esfahbod +Date: Fri May 31 22:56:37 2019 -0700 + + [docs] Fix dist + + docs/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 619f5f1eb9e5e2a4f326f89c9e3e05b01f9c042f +Author: Behdad Esfahbod +Date: Fri May 31 22:31:35 2019 -0700 + + Fourth try at building VS bots + + Based on https://github.com/harfbuzz/harfbuzz/issues/1730#issuecomment-497151210 + + src/hb-algs.hh | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +commit f387a09742bd8e4a7a8da6db954339609839a113 +Author: Behdad Esfahbod +Date: Fri May 31 22:12:23 2019 -0700 + + [ci] Disable VS 2013 + + That one doesn't even understand constexpr. + + appveyor.yml | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit aba3888d933474a874d2f3ff02397b523846466c +Author: Behdad Esfahbod +Date: Fri May 31 22:11:27 2019 -0700 + + Third try at fixing VS build + + https://github.com/harfbuzz/harfbuzz/issues/1730 + + src/hb-algs.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8aaecbb5832568135f6149254ed9e17ac4310341 +Author: Behdad Esfahbod +Date: Fri May 31 21:41:40 2019 -0700 + + Second VS fix try + + https://github.com/harfbuzz/harfbuzz/issues/1730 + + src/hb-algs.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5a1b5c0a8b91a2291e7327e84acba2406a14414e +Author: Behdad Esfahbod +Date: Fri May 31 21:08:39 2019 -0700 + + Try fixing VS builds + + Hopefully fixes https://github.com/harfbuzz/harfbuzz/issues/1730 + + src/hb-algs.hh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 66381fb73f21e8e3c1c14b196e64d1004be303c7 +Author: Behdad Esfahbod +Date: Fri May 31 20:20:43 2019 -0700 + + [ci] Enable other versions of Visual Studio + + https://github.com/harfbuzz/harfbuzz/issues/1730 + + appveyor.yml | 44 ++++++++++++++++++++++++-------------------- + 1 file changed, 24 insertions(+), 20 deletions(-) + +commit 92fde3dea282d308fad2b8e93cd638aa813c6f2a +Author: Behdad Esfahbod +Date: Fri May 31 20:16:25 2019 -0700 + + Whitespace + + src/hb-algs.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 49879adbfc57c3173a25bbc55afc0796ee71b6da +Author: rsheeter +Date: Fri May 31 15:14:44 2019 -0700 + + [subset] Correct calculation of max offset; fixes bug where loca would erroneously be short + + src/hb-ot-glyf-table.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 2ad4ba7bc04fbbd886a2da6fbc55a4e13468d878 +Author: Behdad Esfahbod +Date: Fri May 31 15:48:54 2019 -0700 + + [gsub] Minor + + src/hb-ot-layout-gsub-table.hh | 40 +++++++++++++++++++++------------------- + 1 file changed, 21 insertions(+), 19 deletions(-) + +commit 2dbdec66a17af94fffc50949e4712465aada9a68 +Author: Behdad Esfahbod +Date: Fri May 31 15:38:11 2019 -0700 + + [gsub] Porting serialize to iterators + + src/hb-ot-layout-gsub-table.hh | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +commit 1834cf86d40abfbb536db1edb366c90318ba49fc +Author: Behdad Esfahbod +Date: Fri May 31 14:39:32 2019 -0700 + + [serialize] Pass offset to serialize_subset() + + src/hb-open-type.hh | 14 +++++++++----- + src/hb-ot-layout-common.hh | 4 ++-- + src/hb-ot-layout-gdef-table.hh | 12 ++++++------ + src/hb-ot-layout-gsubgpos.hh | 7 ++++--- + 4 files changed, 21 insertions(+), 16 deletions(-) + +commit 926044162472aeca8f5032b11b544d38be587110 +Author: Behdad Esfahbod +Date: Fri May 31 14:34:34 2019 -0700 + + [serialize] Pass offset to serialize_copy() + + src/hb-open-type.hh | 12 ++++++++---- + src/hb-ot-layout-common.hh | 4 ++-- + src/hb-ot-layout-gsubgpos.hh | 2 +- + src/hb-ot-name-table.hh | 2 +- + 4 files changed, 12 insertions(+), 8 deletions(-) + +commit 87dd4bff1c42f1845fb3d11477e5de210121d48e +Author: Behdad Esfahbod +Date: Thu May 30 11:26:17 2019 -0400 + + [math] Rename HB_MATH_GLYPH_PART_FLAG_EXTENDER + + To HB_OT_MATH_GLYPH_PART_FLAG_EXTENDER. Added a deprecated macro. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1734 + + src/hb-ot-deprecated.h | 4 ++++ + src/hb-ot-math-table.hh | 2 +- + src/hb-ot-math.h | 2 +- + test/api/test-ot-math.c | 16 ++++++++-------- + 4 files changed, 14 insertions(+), 10 deletions(-) + +commit 88f9dab366491af144da316384991e74af443226 +Author: Ebrahim Byagowi +Date: Wed May 29 01:55:31 2019 +0430 + + [ci] Clean up and add disabled bots of other msvc versions (#1733) + + appveyor.yml | 41 ++++++++++++++++++++++++++++++----------- + 1 file changed, 30 insertions(+), 11 deletions(-) + +commit da9d43171ba4ae0a78c92e9de83498fd2f513c8b +Author: Bruce Mitchener +Date: Tue May 28 21:50:17 2019 +0700 + + Fix some typos. + + docs/usermanual-clusters.xml | 4 ++-- + docs/usermanual-fonts-and-faces.xml | 2 +- + src/hb-ot-math.h | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 8a133718472d152fa1f69ec52862b019b71b371f +Author: Ebrahim Byagowi +Date: Tue May 28 13:54:45 2019 +0430 + + [test] minor, fix copyright + + nothing important, fixing a copy paste error inconsistency + + test/api/test-aat-layout.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 13316ac5d435f11c2c65fd2d762841a819afb639 +Author: Ebrahim Byagowi +Date: Tue May 28 13:48:39 2019 +0430 + + [test] minor style improve + + test/subset/run-tests.py | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +commit d64fb9db520d77eb7bb40ceda4e20be5e602bf91 +Author: David Corbett +Date: Sun May 26 11:05:54 2019 -0400 + + [use] Allow U+1A60 TAI THAM SIGN SAKOT after vowel + + src/gen-use-table.py | 7 +- + src/hb-ot-shape-complex-use-machine.hh | 609 +++++++++++---------- + src/hb-ot-shape-complex-use-machine.rl | 20 +- + src/hb-ot-shape-complex-use-table.cc | 4 +- + src/hb-ot-shape-complex-use.cc | 3 + + src/hb-ot-shape-complex-use.hh | 2 + + .../3cc01fede4debd4b7794ccb1b16cdb9987ea7571.ttf | Bin 0 -> 1144 bytes + .../fd565cabd5208d345d0ed4fda7ae742917d846a5.ttf | Bin 1056 -> 0 bytes + .../shaping/data/in-house/tests/use-syllable.tests | 5 +- + 9 files changed, 351 insertions(+), 299 deletions(-) + +commit 179570d4cae9aefcd91d540b8865a81d569b3358 +Author: Behdad Esfahbod +Date: Mon May 27 13:08:07 2019 -0400 + + [atomic] Fix warning, second time + + Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1554306 + + src/hb-atomic.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ad17a8bdd571c7b275f9735e3602a8068f12934f +Author: Behdad Esfahbod +Date: Sat May 25 16:33:21 2019 -0400 + + [ucd] Update for latest packTab + + src/gen-ucd-table.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 771712b3ca97035ba5690e65bd7e63a852286159 +Author: Behdad Esfahbod +Date: Sat May 25 15:58:45 2019 -0400 + + [ucd] Update for recent packTab + + No need for separate youseedy package. + + src/gen-ucd-table.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 52aa6c57c5a4b18807a1329549dface90b148f22 +Author: Ebrahim Byagowi +Date: Sat May 25 22:55:06 2019 +0430 + + [ci] minor + + .circleci/config.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9b75da4299adb5487519ddf96e99949b1dad2d5c +Author: Ebrahim Byagowi +Date: Sat May 25 22:46:10 2019 +0430 + + [ci] minor + + .circleci/config.yml | 2 ++ + 1 file changed, 2 insertions(+) + +commit 9158cab3f9f9e1a4941c1dbf0aa71455ceb00da6 +Author: Ebrahim Byagowi +Date: Sat May 25 22:33:02 2019 +0430 + + [ci] Store dist-win result instead + + .circleci/config.yml | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit 85b68a42af541bc91f2851389ac09b012a6d3aa1 +Author: Behdad Esfahbod +Date: Sat May 25 12:59:01 2019 -0400 + + [atomic] Fix warnings + + https://bugzilla.mozilla.org/show_bug.cgi?id=1554306 + + src/hb-atomic.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 941c1b6d711b8528d0f5faa5655b09ea74f7dfb4 +Author: Behdad Esfahbod +Date: Sat May 25 12:52:16 2019 -0400 + + [mingw] Update instructions + + https://github.com/harfbuzz/harfbuzz/issues/1728 + + RELEASING.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 210f93c143d0fa2a7b293a6ffd138b3e01cab7c0 +Author: Behdad Esfahbod +Date: Sat May 25 12:49:20 2019 -0400 + + [mutex] Prefer pthread over windows + + https://github.com/harfbuzz/harfbuzz/issues/1728 + + src/hb-mutex.hh | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit a5d1b0bdaa0183e2bd310640f5867426096e0b18 +Author: Behdad Esfahbod +Date: Sat May 25 12:45:40 2019 -0400 + + Look for pthread even if win32 + + https://github.com/harfbuzz/harfbuzz/issues/1728 + + configure.ac | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit f3b132187fc734cbb3705b405361c8bad9a72582 +Author: Behdad Esfahbod +Date: Sat May 25 12:42:38 2019 -0400 + + [mingw] Some more tweaks + + It now survives ./config.status --recheck as well. + + https://github.com/harfbuzz/harfbuzz/issues/1728 + + mingw-configure.sh | 37 ++++++++++++++++++------------------- + mingw32.sh | 2 +- + mingw64.sh | 2 +- + 3 files changed, 20 insertions(+), 21 deletions(-) + +commit c41ed54b169c16fb9862e88ddf127ae68c1561e9 +Author: Behdad Esfahbod +Date: Sat May 25 12:35:09 2019 -0400 + + [mingw] Add "make dist-win" to toplevel Makefile + + Makefile.am | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +commit a0a75a7c701932f4533b104eeb3c6087d01aa2ae +Author: Behdad Esfahbod +Date: Sat May 25 12:16:28 2019 -0400 + + [mingw] More + + Makefile.am | 8 +++++++- + mingw-configure.sh | 29 +++++++++++++++++++++++++++++ + mingw32.sh | 25 ++----------------------- + mingw64.sh | 25 ++----------------------- + 4 files changed, 40 insertions(+), 47 deletions(-) + +commit 309a9d8ffb499f89738864acef596685ca495150 +Author: Ebrahim Byagowi +Date: Sat May 25 20:40:03 2019 +0430 + + [ci] Remove --without-icu now that we have it in ./mingw{32,64} scripts + + .circleci/config.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ccfe642c0cdc9fbc8280669e3e8b01dc5eb682d8 +Author: Behdad Esfahbod +Date: Sat May 25 12:08:05 2019 -0400 + + [mingw] Force off ICU + + If cross-compiled ICU is not available, we might end up finding the + native ICU via icu-config. That's distracting. + + mingw32.sh | 2 +- + mingw64.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 0e6b7f7cd51d7376f21a422881cb4eb542360b0b +Author: Ebrahim Byagowi +Date: Sat May 25 20:27:29 2019 +0430 + + [ci] Build mingw on Fedora and store .exe outputs + + .circleci/config.yml | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +commit 7b716cbbe6de2902ca6b1f67024b3f8cdb41340c +Author: Behdad Esfahbod +Date: Sat May 25 11:37:23 2019 -0400 + + [ming2] Update instructions + + Part of https://github.com/harfbuzz/harfbuzz/issues/1728 + + Only left to write how to create a win32 bundle. + + README.mingw.md | 44 ++++++++++++++++++++++++++------------------ + RELEASING.md | 54 ++++++------------------------------------------------ + 2 files changed, 32 insertions(+), 66 deletions(-) + +commit 77a1b6b7c3bd5490ffa5bb48a8b52d9c4c18e669 +Author: Behdad Esfahbod +Date: Sat May 25 11:18:40 2019 -0400 + + [mingw] Rename README.wine + + Makefile.am | 2 +- + README.wine.md => README.mingw.md | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit c68b4264880c0f99bcb579345e51ce54e799655b +Author: Behdad Esfahbod +Date: Sat May 25 11:17:56 2019 -0400 + + [mingw] Update for recent change + + README.wine.md | 2 +- + RELEASING.md | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 5cf2e648a67e1af20a23e010c86e8812a74ff7a4 +Author: Behdad Esfahbod +Date: Sat May 25 11:15:15 2019 -0400 + + [mingw] Update for Fedora mingw installation location + + Also adds --with-uniscribe by default. + + Part of https://github.com/harfbuzz/harfbuzz/issues/1728 + + mingw32.sh | 9 +++++---- + mingw64.sh | 9 +++++---- + 2 files changed, 10 insertions(+), 8 deletions(-) + +commit e7ed85de95d3ccdb674ec5a30ae66d53cea74b3a +Merge: f93a5e6a 97ba206b +Author: n8willis +Date: Sat May 25 16:05:07 2019 +0100 + + Merge pull request #1691 from n8willis/usermanual-shaping + + Usermanual: Add new chapters. + +commit 97ba206bed341dc7c915a86531512b1e0617303d +Author: Nathan Willis +Date: Sat May 25 12:26:50 2019 +0100 + + Usermanual; minor. + + ...usermanual-buffers-language-script-and-direction.xml | 2 +- + docs/usermanual-opentype-features.xml | 17 ++++++++++------- + 2 files changed, 11 insertions(+), 8 deletions(-) + +commit f93a5e6a7dad4fde2bf61c241bf32da678525c8b +Author: Behdad Esfahbod +Date: Fri May 24 17:02:38 2019 -0400 + + [win] Add mingw-ldd.py + + Part of https://github.com/harfbuzz/harfbuzz/issues/1728 + + mingw-ldd.py | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 58 insertions(+) + +commit 5fd3ece5237ac6a4ee95b2665b5e20102ed176bb +Author: Behdad Esfahbod +Date: Fri May 24 15:56:15 2019 -0400 + + 2.5.0 + + Makefile.am | 2 +- + NEWS | 14 ++++++++++++++ + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 4 files changed, 18 insertions(+), 4 deletions(-) + +commit 1da089179b9bd06f071f967d128819e85998b809 +Author: Behdad Esfahbod +Date: Fri May 24 15:41:34 2019 -0400 + + Put back Since: tags for hb_color_get_* + + src/hb-common.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit dd5ad6b6b5aed3db62bc03b89acf90c68795edb4 +Author: Nathan Willis +Date: Fri May 24 20:30:22 2019 +0100 + + Usermanual-buffers-chapter: trim out fallback-of-ufuncs talk and just mention that stuff exists if you care to go find it. + + docs/usermanual-buffers-language-script-and-direction.xml | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit e1a5ce6aa661251e998df7b3612a1d5d39e28827 +Author: Qunxin Liu +Date: Fri May 24 10:58:52 2019 -0700 + + Fix fuzzer crash testcase + + Add a check for stringOffSet(uint16) overflow, + return early if overflow happens + + src/hb-ot-name-table.hh | 2 +- + ...estcase-minimized-hb-subset-fuzzer-5077547978588160 | Bin 0 -> 339602 bytes + ...estcase-minimized-hb-subset-fuzzer-5761434614497280 | Bin 0 -> 532 bytes + 3 files changed, 1 insertion(+), 1 deletion(-) + +commit 240540ff9a463cf386ae5755471a5621b94290df +Author: Nathan Willis +Date: Fri May 24 20:13:35 2019 +0100 + + Usermanual-buffers-chapter: explain ICU fallback for Ufuncs. + + docs/usermanual-buffers-language-script-and-direction.xml | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit d100ccad02b038719472b2cc733940ffb0374cd1 +Author: David Corbett +Date: Sun May 19 10:01:20 2019 -0400 + + [use] Allow multiple FMs in a cluster + + src/gen-use-table.py | 12 +- + src/hb-ot-shape-complex-use-machine.hh | 567 ++++++++++++++++----------------- + src/hb-ot-shape-complex-use-machine.rl | 14 +- + src/hb-ot-shape-complex-use-table.cc | 38 ++- + src/hb-ot-shape-complex-use.hh | 11 +- + 5 files changed, 315 insertions(+), 327 deletions(-) + +commit 487879e013758aef2c7f824033a40cd56361d240 +Author: Behdad Esfahbod +Date: Fri May 24 12:37:53 2019 -0400 + + Don't compile in UCD if HB_NO_UCD defined + + src/hb-ucd.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 1fffe51a295b6106a442bed8107d305c325bef05 +Author: Behdad Esfahbod +Date: Fri May 24 10:52:09 2019 -0400 + + [blob] Shuffle + + src/hb-blob.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 96de94768b08287325be8947255917502368c337 +Merge: c96c6b28 1197bef2 +Author: rsheeter +Date: Fri May 24 11:22:41 2019 -0700 + + Merge pull request #1722 from googlefonts/glyf + + [subset] Use iterators in glyf/loca subsetting + +commit 1197bef26c63ee896bea3fab5788635cb0fc9d18 +Author: Rod Sheeter +Date: Fri May 24 10:52:49 2019 -0700 + + [subset] Per code review, use hb_array to avoid duplicated type name + + src/hb-ot-glyf-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e66253283385aa67eb9c5ab627139a56f9ae5a71 +Author: Rod Sheeter +Date: Fri May 24 10:39:56 2019 -0700 + + [subset] Cppcheck complaints + + test/api/hb-test.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 13b3cd307e7dedea3b419fb06d81a008e49ccff6 +Author: Rod Sheeter +Date: Fri May 24 10:10:12 2019 -0700 + + [subset] Address @behdad review feedback + + src/hb-ot-glyf-table.hh | 18 ++++++++---------- + 1 file changed, 8 insertions(+), 10 deletions(-) + +commit c96c6b287ff1d96da6a50a8cb3f641fe8705e5f7 +Author: Behdad Esfahbod +Date: Thu May 23 21:37:17 2019 -0400 + + One more + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b567d4ea14cc6ec0e8efc64a4993a9b0461adb20 +Author: Behdad Esfahbod +Date: Thu May 23 21:36:42 2019 -0400 + + Fix build after UCDN -> UCD + + CMakeLists.txt | 14 -------------- + configure.ac | 18 +----------------- + docs/usermanual-install-harfbuzz.xml | 34 ++++++++-------------------------- + 3 files changed, 9 insertions(+), 57 deletions(-) + +commit 226ab06ec110f4cbd56b39ce0d05d349dfec35b9 +Author: Behdad Esfahbod +Date: Thu May 23 20:39:04 2019 -0400 + + [ucd] Add URL to dependencies + + src/gen-ucd-table.py | 3 +++ + 1 file changed, 3 insertions(+) + +commit 65392b734e38668b870b1ffcbfb4b42ec289ef58 +Author: Behdad Esfahbod +Date: Wed May 22 16:21:21 2019 -0400 + + [ucdn] Replace UCDN with a new UCD implementation + + UCDN was ~120kb of data. New implementatoin is 69kb in default builds, + and 49kb if built with HB_OPTIMIZE_SIZE or __OPTIMIZE_SIZE__. The + latter automatically enabled if built with -Os or -Oz. + + There's room to shave off another 10kb or 20kb. That will follow later. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/Makefile.am | 11 - + src/Makefile.sources | 5 +- + src/gen-ucd-table.py | 11 +- + src/hb-algs.hh | 8 + + src/hb-ot-layout.cc | 76 +- + src/hb-ucd-table.hh | 5160 +++++++++++++++++++++++++++++++++++++ + src/hb-ucd.cc | 209 ++ + src/hb-ucdn.cc | 272 -- + src/hb-ucdn/COPYING | 13 - + src/hb-ucdn/Makefile.am | 16 - + src/hb-ucdn/Makefile.sources | 7 - + src/hb-ucdn/README | 40 - + src/hb-ucdn/ucdn.c | 361 --- + src/hb-ucdn/ucdn.h | 472 ---- + src/hb-ucdn/ucdn_db.h | 5790 ------------------------------------------ + src/hb-unicode.cc | 8 +- + 16 files changed, 5427 insertions(+), 7032 deletions(-) + +commit 12c59f6c40401c8221facc5d0aed63f510a77dd7 +Author: Behdad Esfahbod +Date: Thu May 23 13:33:21 2019 -0400 + + [deprecated] Minor + + src/hb-deprecated.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 36dee9221f8de3a2a6a23f0548460aab4982b594 +Author: Behdad Esfahbod +Date: Wed May 22 15:51:53 2019 -0400 + + [gen-ucd] Rename + + src/Makefile.am | 1 + + src/{gen-ucd.py => gen-ucd-table.py} | 0 + 2 files changed, 1 insertion(+) + +commit 831c213501fc38229755be7958b2952fe0cdff0e +Author: Behdad Esfahbod +Date: Wed May 22 15:46:19 2019 -0400 + + [gen-ucd] Minor + + src/gen-ucd.py | 30 +++++++++++++++++++++++++++--- + 1 file changed, 27 insertions(+), 3 deletions(-) + +commit 15a9e32b566fbf6f4a2c6fd488d8cc3865234b17 +Merge: 993d81b9 ff7fc6d4 +Author: Ebrahim Byagowi +Date: Thu May 23 11:02:15 2019 +0430 + + Merge pull request #1723 from googlefonts/drop_tables + + [subset] Add morx, mort, kern, and kernx to the default layout tables… + +commit ff7fc6d488f37e3faaca4986cde35836f013b03f +Author: Garret Rieger +Date: Wed May 22 17:36:16 2019 -0700 + + [subset] Add morx, mort, kern, and kernx to the default layout tables drop list. + + src/hb-subset-input.cc | 4 ++++ + src/hb-subset.cc | 4 ++++ + 2 files changed, 8 insertions(+) + +commit 993d81b9c57f2e27d80d276953b0430821129425 +Author: Qunxin Liu +Date: Tue May 14 13:55:11 2019 -0700 + + [subset] Add one ttf file with fvar/STAT tables to integration test + Ignore gvar/MVAR/HVAR table + add support for --nameIDs=* option + + src/hb-ot-cmap-table.hh | 27 +++++++++++++++++---- + src/hb-ot-stat-table.hh | 2 +- + src/hb-subset-input.cc | 1 + + src/hb-subset-plan.cc | 6 +---- + test/api/hb-subset-test.h | 2 +- + .../Comfortaa-Regular-new.default.61,62,63.ttf | Bin 0 -> 6492 bytes + .../basics/Comfortaa-Regular-new.default.61,63.ttf | Bin 0 -> 6316 bytes + .../basics/Comfortaa-Regular-new.default.61.ttf | Bin 0 -> 6148 bytes + .../basics/Comfortaa-Regular-new.default.62.ttf | Bin 0 -> 6088 bytes + .../basics/Comfortaa-Regular-new.default.63.ttf | Bin 0 -> 6068 bytes + ...Regular-new.drop-hints-retain-gids.61,62,63.ttf | Bin 0 -> 3284 bytes + ...aa-Regular-new.drop-hints-retain-gids.61,63.ttf | Bin 0 -> 3164 bytes + ...ortaa-Regular-new.drop-hints-retain-gids.61.ttf | Bin 0 -> 2868 bytes + ...ortaa-Regular-new.drop-hints-retain-gids.62.ttf | Bin 0 -> 3020 bytes + ...ortaa-Regular-new.drop-hints-retain-gids.63.ttf | Bin 0 -> 3024 bytes + .../Comfortaa-Regular-new.drop-hints.61,62,63.ttf | Bin 0 -> 1952 bytes + .../Comfortaa-Regular-new.drop-hints.61,63.ttf | Bin 0 -> 1832 bytes + .../basics/Comfortaa-Regular-new.drop-hints.61.ttf | Bin 0 -> 1704 bytes + .../basics/Comfortaa-Regular-new.drop-hints.62.ttf | Bin 0 -> 1688 bytes + .../basics/Comfortaa-Regular-new.drop-hints.63.ttf | Bin 0 -> 1688 bytes + .../Comfortaa-Regular-new.name-ids.61,62,63.ttf | Bin 0 -> 6236 bytes + .../Comfortaa-Regular-new.name-ids.61,63.ttf | Bin 0 -> 6060 bytes + .../basics/Comfortaa-Regular-new.name-ids.61.ttf | Bin 0 -> 5892 bytes + .../basics/Comfortaa-Regular-new.name-ids.62.ttf | Bin 0 -> 5832 bytes + .../basics/Comfortaa-Regular-new.name-ids.63.ttf | Bin 0 -> 5812 bytes + .../Comfortaa-Regular-new.retain-gids.61,62,63.ttf | Bin 0 -> 7824 bytes + .../Comfortaa-Regular-new.retain-gids.61,63.ttf | Bin 0 -> 7648 bytes + .../Comfortaa-Regular-new.retain-gids.61.ttf | Bin 0 -> 7312 bytes + .../Comfortaa-Regular-new.retain-gids.62.ttf | Bin 0 -> 7420 bytes + .../Comfortaa-Regular-new.retain-gids.63.ttf | Bin 0 -> 7404 bytes + ...eSansPro-Regular.default.1FC,21,41,20,62,63.otf | Bin 3784 -> 2384 bytes + .../SourceSansPro-Regular.default.61,62,63.otf | Bin 3496 -> 2096 bytes + ...ourceSansPro-Regular.default.D7,D8,D9,DA,DE.otf | Bin 3612 -> 2212 bytes + ...subroutinize-retain-gids.1FC,21,41,20,62,63.otf | Bin 33516 -> 32124 bytes + ...Regular.desubroutinize-retain-gids.61,62,63.otf | Bin 31080 -> 29688 bytes + ...r.desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf | Bin 34708 -> 33316 bytes + ...o-Regular.desubroutinize.1FC,21,41,20,62,63.otf | Bin 3640 -> 2240 bytes + ...urceSansPro-Regular.desubroutinize.61,62,63.otf | Bin 3400 -> 2000 bytes + ...nsPro-Regular.desubroutinize.D7,D8,D9,DA,DE.otf | Bin 3596 -> 2196 bytes + ...subroutinize-retain-gids.1FC,21,41,20,62,63.otf | Bin 33352 -> 31960 bytes + ...p-hints-desubroutinize-retain-gids.61,62,63.otf | Bin 30956 -> 29564 bytes + ...s-desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf | Bin 34560 -> 33168 bytes + ...rop-hints-desubroutinize.1FC,21,41,20,62,63.otf | Bin 3480 -> 2080 bytes + ...-Regular.drop-hints-desubroutinize.61,62,63.otf | Bin 3288 -> 1876 bytes + ...ar.drop-hints-desubroutinize.D7,D8,D9,DA,DE.otf | Bin 3448 -> 2048 bytes + ...r.drop-hints-retain-gids.1FC,21,41,20,62,63.otf | Bin 33448 -> 32052 bytes + ...Pro-Regular.drop-hints-retain-gids.61,62,63.otf | Bin 31028 -> 29632 bytes + ...gular.drop-hints-retain-gids.D7,D8,D9,DA,DE.otf | Bin 34576 -> 33180 bytes + ...nsPro-Regular.drop-hints.1FC,21,41,20,62,63.otf | Bin 3564 -> 2164 bytes + .../SourceSansPro-Regular.drop-hints.61,62,63.otf | Bin 3340 -> 1940 bytes + ...ceSansPro-Regular.drop-hints.D7,D8,D9,DA,DE.otf | Bin 3464 -> 2064 bytes + ...sPro-Regular.retain-gids.1FC,21,41,20,62,63.otf | Bin 33668 -> 32276 bytes + .../SourceSansPro-Regular.retain-gids.61,62,63.otf | Bin 31180 -> 29788 bytes + ...eSansPro-Regular.retain-gids.D7,D8,D9,DA,DE.otf | Bin 34724 -> 33332 bytes + .../Roboto-Regular.default.1FC,21,41,20,62,63.ttf | Bin 3772 -> 3164 bytes + .../full-font/Roboto-Regular.default.61,62,63.ttf | Bin 3368 -> 2760 bytes + .../Roboto-Regular.default.D7,D8,D9,DA,DE.ttf | Bin 3732 -> 3124 bytes + ...oboto-Regular.drop-hints.1FC,21,41,20,62,63.ttf | Bin 2224 -> 1616 bytes + .../Roboto-Regular.drop-hints.61,62,63.ttf | Bin 2016 -> 1408 bytes + .../Roboto-Regular.drop-hints.D7,D8,D9,DA,DE.ttf | Bin 2252 -> 1644 bytes + ...gular.default.3042,3044,3046,3048,304A,304B.ttf | Bin 3112 -> 2684 bytes + ...gular.default.3042,3044,3046,73E0,5EA6,8F38.ttf | Bin 3356 -> 2928 bytes + .../Mplus1p-Regular.default.61,63,65,6B.ttf | Bin 2656 -> 2228 bytes + ...gular.default.660E,6975,73E0,5EA6,8F38,6E05.ttf | Bin 3652 -> 3224 bytes + .../japanese/Mplus1p-Regular.default.660E.ttf | Bin 2396 -> 1968 bytes + ...ar.drop-hints.3042,3044,3046,3048,304A,304B.ttf | Bin 2384 -> 1956 bytes + ...ar.drop-hints.3042,3044,3046,73E0,5EA6,8F38.ttf | Bin 2628 -> 2200 bytes + .../Mplus1p-Regular.drop-hints.61,63,65,6B.ttf | Bin 1928 -> 1500 bytes + ...ar.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.ttf | Bin 2924 -> 2496 bytes + .../japanese/Mplus1p-Regular.drop-hints.660E.ttf | Bin 1668 -> 1240 bytes + test/subset/data/fonts/Comfortaa-Regular-new.ttf | Bin 0 -> 230316 bytes + test/subset/data/tests/basics.tests | 1 + + test/subset/generate-expected-outputs.py | 3 +-- + test/subset/run-tests.py | 3 ++- + util/options-subset.cc | 23 +++++++++++++++--- + 75 files changed, 50 insertions(+), 18 deletions(-) + +commit 58ce477ac170969430310750b78dcb5f9e3b06a3 +Author: Rod Sheeter +Date: Tue May 21 20:22:40 2019 -0700 + + [subset] Report failure more often + + src/hb-ot-glyf-table.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 51a0129f7322e97825455df4eb6eecfea14980f5 +Author: Rod Sheeter +Date: Tue May 21 20:12:19 2019 -0700 + + [subset] Thar be comparison of integers of different signs + + test/api/hb-test.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 14e3b0cf41d9657c39f1f921f7e09a1418fa3278 +Author: Rod Sheeter +Date: Tue May 21 20:09:36 2019 -0700 + + [subset] Code review feedback + + src/hb-ot-glyf-table.hh | 53 +++++++++++++++++++++++++------------------------ + 1 file changed, 27 insertions(+), 26 deletions(-) + +commit a03ed95e7d50b9dd947e8982c7730de969795b05 +Author: Behdad Esfahbod +Date: Tue May 21 16:43:14 2019 -0400 + + [gen-ucd] Generate decomposition tables + + Code is ugly. Ugh. + + src/gen-ucd.py | 40 ++++++++++++++++++++-------------------- + 1 file changed, 20 insertions(+), 20 deletions(-) + +commit 8a48c88fa9fe047a83ba4a45dbd6399412ca3302 +Author: Behdad Esfahbod +Date: Tue May 21 13:02:54 2019 -0400 + + [gen-ucd] Comment + + src/gen-ucd.py | 4 ++++ + 1 file changed, 4 insertions(+) + +commit b71d353cee89a6654810f75e7a1d7fd156b76faa +Author: Behdad Esfahbod +Date: Mon May 20 17:33:55 2019 -0400 + + [gen-ucd] Remove some code + + src/gen-ucd.py | 7 ------- + 1 file changed, 7 deletions(-) + +commit 4ea44112b5163591ce0b086e0d13ec368f4f6ddc +Author: Rod Sheeter +Date: Tue May 21 13:07:43 2019 -0700 + + [subset] Remove missed reference to hb-subset-glyf, was deleted + + src/Makefile.sources | 1 - + 1 file changed, 1 deletion(-) + +commit b928de91a755788fd0fad9fa0f5f03c5670ac6a3 +Author: Garret Rieger +Date: Tue May 21 11:23:26 2019 -0700 + + [subset] Add test/subset/data/expected/layout to dist list. + + test/subset/data/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 0af9de13b78ddd35f58ee02ce8ffeffd99509ec5 +Author: Garret Rieger +Date: Mon May 20 15:04:20 2019 -0700 + + [subset] For gsub subsetting only consider glyphs reachable via gsub closure. + + src/hb-ot-layout-gsub-table.hh | 4 +-- + src/hb-subset-plan.cc | 55 ++++++++++++++++++++---------------------- + src/hb-subset-plan.hh | 10 ++++++++ + 3 files changed, 38 insertions(+), 31 deletions(-) + +commit c740c8636b48b1790bba42445a301e8e1cf8f749 +Author: Garret Rieger +Date: Thu May 16 10:57:33 2019 -0700 + + [subset] Add integration tests for SingleSubst. + + test/subset/data/Makefile.sources | 1 + + ...ular.smallcaps.keep-layout-retain-gids.41,42,43.ttf | Bin 0 -> 6780 bytes + ...Regular.smallcaps.keep-layout-retain-gids.41,43.ttf | Bin 0 -> 6396 bytes + ...to-Regular.smallcaps.keep-layout-retain-gids.41.ttf | Bin 0 -> 6032 bytes + ...to-Regular.smallcaps.keep-layout-retain-gids.43.ttf | Bin 0 -> 6088 bytes + ...Regular.smallcaps.keep-layout-retain-gids.CA,CB.ttf | Bin 0 -> 7932 bytes + .../Roboto-Regular.smallcaps.keep-layout.41,42,43.ttf | Bin 0 -> 2972 bytes + .../Roboto-Regular.smallcaps.keep-layout.41,43.ttf | Bin 0 -> 2572 bytes + .../layout/Roboto-Regular.smallcaps.keep-layout.41.ttf | Bin 0 -> 2196 bytes + .../layout/Roboto-Regular.smallcaps.keep-layout.43.ttf | Bin 0 -> 2268 bytes + .../Roboto-Regular.smallcaps.keep-layout.CA,CB.ttf | Bin 0 -> 2612 bytes + test/subset/data/fonts/Roboto-Regular.smallcaps.ttf | Bin 0 -> 131632 bytes + test/subset/data/profiles/keep-layout-retain-gids.txt | 2 ++ + test/subset/data/profiles/keep-layout.txt | 1 + + test/subset/data/tests/full-font.tests | 1 - + test/subset/data/tests/layout.tests | 13 +++++++++++++ + test/subset/generate-expected-outputs.py | 3 ++- + 17 files changed, 19 insertions(+), 2 deletions(-) + +commit 349d692b0ee45330220fd3ec9267979d73acd149 +Author: Rod Sheeter +Date: Tue May 21 12:38:53 2019 -0700 + + [subset] Iter in and out for loca + + src/hb-ot-glyf-table.hh | 31 ++++++++++++++++--------------- + test/api/hb-test.h | 7 ++----- + 2 files changed, 18 insertions(+), 20 deletions(-) + +commit 95445d79be0a79e6e2d384d46819730146d397d8 +Author: Rod Sheeter +Date: Tue May 21 11:14:31 2019 -0700 + + [subset] Write loca using more idiomatic harfbuzzese + + src/hb-ot-glyf-table.hh | 35 +++++++++++++++++++---------------- + 1 file changed, 19 insertions(+), 16 deletions(-) + +commit d1b12a546561a78ae3c3e9d6bffa057caf82dbee +Merge: 3a43603e f49a5bec +Author: Rod Sheeter +Date: Mon May 20 21:29:54 2019 -0700 + + Merge branch 'master' of https://github.com/harfbuzz/harfbuzz into glyf + +commit 3a43603ecea2c349f58396e103a52948776681e0 +Author: Rod Sheeter +Date: Mon May 20 20:40:55 2019 -0700 + + [subset] Fix memory leak caused by failure to cleanup glyf accelerator + + src/hb-ot-glyf-table.hh | 42 ++++++++++++++++++++++++++---------------- + 1 file changed, 26 insertions(+), 16 deletions(-) + +commit 5cedda5e4a3f726168b87d357aee723e6fd919cd +Author: Rod Sheeter +Date: Thu May 16 19:16:52 2019 -0700 + + [subset] Fix null pointer deref, tidy up a bit + + src/hb-ot-glyf-table.hh | 282 +++++++++++++++++++++++++------------------- + test/api/test-subset-glyf.c | 18 +-- + 2 files changed, 167 insertions(+), 133 deletions(-) + +commit 8a84b540c7b850c1fb30d5bc1ffdeb43033be173 +Author: Rod Sheeter +Date: Thu May 16 19:14:16 2019 -0700 + + [subset] Tests passing using iterator based glyf + + src/hb-ot-glyf-table.hh | 117 +++++++++++++++++++++++++++++++------------- + test/api/test-subset-glyf.c | 4 +- + 2 files changed, 86 insertions(+), 35 deletions(-) + +commit 82bbec306376d61b6700461c4038c6789e60a998 +Merge: 9d09ac13 b7be5931 +Author: Rod Sheeter +Date: Thu May 16 15:14:01 2019 -0700 + + Merge branch 'master' of https://github.com/harfbuzz/harfbuzz into glyf + +commit 9d09ac13a114967576284d0b006a0ac7965d928a +Author: rsheeter +Date: Sat May 11 23:16:40 2019 -0700 + + [subset] Tweak hint stripping + + src/hb-ot-glyf-table.hh | 46 +++++++++++++++++++++++++++++++++------------- + 1 file changed, 33 insertions(+), 13 deletions(-) + +commit 3a4c928fcfce5a8c7a56907b9945e87b0ce8e327 +Author: rsheeter +Date: Sat May 11 22:06:46 2019 -0700 + + [subset] Fix glyf tests except hint stripping & local test asan + + src/hb-ot-glyf-table.hh | 93 +++++++++++++++++++++++++++++++++------------ + test/api/hb-subset-test.h | 2 +- + test/api/hb-test.h | 13 +++++++ + test/api/test-subset-glyf.c | 8 ++-- + 4 files changed, 86 insertions(+), 30 deletions(-) + +commit b77dde8f138442935e5ca99460a520a4117d6dd2 +Author: Rod Sheeter +Date: Fri May 10 16:52:19 2019 -0700 + + [subset] Destroy blob + + src/hb-ot-glyf-table.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 14db6512f8dca80a575f468708949346b005834a +Author: Rod Sheeter +Date: Fri May 10 09:32:43 2019 -0700 + + [subset] Correct flipped use short computation + + src/hb-ot-glyf-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ab3fe5de2bbe10fdc13711537f824b62d091f995 +Author: Rod Sheeter +Date: Thu May 9 22:12:20 2019 -0700 + + [subset] Glyf by iter now runs but fails tests + + src/hb-ot-glyf-table.hh | 88 +++++++++++++++++++++++++++++++++---------------- + 1 file changed, 59 insertions(+), 29 deletions(-) + +commit f8de063b48c243d551c8892bdd2a799606fda3f4 +Merge: 0d7fef2d 8f174870 +Author: Rod Sheeter +Date: Thu May 9 20:02:38 2019 -0700 + + Merge branch 'glyf' of github.com:googlefonts/harfbuzz into glyf + +commit 0d7fef2d50bba714815c0c13f3b3dd6464710a1d +Author: rsheeter +Date: Wed May 8 16:52:00 2019 -0700 + + [subset] Dinner time, checkpoint + + src/hb-ot-glyf-table.hh | 97 +++++++++++++++++++++++++++++-------------------- + 1 file changed, 58 insertions(+), 39 deletions(-) + +commit 240bc86e3a0b177ee84ec9c60723304a0cf4c405 +Author: rsheeter +Date: Wed May 8 14:59:03 2019 -0700 + + [subset] Remove subset-glyf; want everything to point to new iter-based edition. Some of the code will resurface as impl builds out. + + src/Makefile.sources | 2 - + src/hb-ot-glyf-table.hh | 9 +- + src/hb-subset-glyf.cc | 346 ------------------------------------------------ + src/hb-subset-glyf.hh | 40 ------ + src/hb-subset.cc | 1 - + 5 files changed, 6 insertions(+), 392 deletions(-) + +commit 02d4d4f3e67dcc37915bc386d506bb272455ff1e +Author: rsheeter +Date: Wed May 8 14:43:18 2019 -0700 + + [subset] Starting to sketch glyf as iter + + src/hb-ot-glyf-table.hh | 60 ++++++++++++++++++++++++++++++++++++------------- + src/hb-subset-plan.hh | 2 ++ + src/hb-subset.cc | 2 +- + 3 files changed, 47 insertions(+), 17 deletions(-) + +commit 8f174870e9eed4c47463fdb0d4fe3e22a6f5fdc8 +Author: rsheeter +Date: Wed May 8 16:52:00 2019 -0700 + + [subset] Dinner time, checkpoint + + src/hb-ot-glyf-table.hh | 97 +++++++++++++++++++++++++++++-------------------- + 1 file changed, 58 insertions(+), 39 deletions(-) + +commit 723d054dcb6ad44e9eab4dc8cc55f8d480d2ff16 +Merge: ed727d4b e2a51ff7 +Author: rsheeter +Date: Wed May 8 16:45:35 2019 -0700 + + Merge branch 'master' of https://github.com/harfbuzz/harfbuzz into glyf + +commit ed727d4bb74860c126675e94f87f65ff7874dbb6 +Merge: fb9bff95 e8b45c19 +Author: rsheeter +Date: Wed May 8 16:39:45 2019 -0700 + + Merge branch 'master' of https://github.com/harfbuzz/harfbuzz into glyf + +commit fb9bff955a9356b053c5c9bcd7aa9101edb55767 +Author: rsheeter +Date: Wed May 8 14:59:03 2019 -0700 + + [subset] Remove subset-glyf; want everything to point to new iter-based edition. Some of the code will resurface as impl builds out. + + src/Makefile.sources | 2 - + src/hb-ot-glyf-table.hh | 9 +- + src/hb-subset-glyf.cc | 346 ------------------------------------------------ + src/hb-subset-glyf.hh | 40 ------ + src/hb-subset.cc | 1 - + 5 files changed, 6 insertions(+), 392 deletions(-) + +commit f9b089b695edc89023e3d62700ae68d5648f8494 +Author: rsheeter +Date: Wed May 8 14:43:18 2019 -0700 + + [subset] Starting to sketch glyf as iter + + src/hb-ot-glyf-table.hh | 60 ++++++++++++++++++++++++++++++++++++------------- + src/hb-subset-plan.hh | 2 ++ + src/hb-subset.cc | 2 +- + 3 files changed, 47 insertions(+), 17 deletions(-) + +commit f49a5bec9fc241c098be5a49233aa83cd5dc098e +Author: rsheeter +Date: Mon May 20 20:45:11 2019 -0700 + + [docs] Tweak fuzzer doc + + TESTING.md | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 1aadd1449c65c50d5f35191f43136841c64ad399 +Author: Behdad Esfahbod +Date: Mon May 20 17:29:13 2019 -0400 + + [gen-ucd] Generate script order table + + src/gen-ucd.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit be8de188671c04ddd8ec4d7af38b313322189136 +Author: Behdad Esfahbod +Date: Mon May 20 17:17:38 2019 -0400 + + [gen-ucd] Start adding script-order + + src/gen-ucd.py | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +commit 4a0eb066fdceb0cab48107f17670d6943ec0d61e +Author: Behdad Esfahbod +Date: Mon May 20 16:57:04 2019 -0400 + + [gen-ucd] Add gc order + + src/gen-ucd.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit d1f9b2f961c71e5218ee359e8fb20cfbdb894c7e +Author: Behdad Esfahbod +Date: Mon May 20 15:47:49 2019 -0400 + + [gen-ucd] Flesh out a bit more + + src/gen-ucd.py | 52 ++++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 40 insertions(+), 12 deletions(-) + +commit d6de4659aa7edb991507f8838dc566874e5b6a61 +Author: Behdad Esfahbod +Date: Mon May 20 15:33:23 2019 -0400 + + Add HB_OPTIMIZE_SIZE + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 0ff3618c2d841d16cce9ba2d73321048e7ca6a2d +Author: Garret Rieger +Date: Fri May 17 15:30:01 2019 -0700 + + [subset] Use hb_subset_input_t inside of subset_options_t so that input defaults are shared between the library and cli. + + src/hb-subset-input.cc | 42 ++++++++----- + src/hb-subset-input.hh | 7 +-- + src/hb-subset-plan.cc | 3 +- + src/hb-subset-plan.hh | 1 - + src/hb-subset.cc | 23 +------ + src/hb-subset.h | 6 -- + test/api/test-subset-glyf.c | 8 ++- + test/fuzzing/hb-subset-fuzzer.cc | 8 ++- + util/Makefile.am | 5 +- + util/Makefile.sources | 1 + + util/hb-subset.cc | 9 +-- + util/options-subset.cc | 127 +++++++++++++++++++++++++++++++++++++++ + util/options.cc | 101 ------------------------------- + util/options.hh | 20 ++---- + 14 files changed, 182 insertions(+), 179 deletions(-) + +commit 67064294a0c521550f5277b51b8c7e5d6bb27e68 +Author: Garret Rieger +Date: Thu May 16 15:13:39 2019 -0700 + + [subset] Add drop-tables option to hb-subset util. + + util/hb-subset.cc | 1 + + util/options.cc | 45 ++++++++++++++++++++++++++++++++++++++++++--- + util/options.hh | 3 +++ + 3 files changed, 46 insertions(+), 3 deletions(-) + +commit 3be0ffe45d1ba32ddd8d3af25ff2c420be85da76 +Author: Garret Rieger +Date: Thu May 16 11:29:15 2019 -0700 + + [subset] Add drop tables to subset input. + + src/hb-subset-input.cc | 8 +++++ + src/hb-subset-input.hh | 1 + + src/hb-subset-plan.cc | 3 ++ + src/hb-subset-plan.hh | 5 ++- + src/hb-subset.cc | 3 ++ + src/hb-subset.h | 3 ++ + test/api/Makefile.am | 2 ++ + test/api/test-subset-drop-tables.c | 71 ++++++++++++++++++++++++++++++++++++++ + 8 files changed, 95 insertions(+), 1 deletion(-) + +commit 0ca7ad4352eff357cbb5cc1dfe62aa15b440de84 +Author: Behdad Esfahbod +Date: Mon May 20 11:39:07 2019 -0400 + + [cff] Fix unlikely invocations + + src/hb-ot-cff-common.hh | 8 ++++---- + src/hb-ot-cff1-table.hh | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 9ef241cd409b7ad4eeb8259cbf1a7a01358a766e +Author: Behdad Esfahbod +Date: Mon May 20 11:38:02 2019 -0400 + + [test] Add one more + + ...-testcase-minimized-hb-subset-fuzzer-5634197349203968 | Bin 0 -> 5791 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 3efb7af7e28061f8cd138eb2ed5261bf521abc63 +Author: Behdad Esfahbod +Date: Mon May 20 11:37:16 2019 -0400 + + [STAT] Fix sanitize condition + + Oops! + + Fixes https://oss-fuzz.com/testcase-detail/5696825891225600 + + src/hb-ot-stat-table.hh | 2 +- + ...zz-testcase-minimized-hb-subset-fuzzer-5696825891225600 | Bin 0 -> 69 bytes + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit e66eb21a46b2374bfb51f86ed9f5eec35ba87a61 +Author: Ebrahim Byagowi +Date: Sat May 18 07:44:48 2019 -0700 + + Don't set _POSIX_C_SOURCE in NetBSD + + According to a harfbuzz package patch on NetBSD project + https://github.com/NetBSD/pkgsrc/blob/trunk/fonts/harfbuzz/patches/patch-src_hb-blob.cc + + src/hb-blob.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 08c3648c6e18a0969a64284337dbd5b435d40f37 +Author: Behdad Esfahbod +Date: Fri May 17 16:21:34 2019 -0700 + + Oops, fix include + + src/hb-set.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 24958b8868a8003936e872d8fda873c52d528bcf +Author: Behdad Esfahbod +Date: Fri May 17 16:20:36 2019 -0700 + + [set] Use StructAtOffsetUnaligned + + src/hb-set.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a0febbac439ac4cc58af674f676e473d2f6d726f +Author: rsheeter +Date: Thu May 16 15:58:49 2019 -0700 + + Update TESTING.md + + TESTING.md | 5 +++++ + 1 file changed, 5 insertions(+) + +commit b7be59311f27112791e9b9c6356464e1c3ff92c1 +Author: Behdad Esfahbod +Date: Thu May 16 13:32:56 2019 -0700 + + Fix msan issue + + The fact that HB_AUTO_RETURN will return rvalue-references for rvalues + is very disturbing. + + Even apart from that, I'm totally lost re any hb_move needs or + hb_forward'ing to functions/templates where the type is fixed by + explicitly specifying template parameters. + + ==1==ERROR: AddressSanitizer: stack-use-after-return on address 0x7f6ad65e51e0 at pc 0x0000005da240 bp 0x7ffc104ab670 sp 0x7ffc104ab668 + READ of size 4 at 0x7f6ad65e51e0 thread T0 + SCARINESS: 55 (4-byte-read-stack-use-after-return) + #0 0x5da23f in bool OT::Coverage::serialize, OT::SingleSubstFormat1::subset(hb_subset_context_t*) const::'lambda'(unsigned int), (hb_function_sortedness_t)1, (void*)0>, $_20&, (hb_function_sortedness_t)1, (void*)0>, (void*)0>(hb_serialize_context_t*, hb_map_iter_t, OT::SingleSubstFormat1::subset(hb_subset_context_t*) const::'lambda'(unsigned int), (hb_function_sortedness_t)1, (void*)0>, $_20&, (hb_function_sortedness_t)1, (void*)0>) harfbuzz/src/hb-ot-layout-common.hh:1055:16 + #1 0x5d88f9 in bool OT::SingleSubstFormat1::serialize, OT::SingleSubstFormat1::subset(hb_subset_context_t*) const::'lambda'(unsigned int), (hb_function_sortedness_t)1, (void*)0>, $_20&, (hb_function_sortedness_t)1, (void*)0>, (void*)0>(hb_serialize_context_t*, hb_map_iter_t, OT::SingleSubstFormat1::subset(hb_subset_context_t*) const::'lambda'(unsigned int), (hb_function_sortedness_t)1, (void*)0>, $_20&, (hb_function_sortedness_t)1, (void*)0>, unsigned int) harfbuzz/src/hb-ot-layout-gsub-table.hh:98:9 + + src/hb-algs.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit bcd3ffc948f63f59a709923a3ba6dc9d591aae6b +Author: Behdad Esfahbod +Date: Thu May 16 13:22:09 2019 -0700 + + Whitespace + + src/hb-ot-layout-gsub-table.hh | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit 05bc5f96fb0818531404174b71c6ff497d5e2738 +Author: Behdad Esfahbod +Date: Thu May 16 13:05:58 2019 -0700 + + [subset] Remove extra iteration + + src/hb-ot-layout-gsub-table.hh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 6555f209586886a4b2562412363cf152d7837d5c +Author: Garret Rieger +Date: Wed May 15 09:42:38 2019 -0700 + + [subset] Truncate empty gids at the end in retain-gids mode. + + src/hb-subset-plan.cc | 8 ++++--- + test/api/fonts/Roboto-Regular.a.retaingids.ttf | Bin 0 -> 2068 bytes + .../SourceHanSans-Regular.41,4C2E.retaingids.otf | Bin 2736 -> 2656 bytes + test/api/test-subset-glyf.c | 25 +++++++++++++++++++++ + ...oboto-Regular.abc.drop-hints-retain-gids.61.ttf | Bin 744 -> 732 bytes + ...oboto-Regular.abc.drop-hints-retain-gids.62.ttf | Bin 712 -> 704 bytes + .../basics/Roboto-Regular.abc.retain-gids.61.ttf | Bin 1808 -> 1792 bytes + .../basics/Roboto-Regular.abc.retain-gids.62.ttf | Bin 1756 -> 1748 bytes + 8 files changed, 30 insertions(+), 3 deletions(-) + +commit 2376867649f97d25e4319f45845525ec207887f7 +Author: Behdad Esfahbod +Date: Wed May 15 21:57:26 2019 -0700 + + Use hb_map(hb_add(this)) to dereference OffsetTo<>'s + + src/hb-ot-layout-gsub-table.hh | 30 ++++++++++++++------- + src/hb-ot-layout-gsubgpos.hh | 60 ++++++++++++++++++++++++++++-------------- + src/hb-ot-stat-table.hh | 2 +- + 3 files changed, 61 insertions(+), 31 deletions(-) + +commit 6f51e5552477125480f764a6af763dad9f8e3e1b +Author: Behdad Esfahbod +Date: Wed May 15 21:41:12 2019 -0700 + + [algs] Rename hb_bind to hb_partial + + Since our API is the invers of what std::bind is, and closer to Python + functools.partial(). + + src/hb-algs.hh | 12 ++++++------ + src/test-algs.cc | 6 +++--- + 2 files changed, 9 insertions(+), 9 deletions(-) + +commit 0888e7bc86454020db45f78ee1136d6f3a1b9527 +Author: Behdad Esfahbod +Date: Wed May 15 21:36:42 2019 -0700 + + [algs] Change hb_bind parameter number to be from one + + To match std:;bind, even though our interfaces are very different. + + src/hb-algs.hh | 24 +++++++++++++----------- + src/test-algs.cc | 6 +++--- + 2 files changed, 16 insertions(+), 14 deletions(-) + +commit dfa5e4297147b52f0ed2f569c9b90a0c68c003c4 +Author: Behdad Esfahbod +Date: Wed May 15 21:18:14 2019 -0700 + + Add back symmetric OffsetTo<>::friend operator+ + + Finally seems to be working now. + + src/hb-open-type.hh | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit a06a236891611da9db601ddbc2b1513380ad12e6 +Author: Behdad Esfahbod +Date: Wed May 15 21:12:22 2019 -0700 + + [algs] Partialize all operators + + src/hb-algs.hh | 66 +++++++++++++++++++++++++++++++++++--------------------- + src/test-algs.cc | 4 ++-- + 2 files changed, 44 insertions(+), 26 deletions(-) + +commit edc69ec935511d1993240fb68b54b2cfd6afa888 +Author: Behdad Esfahbod +Date: Wed May 15 21:09:56 2019 -0700 + + [algs] Rewrite bind API + + And add a partialization API use example to hb_add() + + src/hb-algs.hh | 45 ++++++++++++++++++++------------------------- + src/test-algs.cc | 9 ++++++--- + 2 files changed, 26 insertions(+), 28 deletions(-) + +commit 16a3540ea4257a19b9bfd9d5300a280e18b423a1 +Author: Behdad Esfahbod +Date: Wed May 15 20:48:20 2019 -0700 + + [algs] Add hb_bind0 and hb_bind1 + + src/hb-algs.hh | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/test-algs.cc | 7 +++++++ + 2 files changed, 61 insertions(+) + +commit d214b07883a626f3ecebb027797e8bb994e174a4 +Author: Behdad Esfahbod +Date: Wed May 15 19:07:39 2019 -0700 + + Fix clang build + + Ugh. + + In file included from hb-ot-face.cc:41: + ./hb-ot-layout-gsub-table.hh:293:7: error: template parameter redefines default argument + hb_requires (hb_is_sorted_source_of (Iterator, + ^ + ./hb-meta.hh:59:27: note: expanded from macro 'hb_requires' + define hb_requires(Cond) hb_enable_if((Cond)) + ^ + ./hb-meta.hh:57:67: note: expanded from macro 'hb_enable_if' + define hb_enable_if(Cond) typename hb_enable_if<(Cond)>::type* = nullptr + ^ + ./hb-ot-layout-gsub-table.hh:40:5: note: previous default template argument defined here + hb_requires (hb_is_sorted_source_of (Iterator, + ^ + ./hb-meta.hh:59:27: note: expanded from macro 'hb_requires' + define hb_requires(Cond) hb_enable_if((Cond)) + ^ + ./hb-meta.hh:57:67: note: expanded from macro 'hb_enable_if' + define hb_enable_if(Cond) typename hb_enable_if<(Cond)>::type* = nullptr + ^ + + src/hb-ot-layout-gsub-table.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 371b55c7a0c718fcaca0330edfeacf610797cf7a +Author: Behdad Esfahbod +Date: Wed May 15 18:54:07 2019 -0700 + + Fix clang build + + In file included from hb-ot-face.cc:41: + ./hb-ot-layout-gsub-table.hh:293:7: error: template parameter redefines default argument + hb_requires (hb_is_sorted_source_of (Iterator, + ^ + ./hb-meta.hh:59:27: note: expanded from macro 'hb_requires' + define hb_requires(Cond) hb_enable_if((Cond)) + ^ + ./hb-meta.hh:57:67: note: expanded from macro 'hb_enable_if' + define hb_enable_if(Cond) typename hb_enable_if<(Cond)>::type* = nullptr + ^ + ./hb-ot-layout-gsub-table.hh:40:5: note: previous default template argument defined here + hb_requires (hb_is_sorted_source_of (Iterator, + ^ + ./hb-meta.hh:59:27: note: expanded from macro 'hb_requires' + define hb_requires(Cond) hb_enable_if((Cond)) + ^ + ./hb-meta.hh:57:67: note: expanded from macro 'hb_enable_if' + define hb_enable_if(Cond) typename hb_enable_if<(Cond)>::type* = nullptr + ^ + 1 error generated. + + src/hb-ot-layout-gsub-table.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 243a5a6af2565937705d6bc20e65a62b686bb664 +Author: Behdad Esfahbod +Date: Wed May 15 19:03:59 2019 -0700 + + [algs] Remove pair copy constructor + + Use default. + + src/hb-algs.hh | 1 - + src/test-algs.cc | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit f92d188d7703184d04e8f205ae46ca3081d3e048 +Author: Behdad Esfahbod +Date: Wed May 15 18:52:57 2019 -0700 + + Whitespace + + src/hb-ot-layout-gsub-table.hh | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 962f95cf802404dafadf2f999772d3f9fc949d63 +Author: Garret Rieger +Date: Thu May 9 13:04:11 2019 -0700 + + [subset] Switch SingleSubst to use iterators in serialize. + + src/hb-ot-layout-common.hh | 6 +-- + src/hb-ot-layout-gsub-table.hh | 97 +++++++++++++++++++++++++----------------- + 2 files changed, 62 insertions(+), 41 deletions(-) + +commit 78d35f0e780dd811ae103c96f3b1060d49046a7a +Author: Behdad Esfahbod +Date: Wed May 15 18:15:05 2019 -0700 + + Reduce captures of lambdas + + src/hb-ot-hdmx-table.hh | 4 ++-- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 29 +++++++++++++++-------------- + src/hb-ot-layout-gsubgpos.hh | 12 ++++++------ + src/hb-ot-name-table.hh | 2 +- + src/hb-ot-stat-table.hh | 2 +- + src/hb-ot-var-fvar-table.hh | 4 ++-- + src/hb-subset-plan.cc | 2 +- + src/test-iter.cc | 4 ++-- + 9 files changed, 31 insertions(+), 30 deletions(-) + +commit 5266ca86b633b84850492b7982334fb63271ccbc +Author: Behdad Esfahbod +Date: Wed May 15 17:59:00 2019 -0700 + + Fix tests + + Oops. + + src/test-algs.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 5da8a3a90db5e5ccaaf68de2ac312108af911821 +Author: Behdad Esfahbod +Date: Wed May 15 17:11:18 2019 -0700 + + Remove variadic form of hb_min/hb_max + + Unused, and why here and not in other functions... + + src/hb-algs.hh | 22 ++-------------------- + 1 file changed, 2 insertions(+), 20 deletions(-) + +commit e5cfe9d582d86281eda2bcb85d3d1cbd4afbb5bb +Author: Behdad Esfahbod +Date: Wed May 15 16:59:36 2019 -0700 + + Add arithmetic operators + + src/hb-algs.hh | 44 ++++++++++++++++++++++++++++++-------------- + 1 file changed, 30 insertions(+), 14 deletions(-) + +commit f7a458510d9c34d1c52579985ded5082ad0f3458 +Author: Behdad Esfahbod +Date: Wed May 15 16:49:35 2019 -0700 + + Add hb_bitwise_* ops + + src/hb-algs.hh | 56 +++++++++++++++++++++++++++++++++++--------------------- + src/hb-set.hh | 14 +++++++------- + 2 files changed, 42 insertions(+), 28 deletions(-) + +commit d822e0a16f914ec6a7e629d21ed972d009a88561 +Author: Behdad Esfahbod +Date: Wed May 15 16:30:08 2019 -0700 + + [array] Adjust operator!= + + See comments. + + src/hb-array.hh | 7 ++++++- + src/hb-vector.hh | 1 + + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit 203ea58bf67b3df3e376f94cdfb37382dd3858a0 +Author: Behdad Esfahbod +Date: Wed May 15 16:14:40 2019 -0700 + + More adjustment to OffsetTo<>::friend opeator+ + + Let's see if I break any bots. But yeah, it wasn't accepting a + non-const pointer. It just happens that we don't use that in the + code it seems. + + src/hb-open-type.hh | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit ebf47a95f29dd959319feb7f8728f7c0162a181e +Author: Behdad Esfahbod +Date: Wed May 15 15:14:26 2019 -0700 + + [iter] Simplify operator!= of iterator filters + + Both to save ops, and also because lambdas don't implement operator!=, + so this was failing in range-based for loop if a lambda was passed to + hb_map() or hb_filter(). Just check end-condition assuming that we + are comparing to .end() or iterators that are otherwise derived from + current iterator. Ie. don't compare things that are expected to be + in common. + + src/hb-iter.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit d3e1d5044f23a2dc910f4253c3f4976bf08f93ab +Author: Behdad Esfahbod +Date: Wed May 15 14:25:54 2019 -0700 + + Add all pair_t comparison operators + + src/hb-algs.hh | 5 +++++ + 1 file changed, 5 insertions(+) + +commit f244224dbb5ee8929af109a0c4e23d2d993c8df8 +Author: Behdad Esfahbod +Date: Wed May 15 14:19:20 2019 -0700 + + [iter] Use default operators instead of redefining empty ones + + src/hb-iter.hh | 26 +++++++++++++++----------- + 1 file changed, 15 insertions(+), 11 deletions(-) + +commit 125c45ed368ae61a74e2c558b9c884cfde6295e1 +Author: David Corbett +Date: Wed May 15 17:02:32 2019 -0400 + + Convert Consonant_Initial_Postfixed to CONS_MED + + src/gen-use-table.py | 6 +++--- + src/hb-ot-shape-complex-use-table.cc | 2 +- + .../fonts/fd565cabd5208d345d0ed4fda7ae742917d846a5.ttf | Bin 0 -> 1056 bytes + test/shaping/data/in-house/tests/use-syllable.tests | 1 + + 4 files changed, 5 insertions(+), 4 deletions(-) + +commit 99ca956c131563b57d490b1ec3c8de920645e53f +Author: David Corbett +Date: Wed May 15 16:29:51 2019 -0400 + + Fix record-test.sh on machines without sha1sum + + test/shaping/record-test.sh | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +commit e2767e438c56b8ee0bc2f2040c10b13b34d37f95 +Author: Ebrahim Byagowi +Date: Wed May 15 13:14:09 2019 +0430 + + [ci][test] Ignore other gcov symbols also + + To fix https://travis-ci.org/harfbuzz/harfbuzz/jobs/532693197 + + src/check-symbols.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 397cbbd5ff25c9796ecd56b8270e83de1eb322ac +Author: Ebrahim Byagowi +Date: Wed May 15 13:03:28 2019 +0430 + + [ci][travis] Update its distribution + + It may break things, lets see + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 763ea4224bf612f3efb80d5744d1e8852682683e +Author: Behdad Esfahbod +Date: Wed May 15 01:15:11 2019 -0700 + + Another try + + src/hb-open-type.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit e1b2edb04af7bd2b4eecb59392f75abcc72cd8a6 +Author: Behdad Esfahbod +Date: Wed May 15 01:12:04 2019 -0700 + + Completely revert the thing back + + src/hb-open-type.hh | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +commit c58eeb5fb35ec6a8d0a4394fd83cb2571cd5af4f +Author: Behdad Esfahbod +Date: Wed May 15 01:10:31 2019 -0700 + + Another try at fix + + Fails locally. Trying to understand. Sigh + + src/hb-open-type.hh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 004edf3bdac77564d39516b51b0666de60e65ece +Author: Behdad Esfahbod +Date: Wed May 15 01:02:50 2019 -0700 + + Ugh. How was the Travis bot happy before, but isn't now?! :( + + src/hb-open-type.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit e01c7b1648dbbb76966b3bd4437bcf7699e77c35 +Author: Behdad Esfahbod +Date: Wed May 15 00:52:17 2019 -0700 + + Move OffsetTo operator+ back out of class + + Apparently there's different overload resolution rules that apply, at + least with some (older?) version of gcc. + + hb-ot-name-table.hh: In member function ‘void OT::name::accelerator_t::init(hb_face_t*)’: + hb-ot-name-table.hh:244:62: error: ambiguous overload for ‘operator+’ (operand types are ‘hb_blob_ptr_t’ and ‘OT::NNOffsetTo > > {aka const OT::OffsetTo >, OT::IntType, false>}’) + this->pool = (const char *) (const void *) (this->table+this->table->stringOffset); + ^ + hb-ot-name-table.hh:244:62: note: candidates are: + hb-ot-name-table.hh:244:62: note: operator+(const C*, long int) + hb-ot-name-table.hh:244:62: note: operator+(const char*, long int) + + src/hb-open-type.hh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit b213042f87dd736bad7a852fe98269f84cbff493 +Author: Behdad Esfahbod +Date: Wed May 15 00:50:48 2019 -0700 + + Revert "Revert symmetric OffsetTo overloads" + + This reverts commit 01912efb74fc554a81c8cfe572145ce45b8fa58b. + + Actually this didn't break things. Fixing + + src/hb-open-type.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 01912efb74fc554a81c8cfe572145ce45b8fa58b +Author: Behdad Esfahbod +Date: Wed May 15 00:42:47 2019 -0700 + + Revert symmetric OffsetTo overloads + + Reverts 57f65ae9355004044325dd6441cde761bca5e0a3 + + Caused ambiguous-overload on some gcc... + + src/hb-open-type.hh | 4 ---- + 1 file changed, 4 deletions(-) + +commit d0df996cdc249a245c9dad1fa6503213c84dbcd2 +Author: Behdad Esfahbod +Date: Wed May 15 00:32:41 2019 -0700 + + Use implicit lambda return type + + src/hb-array.hh | 4 ++-- + src/hb-ot-layout-gsub-table.hh | 8 ++++---- + src/hb-ot-layout-gsubgpos.hh | 18 +++++++++--------- + src/hb-ot-stat-table.hh | 2 +- + src/hb-ot-var-fvar-table.hh | 4 ++-- + src/test-iter.cc | 8 ++++---- + src/test-meta.cc | 1 - + 7 files changed, 22 insertions(+), 23 deletions(-) + +commit 57f65ae9355004044325dd6441cde761bca5e0a3 +Author: Behdad Esfahbod +Date: Tue May 14 22:52:59 2019 -0700 + + Add symmetric friend operator+ for OffsetTo + + src/hb-open-type.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 71208e5047c71108dec7361fd7c3e594c8b6c2d8 +Author: Behdad Esfahbod +Date: Tue May 14 22:51:59 2019 -0700 + + Move OffsetTo<> deref operators in-class as friends + + src/hb-open-type.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit e6d6f4b96dd5517406265093cd57834c00850d41 +Author: Behdad Esfahbod +Date: Tue May 14 22:45:03 2019 -0700 + + Whitespace + + src/hb-ot-stat-table.hh | 2 +- + src/hb-ot-var-fvar-table.hh | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 889dc1eb06a80ea9be4223a19011e47a52abebdd +Author: Behdad Esfahbod +Date: Tue May 14 22:28:07 2019 -0700 + + [iter] Remove sort categorization + + See comments. + + src/hb-array.hh | 2 +- + src/hb-iter.hh | 48 ++++++++++++++++++++++++++++++---------------- + src/hb-ot-layout-common.hh | 2 +- + src/hb-set.hh | 2 +- + 4 files changed, 35 insertions(+), 19 deletions(-) + +commit b4eff38397c2a4e475f426df38e040dddf94a4fa +Author: Behdad Esfahbod +Date: Tue May 14 09:07:20 2019 -0700 + + Start of gen-ucd.py, to replace UCDN + + src/gen-ucd.py | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 46 insertions(+) + +commit 02e5e5d939be36d8f108029601a1ce1f533e5ccb +Author: Qunxin Liu +Date: Mon May 13 09:38:42 2019 -0700 + + [subset] retian nameids from STAT and fvar tables + + src/hb-ot-stat-table.hh | 76 +++++++++++++++++++++++++++++++++++++++++---- + src/hb-ot-var-fvar-table.hh | 21 +++++++++++++ + src/hb-subset-plan.cc | 26 ++++++++++++++++ + 3 files changed, 117 insertions(+), 6 deletions(-) + +commit ff7995200e706f3161b9fc5c27bb950e3d87e8e2 +Author: Behdad Esfahbod +Date: Tue May 14 07:44:03 2019 -0700 + + Hopefully last warning fix + + src/hb-subset-cff2.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d1baf99697d215584b2ecb8d2d38ba5b9045955c +Author: Ebrahim Byagowi +Date: Tue May 14 16:16:46 2019 +0430 + + [ci] add HB_TINY to asmjs builder + + .circleci/config.yml | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +commit 9e7c9c3adb33b06610951be38f3c820342333092 +Author: Ebrahim Byagowi +Date: Tue May 14 15:58:51 2019 +0430 + + Fix -Wunused-function on HB_NO_SHAPE_AAT + + We should add a bot for it + Part of #1652 + + src/hb-ot-shape.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit c73d7ba75d4556d9b8e05b10d6572f74f4814f7a +Author: Dominik Röttsches +Date: Tue May 14 13:26:18 2019 +0300 + + Fix building with HB_NO_SUBSET_LAYOUT + + Fixes an unused function warning when building with HB_NO_SUBSET_LAYOUT + as part of the Chrome build. + + src/hb-subset-plan.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit f39934983f459c992e27075cd2c45ac0025183d0 +Author: Behdad Esfahbod +Date: Tue May 14 00:13:21 2019 -0700 + + [ucdn] Fix Hangul composition + + https://github.com/grigorig/ucdn/issues/23 + + src/hb-ucdn/ucdn.c | 3 ++- + test/api/test-unicode.c | 4 ++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit b2ab15a78c219016e20389582716e0ac0ee8aeb5 +Author: Behdad Esfahbod +Date: Mon May 13 23:47:28 2019 -0700 + + Fix more warnings + + src/hb-ot-cff1-table.hh | 8 ++++---- + src/hb-subset-cff1.cc | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 42ae468a8a76e1e4e6a8121eec5dc118f52086ee +Author: Behdad Esfahbod +Date: Mon May 13 23:43:45 2019 -0700 + + [config] Add NDEBUG and HB_NDEBUG + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 10 ++++++++++ + src/hb.hh | 10 ---------- + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit 0a01deb76fa582afa83da70a09478299d8080827 +Author: Behdad Esfahbod +Date: Mon May 13 18:04:09 2019 -0700 + + One more warning fix + + No idea where these appear from... + + src/hb-ot-cff-common.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f76e9f2ede76a189d48ddd4f2275442d8e849815 +Author: Behdad Esfahbod +Date: Mon May 13 17:39:46 2019 -0700 + + [icu] Comment + + src/hb-icu.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 70fe9e73555f3354238f7cda5ff0f0c0b75e1d62 +Author: Behdad Esfahbod +Date: Mon May 13 17:35:02 2019 -0700 + + Fix moreeeeeeeeeee + + src/hb-icu.cc | 28 +++++++++++++++------------- + src/hb-subset-plan.cc | 2 +- + 2 files changed, 16 insertions(+), 14 deletions(-) + +commit 68e12e68f813bfd22dda040463d042cc06b958ec +Author: Behdad Esfahbod +Date: Mon May 13 17:28:59 2019 -0700 + + Fix more semi-colon issues + + src/hb-coretext.cc | 4 ++-- + src/hb-directwrite.cc | 4 ++-- + src/hb-graphite2.cc | 4 ++-- + src/hb-uniscribe.cc | 4 ++-- + 4 files changed, 8 insertions(+), 8 deletions(-) + +commit 4d3cf2adb669c345cc43832d11689271995e160a +Author: Behdad Esfahbod +Date: Mon May 13 17:25:07 2019 -0700 + + [iter] Fix zip iterator sortedness classification logic + + src/hb-iter.hh | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +commit c572732f29787d1cf7ff39b8160b3935d4b13ba4 +Author: Behdad Esfahbod +Date: Mon May 13 15:41:09 2019 -0700 + + Fix more excess semi-colon errors + + src/hb-common.cc | 2 +- + src/hb-ot-name.cc | 4 ++-- + src/hb-ot-shape-complex-indic.hh | 2 +- + src/hb-ot-shape-complex-khmer.hh | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +commit 513762849a683914fc266a17ddf38f133cccf072 +Author: Behdad Esfahbod +Date: Mon May 13 15:36:14 2019 -0700 + + [iter] Track strictly-sorted iterators + + This make output of hb_enumerate() sorted regardless of input iterator. + + src/hb-array.hh | 2 +- + src/hb-iter.hh | 30 +++++++++++++++++++++--------- + src/hb-ot-layout-common.hh | 2 +- + src/hb-set.hh | 2 +- + 4 files changed, 24 insertions(+), 12 deletions(-) + +commit 7e02063f3202712b4e5fbddac0354adadb924f72 +Author: Behdad Esfahbod +Date: Mon May 13 15:26:00 2019 -0700 + + [iter] Minor + + src/hb-iter.hh | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) + +commit a5fb44a8cbbaad194ddf6d02a6b6c98b0b637149 +Author: Garret Rieger +Date: Mon May 13 14:57:40 2019 -0700 + + [subset] Fix shadowed 'groups' param in cmap. + + src/hb-ot-cmap-table.hh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 73943bdf21a96f4e12cb9efd8458a2711de0d870 +Author: Behdad Esfahbod +Date: Mon May 13 14:48:31 2019 -0700 + + Adjust uniscribe_bug_compatible mode + + More correct behavior. We were commenting out some legit conditions + before. + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-shape-complex-indic.cc | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +commit 809c58708359bcc22bb1273069886f2cbf68be65 +Author: Behdad Esfahbod +Date: Mon May 13 14:45:51 2019 -0700 + + [config] Better compile away morx/kerx/trak + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-shape.cc | 38 ++++++++++++++------------------------ + src/hb-ot-shape.hh | 12 +++++++++++- + 2 files changed, 25 insertions(+), 25 deletions(-) + +commit b1d3e54bd3c881794b05831e811b1a77a7d427c5 +Author: Behdad Esfahbod +Date: Mon May 13 14:35:04 2019 -0700 + + [indic] Don't constrain how many C, M, ... occur + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1709 + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-shape-complex-indic-machine.hh | 1225 ++++++++---------------------- + src/hb-ot-shape-complex-indic-machine.rl | 8 +- + 2 files changed, 305 insertions(+), 928 deletions(-) + +commit 148d88368013ba9bf70a7dd275b1a0f9c64fd45c +Author: Behdad Esfahbod +Date: Mon May 13 14:33:06 2019 -0700 + + [test] Don't call deprecated API + + test/api/test-font.c | 3 --- + test/api/test-shape.c | 16 ++-------------- + 2 files changed, 2 insertions(+), 17 deletions(-) + +commit a487fc33248ea2f934ff4cb857cb556065c11841 +Author: Behdad Esfahbod +Date: Mon May 13 14:16:33 2019 -0700 + + Another extra semi-colon + + src/hb-ot-layout-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8461ade7832110d28001dc641342d3f9461e03b0 +Author: Behdad Esfahbod +Date: Mon May 13 14:10:48 2019 -0700 + + Revert "[ragel] Regenerate ragel-generated files using ragel 7.0.0.11 May 2018" + + This reverts commit 9b05db33b54e6e5f0b4658f4c06e7fe563f8923b. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1708 + + src/hb-buffer-deserialize-json.hh | 1051 ++++++----- + src/hb-buffer-deserialize-text.hh | 1009 ++++++----- + src/hb-ot-shape-complex-indic-machine.hh | 2678 ++++++++++++---------------- + src/hb-ot-shape-complex-khmer-machine.hh | 709 ++++---- + src/hb-ot-shape-complex-myanmar-machine.hh | 820 ++++----- + src/hb-ot-shape-complex-use-machine.hh | 1144 ++++++------ + 6 files changed, 3452 insertions(+), 3959 deletions(-) + +commit 52c15b053aec06d351404a4c15609384946b26e1 +Author: Behdad Esfahbod +Date: Mon May 13 14:10:28 2019 -0700 + + Revert "[ragel] Switch to -T1 output instead of -F1" + + This reverts commit ae8719eb596485ebff07dd5016256015cd0cf86b. + + Part of https://github.com/harfbuzz/harfbuzz/issues/1708 + + src/Makefile.am | 2 +- + src/hb-buffer-deserialize-json.hh | 381 ++- + src/hb-buffer-deserialize-text.hh | 308 +-- + src/hb-ot-shape-complex-indic-machine.hh | 3527 +++++++--------------------- + src/hb-ot-shape-complex-khmer-machine.hh | 396 +--- + src/hb-ot-shape-complex-myanmar-machine.hh | 742 ++---- + src/hb-ot-shape-complex-use-machine.hh | 1011 ++------ + 7 files changed, 1658 insertions(+), 4709 deletions(-) + +commit e98f0ddd6373f64ef4b542daa36b5841399170af +Author: Behdad Esfahbod +Date: Mon May 13 13:53:06 2019 -0700 + + Fix extra semi-colon + + src/hb-iter.hh | 2 +- + src/hb.hh | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit ae8719eb596485ebff07dd5016256015cd0cf86b +Author: Behdad Esfahbod +Date: Mon May 13 12:27:10 2019 -0700 + + [ragel] Switch to -T1 output instead of -F1 + + Fedora upgraded to ragel 7, which is buggy if char is signed. + Switching to -G2 output fails with sign-compare error: + + ../../src/hb-buffer-deserialize-json.hh:107:12: error: comparison of integer expressions of different signedness: ‘unsigned int’ and ‘const char’ [-Werror=sign-compare] + if ( 9u <= ( (*( p))) && ( (*( p))) <= 13u ) { + ~~~^~~~~~~~~~~~~ + + Switching to -T1 for now. It actually results in smaller code, + at the expense of some binary searching instead of flat tables. + In the not distant future, we might actually generate two different + outputs and choose between depending on size-optimize options. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1708 + + src/Makefile.am | 2 +- + src/hb-buffer-deserialize-json.hh | 381 ++-- + src/hb-buffer-deserialize-text.hh | 308 ++- + src/hb-ot-shape-complex-indic-machine.hh | 3401 +++++++++++++++++++++------- + src/hb-ot-shape-complex-khmer-machine.hh | 396 +++- + src/hb-ot-shape-complex-myanmar-machine.hh | 742 ++++-- + src/hb-ot-shape-complex-use-machine.hh | 1011 ++++++--- + 7 files changed, 4646 insertions(+), 1595 deletions(-) + +commit df3f36f0bb7aeed0554843f24f6542852e40f6cc +Author: Behdad Esfahbod +Date: Sun May 12 20:56:36 2019 -0700 + + Minor + + src/gen-os2-unicode-ranges.py | 2 ++ + 1 file changed, 2 insertions(+) + +commit ccc88e98f34453100830d6408fdabfe90e6b47b8 +Author: Behdad Esfahbod +Date: Sun May 12 16:12:06 2019 -0700 + + Fix MSVC build + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f8f9cb93b7166b0d8c816610596da486443c7391 +Author: Behdad Esfahbod +Date: Sun May 12 15:56:25 2019 -0700 + + [config] Define HB_NO_SUBSET_LAYOUT in HB_LEAN + + Assumning subsetter would be used for printing-like uses in that case, + which don't need GSUB/GPOS. + + src/hb-config.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit a1394a28fc4b3d15ef45481f3147f0685d343acb +Author: Behdad Esfahbod +Date: Sun May 12 15:47:46 2019 -0700 + + [config] Add HB_NO_UNISCRIBE_BUG_COMPATIBLE + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 4 ++++ + src/hb-ot-shape-complex-indic.cc | 24 ++++++++++++++++++------ + 2 files changed, 22 insertions(+), 6 deletions(-) + +commit dba1ac1b0e8f5f96974fc1119b318ae6127daa82 +Author: Behdad Esfahbod +Date: Sun May 12 15:33:31 2019 -0700 + + [config] Disable buffer serialize routines in HB_TINY + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-buffer-serialize.cc | 14 +++++++++++++- + src/hb-config.hh | 1 + + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit 3d9be2ad5036aaf02b69095faaf9c18705c2c5bc +Merge: a20db496 1a850abd +Author: n8willis +Date: Sun May 12 20:03:29 2019 +0100 + + Merge pull request #1665 from n8willis/docs-gtkdoc-colormath + + [Docs] Add gtk-doc comments for OT color and OT math + +commit a20db496f090abc5b937857b7c5f077161b6ffe4 +Author: Behdad Esfahbod +Date: Sun May 12 11:08:45 2019 -0700 + + Fix builds + + src/hb-subset-plan.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 8694d6082901661e90e2ffcf732e9985a215063f +Author: Behdad Esfahbod +Date: Sun May 12 11:05:24 2019 -0700 + + [config] Enable HB_NO_MT in HB_TINY + + Now that user can override it if needed... + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7f6fca4ef78cf3c9384bf835def14219b2ce8791 +Author: Behdad Esfahbod +Date: Sun May 12 10:29:47 2019 -0700 + + Force-disable CFF code under disabling conditions + + Subsetter size goes down from 190kb to 119kb. Main library about 7kb. + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-cff1-table.cc | 4 ++++ + src/hb-ot-cff2-table.cc | 4 ++++ + src/hb-subset-cff1.cc | 4 ++++ + src/hb-subset-cff2.cc | 4 ++++ + 4 files changed, 16 insertions(+) + +commit 5249eee43748db32b40ad2602b3243d2491642b3 +Author: Behdad Esfahbod +Date: Sat May 11 16:12:07 2019 -0700 + + [config] Allow overriding chosen config + + src/hb-config.hh | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 30c059a978c91fcd38d47f1ac4a03295f887a7da +Author: Ebrahim Byagowi +Date: Sat May 11 18:48:41 2019 -0400 + + [test] minor, fix -Weverything bot + + test/fuzzing/main.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit a29b1de55abca2e90733caff7423e5251d72e03c +Author: Nathan Willis +Date: Sat May 11 20:56:55 2019 +0100 + + Usermanual, fix up userfeatures example code in OpenType features section of shaping chapter. + + docs/usermanual-opentype-features.xml | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +commit 78fcb14db9041af0e0d5ea209cf0cb1977f6dcc3 +Author: Nathan Willis +Date: Sat May 11 20:56:02 2019 +0100 + + Usermanual, minor: flesh out invisible-glyph discussion in buffers chapter. + + ...ermanual-buffers-language-script-and-direction.xml | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + +commit 25531a30394c451a7a2aee77928e0a550015b803 +Author: Ebrahim Byagowi +Date: Sat May 11 19:50:42 2019 +0000 + + [test] minor + + style fix and add return statement + + test/fuzzing/main.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 1a850abd66999707b6f4795050e748fc879b92ef +Merge: 8a544171 a6048e4c +Author: n8willis +Date: Sat May 11 20:16:57 2019 +0100 + + Merge branch 'master' into docs-gtkdoc-colormath + +commit 8a544171d15bb36c15ca7bf679643b2b14f94b45 +Author: Nathan Willis +Date: Sat May 11 20:11:49 2019 +0100 + + Corrections to OT Color gtk-doc comments. + + src/hb-ot-color.cc | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 301f5091f6663cc8a1fff848bf5285aa15cc0598 +Author: Nathan Willis +Date: Sat May 11 20:11:36 2019 +0100 + + Corrections to OT Math gtk-doc comments. + + src/hb-ot-math.cc | 33 +++++++++++++++++++++++---------- + 1 file changed, 23 insertions(+), 10 deletions(-) + +commit a6048e4cd013987ecb846e0683a7cf6f0caa65f9 +Author: Behdad Esfahbod +Date: Sat May 11 12:11:22 2019 -0700 + + Fix build + + src/hb-ot-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 32d3c06b61f2f4252f4403b55c6ba07fbb572149 +Author: Behdad Esfahbod +Date: Sat May 11 11:59:18 2019 -0700 + + Disable sbix if no-color or no-ot-font-bitmap + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-font.cc | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) + +commit 606841b07017ac80dea2fc5ada25b5976f2f9192 +Author: Behdad Esfahbod +Date: Sat May 11 11:54:30 2019 -0700 + + [iter] Check for more before forwarding/rewinding past ends + + src/hb-iter.hh | 4 ++-- + src/test-iter.cc | 6 ++---- + 2 files changed, 4 insertions(+), 6 deletions(-) + +commit c1c122e7b3f60dc7b5a224c68d2acb106fda8b49 +Author: David Corbett +Date: Sat May 11 11:38:06 2019 -0400 + + [iter] Fix filter rewinding + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b854d4ff46602104343201361919f30169144cf1 +Author: David Corbett +Date: Fri May 10 22:51:49 2019 -0400 + + [array] Fix rewinding + + src/hb-array.hh | 22 +++++++++++++--------- + 1 file changed, 13 insertions(+), 9 deletions(-) + +commit 76e80c5ca5e820e955438e4c727929ddd99e695e +Author: n8willis +Date: Sat May 11 19:51:24 2019 +0100 + + Update src/hb-ot-color.cc + + Co-Authored-By: Khaled Hosny + + src/hb-ot-color.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 79126df3070f00193fe3caefe9deb62c4520e048 +Author: Behdad Esfahbod +Date: Sat May 11 11:23:31 2019 -0700 + + [iter] Add hb_map_sorted() and hb_map_retains_sorting() + + src/hb-iter.hh | 38 +++++++++++++++++++++++++++++++------- + 1 file changed, 31 insertions(+), 7 deletions(-) + +commit bcd81932f0bcb2258276ae313709780e90e9b0f6 +Author: n8willis +Date: Sat May 11 14:10:32 2019 +0100 + + Update src/hb-ot-math.cc + + Co-Authored-By: Khaled Hosny + + src/hb-ot-math.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ddc6dd42f753a20204898e41cc711b0100638330 +Author: n8willis +Date: Sat May 11 14:10:11 2019 +0100 + + Update src/hb-ot-math.cc + + Co-Authored-By: Khaled Hosny + + src/hb-ot-math.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 46e05ecca16e561a0ff4ca60bb064f480374590a +Author: n8willis +Date: Sat May 11 14:09:52 2019 +0100 + + Update src/hb-ot-color.cc + + Co-Authored-By: Khaled Hosny + + src/hb-ot-color.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6d9870b4799f20a6c58a2c071713e56aa93b0221 +Author: n8willis +Date: Sat May 11 14:09:26 2019 +0100 + + Update src/hb-ot-color.cc + + Co-Authored-By: Khaled Hosny + + src/hb-ot-color.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 12ea4a24c40c7ac28d058e9721479347951e3482 +Author: n8willis +Date: Sat May 11 14:08:40 2019 +0100 + + Update src/hb-ot-color.cc + + Co-Authored-By: Khaled Hosny + + src/hb-ot-color.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3535f2d31efe1ebe44ba63f980882ba23cdcde3b +Author: n8willis +Date: Sat May 11 14:07:38 2019 +0100 + + Update src/hb-ot-color.cc + + Co-Authored-By: Khaled Hosny + + src/hb-ot-color.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 12d2c472fe8ec3268a4b39a57603dcc734ab7b88 +Author: n8willis +Date: Sat May 11 14:06:56 2019 +0100 + + Update src/hb-ot-color.cc + + Co-Authored-By: Khaled Hosny + + src/hb-ot-color.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7f45ce42dbf11366e904f48db45cf5405e4e94df +Author: Behdad Esfahbod +Date: Sat May 11 01:28:31 2019 -0700 + + [config] Rename + + src/hb-config.hh | 2 +- + src/hb-ot-layout.cc | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 0e78d4ddaec5f29d6652cc4185cbcca98c3a2927 +Author: Behdad Esfahbod +Date: Sat May 11 01:27:50 2019 -0700 + + [config] Add HB_NO_NAME + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 6 +++++- + src/hb-ot-name.cc | 20 ++++++++++++++++++++ + 2 files changed, 25 insertions(+), 1 deletion(-) + +commit 1fc077211771c752768f63f178116d2b8f2f7d03 +Author: Behdad Esfahbod +Date: Sat May 11 01:24:23 2019 -0700 + + [config] HB_NO_OT_NAME_LANGUAGE AAT + + src/hb-config.hh | 4 ++-- + src/hb-ot-name-language-static.hh | 3 +++ + src/hb-ot-name-table.hh | 4 +++- + 3 files changed, 8 insertions(+), 3 deletions(-) + +commit 4381bb2de7a554a148302836b86a5d73264abeae +Author: Behdad Esfahbod +Date: Sat May 11 01:14:04 2019 -0700 + + [config] Comment + + src/hb-config.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 9c921e6c32ab5ac4c524f554b7a7841eeeb0908f +Author: Behdad Esfahbod +Date: Sat May 11 01:08:51 2019 -0700 + + [config] Enable HB_NO_NAME_TABLE_AAT + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 81b79dfc397599182f43d63bf9346eee28e2d220 +Author: Behdad Esfahbod +Date: Sat May 11 00:53:52 2019 -0700 + + [config] Add HB_NO_COLOR to HB_LEAN + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 1 + + src/hb-ot-color.cc | 49 +++++++++++++++++++++++++++++++++++++++++++++---- + src/hb-ot-color.h | 2 +- + src/hb-ot-layout.h | 2 +- + 4 files changed, 48 insertions(+), 6 deletions(-) + +commit b63a8e173cbc5a81f2ca4a0a82f20b9dafaedb30 +Author: Behdad Esfahbod +Date: Sat May 11 00:47:20 2019 -0700 + + [config Add HB_NO_OT_SHAPE_COMPLEX_VOWEL_CONSTRAINTS to LEAN + + Already I don't like the inflexibility of this approach :(. + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 42a21284778f3203d96133f74b0f846cd1567958 +Author: Behdad Esfahbod +Date: Sat May 11 00:44:22 2019 -0700 + + [config] Disbale getenv() and atexit() if HB_LEAN + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit fca27860417812d51e40f040de97c10177b1250e +Author: Behdad Esfahbod +Date: Sat May 11 00:37:01 2019 -0700 + + [config] Make HB_DISABLE_DEPRECATED actually compile + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 7 +++++++ + src/hb-font.cc | 8 ++++++++ + src/hb-font.hh | 12 ++++++++++-- + src/hb-graphite2.cc | 2 ++ + src/hb-icu.cc | 2 +- + src/hb-ot-layout.cc | 7 ++++++- + src/hb-ot-shape-fallback.cc | 4 ++++ + src/hb-ot-tag.cc | 4 ++++ + src/hb-ot-var-fvar-table.hh | 6 ++++++ + src/hb-ot-var.cc | 2 ++ + src/hb-set.cc | 2 ++ + src/hb-unicode.cc | 6 ++++++ + src/hb-unicode.hh | 10 +++++++--- + 13 files changed, 65 insertions(+), 7 deletions(-) + +commit 5a48611ccd045de5782ad2fd5f6718357fe232a2 +Author: Behdad Esfahbod +Date: Sat May 11 00:19:03 2019 -0700 + + [config] Add HB_NO_OT_LAYOUT_UNUSED + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 1 + + src/hb-ot-layout.cc | 12 ++++++++++++ + 2 files changed, 13 insertions(+) + +commit 771f1b21d1d7128440d6b4488705456d43dbc0e7 +Author: Behdad Esfahbod +Date: Sat May 11 00:16:18 2019 -0700 + + [config] Adjust + + src/hb-config.hh | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit 484f6e8215038006a945da67d245f14db3eeeb2e +Author: Behdad Esfahbod +Date: Sat May 11 00:13:35 2019 -0700 + + [config] Add HB_LEAN + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 5 +++++ + src/hb-ot-math.cc | 40 ++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 45 insertions(+) + +commit 0bfd14c0ed2f95f00d0b94d396c777399afa4d68 +Author: Behdad Esfahbod +Date: Sat May 11 00:06:57 2019 -0700 + + [config] Fix tests + + src/hb-config.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit 784df8eba1aaf20d2db464f8b3ea0984f7ea1308 +Author: Behdad Esfahbod +Date: Sat May 11 00:04:59 2019 -0700 + + [config] Flesh out more + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-config.hh | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit 799c6a5081e5058260199eeeb2091ee2c1dfefff +Author: Behdad Esfahbod +Date: Fri May 10 23:55:22 2019 -0700 + + [config] Add some + + src/hb-aat-layout.cc | 26 +++++++++++++------------- + src/hb-aat-map.cc | 4 ++-- + src/hb-config.hh | 18 ++++++++++++++++++ + src/hb-ot-kern-table.hh | 14 +++++++------- + src/hb-ot-shape.cc | 22 +++++++++++----------- + 5 files changed, 51 insertions(+), 33 deletions(-) + +commit e6582de12f1af9ab5e3122d762a3e12438a66b6b +Author: Behdad Esfahbod +Date: Fri May 10 23:53:38 2019 -0700 + + Add hb-config.hh + + src/Makefile.sources | 1 + + src/hb-config.hh | 36 ++++++++++++++++++++++++++++++++++++ + src/hb.hh | 7 ++++--- + 3 files changed, 41 insertions(+), 3 deletions(-) + +commit d43af339e7a7f5dab1690703a78d2690baefbd59 +Author: Behdad Esfahbod +Date: Fri May 10 23:46:22 2019 -0700 + + [subset] More HB_NO_SUBSET_LAYOUT + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-subset-plan.cc | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +commit 31c591d69f6a7605088883db59149e83c80d019c +Author: Behdad Esfahbod +Date: Fri May 10 23:39:53 2019 -0700 + + [cff] Prune more code if HB_NO_OT_FONT_CFF + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-cff1-table.cc | 5 +++++ + src/hb-ot-cff2-table.cc | 5 +++++ + 2 files changed, 10 insertions(+) + +commit 5ea8ad5c48f9baabc4ccf81dce4aee1067c401f6 +Author: Behdad Esfahbod +Date: Fri May 10 23:36:42 2019 -0700 + + [subset] Add HB_NO_SUBSET_CFF + + Doesn't fully prune all the relevant code. To be fixed later. + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-subset.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 2c93f0dee31b2277567ccbee041539732b9bd26d +Author: Behdad Esfahbod +Date: Fri May 10 23:31:05 2019 -0700 + + Add HB_NO_AAT + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-aat-layout.cc | 58 +++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-aat-map.cc | 8 +++++++ + src/hb-ot-kern-table.hh | 14 ++++++++++++ + src/hb-ot-shape.cc | 28 +++++++++++++++++++++++- + 4 files changed, 107 insertions(+), 1 deletion(-) + +commit 62dfe7aea23c95f4550543085071990e20ee4d54 +Author: Behdad Esfahbod +Date: Fri May 10 23:17:15 2019 -0700 + + [cff] Minor + + src/hb-subset-cff1.cc | 2 +- + src/hb-subset-cff2.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 227d85e138d4c785c2d658e225ed35f5acd1235f +Author: Behdad Esfahbod +Date: Fri May 10 23:15:58 2019 -0700 + + Minor + + src/hb-atomic.hh | 2 +- + src/hb-debug.hh | 2 +- + src/hb-font.cc | 2 +- + src/hb-ot-font.cc | 4 ++-- + src/hb-ot-layout.cc | 6 +++--- + src/hb-ot-name-table.hh | 2 +- + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-hebrew.cc | 2 +- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape-complex-vowel-constraints.cc | 2 +- + src/hb-ot-shape-fallback.cc | 6 +++--- + src/hb-subset.cc | 4 ++-- + src/hb-warning.cc | 4 ++-- + src/hb.hh | 10 +++++----- + 14 files changed, 25 insertions(+), 25 deletions(-) + +commit 9bfe22af6113ee8cd24cb9ee091f0841c27bbf98 +Author: Behdad Esfahbod +Date: Fri May 10 22:44:19 2019 -0700 + + [sanitize] Fix previous commit + + src/hb-open-type.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 4dcf65328f04a11594fc190fd7e976afa54455e9 +Author: Behdad Esfahbod +Date: Fri May 10 22:23:24 2019 -0700 + + [sanitize] Simplify + + src/hb-open-type.hh | 45 ++++++++++----------------------------------- + 1 file changed, 10 insertions(+), 35 deletions(-) + +commit 23168c3981f7c80883663fa69c608caee98d3d99 +Author: Behdad Esfahbod +Date: Fri May 10 22:11:51 2019 -0700 + + [sanitize] Use hb_is_trivially_copyable() + + src/hb-open-type.hh | 64 +++++++---------------------------------------------- + 1 file changed, 8 insertions(+), 56 deletions(-) + +commit 0ff7954f9f09f80654ac91c16712154744a0dd2d +Author: Behdad Esfahbod +Date: Fri May 10 22:04:40 2019 -0700 + + [meta] Add hb_is_trivial + + src/hb-meta.hh | 7 +++++++ + src/test-meta.cc | 4 ++++ + 2 files changed, 11 insertions(+) + +commit 7162a97bca6e0dde3d277701a3bf15688deef61d +Author: Behdad Esfahbod +Date: Fri May 10 22:03:03 2019 -0700 + + [meta] Add hb_is_trivially_copyable() + + src/hb-meta.hh | 11 +++++++++++ + src/test-meta.cc | 4 ++++ + 2 files changed, 15 insertions(+) + +commit f2398f34c019a55d4f0e1a7031961714afadf2b3 +Author: Behdad Esfahbod +Date: Fri May 10 21:59:57 2019 -0700 + + [meta] Add is_trivially_destructible + + src/hb-meta.hh | 6 +++--- + src/test-meta.cc | 7 +++++-- + 2 files changed, 8 insertions(+), 5 deletions(-) + +commit 72cb5b8e52b7103c18adcb82cbcd4b91a2c85474 +Author: Behdad Esfahbod +Date: Fri May 10 21:50:15 2019 -0700 + + Remove accidentally included include + + src/test-meta.cc | 3 --- + 1 file changed, 3 deletions(-) + +commit 086772e409759e8f1edd0e34f6f25374e51e9e10 +Author: Behdad Esfahbod +Date: Fri May 10 21:49:25 2019 -0700 + + [meta] Add is_destructible + + src/hb-meta.hh | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit b14745278ad16fe7f4e838b685029e3fdda516ca +Author: Behdad Esfahbod +Date: Fri May 10 21:42:59 2019 -0700 + + [met]a Add is_constructible, ... + + src/hb-meta.hh | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/test-meta.cc | 23 ++++++++++++++++++ + 2 files changed, 96 insertions(+) + +commit 19e08a146712dacd11359370c91a7bad55bc6f62 +Author: Behdad Esfahbod +Date: Fri May 10 21:25:07 2019 -0700 + + [iter] Adjust source_of/sink_of + + src/hb-iter.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c0485e32a320e17dd0634b2cc8b4dd8c4fdc65e0 +Author: Behdad Esfahbod +Date: Fri May 10 21:03:14 2019 -0700 + + Use hb_void_t<> the way it's supposed to be used + + src/hb-null.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 40fb36a39de5dd3ee9a4c84f1f76205b6bb68660 +Author: Behdad Esfahbod +Date: Fri May 10 21:01:19 2019 -0700 + + [meta] Minor + + src/hb-meta.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit f9a96a0a97f59a0b31ee0f901d1c21dde6b3cfaf +Author: Behdad Esfahbod +Date: Fri May 10 20:56:16 2019 -0700 + + [meta] More rewrites + + src/hb-meta.hh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 5252677e53ff4473701172bbbd4e953ac6b08e6f +Author: Behdad Esfahbod +Date: Fri May 10 20:49:52 2019 -0700 + + [meta] Rewrite hb_int_min/max + + src/hb-meta.hh | 44 ++++++++++++++++++++++---------------------- + 1 file changed, 22 insertions(+), 22 deletions(-) + +commit caa3f92e91062ff78b657aec23569b099de48640 +Author: Behdad Esfahbod +Date: Fri May 10 20:43:51 2019 -0700 + + [meta] void_tt -> void_t + + src/hb-meta.hh | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 7df3ecfb4069d275cd277c71165962bb5769364a +Author: Behdad Esfahbod +Date: Fri May 10 20:43:26 2019 -0700 + + [meta] hb_void_t -> hb_empty_t + + src/hb-debug.hh | 6 +++--- + src/hb-meta.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos.hh | 18 +++++++++--------- + 4 files changed, 14 insertions(+), 14 deletions(-) + +commit 149c3db8a2d41894b5d65f4c4b7c20757f6de6dd +Author: Behdad Esfahbod +Date: Fri May 10 20:34:52 2019 -0700 + + [meta] Minor + + src/hb-meta.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 707ff5b59d3903b60312a028f2ba5d74c18db101 +Author: Behdad Esfahbod +Date: Fri May 10 20:31:20 2019 -0700 + + Minor + + src/hb-meta.hh | 5 ----- + src/hb-open-type.hh | 2 +- + 2 files changed, 1 insertion(+), 6 deletions(-) + +commit ce300f4fb68a25d46d165e8b0a4825482c83a966 +Author: Behdad Esfahbod +Date: Fri May 10 20:26:29 2019 -0700 + + [meta] Rewrite is_signed, add is_unsigned + + src/hb-meta.hh | 29 ++++++++++++----------------- + 1 file changed, 12 insertions(+), 17 deletions(-) + +commit e939d88bd72e0db0ebe357649b7a0fa3447c0bf4 +Author: Behdad Esfahbod +Date: Fri May 10 20:20:51 2019 -0700 + + [meta] Rewrite is_integral / is_floating_point, add is_arithmetic + + src/hb-meta.hh | 49 +++++++++++++++++++++++++++++++------------------ + 1 file changed, 31 insertions(+), 18 deletions(-) + +commit c3a456a26e8e5f8bc483b326f1928e9c603a7216 +Author: Behdad Esfahbod +Date: Fri May 10 20:17:30 2019 -0700 + + [meta] Rewrite is_cr_convertible + + src/hb-meta.hh | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +commit b4ad6af9c4ec30c462078bd93ae12653619c5fea +Author: Behdad Esfahbod +Date: Fri May 10 20:15:03 2019 -0700 + + [meta] Rewrite is_base_of + + src/hb-meta.hh | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit 5a171ed3a69313e10df6e42a03affb5e8bfe8e95 +Author: Behdad Esfahbod +Date: Fri May 10 20:11:29 2019 -0700 + + [null] Modernize template work + + src/hb-null.hh | 19 ++++++------------- + 1 file changed, 6 insertions(+), 13 deletions(-) + +commit 61d150c916d181cc3f333d0378108e08210370ad +Author: Behdad Esfahbod +Date: Fri May 10 20:06:31 2019 -0700 + + [meta] Add integral_constant, true_t -> true_type, false_t -> false_type + + src/hb-iter.hh | 20 ++++++++++---------- + src/hb-meta.hh | 17 ++++++++--------- + src/hb-null.hh | 4 ++-- + 3 files changed, 20 insertions(+), 21 deletions(-) + +commit 38e3a8bd531ef3d35ca0fbcfad09db3f83345038 +Author: Behdad Esfahbod +Date: Fri May 10 20:03:14 2019 -0700 + + [meta] bool_tt -> bool_constant + + src/hb-meta.hh | 6 +++--- + src/hb-null.hh | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 3919ca41b5e657764c7f75dfdc21cf8ca20bd66f +Author: Behdad Esfahbod +Date: Fri May 10 19:56:36 2019 -0700 + + [meta] Add is_floating_point + + src/hb-meta.hh | 33 +++++++++++++++++++-------------- + 1 file changed, 19 insertions(+), 14 deletions(-) + +commit 25bb7e005d96c367731fd8d129d764d101b1200f +Author: Behdad Esfahbod +Date: Fri May 10 19:49:26 2019 -0700 + + [meta] Add is_signed for floating point types + + src/hb-meta.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit e0315b4aadb3fbc6b618de56d643471e8d1f7859 +Author: Behdad Esfahbod +Date: Fri May 10 19:48:02 2019 -0700 + + [meta] is_integer -> is_integral + + src/hb-algs.hh | 2 +- + src/hb-map.hh | 4 ++-- + src/hb-meta.hh | 26 +++++++++++++------------- + 3 files changed, 16 insertions(+), 16 deletions(-) + +commit 9574de7a3e763b9c5eacf65b4b8c148724c00b82 +Author: Behdad Esfahbod +Date: Fri May 10 19:29:32 2019 -0700 + + [meta] Add add_const, add_pointer, add_lvalue_reference, add_rvalue_reference + + src/hb-meta.hh | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 2fb3a8327ab35248a0c7877c48422718cfbe375d +Author: Behdad Esfahbod +Date: Fri May 10 18:40:29 2019 -0700 + + [vector] Simplify arrayZ + + Was turned into function when we had static ones and wanted to be + move-safe... Not the case anymore. + + src/hb-coretext.cc | 2 +- + src/hb-ot-cff-common.hh | 2 +- + src/hb-uniscribe.cc | 10 +++---- + src/hb-vector.hh | 71 ++++++++++++++++++++++--------------------------- + 4 files changed, 39 insertions(+), 46 deletions(-) + +commit 4d67743ffd99ed9f2278ab21adfac7eb314c0df0 +Author: Behdad Esfahbod +Date: Fri May 10 16:35:31 2019 -0700 + + [subset] Use more auto typing + + src/hb-ot-layout-common.hh | 8 ++++---- + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gsubgpos.hh | 4 ++-- + 3 files changed, 7 insertions(+), 7 deletions(-) + +commit a27a31b9ee2601a05575cb581dc227caa73742c4 +Author: Behdad Esfahbod +Date: Fri May 10 16:26:19 2019 -0700 + + Minor + + src/hb-ot-layout-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2ade0086286963ae2c65d44b94e63cb3836ce36b +Author: Behdad Esfahbod +Date: Fri May 10 16:21:03 2019 -0700 + + [serialize] More rewrite + + src/hb-ot-layout-common.hh | 42 ++++++++++++++++++++++++------------------ + 1 file changed, 24 insertions(+), 18 deletions(-) + +commit 99ed6e29d86bbf391c12ee1f980b8af9dc35615e +Author: Behdad Esfahbod +Date: Fri May 10 16:07:51 2019 -0700 + + [serialize] Fix a TODO + + src/hb-ot-layout-common.hh | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +commit d8a49b53e3676ad742bdb8edf0ec3ca6f7a7cac9 +Author: rsheeter +Date: Fri May 10 16:52:43 2019 -0700 + + Update TESTING.md + + TESTING.md | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 25a5b287f220802728cd3312692f368c45d22862 +Author: Behdad Esfahbod +Date: Fri May 10 16:01:39 2019 -0700 + + Fix sanitize fail of extension sublookups + + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=960331 + + src/hb-ot-layout-common.hh | 10 ++++++++-- + src/hb-sanitize.hh | 2 ++ + ...uzz-testcase-minimized-harfbuzz_fuzzer-5702671124791296 | Bin 0 -> 94 bytes + 3 files changed, 10 insertions(+), 2 deletions(-) + +commit 9c0c3589f31106d1898f8922cc9a2e18cb054989 +Author: Behdad Esfahbod +Date: Fri May 10 13:56:50 2019 -0700 + + Minor + + src/hb-ot-layout-common.hh | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit 5d773ec60029e1a6edec45c27ea918d9be4ea806 +Author: Behdad Esfahbod +Date: Fri May 10 13:53:15 2019 -0700 + + Minor + + src/hb-ot-layout-gsubgpos.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ac737f8c9e7cbc81cdb5a0542a2494671f236895 +Author: Behdad Esfahbod +Date: Fri May 10 13:51:12 2019 -0700 + + Minor again + + src/hb-ot-layout-gsubgpos.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5d4437fad0f99508ebd5c026a3d927f5d649615e +Author: Behdad Esfahbod +Date: Fri May 10 13:43:29 2019 -0700 + + Minor + + src/hb-ot-layout-common.hh | 1 - + 1 file changed, 1 deletion(-) + +commit cd9bc732a75c716121a86e39ab588d2e0af58eba +Author: Behdad Esfahbod +Date: Fri May 10 13:17:41 2019 -0700 + + [gsubgpos] Minor + + src/hb-ot-layout-gsubgpos.hh | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +commit 6d63e27ca41b12ba2e8fb22fd6bc44417651c518 +Author: Behdad Esfahbod +Date: Fri May 10 11:53:02 2019 -0700 + + Generate tarball in .xz instead of .bz2 + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1662 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1d870cce68f7033f6d3967ce4e9ba622a6fafe79 +Author: Behdad Esfahbod +Date: Fri May 10 11:32:59 2019 -0700 + + Fix bot + + Any way to catch these? + + src/test-meta.cc | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit 30e4ae6bd19bf297b029205b5f86c1a0ae14943d +Author: Behdad Esfahbod +Date: Fri May 10 11:26:39 2019 -0700 + + [meta] Add hb_is_base_of + + src/hb-meta.hh | 7 +++++++ + src/test-meta.cc | 16 ++++++++++++++++ + 2 files changed, 23 insertions(+) + +commit 98974ac16f5caf282c9c7cf0c417b494efd6af1d +Author: Behdad Esfahbod +Date: Fri May 10 11:18:52 2019 -0700 + + [iter] Adjust is_source_of / is_sink_of + + There are two cases that we accept. Encode both. + + src/hb-iter.hh | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 1b58bf22ca70908bb578910757795ee32d48b65a +Author: rsheeter +Date: Thu May 9 20:06:29 2019 -0700 + + Update TESTING.md + + TESTING.md | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit ed972d5d73ba0592e1ba92426adf2a8f67acf9c9 +Author: Behdad Esfahbod +Date: Thu May 9 16:58:28 2019 -0700 + + [iter] Rewrite test functions + + Notably, add hb_is_source_of(,) and hb_is_sink_of(,) to replace most + uses of hb_is_iterator_of(,). + + src/hb-iter.hh | 65 +++++++++++++++++++++++++++++----------------- + src/hb-open-type.hh | 7 +++-- + src/hb-ot-layout-common.hh | 6 ++--- + src/hb-ot-name-table.hh | 2 +- + src/test-iter.cc | 2 +- + 5 files changed, 49 insertions(+), 33 deletions(-) + +commit 42901d7af91b4c5cffee9752f653447e4f4bd4f7 +Author: Behdad Esfahbod +Date: Thu May 9 16:22:08 2019 -0700 + + Minor + + src/hb-meta.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 322627ae1daa16f62f7a91c3c3ed02eb5b708ca5 +Author: Behdad Esfahbod +Date: Thu May 9 16:08:10 2019 -0700 + + Whitespace + + src/hb-array.hh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 489f3c35bddb22cfe40c45d3a5c1cb6d88ccaf1f +Author: Behdad Esfahbod +Date: Thu May 9 15:39:32 2019 -0700 + + Fix bot + + src/test-meta.cc | 70 ++++++++++++++++++++++++++++---------------------------- + 1 file changed, 35 insertions(+), 35 deletions(-) + +commit 790315e0dbc0ce796f0081a60953f74bd3fbdb63 +Author: Behdad Esfahbod +Date: Thu May 9 15:31:24 2019 -0700 + + [algs] Implement implicit casting between compatible pair types + + src/hb-algs.hh | 5 +++++ + src/test-algs.cc | 3 +++ + 2 files changed, 8 insertions(+) + +commit 69d9114b5372c1fcea5f20e75a187158c31c52f8 +Author: Behdad Esfahbod +Date: Thu May 9 15:24:14 2019 -0700 + + [meta] Rewrite hb_is_cr_converitble + + src/hb-meta.hh | 22 ++++++++++------------ + 1 file changed, 10 insertions(+), 12 deletions(-) + +commit ceda1f03b7b06248ffd056eb7b2400088bb4a121 +Author: Behdad Esfahbod +Date: Thu May 9 15:19:42 2019 -0700 + + Fix compile + + NameRecord is not copy-constructible, so should be iterator of + const-reference. + + src/hb-meta.hh | 2 -- + src/hb-ot-name-table.hh | 2 +- + src/test-meta.cc | 12 ++++++++++++ + 3 files changed, 13 insertions(+), 3 deletions(-) + +commit 3686c3b65c017cf8689b67db440b4cddd399538b +Author: Behdad Esfahbod +Date: Thu May 9 15:09:07 2019 -0700 + + Adjust is_cr_convertible + + If To is const& then From doesn't need to be &. + + src/hb-meta.hh | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit 726002a6a615e2d213186d402cca4e8d7e7a7f58 +Author: Behdad Esfahbod +Date: Thu May 9 14:53:02 2019 -0700 + + [iter] Make hb_is_iterator_of() check is_convertible + + Instead of is_cr_convertible. + + src/hb-array.hh | 8 ++++---- + src/hb-iter.hh | 2 +- + src/hb-meta.hh | 8 ++++---- + 3 files changed, 9 insertions(+), 9 deletions(-) + +commit 70a49f2e4a9ab05fe04d1949bbf7a128d14a1284 +Author: Behdad Esfahbod +Date: Thu May 9 14:35:15 2019 -0700 + + [meta] Add hb_conditional<> and hb_is_convertible() + + src/Makefile.am | 6 ++++- + src/hb-meta.hh | 56 +++++++++++++++++++++++++++++++++++++-------- + src/test-meta.cc | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 121 insertions(+), 11 deletions(-) + +commit 5e3cbed048b19ee579277ab4c56167a15d13104e +Author: Garret Rieger +Date: Wed May 8 16:33:03 2019 -0700 + + [subset] Switch building of glyph maps in subset plan to use iterators. + + src/hb-algs.hh | 4 +--- + src/hb-subset-plan.cc | 52 +++++++++++++++++++++++++-------------------------- + 2 files changed, 27 insertions(+), 29 deletions(-) + +commit 971020eca7c5d576816b93431607f1e63e9584a4 +Author: Garret Rieger +Date: Wed May 8 16:31:52 2019 -0700 + + Add sink support for hb_hashmap_t and a reverse call to hb_pair_t. + + src/hb-algs.hh | 5 +++++ + src/hb-map.hh | 4 ++++ + 2 files changed, 9 insertions(+) + +commit 98eec3dd5f527cc562d98784429db0c7269e82a8 +Author: Behdad Esfahbod +Date: Thu May 9 13:15:36 2019 -0700 + + Add hb_pair_t(,) macro as alternative to hb_pair_t<,> + + Just so it's easier to use it in other macros. + + src/hb-algs.hh | 1 + + 1 file changed, 1 insertion(+) + +commit c9b287a867d6130a0cc745d7fd3ccfa4dcb4c32e +Author: Behdad Esfahbod +Date: Thu May 9 12:43:57 2019 -0700 + + Add hb_lidentity(), and rename hb_rvalue() to hb_ridentity() + + src/hb-algs.hh | 13 ++++++++++++- + src/hb-map.hh | 4 ++-- + src/test-iter.cc | 2 +- + 3 files changed, 15 insertions(+), 4 deletions(-) + +commit 00195a22ce5198345cb39825a45863cef7d8f7fc +Author: Behdad Esfahbod +Date: Thu May 9 12:14:36 2019 -0700 + + [hdmx] Adjust to hb_iota() behavior change + + Use hb_range() instead. + + src/hb-ot-hdmx-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4f2ad75a839708de71e7341f23c2d4b72059fc58 +Author: Behdad Esfahbod +Date: Thu May 9 12:07:45 2019 -0700 + + [enumerate] Fix hb_enumerate() len for step=0 + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5da3c9c33f02010a3fc57cf0e1d07955af681e7c +Author: Behdad Esfahbod +Date: Thu May 9 11:30:31 2019 -0700 + + [iter] Fix hb_zip() end condition + + We should compare-equal to end if either iterator's end reaches, + not if both reach at the same time. Fixes infinite-loop in test + which was happening after hb_enumerate() switched to using hb_zip(). + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 57a5256fbcef6e5d29fc40cf019cc4b2c29c9dcf +Author: Behdad Esfahbod +Date: Thu May 9 11:30:27 2019 -0700 + + [iter] Minor + + src/hb-iter.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 12dd56f8573cb86169580d5ac31b986208805c03 +Author: Behdad Esfahbod +Date: Thu May 9 11:25:02 2019 -0700 + + [iter] Minor + + src/hb-iter.hh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 57d545932f539d06c52862310ecdfe79c143bb6b +Author: Behdad Esfahbod +Date: Thu May 9 11:23:41 2019 -0700 + + [test-iter] Don't walk past end + + That's not legal. + + src/test-iter.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 46837910e628248edc09e45e212532a3493905da +Author: Behdad Esfahbod +Date: Thu May 9 11:20:41 2019 -0700 + + [iter] Allow negative step in hb_iota() + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 087327af1eac8c3a16115904557cbf3ab0f28072 +Author: Behdad Esfahbod +Date: Thu May 9 11:14:06 2019 -0700 + + [iter] Minor + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 64f0899a9f5e5aff65c5a78fa796ceae6f35c008 +Author: Behdad Esfahbod +Date: Thu May 9 11:10:31 2019 -0700 + + [iter] Bug fix + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5d263556b95047bced88e4a6252178d2fc0f9a19 +Author: Behdad Esfahbod +Date: Thu May 9 11:08:25 2019 -0700 + + [iter] Fix + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2c24ea37b1ef63f79fcc24752dd180ce53540eda +Author: Behdad Esfahbod +Date: Thu May 9 11:07:38 2019 -0700 + + [iter] Take start value in hb_enumerate() + + Also rewrite it via composition. + + src/hb-iter.hh | 61 ++++++++++++-------------------------------------------- + src/test-iter.cc | 1 + + 2 files changed, 14 insertions(+), 48 deletions(-) + +commit 7675d0d3a6cc13ade1a2047019ef7fac8c373a3c +Author: Behdad Esfahbod +Date: Thu May 9 11:02:56 2019 -0700 + + [iter] Add hb_range() + + hb_range() is like Python range. hb_iota() has slightly different API. + Ie. it takes a start, instead of end. + + src/hb-iter.hh | 29 ++++++++++++++++++----------- + src/test-iter.cc | 19 +++++++++++-------- + 2 files changed, 29 insertions(+), 19 deletions(-) + +commit 05867d9f5315c7e4f49e5873a5aba6bba7121f04 +Author: Behdad Esfahbod +Date: Thu May 9 11:00:43 2019 -0700 + + [meta] Add hb_int_max() + + src/hb-meta.hh | 91 ++++++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 56 insertions(+), 35 deletions(-) + +commit 71537f93e0ce27121012bf1e81270b6b03b22224 +Author: Behdad Esfahbod +Date: Thu May 9 10:46:49 2019 -0700 + + [iota] end -> end_ to not shadow + + src/hb-iter.hh | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit 6bc82579100992e3f04c11f36b9c2f0014d880f2 +Merge: 34764454 6d9a86ae +Author: n8willis +Date: Thu May 9 14:39:05 2019 +0100 + + Merge pull request #1680 from n8willis/usermanual-obj + + Usermanual: object-model chapter + +commit 3476445420d0e6432c09710b6667205453799129 +Author: Behdad Esfahbod +Date: Wed May 8 21:14:01 2019 -0700 + + Remove unnecessary template keyword + + Should fix MSVC. + + src/hb-array.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e2a51ff7264940312197184318f5ad4ec971492f +Author: Behdad Esfahbod +Date: Wed May 8 16:41:39 2019 -0700 + + Remove unused var + + src/hb-open-type.hh | 1 - + 1 file changed, 1 deletion(-) + +commit e8b45c19330d8718cd6d7aef0ca2db0539a53294 +Author: Behdad Esfahbod +Date: Wed May 8 16:37:38 2019 -0700 + + [array] Add .copy() + + src/hb-array.hh | 11 +++++++++++ + src/hb-open-type.hh | 10 ++++------ + src/hb-serialize.hh | 2 +- + 3 files changed, 16 insertions(+), 7 deletions(-) + +commit afb013f350b0022ae6c05f140aeba23d5de34101 +Author: Behdad Esfahbod +Date: Wed May 8 16:16:43 2019 -0700 + + Fix msan issue + + hb_identity returns rvalue-reference if input is rvalue. That, can leak + the reference and cause in bad access to temporaries after they are + destructed. This is unfortunately unfixable given the desired + transparency of hb_identity :(. Just don't use it with hb_map(). + + src/test-iter.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4c94bc63d914fac7e11940eb165b6cf1039ba5a1 +Author: Behdad Esfahbod +Date: Wed May 8 15:57:33 2019 -0700 + + Move hb_invoke() back to hb-algs.hh + + src/hb-algs.hh | 32 ++++++++++++++++++++++++++++++++ + src/hb-meta.hh | 32 -------------------------------- + 2 files changed, 32 insertions(+), 32 deletions(-) + +commit b710176ce28e863a01797987d7ce37d19aaf2fd3 +Author: Behdad Esfahbod +Date: Wed May 8 15:46:51 2019 -0700 + + [hdmx] Touch up + + src/hb-ot-hdmx-table.hh | 24 ++++++++++++++---------- + 1 file changed, 14 insertions(+), 10 deletions(-) + +commit e8ef0e627c493af700e254bdd2767f8955f2d03f +Author: Garret Rieger +Date: Tue May 7 17:23:02 2019 -0700 + + [subset] WIP convert hdmx subsetting to use iterators. + + src/hb-ot-hdmx-table.hh | 121 +++++++++++++++++++------------------------- + test/api/test-subset-hdmx.c | 23 --------- + 2 files changed, 51 insertions(+), 93 deletions(-) + +commit d5decf9bf77db914b67ffc446379df621516e362 +Author: Garret Rieger +Date: Tue May 7 15:47:38 2019 -0700 + + [subset] Move hdmx to subset2. + + src/hb-ot-hdmx-table.hh | 36 ++++++------------------------------ + src/hb-subset.cc | 2 +- + 2 files changed, 7 insertions(+), 31 deletions(-) + +commit 27b2093009745b6c30663605f45ac95deb1562cc +Author: Behdad Esfahbod +Date: Wed May 8 15:32:57 2019 -0700 + + [map] Return rvalues from keys()/values() + + src/hb-algs.hh | 7 +++++++ + src/hb-map.hh | 2 ++ + 2 files changed, 9 insertions(+) + +commit 372c5b97bfa3b744de1d017cf662607eb8a2fa6e +Author: Behdad Esfahbod +Date: Wed May 8 15:28:39 2019 -0700 + + [map] Fix bots + + Older compilers don't like calling iter() from return-type decltype() + + ../src/hb-map.hh:226:12: error: cannot call member function 'decltype ((((+ hb_array(((const hb_hashmap_t*)this)->hb_hashmap_t::items, (((const hb_hashmap_t*)this)->hb_hashmap_t::mask ? (((const hb_hashmap_t*)this)->hb_hashmap_t::mask + 1) : 0))) | hb_filter((& hb_hashmap_t::item_t:: is_real))) | hb_map((& hb_hashmap_t::item_t:: get_pair)))) hb_hashmap_t::iter() const [with K = const hb_serialize_context_t::object_t*; V = unsigned int; K kINVALID = 0u; V vINVALID = 0u; decltype ((((+ hb_array(((const hb_hashmap_t*)this)->hb_hashmap_t::items, (((const hb_hashmap_t*)this)->hb_hashmap_t::mask ? (((const hb_hashmap_t*)this)->hb_hashmap_t::mask + 1) : 0))) | hb_filter((& hb_hashmap_t::item_t:: is_real))) | hb_map((& hb_hashmap_t::item_t:: get_pair)))) = hb_map_iter_t::item_t>, bool (hb_hashmap_t::item_t::*)() const, const&, 0u>, hb_pair_t (hb_hashmap_t::item_t::*)() const, 0u>]' without object + + iter() + ^ + ../src/hb-meta.hh:58:41: note: in definition of macro 'HB_AUTO_RETURN' + #define HB_AUTO_RETURN(E) -> decltype ((E)) { return (E); } + ^ + + src/hb-map.hh | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit a30482718491e3455365167e1c85981c8c0f542b +Author: Behdad Esfahbod +Date: Wed May 8 15:08:10 2019 -0700 + + [map] Add .values() iterator + + src/hb-map.hh | 6 +++++- + src/test-iter.cc | 8 ++++++++ + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit 3c69505b3a7850b68a931849a2badb84b6b36d51 +Author: Behdad Esfahbod +Date: Wed May 8 15:05:10 2019 -0700 + + [map] Fix iter + + src/hb-map.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5ceaafa5de8dff51fe91f7008a12ec9c304a1376 +Author: Behdad Esfahbod +Date: Wed May 8 14:59:25 2019 -0700 + + [algs] Fix identity return type + + src/hb-algs.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit f5705d7656817cbfdbc4479b1cb0be3af6f4abdf +Author: Behdad Esfahbod +Date: Wed May 8 14:46:55 2019 -0700 + + Whitespace + + src/hb-map.hh | 10 +++++----- + src/test-iter.cc | 11 +++++++---- + 2 files changed, 12 insertions(+), 9 deletions(-) + +commit a17f0fa3a10a25959561582ae63ef2e5208647e2 +Author: Behdad Esfahbod +Date: Wed May 8 14:44:11 2019 -0700 + + [meta] Capture rvalue-references in is_reference / remove_reference + + src/hb-meta.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 7166bd563447a64eda05c66668bd4a178292bd79 +Author: Behdad Esfahbod +Date: Wed May 8 14:24:57 2019 -0700 + + Minor + + src/hb-open-type.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b827181ba1f539c990e1bd8fdd3559f1589c8d28 +Author: rsheeter +Date: Wed May 8 13:51:11 2019 -0700 + + [map] tweak test-iter.cc + + src/hb-map.hh | 1 - + src/test-iter.cc | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +commit 492af0f1bf1d7198b474fda2faca451908af267f +Author: rsheeter +Date: Wed May 8 12:47:18 2019 -0700 + + [map] add keys() + + src/hb-map.hh | 9 ++++++++- + src/test-iter.cc | 4 ++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + +commit ba60512813caafc2006b26214e95bbfe1c0e460a +Author: rsheeter +Date: Wed May 8 12:09:10 2019 -0700 + + [map] add a test for iteration + + src/hb-map.hh | 2 +- + src/test-iter.cc | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 183b8094b577dcb7f40b7fcd64b60d405845897a +Author: rsheeter +Date: Wed May 8 11:40:31 2019 -0700 + + [map] add iteration + + src/hb-map.hh | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit df237d2fe78086ad16bdbd2cc60639ae9ce909d6 +Author: Ebrahim Byagowi +Date: Wed May 8 14:17:14 2019 -0700 + + [test] Add https://crbug.com/oss-fuzz/14641 testcase + + As 503748d fix + + ...-testcase-minimized-hb-subset-fuzzer-5676773460672512 | Bin 0 -> 2172 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 02ae2591d930563cec8c3c63086afb0a3a12c4aa +Author: Michiharu Ariza +Date: Wed May 8 13:44:03 2019 -0700 + + initialize return param subr_num in popSubrNum + + also snake_cased popSubrtNum and other surrounding function names + + src/hb-cff-interp-cs-common.hh | 15 ++++++++------- + src/hb-subset-cff1.cc | 4 ++-- + src/hb-subset-cff2.cc | 4 ++-- + 3 files changed, 12 insertions(+), 11 deletions(-) + +commit 503748d8a80dd5db450c8c4dc109f2b97049d989 +Author: Behdad Esfahbod +Date: Wed May 8 12:45:02 2019 -0700 + + [name] Sanitize records for reals + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14641 + + src/hb-ot-name-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5875d775e1253c0e14b900539c28c2de881da7aa +Author: Behdad Esfahbod +Date: Wed May 8 12:25:34 2019 -0700 + + [iter] Rename hb_iter_t() to hb_iter_type<> and add hb_item_type<> + + src/hb-iter.hh | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +commit bad16066392e4dbdd8490a4b1c70d1dcddcc8ec8 +Author: Behdad Esfahbod +Date: Wed May 8 12:11:52 2019 -0700 + + [map] Make .has() optionally return value + + src/hb-map.hh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 750d5af48e38627c3c84a2f3857a7ee602221e24 +Author: Behdad Esfahbod +Date: Wed May 8 12:01:55 2019 -0700 + + Make compiler happy with -Og + + src/hb-cff-interp-cs-common.hh | 2 +- + src/hb-ot-cmap-table.hh | 6 +++--- + src/hb-ot-glyf-table.hh | 2 +- + src/hb-subset-glyf.cc | 4 ++-- + 4 files changed, 7 insertions(+), 7 deletions(-) + +commit cdb61eb0431d426f7152f975e89ee3ba4431083f +Author: Behdad Esfahbod +Date: Wed May 8 11:00:18 2019 -0700 + + [iter] Accept pointer in hb_iter() and hb_iter_t() + + src/hb-iter.hh | 4 ++-- + src/test-iter.cc | 3 +++ + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit c93eeba9b21cb8f8ba64ebaf284bf9c8a8544886 +Author: Behdad Esfahbod +Date: Wed May 8 10:56:09 2019 -0700 + + [iter] Accept pointer in hb_map() + + src/hb-iter.hh | 4 ++-- + src/test-iter.cc | 7 ++++++- + 2 files changed, 8 insertions(+), 3 deletions(-) + +commit 4c9e0c37a34e8355d752af39507b310f473bffa5 +Author: Behdad Esfahbod +Date: Wed May 8 10:40:39 2019 -0700 + + [serialize] LangSys subset->copy + + src/hb-ot-layout-common.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 50dc3e7d9f4f290c7353313c5e5f888cb7c4846d +Author: Behdad Esfahbod +Date: Wed May 8 10:35:02 2019 -0700 + + Add hb_iota() + + src/hb-iter.hh | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/test-iter.cc | 10 ++++++++++ + 2 files changed, 61 insertions(+) + +commit aa4ac13f0be34bba66b00d04fd7806c474ff59c0 +Author: Behdad Esfahbod +Date: Wed May 8 10:02:30 2019 -0700 + + [iter] Actually fix previous commit + + The iter objects shouldn't not be const. D'oh. + + src/hb-iter.hh | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit a66598e0306fe80063c5d6a678bbca4a931bc4d4 +Author: Behdad Esfahbod +Date: Wed May 8 09:56:29 2019 -0700 + + [iter] For ref-qualified variants + + src/hb-iter.hh | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit fa576ce1874fd886688bf3f16b714d86aebb07ec +Author: rsheeter +Date: Wed May 8 09:53:58 2019 -0700 + + Update README.md + + README.md | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit d109c9e767ff3198d51e23a7ac8931d0bc4d5d72 +Author: rsheeter +Date: Wed May 8 09:53:29 2019 -0700 + + Update README.md + + README.md | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 4063181791d6b3efb35e7c748dee12273e64ebd4 +Author: rsheeter +Date: Wed May 8 09:47:34 2019 -0700 + + [docs] add fuzzer instructions (courtesy of Garret) + + TESTING.md | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 00946ca3aa45f109c455871ce89c5872fd243624 +Author: Roderick Sheeter +Date: Wed May 8 09:42:35 2019 -0700 + + [docs] add sample commands for test exec + + README.md | 4 ++++ + TESTING.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 51 insertions(+) + +commit 8479eb5955c93cbc8951d0319b2fe43ff19cc403 +Author: Behdad Esfahbod +Date: Wed May 8 09:48:55 2019 -0700 + + [iter] Fix hb_sink() to accept rvalue + + src/hb-iter.hh | 2 +- + src/test-iter.cc | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 710d459acac88fd784d4ead0ba75b9aa623c48d4 +Author: Behdad Esfahbod +Date: Wed May 8 09:33:09 2019 -0700 + + [iter] Default predicates to hb_identity instead of hb_bool + + The bool conversion happens after predicate is called automatically. + + src/hb-iter.hh | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit fe14a4000a58528878bcc75fde0972de2b779316 +Author: Behdad Esfahbod +Date: Wed May 8 09:32:19 2019 -0700 + + Adjust hb_all/any/none + + src/hb-iter.hh | 18 +++++++++--------- + src/test-iter.cc | 10 ++++++---- + 2 files changed, 15 insertions(+), 13 deletions(-) + +commit 4a101d8ffccd6f907f16ef190125ded5e27e0d8b +Author: Behdad Esfahbod +Date: Wed May 8 09:16:33 2019 -0700 + + Add hb_match + + src/hb-algs.hh | 30 +++++++++++++++++++++++++++++- + 1 file changed, 29 insertions(+), 1 deletion(-) + +commit 26adefd9eaf4bc1d80b1ffececf0d86f3308f9ee +Author: Behdad Esfahbod +Date: Wed May 8 09:14:44 2019 -0700 + + [algs] Try f[v] in hb_get() as last resort + + src/hb-algs.hh | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 0601a19d38b2b0fc5dd36fd821af634a49322ebf +Author: Behdad Esfahbod +Date: Wed May 8 07:47:36 2019 -0700 + + Fix a few more double-pomotion errors + + src/hb-coretext.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 2ba984fcbbef4561d35c3a2c502610c38b26f4fb +Author: Behdad Esfahbod +Date: Tue May 7 23:28:22 2019 -0700 + + Fix signed comparison on 32bit + + src/hb-sanitize.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dfc57802450360f06026668b7b61495aaa2d1943 +Author: Behdad Esfahbod +Date: Tue May 7 23:26:09 2019 -0700 + + Fix more double-promotion errors + + WHy do only some of the clang bots catch this I have no idea :(. + + src/hb-aat-layout-trak-table.hh | 4 ++-- + src/hb-font.hh | 2 +- + src/hb-open-type.hh | 4 ++-- + src/hb-ot-color-cbdt-table.hh | 12 ++++++------ + src/hb-ot-color-sbix-table.hh | 10 +++++----- + src/hb-ot-layout-gpos-table.hh | 20 ++++++++++---------- + 6 files changed, 26 insertions(+), 26 deletions(-) + +commit c2c9d204fa5c2189e369726276a1c0e92e09a9ce +Author: Behdad Esfahbod +Date: Tue May 7 23:13:38 2019 -0700 + + Fix double-promotion warnings + + Make it an error. + + src/hb-ot-var-fvar-table.hh | 12 ++++++------ + src/hb.hh | 1 + + 2 files changed, 7 insertions(+), 6 deletions(-) + +commit 2c7093ed01f417828d5521d983eae63042363197 +Author: Behdad Esfahbod +Date: Tue May 7 23:10:59 2019 -0700 + + More tests + + src/test-algs.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 56d2d0294b836ea1e2dea9e242ae72c99387d00a +Author: Behdad Esfahbod +Date: Tue May 7 23:08:49 2019 -0700 + + [algs] Sprinkle hb_min/max with hb-forward salad + + Let's see if fixes MSVC fail. Though, the error doesn't make sense to me. + + hb-blob.cc + c:\projects\harfbuzz\src\hb-algs.hh(166): error C2440: 'return': cannot convert from 'unsigned int' to 'unsigned int &&' [C:\projects\harfbuzz\build\harfbuzz.vcxproj] + c:\projects\harfbuzz\src\hb-algs.hh(166): note: You cannot bind an lvalue to an rvalue reference + c:\projects\harfbuzz\src\hb-algs.hh(174): note: see reference to function template instantiation 'T &&::impl(T &&,T2) const' being compiled + with + [ + T=unsigned int, + T2=unsigned int & + ] + + src/hb-algs.hh | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit bdbfdc92b58d5c9f8654e430075dab543d1ba394 +Author: Behdad Esfahbod +Date: Tue May 7 22:52:43 2019 -0700 + + [iter] Add value and projection to hb_all/any/none + + Allows for eg, checking all values equal 2: hb_all (it, 2). + + src/hb-iter.hh | 24 ++++++++++++++++++------ + src/test-iter.cc | 10 +++++++++- + 2 files changed, 27 insertions(+), 7 deletions(-) + +commit cf61acb9eaa2bb3fe479a9050116b4b96934e3ed +Author: Behdad Esfahbod +Date: Tue May 7 22:45:01 2019 -0700 + + [iter] Accept rvalues to hb_enumerate() + + src/hb-iter.hh | 2 +- + src/test-iter.cc | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit e8bd5fc3fa2cc5c5f8f254629553902aed3496ba +Author: Behdad Esfahbod +Date: Tue May 7 22:29:40 2019 -0700 + + [meta] Move hb_invoke from algs to meta + + src/hb-algs.hh | 31 ------------------------------- + src/hb-meta.hh | 32 ++++++++++++++++++++++++++++++++ + 2 files changed, 32 insertions(+), 31 deletions(-) + +commit af571dbffc12e6bb7a3146762d12bb4ac3f19bdc +Author: Behdad Esfahbod +Date: Tue May 7 21:39:20 2019 -0700 + + [meta] Replace most hb_enable_if with hb_requires + + They do absolutely same thing. hb_requires is to encode constraints, + whereas hb_enable_if is for more conditional enabling. + + src/hb-iter.hh | 63 +++++++++++++++++++++------------------------- + src/hb-open-type.hh | 6 ++--- + src/hb-ot-layout-common.hh | 6 ++--- + src/test-iter.cc | 6 ++--- + 4 files changed, 37 insertions(+), 44 deletions(-) + +commit 6fa1f38070e710b2f80a836bd633b6ab33e1bc80 +Author: Behdad Esfahbod +Date: Tue May 7 21:33:26 2019 -0700 + + [algs] Accept varargs in hb_min/max + + src/hb-algs.hh | 24 +++++++++++++++++++++--- + src/test-algs.cc | 8 ++++++++ + 2 files changed, 29 insertions(+), 3 deletions(-) + +commit 1ad07080c3ea7f6a1b3cb247529ec0c78575a6d3 +Author: Behdad Esfahbod +Date: Tue May 7 21:00:23 2019 -0700 + + Rename + + src/hb-algs.hh | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit 83e3eabd84e2b53c696768d1357a6a259bcd3576 +Author: Behdad Esfahbod +Date: Tue May 7 20:58:43 2019 -0700 + + Whitespace + + src/hb-aat-layout-common.hh | 2 +- + src/hb-aat-layout-kerx-table.hh | 2 +- + src/hb-aat-layout-morx-table.hh | 2 +- + src/hb-algs.hh | 6 +++--- + src/hb-dispatch.hh | 2 +- + src/hb-open-type.hh | 18 +++++++++--------- + src/hb-ot-kern-table.hh | 4 ++-- + src/hb-ot-layout-common.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 16 ++++++++-------- + src/hb-ot-layout-gsub-table.hh | 14 +++++++------- + src/hb-ot-layout-gsubgpos.hh | 8 ++++---- + src/hb-sanitize.hh | 6 +++--- + src/hb-serialize.hh | 12 ++++++------ + src/hb-subset.hh | 6 +++--- + 14 files changed, 50 insertions(+), 50 deletions(-) + +commit 2b9402a86a4e37e6386f8028bdf3789ae262a4c4 +Author: Behdad Esfahbod +Date: Tue May 7 20:55:33 2019 -0700 + + Use universal references in hb_min/max + + src/hb-algs.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 41248cce0e32653227a83eb4e42ccf793f040fc2 +Author: Behdad Esfahbod +Date: Tue May 7 20:54:31 2019 -0700 + + Remove MIN/MAX in favor of hb_min/hb_max + + src/hb-aat-layout-common.hh | 8 ++++---- + src/hb-aat-layout-feat-table.hh | 2 +- + src/hb-aat-layout-kerx-table.hh | 2 +- + src/hb-aat-layout-morx-table.hh | 18 +++++++++--------- + src/hb-algs.hh | 14 +++++--------- + src/hb-array.hh | 4 ++-- + src/hb-blob.cc | 2 +- + src/hb-buffer-serialize.cc | 32 ++++++++++++++++---------------- + src/hb-buffer.cc | 4 ++-- + src/hb-buffer.hh | 2 +- + src/hb-common.cc | 20 ++++++++++---------- + src/hb-coretext.cc | 6 +++--- + src/hb-debug.hh | 2 +- + src/hb-directwrite.cc | 2 +- + src/hb-ft.cc | 2 +- + src/hb-iter.hh | 2 +- + src/hb-open-file.hh | 2 +- + src/hb-open-type.hh | 2 +- + src/hb-ot-cmap-table.hh | 8 ++++---- + src/hb-ot-color-cbdt-table.hh | 6 +++--- + src/hb-ot-color-cpal-table.hh | 2 +- + src/hb-ot-color-sbix-table.hh | 2 +- + src/hb-ot-glyf-table.hh | 14 +++++++------- + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 4 ++-- + src/hb-ot-layout-gsubgpos.hh | 6 +++--- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-map.cc | 8 ++++---- + src/hb-ot-post-table.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 8 ++++---- + src/hb-ot-shape-complex-use.cc | 2 +- + src/hb-ot-shape.cc | 4 ++-- + src/hb-ot-tag.cc | 2 +- + src/hb-ot-var-avar-table.hh | 2 +- + src/hb-ot-var-fvar-table.hh | 18 +++++++++--------- + src/hb-sanitize.hh | 4 ++-- + src/hb-uniscribe.cc | 2 +- + 38 files changed, 111 insertions(+), 115 deletions(-) + +commit 5c0f62adc969696b46c1ceb57cd3c2fa408eb94f +Author: Behdad Esfahbod +Date: Tue May 7 17:23:46 2019 -0700 + + [serializer] Accept pointer & reference in more methods + + src/hb-serialize.hh | 39 ++++++++++++++++++++++++--------------- + 1 file changed, 24 insertions(+), 15 deletions(-) + +commit 839618de3b3da285e8753b6ca6d767e9a483bfde +Author: Behdad Esfahbod +Date: Tue May 7 17:21:27 2019 -0700 + + [serializer] Minor + + src/hb-serialize.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 035b818e34bbd2d5c1f65328c9847c845d74d919 +Author: Behdad Esfahbod +Date: Tue May 7 17:21:18 2019 -0700 + + [meta] Fix addressof() + + src/hb-meta.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7654ebe3a51c98b4d3bf6fb11779024f1c770962 +Author: Behdad Esfahbod +Date: Tue May 7 16:53:03 2019 -0700 + + Whitespace + + src/hb-algs.hh | 30 ++++++++++++++++++++---------- + src/hb-iter.hh | 39 ++++++++++++++++++++++++++------------- + src/hb-meta.hh | 11 ++++++----- + 3 files changed, 52 insertions(+), 28 deletions(-) + +commit 95426ea983bde01fadf4681926cb77e3b3c0d40a +Author: Behdad Esfahbod +Date: Tue May 7 15:56:51 2019 -0700 + + Add comment + + src/hb-open-type.hh | 1 + + 1 file changed, 1 insertion(+) + +commit e33ad252222481a6078a8bb423505e713b081313 +Author: Behdad Esfahbod +Date: Tue May 7 15:46:24 2019 -0700 + + [serialize] FeatureVariations subset->copy + + src/hb-ot-layout-common.hh | 6 +++--- + src/hb-ot-layout-gsubgpos.hh | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit fa8c4ba81175f671c3f39f1586d0a1d9067d9f89 +Author: Behdad Esfahbod +Date: Tue May 7 14:26:03 2019 -0700 + + Minor + + src/hb-serialize.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c09d6c58e99dba50f29a569e4c53916b5b507ef1 +Author: Behdad Esfahbod +Date: Tue May 7 14:09:00 2019 -0700 + + [iter] Require lvalue in operators that return reference + + src/hb-iter.hh | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 52f6c04c1e0eab2aaa0c7d817b212c01ba993fe9 +Author: Behdad Esfahbod +Date: Tue May 7 13:45:48 2019 -0700 + + Minor + + src/hb-serialize.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 7c037bd2be2e794dfd882b806f684ad74c56dbb8 +Author: Behdad Esfahbod +Date: Tue May 7 13:37:43 2019 -0700 + + [name] Clean up some more + + src/hb-meta.hh | 2 ++ + src/hb-ot-name-table.hh | 30 ++++++++++++++---------------- + 2 files changed, 16 insertions(+), 16 deletions(-) + +commit f982b9d9f8d6b61efd2a3e89cc3d34923c1914b0 +Author: Behdad Esfahbod +Date: Tue May 7 13:29:01 2019 -0700 + + [name] Clean up serialize() API + + src/hb-ot-name-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 59ee61fddc76cd18f19f351bca7dd293eb610333 +Author: Behdad Esfahbod +Date: Tue May 7 13:26:15 2019 -0700 + + [name] Use iterators more + + src/hb-ot-name-table.hh | 46 +++++++++++++++------------------------------- + src/hb-subset-plan.cc | 3 +++ + 2 files changed, 18 insertions(+), 31 deletions(-) + +commit 2eb7e0e0e923d096d2598133cacd6e5ee04a6a04 +Author: Behdad Esfahbod +Date: Tue May 7 12:45:38 2019 -0700 + + [serialize] Minor + + src/hb-serialize.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 1c81cff2d3f9df2c18ffbdfff02ed418560480c1 +Author: Behdad Esfahbod +Date: Tue May 7 11:51:10 2019 -0700 + + Fix signed-comparison error on 32bit + + src/hb-serialize.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 938de315756e08bd2b5fa816c7951640e5835b2e +Author: Behdad Esfahbod +Date: Tue May 7 11:47:02 2019 -0700 + + Comment + + src/hb-subset-glyf.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 159fe962e90dd3b758ad10046b9d75cf87c1d4f3 +Author: Behdad Esfahbod +Date: Tue May 7 11:46:11 2019 -0700 + + [doc] Make header search more resilient + + How stupid to scan all files... Sigh. + + docs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9b05db33b54e6e5f0b4658f4c06e7fe563f8923b +Author: Behdad Esfahbod +Date: Tue May 7 11:39:44 2019 -0700 + + [ragel] Regenerate ragel-generated files using ragel 7.0.0.11 May 2018 + + src/hb-buffer-deserialize-json.hh | 1051 +++++------ + src/hb-buffer-deserialize-text.hh | 1009 +++++------ + src/hb-ot-shape-complex-indic-machine.hh | 2678 ++++++++++++++++------------ + src/hb-ot-shape-complex-khmer-machine.hh | 709 ++++---- + src/hb-ot-shape-complex-myanmar-machine.hh | 820 +++++---- + src/hb-ot-shape-complex-use-machine.hh | 1144 ++++++------ + 6 files changed, 3959 insertions(+), 3452 deletions(-) + +commit 521262b236dacf7b2b64e0a1d3c79d6a10b07063 +Author: Behdad Esfahbod +Date: Tue May 7 11:08:08 2019 -0700 + + [subset] Add TODO + + src/hb-subset.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit e6a622b5b202533d64f83e71d7ff8a8104d46e26 +Author: Behdad Esfahbod +Date: Tue May 7 11:06:43 2019 -0700 + + [serialize] Enable bias assertion + + src/hb-serialize.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 530ddbbc320bd24b4902ee6d49bf80242a591794 +Author: Behdad Esfahbod +Date: Tue May 7 11:05:51 2019 -0700 + + [serialize] Use range-based loop + + src/hb-serialize.hh | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +commit 0987c4204fae66f80224c6f01d9c5dc3abe809e0 +Author: Behdad Esfahbod +Date: Tue May 7 11:01:02 2019 -0700 + + [name] Remove dead code + + src/hb-ot-name-table.hh | 88 +------------------------------------------------ + 1 file changed, 1 insertion(+), 87 deletions(-) + +commit 5ac4ab686809be9352e91bc3213e1edf3ba66a93 +Author: Behdad Esfahbod +Date: Thu May 2 16:29:07 2019 -0700 + + [subset] fix for name table serializing with new serializer machinery + + src/hb-ot-name-table.hh | 8 ++++++-- + test/api/fonts/nameID.expected.ttf | Bin 170696 -> 2388 bytes + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit c548fcedc404c03442c042059a71194d97d23bb6 +Author: Behdad Esfahbod +Date: Thu May 2 16:29:07 2019 -0700 + + [WIP] [name] Port to fancy serializer machinery + + src/hb-ot-name-table.hh | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +commit fa2d97161f8b7de3d7a70e06d41b6f7e154012ad +Author: Behdad Esfahbod +Date: Tue May 7 00:34:50 2019 -0700 + + Remove use of deprecated implicit copy/move assignment operators + + By removing custom copy constructor. + + src/hb-meta.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit 45f5e56236912359d0ac72310dcdba9259cfee66 +Author: Behdad Esfahbod +Date: Tue May 7 00:33:32 2019 -0700 + + Warn on -Wdeprecated + + src/hb.hh | 1 + + 1 file changed, 1 insertion(+) + +commit c3e0eafc80481f8c16516fdae1841c563e7253d4 +Author: Ebrahim Byagowi +Date: Tue May 7 12:04:00 2019 +0430 + + [ci] Upgrade Ubuntu 17.10 bots to 19.04 + + .circleci/config.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8903040fcd09e7d7ad5112ac2a583718bb85795d +Author: Behdad Esfahbod +Date: Tue May 7 00:13:11 2019 -0700 + + Actually make it work + + src/hb-iter.hh | 2 ++ + src/hb-meta.hh | 6 ++++-- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit 025eaa3c81214cdb20f2f588bab665512d21507c +Author: Behdad Esfahbod +Date: Tue May 7 00:05:37 2019 -0700 + + [iter] Make filter/map copyable + + src/hb-iter.hh | 18 +++++++++--------- + src/test-iter.cc | 4 ++-- + 2 files changed, 11 insertions(+), 11 deletions(-) + +commit 03a68165d8296ed5cc0eb2434500381419409e79 +Author: Behdad Esfahbod +Date: Tue May 7 00:03:35 2019 -0700 + + [meta] Add hb_reference_wrapper<> + + Functionality kinda superset of std:: counterpart. + + src/hb-meta.hh | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit 0bf86d9c5dcb0de206b38c3cf1824d2254376f37 +Author: Behdad Esfahbod +Date: Mon May 6 23:39:26 2019 -0700 + + Whitespace + + src/hb-meta.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 72eb91deb9eb7a08e38e100a3234518651fe4cb8 +Author: Behdad Esfahbod +Date: Mon May 6 23:39:13 2019 -0700 + + Add hb_ref() + + Unused. + + src/hb-meta.hh | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 240f57e58d3b0161feb90621d5db9e2fc4d99b27 +Author: Behdad Esfahbod +Date: Mon May 6 23:17:39 2019 -0700 + + Rename hb_deref_pointer() to hb_deref() + + src/hb-algs.hh | 12 ++++++------ + src/hb-map.hh | 2 +- + src/hb-meta.hh | 2 +- + src/hb-serialize.hh | 2 +- + 4 files changed, 9 insertions(+), 9 deletions(-) + +commit 0b1ca5a13b6921cb4d00f8651bb99fc7c7037ec2 +Author: Behdad Esfahbod +Date: Mon May 6 23:04:32 2019 -0700 + + [iter] Adjust hb_filter + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4c2fd05ca5fa34303b986c34948b512d770ab8fe +Author: Behdad Esfahbod +Date: Mon May 6 19:57:15 2019 -0700 + + [iter] Implement range-based for loops + + Part of https://github.com/harfbuzz/harfbuzz/issues/1648 + + src/hb-array.hh | 6 ++++ + src/hb-iter.hh | 74 ++++++++++++++++++++++++++++++++++++++++++++-- + src/hb-ot-layout-common.hh | 14 +++++++++ + src/hb-set.hh | 3 ++ + src/test-iter.cc | 28 ++++++++++++++---- + 5 files changed, 118 insertions(+), 7 deletions(-) + +commit e261dc3a4043230ae1b4f56e2cc7d3133b7da4ca +Author: Ebrahim Byagowi +Date: Tue May 7 01:24:55 2019 +0430 + + Ignore -Wc++11-compat as we require C++11 actually + + pollutes gcc bots logs https://circleci.com/gh/harfbuzz/harfbuzz/85395 + + src/hb.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 9f9890e9e82c620e733d123f421f7c63d91ce8e1 +Author: Behdad Esfahbod +Date: Mon May 6 12:16:51 2019 -0700 + + Remove HB_NO_OPTIONS in favor of HB_NO_GETENV + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-debug.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 36bb24f7b4dbbe171b945639bac749c46785e17c +Author: Behdad Esfahbod +Date: Sun May 5 10:14:17 2019 -0700 + + [dispatch] Forward arguments in all dispatch multiplexers + + src/hb-aat-layout-kerx-table.hh | 14 ++++----- + src/hb-aat-layout-morx-table.hh | 14 ++++----- + src/hb-ot-kern-table.hh | 16 +++++----- + src/hb-ot-layout-common.hh | 6 ++-- + src/hb-ot-layout-gpos-table.hh | 68 ++++++++++++++++++++--------------------- + src/hb-ot-layout-gsub-table.hh | 58 +++++++++++++++++------------------ + src/hb-ot-layout-gsubgpos.hh | 32 +++++++++---------- + 7 files changed, 104 insertions(+), 104 deletions(-) + +commit c14efb8e68e31fb7537bcfe5eea779c0830a0b0c +Author: Behdad Esfahbod +Date: Sun May 5 09:54:58 2019 -0700 + + Fix previous commit + + Priority should be given to specific over dispatch. Broke sanitize before. + This fixes it, by moving prioritization to the context implementation, since + the correct priority cannot be done in the dispatch implementation. Done + for subset and sanitize only, which need it. + + src/hb-aat-layout-common.hh | 2 +- + src/hb-dispatch.hh | 10 +--------- + src/hb-ot-layout-gsubgpos.hh | 14 +++++++------- + src/hb-sanitize.hh | 16 +++++++++++++--- + src/hb-subset.hh | 15 ++++++++++++--- + 5 files changed, 34 insertions(+), 23 deletions(-) + +commit b10f65933a77434bf8d68058793037f38a8ed5a6 +Author: Behdad Esfahbod +Date: Sun May 5 09:23:35 2019 -0700 + + [dispatch] Use functionality from previous commit + + To remove a couple of unwanted wrapper methods + + src/hb-dispatch.hh | 15 +++++++++------ + src/hb-open-type.hh | 10 +++++----- + src/hb-ot-layout-gpos-table.hh | 6 ------ + src/hb-ot-layout-gsub-table.hh | 6 ------ + src/hb-sanitize.hh | 5 +++-- + src/hb-subset.hh | 5 +++-- + 6 files changed, 20 insertions(+), 27 deletions(-) + +commit ac350c92fd6b04845c6240a5f3b77ceaf29e51d0 +Author: Behdad Esfahbod +Date: Sun May 5 09:10:46 2019 -0700 + + [dispatch] Try obj.dispatch(c) before trying c->dispatch(obj) + + src/hb-aat-layout-common.hh | 2 +- + src/hb-dispatch.hh | 13 +++++++++++++ + src/hb-ot-layout-gsubgpos.hh | 14 +++++++------- + src/hb-sanitize.hh | 2 +- + src/hb-subset.hh | 4 ++-- + 5 files changed, 24 insertions(+), 11 deletions(-) + +commit 0d5fd168f8e3c1202358a82161a28e407149b1b4 +Author: Behdad Esfahbod +Date: Fri May 3 10:37:32 2019 -0700 + + Revert "[WIP] [name] Port to fancy serializer machinery" + + This reverts commit c7f366fbbb208d0a9103ac4ee4ac00ff726c31e4. + + Don't know how it got to master! + + src/hb-ot-name-table.hh | 18 +++++++----------- + 1 file changed, 7 insertions(+), 11 deletions(-) + +commit 72e3eba8f87e2a8b145a4f98e24499f0aafe099b +Author: Cody Planteen +Date: Thu May 2 13:03:15 2019 -0600 + + Add configuration option HB_NO_GETENV to disable use of getenv() + + src/hb.hh | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit c7f366fbbb208d0a9103ac4ee4ac00ff726c31e4 +Author: Behdad Esfahbod +Date: Thu May 2 16:29:07 2019 -0700 + + [WIP] [name] Port to fancy serializer machinery + + src/hb-ot-name-table.hh | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +commit 8855af38a8497d7788924d368baa9eeae4916940 +Author: Behdad Esfahbod +Date: Thu May 2 16:26:06 2019 -0700 + + [name] Add NameRecord::copy() + + src/hb-ot-name-table.hh | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 097bb3f0af391dbb5d498df548b769f165f35c8a +Author: Behdad Esfahbod +Date: Thu May 2 16:25:00 2019 -0700 + + [name] Minor changes + + src/hb-ot-name-table.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 431b6e1c449582619169722e16b472e872b02d58 +Author: Behdad Esfahbod +Date: Thu May 2 16:22:32 2019 -0700 + + [serialize] Disable assertion for now + + src/hb-serialize.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8a32c9eecbdc907415195eca9ebad47c8acf2df5 +Author: Behdad Esfahbod +Date: Thu May 2 16:20:18 2019 -0700 + + [serialize] Misc getting copy() to work + + src/hb-open-type.hh | 16 +++++++++------- + src/hb-serialize.hh | 26 ++++++++++++++++---------- + 2 files changed, 25 insertions(+), 17 deletions(-) + +commit 7d497a3a92973d4cec14888b932091f49de1d190 +Author: Behdad Esfahbod +Date: Thu May 2 16:20:03 2019 -0700 + + [debug] Allow return_trace() to return any type + + src/hb-debug.hh | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit 49b1c763a0459d586b7f0aa86eadd13d21b24867 +Author: Behdad Esfahbod +Date: Thu May 2 16:19:34 2019 -0700 + + [test] Run "fonttools ttx" instead of "ttx" + + test/subset/run-tests.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 91176d5b778b44172591e82ba84127e5eff1372d +Author: Behdad Esfahbod +Date: Thu May 2 15:12:07 2019 -0700 + + [serialize] Check offset base is within (possibly end of) object + + src/hb-serialize.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 0f1a6ce8268b197732aab40069bbda57eddac2e0 +Author: Behdad Esfahbod +Date: Thu May 2 15:03:41 2019 -0700 + + [name] Fix format of susbetted table to 0 + + src/hb-ot-name-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 87810fc958e28d0c5e05097b1b3fe78d962fdc62 +Author: Behdad Esfahbod +Date: Thu May 2 14:45:57 2019 -0700 + + [name] Use variable forwarding to simplify sanitize() + + src/hb-ot-name-table.hh | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +commit bf91b418b0e988619c230156f5f062c5d2802dd8 +Author: Behdad Esfahbod +Date: Thu May 2 14:42:37 2019 -0700 + + [name] + + src/hb-ot-name-table.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 998b0b68ac2eafd1d5bca51b3723fa753e4db7c4 +Author: Behdad Esfahbod +Date: Thu May 2 14:39:52 2019 -0700 + + [serializer] Add copy() to (Unsized)ArrayOf + + src/hb-open-type.hh | 41 +++++++++++++++++++++++++++++++++++++++++ + src/hb-serialize.hh | 4 ++-- + 2 files changed, 43 insertions(+), 2 deletions(-) + +commit 88a41472404a8e7754e1099ca4a5b2146dae5298 +Author: Behdad Esfahbod +Date: Thu May 2 14:22:31 2019 -0700 + + [serializer] Accept exact type in serialize_subset/copy() + + src/hb-open-type.hh | 12 ++++++------ + src/hb-ot-layout-common.hh | 33 ++------------------------------- + src/hb-ot-layout-gpos-table.hh | 6 ++++++ + src/hb-ot-layout-gsub-table.hh | 6 ++++++ + 4 files changed, 20 insertions(+), 37 deletions(-) + +commit 88fdeeecc0ef57e41219d92c90f35f13cbd3a35e +Author: Behdad Esfahbod +Date: Thu May 2 14:14:33 2019 -0700 + + [serialize] Take arguments in copy() + + src/hb-open-type.hh | 6 +++--- + src/hb-serialize.hh | 10 ++++++---- + 2 files changed, 9 insertions(+), 7 deletions(-) + +commit 273ed6127bd9471fd11b3c1c7f232638f1ff1dba +Author: Behdad Esfahbod +Date: Thu May 2 14:04:51 2019 -0700 + + [serializer] Add serialize_copy() + + src/hb-open-type.hh | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit bf22338f49fb1711f7cbcad2d9949d7962cdc0bc +Author: Behdad Esfahbod +Date: Thu May 2 13:51:52 2019 -0700 + + Remove dead code + + src/hb-algs.hh | 3 --- + 1 file changed, 3 deletions(-) + +commit 14e1fabc41a9a5ead3d91d560773050469982f54 +Author: David Corbett +Date: Wed May 1 21:29:06 2019 -0400 + + Sync gen-vowel-constraints.py with current output + + src/gen-vowel-constraints.py | 3 +++ + 1 file changed, 3 insertions(+) + +commit 026ab825c8e41980e286be911cc6fbb958dd7cd3 +Author: David Corbett +Date: Wed May 1 16:15:58 2019 -0400 + + Add dotted circles to more broken clusters + + src/gen-use-table.py | 9 + + src/hb-ot-shape-complex-myanmar-machine.hh | 196 +++++----- + src/hb-ot-shape-complex-myanmar-machine.rl | 4 +- + src/hb-ot-shape-complex-use-machine.hh | 602 +++++++++++++++-------------- + src/hb-ot-shape-complex-use-machine.rl | 11 +- + src/hb-ot-shape-complex-use-table.cc | 2 +- + 6 files changed, 433 insertions(+), 391 deletions(-) + +commit 92588782d7a45e0c023c5f48cbd19b11cfa8f0d2 +Author: Ebrahim Byagowi +Date: Tue Apr 30 13:05:10 2019 -0700 + + Remove space between right angle brackets now that we have C++11 (#1689) + + src/hb-aat-layout-ankr-table.hh | 2 +- + src/hb-aat-layout-common.hh | 14 +++---- + src/hb-aat-layout-just-table.hh | 4 +- + src/hb-aat-layout-kerx-table.hh | 14 +++---- + src/hb-aat-layout-lcar-table.hh | 2 +- + src/hb-aat-layout-morx-table.hh | 14 +++---- + src/hb-aat-layout-trak-table.hh | 2 +- + src/hb-aat-ltag-table.hh | 2 +- + src/hb-cff-interp-cs-common.hh | 2 +- + src/hb-cff1-interp-cs.hh | 2 +- + src/hb-cff2-interp-cs.hh | 2 +- + src/hb-iter.hh | 4 +- + src/hb-null.hh | 8 ++-- + src/hb-open-file.hh | 8 ++-- + src/hb-open-type.hh | 8 ++-- + src/hb-ot-color-cbdt-table.hh | 2 +- + src/hb-ot-color-colr-table.hh | 4 +- + src/hb-ot-color-cpal-table.hh | 8 ++-- + src/hb-ot-color-sbix-table.hh | 2 +- + src/hb-ot-color-svg-table.hh | 4 +- + src/hb-ot-kern-table.hh | 6 +-- + src/hb-ot-layout-base-table.hh | 2 +- + src/hb-ot-layout-common.hh | 10 ++--- + src/hb-ot-layout-gdef-table.hh | 4 +- + src/hb-ot-layout-gpos-table.hh | 6 +-- + src/hb-ot-layout-gsub-table.hh | 18 ++++----- + src/hb-ot-layout-gsubgpos.hh | 86 ++++++++++++++++++++--------------------- + src/hb-ot-math-table.hh | 2 +- + src/hb-ot-name-table.hh | 10 ++--- + src/hb-ot-stat-table.hh | 4 +- + src/hb-subset-cff1.cc | 2 +- + src/test-iter.cc | 10 ++--- + 32 files changed, 134 insertions(+), 134 deletions(-) + +commit f27fdca4aa438ec366ee17370fbc9fdeb962c397 +Author: Ebrahim Byagowi +Date: Tue Apr 30 13:01:04 2019 -0700 + + [doc] Add documentation to hb_color_get_* and hb_directwrite_face_* (#1690) + + src/hb-common.cc | 12 ++++++++---- + src/hb-directwrite.cc | 8 ++++++-- + 2 files changed, 14 insertions(+), 6 deletions(-) + +commit fe4a0ac707802b5bb36787723f8d55a58c2946a5 +Author: David Corbett +Date: Tue Apr 30 13:35:50 2019 -0400 + + Fix some dead links + + src/gen-os2-unicode-ranges.py | 2 +- + src/gen-use-table.py | 6 +++--- + src/hb-ot-shape-complex-myanmar.hh | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit 68749e996aedbae9b1c4553f5672f74e1727b850 +Author: Nathan Willis +Date: Tue Apr 30 17:23:55 2019 +0100 + + [Docs] Usermanual; update XML manifest for new chapters. + + docs/Makefile.am | 4 ++-- + docs/harfbuzz-docs.xml | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 30d7d1064ee339ca216699851030f9bae8c07c68 +Author: Nathan Willis +Date: Tue Apr 30 17:23:19 2019 +0100 + + [Docs] Usermanual; add Utilities chapter. + + docs/usermanual-utilities.xml | 244 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 244 insertions(+) + +commit d0f5a05aef73293fe21ddb022084166a7a095862 +Author: Nathan Willis +Date: Tue Apr 30 17:22:54 2019 +0100 + + [Docs] Usermanual; add Shaping, Features, and Plans. + + docs/usermanual-opentype-features.xml | 279 +++++++++++++++++++++++++++++++++- + 1 file changed, 277 insertions(+), 2 deletions(-) + +commit 8354c99fbee2887cb71440f4e25ad1e6f46b2592 +Author: Nathan Willis +Date: Tue Apr 30 17:22:08 2019 +0100 + + [Docs] Usermanual; add Fonts And Faces chapter. + + docs/usermanual-fonts-and-faces.xml | 445 +++++++++++++++++++++++++++++++++++- + 1 file changed, 437 insertions(+), 8 deletions(-) + +commit 3b301c5ac6b15728f858cb6f5de8dfc6a77209fa +Author: Nathan Willis +Date: Tue Apr 30 17:21:33 2019 +0100 + + [Docs] Usermanual; fill out Buffers chapter. + + ...anual-buffers-language-script-and-direction.xml | 358 +++++++++++++++++++-- + 1 file changed, 335 insertions(+), 23 deletions(-) + +commit 6d9a86ae7535ea8e3c108a49c6da877a78cdac26 +Author: Nathan Willis +Date: Tue Apr 30 16:09:01 2019 +0100 + + [Docs] Usermanual; fixes to Object Model chapter + + docs/usermanual-object-model.xml | 35 ++++++++++++++++++++++------------- + 1 file changed, 22 insertions(+), 13 deletions(-) + +commit 9542bdd0ed2d581cdb4bd950ac3cd7e3bf899478 +Author: Ebrahim Byagowi +Date: Mon Apr 29 14:52:28 2019 -0700 + + Add color channels getters ABI (#1513) + + So can be used with language wrappers + + src/hb-common.cc | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-common.h | 40 +++++++++++----------------------------- + 2 files changed, 64 insertions(+), 29 deletions(-) + +commit e200d165a4e8a5f901165c705d617b6e457ec595 +Author: Ebrahim Byagowi +Date: Tue Apr 30 02:10:50 2019 +0430 + + [ci] Remove crosscompile-notest-freebsd9 bot + + It was testing an old version of freebsd and now it's image is gone. + We really like to test the environment. + + .circleci/config.yml | 10 ---------- + 1 file changed, 10 deletions(-) + +commit 4aa546b70ad7b11154b901e67f98c1ec6bc5c364 +Author: David Corbett +Date: Mon Apr 29 14:16:51 2019 -0400 + + Allow some Balinese Po & So as aksara modre bases + + src/gen-use-table.py | 10 ++++++++-- + src/hb-ot-shape-complex-use-table.cc | 4 ++-- + 2 files changed, 10 insertions(+), 4 deletions(-) + +commit 6d6edc8b25395c87477181a647a8e6d02f2cad4f +Author: Ebrahim Byagowi +Date: Sun Apr 28 11:54:07 2019 -0700 + + [valgrind] Use libtool and support run-subset-fuzzer-tests (#1668) + + test/fuzzing/Makefile.am | 4 +- + test/fuzzing/run-shape-fuzzer-tests.py | 28 ++++++------ + test/fuzzing/run-subset-fuzzer-tests.py | 75 ++++++++++++++++++++++++++++++--- + 3 files changed, 85 insertions(+), 22 deletions(-) + +commit 62c6e170728303f4225aaa25523675fc260ae1ab +Author: Ebrahim Byagowi +Date: Sun Apr 28 10:55:07 2019 -0700 + + [test] Add crbug.com/oss-fuzz/14474 testcase + + Fixed at 6977a95f + + ...testcase-minimized-hb-subset-fuzzer-5716947896893440 | Bin 0 -> 65833 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 6977a95fed8a35d6e915ed3fc3a3ea8709f3d4a4 +Author: Behdad Esfahbod +Date: Sat Apr 27 10:05:25 2019 -0700 + + [subset] Don't crash if subsetting GSUB/GPOS fails + + Fixes fuzzer issue. + + src/hb-subset.cc | 27 ++++++++++++++------------- + 1 file changed, 14 insertions(+), 13 deletions(-) + +commit 2b051e7aa147c78cfbf953b6f0eb18c25b732eb2 +Author: Behdad Esfahbod +Date: Sat Apr 27 10:01:11 2019 -0700 + + [subset] Check error after calling serializer end + + src/hb-subset.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 750b65e9a980efc13e50ea5d0388ecf06e7a93b1 +Author: Behdad Esfahbod +Date: Fri Apr 26 17:14:25 2019 -0700 + + [meta] Add hb_type_identity<> + + To block template argument deduction. + + src/hb-meta.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 8c8922a019eb1ceb8beffc05ca638ee0ca25b565 +Author: Qunxin Liu +Date: Thu Apr 25 09:17:58 2019 -0700 + + [subset] Updates due to changes in resolve_links() on master branch + + src/Makefile.sources | 1 + + src/hb-ot-name-table.hh | 7 +++++-- + src/hb-static.cc | 3 +-- + 3 files changed, 7 insertions(+), 4 deletions(-) + +commit 2f6ec35344db08d0c892152bc7a7eaa67e7c03f0 +Author: Garret Rieger +Date: Wed Apr 24 15:15:36 2019 -0700 + + Move implementations of hb-ot-name-language.cc into a hb-static.cc + + src/hb-aat-layout.hh | 1 - + src/hb-ot-name-language-static.hh | 462 ++++++++++++++++++++++++++++++++++++++ + src/hb-ot-name-language.hh | 432 +---------------------------------- + src/hb-static.cc | 2 + + 4 files changed, 468 insertions(+), 429 deletions(-) + +commit 19afd25004487cfaa7b487b1768b4dae1ab37296 +Author: Qunxin Liu +Date: Wed Apr 24 14:02:29 2019 -0700 + + [subset] Update to use _subset2() for name table + + src/hb-ot-name-table.hh | 47 ++++++++++------------------------------------- + src/hb-subset.cc | 4 ++-- + 2 files changed, 12 insertions(+), 39 deletions(-) + +commit 1ca4b5c77012ed586413f39e730b03bf965e1305 +Author: Qunxin Liu +Date: Mon Apr 22 11:31:23 2019 -0700 + + [subset] Add unit test for str de-dup + Also move the implementation of some methods from the .cc to the .hh + + src/Makefile.sources | 1 - + src/hb-aat-layout.cc | 8 - + src/hb-aat-layout.hh | 9 +- + src/hb-ot-name-language.cc | 457 --------------------------------- + src/hb-ot-name-language.hh | 432 ++++++++++++++++++++++++++++++- + test/api/fonts/nameID.dup.expected.ttf | Bin 0 -> 2340 bytes + test/api/fonts/nameID.dup.origin.ttf | Bin 0 -> 170680 bytes + test/api/test-subset-nameids.c | 21 ++ + 8 files changed, 456 insertions(+), 472 deletions(-) + +commit 9ad14f56b6cf2a345104b3a897b52a1f4c0f33a5 +Author: Qunxin Liu +Date: Tue Apr 16 11:20:58 2019 -0700 + + [subset] update name table subsetting with new serializer + + src/hb-ot-name-table.hh | 126 ++++++++++++++++++++++++++++-------------------- + 1 file changed, 75 insertions(+), 51 deletions(-) + +commit 6faac8df83bb59f08e5d329e76435ba438b2ea54 +Author: Qunxin Liu +Date: Wed Apr 10 16:38:35 2019 -0700 + + [subset] Subsetting Name Table Step 4 + Add unit test and integration test + + test/api/Makefile.am | 2 + + test/api/fonts/nameID.expected.ttf | Bin 0 -> 170696 bytes + test/api/fonts/nameID.origin.ttf | Bin 0 -> 170976 bytes + test/api/hb-subset-test.h | 9 ++++ + test/api/test-subset-nameids.c | 58 +++++++++++++++++++++ + .../Roboto-Regular.abc.name-ids.61,62,63.ttf | Bin 0 -> 2168 bytes + .../basics/Roboto-Regular.abc.name-ids.61,63.ttf | Bin 0 -> 1988 bytes + .../basics/Roboto-Regular.abc.name-ids.61.ttf | Bin 0 -> 1792 bytes + .../basics/Roboto-Regular.abc.name-ids.62.ttf | Bin 0 -> 1740 bytes + .../basics/Roboto-Regular.abc.name-ids.63.ttf | Bin 0 -> 1716 bytes + test/subset/data/profiles/name-ids.txt | 1 + + test/subset/data/tests/basics.tests | 1 + + 12 files changed, 71 insertions(+) + +commit e501ea143d1e63974903cdb41932c50f4222ff4e +Author: Qunxin Liu +Date: Fri Apr 5 10:05:55 2019 -0700 + + [subset] Subset name table step 3, add --nameids option to guide the + selection of which name records to keep in the subset method. + + src/hb-ot-name-table.hh | 28 ++++++++++++++++------------ + src/hb-subset-input.cc | 8 ++++++++ + src/hb-subset-input.hh | 3 ++- + src/hb-subset-plan.cc | 10 ++++++---- + src/hb-subset-plan.hh | 3 +++ + src/hb-subset.h | 3 +++ + util/hb-subset.cc | 1 + + util/options.cc | 45 +++++++++++++++++++++++++++++++++++++++++++++ + util/options.hh | 8 ++++++++ + 9 files changed, 92 insertions(+), 17 deletions(-) + +commit 2637a81615c80443911a603cbd161ade525c79f1 +Author: Qunxin Liu +Date: Tue Apr 2 13:38:27 2019 -0700 + + [subset] subset name table step 2, add implementation for collecting subset + elements and serialize method + + src/hb-ot-name-table.hh | 131 ++++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 109 insertions(+), 22 deletions(-) + +commit 408c1daeb4ff86d2204ed1bdd059513357ada392 +Author: Qunxin Liu +Date: Fri Mar 29 10:34:32 2019 -0700 + + [subset] subset name table step 1, write out table unmodified, use accelerator to access + string + + src/hb-ot-name-table.hh | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-subset.cc | 4 ++++ + 2 files changed, 57 insertions(+) + +commit 3a7f5bdd18314676425ec811199767a5f8e65a40 +Author: Behdad Esfahbod +Date: Fri Apr 26 14:40:01 2019 -0700 + + Rewrite hb_is_signed() + + src/hb-meta.hh | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +commit 73c82f2301a52cf2111296b34691bc898a7a6363 +Author: Behdad Esfahbod +Date: Fri Apr 26 13:16:48 2019 -0700 + + [iter] Fix hb_is_iterator_of() to actually check item type + + src/hb-iter.hh | 20 +++++++++----------- + 1 file changed, 9 insertions(+), 11 deletions(-) + +commit c51f15ddfcae8578483693b761b81ceaebf05f2a +Author: Behdad Esfahbod +Date: Fri Apr 26 13:03:41 2019 -0700 + + [array] Adjust hb_sorted_array_t copy constructor/assignment to match hb_array_t + + src/hb-array.hh | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +commit b2758c360cc08d7a0334aae11845d0c5d50c46af +Author: Behdad Esfahbod +Date: Fri Apr 26 12:58:06 2019 -0700 + + [array] Use hb_is_cr_convertible_to() + + src/hb-array.hh | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) + +commit 8ecae793aa79056a312d3c8518106cfeca42390e +Author: Behdad Esfahbod +Date: Fri Apr 26 12:57:56 2019 -0700 + + [meta] Add hb_is_cr_convertible_to() + + src/hb-meta.hh | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 52bb0346d319c322f117567a096fafa1bc804e26 +Author: Behdad Esfahbod +Date: Fri Apr 26 12:52:28 2019 -0700 + + [meta] Add hb_decay<> + + src/hb-meta.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 474f3587cd18fdaf86b2068647fa03b107557d8c +Author: Michiharu Ariza +Date: Fri Apr 26 10:12:38 2019 -0700 + + copy retain_gids from input to plan + + src/hb-subset-plan.cc | 1 + + src/hb-subset-plan.hh | 1 + + 2 files changed, 2 insertions(+) + +commit 3fc066314ac19005ea8157a6541412cfd24abbc2 +Author: Behdad Esfahbod +Date: Wed Apr 24 16:41:57 2019 -0700 + + Another try at fixing cmake build + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c69f02784ac53a7fd13eee559559b38d8224ef59 +Author: Behdad Esfahbod +Date: Wed Apr 24 16:31:37 2019 -0700 + + Fix sign-compare error on 32-bit systems + + src/hb-open-type.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f2d20dd9d3b52f434f5fe9dbef82bd95eb499edf +Author: Behdad Esfahbod +Date: Wed Apr 24 15:08:27 2019 -0700 + + [THANKS] Add Ivan Kuckir + + https://github.com/harfbuzz/harfbuzz/issues/1633#issuecomment-485764140 + + THANKS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0ca358f21a2a6e86a3d5c145a70bb84ab6e2db32 +Author: Behdad Esfahbod +Date: Wed Apr 24 16:36:29 2019 -0400 + + Try fixing cmake build + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 59a8fa53533b10b9c25458d9ba2d68b7b01c3ff0 +Author: Behdad Esfahbod +Date: Wed Apr 24 12:19:13 2019 -0400 + + [iter] Add tests for casting to hb_iter_t<> base class for hb_sorted_array_t<> + + Something's phishy about hb_sorted_array_t<>. Can't get it work nicely with + change I'm making. Ugh.. + + src/test-iter.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 714307cc437f375f128e17e5ab01eba0c57aaf01 +Author: Behdad Esfahbod +Date: Wed Apr 24 10:56:12 2019 -0400 + + [iter] Remove fixed TODO + + src/hb-iter.hh | 3 --- + 1 file changed, 3 deletions(-) + +commit 22da12318a3e9fd9955f24fd0092de1a4a1a940d +Author: Behdad Esfahbod +Date: Wed Apr 24 10:53:16 2019 -0400 + + [map] Fix TODO + + src/hb-map.hh | 6 ++---- + src/hb-meta.hh | 6 ++++++ + src/hb-ot-cff1-table.cc | 1 - + src/hb-ot-cff2-table.cc | 1 - + src/hb.hh | 3 +-- + 5 files changed, 9 insertions(+), 8 deletions(-) + +commit 4c6136e976af4f7332f703f5a7625505ffc296b6 +Author: Behdad Esfahbod +Date: Wed Apr 24 10:44:24 2019 -0400 + + [mutex] Remove TODO + + src/hb-mutex.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit 0268db11965d022883d5ef2ef828c0635165b7bd +Author: Behdad Esfahbod +Date: Wed Apr 24 10:43:40 2019 -0400 + + [map] Use hb_invoke() with pointer-to-method + + src/hb-algs.hh | 5 ++++- + src/hb-map.hh | 4 ++-- + src/test-algs.cc | 8 ++++++++ + 3 files changed, 14 insertions(+), 3 deletions(-) + +commit 8f79a5750e8982f9ab73c0dc6a8534dffef74610 +Author: Behdad Esfahbod +Date: Wed Apr 24 10:32:49 2019 -0400 + + [algs] Add more hb_forward<>()'s + + src/hb-algs.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 42526d1697e2449fa23741f84721dcf2ce688af7 +Author: Behdad Esfahbod +Date: Wed Apr 24 10:24:33 2019 -0400 + + [serialize] Fix SingleSubstFormat1 failure + + src/hb-ot-layout-gsub-table.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 6cc9707c9c0885a3133b7844f615cdcdaeccec18 +Author: Behdad Esfahbod +Date: Wed Apr 24 10:22:06 2019 -0400 + + [serialize] Rename + + src/hb-serialize.hh | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +commit 085793d6cd35a1590a66712f39260030367490db +Author: Behdad Esfahbod +Date: Wed Apr 24 10:15:59 2019 -0400 + + Remove wrong TODOs + + src/hb-ot-layout-gsubgpos.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 1 - + src/hb-ot-shape-complex-khmer.cc | 4 ++-- + src/hb-ot-shape-complex-myanmar.cc | 3 ++- + src/hb-ot-shape-complex-use.cc | 4 ++-- + 5 files changed, 7 insertions(+), 7 deletions(-) + +commit 915b9ea5f48d56df21419761477b2d4ba2843b54 +Author: Behdad Esfahbod +Date: Wed Apr 24 10:07:19 2019 -0400 + + [serialize] Add c->check_assign() + + To check for assignment overflows. + + src/hb-open-type.hh | 7 +++---- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-serialize.hh | 20 +++++++++++++------- + 3 files changed, 17 insertions(+), 12 deletions(-) + +commit 00a00bc1f23c681d64fbd4df33582ec0165e337a +Author: Behdad Esfahbod +Date: Wed Apr 24 10:01:30 2019 -0400 + + Fix two TODOs + + src/hb-ot-layout-gsub-table.hh | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit 11ab889a8d743304c8ec17920e209a514f46739d +Author: Behdad Esfahbod +Date: Wed Apr 24 09:55:24 2019 -0400 + + Rename a few test programs + + src/Makefile.am | 24 +++++++++++----------- + ...est-size-params.cc => test-gpos-size-params.cc} | 0 + ...substitute.cc => test-gsub-would-substitute.cc} | 0 + src/{test-name-table.cc => test-ot-name.cc} | 0 + 4 files changed, 12 insertions(+), 12 deletions(-) + +commit 12017db0bfe62e7777e1ab6ba5b14729dcd4c351 +Author: Behdad Esfahbod +Date: Wed Apr 24 09:24:38 2019 -0400 + + Move test code around + + src/test-algs.cc | 8 ++++++++ + src/test-iter.cc | 9 --------- + 2 files changed, 8 insertions(+), 9 deletions(-) + +commit 27377a7e287dd39e3f7caad5c1e0691ae381ccf8 +Author: Behdad Esfahbod +Date: Wed Apr 24 09:22:14 2019 -0400 + + Rely on variadic parameter pack more + + src/hb-open-type.hh | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 3ad20c38ade76aca8aed024014977ecb5f2b636e +Author: Behdad Esfahbod +Date: Wed Apr 24 09:09:00 2019 -0400 + + [serialize] Fix a few overflow TODO items + + src/hb-open-type.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 175bdad8bff5b0e9732ab1fb97617a9293680fd4 +Author: Behdad Esfahbod +Date: Tue Apr 23 23:57:11 2019 -0400 + + One more variadic parameter pack use + + src/hb-aat-layout-common.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 441cca235477a5399af214c9ac85320d4de69f0b +Author: Behdad Esfahbod +Date: Tue Apr 23 23:49:21 2019 -0400 + + Use hb_forward() when forwarding parameter pack + + src/hb-open-type.hh | 32 ++++++++++++++++---------------- + src/hb-serialize.hh | 3 ++- + 2 files changed, 18 insertions(+), 17 deletions(-) + +commit 20f3134789f65b10f301c4635c9f80c2dda0fb97 +Author: Behdad Esfahbod +Date: Tue Apr 23 12:58:52 2019 -0400 + + Use variadic templates in OffsetTo<> and various ArrayOf<>s + + src/hb-open-type.hh | 145 ++++++++++++++++++---------------------------------- + 1 file changed, 49 insertions(+), 96 deletions(-) + +commit aa6692cb0079bbe1e003f211a321e8fe6a18ea94 +Author: Nathan Willis +Date: Tue Apr 23 17:56:44 2019 +0100 + + Usermanual: update Makefile SGML list. Again. + + docs/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 98c54cdef8b0615a95382bdba4ecd008789f8c9e +Author: Nathan Willis +Date: Tue Apr 23 17:48:42 2019 +0100 + + Usermanual: add chapter on object model. + + docs/harfbuzz-docs.xml | 1 + + docs/usermanual-object-model.xml | 249 +++++++++++++++++++++++++++++++++++++++ + 2 files changed, 250 insertions(+) + +commit 64ca2ffa4c88b961dcbd9d06be8ac7dd80ad8182 +Author: Ebrahim Byagowi +Date: Tue Apr 23 01:10:46 2019 -0700 + + Fix clang's -Wmain complain (#1678) + + src/test-iter.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 7c218351ab45c41e48147b2196393357f7b551d4 +Author: Ebrahim Byagowi +Date: Tue Apr 23 12:40:29 2019 +0430 + + .editorconfig, minor + + still doesn't work with vscode + + .editorconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 25dd88efc6521b972babe1067c0de1b9d4f5dbe5 +Author: Behdad Esfahbod +Date: Mon Apr 22 17:45:23 2019 -0400 + + Err, fix hb_invoke() variadic + + src/hb-algs.hh | 6 +++--- + src/test-iter.cc | 5 ++++- + 2 files changed, 7 insertions(+), 4 deletions(-) + +commit c862a532df0bc3ce0b47f3fde9bf1dd300ff8bee +Author: Behdad Esfahbod +Date: Mon Apr 22 17:32:19 2019 -0400 + + Add variadic arguments to hb_invoke() + + src/hb-algs.hh | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit 9c724e48a2f5d61c31c79f0b4660f08e5d07db10 +Author: Behdad Esfahbod +Date: Mon Apr 22 15:37:10 2019 -0400 + + [serializer] Add err_propagaged_error() + + src/hb-serialize.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit ae8da4b61b4cc3b55242b85fe7c63393d65bd6cf +Author: Behdad Esfahbod +Date: Mon Apr 22 15:25:11 2019 -0400 + + Minor + + src/hb-iter.hh | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 24da1d08603a7fe262ae88d687986efc0343956f +Author: Behdad Esfahbod +Date: Mon Apr 22 15:20:25 2019 -0400 + + Use variadic template args for propagate_error() + + Let's see if bots happy. + + Not sure where else we can use these. Mm. Maybe in hb_invoke(). + + src/hb-serialize.hh | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +commit 9bab398462fa598047f34fd6d23e07a91305b1b3 +Author: Behdad Esfahbod +Date: Mon Apr 22 15:16:35 2019 -0400 + + Simplify propagate_error() + + src/hb-serialize.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit ecac94ca763e80d217ba5db429745e8882b38464 +Author: Behdad Esfahbod +Date: Sun Apr 21 12:27:32 2019 -0400 + + [docs] Remove fdo repo + + Has not been updated. + + docs/harfbuzz-docs.xml | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit 8ed7655be89c658219ab702e34a79734ba0efb73 +Author: Behdad Esfahbod +Date: Sun Apr 21 12:25:19 2019 -0400 + + Update AUTHORS / COPYING + + AUTHORS | 3 +++ + COPYING | 3 ++- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit a464cbeecea73aeaa03c262f49fed8584057d9bb +Author: Ebrahim Byagowi +Date: Fri Apr 19 12:14:09 2019 -0700 + + Revert "Add harfbuzzjs build configuration (#1636)" (#1675) + + This reverts commit 694cb1beeefe1c54b2e613d2d566a21e248a2c9c. + + CMakeLists.txt | 35 ----------------------------------- + 1 file changed, 35 deletions(-) + +commit 694cb1beeefe1c54b2e613d2d566a21e248a2c9c +Author: Ebrahim Byagowi +Date: Fri Apr 19 07:51:04 2019 -0700 + + Add harfbuzzjs build configuration (#1636) + + CMakeLists.txt | 35 +++++++++++++++++++++++++++++++++++ + 1 file changed, 35 insertions(+) + +commit 42f4bd6b801f96fc33a365db8ab6390e74cef05a +Author: Behdad Esfahbod +Date: Thu Apr 18 19:04:59 2019 -0400 + + Minor warning fix again + + src/hb-ot-map.cc | 20 ++++++++++---------- + test/api/test-ot-face.c | 2 +- + 2 files changed, 11 insertions(+), 11 deletions(-) + +commit 267fb9c7163e61c9cdbafbb16005bc659ec5a4a2 +Author: Michiharu Ariza +Date: Thu Apr 18 15:17:10 2019 -0700 + + add spaces + + src/hb-ot-cff1-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ba0386060d92dffcde2d14f9e523a46ea8713de2 +Author: Michiharu Ariza +Date: Thu Apr 18 14:53:35 2019 -0700 + + fix oss-fuzz issue 14345 + + src/hb-ot-cff1-table.hh | 3 ++- + ...testcase-minimized-hb-subset-fuzzer-5923632099885056 | Bin 0 -> 25847 bytes + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 63a2108480cca2d9c1a2f61d6642d70496f1a5e3 +Author: Michiharu Ariza +Date: Thu Apr 18 13:54:58 2019 -0700 + + silence MVC warnings 3rd attempt + + src/hb-ot-cff1-table.cc | 5 +++-- + src/hb-ot-cff2-table.cc | 9 +++++---- + 2 files changed, 8 insertions(+), 6 deletions(-) + +commit 705dde57fe7bd5aafe93f284db2aa809aad932dc +Author: Michiharu Ariza +Date: Thu Apr 18 11:32:10 2019 -0700 + + silence MVC warnings 2nd attempt + + src/hb-ot-cff1-table.cc | 4 ++-- + src/hb-ot-cff2-table.cc | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit dd4c37529bcecee33d43015a852a3fcf9e978b7f +Author: Michiharu Ariza +Date: Thu Apr 18 10:38:57 2019 -0700 + + silence MVC warnings + + src/hb-cff-interp-common.hh | 2 +- + src/hb-ot-cff1-table.cc | 4 ++-- + src/hb-ot-cff2-table.cc | 8 ++++---- + 3 files changed, 7 insertions(+), 7 deletions(-) + +commit 518e6e07f29d9bb7e532313fb0af6177d8022ea5 +Author: Behdad Esfahbod +Date: Thu Apr 18 12:21:25 2019 -0400 + + Minor + + src/hb-ot-map.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 91d958acc08cb99ddd3b656922e13497b9d1595d +Author: Behdad Esfahbod +Date: Thu Apr 18 10:04:10 2019 -0400 + + [array] Simplify copy assignment/constructor + + To fix bogus MSVC warnings: + + c:\projects\harfbuzz\src\hb-array.hh(189): warning C4521: 'hb_array_t': multiple copy constructors specified [C:\projects\harfbuzz\build\harfbuzz.vcxproj] + c:\projects\harfbuzz\src\hb-array.hh(189): warning C4522: 'hb_array_t': multiple assignment operators specified [C:\projects\harfbuzz\build\harfbuzz.vcxproj] + + src/hb-array.hh | 29 +++++++++++++++++++---------- + 1 file changed, 19 insertions(+), 10 deletions(-) + +commit 693d91cd49fda3e728b59e6885bea8d7b01958ef +Author: Behdad Esfahbod +Date: Wed Apr 17 17:59:39 2019 -0400 + + [serialize] Fix offset calculation + + src/hb-serialize.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit db0c9a1485ae6ca7ca9af38a43504f1ae4ea09c8 +Author: Behdad Esfahbod +Date: Wed Apr 17 17:58:13 2019 -0400 + + [subset] Assert offsets are zero during relocation + + If they're not, it's a bug in our subsetting logic somewhere. So check. + + src/hb-serialize.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit efbba7ad26dda5930f5d1bd5292304835432f504 +Author: Behdad Esfahbod +Date: Wed Apr 17 11:00:08 2019 -0400 + + [serializer] Add copy() + + Calls obj.copy() or obj.operator=() in that order. + + src/hb-serialize.hh | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit c67a0d581fcc50df5563c23060b4fcd9dac4c87c +Author: Behdad Esfahbod +Date: Wed Apr 17 10:20:02 2019 -0400 + + Add HB_RETURN + + src/hb-algs.hh | 13 ++++++------- + src/hb-meta.hh | 34 ++++++++++++++++++++-------------- + 2 files changed, 26 insertions(+), 21 deletions(-) + +commit 6745a600bfec13b3f5468b3d31bab7d82b1e61ce +Author: David Corbett +Date: Tue Apr 16 17:29:34 2019 -0400 + + Comment out ot_languages where fallback suffices + + src/gen-tag-table.py | 15 +- + src/hb-ot-tag-table.hh | 443 +++++++++++++++++++++++++------------------------ + src/hb-ot-tag.cc | 19 ++- + test/api/test-ot-tag.c | 5 +- + 4 files changed, 255 insertions(+), 227 deletions(-) + +commit 5daeff3e68e4e202effb152f52702a044c09f386 +Author: David Corbett +Date: Wed Apr 17 09:11:44 2019 -0400 + + Fix "hb_script_" doc typo + + src/hb-common.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6916b77863cd5ce492a274eb85f196f2152fbb96 +Author: Behdad Esfahbod +Date: Tue Apr 16 18:33:51 2019 -0400 + + One more auto return type + + src/hb-iter.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5b33427f2c4d596a12f05ffebebfd68655fd63eb +Author: Behdad Esfahbod +Date: Tue Apr 16 18:28:17 2019 -0400 + + Rename HB_AUTO_RETURN_EXPR to HB_AUTO_RETURN + + src/hb-algs.hh | 34 +++++++++++++++++----------------- + src/hb-meta.hh | 8 ++++---- + 2 files changed, 21 insertions(+), 21 deletions(-) + +commit da293b0e59a0d6c47e9b3a7807115a168a0a5c94 +Author: Behdad Esfahbod +Date: Tue Apr 16 18:27:25 2019 -0400 + + Use HB_AUTO_RETURN_EXPR in hb_min/max + + src/hb-algs.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 0241a40f2aff43aba045fb7de4a2c3e5f1e9626a +Author: Behdad Esfahbod +Date: Tue Apr 16 18:26:30 2019 -0400 + + Use auto return type for hb_first/hb_second + + src/hb-algs.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit fe30fcd228ff95be1f169f580b30184c8511d1c3 +Author: Behdad Esfahbod +Date: Tue Apr 16 17:34:06 2019 -0400 + + Use hb_deref_pointer() to reduce number of overloads + + src/hb-algs.hh | 27 ++++++++++----------------- + src/hb-meta.hh | 36 +++++++++++++++++++----------------- + 2 files changed, 29 insertions(+), 34 deletions(-) + +commit c918a6706fa759696569ad6dcaae03fed76306bc +Author: Behdad Esfahbod +Date: Tue Apr 16 17:28:18 2019 -0400 + + Properly prioritize hb_hash() + + src/hb-algs.hh | 46 +++++++++++++++++++++++----------------------- + 1 file changed, 23 insertions(+), 23 deletions(-) + +commit 75fd845a4abccc2596f0e1fe2294f936199e61f3 +Author: Behdad Esfahbod +Date: Tue Apr 16 17:22:29 2019 -0400 + + Move around + + src/hb-algs.hh | 25 ++++++++++++------------- + 1 file changed, 12 insertions(+), 13 deletions(-) + +commit 973717175d46d62471772318bb0b607070c53ec7 +Author: Behdad Esfahbod +Date: Tue Apr 16 16:50:07 2019 -0400 + + Fix priorities + + src/hb-algs.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 54ece299bcb3436763cc4f3b6b0ca11de8133b28 +Author: Behdad Esfahbod +Date: Tue Apr 16 16:45:53 2019 -0400 + + Use type aliasing for meta-functions, ie. those returning a type + + src/hb-algs.hh | 3 ++- + src/hb-array.hh | 6 +++--- + src/hb-atomic.hh | 2 +- + src/hb-blob.hh | 2 +- + src/hb-common.cc | 2 +- + src/hb-ft.cc | 2 +- + src/hb-iter.hh | 2 +- + src/hb-meta.hh | 12 ++++++------ + src/hb-null.hh | 6 +++--- + 9 files changed, 19 insertions(+), 18 deletions(-) + +commit 1ce11b44375dae74e8984ace1db4f08c51ac9c38 +Author: David Corbett +Date: Tue Apr 16 10:04:45 2019 -0400 + + Reduce LangTag from 3 language system tags to 1 + + src/gen-tag-table.py | 13 +- + src/hb-ot-tag-table.hh | 2078 ++++++++++++++++++++++++------------------------ + src/hb-ot-tag.cc | 22 +- + 3 files changed, 1053 insertions(+), 1060 deletions(-) + +commit 155e92f25908830bef192304a2039853f6f5d4b5 +Author: Behdad Esfahbod +Date: Tue Apr 16 11:35:09 2019 -0400 + + Reduce NullPool size + + src/hb-null.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4fc2d2d7248171c386c39630aa2612f240669a58 +Author: Behdad Esfahbod +Date: Tue Apr 16 11:24:42 2019 -0400 + + [meta] Flesh out hb_invoke() + + src/hb-algs.hh | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +commit e03d9395aa79a29d731607bfd46533b700dc1a37 +Author: Behdad Esfahbod +Date: Tue Apr 16 11:20:16 2019 -0400 + + Comment + + src/hb-algs.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b8e763fd7140b3e298863e04053ec0f3c73a6a70 +Author: Behdad Esfahbod +Date: Tue Apr 16 10:50:22 2019 -0400 + + [meta] Add hb_invoke() + + src/hb-algs.hh | 34 ++++++++++++++++++++++++++++++++-- + src/hb-iter.hh | 2 +- + 2 files changed, 33 insertions(+), 3 deletions(-) + +commit a3fcb9a370ad7a3c205342f831d8529c81660466 +Author: Behdad Esfahbod +Date: Tue Apr 16 10:45:20 2019 -0400 + + [meta] Add HB_AUTO_RETURN_EXPR, HB_VOID_RETURN_EXPR, hb_priority, hb_has(), hb_get() + + The first three based on range-v3. + + src/hb-algs.hh | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-iter.hh | 7 ++++--- + src/hb-meta.hh | 32 +++++++++++++++----------------- + src/hb.hh | 2 +- + 4 files changed, 66 insertions(+), 21 deletions(-) + +commit ff68be31bf2ea82bf6bfcc6f993fb6806a895f97 +Author: Behdad Esfahbod +Date: Tue Apr 16 09:59:08 2019 -0400 + + Add hb_void_tt<> ala std::void_t + + src/hb-meta.hh | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 89fea21697adfbba5057dd1d69c9806ee86e5ca8 +Author: Behdad Esfahbod +Date: Mon Apr 15 17:36:09 2019 -0400 + + Fix copyright + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b7384c89e2685cec1b6761c918ec7d91e8ae3af8 +Author: Behdad Esfahbod +Date: Mon Apr 15 16:53:10 2019 -0400 + + [fuzzing] Run valgrind with --leak-check=full + + test/fuzzing/run-shape-fuzzer-tests.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3ff66c00292b20325b0d991dfd5eee80284cb9a8 +Author: Behdad Esfahbod +Date: Mon Apr 15 16:52:21 2019 -0400 + + [fuzzing] Fail if valgrind is requested but not found + + test/fuzzing/run-shape-fuzzer-tests.py | 3 +++ + 1 file changed, 3 insertions(+) + +commit 07776b60965d503dfb7fb5c611397e40759b0bdc +Author: Behdad Esfahbod +Date: Mon Apr 15 16:43:34 2019 -0400 + + More tweaks to previous commit + + Delete assignment operator of OffsetTo<> instead of Offset<>. + + In simple ArrayOf<>::sanitize() assert that Type has assignment operator. + Ideally we should SFINAE this and fallback to calling Type::sanitize() + if assignment operator is not available. But we don't have a case of + that in the codebase. + + src/hb-open-file.hh | 4 ++-- + src/hb-open-type.hh | 16 +++++++++++----- + 2 files changed, 13 insertions(+), 7 deletions(-) + +commit 699de689e9aa2246ba9207c07140ccd564f5ec20 +Author: Behdad Esfahbod +Date: Mon Apr 15 16:00:20 2019 -0400 + + Delete default assignment operator Offset<> + + src/hb-open-type.hh | 3 +++ + src/hb-ot-cmap-table.hh | 2 +- + src/hb-ot-layout-common.hh | 14 +++++++------- + 3 files changed, 11 insertions(+), 8 deletions(-) + +commit 02d864aa26359b7f057e2aa81404309e17180d47 +Author: Behdad Esfahbod +Date: Mon Apr 15 15:39:03 2019 -0400 + + Add HB_FUNCOBJ() + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1651 + + src/hb-algs.hh | 28 +++++++++++++++------------- + src/hb-iter.hh | 56 ++++++++++++++++++++++++++++---------------------------- + src/hb-meta.hh | 22 +++++++++++++--------- + src/hb.hh | 7 +++++++ + 4 files changed, 63 insertions(+), 50 deletions(-) + +commit 60be1450ad04612a6c2a6116036dbf3e436018de +Author: Nathan Willis +Date: Mon Apr 15 18:05:14 2019 +0100 + + [Usermanual]: fix Tamil error in Why-do-I-need-a-shaping-engine section. + + docs/usermanual-what-is-harfbuzz.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 38b1d0b9b2e798dd808a816a397323ed7ba697ab +Author: Behdad Esfahbod +Date: Mon Apr 15 12:44:31 2019 -0400 + + Move static const to post-struct for a function object + + Just sending this to bots to see if all happy, then turn it into macro and + apply everywhere. + + Part of https://github.com/harfbuzz/harfbuzz/issues/1651 + + src/hb-algs.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 19e800c9d881ec016ab2e5fcaadab55ab5188398 +Author: Behdad Esfahbod +Date: Mon Apr 15 12:07:00 2019 -0400 + + Ugh. Another try, to unbreak gcc this time! + + Jenga. + + src/hb-subset.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 3a88f55c15b625a0ad10fbfadf4562bcbb41ae53 +Author: Behdad Esfahbod +Date: Mon Apr 15 11:59:57 2019 -0400 + + Move location of HB_UNUSED to make MSVC happy + + src/hb-subset.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1ae265888e144328dbf1df796d379bf742c4151a +Author: Behdad Esfahbod +Date: Mon Apr 15 11:31:40 2019 -0400 + + Fix gcc warning + + src/hb-array.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit c0ea37b557f53b50094042f11fe2611b1b30d725 +Author: Ebrahim Byagowi +Date: Mon Apr 15 00:34:04 2019 +0430 + + [ci] Fix macOS glib issue + + .circleci/config.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ad126036643e44a98c4c42d2a2a4a3b4a3649937 +Merge: 341b70a3 47e538a3 +Author: Nathan Willis +Date: Sun Apr 14 15:42:42 2019 +0100 + + Merge branch 'master' of https://github.com/harfbuzz/harfbuzz + +commit cd9889cac3ac3b271f7335f3e94acc4667a59b40 +Author: Nathan Willis +Date: Sun Apr 14 15:33:56 2019 +0100 + + Docs: update and extended GTK-Doc comments for hb-ot-math. + + src/hb-ot-math.cc | 133 ++++++++++++++++++++++++++++++++---------------------- + src/hb-ot-math.h | 21 +++++++++ + 2 files changed, 99 insertions(+), 55 deletions(-) + +commit 3f74b7a14bffb8e91cd98edd0c3ddf0b0ddc169a +Author: Nathan Willis +Date: Sun Apr 14 15:20:56 2019 +0100 + + Docs: Regularize GTK-Doc comments for hb-ot-color. + + src/hb-ot-color.cc | 136 ++++++++++++++++++++++++++++++----------------------- + src/hb-ot-color.h | 6 +-- + 2 files changed, 80 insertions(+), 62 deletions(-) + +commit 47e538a35f9072e5775a65e2bf110ae895818321 +Author: Behdad Esfahbod +Date: Fri Apr 12 22:50:22 2019 -0400 + + Add HB_NO_SUBSET_LAYOUT + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-subset.cc | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit a98e4068e76d50bd9562d85a452b56e681f1d62b +Author: Behdad Esfahbod +Date: Fri Apr 12 22:42:44 2019 -0400 + + Revert "Hide symbols in hb-iter" + + This reverts commit 98f14c4cdb837a962083a6702f401d41b4c1ec5c. + + Same as previous commit. + + src/hb-iter.hh | 88 +++++++++++++++++++++++++++++----------------------------- + 1 file changed, 44 insertions(+), 44 deletions(-) + +commit dab92bdd4623aa7dac8eb00b14131566d75d095e +Author: Behdad Esfahbod +Date: Fri Apr 12 22:39:38 2019 -0400 + + Revert "Hide more symbols" + + This reverts commit 2e86d50915cf1a791da9acb95245aa820a3d70f4. + + I think the setup that caused me to do this is faulty and not hiding inlines. + + src/hb-blob.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 98f14c4cdb837a962083a6702f401d41b4c1ec5c +Author: Behdad Esfahbod +Date: Fri Apr 12 18:11:18 2019 -0400 + + Hide symbols in hb-iter + + Painful. All template methods need to be explicitly hidden :(. + + Maybe we should switch to -fvisibility=hidden pragma. + + A LOT more to go. + + src/hb-iter.hh | 88 +++++++++++++++++++++++++++++----------------------------- + 1 file changed, 44 insertions(+), 44 deletions(-) + +commit 2e86d50915cf1a791da9acb95245aa820a3d70f4 +Author: Behdad Esfahbod +Date: Fri Apr 12 18:07:42 2019 -0400 + + Hide more symbols + + Exposed by: + + $ make -j5 CPPFLAGS="-O0" CXXFLAGS=-flto=thin LDFLAGS=-lc++ && ./check-symbols.sh + + src/hb-blob.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit caa20e4ef9dff61a86312daec5d5a1df27d95ff7 +Author: Behdad Esfahbod +Date: Fri Apr 12 17:59:18 2019 -0400 + + Hide a few more symbols + + Exposed by: + + $ make CPPFLAGS=-O0 + + src/hb-array.hh | 4 ++-- + src/hb-meta.hh | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 95df00aec1996d521acdff6deff063ba98214fb9 +Author: Behdad Esfahbod +Date: Fri Apr 12 17:50:03 2019 -0400 + + Hide a few static methods + + Looks like static methods that do not get inlined end up exported. + We have a lot more. Need to protect all at some point. Wish there + was an easier way, like the visibility flag we pass that automatically + hides all inline methods. + + Was exposed by check-symbols.sh when compiling on OS X 10.14 with: + + $ make CPPFLAGS=-Oz CXXFLAGS=-flto=thin LDFLAGS=-lc++ + + src/hb-aat-layout.hh | 2 +- + src/hb-aat-map.hh | 2 +- + src/hb-array.hh | 2 +- + src/hb-coretext.cc | 4 ++-- + src/hb-open-file.hh | 2 +- + src/hb-open-type.hh | 3 ++- + src/hb-ot-cmap-table.hh | 14 +++++++------- + src/hb-ot-layout-base-table.hh | 6 +++--- + src/hb-ot-layout-gpos-table.hh | 8 ++++---- + src/hb-ot-layout-gsub-table.hh | 8 ++++---- + src/hb-ot-layout-gsubgpos.hh | 2 +- + src/hb-ot-map.hh | 4 ++-- + src/hb-uniscribe.cc | 4 ++-- + 13 files changed, 31 insertions(+), 30 deletions(-) + +commit 2f4be4ba54b539fbadc31fc53bdcfca81d7db77a +Author: Behdad Esfahbod +Date: Fri Apr 12 16:21:58 2019 -0400 + + Add HB_NO_OPTIONS + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-debug.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit 079d2dcbb2607cda3daa497199090c5813a51de5 +Author: Behdad Esfahbod +Date: Fri Apr 12 15:00:37 2019 -0400 + + Add HB_NO_NAME_TABLE_AAT + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-name-table.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 60a58aa61c09cafd12c432fdc1f7325f2a6d44bd +Author: Behdad Esfahbod +Date: Fri Apr 12 14:58:53 2019 -0400 + + Add HB_NO_OT_FONT_BITMAP + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-font.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 160c4d8b2d9f6c205b713236f043081e6dd532ee +Author: Behdad Esfahbod +Date: Fri Apr 12 14:57:49 2019 -0400 + + Add HB_NO_OT_FONT_CFF + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-font.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 35f3b97fac3b106d345a06a4970f6adce182797b +Author: Behdad Esfahbod +Date: Fri Apr 12 10:16:12 2019 -0400 + + Add HB_NO_OT_SHAPE_COMPLEX_HEBREW_FALLBACK + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-shape-complex-hebrew.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 414c5de26b34c0c53f6f4b5f00ddc8e1a3b62ac2 +Author: Behdad Esfahbod +Date: Fri Apr 12 10:12:11 2019 -0400 + + Add HB_NO_OT_SHAPE_FALLBACK + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-shape-fallback.cc | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit fe0018f7ef804acefa729e888f5a9935e571079d +Author: Behdad Esfahbod +Date: Fri Apr 12 09:35:29 2019 -0400 + + Add HB_NO_OT_SHAPE_COMPLEX_THAI_FALLBACK + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-shape-complex-thai.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 9ddbfa006d752f6ddd3610ff968f84cf18dec031 +Author: Behdad Esfahbod +Date: Fri Apr 12 09:33:25 2019 -0400 + + Add HB_NO_OT_LAYOUT_BLACKLIST + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-layout.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 571fad4cf17d90434562d1b6f5d08b6f27343c7a +Author: Behdad Esfahbod +Date: Thu Apr 11 17:54:38 2019 -0400 + + Add HB_NO_OT_SHAPE_COMPLEX_VOWEL_CONSTRAINTS + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-shape-complex-vowel-constraints.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 3db227265bc0790ffd718bf265d245c78598a49d +Author: Nathan Willis +Date: Tue Apr 2 18:49:40 2019 +0100 + + Update gtk-doc annotations for inout counts on various getter functions. + + src/hb-ot-layout.cc | 122 ++++++++++++++++++++++++++++++---------------------- + 1 file changed, 70 insertions(+), 52 deletions(-) + +commit c08ddbd91b7f0fffe761638a2ee4893304b012db +Author: Nathan Willis +Date: Sun Mar 24 15:07:07 2019 +0000 + + [Docs] Minor edits to gtk-doc inline comment review. + + src/hb-ot-layout.cc | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +commit af5230bce39020cf6fc87ee5e21cca3ba201a417 +Author: Nathan Willis +Date: Mon Mar 18 14:03:16 2019 +0000 + + [Docs] Minor; fix formatting for gtk-doc multiple-annotations. + + src/hb-ot-layout.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 6c0a1e8cd67144d20c8b5fcad23953910eeeea51 +Author: Nathan Willis +Date: Sun Mar 17 14:50:47 2019 +0000 + + [Docs] Annotate gtk-doc formatting with some un-annotated (out)s. + + src/hb-ot-layout.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 5122805c740961d4fdfbff440ed68792b63d50ed +Author: Nathan Willis +Date: Sun Mar 17 14:43:06 2019 +0000 + + [Docs] Fix gtk-doc formatting for (out) and (inout). + + src/hb-ot-layout.cc | 108 ++++++++++++++++++++++++++-------------------------- + 1 file changed, 54 insertions(+), 54 deletions(-) + +commit d3178aa52ae822ac6af606027ac8150ded0a2966 +Author: Nathan Willis +Date: Sun Mar 17 14:27:27 2019 +0000 + + [Docs] Fix gtk-doc references to 'kern' table functions, clarifying that GPOS is not examined. + + src/hb-ot-layout.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 3449031fad9dff7acedde7dceb0e47db708fc025 +Author: Nathan Willis +Date: Sat Mar 16 15:38:08 2019 +0000 + + [Docs] Add inline gtk-doc documentation of GDEF glyph classes. + + src/hb-ot-layout.h | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 930f6fc3da04ce1897e65862fccb03afa9d3a780 +Author: Nathan Willis +Date: Sat Mar 16 15:10:21 2019 +0000 + + [Docs] Add inlind gtk-doc comments for hb-ot-layout functions. + + src/hb-ot-layout.cc | 456 +++++++++++++++++++++++++++++++++++++++++++++++++++- + src/hb-ot-layout.h | 11 ++ + 2 files changed, 462 insertions(+), 5 deletions(-) + +commit b52c0e54b9855a1f3d400e4dbcd0372520f2c2fc +Author: Behdad Esfahbod +Date: Thu Apr 11 11:20:10 2019 -0400 + + Use injected class name to simplify macros + + src/hb-open-type.hh | 10 +++++----- + src/hb.hh | 14 -------------- + 2 files changed, 5 insertions(+), 19 deletions(-) + +commit baf1e79075b0f917b79484446cd2ca47b58f50aa +Author: Behdad Esfahbod +Date: Thu Apr 11 11:18:04 2019 -0400 + + [C++11] Use deleted methods + + src/hb.hh | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +commit 824fd342d5d66584a5ed88951e05975f33c55617 +Author: Behdad Esfahbod +Date: Thu Apr 11 11:16:01 2019 -0400 + + Rename a few macros + + src/hb-map.hh | 2 +- + src/hb-open-type.hh | 10 +++++----- + src/hb-set.hh | 2 +- + src/hb.hh | 12 ++++++------ + 4 files changed, 13 insertions(+), 13 deletions(-) + +commit edfc6be4a0362efa5c1d39f4792a28b5726c3ce5 +Author: Behdad Esfahbod +Date: Wed Apr 10 15:53:48 2019 -0400 + + [arabic] Disable fallback shaping if HB_NO_OT_SHAPE_COMPLEX_ARABIC_FALLBACK defined + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-ot-shape-complex-arabic-fallback.hh | 1 - + src/hb-ot-shape-complex-arabic.cc | 4 ++++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 4d31662b5da20790f6f860cec8f5fdabf48210f0 +Author: Behdad Esfahbod +Date: Wed Apr 10 15:40:03 2019 -0400 + + Don't install ot-font funcs on new fonts if HB_NO_OT_FONT defined + + Currently linker cannot GC hb-ot-font completely because we install + it on fonts by default. Don't do that if HB_NO_OT_FONT defined. + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-font.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit b111b3de020cde6fb0686efc224cace4608f2e45 +Author: Behdad Esfahbod +Date: Wed Apr 10 15:38:15 2019 -0400 + + Don't use any default unicode funcs if HB_NO_UNICODE_FUNCS is defined + + Part of https://github.com/harfbuzz/harfbuzz/issues/1652 + + src/hb-unicode.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit c5509be93a351177724f2891dd5e9ddb02553452 +Author: Behdad Esfahbod +Date: Mon Apr 8 14:50:58 2019 -0400 + + [coretext] Fix unused-variable error + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1659 + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4c19aa26204d0dc2f08b6e4a824e9088301f68d8 +Author: Maks Naumov +Date: Fri Apr 5 21:46:27 2019 +0300 + + Fix MSVC C4068 warning (#1656) + + src/hb-blob.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e44b83aac0443bd23df15b505a3d638883621b0e +Author: Michiharu Ariza +Date: Fri Apr 5 10:15:08 2019 -0700 + + replace test font SourceHanSans with its subet + + ...gular.default.3042,3044,3046,3048,304A,304B.otf | Bin 6356 -> 0 bytes + ...gular.default.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 6564 -> 0 bytes + .../SourceHanSans-Regular.default.61,63,65,6B.otf | Bin 5532 -> 0 bytes + ...gular.default.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 6780 -> 0 bytes + .../SourceHanSans-Regular.default.660E.otf | Bin 5248 -> 0 bytes + ...e-retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 537992 -> 0 bytes + ...e-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 692312 -> 0 bytes + ...ular.desubroutinize-retain-gids.61,63,65,6B.otf | Bin 531624 -> 0 bytes + ...e-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 692496 -> 0 bytes + ...ans-Regular.desubroutinize-retain-gids.660E.otf | Bin 613836 -> 0 bytes + ...esubroutinize.3042,3044,3046,3048,304A,304B.otf | Bin 6272 -> 0 bytes + ...esubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 6456 -> 0 bytes + ...eHanSans-Regular.desubroutinize.61,63,65,6B.otf | Bin 5460 -> 0 bytes + ...esubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 6572 -> 0 bytes + .../SourceHanSans-Regular.desubroutinize.660E.otf | Bin 5224 -> 0 bytes + ...e-retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 537424 -> 0 bytes + ...e-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 691692 -> 0 bytes + ...ints-desubroutinize-retain-gids.61,63,65,6B.otf | Bin 531124 -> 0 bytes + ...e-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 691808 -> 0 bytes + ....drop-hints-desubroutinize-retain-gids.660E.otf | Bin 613348 -> 0 bytes + ...esubroutinize.3042,3044,3046,3048,304A,304B.otf | Bin 6096 -> 0 bytes + ...esubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 6204 -> 0 bytes + ...gular.drop-hints-desubroutinize.61,63,65,6B.otf | Bin 5344 -> 0 bytes + ...esubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 6268 -> 0 bytes + ...Sans-Regular.drop-hints-desubroutinize.660E.otf | Bin 5120 -> 0 bytes + ...s-retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 537492 -> 0 bytes + ...s-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 691788 -> 0 bytes + ...-Regular.drop-hints-retain-gids.61,63,65,6B.otf | Bin 531164 -> 0 bytes + ...-Regular.drop-hints-retain-gids.61,63,65,6B.ttx | 393879 ------------------ + ...s-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 692008 -> 0 bytes + ...HanSans-Regular.drop-hints-retain-gids.660E.otf | Bin 613368 -> 0 bytes + ...ar.drop-hints.3042,3044,3046,3048,304A,304B.otf | Bin 6164 -> 0 bytes + ...ar.drop-hints.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 6300 -> 0 bytes + ...ourceHanSans-Regular.drop-hints.61,63,65,6B.otf | Bin 5376 -> 0 bytes + ...ar.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 6472 -> 0 bytes + .../SourceHanSans-Regular.drop-hints.660E.otf | Bin 5140 -> 0 bytes + ...r.retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 538076 -> 0 bytes + ...r.retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 692420 -> 0 bytes + ...urceHanSans-Regular.retain-gids.61,63,65,6B.otf | Bin 531704 -> 0 bytes + ...r.retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 692700 -> 0 bytes + .../SourceHanSans-Regular.retain-gids.660E.otf | Bin 613860 -> 0 bytes + ...ubset.default.3042,3044,3046,3048,304A,304B.otf | Bin 0 -> 3028 bytes + ...ubset.default.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 0 -> 3240 bytes + ...eHanSans-Regular_subset.default.61,63,65,6B.otf | Bin 0 -> 2200 bytes + ...ubset.default.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 0 -> 3460 bytes + .../SourceHanSans-Regular_subset.default.660E.otf | Bin 0 -> 1920 bytes + ...e-retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 0 -> 90956 bytes + ...e-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 0 -> 125820 bytes + ...bset.desubroutinize-retain-gids.61,63,65,6B.otf | Bin 0 -> 88392 bytes + ...e-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 0 -> 126004 bytes + ...ular_subset.desubroutinize-retain-gids.660E.otf | Bin 0 -> 103780 bytes + ...esubroutinize.3042,3044,3046,3048,304A,304B.otf | Bin 0 -> 2952 bytes + ...esubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 0 -> 3136 bytes + ...s-Regular_subset.desubroutinize.61,63,65,6B.otf | Bin 0 -> 2132 bytes + ...esubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 0 -> 3256 bytes + ...eHanSans-Regular_subset.desubroutinize.660E.otf | Bin 0 -> 1896 bytes + ...e-retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 0 -> 90656 bytes + ...e-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 0 -> 125468 bytes + ...ints-desubroutinize-retain-gids.61,63,65,6B.otf | Bin 0 -> 88156 bytes + ...e-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 0 -> 125584 bytes + ....drop-hints-desubroutinize-retain-gids.660E.otf | Bin 0 -> 103556 bytes + ...esubroutinize.3042,3044,3046,3048,304A,304B.otf | Bin 0 -> 2792 bytes + ...esubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 0 -> 2896 bytes + ...ubset.drop-hints-desubroutinize.61,63,65,6B.otf | Bin 0 -> 2028 bytes + ...esubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 0 -> 2964 bytes + ...gular_subset.drop-hints-desubroutinize.660E.otf | Bin 0 -> 1804 bytes + ...s-retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 0 -> 90724 bytes + ...s-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 0 -> 125560 bytes + ...r_subset.drop-hints-retain-gids.61,63,65,6B.otf | Bin 0 -> 88196 bytes + ...s-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 0 -> 125780 bytes + ...-Regular_subset.drop-hints-retain-gids.660E.otf | Bin 0 -> 103572 bytes + ...et.drop-hints.3042,3044,3046,3048,304A,304B.otf | Bin 0 -> 2848 bytes + ...et.drop-hints.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 0 -> 2988 bytes + ...nSans-Regular_subset.drop-hints.61,63,65,6B.otf | Bin 0 -> 2060 bytes + ...et.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 0 -> 3164 bytes + ...ourceHanSans-Regular_subset.drop-hints.660E.otf | Bin 0 -> 1824 bytes + ...t.retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 0 -> 91040 bytes + ...t.retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 0 -> 125924 bytes + ...Sans-Regular_subset.retain-gids.61,63,65,6B.otf | Bin 0 -> 88468 bytes + ...t.retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 0 -> 126208 bytes + ...urceHanSans-Regular_subset.retain-gids.660E.otf | Bin 0 -> 103800 bytes + test/subset/data/fonts/SourceHanSans-Regular.otf | Bin 16427580 -> 0 bytes + .../data/fonts/SourceHanSans-Regular_subset.otf | Bin 0 -> 2707728 bytes + test/subset/data/tests/cff-japanese.tests | 2 +- + 84 files changed, 1 insertion(+), 393880 deletions(-) + +commit a96d003d6ec4212fadad4f5b9058c9f8b07bcf89 +Author: Maks Naumov +Date: Fri Apr 5 12:29:56 2019 +0300 + + Fix MSVC C4138 warning (#1657) + + src/hb-ot-cff-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c68eb7002f1c2b847d955797e27f5403199e3d9d +Author: Behdad Esfahbod +Date: Wed Apr 3 16:24:12 2019 -0700 + + Minor + + src/hb-ot-layout-common.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 85adf4ad5c76172514f281bfbe3850ef35473cc7 +Author: Behdad Esfahbod +Date: Wed Apr 3 16:06:55 2019 -0700 + + [GDEF] Don't assume glyphlist is sorted + + As was hit by the fuzzer. + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14032 + + src/hb-ot-layout-common.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit ecabdffc61cb0b71424f4845aeda8cd0a6d25a29 +Author: Behdad Esfahbod +Date: Wed Apr 3 16:06:34 2019 -0700 + + [algs] Add hb_min() and hb_max() + + src/hb-algs.hh | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 7b863142ceb82fc2fd23802f19f7379aa2f152e5 +Author: Behdad Esfahbod +Date: Wed Apr 3 15:48:27 2019 -0700 + + [serialize] Make putting breakpoint on out-of-memory easier + + src/hb-serialize.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 2bd275023405b6a669d59ad4cdcb2e8cb410d593 +Author: Behdad Esfahbod +Date: Wed Apr 3 15:31:53 2019 -0700 + + [iter] Tweak SFINAE again + + Don't think we need hb_is_same(). + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f02ebc89ec89e78a348f9b67d613a2024feabc18 +Author: Behdad Esfahbod +Date: Wed Apr 3 15:23:06 2019 -0700 + + [array] Add compy assignment operator since copy constructor is explicit + + src/hb-array.hh | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 20a73da2c9227a0f9bc943a3d766eedeb5bed3b3 +Author: Behdad Esfahbod +Date: Wed Apr 3 14:32:15 2019 -0700 + + [array] Add default copy constructor + + MSVC seems to need it. + + src/hb-array.hh | 1 + + 1 file changed, 1 insertion(+) + +commit d419a9a4376de7b2ae1dec7df09f8d034cc2d039 +Author: Behdad Esfahbod +Date: Wed Apr 3 14:18:19 2019 -0700 + + [iter] Use different SFINAE scheme to make MSVC happy + + From Orvid King: TLDR; MSVC has some issues using sizeof(declval()) for + SFINAE of templated types, so I just used SFINAE in a different context where + MSVC doesn't have the issue. + + src/hb-iter.hh | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +commit 2778df7972f537192b51cd0719adf2ab4d1f3397 +Author: Behdad Esfahbod +Date: Wed Apr 3 14:15:01 2019 -0700 + + [meta] Add hb_is_same() + + src/hb-meta.hh | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 6215fb8e68bdf69f4af9f7f4959ad55a70723774 +Author: Behdad Esfahbod +Date: Tue Apr 2 23:10:03 2019 -0700 + + [serialize] Actually reclaim storage from duplicate objects + + src/hb-serialize.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3305a2cad24f878f5d8773c2acae491ebd5a9059 +Author: Behdad Esfahbod +Date: Tue Apr 2 22:42:22 2019 -0700 + + [serialize] Port to use object pool + + Tested, but feels fragile :(. + + src/hb-pool.hh | 5 +- + src/hb-serialize.hh | 141 ++++++++++++++++++++++++++++++++-------------------- + 2 files changed, 91 insertions(+), 55 deletions(-) + +commit 5efbc01174127bede4d533866acac239e5a0cfd5 +Author: Behdad Esfahbod +Date: Tue Apr 2 22:41:06 2019 -0700 + + [pool] Uses memset() instead of assigning Null() + + Assignment is invalid on invalid object. + + src/hb-pool.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 434d78bf91ac5204ffbf2144f199eb7a0f65c421 +Author: Behdad Esfahbod +Date: Tue Apr 2 21:46:40 2019 -0700 + + Add hb_pool_t<> for pooled memory allocation + + src/Makefile.sources | 1 + + src/hb-pool.hh | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 99 insertions(+) + +commit 8e4df1a152f3916613594fa1bac308efdb61d512 +Author: Behdad Esfahbod +Date: Tue Apr 2 20:20:53 2019 -0700 + + [serialize] Disable packed_map again + + Ugh. Need to think of something else. + + src/hb-serialize.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 31c1a83899147310b27bd40fac755c629cb59cef +Author: Behdad Esfahbod +Date: Tue Apr 2 20:17:27 2019 -0700 + + [map] Protect more against pointer deref + + src/hb-map.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 5bffa9e375fe294718452ad51e4c5ff017a046b4 +Author: Behdad Esfahbod +Date: Tue Apr 2 20:13:16 2019 -0700 + + More + + src/hb-map.hh | 5 +++++ + src/hb-set.hh | 9 ++++++++- + src/hb-vector.hh | 8 ++++---- + 3 files changed, 17 insertions(+), 5 deletions(-) + +commit 5b66b033fd2cd9c95284d283f08d6789c7ec985d +Author: Behdad Esfahbod +Date: Tue Apr 2 19:27:02 2019 -0700 + + [serialize] Fix hb_hashmap_t<> for pointers and use in packed_map + + src/hb-array.hh | 12 +++++++++++- + src/hb-map.hh | 22 ++++++++++++++-------- + src/hb-serialize.hh | 8 +++----- + src/hb-vector.hh | 1 + + 4 files changed, 29 insertions(+), 14 deletions(-) + +commit 42ab32cbbaf8b403c351953f091c0fbe8464c4cb +Author: Behdad Esfahbod +Date: Tue Apr 2 18:41:33 2019 -0700 + + [iter] Remove passing pointer to hb_iter() + + While doable with hb_deref_pointer() as well, we also would then + need to do it in a ton of places. Not worth it / messy. + + src/hb-array.hh | 2 +- + src/hb-iter.hh | 5 ----- + src/test-iter.cc | 3 --- + 3 files changed, 1 insertion(+), 9 deletions(-) + +commit d0da547b3741323493398eed8975a76f4a5742c2 +Author: Behdad Esfahbod +Date: Tue Apr 2 18:22:39 2019 -0700 + + [array] Use dagger for hashing array + + Also switch to better mixing. + + src/hb-array.hh | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit b6f29bf14153cac51b218e3aaba9e1b3aa747a8c +Author: Behdad Esfahbod +Date: Tue Apr 2 18:12:01 2019 -0700 + + [iter] Accept pointers in hb_iter() + + No idea how to avoid dupicating code. Was hoping hb_deref_pointer() + would do it, but looks like a pointer can't bind to a universal + reference T&&. Humm. + + src/hb-iter.hh | 5 +++++ + src/test-iter.cc | 3 +++ + 2 files changed, 8 insertions(+) + +commit fc24bb9046e7e39d52a245bdc3480a30095cb6ee +Author: Behdad Esfahbod +Date: Tue Apr 2 17:49:52 2019 -0700 + + [serialize] Towards maintaining packed_map + + src/hb-serialize.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit aa2293a55eaa39f4e77b60851bbdee56b1120225 +Author: Behdad Esfahbod +Date: Tue Apr 2 17:42:10 2019 -0700 + + [serialize] Minor + + src/hb-open-type.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit e42b82c828ecec6f534040dae5518e04643b5f10 +Author: Behdad Esfahbod +Date: Tue Apr 2 17:21:54 2019 -0700 + + [serialize] Handle non-nullable offsets + + src/hb-open-type.hh | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +commit e04518bafc66224887bf7f478e1affb54bc7acd0 +Author: Behdad Esfahbod +Date: Tue Apr 2 17:20:04 2019 -0700 + + [serialize] Movce empty-object handling earlier + + src/hb-serialize.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 7f73c9744e6c0e8dd37a208b75a4bc299bccbd4d +Author: Behdad Esfahbod +Date: Tue Apr 2 17:12:24 2019 -0700 + + [serialize] Minor + + src/hb-open-type.hh | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +commit 5a3de4f4f8791139d2c04a66244001aba192ef6b +Author: Behdad Esfahbod +Date: Tue Apr 2 16:53:05 2019 -0700 + + [serialize] Allow offset links that have base offset from the object base + + Rarely used, but used, in name table or similar constructs. + + src/hb-serialize.hh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit edad6b2c450e22e67ae86c5f2328cca3c29aaad2 +Author: Ebrahim Byagowi +Date: Wed Apr 3 00:48:59 2019 +0430 + + [test][iter] minor, fix double promotion warning + + src/test-iter.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 062f5d6e7aa061358eb5874a8f3a3f3bd6e9f16f +Author: Ebrahim Byagowi +Date: Tue Apr 2 20:27:00 2019 +0430 + + [test] minor, c style comments + + src/test-iter.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit afdbf960d6147ec607ddb2c780d3a83068f61357 +Author: Ebrahim Byagowi +Date: Tue Apr 2 20:25:06 2019 +0430 + + [iter][test] Add another test for hb_reduce + + Different initial and accumulator types + + src/test-iter.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit bfa02bef4546f448e048288c1162988c8c39322a +Author: Behdad Esfahbod +Date: Mon Apr 1 21:36:13 2019 -0700 + + [serialize] Switch to tetris-packing + + src/hb-open-type.hh | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +commit f0ea3ac17bef98409d302b9f285e94015e069823 +Author: Behdad Esfahbod +Date: Mon Apr 1 21:36:03 2019 -0700 + + [serialize] Fix linking + + src/hb-serialize.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7c0e2054e0799ed89cdc5de8c1416d009c0029b5 +Author: Behdad Esfahbod +Date: Mon Apr 1 21:32:29 2019 -0700 + + [serialize] Minor + + src/hb-serialize.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 64d0f0893812fa1cb2746071d8b021560969526d +Author: Behdad Esfahbod +Date: Mon Apr 1 16:50:28 2019 -0700 + + [cmap] Minor + + src/hb-ot-cmap-table.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 2e675cc7b50b5a57ceddf799d63811801ffcfe94 +Author: Behdad Esfahbod +Date: Mon Apr 1 16:45:50 2019 -0700 + + [subset] Call serialize start/end around it + + To be cleaned up. + + src/hb-subset.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit abe33c6149719eb371c5f2b0d8c143550938129e +Author: Behdad Esfahbod +Date: Mon Apr 1 16:45:40 2019 -0700 + + [serialize] Assert stack + + src/hb-serialize.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 72e9b2c16cd1bc183226ca0aa8a58a5b1222573d +Author: Behdad Esfahbod +Date: Mon Apr 1 16:17:30 2019 -0700 + + [serialize] Add add_link() to add link + + src/hb-serialize.hh | 26 +++++++++++++++++++++++--- + 1 file changed, 23 insertions(+), 3 deletions(-) + +commit 74addbecac3b8be699ac90b3853970f6c7efd0eb +Author: Behdad Esfahbod +Date: Mon Apr 1 14:17:09 2019 -0700 + + [serialize] Add default template type to push() + + src/hb-serialize.hh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit b8642087e6c2ec96dc70fcef617128b6ce353a7e +Author: Ebrahim Byagowi +Date: Tue Apr 2 00:30:06 2019 +0430 + + [iter] hb_reduce, accumulator with a different type + + src/hb-iter.hh | 22 ++++++++++++---------- + src/test-iter.cc | 26 +++++++++++++++++++++++++- + 2 files changed, 37 insertions(+), 11 deletions(-) + +commit e526414c759ebca82f1071cdeafe1160bcaa9637 +Author: Ebrahim Byagowi +Date: Sun Mar 31 12:41:58 2019 +0430 + + [iter] Implement hb_reduce + + src/hb-iter.hh | 28 ++++++++++++++++++++++++++++ + src/test-iter.cc | 5 +++++ + 2 files changed, 33 insertions(+) + +commit f3aca6aa267f7687a0406c7c545aefb5eed300b2 +Author: Behdad Esfahbod +Date: Sun Mar 31 21:37:14 2019 -0700 + + [serialize] Implement linking + + Untested! + + src/hb-serialize.hh | 29 +++++++++++++++++++++++++++-- + 1 file changed, 27 insertions(+), 2 deletions(-) + +commit 17f0cfa7ea3a5f0946d8800b98c1582c05dad853 +Author: Behdad Esfahbod +Date: Sun Mar 31 21:34:19 2019 -0700 + + Move BEInt to hb.hh + + I knows... + + src/hb-machinery.hh | 88 ---------------------------------------------------- + src/hb.hh | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 89 insertions(+), 88 deletions(-) + +commit 78fc43f2930064cd6cf4229c1e4cb76edb8ed7f6 +Author: Behdad Esfahbod +Date: Sun Mar 31 19:17:07 2019 -0700 + + [iter] Fix up build, ouch + + Yeah, some things not very clear... + + src/hb-iter.hh | 8 ++++++-- + src/test-iter.cc | 4 ++-- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit e5d6fe9782a9fcde0786392c075c6c0b85c24829 +Author: Jonathan Kew +Date: Sun Mar 31 19:17:32 2019 +0100 + + Don't skip setting the .end field of the first range + + Fixes a bug in CoverageFormat2::serialize whereby the first range + was not serialized correctly if it consists of only a single glyph ID. + This broke shaping of U+0626 in the Arabic fallback shaper, because it + is not found in the coverage table of the 'init' and 'medi' lookups. + + Also fix similar bug in ClassDefFormat2::serialize, noted during code + inspection (I haven't observed a case that was actually affected by + this, but it looks broken). + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1504 + + src/hb-ot-layout-common.hh | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit 8a8d45b924cdb4343b4b11a7ef14e2d1fabb6f82 +Author: Behdad Esfahbod +Date: Sun Mar 31 19:00:09 2019 -0700 + + [iter] Adjust hb_copy() and use it + + Untested. + + src/hb-iter.hh | 11 ++++------- + src/hb-vector.hh | 4 ++-- + 2 files changed, 6 insertions(+), 9 deletions(-) + +commit ba4b7be45523e88c26f763f8a329cc43c13b98a1 +Author: Ebrahim Byagowi +Date: Sun Mar 31 01:32:30 2019 -0700 + + Remove coretext_aat shaper (#1581) + + coretext_aat was a temporary shaper to redirect shaping of AAT fonts + to CoreText and leaving the rest for HarfBuzz. As HarfBuzz now supports + AAT and Chrome now actually ships that on a stable version on macOS, + we no longer care about such use-case. If a client really wants 100% + metrics compatibility with CoreText better to use it directly or through + our API. Replicating the same behavior still is possible using + hb_shape_full, something we don't care or like to offer anymore. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1478 + + src/hb-coretext.cc | 56 --------------------------------------------------- + src/hb-shaper-list.hh | 4 ---- + 2 files changed, 60 deletions(-) + +commit d6005b49b32410543a8dfa93ce2a213223cf8f01 +Author: Behdad Esfahbod +Date: Sat Mar 30 19:49:56 2019 -0700 + + [serialize] Start implementing linking + + src/hb-serialize.hh | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +commit 313b3057c335da6baa4cd447bac95812992413b9 +Author: Behdad Esfahbod +Date: Sat Mar 30 19:46:35 2019 -0700 + + [serializer] Implement dedup! + + src/hb-serialize.hh | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + +commit b189bbc48fb4b7c251d30b26a57ad84d1cb6dbe4 +Author: Behdad Esfahbod +Date: Sat Mar 30 19:41:48 2019 -0700 + + Implement hashing of objects + + Should be improved for hb_bytes_t. + + src/hb-algs.hh | 2 +- + src/hb-array.hh | 13 +++++++++++++ + src/hb-serialize.hh | 5 +++++ + src/hb-vector.hh | 5 +++++ + 4 files changed, 24 insertions(+), 1 deletion(-) + +commit d6b28057a5cc636138cd453947d3a2008f18729f +Author: Behdad Esfahbod +Date: Sat Mar 30 19:31:51 2019 -0700 + + Fix hb_hash(pointer) + + src/hb-algs.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d74dc3ef65a159fe585e906deccdb32b570433aa +Author: Behdad Esfahbod +Date: Sat Mar 30 19:26:37 2019 -0700 + + [serialize] Don't insert empty object into tree + + src/hb-serialize.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 7fd82283263f8caded4870d6e12f74c7e660fa8d +Author: Behdad Esfahbod +Date: Sat Mar 30 19:16:20 2019 -0700 + + [serialize] Towards maintaining hashmap + + src/hb-algs.hh | 2 +- + src/hb-serialize.hh | 16 ++++++++++++++-- + src/hb-vector.hh | 1 + + 3 files changed, 16 insertions(+), 3 deletions(-) + +commit f254f45a1e6b1de6d83c97033773d20408772763 +Author: Behdad Esfahbod +Date: Sat Mar 30 19:05:51 2019 -0700 + + [serialize] Only pack main object if there are other objects + + Avoids a memmove for tables that don't use the object packing mechanism. + + src/hb-serialize.hh | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 946d446f9b795f657d56ca443edbc0b77d660a50 +Author: Behdad Esfahbod +Date: Sat Mar 30 19:03:55 2019 -0700 + + [serialize] Copy both sides of the buffer + + src/hb-serialize.hh | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +commit 8512dc565d310e9fd80d831282736284cc3ecd2e +Author: Behdad Esfahbod +Date: Sat Mar 30 19:01:23 2019 -0700 + + [serialize] Simplify copy + + src/hb-serialize.hh | 22 +++++++--------------- + 1 file changed, 7 insertions(+), 15 deletions(-) + +commit 0b1fe7b716628f7b7b4098da9ef544e1518008f5 +Author: Behdad Esfahbod +Date: Sat Mar 30 18:48:26 2019 -0700 + + [serializer] Unbreak for now + + src/hb-serialize.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 10f062234eb7c762a36cf750e75fe6f74ee89a3d +Author: Behdad Esfahbod +Date: Sat Mar 30 18:44:01 2019 -0700 + + [map] Shuffle fini code + + src/hb-map.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e6b78003efbe02ba4542cadcc13bc1dd0b1d57b0 +Author: Behdad Esfahbod +Date: Sat Mar 30 18:33:30 2019 -0700 + + [vector] Add move semantics + + src/hb-vector.hh | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit 4c4d3c3ed55a8f1eea20593c08322e61fe1cdd3c +Author: Behdad Esfahbod +Date: Sat Mar 30 18:30:50 2019 -0700 + + [vector] Add some move and forwarding + + src/hb-serialize.hh | 2 +- + src/hb-vector.hh | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 7c9ceabcef426ca6fc54b70db9dd8cb63937710b +Author: Behdad Esfahbod +Date: Sat Mar 30 18:19:36 2019 -0700 + + [meta] Add hb_move and hb_forward ala std:: + + src/hb-meta.hh | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 9a19b885f9136b0b7cdfa04679274cd4b6d16188 +Author: Behdad Esfahbod +Date: Sat Mar 30 18:14:30 2019 -0700 + + [serialize] Flesh out packing + + src/hb-serialize.hh | 58 +++++++++++++++++++++++++++++++---------------------- + 1 file changed, 34 insertions(+), 24 deletions(-) + +commit 357c7c611cc20f86c646bd2d392c243140f92d34 +Author: Behdad Esfahbod +Date: Sat Mar 30 18:13:57 2019 -0700 + + [vector] Add copy constructor and assignment operator + + src/hb-vector.hh | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +commit 6f69c9d26fa53cd8a2331395bbc146bfc85fd1e3 +Author: Behdad Esfahbod +Date: Sat Mar 30 18:00:03 2019 -0700 + + [serialize] Minor + + src/hb-serialize.hh | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit a43290192beedc6335efc3841c05ec7fa54e8871 +Author: Behdad Esfahbod +Date: Sat Mar 30 17:51:26 2019 -0700 + + [serialize] Add packed_map + + src/hb-map.hh | 7 +++++++ + src/hb-serialize.hh | 24 +++++++++++++++++++++--- + 2 files changed, 28 insertions(+), 3 deletions(-) + +commit bed150bd2e8d61950ea17d1b5a4bf4705801c1cc +Author: Behdad Esfahbod +Date: Sat Mar 30 17:26:35 2019 -0700 + + [serialize] Start fleshing out object stack + + src/hb-serialize.hh | 91 ++++++++++++++++++++++++++++++++++++++--------------- + src/hb-vector.hh | 9 ++++-- + 2 files changed, 72 insertions(+), 28 deletions(-) + +commit 63c35651893b2a1c555f728012e9ad36c0f84145 +Author: Behdad Esfahbod +Date: Sat Mar 30 17:12:40 2019 -0700 + + [serialize] Simplify propagate_error() + + src/hb-serialize.hh | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +commit dbe9ba6711c6d35374de645097babfd81bc295b2 +Author: Behdad Esfahbod +Date: Sat Mar 30 17:10:59 2019 -0700 + + [serialize] Add object_t, link_t, and snapshot_t + + src/hb-serialize.hh | 32 +++++++++++++++++++++++++++++++- + 1 file changed, 31 insertions(+), 1 deletion(-) + +commit 38d57b9a66008c9722125d4d677d759a910cf2a1 +Author: Behdad Esfahbod +Date: Sat Mar 30 16:38:06 2019 -0700 + + [map] Add another TODO item + + src/hb-map.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 7fd940f899da4948d2c61ed497c1face42776187 +Author: Behdad Esfahbod +Date: Sat Mar 30 16:29:19 2019 -0700 + + [map] Add TODO + + src/hb-map.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 6dcf7c4017619c782dbc8bd2c584bb33df96fc83 +Author: Behdad Esfahbod +Date: Sat Mar 30 15:08:39 2019 -0700 + + [serialize] Add unused 'tail' + + src/hb-serialize.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit fe05e48086be9ed685b8a6ca4af966660744bc0f +Author: Behdad Esfahbod +Date: Sat Mar 30 15:06:25 2019 -0700 + + [serialize] Add ran_out_of_room + + src/hb-serialize.hh | 8 +++++++- + src/hb-subset.cc | 7 ++++++- + 2 files changed, 13 insertions(+), 2 deletions(-) + +commit a7c63cd8f8475c6de7fd5bb6444bf5d24082a191 +Author: Behdad Esfahbod +Date: Sat Mar 30 14:59:40 2019 -0700 + + Split sanitize and dispatch into their own files + + src/Makefile.sources | 2 + + src/hb-dispatch.hh | 50 +++++++ + src/hb-machinery.hh | 369 +----------------------------------------------- + src/hb-sanitize.hh | 388 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 442 insertions(+), 367 deletions(-) + +commit be66b575fc15dbbe82cf1a7fa0b58020e86cffdc +Author: Behdad Esfahbod +Date: Sat Mar 30 14:53:54 2019 -0700 + + Move serializer to hb-serialize.hh + + src/Makefile.sources | 1 + + src/hb-machinery.hh | 164 +----------------------------------------- + src/hb-serialize.hh | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 198 insertions(+), 163 deletions(-) + +commit bb22462f292995a724bf20363adf52d3a8357a97 +Author: Behdad Esfahbod +Date: Sat Mar 30 14:46:54 2019 -0700 + + Whitespace + + src/hb-machinery.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit ef33b5d1f6d3ec21e15ad74ca2524a117f594e06 +Author: Behdad Esfahbod +Date: Sat Mar 30 14:39:21 2019 -0700 + + [map] Deref pointers before equality check + + src/hb-map.hh | 6 ++++-- + src/hb-meta.hh | 4 ++-- + 2 files changed, 6 insertions(+), 4 deletions(-) + +commit c98f51da719d1792bf23b53a9a345926056bf34d +Author: Behdad Esfahbod +Date: Sat Mar 30 14:30:22 2019 -0700 + + [map] Templatize hb_map_t + + Template name is hb_hashmap_t. + + src/hb-map.hh | 65 ++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 37 insertions(+), 28 deletions(-) + +commit 4b7f4dbc0cf58d87f4c91f059734e91e4d988480 +Author: Behdad Esfahbod +Date: Sat Mar 30 13:48:32 2019 -0700 + + Add hb_deref_pointer() + + src/hb-algs.hh | 18 +++++++++++++----- + src/hb-meta.hh | 8 ++++++++ + 2 files changed, 21 insertions(+), 5 deletions(-) + +commit e5306927994e8e412dea5dd960b8b3ed4ca848eb +Author: Behdad Esfahbod +Date: Fri Mar 29 23:31:07 2019 -0700 + + [iter] Fix bug in hb_any() and hb_none() + + src/hb-iter.hh | 4 ++-- + src/hb-ot-layout-gsubgpos.hh | 12 ++++++------ + src/test-iter.cc | 2 +- + 3 files changed, 9 insertions(+), 9 deletions(-) + +commit f505b5d5c9c05741a933b4b986503e1697bbdfdb +Author: Behdad Esfahbod +Date: Fri Mar 29 22:55:02 2019 -0700 + + [iter] Port remaining "for (auto" instances to daggers + + src/hb-ot-layout-gsubgpos.hh | 35 +++++++++++++++++++++++------------ + 1 file changed, 23 insertions(+), 12 deletions(-) + +commit 668d2d562fec797d779c6d6a43eb6e1c7cfbc07a +Author: Behdad Esfahbod +Date: Fri Mar 29 22:48:38 2019 -0700 + + [iter] One more dagger + + src/hb-ot-layout-gsubgpos.hh | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit d51452500f909803a346f26c71cf4b3f84f619bd +Author: Behdad Esfahbod +Date: Fri Mar 29 22:48:12 2019 -0700 + + [iter] Remove more wrong &&'s + + Sigh... + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 05f2130a1c479afe7982e8ddcfb3d83af9960e5b +Author: Behdad Esfahbod +Date: Fri Mar 29 22:40:13 2019 -0700 + + [iter] More daggers + + src/hb-ot-layout-gsubgpos.hh | 110 +++++++++++++++++++++++++------------------ + 1 file changed, 64 insertions(+), 46 deletions(-) + +commit 22ec4c3aa5aa41b7aa2a89290851ddd386273579 +Author: Behdad Esfahbod +Date: Fri Mar 29 22:27:46 2019 -0700 + + [iter] More daggers + + src/hb-ot-layout-gsubgpos.hh | 55 ++++++++++++++++++++++++++------------------ + 1 file changed, 33 insertions(+), 22 deletions(-) + +commit 688069bbfb40d69fb141371633cd499d91324cc2 +Author: Behdad Esfahbod +Date: Fri Mar 29 22:17:31 2019 -0700 + + [iter] One more dagger + + src/hb-ot-layout-gsub-table.hh | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +commit 90b60bd6909ffc6d0bff3e6901057439460407ca +Author: Behdad Esfahbod +Date: Fri Mar 29 22:12:42 2019 -0700 + + Remove HB_DEBUG_WOULD_APPLY + + Not that useful. + + src/hb-debug.hh | 15 +--------- + src/hb-ot-layout-gsub-table.hh | 49 ++++++++++---------------------- + src/hb-ot-layout-gsubgpos.hh | 64 ++++++++++++++++++------------------------ + 3 files changed, 43 insertions(+), 85 deletions(-) + +commit 4d28267e59406cc85761131b84c5b2b4c65c6b35 +Author: Behdad Esfahbod +Date: Fri Mar 29 22:04:15 2019 -0700 + + [iter] Port more to daggers + + src/hb-ot-layout-gsub-table.hh | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit 9d8c72042b4a023b55cb39779407fdecaf098af1 +Author: Behdad Esfahbod +Date: Fri Mar 29 21:59:28 2019 -0700 + + Whitespace + + src/hb-ot-layout-gpos-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 418e9d07e2120f806852312f4c74204fa085a6cc +Author: Behdad Esfahbod +Date: Fri Mar 29 21:57:26 2019 -0700 + + Simplify code + + src/hb-ot-layout-gsub-table.hh | 20 +++----------------- + 1 file changed, 3 insertions(+), 17 deletions(-) + +commit f5ef8a7347656ad5f5bb8cec5f9a3de262a79411 +Author: Behdad Esfahbod +Date: Fri Mar 29 21:57:17 2019 -0700 + + [iter] Port one more function to dagger + + src/hb-ot-layout-gpos-table.hh | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit bcab098c8f35ac4bef6618d949a7bf1d95869fa5 +Author: Behdad Esfahbod +Date: Fri Mar 29 21:49:18 2019 -0700 + + [iter] Port more code to daggers + + src/hb-ot-layout-gsub-table.hh | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit 4c75158e1803e73d6126f715aa4b22ebe30aa7c7 +Author: Behdad Esfahbod +Date: Fri Mar 29 21:46:13 2019 -0700 + + [iter] Port two more functions to daggers + + src/hb-ot-layout-gsub-table.hh | 29 +++++++++++++++++------------ + 1 file changed, 17 insertions(+), 12 deletions(-) + +commit e70ccbe9edd4d5e033df4afa728b3593ba9f78af +Author: Behdad Esfahbod +Date: Fri Mar 29 21:45:49 2019 -0700 + + Fix pair signature + + Oh well. Again, who does fully understand what is right??? + + src/hb-algs.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6237b47f0c59fd3913b19b23800cdf83eaa01fb6 +Author: Behdad Esfahbod +Date: Fri Mar 29 21:36:49 2019 -0700 + + [iter] Add hb_unzip() + + src/hb-iter.hh | 38 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +commit f1dad91eb3ce9dcdedbb4a0d6e34517db0154a84 +Author: Behdad Esfahbod +Date: Fri Mar 29 21:17:08 2019 -0700 + + Whitespace + + src/hb-ot-layout-gsub-table.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit 896b31670d07cbe276feff1db249b64faa5c552c +Author: Behdad Esfahbod +Date: Fri Mar 29 21:16:30 2019 -0700 + + [iter] Port two more loops to dagger + + src/hb-ot-layout-gsub-table.hh | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit 8e34cb251a9b22d6fbc637fd2f25965beb260270 +Author: Behdad Esfahbod +Date: Fri Mar 29 21:14:20 2019 -0700 + + [iter] Remove unneeded && + + Next commit needs this. I never fully get this, sigh. + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 12a4c0441ff13e56bb87f53eab45930c2a6142ed +Author: Behdad Esfahbod +Date: Fri Mar 29 21:06:10 2019 -0700 + + Whitespace + + src/hb-ot-layout-gsub-table.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 4c38a9f6011a9b1dd6c4fc98620e23decc340322 +Author: Behdad Esfahbod +Date: Fri Mar 29 20:23:07 2019 -0700 + + Remove hb_assign() + + Not needed anymore. We just use operator= now. + + src/hb-iter.hh | 2 +- + src/hb-machinery.hh | 2 +- + src/hb-null.hh | 13 ------------- + src/hb-open-type.hh | 2 +- + 4 files changed, 3 insertions(+), 16 deletions(-) + +commit b986c6a321f7d997eba0a9308b651966644bf336 +Author: Behdad Esfahbod +Date: Fri Mar 29 20:17:46 2019 -0700 + + [C++11] Remove IntType::set() in favor of operator= + + src/hb-cff-interp-common.hh | 4 +- + src/hb-ft.cc | 2 +- + src/hb-null.hh | 6 --- + src/hb-open-file.hh | 14 +++--- + src/hb-open-type.hh | 43 +++++++++++------ + src/hb-ot-cff-common.hh | 24 +++++----- + src/hb-ot-cff1-table.hh | 32 ++++++------- + src/hb-ot-cmap-table.hh | 77 +++++++++++++++--------------- + src/hb-ot-glyf-table.hh | 2 +- + src/hb-ot-hdmx-table.hh | 12 ++--- + src/hb-ot-hmtx-table.hh | 8 ++-- + src/hb-ot-layout-common.hh | 44 ++++++++--------- + src/hb-ot-layout-gdef-table.hh | 8 ++-- + src/hb-ot-layout-gsub-table.hh | 18 +++---- + src/hb-ot-maxp-table.hh | 16 +++---- + src/hb-ot-os2-table.hh | 10 ++-- + src/hb-ot-post-table.hh | 2 +- + src/hb-ot-shape-complex-arabic-fallback.hh | 10 ++-- + src/hb-ot-vorg-table.hh | 12 ++--- + src/hb-subset-cff-common.cc | 12 ++--- + src/hb-subset-cff-common.hh | 2 +- + src/hb-subset-cff1.cc | 10 ++-- + src/hb-subset-cff2.cc | 8 ++-- + src/hb-subset-glyf.cc | 8 ++-- + src/hb-uniscribe.cc | 22 ++++----- + 25 files changed, 206 insertions(+), 200 deletions(-) + +commit 58ad357951a732f05d9680573d00a4764171a9dd +Author: Behdad Esfahbod +Date: Fri Mar 29 20:05:19 2019 -0700 + + [vector] Accept all types in push(...) + + Let assignment operator worry about conversion. + + src/hb-vector.hh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 489faf826ca16e9bc89515869ebaf52653450b54 +Author: Behdad Esfahbod +Date: Fri Mar 29 20:01:37 2019 -0700 + + [C++11] Use type aliases for template partial instantiations + + src/hb-open-type.hh | 24 ++++++++++++++---------- + 1 file changed, 14 insertions(+), 10 deletions(-) + +commit 4fd02f6ee58ebf7b4ecf0526328938c5bd74a180 +Author: Behdad Esfahbod +Date: Fri Mar 29 17:57:59 2019 -0700 + + Remove unused line + + src/hb-machinery.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 9a5b15dc1eda4f34496bb942d78f0df4e975b469 +Author: Behdad Esfahbod +Date: Fri Mar 29 17:57:24 2019 -0700 + + [C++11] Replace BEInt.set() with operator= + + src/hb-machinery.hh | 15 +++++++++++---- + src/hb-open-type.hh | 8 ++++---- + 2 files changed, 15 insertions(+), 8 deletions(-) + +commit 0aa59b1de34ddebc242cca3ebddde6859269f5f1 +Author: Behdad Esfahbod +Date: Fri Mar 29 17:49:55 2019 -0700 + + [C++11] Add operator= to IntType<> + + Now that we require C++11 we can do this. + + src/hb-open-type.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit eca466e6b1a3e29532af92a2d30b2555c0fafbfc +Author: Behdad Esfahbod +Date: Fri Mar 29 15:59:04 2019 -0700 + + Err. Fixup C++11 polyfill removal + + Fixes 1d75db19fb5df139b9648ff3f5e6184a5c554345 + + src/hb.hh | 27 +++++++++++++++++++++------ + 1 file changed, 21 insertions(+), 6 deletions(-) + +commit 3f36c89f2ea16e293f8af7e7f549ebcd7247ea97 +Author: Behdad Esfahbod +Date: Fri Mar 29 15:22:46 2019 -0700 + + Inline explicit_operator macro + + Now that we require C++11, no need to macro. + + src/hb-iter.hh | 2 +- + src/hb-machinery.hh | 2 +- + src/hb-open-type.hh | 2 +- + src/hb-vector.hh | 6 +++--- + src/hb.hh | 5 ----- + 5 files changed, 6 insertions(+), 11 deletions(-) + +commit 1d75db19fb5df139b9648ff3f5e6184a5c554345 +Author: Behdad Esfahbod +Date: Fri Mar 29 15:20:34 2019 -0700 + + Remove C++<11 polyfill + + Leaving hb-atomic.hh as is since harmless and other projects might + copy from that file. + + src/hb.hh | 81 --------------------------------------------------------------- + 1 file changed, 81 deletions(-) + +commit 8e7887ca5f8a2822345bdcbdc873c73a31c81177 +Merge: 7929b0f0 90aebc6c +Author: Behdad Esfahbod +Date: Fri Mar 29 14:37:04 2019 -0700 + + Merge branch 'master' into iter + +commit 90aebc6cf1aaca281ce51cb8e23831d7167cdcd3 +Author: Behdad Esfahbod +Date: Fri Mar 29 14:30:02 2019 -0700 + + Update RELEASING + + RELEASING.md | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 7929b0f07e87a77687ea50205e6e4013c9264f85 +Author: Behdad Esfahbod +Date: Fri Mar 29 14:14:55 2019 -0700 + + [ci] Fix build + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b292772e6ef15728dd66329e637265748df0efe1 +Author: Ebrahim Byagowi +Date: Fri Mar 29 13:00:56 2019 -0700 + + [dwrite] A new API, hb_directwrite_face_get_font_face (#1600) + + Can be useful when using HarfBuzz for font loading and shaping + but using DirectWrite for rendering. + + docs/harfbuzz-sections.txt | 10 ++++++++-- + src/hb-directwrite.cc | 34 ++++++++++++++++++++++++++++++---- + src/hb-directwrite.h | 3 +++ + 3 files changed, 41 insertions(+), 6 deletions(-) + +commit 59f36f36820f6e6fb1d3b6da26d6b5ee7588c42f +Author: Behdad Esfahbod +Date: Fri Mar 29 10:55:12 2019 -0700 + + Replace REPLACEME's left out of 2.4.0 + + https://github.com/harfbuzz/harfbuzz/issues/1641 + + src/hb-common.h | 2 +- + src/hb-directwrite.cc | 2 +- + src/hb-subset-input.cc | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit fe570bc043ca2c6be71b18f7401c8f06e73527e0 +Author: Behdad Esfahbod +Date: Fri Mar 29 10:51:38 2019 -0700 + + [docs] Remove unexisting section + + docs/harfbuzz-docs.xml | 1 - + 1 file changed, 1 deletion(-) + +commit 443db2a24624b63c49fa3ad9a10d3b4c523af1ce +Author: Behdad Esfahbod +Date: Fri Mar 29 10:46:44 2019 -0700 + + [iter] Remove hb_len() + + Not planning on using it. So remove. Can add later if needed. + + src/hb-iter.hh | 8 -------- + src/test-iter.cc | 2 -- + 2 files changed, 10 deletions(-) + +commit bdd5a9c48d644b660f8fcac16902a576cc7ff443 +Author: Behdad Esfahbod +Date: Thu Mar 28 21:58:07 2019 -0700 + + Add hb_hash() + + I don't like the hb_remove_reference() hack, but necessary. + + src/hb-algs.hh | 17 +++++++++++++++++ + src/hb-map.hh | 10 +--------- + src/hb.hh | 2 +- + 3 files changed, 19 insertions(+), 10 deletions(-) + +commit 343e6063dcd512164a999f1d12bae50877392a82 +Author: Behdad Esfahbod +Date: Thu Mar 28 21:44:12 2019 -0700 + + Add hb_is_integer(T) + + src/hb-meta.hh | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit f639b9a8eab369bee6e36b3e60b585b4f720e77e +Author: Behdad Esfahbod +Date: Thu Mar 28 21:34:47 2019 -0700 + + [iter] Add hb_len() function-object + + src/hb-iter.hh | 8 ++++++++ + src/test-iter.cc | 2 ++ + 2 files changed, 10 insertions(+) + +commit a030ce4ff83e0948e4f865accc5670e8b5e78dde +Merge: 11456b2d d6fc1d49 +Author: Behdad Esfahbod +Date: Thu Mar 28 21:26:50 2019 -0700 + + Merge branch 'master' into iter + +commit d6fc1d49aa099104a889c96bc9087c21d8fc0960 +Author: Behdad Esfahbod +Date: Thu Mar 28 21:21:26 2019 -0700 + + 2.4.0 + + NEWS | 11 +++++++++++ + configure.ac | 2 +- + src/hb-buffer.h | 2 +- + src/hb-version.h | 6 +++--- + 4 files changed, 16 insertions(+), 5 deletions(-) + +commit d2db71fdc4764eecf8320cf465ee0e4254146b6e +Author: Behdad Esfahbod +Date: Thu Mar 28 21:00:58 2019 -0700 + + Use internal bsearch() for language tags + + Fixes https://github.com/harfbuzz/harfbuzz/pull/1639 + + src/hb-ot-tag.cc | 46 ++++++++++++++++++++++------------------------ + 1 file changed, 22 insertions(+), 24 deletions(-) + +commit 21bb80ebf2e20025a196386cee8fd92dd1eb4597 +Author: Behdad Esfahbod +Date: Thu Mar 28 20:50:04 2019 -0700 + + [indic] Add back medial-consonant to grammar + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1592 + + src/hb-ot-shape-complex-indic-machine.hh | 1244 +++++++++++--------- + src/hb-ot-shape-complex-indic-machine.rl | 5 +- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-indic.hh | 6 +- + .../f75c4b05a0a4d67c1a808081ae3d74a9c66509e8.ttf | Bin 0 -> 1924 bytes + .../data/in-house/tests/indic-syllable.tests | 2 + + 6 files changed, 672 insertions(+), 587 deletions(-) + +commit 5ab6de7a6fbad4c4a954c2c81d216486a5a14f72 +Author: Behdad Esfahbod +Date: Thu Mar 28 20:23:12 2019 -0700 + + [khmer] Add trailing Coeng to syllable grammar + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1541 + + src/hb-ot-shape-complex-khmer-machine.hh | 248 ++++++++++----------- + src/hb-ot-shape-complex-khmer-machine.rl | 2 +- + .../ad01ab2ea1cb1a4d3a2783e2675112ef11ae6404.ttf | Bin 0 -> 1500 bytes + test/shaping/data/in-house/tests/khmer-misc.tests | 1 + + 4 files changed, 122 insertions(+), 129 deletions(-) + +commit 7360265e69a8cdaa9f993c36def2860a79cca49f +Author: Ebrahim Byagowi +Date: Thu Mar 28 16:57:56 2019 -0700 + + [ci] Tweak macos and psvita bots (#1638) + + * Add --with-graphite2 to macOS + * Add a dummy ragel script for psvita + + .circleci/config.yml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit a548d1da78b506cc6460fdde3715f6ef13ccad48 +Author: Ebrahim Byagowi +Date: Thu Mar 28 15:42:45 2019 -0700 + + [ci] Use only CircleCI for macOS (#1637) + + .circleci/config.yml | 5 +++-- + .travis.yml | 18 ------------------ + 2 files changed, 3 insertions(+), 20 deletions(-) + +commit 160b4a2b01e925812fbf0e7db5bc9dcb90dc81cc +Author: Behdad Esfahbod +Date: Thu Mar 28 13:44:38 2019 -0700 + + Fix shell syntax error + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1612 + + src/check-symbols.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8665b9b0a24e4d46e486057d72c0486b9da16523 +Author: Behdad Esfahbod +Date: Thu Mar 28 11:11:52 2019 -0700 + + Comment + + src/hb.hh | 1 + + 1 file changed, 1 insertion(+) + +commit a7eed7e41dba8e583a9c740a4ca7ddf53e77de63 +Author: punchcutter +Date: Wed Mar 27 23:12:58 2019 -0700 + + Override USE category for Grantha and Tirhuta visargas to allow marks + + src/gen-use-table.py | 3 ++- + src/hb-ot-shape-complex-use-table.cc | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit cf040c0fef4a049a75a5ec7972f518b9034bdc76 +Author: Egor Pugin +Date: Thu Mar 28 19:06:12 2019 +0300 + + Disable unwanted C++ definitions for MSVC. + + MSVC does not set __cplusplus to the latest standard and also it does not like redefining some keywords. + + src/hb.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 717181c5943c13a682c719dce10bfc3d9cc47e6b +Author: Ebrahim Byagowi +Date: Wed Mar 27 16:38:39 2019 +0430 + + [ci] remove ragel from psvita compile bot + + .circleci/config.yml | 1 - + 1 file changed, 1 deletion(-) + +commit 08e36c5d8be22b3a7e31f33af9452372dafeacc0 +Author: Ebrahim Byagowi +Date: Wed Mar 27 16:21:47 2019 +0430 + + [ci] Don't install ragel on cmake build bot images + + It is not needed anyway + + .circleci/config.yml | 5 ----- + 1 file changed, 5 deletions(-) + +commit ec2a5dc859b03ceb92518aa992e4e9c053b30534 +Author: Behdad Esfahbod +Date: Tue Mar 26 16:18:03 2019 -0700 + + Use class templates for Null objects + + This allows partial-instantiating custom Null object for template Lookup. + Before, this had to be handcoded per instantiation. Apparently I missed + adding one for AAT::ankr.lookupTable, so it was getting the wrong (generic) + null for Lookup object, which is wrong and unsafe. + + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=944346 + + src/hb-aat-layout-common.hh | 14 ++++------ + src/hb-null.hh | 31 +++++++++++++-------- + ...case-minimized-harfbuzz_fuzzer-5748102301614080 | Bin 0 -> 213 bytes + 3 files changed, 24 insertions(+), 21 deletions(-) + +commit 96f12377942dbe1c6b1d0ffa7d626d99cb265443 +Author: Behdad Esfahbod +Date: Tue Mar 26 16:17:45 2019 -0700 + + [aat] Add missing check to ankr table + + Isn't absolutely needed. But helps. + + src/hb-aat-layout-ankr-table.hh | 1 + + 1 file changed, 1 insertion(+) + +commit e5dfffb1ef610a982ed9878fbf3f9ee49cbc3a97 +Author: Behdad Esfahbod +Date: Mon Mar 25 15:15:37 2019 -0700 + + [docs] Update + + docs/harfbuzz-docs.xml | 1 + + 1 file changed, 1 insertion(+) + +commit 0dd3fdf9d227f9bd79f395078f8e58dcfc32d1bf +Author: Behdad Esfahbod +Date: Mon Mar 25 15:08:14 2019 -0700 + + Update ChangeLog generation + + Let's see if I can make a release on Mac... + + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2d9034491eca0a63db82d3801f05c067a5241b7d +Author: Qunxin Liu +Date: Tue Mar 26 10:37:24 2019 -0700 + + completely remove lines that are commented out + + src/hb-subset-plan.cc | 6 ------ + src/hb-subset-plan.hh | 3 --- + 2 files changed, 9 deletions(-) + +commit 3147133b6173487c26813a2a406aebd067b53fbf +Author: Qunxin Liu +Date: Tue Mar 26 09:15:56 2019 -0700 + + update arguments in_populate_gids_to_retain() and _create_old_gid_to_new_gid_map() + so they don't use deprecated variable + + src/hb-subset-plan.cc | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +commit 79a6c258497e80be15245a7b576e34443d9f7bff +Author: Qunxin Liu +Date: Mon Mar 25 19:59:37 2019 -0700 + + try to remove deprecated variable from struct definition + + src/hb-subset-plan.cc | 9 +++++---- + src/hb-subset-plan.hh | 2 +- + 2 files changed, 6 insertions(+), 5 deletions(-) + +commit bcb4e505d6ffe33e3268a06698e75d6be0e64957 +Author: Michiharu Ariza +Date: Fri Mar 15 13:46:25 2019 -0700 + + cff2 subset fuzzer issues (#1619) + + * add check to FDArray::serialize + + * add test files + + * fix off by one + + src/hb-ot-cff-common.hh | 1 + + ...z-testcase-minimized-hb-subset-fuzzer-5739000398086144 | Bin 0 -> 620 bytes + ...z-testcase-minimized-hb-subset-fuzzer-5760768497156096 | Bin 0 -> 210 bytes + ...z-testcase-minimized-hb-subset-fuzzer-5764268627066880 | Bin 0 -> 687 bytes + 4 files changed, 1 insertion(+) + +commit 8aaab78efcac81a05ec919be13792c98741ea1b5 +Author: Ebrahim Byagowi +Date: Thu Mar 14 16:49:42 2019 -0700 + + Allow zero length ranges in sanitization (#1617) + + Fixes fvar table sanitization where there are no named instance + by allowing zero length ranges starting from Null() address. + + Fixes #1607 + + src/hb-machinery.hh | 30 ++++++++++++++++-------------- + test/api/fonts/Zycon.ttf | Bin 0 -> 21036 bytes + test/api/test-ot-face.c | 9 +++++++++ + 3 files changed, 25 insertions(+), 14 deletions(-) + +commit b1dfb8c850f36d4065190a779a6e3342a5fbb593 +Author: Khaled Hosny +Date: Thu Mar 14 21:41:25 2019 +0200 + + [ci] Cache FreeType build on Travis + + .ci/build-freetype.sh | 17 +++++++++++++++++ + .travis.yml | 18 ++++++++++++------ + 2 files changed, 29 insertions(+), 6 deletions(-) + +commit 7de9f92ee9ced6f4c176459cf25f4ca931ca5ceb +Author: David Corbett +Date: Tue Mar 12 19:30:47 2019 -0400 + + Categorize U+09FC as Consonant_Placeholder + + src/hb-ot-shape-complex-indic.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 8b1eaecd9485fe504af364db1537bb04852b265c +Author: Khaled Hosny +Date: Wed Mar 13 13:21:12 2019 +0200 + + [ci] Simplify and fix Travis CI macOS build + + .travis.yml | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +commit e52ec3fc23c2d5a881849f047885e0423bd74740 +Author: Behdad Esfahbod +Date: Mon Mar 11 18:09:51 2019 -0700 + + Remove redundant hb_ot_layout_lookup_would_substitute_fast + + src/hb-ot-layout.cc | 13 ------------- + src/hb-ot-layout.hh | 7 ------- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-khmer.cc | 2 +- + 4 files changed, 2 insertions(+), 22 deletions(-) + +commit c2442c90d6ecfaee987ed8ac6f93a9ac6b07c642 +Author: Khaled Hosny +Date: Tue Mar 12 01:09:27 2019 +0200 + + [doc] Add placeholder since version for new flag + + src/hb-buffer.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8c42f03215097d7c1bae74db7e98315263d3e8a4 +Author: David Corbett +Date: Fri Mar 8 09:46:48 2019 -0500 + + Remove obsolete overrides from Indic/USE scripts + + src/gen-indic-table.py | 4 ---- + src/gen-use-table.py | 30 +++++++----------------------- + src/hb-ot-shape-complex-use-table.cc | 2 +- + 3 files changed, 8 insertions(+), 28 deletions(-) + +commit b38bab86229bc40d9cdf4819d6dc6aab444d0291 +Author: Eric Muller +Date: Tue Feb 12 11:41:16 2019 -0800 + + Update generation code for hb-ot-shape-complex-vowel-constraints.cc. Remove 'unlikely' + + src/gen-vowel-constraints.py | 3 +++ + src/hb-ot-shape-complex-vowel-constraints.cc | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 44a67ddeb878f7639b30d1884e38b1525aab4f4a +Author: Eric Muller +Date: Sun Feb 10 04:31:41 2019 -0800 + + Fix coding style. + + src/hb-ot-shape-complex-hangul.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 30d7c40f8ce9f47d733b1f43a93f20739772859e +Author: Eric Muller +Date: Sat Feb 9 02:55:27 2019 -0800 + + Add a flag to hb_buffer_t to prevent the insertion of dotted circles on incorrect character sequences. + + Current behavior unchanged if this flag is not set (and it isn't by default). + + src/hb-buffer.h | 7 ++++++- + src/hb-ot-shape-complex-hangul.cc | 3 ++- + src/hb-ot-shape-complex-indic.cc | 3 +++ + src/hb-ot-shape-complex-khmer.cc | 3 +++ + src/hb-ot-shape-complex-myanmar.cc | 3 +++ + src/hb-ot-shape-complex-use.cc | 3 +++ + src/hb-ot-shape-complex-vowel-constraints.cc | 3 +++ + src/hb-ot-shape.cc | 3 +++ + 8 files changed, 26 insertions(+), 2 deletions(-) + +commit 8b6eb6cf465032d0ca747f4b75f6e9155082bc45 +Author: Ebrahim Byagowi +Date: Fri Mar 8 01:33:41 2019 +0330 + + Add a macOS 10.14.3 fonts tests (#1608) + + .circleci/config.yml | 11 +++++++++++ + test/shaping/data/in-house/tests/macos.tests | 19 +++++++++++++++++++ + 2 files changed, 30 insertions(+) + +commit e723c04de1b3dcd96e6a70baf09e3ae2ddbbc0bf +Author: David Corbett +Date: Wed Mar 6 12:37:25 2019 -0500 + + Update to Unicode 12.0.0 + + src/gen-use-table.py | 1 - + src/gen-vowel-constraints.py | 1 + + src/hb-common.h | 8 + + src/hb-ot-shape-complex-arabic-table.hh | 14 +- + src/hb-ot-shape-complex-indic-table.cc | 56 +- + src/hb-ot-shape-complex-use-table.cc | 49 +- + src/hb-ot-shape-complex-vowel-constraints.cc | 4 +- + src/hb-ot-shape-complex.hh | 3 + + src/hb-ot-tag-table.hh | 12 +- + src/hb-ucdn.cc | 4 + + src/hb-ucdn/ucdn.h | 11 + + src/hb-ucdn/ucdn_db.h | 2998 +++++++++++++------------- + src/hb-unicode-emoji-table.hh | 6 +- + 13 files changed, 1631 insertions(+), 1536 deletions(-) + +commit 2f125b0fa763c3be7d8d74489c027f7155607756 +Author: Adrian Wong +Date: Wed Feb 13 21:04:46 2019 +1100 + + [indic] Remove superfluous ZWNJ check in final reorder of pre-base matras + + src/hb-ot-shape-complex-indic.cc | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +commit d936ad4582a0017cf88406372d7c08b9896beed6 +Author: Stephan Bergmann +Date: Tue Mar 5 17:18:57 2019 +0100 + + Fix hb_atomic_* variants based on C++11 atomics + + I stumbled over this when trying to upgrade the version of HarfBuzz used by + LibreOffice to 3.2.1 (see "Upgrade to latest + HarfBuzz 2.3.1"), where building with MSVC 2017 failed like + + > c:\cygwin\home\tdf\lode\jenkins\workspace\gerrit_windows\workdir\unpackedtarball\harfbuzz\src\hb-atomic.hh(272): error C2440: 'reinterpret_cast': cannot convert from 'const int *' to 'std::atomic *' + > c:\cygwin\home\tdf\lode\jenkins\workspace\gerrit_windows\workdir\unpackedtarball\harfbuzz\src\hb-atomic.hh(272): note: Conversion loses qualifiers + > c:\cygwin\home\tdf\lode\jenkins\workspace\gerrit_windows\workdir\unpackedtarball\harfbuzz\src\hb-atomic.hh(272): error C2227: left of '->load' must point to class/struct/union/generic type + + (see ). + + I added all the necessary "const" to make building of HarfBuzz 2.3.1 with + MSVC 2017 succeed for me. There may be more missing at least conceptually. + + src/hb-atomic.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 731b13e4e9190a45e51f855f19e88869a7718d43 +Author: Martin Hosken +Date: Mon Mar 4 11:12:21 2019 +0700 + + Fix offset drift in graphite integration + + src/hb-graphite2.cc | 35 +++++++++++++++++++---------------- + 1 file changed, 19 insertions(+), 16 deletions(-) + +commit 8a25868e6a41a3d82782aadb3c7b744ad87d20ff +Author: Ebrahim Byagowi +Date: Sat Mar 2 03:24:49 2019 +0330 + + Minor, remove .editorconfig hack + + As vscode is going to support it soon + + .editorconfig | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +commit 4f37ab63de9705d7bf74ee75364747e41b7c06a1 +Author: Garret Rieger +Date: Thu Feb 28 17:25:05 2019 -0800 + + Make hb_subset_input_glyph_set () actually do something. + + src/hb-subset-plan.cc | 3 +++ + test/api/hb-subset-test.h | 11 ++++++++++- + test/api/test-subset-glyf.c | 24 ++++++++++++++++++++++++ + 3 files changed, 37 insertions(+), 1 deletion(-) + +commit 45149eb34f9735b5d690a2a7956adb42b938c8d9 +Author: Ebrahim Byagowi +Date: Fri Feb 22 13:13:42 2019 +0330 + + [dwrite] hb_directwrite_face_create, a new API + + It makes a hb_face_t from IDWriteFontFace, useful when using + DirectWrite facilities for font selection, loading and rendering + but using harfbuzz for shaping. + + src/hb-directwrite.cc | 70 +++++++++++++++++++++++++++++++++++++++++++++++---- + src/hb-directwrite.h | 5 +++- + 2 files changed, 69 insertions(+), 6 deletions(-) + +commit 45adc185260f0fa1fa86472aafb7f91f942c567e +Author: David Corbett +Date: Mon Feb 18 22:30:40 2019 -0500 + + Fix or document unsupported font-feature-settings + + src/hb-common.cc | 18 ++++++++++++------ + util/options.cc | 3 ++- + 2 files changed, 14 insertions(+), 7 deletions(-) + +commit d66f7e14a0097d8ca54ad9824f7aa7daee6c7f72 +Author: Joël R. Langlois +Date: Mon Feb 25 15:26:58 2019 -0500 + + Remove Forcing Diagnostic Colours from CMakeLists.txt (#1597) + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1596 + + CMakeLists.txt | 12 ------------ + 1 file changed, 12 deletions(-) + +commit 93739242e1aab9b745d0ba3c22c33b4acaf9526c +Author: Michiharu Ariza +Date: Wed Feb 20 13:23:12 2019 -0800 + + minor edit + + src/hb-map.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit eebc21c8de08d58c806fcd3d0f3a5aedee867776 +Author: Michiharu Ariza +Date: Wed Feb 20 12:43:18 2019 -0800 + + fix crash in hb_map_t::clear() + + in case called immediately after init() + + src/hb-map.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit a17ed8459ee1e01caf4761f682bcda821bc8e656 +Author: Khaled Hosny +Date: Tue Feb 19 21:14:11 2019 +0200 + + [doc] Move hb_variation_t to hb-common section + + docs/harfbuzz-sections.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 9caabc9cf898e1d66921f88890d5b7d46494dc90 +Author: Khaled Hosny +Date: Tue Feb 19 19:27:28 2019 +0200 + + [doc] Move feature_t and its function to hb-common + + It is rather confusing to have script, language etc, in hb-common section + while feature is in hb-shape section. I keep looking for it in hb-common + section then using the API index because I can’t find it there. + + docs/harfbuzz-sections.txt | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit d29c8424c8bfa47c910d0e270f05b5c0a1f803a2 +Author: Evgeniy Reizner +Date: Tue Feb 19 18:35:00 2019 +0200 + + Typo (#1588) + + Fixed a small typo. + [skip ci] + + src/hb-ot-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6bd4c082e49143d0631881645b81f999347257f8 +Author: Khaled Hosny +Date: Tue Feb 19 02:23:58 2019 +0200 + + [doc] Document hb_feature_from_string() syntax + + Copied and edited from the util option documentation. The docbook table + syntax is too verbose, but that is the best I can come up with. + + src/hb-common.cc | 35 ++++++++++++++++++++++++++++++++++- + 1 file changed, 34 insertions(+), 1 deletion(-) + +commit 11456b2d9c1c567d1ad6496a3056154b69cafa21 +Author: Behdad Esfahbod +Date: Fri Feb 15 16:58:43 2019 -0800 + + WHitespace + + src/hb-ot-layout-gsubgpos.hh | 4 ---- + 1 file changed, 4 deletions(-) + +commit 77060bcda229dc237d3952fbf5da59709cd81e05 +Author: Behdad Esfahbod +Date: Fri Feb 15 16:55:08 2019 -0800 + + [iter] Add hb_all, hb_any, hb_none + + src/hb-iter.hh | 46 +++++++++++++++++++++++++++++++++++++++++++++- + src/test-iter.cc | 2 ++ + 2 files changed, 47 insertions(+), 1 deletion(-) + +commit 72dd5e34e0fc2902857c39cd4609d40b71fa4736 +Author: Behdad Esfahbod +Date: Fri Feb 15 16:11:32 2019 -0800 + + [iter] Make hb_iter() into function-object + + src/hb-iter.hh | 28 +++++++++++++++++++--------- + 1 file changed, 19 insertions(+), 9 deletions(-) + +commit 98be7bd77ada32e58dad76897cefcf1d99538d2b +Author: Behdad Esfahbod +Date: Fri Feb 15 16:09:29 2019 -0800 + + [iter] Make hb_map into function-object + + src/hb-iter.hh | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit c1e5ba81fe4888143c1cf4a3deb3597875580c6d +Merge: b8b3b3e3 3da79dd5 +Author: Behdad Esfahbod +Date: Fri Feb 15 16:06:03 2019 -0800 + + Merge remote-tracking branch 'origin/master' into iter + +commit b8b3b3e38b08ee7bb8d44481dd25febcee693554 +Author: Behdad Esfahbod +Date: Fri Feb 15 16:05:36 2019 -0800 + + [iter] Add hb_enumerate() and use it + + src/hb-iter.hh | 39 +++++++++++++++++++++++++++++++++++++-- + src/hb-ot-layout-gsubgpos.hh | 32 ++++++++++++-------------------- + 2 files changed, 49 insertions(+), 22 deletions(-) + +commit 3da79dd5b92b89fbf062cbe591e6b1ba83083aec +Merge: 50005501 d8a68728 +Author: Behdad Esfahbod +Date: Fri Feb 15 15:54:51 2019 -0800 + + Merge pull request #1557 from harfbuzz/cff-more-arrayof-fixes + + CFF more arrayof fixes + +commit 5000550183022db8c9cfef63a9ed90eb9f37764d +Merge: 5c2bb1de 90c8bbf9 +Author: Behdad Esfahbod +Date: Fri Feb 15 15:54:13 2019 -0800 + + Merge pull request #1583 from harfbuzz/cff-retain-gids + + [subset] Implement --retain-gids with CFF/CFF2 + +commit d8a68728a077a8c5fc8ceae19f2866cdc8b70baf +Merge: 1cb1d5d7 5c2bb1de +Author: Michiharu Ariza +Date: Fri Feb 15 14:48:10 2019 -0800 + + Merge branch 'master' into cff-more-arrayof-fixes + +commit 90c8bbf98747eb29687471da892b4a34a9236242 +Merge: 6f1dfd08 5c2bb1de +Author: Michiharu Ariza +Date: Fri Feb 15 14:47:38 2019 -0800 + + Merge branch 'master' into cff-retain-gids + +commit 5c2bb1de8de31fecf0dae2ef905b896e42d39f1d +Author: Martin <44297768+TheRealMDoerr@users.noreply.github.com> +Date: Fri Feb 15 19:23:46 2019 +0100 + + Support xlclang++ on AIX. (#1584) + + src/hb-atomic.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1558a43342e2c5649cf48cb5860ac8a7aa9faf1d +Author: Behdad Esfahbod +Date: Thu Feb 14 20:46:13 2019 -0800 + + [test] Minor + + src/test-algs.cc | 1 + + 1 file changed, 1 insertion(+) + +commit fa373584def11c97d8a7db00d9abc04851ca9480 +Author: Behdad Esfahbod +Date: Thu Feb 14 20:15:07 2019 -0800 + + [algs] Test pair more + + src/test-algs.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 0d7af5fb02723d8f4e8ad93848e9abe384174b36 +Author: Behdad Esfahbod +Date: Thu Feb 14 19:37:57 2019 -0800 + + [algs] Use universal references for hb_pair() + + Such that it carries lvalues inside. + + src/Makefile.am | 6 +++++- + src/hb-algs.hh | 2 +- + src/test-algs.cc | 45 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 51 insertions(+), 2 deletions(-) + +commit 5b99c92d4c6e294bb328113308e5c9cd23b3ed67 +Author: Behdad Esfahbod +Date: Thu Feb 14 17:10:04 2019 -0800 + + [iter] Use more + + src/hb-iter.hh | 4 ++-- + src/hb-ot-layout-gsubgpos.hh | 10 ++++------ + 2 files changed, 6 insertions(+), 8 deletions(-) + +commit 72c1b59588bec30322abfa4de04b53e93122b25b +Author: Behdad Esfahbod +Date: Thu Feb 14 15:43:20 2019 -0800 + + [iter] Use in more places + + src/hb-ot-layout-gsubgpos.hh | 48 ++++++++++++++++++-------------------------- + 1 file changed, 20 insertions(+), 28 deletions(-) + +commit 40cce41eaeac731334251cccaa124407e6bffccb +Author: Behdad Esfahbod +Date: Thu Feb 14 15:14:37 2019 -0800 + + [iter] Use in a couple more intersects() calls + + src/hb-ot-layout-gsubgpos.hh | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +commit bafdf1829d15e658df55eabc0548e9ca71d18b1b +Author: Behdad Esfahbod +Date: Thu Feb 14 15:13:16 2019 -0800 + + [iter] Use in a couple more closure() calls + + src/hb-ot-layout-gsubgpos.hh | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +commit fa35d3fd81c1ddb847cdd83556f817db9ef7f35b +Author: Behdad Esfahbod +Date: Thu Feb 14 14:04:05 2019 -0800 + + [iter] Add hb_drain + + src/hb-iter.hh | 11 +++++++++++ + src/test-iter.cc | 7 ++++++- + 2 files changed, 17 insertions(+), 1 deletion(-) + +commit f4cfd6b6adbe0a87fe565a29b6cd600cf86f65dd +Author: Behdad Esfahbod +Date: Thu Feb 14 13:45:52 2019 -0800 + + [iter] A couple more hb_apply() + lambda uses + + src/hb-ot-layout-gsub-table.hh | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +commit 7514a49f217c42ae0c895755e305f1d5b75c759d +Author: Behdad Esfahbod +Date: Thu Feb 14 13:16:33 2019 -0800 + + [iter] Use hb_apply() with lambda functions in a few places + + src/hb-ot-layout-gsub-table.hh | 30 +++++++++++++++++------------- + 1 file changed, 17 insertions(+), 13 deletions(-) + +commit 0670e1a6f5d9938d30d5d0674ea10752d4a58114 +Author: Behdad Esfahbod +Date: Thu Feb 14 11:53:40 2019 -0800 + + [iter] Remove excess use of universal references + + Every time I have to study these to understand why a change is right.. + + src/hb-iter.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 773d75637c36426b96be43f1188c68d77ac4ba47 +Author: Behdad Esfahbod +Date: Thu Feb 14 11:40:22 2019 -0800 + + [iter] Add hb_apply() + + src/hb-iter.hh | 30 ++++++++++++++++++++++++++++++ + src/test-iter.cc | 3 +++ + 2 files changed, 33 insertions(+) + +commit 5b725784e53a96ba4d983184a2670aba2aa0fd9c +Merge: 00db9409 28f77361 +Author: Behdad Esfahbod +Date: Thu Feb 14 11:34:55 2019 -0800 + + Merge branch 'master' into iter + +commit 28f77361322886360743fdbffd388c9482cf4257 +Author: Behdad Esfahbod +Date: Thu Feb 14 11:34:28 2019 -0800 + + [CI] Install more packages + + Wish there was a way to streamline this :(. + + .circleci/config.yml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 00db94095d53bd5e954be31caa428a3fd8f5f4c2 +Author: Behdad Esfahbod +Date: Thu Feb 14 11:10:13 2019 -0800 + + [iter] Make hb_filter() a function-object + + src/hb-iter.hh | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +commit aa4c3212628f6861f1ef3ecb9eb5205b5780ac91 +Author: Behdad Esfahbod +Date: Thu Feb 14 11:07:12 2019 -0800 + + [iter] Make hb_zip() a function-object + + src/hb-iter.hh | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +commit f8fcfb263e197c27015eeea56761b2dc8138da91 +Author: Behdad Esfahbod +Date: Thu Feb 14 11:03:29 2019 -0800 + + [iter] Accept pointers to hb_sink() + + src/hb-iter.hh | 4 ++++ + src/hb-ot-layout-gsub-table.hh | 6 +++--- + 2 files changed, 7 insertions(+), 3 deletions(-) + +commit b530573ad9b30e06d5cecfd107941c573cd5d999 +Author: Behdad Esfahbod +Date: Thu Feb 14 11:00:10 2019 -0800 + + [iter] Make hb_sink function-object + + src/hb-iter.hh | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit bb139cb8d0e4339042c5d0d0f192e13707c2bda4 +Author: Behdad Esfahbod +Date: Thu Feb 14 10:51:47 2019 -0800 + + [iter] Back to dagger formatting for pipelines + + src/hb-ot-layout-gsub-table.hh | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 5fa52e62b1744347970c42f42bbcd8d2e82d6c60 +Author: Behdad Esfahbod +Date: Thu Feb 14 10:51:02 2019 -0800 + + [iter] Accept iterator, not iterable, in hb_sink()() + + src/hb-iter.hh | 8 ++++---- + src/test-iter.cc | 1 + + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit 0f292ea85f54b3496fe87e6466acf43b76f57dcd +Author: Behdad Esfahbod +Date: Thu Feb 14 10:49:31 2019 -0800 + + [iter] Accept iterator, not iterable, in hb_filter()() + + src/hb-iter.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 345bfbb207b4d1174ee0ec41cf35cdc2e14936ff +Author: Behdad Esfahbod +Date: Thu Feb 14 10:48:20 2019 -0800 + + [iter] Accept iterator, not iterable, in hb_map()() + + src/hb-iter.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 16cc313dcd7d4ddf16451cadc118aeb680101384 +Author: Behdad Esfahbod +Date: Thu Feb 14 10:40:05 2019 -0800 + + [iter] Use hb_sink() + + src/hb-ot-layout-gsub-table.hh | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit b702a0cbf8abae4622a99adf3a3b6adda3d9f2c1 +Author: Behdad Esfahbod +Date: Thu Feb 14 10:39:58 2019 -0800 + + [iter] Add hb_sink() + + src/hb-iter.hh | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +commit 1cb1d5d7fb74e9f42dc8361dcdf669ed479d595d +Merge: 8a568a88 d5287e1b +Author: Michiharu Ariza +Date: Thu Feb 14 10:09:19 2019 -0800 + + Merge branch 'master' into cff-more-arrayof-fixes + +commit 6f1dfd082cf79488ae6773e7d99172f13575668c +Merge: b1dbc77f d5287e1b +Author: Michiharu Ariza +Date: Thu Feb 14 10:08:16 2019 -0800 + + Merge branch 'master' into cff-retain-gids + +commit 9e7383d124f1f1422f542720c76b4ee9605bda8b +Author: Behdad Esfahbod +Date: Wed Feb 13 23:54:36 2019 -0800 + + [CI] Disable cmake-oracledeveloperstudio bot + + Weird error: + + "/root/project/src/hb-iter.hh", line 277: Error: Type name expected instead of "decltype()". + "/root/project/src/hb-iter.hh", line 278: Error: Invalid type while substituting into Iter::item_t. + "/root/project/src/hb-iter.hh", line 317: Error: Type name expected instead of "decltype()". + "/root/project/src/hb-iter.hh", line 318: Error: Invalid type while substituting into Iter::item_t. + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4103252323b15a821f0a912b580c2107211b918f +Merge: f1b89344 d5287e1b +Author: Behdad Esfahbod +Date: Wed Feb 13 23:46:43 2019 -0800 + + Merge branch 'master' into iter + +commit d5287e1ba40638be5d48178ce3d64557b622b01f +Author: Behdad Esfahbod +Date: Wed Feb 13 23:46:17 2019 -0800 + + [CI] Install wget on clang-O3-O0 bot + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f1b8934400137fe832909730ad86d73595612e9e +Author: Behdad Esfahbod +Date: Wed Feb 13 23:30:21 2019 -0800 + + [CI] Remove macos-notest-ios bot + + Not sure what ancient compiler it is (gcc 4.2?), but didn't like hb_zip SFINAE + apparently: + + In file included from /Users/distiller/project/src/hb-aat-layout.cc:28: + In file included from /Users/distiller/project/src/hb-open-type.hh:32: + In file included from /Users/distiller/project/src/hb.hh:642: + /Users/distiller/project/src/hb-iter.hh:364:1: note: candidate template ignored: substitution failure [with A = OT::Coverage, B = OT::OffsetArrayOf]: non-type template argument does not refer to any declaration + hb_zip (const A& a, const B &b) + ^ + In file included from /Users/distiller/project/src/hb-aat-layout.cc:37: + In file included from /Users/distiller/project/src/hb-aat-layout-kerx-table.hh:31: + In file included from /Users/distiller/project/src/hb-kern.hh:32: + /Users/distiller/project/src/hb-ot-layout-gpos-table.hh:725:20: error: no matching function for call to 'hb_zip' + for (auto it = hb_zip (this+coverage, pairSet) + ^~~~~~ + + Not going to try to appease. + + .circleci/config.yml | 13 ------------- + 1 file changed, 13 deletions(-) + +commit 7d2376de336c7fc14d69e01add02115335f92db8 +Merge: 2d940946 890d0ee7 +Author: Behdad Esfahbod +Date: Wed Feb 13 22:08:54 2019 -0800 + + Merge branch 'master' into iter + +commit 890d0ee77fecd6aa4f19b663bb2897735a0d4c0b +Author: Ebrahim Byagowi +Date: Thu Feb 14 00:27:01 2019 +0330 + + Minor, use a meaningful naming in template parameter (#1582) + + src/hb-ot-layout.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 8a568a8858b44a81ca43a82761a70bf8d53e7c26 +Merge: c83412e4 1e1d0e63 +Author: Michiharu Ariza +Date: Wed Feb 13 11:25:00 2019 -0800 + + Merge branch 'master' into cff-more-arrayof-fixes + +commit b1dbc77fa62a99047df539663cfd1e8778d2c907 +Merge: c3a3536c 1e1d0e63 +Author: Michiharu Ariza +Date: Wed Feb 13 11:24:38 2019 -0800 + + Merge branch 'master' into cff-retain-gids + +commit 1e1d0e63df405730ed542ae1d729928623addf08 +Author: Ebrahim Byagowi +Date: Wed Feb 13 12:58:01 2019 +0330 + + Fix djgpp complains by tweaking templates (#1579) + + For some reasons djgpp doesn't understand "unsigned int" can be same + with one of uint*_t anyway so lets do that for it explicitly. + + Just to note, our CI's djgpp is based GCC 7.2.0 and isn't old. + + src/hb-ot-layout.hh | 4 ++-- + src/hb-ot-shape-complex-arabic.cc | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit c3a3536c9a00a989ebd83d52e67d06525ed669bc +Merge: bc33c617 85a6d312 +Author: Michiharu Ariza +Date: Tue Feb 12 15:10:59 2019 -0800 + + Merge branch 'cff-retain-gids' of https://github.com/harfbuzz/harfbuzz into cff-retain-gids + +commit bc33c617b85988f4d81312e62a75f92601852c76 +Merge: c6af8461 fdfa3d29 +Author: Michiharu Ariza +Date: Tue Feb 12 15:10:50 2019 -0800 + + Merge branch 'master' into cff-retain-gids + +commit c6af846178bba10af318bcea1e9ac5165ec2aea6 +Author: Michiharu Ariza +Date: Tue Feb 12 15:10:43 2019 -0800 + + tweaked --desubroutinize to remove hintmask only subrs + + src/hb-subset-cff-common.hh | 26 ++++++++++++++++++++++++-- + 1 file changed, 24 insertions(+), 2 deletions(-) + +commit 85a6d3121a26c9bcbec60d37b64643ff8dc97a0a +Merge: d9ded069 fdfa3d29 +Author: Michiharu Ariza +Date: Mon Feb 11 14:25:21 2019 -0800 + + Merge branch 'master' into cff-retain-gids + +commit c83412e4cec10f6f6f6ac38f202b3ce373da5daf +Merge: 1239b6b2 fdfa3d29 +Author: Michiharu Ariza +Date: Mon Feb 11 14:16:25 2019 -0800 + + Merge branch 'master' into cff-more-arrayof-fixes + +commit fdfa3d29b7c347b5038f4f9148428c80dde462ae +Author: Ken <21211439+kencu@users.noreply.github.com> +Date: Sun Feb 10 23:46:05 2019 -0800 + + hb-coretext.cc: remove TARGET_OS_MAC from test (#1578) + + it is always true when building on APPLE systems + and this file only builds on APPLE systems + + src/hb-coretext.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit f55e7bf5835c59e478d6a448327d53027c4e9f4a +Author: Ebrahim Byagowi +Date: Sun Feb 10 01:08:05 2019 +0330 + + [ci] Install 'base-devel' on ArchLinux CI bot + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8f4eb919bd0498e997852aa39656adc4c65b3f0e +Author: Ebrahim Byagowi +Date: Sat Feb 9 16:58:02 2019 +0330 + + [ci] Install 'which' in ArchLinux bot + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 02294349618037f59b32834b49880ca75ed96261 +Author: Ebrahim Byagowi +Date: Sat Feb 9 16:33:28 2019 +0330 + + [ci] Speculative fix for Alpine and ArchLinux bots + + .circleci/config.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d9ded069926bf46a5d8e5edbf5201c98044db78e +Merge: a5e933eb 84694af7 +Author: Michiharu Ariza +Date: Fri Feb 8 14:44:20 2019 -0800 + + Merge branch 'master' into cff-retain-gids + +commit a5e933eba08ff50ac3beb1055ae952ccc26d0af7 +Author: Michiharu Ariza +Date: Fri Feb 8 14:44:13 2019 -0800 + + Updated expected/cff-japanese fonts with retained FDs + + ...gular.default.3042,3044,3046,3048,304A,304B.otf | Bin 6324 -> 6356 bytes + ...gular.default.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 6568 -> 6564 bytes + .../SourceHanSans-Regular.default.61,63,65,6B.otf | Bin 5500 -> 5532 bytes + ...gular.default.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 6780 -> 6780 bytes + .../SourceHanSans-Regular.default.660E.otf | Bin 5248 -> 5248 bytes + ...e-retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 536352 -> 537992 bytes + ...e-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 690752 -> 692312 bytes + ...ular.desubroutinize-retain-gids.61,63,65,6B.otf | Bin 530004 -> 531624 bytes + ...e-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 690868 -> 692496 bytes + ...ans-Regular.desubroutinize-retain-gids.660E.otf | Bin 612212 -> 613836 bytes + ...esubroutinize.3042,3044,3046,3048,304A,304B.otf | Bin 6248 -> 6272 bytes + ...esubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 6432 -> 6456 bytes + ...eHanSans-Regular.desubroutinize.61,63,65,6B.otf | Bin 5428 -> 5460 bytes + ...esubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 6552 -> 6572 bytes + .../SourceHanSans-Regular.desubroutinize.660E.otf | Bin 5196 -> 5224 bytes + ...e-retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 536176 -> 537424 bytes + ...e-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 690500 -> 691692 bytes + ...ints-desubroutinize-retain-gids.61,63,65,6B.otf | Bin 529888 -> 531124 bytes + ...e-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 690564 -> 691808 bytes + ....drop-hints-desubroutinize-retain-gids.660E.otf | Bin 612108 -> 613348 bytes + ...s-retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 536244 -> 537492 bytes + ...s-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 690596 -> 691788 bytes + ...-Regular.drop-hints-retain-gids.61,63,65,6B.otf | Bin 529928 -> 531164 bytes + ...-Regular.drop-hints-retain-gids.61,63,65,6B.ttx | 393879 ++++++++++++++++++ + ...s-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 690768 -> 692008 bytes + ...HanSans-Regular.drop-hints-retain-gids.660E.otf | Bin 612128 -> 613368 bytes + ...ar.drop-hints.3042,3044,3046,3048,304A,304B.otf | Bin 6132 -> 6164 bytes + ...ar.drop-hints.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 6304 -> 6300 bytes + ...ourceHanSans-Regular.drop-hints.61,63,65,6B.otf | Bin 5344 -> 5376 bytes + ...ar.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 6472 -> 6472 bytes + .../SourceHanSans-Regular.drop-hints.660E.otf | Bin 5140 -> 5140 bytes + ...r.retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 536436 -> 538076 bytes + ...r.retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 690860 -> 692420 bytes + ...urceHanSans-Regular.retain-gids.61,63,65,6B.otf | Bin 530084 -> 531704 bytes + ...r.retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 691076 -> 692700 bytes + .../SourceHanSans-Regular.retain-gids.660E.otf | Bin 612236 -> 613860 bytes + 36 files changed, 393879 insertions(+) + +commit 84694af723bde07cf3231ed2d2e193123f5f73ed +Author: Ebrahim Byagowi +Date: Fri Feb 8 15:30:17 2019 +0330 + + [ci] Disable the just added bot + + Doesn't play well with CircleCI apparently + + https://circleci.com/gh/harfbuzz/harfbuzz/74289 + + .circleci/config.yml | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +commit 81ae4974e35aa8ca408abd6238eb768f5c948287 +Author: Ebrahim Byagowi +Date: Fri Feb 8 15:18:26 2019 +0330 + + [ci] Add a Void Linux bot + + https://voidlinux.org/ is yet another and different distro written from scratch, thus completely eligible to have a bot here! + + Seriously however not that useful yet however but I will try to overload it other tasks later, like our other bots. + + No test yet also, couldn't install cairo-devel, will try to fix that later. + + Their harfbuzz package source: https://github.com/void-linux/void-packages/blob/master/srcpkgs/harfbuzz/template + + .circleci/config.yml | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit e2856c2d85eb0f6ce0c780d1889dc9bb05cdc433 +Author: Michiharu Ariza +Date: Thu Feb 7 15:32:32 2019 -0800 + + retain FDSelect & FDArray with --retain-gids + + so in sync with fonttools behavior + + src/hb-subset-cff-common.cc | 12 ++++-------- + .../SourceHanSans-Regular.41,4C2E.retaingids.otf | Bin 2604 -> 2736 bytes + 2 files changed, 4 insertions(+), 8 deletions(-) + +commit 1239b6b2b4430658aea78216a1dcc885724a7ab4 +Merge: 9f80eb01 126abca9 +Author: Michiharu Ariza +Date: Thu Feb 7 10:29:40 2019 -0800 + + Merge branch 'master' into cff-more-arrayof-fixes + +commit a5fa76977b5bdf3bd40ede3cdd0da9c5546557a6 +Merge: 214d0b02 126abca9 +Author: Michiharu Ariza +Date: Thu Feb 7 10:28:13 2019 -0800 + + Merge branch 'master' into cff-retain-gids + +commit 214d0b024b49edd51974ff2c051535ae06de0709 +Author: Michiharu Ariza +Date: Thu Feb 7 10:27:43 2019 -0800 + + minor change + + src/hb-subset-cff-common.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 126abca98a954f7ec3374d0593fee25f78dc10f3 +Merge: 1e062821 7859decd +Author: Behdad Esfahbod +Date: Wed Feb 6 13:36:52 2019 -0800 + + Merge pull request #1571 from kencu/cleanostests + + hb-coretext.cc: clean up macosx test + +commit 7859decdd02f65dfb3da07bd95742b14b4697638 +Author: Ken Cunningham +Date: Tue Feb 5 20:26:49 2019 -0800 + + hb-coretext.cc: clean up macosx test + + TARGET_OS_OSX was introduced only in late OS versions + so always returns as "0" on older systems. + + if !TARGET_OS_IPHONE can work, as it returns as !0 on older + systems where TARGET_OS_IPHONE is not defined, but is not + specific + + if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) + is both specific and accurate on all systems. + + src/hb-coretext.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 9328354a83252a8d8d74fe424ab3894d398b0bd0 +Author: Michiharu Ariza +Date: Mon Feb 4 11:28:15 2019 -0800 + + separate CFF from TrueType in full font tests + + ...eSansPro-Regular.default.1FC,21,41,20,62,63.otf | Bin + .../SourceSansPro-Regular.default.61,62,63.otf | Bin + ...ourceSansPro-Regular.default.D7,D8,D9,DA,DE.otf | Bin + ...subroutinize-retain-gids.1FC,21,41,20,62,63.otf | Bin + ...Regular.desubroutinize-retain-gids.61,62,63.otf | Bin + ...r.desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf | Bin + ...o-Regular.desubroutinize.1FC,21,41,20,62,63.otf | Bin + ...urceSansPro-Regular.desubroutinize.61,62,63.otf | Bin + ...nsPro-Regular.desubroutinize.D7,D8,D9,DA,DE.otf | Bin + ...subroutinize-retain-gids.1FC,21,41,20,62,63.otf | Bin + ...p-hints-desubroutinize-retain-gids.61,62,63.otf | Bin + ...s-desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf | Bin + ...rop-hints-desubroutinize.1FC,21,41,20,62,63.otf | Bin + ...-Regular.drop-hints-desubroutinize.61,62,63.otf | Bin + ...ar.drop-hints-desubroutinize.D7,D8,D9,DA,DE.otf | Bin + ...r.drop-hints-retain-gids.1FC,21,41,20,62,63.otf | Bin + ...Pro-Regular.drop-hints-retain-gids.61,62,63.otf | Bin + ...gular.drop-hints-retain-gids.D7,D8,D9,DA,DE.otf | Bin + ...nsPro-Regular.drop-hints.1FC,21,41,20,62,63.otf | Bin + .../SourceSansPro-Regular.drop-hints.61,62,63.otf | Bin + ...ceSansPro-Regular.drop-hints.D7,D8,D9,DA,DE.otf | Bin + ...sPro-Regular.retain-gids.1FC,21,41,20,62,63.otf | Bin + .../SourceSansPro-Regular.retain-gids.61,62,63.otf | Bin + ...eSansPro-Regular.retain-gids.D7,D8,D9,DA,DE.otf | Bin + ...gular.default.3042,3044,3046,3048,304A,304B.otf | Bin + ...gular.default.3042,3044,3046,73E0,5EA6,8F38.otf | Bin + .../SourceHanSans-Regular.default.61,63,65,6B.otf | Bin + ...gular.default.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin + .../SourceHanSans-Regular.default.660E.otf | Bin + ...e-retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin + ...e-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin + ...ular.desubroutinize-retain-gids.61,63,65,6B.otf | Bin + ...e-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin + ...ans-Regular.desubroutinize-retain-gids.660E.otf | Bin + ...esubroutinize.3042,3044,3046,3048,304A,304B.otf | Bin + ...esubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf | Bin + ...eHanSans-Regular.desubroutinize.61,63,65,6B.otf | Bin + ...esubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin + .../SourceHanSans-Regular.desubroutinize.660E.otf | Bin + ...e-retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin + ...e-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin + ...ints-desubroutinize-retain-gids.61,63,65,6B.otf | Bin + ...e-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin + ....drop-hints-desubroutinize-retain-gids.660E.otf | Bin + ...esubroutinize.3042,3044,3046,3048,304A,304B.otf | Bin + ...esubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf | Bin + ...gular.drop-hints-desubroutinize.61,63,65,6B.otf | Bin + ...esubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin + ...Sans-Regular.drop-hints-desubroutinize.660E.otf | Bin + ...s-retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin + ...s-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin + ...-Regular.drop-hints-retain-gids.61,63,65,6B.otf | Bin + ...s-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin + ...HanSans-Regular.drop-hints-retain-gids.660E.otf | Bin + ...ar.drop-hints.3042,3044,3046,3048,304A,304B.otf | Bin + ...ar.drop-hints.3042,3044,3046,73E0,5EA6,8F38.otf | Bin + ...ourceHanSans-Regular.drop-hints.61,63,65,6B.otf | Bin + ...ar.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin + .../SourceHanSans-Regular.drop-hints.660E.otf | Bin + ...r.retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin + ...r.retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin + ...urceHanSans-Regular.retain-gids.61,63,65,6B.otf | Bin + ...r.retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin + .../SourceHanSans-Regular.retain-gids.660E.otf | Bin + test/subset/data/tests/cff-full-font.tests | 18 +++++++++++++++++ + test/subset/data/tests/cff-japanese.tests | 22 +++++++++++++++++++++ + test/subset/data/tests/full-font.tests | 7 ------- + test/subset/data/tests/japanese.tests | 7 ------- + test/subset/subset_test_suite.py | 7 +------ + 69 files changed, 41 insertions(+), 20 deletions(-) + +commit ec30a8a9acf7be9918a8a6bff41696127090173f +Author: Michiharu Ariza +Date: Fri Feb 1 15:58:03 2019 -0800 + + removed unused test data + + ...ts.desubroutinize-retain-gids.1FC,21,41,20,62,63.otf | Bin 15456 -> 0 bytes + ...r.drop-hints.desubroutinize-retain-gids.61,62,63.otf | Bin 13036 -> 0 bytes + ...-hints.desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf | Bin 16656 -> 0 bytes + ...nsPro-Regular.drop-hints.desubroutinize.61,62,63.otf | Bin 3276 -> 0 bytes + ...-hints.desubroutinize.retain-gids.D7,D8,D9,DA,DE.otf | Bin 34560 -> 0 bytes + ...ro-Regular.drop-hints.retain-gids.D7,D8,D9,DA,DE.otf | Bin 34576 -> 0 bytes + 6 files changed, 0 insertions(+), 0 deletions(-) + +commit 30b781f20a8e386732f8e2858a22665d7af98061 +Merge: c1286265 1e062821 +Author: Michiharu Ariza +Date: Fri Feb 1 14:50:34 2019 -0800 + + Merge branch 'master' into cff-retain-gids + +commit c12862657f24b6c197e23d99a4edbdfcf3c90653 +Author: Michiharu Ariza +Date: Fri Feb 1 14:50:01 2019 -0800 + + added desubroutinize & retain-gids full test cases with CFF fonts + + and CFF retain-gids fixes + + src/hb-subset-cff1.cc | 44 +++++++++------------ + .../SourceHanSans-Regular.41,4C2E.retaingids.otf | Bin 2600 -> 2604 bytes + ...subroutinize-retain-gids.1FC,21,41,20,62,63.otf | Bin 0 -> 33516 bytes + ...Regular.desubroutinize-retain-gids.61,62,63.otf | Bin 0 -> 31080 bytes + ...r.desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf | Bin 0 -> 34708 bytes + ...subroutinize-retain-gids.1FC,21,41,20,62,63.otf | Bin 0 -> 33352 bytes + ...p-hints-desubroutinize-retain-gids.61,62,63.otf | Bin 0 -> 30956 bytes + ...s-desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf | Bin 0 -> 34560 bytes + ...op-hints-desubroutinize.1FC,21,41,20,62,63.otf} | Bin + ...-Regular.drop-hints-desubroutinize.61,62,63.otf | Bin 0 -> 3288 bytes + ...r.drop-hints-desubroutinize.D7,D8,D9,DA,DE.otf} | Bin + ...r.drop-hints-retain-gids.1FC,21,41,20,62,63.otf | Bin 0 -> 33448 bytes + ...Pro-Regular.drop-hints-retain-gids.61,62,63.otf | Bin 0 -> 31028 bytes + ...gular.drop-hints-retain-gids.D7,D8,D9,DA,DE.otf | Bin 0 -> 34576 bytes + ...subroutinize-retain-gids.1FC,21,41,20,62,63.otf | Bin 0 -> 15456 bytes + ...p-hints.desubroutinize-retain-gids.61,62,63.otf | Bin 0 -> 13036 bytes + ...s.desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf | Bin 0 -> 16656 bytes + ...s.desubroutinize.retain-gids.D7,D8,D9,DA,DE.otf | Bin 0 -> 34560 bytes + ...gular.drop-hints.retain-gids.D7,D8,D9,DA,DE.otf | Bin 0 -> 34576 bytes + ...sPro-Regular.retain-gids.1FC,21,41,20,62,63.otf | Bin 0 -> 33668 bytes + .../SourceSansPro-Regular.retain-gids.61,62,63.otf | Bin 0 -> 31180 bytes + ...eSansPro-Regular.retain-gids.D7,D8,D9,DA,DE.otf | Bin 0 -> 34724 bytes + ...e-retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 0 -> 536352 bytes + ...e-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 0 -> 690752 bytes + ...ular.desubroutinize-retain-gids.61,63,65,6B.otf | Bin 0 -> 530004 bytes + ...e-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 0 -> 690868 bytes + ...ans-Regular.desubroutinize-retain-gids.660E.otf | Bin 0 -> 612212 bytes + .../SourceHanSans-Regular.desubroutinize..otf | Bin 2340 -> 0 bytes + ...e-retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 0 -> 536176 bytes + ...e-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 0 -> 690500 bytes + ...ints-desubroutinize-retain-gids.61,63,65,6B.otf | Bin 0 -> 529888 bytes + ...e-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 0 -> 690564 bytes + ....drop-hints-desubroutinize-retain-gids.660E.otf | Bin 0 -> 612108 bytes + ...subroutinize.3042,3044,3046,3048,304A,304B.otf} | Bin 6076 -> 6096 bytes + ...subroutinize.3042,3044,3046,73E0,5EA6,8F38.otf} | Bin 6180 -> 6204 bytes + ...ular.drop-hints-desubroutinize.61,63,65,6B.otf} | Bin 5312 -> 5344 bytes + ...subroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf} | Bin 6248 -> 6268 bytes + ...ans-Regular.drop-hints-desubroutinize.660E.otf} | Bin 5140 -> 5120 bytes + ...s-retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 0 -> 536244 bytes + ...s-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 0 -> 690596 bytes + ...-Regular.drop-hints-retain-gids.61,63,65,6B.otf | Bin 0 -> 529928 bytes + ...s-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 0 -> 690768 bytes + ...HanSans-Regular.drop-hints-retain-gids.660E.otf | Bin 0 -> 612128 bytes + ...eHanSans-Regular.drop-hints.desubroutinize..otf | Bin 2188 -> 0 bytes + ...r.retain-gids.3042,3044,3046,3048,304A,304B.otf | Bin 0 -> 536436 bytes + ...r.retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 0 -> 690860 bytes + ...urceHanSans-Regular.retain-gids.61,63,65,6B.otf | Bin 0 -> 530084 bytes + ...r.retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 0 -> 691076 bytes + .../SourceHanSans-Regular.retain-gids.660E.otf | Bin 0 -> 612236 bytes + .../data/profiles/desubroutinize-retain-gids.txt | 2 + + .../drop-hints-desubroutinize-retain-gids.txt | 3 ++ + test/subset/data/tests/full-font.tests | 6 +++ + test/subset/data/tests/japanese.tests | 6 +++ + test/subset/subset_test_suite.py | 2 +- + 54 files changed, 36 insertions(+), 27 deletions(-) + +commit f2908b4d8f9b02ce06d3f648c3f08757797073b6 +Author: Michiharu Ariza +Date: Thu Jan 31 14:16:37 2019 -0800 + + Implement subset --regain-gids option with CFF1/2 + + along with api tests & expected results + + src/hb-subset-cff-common.cc | 17 +++- + src/hb-subset-cff-common.hh | 91 +++++++++++++-------- + src/hb-subset-cff1.cc | 89 ++++++++++++-------- + src/hb-subset-cff2.cc | 30 ++++--- + test/api/fonts/AdobeVFPrototype.ac.retaingids.otf | Bin 0 -> 7000 bytes + .../SourceHanSans-Regular.41,4C2E.retaingids.otf | Bin 0 -> 2600 bytes + .../fonts/SourceSansPro-Regular.ac.retaingids.otf | Bin 0 -> 1708 bytes + test/api/test-subset-cff1.c | 48 +++++++++++ + test/api/test-subset-cff2.c | 24 ++++++ + 9 files changed, 217 insertions(+), 82 deletions(-) + +commit 1e06282105a2d579aab32094cc7abc10ed231978 +Author: Behdad Esfahbod +Date: Thu Jan 31 13:56:58 2019 -0800 + + Adjust hb_is_signed<> + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1535 + + src/hb-dsalgs.hh | 27 +++++++++------------------ + 1 file changed, 9 insertions(+), 18 deletions(-) + +commit 21ea1c91529471c05e03b6db61df256f24fa23c1 +Author: Behdad Esfahbod +Date: Thu Jan 31 13:49:18 2019 -0800 + + Remove stale comment + + src/hb-dsalgs.hh | 5 ----- + 1 file changed, 5 deletions(-) + +commit 9f80eb0177e527253818ad9171fc75fb565318cb +Merge: b3799007 d14d2c20 +Author: Michiharu Ariza +Date: Thu Jan 31 12:54:36 2019 -0800 + + Merge branch 'master' into cff-more-arrayof-fixes + +commit 2d940946d5af0e3869a2324b6e36ca8ea3698c48 +Author: Behdad Esfahbod +Date: Wed Jan 30 16:03:16 2019 -0800 + + [iter] Fix mystery crash + + Fuzzer caught it: + + ==14==ERROR: AddressSanitizer: stack-use-after-return on address 0x7fca2ed7a3e0 at pc 0x0000006057aa bp 0x7ffc3290f1d0 sp 0x7ffc3290f1c8 + READ of size 4 at 0x7fca2ed7a3e0 thread T0 + SCARINESS: 55 (4-byte-read-stack-use-after-return) + #0 0x6057a9 in OT::SingleSubstFormat2::subset(hb_subset_context_t*) const /src/harfbuzz/src/./hb-ot-layout-gsub-table.hh:194:40 + #1 0x5ff921 in hb_subset_context_t::return_t OT::SingleSubst::dispatch(hb_subset_context_t*) const /src/harfbuzz/src/./hb-ot-layout-gsub-table.hh:256:13 + + I can't reproduce locally, but many of the bots are failing because of this + as well. + + It's a pity that operator-> must return pointer. Ugh. Why?! + + src/hb-iter.hh | 4 ++++ + src/hb-ot-layout-gsub-table.hh | 4 ++-- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit d14d2c20b05c5acf0a6f9c6dc36a7b8d8966153e +Merge: acf5f0a3 dc04261a +Author: Behdad Esfahbod +Date: Wed Jan 30 18:36:57 2019 -0500 + + Merge pull request #1567 from googlefonts/fuzzer + + [subset] Update the subset fuzzer to get options to use from test case. + +commit dc04261a5b8408bcfde16090ddf91568c3d8dae7 +Author: Garret Rieger +Date: Wed Jan 30 15:23:19 2019 -0800 + + [subset] Update the subset fuzzer to determine which options to use based on data in the fuzzing test case. + Add support for toggling retain_gids. + + test/fuzzing/hb-subset-fuzzer.cc | 32 +++++++++++++++++++------------- + 1 file changed, 19 insertions(+), 13 deletions(-) + +commit 2e675d49f2f705a5b5d95574a5336d5e670a0fba +Merge: ede117dc acf5f0a3 +Author: Behdad Esfahbod +Date: Wed Jan 30 15:10:43 2019 -0800 + + Merge branch 'master' into iter + +commit acf5f0a3aff0e128509b0979f629edf0596fcee5 +Author: Behdad Esfahbod +Date: Wed Jan 30 15:10:23 2019 -0800 + + [configure] Fix up + + configure.ac | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit ede117dc40d547cd457a420c9f7c9829cdb5f307 +Author: Behdad Esfahbod +Date: Wed Jan 30 15:10:23 2019 -0800 + + [configure] Fix up + + configure.ac | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit cbe2118c588622070612ba7ac7eae7496a092e3c +Merge: 8b46c2d9 6b834c1c +Author: Behdad Esfahbod +Date: Wed Jan 30 15:07:09 2019 -0800 + + Merge branch 'master' into iter + +commit 6b834c1c76b867ef32747202a755255d2f360f1e +Author: Behdad Esfahbod +Date: Wed Jan 30 15:06:22 2019 -0800 + + [configure] Print compiler version info in report + + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 8b46c2d933b546a88799b08f4a74fd1285518ed5 +Author: Behdad Esfahbod +Date: Wed Jan 30 15:06:22 2019 -0800 + + [configure] Print compiler version info in report + + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 4aa4eedfd5633ee84d37469c9625d12856dbc575 +Author: Behdad Esfahbod +Date: Wed Jan 30 15:02:29 2019 -0800 + + [ci] Switch clang-O3-O0 bot to Ubuntu image + + https://github.com/harfbuzz/harfbuzz/issues/1566 + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7c292c0853140540f13f73d43ef7f7e0746e5f28 +Author: Behdad Esfahbod +Date: Wed Jan 30 14:54:23 2019 -0800 + + [iter] Warning fix + + Not sure why I don't get it, but this warning: + + warning: base class ‘struct hb_iter_fallback_mixin_t, const OT::UVSMapping&>’ should be explicitly initialized in the copy constructor [-Wextra] + + src/hb-iter.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit a84b0145ea799c9452ecb97713689247955d30ff +Author: Behdad Esfahbod +Date: Wed Jan 30 14:42:48 2019 -0800 + + [ci] Disable -Wunused-template on -Weverything bot + + ./hb-algs.hh:37:3: error: unused function template 'operator()' [-Werror,-Wunused-template] + operator () (const T& v) const { return v; } + ^ + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d983c529b66b530715e9c813c69e699b1d8029d3 +Merge: 55d1d7c8 e6ffcc59 +Author: Behdad Esfahbod +Date: Wed Jan 30 17:17:59 2019 -0500 + + Merge pull request #1564 from googlefonts/retain_gids + + [subset] Add --retain-gids option to the subsetter. + +commit 55d1d7c8bcd8d97c4e618e5dd21f13df50b10ce8 +Author: Behdad Esfahbod +Date: Wed Jan 30 13:54:15 2019 -0800 + + 2.3.1 + + NEWS | 7 +++++++ + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 3 files changed, 10 insertions(+), 3 deletions(-) + +commit e799004e9f6821864b955a09673544d92e8b45e6 +Author: Behdad Esfahbod +Date: Tue Jan 29 17:15:12 2019 -0800 + + [iter] Whitespace + + src/hb-iter.hh | 23 ++++++++++++++--------- + 1 file changed, 14 insertions(+), 9 deletions(-) + +commit 849a0f1758b67eb3b4d864047b9df671e76404a5 +Author: Behdad Esfahbod +Date: Tue Jan 29 17:10:19 2019 -0800 + + [iter] Add hb_iter_with_fallback_t instead + + src/hb-array.hh | 5 +---- + src/hb-iter.hh | 29 +++++++++++++---------------- + src/hb-ot-layout-common.hh | 5 +---- + src/hb-set.hh | 5 +---- + src/test-iter.cc | 5 +---- + 5 files changed, 17 insertions(+), 32 deletions(-) + +commit 4d40ed9d1a7a4f18af6710a1b8ba90257b8456a0 +Author: Behdad Esfahbod +Date: Tue Jan 29 13:55:23 2019 -0800 + + [iter] Add hb_iter_with_mixin_t<> + + src/hb-array.hh | 5 +++-- + src/hb-iter.hh | 18 ++++++++++++++++-- + src/hb-ot-layout-common.hh | 5 +++-- + src/hb-set.hh | 5 +++-- + src/test-iter.cc | 5 +++-- + 5 files changed, 28 insertions(+), 10 deletions(-) + +commit 6521d5b201cb8df5a3c2657b4da703cf52472f81 +Author: Behdad Esfahbod +Date: Tue Jan 29 13:44:39 2019 -0800 + + [iter] Export operator << / >> + + src/hb-iter.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 84a25d79c649776a299526c087bf369a9705f89e +Author: Behdad Esfahbod +Date: Tue Jan 29 13:39:19 2019 -0800 + + [iter] Rename + + src/hb-array.hh | 2 +- + src/hb-iter.hh | 12 ++++++------ + src/hb-ot-layout-common.hh | 2 +- + src/hb-set.hh | 2 +- + src/test-iter.cc | 2 +- + 5 files changed, 10 insertions(+), 10 deletions(-) + +commit e6ffcc5904ab88143cad0c7a7a4c990147af278b +Author: Garret Rieger +Date: Mon Jan 28 18:12:19 2019 -0800 + + [subset] Add expected files for retain-gids integration tests. + + ...oboto-Regular.abc.drop-hints-retain-gids.61,62,63.ttf | Bin 0 -> 924 bytes + .../Roboto-Regular.abc.drop-hints-retain-gids.61,63.ttf | Bin 0 -> 856 bytes + .../Roboto-Regular.abc.drop-hints-retain-gids.61.ttf | Bin 0 -> 744 bytes + .../Roboto-Regular.abc.drop-hints-retain-gids.62.ttf | Bin 0 -> 712 bytes + .../Roboto-Regular.abc.drop-hints-retain-gids.63.ttf | Bin 0 -> 716 bytes + .../basics/Roboto-Regular.abc.retain-gids.61,62,63.ttf | Bin 0 -> 2168 bytes + .../basics/Roboto-Regular.abc.retain-gids.61,63.ttf | Bin 0 -> 1996 bytes + .../basics/Roboto-Regular.abc.retain-gids.61.ttf | Bin 0 -> 1808 bytes + .../basics/Roboto-Regular.abc.retain-gids.62.ttf | Bin 0 -> 1756 bytes + .../basics/Roboto-Regular.abc.retain-gids.63.ttf | Bin 0 -> 1732 bytes + test/subset/data/profiles/retain-gids.txt | 1 - + 11 files changed, 1 deletion(-) + +commit 198859bb3702e45cb271dd51b7231f10d01576be +Author: Garret Rieger +Date: Mon Jan 28 18:10:56 2019 -0800 + + [subset] For retain gids don't truncate glyphs past the highest requested subset glyph. + + src/hb-subset-plan.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 490d52f908aaa4722e71a4a682de20e94d89ad00 +Author: Garret Rieger +Date: Mon Jan 28 17:43:42 2019 -0800 + + [subset] Add retain-gids option to hb-subset executable. + + util/hb-subset.cc | 1 + + util/options.cc | 1 + + util/options.hh | 2 ++ + 3 files changed, 4 insertions(+) + +commit a903f9c228d1f3e8065f89de16e50027d6018e58 +Author: Garret Rieger +Date: Mon Jan 28 17:43:11 2019 -0800 + + [subset] Add some subsetting integration tests covering retain gids. + + test/subset/data/profiles/drop-hints-retain-gids.txt | 2 ++ + test/subset/data/profiles/retain-gids.txt | 2 ++ + test/subset/data/tests/basics.tests | 2 ++ + 3 files changed, 6 insertions(+) + +commit 05e99c86baa0e95c2bff1c87d601eaf022c9d1f8 +Author: Garret Rieger +Date: Mon Jan 28 17:05:04 2019 -0800 + + [subset] A few small fixes for the new subset plan api. + + src/hb-ot-hdmx-table.hh | 6 +++--- + src/hb-ot-hmtx-table.hh | 9 +++------ + src/hb-subset.cc | 2 +- + 3 files changed, 7 insertions(+), 10 deletions(-) + +commit bdbe047d6ce3d8873c6740500d38d1b0c4e851f8 +Author: Garret Rieger +Date: Mon Jan 28 16:59:15 2019 -0800 + + [subset] Update hb-subset-plan.cc to match hb-subset-plan.hh. + + src/hb-subset-plan.cc | 20 ++++++++++---------- + src/hb-subset-plan.hh | 1 - + 2 files changed, 10 insertions(+), 11 deletions(-) + +commit 74c44ffebafe7758937d82524758be8bb4ecc4e2 +Author: Garret Rieger +Date: Mon Jan 28 16:53:01 2019 -0800 + + [subset] Update hb-subset-glyf.cc to use new hb-subset-plan API. + + src/hb-subset-glyf.cc | 57 ++++++++++++++++++++------------------------------- + 1 file changed, 22 insertions(+), 35 deletions(-) + +commit 4842294b861b9fe322c811abef0ebb0553be2bf0 +Author: Garret Rieger +Date: Mon Jan 28 16:51:27 2019 -0800 + + [subset] Update gsub to use glyphset() method of subset plan. + + src/hb-ot-layout-gsub-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 853b1f1aa5489b8439c41c30be77ed042c8c89e5 +Author: Garret Rieger +Date: Mon Jan 28 16:50:56 2019 -0800 + + [subset] Correct maxp num glyph's to use new subset plan method. + + src/hb-ot-maxp-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 846e05a298bc088f2cd2fe53b75ca531916a56f8 +Author: Garret Rieger +Date: Mon Jan 28 16:50:20 2019 -0800 + + [subset] Re-add glyphs array to subset plan, with new name 'glyphs_deprecated'. Switch CFF subsetting to use it. + + src/hb-subset-cff1.cc | 36 ++++++++++++++++++------------------ + src/hb-subset-cff2.cc | 12 ++++++------ + src/hb-subset-plan.hh | 3 +++ + 3 files changed, 27 insertions(+), 24 deletions(-) + +commit 03e88eab5c0f8775ccffc0925532748140d93470 +Author: Garret Rieger +Date: Mon Jan 28 16:15:06 2019 -0800 + + Re-implement HMTX/VMTX subsetting. Update it to support glyph renumbering and simplify the implementation. + + src/hb-ot-hmtx-table.hh | 99 +++++++++++++++++++++++++------------------------ + src/hb-subset-plan.cc | 2 +- + src/hb-subset-plan.hh | 2 +- + 3 files changed, 53 insertions(+), 50 deletions(-) + +commit 925be2922348336335a96d84e606d4bdd9a11110 +Author: Garret Rieger +Date: Fri Jan 25 18:04:41 2019 -0800 + + Update hb-ot-vorg-table and hb-ot-layout-common to use the updated subset plan api. + + src/hb-ot-layout-common.hh | 4 ++-- + src/hb-ot-vorg-table.hh | 30 +++++++++++++++++++----------- + 2 files changed, 21 insertions(+), 13 deletions(-) + +commit 4af3be6ef8654ae05b331941e6e690ac197fd144 +Author: Garret Rieger +Date: Fri Jan 25 18:03:47 2019 -0800 + + Remove glyph array from subset plan, make num_glyphs and glyphset private. + + src/hb-subset-plan.hh | 51 +++++++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 41 insertions(+), 10 deletions(-) + +commit 23f364429dc9350ee06146bdf0ff73d7035e1d71 +Author: Garret Rieger +Date: Fri Jan 18 18:33:21 2019 -0800 + + [subset] Fix hdmx subsetting when retain gids is enabled. + + src/hb-ot-hdmx-table.hh | 19 +++++++++++-------- + src/hb-subset-plan.cc | 10 ++++++++++ + src/hb-subset-plan.hh | 16 +++++++++++++++- + 3 files changed, 36 insertions(+), 9 deletions(-) + +commit 2da1654aefbe4f8e5f1320f1c061adbf90963951 +Author: Garret Rieger +Date: Fri Jan 18 17:49:35 2019 -0800 + + [subset] Compute num_glyphs during subset plan construction. + Update maxp to use the correct num glyphs. + + src/hb-ot-maxp-table.hh | 2 +- + src/hb-subset-glyf.cc | 6 +----- + src/hb-subset-plan.cc | 16 +++++++++++++--- + src/hb-subset-plan.hh | 1 + + 4 files changed, 16 insertions(+), 9 deletions(-) + +commit ccc59dc6121e98ed8d610350b43218e540f61f25 +Author: Garret Rieger +Date: Fri Jan 18 17:36:32 2019 -0800 + + [subset] Add unit test for glyf subsetting and retain gids. + + test/api/fonts/Roboto-Regular.ac.retaingids.ttf | Bin 0 -> 2284 bytes + test/api/test-subset-glyf.c | 26 ++++++++++++++++++++++++ + 2 files changed, 26 insertions(+) + +commit 96b038f375bcfcfdf76c75200ca02758ea7a4ff6 +Author: Garret Rieger +Date: Fri Jan 18 16:41:08 2019 -0800 + + [subset] fix failure to init instruction ranges values for an invalid glyph. + + src/hb-subset-glyf.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 4b1ac3a2fa0a5842b5d45d287fe33e5050ffda3f +Author: Garret Rieger +Date: Fri Jan 18 15:11:26 2019 -0800 + + [subset] Do some refactoring in hb-subset-glyf.cc. + - Extract code out into helper methods in several places. + - Bundle loca address, size and is short into a struct. + + src/hb-subset-glyf.cc | 264 ++++++++++++++++++++++++++++---------------------- + 1 file changed, 148 insertions(+), 116 deletions(-) + +commit b7f971884ed838636be85de216bf60ca4a28ccb9 +Author: Garret Rieger +Date: Thu Jan 17 18:55:56 2019 -0800 + + Add retain_gids option to subset input. Update glyf and loca handling to respect retain_gids. + + src/hb-subset-glyf.cc | 39 ++++++++++++++++++++++++++++++--------- + src/hb-subset-input.cc | 27 +++++++++++++++++++++++++++ + src/hb-subset-input.hh | 1 + + src/hb-subset-plan.cc | 14 ++++++++++---- + src/hb-subset.h | 6 ++++++ + 5 files changed, 74 insertions(+), 13 deletions(-) + +commit b3799007554f2909170df941b07c72f7dc02dfcd +Merge: c6856443 fe532923 +Author: Michiharu Ariza +Date: Tue Jan 29 12:19:57 2019 -0800 + + Merge branch 'master' into cff-more-arrayof-fixes + +commit e75b22039f4129b5057f4b175c9e9d79634b1728 +Author: Behdad Esfahbod +Date: Mon Jan 28 21:26:23 2019 -0500 + + Move hb_addressof() to hb-meta.hh + + src/hb-algs.hh | 12 ------------ + src/hb-iter.hh | 1 - + src/hb-meta.hh | 14 +++++++++++++- + src/hb.hh | 2 +- + 4 files changed, 14 insertions(+), 15 deletions(-) + +commit 6cf25c2971aa9a7471b1cc00176ef36e9acacad4 +Merge: 71157a45 fe532923 +Author: Behdad Esfahbod +Date: Mon Jan 28 21:23:28 2019 -0500 + + Merge branch 'master' into iter + +commit 71157a4520ae5cdbbeb197a979ae02b484856686 +Author: Behdad Esfahbod +Date: Mon Jan 28 21:20:12 2019 -0500 + + [meta] Remove _ft struct names + + Using decltype() instead. + + src/hb-algs.hh | 8 ++++---- + src/hb-iter.hh | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 9103bd056fadd73eab2531f632790920ce602f18 +Author: Behdad Esfahbod +Date: Mon Jan 28 21:16:51 2019 -0500 + + [pair] Use decltype + + src/hb-algs.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit fe532923101586e316b300d419a337d357cd93da +Author: Behdad Esfahbod +Date: Mon Jan 28 20:47:58 2019 -0500 + + [CI] Peg CircleCI badge link to master branch + + [skip ci] + + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9569819e24f72926a5b26e4c8a86d815c0132745 +Author: Behdad Esfahbod +Date: Mon Jan 28 20:43:43 2019 -0500 + + [ci] Peg build status badges to master branch + + [skip ci] + + README.md | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 1e29906a77c275c34a440a416654a514810485e1 +Author: Behdad Esfahbod +Date: Mon Jan 28 20:38:15 2019 -0500 + + Switch README / README.md + + [skip ci] + + README | 19 +------------------ + README.md | 19 ++++++++++++++++++- + 2 files changed, 19 insertions(+), 19 deletions(-) + +commit a30e13469e6d3ec6ff412211722d26f70a97e261 +Author: Behdad Esfahbod +Date: Mon Jan 28 16:39:01 2019 -0500 + + [iter] Add operator << to set / vector + + src/hb-set.hh | 3 +++ + src/hb-vector.hh | 3 +++ + 2 files changed, 6 insertions(+) + +commit d438e610420d931a203b31332cf74d7e0f9dd3f7 +Author: Behdad Esfahbod +Date: Mon Jan 28 16:34:04 2019 -0500 + + [iter] Fix operator() impls + + src/hb-map.hh | 5 +++-- + src/hb-ot-layout-common.hh | 8 +++++--- + src/hb-set.hh | 3 ++- + 3 files changed, 10 insertions(+), 6 deletions(-) + +commit 57795bc8dd6a9ee894c2abb8633c271876b5f596 +Author: Behdad Esfahbod +Date: Mon Jan 28 16:23:12 2019 -0500 + + [iter] Add operator>> and operator<< + + src/hb-iter.hh | 4 ++++ + src/test-iter.cc | 4 ++++ + 2 files changed, 8 insertions(+) + +commit 8bd96be9940ca73e45138172f9f4178190566225 +Author: Behdad Esfahbod +Date: Mon Jan 28 16:17:36 2019 -0500 + + [iter] Use auto c = C.iter() internally + + src/hb-iter.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 073fa4ac5aff4ee72bbb38676bd351b5aa1ec167 +Merge: d592bd16 9a1df82e +Author: Behdad Esfahbod +Date: Mon Jan 28 14:35:41 2019 -0500 + + Merge branch 'master' into iter + +commit 9a1df82e3f13fbd4488ee9955814bbb5d0957074 +Author: Behdad Esfahbod +Date: Mon Jan 28 14:15:18 2019 -0500 + + [uniscribe] Whitelist function type cast + + src/hb-uniscribe.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 6e1c3eaf7005d06c89f0807f693aadd835aa0468 +Author: Behdad Esfahbod +Date: Mon Jan 28 14:12:41 2019 -0500 + + Fix sign comparison error + + src/hb-open-file.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 9db7a7da6339eacbb6c699fa1939bbd7e9e148f5 +Author: Behdad Esfahbod +Date: Mon Jan 28 14:09:59 2019 -0500 + + Fix warning + + c:\projects\harfbuzz\src\hb-ot-color-cbdt-table.hh(59): warning C4146: unary minus operator applied to unsigned type, result still unsigned [C:\projects\harfbuzz\build\harfbuzz.vcxproj] + + src/hb-ot-color-cbdt-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 51b584880e550545ced3aa8ba4ccad3cf79bb53e +Author: Behdad Esfahbod +Date: Mon Jan 28 14:09:45 2019 -0500 + + [pragma] Silence MSVC unknown-pragma warning + + src/hb.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit d592bd16cd6c5ad1ee351d90d213ee2a1ea71b05 +Author: Behdad Esfahbod +Date: Mon Jan 28 13:41:40 2019 -0500 + + Try fixing MSVC build + + src/hb-algs.hh | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 0363ce650b6085f62e66aff4639aa203fa17d419 +Author: Behdad Esfahbod +Date: Sun Jan 27 01:03:56 2019 +0100 + + [iter] Accept C arrays in hb_iter() + + src/hb-array.hh | 4 +--- + src/hb-iter.hh | 11 +++++++++++ + src/test-iter.cc | 5 ++++- + 3 files changed, 16 insertions(+), 4 deletions(-) + +commit b62e7f9223a6369768bde2500efe1bd1d27a0ea2 +Author: Behdad Esfahbod +Date: Sun Jan 27 00:51:43 2019 +0100 + + [test] Test unary operator+ + + "Test" as in compiles.. + + src/test-iter.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 778c96b8d7b86ae2a0fe944f499fa4a57c12e365 +Author: Behdad Esfahbod +Date: Sun Jan 27 00:50:54 2019 +0100 + + [iter] Fix hb_iter() + + src/hb-algs.hh | 4 ---- + src/hb-iter.hh | 10 +++++++--- + src/test-iter.cc | 2 +- + 3 files changed, 8 insertions(+), 8 deletions(-) + +commit 2f5b1a9104e5f4a14aa77a2f4c3c6e1c2837500c +Author: Behdad Esfahbod +Date: Sun Jan 27 00:49:37 2019 +0100 + + [iter] Add unary operator+ that returns a copy + + src/hb-iter.hh | 1 + + src/test-iter.cc | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit fbab07f9b3dac90ce2136506f72879335193fc02 +Author: Behdad Esfahbod +Date: Sun Jan 27 00:44:45 2019 +0100 + + [iter] Add hb_bool() and make hb_filter default to it for predicate + + src/hb-algs.hh | 6 ++++++ + src/hb-iter.hh | 4 ++-- + src/test-iter.cc | 10 +++++++++- + 3 files changed, 17 insertions(+), 3 deletions(-) + +commit 313d63e240736bfe7c312133fe8c09ccff428d52 +Author: Behdad Esfahbod +Date: Sat Jan 26 22:58:26 2019 +0100 + + [meta] Back to using _ft suffix for function-object types + + Seprate namespace, cleaner, more clear. + + src/hb-algs.hh | 6 +++--- + src/hb-iter.hh | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 2aff6d9625673062b1129e2af5b7d029f7622e71 +Author: Behdad Esfahbod +Date: Sat Jan 26 22:54:25 2019 +0100 + + [iter] Test that default-constructed iterators are empty + + src/test-iter.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit f35e7eabf10d99c2a4ddab054cf89f3da359e7a8 +Author: Behdad Esfahbod +Date: Sat Jan 26 22:50:00 2019 +0100 + + pragma GCC diagnostic error "-Winjected-class-name" + + See 6b6783e1588ebe5772a1edc19552219e9d931bda + + src/hb.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 509353357c220a3a60910b70b3a90ea8fa6a14a8 +Author: Behdad Esfahbod +Date: Sat Jan 26 22:47:35 2019 +0100 + + [iter] Use hb_declval() instead of Null() to get instance + + I had used Null to make one of the bots happy before. Not going + to bend to such demands anymore.. + + src/hb-iter.hh | 3 +-- + src/hb.hh | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) + +commit 6b6783e1588ebe5772a1edc19552219e9d931bda +Author: Behdad Esfahbod +Date: Sat Jan 26 22:44:09 2019 +0100 + + [iter/meta] Fix build on newer clang + + The mystery failure had to do with SFINAE failure because the template + function involved was accessing ::iter_t of a type that was also named iter_t. + In this context, apparently: + + warning: ISO C++ specifies that qualified reference to 'iter_t' is a + constructor name rather than a type in this context, despite preceding 'typename' keyword + [-Winjected-class-name] + + We use a new macro, also called hb_iter_t(), to get iterator type of + a type. This uses declval/hb_decltype, and has the added benefit + that it returns correct type for const vs non-const objects, if they + have different iterators. + + src/hb-iter.hh | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) + +commit 5adb113bafb2cf10ea768ff7a15ad4e6a1270a29 +Author: Behdad Esfahbod +Date: Sat Jan 26 22:15:59 2019 +0100 + + [meta] Mark function-objects as const + + src/hb-algs.hh | 6 +++--- + src/hb-iter.hh | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit ac90f17c552e5264ad0a9d17c50fac9008d6ebe7 +Merge: 090fe56d 60022ecc +Author: Behdad Esfahbod +Date: Sat Jan 26 14:05:39 2019 +0100 + + Merge branch 'master' into iter + +commit 60022ecced202760daa7f75516bba6a4689a49de +Author: Behdad Esfahbod +Date: Sat Jan 26 14:04:51 2019 +0100 + + Fix -Wcast-function-type warnings in util/ with gcc 4.8 + + src/hb.hh | 1 + + util/options.hh | 5 ++++- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit a9321cb5f88cae1dafbd623b8bf7c68a82a3c211 +Author: Behdad Esfahbod +Date: Fri Jan 25 16:11:45 2019 +0100 + + Fix mac test + + test/shaping/data/in-house/tests/macos.tests | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f39809752909f193a9c60f4357a88ea1c3ce1162 +Author: Behdad Esfahbod +Date: Fri Jan 25 16:08:25 2019 +0100 + + More static constexpr + + src/hb-machinery.hh | 10 +++++----- + src/hb-set-digest.hh | 14 +++++++------- + 2 files changed, 12 insertions(+), 12 deletions(-) + +commit 090fe56dc6ef5f7afa297f2cb200418a520a2026 +Merge: 21c0713a 06358ae9 +Author: Behdad Esfahbod +Date: Fri Jan 25 15:34:03 2019 +0100 + + Merge branch 'master' into iter + +commit 06358ae9746ae72c0917e8a5f294d14fd695f380 +Author: Behdad Esfahbod +Date: Fri Jan 25 15:11:47 2019 +0100 + + [AAT] Add test for recent Ligature stack fix, using Zapfino on Mac + + test/shaping/data/in-house/tests/macos.tests | 2 ++ + 1 file changed, 2 insertions(+) + +commit c685644386d1c88d6df6e024e56d61c792d94418 +Merge: 0bd0a331 e970de48 +Author: Michiharu Ariza +Date: Thu Jan 24 13:19:18 2019 -0800 + + Merge branch 'master' into cff-more-arrayof-fixes + +commit e970de48bcbdccd29350f331288c0a98f7846c16 +Author: Behdad Esfahbod +Date: Thu Jan 24 18:16:17 2019 +0100 + + [AAT] Minor sign + + src/hb-aat-layout-morx-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a371a28cda23805cbea22867e0a3ed53ecb811ed +Author: Behdad Esfahbod +Date: Thu Jan 24 18:12:25 2019 +0100 + + [AAT] Use a ring buffer for ligature stack + + I think Apple does very similarly, but probably with a stack size of 16. + We do it with a stack size that is currently set to 64. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1531 + + src/hb-aat-layout-morx-table.hh | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +commit 7886b1578fceee368ae5afe206ff98f50e1c42e3 +Author: Behdad Esfahbod +Date: Thu Jan 24 18:06:17 2019 +0100 + + Whitespace + + src/hb-aat-layout-morx-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b976940243bf1f174bd6abb85955789ef2631d24 +Author: Behdad Esfahbod +Date: Thu Jan 24 18:01:07 2019 +0100 + + [AAT] Handle transition errors during machine operation + + Before we used to give up. Now, just ignore error and continue processing. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1531 + + src/hb-aat-layout-common.hh | 3 +-- + src/hb-aat-layout-kerx-table.hh | 21 +++++++-------------- + src/hb-aat-layout-morx-table.hh | 34 +++++++++++++--------------------- + 3 files changed, 21 insertions(+), 37 deletions(-) + +commit 0bd0a3311cfded5ffa4d9d488d404558cf65e8ed +Merge: 12cd3171 f60282c5 +Author: Michiharu Ariza +Date: Thu Jan 24 08:53:28 2019 -0800 + + Merge branch 'master' into cff-more-arrayof-fixes + +commit e234bb6a428cd6c8ddf57eb078cd51b9d1f25ba8 +Author: Behdad Esfahbod +Date: Thu Jan 24 17:23:11 2019 +0100 + + [AAT] Ignore machine errors and continue + + src/hb-aat-layout-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1ec90514f69efc329691186466f62373efa863b1 +Author: Behdad Esfahbod +Date: Thu Jan 24 17:21:41 2019 +0100 + + [AAT] Minor + + src/hb-aat-layout-common.hh | 12 ++++---- + src/hb-aat-layout-kerx-table.hh | 38 +++++++++++------------ + src/hb-aat-layout-morx-table.hh | 68 ++++++++++++++++++++--------------------- + 3 files changed, 59 insertions(+), 59 deletions(-) + +commit 299eca0c3b28c99add006420bc667431d874fb2e +Author: Behdad Esfahbod +Date: Thu Jan 24 17:17:00 2019 +0100 + + [AAT] Handle out-of-bounds classes + + src/hb-aat-layout-common.hh | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +commit c4623db4a3f963394db940449007fa3312460993 +Author: Behdad Esfahbod +Date: Thu Jan 24 17:10:12 2019 +0100 + + [AAT] Minor + + src/hb-aat-layout-common.hh | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +commit c4e36f97b6df1eb5fba588b09ae1630bb5c49589 +Author: Behdad Esfahbod +Date: Thu Jan 24 17:06:16 2019 +0100 + + [AAT] Minor + + src/hb-aat-layout-common.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit f60282c5bff4a317ba3180e3519274963c6e8849 +Author: Behdad Esfahbod +Date: Thu Jan 24 16:29:09 2019 +0100 + + More pragma control + + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=924848 + + src/hb.hh | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +commit fd0889f903ac1ba2da06e77eed8424395ea85a90 +Author: Behdad Esfahbod +Date: Thu Jan 24 16:12:52 2019 +0100 + + Comment + + src/hb-ot-shape.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 00f06d1aa61e9a6d01b5943ce55ba2b0c40237ee +Author: Behdad Esfahbod +Date: Thu Jan 24 16:11:05 2019 +0100 + + Fix test + + test/shaping/data/in-house/tests/cluster.tests | 1 - + test/shaping/data/in-house/tests/emoji.tests | 3 ++- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 9f314177336f9551756944e0e555614c9189c7a5 +Author: Behdad Esfahbod +Date: Thu Jan 24 16:08:33 2019 +0100 + + Form cluster for Emoji sub-region tag sequences + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1556 + + src/hb-ot-shape.cc | 13 +++++++++++++ + .../fonts/8d9c4b193808b8bde94389ba7831c1fc6f9e794e.ttf | Bin 0 -> 1548 bytes + test/shaping/data/in-house/tests/cluster.tests | 1 + + 3 files changed, 14 insertions(+) + +commit 5034f8f2ab8f53eb0395e6f6ce2f8da69a08460d +Author: Behdad Esfahbod +Date: Thu Jan 24 12:50:38 2019 +0100 + + Fix macos tests with previous commit + + test/shaping/data/in-house/tests/macos.tests | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 3ecda71041a7239ca37ec7b888809efe8f595a19 +Author: Behdad Esfahbod +Date: Thu Jan 24 12:08:23 2019 +0100 + + Adjust mark offsets when zeroing from fallback mark positioning code + + Adjust tests. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1532 + + src/hb-ot-shape-fallback.cc | 31 +++++++++++++++------- + src/hb-ot-shape-fallback.hh | 3 ++- + src/hb-ot-shape.cc | 3 ++- + .../in-house/tests/arabic-fallback-shaping.tests | 2 +- + test/shaping/data/in-house/tests/cluster.tests | 2 +- + .../data/in-house/tests/fallback-positioning.tests | 4 +-- + 6 files changed, 30 insertions(+), 15 deletions(-) + +commit 12cd3171ba3b84eff9f359778fabcab8f66ce36e +Merge: 261a7421 36fb2b4d +Author: Michiharu Ariza +Date: Wed Jan 23 14:05:42 2019 -0800 + + Merge branch 'master' into cff-more-arrayof-fixes + +commit 261a7421814d83f84d8def046b7108a245347461 +Author: Michiharu Ariza +Date: Wed Jan 23 14:04:29 2019 -0800 + + more rewriting with ArrayOf<> + + CFF1 Encoding0, Encoding1, CFF1SuppEncData + + src/hb-ot-cff1-table.hh | 51 +++++++++++++++++++++++-------------------------- + 1 file changed, 24 insertions(+), 27 deletions(-) + +commit 36fb2b4da9718a86978fa07c99ba4345f7ca9b4b +Author: Behdad Esfahbod +Date: Wed Jan 23 20:53:57 2019 +0100 + + [AAT] In InsertionChain, set mark to previous-position if inserting + + Fixes MORX-31 + + src/hb-aat-layout-morx-table.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit cbe0ed117ac86179183c389977d15981d26524f7 +Author: Behdad Esfahbod +Date: Wed Jan 23 20:45:18 2019 +0100 + + [AAT] Re-enable tests MORX-31 and MORX-41 + + test/shaping/data/text-rendering-tests/DISABLED | 3 --- + test/shaping/data/text-rendering-tests/Makefile.sources | 2 ++ + 2 files changed, 2 insertions(+), 3 deletions(-) + +commit baf4d6a68a031bf65e17ccd5dac15fe7d0df33b6 +Author: Behdad Esfahbod +Date: Wed Jan 23 20:36:07 2019 +0100 + + [AAT] Remove mark_set from InsertionChain + + src/hb-aat-layout-morx-table.hh | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +commit 410731d3fb678365c07a4d1745b72b6bb3142b70 +Author: Behdad Esfahbod +Date: Wed Jan 23 20:30:48 2019 +0100 + + [test/text-rendering-tests] Update from upstream + + test/shaping/data/text-rendering-tests/extract-tests.py | 2 +- + test/shaping/data/text-rendering-tests/tests/MORX-14.tests | 2 +- + test/shaping/data/text-rendering-tests/tests/MORX-32.tests | 8 ++++---- + test/shaping/data/text-rendering-tests/tests/MORX-41.tests | 4 ++-- + 4 files changed, 8 insertions(+), 8 deletions(-) + +commit 0b2fa342de88bbe609b2147444e56c94680cbd38 +Author: Behdad Esfahbod +Date: Tue Jan 22 16:36:00 2019 +0100 + + More of previous + + src/hb-subset-cff1.cc | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit a5e5dd8b42b40c3647e06e6bb62580af77bed42b +Author: Behdad Esfahbod +Date: Tue Jan 22 16:30:07 2019 +0100 + + Fix sign-compare error resulted from promoting unsigned integers to signed larger ints + + Clang and gcc know not to warn in these cases, but not nonmainstream compilers + + src/hb-subset-cff2.cc | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 32379bbf10726bb7ed2e507d0a6b5917c350e056 +Author: Behdad Esfahbod +Date: Tue Jan 22 12:55:29 2019 +0100 + + Cast HB_UNTAG results to uint8_t + + src/hb-common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 83d4aa5ca9a39dbe66db9b81b34f5b568503bd7e +Author: Behdad Esfahbod +Date: Tue Jan 22 12:52:23 2019 +0100 + + More -Wcast-error fix + + src/hb-dsalgs.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit 447323b85a7b68bd41561a87c91431cd05227b97 +Author: Behdad Esfahbod +Date: Tue Jan 22 12:45:40 2019 +0100 + + Better fix for -Wcast-align errors + + src/hb-font.cc | 33 +++++++++------------------------ + src/hb-ft.cc | 14 ++++---------- + src/hb-machinery.hh | 16 ++++++++++++++++ + src/hb-ot-cmap-table.hh | 7 ++----- + src/hb-ot-font.cc | 14 ++++---------- + 5 files changed, 35 insertions(+), 49 deletions(-) + +commit 81ec543d800c4a94b5e608fd87e84d33d7dae8ac +Author: Behdad Esfahbod +Date: Tue Jan 22 12:43:12 2019 +0100 + + More -Wcast-error fixes + + src/hb-font.cc | 8 ++++---- + src/hb-ft.cc | 2 +- + src/hb-ot-font.cc | 4 ++-- + 3 files changed, 7 insertions(+), 7 deletions(-) + +commit 90772725493108c79487a67620f0240e5d68f4ee +Author: Behdad Esfahbod +Date: Tue Jan 22 12:40:18 2019 +0100 + + pragma GCC diagnostic error "-Wsign-compare" + + src/hb.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8d05bf7dc0094e75be07ca1f7ef852a1e45d0687 +Author: Behdad Esfahbod +Date: Tue Jan 22 12:34:05 2019 +0100 + + Fix cast-align error + + If compiler doesn't inline StructAtOffset, this was an error since we + only disable cast-align at call-site. So, move the cast out. + + ../src/hb-machinery.hh: In instantiation of 'const Type& StructAtOffset(const void*, unsigned int) [with Type = unsigned int]': + ../src/hb-font.cc:146:85: required from here + ../src/hb-machinery.hh:63:12: error: cast from 'const char*' to 'const unsigned int*' increases required alignment of target type [-Werror=cast-align] + { return * reinterpret_cast ((const char *) P + offset); } + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ../src/hb-machinery.hh: In instantiation of 'Type& StructAtOffset(void*, unsigned int) [with Type = unsigned int]': + ../src/hb-font.cc:147:79: required from here + ../src/hb-machinery.hh:66:12: error: cast from 'char*' to 'unsigned int*' increases required alignment of target type [-Werror=cast-align] + { return * reinterpret_cast ((char *) P + offset); } + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + src/hb-font.cc | 8 ++++---- + src/hb-ft.cc | 6 +++--- + src/hb-ot-cmap-table.hh | 4 ++-- + src/hb-ot-font.cc | 4 ++-- + 4 files changed, 11 insertions(+), 11 deletions(-) + +commit b270cee6c5800c019aafb55e9ca9d7e92a92d3ec +Author: Behdad Esfahbod +Date: Tue Jan 22 12:29:05 2019 +0100 + + [CI] Remove gcc 4.2 bots + + We don't support that version anymore. + + .circleci/config.yml | 25 ------------------------- + 1 file changed, 25 deletions(-) + +commit 70a52d6bd8c45630ca90e945fc4d716fe9114010 +Author: Behdad Esfahbod +Date: Tue Jan 22 12:15:23 2019 +0100 + + Convert all other enum class consts to static constexpr + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1553 + + src/hb-cff-interp-common.hh | 2 +- + src/hb-iter.hh | 2 +- + src/hb-machinery.hh | 12 ++++++------ + src/hb-open-type.hh | 8 ++++---- + src/hb-set-digest.hh | 4 ++-- + src/hb-set.hh | 10 +++++----- + src/hb-vector.hh | 2 +- + 7 files changed, 20 insertions(+), 20 deletions(-) + +commit 5d4b0377b99ddc4112b8ffb2b787eac0b383081c +Author: Behdad Esfahbod +Date: Tue Jan 22 12:11:24 2019 +0100 + + Convert unsigned enum class consts to static constexpr + + Part of https://github.com/harfbuzz/harfbuzz/issues/1553 + + src/hb-aat-layout-common.hh | 6 +++--- + src/hb-aat-layout-kerx-table.hh | 2 +- + src/hb-buffer.hh | 2 +- + src/hb-open-type.hh | 2 +- + src/hb-ot-kern-table.hh | 4 ++-- + src/hb-ot-layout-common.hh | 2 +- + src/hb-ot-layout.cc | 4 ++-- + 7 files changed, 11 insertions(+), 11 deletions(-) + +commit ef00654962204ae706b276871e2b6758fbbf69e0 +Author: Behdad Esfahbod +Date: Tue Jan 22 12:08:57 2019 +0100 + + Convert tag enum class consts to static constexpr + + Part of https://github.com/harfbuzz/harfbuzz/issues/1553 + + src/hb-aat-fdsc-table.hh | 2 +- + src/hb-aat-layout-ankr-table.hh | 2 +- + src/hb-aat-layout-bsln-table.hh | 2 +- + src/hb-aat-layout-feat-table.hh | 2 +- + src/hb-aat-layout-just-table.hh | 2 +- + src/hb-aat-layout-kerx-table.hh | 2 +- + src/hb-aat-layout-lcar-table.hh | 2 +- + src/hb-aat-layout-morx-table.hh | 6 +++--- + src/hb-aat-layout-trak-table.hh | 2 +- + src/hb-aat-ltag-table.hh | 2 +- + src/hb-ot-cff1-table.hh | 2 +- + src/hb-ot-cff2-table.hh | 2 +- + src/hb-ot-cmap-table.hh | 2 +- + src/hb-ot-color-cbdt-table.hh | 4 ++-- + src/hb-ot-color-colr-table.hh | 2 +- + src/hb-ot-color-cpal-table.hh | 2 +- + src/hb-ot-color-sbix-table.hh | 2 +- + src/hb-ot-color-svg-table.hh | 2 +- + src/hb-ot-gasp-table.hh | 2 +- + src/hb-ot-glyf-table.hh | 4 ++-- + src/hb-ot-hdmx-table.hh | 2 +- + src/hb-ot-head-table.hh | 2 +- + src/hb-ot-hhea-table.hh | 4 ++-- + src/hb-ot-hmtx-table.hh | 12 ++++++------ + src/hb-ot-kern-table.hh | 6 +++--- + src/hb-ot-layout-base-table.hh | 2 +- + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-jstf-table.hh | 2 +- + src/hb-ot-math-table.hh | 2 +- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-name-table.hh | 2 +- + src/hb-ot-os2-table.hh | 2 +- + src/hb-ot-post-table.hh | 2 +- + src/hb-ot-stat-table.hh | 2 +- + src/hb-ot-var-avar-table.hh | 2 +- + src/hb-ot-var-fvar-table.hh | 2 +- + src/hb-ot-var-hvar-table.hh | 8 ++++---- + src/hb-ot-var-mvar-table.hh | 2 +- + src/hb-ot-vorg-table.hh | 2 +- + 41 files changed, 56 insertions(+), 56 deletions(-) + +commit 39e1b6d03f71ccb8f18d64dfbff64acfaf02970b +Author: Behdad Esfahbod +Date: Tue Jan 22 12:07:43 2019 +0100 + + Convert boolean enum class consts to static constexpr + + Part of https://github.com/harfbuzz/harfbuzz/issues/1553 + + src/hb-aat-layout-common.hh | 4 ++-- + src/hb-aat-layout-kerx-table.hh | 4 ++-- + src/hb-aat-layout-morx-table.hh | 8 ++++---- + src/hb-dsalgs.hh | 16 ++++++++-------- + src/hb-ot-kern-table.hh | 4 ++-- + src/hb-ot-layout.cc | 4 ++-- + 6 files changed, 20 insertions(+), 20 deletions(-) + +commit 271cb7c1c0f49c7af786daa5d5310b9f08142148 +Author: Behdad Esfahbod +Date: Tue Jan 22 12:05:35 2019 +0100 + + Make some enum constants unsigned + + src/hb-aat-layout-common.hh | 6 +++--- + src/hb-buffer.hh | 2 +- + src/hb-ot-layout.cc | 8 ++++---- + 3 files changed, 8 insertions(+), 8 deletions(-) + +commit 3d9a6e62662fb769e0f785fa7a43df806988d2a2 +Author: Behdad Esfahbod +Date: Tue Jan 22 12:02:06 2019 +0100 + + Whitespace + + src/hb-ot-layout-gsubgpos.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c81f02fd06fcbc4426c9e3255833f8d7057cc97a +Author: Behdad Esfahbod +Date: Tue Jan 22 12:00:44 2019 +0100 + + pragma GCC diagnostic error "-Wvla" + + src/hb.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ff98109455bfbf92f7633262bc570b05d15d5d01 +Author: Alfie John +Date: Tue Jan 22 19:58:36 2019 +1100 + + Fix grammar + + docs/usermanual-clusters.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e9c0f5e714cc62bcf6349b86b13e1c031f9bb764 +Author: Alfie John +Date: Tue Jan 22 00:03:02 2019 +0000 + + Grammar fix + + docs/usermanual-clusters.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 789396ed6bf2c76c1bb955e80efb43f75e3c61d2 +Author: Behdad Esfahbod +Date: Sun Jan 20 20:09:10 2019 -0500 + + Remove wrongly added files + + test/api/test-ot-extents-cff | Bin 8574336 -> 0 bytes + .../test-ot-extents-cff.dSYM/Contents/Info.plist | 20 -------------------- + .../Contents/Resources/DWARF/test-ot-extents-cff | Bin 7650053 -> 0 bytes + 3 files changed, 20 deletions(-) + +commit 380c3cffb9353083913a3bb505c2c62367613096 +Author: Behdad Esfahbod +Date: Sun Jan 20 19:51:08 2019 -0500 + + Use enum for class constant + + src/hb-cff-interp-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6d042a18e7079e07a2b2f465a6a56483a42ef189 +Author: Behdad Esfahbod +Date: Sun Jan 20 19:49:59 2019 -0500 + + [CFF] Use enum for tableTag + + src/hb-ot-cff1-table.hh | 2 +- + src/hb-ot-cff2-table.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit c1cbbb94595641f0609cc8d2dbe8415540c10f77 +Author: Behdad Esfahbod +Date: Sun Jan 20 19:47:52 2019 -0500 + + Use static constexpr for large class constants + + src/hb-map.hh | 2 +- + src/hb-set.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 30ae62779f1a68c5657ab27bc7e77496ba8a906c +Author: Khaled Hosny +Date: Mon Jan 21 16:44:48 2019 +0200 + + Regular spaces will do + + docs/usermanual-getting-started.xml | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit ed62551d67ac5bb8dbfaf3fa5eb51013157b214a +Author: Alfie John +Date: Mon Jan 21 05:00:01 2019 +0000 + + Adding leading space for code example + + docs/usermanual-getting-started.xml | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 3e332544db35ca08de767ecab01b489a9905c559 +Author: Alfie John +Date: Mon Jan 21 04:54:27 2019 +0000 + + Fix description of example + + docs/usermanual-getting-started.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2144ca9f01d01b6de386d17ada73a288372ee553 +Author: Alfie John +Date: Mon Jan 21 04:47:05 2019 +0000 + + Added option to build docs to docs + + docs/usermanual-install-harfbuzz.xml | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 21c0713a1cf4b42b5dfa8fb9bdf1c1935a481b00 +Author: Behdad Esfahbod +Date: Wed Jan 9 21:24:51 2019 -0800 + + Whitespace + + src/hb-ot-layout-gsub-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 934d3fa2a7d5d47da7030f43ea7ca7234625fc7e +Author: Behdad Esfahbod +Date: Wed Jan 9 21:00:13 2019 -0800 + + Use more iter pipelines + + src/hb-ot-layout-gpos-table.hh | 9 +++++---- + src/hb-ot-layout-gsubgpos.hh | 32 ++++++++++++++++++-------------- + 2 files changed, 23 insertions(+), 18 deletions(-) + +commit 420d8ac350590d776832dc7b353d997857cd7b45 +Author: Behdad Esfahbod +Date: Wed Jan 9 20:58:25 2019 -0800 + + [algs] Add hb_iter() + + Makes it nicer in pipelines. + + src/hb-algs.hh | 4 ++++ + src/hb-ot-layout-gsub-table.hh | 6 +++--- + 2 files changed, 7 insertions(+), 3 deletions(-) + +commit 54ec48ea20d7d7d9e62bca12265e2f26383f9bc1 +Author: Behdad Esfahbod +Date: Wed Jan 9 20:54:21 2019 -0800 + + Use iter pipelines more + + src/hb-ot-layout-gsub-table.hh | 81 +++++++++++++++++++++++------------------- + 1 file changed, 44 insertions(+), 37 deletions(-) + +commit 83cecd80d93a1e09231b8deaa6ecf8cd44875dfd +Author: Behdad Esfahbod +Date: Wed Jan 9 19:49:13 2019 -0800 + + [iter] Default projection to identity + + src/hb-algs.hh | 6 +++--- + src/hb-iter.hh | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit a699c6b17cf2d272ac445838e82db6b0017cdbd7 +Author: Behdad Esfahbod +Date: Wed Jan 9 19:42:41 2019 -0800 + + [algs] Add hb_identity + + src/hb-algs.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 463cfb426ff94b78b8e44f1c5662931b948beca7 +Author: Behdad Esfahbod +Date: Wed Jan 9 16:19:40 2019 -0800 + + Fix unused-variable warnings + + inline variables are not C++11, so mark them unused... + + src/hb-algs.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f4cbb1ee0c7e1c2911c3676936e1bb571f6b255f +Author: Behdad Esfahbod +Date: Wed Jan 9 13:28:00 2019 -0800 + + WIP + + src/hb-ot-layout-gsub-table.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 471e96e55d3366a6ad723fe88c9aa895921c048f +Author: Behdad Esfahbod +Date: Wed Jan 9 12:42:01 2019 -0800 + + [iter] Use forwarding references + + src/hb-iter.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 528ea66f24c326d7361663a145bd9b8081c7c5c2 +Author: Behdad Esfahbod +Date: Wed Jan 9 12:36:17 2019 -0800 + + [algs] Fix hb_first() / hb_second() + + src/hb-algs.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 343f5a4bfcf528ed8f5239fae9ddfca64b998fde +Author: Behdad Esfahbod +Date: Wed Jan 9 12:35:45 2019 -0800 + + [iter] Misc fixes to get piping almost work + + src/hb-iter.hh | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +commit 7cedf7f64c2be0d16771dba73fd370325f7b66a1 +Author: Behdad Esfahbod +Date: Wed Jan 9 12:22:14 2019 -0800 + + Change hb_first() and hb_second() to function objects + + src/hb-algs.hh | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit f35568d603df6409e4f867acf2f58794560f6649 +Author: Behdad Esfahbod +Date: Wed Jan 9 11:32:33 2019 -0800 + + [iter] Add hb_filter() + + Untested. + + src/hb-iter.hh | 39 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 39 insertions(+) + +commit 1733e4702c4f4f8058e69500008d050cf9df0318 +Author: Behdad Esfahbod +Date: Wed Jan 9 11:15:49 2019 -0800 + + [iter] Add hb_map() + + Untested. + + src/hb-iter.hh | 43 ++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 42 insertions(+), 1 deletion(-) + +commit f7fcc476418099e2b89c52068ac81280a95bf76f +Author: Behdad Esfahbod +Date: Wed Jan 9 11:00:32 2019 -0800 + + [iter] Make hb_zip() take const references + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ede1a71b31f49a6dc247ac0491b78508346e9932 +Author: Behdad Esfahbod +Date: Wed Jan 9 10:45:53 2019 -0800 + + Minor rename + + src/hb-ot-layout-gsub-table.hh | 12 ++++++------ + src/hb-ot-layout-gsubgpos.hh | 6 +++--- + 2 files changed, 9 insertions(+), 9 deletions(-) + +commit 93551669c5a41ee11a156ef60a9f80dc328430b9 +Author: Behdad Esfahbod +Date: Wed Jan 9 10:18:49 2019 -0800 + + Remove unused Coverage::iter_t::get_coverage() + + src/hb-ot-layout-common.hh | 11 ----------- + 1 file changed, 11 deletions(-) + +commit af2067e87b06995a9cc9154baab2a5bc4f3f6955 +Author: Behdad Esfahbod +Date: Wed Jan 9 10:17:33 2019 -0800 + + Use hb_zip() moooore + + src/hb-ot-layout-gsub-table.hh | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit 0d1fdf939de13bb1994bc8f70da7f9f511b7e5be +Author: Behdad Esfahbod +Date: Wed Jan 9 10:06:48 2019 -0800 + + Use hb_zip() some mooore + + src/hb-ot-layout-gpos-table.hh | 13 +++------ + src/hb-ot-layout-gsub-table.hh | 64 +++++++++++------------------------------- + 2 files changed, 21 insertions(+), 56 deletions(-) + +commit af6c1902356c937bc47ad8c37ab6f037b5810b67 +Author: Behdad Esfahbod +Date: Wed Jan 9 10:01:28 2019 -0800 + + Use hb_zip() some moore + + src/hb-ot-layout-gsubgpos.hh | 52 ++++++++++++-------------------------------- + 1 file changed, 14 insertions(+), 38 deletions(-) + +commit 83ad0b6d0f3e7656f78611e89d7ebb939cd8e713 +Author: Behdad Esfahbod +Date: Wed Jan 9 09:57:36 2019 -0800 + + Use hb_zip() some more + + src/hb-ot-layout-gsub-table.hh | 36 ++++++++++-------------------------- + 1 file changed, 10 insertions(+), 26 deletions(-) + +commit f0dd0656b8d2038ae6aa8d0a39d17130ddc8f16f +Author: Behdad Esfahbod +Date: Wed Jan 9 09:52:10 2019 -0800 + + Use hb_zip() some + + src/hb-ot-layout-gsub-table.hh | 20 +++++--------------- + 1 file changed, 5 insertions(+), 15 deletions(-) + +commit 200cdb721bfb125cd462437ccbcc40554560c4d0 +Author: Behdad Esfahbod +Date: Wed Jan 9 09:49:12 2019 -0800 + + [iter] Rename hb_zip_t to hb_zip_iter_t + + src/hb-iter.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 3290c181c17db33991cd1b79eca49f70d2601ce0 +Author: Behdad Esfahbod +Date: Wed Jan 9 09:08:15 2019 -0800 + + [algs] Whitespace + + src/hb-algs.hh | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit 014c50292b471de0167b65fdc0eb446245438b84 +Author: Behdad Esfahbod +Date: Wed Jan 9 09:07:01 2019 -0800 + + [iter] Move code + + src/hb-iter.hh | 47 ++++++++++++++++++++++++++++------------------- + 1 file changed, 28 insertions(+), 19 deletions(-) + +commit 6e3ad650d1b864742084c6254d020734f09cb396 +Author: Behdad Esfahbod +Date: Wed Jan 9 09:05:01 2019 -0800 + + Rename hb-dsalgs to hb-algs + + src/Makefile.sources | 2 +- + src/{hb-dsalgs.hh => hb-algs.hh} | 6 +++--- + src/hb-array.hh | 2 +- + src/hb-debug.hh | 2 +- + src/hb-iter.hh | 2 +- + src/hb.hh | 8 ++++---- + 6 files changed, 11 insertions(+), 11 deletions(-) + +commit f27607580e4d13e8ddf721df971a7d5062c54fb2 +Author: Behdad Esfahbod +Date: Wed Jan 9 09:03:21 2019 -0800 + + [algs] Add hb_first() and hb_second() + + src/hb-dsalgs.hh | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit a7de144df342f30b3d6f9e61c3fe3d1348ab222d +Author: Behdad Esfahbod +Date: Wed Jan 9 08:39:25 2019 -0800 + + Implement uniform map interface + + Coverage, ClassDef, hb_set_t, and hb_map_t implement. + + src/hb-map.hh | 13 +++++++------ + src/hb-ot-layout-common.hh | 14 ++++++++++++-- + src/hb-set.hh | 17 ++++++++++++----- + 3 files changed, 31 insertions(+), 13 deletions(-) + +commit 7987095e64e52b509661828aeadabe0b27bba0d0 +Author: Behdad Esfahbod +Date: Wed Jan 9 01:02:38 2019 -0800 + + [meta] Remove hb_enable_if_t + + It was only used for C++<11 which does not allow default parameters + in function templates. Looks like we cannot support <11 anyway, so, + start cleaning up. + + src/hb-iter.hh | 18 +++++++++--------- + src/hb-meta.hh | 1 - + src/hb-open-type.hh | 14 ++++++-------- + src/hb-ot-layout-common.hh | 21 +++++++++------------ + src/test-iter.cc | 12 ++++++------ + 5 files changed, 30 insertions(+), 36 deletions(-) + +commit 15a69284369ce739e79bf288a55c4c3010313144 +Author: Behdad Esfahbod +Date: Wed Jan 9 00:36:47 2019 -0800 + + [iter] Implement operator-> unconditionally + + The right condition to check for would have been "is_struct", which + we don't have. + + src/hb-iter.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 8f52a827e7d93abf3ef6159fd00f7c85c6d46793 +Author: Behdad Esfahbod +Date: Wed Jan 9 00:36:26 2019 -0800 + + Allow rvalues in hb_addressof() + + src/hb-dsalgs.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a4ea0d368015b91df8d4c164a8838c45943562dc +Author: Behdad Esfahbod +Date: Wed Jan 9 00:32:11 2019 -0800 + + [iter] Change from const_iter_t/iter_t to iter_t/writer_t + + src/hb-open-type.hh | 26 ++++++++++++-------------- + src/hb-vector.hh | 13 ++++++------- + 2 files changed, 18 insertions(+), 21 deletions(-) + +commit 7798e4fcc34edca5c7d5d2fe7abd09a0540f0fea +Author: Behdad Esfahbod +Date: Wed Jan 9 00:25:53 2019 -0800 + + [iter] Change Coverage iterator to only return glyph-id + + src/hb-ot-layout-common.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 84e5d002290eb2f58392743bc841fa7def7fc96d +Author: Behdad Esfahbod +Date: Tue Jan 8 23:57:16 2019 -0800 + + [iter] Add hb_zip() + + src/hb-iter.hh | 34 ++++++++++++++++++++++++++++++++++ + src/test-iter.cc | 2 ++ + 2 files changed, 36 insertions(+) + +commit 636786ecaf18c52d4c337d009434b22e868ab796 +Author: Behdad Esfahbod +Date: Tue Jan 8 23:48:35 2019 -0800 + + [iter] Rename __item_type__ to __item_t__ + + src/hb-array.hh | 2 +- + src/hb-iter.hh | 4 ++-- + src/hb-ot-layout-common.hh | 4 ++-- + src/hb-set.hh | 2 +- + src/test-iter.cc | 2 +- + 5 files changed, 7 insertions(+), 7 deletions(-) + +commit 6caf76f4a8b5e232a87b84dc5e357dddef63d00b +Author: Behdad Esfahbod +Date: Tue Jan 8 23:28:05 2019 -0800 + + Tighten Coverage iteration + + src/hb-ot-layout-common.hh | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit ff3a7ce1e75b020c2d536200beb5610ed054e097 +Author: Behdad Esfahbod +Date: Tue Jan 8 23:20:23 2019 -0800 + + [subset] Minor + + src/hb-ot-layout-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 42bf80e578a1b7f4023b3edeea7de103a3c7d7be +Author: Behdad Esfahbod +Date: Tue Jan 8 19:13:17 2019 -0800 + + [iter] More semicolon + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f78f837ef17591144d6b22ae3cc71c49458253ff +Author: Behdad Esfahbod +Date: Tue Jan 8 16:38:08 2019 -0800 + + [iter] Use aliasing using for types + + Fix ambiguity of hb_sorted_array_t::item_t with gcc. No idea if that's a gcc bug + or what spec requires, but using aliasing using seems to fix it. It probably breaks + our non-C++11 bots, in which case I have to condition the change. Testing. + + src/hb-iter.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3fc03e42ce73021c4573729a637d19346f7e5f44 +Author: Behdad Esfahbod +Date: Tue Jan 8 16:33:31 2019 -0800 + + [iter] Use static_assert with hb_is_random_access_iterator() + + Both, checks constexpr'ness, and fixes build with cra**y implementations + of assert() macro: + + test-iter.cc:108:11: error: too many arguments provided to function-like macro invocation + assert (hb_is_random_access_iterator (array_iter_t)); + ^ + ./hb-iter.hh:186:42: note: expanded from macro 'hb_is_random_access_iterator' + hb_is_random_access_iterator_of (Iter, typename Iter::item_t) + ^ + /usr/include/x86_64-linux-gnu/sys/cdefs.h:89:9: note: macro '__STRING' defined here + \#define __STRING(x) #x + ^ + test-iter.cc:108:3: error: use of undeclared identifier '__STRING' + assert (hb_is_random_access_iterator (array_iter_t)); + ^ + /usr/include/assert.h:91:21: note: expanded from macro 'assert' + : __assert_fail (__STRING(expr), __FILE__, __LINE__, __ASSERT_FUNCTION)) + ^ + + src/test-iter.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6af9c5f18eaf51f2d7e564d23d9b09219af9d700 +Author: Behdad Esfahbod +Date: Tue Jan 8 16:27:37 2019 -0800 + + [iter] Remove stray semicolons + + src/hb-iter.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 74ca7b580c284d6fe3bf7067a19a2095102e72d1 +Author: Behdad Esfahbod +Date: Tue Jan 8 13:48:42 2019 -0800 + + [OT] Implement operator[] for Coverage and ClassDef + + src/hb-ot-layout-common.hh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 6c548b6657d419e013969f9a456418e46bef0b30 +Author: Behdad Esfahbod +Date: Tue Jan 8 13:43:49 2019 -0800 + + [iter] Add TODO + + src/hb-iter.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 362d4e7cc324bf99b087aa34a4fae6898e50674f +Author: Behdad Esfahbod +Date: Tue Jan 8 13:41:30 2019 -0800 + + [iter] Implement for OT::ArrayOf / OT::SortedArrayOf + + src/hb-open-type.hh | 36 ++++++++++++++++++++++++------------ + 1 file changed, 24 insertions(+), 12 deletions(-) + +commit 2f837a365c0986c2f925624d9c00ede8cd9e7669 +Author: Behdad Esfahbod +Date: Tue Jan 8 13:05:01 2019 -0800 + + [SortedArrayOf] Fix sub_array() return type + + src/hb-open-type.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 54c30e949e7d0a80c19cb8a12c300d62425683a9 +Author: Behdad Esfahbod +Date: Tue Jan 8 13:00:06 2019 -0800 + + [iter] Constrain hb_fill() and hb_copy() + + src/hb-iter.hh | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit dc0a98cbe7be25a38220eda19ee06b19bf2d130d +Author: Behdad Esfahbod +Date: Tue Jan 8 12:57:01 2019 -0800 + + [iter] Add TODO + + src/hb-iter.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit 2658e40ffb66dba6e2e5525d6ee4792fe1ea1dd1 +Author: Behdad Esfahbod +Date: Tue Jan 8 12:53:02 2019 -0800 + + [iter] Add hb_is_random_access_iterator() + + src/hb-iter.hh | 10 +++++++--- + src/test-iter.cc | 2 ++ + 2 files changed, 9 insertions(+), 3 deletions(-) + +commit 445364d80a06007de5ac4c0fca9bb0b846f25c9c +Author: Behdad Esfahbod +Date: Tue Jan 8 12:42:15 2019 -0800 + + [iter] Rename hb_is_[sorted_]iterator() -> hb_is_[sorted_]iterator_of() + + src/hb-iter.hh | 15 +++++++++------ + src/hb-open-type.hh | 4 ++-- + src/hb-ot-layout-common.hh | 6 +++--- + src/test-iter.cc | 2 +- + 4 files changed, 15 insertions(+), 12 deletions(-) + +commit a6c013b1bf1f828f1eea7db801f2efb9a1486773 +Author: Behdad Esfahbod +Date: Tue Jan 8 14:27:51 2019 -0500 + + [meta] Add hb_declval() macro + + src/hb-iter.hh | 2 +- + src/hb-meta.hh | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit adc5910a63f209e35133c59f4466443844c9a18a +Author: Behdad Esfahbod +Date: Tue Jan 8 14:26:41 2019 -0500 + + [iter] Syntax + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ca6adcd1ad35932aeac4d46a191809b010636b3d +Author: Behdad Esfahbod +Date: Tue Jan 8 14:23:12 2019 -0500 + + [iter] Test hb_is_iterable / hb_is_iterator + + src/test-iter.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 8237809f065f41653a12c95885e3b76409c42f36 +Author: Behdad Esfahbod +Date: Mon Jan 7 22:00:45 2019 -0500 + + [serialize] Make SortedArrayOf:;serialize() take sorted-iterator + + src/hb-open-type.hh | 17 +++++++++++++++++ + src/hb-ot-cmap-table.hh | 18 +++++++++--------- + 2 files changed, 26 insertions(+), 9 deletions(-) + +commit 47333c8a304c6f57f848b5f60eea8ec85ffe2b33 +Author: Behdad Esfahbod +Date: Mon Jan 7 21:38:49 2019 -0500 + + [iter] Fix operator-> + + src/hb-iter.hh | 3 ++- + src/test-iter.cc | 3 +++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 177a8af380738e5be598952adbf275503bb3f5bc +Author: Behdad Esfahbod +Date: Mon Jan 7 20:20:44 2019 -0500 + + [array] SFINAE fun + + src/hb-array.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 8414f167879c1af8ce5c80a15ba1aec2f7e436a6 +Author: Behdad Esfahbod +Date: Mon Jan 7 19:41:52 2019 -0500 + + [meta] Rename + + src/hb-meta.hh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 8e0a58e1b3f338098d2384f2e6e0b4ad08d6c042 +Author: Behdad Esfahbod +Date: Mon Jan 7 19:03:53 2019 -0500 + + [array] Remove construction that was removing constness + + src/hb-array.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit 85969e357a34691cc42c88490fc7e341175783dd +Author: Behdad Esfahbod +Date: Mon Jan 7 18:59:26 2019 -0500 + + [iter] Fix test + + src/test-iter.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit da4996183693b4acecf245c58b58d6040d92a1bf +Author: Behdad Esfahbod +Date: Mon Jan 7 18:36:14 2019 -0500 + + [iter] Remove comment + + src/hb-iter.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 815cde9fa3465828030ca1ed4f32ca1df72c1f37 +Author: Behdad Esfahbod +Date: Mon Jan 7 18:33:04 2019 -0500 + + [iter] Use is_sorted_iterator + + src/hb-aat-map.hh | 2 +- + src/hb-array.hh | 4 +++ + src/hb-meta.hh | 23 +++++++++------- + src/hb-ot-layout-common.hh | 8 +++--- + src/hb-ot-layout-gsub-table.hh | 42 +++++++++++++++--------------- + src/hb-ot-map.hh | 2 +- + src/hb-ot-shape-complex-arabic-fallback.hh | 4 +-- + src/hb-set.hh | 2 +- + src/hb-vector.hh | 32 ++++++++++++++--------- + 9 files changed, 66 insertions(+), 53 deletions(-) + +commit ed4336680d3fc080f99c7dd67db48c55bcd7a020 +Author: Behdad Esfahbod +Date: Mon Jan 7 17:24:23 2019 -0500 + + [iter] Handhold hb_is_iterator() type deduction + + by partial-instantiating on Iter. + + src/hb-iter.hh | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +commit cb5011d364904452a625cfc0485f5a713f472d07 +Author: Behdad Esfahbod +Date: Fri Jan 4 11:22:32 2019 -0500 + + Revert "[iter] Add hb_iter_of_t<>" + + This reverts commit d6cbe96e2fc7bc8f1c10e631b52b1ef31ff9a6f5. + + Isn't useful, as duplicate inheritance of same type results in ambiguity + errors... + + src/hb-iter.hh | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +commit c132cda9d98286f002d2f5b27d1d00bf80b42a9c +Author: Behdad Esfahbod +Date: Wed Jan 2 17:00:01 2019 -0500 + + [iter] Fix warnings + + src/hb-iter.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit c9d8a07e30d05b870c3d2374853adba019601b02 +Author: Behdad Esfahbod +Date: Wed Jan 2 16:43:52 2019 -0500 + + [iter] Add hb_iter_of_t<> + + src/hb-iter.hh | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit b5d6fe1a452c72dd47d20c03a563321771330acc +Author: Behdad Esfahbod +Date: Wed Jan 2 16:20:40 2019 -0500 + + [iter] Remove hb_sorted_iter_t + + Not enforcing it using type hierarchy. + + src/hb-array.hh | 6 ++++-- + src/hb-iter.hh | 26 ++++---------------------- + src/hb-ot-layout-common.hh | 3 ++- + src/hb-set.hh | 3 ++- + 4 files changed, 12 insertions(+), 26 deletions(-) + +commit 255085bd599cb108779d467690b372263f304dcb +Author: Behdad Esfahbod +Date: Wed Jan 2 16:14:00 2019 -0500 + + [iter] Const correctness + + src/hb-open-type.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 415f3f4320c80d47e03fe9594a917fb2964b1144 +Author: Behdad Esfahbod +Date: Mon Dec 31 13:37:13 2018 -0500 + + Add operator= to IntType, commented out + + https://github.com/harfbuzz/harfbuzz/pull/1510 + + src/hb-open-type.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 183be8f452862aaf0cdedb28d54ec114d67745b2 +Author: Behdad Esfahbod +Date: Sun Dec 30 20:58:25 2018 -0500 + + [iter] Minor + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6cd96ba1aca99b6eb31f8402d02c565dd4e96e03 +Author: Behdad Esfahbod +Date: Sun Dec 30 20:51:31 2018 -0500 + + [iter] Make is_random_access_iterator a constant + + We cannot rely on constexpr functions... + + src/hb-array.hh | 2 +- + src/hb-iter.hh | 11 ++++------- + src/test-iter.cc | 2 +- + 3 files changed, 6 insertions(+), 9 deletions(-) + +commit a685bfe8fc93ac1886a708687ea6fa7aa0b7c8c4 +Author: Behdad Esfahbod +Date: Sun Dec 30 20:24:21 2018 -0500 + + Separate GlyphID from HBUINT16 + + For stricter enforcement. + + src/hb-dsalgs.hh | 8 ++++---- + src/hb-open-type.hh | 2 +- + src/hb-ot-layout-common.hh | 2 +- + src/hb-ot-shape-complex-arabic-fallback.hh | 8 ++++++-- + 4 files changed, 12 insertions(+), 8 deletions(-) + +commit 8ac64d00907756333d5917db4b627619420f9260 +Author: Behdad Esfahbod +Date: Sun Dec 30 20:06:12 2018 -0500 + + [iter] Fix sorted_iter iter class + + src/hb-array.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 93615b9598f6b5e514384327b30acfd6bd8cfcfb +Author: Behdad Esfahbod +Date: Sun Dec 30 19:12:06 2018 -0500 + + [iter/meta] Add hb_is_sorted_iterator() + + src/hb-iter.hh | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +commit 92f25db1e86c7b79962a2eb735cd3596c302f71f +Author: Behdad Esfahbod +Date: Sun Dec 30 19:10:26 2018 -0500 + + [iter] Remove stale comment + + src/hb-iter.hh | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit 40c24fd4a623c5f570e657f22fb4e88cba48b02b +Author: Behdad Esfahbod +Date: Sun Dec 30 19:06:47 2018 -0500 + + [iter] Port Coverage towards iter_t instead of array_t specifics + + src/hb-ot-layout-common.hh | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit d552b6818c21efe9eae8b9cd72d5199dadd3724f +Author: Behdad Esfahbod +Date: Sun Dec 30 18:54:07 2018 -0500 + + [meta] Move typename around + + We'll see if bots like. + + src/hb-atomic.hh | 2 +- + src/hb-blob.hh | 2 +- + src/hb-iter.hh | 2 +- + src/hb-meta.hh | 6 +++--- + src/hb-null.hh | 6 +++--- + 5 files changed, 9 insertions(+), 9 deletions(-) + +commit f64ea8fc65b0dacc2ac3b1de97c92488b6e1b6fa +Author: Behdad Esfahbod +Date: Sun Dec 30 18:49:34 2018 -0500 + + [meta] Move code around + + src/hb-atomic.hh | 1 + + src/hb-meta.hh | 10 ++++++++++ + src/hb.hh | 14 +------------- + 3 files changed, 12 insertions(+), 13 deletions(-) + +commit aa2ab4f0617c50de2501722205d3d0eaaf808ff4 +Author: Behdad Esfahbod +Date: Sun Dec 30 18:47:47 2018 -0500 + + [iter] WHitespace + + src/hb-iter.hh | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +commit 851fbb23ea552bc639269670949a9937236d96d5 +Author: Behdad Esfahbod +Date: Sun Dec 30 18:45:50 2018 -0500 + + [iter] Port Coverage::serialize to hb_is_iterator + + src/hb-open-type.hh | 2 +- + src/hb-ot-layout-common.hh | 18 ++++++++++++------ + 2 files changed, 13 insertions(+), 7 deletions(-) + +commit 06a44e2e537303ab8ed1fb761bf3885eb433a718 +Author: Behdad Esfahbod +Date: Sun Dec 30 18:42:14 2018 -0500 + + [iter/meta] Match hb_is_iterator<> using SFINAE + + By specifying Item type, which is desirable. + + src/hb-iter.hh | 28 +++++++++++----------------- + src/hb-open-type.hh | 2 +- + 2 files changed, 12 insertions(+), 18 deletions(-) + +commit bcb913efb484e971d8a76ac1a897a1724bdad58b +Author: Behdad Esfahbod +Date: Sun Dec 30 17:54:24 2018 -0500 + + Minor + + src/hb-ot-layout-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fa1ae3d465fd627ea99c5eb597b85cffe04c1e34 +Author: Behdad Esfahbod +Date: Sun Dec 30 12:01:13 2018 -0500 + + Use C++11 when available + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dc0f98298eca6520efd6e05d34f9aa7847979203 +Author: Behdad Esfahbod +Date: Sun Dec 30 11:22:16 2018 -0500 + + [ci] Remove unused config for gcc 4.2 + + [skip ci] + + .circleci/config.yml | 25 ------------------------- + 1 file changed, 25 deletions(-) + +commit eaa9023634282bed5955a068f9f92b8ef1733c39 +Author: Behdad Esfahbod +Date: Sun Dec 30 11:16:14 2018 -0500 + + [ci] Disable other gcc 4.2 bot + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 859a880b083c67e767162c394e08c46367078b0b +Author: Behdad Esfahbod +Date: Sun Dec 30 02:11:03 2018 -0500 + + [iter] Add back operator + + + Too ugly to remove.. + + src/hb-iter.hh | 6 +++--- + src/test-iter.cc | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 076faf7c1803238f135034579935e6b8f10c774c +Author: Behdad Esfahbod +Date: Sun Dec 30 01:40:08 2018 -0500 + + [iter] Disable operator + + + To see if it makes bots happy... This is frustrating. + + src/hb-iter.hh | 5 +++-- + src/test-iter.cc | 5 +++-- + 2 files changed, 6 insertions(+), 4 deletions(-) + +commit a46874f1ab4b2470784c9ef688c7a8e00592165f +Author: Behdad Esfahbod +Date: Fri Dec 28 21:23:26 2018 -0500 + + [iter] Revert back uses of C++11 auto type deduction + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 26 +++++++++++++------------- + src/hb-ot-layout-gsubgpos.hh | 8 ++++---- + 3 files changed, 18 insertions(+), 18 deletions(-) + +commit 0828db8444d4b6922469770ca1b432356512db18 +Author: Behdad Esfahbod +Date: Fri Dec 28 21:22:26 2018 -0500 + + [iter] Rename + + src/hb-ot-layout-common.hh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 037f735efdc77ae9c8a24527da5d9805163180a6 +Author: Behdad Esfahbod +Date: Fri Dec 28 21:09:15 2018 -0500 + + [iter] Remove friend operator +, hoping to fix some bots + + src/hb-iter.hh | 1 - + src/test-iter.cc | 1 - + 2 files changed, 2 deletions(-) + +commit cb27918d0a104c5f3884013a7dc7c99f3e3e3378 +Author: Behdad Esfahbod +Date: Fri Dec 28 20:16:44 2018 -0500 + + Use Null() instead of declval(), hoping to fix some bots + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3d22900f6251b4386d8a7dfd7e2118dd75f12763 +Author: Behdad Esfahbod +Date: Fri Dec 28 20:01:57 2018 -0500 + + [meta] Don't use template default arguments for functions + + That's a C++11 extension apparently... + + src/hb-meta.hh | 2 +- + src/hb-open-type.hh | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit b89d20dd9f7e0b4fad3f6c8803c73d2ace34c340 +Author: Behdad Esfahbod +Date: Fri Dec 28 16:41:04 2018 -0500 + + [meta] Fix unused-function-template warning + + src/hb-meta.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit df138da2e67ce72bec13e656e3146b21b4600c14 +Author: Behdad Esfahbod +Date: Fri Dec 28 16:29:48 2018 -0500 + + [iter/meta] Implement is_iterator + + Removes use of auto type deduction again, which was not supported on many bots. + + src/hb-iter.hh | 42 +++++++++++++++++++++++++++++++++++++++--- + src/hb-meta.hh | 4 ++-- + src/hb-open-type.hh | 13 +++++++------ + 3 files changed, 48 insertions(+), 11 deletions(-) + +commit 8570da1d741bbe6becbfd27d7bce3b2a6b78dae7 +Author: Behdad Esfahbod +Date: Fri Dec 28 14:40:30 2018 -0500 + + [meta] Minor + + src/hb-iter.hh | 4 ++-- + src/hb-null.hh | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 442f4a58919b8e997daf5465b948975ecbe7e3df +Author: Behdad Esfahbod +Date: Fri Dec 28 14:34:00 2018 -0500 + + [meta] Move more code here + + src/hb-dsalgs.hh | 20 -------------------- + src/hb-meta.hh | 31 +++++++++++++++++++++++++++++++ + src/hb-open-type.hh | 6 +----- + 3 files changed, 32 insertions(+), 25 deletions(-) + +commit 8c6cbbdfa326d6edee4a4b5f33971ad1ecfbcd2c +Author: Behdad Esfahbod +Date: Fri Dec 28 14:29:09 2018 -0500 + + [iter/meta] Add hb_is_iterable + + src/hb-iter.hh | 26 +++++++++++++++++++++++--- + src/hb-meta.hh | 15 ++++++++++----- + src/hb-null.hh | 17 ++++++++--------- + src/hb-open-type.hh | 6 ++++-- + src/hb.hh | 2 +- + 5 files changed, 46 insertions(+), 20 deletions(-) + +commit 576d5e242028b492c2a8bbe56edeaa484b8a886a +Author: Behdad Esfahbod +Date: Thu Dec 27 18:39:39 2018 -0500 + + Don't use delegating constructors + + Not all C++11 features are created equal when it comes to support... + + src/hb-dsalgs.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e32bf3976686c01fe9804086a8ca48aa0069b392 +Author: Behdad Esfahbod +Date: Thu Dec 27 17:38:26 2018 -0500 + + [meta] Add enable_if + + src/hb-meta.hh | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit e76a3cae0fd8cb1e716f4e55f4abbb57af49b10f +Author: Behdad Esfahbod +Date: Thu Dec 27 17:23:12 2018 -0500 + + Add hb-meta.hh for meta-programming + + src/Makefile.sources | 1 + + src/hb-dsalgs.hh | 4 ---- + src/hb-iter.hh | 1 + + src/hb-meta.hh | 40 ++++++++++++++++++++++++++++++++++++++++ + src/hb.hh | 3 ++- + 5 files changed, 44 insertions(+), 5 deletions(-) + +commit 5ec11ce13a6bf4479205f3cf2a9cc96342df7f60 +Author: Behdad Esfahbod +Date: Thu Dec 27 17:17:28 2018 -0500 + + [iter] Clarify readonly vs lvalue iterators + + lvalue iterators must declare __item_type__ as a reference. + + src/hb-array.hh | 6 +++--- + src/hb-iter.hh | 11 ++++++----- + src/hb-set.hh | 6 +++--- + src/test-iter.cc | 6 ++++-- + 4 files changed, 16 insertions(+), 13 deletions(-) + +commit 2cbf5bf3a959402a7f69b328469232b7050bae01 +Author: Behdad Esfahbod +Date: Thu Dec 27 16:55:18 2018 -0500 + + [iter] Test OT::Coverage iter + + src/hb-dsalgs.hh | 6 +++++- + src/hb-ot-layout-common.hh | 6 +++--- + src/test-iter.cc | 9 ++++++++- + 3 files changed, 16 insertions(+), 5 deletions(-) + +commit fd75d29f0f317c4fb36b093c8fabf2a7dcd28042 +Author: Behdad Esfahbod +Date: Thu Dec 27 16:29:22 2018 -0500 + + [iter] Streamline vector iterators + + src/hb-vector.hh | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +commit 570473a345a73ab05ea8e8acf88cfba9b90a81a4 +Author: Behdad Esfahbod +Date: Thu Dec 27 13:29:51 2018 -0500 + + [iter] Make hb_sorted_array_t work as iter + + Ugly, but does the job. + + src/hb-array.hh | 6 ++++-- + src/hb-iter.hh | 18 ++++++++++++++++++ + src/test-iter.cc | 2 ++ + 3 files changed, 24 insertions(+), 2 deletions(-) + +commit d6024794fb072647d8233b184c25da5def26c435 +Author: Behdad Esfahbod +Date: Thu Dec 27 09:56:41 2018 -0500 + + Change hb_void_t implementation + + src/hb-dsalgs.hh | 3 +-- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos.hh | 12 ++++++------ + 3 files changed, 8 insertions(+), 9 deletions(-) + +commit cde31988c26043a47e4599bf7e0d88ea67fc333f +Author: Behdad Esfahbod +Date: Thu Dec 27 09:39:34 2018 -0500 + + [iter] Mark Coverage iterator sorted + + src/hb-ot-layout-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 49161d411f30d06bc920f4153f5925944895cdbc +Author: Behdad Esfahbod +Date: Wed Dec 26 22:50:33 2018 -0500 + + [subset] Take iterator in ArrayOf serialize + + Still not satisfied with how I can enforce iterators only, but + seems to work for now. + + src/hb-open-type.hh | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit e16884248f80c52cd29e39a9b27b15422d76b0f1 +Author: Behdad Esfahbod +Date: Wed Dec 26 22:27:23 2018 -0500 + + [iter] Port Coverage iterator to hb_iter_t + + src/hb-ot-layout-common.hh | 12 +++++++++--- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 26 +++++++++++++------------- + src/hb-ot-layout-gsubgpos.hh | 8 ++++---- + 4 files changed, 27 insertions(+), 21 deletions(-) + +commit c68bca0f953f5b7b7e15780f65a8e3da24917800 +Author: Behdad Esfahbod +Date: Wed Dec 26 22:21:58 2018 -0500 + + Add hb_pair_t<> and hb_pair() + + src/hb-dsalgs.hh | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit 8303a9b011eb2ab710371b9bd7d75693c7639bc1 +Author: Behdad Esfahbod +Date: Wed Dec 26 22:08:54 2018 -0500 + + [Coverage] Ensure increasing coverage in iteration + + src/hb-ot-layout-common.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 50cd26d3941156daefb1d9ba7f514049eed04b16 +Author: Behdad Esfahbod +Date: Wed Dec 26 22:05:25 2018 -0500 + + [Coverage] Mark iterator methods const + + src/hb-ot-layout-common.hh | 25 ++++++++++++------------- + 1 file changed, 12 insertions(+), 13 deletions(-) + +commit 9df1a6eba77e8b7319fc7724e41ceaeda70c2590 +Author: Behdad Esfahbod +Date: Wed Dec 26 20:28:41 2018 -0500 + + [iter] Use operator bool in a few places + + src/hb-ot-layout-common.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 7788ac14a408e038fae9da4299fad69158c7b465 +Author: Behdad Esfahbod +Date: Wed Dec 26 20:06:10 2018 -0500 + + [iter] Remove redundant methods + + src/hb-iter.hh | 44 +++++++++++++++++--------------------------- + 1 file changed, 17 insertions(+), 27 deletions(-) + +commit 3dea9affdaa063c01d67d6697df1f16c62f55c9a +Author: Behdad Esfahbod +Date: Wed Dec 26 19:56:37 2018 -0500 + + [iter] Test default-constructability + + src/test-iter.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 743ff09368f223c56beeda9b72b0520766130322 +Author: Behdad Esfahbod +Date: Wed Dec 26 19:54:52 2018 -0500 + + [iter] Implement friend opeator + (int, iter) + + src/hb-iter.hh | 1 + + src/test-iter.cc | 1 + + 2 files changed, 2 insertions(+) + +commit 6dc4a1c9b1f6aa38bca094d251154f9e51049d4d +Author: Behdad Esfahbod +Date: Wed Dec 26 19:49:13 2018 -0500 + + [iter] Remove const_iter + + src/hb-iter.hh | 2 -- + src/hb-set.hh | 14 ++++++-------- + src/hb-vector.hh | 6 +++--- + 3 files changed, 9 insertions(+), 13 deletions(-) + +commit d12b80c05a2673c4e4bf2337e2cd4f3100e9f88b +Author: Behdad Esfahbod +Date: Wed Dec 26 19:15:21 2018 -0500 + + [ci] Disable macos-llvm-gcc-4.2 again + + Not C++11. + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f2b56af3ef721ce3961bea7d2ee8b6dba6f3fbf2 +Author: Behdad Esfahbod +Date: Wed Dec 26 19:14:39 2018 -0500 + + [iter] Remove hack for older compilers + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2ea79e0340c01d58ebeeaab9d31ffdd64250a24b +Author: Behdad Esfahbod +Date: Wed Dec 26 19:01:46 2018 -0500 + + [iter] Minor + + src/test-iter.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fb053b633351afe2012ece0874a8ac15d504a15c +Author: Behdad Esfahbod +Date: Wed Dec 26 19:01:30 2018 -0500 + + [iter] Rename random_access() to constexpr is_random_access() + + src/hb-iter.hh | 4 ++-- + src/test-iter.cc | 2 ++ + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit 2790aad28ce58acf0077e02921332120325edb4c +Author: Behdad Esfahbod +Date: Wed Dec 26 18:58:42 2018 -0500 + + [iter] Add operator -> + + src/hb-iter.hh | 2 ++ + src/hb.hh | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit d3976b7e63559b87ef34abc62acf5033f3369197 +Author: Behdad Esfahbod +Date: Wed Dec 26 18:54:27 2018 -0500 + + [iter] Make them work, mostly + + src/hb-iter.hh | 11 ++++++++--- + src/hb-set.hh | 18 ++++++++++-------- + src/test-iter.cc | 25 +++++++++++++++++++++++++ + 3 files changed, 43 insertions(+), 11 deletions(-) + +commit 959bb58bdda8e78690789441e07cf22a99113c53 +Author: Behdad Esfahbod +Date: Wed Dec 26 18:54:15 2018 -0500 + + [vector] Add iterator + + src/hb-vector.hh | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 6fc6a141e6d68955310d15c91f6e3d061f7221fb +Author: Behdad Esfahbod +Date: Sun Jan 20 20:09:10 2019 -0500 + + Remove wrongly added files + + test/api/test-ot-extents-cff | Bin 8574336 -> 0 bytes + .../test-ot-extents-cff.dSYM/Contents/Info.plist | 20 -------------------- + .../Contents/Resources/DWARF/test-ot-extents-cff | Bin 7650053 -> 0 bytes + 3 files changed, 20 deletions(-) + +commit dd7c628ed122f858be9ad08c184c87ff31f2ec2d +Author: Behdad Esfahbod +Date: Sun Jan 20 19:51:08 2019 -0500 + + Use enum for class constant + + src/hb-cff-interp-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cf7edf52c3cb38989af20b196a69bf099a1681d6 +Author: Behdad Esfahbod +Date: Sun Jan 20 19:49:59 2019 -0500 + + [CFF] Use enum for tableTag + + src/hb-ot-cff1-table.hh | 2 +- + src/hb-ot-cff2-table.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit bd1318b8ccf08d5f9241851dbb689c7dac717f0a +Author: Behdad Esfahbod +Date: Sun Jan 20 19:47:52 2019 -0500 + + Use static constexpr for large class constants + + src/hb-map.hh | 2 +- + src/hb-set.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 043b610fa698ed247347dfaa042f032f3fd3f572 +Author: Behdad Esfahbod +Date: Sat Jan 19 09:20:46 2019 -0500 + + Fix sign compare warnings + + ../../third_party/harfbuzz-ng/src/src/hb-map.hh(56,45): warning: comparison of integers of different signs: 'const hb_codepoint_t' (aka 'const unsigned int') and 'hb_map_t::(anonymous enum at ../../third_party/harfbuzz-ng/src/src/hb-map.hh:169:3)' [-Wsign-compare] + bool is_unused () const { return key == INVALID; } + + src/hb-map.hh | 2 +- + src/hb-set.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit ce317d032061d81c520180a338172ce38b427135 +Author: Behdad Esfahbod +Date: Sat Jan 19 09:18:03 2019 -0500 + + Fix warning + + warning: '_WIN64' is not defined, evaluates to 0 [-Wundef] + + src/hb-dsalgs.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0c2bd1b160fda4e77919889ac80f9460967fa251 +Author: Ebrahim Byagowi +Date: Sat Jan 19 16:30:07 2019 +0330 + + [dwrite] Fix delete-non-virtual-dtor warning (#1550) + + src/hb-directwrite.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 89bcfb204c736f5962d377896af2c1350f179882 +Author: Behdad Esfahbod +Date: Fri Jan 18 14:59:18 2019 -0500 + + Remove TRACE_COLLECT_GLYPHS + + src/hb-debug.hh | 13 ------------- + src/hb-ot-layout-gpos-table.hh | 26 ++++---------------------- + src/hb-ot-layout-gsub-table.hh | 21 +++------------------ + src/hb-ot-layout-gsubgpos.hh | 12 +----------- + 4 files changed, 8 insertions(+), 64 deletions(-) + +commit f13b6786f0aefd2060ca976f7e42db7387b49450 +Author: Behdad Esfahbod +Date: Fri Jan 18 14:53:54 2019 -0500 + + [pragma] Only add if GCC or clang + + src/hb.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit c2ea7a9da463c567d321233b23813c59762841bb +Author: Behdad Esfahbod +Date: Fri Jan 18 13:45:33 2019 -0500 + + [directwrite] More fix + + src/hb-directwrite.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9714d3ec5c45b2fe460fa6b21bdb3487c62029d3 +Author: Ebrahim Byagowi +Date: Fri Jan 18 21:55:21 2019 +0330 + + [dwrite] Try to fix delete-non-virtual-dtor warnings + + Fixes #1548 hopefully + + src/hb-directwrite.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0772c06f96c3f5a319485c390416531b8125251b +Author: Behdad Esfahbod +Date: Fri Jan 18 12:53:06 2019 -0500 + + Remove tracing from closure + + src/hb-debug.hh | 13 ------------- + src/hb-ot-layout-gsub-table.hh | 15 ++------------- + src/hb-ot-layout-gsubgpos.hh | 14 +------------- + 3 files changed, 3 insertions(+), 39 deletions(-) + +commit d9f6be3a61edfe9e1bce01ea9b11e2bcb16f9618 +Author: Behdad Esfahbod +Date: Fri Jan 18 12:48:01 2019 -0500 + + Fix -Wundef errors with __GNUC__ + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1549 + + src/hb-common.h | 4 ++-- + src/hb.hh | 10 +++++----- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 28917e58f973e5875d3ef3004c16e1ee1a5a973c +Author: Michiharu Ariza +Date: Fri Jan 18 09:43:51 2019 -0800 + + init interp_env_t::hintmask_size + + fixes issue #1547 + + src/hb-cff-interp-cs-common.hh | 1 + + test/api/test-ot-extents-cff | Bin 0 -> 8574336 bytes + .../test-ot-extents-cff.dSYM/Contents/Info.plist | 20 ++++++++++++++++++++ + .../Contents/Resources/DWARF/test-ot-extents-cff | Bin 0 -> 7650053 bytes + 4 files changed, 21 insertions(+) + +commit 9b4e51b2e44d7dea026b1f9201d2f83277bab1cf +Author: Behdad Esfahbod +Date: Fri Jan 18 12:23:02 2019 -0500 + + [pragma] Enable error -Wdelete-non-virtual-dtor + + Currently fails directwrite backend. + + src/hb.hh | 1 + + 1 file changed, 1 insertion(+) + +commit e65272281c71d416f0ff886a55536597665b9dc3 +Author: Behdad Esfahbod +Date: Fri Jan 18 12:22:07 2019 -0500 + + [directwrite] Fix error + + hb-directwrite.cc: In constructor 'TextAnalysis::TextAnalysis(const wchar_t*, uint32_t, const wchar_t*, DWRITE_READING_DIRECTION)': + hb-directwrite.cc:489:18: error: 'TextAnalysis::mText' will be initialized after [-Werror=reorder] + const wchar_t* mText; + ^~~~~ + hb-directwrite.cc:488:12: error: 'uint32_t TextAnalysis::mTextLength' [-Werror=reorder] + uint32_t mTextLength; + ^~~~~~~~~~~ + hb-directwrite.cc:282:3: error: when initialized here [-Werror=reorder] + TextAnalysis (const wchar_t* text, uint32_t textLength, + ^~~~~~~~~~~~ + hb-directwrite.cc: In function 'hb_bool_t _hb_directwrite_shape_full(hb_shape_plan_t*, hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int, float)': + + src/hb-directwrite.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b900f78088abb87ebec263474b2802593afa0264 +Author: Behdad Esfahbod +Date: Fri Jan 18 10:08:23 2019 -0500 + + [pragma] More cast-align whitelist + + src/hb-font.cc | 20 +++++++++++++++----- + src/hb-ft.cc | 6 ++++++ + src/hb-ot-cmap-table.hh | 3 +++ + src/hb-ot-font.cc | 6 ++++++ + 4 files changed, 30 insertions(+), 5 deletions(-) + +commit 0d8b931bbeee9743d2e3bd37dd2fa9dffb807eaa +Author: Behdad Esfahbod +Date: Fri Jan 18 10:03:43 2019 -0500 + + [pragma] Allow cast-align in hb-font.cc + + ../src/hb-machinery.hh: In instantiation of 'const Type& StructAtOffset(const void*, unsigned int) [with Type = unsigned int]': + ../src/hb-font.cc:144:85: required from here + ../src/hb-machinery.hh:63:12: error: cast from 'const char*' to 'const unsigned int*' increases required alignment of target type [-Werror=cast-align] + { return * reinterpret_cast ((const char *) P + offset); } + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ../src/hb-machinery.hh: In instantiation of 'Type& StructAtOffset(void*, unsigned int) [with Type = unsigned int]': + ../src/hb-font.cc:145:79: required from here + ../src/hb-machinery.hh:66:12: error: cast from 'char*' to 'unsigned int*' increases required alignment of target type [-Werror=cast-align] + { return * reinterpret_cast ((char *) P + offset); } + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ../src/hb-machinery.hh: In instantiation of 'Type& StructAtOffset(void*, unsigned int) [with Type = int]': + + src/hb-font.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit a25174a56b8fc334a050aa63be3654f53a7d8893 +Author: Behdad Esfahbod +Date: Fri Jan 18 09:59:36 2019 -0500 + + [pragma] GCC diagnostic error "-Wreorder" + + src/hb.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 4660090569efbf64d3acc99ef6fa33e01abc9701 +Author: Behdad Esfahbod +Date: Fri Jan 18 09:53:16 2019 -0500 + + [pragma] GCC diagnostic warning "-Wmaybe-uninitialized" + + src/hb.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 7a634d7d5b859eb1121acd0b17c727c541a7f540 +Author: Behdad Esfahbod +Date: Fri Jan 18 09:49:14 2019 -0500 + + [pragma] Massage more + + src/hb.hh | 106 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 55 insertions(+), 51 deletions(-) + +commit 16e5ba85b1822ff9d2b2f85f45ddd44f1a05f4b1 +Author: Behdad Esfahbod +Date: Fri Jan 18 09:46:17 2019 -0500 + + [pragma] More + + src/hb.hh | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +commit 2bd530d59883cce437a5093323625f94b9618d89 +Author: Behdad Esfahbod +Date: Fri Jan 18 09:28:22 2019 -0500 + + [pragma] Reorg again + + https://github.com/harfbuzz/harfbuzz/issues/1546 + + src/hb.hh | 91 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 46 insertions(+), 45 deletions(-) + +commit c04272fac81cac48b6310182d58d54569117f298 +Author: Behdad Esfahbod +Date: Fri Jan 18 08:49:45 2019 -0500 + + [pragma] GCC diagnostic ignored "-Wunknown-warning-option" + + Try at fixing https://github.com/harfbuzz/harfbuzz/issues/1546 + + src/hb.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 4d3c8f9685b1744077ab264ffc0e0457d63c4b9a +Author: Behdad Esfahbod +Date: Thu Jan 17 19:58:54 2019 -0500 + + [uniscribe] More warnings + + src/hb-uniscribe.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6a5d2b21d8457001a59537e85596461feba3dbd5 +Author: Behdad Esfahbod +Date: Thu Jan 17 19:57:17 2019 -0500 + + [uniscribe] Fix warnings + + src/hb-uniscribe.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 5b13e458c34d16fef6540a9389225e0597a99df5 +Author: Behdad Esfahbod +Date: Thu Jan 17 19:52:32 2019 -0500 + + Fix build + + src/hb-directwrite.cc | 1 - + 1 file changed, 1 deletion(-) + +commit a77bd6bb8960ecff35aac07f221653c65d08e58e +Author: Behdad Esfahbod +Date: Thu Jan 17 19:33:41 2019 -0500 + + [pragma] GCC diagnostic ignored "-Wclass-memaccess" + + src/hb.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e1302842d9c589ccbed90d29c953fea503d3901f +Author: Behdad Esfahbod +Date: Thu Jan 17 19:12:07 2019 -0500 + + [ci] Remove unnecessary warning declarations + + clang -Weverything still left to be ported to pragmas + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 436c7b294ab12ae338aaa879fe4280caae6c6155 +Author: Behdad Esfahbod +Date: Thu Jan 17 19:03:33 2019 -0500 + + [pragma] ignored -Wunsafe-loop-optimizations // TODO fix + + src/hb.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e3b3181e9ddd8b76428d7eaca64a3e03a99fcdd5 +Author: Behdad Esfahbod +Date: Thu Jan 17 19:02:06 2019 -0500 + + [pragma] error -Wclass-memaccess + + src/hb.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 1a6b97a491f2ba4f84e52c89517b7a02faa70cc3 +Author: Behdad Esfahbod +Date: Thu Jan 17 18:55:03 2019 -0500 + + [pragma] More + + src/hb.hh | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit 06e8091661352873c4d6040fd06a940136497e6f +Author: Behdad Esfahbod +Date: Thu Jan 17 18:47:32 2019 -0500 + + [pragma] More + + src/hb.hh | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +commit 1077e40bf12f998976df4bf509c69df9f9e2a590 +Author: Behdad Esfahbod +Date: Thu Jan 17 18:36:10 2019 -0500 + + [pragma] Flesh out more + + src/hb.hh | 22 +++++++++++++++++----- + 1 file changed, 17 insertions(+), 5 deletions(-) + +commit 7e6bd510fc695c423a7fa6b25c15805482f7d185 +Author: Behdad Esfahbod +Date: Thu Jan 17 18:24:18 2019 -0500 + + Use NNOffsetTo<> in rest of places + + src/hb-aat-layout-common.hh | 8 ++++---- + src/hb-aat-layout-kerx-table.hh | 22 +++++++++++----------- + src/hb-aat-layout-morx-table.hh | 10 +++++----- + 3 files changed, 20 insertions(+), 20 deletions(-) + +commit b1152d5e66d7463a30af8ca2a485f75e0c8e6ffd +Author: Behdad Esfahbod +Date: Thu Jan 17 18:17:04 2019 -0500 + + Use NNOffsetTo<> + + src/hb-aat-layout-ankr-table.hh | 6 +++--- + src/hb-aat-layout-trak-table.hh | 2 +- + src/hb-aat-ltag-table.hh | 2 +- + src/hb-open-file.hh | 10 +++++----- + src/hb-ot-cff2-table.hh | 6 +++--- + src/hb-ot-color-cbdt-table.hh | 2 +- + src/hb-ot-color-colr-table.hh | 4 ++-- + src/hb-ot-color-cpal-table.hh | 8 ++++---- + src/hb-ot-color-svg-table.hh | 2 +- + src/hb-ot-name-table.hh | 2 +- + src/hb-ot-stat-table.hh | 4 ++-- + 11 files changed, 24 insertions(+), 24 deletions(-) + +commit 205d72a198805ba276c1d0e63b1ca313c7bd517f +Author: Behdad Esfahbod +Date: Thu Jan 17 18:10:38 2019 -0500 + + Add NNOffsetTo<> + + src/hb-open-type.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit c99d13d860e3d34e16cd2c070070d4f5d7d58cf4 +Author: Behdad Esfahbod +Date: Thu Jan 17 17:56:27 2019 -0500 + + [AAT] Comment + + src/hb-aat-layout-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f39b5603ffa0452528b2366f8641e7e770960847 +Author: Behdad Esfahbod +Date: Thu Jan 17 17:49:55 2019 -0500 + + Comment + + src/hb-ot-layout-gpos-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 347ad454b88b89fc4bc30fca86c9ca37bea0be5b +Author: Behdad Esfahbod +Date: Thu Jan 17 17:47:29 2019 -0500 + + [AAT] Remove unused code + + src/hb-aat-layout-ankr-table.hh | 3 +-- + src/hb-aat-layout-common.hh | 3 +-- + src/hb-aat-layout-kerx-table.hh | 6 ++---- + src/hb-aat-layout.cc | 14 +++----------- + 4 files changed, 7 insertions(+), 19 deletions(-) + +commit b344d4385af5bc9adac2a24850cb963929d4ae9e +Author: Behdad Esfahbod +Date: Thu Jan 17 17:44:39 2019 -0500 + + [AAT] Allow null in ankr lookupTable offset + + src/hb-aat-layout-ankr-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 14a560a245109376b7314c949895968d0a54452c +Author: Behdad Esfahbod +Date: Thu Jan 17 17:42:44 2019 -0500 + + [pragma GCC] Ignore -Wtype-limits + + src/hb.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 41b4312e936a0dfc396e6f0ef13c2c691dac6e40 +Author: Behdad Esfahbod +Date: Thu Jan 17 16:07:27 2019 -0500 + + [ci] Remove -Werror from Travis + + hb-machinery.hh:111:37: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits] + + Also ignore -Wtype-limits. + + .travis.yml | 2 -- + 1 file changed, 2 deletions(-) + +commit 3f2daae63073bd536bceb1ae71dffd3187afce11 +Author: Behdad Esfahbod +Date: Thu Jan 17 15:27:31 2019 -0500 + + More GCC pragmas + + src/hb.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit d6c5473e1f86cae7f1060abe18f73ccb8e536d6c +Author: Behdad Esfahbod +Date: Thu Jan 17 15:22:46 2019 -0500 + + Rename macro + + src/hb.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a9946b7cfef185d53304e804169d6e53e9d522a0 +Author: Behdad Esfahbod +Date: Thu Jan 17 15:22:28 2019 -0500 + + Add more GCC warning pragmas + + src/hb.hh | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 868b0c0c2e2f1a2dea9b0d3c8eb6e56ded8b1a14 +Author: Behdad Esfahbod +Date: Thu Jan 17 15:08:36 2019 -0500 + + Move -Wcast-align to hb.hh + + configure.ac | 3 --- + src/hb.hh | 4 ++++ + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit 8874eef8ff70de6416266d719fa74eec39e5d8f9 +Author: Behdad Esfahbod +Date: Thu Jan 17 15:04:44 2019 -0500 + + Add pragram GCC diagnostic ignored "-Wunused-macros" + + src/gen-indic-table.py | 3 +++ + src/gen-use-table.py | 3 +++ + src/hb-blob.cc | 3 +++ + src/hb-ot-shape-complex-indic-table.cc | 3 +++ + src/hb-ot-shape-complex-use-table.cc | 3 +++ + 5 files changed, 15 insertions(+) + +commit cc8e9a436fa408a1c63f4b9afb7643cea76a079c +Author: Behdad Esfahbod +Date: Thu Jan 17 14:54:32 2019 -0500 + + [AAT] Fully sanitize ankr table at sanitize time + + Third try to fix access. Followup 6879efc2c1596d11a6a6ad296f80063b558d5e0f + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12532 + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=922303 + + src/hb-aat-layout-ankr-table.hh | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) + +commit 6879efc2c1596d11a6a6ad296f80063b558d5e0f +Author: Behdad Esfahbod +Date: Thu Jan 17 14:06:37 2019 -0500 + + [AAT] Fix anchor bound checking, again + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12532 + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=922303 + + src/hb-aat-layout-ankr-table.hh | 3 ++- + ...zz-testcase-minimized-harfbuzz_fuzzer-5166320261529600 | Bin 0 -> 393 bytes + ...zz-testcase-minimized-hb-shape-fuzzer-5667182741028864 | Bin 0 -> 407 bytes + 3 files changed, 2 insertions(+), 1 deletion(-) + +commit a262eb3d0b7009aabd9e0beebc77e5c0a2a65548 +Author: Behdad Esfahbod +Date: Thu Jan 17 14:06:32 2019 -0500 + + [aat] Minor + + src/hb-aat-layout-kerx-table.hh | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit c986ca15a6320d78471adf950394f391e8729b15 +Author: Behdad Esfahbod +Date: Tue Jan 15 13:58:19 2019 -0500 + + Improve overflow avoidance + + Better fix for 480406cd3ef9e5ab8476ddfa04498bf23906c508 + This way we behave the same on 32bit and 64bit archs. + + src/hb-machinery.hh | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +commit f401f85a5a3ec4ab9c28012a0bfe713d7ee96951 +Author: Tor Arne Vestbø +Date: Mon Dec 17 00:48:35 2018 +0100 + + Remove assumption about Core Text working in 96 DPI + + Core Text doesn't actually have a concept of DPI internally, as it + doesn't rasterize anything by itself, it just generates vector paths + that get passed along to Core Graphics. + + In practice this means Core Text operates in the classical macOS + logical DPI of 72, with one typographic point corresponding to one + point in the Core Graphics coordinate system, which for a normal + bitmap context then corresponds to one pixel -- or two pixels for + a "retina" context with a 2x scale transform. + + Scaling the font point sizes given to HarfBuzz to an assumed DPI + of 96 is problematic with this in mind, as fonts with optical + features such as 'trak' tables for tracking, or color glyphs, + will then base the metrics off of the wrong point size compared + to what the client asked for. + + This in turn causes mismatches between the metrics of the shaped + text and the actual rasterization, which doesn't include the 72 + to 96 DPI scaling. + + If a 96 DPI is needed, such as on the Web, the scaling should be + done outside of HarfBuzz, allowing the client to keep the DPI of + the shaping in sync with the rasterization. + + The recommended way to do that is by scaling the font point size, + not by applying a transform to the target Core Graphics context, + to let Core Text choose the right optical features of the target + point size, as described in WWDC 2015 session 804: + + https://developer.apple.com/videos/play/wwdc2015/804/ + + src/hb-aat-layout-trak-table.hh | 11 ++--------- + src/hb-coretext.cc | 25 ++++--------------------- + test/shaping/data/in-house/tests/aat-trak.tests | 14 +++++++------- + test/shaping/data/in-house/tests/macos.tests | 4 ++-- + 4 files changed, 15 insertions(+), 39 deletions(-) + +commit 0d2727f4fe734af146785df10a44e3505e410ba1 +Author: Behdad Esfahbod +Date: Mon Jan 14 18:23:17 2019 -0800 + + fix FDSelect fuzzing bug (#1539) + + Rewrote struct FDSelect3_4.ranges as ArrayOf + Updated FDSelect3_4::sanitize () to call ranges.sanitize () + nRanges now a function to return a reference to ranges.len + + src/hb-ot-cff-common.hh | 29 +++++++++++++++-------------- + src/hb-subset-cff-common.cc | 2 +- + 2 files changed, 16 insertions(+), 15 deletions(-) + +commit 9f6172d669d53abbf3bf2a3546429cb5036e3d5f +Author: Behdad Esfahbod +Date: Mon Jan 14 20:45:31 2019 -0500 + + Move _POSIX_SOURCE definition + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1308 + + src/hb-blob.cc | 9 +++++++++ + src/hb.hh | 4 ---- + 2 files changed, 9 insertions(+), 4 deletions(-) + +commit 91d774712fa76dd26c441526712bddddca5b4bdd +Author: Behdad Esfahbod +Date: Mon Jan 14 15:31:31 2019 -0500 + + [test] Add test for previous commit + + ...uzz-testcase-minimized-harfbuzz_fuzzer-5662548265009152 | Bin 0 -> 28 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 480406cd3ef9e5ab8476ddfa04498bf23906c508 +Author: Behdad Esfahbod +Date: Mon Jan 14 15:27:34 2019 -0500 + + Fix assertion on address overflow + + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=917031 + + src/hb-machinery.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 7a6686a589ed6bf17a5af0b8012501e4d4ee2ded +Author: Behdad Esfahbod +Date: Mon Jan 14 15:09:14 2019 -0500 + + [AAT] Fix mort ContextualSubtable offset access + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12312 + + src/hb-aat-layout-morx-table.hh | 3 ++- + ...zz-testcase-minimized-hb-shape-fuzzer-5631444412530688 | Bin 0 -> 336 bytes + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit a3fa7d33360a58df5333dbbd121328e580f08849 +Author: Behdad Esfahbod +Date: Mon Jan 14 14:37:36 2019 -0500 + + [AAT] Fix ankr table access + + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=918340 + + src/hb-aat-layout-ankr-table.hh | 7 ++++--- + ...z-testcase-minimized-harfbuzz_fuzzer-5126525414014976 | Bin 0 -> 1141 bytes + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit 760303d411b1561533f8f08c7c15db331c71ece8 +Author: Michiharu Ariza +Date: Fri Jan 11 15:27:35 2019 -0800 + + deleted a duplicate fontdicts_mod.fini() call (#1538) + + src/hb-subset-cff1.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 5110f3da9a4711a35bfb780ea06cda677cc00209 +Author: Ebrahim Byagowi +Date: Wed Jan 9 16:01:11 2019 +0330 + + Add an initial .clang-format config + + There are things can be improved on clang-format side I guess before + the full assertion, but is the best we can get for now I guess. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1536 + + .clang-format | 38 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +commit 099bca6d406af9c8e12a66b93fcc9a38ff7914f9 +Author: Ebrahim Byagowi +Date: Wed Jan 9 15:56:32 2019 +0330 + + Minor, hack .editorconfig for vscode use + + As VSCode and Atom https://github.com/Microsoft/vscode/issues/44438 don't support it + + .editorconfig | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 7b48641aa8551115d21c534940ac4fb364e5ab92 +Author: Michiharu Ariza +Date: Tue Jan 8 12:37:48 2019 -0800 + + fix leak in subset_enc_supp_codes (#1537) + + oss-fuzz issue 12310 + + src/hb-subset-cff1.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 97f67a3c3d499959d33e66aeed449e2957a14bc6 +Author: Ebrahim Byagowi +Date: Fri Jan 4 23:10:39 2019 +0330 + + [ci] Enable more of GCC compile warnings (#1533) + + .circleci/config.yml | 16 ++++++++-------- + src/hb-gobject-structs.cc | 4 ++-- + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit ad954870383a880262edcd01acd8e171c4614a68 +Author: Nathan Willis +Date: Mon Dec 3 12:49:44 2018 -0600 + + Usermanual: small formatting and wording fixes. + + docs/usermanual-getting-started.xml | 3 +++ + docs/usermanual-install-harfbuzz.xml | 30 ++++++++++++++---------------- + docs/usermanual-what-is-harfbuzz.xml | 11 ++++++----- + 3 files changed, 23 insertions(+), 21 deletions(-) + +commit ed13caddf2de68312608e12c37d0e6287c1ac0a0 +Author: Nathan Willis +Date: Wed Nov 28 13:48:38 2018 -0600 + + Usermanual: small updates. + + ...anual-buffers-language-script-and-direction.xml | 7 +- + docs/usermanual-clusters.xml | 279 ++++++++++++++++----- + docs/usermanual-getting-started.xml | 91 ++++++- + docs/usermanual-install-harfbuzz.xml | 3 +- + docs/usermanual-shaping-concepts.xml | 11 +- + 5 files changed, 314 insertions(+), 77 deletions(-) + +commit 26c5b54fb09fb45e02c9c4618bcea4958c698953 +Author: cclauss +Date: Mon Dec 31 04:30:43 2018 +0100 + + CircleCI: Test for Python 3 syntax errors and undefined names (#1522) + + Catch missing imports and errors like #1520 and #1521 + + __E901,E999,F821,F822,F823__ are the "_showstopper_" [flake8](http://flake8.pycqa.org) issues that can halt the runtime with a SyntaxError, NameError, etc. Most other flake8 issues are merely "style violations" -- useful for readability but they do not effect runtime safety. + * F821: undefined name `name` + * F822: undefined name `name` in `__all__` + * F823: local variable name referenced before assignment + * E901: SyntaxError or IndentationError + * E999: SyntaxError -- failed to compile a file into an Abstract Syntax Tree + + .circleci/config.yml | 3 ++- + src/gen-use-table.py | 4 +++- + test/subset/subset_test_suite.py | 2 +- + 3 files changed, 6 insertions(+), 3 deletions(-) + +commit 686e6f2e40da378e031b4c9871a471599c6d61cf +Author: Behdad Esfahbod +Date: Sun Dec 30 11:27:42 2018 -0500 + + Fix automake warnings + + [skip ci] + + test/api/Makefile.am | 1 - + test/subset/data/Makefile.am | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +commit b5c12b9f4d2c32a5013c340f7e40649cb5f2b41a +Author: cclauss +Date: Sun Dec 30 13:07:28 2018 +0100 + + print() is a function in Python 3 (#1520) + + test/subset/generate-expected-outputs.py | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit f4da28b1f153ccf293b367363a1a4d83c056e4e1 +Author: cclauss +Date: Sun Dec 30 12:58:34 2018 +0100 + + Python 3 fixes to gen-os2-unicode-ranges.py (#1521) + + In Python 3, __reload()__ was moved and __sys.setdefaultencoding()__ because the default is already utf-8. Also __Error()__ is an _undefined name_ and __Exception()__ creates a generic exception. + + src/gen-os2-unicode-ranges.py | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit e5989e0962309b27b2486d8fd20f3cbc05c3d79a +Author: Ebrahim Byagowi +Date: Sun Dec 30 10:23:47 2018 +0330 + + [cmake] Enable C++11 on CMake (#1519) + + CMakeLists.txt | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit d092fb27198f24423e51ce07375ebd6d486f64d3 +Author: Behdad Esfahbod +Date: Sun Dec 30 01:53:03 2018 -0500 + + Ouch! Fix build on C++<11 + + src/hb.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 89949ed28db96edabeb09433fcc09f28168163d2 +Author: Behdad Esfahbod +Date: Sun Dec 30 01:52:19 2018 -0500 + + Fix ubsan with passing nullptr to qsort() + + src/hb-array.hh | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 357a0a7ad344caf898eb1697fcdb859d118b7a13 +Author: Behdad Esfahbod +Date: Thu Dec 27 18:29:23 2018 -0500 + + Fix build on C++ < 11 + + src/hb.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 54c0a1731069a17ae4f3b79b419af75709f03f5b +Author: Behdad Esfahbod +Date: Thu Dec 27 18:27:36 2018 -0500 + + [vector] Fix warning + + src/hb-vector.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1043ddbee878a14df0ad8d83fbaa893370ef5a75 +Author: Behdad Esfahbod +Date: Thu Dec 27 18:27:11 2018 -0500 + + [aat] Minor + + src/hb-aat-layout-morx-table.hh | 2 +- + src/hb-aat-map.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 71da9ca62fa87bd3e0fa9d40924bb4c220313a03 +Author: Behdad Esfahbod +Date: Thu Dec 27 18:01:06 2018 -0500 + + [vector] Remove use of arrayZ() by using casts + + src/hb-ot-name-table.hh | 2 +- + src/hb-ot-name.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit fa333e34d6230210bc73a88b0ba6df2102dcda51 +Author: Behdad Esfahbod +Date: Thu Dec 27 17:56:22 2018 -0500 + + [vector] Remove static_array + + Was good idea, but with C++ types with constructor/destructor, was getting in + the way as compiler was destructing those items where it was not desired. + Since C++ does not allow zero-sized arrays, just remove it... + + src/hb-aat-map.hh | 4 ++-- + src/hb-cff-interp-common.hh | 2 +- + src/hb-face.cc | 2 +- + src/hb-object.hh | 2 +- + src/hb-ot-cff-common.hh | 2 +- + src/hb-ot-layout-gsubgpos.hh | 2 +- + src/hb-ot-map.hh | 10 +++++----- + src/hb-ot-post-table.hh | 2 +- + src/hb-set.hh | 4 ++-- + src/hb-vector.hh | 34 +++++++++++----------------------- + src/hb.hh | 3 +++ + 11 files changed, 29 insertions(+), 38 deletions(-) + +commit ab2258a419abbace9ff27916143b46f88e8ccef3 +Author: Behdad Esfahbod +Date: Thu Dec 27 17:45:05 2018 -0500 + + [vector] Use allocated = -1 to signify failure + + src/hb-vector.hh | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +commit 09fa536d89d969998fe6bbe274a9964c73d1d982 +Author: Michiharu Ariza +Date: Thu Dec 27 08:33:09 2018 -0800 + + fix lealk with cff2::accelerator_templ_t::topDict (#1517) + + src/hb-ot-cff2-table.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 3b81442cd5c11099ae9245074d24ef679b4473fa +Author: Behdad Esfahbod +Date: Mon Dec 24 11:31:04 2018 -0500 + + [vector] Change pre-alloced count from 8 to 2 + + I'm thinking about dropping it to zero, but that needs slight code changes. + + src/hb-vector.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d25a2f1496d13846ddaea123ac6fb9807dc5669a +Author: Behdad Esfahbod +Date: Sun Dec 23 20:19:52 2018 -0500 + + Fix a few warnings + + src/hb-aat-layout-common.hh | 12 ++++++------ + src/hb-iter.hh | 8 ++++---- + src/hb-null.hh | 2 +- + src/hb-ot-cff1-table.hh | 2 +- + src/hb-ot-cff2-table.hh | 2 +- + src/hb-subset-cff-common.hh | 3 ++- + src/hb.hh | 3 ++- + 7 files changed, 17 insertions(+), 15 deletions(-) + +commit 85003b594b3aa1f6638e274bc89f18999a5de9f5 +Author: Behdad Esfahbod +Date: Sat Dec 22 16:19:10 2018 -0500 + + [iter] Fix warning + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e4355b1ca177200db6769136ead1ee25da86ec85 +Author: Behdad Esfahbod +Date: Sat Dec 22 16:11:22 2018 -0500 + + [set] Add iter_t as alias to const_iter_t + + src/hb-set.hh | 6 ++++-- + src/test-iter.cc | 2 ++ + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit 33f8de61863efa538c488121c476fd0e907020d0 +Author: Behdad Esfahbod +Date: Sat Dec 22 15:10:18 2018 -0500 + + [set] Change to const_iter + + src/hb-set.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit f88fed5cd8787e3deeec05dac4353337dc02abdd +Author: Behdad Esfahbod +Date: Sat Dec 22 11:11:10 2018 -0500 + + [set] Cache length in iterator + + src/hb-set.hh | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit d0a706c7fdb72a1d224b4a5bdbad0fb8c90e3186 +Author: Ebrahim Byagowi +Date: Sat Dec 22 19:47:48 2018 +0330 + + Minor, remove redundant inline + + src/hb-ot-layout.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit ae6e348d642194585543f0d548fb94d210575fe4 +Author: Ebrahim Byagowi +Date: Sat Dec 22 19:47:29 2018 +0330 + + Minor, tweak spaces + + src/hb-ot-glyf-table.hh | 8 ++++---- + src/hb-subset-cff-common.hh | 15 ++++++--------- + 2 files changed, 10 insertions(+), 13 deletions(-) + +commit 29f0b6bce7da4c599f54066f7e7f6000f10d2f29 +Author: Michiharu Ariza +Date: Sat Dec 22 07:47:04 2018 -0800 + + CFF renaming (#1507) + + * reimplement ByteStr as byte_str_t based on hb_ubytes_t + + Unuse start_embed + Also renamed SubByteStr to byte_str_ref_t + More renaming to come + + * substr renamed to str_ref in line with its type byte_str_ref_t + + * uncamelize non-table struct names + + * uncamelized non-struct types OpCode etc + + * add byte_str_t copy ctor + + * test + + * test2 + + * undo tests + + * fix bot failure + + * undo the previous change + + * fixed tabs, added inline + + * Revert "fixed tabs, added inline" + + This reverts commit 21163c30e9d18759414f7fe2518628241599f039. + + * fix tabs + + src/hb-cff-interp-common.hh | 215 +++++++++++++++------------------ + src/hb-cff-interp-cs-common.hh | 250 +++++++++++++++++++-------------------- + src/hb-cff-interp-dict-common.hh | 64 +++++----- + src/hb-cff1-interp-cs.hh | 26 ++-- + src/hb-cff2-interp-cs.hh | 56 ++++----- + src/hb-ot-cff-common.hh | 59 ++++----- + src/hb-ot-cff1-table.cc | 56 ++++----- + src/hb-ot-cff1-table.hh | 147 ++++++++++++----------- + src/hb-ot-cff2-table.cc | 28 ++--- + src/hb-ot-cff2-table.hh | 128 ++++++++++---------- + src/hb-subset-cff-common.cc | 10 +- + src/hb-subset-cff-common.hh | 232 ++++++++++++++++++------------------ + src/hb-subset-cff1.cc | 244 +++++++++++++++++++------------------- + src/hb-subset-cff2.cc | 100 ++++++++-------- + 14 files changed, 796 insertions(+), 819 deletions(-) + +commit 89d04129e2f4dedb865635dcb8f0fd020e4218c2 +Author: Behdad Esfahbod +Date: Fri Dec 21 20:07:52 2018 -0500 + + [set] Actually derive iterator from hb_sorted_iter_t<> + + src/hb-set.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fc35919d015c5b8d231933d6bc6ea640c83af6b2 +Author: Behdad Esfahbod +Date: Fri Dec 21 20:06:17 2018 -0500 + + [set] Implement unified iterator + + src/hb-set.hh | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +commit 4911e67d2d2188ee9bdc0315e121e51d9967b567 +Author: Behdad Esfahbod +Date: Fri Dec 21 20:00:52 2018 -0500 + + [set] Mark some internals protected + + src/hb-set.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 954b985422a8964f6e7da9f71ab7a68074017111 +Author: Behdad Esfahbod +Date: Fri Dec 21 19:55:02 2018 -0500 + + [iter] Add hb_sorted_iter_t<> + + src/hb-array.hh | 2 +- + src/hb-iter.hh | 11 +++++++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + +commit b205105c9e1c6295b17cfd88ffb8ca7d963ef173 +Author: Behdad Esfahbod +Date: Fri Dec 21 19:48:21 2018 -0500 + + [iter] Change operator[] operand to be signed + + To fix older compilers again (this was the case in hb_array_t). + + hb-ot-layout-common.hh:1353: note: candidate 2: operator[](T*, int) + hb-ot-layout-common.hh:1354: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: + hb-iter.hh:63: note: candidate 1: Item& hb_iter_t::operator[](unsigned int) const [with Iter = hb_array_t >, Item = const OT::IntType] + hb-ot-layout-common.hh:1354: note: candidate 2: operator[](T*, int) + hb-ot-layout-common.hh: In member function 'bool OT::ClassDef::serialize(hb_serialize_context_t*, hb_array_t >, hb_array_t >)': + hb-ot-layout-common.hh:1490: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: + hb-iter.hh:63: note: candidate 1: Item& hb_iter_t::operator[](unsigned int) const [with Iter = hb_array_t >, Item = const OT::IntType] + hb-ot-layout-common.hh:1490: note: candidate 2: operator[](T*, int) + + src/hb-iter.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 25786f49c1df36fdb5f78681055a1f4aa4b17f86 +Author: Behdad Esfahbod +Date: Fri Dec 21 19:29:00 2018 -0500 + + [array] Port to hb_iter_t<> + + hb_array_t is its own iterator... + + src/hb-array.hh | 75 +++++++++++++++++++++++++-------------------------------- + src/hb-iter.hh | 5 ++-- + 2 files changed, 36 insertions(+), 44 deletions(-) + +commit 2a33ab0560a13cb8fef5983bfe0f6d68dfd47b14 +Author: Behdad Esfahbod +Date: Fri Dec 21 18:49:27 2018 -0500 + + [iter] Change __more__ to fallback to __len__ + + src/hb-iter.hh | 15 ++++++--------- + src/test-iter.cc | 1 - + 2 files changed, 6 insertions(+), 10 deletions(-) + +commit 474a12058d681f2d7cef84db0cf20f9f784fa400 +Author: Behdad Esfahbod +Date: Fri Dec 21 18:46:51 2018 -0500 + + [array/vector] Rename len to length + + src/hb-aat-layout-feat-table.hh | 5 ++- + src/hb-aat-layout-lcar-table.hh | 2 +- + src/hb-aat-map.cc | 4 +-- + src/hb-array.hh | 72 ++++++++++++++++++++--------------------- + src/hb-cff-interp-common.hh | 10 +++--- + src/hb-cff2-interp-cs.hh | 6 ++-- + src/hb-coretext.cc | 12 +++---- + src/hb-face.cc | 4 +-- + src/hb-object.hh | 23 +++++++------ + src/hb-open-file.hh | 4 +-- + src/hb-open-type.hh | 8 ++--- + src/hb-ot-cff-common.hh | 38 +++++++++++----------- + src/hb-ot-cff1-table.hh | 28 ++++++++-------- + src/hb-ot-cmap-table.hh | 24 +++++++------- + src/hb-ot-color-colr-table.hh | 6 ++-- + src/hb-ot-hdmx-table.hh | 6 ++-- + src/hb-ot-hmtx-table.hh | 8 ++--- + src/hb-ot-layout-common.hh | 32 +++++++++--------- + src/hb-ot-layout-gdef-table.hh | 4 +-- + src/hb-ot-layout-gsub-table.hh | 24 +++++++------- + src/hb-ot-layout-gsubgpos.hh | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-map.cc | 22 ++++++------- + src/hb-ot-map.hh | 4 +-- + src/hb-ot-math-table.hh | 4 +-- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-name-table.hh | 8 ++--- + src/hb-ot-name.cc | 4 +-- + src/hb-ot-post-table.hh | 8 ++--- + src/hb-ot-var-fvar-table.hh | 2 +- + src/hb-ot-vorg-table.hh | 10 +++--- + src/hb-set.hh | 36 ++++++++++----------- + src/hb-subset-cff-common.cc | 8 ++--- + src/hb-subset-cff-common.hh | 50 ++++++++++++++-------------- + src/hb-subset-cff1.cc | 48 +++++++++++++-------------- + src/hb-subset-cff2.cc | 16 ++++----- + src/hb-subset-glyf.cc | 14 ++++---- + src/hb-subset-plan.cc | 2 +- + src/hb-uniscribe.cc | 26 +++++++-------- + src/hb-vector.hh | 56 ++++++++++++++++---------------- + src/test-iter.cc | 4 +-- + 41 files changed, 325 insertions(+), 323 deletions(-) + +commit 2fc1860a5b40f5deba720c0c1099fdd0450b77c0 +Author: Behdad Esfahbod +Date: Fri Dec 21 18:09:45 2018 -0500 + + [iter] Split hb_iter_t<> into hb_iter_t<> and hb_iter_mixin_t<> + + src/hb-iter.hh | 31 ++++++++++++++++++++----------- + src/test-iter.cc | 2 +- + 2 files changed, 21 insertions(+), 12 deletions(-) + +commit 865deeb3be1cb40efe3d7c42db48b0cdf977de47 +Author: Behdad Esfahbod +Date: Fri Dec 21 17:35:58 2018 -0500 + + Adjust internal header dependencies + + src/hb-array.hh | 5 ++++- + src/hb-dsalgs.hh | 1 - + src/hb-iter.hh | 1 + + src/hb-vector.hh | 1 + + src/hb.hh | 15 +++++++++------ + src/test-iter.cc | 1 + + src/test-unicode-ranges.cc | 1 + + 7 files changed, 17 insertions(+), 8 deletions(-) + +commit 8e5c2bc60bd9a800dacc96cc29c6ff831a852ae3 +Author: Behdad Esfahbod +Date: Fri Dec 21 17:29:11 2018 -0500 + + [Makefile.am] Minor + + src/Makefile.am | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit f419cef4174c5447bf5031e771483f3274ae4dce +Author: Behdad Esfahbod +Date: Fri Dec 21 17:22:09 2018 -0500 + + [iter] Include from hb.hh + + src/hb.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 7557e34872c846433c2465b21b99bf7c5f961673 +Author: Behdad Esfahbod +Date: Fri Dec 21 17:21:19 2018 -0500 + + [iter] Move hb_fill() and hb_copy() to hb-iter.hh + + src/hb-iter.hh | 18 ++++++++++++++++++ + src/test-iter.cc | 16 ---------------- + 2 files changed, 18 insertions(+), 16 deletions(-) + +commit 5e1840e031cff1127842fc5cc8ee93e5959f02d5 +Author: Behdad Esfahbod +Date: Fri Dec 21 16:39:57 2018 -0500 + + [iter] Disallow copy-construction or assignment of hb_iter_t<> + + Should only be done by subclass. + + src/hb-iter.hh | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 65e8bd56ad26912636fbdc400a83cc48db2a13ce +Author: Behdad Esfahbod +Date: Fri Dec 21 16:20:30 2018 -0500 + + [iter] Fix hb_copy() return value + + src/test-iter.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 40d71211a8969ec4414d2476a209e60d0a3525d3 +Author: Behdad Esfahbod +Date: Fri Dec 21 16:19:44 2018 -0500 + + [iter] Add const_iter_t / const_iter() + + src/hb-iter.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit aaddfaa57a841726a8b49653af3f8b702831da1b +Author: Behdad Esfahbod +Date: Fri Dec 21 16:04:38 2018 -0500 + + [iter] Make hb_fill() take collection type, not iter + + Starting to get the hang of when take which. + + src/test-iter.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 7b4eea853c36fd59db6e5d68bbef9b8cebad760e +Author: Behdad Esfahbod +Date: Fri Dec 21 16:02:16 2018 -0500 + + [array] Add more hb_array() / hb_sorted_array() variants + + src/hb-array.hh | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +commit 09740148e310021a4a690666c2e2836c2005353d +Author: Behdad Esfahbod +Date: Fri Dec 21 15:56:01 2018 -0500 + + [serialize] Use component_list by reference, as a supplier + + src/hb-ot-layout-gsub-table.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 3dbe1e364c19d82ab436b9ea7b41c9754d43e923 +Author: Behdad Esfahbod +Date: Fri Dec 21 15:53:09 2018 -0500 + + [iter] Add .random_access() + + src/hb-iter.hh | 4 ++++ + src/test-iter.cc | 1 + + 2 files changed, 5 insertions(+) + +commit 20f14b4aa6311d8fb2ed80c47bb15e8d87d2f6b3 +Author: Behdad Esfahbod +Date: Fri Dec 21 15:19:22 2018 -0500 + + [iter] Fix __end__() + + src/hb-iter.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 95265aeab7da54f31d4f68590af7730054b6be16 +Author: Behdad Esfahbod +Date: Fri Dec 21 15:12:55 2018 -0500 + + [array] Remove copy constructor + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1502 + + src/hb-array.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 69d232eaea323b8c42e5fa1788553ac4e8bf3a50 +Author: Behdad Esfahbod +Date: Fri Dec 21 15:08:06 2018 -0500 + + Fix bot + + C:\projects\harfbuzz\src\hb-uniscribe.cc(709): error C2666: 'hb_vector_t::operator +': 3 overloads have similar conversions [C:\projects\harfbuzz\build\harfbuzz.vcxproj] + + src/hb-uniscribe.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b9a51f531009ce201b86a0326aff662fd19a68a1 +Author: Behdad Esfahbod +Date: Fri Dec 21 15:05:00 2018 -0500 + + Minor + + src/hb-ot-layout-gpos-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bdb6da72267c8fa4802a2183ba69a1535653378b +Author: Behdad Esfahbod +Date: Fri Dec 21 11:20:27 2018 -0500 + + [iter] Fix test again + + src/test-iter.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit e9520752489298e0ce1a08da10ec3d439f9356d9 +Author: Behdad Esfahbod +Date: Fri Dec 21 11:15:16 2018 -0500 + + Minor + + src/Makefile.am | 6 +++--- + src/test-iter.cc | 1 - + 2 files changed, 3 insertions(+), 4 deletions(-) + +commit 35503d7d7324293162b605ffe0bd712656dd52b8 +Author: Behdad Esfahbod +Date: Fri Dec 21 03:03:46 2018 -0500 + + [iter] More prototyping + + src/test-iter.cc | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit 73c7a896d1395539e3c9e71b073ce5094c835aa0 +Author: Behdad Esfahbod +Date: Fri Dec 21 02:48:28 2018 -0500 + + [iter] Make hb_fill() and hb_copy() take iterators + + I'm still going back and force... + + src/test-iter.cc | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +commit 12e506fda4bfd82d67e4beede29ae7dbc02ad8f4 +Author: Behdad Esfahbod +Date: Fri Dec 21 02:47:04 2018 -0500 + + [iter] Add hb_fill() + + src/test-iter.cc | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +commit ad3ed58de5297930826c67d18b99991b93d29654 +Author: Behdad Esfahbod +Date: Fri Dec 21 02:12:55 2018 -0500 + + [iter] Start prototyping hb_copy() + + src/test-iter.cc | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +commit 44af738d19486095c0fbc2ef2b359a298126ac2b +Author: Behdad Esfahbod +Date: Fri Dec 21 01:59:37 2018 -0500 + + [iter] Showcase implicit casts + + src/test-iter.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 879faa2aee74e237594901426096ceeb78a716a4 +Author: Behdad Esfahbod +Date: Fri Dec 21 01:57:40 2018 -0500 + + Rename + + src/hb-array.hh | 2 +- + src/hb-open-type.hh | 4 ++-- + src/hb-vector.hh | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit aeb696a91cd1cdc73bf5b87e56163c7f64778616 +Author: Behdad Esfahbod +Date: Fri Dec 21 01:57:02 2018 -0500 + + [iter] Rename + + src/hb-iter.hh | 44 ++++++++++++++++++++++---------------------- + 1 file changed, 22 insertions(+), 22 deletions(-) + +commit 8001e00a470ad06f0307002b4cade5612ee7b521 +Author: Behdad Esfahbod +Date: Fri Dec 21 01:53:27 2018 -0500 + + [iter] First sample use + + src/Makefile.am | 5 ++++- + src/hb-iter.hh | 25 +++++++++++-------------- + src/test-iter.cc | 25 ++++++++++++++++++++----- + 3 files changed, 35 insertions(+), 20 deletions(-) + +commit 19d2b5013d8ac7aa45b3b8e8c61ad90773c86925 +Author: Behdad Esfahbod +Date: Fri Dec 21 01:17:35 2018 -0500 + + [iter] Add bidirectionality + + src/hb-iter.hh | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +commit 314d8698d0746416efd332f5fae45aecb26df7ee +Author: Behdad Esfahbod +Date: Fri Dec 21 00:54:55 2018 -0500 + + [iter] Sketch new iterator design + + src/hb-iter.hh | 154 +++++++++++++++++++------------------------------------ + src/test-iter.cc | 16 ++++++ + 2 files changed, 69 insertions(+), 101 deletions(-) + +commit f6d5f1e91ced2b6b1114ad765f568f799dd3612f +Author: Behdad Esfahbod +Date: Fri Dec 21 00:23:34 2018 -0500 + + [iter] Add empty test + + src/Makefile.am | 7 +++++-- + src/hb-machinery.hh | 1 - + src/test-iter.cc | 33 +++++++++++++++++++++++++++++++++ + src/test-unicode-ranges.cc | 2 -- + 4 files changed, 38 insertions(+), 5 deletions(-) + +commit b80b97b549dacc10d314bf8b5fd4ace596ccdfe1 +Author: Behdad Esfahbod +Date: Fri Dec 21 00:08:05 2018 -0500 + + Revert "Remove unused hb-iter.hh" + + This reverts commit 969ff3c7aadbe721cdd414488eb170433f10d00c. + + src/Makefile.sources | 1 + + src/hb-iter.hh | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-machinery.hh | 1 + + 3 files changed, 148 insertions(+) + +commit a728c63a98281fd4a0661e17fc01171bc3205b27 +Author: Behdad Esfahbod +Date: Thu Dec 20 23:15:49 2018 -0500 + + [vector] Add operator bool + + src/hb-vector.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit bd369773921b4891996bd21f325702e490f47ca4 +Author: Behdad Esfahbod +Date: Thu Dec 20 23:14:24 2018 -0500 + + Rename + + src/hb-array.hh | 2 +- + src/hb-open-type.hh | 4 ++-- + src/hb-vector.hh | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit e6ebc9b6f89e62d888b3bcf926afd624f16f3e95 +Author: Behdad Esfahbod +Date: Thu Dec 20 23:13:36 2018 -0500 + + Remove unused typedef + + src/hb-machinery.hh | 3 --- + 1 file changed, 3 deletions(-) + +commit 4941e95f10fe0fe658752134a42b58896fb19c42 +Author: Behdad Esfahbod +Date: Thu Dec 20 21:48:57 2018 -0500 + + 2.3.0 + + NEWS | 15 +++++++++++++++ + configure.ac | 2 +- + src/hb-aat-layout.cc | 6 +++--- + src/hb-version.h | 4 ++-- + 4 files changed, 21 insertions(+), 6 deletions(-) + +commit 87f7c83fffb7e64970be23c8e3c620d32a3b8f5b +Author: Behdad Esfahbod +Date: Thu Dec 20 15:54:17 2018 -0500 + + [serializer] Add operator << + + Not sure if we are going to use it. But might incentivize us to. + + src/hb-machinery.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5b70074edf1c12a9442037d54c03d3025bd93995 +Author: Behdad Esfahbod +Date: Thu Dec 20 15:38:59 2018 -0500 + + Add hb_assign(obj, value) + + src/hb-machinery.hh | 2 +- + src/hb-null.hh | 24 +++++++++++++++++++++++- + src/hb-open-type.hh | 5 +++-- + 3 files changed, 27 insertions(+), 4 deletions(-) + +commit 6124123393eabb77d34830c971ec463998d50aba +Author: Behdad Esfahbod +Date: Thu Dec 20 12:26:30 2018 -0500 + + [serialize] Adjust ClassDef + + [skip ci] + + src/hb-ot-layout-common.hh | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +commit 4220b7bdd7706622563401bf8f055c4b1482b4e5 +Author: Behdad Esfahbod +Date: Thu Dec 20 11:48:45 2018 -0500 + + Fix code on big-endian gcc / clang + + Ouch! We need a bigendian bot... + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1498 + + src/hb-machinery.hh | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit c87ee72232416099a73b563ca7aaf293b1c87b2a +Author: Behdad Esfahbod +Date: Wed Dec 19 22:28:16 2018 -0500 + + Minor [skip ci] + + src/hb-dsalgs.hh | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit 5000a59a6391d588c2cbdda132839b1fb1f75bf2 +Author: Behdad Esfahbod +Date: Wed Dec 19 21:07:53 2018 -0500 + + [saitnize] Minor + + src/hb-machinery.hh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 3ee4ea945674c4b96c9aa6b0367bbf22dc8745d1 +Author: fanc999 +Date: Thu Dec 20 11:26:54 2018 +0800 + + Fix build on older Visual Studio versions (#1499) + + * src/hb-cff-interp-dict-common.hh: Use ull for unsigned int64_t + + The llu suffix does not work for older Visual Studio versions + (pre-2013), but ull works for all the compilers that we attempt to + support. + + * test/api: Fix build on pre-C99 compilers + + Ensure variables are declared at the top of the block. + + * src/hb-dsalgs.hh: Add specialization for hb_is_signed<> for __int8 + + Pre-Visual Studio 2010 does not consider __int8 (which is typedef'ed to + int8_t) to be equivilant to signed char, so the compiler cannot find the + corresponding hb_is_signed<> specialization that is needed. + + The interesting thing is unsigned __int8 is considered to be equivilant + to unsigned char, so as the other types (short, int, long) that we look + for here, so only the specialization for __int8 is added here. + + This will fix builds on Visual Studio 2008 at least. + + src/hb-cff-interp-dict-common.hh | 2 +- + src/hb-dsalgs.hh | 9 +++++++++ + test/api/test-aat-layout.c | 3 ++- + test/api/test-subset-cff1.c | 12 ++++++++---- + 4 files changed, 20 insertions(+), 6 deletions(-) + +commit a62870506d16949582bf0b54e3dc8846b9747a4a +Author: Behdad Esfahbod +Date: Wed Dec 19 21:05:00 2018 -0500 + + [sanitize] Use hb_static_size instead of ::static_size + + https://github.com/harfbuzz/harfbuzz/issues/1496#issuecomment-448818112 + + src/hb-machinery.hh | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit 0c9cd5d5f4d96df77e4298e16c786e67b83f9bc4 +Author: Ebrahim Byagowi +Date: Wed Dec 19 21:18:30 2018 +0330 + + [test] Fix test-name-table.cc leak issue + + Spotted it accidentally but wanted to see if is anything serious so went for fixing it + + src/test-name-table.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 3d9d7dc4dd4be8e746507282569504b511afa709 +Author: Behdad Esfahbod +Date: Tue Dec 18 22:11:23 2018 -0500 + + [arrays] Add hb_ubytes_t for unsigned char + + src/hb-array.hh | 1 + + 1 file changed, 1 insertion(+) + +commit f1e95e40edc871c840abe8a8a695efc252af40f5 +Author: Behdad Esfahbod +Date: Tue Dec 18 16:49:08 2018 -0500 + + [arrays] Remove hb_supplier_t<> + + src/hb-array.hh | 11 -- + src/hb-cff2-interp-cs.hh | 2 +- + src/hb-face.cc | 6 +- + src/hb-open-file.hh | 15 +- + src/hb-open-type.hh | 18 +- + src/hb-ot-cmap-table.hh | 3 +- + src/hb-ot-layout-common.hh | 104 ++++-------- + src/hb-ot-layout-gsub-table.hh | 257 +++++++++++++---------------- + src/hb-ot-shape-complex-arabic-fallback.hh | 23 +-- + 9 files changed, 170 insertions(+), 269 deletions(-) + +commit f9417af29bd5a1d2f5b55389a1cc6f4280b347d8 +Author: Behdad Esfahbod +Date: Tue Dec 18 13:23:32 2018 -0500 + + [serialize] Propagate error from hb-face + + src/hb-face.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 9aebfb418222427a324d911b32abfc11256ca9e3 +Author: Behdad Esfahbod +Date: Tue Dec 18 13:22:17 2018 -0500 + + [serialize] Streamline error propagation + + src/hb-buffer.hh | 2 ++ + src/hb-machinery.hh | 35 ++++++++++++++++++++++++++--------- + src/hb-map.hh | 2 ++ + src/hb-ot-layout-common.hh | 4 ++-- + src/hb-ot-layout-gsub-table.hh | 4 ++-- + src/hb-set.hh | 2 ++ + src/hb-subset.cc | 2 +- + 7 files changed, 37 insertions(+), 14 deletions(-) + +commit 969ff3c7aadbe721cdd414488eb170433f10d00c +Author: Behdad Esfahbod +Date: Mon Dec 17 22:43:00 2018 -0500 + + Remove unused hb-iter.hh + + The ideas there are all part of hb-array.hh now. To be determined how we + want to use generic iterator patterns. + + src/Makefile.sources | 1 - + src/hb-iter.hh | 146 --------------------------------------------------- + src/hb-machinery.hh | 1 - + 3 files changed, 148 deletions(-) + +commit b1094fc2d2b614c1407b502d15bd98407a5ffb56 +Author: Behdad Esfahbod +Date: Mon Dec 17 22:41:04 2018 -0500 + + [arrays] Minor tweaks to hb_supplier_t + + I think I like to keep this hb_supplier_t thing separately from hb_array_t. + + src/hb-array.hh | 5 +++++ + 1 file changed, 5 insertions(+) + +commit cf39c242057636feebafce347f8e7ac2b305112a +Author: Behdad Esfahbod +Date: Mon Dec 17 22:36:23 2018 -0500 + + [arrays] Rename Supplier to hb_supplier_t + + src/hb-array.hh | 6 +- + src/hb-face.cc | 2 +- + src/hb-open-file.hh | 4 +- + src/hb-open-type.hh | 4 +- + src/hb-ot-cmap-table.hh | 2 +- + src/hb-ot-layout-common.hh | 34 ++++----- + src/hb-ot-layout-gsub-table.hh | 108 ++++++++++++++--------------- + src/hb-ot-shape-complex-arabic-fallback.hh | 14 ++-- + 8 files changed, 87 insertions(+), 87 deletions(-) + +commit 6b5eaa753047b6b0389cb7521c52efbaccf72daf +Author: Behdad Esfahbod +Date: Mon Dec 17 21:55:33 2018 -0500 + + Hide hb_addressof() + + src/hb-dsalgs.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6befa75cdf83d561de69fb342f68694cd7b46f5e +Author: Behdad Esfahbod +Date: Mon Dec 17 20:34:51 2018 -0500 + + Enable __builtin_* on clang + + We'll see which old clang versions this breaks... + + src/hb-dsalgs.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 8d2d41025619e24160ed80edd1c413168a2dda36 +Author: Behdad Esfahbod +Date: Mon Dec 17 20:23:26 2018 -0500 + + Add hb_addressof() and use it to fix bug after hb_bytes_t merge + + We cannot take address hb_bytes_t direction. We need to use the + newly added hb_addressof(), ala std::addressof(). + + src/hb-dsalgs.hh | 9 +++++++++ + src/hb-ot-post-table.hh | 3 ++- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 49334f9b509fc15e8baa93d49b86886ca933de04 +Author: Behdad Esfahbod +Date: Mon Dec 17 18:27:36 2018 -0500 + + Enable system extensions in hb.hh + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1491 + + configure.ac | 1 - + src/hb.hh | 26 ++++++++++++++++++++++++++ + 2 files changed, 26 insertions(+), 1 deletion(-) + +commit 37c14bc7459e8b9cc0840b68223123ffb950b4cc +Author: prrace +Date: Mon Dec 17 14:59:37 2018 -0800 + + Fix Solaris use after free (#1495) + + src/hb-atomic.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 483f2491e40ccf660836ed2797738297e40bd100 +Author: Behdad Esfahbod +Date: Mon Dec 17 17:56:10 2018 -0500 + + Remove define GNU_SOURCE + + Not needed. We get it in our config.h automatically thanks to + AC_USE_SYSTEM_EXTENSIONS. Let's see whose build it breaks... + If we end up putting it back, we should add other things from + that macro and remove the macro. + + src/hb.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit 87ff65aea117391c732d51d874964b3e32d6fa94 +Author: Behdad Esfahbod +Date: Mon Dec 17 17:19:42 2018 -0500 + + Fix more warnings + + src/hb.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f9d219a17417f61fa2c6152d2181504866583a72 +Author: prrace +Date: Mon Dec 17 14:18:47 2018 -0800 + + Fix Solaris Trailing comma in enum warnings (#1490) + + src/hb-ot-color.h | 2 +- + src/hb-ot-name.h | 2 +- + src/hb-ot-var.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 244a8627f7b0ed651d6010c7ee7e54fa8fcca400 +Author: Ebrahim Byagowi +Date: Mon Dec 17 21:31:43 2018 +0330 + + Lower coretext_aat shaper priority (#1488) + + Related to https://github.com/harfbuzz/harfbuzz/issues/1478 + + src/hb-shaper-list.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit e41200859997ccf8fd7d36fff654f3ceea3a4160 +Author: Ebrahim Byagowi +Date: Mon Dec 17 21:31:01 2018 +0330 + + Remove redundant void from C++ sources (#1486) + + src/dump-indic-data.cc | 2 +- + src/dump-khmer-data.cc | 2 +- + src/dump-myanmar-data.cc | 2 +- + src/dump-use-data.cc | 2 +- + src/hb-aat-fdsc-table.hh | 4 +- + src/hb-aat-layout-common.hh | 23 +++--- + src/hb-aat-layout-feat-table.hh | 8 +-- + src/hb-aat-layout-just-table.hh | 2 +- + src/hb-aat-layout-kerx-table.hh | 21 +++--- + src/hb-aat-layout-morx-table.hh | 10 +-- + src/hb-aat-layout-trak-table.hh | 4 +- + src/hb-aat-layout.cc | 6 +- + src/hb-aat-map.hh | 4 +- + src/hb-array.hh | 24 +++---- + src/hb-atomic.hh | 18 ++--- + src/hb-blob.cc | 8 +-- + src/hb-blob.hh | 33 ++++----- + src/hb-buffer-serialize.cc | 2 +- + src/hb-buffer.cc | 24 +++---- + src/hb-buffer.hh | 51 ++++++------- + src/hb-cache.hh | 6 +- + src/hb-cff-interp-common.hh | 113 +++++++++++++---------------- + src/hb-cff-interp-cs-common.hh | 26 +++---- + src/hb-cff-interp-dict-common.hh | 12 ++-- + src/hb-cff1-interp-cs.hh | 4 +- + src/hb-cff2-interp-cs.hh | 24 +++---- + src/hb-common.cc | 20 +++--- + src/hb-coretext.cc | 2 +- + src/hb-debug.hh | 6 +- + src/hb-directwrite.cc | 16 ++--- + src/hb-dsalgs.hh | 2 +- + src/hb-face.cc | 6 +- + src/hb-face.hh | 8 +-- + src/hb-font.cc | 6 +- + src/hb-font.hh | 6 +- + src/hb-ft.cc | 18 ++--- + src/hb-glib.cc | 8 +-- + src/hb-gobject-enums.cc.tmpl | 2 +- + src/hb-gobject-enums.h.tmpl | 2 +- + src/hb-gobject-structs.cc | 2 +- + src/hb-icu.cc | 8 +-- + src/hb-iter.hh | 15 ++-- + src/hb-machinery.hh | 150 ++++++++++++++++----------------------- + src/hb-map.cc | 4 +- + src/hb-map.hh | 24 +++---- + src/hb-mutex.hh | 10 +-- + src/hb-null.hh | 32 ++++----- + src/hb-object.hh | 22 +++--- + src/hb-open-file.hh | 32 ++++----- + src/hb-open-type.hh | 66 +++++++++-------- + src/hb-ot-cff-common.hh | 30 ++++---- + src/hb-ot-cff1-table.cc | 17 ++--- + src/hb-ot-cff1-table.hh | 52 ++++++-------- + src/hb-ot-cff2-table.cc | 8 +-- + src/hb-ot-cff2-table.hh | 34 ++++----- + src/hb-ot-cmap-table.hh | 10 +-- + src/hb-ot-color-cbdt-table.hh | 4 +- + src/hb-ot-color-colr-table.hh | 2 +- + src/hb-ot-color-cpal-table.hh | 10 +-- + src/hb-ot-color-sbix-table.hh | 11 ++- + src/hb-ot-color-svg-table.hh | 7 +- + src/hb-ot-face.cc | 2 +- + src/hb-ot-face.hh | 2 +- + src/hb-ot-font.cc | 8 +-- + src/hb-ot-glyf-table.hh | 6 +- + src/hb-ot-hdmx-table.hh | 4 +- + src/hb-ot-head-table.hh | 8 +-- + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-ot-kern-table.hh | 20 +++--- + src/hb-ot-layout-base-table.hh | 10 +-- + src/hb-ot-layout-common.hh | 67 +++++++++-------- + src/hb-ot-layout-gdef-table.hh | 20 +++--- + src/hb-ot-layout-gpos-table.hh | 34 ++++----- + src/hb-ot-layout-gsub-table.hh | 24 +++---- + src/hb-ot-layout-gsubgpos.hh | 92 +++++++++++------------- + src/hb-ot-layout-jstf-table.hh | 8 +-- + src/hb-ot-map.cc | 2 +- + src/hb-ot-map.hh | 8 +-- + src/hb-ot-math-table.hh | 11 ++- + src/hb-ot-maxp-table.hh | 5 +- + src/hb-ot-name-table.hh | 6 +- + src/hb-ot-os2-table.hh | 18 ++--- + src/hb-ot-post-table.hh | 4 +- + src/hb-ot-shape.cc | 2 +- + src/hb-ot-shape.hh | 2 +- + src/hb-ot-tag.cc | 4 +- + src/hb-ot-var-fvar-table.hh | 9 ++- + src/hb-ot-var-hvar-table.hh | 9 +-- + src/hb-ot-vorg-table.hh | 2 +- + src/hb-set-digest.hh | 4 +- + src/hb-set.cc | 4 +- + src/hb-set.hh | 38 +++++----- + src/hb-shape-plan.cc | 2 +- + src/hb-shape-plan.hh | 5 +- + src/hb-shape.cc | 10 +-- + src/hb-shaper.cc | 14 ++-- + src/hb-shaper.hh | 6 +- + src/hb-static.cc | 4 +- + src/hb-subset-cff-common.hh | 91 +++++++++++------------- + src/hb-subset-cff1.cc | 20 ++---- + src/hb-subset-cff2.cc | 8 +-- + src/hb-subset-input.cc | 2 +- + src/hb-subset.hh | 4 +- + src/hb-ucdn.cc | 10 +-- + src/hb-unicode.cc | 64 ++++++++--------- + src/hb-uniscribe.cc | 12 ++-- + src/hb-vector.hh | 38 +++++----- + src/hb.hh | 6 +- + src/test-unicode-ranges.cc | 4 +- + util/ansi-print.cc | 6 +- + util/hb-fc.cc | 2 +- + util/hb-shape.cc | 5 +- + util/helper-cairo.cc | 2 +- + util/helper-cairo.hh | 2 +- + util/main-font-text.hh | 2 +- + util/options.cc | 8 +-- + util/options.hh | 22 +++--- + util/view-cairo.hh | 14 ++-- + 118 files changed, 861 insertions(+), 1024 deletions(-) + +commit 7ace10078c23d00da4af0480f91b877faeed3d38 +Author: Ebrahim Byagowi +Date: Mon Dec 17 20:07:04 2018 +0330 + + Minor, fix two more ArrayOf incorrect operator logic + + src/hb-open-type.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a1240383aa82fd88e922a1e751444d14033ae882 +Author: Behdad Esfahbod +Date: Mon Dec 17 10:44:14 2018 -0500 + + [arrays] Minor fix + + src/hb-open-type.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 381c3548e9022a421bcf88db148cc11f337f3b79 +Author: Behdad Esfahbod +Date: Mon Dec 17 00:39:30 2018 -0500 + + [array] Add cast operator to add const to Type + + In lieu of constructor removed in previous commit. + + src/hb-array.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 15acf33c228e0c8e0f8cc6a04e566970164dd5f1 +Author: Behdad Esfahbod +Date: Mon Dec 17 00:38:13 2018 -0500 + + [array] Remove problematic constructor + + src/hb-array.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 470369a871791b610e0c42212558e83baeb83409 +Author: Behdad Esfahbod +Date: Mon Dec 17 00:20:19 2018 -0500 + + [array] Add arithmetic operators + + src/hb-array.hh | 22 ++++++++++++++++++---- + 1 file changed, 18 insertions(+), 4 deletions(-) + +commit 6cd60c2f2aa17e3f02b50c19cf640b3f183f3354 +Author: Behdad Esfahbod +Date: Mon Dec 17 00:09:06 2018 -0500 + + [array] Return Crap instead of Null if Type is not const + + Ouch! + + src/hb-array.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 94e72cf1c9af563fbf522efb7f2e0b1fcd616418 +Author: Behdad Esfahbod +Date: Mon Dec 17 00:06:40 2018 -0500 + + [array] Add operator * + + src/hb-array.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 68d4a5eee0f248891d20d69b897201d105951aef +Author: Behdad Esfahbod +Date: Mon Dec 17 00:02:42 2018 -0500 + + [array] Add constructor from fixed-size array + + src/hb-array.hh | 1 + + src/hb-iter.hh | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit a4354d2fd36377ec8b544c7b88a231cb1273dccd +Author: Behdad Esfahbod +Date: Sun Dec 16 23:57:27 2018 -0500 + + [array] Organize + + src/hb-array.hh | 75 ++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 48 insertions(+), 27 deletions(-) + +commit 84c1865821151d83a8798ae11ebba3329a12c560 +Author: Behdad Esfahbod +Date: Sun Dec 16 23:52:17 2018 -0500 + + [arrays] Reduce Supplier<> even further + + src/hb-array.hh | 24 +++--------------------- + 1 file changed, 3 insertions(+), 21 deletions(-) + +commit 1bcc4fc9f34ab518fc822c9464a73ba3e90f5f1c +Author: Behdad Esfahbod +Date: Sun Dec 16 23:47:56 2018 -0500 + + Whitespace + + src/hb-ot-shape-complex-arabic-fallback.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit f85f6e815f439075f8c6f5391e5c8dfe77e0f00d +Author: Behdad Esfahbod +Date: Sun Dec 16 23:45:07 2018 -0500 + + [array] Add operator += + + src/hb-array.hh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 7c0e3e9b2b077fced829a10f616ed3d6b51c15c4 +Author: Behdad Esfahbod +Date: Sun Dec 16 23:43:17 2018 -0500 + + [array] Add constructor from hb_array_t + + src/hb-array.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 92680361ec68734ad38e2158626feebaf18eec88 +Author: Behdad Esfahbod +Date: Sun Dec 16 23:38:51 2018 -0500 + + [arrays] Move Supplier<> to hb-array.hh + + src/hb-array.hh | 33 +++++++++++++++++++++++++++++++++ + src/hb-machinery.hh | 32 -------------------------------- + 2 files changed, 33 insertions(+), 32 deletions(-) + +commit 2a3fa3f82ffdb778a2d21fc01e859579161237c9 +Author: Behdad Esfahbod +Date: Sun Dec 16 23:33:03 2018 -0500 + + [arrays] Remove unnecessary constructor from Supplier<> + + Looks like operator hb_array_t<> from vector works here. :) + + src/hb-machinery.hh | 5 ----- + 1 file changed, 5 deletions(-) + +commit 507cac4943e987879b95d842fe60643abbf22efa +Author: Behdad Esfahbod +Date: Sun Dec 16 23:31:19 2018 -0500 + + [arrays] Start moving Supplier<> to hb_array_t<> + + src/hb-machinery.hh | 31 +++++++++++-------------------- + 1 file changed, 11 insertions(+), 20 deletions(-) + +commit 1e2c98126e8500ace31483b05d77478afd59bab8 +Author: Behdad Esfahbod +Date: Sun Dec 16 22:30:44 2018 -0500 + + [arrays] Remove unused stride from Supplier + + src/hb-machinery.hh | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +commit 0d0fe9df46c645538feaee1ec99a0108383a3669 +Author: Behdad Esfahbod +Date: Sun Dec 16 22:29:40 2018 -0500 + + [arrays] Remove need of stride in Supplier<> + + src/hb-face.cc | 6 ++---- + src/hb-open-file.hh | 19 +++++++++---------- + src/hb-vector.hh | 2 +- + 3 files changed, 12 insertions(+), 15 deletions(-) + +commit dcfa4a8d711716de88b94a370663e9564e3e7ccc +Author: Behdad Esfahbod +Date: Sun Dec 16 20:40:07 2018 -0500 + + [array] Remove custom hb_bytes_t implementation + + src/hb-array.hh | 67 +++++++++++++++++-------------------------------- + src/hb-machinery.hh | 2 +- + src/hb-ot-name-table.hh | 8 +++--- + src/hb-ot-name.cc | 10 ++++---- + 4 files changed, 33 insertions(+), 54 deletions(-) + +commit 3656f56d47cf6b89a25990d7836704fef79fa5b4 +Author: Behdad Esfahbod +Date: Sun Dec 16 20:35:11 2018 -0500 + + [arrays] Minor + + src/hb-array.hh | 3 ++- + src/hb-open-type.hh | 10 ++++------ + src/hb-vector.hh | 4 +--- + 3 files changed, 7 insertions(+), 10 deletions(-) + +commit aa8f94714ee720c56be1a3406df7bacb0550158c +Author: Behdad Esfahbod +Date: Sun Dec 16 20:20:35 2018 -0500 + + [array] Minor + + src/hb-array.hh | 4 ++++ + src/hb-iter.hh | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 5a552f75468d777d8d4bd3168e28f56a3369eafd +Author: Behdad Esfahbod +Date: Sun Dec 16 20:07:44 2018 -0500 + + [array] Move hb_array_t and related types to hb-array.hh + + src/Makefile.sources | 1 + + src/hb-array.hh | 241 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-dsalgs.hh | 206 ------------------------------------------- + src/hb-machinery.hh | 1 + + src/hb-vector.hh | 2 +- + 5 files changed, 244 insertions(+), 207 deletions(-) + +commit 01d06e34ffa746d3737df00bb692cdb1e859c1c6 +Author: Behdad Esfahbod +Date: Sun Dec 16 14:27:43 2018 -0500 + + Minor change to explicit_operator aesthetics + + src/hb-iter.hh | 2 +- + src/hb-machinery.hh | 2 +- + src/hb-vector.hh | 4 ++-- + src/hb.hh | 4 ++-- + 4 files changed, 6 insertions(+), 6 deletions(-) + +commit b2ebaa9afac0f57006283db92d1f3b4df3d6bd7e +Author: Ebrahim Byagowi +Date: Sun Dec 16 22:38:10 2018 +0330 + + Remove redundant 'inline' from methods (#1483) + + src/hb-aat-fdsc-table.hh | 12 +- + src/hb-aat-layout-ankr-table.hh | 12 +- + src/hb-aat-layout-bsln-table.hh | 13 +- + src/hb-aat-layout-common.hh | 150 +++++++------- + src/hb-aat-layout-feat-table.hh | 46 ++--- + src/hb-aat-layout-just-table.hh | 26 +-- + src/hb-aat-layout-kerx-table.hh | 120 +++++------ + src/hb-aat-layout-lcar-table.hh | 14 +- + src/hb-aat-layout-morx-table.hh | 104 +++++----- + src/hb-aat-layout-trak-table.hh | 28 +-- + src/hb-aat-layout.hh | 2 +- + src/hb-aat-ltag-table.hh | 6 +- + src/hb-aat-map.hh | 7 +- + src/hb-atomic.hh | 26 +-- + src/hb-blob.hh | 32 ++- + src/hb-buffer.hh | 76 ++++--- + src/hb-cache.hh | 10 +- + src/hb-cff-interp-common.hh | 197 +++++++++--------- + src/hb-cff-interp-cs-common.hh | 166 +++++++-------- + src/hb-cff-interp-dict-common.hh | 26 +-- + src/hb-cff1-interp-cs.hh | 21 +- + src/hb-cff2-interp-cs.hh | 48 ++--- + src/hb-common.cc | 13 +- + src/hb-debug.hh | 20 +- + src/hb-directwrite.cc | 2 +- + src/hb-dsalgs.hh | 84 ++++---- + src/hb-face.cc | 2 +- + src/hb-face.hh | 6 +- + src/hb-font.hh | 216 ++++++++++---------- + src/hb-ft.cc | 8 +- + src/hb-glib.cc | 2 +- + src/hb-icu.cc | 2 +- + src/hb-iter.hh | 18 +- + src/hb-kern.hh | 8 +- + src/hb-machinery.hh | 210 +++++++++---------- + src/hb-map.hh | 38 ++-- + src/hb-mutex.hh | 12 +- + src/hb-null.hh | 26 +-- + src/hb-object.hh | 34 ++-- + src/hb-open-file.hh | 92 ++++----- + src/hb-open-type.hh | 253 ++++++++++++----------- + src/hb-ot-cff-common.hh | 177 ++++++++-------- + src/hb-ot-cff1-table.cc | 32 +-- + src/hb-ot-cff1-table.hh | 160 +++++++-------- + src/hb-ot-cff2-table.cc | 16 +- + src/hb-ot-cff2-table.hh | 62 +++--- + src/hb-ot-cmap-table.hh | 185 +++++++++-------- + src/hb-ot-color-cbdt-table.hh | 40 ++-- + src/hb-ot-color-colr-table.hh | 18 +- + src/hb-ot-color-cpal-table.hh | 55 +++-- + src/hb-ot-color-sbix-table.hh | 48 ++--- + src/hb-ot-color-svg-table.hh | 20 +- + src/hb-ot-font.cc | 2 +- + src/hb-ot-gasp-table.hh | 6 +- + src/hb-ot-glyf-table.hh | 37 ++-- + src/hb-ot-hdmx-table.hh | 36 ++-- + src/hb-ot-head-table.hh | 10 +- + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-hmtx-table.hh | 18 +- + src/hb-ot-kern-table.hh | 44 ++-- + src/hb-ot-layout-base-table.hh | 104 +++++----- + src/hb-ot-layout-common.hh | 425 ++++++++++++++++++++------------------- + src/hb-ot-layout-gdef-table.hh | 126 ++++++------ + src/hb-ot-layout-gpos-table.hh | 209 +++++++++---------- + src/hb-ot-layout-gsub-table.hh | 360 ++++++++++++++++----------------- + src/hb-ot-layout-gsubgpos.hh | 353 ++++++++++++++++---------------- + src/hb-ot-layout-jstf-table.hh | 44 ++-- + src/hb-ot-map.hh | 38 ++-- + src/hb-ot-math-table.hh | 142 ++++++------- + src/hb-ot-maxp-table.hh | 12 +- + src/hb-ot-name-table.hh | 21 +- + src/hb-ot-os2-table.hh | 34 ++-- + src/hb-ot-post-table.hh | 26 +-- + src/hb-ot-shape-complex-indic.cc | 10 +- + src/hb-ot-shape-complex-khmer.cc | 10 +- + src/hb-ot-shape.hh | 6 +- + src/hb-ot-stat-table.hh | 16 +- + src/hb-ot-var-avar-table.hh | 8 +- + src/hb-ot-var-fvar-table.hh | 55 +++-- + src/hb-ot-var-hvar-table.hh | 16 +- + src/hb-ot-var-mvar-table.hh | 10 +- + src/hb-ot-vorg-table.hh | 22 +- + src/hb-set-digest.hh | 41 ++-- + src/hb-set.hh | 114 +++++------ + src/hb-shape.cc | 14 +- + src/hb-shaper.cc | 14 +- + src/hb-shaper.hh | 10 +- + src/hb-subset-cff-common.hh | 175 ++++++++-------- + src/hb-subset-cff1.cc | 91 ++++----- + src/hb-subset-cff2.cc | 36 ++-- + src/hb-subset-plan.hh | 12 +- + src/hb-subset.hh | 4 +- + src/hb-ucdn.cc | 2 +- + src/hb-unicode.hh | 26 +-- + src/hb-uniscribe.cc | 16 +- + src/hb-utf.hh | 54 +++-- + src/hb-vector.hh | 86 ++++---- + 97 files changed, 2911 insertions(+), 2987 deletions(-) + +commit 7251c7729061b7df29efe2b466315e96c81ad03f +Author: Behdad Esfahbod +Date: Sat Dec 15 21:00:55 2018 -0500 + + Whitespace + + src/hb-buffer-serialize.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 829b56b1a22736eac49132b2e56dc480157afca2 +Author: Behdad Esfahbod +Date: Sat Dec 15 13:02:13 2018 -0500 + + Whitespace + + src/hb-ot-cff-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 42a1012562c1f020f470526a34b68ed21ad138cc +Author: Behdad Esfahbod +Date: Thu Dec 13 19:39:59 2018 -0500 + + [subset] Actually subset GDEF + + src/hb-subset.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit c9c746c7f6091e575fd74ba8f8cae2c4fd44a1ad +Author: Behdad Esfahbod +Date: Thu Dec 13 18:37:37 2018 -0500 + + [subset] Fix up ClassDef some more + + src/hb-ot-layout-common.hh | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +commit 7ee6128902333716dd8d8df6e38a8d1ebacb0a46 +Author: Behdad Esfahbod +Date: Thu Dec 13 18:32:04 2018 -0500 + + [subset] Fix ClassDefFormat1 subsetting + + src/hb-ot-layout-common.hh | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +commit 1b6d0c44b3067f5840d3fdac99fbc7448d0f37bf +Author: Behdad Esfahbod +Date: Thu Dec 13 18:10:48 2018 -0500 + + [subset] Sketch GDEF subsetting + + src/hb-ot-layout-gdef-table.hh | 20 ++++++++++++++++++++ + src/hb-ot-layout-gsubgpos.hh | 2 ++ + 2 files changed, 22 insertions(+) + +commit 705e2f5056d60c28154004e0c5d3b0ec67fe93c8 +Author: Behdad Esfahbod +Date: Thu Dec 13 17:48:42 2018 -0500 + + [subset] Implement for ClassDef + + src/hb-ot-layout-common.hh | 80 ++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout-gsub-table.hh | 8 ++--- + 2 files changed, 84 insertions(+), 4 deletions(-) + +commit 6e33a3955df77b9d1fda5ea44302d97b21e7871c +Author: Behdad Esfahbod +Date: Thu Dec 13 16:40:01 2018 -0500 + + Minor + + src/hb-machinery.hh | 12 +++++++++--- + src/hb-ot-cmap-table.hh | 3 +-- + src/hb-ot-layout-gsub-table.hh | 8 ++++---- + 3 files changed, 14 insertions(+), 9 deletions(-) + +commit cc65901ca7185df926570d5067ace763a2cc759e +Author: Behdad Esfahbod +Date: Thu Dec 13 16:01:45 2018 -0500 + + [serialize] Implement for ClassDef + + src/hb-ot-layout-common.hh | 33 +++++++++++++++++++++++++++++++-- + 1 file changed, 31 insertions(+), 2 deletions(-) + +commit e5309e4fd8583aa5c5ad9f3934d8aa593c850468 +Author: Behdad Esfahbod +Date: Thu Dec 13 15:57:12 2018 -0500 + + [serialize] Implement for ClassDefFormat2 + + src/hb-ot-layout-common.hh | 50 ++++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 46 insertions(+), 4 deletions(-) + +commit c8b43cbe316b07507aece4dc769f38226cd706da +Author: Behdad Esfahbod +Date: Thu Dec 13 15:50:13 2018 -0500 + + [serialize] Implement for ClassDefFormat1 + + src/hb-ot-layout-common.hh | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +commit 576103132945c9d916514720d4034b398e099cfa +Author: Behdad Esfahbod +Date: Wed Dec 12 21:21:26 2018 -0500 + + [subset] Minor + + src/hb-subset.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 798e98c47bd9fa4d434487ae92e2c88ebb8a19a5 +Author: Michiharu Ariza +Date: Wed Dec 12 18:08:15 2018 -0800 + + [CFF] bad offset in Index (#1476) + + * Update hb-ot-cff-common.hh + + * fix bug + + * bummer fix wasn't hit. refix + + * additional sanity check + + * Added test cases for oss-fuzz issues 11805, 11806 + + src/hb-ot-cff-common.hh | 10 ++++++++-- + ...clusterfuzz-testcase-hb-subset-fuzzer-5643036478930944 | Bin 0 -> 369 bytes + ...clusterfuzz-testcase-hb-subset-fuzzer-5686186874503168 | Bin 0 -> 962 bytes + 3 files changed, 8 insertions(+), 2 deletions(-) + +commit bcb4ecaf68c7219e89a801352bfc6a682b1581ef +Author: Michiharu Ariza +Date: Wed Dec 12 17:36:01 2018 -0800 + + [CFF] check out of range FD index (#1477) + + * add fd index checks to subr subsetter + + also added oss-fuzz test case + + * undid SubrSubsetParam::is_valid + + because already validated by SubrClosures.valid + + src/hb-subset-cff-common.hh | 10 ++++++++++ + ...lusterfuzz-testcase-hb-subset-fuzzer-5762137968869376 | Bin 0 -> 2037 bytes + 2 files changed, 10 insertions(+) + +commit 3f8e7a98d3cc10fefe65b9638c8abdf3ebe152cb +Author: Behdad Esfahbod +Date: Wed Dec 12 11:32:57 2018 -0500 + + [util/hb-subset] Add --layout to keep GDEF/GSUB/GPOS + + Will become default and option removed in the future. + + util/hb-subset.cc | 1 + + util/options.cc | 1 + + util/options.hh | 2 ++ + 3 files changed, 4 insertions(+) + +commit 2cc993e035cb37711f894968246817e53a9e823d +Author: Behdad Esfahbod +Date: Wed Dec 12 10:07:38 2018 -0500 + + [dispatch] Minor + + src/hb-ot-layout-gpos-table.hh | 4 +--- + src/hb-ot-layout-gsub-table.hh | 4 +--- + 2 files changed, 2 insertions(+), 6 deletions(-) + +commit 602fbfe3c96b3f18b0109239528ba18a19be4948 +Author: Behdad Esfahbod +Date: Wed Dec 12 09:56:47 2018 -0500 + + [sanitize] Fix sanitizing sublookup array + + src/hb-ot-layout-common.hh | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit c78e4784fbe06ceb27b54a1d8908016ade071cb4 +Author: Behdad Esfahbod +Date: Wed Dec 12 09:50:18 2018 -0500 + + [dispatch] Minor + + src/hb-machinery.hh | 1 + + src/hb-ot-layout-gsubgpos.hh | 3 --- + src/hb-subset.hh | 1 - + 3 files changed, 1 insertion(+), 4 deletions(-) + +commit f9d211af1d6d78d092038d263b222ec8a65cf09d +Author: Behdad Esfahbod +Date: Wed Dec 12 09:44:30 2018 -0500 + + Revert "Minor fix re sanitize of Lookup subtables" + + This reverts commit 7146718bef81492e13aede0a2801cda1da41ce35. + + Fixing differently. + + src/hb-ot-layout-common.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 7ee5c52345c122436e054062084cd51292b90ad1 +Author: Ebrahim Byagowi +Date: Wed Dec 12 15:14:37 2018 +0330 + + minor style fix, use void in methods on no argument + + src/hb-aat-fdsc-table.hh | 4 +- + src/hb-aat-layout-common.hh | 6 +- + src/hb-aat-layout-feat-table.hh | 4 +- + src/hb-aat-layout-trak-table.hh | 18 +-- + src/hb-aat-layout.cc | 4 +- + src/hb-buffer.cc | 48 +++---- + src/hb-directwrite.cc | 297 +++++++++++++++++++--------------------- + src/hb-dsalgs.hh | 5 +- + src/hb-map.hh | 20 +-- + src/hb-ot-cmap-table.hh | 2 +- + src/hb-ot-color-cbdt-table.hh | 2 +- + src/hb-ot-color-cpal-table.hh | 4 +- + src/hb-ot-color-sbix-table.hh | 10 +- + src/hb-ot-color-svg-table.hh | 15 +- + src/hb-ot-glyf-table.hh | 2 +- + src/hb-ot-hdmx-table.hh | 6 +- + src/hb-ot-layout-base-table.hh | 11 +- + src/hb-ot-os2-table.hh | 15 +- + 18 files changed, 211 insertions(+), 262 deletions(-) + +commit a33f238f8888cc969e1e393deda0518fb8dd6b13 +Merge: 7146718b 1e09add2 +Author: Ebrahim Byagowi +Date: Wed Dec 12 12:44:06 2018 +0330 + + Merge pull request #1474 from fanc999/master.msvc + + Few fixes for Visual Studio builds + +commit 7146718bef81492e13aede0a2801cda1da41ce35 +Author: Behdad Esfahbod +Date: Tue Dec 11 23:44:29 2018 -0500 + + Minor fix re sanitize of Lookup subtables + + We were dereferencing Null pointers and trying to sanitize them, + which is not necessary... + + src/hb-ot-layout-common.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit ce069d193229cde12c77a3f464fc10286bedf5f3 +Author: Behdad Esfahbod +Date: Tue Dec 11 23:07:48 2018 -0500 + + Minor + + src/hb-open-type.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 1aea86944605e7e18acfd2c0a77ba60e62239274 +Author: Behdad Esfahbod +Date: Tue Dec 11 22:53:58 2018 -0500 + + [subset] Map glyphs during SingleSubst subsetting + + Ha! + + src/hb-ot-layout-gsub-table.hh | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 41d1a1c10f7e5ca69a337ae164d270e09b5f93ac +Author: Behdad Esfahbod +Date: Tue Dec 11 22:48:27 2018 -0500 + + [subset] Minor + + src/hb-machinery.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2aba2c6c73301396f7e0e5dee819ab6863e74900 +Author: Behdad Esfahbod +Date: Tue Dec 11 21:18:47 2018 -0500 + + [serialize] Break down assert + + src/hb-machinery.hh | 18 ++++++++---------- + 1 file changed, 8 insertions(+), 10 deletions(-) + +commit 9844c880e280e9cd28dcbeac2e581ac923c5ddf3 +Author: Behdad Esfahbod +Date: Tue Dec 11 17:28:04 2018 -0500 + + Minor + + test/shaping/Makefile.am | 2 ++ + util/Makefile.am | 2 ++ + 2 files changed, 4 insertions(+) + +commit 2941208f1eedabec2715b2a67d40f058df7eb5e6 +Author: Michiharu Ariza +Date: Tue Dec 11 12:21:24 2018 -0800 + + [CFF] oss-fuzz issue 11690 ASSERT: substr.offset >= opStart (#1461) + + * fix oss-fuzz 11690: substr.offset >= opStart + + detect recursive subroutine call & handle as error + + * fix build failure + + * add minimized test case for oss-fuzz 11690 + + * removed asserts + + src/hb-cff-interp-common.hh | 9 ++++----- + src/hb-subset-cff-common.hh | 12 ++++++++++-- + src/hb-subset-cff1.cc | 4 ++-- + src/hb-subset-cff2.cc | 4 ++-- + ...testcase-minimized-hb-subset-fuzzer-5750420593442816 | Bin 0 -> 96091 bytes + 5 files changed, 18 insertions(+), 11 deletions(-) + +commit 333586245cb37668c8a29af17920474c09667f4b +Author: Michiharu Ariza +Date: Tue Dec 11 12:20:20 2018 -0800 + + minimize use of assert: removed or changed to error handling (#1467) + + src/hb-ot-cff-common.hh | 2 +- + src/hb-ot-cff1-table.hh | 12 ++++++++---- + src/hb-subset-cff-common.cc | 6 ++++-- + src/hb-subset-cff-common.hh | 1 - + src/hb-subset-cff1.cc | 22 +++++++++++++++++----- + src/hb-subset-cff2.cc | 14 +++++++++++--- + 6 files changed, 41 insertions(+), 16 deletions(-) + +commit f24498c1e95e816889eb7a2f8b1062bbf15bed1b +Author: Ebrahim Byagowi +Date: Tue Dec 11 23:02:52 2018 +0330 + + [ci] Fix Travis macOS bot ICU issue (#1472) + + .travis.yml | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 9f3a51ddb952e1281f9a656fde7193c3e3b8dad2 +Author: 👻 +Date: Tue Dec 11 13:38:05 2018 -0500 + + [ucdn] Fix header + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1470 + + src/hb-ucdn/ucdn.h | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit b225593d6baf3455e1ac951efc0df5015fdf7c69 +Author: David Corbett +Date: Tue Dec 11 13:19:17 2018 -0500 + + Correct REPLACEMENT CHARACTER's code point to FFFD (#1471) + + test/shaping/hb_test_tools.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 1e09add232e14ef61d2f222a5ee05a2105af64f0 +Author: Chun-wei Fan +Date: Wed Dec 12 01:32:01 2018 +0800 + + test/api: Fix building on pre-C99 compilers + + Ensure variables are declared at the top of the block. + + test/api/hb-test.h | 3 ++- + test/api/test-aat-layout.c | 3 ++- + test/api/test-font.c | 2 +- + test/api/test-map.c | 9 ++++++--- + test/api/test-ot-color.c | 9 +++++---- + test/api/test-ot-face.c | 14 ++++++++------ + test/api/test-ot-name.c | 30 ++++++++++++++++-------------- + test/api/test-ot-tag.c | 11 ++++++----- + 8 files changed, 46 insertions(+), 35 deletions(-) + +commit 09b16c536d31376de771eedde54620dd6c8f39d7 +Author: Chun-wei Fan +Date: Wed Dec 12 01:23:53 2018 +0800 + + CMake: Fix Introspection builds + + We need to add -DHB_AAT_H and -DHB_AAT_H_IN to the flags that are passed + to g-ir-scanner, so that introspection builds can proceed normally. + + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit 1683bb2c9337fa34e5e80d459ab5eab99d7a9804 +Author: Ebrahim Byagowi +Date: Sat Dec 8 13:57:39 2018 +0330 + + [glyf] minor + + src/hb-ot-glyf-table.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit f7cfe99815c07f82d5ad253af1e811db734bf92b +Author: Ebrahim Byagowi +Date: Sat Dec 8 13:40:44 2018 +0330 + + [os2] Move typometrics detection logic to the table (#1465) + + src/hb-ot-hmtx-table.hh | 14 +++++--------- + src/hb-ot-os2-table.hh | 7 ++++--- + 2 files changed, 9 insertions(+), 12 deletions(-) + +commit 47cf9a9633bbff12fef1131e7179dfc351f7e5f3 +Author: Ebrahim Byagowi +Date: Sat Dec 8 10:20:25 2018 +0330 + + Apply non-controversial parts of ot-style (#1464) + + Things to be used in https://github.com/harfbuzz/harfbuzz/pull/1459 + + src/hb-aat-fdsc-table.hh | 29 +++++++++++++++++++++++++--- + src/hb-aat-layout-common.hh | 1 + + src/hb-ot-head-table.hh | 13 +++++++++++++ + src/hb-ot-os2-table.hh | 46 +++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-stat-table.hh | 38 ++++++++++++++++++------------------- + 5 files changed, 105 insertions(+), 22 deletions(-) + +commit 4d809696ef4db046d11072e5433ea5ff36bd7b26 +Author: Michiharu Ariza +Date: Fri Dec 7 20:49:39 2018 -0800 + + fix for issue #1447 (#1462) + + Added case for OpCode_BaseFontName. This opcode in spec but practically unused. + Added a comment for default case which can't be hit + + src/hb-ot-cff1-table.hh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 1abd4fcaec31053b442525d7f240af489c5974b1 +Author: Ebrahim Byagowi +Date: Fri Dec 7 22:34:12 2018 +0330 + + [fdsc] minor + + src/hb-aat-fdsc-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 59345cdef38cf1f514a6a0eb6e8852350acb6166 +Author: Michiharu Ariza +Date: Thu Dec 6 13:36:26 2018 -0800 + + [CFF] Refix oss-fuzz 11714: set_blends (PR #1458) (#1460) + + * pass subarray of stack to set_blends + + * get_subarray to return a value, not ref + + * restored error check (with tweak) + + src/hb-cff-interp-common.hh | 5 +++++ + src/hb-cff2-interp-cs.hh | 14 +++++++++----- + 2 files changed, 14 insertions(+), 5 deletions(-) + +commit 20245f0000a0f04f2ba172b51ce69ee7ebb256aa +Author: Behdad Esfahbod +Date: Thu Dec 6 10:27:37 2018 -0800 + + Fix likely check + + Ouch! + + src/hb-cff-interp-dict-common.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d866e905fd555d393464ed58d5fc11ee453c7ea4 +Author: Behdad Esfahbod +Date: Thu Dec 6 10:26:32 2018 -0800 + + Add default value to first argument of sub_array() + + src/hb-dsalgs.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit f1352f7486caaf6d3480ef2ac6b4719acf73e6a2 +Author: Behdad Esfahbod +Date: Thu Dec 6 10:21:06 2018 -0800 + + Add sub_array to hb_vector_t + + src/hb-vector.hh | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit ca23b719357b01e98a5cf533bbf637d6706a4ec2 +Author: Behdad Esfahbod +Date: Thu Dec 6 10:19:03 2018 -0800 + + Add default-value for second arg of sub_array() + + src/hb-dsalgs.hh | 7 +++---- + src/hb-open-type.hh | 8 ++++---- + 2 files changed, 7 insertions(+), 8 deletions(-) + +commit 6ad3fcddaf2ba8ebc9ad49ff9e7b33b60fcad16a +Merge: f95324a3 ae087d10 +Author: Ebrahim Byagowi +Date: Thu Dec 6 10:21:00 2018 +0330 + + Merge pull request #1458 from harfbuzz/cff-check-blends + + [CFF] oss-fuzz issue 11714: set_blends + +commit ae087d10c22249f3aec3239e4eac98a728f71f75 +Author: Michiharu Ariza +Date: Wed Dec 5 21:47:34 2018 -0800 + + add minimized test case for oss-fuzz issue 11714 + + ...-testcase-minimized-hb-subset-fuzzer-5710107829075968 | Bin 0 -> 3660 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 1ccbdcf73bbc967f5f94c0bc7f7e869bd87d9fa0 +Merge: 14d29a10 f95324a3 +Author: Michiharu Ariza +Date: Wed Dec 5 21:37:38 2018 -0800 + + Merge branch 'master' into cff-check-blends + +commit 14d29a10437205566c4bd7bcfa2282d34d9f4f2f +Author: Michiharu Ariza +Date: Wed Dec 5 21:33:29 2018 -0800 + + check number of blends against args on stack + + src/hb-cff2-interp-cs.hh | 5 +++++ + 1 file changed, 5 insertions(+) + +commit f95324a3351c1f699214ad84d073268218ea83a3 +Merge: 6727c4b6 9d8f3b0d +Author: Ebrahim Byagowi +Date: Thu Dec 6 08:33:44 2018 +0330 + + Merge pull request #1457 from harfbuzz/cff-varstore-sanitize + + [CFF] oss-fuzz issue 11713 (CFF2VariationStore::serialize) + +commit 6727c4b6f0356b08803b4d5cde608ec004e3533f +Merge: d9dabc00 34e3ef8f +Author: Behdad Esfahbod +Date: Wed Dec 5 17:37:21 2018 -0800 + + Merge pull request #1456 from harfbuzz/cff-subr-sanitize + + [CFF] fix oss-fuzz issue 11691 (BlendArg::set_blends) + +commit 9d8f3b0dfbf39f5dfa25d52f47e8af6ad318eb17 +Author: Michiharu Ariza +Date: Wed Dec 5 17:14:51 2018 -0800 + + add minimized test case for oss-fuzz issue 11713 + + ...z-testcase-minimized-hb-subset-fuzzer-5660711141769216 | Bin 0 -> 383 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit c31092ab34641072606f854408eb1bea18ed2507 +Author: Michiharu Ariza +Date: Wed Dec 5 17:04:55 2018 -0800 + + sanitize variationStore in CFF2 against its size + + src/hb-ot-cff2-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 34e3ef8ff394f281b8d7e2c08f346a9495692edc +Merge: 72d8f763 d9dabc00 +Author: Michiharu Ariza +Date: Wed Dec 5 15:50:05 2018 -0800 + + Merge branch 'master' into cff-subr-sanitize + +commit 72d8f76368b264a42fe58438fe15811d458a7935 +Author: Michiharu Ariza +Date: Wed Dec 5 15:49:11 2018 -0800 + + add minimized test case for oss-fuzz issue 11691 + + ...z-testcase-minimized-hb-shape-fuzzer-5686369209286656 | Bin 0 -> 2880 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit d9dabc00e9278a346e85538212c126da7e610d55 +Merge: 81cfd3c7 010e2ddb +Author: Behdad Esfahbod +Date: Wed Dec 5 15:39:34 2018 -0800 + + Merge pull request #1454 from harfbuzz/cff-fixbcd + + [CFF] fix oss-fuzz issue 11674: parse_bcd + +commit 81cfd3c775dbc470f57d7fe2775cc068ffa367b6 +Merge: 8394a6cb 6708c559 +Author: Behdad Esfahbod +Date: Wed Dec 5 15:37:15 2018 -0800 + + Merge pull request #1455 from harfbuzz/cff-strinc_assert + + [CFF] fix oss-fuzz issue 11675 (ASSERT: count <= str.len) + +commit 6dcfda92c17a7701479118751a8290246e9a3c05 +Author: Michiharu Ariza +Date: Wed Dec 5 15:07:46 2018 -0800 + + sanitize CFF1 & CFF2 global subrs + + src/hb-ot-cff1-table.hh | 2 +- + src/hb-ot-cff2-table.hh | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 6708c5595fc6babdae0132f8a23cbe3558a58703 +Author: Michiharu Ariza +Date: Wed Dec 5 12:51:18 2018 -0800 + + fix oss-fuzz issue 11675 (ASSERT: count <= str.len) + + Also added an additional error check to avail () + + src/hb-cff-interp-common.hh | 18 ++++++++++++++++-- + ...stcase-minimized-hb-subset-fuzzer-5768186323009536 | Bin 0 -> 337 bytes + 2 files changed, 16 insertions(+), 2 deletions(-) + +commit 010e2ddb384b5a721172fd7466aafec58dbf8063 +Author: Michiharu Ariza +Date: Wed Dec 5 12:23:58 2018 -0800 + + minimized test case for oss-fuzz issue 11674 + + ...zz-testcase-minimized-hb-subset-fuzzer-5672006905757696 | Bin 0 -> 73 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 2cb9d4c183afc838ecf2ba0d47814e9eaa6f09c6 +Merge: a5fa843c 8394a6cb +Author: Michiharu Ariza +Date: Wed Dec 5 11:25:29 2018 -0800 + + Merge branch 'master' into cff-fixbcd + +commit a5fa843c746e20aaca48ece6cff057deb8d916ca +Author: Michiharu Ariza +Date: Wed Dec 5 11:18:16 2018 -0800 + + fixed a bug with fractional part in a negative value + + src/hb-cff-interp-dict-common.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 8394a6cb252dd8b4230c2b59e8c346ec5403bf88 +Author: Ebrahim Byagowi +Date: Wed Dec 5 15:23:41 2018 +0330 + + [os2] Make newer table fields accessible (#1452) + + src/hb-ot-os2-table.hh | 88 +++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 66 insertions(+), 22 deletions(-) + +commit 5ab086ebb18112ef48bf6c913acc91b2009a9bed +Author: Ebrahim Byagowi +Date: Wed Dec 5 14:17:37 2018 +0330 + + [fdsc] Implement the table parsing + + Related to https://github.com/harfbuzz/harfbuzz/issues/1337 + + May used in addition to an API related to STAT. + + Lots of Apple fonts have it. + + src/Makefile.sources | 1 + + src/hb-aat-fdsc-table.hh | 103 +++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-aat-layout.cc | 1 + + 3 files changed, 105 insertions(+) + +commit 8f80e53341a3d5bac6c2c39ab6d6973eedb0b074 +Author: Ebrahim Byagowi +Date: Wed Dec 5 13:51:14 2018 +0330 + + [gasp] Implement the table parsing + + May or may not be used in https://github.com/harfbuzz/harfbuzz/pull/1432 + + src/Makefile.sources | 1 + + src/hb-ot-gasp-table.hh | 84 +++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout.cc | 5 +-- + 3 files changed, 88 insertions(+), 2 deletions(-) + +commit 79e7e3445efef2dc57f8a10c7e355e802af08868 +Merge: cf4b7db6 78f639b8 +Author: Ebrahim Byagowi +Date: Wed Dec 5 13:25:18 2018 +0330 + + Merge pull request #1449 from harfbuzz/cff-fixcharset + + [CFF] fix for oss-fuzz 11657: Charset overrun + +commit cf4b7db6b1e01c11d7a8a26d95cf947935a234a7 +Merge: 32cc46c7 803d2f92 +Author: Ebrahim Byagowi +Date: Wed Dec 5 13:23:23 2018 +0330 + + Merge pull request #1448 from harfbuzz/cff-leak + + [CFF] fix leak: oss-fuzz 11662 + +commit 620d1ef588c6ce25644891cfe4b9c20fd8a9d1db +Author: Michiharu Ariza +Date: Wed Dec 5 00:36:11 2018 -0800 + + fix unsigned long const + + src/hb-cff-interp-dict-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 28dfb4c14280b05ad0a519f9df2b0eda41a62540 +Author: Michiharu Ariza +Date: Wed Dec 5 00:26:03 2018 -0800 + + fix signed/unsigned comparison + + src/hb-cff-interp-dict-common.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f9cee08edd32182044407bf6ffde00df0feb09b7 +Author: Michiharu Ariza +Date: Tue Dec 4 23:58:26 2018 -0800 + + use sized int types in parse_bcd + + src/hb-cff-interp-dict-common.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit c01a5f32a33fa875de68ca29a4672fd36a05245b +Author: Michiharu Ariza +Date: Tue Dec 4 23:23:23 2018 -0800 + + refix + + src/hb-cff-interp-dict-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 755fefc92113e469a1aadee2546958fede156c01 +Author: Michiharu Ariza +Date: Tue Dec 4 23:18:28 2018 -0800 + + fix bug + + src/hb-cff-interp-dict-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0e81b153aff1f2e301e73ca1a15a9bc5b2e7bb82 +Author: Michiharu Ariza +Date: Tue Dec 4 22:40:07 2018 -0800 + + fix typo + + src/hb-cff-interp-dict-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 85d4b15cd88ce9a6ffccccf90300f9c184166058 +Author: Michiharu Ariza +Date: Tue Dec 4 22:30:33 2018 -0800 + + include float.h + + src/hb-cff-interp-dict-common.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 5a7c371e4c6f1775ebbfe120fafe92afe402a954 +Author: Michiharu Ariza +Date: Tue Dec 4 22:24:38 2018 -0800 + + check overflow & clamp + + src/hb-cff-interp-dict-common.hh | 36 +++++++++++++++++++++++++++--------- + 1 file changed, 27 insertions(+), 9 deletions(-) + +commit 32cc46c75a5f163f254b7998ed9193d5bbc85e4b +Author: Michiharu Ariza +Date: Tue Dec 4 21:32:34 2018 -0800 + + [CFF] fix oss-fuzz issue 11670: NULL dereference (#1450) + + * guard against no subr access + + * code tweak + + * add minimized testcase for oss-fuzz 11670 (Null deference) + + src/hb-cff-interp-cs-common.hh | 22 ++++++++++++++++----- + src/hb-ot-cff-common.hh | 2 +- + ...ase-minimized-hb-subset-fuzzer-5672913680728064 | Bin 0 -> 861 bytes + 3 files changed, 18 insertions(+), 6 deletions(-) + +commit 78f639b8bf508ccfb27224f12442f8e8a1460e08 +Author: Michiharu Ariza +Date: Tue Dec 4 14:17:03 2018 -0800 + + added minimized testcase for oss-fuzz issue 11657 + + ...zz-testcase-minimized-hb-shape-fuzzer-5700264032468992 | Bin 0 -> 648 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit d3d2f32c6e85de1d7fbbb18afef356e09110e61c +Author: Michiharu Ariza +Date: Tue Dec 4 13:51:26 2018 -0800 + + fix oss-fuzz 11657: buffer overrun + + Check overrun in Charset1_2::get_glyph + + src/hb-ot-cff1-table.hh | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit d0a250a7b15f1099c2005bc2427d62e7370dcc33 +Author: Ebrahim Byagowi +Date: Tue Dec 4 23:42:13 2018 +0330 + + Reuse hb_aat_layout_has_* logic in coretext-aat detection logic (#1442) + + src/hb-coretext.cc | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) + +commit 803d2f92dca329a84d92c224a73e13906e8b8d56 +Merge: 6ce8d10b c775adc1 +Author: Michiharu Ariza +Date: Tue Dec 4 11:01:26 2018 -0800 + + Merge branch 'master' into cff-leak + +commit 6ce8d10b45598f5f6dade38e65486f793f33d0b6 +Author: Michiharu Ariza +Date: Tue Dec 4 10:39:17 2018 -0800 + + add unlikely to error handling + + src/hb-ot-cff1-table.hh | 2 +- + src/hb-ot-cff2-table.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b61f74f69a84f427b40deefefed429fbc915981c +Author: Michiharu Ariza +Date: Tue Dec 4 10:30:35 2018 -0800 + + added minimized test case for oss-fuzz issue 11662 + + ...testcase-minimized-hb-shape-fuzzer-5175735354916864 | Bin 0 -> 354461 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 0b952e6026c8be13d16d97f464034ee477e6282f +Author: Michiharu Ariza +Date: Tue Dec 4 10:22:35 2018 -0800 + + more leak fixes + + src/hb-ot-cff1-table.hh | 2 +- + src/hb-ot-cff2-table.hh | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit c775adc1383f72f02b1329628b3eba1dc377a0f7 +Merge: c968869f 04f2ca94 +Author: Ebrahim Byagowi +Date: Tue Dec 4 21:30:07 2018 +0330 + + Merge pull request #1444 from harfbuzz/cff-assert + + removed assert, fixes https://github.com/harfbuzz/harfbuzz/issues/1443 + +commit 9473463f5c884fcb1de8a7ba7410da2601e6ffa8 +Author: Michiharu Ariza +Date: Tue Dec 4 09:58:48 2018 -0800 + + fix attempt for oss-fuzz 11662 leak + + src/hb-ot-cff1-table.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 04f2ca94212983d675ed2cd36350be23ff2a6e19 +Author: Michiharu Ariza +Date: Tue Dec 4 09:24:07 2018 -0800 + + removed assert + + src/hb-ot-cff1-table.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit c968869f212dbfcb86d42fb36049328521cbf00c +Merge: 8c05b955 c48f53d3 +Author: Behdad Esfahbod +Date: Tue Dec 4 04:14:13 2018 -0500 + + Merge pull request #1441 from harfbuzz/cff-doublenum + + use double as CFF Number implementation + +commit c48f53d30901dfc20b7432c2947e66642010dc4e +Author: Michiharu Ariza +Date: Mon Dec 3 16:59:41 2018 -0800 + + more double changes + + src/hb-cff2-interp-cs.hh | 4 ++-- + test/api/test-ot-extents-cff.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 9424e8052686a6a93e0d30e38aecbe927db9d787 +Author: Michiharu Ariza +Date: Mon Dec 3 16:18:10 2018 -0800 + + added minimized test cases + + ...zz-testcase-minimized-hb-shape-fuzzer-5647267827023872 | Bin 0 -> 655 bytes + ...zz-testcase-minimized-hb-shape-fuzzer-5725855502827520 | Bin 0 -> 655 bytes + ...zz-testcase-minimized-hb-shape-fuzzer-5736657639178240 | Bin 0 -> 459 bytes + 3 files changed, 0 insertions(+), 0 deletions(-) + +commit 5fff6ab0024547a8ac47723a0047f4b17416d6ce +Author: Michiharu Ariza +Date: Mon Dec 3 16:06:58 2018 -0800 + + additional precision made a difference in extents test + + src/hb-cff-interp-common.hh | 2 +- + src/hb-cff2-interp-cs.hh | 2 +- + test/api/test-ot-extents-cff.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 9e5180cd444b6900a0fa0c3df4c8138f9a663383 +Author: Michiharu Ariza +Date: Mon Dec 3 15:32:42 2018 -0800 + + more double changes + + src/hb-cff-interp-common.hh | 8 ++++---- + src/hb-cff-interp-dict-common.hh | 10 +++++----- + 2 files changed, 9 insertions(+), 9 deletions(-) + +commit 9af33d7a2ad5ce88fc508bc5c6a56be4650d2621 +Author: Michiharu Ariza +Date: Mon Dec 3 14:48:46 2018 -0800 + + Number to use double for all types + + src/hb-cff-interp-common.hh | 84 +++++++-------------------------------------- + 1 file changed, 13 insertions(+), 71 deletions(-) + +commit 8c05b955eb4aa088b2b5df9b6415863486eaf59c +Merge: d19b1680 01f628cf +Author: Behdad Esfahbod +Date: Mon Dec 3 14:30:51 2018 -0500 + + Merge pull request #1439 from ebraminio/tracking + + [aat] Expose hb_aat_layout_has_tracking API + +commit 01f628cf5571b8b58108ab66cfc3e929c9840e31 +Author: Ebrahim Byagowi +Date: Mon Dec 3 22:04:48 2018 +0330 + + [aat] Expose hb_aat_layout_has_tracking API + + docs/harfbuzz-sections.txt | 7 ++++--- + src/hb-aat-layout.cc | 9 ++++++++- + src/hb-aat-layout.h | 8 ++++++++ + src/hb-aat-layout.hh | 3 --- + test/api/fonts/aat-morx.ttf | Bin 0 -> 1620 bytes + test/api/fonts/aat-trak.ttf | Bin 0 -> 2456 bytes + test/api/test-aat-layout.c | 13 +++++++++++++ + 7 files changed, 33 insertions(+), 7 deletions(-) + +commit d19b1680b53e54f449736432f369a676c394ebf8 +Author: Behdad Esfahbod +Date: Mon Dec 3 10:41:37 2018 -0500 + + [aat] Expose a couple APIs + + New API: + +hb_aat_layout_has_substitution() + +hb_aat_layout_has_positioning() + + docs/harfbuzz-sections.txt | 2 ++ + src/hb-aat-layout.cc | 20 ++++++++++++++++---- + src/hb-aat-layout.h | 16 ++++++++++++++++ + src/hb-aat-layout.hh | 6 ------ + 4 files changed, 34 insertions(+), 10 deletions(-) + +commit 84efe0438e1cfc5b070e114b70e8c070be6119ca +Author: Behdad Esfahbod +Date: Sun Dec 2 12:38:53 2018 -0500 + + [aat] Fix division sign fallout + + Happened after 11d2f49af8f53340134c844173f4d8655b00dea3 + since now nClasses is unsigned int... + + src/hb-aat-layout-common.hh | 2 +- + ...zz-testcase-minimized-hb-shape-fuzzer-5768046065483776 | Bin 0 -> 342 bytes + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit 2087f5a2a743380b36399ba8a2b4ff9e93890fcf +Author: Behdad Esfahbod +Date: Sat Dec 1 20:04:45 2018 -0500 + + Add casts to hb_array_t<> + + src/hb-open-type.hh | 13 ++++++++++--- + src/hb-vector.hh | 2 ++ + 2 files changed, 12 insertions(+), 3 deletions(-) + +commit 58d4d19947794aded4e966290b01e1034f216a7d +Author: Behdad Esfahbod +Date: Sat Dec 1 19:34:18 2018 -0500 + + Simplify build source list + + CMakeLists.txt | 12 +-- + src/Makefile.am | 6 -- + src/Makefile.sources | 231 ++++++++++++++++++++++++--------------------------- + 3 files changed, 111 insertions(+), 138 deletions(-) + +commit 967a204ee92548163a0d19678a237dcaf3720c20 +Author: Behdad Esfahbod +Date: Sat Dec 1 19:28:17 2018 -0500 + + Minor + + test/api/hb-subset-test.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 11d2f49af8f53340134c844173f4d8655b00dea3 +Author: Behdad Esfahbod +Date: Sat Dec 1 13:12:21 2018 -0500 + + New approach to change BigEndian casts to be int-sized + + Fixes spurious warnings like: + Fixes https://github.com/harfbuzz/harfbuzz/issues/1436 + + src/hb-open-type.hh | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit 50e0273ab18acd2fbb21bcf18ad487092e890b4e +Author: Behdad Esfahbod +Date: Sat Dec 1 13:03:52 2018 -0500 + + Change hb_assert_unsigned_t<> to hb_is_signed<> + + src/hb-dsalgs.hh | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +commit c3a8b047aab47e40dc107a952b3a1472068ec932 +Author: Behdad Esfahbod +Date: Sat Dec 1 00:14:48 2018 -0500 + + Revert "Change BigEndian casts to be int-sized" + + This reverts commit eb5ddd32bf4e458ca0af8d5784f8fd46485ad225. + + Broke tests, badly. To be investigated and reenabled. + + src/hb-open-type.hh | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit be45677ab605efc711a433323d66e4051c289252 +Author: Behdad Esfahbod +Date: Sat Dec 1 00:04:29 2018 -0500 + + Minor + + src/hb-ot-layout-gsub-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit eb5ddd32bf4e458ca0af8d5784f8fd46485ad225 +Author: Behdad Esfahbod +Date: Sat Dec 1 00:03:01 2018 -0500 + + Change BigEndian casts to be int-sized + + Fixes spurious warnings like: + Fixes https://github.com/harfbuzz/harfbuzz/issues/1436 + + src/hb-open-type.hh | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit e8860fdcaa69e3452edd903f78599bc8fa9d109c +Author: Behdad Esfahbod +Date: Fri Nov 30 23:38:24 2018 -0500 + + Fix more warning + + src/hb-ot-cff-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit af349ee3487b31c2328f0a37a43d31b248ed14e5 +Author: Behdad Esfahbod +Date: Fri Nov 30 23:20:50 2018 -0500 + + Fix warning + + src/hb-ot-cff-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 825df6dbc7fd013c68d7b5672f81e69b69bc14e7 +Author: Behdad Esfahbod +Date: Fri Nov 30 23:04:59 2018 -0500 + + [CFF] Change spaces to tabs + + src/hb-cff-interp-common.hh | 389 ++++++++++++++++----------------- + src/hb-cff-interp-cs-common.hh | 324 ++++++++++++++-------------- + src/hb-cff-interp-dict-common.hh | 190 ++++++++-------- + src/hb-cff1-interp-cs.hh | 72 +++---- + src/hb-cff2-interp-cs.hh | 76 +++---- + src/hb-ot-cff-common.hh | 128 +++++------ + src/hb-ot-cff1-table.cc | 4 +- + src/hb-ot-cff1-table.hh | 456 +++++++++++++++++++-------------------- + src/hb-ot-cff2-table.cc | 4 +- + src/hb-ot-cff2-table.hh | 216 +++++++++---------- + src/hb-subset-cff-common.cc | 76 +++---- + src/hb-subset-cff-common.hh | 384 ++++++++++++++++----------------- + src/hb-subset-cff1.cc | 416 +++++++++++++++++------------------ + src/hb-subset-cff1.hh | 2 +- + src/hb-subset-cff2.cc | 240 ++++++++++----------- + src/hb-subset-cff2.hh | 2 +- + 16 files changed, 1492 insertions(+), 1487 deletions(-) + +commit 592f39b3c4ed04a6f6cf129020358e64782c7108 +Author: Behdad Esfahbod +Date: Fri Nov 30 22:54:57 2018 -0500 + + [CFF] Whitespace + + src/hb-cff-interp-common.hh | 7 +++---- + src/hb-cff-interp-cs-common.hh | 6 +++--- + src/hb-cff-interp-dict-common.hh | 6 +++--- + src/hb-cff2-interp-cs.hh | 2 +- + src/hb-ot-cff-common.hh | 12 ++++++------ + src/hb-ot-cff1-table.hh | 30 +++++++++++++++--------------- + src/hb-ot-cff2-table.hh | 12 ++++++------ + src/hb-subset-cff-common.cc | 8 ++++---- + src/hb-subset-cff-common.hh | 34 +++++++++++++++++----------------- + src/hb-subset-cff1.cc | 20 ++++++++++---------- + src/hb-subset-cff2.cc | 18 +++++++++--------- + 11 files changed, 77 insertions(+), 78 deletions(-) + +commit a2e8d1d455c5d0ae22927567cf8a9a2539cd3470 +Author: Behdad Esfahbod +Date: Fri Nov 30 22:54:20 2018 -0500 + + Minor + + src/Makefile.sources | 27 +++++++++++++-------------- + 1 file changed, 13 insertions(+), 14 deletions(-) + +commit e3dc47c6357813d2dd098aad312d79e9d7c2aa18 +Author: Behdad Esfahbod +Date: Fri Nov 30 22:43:22 2018 -0500 + + Remove generated files that were accidentally added by CFF2 branch + + gtk-doc.make | 320 -- + m4/libtool.m4 | 8369 ----------------------------------------------------- + m4/ltoptions.m4 | 437 --- + m4/ltsugar.m4 | 124 - + m4/ltversion.m4 | 23 - + m4/lt~obsolete.m4 | 99 - + 6 files changed, 9372 deletions(-) + +commit 5e64e0f53259dbc0a3ea8e220ded15e85bbc1782 +Merge: 09096aa8 d8c69137 +Author: Behdad Esfahbod +Date: Fri Nov 30 22:40:54 2018 -0500 + + Merge pull request #1113 from harfbuzz/cff-subset + + CFF/CFF2 subsetter + +commit 09096aa89f1944dff94a5518bce578eba8989e74 +Author: Bruce Mitchener +Date: Sat Dec 1 10:22:49 2018 +0700 + + Use nullptr instead of 0/NULL. (#1435) + + * Use nullptr instead of 0/NULL. + + * Update test-name-table.cc + + src/hb-debug.hh | 2 +- + src/test-name-table.cc | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit d8c69137655fbe9678d1dfef0eb3c4172f8bbfc0 +Author: Michiharu Ariza +Date: Fri Nov 30 18:58:14 2018 -0800 + + undo 0u + + src/hb-cff2-interp-cs.hh | 2 +- + src/hb-ot-cff1-table.hh | 4 ++-- + src/hb-ot-vorg-table.hh | 2 +- + src/hb-subset-cff-common.hh | 4 ++-- + src/hb-subset-cff1.cc | 4 ++-- + 5 files changed, 8 insertions(+), 8 deletions(-) + +commit 2c859b3880868b30823eb00bed90dc0de873628b +Merge: 9483da14 bb72de66 +Author: Michiharu Ariza +Date: Fri Nov 30 18:47:34 2018 -0800 + + Merge branch 'master' into cff-subset + +commit bb72de66ddf3ae9ae53cf68642cb228e88aa64f5 +Merge: fedd8e6c fb059082 +Author: Behdad Esfahbod +Date: Fri Nov 30 21:36:35 2018 -0500 + + Merge pull request #1433 from harfbuzz/overload-overload + + Fix ambiguous overload errors with old compilers + +commit fb059082138bf17a5a8616410d9a35f927f9fd85 +Author: Behdad Esfahbod +Date: Fri Nov 30 20:45:40 2018 -0500 + + Revert ugly fixes + + Now that we have 6daf45e0, revert cryptic hacks... + + This reverts commit abd81ed4f5cbc5a94171747909bc6b77551cb929. + This reverts commit 9c6921c08c905a0cf45ba0182134e6ff910fac51. + This reverts commit d39760cabfe4007cefdfc45231e85e93fababac2. + This reverts commit fedd8e6c176dea85194693399e50243eb1c117c4. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1374 + + src/hb-aat-layout-morx-table.hh | 4 ++-- + src/hb-face.cc | 4 ++-- + src/hb-machinery.hh | 4 ++-- + src/hb-ot-color-cpal-table.hh | 2 +- + src/hb-ot-kern-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 32 ++++++++++++++++---------------- + src/hb-ot-layout-gsubgpos.hh | 14 +++++++------- + 7 files changed, 31 insertions(+), 31 deletions(-) + +commit dfad19ad5aefdacecca6af81917abc2670d4416f +Author: Behdad Esfahbod +Date: Fri Nov 30 19:57:12 2018 -0500 + + Make operator [] take signed int + + The built-in operator takes signed int. So, match it, such that + the built-in is never a better or equally-good match to our operator. + Fixes "ambiguous overload" errors from gcc 4.2 and VS 2008. + + See https://github.com/harfbuzz/harfbuzz/issues/1374 + + src/hb-dsalgs.hh | 3 ++- + src/hb-open-type.hh | 42 ++++++++++++++++++++++++++++-------------- + src/hb-vector.hh | 6 ++++-- + 3 files changed, 34 insertions(+), 17 deletions(-) + +commit 9483da145d6da1bdfa3224fe13a5b4e9b449d19f +Author: Michiharu Ariza +Date: Fri Nov 30 16:59:41 2018 -0800 + + redo fixes + + src/hb-cff2-interp-cs.hh | 2 +- + src/hb-ot-cff1-table.hh | 4 ++-- + src/hb-subset-cff-common.hh | 6 +++--- + src/hb-subset-cff1.cc | 4 ++-- + 4 files changed, 8 insertions(+), 8 deletions(-) + +commit 291da448237cdc0b5534fbc1ce2288e1aa8e7b8a +Author: Michiharu Ariza +Date: Fri Nov 30 16:50:46 2018 -0800 + + yet another + + src/hb-subset-cff-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b1821b9d092e4fd7fd888f4bffc341283bace461 +Author: Michiharu Ariza +Date: Fri Nov 30 16:31:01 2018 -0800 + + some more + + src/hb-subset-cff-common.hh | 4 ++-- + src/hb-subset-cff1.cc | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 9784cff55688d1ee93275e39c2339d5a486ed78b +Author: Michiharu Ariza +Date: Fri Nov 30 16:07:08 2018 -0800 + + fix another pesky gcc error + + src/hb-cff2-interp-cs.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 23a797b44365ed76fc7db25be13bd9c3580a8695 +Author: Michiharu Ariza +Date: Fri Nov 30 15:15:31 2018 -0800 + + silence picky gcc errors + + src/hb-ot-cff1-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9ae954f43ad1eb703d54db98ce46157370b71a9c +Merge: 471db3aa fedd8e6c +Author: Michiharu Ariza +Date: Fri Nov 30 15:00:52 2018 -0800 + + Merge branch 'master' into cff-subset + +commit fedd8e6c176dea85194693399e50243eb1c117c4 +Author: Behdad Esfahbod +Date: Fri Nov 30 16:50:30 2018 -0500 + + One more......... + + I wonder if there's something better to do about these :(. + + In file included from hb-ot-color.cc:31: + hb-ot-color-cpal-table.hh: In member function 'unsigned int OT::CPAL::get_size() const': + hb-ot-color-cpal-table.hh:118: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: + + src/hb-ot-color-cpal-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bc5db9b0807767ac04d6e50070d69cb9c520f06e +Author: Behdad Esfahbod +Date: Fri Nov 30 16:04:52 2018 -0500 + + One more.... + + hb-ot-vorg-table.hh:96: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: + hb-vector.hh:87: note: candidate 1: const Type& hb_vector_t::operator[](unsigned int) const [with Type = OT::VertOriginMetric, unsigned int PreallocedCount = 8u] + hb-ot-vorg-table.hh:96: note: candidate 2: operator[](const T*, int) + + src/hb-ot-vorg-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d39760cabfe4007cefdfc45231e85e93fababac2 +Author: Behdad Esfahbod +Date: Fri Nov 30 15:55:30 2018 -0500 + + One more... + + Sigh. + + hb-ot-kern-table.hh: In member function 'int OT::KernSubTableFormat3::get_kerning(hb_codepoint_t, hb_codepoint_t) const': + hb-ot-kern-table.hh:59: error: ambiguous overload for 'operator[]' in 'kernValue[kernIndex[i]]' + hb-ot-kern-table.hh:59: note: candidates are: operator[](T*, int) + hb-dsalgs.hh:574: note: Type& hb_array_t::operator[](unsigned int) const [with Type = const OT::IntType] + + src/hb-ot-kern-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9c6921c08c905a0cf45ba0182134e6ff910fac51 +Author: Behdad Esfahbod +Date: Fri Nov 30 15:16:57 2018 -0500 + + More... + + hb-ot-layout-gsubgpos.hh:1707: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: + ... + + src/hb-aat-layout-morx-table.hh | 4 ++-- + src/hb-ot-layout-gpos-table.hh | 32 ++++++++++++++++---------------- + src/hb-ot-layout-gsubgpos.hh | 16 ++++++++-------- + 3 files changed, 26 insertions(+), 26 deletions(-) + +commit f998bb2086342d6fdcd4295593eddea91396e0b6 +Author: Behdad Esfahbod +Date: Fri Nov 30 12:52:21 2018 -0500 + + More weird fixes + + In file included from hb-ot-name.cc:29: + hb-ot-name-table.hh: In member function 'unsigned int OT::name::get_size() const': + hb-ot-name-table.hh:157: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: + hb-open-type.hh:354: note: candidate 1: const Type& OT::UnsizedArrayOf::operator[](unsigned int) const [with Type = OT::NameRecord] + hb-ot-name-table.hh:157: note: candidate 2: operator[](const T*, int) + hb-ot-name-table.hh: In member function 'void OT::name::accelerator_t::init(hb_face_t*)': + hb-ot-name-table.hh:196: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: + hb-dsalgs.hh:574: note: candidate 1: Type& hb_array_t::operator[](unsigned int) const [with Type = const OT::NameRecord] + hb-ot-name-table.hh:196: note: candidate 2: operator[](T*, int) + hb-ot-name-table.hh:197: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: + hb-dsalgs.hh:574: note: candidate 1: Type& hb_array_t::operator[](unsigned int) const [with Type = const OT::NameRecord] + hb-ot-name-table.hh:197: note: candidate 2: operator[](T*, int) + hb-ot-name-table.hh:198: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: + hb-dsalgs.hh:574: note: candidate 1: Type& hb_array_t::operator[](unsigned int) const [with Type = const OT::NameRecord] + hb-ot-name-table.hh:198: note: candidate 2: operator[](T*, int) + make[4]: *** [libharfbuzz_la-hb-ot-name.lo] Error 1 + make[3]: *** [all-recursive] Error 1 + + src/hb-ot-name-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 67fd94da98f950b5feb719ac805f2a45379fc935 +Merge: abd81ed4 ae79fdaa +Author: Behdad Esfahbod +Date: Fri Nov 30 11:53:30 2018 -0500 + + Merge commit 'ae79fdaa7774d3f886a8f03926577c3bd2010b03' + +commit abd81ed4f5cbc5a94171747909bc6b77551cb929 +Author: Behdad Esfahbod +Date: Fri Nov 30 11:51:26 2018 -0500 + + Umm. Cryptic, yes + + In file included from hb-face.cc:35: + hb-ot-cmap-table.hh: In member function 'void OT::CmapSubtableFormat4::_compiles_assertion_on_line_388() const': + hb-ot-cmap-table.hh:388: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: + hb-open-type.hh:354: note: candidate 1: const Type& OT::UnsizedArrayOf::operator[](unsigned int) const [with Type = OT::IntType] + hb-ot-cmap-table.hh:388: note: candidate 2: operator[](const T*, int) + hb-ot-cmap-table.hh: In member function 'void OT::CmapSubtableFormat4::_instance_assertion_on_line_388() const': + hb-ot-cmap-table.hh:388: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: + hb-open-type.hh:354: note: candidate 1: const Type& OT::UnsizedArrayOf::operator[](unsigned int) const [with Type = OT::IntType] + hb-ot-cmap-table.hh:388: note: candidate 2: operator[](const T*, int) + hb-face.cc: In function 'hb_blob_t* _hb_face_builder_data_reference_blob(hb_face_builder_data_t*)': + hb-face.cc:650: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: + hb-vector.hh:81: note: candidate 1: Type& hb_vector_t::operator[](unsigned int) [with Type = hb_face_builder_data_t::table_entry_t, unsigned int PreallocedCount = 32u] + hb-face.cc:650: note: candidate 2: operator[](T*, int) + hb-face.cc:650: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: + hb-vector.hh:81: note: candidate 1: Type& hb_vector_t::operator[](unsigned int) [with Type = hb_face_builder_data_t::table_entry_t, unsigned int PreallocedCount = 32u] + hb-face.cc:650: note: candidate 2: operator[](const T*, int) + hb-face.cc:651: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: + hb-vector.hh:81: note: candidate 1: Type& hb_vector_t::operator[](unsigned int) [with Type = hb_face_builder_data_t::table_entry_t, unsigned int PreallocedCount = 32u] + hb-face.cc:651: note: candidate 2: operator[](T*, int) + hb-face.cc:651: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: + hb-vector.hh:81: note: candidate 1: Type& hb_vector_t::operator[](unsigned int) [with Type = hb_face_builder_data_t::table_entry_t, unsigned int PreallocedCount = 32u] + hb-face.cc:651: note: candidate 2: operator[](const T*, int) + + src/hb-face.cc | 4 ++-- + src/hb-machinery.hh | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit ae79fdaa7774d3f886a8f03926577c3bd2010b03 +Author: Behdad Esfahbod +Date: Fri Nov 30 11:51:26 2018 -0500 + + Umm. Cryptic, yes + + hb-face.cc:650: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: + hb-vector.hh:81: note: candidate 1: Type& hb_vector_t::operator[](unsigned int) [with Type = hb_face_builder_data_t::table_entry_t, unsigned int PreallocedCount = 32u] + hb-face.cc:650: note: candidate 2: operator[](T*, int) + + src/hb-face.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0f32c95e1487ffcc37439635c3294f941eae857a +Author: Behdad Esfahbod +Date: Fri Nov 30 11:31:39 2018 -0500 + + Fix a few more sizeof(vector[0]) errors with weird compilers + + src/hb-face.cc | 4 ++-- + src/hb-set.hh | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 88630a458b21b811075bed9e761a94c50736dc11 +Author: Behdad Esfahbod +Date: Fri Nov 30 01:11:04 2018 -0500 + + Fix build for realz + + src/hb-ot-deprecated.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 346286d04eb616c43ba8c796211fa2e5e7bf1983 +Author: Behdad Esfahbod +Date: Fri Nov 30 00:44:40 2018 -0500 + + Fix build + + src/hb-ot-deprecated.h | 1 + + 1 file changed, 1 insertion(+) + +commit 31f39cb41e1497a76c5838c93f9b4034089049f2 +Author: Behdad Esfahbod +Date: Fri Nov 30 00:38:08 2018 -0500 + + [post] Rename v2 to v2X + + src/hb-ot-post-table.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit e3dd47e6025a7f082af4830ba483d90d9b44381f +Author: Behdad Esfahbod +Date: Fri Nov 30 00:32:12 2018 -0500 + + Move things + + src/Makefile.sources | 1 + + src/hb-deprecated.h | 61 +--------------------------- + src/hb-ot-deprecated.h | 106 +++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot.h | 1 + + 4 files changed, 109 insertions(+), 60 deletions(-) + +commit 27a6b0a2f7255ed6fc7bfe1f10052c2e344e319b +Author: Behdad Esfahbod +Date: Thu Nov 29 16:29:30 2018 -0500 + + Fix build for realz + + src/hb-coretext.cc | 2 +- + src/hb-uniscribe.cc | 10 +++++----- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit e2af4dd1ecbe398c60fe5f3f370dd35400d7e1eb +Author: Behdad Esfahbod +Date: Thu Nov 29 16:03:15 2018 -0500 + + [uniscribe] Fix build + + src/hb-uniscribe.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bf738ba3ba80778c7feb95ece446607a250d9382 +Author: Ebrahim Byagowi +Date: Fri Nov 30 00:06:40 2018 +0330 + + [test][aat] Remove extra --shaper ot + + As run-tests.py already adds it + + test/shaping/data/in-house/tests/macos.tests | 64 ++++++++++++++-------------- + 1 file changed, 32 insertions(+), 32 deletions(-) + +commit b65645bbafb3f1f9f956df3028cf4479a4bdc265 +Author: Ebrahim Byagowi +Date: Thu Nov 29 23:57:50 2018 +0330 + + [ci] Re-enable llvm-gcc-4.2 bots (#1429) + + .circleci/config.yml | 48 ++++++++++++++++++++++++------------------------ + 1 file changed, 24 insertions(+), 24 deletions(-) + +commit e7bd29ea11bd6301a332b471120a4a2cd8575d09 +Author: Ebrahim Byagowi +Date: Thu Nov 29 23:47:20 2018 +0330 + + Limit __builtin_bswap16 to GCC >= 5 as it was implemented on 4.8 + + src/hb-machinery.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ac0264717b949df8840b179d882a9bed2993fb74 +Author: Behdad Esfahbod +Date: Thu Nov 29 15:07:44 2018 -0500 + + [coretext] Fix compile + + Fingers crossed. + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5c4fead734b082e0168e6811bec4bcaa19acc36a +Author: Behdad Esfahbod +Date: Thu Nov 29 15:04:34 2018 -0500 + + Convert "static const hb_tag_t" constants to enum + + src/hb-aat-layout-ankr-table.hh | 2 +- + src/hb-aat-layout-bsln-table.hh | 2 +- + src/hb-aat-layout-feat-table.hh | 2 +- + src/hb-aat-layout-just-table.hh | 2 +- + src/hb-aat-layout-kerx-table.hh | 2 +- + src/hb-aat-layout-lcar-table.hh | 2 +- + src/hb-aat-layout-morx-table.hh | 6 +++--- + src/hb-aat-layout-trak-table.hh | 2 +- + src/hb-aat-ltag-table.hh | 2 +- + src/hb-ot-cmap-table.hh | 2 +- + src/hb-ot-color-cbdt-table.hh | 4 ++-- + src/hb-ot-color-colr-table.hh | 2 +- + src/hb-ot-color-cpal-table.hh | 2 +- + src/hb-ot-color-sbix-table.hh | 2 +- + src/hb-ot-color-svg-table.hh | 2 +- + src/hb-ot-glyf-table.hh | 4 ++-- + src/hb-ot-hdmx-table.hh | 2 +- + src/hb-ot-head-table.hh | 2 +- + src/hb-ot-hhea-table.hh | 4 ++-- + src/hb-ot-hmtx-table.hh | 14 +++++++------- + src/hb-ot-kern-table.hh | 6 +++--- + src/hb-ot-layout-base-table.hh | 2 +- + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-jstf-table.hh | 2 +- + src/hb-ot-math-table.hh | 2 +- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-name-table.hh | 2 +- + src/hb-ot-os2-table.hh | 2 +- + src/hb-ot-post-table.hh | 2 +- + src/hb-ot-stat-table.hh | 2 +- + src/hb-ot-var-avar-table.hh | 2 +- + src/hb-ot-var-fvar-table.hh | 2 +- + src/hb-ot-var-hvar-table.hh | 8 ++++---- + src/hb-ot-var-mvar-table.hh | 2 +- + src/hb-ot-vorg-table.hh | 2 +- + 37 files changed, 53 insertions(+), 53 deletions(-) + +commit 9e4138c82548c2b29a1ae8801d2c6c7c1f1a9c7a +Author: Behdad Esfahbod +Date: Thu Nov 29 15:01:10 2018 -0500 + + Convert misc "static const" constants to enum + + src/hb-aat-layout-kerx-table.hh | 4 ++-- + src/hb-map.hh | 2 +- + src/hb-ot-kern-table.hh | 4 ++-- + src/hb-set-digest.hh | 14 +++++++------- + 4 files changed, 12 insertions(+), 12 deletions(-) + +commit 44cbd2ea3dc36312bd80860983b6616586e78c6c +Author: Behdad Esfahbod +Date: Thu Nov 29 14:53:43 2018 -0500 + + Convert "static const bool" constants to anonymous enum + + src/hb-aat-layout-common.hh | 4 ++-- + src/hb-aat-layout-kerx-table.hh | 4 ++-- + src/hb-aat-layout-morx-table.hh | 8 ++++---- + src/hb-dsalgs.hh | 16 ++++++++-------- + src/hb-ot-kern-table.hh | 4 ++-- + src/hb-ot-layout.cc | 4 ++-- + 6 files changed, 20 insertions(+), 20 deletions(-) + +commit 861bc75349257f74c12b261abfcd5ab9e2f04863 +Author: Behdad Esfahbod +Date: Thu Nov 29 14:34:44 2018 -0500 + + [vector] Make pointer cast explicit + + Too bad this doesn't help MSVC 2008 build, as explicit operators are + C++11. + + src/hb-machinery.hh | 2 +- + src/hb-ot-cmap-table.hh | 3 ++- + src/hb-set.hh | 4 ++-- + src/hb-subset.cc | 2 +- + src/hb-vector.hh | 4 ++-- + 5 files changed, 8 insertions(+), 7 deletions(-) + +commit 72955e68256806f082439d65e6f9b5cf2e35fa8a +Author: Behdad Esfahbod +Date: Thu Nov 29 14:28:44 2018 -0500 + + Hand-hold older compilers + + src/hb-set.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1a182e97ee71de0e78a70ff823ae17fa93a31830 +Author: Behdad Esfahbod +Date: Thu Nov 29 12:39:52 2018 -0500 + + [test/text-rendering-tests] Update from upstream + + .../text-rendering-tests/fonts/TestGVAR-Composite-0.ttf | Bin 0 -> 3136 bytes + .../fonts/TestGVAR-Composite-Missing.ttf | Bin 0 -> 2984 bytes + 2 files changed, 0 insertions(+), 0 deletions(-) + +commit 000d4b128eba58677acdc3b361829ff2f9a257b1 +Author: Behdad Esfahbod +Date: Thu Nov 29 12:32:47 2018 -0500 + + Make shaper's override_features() override user features as well + + The override_features is used to override features that are normally + discretionary features, but in a specific shaper are for various + reasons desired to be bolted on or off, because they've been used + for inherent shaping. As such, it makes sense that they also + override user features. Ie. if user turned 'liga' on, we don't + want Khmer shaping to become broken... Or turn 'clig' off... + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1310 + + src/hb-ot-shape.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit a95d9d8c8465ebc927bc2194dffe4ea95542e54c +Author: Behdad Esfahbod +Date: Thu Nov 29 12:30:14 2018 -0500 + + [khmer] Move 'clig' to overrides + + Prerequisite for https://github.com/harfbuzz/harfbuzz/issues/1310 + + src/hb-ot-shape-complex-khmer.cc | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +commit 282ce7230b8bd8ad65c408cdaf1499504038247d +Author: Behdad Esfahbod +Date: Thu Nov 29 12:18:14 2018 -0500 + + Fix "typename outside template" issues + + Nothing an extra template class wouldn't fix... + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1419 + + src/hb-null.hh | 25 +++++++++++++++++++------ + 1 file changed, 19 insertions(+), 6 deletions(-) + +commit dc41ecef85b094b30c612113606597b91c55351c +Author: Behdad Esfahbod +Date: Thu Nov 29 11:53:53 2018 -0500 + + 2.2.0 + + NEWS | 35 +++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + src/hb-aat-layout.cc | 6 +++--- + src/hb-aat-layout.h | 4 ++-- + src/hb-deprecated.h | 4 ++-- + src/hb-ot-var.cc | 8 ++++---- + src/hb-ot-var.h | 4 ++-- + src/hb-version.h | 6 +++--- + 8 files changed, 52 insertions(+), 17 deletions(-) + +commit 7b85081be4fbd6cad75dc28ae933ce920f71b22d +Author: Behdad Esfahbod +Date: Thu Nov 29 11:34:22 2018 -0500 + + [icu] Minor + + src/hb-icu.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0bcb1de1265368a27e53c6d935c965cbcb4130a0 +Merge: e0307de8 a85886fc +Author: Behdad Esfahbod +Date: Thu Nov 29 10:39:18 2018 -0500 + + Merge pull request #1418 from gvictor/replace_icu_deprecated + + Replace @Deprecated ICU API - USCRIPT_CODE_LIMIT + +commit e0307de818ad1f70ef96938642bda61d7a62532a +Author: Ebrahim Byagowi +Date: Thu Nov 29 11:36:05 2018 +0330 + + [test][aat.kern] More (#1427) + + test/shaping/data/in-house/tests/macos.tests | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 471db3aa6f963ecd4ebaf66daa81ef245d30d3b8 +Author: Michiharu Ariza +Date: Wed Nov 28 17:06:11 2018 -0800 + + workaround for issue #1417 + + src/hb-cff-interp-common.hh | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 32d291ae899eb095500052bed2a22e5255a34838 +Merge: 1ecbf4d3 949655aa +Author: Michiharu Ariza +Date: Wed Nov 28 16:27:45 2018 -0800 + + Merge branch 'master' into cff-subset + +commit 949655aa7853a4513af6b5247b9822be38f5d322 +Merge: 7b78d223 d3d0f15f +Author: Behdad Esfahbod +Date: Wed Nov 28 17:21:57 2018 -0500 + + Merge pull request #1425 from mbutterick/patch-1 + + update simple shaping example (closes #298) + +commit d3d0f15f7d20bedf7018fb2fb652f92ff4159bd7 +Author: Matthew Butterick +Date: Wed Nov 28 13:46:12 2018 -0800 + + update simple shaping example (closes #298) + + add call to `FT_Set_Char_Size`, otherwise default size remains at `0`, and glyph positions come back as `0` too + + docs/usermanual-getting-started.xml | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7b78d2233df0e51e2967bc54a9202b3f9e05059a +Author: Ebrahim Byagowi +Date: Thu Nov 29 00:55:05 2018 +0330 + + [test][aat] Update expectency + + It is not visually noticeable but apparently affected by kern format2 correct implementation. + I should've checked CoreText result which can't as CircleCI outage. + + test/shaping/data/in-house/tests/macos.tests | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5155067e10011f78f1ce35b3dadb062bccd3a706 +Author: Ebrahim Byagowi +Date: Thu Nov 29 00:07:00 2018 +0330 + + [test] Add test for format2 kern (#1423) + + test/shaping/data/in-house/Makefile.sources | 1 + + .../fonts/e39391c77a6321c2ac7a2d644de0396470cd4bfe.ttf | Bin 0 -> 34116 bytes + test/shaping/data/in-house/tests/kern-format2.tests | 3 +++ + 3 files changed, 4 insertions(+) + +commit 42a2b496e428521151ff5cb07454d2e993f892cc +Author: Behdad Esfahbod +Date: Wed Nov 28 15:24:30 2018 -0500 + + [kerx] Fix Format2 index calc again + + src/hb-aat-layout-common.hh | 14 ++++++++++++++ + src/hb-aat-layout-kerx-table.hh | 2 +- + 2 files changed, 15 insertions(+), 1 deletion(-) + +commit 9e4f03b6ed80a81f8aee5ba93564f5eabab4299c +Merge: 19863c80 a3267cf8 +Author: Behdad Esfahbod +Date: Wed Nov 28 15:08:01 2018 -0500 + + Merge remote-tracking branch 'fdo/master' + +commit a3267cf803082af157a7f2b0026af2633b14f8e3 +Author: Behdad Esfahbod +Date: Wed Nov 28 15:06:01 2018 -0500 + + [kern] Fix kern table Format2 offsetToIndex + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1421 + + src/hb-aat-layout-kerx-table.hh | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit f9a9c0fd1e561715d696c7bd840bab552d0718ee +Author: Behdad Esfahbod +Date: Wed Nov 28 14:51:56 2018 -0500 + + [kerx] Fix ClassTable implementation for 'kern' table Format 2 + + src/hb-aat-layout-common.hh | 8 +++++--- + src/hb-aat-layout-kerx-table.hh | 10 ++-------- + 2 files changed, 7 insertions(+), 11 deletions(-) + +commit 5b4a789ca857664668ff69936574dcd09bee6065 +Author: Behdad Esfahbod +Date: Wed Nov 28 14:46:26 2018 -0500 + + [aat] Towards adding two ClassTable's + + src/hb-aat-layout-common.hh | 40 ++++++++++++++++++++-------------------- + 1 file changed, 20 insertions(+), 20 deletions(-) + +commit 19863c805982d5d1d059d4dd9376039d3fdaabcd +Author: Ebrahim Byagowi +Date: Wed Nov 28 20:28:42 2018 +0330 + + [test][aat] Add a test and make macOS runners faster (#1422) + + .circleci/config.yml | 15 +++----- + test/shaping/data/in-house/tests/macos.tests | 54 ++++++++++++++-------------- + 2 files changed, 33 insertions(+), 36 deletions(-) + +commit 987f4187722a05e3f360b85c66309a351fc5d6ad +Merge: 1042d9fb 4e2a03b6 +Author: Behdad Esfahbod +Date: Tue Nov 27 17:40:32 2018 -0500 + + Merge pull request #1398 from Adenilson/bigInt01 + + Optimize harfbuzz big integer conversions + +commit 4e2a03b6b6e0c0d1c4edea10dc1aae63eeb6c581 +Author: Behdad Esfahbod +Date: Tue Nov 27 17:40:09 2018 -0500 + + Comment + + src/hb-machinery.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 4a719a7f4c997ea7e47588bc0288c97706dae015 +Author: Adenilson Cavalcanti +Date: Tue Nov 20 14:41:19 2018 -0800 + + Optimize harfbuzz big integer conversions + + Profiling showed that type conversions were adding considerable cycles in time + spent doing text shaping. + + The idea is to optimize it using native processor instructions to help Blink + layout performance. + + Doing further investigation revelead that compilers may not use the + proper instruction on ARM 32bits builds (i.e. REV16). + + One way to insure that the generated ASM was ideal for both gcc/clang + was using __builtin_bswap16. + + Added bonus is that we no longer need to test for CPU architecture. + + src/hb-machinery.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit a85886fc77083084e9a12ee15b47eab7876f9f53 +Author: Victor Chang +Date: Tue Nov 27 11:34:56 2018 +0000 + + Replace @Deprecated ICU API - USCRIPT_CODE_LIMIT + + Use of the deprecated API USCRIPT_CODE_LIMIT prevents harfbuzz + using the ICU4C as a shared library. + + The API has been replaced by u_getIntPropertyMaxValue(UCHAR_SCRIPT) + + src/hb-icu.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 1042d9fbc05aff9d51f15c2824a8521e963d0acd +Author: Ebrahim Byagowi +Date: Mon Nov 26 18:58:39 2018 +0330 + + [ci] Add .codecov.yml + + Similar to https://github.com/GoogleChrome/lighthouse/blob/master/.codecov.yml + + No strong preference on commenting, feel free to enable it again + + .codecov.yml | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 97eaedca5de76c74534bab41562aee130098558a +Author: Ebrahim Byagowi +Date: Mon Nov 26 16:58:58 2018 +0330 + + [test][aat] Enable Tamil MN test (#1414) + + test/shaping/data/in-house/tests/macos.tests | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 574d888c8a409295a952361a39c8e83a52a0fc3d +Author: Behdad Esfahbod +Date: Sun Nov 25 16:51:22 2018 -0500 + + [aat] Ignore GSUB table of Muthu Foundry if they have morx table + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1410 + + src/hb-ot-layout-gpos-table.hh | 3 +++ + src/hb-ot-layout-gsub-table.hh | 3 +++ + src/hb-ot-layout-gsubgpos.hh | 5 +++++ + src/hb-ot-layout.cc | 36 +++++++++++++++++++++++++++++++++++- + 4 files changed, 46 insertions(+), 1 deletion(-) + +commit 4151c2848d8df75b6d0a4f5d79bee843158aa4a4 +Author: Behdad Esfahbod +Date: Sun Nov 25 16:38:36 2018 -0500 + + [GDEF] Move more code + + src/hb-ot-layout-gdef-table.hh | 10 +++++++++- + src/hb-ot-layout.cc | 11 ----------- + 2 files changed, 9 insertions(+), 12 deletions(-) + +commit 4f21703f225b6977196ef180e8d7300ea86d2cc3 +Author: Behdad Esfahbod +Date: Sun Nov 25 15:59:18 2018 -0500 + + [GDEF] Move code around + + src/hb-ot-layout-gdef-table.hh | 3 +++ + src/hb-ot-layout.cc | 16 +++++++--------- + 2 files changed, 10 insertions(+), 9 deletions(-) + +commit 4ed9fb1a0050f3151f9332f08c8bb2c13652c607 +Author: Behdad Esfahbod +Date: Sun Nov 25 15:51:01 2018 -0500 + + [GDEF] Minor + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0e3a48e54248d69197e8fb23c824d987f91b3bf7 +Author: Ebrahim Byagowi +Date: Sun Nov 25 13:37:23 2018 +0330 + + [test][aat] fix 10.13.6 Helvetica expectation + + test/shaping/data/in-house/tests/macos.tests | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cbc541b426f01717641f1f3529a7c9703aec7a28 +Author: Ebrahim Byagowi +Date: Sun Nov 25 12:50:30 2018 +0330 + + [aat] Add m grave test (#1412) + + test/shaping/data/in-house/tests/macos.tests | 4 ++++ + 1 file changed, 4 insertions(+) + +commit fa26ad0f48462063f2160a43cb62b018bb21e251 +Author: Ebrahim Byagowi +Date: Sun Nov 25 11:25:17 2018 +0330 + + [aat] Fix macos expectation + + test/shaping/data/in-house/tests/macos.tests | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 926f512f354835f8323bb2c2e58789dd918a9b65 +Author: Behdad Esfahbod +Date: Sun Nov 25 01:14:40 2018 -0500 + + [aat.feat] Rework API and implementation + + Fixes https://github.com/harfbuzz/harfbuzz/pull/1346 + + docs/harfbuzz-docs.xml | 5 +++ + docs/harfbuzz-sections.txt | 7 ++-- + src/hb-aat-layout-feat-table.hh | 89 +++++++++++++++++++++++------------------ + src/hb-aat-layout.cc | 80 ++++++++++++++++-------------------- + src/hb-aat-layout.h | 32 +++++++++------ + test/api/test-aat-layout.c | 58 ++++++++++++++------------- + 6 files changed, 141 insertions(+), 130 deletions(-) + +commit 84dacbca7ea54a3ca2d5d711d50272a7f3baf456 +Author: Behdad Esfahbod +Date: Sat Nov 24 12:08:36 2018 -0500 + + [aat.feat] Add _MAX_VALUE to enums + + src/hb-aat-layout.h | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 3922aae1620958768d3257c0988432d5609dca1b +Author: Behdad Esfahbod +Date: Sat Nov 24 11:02:04 2018 -0500 + + [aat.feat] Minor + + src/hb-aat-layout-feat-table.hh | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +commit 0f8e98eca2463da3b83d1b66a19259a584df1682 +Author: Behdad Esfahbod +Date: Sat Nov 24 11:00:42 2018 -0500 + + [aat.feat] Whitespace + + src/hb-aat-layout-feat-table.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit c2256068339c9e10c8e6df5d1749be4b4eb04ad4 +Author: Behdad Esfahbod +Date: Sat Nov 24 10:54:40 2018 -0500 + + [aat.feat] Port to SortedUnsizedArrayOf.bsearch() + + src/hb-aat-layout-feat-table.hh | 19 +++++++------------ + 1 file changed, 7 insertions(+), 12 deletions(-) + +commit 52ae9867efd6520d17306b9f3ad612fe5463e93d +Author: Behdad Esfahbod +Date: Sat Nov 24 10:46:56 2018 -0500 + + [AAT.feat] Use lsearch for looking up SettingName's + + They are not sorted. + + src/hb-aat-layout-feat-table.hh | 18 ++++++------------ + src/hb-open-type.hh | 16 ++++++++-------- + src/hb-static.cc | 6 ++++-- + 3 files changed, 18 insertions(+), 22 deletions(-) + +commit 44b9331f663c09174d94e06baf36d48a50599c42 +Author: Behdad Esfahbod +Date: Sat Nov 24 10:30:35 2018 -0500 + + [aat] Fix include issues + + src/Makefile.am | 2 ++ + src/hb-aat.h | 2 ++ + 2 files changed, 4 insertions(+) + +commit b206133d1f616339a57996b634dadc7f0a2c4cfb +Author: Behdad Esfahbod +Date: Fri Nov 23 14:05:11 2018 -0500 + + [aat] Move contents of hb-aat.h to hb-aat-layout.h + + Since it was pages and pages... + + src/Makefile.sources | 1 + + src/hb-aat-layout.cc | 1 - + src/hb-aat-layout.h | 452 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-aat-layout.hh | 1 - + src/hb-aat-map.hh | 1 - + src/hb-aat.h | 417 +---------------------------------------------- + src/hb.hh | 2 + + 7 files changed, 458 insertions(+), 417 deletions(-) + +commit 2cb235d0210e74ea4ee123767b489301a9c340ab +Author: Behdad Esfahbod +Date: Fri Nov 23 12:23:35 2018 -0500 + + [aat.feat] Fix enum namespace + + src/hb-aat-layout-feat-table.hh | 2 +- + src/hb-aat-layout-morx-table.hh | 4 +- + src/hb-aat-layout.cc | 150 ++++++------ + src/hb-aat.h | 502 ++++++++++++++++++++-------------------- + test/api/test-aat-layout.c | 2 +- + 5 files changed, 330 insertions(+), 330 deletions(-) + +commit 712762cabbbe85e6ab8361cd115c22a176827734 +Author: Behdad Esfahbod +Date: Fri Nov 23 12:21:02 2018 -0500 + + Minor + + src/hb-aat.h | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit e20f81f4fa977a8d22c6afee1e46fbf46bc182d9 +Author: Behdad Esfahbod +Date: Fri Nov 23 11:57:42 2018 -0500 + + [aat] Rename feat API a bit more + + docs/harfbuzz-sections.txt | 10 +++++----- + src/hb-aat-layout-feat-table.hh | 8 ++++---- + src/hb-aat-layout.cc | 32 ++++++++++++++++---------------- + src/hb-aat.h | 26 +++++++++++++------------- + test/api/test-aat-layout.c | 28 ++++++++++++++-------------- + 5 files changed, 52 insertions(+), 52 deletions(-) + +commit 54f4c17f0a932b0ca0317e1ad5e5e43a11a83fd1 +Author: Ebrahim Byagowi +Date: Fri Nov 23 12:05:06 2018 +0330 + + [feat] Rename API uses of setting to selector + + docs/harfbuzz-sections.txt | 6 +-- + src/hb-aat-layout-feat-table.hh | 52 ++++++++++++------------ + src/hb-aat-layout-morx-table.hh | 2 +- + src/hb-aat-layout.cc | 88 ++++++++++++++++++++--------------------- + src/hb-aat-layout.hh | 4 +- + src/hb-aat-map.cc | 2 +- + src/hb-aat-map.hh | 2 +- + src/hb-aat.h | 20 +++++----- + test/api/test-aat-layout.c | 46 ++++++++++----------- + 9 files changed, 111 insertions(+), 111 deletions(-) + +commit 9c64b216ec7ae2c2c124ebd00dc6fa568752be78 +Author: Ebrahim Byagowi +Date: Fri Nov 23 11:44:53 2018 +0330 + + [feat] Apply renamings and add documentation + + docs/harfbuzz-sections.txt | 10 ++++++++++ + src/hb-aat-layout.cc | 44 ++++++++++++++++++++++++++++++++++++++------ + src/hb-aat.h | 6 +++--- + test/api/test-aat-layout.c | 28 ++++++++++++++-------------- + 4 files changed, 65 insertions(+), 23 deletions(-) + +commit a8726cb4830f51a820db4bc6346ed09c91493817 +Author: Ebrahim Byagowi +Date: Sat Nov 17 14:23:11 2018 +0330 + + [feat] Use bsearch + + src/hb-aat-layout-feat-table.hh | 36 ++++++++++++++++++++++-------------- + src/hb-aat-layout-morx-table.hh | 2 +- + src/hb.hh | 2 ++ + 3 files changed, 25 insertions(+), 15 deletions(-) + +commit 4009a05ca7de21fff2176621597cd0cd01e9d80e +Author: Ebrahim Byagowi +Date: Sat Nov 17 11:30:50 2018 +0330 + + [feat] Address Behdad comments + + src/hb-aat-layout-feat-table.hh | 114 ++++--- + src/hb-aat-layout.cc | 14 +- + src/hb-aat.h | 673 +++++++++++++++++----------------------- + test/api/test-aat-layout.c | 88 +++--- + 4 files changed, 423 insertions(+), 466 deletions(-) + +commit 19b6025534a98df96d67eee45c5c1ea6fbc1cc43 +Author: Ebrahim Byagowi +Date: Sat Nov 17 01:07:09 2018 +0330 + + [feat] Address @behdad comments + + src/Makefile.sources | 2 +- + src/hb-aat-layout-feat-table.hh | 82 +++---- + src/hb-aat-layout-morx-table.hh | 2 +- + src/hb-aat-layout.cc | 104 ++++---- + src/hb-aat-map.cc | 2 +- + src/hb-aat.h | 533 ++++++++++++---------------------------- + src/hb-ot.h | 1 - + test/api/test-aat-layout.c | 84 +++---- + 8 files changed, 282 insertions(+), 528 deletions(-) + +commit 9212ec203c948e290a1d92b701619ccdbc89377c +Author: Ebrahim Byagowi +Date: Fri Nov 9 00:50:10 2018 +0330 + + [feat] Complete feature types list + + src/hb-aat-layout-morx-table.hh | 2 +- + src/hb-aat-layout.cc | 154 ++++----- + src/hb-aat.h | 697 ++++++++++++++++++++++++++++++++++++++-- + 3 files changed, 752 insertions(+), 101 deletions(-) + +commit fbad794bd2c574363a0c5c5fefabce764496f93c +Author: Ebrahim Byagowi +Date: Thu Nov 1 22:24:42 2018 +0330 + + [feat] Add feature iteration API + + src/hb-aat-layout-feat-table.hh | 36 +++++++++++++++++++++-------- + src/hb-aat-layout.cc | 26 +++++++++++---------- + src/hb-aat.h | 23 +++++++++++++++++-- + test/api/test-aat-layout.c | 51 +++++++++++++++++++++++++++-------------- + 4 files changed, 96 insertions(+), 40 deletions(-) + +commit 7a0471aa356bcd062d31a59bdb19c335249116c7 +Author: Ebrahim Byagowi +Date: Thu Nov 1 21:38:54 2018 +0330 + + [feat] Turn AAT feature id into enum + + src/hb-aat-layout-feat-table.hh | 20 ++--- + src/hb-aat-layout-morx-table.hh | 10 +-- + src/hb-aat-layout.cc | 170 ++++++++++++++++++++-------------------- + src/hb-aat-layout.hh | 6 +- + src/hb-aat-map.cc | 2 +- + src/hb-aat-map.hh | 4 +- + src/hb-aat.h | 64 +++++++++------ + test/api/test-aat-layout.c | 8 +- + test/api/test-c.c | 1 + + 9 files changed, 150 insertions(+), 135 deletions(-) + +commit b233fa4bc9cdb1c6677b37106d96d878d6e03bfd +Author: Ebrahim Byagowi +Date: Thu Nov 1 20:02:57 2018 +0330 + + [feat] Rename records to selectors as @drott + + src/hb-aat-layout-feat-table.hh | 20 ++++++++++---------- + src/hb-aat-layout.cc | 10 +++++----- + src/hb-aat.h | 4 ++-- + 3 files changed, 17 insertions(+), 17 deletions(-) + +commit a157b3e4ebd57ad29f217c4cef6519e7398cfa5c +Author: Ebrahim Byagowi +Date: Thu Nov 1 19:56:16 2018 +0330 + + [feat] Apply @behdad comments + + src/Makefile.sources | 2 +- + src/hb-aat-layout-feat-table.hh | 1 + + src/hb-aat-layout.cc | 16 ++++++++-------- + src/hb-aat-layout.hh | 2 +- + src/hb-aat-map.hh | 2 +- + src/{hb-aat-layout.h => hb-aat.h} | 22 +++++++++++++--------- + src/hb-ot.h | 1 + + test/api/test-aat-layout.c | 14 +++++++------- + test/api/test-c.c | 1 - + 9 files changed, 33 insertions(+), 28 deletions(-) + +commit 3aff3f822f0d7bf7a2b5160ad93df3fe413c7c47 +Author: Ebrahim Byagowi +Date: Thu Nov 1 19:20:20 2018 +0330 + + [feat] Apply @drott and @jfkthame comments + + src/hb-aat-layout-feat-table.hh | 14 ++++++-------- + src/hb-aat-layout.cc | 12 +++++++----- + src/hb-aat-layout.h | 10 +++++----- + test/api/test-aat-layout.c | 4 ++-- + 4 files changed, 20 insertions(+), 20 deletions(-) + +commit b791bbbae47aa19709da640a1dc5e84590c5c2c2 +Author: Ebrahim Byagowi +Date: Thu Nov 1 15:15:56 2018 +0330 + + [feat] Apply @jfkthame reviews + + src/hb-aat-layout-feat-table.hh | 27 +++++++++++++++------------ + src/hb-aat-layout.cc | 23 ++++++++++++----------- + src/hb-aat-layout.h | 14 +++++++++----- + test/api/fonts/aat-feat.ttf | Bin 0 -> 1132 bytes + test/api/test-aat-layout.c | 30 ++++++++++++++++++------------ + 5 files changed, 54 insertions(+), 40 deletions(-) + +commit 95abd53758e281325b9124f0942aafb382a89090 +Author: Ebrahim Byagowi +Date: Thu Nov 1 13:14:29 2018 +0330 + + [feat] Expose public API + + * hb_aat_get_feature_settings + + src/Makefile.sources | 1 + + src/hb-aat-layout-feat-table.hh | 68 ++++++++++++++++++++++++++++++- + src/hb-aat-layout-morx-table.hh | 6 +-- + src/hb-aat-layout.cc | 33 +++++++++++++++ + src/hb-aat-layout.h | 75 ++++++++++++++++++++++++++++++++++ + src/hb-aat-layout.hh | 7 ++-- + src/hb-aat-map.hh | 5 ++- + src/hb-ot-face.hh | 1 + + test/api/Makefile.am | 1 + + test/api/test-aat-layout.c | 89 +++++++++++++++++++++++++++++++++++++++++ + test/api/test-c.c | 1 + + 11 files changed, 278 insertions(+), 9 deletions(-) + +commit 264c4a539cbfd8d5e5f143206d9d27230a186897 +Author: Behdad Esfahbod +Date: Sun Nov 25 00:30:08 2018 -0500 + + [test] Reorder test suites + + aots is less interesting. Run text-rendering-tests before aots. + + test/shaping/data/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9326912941e5927bcfb4689689c954b9a3995baa +Author: Behdad Esfahbod +Date: Sun Nov 25 00:27:23 2018 -0500 + + [kerx] Fix crash + + src/hb-machinery.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 6ee401049d475b2a2d9c859e6dbf8ff2750a1609 +Author: Behdad Esfahbod +Date: Sun Nov 25 00:21:13 2018 -0500 + + Simplify sanitize set_object() / fix bots + + src/hb-machinery.hh | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit c5a6b355e165e90d8d90454ceeca7b100282945f +Author: Behdad Esfahbod +Date: Sat Nov 24 23:49:23 2018 -0500 + + [kerx] Port to hb_sanitize_with_object_t + + src/hb-aat-layout-kerx-table.hh | 19 +++++++------------ + 1 file changed, 7 insertions(+), 12 deletions(-) + +commit c405ed0509afaa7c3846e8e461bedfbceb0cd937 +Author: Behdad Esfahbod +Date: Sat Nov 24 23:46:15 2018 -0500 + + [morx] Port to hb_sanitize_with_object_t + + src/hb-aat-layout-morx-table.hh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 1e8994221fb5cfdb1902d5249c7a75cde6d6e3c8 +Author: Behdad Esfahbod +Date: Sat Nov 24 23:38:06 2018 -0500 + + Add hb_sanitize_with_object_t + + Context manager. + + src/hb-machinery.hh | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit b3c5affc05a3c7bbcfbd98521703d3d3447fcd7d +Author: Behdad Esfahbod +Date: Sat Nov 24 23:34:34 2018 -0500 + + Simplify sanitize set_object() + + src/hb-aat-layout-kerx-table.hh | 12 ++++++------ + src/hb-aat-layout-morx-table.hh | 10 +++++----- + src/hb-machinery.hh | 26 +++++++++++++------------- + 3 files changed, 24 insertions(+), 24 deletions(-) + +commit 3d3097269995aa227b4b198d4da2baf942b65c66 +Author: Behdad Esfahbod +Date: Sat Nov 24 23:12:28 2018 -0500 + + [aat] Skip terminator in VarSizedBinSearchArray<> + + Fixes shaping with Apple Chancery on 10.13 again. In that font, + there was a terminator segment, that was tripping off sanitize(). + + src/hb-aat-layout-common.hh | 6 ++++++ + src/hb-open-type.hh | 21 ++++++++++++++++++++- + 2 files changed, 26 insertions(+), 1 deletion(-) + +commit 4202a3cde3b6065124feb7f4c662563de1e08126 +Author: Behdad Esfahbod +Date: Sat Nov 24 22:48:34 2018 -0500 + + Minor + + src/hb-open-type.hh | 21 ++++++++++++++++----- + 1 file changed, 16 insertions(+), 5 deletions(-) + +commit 1c2302bbf1d2d0e66f49ab54ad98d1b61bc5603d +Author: Behdad Esfahbod +Date: Sat Nov 24 22:32:17 2018 -0500 + + [debug] Print function in return_trace() + + src/hb-debug.hh | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +commit 748198a6718adbb200ee24ac013c617f62c946a4 +Author: Behdad Esfahbod +Date: Sat Nov 24 22:16:59 2018 -0500 + + Revert "[aat.morx] Remove set_object() business" + + This reverts commit ae8ed58a6e53441d9ccbf67afd8a00b815cde99e. + + Apparently this broke Apple Chancery from OS X 10.12 :(. + Investigating... + + src/hb-aat-layout-morx-table.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit c8a2dc820eb0ee3124e3762cb1167ac9e528ad28 +Author: Behdad Esfahbod +Date: Sat Nov 24 22:16:53 2018 -0500 + + Revert "[aat.kerx] Remove kerx subtable boundary enforcement" + + This reverts commit 15905a2a2998f7ddd964f920a4828602235d6b00. + + src/hb-aat-layout-kerx-table.hh | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit 9eeebd8ddedb96c03860ce7eb5500aafa3969d6b +Author: Behdad Esfahbod +Date: Sat Nov 24 22:16:47 2018 -0500 + + Revert "[sanitize] Remove now-unused set_object() machinery" + + This reverts commit bbdb6edb3e1cea4c5b7076c4f6b3e6998ae36dae. + + src/hb-machinery.hh | 25 ++++++++++++++++++++++++- + 1 file changed, 24 insertions(+), 1 deletion(-) + +commit 248ce22857c8918bf3468ef48d906de4c19c3d4d +Author: Behdad Esfahbod +Date: Sat Nov 24 22:01:06 2018 -0500 + + [tests] Minor + + test/shaping/run-tests.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f47c5da0aa04a88b37d9c3af4730204319a9a36b +Author: Behdad Esfahbod +Date: Sat Nov 24 21:36:57 2018 -0500 + + [arrays] Use hb_array_t<> in all places with sub_array() + + src/hb-aat-layout-lcar-table.hh | 6 +++--- + src/hb-ot-layout-gdef-table.hh | 14 ++++++++------ + src/hb-ot-math-table.hh | 10 ++++------ + 3 files changed, 15 insertions(+), 15 deletions(-) + +commit 3246a8ebbd900bcc3e3c70532eab0f406b8f5c4a +Author: Behdad Esfahbod +Date: Sat Nov 24 21:32:00 2018 -0500 + + [arrays] Merge ArrayOf's sub_array into hb_array_t's + + src/hb-dsalgs.hh | 44 +++++++++++++++++++++++++++----------------- + src/hb-open-type.hh | 30 ++++++++++++++++++------------ + 2 files changed, 45 insertions(+), 29 deletions(-) + +commit e6877e28cd30e89af7cce59d903184a5a01ec970 +Author: Ebrahim Byagowi +Date: Sun Nov 25 02:12:40 2018 +0330 + + [test] Add the missed aots fonts + + test/shaping/data/aots/fonts/classdef1_font1.otf | Bin 0 -> 6004 bytes + test/shaping/data/aots/fonts/classdef1_font2.otf | Bin 0 -> 6020 bytes + test/shaping/data/aots/tests/classdef1_empty.tests | 2 +- + 3 files changed, 1 insertion(+), 1 deletion(-) + +commit 825ea5a4607fafa11c56a72a82bda773f6b44e79 +Author: Ebrahim Byagowi +Date: Sun Nov 25 01:59:54 2018 +0330 + + [test] Merge 10.12.6 and 10.13.6 tests, update to Apple Chancery fix + + test/shaping/data/in-house/Makefile.sources | 3 +-- + .../data/in-house/tests/macos-10.12.6.tests | 11 --------- + .../data/in-house/tests/macos-10.13.6.tests | 13 ----------- + test/shaping/data/in-house/tests/macos.tests | 26 ++++++++++++++++++++++ + 4 files changed, 27 insertions(+), 26 deletions(-) + +commit bbdb6edb3e1cea4c5b7076c4f6b3e6998ae36dae +Author: Behdad Esfahbod +Date: Sat Nov 24 17:15:38 2018 -0500 + + [sanitize] Remove now-unused set_object() machinery + + src/hb-machinery.hh | 25 +------------------------ + 1 file changed, 1 insertion(+), 24 deletions(-) + +commit 15905a2a2998f7ddd964f920a4828602235d6b00 +Author: Behdad Esfahbod +Date: Sat Nov 24 17:14:39 2018 -0500 + + [aat.kerx] Remove kerx subtable boundary enforcement + + Have not encountered fonts needing this, but same reasoning as + for morx (see previos commit.) + + src/hb-aat-layout-kerx-table.hh | 21 --------------------- + 1 file changed, 21 deletions(-) + +commit ae8ed58a6e53441d9ccbf67afd8a00b815cde99e +Author: Behdad Esfahbod +Date: Sat Nov 24 17:11:09 2018 -0500 + + [aat.morx] Remove set_object() business + + With OS X 10.13 Apple Chancery fails to ligate if we limit each morx + sub-chain to its declared length. Perhaps their newer compiler does + object-sharing across sub-chains. Anyway, since that's a valid, if + unspecified, way to compile tables, remove enforcement. + + Probably do the same with kern/kerx. + + src/hb-aat-layout-morx-table.hh | 8 -------- + 1 file changed, 8 deletions(-) + +commit b518e5af9f66414396752069bb8f43466a9236fa +Author: Ebrahim Byagowi +Date: Sun Nov 25 01:39:00 2018 +0330 + + Add 10.13.6 aat fonts tests and bot (#1409) + + .circleci/config.yml | 16 ++++++++++++++-- + test/shaping/data/in-house/Makefile.sources | 3 ++- + .../in-house/tests/{macos.tests => macos-10.12.6.tests} | 2 -- + test/shaping/data/in-house/tests/macos-10.13.6.tests | 13 +++++++++++++ + 4 files changed, 29 insertions(+), 5 deletions(-) + +commit b7f7950e8fc4b9e229b466ac2453d57b8da9a5a6 +Author: Behdad Esfahbod +Date: Sat Nov 24 15:56:17 2018 -0500 + + [aat] Add test for recent regression + + test/shaping/data/in-house/tests/macos.tests | 1 + + 1 file changed, 1 insertion(+) + +commit ea9512e61a7ed333b810918e74cce4c8bd2291b9 +Author: Behdad Esfahbod +Date: Sat Nov 24 15:49:33 2018 -0500 + + [tests] Redo test runner logging a bit + + test/shaping/run-tests.py | 44 +++++++++++++++++++++++--------------------- + 1 file changed, 23 insertions(+), 21 deletions(-) + +commit 5020affc3877d39377506245ecaf01a659eef82a +Author: Behdad Esfahbod +Date: Sat Nov 24 15:42:11 2018 -0500 + + [tests] Minor + + test/shaping/data/in-house/tests/macos.tests | 2 ++ + 1 file changed, 2 insertions(+) + +commit ee3a3e10d45f5df1a74b65fbe3df77f8dd8f902e +Author: Behdad Esfahbod +Date: Sat Nov 24 15:37:01 2018 -0500 + + [tests/shaping] Allow comments in test files + + Line should start with "# ". + + test/shaping/run-tests.py | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +commit ed900ee9afa0dabdbf6bf9d2af46c2343a16773f +Author: Behdad Esfahbod +Date: Sat Nov 24 15:22:09 2018 -0500 + + [tests] Rename + + test/shaping/data/in-house/Makefile.sources | 2 +- + test/shaping/data/in-house/tests/{macos-10.12.tests => macos.tests} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit 20edc70d537b01e8a384ee05673335f2f8a18238 +Author: Behdad Esfahbod +Date: Sat Nov 24 14:52:34 2018 -0500 + + [morx/kerx] Fix sanitize regression + + Broke in 8dcc1913a1670ede7b124f7b5b775d7ab8791386 + + If sanitizer is left with another object, it wouldn't work. + + Better fix coming soon. + + src/hb-aat-layout-kerx-table.hh | 6 +----- + src/hb-aat-layout-morx-table.hh | 4 +--- + 2 files changed, 2 insertions(+), 8 deletions(-) + +commit 3cc14e78aeb1c70eb82891ab4513c0e7d0f59928 +Author: Ebrahim Byagowi +Date: Sat Nov 24 20:49:21 2018 +0330 + + [test] Enable more of aots tests (#1408) + + The ones commented out in this change should've be passed :/ + a closer look is needed. + + test/shaping/data/aots/Makefile.sources | 76 +++++++++++----------- + test/shaping/data/aots/hb-aots-tester.cpp | 1 + + test/shaping/data/aots/tests/classdef1_empty.tests | 2 +- + test/shaping/data/aots/tests/gsub3_1_simple.tests | 2 +- + .../data/aots/tests/lookupflag_ignore_attach.tests | 10 +-- + 5 files changed, 46 insertions(+), 45 deletions(-) + +commit 24887d1115ee41cfad70577eb243382f6c23ab6e +Author: Ebrahim Byagowi +Date: Sat Nov 24 20:07:24 2018 +0330 + + Add Adobe AOTS tests (#1395) + + Annotated OpenType Specification or aots, https://github.com/adobe-type-tools/aots + provides a set of tests for OpenType specification, this change add those tests in addition + to modified version of their HarfBuzz test runner for generating harfbuzz project specific tests. + + configure.ac | 1 + + test/shaping/CMakeLists.txt | 13 +- + test/shaping/data/Makefile.am | 1 + + test/shaping/data/aots/COPYING | 13 + + test/shaping/data/aots/Makefile.am | 37 +++ + test/shaping/data/aots/Makefile.sources | 126 ++++++++ + test/shaping/data/aots/fonts/classdef1_font3.otf | Bin 0 -> 6060 bytes + test/shaping/data/aots/fonts/classdef1_font4.otf | Bin 0 -> 5984 bytes + test/shaping/data/aots/fonts/classdef2_font1.otf | Bin 0 -> 6004 bytes + test/shaping/data/aots/fonts/classdef2_font2.otf | Bin 0 -> 6016 bytes + test/shaping/data/aots/fonts/classdef2_font3.otf | Bin 0 -> 6052 bytes + test/shaping/data/aots/fonts/classdef2_font4.otf | Bin 0 -> 5984 bytes + test/shaping/data/aots/fonts/cmap0_font1.otf | Bin 0 -> 5196 bytes + test/shaping/data/aots/fonts/cmap10_font1.otf | Bin 0 -> 4968 bytes + test/shaping/data/aots/fonts/cmap10_font2.otf | Bin 0 -> 4960 bytes + test/shaping/data/aots/fonts/cmap12_font1.otf | Bin 0 -> 4980 bytes + test/shaping/data/aots/fonts/cmap14_font1.otf | Bin 0 -> 5028 bytes + test/shaping/data/aots/fonts/cmap2_font1.otf | Bin 0 -> 6000 bytes + test/shaping/data/aots/fonts/cmap4_font1.otf | Bin 0 -> 4964 bytes + test/shaping/data/aots/fonts/cmap4_font2.otf | Bin 0 -> 4956 bytes + test/shaping/data/aots/fonts/cmap4_font3.otf | Bin 0 -> 4956 bytes + test/shaping/data/aots/fonts/cmap4_font4.otf | Bin 0 -> 4972 bytes + test/shaping/data/aots/fonts/cmap6_font1.otf | Bin 0 -> 4948 bytes + test/shaping/data/aots/fonts/cmap6_font2.otf | Bin 0 -> 4944 bytes + test/shaping/data/aots/fonts/cmap8_font1.otf | Bin 0 -> 13224 bytes + .../data/aots/fonts/cmap_composition_font1.otf | Bin 0 -> 5096 bytes + .../aots/fonts/cmap_subtableselection_font1.otf | Bin 0 -> 6412 bytes + .../aots/fonts/cmap_subtableselection_font2.otf | Bin 0 -> 6140 bytes + .../aots/fonts/cmap_subtableselection_font3.otf | Bin 0 -> 5872 bytes + .../aots/fonts/cmap_subtableselection_font4.otf | Bin 0 -> 5600 bytes + .../aots/fonts/cmap_subtableselection_font5.otf | Bin 0 -> 5332 bytes + .../data/aots/fonts/gpos1_1_lookupflag_f1.otf | Bin 0 -> 5208 bytes + test/shaping/data/aots/fonts/gpos1_1_simple_f1.otf | Bin 0 -> 5136 bytes + test/shaping/data/aots/fonts/gpos1_1_simple_f2.otf | Bin 0 -> 5136 bytes + test/shaping/data/aots/fonts/gpos1_1_simple_f3.otf | Bin 0 -> 5136 bytes + test/shaping/data/aots/fonts/gpos1_1_simple_f4.otf | Bin 0 -> 5136 bytes + test/shaping/data/aots/fonts/gpos1_2_font1.otf | Bin 0 -> 5108 bytes + test/shaping/data/aots/fonts/gpos1_2_font2.otf | Bin 0 -> 5148 bytes + test/shaping/data/aots/fonts/gpos2_1_font6.otf | Bin 0 -> 5120 bytes + test/shaping/data/aots/fonts/gpos2_1_font7.otf | Bin 0 -> 5132 bytes + .../data/aots/fonts/gpos2_1_lookupflag_f1.otf | Bin 0 -> 5220 bytes + .../data/aots/fonts/gpos2_1_lookupflag_f2.otf | Bin 0 -> 5220 bytes + .../data/aots/fonts/gpos2_1_next_glyph_f1.otf | Bin 0 -> 5180 bytes + .../data/aots/fonts/gpos2_1_next_glyph_f2.otf | Bin 0 -> 5176 bytes + test/shaping/data/aots/fonts/gpos2_1_simple_f1.otf | Bin 0 -> 5148 bytes + test/shaping/data/aots/fonts/gpos2_2_font1.otf | Bin 0 -> 5148 bytes + test/shaping/data/aots/fonts/gpos2_2_font2.otf | Bin 0 -> 5188 bytes + test/shaping/data/aots/fonts/gpos2_2_font3.otf | Bin 0 -> 5188 bytes + test/shaping/data/aots/fonts/gpos2_2_font4.otf | Bin 0 -> 5148 bytes + test/shaping/data/aots/fonts/gpos2_2_font5.otf | Bin 0 -> 5140 bytes + test/shaping/data/aots/fonts/gpos3_font1.otf | Bin 0 -> 5120 bytes + test/shaping/data/aots/fonts/gpos3_font2.otf | Bin 0 -> 5160 bytes + test/shaping/data/aots/fonts/gpos3_font3.otf | Bin 0 -> 5164 bytes + .../data/aots/fonts/gpos4_lookupflag_f1.otf | Bin 0 -> 5256 bytes + .../data/aots/fonts/gpos4_lookupflag_f2.otf | Bin 0 -> 5240 bytes + .../data/aots/fonts/gpos4_multiple_anchors_1.otf | Bin 0 -> 5352 bytes + test/shaping/data/aots/fonts/gpos4_simple_1.otf | Bin 0 -> 5200 bytes + test/shaping/data/aots/fonts/gpos5_font1.otf | Bin 0 -> 5284 bytes + test/shaping/data/aots/fonts/gpos6_font1.otf | Bin 0 -> 5176 bytes + test/shaping/data/aots/fonts/gpos7_1_font1.otf | Bin 0 -> 5160 bytes + test/shaping/data/aots/fonts/gpos9_font1.otf | Bin 0 -> 5096 bytes + test/shaping/data/aots/fonts/gpos9_font2.otf | Bin 0 -> 5124 bytes + .../data/aots/fonts/gpos_chaining1_boundary_f1.otf | Bin 0 -> 5496 bytes + .../data/aots/fonts/gpos_chaining1_boundary_f2.otf | Bin 0 -> 5500 bytes + .../data/aots/fonts/gpos_chaining1_boundary_f3.otf | Bin 0 -> 5496 bytes + .../data/aots/fonts/gpos_chaining1_boundary_f4.otf | Bin 0 -> 5496 bytes + .../aots/fonts/gpos_chaining1_lookupflag_f1.otf | Bin 0 -> 5520 bytes + .../fonts/gpos_chaining1_multiple_subrules_f1.otf | Bin 0 -> 5592 bytes + .../fonts/gpos_chaining1_multiple_subrules_f2.otf | Bin 0 -> 5592 bytes + .../aots/fonts/gpos_chaining1_next_glyph_f1.otf | Bin 0 -> 5540 bytes + .../data/aots/fonts/gpos_chaining1_simple_f1.otf | Bin 0 -> 5488 bytes + .../data/aots/fonts/gpos_chaining1_simple_f2.otf | Bin 0 -> 5488 bytes + .../aots/fonts/gpos_chaining1_successive_f1.otf | Bin 0 -> 5524 bytes + .../data/aots/fonts/gpos_chaining2_boundary_f1.otf | Bin 0 -> 5704 bytes + .../data/aots/fonts/gpos_chaining2_boundary_f2.otf | Bin 0 -> 5708 bytes + .../data/aots/fonts/gpos_chaining2_boundary_f3.otf | Bin 0 -> 5704 bytes + .../data/aots/fonts/gpos_chaining2_boundary_f4.otf | Bin 0 -> 5704 bytes + .../aots/fonts/gpos_chaining2_lookupflag_f1.otf | Bin 0 -> 5728 bytes + .../fonts/gpos_chaining2_multiple_subrules_f1.otf | Bin 0 -> 5800 bytes + .../fonts/gpos_chaining2_multiple_subrules_f2.otf | Bin 0 -> 5800 bytes + .../aots/fonts/gpos_chaining2_next_glyph_f1.otf | Bin 0 -> 5744 bytes + .../data/aots/fonts/gpos_chaining2_simple_f1.otf | Bin 0 -> 5696 bytes + .../data/aots/fonts/gpos_chaining2_simple_f2.otf | Bin 0 -> 5696 bytes + .../aots/fonts/gpos_chaining2_successive_f1.otf | Bin 0 -> 5732 bytes + .../data/aots/fonts/gpos_chaining3_boundary_f1.otf | Bin 0 -> 5504 bytes + .../data/aots/fonts/gpos_chaining3_boundary_f2.otf | Bin 0 -> 5508 bytes + .../data/aots/fonts/gpos_chaining3_boundary_f3.otf | Bin 0 -> 5500 bytes + .../data/aots/fonts/gpos_chaining3_boundary_f4.otf | Bin 0 -> 5500 bytes + .../aots/fonts/gpos_chaining3_lookupflag_f1.otf | Bin 0 -> 5548 bytes + .../aots/fonts/gpos_chaining3_next_glyph_f1.otf | Bin 0 -> 5524 bytes + .../data/aots/fonts/gpos_chaining3_simple_f1.otf | Bin 0 -> 5496 bytes + .../data/aots/fonts/gpos_chaining3_simple_f2.otf | Bin 0 -> 5516 bytes + .../aots/fonts/gpos_chaining3_successive_f1.otf | Bin 0 -> 5544 bytes + .../data/aots/fonts/gpos_context1_boundary_f1.otf | Bin 0 -> 5480 bytes + .../data/aots/fonts/gpos_context1_boundary_f2.otf | Bin 0 -> 5480 bytes + .../data/aots/fonts/gpos_context1_expansion_f1.otf | Bin 0 -> 5492 bytes + .../aots/fonts/gpos_context1_lookupflag_f1.otf | Bin 0 -> 5508 bytes + .../aots/fonts/gpos_context1_lookupflag_f2.otf | Bin 0 -> 5500 bytes + .../fonts/gpos_context1_multiple_subrules_f1.otf | Bin 0 -> 5568 bytes + .../fonts/gpos_context1_multiple_subrules_f2.otf | Bin 0 -> 5568 bytes + .../aots/fonts/gpos_context1_next_glyph_f1.otf | Bin 0 -> 5500 bytes + .../data/aots/fonts/gpos_context1_simple_f1.otf | Bin 0 -> 5476 bytes + .../data/aots/fonts/gpos_context1_simple_f2.otf | Bin 0 -> 5468 bytes + .../aots/fonts/gpos_context1_successive_f1.otf | Bin 0 -> 5508 bytes + .../data/aots/fonts/gpos_context2_boundary_f1.otf | Bin 0 -> 5492 bytes + .../data/aots/fonts/gpos_context2_boundary_f2.otf | Bin 0 -> 5496 bytes + .../data/aots/fonts/gpos_context2_classes_f1.otf | Bin 0 -> 5540 bytes + .../data/aots/fonts/gpos_context2_classes_f2.otf | Bin 0 -> 5564 bytes + .../data/aots/fonts/gpos_context2_expansion_f1.otf | Bin 0 -> 5524 bytes + .../aots/fonts/gpos_context2_lookupflag_f1.otf | Bin 0 -> 5540 bytes + .../aots/fonts/gpos_context2_lookupflag_f2.otf | Bin 0 -> 5532 bytes + .../fonts/gpos_context2_multiple_subrules_f1.otf | Bin 0 -> 5600 bytes + .../fonts/gpos_context2_multiple_subrules_f2.otf | Bin 0 -> 5600 bytes + .../aots/fonts/gpos_context2_next_glyph_f1.otf | Bin 0 -> 5512 bytes + .../data/aots/fonts/gpos_context2_simple_f1.otf | Bin 0 -> 5508 bytes + .../data/aots/fonts/gpos_context2_simple_f2.otf | Bin 0 -> 5484 bytes + .../aots/fonts/gpos_context2_successive_f1.otf | Bin 0 -> 5544 bytes + .../data/aots/fonts/gpos_context3_boundary_f1.otf | Bin 0 -> 5476 bytes + .../data/aots/fonts/gpos_context3_boundary_f2.otf | Bin 0 -> 5472 bytes + .../aots/fonts/gpos_context3_lookupflag_f1.otf | Bin 0 -> 5512 bytes + .../aots/fonts/gpos_context3_lookupflag_f2.otf | Bin 0 -> 5504 bytes + .../aots/fonts/gpos_context3_next_glyph_f1.otf | Bin 0 -> 5496 bytes + .../data/aots/fonts/gpos_context3_simple_f1.otf | Bin 0 -> 5480 bytes + .../aots/fonts/gpos_context3_successive_f1.otf | Bin 0 -> 5516 bytes + .../data/aots/fonts/gsub1_1_lookupflag_f1.otf | Bin 0 -> 5208 bytes + test/shaping/data/aots/fonts/gsub1_1_modulo_f1.otf | Bin 0 -> 5216 bytes + test/shaping/data/aots/fonts/gsub1_1_simple_f1.otf | Bin 0 -> 5136 bytes + .../data/aots/fonts/gsub1_2_lookupflag_f1.otf | Bin 0 -> 5212 bytes + test/shaping/data/aots/fonts/gsub1_2_simple_f1.otf | Bin 0 -> 5140 bytes + .../data/aots/fonts/gsub2_1_lookupflag_f1.otf | Bin 0 -> 5224 bytes + .../aots/fonts/gsub2_1_multiple_sequences_f1.otf | Bin 0 -> 5248 bytes + test/shaping/data/aots/fonts/gsub2_1_simple_f1.otf | Bin 0 -> 5144 bytes + .../data/aots/fonts/gsub3_1_lookupflag_f1.otf | Bin 0 -> 5224 bytes + .../data/aots/fonts/gsub3_1_multiple_f1.otf | Bin 0 -> 5168 bytes + test/shaping/data/aots/fonts/gsub3_1_simple_f1.otf | Bin 0 -> 5144 bytes + .../data/aots/fonts/gsub4_1_lookupflag_f1.otf | Bin 0 -> 5220 bytes + .../aots/fonts/gsub4_1_multiple_ligatures_f1.otf | Bin 0 -> 5252 bytes + .../aots/fonts/gsub4_1_multiple_ligatures_f2.otf | Bin 0 -> 5252 bytes + .../aots/fonts/gsub4_1_multiple_ligsets_f1.otf | Bin 0 -> 5240 bytes + test/shaping/data/aots/fonts/gsub4_1_simple_f1.otf | Bin 0 -> 5148 bytes + test/shaping/data/aots/fonts/gsub7_font1.otf | Bin 0 -> 5096 bytes + test/shaping/data/aots/fonts/gsub7_font2.otf | Bin 0 -> 5116 bytes + .../data/aots/fonts/gsub_chaining1_boundary_f1.otf | Bin 0 -> 5516 bytes + .../data/aots/fonts/gsub_chaining1_boundary_f2.otf | Bin 0 -> 5520 bytes + .../data/aots/fonts/gsub_chaining1_boundary_f3.otf | Bin 0 -> 5520 bytes + .../data/aots/fonts/gsub_chaining1_boundary_f4.otf | Bin 0 -> 5520 bytes + .../aots/fonts/gsub_chaining1_lookupflag_f1.otf | Bin 0 -> 5544 bytes + .../fonts/gsub_chaining1_multiple_subrules_f1.otf | Bin 0 -> 5616 bytes + .../fonts/gsub_chaining1_multiple_subrules_f2.otf | Bin 0 -> 5616 bytes + .../aots/fonts/gsub_chaining1_next_glyph_f1.otf | Bin 0 -> 5560 bytes + .../data/aots/fonts/gsub_chaining1_simple_f1.otf | Bin 0 -> 5508 bytes + .../data/aots/fonts/gsub_chaining1_simple_f2.otf | Bin 0 -> 5512 bytes + .../aots/fonts/gsub_chaining1_successive_f1.otf | Bin 0 -> 5544 bytes + .../data/aots/fonts/gsub_chaining2_boundary_f1.otf | Bin 0 -> 5724 bytes + .../data/aots/fonts/gsub_chaining2_boundary_f2.otf | Bin 0 -> 5728 bytes + .../data/aots/fonts/gsub_chaining2_boundary_f3.otf | Bin 0 -> 5728 bytes + .../data/aots/fonts/gsub_chaining2_boundary_f4.otf | Bin 0 -> 5728 bytes + .../aots/fonts/gsub_chaining2_lookupflag_f1.otf | Bin 0 -> 5752 bytes + .../fonts/gsub_chaining2_multiple_subrules_f1.otf | Bin 0 -> 5824 bytes + .../fonts/gsub_chaining2_multiple_subrules_f2.otf | Bin 0 -> 5824 bytes + .../aots/fonts/gsub_chaining2_next_glyph_f1.otf | Bin 0 -> 5764 bytes + .../data/aots/fonts/gsub_chaining2_simple_f1.otf | Bin 0 -> 5716 bytes + .../data/aots/fonts/gsub_chaining2_simple_f2.otf | Bin 0 -> 5720 bytes + .../aots/fonts/gsub_chaining2_successive_f1.otf | Bin 0 -> 5752 bytes + .../data/aots/fonts/gsub_chaining3_boundary_f1.otf | Bin 0 -> 5528 bytes + .../data/aots/fonts/gsub_chaining3_boundary_f2.otf | Bin 0 -> 5532 bytes + .../data/aots/fonts/gsub_chaining3_boundary_f3.otf | Bin 0 -> 5524 bytes + .../data/aots/fonts/gsub_chaining3_boundary_f4.otf | Bin 0 -> 5524 bytes + .../aots/fonts/gsub_chaining3_lookupflag_f1.otf | Bin 0 -> 5572 bytes + .../aots/fonts/gsub_chaining3_next_glyph_f1.otf | Bin 0 -> 5548 bytes + .../data/aots/fonts/gsub_chaining3_simple_f1.otf | Bin 0 -> 5520 bytes + .../data/aots/fonts/gsub_chaining3_simple_f2.otf | Bin 0 -> 5540 bytes + .../aots/fonts/gsub_chaining3_successive_f1.otf | Bin 0 -> 5568 bytes + .../data/aots/fonts/gsub_context1_boundary_f1.otf | Bin 0 -> 5500 bytes + .../data/aots/fonts/gsub_context1_boundary_f2.otf | Bin 0 -> 5504 bytes + .../data/aots/fonts/gsub_context1_expansion_f1.otf | Bin 0 -> 5516 bytes + .../aots/fonts/gsub_context1_lookupflag_f1.otf | Bin 0 -> 5532 bytes + .../aots/fonts/gsub_context1_lookupflag_f2.otf | Bin 0 -> 5524 bytes + .../fonts/gsub_context1_multiple_subrules_f1.otf | Bin 0 -> 5592 bytes + .../fonts/gsub_context1_multiple_subrules_f2.otf | Bin 0 -> 5592 bytes + .../aots/fonts/gsub_context1_next_glyph_f1.otf | Bin 0 -> 5520 bytes + .../data/aots/fonts/gsub_context1_simple_f1.otf | Bin 0 -> 5500 bytes + .../data/aots/fonts/gsub_context1_simple_f2.otf | Bin 0 -> 5492 bytes + .../aots/fonts/gsub_context1_successive_f1.otf | Bin 0 -> 5528 bytes + .../data/aots/fonts/gsub_context2_boundary_f1.otf | Bin 0 -> 5516 bytes + .../data/aots/fonts/gsub_context2_boundary_f2.otf | Bin 0 -> 5516 bytes + .../data/aots/fonts/gsub_context2_classes_f1.otf | Bin 0 -> 5564 bytes + .../data/aots/fonts/gsub_context2_classes_f2.otf | Bin 0 -> 5584 bytes + .../data/aots/fonts/gsub_context2_expansion_f1.otf | Bin 0 -> 5544 bytes + .../aots/fonts/gsub_context2_lookupflag_f1.otf | Bin 0 -> 5560 bytes + .../aots/fonts/gsub_context2_lookupflag_f2.otf | Bin 0 -> 5552 bytes + .../fonts/gsub_context2_multiple_subrules_f1.otf | Bin 0 -> 5620 bytes + .../fonts/gsub_context2_multiple_subrules_f2.otf | Bin 0 -> 5620 bytes + .../aots/fonts/gsub_context2_next_glyph_f1.otf | Bin 0 -> 5536 bytes + .../data/aots/fonts/gsub_context2_simple_f1.otf | Bin 0 -> 5528 bytes + .../data/aots/fonts/gsub_context2_simple_f2.otf | Bin 0 -> 5504 bytes + .../aots/fonts/gsub_context2_successive_f1.otf | Bin 0 -> 5568 bytes + .../data/aots/fonts/gsub_context3_boundary_f1.otf | Bin 0 -> 5500 bytes + .../data/aots/fonts/gsub_context3_boundary_f2.otf | Bin 0 -> 5496 bytes + .../aots/fonts/gsub_context3_lookupflag_f1.otf | Bin 0 -> 5536 bytes + .../aots/fonts/gsub_context3_lookupflag_f2.otf | Bin 0 -> 5528 bytes + .../aots/fonts/gsub_context3_next_glyph_f1.otf | Bin 0 -> 5520 bytes + .../data/aots/fonts/gsub_context3_simple_f1.otf | Bin 0 -> 5504 bytes + .../aots/fonts/gsub_context3_successive_f1.otf | Bin 0 -> 5540 bytes + .../aots/fonts/lookupflag_ignore_attach_f1.otf | Bin 0 -> 5416 bytes + .../data/aots/fonts/lookupflag_ignore_base_f1.otf | Bin 0 -> 5256 bytes + .../fonts/lookupflag_ignore_combination_f1.otf | Bin 0 -> 5408 bytes + .../aots/fonts/lookupflag_ignore_ligatures_f1.otf | Bin 0 -> 5320 bytes + .../data/aots/fonts/lookupflag_ignore_marks_f1.otf | Bin 0 -> 5288 bytes + test/shaping/data/aots/hb-aots-tester.cpp | 343 +++++++++++++++++++++ + test/shaping/data/aots/tests/classdef1.tests | 1 + + test/shaping/data/aots/tests/classdef1_empty.tests | 1 + + .../data/aots/tests/classdef1_multiple.tests | 1 + + .../shaping/data/aots/tests/classdef1_single.tests | 1 + + test/shaping/data/aots/tests/classdef2.tests | 1 + + test/shaping/data/aots/tests/classdef2_empty.tests | 1 + + .../data/aots/tests/classdef2_multiple.tests | 1 + + .../shaping/data/aots/tests/classdef2_single.tests | 1 + + .../data/aots/tests/gpos1_1_lookupflag.tests | 1 + + test/shaping/data/aots/tests/gpos1_1_simple.tests | 4 + + test/shaping/data/aots/tests/gpos1_2.tests | 1 + + .../data/aots/tests/gpos1_2_lookupflag.tests | 1 + + test/shaping/data/aots/tests/gpos2_1.tests | 2 + + .../data/aots/tests/gpos2_1_lookupflag.tests | 2 + + .../data/aots/tests/gpos2_1_next_glyph.tests | 2 + + test/shaping/data/aots/tests/gpos2_1_simple.tests | 2 + + test/shaping/data/aots/tests/gpos2_2.tests | 5 + + test/shaping/data/aots/tests/gpos3.tests | 11 + + .../shaping/data/aots/tests/gpos3_lookupflag.tests | 2 + + .../shaping/data/aots/tests/gpos4_lookupflag.tests | 2 + + .../data/aots/tests/gpos4_multiple_anchors.tests | 1 + + test/shaping/data/aots/tests/gpos4_simple.tests | 5 + + test/shaping/data/aots/tests/gpos5.tests | 2 + + test/shaping/data/aots/tests/gpos6.tests | 3 + + test/shaping/data/aots/tests/gpos7_1.tests | 2 + + test/shaping/data/aots/tests/gpos9.tests | 2 + + .../data/aots/tests/gpos_chaining1_boundary.tests | 4 + + .../aots/tests/gpos_chaining1_lookupflag.tests | 1 + + .../tests/gpos_chaining1_multiple_subrules.tests | 2 + + .../aots/tests/gpos_chaining1_next_glyph.tests | 1 + + .../data/aots/tests/gpos_chaining1_simple.tests | 11 + + .../aots/tests/gpos_chaining1_successive.tests | 1 + + .../data/aots/tests/gpos_chaining2_boundary.tests | 4 + + .../aots/tests/gpos_chaining2_lookupflag.tests | 1 + + .../tests/gpos_chaining2_multiple_subrules.tests | 2 + + .../aots/tests/gpos_chaining2_next_glyph.tests | 1 + + .../data/aots/tests/gpos_chaining2_simple.tests | 11 + + .../aots/tests/gpos_chaining2_successive.tests | 1 + + .../data/aots/tests/gpos_chaining3_boundary.tests | 4 + + .../aots/tests/gpos_chaining3_lookupflag.tests | 1 + + .../aots/tests/gpos_chaining3_next_glyph.tests | 1 + + .../data/aots/tests/gpos_chaining3_simple.tests | 11 + + .../aots/tests/gpos_chaining3_successive.tests | 1 + + .../data/aots/tests/gpos_context1_boundary.tests | 2 + + .../data/aots/tests/gpos_context1_expansion.tests | 1 + + .../data/aots/tests/gpos_context1_lookupflag.tests | 2 + + .../tests/gpos_context1_multiple_subrules.tests | 2 + + .../data/aots/tests/gpos_context1_next_glyph.tests | 1 + + .../data/aots/tests/gpos_context1_simple.tests | 3 + + .../data/aots/tests/gpos_context1_successive.tests | 1 + + .../data/aots/tests/gpos_context2_boundary.tests | 2 + + .../data/aots/tests/gpos_context2_classes.tests | 2 + + .../data/aots/tests/gpos_context2_expansion.tests | 1 + + .../data/aots/tests/gpos_context2_lookupflag.tests | 2 + + .../tests/gpos_context2_multiple_subrules.tests | 2 + + .../data/aots/tests/gpos_context2_next_glyph.tests | 1 + + .../data/aots/tests/gpos_context2_simple.tests | 3 + + .../data/aots/tests/gpos_context2_successive.tests | 1 + + .../data/aots/tests/gpos_context3_boundary.tests | 2 + + .../data/aots/tests/gpos_context3_lookupflag.tests | 2 + + .../data/aots/tests/gpos_context3_next_glyph.tests | 1 + + .../data/aots/tests/gpos_context3_simple.tests | 2 + + .../data/aots/tests/gpos_context3_successive.tests | 1 + + .../data/aots/tests/gsub1_1_lookupflag.tests | 1 + + test/shaping/data/aots/tests/gsub1_1_modulo.tests | 1 + + test/shaping/data/aots/tests/gsub1_1_simple.tests | 1 + + .../data/aots/tests/gsub1_2_lookupflag.tests | 1 + + test/shaping/data/aots/tests/gsub1_2_simple.tests | 1 + + .../data/aots/tests/gsub2_1_lookupflag.tests | 1 + + .../aots/tests/gsub2_1_multiple_sequences.tests | 1 + + test/shaping/data/aots/tests/gsub2_1_simple.tests | 2 + + .../data/aots/tests/gsub3_1_lookupflag.tests | 1 + + .../shaping/data/aots/tests/gsub3_1_multiple.tests | 1 + + test/shaping/data/aots/tests/gsub3_1_simple.tests | 1 + + .../data/aots/tests/gsub4_1_lookupflag.tests | 1 + + .../aots/tests/gsub4_1_multiple_ligatures.tests | 2 + + .../data/aots/tests/gsub4_1_multiple_ligsets.tests | 1 + + test/shaping/data/aots/tests/gsub4_1_simple.tests | 1 + + test/shaping/data/aots/tests/gsub7.tests | 2 + + .../data/aots/tests/gsub_chaining1_boundary.tests | 4 + + .../aots/tests/gsub_chaining1_lookupflag.tests | 1 + + .../tests/gsub_chaining1_multiple_subrules.tests | 2 + + .../aots/tests/gsub_chaining1_next_glyph.tests | 1 + + .../data/aots/tests/gsub_chaining1_simple.tests | 11 + + .../aots/tests/gsub_chaining1_successive.tests | 1 + + .../data/aots/tests/gsub_chaining2_boundary.tests | 4 + + .../aots/tests/gsub_chaining2_lookupflag.tests | 1 + + .../tests/gsub_chaining2_multiple_subrules.tests | 2 + + .../aots/tests/gsub_chaining2_next_glyph.tests | 1 + + .../data/aots/tests/gsub_chaining2_simple.tests | 11 + + .../aots/tests/gsub_chaining2_successive.tests | 1 + + .../data/aots/tests/gsub_chaining3_boundary.tests | 4 + + .../aots/tests/gsub_chaining3_lookupflag.tests | 1 + + .../aots/tests/gsub_chaining3_next_glyph.tests | 1 + + .../data/aots/tests/gsub_chaining3_simple.tests | 11 + + .../aots/tests/gsub_chaining3_successive.tests | 1 + + .../data/aots/tests/gsub_context1_boundary.tests | 2 + + .../data/aots/tests/gsub_context1_expansion.tests | 1 + + .../data/aots/tests/gsub_context1_lookupflag.tests | 2 + + .../tests/gsub_context1_multiple_subrules.tests | 2 + + .../data/aots/tests/gsub_context1_next_glyph.tests | 1 + + .../data/aots/tests/gsub_context1_simple.tests | 3 + + .../data/aots/tests/gsub_context1_successive.tests | 1 + + .../data/aots/tests/gsub_context2_boundary.tests | 2 + + .../data/aots/tests/gsub_context2_classes.tests | 2 + + .../data/aots/tests/gsub_context2_expansion.tests | 1 + + .../data/aots/tests/gsub_context2_lookupflag.tests | 2 + + .../tests/gsub_context2_multiple_subrules.tests | 2 + + .../data/aots/tests/gsub_context2_next_glyph.tests | 1 + + .../data/aots/tests/gsub_context2_simple.tests | 3 + + .../data/aots/tests/gsub_context2_successive.tests | 1 + + .../data/aots/tests/gsub_context3_boundary.tests | 2 + + .../data/aots/tests/gsub_context3_lookupflag.tests | 2 + + .../data/aots/tests/gsub_context3_next_glyph.tests | 1 + + .../data/aots/tests/gsub_context3_simple.tests | 2 + + .../data/aots/tests/gsub_context3_successive.tests | 1 + + .../data/aots/tests/lookupflag_ignore_attach.tests | 5 + + .../data/aots/tests/lookupflag_ignore_base.tests | 2 + + .../aots/tests/lookupflag_ignore_combination.tests | 3 + + .../aots/tests/lookupflag_ignore_ligatures.tests | 3 + + .../data/aots/tests/lookupflag_ignore_marks.tests | 1 + + test/shaping/run-tests.py | 9 +- + 332 files changed, 815 insertions(+), 3 deletions(-) + +commit ae96c98dfaef3a789227ffecd40b92518dface8a +Author: Behdad Esfahbod +Date: Sat Nov 24 10:25:10 2018 -0500 + + [color] Use SortedUnsizedArrayOf<> + + src/hb-ot-color-colr-table.hh | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) + +commit 4a3b20738fca3231e5d9a36adba333b5bce05f4a +Author: Behdad Esfahbod +Date: Sat Nov 24 10:17:59 2018 -0500 + + [trak] Coment + + src/hb-aat-layout-trak-table.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 918b1ee54d43eb493c9226bff7677ed8ec07934b +Author: Behdad Esfahbod +Date: Sat Nov 24 10:09:17 2018 -0500 + + [arrays] Add not_found to reference bsearch as well + + src/hb-open-type.hh | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit d77a098b735cf14aa601feab5bdb9f4e474c794f +Author: Behdad Esfahbod +Date: Sat Nov 24 10:06:13 2018 -0500 + + [arrays] Improve bfind() interface + + Much more useful now. :) + + src/hb-dsalgs.hh | 29 +++++++++++++++++++++++++---- + src/hb-open-file.hh | 9 +-------- + src/hb-open-type.hh | 12 ++++++++---- + src/hb-ot-layout-common.hh | 10 ++-------- + src/hb-set.hh | 6 +++--- + src/hb-vector.hh | 6 ++++-- + 6 files changed, 43 insertions(+), 29 deletions(-) + +commit 1204a247a5d9a4da39675d3da85d4fd3268a5b66 +Author: Behdad Esfahbod +Date: Sat Nov 24 09:49:21 2018 -0500 + + [fuzzing] Add tests for previous commit + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11526 + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11522 + + ...zz-testcase-minimized-hb-shape-fuzzer-5634620935110656 | Bin 0 -> 41 bytes + ...zz-testcase-minimized-hb-shape-fuzzer-5716208469409792 | Bin 0 -> 243 bytes + 2 files changed, 0 insertions(+), 0 deletions(-) + +commit 8dcc1913a1670ede7b124f7b5b775d7ab8791386 +Author: Behdad Esfahbod +Date: Sat Nov 24 09:47:45 2018 -0500 + + [kerx/morx] Make sure object length is sanitized before accessing it + + src/hb-aat-layout-kerx-table.hh | 5 +++++ + src/hb-aat-layout-morx-table.hh | 5 +++++ + 2 files changed, 10 insertions(+) + +commit 70d80c90fe2f4eca66bec3e1d313bbf7e4d0ab65 +Author: Behdad Esfahbod +Date: Sat Nov 24 01:59:50 2018 -0500 + + [arrays] Port ArrayOf.qsort() and hb_vector_t.qsort() to hb_array_t + + src/hb-dsalgs.hh | 14 ++++++++++++-- + src/hb-open-type.hh | 14 ++++++++++++-- + 2 files changed, 24 insertions(+), 4 deletions(-) + +commit 073d837aa2394d29dda72679802d583c559c3c5b +Author: Behdad Esfahbod +Date: Sat Nov 24 01:48:48 2018 -0500 + + [arrays] Port ArrayOf.qsort() to hb_array_t's + + src/hb-open-type.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit ad5c871d801b481f95dd32c8b65ecc70def597be +Author: Behdad Esfahbod +Date: Sat Nov 24 01:47:49 2018 -0500 + + [arrays] Add copy-constructor to hb_array_t and hb_sorted_array_t + + src/hb-dsalgs.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 61de55bf496c1edb120e4d096140eb1125552bbe +Author: Behdad Esfahbod +Date: Sat Nov 24 01:45:58 2018 -0500 + + [arrays] Port hb_vector_t.qsort() to hb_array_t's + + src/hb-dsalgs.hh | 16 +++++++++++++--- + src/hb-vector.hh | 10 ++-------- + 2 files changed, 15 insertions(+), 11 deletions(-) + +commit e3face8e791d677f94154e8a7f3d787d0d69a02f +Author: Behdad Esfahbod +Date: Sat Nov 24 01:42:17 2018 -0500 + + [arrays] Remove one flavor of hb_vector_t.qsort() + + src/hb-vector.hh | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +commit 7c1600dcd9813ca560ecccc5c54877a5750caf4e +Author: Behdad Esfahbod +Date: Sat Nov 24 01:37:11 2018 -0500 + + [arrays] Add (unused) SortedUnsizedArrayOf<> + + src/hb-open-type.hh | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit e700392f5cbf366f1e03dc7e7b1a2eb6c3027b92 +Author: Behdad Esfahbod +Date: Sat Nov 24 01:31:00 2018 -0500 + + [arrays] Port SortedArrayOf.bsearch/bfind to hb_sorted_array_t's + + src/hb-dsalgs.hh | 9 +++------ + src/hb-open-type.hh | 50 ++++++++++---------------------------------------- + src/hb-vector.hh | 35 ++++++++++------------------------- + 3 files changed, 23 insertions(+), 71 deletions(-) + +commit e604306f2829804e9016966c1378166253b19d29 +Author: Behdad Esfahbod +Date: Sat Nov 24 01:24:48 2018 -0500 + + [arrays] Port hb_vector_t.bsearch/bfind to (new) hb_sorted_array_t's + + src/hb-dsalgs.hh | 63 +++++++++++++++++++++++++++++++++++++++++++++++++---- + src/hb-open-type.hh | 12 ++++++---- + src/hb-vector.hh | 57 +++++++++++++++++++----------------------------- + 3 files changed, 89 insertions(+), 43 deletions(-) + +commit 268eca24921e85eda98f4f0cce05d40c7235ba62 +Author: Behdad Esfahbod +Date: Sat Nov 24 01:11:12 2018 -0500 + + [arrays] Port (unused) ArrayOf.lsearch() to hb_array_t's + + src/hb-open-type.hh | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +commit 830856ba6b9454bf507e00416f9d45e9975fb7dc +Author: Behdad Esfahbod +Date: Sat Nov 24 01:09:28 2018 -0500 + + [arrays] Port hb_vector_t.lsearch() to hb_array_t's + + src/hb-dsalgs.hh | 26 +++++++++++++++++++++++--- + src/hb-vector.hh | 16 ++++------------ + 2 files changed, 27 insertions(+), 15 deletions(-) + +commit 96cf0889804b7d72a96274b25641bb18f7dd2e1e +Author: Behdad Esfahbod +Date: Sat Nov 24 01:07:15 2018 -0500 + + [arrays] More + + src/hb-face.cc | 6 +++--- + src/hb-vector.hh | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 3e26c8d2b10fc08642c25c7f13aef68b0b1008f6 +Author: Behdad Esfahbod +Date: Sat Nov 24 00:58:44 2018 -0500 + + [arrays] Update ArrayOf.lsearch() + + Currently unused apparently + + src/hb-open-type.hh | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +commit 22e1857b01c71714245ddca05cb3fa0127bf7da2 +Author: Behdad Esfahbod +Date: Sat Nov 24 00:53:19 2018 -0500 + + [arrays] Change argument type of cmp called by hb_vector_t.bsearch() + + Towards consolidating all array bsearch/... + + src/hb-aat-map.hh | 4 ++-- + src/hb-ot-map.hh | 4 ++-- + src/hb-set.hh | 2 +- + src/hb-vector.hh | 4 ++-- + 4 files changed, 7 insertions(+), 7 deletions(-) + +commit 5fdf7b724eb3cb5ac60cd7f90d3250877ad7ca06 +Author: Nathan Willis +Date: Thu Nov 15 17:40:21 2018 -0600 + + Usermanual: clusters chapter; add brief grapheme definition and clarify monotonous cluster handling. + + docs/usermanual-clusters.xml | 56 ++++++++++++++++++++++++++++++-------------- + 1 file changed, 39 insertions(+), 17 deletions(-) + +commit 939220e57da613e090d247aa1af2396c28370af4 +Author: Nathan Willis +Date: Thu Nov 15 15:47:03 2018 -0600 + + Usermanual: clusters chapter, minor updates. + + docs/usermanual-clusters.xml | 25 ++++++++++++++++--------- + 1 file changed, 16 insertions(+), 9 deletions(-) + +commit 53ac46e974cf0ee8720b40ef394714eb97ff53b9 +Author: Nathan Willis +Date: Mon Nov 12 12:17:06 2018 -0600 + + Usermanual: expand clusters chapter. + + docs/usermanual-clusters.xml | 743 +++++++++++++++++++++++++++---------------- + 1 file changed, 473 insertions(+), 270 deletions(-) + +commit 30cb45b3eaacda15cc45435815cae3fd50e87557 +Author: Behdad Esfahbod +Date: Sat Nov 24 00:35:31 2018 -0500 + + Change ArrayOf.bsearch() return semantics + + Towards consolidating all array bsearch/... + + src/hb-aat-layout-kerx-table.hh | 16 +++------------- + src/hb-open-file.hh | 12 ++++++++---- + src/hb-open-type.hh | 42 ++++++++++++++++++++++++++++++++--------- + src/hb-ot-cmap-table.hh | 30 ++++++++++++----------------- + src/hb-ot-color-svg-table.hh | 3 +-- + src/hb-ot-layout-common.hh | 29 +++++++++++----------------- + src/hb-ot-vorg-table.hh | 9 ++++----- + src/hb-vector.hh | 14 +++++++++----- + 8 files changed, 81 insertions(+), 74 deletions(-) + +commit 5cd9546ba73d9f8c8b7b8db0960d657c50b70f64 +Author: Behdad Esfahbod +Date: Sat Nov 24 00:38:36 2018 -0500 + + Minor + + src/hb-ot-layout-common.hh | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit fd94e729cb50f2b6bd83b80cbf400e10ac633a1c +Author: Behdad Esfahbod +Date: Sat Nov 24 00:45:55 2018 -0500 + + Whitespace + + src/hb-ot-layout-common.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit bb2a2065080a3099eb0dc82d1df0891ad2601316 +Author: Behdad Esfahbod +Date: Sat Nov 24 00:31:40 2018 -0500 + + Assert that item-type of arrays have static size + + src/hb-dsalgs.hh | 2 ++ + src/hb-open-type.hh | 4 ++++ + src/hb-vector.hh | 2 ++ + 3 files changed, 8 insertions(+) + +commit 690d9eb83d3421b397b0cb824cd768d6d73cbf12 +Author: Behdad Esfahbod +Date: Sat Nov 24 00:29:22 2018 -0500 + + [vector] Rename + + src/hb-vector.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit ba38378fd4374f3d44bdc9aa0de902401b60b13d +Author: Behdad Esfahbod +Date: Sat Nov 24 00:27:57 2018 -0500 + + [aat] Minor + + src/hb-aat-layout-common.hh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 39b9d63b014380d421cc9b94a49dd411c7a5aabf +Author: Behdad Esfahbod +Date: Sat Nov 24 00:25:40 2018 -0500 + + Add hb_static_size(T) + + src/hb-null.hh | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +commit f99abcc37990a478189dda691d1fdac7b9d51386 +Author: Behdad Esfahbod +Date: Sat Nov 24 00:22:21 2018 -0500 + + Add template-function convenience macros + + src/hb-atomic.hh | 2 +- + src/hb-blob.hh | 4 ++-- + src/hb-common.cc | 2 +- + src/hb-ft.cc | 2 +- + src/hb-null.hh | 11 ++++++----- + src/hb.hh | 3 +++ + 6 files changed, 14 insertions(+), 10 deletions(-) + +commit ec83b2228e0bbb6df7e7b94dad49db32b041af4a +Author: Behdad Esfahbod +Date: Fri Nov 23 19:58:49 2018 -0500 + + Add null bytes for CmapSubtableLongGroup + + src/hb-ot-cmap-table.hh | 1 + + src/hb-static.cc | 4 +++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit e2ffb33a534a427c760dae53d0469eeced4343ba +Author: Behdad Esfahbod +Date: Fri Nov 23 16:24:28 2018 -0500 + + Remove lsearch for small TableDirectorys + + src/hb-open-file.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 04f7e5536924e7f277d72b8cb9d878239877c331 +Author: Behdad Esfahbod +Date: Fri Nov 23 16:07:43 2018 -0500 + + [arrays] Add as_array() to hb_vector_t<> + + src/hb-vector.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit c514f65181390ab98b0f738632f71cda31e46b68 +Author: Behdad Esfahbod +Date: Fri Nov 23 16:04:56 2018 -0500 + + [arrays] Add as_array() to ArrayOf<> + + src/hb-open-type.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit 9552f4ef0da0b7e1fb28cb2738b865888e7941d9 +Author: Behdad Esfahbod +Date: Fri Nov 23 15:24:17 2018 -0500 + + [kern] Don't enforce length of last subtable + + src/hb-aat-layout-kerx-table.hh | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) + +commit 992b7128656e72f935089dc2e12c2d2a25511886 +Merge: c9cc96c0 018ba46e +Author: Behdad Esfahbod +Date: Fri Nov 23 13:49:34 2018 -0500 + + Merge pull request #1407 from harfbuzz/at-sign + + Don't canonicalize '@' to '-' in language tags + +commit 018ba46e4d003a5dd0f6d2d899226129c4ef0c60 +Author: David Corbett +Date: Fri Nov 23 13:21:22 2018 -0500 + + Don't canonicalize '@' to '-' in language tags + + Fixes #1406. + + src/hb-common.cc | 2 +- + test/api/test-ot-tag.c | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit c9cc96c0cfbbb87b9292e413d500a454182be9f4 +Author: Ebrahim Byagowi +Date: Fri Nov 23 19:58:56 2018 +0330 + + [aat] Update expectation + + test/shaping/data/in-house/tests/macos-10.12.tests | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 748962264a9f098b32b9cb3fe4d18c786907a184 +Author: Behdad Esfahbod +Date: Fri Nov 23 11:10:17 2018 -0500 + + [aat] Disable mark advance zeroing if kern table has state-machines + + Geeza Pro for example, relies on that for fancy mark positioning. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1405 + + src/hb-aat-layout-kerx-table.hh | 15 +++++++++++++++ + src/hb-ot-kern-table.hh | 9 +++++++++ + src/hb-ot-layout.cc | 6 ++++++ + src/hb-ot-layout.hh | 3 +++ + src/hb-ot-shape.cc | 4 +++- + 5 files changed, 36 insertions(+), 1 deletion(-) + +commit 3d2b98ef14af29acd74f01647bef60cd410825fb +Author: Behdad Esfahbod +Date: Fri Nov 23 10:45:44 2018 -0500 + + Minor + + src/hb.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 341851efe158599a34d241a97593058a4333852e +Author: Ebrahim Byagowi +Date: Fri Nov 23 15:40:05 2018 +0330 + + [aat] Add macOS specific tests (#1404) + + .circleci/config.yml | 46 ++++++++++++++-------- + test/shaping/CMakeLists.txt | 2 + + test/shaping/data/in-house/Makefile.sources | 1 + + test/shaping/data/in-house/tests/macos-10.12.tests | 10 +++++ + test/shaping/run-tests.py | 38 ++++++++++++++---- + 5 files changed, 73 insertions(+), 24 deletions(-) + +commit 22798e93c414a2655c757a6e41b300f67e04a9a3 +Author: Behdad Esfahbod +Date: Thu Nov 22 22:47:51 2018 -0500 + + [use] Minor clarification + + src/hb-ot-shape-complex-use.cc | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +commit a2d6c1075a5595a08ef09357293919d9df8eb64a +Author: Behdad Esfahbod +Date: Thu Nov 22 22:40:57 2018 -0500 + + Minor tweak to FLAG64 + + src/hb.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 8280459e74cff2dec3de012abd309cda9578b759 +Merge: e4a4555d 3c7792ca +Author: Behdad Esfahbod +Date: Thu Nov 22 22:39:12 2018 -0500 + + Merge pull request #1291 from harfbuzz/use-reordering + + [use] Fix reordering + +commit e4a4555d1e40dacdf72452805e9e6b6109627d63 +Author: Behdad Esfahbod +Date: Thu Nov 22 22:17:49 2018 -0500 + + [cmap] Move code around + + src/hb-ot-cmap-table.hh | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +commit 758c9d68e2143493978d8ac8391f4af2a2abc26a +Author: Behdad Esfahbod +Date: Thu Nov 22 22:16:12 2018 -0500 + + [morx/kerx] Limit range to subtable when sanitizing + + src/hb-aat-layout-kerx-table.hh | 2 ++ + src/hb-aat-layout-morx-table.hh | 2 ++ + 2 files changed, 4 insertions(+) + +commit a9fe787a11fc391d9a43a4ea19e6eb1c474199bd +Author: Behdad Esfahbod +Date: Thu Nov 22 22:12:36 2018 -0500 + + [sanitizer] Add reset_object(), make set_object() do bounds-check + + Affects morx/kerx run-time only currently. Will adjust their sanitize next. + + src/hb-aat-layout-kerx-table.hh | 1 + + src/hb-aat-layout-morx-table.hh | 1 + + src/hb-machinery.hh | 30 +++++++++++++++++++----------- + 3 files changed, 21 insertions(+), 11 deletions(-) + +commit 2c8188bf599e351a4e0804d74612f9643b3d2443 +Author: Behdad Esfahbod +Date: Thu Nov 22 22:02:19 2018 -0500 + + [kerx] Make sure subtables are non-zero-length + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11400 + + src/hb-aat-layout-kerx-table.hh | 1 + + src/hb-aat-layout-morx-table.hh | 2 +- + ...z-testcase-minimized-hb-shape-fuzzer-5722888989048832 | Bin 0 -> 3608 bytes + 3 files changed, 2 insertions(+), 1 deletion(-) + +commit a9e0bdc35dfcbead7d4b6fa249d60ebedd7d43ca +Author: Behdad Esfahbod +Date: Thu Nov 22 21:30:04 2018 -0500 + + [GSUB] Don't flush glyphset during recursion in closure() + + See comment. + + Supercedes https://github.com/harfbuzz/harfbuzz/pull/1401 + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11366 + + src/hb-ot-layout-gsub-table.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 8982830d3ec54f50cc951de9569520fafc735e75 +Author: Garret Rieger +Date: Mon Nov 19 13:00:24 2018 -0800 + + [subset] add fuzzer testcase. + + ...z-testcase-minimized-hb-subset-fuzzer-5067936541179904 | Bin 0 -> 172 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit d0e81b2cc85d09d01905c5fc5b3382c25eaa3bb3 +Author: Behdad Esfahbod +Date: Thu Nov 22 21:20:39 2018 -0500 + + [set] Rename + + src/hb-set.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit e866910579e9cdc5b1ffa2e401fd0c056d44ca6a +Author: Behdad Esfahbod +Date: Thu Nov 22 18:07:59 2018 -0500 + + Enforce requiring null_size even if min_size is 0 + + This concludes null-size enforcement changes + + src/hb-null.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4d4fd64ff47da04a7008d410c92e8fb4ad970781 +Author: Behdad Esfahbod +Date: Thu Nov 22 18:07:36 2018 -0500 + + Allow non-nullable OffsetTo<> to non-Null'able objects + + src/hb-open-type.hh | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +commit fa9f585ec53bc7145d3bed1a4bd756d64dae1e55 +Author: Behdad Esfahbod +Date: Thu Nov 22 17:56:51 2018 -0500 + + [glyf] Don't mark structs UNBOUNDED + + See comments. + + src/hb-ot-glyf-table.hh | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit f47a60a7543dbaf41086c25a1a22ae518d8b92a9 +Author: Behdad Esfahbod +Date: Thu Nov 22 17:53:29 2018 -0500 + + Mark UnsizedArrayOf<> as UNBOUNDED + + Since min_size is 0, Null() still accepts this type. + + src/hb-open-type.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 199a0f7b41b691e371487fd569c0d0146da3c3f3 +Author: Behdad Esfahbod +Date: Thu Nov 22 17:31:07 2018 -0500 + + [ot-shape] Simplify logic + + src/hb-ot-shape.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 014e4980ed9c8c473001abdb3a44121eb73fd50d +Author: Behdad Esfahbod +Date: Thu Nov 22 16:21:49 2018 -0500 + + Move + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 62890dee18b88865a2014fb6a1322c1c9218bd49 +Author: Behdad Esfahbod +Date: Thu Nov 22 16:20:29 2018 -0500 + + [aat] Zero mark advances if decided so even if there's cross-kerning + + Cross-kerning can only take care of positioning vertically. It doesn't + adjust mark advance... + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a201fa74cd67f36a402a5c8093889c9d793e9fd5 +Author: Behdad Esfahbod +Date: Thu Nov 22 15:52:29 2018 -0500 + + [aat] Tweak fallback positioning logic when applying morx + + Such that for Indic-like scripts (eg. Khmer), we don't do any fallback mark + advance-zeroing / positioning, but we do for Latin, etc. Reuses preferences + of our script-specific OpenType shapers for those. + + Fixes regression: https://github.com/harfbuzz/harfbuzz/issues/1393 + Which means, fixes again: https://github.com/harfbuzz/harfbuzz/issues/1264 + While not regressing: https://github.com/harfbuzz/harfbuzz/issues/1357 + + src/hb-ot-shape.cc | 38 +++++++++++++++++++++++--------------- + src/hb-ot-shape.hh | 3 +++ + 2 files changed, 26 insertions(+), 15 deletions(-) + +commit fa0bd8964d110c168a918bc331dcd350c3fed8c1 +Author: Behdad Esfahbod +Date: Thu Nov 22 14:46:39 2018 -0500 + + [myanmar] Minor move + + src/hb-ot-shape-complex.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 7dc561984bdb1f29f09ae0793195b5fbf772522b +Author: Behdad Esfahbod +Date: Thu Nov 22 14:45:46 2018 -0500 + + [myanmar] If there's no GSUB table, pick myanmar shaper + + Needed for morx+kern mark-zeroing interaction. All other scripts + work this way. + + src/hb-ot-shape-complex.hh | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +commit 25f52f58c20715cc0dee2dd2885669078a128b08 +Author: Behdad Esfahbod +Date: Thu Nov 22 14:41:01 2018 -0500 + + [myanmar] Remove myanmar_old shaper + + Over time it has become the same as default shaper. So, remove. + + src/hb-ot-shape-complex-myanmar.cc | 21 --------------------- + src/hb-ot-shape-complex.hh | 4 +--- + 2 files changed, 1 insertion(+), 24 deletions(-) + +commit eeed802b1d0f932c61a088d3e0156ae70645b9e2 +Author: Behdad Esfahbod +Date: Thu Nov 22 01:53:36 2018 -0500 + + Fix spurious gcc warnings + + ../../src/hb-null.hh:53:39: warning: enum constant in boolean context [-Wint-in-bool-context] + + src/hb-null.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b96ecb9971a9ad089a631d0139f05ae9d880fc55 +Author: Behdad Esfahbod +Date: Thu Nov 22 01:49:12 2018 -0500 + + More + + This makes more of the gcc spurious warning: + + ../../src/hb-null.hh:53:39: warning: enum constant in boolean context [-Wint-in-bool-context] + + But not going to let that defeat correct code. Type to switch to clang + as my main compiler... + + src/hb-blob.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2737aa81e5aee721e868bf0c72f19c0245c721fe +Author: Behdad Esfahbod +Date: Thu Nov 22 01:44:27 2018 -0500 + + Fix up recent change + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1300 + + src/hb-null.hh | 12 +++++++++--- + src/hb-open-type.hh | 5 ----- + src/hb-ot-glyf-table.hh | 4 ++-- + 3 files changed, 11 insertions(+), 10 deletions(-) + +commit fffea5aff7a631eedd13c38c1fb7ea4f5f950930 +Author: Behdad Esfahbod +Date: Thu Nov 22 01:25:34 2018 -0500 + + Minor + + src/hb-open-type.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 209b58ef731f102b92179ed76551e2fd6b5ed075 +Author: Behdad Esfahbod +Date: Thu Nov 22 01:22:33 2018 -0500 + + Minor + + src/hb-ot-kern-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3b9fd176e83bbebc4d0b5fc967c15b08fdef7015 +Author: Behdad Esfahbod +Date: Thu Nov 22 01:18:55 2018 -0500 + + Disallow taking Null() of unbounded structs + + Not sure I've marked all such structs. To be done as we discover. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1300 + + src/hb-aat-layout-common.hh | 2 +- + src/hb-machinery.hh | 4 ++++ + src/hb-ot-kern-table.hh | 2 +- + src/hb-ot-var-fvar-table.hh | 31 ++++++++++++++++--------------- + 4 files changed, 22 insertions(+), 17 deletions(-) + +commit f2b91d6510face95008151bb0d25837723536f9f +Author: Behdad Esfahbod +Date: Thu Nov 22 01:10:22 2018 -0500 + + Use Type::null_size for our structs in Null(), sizeof() for other types + + src/hb-null.hh | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +commit 7dd945a8764cbbf76f686fd9387918b63f7d2fb4 +Author: Behdad Esfahbod +Date: Thu Nov 22 01:05:02 2018 -0500 + + One more time.. + + src/hb-machinery.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d062ad10de6c63d94676660b76526a160cf4299e +Author: Behdad Esfahbod +Date: Thu Nov 22 00:39:14 2018 -0500 + + Fix bots happy again, hopefully + + So, our fallback static_assert cannot be had more than once per line + of source. + + src/hb-machinery.hh | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +commit fb10c021c8a32f8dc054f008caf86af82667e109 +Author: Behdad Esfahbod +Date: Thu Nov 22 00:21:49 2018 -0500 + + Revert alignof() == 1 check + + Bots not happy with using "this" inside assertion... + + This reverts 2656644887e77a9d814bb12374af3c26b42fd935 + + src/hb-machinery.hh | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +commit 8d778877b88155dec1808a994416ead0b3d98ae7 +Author: Behdad Esfahbod +Date: Wed Nov 21 23:46:09 2018 -0500 + + .. + + src/hb-machinery.hh | 8 ++++++-- + src/hb-null.hh | 4 ++-- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit 8cfeed99486e87c3217dc141bc24b7768a460f32 +Author: Behdad Esfahbod +Date: Wed Nov 21 23:42:31 2018 -0500 + + Minor + + src/hb-machinery.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e5d954a2fb0c390ea67e83763e3c3a47caa2eb50 +Author: Behdad Esfahbod +Date: Wed Nov 21 23:30:50 2018 -0500 + + Minor + + src/hb-machinery.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e987059c618e03d2346c31ed64429d67ce0e367a +Author: Behdad Esfahbod +Date: Wed Nov 21 23:25:06 2018 -0500 + + Minor + + src/hb-machinery.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit a2b6d308a40d737f54a79f00bc7ace226bad5aaf +Author: Behdad Esfahbod +Date: Wed Nov 21 23:23:49 2018 -0500 + + Remove DEFINE_SIZE_ARRAY2 + + src/hb-machinery.hh | 6 ------ + src/hb-ot-layout-common.hh | 8 ++++---- + src/hb-ot-post-table.hh | 6 +++--- + 3 files changed, 7 insertions(+), 13 deletions(-) + +commit 2656644887e77a9d814bb12374af3c26b42fd935 +Author: Behdad Esfahbod +Date: Wed Nov 21 23:23:21 2018 -0500 + + Check alignof() structs are 1 + + src/hb-machinery.hh | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +commit 6321fdf7040ce48e3de8d34fdcc57caa6433cb66 +Author: Behdad Esfahbod +Date: Wed Nov 21 23:19:00 2018 -0500 + + Whitespace + + src/hb-machinery.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f961c1eb88af0d178e5d3431b9d57bdf79669488 +Merge: ecdceea8 264439c6 +Author: Behdad Esfahbod +Date: Wed Nov 21 17:27:27 2018 -0500 + + Merge pull request #1400 from harfbuzz/sharada-sandhi-mark + + Test U+111C9 SHARADA SANDHI MARK + +commit 264439c6c308ac5f01c4ba4faf64daa2d642236a +Author: David Corbett +Date: Wed Nov 21 16:33:45 2018 -0500 + + Test U+111C9 SHARADA SANDHI MARK + + .../fonts/86cdd983c4e4c4d7f27dd405d6ceb7d4b9ed3d35.ttf | Bin 0 -> 968 bytes + test/shaping/data/in-house/tests/use-syllable.tests | 1 + + 2 files changed, 1 insertion(+) + +commit ecdceea861952be003e1d435aa3282a4e3e200a9 +Merge: b89c7fd3 b3d5b0a5 +Author: Behdad Esfahbod +Date: Wed Nov 21 16:12:32 2018 -0500 + + Merge pull request #1399 from harfbuzz/sharada-sandhi-mark + + Fix USE categories for U+111C9 SHARADA SANDHI MARK + +commit b89c7fd3dc505a958dd4b6acec0e0f8e57224fd8 +Author: Behdad Esfahbod +Date: Wed Nov 21 12:32:48 2018 -0500 + + Allow defining HB_USE_ATEXIT to 0 + + That's better use of that value than requiring extra macro HB_NO_ATEXIT + + src/hb-common.cc | 10 +++++----- + src/hb-ft.cc | 12 ++++++------ + src/hb-glib.cc | 6 +++--- + src/hb-icu.cc | 6 +++--- + src/hb-ot-font.cc | 6 +++--- + src/hb-shape.cc | 6 +++--- + src/hb-shaper.cc | 6 +++--- + src/hb-ucdn.cc | 6 +++--- + src/hb-uniscribe.cc | 4 ++-- + src/hb.hh | 5 ++++- + 10 files changed, 35 insertions(+), 32 deletions(-) + +commit b3d5b0a5d92115ca672b8103999ab7ac88e39a4a +Author: David Corbett +Date: Wed Nov 21 11:35:44 2018 -0500 + + Fix USE categories for U+111C9 SHARADA SANDHI MARK + + src/gen-use-table.py | 7 ++++++- + src/hb-ot-shape-complex-use-table.cc | 2 +- + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit f48bb9a3939067f24a81007e642caaac77cc7167 +Author: Behdad Esfahbod +Date: Tue Nov 20 20:40:55 2018 -0500 + + [var] Deprecated axis enumeration API and add new version + + New version has axis flags. + + New API: + +hb_ot_var_axis_info_t + +hb_ot_var_find_axis_info() + +hb_ot_var_get_axis_infos() + + Deprecated API: + -HB_OT_VAR_NO_AXIS_INDEX + -hb_ot_var_axis_t + -hb_ot_var_find_axis() + -hb_ot_var_get_axes() + + docs/harfbuzz-sections.txt | 14 +++--- + src/hb-deprecated.h | 37 +++++++++++++++ + src/hb-ot-var-fvar-table.hh | 112 ++++++++++++++++++++++++++++++++------------ + src/hb-ot-var.cc | 43 ++++++++++++++--- + src/hb-ot-var.h | 61 ++++++++++++------------ + test/api/test-ot-face.c | 2 +- + 6 files changed, 192 insertions(+), 77 deletions(-) + +commit b2d803cef6974519d5892af2c9efeb8dfba87618 +Author: Behdad Esfahbod +Date: Tue Nov 20 11:42:25 2018 -0500 + + Remove newly-added -hb_ot_var_axis_get_flags() + + src/hb-ot-var-fvar-table.hh | 6 ------ + src/hb-ot-var.cc | 12 ------------ + src/hb-ot-var.h | 4 ---- + 3 files changed, 22 deletions(-) + +commit 736897d7a1410fd281fbcedc084b85bf4ba1410c +Author: Behdad Esfahbod +Date: Tue Nov 20 11:40:43 2018 -0500 + + [var] Make sure hb_ot_var_axis_flags_t is int-sized + + src/hb-ot-var.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit eab5d15f6156e771cb606b760dd170b96c5cd398 +Author: Behdad Esfahbod +Date: Tue Nov 20 11:33:33 2018 -0500 + + [var] Move code + + src/hb-ot-var.h | 27 ++++++++++++++------------- + 1 file changed, 14 insertions(+), 13 deletions(-) + +commit 1ecbf4d3e3de7edc86651c6f805788747d6d89af +Merge: 515f1a16 064f703c +Author: Michiharu Ariza +Date: Tue Nov 20 17:19:05 2018 -0800 + + Merge branch 'master' into cff-subset + +commit 064f703c7ac5a28803a8221720e922ea6dbd2505 +Merge: be1828da 82951182 +Author: Behdad Esfahbod +Date: Tue Nov 20 16:29:30 2018 -0500 + + Merge pull request #1397 from harfbuzz/small-emoji-table + + Shrink the emoji table by merging adjacent ranges + +commit 82951182799772a642d32195dd87e6f0c116f545 +Author: David Corbett +Date: Tue Nov 20 15:41:45 2018 -0500 + + Shrink the emoji table by merging adjacent ranges + + src/gen-emoji-table.py | 13 +-- + src/hb-unicode-emoji-table.hh | 189 ++++-------------------------------------- + 2 files changed, 23 insertions(+), 179 deletions(-) + +commit be1828daaa1e1a72d971aed8d34fff54688d0f41 +Author: Behdad Esfahbod +Date: Tue Nov 20 11:16:23 2018 -0500 + + [var] Fix type of coords returned + + Ouch. Wonder how none of the bots caught the float->int truncation. + + src/hb-ot-var-fvar-table.hh | 2 +- + src/hb-ot-var.cc | 2 +- + src/hb-ot-var.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 8f3ee17ae468950a34439785d2e6ac4182efb65c +Author: Behdad Esfahbod +Date: Tue Nov 20 01:38:23 2018 -0500 + + [travis] Update Coverity token + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f9552362986efd0973b2637d21b787edbc8479f2 +Author: Behdad Esfahbod +Date: Tue Nov 20 01:21:36 2018 -0500 + + Add codecov.io badge + + README | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit 831ba74382e35f110006539f22bebce4d57c8502 +Author: Behdad Esfahbod +Date: Tue Nov 20 01:16:08 2018 -0500 + + Fix Codacy "issues" + + src/test-name-table.cc | 2 +- + src/test-ot-color.cc | 14 +++++++------- + test/api/test-buffer.c | 5 +++-- + test/api/test-object.c | 2 +- + test/api/test-ot-name.c | 2 +- + 5 files changed, 13 insertions(+), 12 deletions(-) + +commit c49e43c1ffee0e9664da6202ace493d932b725a1 +Author: Behdad Esfahbod +Date: Tue Nov 20 01:06:50 2018 -0500 + + [travis] Another push for codecov.io after setting token + + .travis.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 96b24c5124a085b7601215360eed847ce5302699 +Author: Behdad Esfahbod +Date: Tue Nov 20 01:03:42 2018 -0500 + + [travis] Add codecov.io + + .travis.yml | 1 + + 1 file changed, 1 insertion(+) + +commit 3c7792ca326abfb989285f794d6ee71ad9f6bf89 +Author: David Corbett +Date: Sat Oct 20 15:02:26 2018 -0400 + + [use] Fix reordering + + Fixes #1235. + + src/hb-ot-shape-complex-use.cc | 48 ++++++++++++++------- + src/hb.hh | 2 + + .../4afb0e8b9a86bb9bd73a1247de4e33fbe3c1fd93.ttf | Bin 0 -> 1824 bytes + test/shaping/data/in-house/tests/use.tests | 3 ++ + 4 files changed, 38 insertions(+), 15 deletions(-) + +commit 587d49fc657c10c8a20f2409a04d72bf80bb361e +Author: Behdad Esfahbod +Date: Mon Nov 19 14:27:19 2018 -0500 + + [fvar] Add named-instance API + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1241 + + docs/harfbuzz-sections.txt | 4 ++++ + src/hb-ot-var-fvar-table.hh | 55 ++++++++++++++++++++++++++++++++++++++++++--- + src/hb-ot-var.cc | 33 +++++++++++++++++++++++++++ + src/hb-ot-var.h | 32 ++++++++++++++++++++++++++ + 4 files changed, 121 insertions(+), 3 deletions(-) + +commit 46c0da820fc313bad8afaf019d2cd9065fa5f514 +Author: Behdad Esfahbod +Date: Mon Nov 19 13:32:48 2018 -0500 + + Fix build + + src/hb-dsalgs.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 56c9238d3da8c034336cf80ba37e03e33c493718 +Author: Behdad Esfahbod +Date: Mon Nov 19 13:09:53 2018 -0500 + + [fvar] Rewrite sanitize + + src/hb-ot-var-fvar-table.hh | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +commit 4a6a692e3ea4fab632a0162c6d513dc151054d8f +Author: Behdad Esfahbod +Date: Mon Nov 19 13:04:43 2018 -0500 + + [fvar] Use hb_array_t for axes + + src/hb-dsalgs.hh | 6 ++++++ + src/hb-ot-var-fvar-table.hh | 14 ++++---------- + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit e0097396010c40cf62641cd12ceb12dd5d79c9c7 +Author: Behdad Esfahbod +Date: Mon Nov 19 12:53:53 2018 -0500 + + [fvar] Minor + + src/hb-ot-var-fvar-table.hh | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 1a2eb108b857de9c5e84cc5de0c12c7657e04498 +Author: Behdad Esfahbod +Date: Mon Nov 19 12:36:56 2018 -0500 + + [ot-var] Add hb_ot_var_axis_get_flags() + + Part of https://github.com/harfbuzz/harfbuzz/issues/1241 + + New API: + +hb_ot_var_axis_flags_t + +hb_ot_var_axis_get_flags + + docs/harfbuzz-sections.txt | 2 ++ + src/hb-buffer.h | 2 ++ + src/hb-ot-var-fvar-table.hh | 9 +++++++++ + src/hb-ot-var.cc | 12 ++++++++++++ + src/hb-ot-var.h | 13 +++++++++++++ + 5 files changed, 38 insertions(+) + +commit bd6b2ba1d3910cc259db7abeb6c9bd7ed9494857 +Author: Behdad Esfahbod +Date: Mon Nov 19 11:34:56 2018 -0500 + + [ot-var] Add flags + + Unfortunate that we don't have room in hb_ot_var_axis_t to expose flags :(. + + src/hb-ot-var-fvar-table.hh | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit c076c7b85ce4d069ae8b2b04143aca4c4f052ae9 +Author: Behdad Esfahbod +Date: Mon Nov 19 11:30:40 2018 -0500 + + [ot-var] Use hb_ot_name_id_t + + src/hb-ot-var.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 515f1a16140f78c9ec379854851f77a1b44af145 +Merge: a6da9b94 e3a1a835 +Author: Michiharu Ariza +Date: Fri Nov 16 17:38:47 2018 -0800 + + Merge branch 'master' into cff-subset + +commit a6da9b9415bae43c58f12a8e43b77ba31dd432a6 +Author: Michiharu Ariza +Date: Fri Nov 16 17:29:03 2018 -0800 + + fixed Charset format selection + + src/hb-subset-cff1.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit e3a1a8350a6a7933b0a100194985f4425ab9de19 +Author: Behdad Esfahbod +Date: Fri Nov 16 16:53:25 2018 -0800 + + 2.1.3 + + NEWS | 6 ++++++ + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 3 files changed, 9 insertions(+), 3 deletions(-) + +commit 9714e114b88893bd962b1bcf36382bdacbc4866c +Author: Behdad Esfahbod +Date: Fri Nov 16 16:52:42 2018 -0800 + + Fix recent commits + + src/hb-open-type.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0328a1ce41611ed981d41384ae5727479699f3a0 +Author: Behdad Esfahbod +Date: Fri Nov 16 16:48:28 2018 -0800 + + Revert b4c61130324455bfd42095b01fa14ac901e441f1 + + Was causing more trouble than it solved. We use unsigned for indexing, + and it's not helpful to allow that wrapping to negative integers on + 32bit machines. The only way we could work around it would have been + by accepting int64_t arg, but that's overkill. + + Ignore the MSVC 2008 build issue. We don't support that compiler. + + src/hb-open-type.hh | 17 ++++------------- + 1 file changed, 4 insertions(+), 13 deletions(-) + +commit 52f61cdb87b67ef42a25288d8624170d0b6d3a25 +Author: Behdad Esfahbod +Date: Fri Nov 16 16:41:59 2018 -0800 + + Detect over/under-flow in UnsizedArray::operator[] + + Was causing bad substitutions in mort table because of WordOffsetToIndex() + producing negative numbers that were cast to unsigned int and returned as + large numbers (which was desirable, so they would be rejected), but then + they were cast to int when passed to this operator and acting as small + negative integers, which was bad... + + Detect overflow. Ouch, however, now I see this still fails on 32-bit. + Guess I'm going to revert an earlier change. + + src/hb-open-type.hh | 21 ++++++++++++++++----- + 1 file changed, 16 insertions(+), 5 deletions(-) + +commit 6910ff03e66f5f4c9eb5592262d414ef7d91df04 +Author: Behdad Esfahbod +Date: Fri Nov 16 16:11:02 2018 -0800 + + [aat] Fix mort shaping + + Ouch! + + src/hb-aat-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fdb29ab2b0058c9813f9fc44c83dd9048db92d16 +Author: Behdad Esfahbod +Date: Fri Nov 16 15:38:11 2018 -0800 + + 2.1.2 + + NEWS | 13 ++++++++++++- + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 3 files changed, 15 insertions(+), 4 deletions(-) + +commit cff4c6087fdb667a40f54f20ca3c49251bf076de +Author: Behdad Esfahbod +Date: Fri Nov 16 15:04:41 2018 -0800 + + Fix vertical fallback space sign + + Ouch! + + Follow-up to cf203af8a33591c163b63dbdf0fd341bc4606190 + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1343 + + src/hb-ot-shape-fallback.cc | 8 ++++---- + test/shaping/data/in-house/tests/spaces.tests | 22 +++++++++++----------- + 2 files changed, 15 insertions(+), 15 deletions(-) + +commit 7a97f7074052a5d746af29f0743abd20682b09a2 +Author: Behdad Esfahbod +Date: Fri Nov 16 14:46:40 2018 -0800 + + Don't apply GPOS if applying morx + + That's what Apple does, and it wouldn't degrade our OpenType performance. + + Part of https://github.com/harfbuzz/harfbuzz/issues/1348 + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit eafd515639497098436ecf4c7b836e231bced323 +Author: Behdad Esfahbod +Date: Fri Nov 16 14:45:56 2018 -0800 + + Prefer morx table if GSUB is empty (no scripts) + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1348 + + src/hb-ot-shape.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit aa06574823e27c4dbb378d2467a3e6f6f36af9fe +Author: Behdad Esfahbod +Date: Fri Nov 16 14:31:05 2018 -0800 + + Minor + + src/hb-aat-layout-trak-table.hh | 2 +- + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gsubgpos.hh | 2 +- + src/hb-ot-math-table.hh | 2 +- + src/hb-ot-var-fvar-table.hh | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +commit b6903bd6c4b0c792c821e37a8e223088ae40e5fa +Author: Michiharu Ariza +Date: Fri Nov 16 13:46:58 2018 -0800 + + ensure fdmap initialized as identity for single-FD (non-CID) fonts + + src/hb-subset-cff1.cc | 13 ++++++++++--- + src/hb-subset-cff2.cc | 2 ++ + 2 files changed, 12 insertions(+), 3 deletions(-) + +commit b403be8ad98ffd2dbe95dad73e96c7ed1295d9fc +Merge: b67a7c73 50d1a41c +Author: Michiharu Ariza +Date: Fri Nov 16 12:29:18 2018 -0800 + + Merge branch 'master' into cff-subset + +commit b67a7c731f041323c19ab245f0285c304d9ae3d2 +Author: Michiharu Ariza +Date: Fri Nov 16 12:28:24 2018 -0800 + + drop dotsection as hint along with test case + + src/hb-subset-cff-common.hh | 4 ++++ + src/hb-subset-cff1.cc | 1 + + test/api/fonts/cff1_dotsect.nohints.otf | Bin 0 -> 3132 bytes + test/api/fonts/cff1_dotsect.otf | Bin 0 -> 3220 bytes + test/api/test-subset-cff1.c | 21 +++++++++++++++++++++ + 5 files changed, 26 insertions(+) + +commit 50d1a41c08ad3508a94240b52df03c383ae8f1f8 +Author: Behdad Esfahbod +Date: Fri Nov 16 08:52:57 2018 -0500 + + [coretext] Hopefully the last one + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0aab861f9cda6fba5ce71562d9f087d924e8a161 +Author: Behdad Esfahbod +Date: Fri Nov 16 08:43:25 2018 -0500 + + [coretext] Another round + + src/hb-coretext.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 0809b76a9a1d7bd53818df7e83a9c81e664dfe0e +Author: Behdad Esfahbod +Date: Fri Nov 16 08:29:47 2018 -0500 + + [coretext] One more try.. + + src/hb-coretext.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 78bd4475946f2d255539306e4b1115f408c54b54 +Author: Behdad Esfahbod +Date: Fri Nov 16 04:10:53 2018 -0500 + + [coretext] One more try + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fd27a23c824bbbd4f4c7e75701cc5d287289704b +Author: Behdad Esfahbod +Date: Fri Nov 16 03:57:12 2018 -0500 + + [coretext] Another build fix attemt + + src/hb-coretext.cc | 3 --- + 1 file changed, 3 deletions(-) + +commit 729aedf0da90cbf11235a35588cfdc06ba87a784 +Author: Behdad Esfahbod +Date: Fri Nov 16 03:26:46 2018 -0500 + + [directwrite] Fix build + + src/hb-directwrite.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit cfb9771a3b096006cbae98438f1ba101d222e0e4 +Author: Behdad Esfahbod +Date: Fri Nov 16 03:24:22 2018 -0500 + + [coretext] Try to fix + + src/hb-coretext.cc | 48 ++++++++++++++++++++++++++++++++++++++---------- + src/hb-machinery.hh | 15 +++++---------- + src/hb-shaper.hh | 44 -------------------------------------------- + 3 files changed, 43 insertions(+), 64 deletions(-) + +commit e3e9547365417e547beec84494c8bf6e4e2947fb +Author: Behdad Esfahbod +Date: Fri Nov 16 02:55:29 2018 -0500 + + [coretext] Unbreak build + + src/hb-coretext.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ce5da0f36a2ece29c387810a060531df15ad6c7b +Author: Behdad Esfahbod +Date: Fri Nov 16 02:29:13 2018 -0500 + + [shaper] Rewrite shaper data code to be more template-driven than macro-driven + + src/hb-coretext.cc | 17 +++---- + src/hb-directwrite.cc | 9 +--- + src/hb-face.cc | 12 +---- + src/hb-face.hh | 13 ++---- + src/hb-fallback-shape.cc | 5 -- + src/hb-font.cc | 14 ++---- + src/hb-font.hh | 12 ++--- + src/hb-graphite2.cc | 11 ++--- + src/hb-machinery.hh | 14 ++---- + src/hb-ot-shape.cc | 5 -- + src/hb-shape-plan.cc | 4 +- + src/hb-shaper-impl.hh | 9 +--- + src/hb-shaper.hh | 117 ++++++++++++++++++++++++++++++++--------------- + src/hb-uniscribe.cc | 32 +++++-------- + 14 files changed, 127 insertions(+), 147 deletions(-) + +commit cb4bf85b14afb3761a85e3da130f2844ac94a49d +Author: Behdad Esfahbod +Date: Fri Nov 16 02:02:24 2018 -0500 + + [hdmx] Fix bounds checking + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11351 + + src/hb-ot-hdmx-table.hh | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit af727b4e629f8b07d7afb809be69d053827f6a51 +Author: Behdad Esfahbod +Date: Fri Nov 16 01:55:39 2018 -0500 + + [hdmx] Minor + + src/hb-ot-hdmx-table.hh | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 9e9f16c92debecb4caf533fa112898dfec116d98 +Author: Behdad Esfahbod +Date: Fri Nov 16 01:48:26 2018 -0500 + + [subset] Remove invalid glyphs from glypset to retain + + Fixes https://github.com/harfbuzz/harfbuzz/pull/1388 + + src/hb-subset-plan.cc | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 072c7aba92d3c92c84454a12578264f12439bb0d +Author: Michiharu Ariza +Date: Thu Nov 15 15:41:46 2018 -0800 + + use 2-byte offset instead of 4-byte for local subrs + + more than enough since local subrs immediately follow its corresponding private dict, as the result 2-byte redunction for each font dict with local subrs + updated api test expected subset fonts accordingly + + src/hb-subset-cff-common.hh | 4 ++-- + test/api/fonts/AdobeVFPrototype.abc.otf | Bin 7460 -> 7456 bytes + test/api/fonts/AdobeVFPrototype.ac.nohints.otf | Bin 6780 -> 6780 bytes + test/api/fonts/AdobeVFPrototype.ac.otf | Bin 6996 -> 6996 bytes + .../fonts/SourceHanSans-Regular.41,4C2E.nohints.otf | Bin 2380 -> 2376 bytes + test/api/fonts/SourceHanSans-Regular.41,4C2E.otf | Bin 2576 -> 2572 bytes + test/api/fonts/SourceSansPro-Regular.abc.otf | Bin 1812 -> 1808 bytes + test/api/fonts/SourceSansPro-Regular.ac.nohints.otf | Bin 1592 -> 1592 bytes + test/api/fonts/SourceSansPro-Regular.ac.otf | Bin 1708 -> 1704 bytes + test/api/fonts/cff1_seac.C0.otf | Bin 1604 -> 1600 bytes + 10 files changed, 2 insertions(+), 2 deletions(-) + +commit 9d0231cfe7c404da3b5bc360ad76180a7aded62c +Author: Michiharu Ariza +Date: Thu Nov 15 15:39:43 2018 -0800 + + fixed a subset bug when no font dicts reduce + + src/hb-ot-cff-common.hh | 11 +++++++++++ + src/hb-subset-cff-common.cc | 24 +++++++++++++----------- + src/hb-subset-cff1.cc | 27 ++++++--------------------- + src/hb-subset-cff2.cc | 25 +++++-------------------- + 4 files changed, 35 insertions(+), 52 deletions(-) + +commit 11aa0468ac2c62ff734ba6b0f6eb43d1bd6f602b +Author: Ebrahim Byagowi +Date: Thu Nov 15 23:10:56 2018 +0330 + + [subset] minor, adjust spaces + + src/hb-open-type.hh | 70 ++++++------ + src/hb-ot-cmap-table.hh | 182 +++++++++++++++---------------- + src/hb-ot-glyf-table.hh | 242 ++++++++++++++++++++--------------------- + src/hb-ot-hdmx-table.hh | 20 ++-- + src/hb-ot-hmtx-table.hh | 14 +-- + src/hb-ot-layout-common.hh | 77 ++++++------- + src/hb-ot-layout-gpos-table.hh | 16 +-- + src/hb-ot-layout-gsub-table.hh | 4 +- + src/hb-ot-layout-gsubgpos.hh | 88 +++++++-------- + src/hb-ot-os2-table.hh | 24 ++-- + src/hb-ot-post-table.hh | 26 ++--- + src/hb-subset-glyf.cc | 182 +++++++++++++++---------------- + src/hb-subset-glyf.hh | 6 +- + src/hb-subset-input.cc | 4 +- + src/hb-subset-plan.cc | 32 +++--- + src/hb-subset-plan.hh | 12 +- + src/hb-subset.cc | 46 ++++---- + src/hb-subset.h | 7 +- + util/hb-subset.cc | 2 +- + 19 files changed, 510 insertions(+), 544 deletions(-) + +commit d7c50ff0d65192fd2b7b80704e227fa108c06de3 +Author: Ebrahim Byagowi +Date: Thu Nov 15 23:10:49 2018 +0330 + + [math] minor, adjust spaces + + src/hb-ot-math-table.hh | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +commit 13735570f051c4131cdc481939799d76c38c758b +Author: Michiharu Ariza +Date: Thu Nov 15 12:10:23 2018 -0800 + + reject nested seac + + src/hb-cff1-interp-cs.hh | 4 ++++ + src/hb-ot-cff1-table.cc | 11 ++++++----- + 2 files changed, 10 insertions(+), 5 deletions(-) + +commit c37aecd41c5b55e5ef496f3c4cc255a1e2ce7f9f +Merge: ecdb77f0 cabe433f +Author: Michiharu Ariza +Date: Thu Nov 15 11:03:46 2018 -0800 + + Merge branch 'master' into cff-subset + +commit ecdb77f0ae1ef9b129cf9195dbdaa9f6c4425ed5 +Author: Michiharu Ariza +Date: Thu Nov 15 10:54:15 2018 -0800 + + fixed CFF1 subset of std encoding & non-std charset combo + + src/hb-ot-cff-common.hh | 2 -- + src/hb-ot-cff1-table.hh | 2 ++ + src/hb-subset-cff1.cc | 5 +++-- + 3 files changed, 5 insertions(+), 4 deletions(-) + +commit cabe433fbb81d314ad9e3cbed768dd13983a4477 +Author: Behdad Esfahbod +Date: Thu Nov 15 02:48:50 2018 -0500 + + [base] Add TODO items + + src/hb-ot-layout-base-table.hh | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 3bf1ce748fa89316dd32de28bfdc636495e657fb +Author: Behdad Esfahbod +Date: Wed Nov 14 21:08:54 2018 -0500 + + [shaper] Rename + + src/hb-shape-plan.cc | 2 +- + src/hb-shape.cc | 2 +- + src/hb-shaper.cc | 16 ++++++++-------- + src/hb-shaper.hh | 4 ++-- + 4 files changed, 12 insertions(+), 12 deletions(-) + +commit c221dc0ba70fd4af94d8f735a9cef1ab92cc6ede +Author: Behdad Esfahbod +Date: Wed Nov 14 14:49:34 2018 -0500 + + [ot-shape] Move code around + + src/hb-aat-layout-common.hh | 4 ++-- + src/hb-aat-layout.cc | 8 ++++---- + src/hb-aat-layout.hh | 6 +++--- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-layout.hh | 2 +- + src/hb-ot-shape.cc | 44 +++++++++++++++++++++++++++++--------------- + src/hb-ot-shape.hh | 6 +++--- + 7 files changed, 43 insertions(+), 29 deletions(-) + +commit 892ab37e7c9580e35b35a4d82a99e2ea73ac7b0b +Merge: 3787c078 7867c2ba +Author: Michiharu Ariza +Date: Wed Nov 14 13:54:07 2018 -0800 + + Merge branch 'master' into cff-subset + +commit 3787c078561f1157bd04644f092c4467f63c717c +Author: Michiharu Ariza +Date: Wed Nov 14 13:38:03 2018 -0800 + + Implemented seac for extents & subset along with API tests + + gtk-doc.make | 321 +++++++++++++++++++++++++++++++++++++++- + src/hb-cff-interp-common.hh | 2 +- + src/hb-cff-interp-cs-common.hh | 7 + + src/hb-cff1-interp-cs.hh | 29 +++- + src/hb-ot-cff1-table.cc | 256 +++++++++++++++++++++++++------- + src/hb-ot-cff1-table.hh | 88 ++++++++--- + src/hb-subset-plan.cc | 19 +++ + test/api/fonts/cff1_seac.C0.otf | Bin 0 -> 1604 bytes + test/api/fonts/cff1_seac.otf | Bin 0 -> 2260 bytes + test/api/test-ot-extents-cff.c | 31 ++++ + test/api/test-subset-cff1.c | 19 +++ + 11 files changed, 699 insertions(+), 73 deletions(-) + +commit 7867c2bad05fe48f9e4a1b776fb7da67b747fb4e +Author: Ebrahim Byagowi +Date: Wed Nov 14 22:13:50 2018 +0330 + + [STAT] Add table parsing (#1384) + + src/Makefile.sources | 1 + + src/hb-ot-face.hh | 2 + + src/hb-ot-font.cc | 4 +- + src/hb-ot-hmtx-table.hh | 11 +- + src/hb-ot-stat-table.hh | 280 ++++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 290 insertions(+), 8 deletions(-) + +commit 48d16c2ab2b181c733accd4fd9730963e59b6323 +Author: Behdad Esfahbod +Date: Wed Nov 14 09:56:30 2018 -0500 + + [hmtx] Fix signedness issue + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1248#issuecomment-438689499 + + src/hb-ot-hmtx-table.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 29db2a44a6b7a28ade5e288779dbf5a200b43acd +Author: Ebrahim Byagowi +Date: Wed Nov 14 12:13:16 2018 +0330 + + [ot-color/svg] Note that it can be gzipped + + src/hb-ot-color.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a9c27d576ffe4452d1a3dae73964a8f4d6dcc088 +Merge: 3c3eb5ea e543e1a0 +Author: Ebrahim Byagowi +Date: Wed Nov 14 08:29:17 2018 +0330 + + Merge pull request #1383 from punchcutter/master + + Add test for https://github.com/harfbuzz/harfbuzz/issues/1379 + +commit e543e1a0858bb5d7384d82600a789d40b62d9821 +Author: punchcutter +Date: Tue Nov 13 20:44:27 2018 -0800 + + Add Grantha test + + .../fonts/dcf774ca21062e7439f98658b18974ea8b956d0c.ttf | Bin 0 -> 2568 bytes + test/shaping/data/in-house/tests/use.tests | 1 + + 2 files changed, 1 insertion(+) + +commit 3c3eb5ea9ccf34d33e94f83b9961b3a5e903d196 +Author: Behdad Esfahbod +Date: Tue Nov 13 21:10:10 2018 -0500 + + [aat] Disable fallback mark advance zeroing and positioning if morx applied + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1357 + + src/hb-ot-shape.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit dc4225ccd1d16a1139cbc6092353db9ed03e8980 +Author: Behdad Esfahbod +Date: Tue Nov 13 20:48:46 2018 -0500 + + Don't retry creating again and again in lazy_loader if create failed + + Still does that if get_null() returns nullptr. Our shaper data objects + are like that. Shrug. + + src/hb-machinery.hh | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit 086235f59310ed77542d4916d31a4285c68630ff +Merge: 2092f595 c565fc3f +Author: Behdad Esfahbod +Date: Tue Nov 13 19:50:25 2018 -0500 + + Merge pull request #1382 from punchcutter/master + + Change USE Category for Grantha Virama + +commit 2092f595c7a4c591cace41cb99d31620fa6d5fa4 +Merge: 475be9d5 eee5b5ed +Author: Behdad Esfahbod +Date: Tue Nov 13 19:49:06 2018 -0500 + + Merge pull request #1380 from kbrow1i/cygwin + + Don't use Win32 API on Cygwin + +commit c565fc3fb3b14c02e30af28b9d4d4289b0d2e162 +Author: punchcutter +Date: Tue Nov 13 12:51:10 2018 -0800 + + Change USE Category for Grantha Virama + https://github.com/harfbuzz/harfbuzz/issues/1379 + + src/gen-use-table.py | 3 ++- + src/hb-ot-shape-complex-use-table.cc | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 475be9d5c672db6e1764d9425ed7fdaa0dff35c9 +Author: Behdad Esfahbod +Date: Tue Nov 13 13:01:13 2018 -0500 + + Fix Windows build + + src/hb-atomic.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit fc44dea341f1750fec801faed66656b8a58dcded +Author: Behdad Esfahbod +Date: Tue Nov 13 11:54:33 2018 -0500 + + Use atomic ints for upem and num_glyphs on face + + src/hb-aat-layout-lcar-table.hh | 3 ++- + src/hb-face.cc | 10 +++++----- + src/hb-face.hh | 24 ++++++++++++++---------- + src/hb-ot-color-sbix-table.hh | 2 +- + src/hb-static.cc | 13 +++++++++---- + 5 files changed, 31 insertions(+), 21 deletions(-) + +commit 9579ed9755d7c3e47435c55881c9841a5f60ad7e +Author: Behdad Esfahbod +Date: Tue Nov 13 11:45:12 2018 -0500 + + Make atomic types' internal values non-mutable + + This resulted from confusion previously... + + src/hb-atomic.hh | 10 +++++----- + src/hb-object.hh | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit c52d5bcd9405dbaa9289d720d9f0853aeac6b244 +Author: Behdad Esfahbod +Date: Tue Nov 13 11:41:29 2018 -0500 + + [ot-face] Add 'head' table + + src/hb-ot-face.hh | 1 + + src/hb-ot-glyf-table.hh | 11 +++-------- + src/hb-static.cc | 5 +---- + 3 files changed, 5 insertions(+), 12 deletions(-) + +commit eee5b5ed04f588f618a2251397dd5b850c378627 +Author: Ken Brown +Date: Mon Nov 12 21:05:39 2018 -0500 + + Don't use Win32 API on Cygwin + + Cygwin is a Posix platform to the extent possible. It should use the + Posix API except in special circumstances. + + src/hb-atomic.hh | 2 +- + src/hb-blob.cc | 10 +++++----- + src/hb-mutex.hh | 2 +- + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + src/hb.hh | 2 +- + 5 files changed, 9 insertions(+), 9 deletions(-) + +commit 56f541d0001f6d7e2e35cdd15217bdf52ebf8391 +Author: Behdad Esfahbod +Date: Mon Nov 12 19:46:37 2018 -0500 + + [shape-plan] Remove unused code + + src/hb-shape-plan.hh | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +commit 6c22f3fd95617a8c3cd558858c6758a0d548d370 +Author: Behdad Esfahbod +Date: Mon Nov 12 19:26:01 2018 -0500 + + [shape-plan] Implement fine-grained caching plans with user-features + + Only tag, value, and global-ness of features are considered, not their + start/end offsets. + + src/hb-shape-plan.cc | 69 ++++++++++++++++++++++++++++++---------------------- + src/hb-shape-plan.hh | 17 ++----------- + 2 files changed, 42 insertions(+), 44 deletions(-) + +commit cc8428756a1b18b0445c2c5fbb38e05453693dad +Author: Behdad Esfahbod +Date: Mon Nov 12 18:48:10 2018 -0500 + + [shape-plan] Cache shape plans with variations based on variation indices + + src/hb-aat-map.cc | 4 +--- + src/hb-aat-map.hh | 4 +--- + src/hb-ot-map.cc | 18 +++++------------ + src/hb-ot-map.hh | 6 +++--- + src/hb-ot-shape.cc | 13 +++++-------- + src/hb-ot-shape.hh | 28 +++++++++++++++++++++++--- + src/hb-shape-plan.cc | 55 ++++------------------------------------------------ + src/hb-shape-plan.hh | 23 ++++++++++++++++++---- + 8 files changed, 63 insertions(+), 88 deletions(-) + +commit 8284cb9fb3600268e06d8a2ba8400700510de7a5 +Author: Behdad Esfahbod +Date: Mon Nov 12 18:18:20 2018 -0500 + + [shape-plan] Refactor more + + src/hb-shape-plan.cc | 46 ++++++++++++++++++++++++++-------------------- + 1 file changed, 26 insertions(+), 20 deletions(-) + +commit 1082338525c96206f43785e283e41b3e959871fd +Author: Behdad Esfahbod +Date: Mon Nov 12 18:05:02 2018 -0500 + + [shape-plan] Only use shape-plan key to initialize hb_ot_shape_plan_t + + Such that we don't accidentally use info not in the cache key. + + src/hb-ot-shape.cc | 25 +++++++++++-------------- + src/hb-ot-shape.hh | 8 +++----- + src/hb-shape-plan.cc | 7 +------ + 3 files changed, 15 insertions(+), 25 deletions(-) + +commit 7ac03f88a22325fb4d6b77ee7694ad11f6a99bcb +Author: Behdad Esfahbod +Date: Mon Nov 12 17:50:30 2018 -0500 + + [shape-plan] Minor + + src/hb-shape-plan.cc | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +commit c7be933439af1bc8251b2b19df75b42bd0f3bdb5 +Author: Behdad Esfahbod +Date: Mon Nov 12 17:49:15 2018 -0500 + + [shape-plan] Refactor some more + + src/hb-shape-plan.cc | 147 ++++++++++++++++++++++++++++----------------------- + src/hb-shape-plan.hh | 15 ++++++ + 2 files changed, 95 insertions(+), 67 deletions(-) + +commit fc27777833e052dab91ca5777802e6c4e956deb4 +Author: Behdad Esfahbod +Date: Mon Nov 12 17:27:34 2018 -0500 + + [shape-plan] Refactor more + + src/hb-shape-plan.cc | 44 +++++++++++++++++++++++--------------------- + 1 file changed, 23 insertions(+), 21 deletions(-) + +commit 566612295b7c9bc003e9f1723f2491113724b788 +Author: Behdad Esfahbod +Date: Mon Nov 12 17:19:45 2018 -0500 + + [shape-plan] Turn hb_shape_plan_proposal_t into hb_shape_plan_key_t + + And include it in hb_shape_plan_t itself. + + src/hb-shape-plan.cc | 206 +++++++++++++++++++-------------------------------- + src/hb-shape-plan.hh | 27 +++---- + 2 files changed, 92 insertions(+), 141 deletions(-) + +commit af123bd1b814b4fb881ea3d11f1ef0bcced75942 +Author: Behdad Esfahbod +Date: Mon Nov 12 16:27:08 2018 -0500 + + Add hb_memcmp() + + src/hb-dsalgs.hh | 17 ++++++++++++----- + src/hb-set.hh | 2 +- + 2 files changed, 13 insertions(+), 6 deletions(-) + +commit 65456bff37ef61094c35574a35c96f6437fd6015 +Author: Behdad Esfahbod +Date: Mon Nov 12 16:15:26 2018 -0500 + + [shape-plan] Minor + + src/hb-shape-plan.cc | 15 ++++++++------- + src/hb-shape-plan.hh | 9 +++++---- + 2 files changed, 13 insertions(+), 11 deletions(-) + +commit 1db672a5e903de39f955e70b8814c275ccbe1b5c +Author: Behdad Esfahbod +Date: Mon Nov 12 16:05:09 2018 -0500 + + [shaper] Rename + + src/hb-shape-plan.cc | 2 +- + src/hb-shape.cc | 2 +- + src/hb-shaper.cc | 16 ++++++++-------- + src/hb-shaper.hh | 4 ++-- + 4 files changed, 12 insertions(+), 12 deletions(-) + +commit 5212cd8af2171b9d0e9b78196e7758c37f148b80 +Author: Behdad Esfahbod +Date: Mon Nov 12 14:25:18 2018 -0500 + + [fuzzing] Add new test + + ...zz-testcase-minimized-hb-shape-fuzzer-5754863779053568 | Bin 0 -> 100 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 274f4c726f461f49f54a79557d63bf95d22903cf +Author: Behdad Esfahbod +Date: Mon Nov 12 14:24:36 2018 -0500 + + Rename check_array2() to check_array() + + src/hb-aat-layout-kerx-table.hh | 2 +- + src/hb-machinery.hh | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit e014405a214bceff3a1ce80f0b98273c44078e82 +Author: Behdad Esfahbod +Date: Mon Nov 12 14:23:31 2018 -0500 + + Rename check_array(array, a, b) to check_range() + + src/hb-aat-layout-common.hh | 8 ++++++-- + src/hb-machinery.hh | 31 +++++++++++++++++++++++-------- + src/hb-open-type.hh | 4 +++- + src/hb-ot-layout-common.hh | 5 +++-- + src/hb-ot-layout-gpos-table.hh | 11 ++++++++--- + src/hb-ot-var-hvar-table.hh | 4 +++- + src/hb-ot-var-mvar-table.hh | 4 +++- + 7 files changed, 49 insertions(+), 18 deletions(-) + +commit c8f4cc49272d8bcd47706a6306a625d724349f5a +Author: Behdad Esfahbod +Date: Mon Nov 12 14:11:29 2018 -0500 + + [kerx] Fix integer overflow in multiply + + Fixes https://oss-fuzz.com/v2/testcase-detail/5754863779053568 + + src/hb-aat-layout-kerx-table.hh | 2 +- + src/hb-machinery.hh | 29 ++++++++++++++++------------- + 2 files changed, 17 insertions(+), 14 deletions(-) + +commit 1300f027a938d8898cdc9abbcad71afadf70e6e6 +Author: Behdad Esfahbod +Date: Mon Nov 12 13:56:48 2018 -0500 + + [kerx] Minor tweak on previous commit + + src/hb-aat-layout-kerx-table.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit d6666b3866037c9d3e8a497958af9ba8d2f47a73 +Author: Behdad Esfahbod +Date: Mon Nov 12 13:21:14 2018 -0500 + + [fuzzing] Remove limited-edition build of libraries + + Use normal, production, shared libraries. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1237 + + src/Makefile.am | 31 ------------------------------- + test/fuzzing/Makefile.am | 39 +++++++++++++-------------------------- + 2 files changed, 13 insertions(+), 57 deletions(-) + +commit a549aa14a0b60436a16f7f8924a5b5f82b4d5b7e +Author: Behdad Esfahbod +Date: Mon Nov 12 13:01:22 2018 -0500 + + [kerx] Protect against stack underflow + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11367 + + src/hb-aat-layout-kerx-table.hh | 2 +- + ...uzz-testcase-minimized-hb-shape-fuzzer-5691469793329152 | Bin 0 -> 69 bytes + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit 41a8bc7fd9399def8f580b02627a77f3972cc0e9 +Merge: 0dfa584c 77bd0a64 +Author: Michiharu Ariza +Date: Mon Nov 12 08:49:00 2018 -0800 + + Merge branch 'master' into cff-subset + +commit 0dfa584cb4af6be2852d038e9bd591f67ea9fc6e +Author: Michiharu Ariza +Date: Mon Nov 12 08:47:07 2018 -0800 + + changed Adobe company name + + src/hb-cff-interp-common.hh | 2 +- + src/hb-cff-interp-cs-common.hh | 2 +- + src/hb-cff-interp-dict-common.hh | 2 +- + src/hb-cff1-interp-cs.hh | 2 +- + src/hb-cff2-interp-cs.hh | 2 +- + src/hb-ot-cff-common.hh | 2 +- + src/hb-ot-cff1-table.cc | 2 +- + src/hb-ot-cff1-table.hh | 2 +- + src/hb-ot-cff2-table.cc | 2 +- + src/hb-ot-cff2-table.hh | 2 +- + src/hb-ot-vorg-table.hh | 2 +- + src/hb-subset-cff-common.cc | 2 +- + src/hb-subset-cff-common.hh | 2 +- + src/hb-subset-cff1.cc | 2 +- + src/hb-subset-cff1.hh | 2 +- + src/hb-subset-cff2.cc | 2 +- + src/hb-subset-cff2.hh | 2 +- + test/api/test-ot-extents-cff.c | 2 +- + test/api/test-subset-cff1.c | 2 +- + test/api/test-subset-cff2.c | 2 +- + 20 files changed, 20 insertions(+), 20 deletions(-) + +commit 3e284e02c2a5da758526360a45364a330b8ab8e9 +Author: Behdad Esfahbod +Date: Sun Nov 11 22:51:34 2018 -0500 + + [shape-plan] Minor + + src/hb-ot-shape.cc | 26 ++++++++++++++------------ + src/hb-ot-shape.hh | 15 ++++++++------- + src/hb-shape-plan.cc | 3 ++- + 3 files changed, 24 insertions(+), 20 deletions(-) + +commit 420c9de6447cdb491184e7f8caf0811b0c962c05 +Author: Behdad Esfahbod +Date: Sun Nov 11 22:38:05 2018 -0500 + + [shape-plan] Minor rename + + src/hb-shape-plan.cc | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit 77bd0a6458a9169df59f6be667a8eb79bd353dc9 +Author: Behdad Esfahbod +Date: Sun Nov 11 22:08:48 2018 -0500 + + Add variation coords to shape_plan proposal + + This is the root cause of bug worked around in 19e77e01bc13f44138e1d50533327d314dd0a018. + + Still no shape plan caching for variations though. + + src/hb-shape-plan.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 9c767d075d0be85227b8dc146061de9bd24f3fec +Author: Behdad Esfahbod +Date: Sun Nov 11 22:03:15 2018 -0500 + + Minor + + src/hb-shape-plan.cc | 31 +++++++++++++------------------ + 1 file changed, 13 insertions(+), 18 deletions(-) + +commit f521a28b4aad1566664cf14d70a911728ee0b962 +Author: Behdad Esfahbod +Date: Sun Nov 11 21:32:01 2018 -0500 + + Embed hb_ot_shape_plan_t into hb_shape_plan_t + + No other shaper will need shape_plan_data, by definition. So, remove + abstraction layer and always create hb_ot_shape_plan_t as part of + hb_shape_plan_t. + + src/hb-coretext.cc | 45 ---------------------- + src/hb-directwrite.cc | 21 ---------- + src/hb-fallback-shape.cc | 22 ----------- + src/hb-graphite2.cc | 22 ----------- + src/hb-ot-shape.cc | 99 ++++++++++++++++++++++-------------------------- + src/hb-ot-shape.hh | 21 +++++----- + src/hb-shape-plan.cc | 22 ++++++----- + src/hb-shape-plan.hh | 3 +- + src/hb-uniscribe.cc | 22 ----------- + 9 files changed, 70 insertions(+), 207 deletions(-) + +commit fabb01210433ce1c6d5f630bc270f82a8a4a4014 +Author: Behdad Esfahbod +Date: Sun Nov 11 17:10:23 2018 -0500 + + Remove wrong comment + + src/hb-shape-plan.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 1fd183ee1c40e2eedf86b5e82d1b547c5650ebf5 +Author: Behdad Esfahbod +Date: Sun Nov 11 16:47:52 2018 -0500 + + Finish off eecccc919ce15f60ae7ef9da5cfb311b4aa05c63 + + src/hb-machinery.hh | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit 1beacdded9cd1e4467b52244cdfd8497516eb107 +Author: Behdad Esfahbod +Date: Sun Nov 11 16:35:28 2018 -0500 + + Minor + + src/hb-coretext.cc | 8 ++++---- + src/hb-directwrite.cc | 4 ++-- + src/hb-fallback-shape.cc | 4 ++-- + src/hb-graphite2.cc | 4 ++-- + src/hb-ot-shape.cc | 4 ++-- + src/hb-shaper.hh | 3 ++- + src/hb-uniscribe.cc | 4 ++-- + 7 files changed, 16 insertions(+), 15 deletions(-) + +commit e88d47b7f2f9aee5b0b3cdc0b8f708884175a71f +Author: Behdad Esfahbod +Date: Sun Nov 11 16:25:43 2018 -0500 + + Minor + + src/hb-face.cc | 2 +- + src/hb-face.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 55c66c7c56c1ecd493f51fe66fd434b28addfb41 +Author: Behdad Esfahbod +Date: Sun Nov 11 16:09:38 2018 -0500 + + Revert "Declare Null() constexpr" + + This reverts commit 442a72d95ab1fb3a47b486d8d1eb68e909d0ffb8. + + Doesn't make sense. No idea how my local compilers where happy with it! + + src/hb-null.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 98c6f03ccdd0630282ea0b166f66dcfb2a9c1f51 +Author: Behdad Esfahbod +Date: Sun Nov 11 15:54:20 2018 -0500 + + Minor + + src/hb-face.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 442a72d95ab1fb3a47b486d8d1eb68e909d0ffb8 +Author: Behdad Esfahbod +Date: Sun Nov 11 15:51:23 2018 -0500 + + Declare Null() constexpr + + src/hb-null.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit eecccc919ce15f60ae7ef9da5cfb311b4aa05c63 +Author: Behdad Esfahbod +Date: Sun Nov 11 15:48:47 2018 -0500 + + Don't store to null object + + Ouch :). + + src/hb-machinery.hh | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 903856ab505cbc6b756d7b904650df72e90f67a7 +Author: Behdad Esfahbod +Date: Sun Nov 11 15:45:58 2018 -0500 + + Remove unused function + + src/hb-machinery.hh | 5 ----- + 1 file changed, 5 deletions(-) + +commit 0e0af11c62c6a55248a5d3c8868da91ef36384c5 +Author: Behdad Esfahbod +Date: Sun Nov 11 12:54:16 2018 -0500 + + [hdmx] Renames + + src/hb-ot-hdmx-table.hh | 46 +++++++++++++++++++++++----------------------- + 1 file changed, 23 insertions(+), 23 deletions(-) + +commit da6aa3b0333de3f2169a5cfcb33374e1b2fe346e +Author: Behdad Esfahbod +Date: Sun Nov 11 11:40:57 2018 -0500 + + Add hb_blob_ptr_t.destroy() + + src/hb-blob.hh | 1 + + src/hb-ot-cmap-table.hh | 2 +- + src/hb-ot-color-cbdt-table.hh | 4 ++-- + src/hb-ot-color-sbix-table.hh | 2 +- + src/hb-ot-color-svg-table.hh | 2 +- + src/hb-ot-glyf-table.hh | 4 ++-- + src/hb-ot-hmtx-table.hh | 6 +++--- + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gsubgpos.hh | 2 +- + src/hb-ot-name-table.hh | 2 +- + src/hb-ot-post-table.hh | 2 +- + 11 files changed, 15 insertions(+), 14 deletions(-) + +commit bb9abb4efd7d72198ffe8abb137ccf07ae17743e +Author: Behdad Esfahbod +Date: Sun Nov 11 00:39:52 2018 -0500 + + [hmtx/port] Use hb_blob_ptr_t + + src/hb-ot-hmtx-table.hh | 24 ++++++++++-------------- + src/hb-ot-post-table.hh | 11 +++++------ + 2 files changed, 15 insertions(+), 20 deletions(-) + +commit 0e2680a6e8d16afd38ffdb6e8cf244150a5e3837 +Author: Behdad Esfahbod +Date: Sun Nov 11 00:28:47 2018 -0500 + + [cmap] Port to hb_blob_ptr_t + + Although didn't need it... + + src/hb-ot-cmap-table.hh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 0b0fad3ea8888d57d1e077077f5897d1901c5371 +Author: Behdad Esfahbod +Date: Sun Nov 11 00:26:55 2018 -0500 + + [color] Port to hb_blob_ptr_t + + Fix hb_blob_ptr_t::get_length () as well. + + src/hb-blob.hh | 2 +- + src/hb-ot-color-cbdt-table.hh | 38 +++++++++++++------------------------- + src/hb-ot-color-sbix-table.hh | 10 ++++------ + src/hb-ot-color-svg-table.hh | 11 +++++------ + src/hb-ot-glyf-table.hh | 22 ++++++++-------------- + 5 files changed, 31 insertions(+), 52 deletions(-) + +commit 925b7a214f06b83b6f2278052656dabc4ebdd6b7 +Author: Behdad Esfahbod +Date: Sun Nov 11 00:17:30 2018 -0500 + + Comment + + src/hb-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dcb63868333ba8e229fd8756377151440dd9fd23 +Author: Behdad Esfahbod +Date: Sun Nov 11 00:16:17 2018 -0500 + + [shape-plan] Remove use of custom null object + + src/hb-shape-plan.cc | 24 ------------------------ + src/hb-shape-plan.hh | 1 - + 2 files changed, 25 deletions(-) + +commit 109891d49876de4de14a91adefbdf681c2b9acc2 +Author: Behdad Esfahbod +Date: Sun Nov 11 00:15:08 2018 -0500 + + [shape-plan] Make null object all zeros + + To remove custom null object next.. + + src/hb-shape-plan.cc | 8 ++++---- + src/hb-shape-plan.hh | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 34185ff3bc7ece5620145fc05da07c79da950f34 +Author: Behdad Esfahbod +Date: Sun Nov 11 00:12:30 2018 -0500 + + [blob] Use default null object + + src/hb-blob.cc | 12 ------------ + src/hb-blob.hh | 1 - + 2 files changed, 13 deletions(-) + +commit 2ee1d9f555fba60342bab63294a6dacca10466de +Author: Behdad Esfahbod +Date: Sun Nov 11 00:11:28 2018 -0500 + + [blob] Change null object memory mode to DUPLICATE + + We never rely on that being equal to readonly. Just not being + writable. Maybe not even that given that the object is inert. + + In prep for next commit, using default null pool. + + src/hb-blob.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5d0078a48b246e713817e5bb6b4efada9618bea3 +Author: Behdad Esfahbod +Date: Sat Nov 10 23:52:15 2018 -0500 + + Add hb_blob_ptr_t + + Use in a couple of places. Push to bots to see how many unhappy before + I convert the rest. + + src/hb-blob.hh | 23 +++++++++++++++++++++++ + src/hb-ot-layout-gdef-table.hh | 5 ++--- + src/hb-ot-layout-gsubgpos.hh | 8 +++----- + src/hb-ot-layout.cc | 14 ++++++-------- + src/hb-ot-name-table.hh | 12 +++++------- + 5 files changed, 39 insertions(+), 23 deletions(-) + +commit e44046ec499949884b9b77c4c9937ad381386850 +Author: Behdad Esfahbod +Date: Sat Nov 10 22:41:35 2018 -0500 + + Minor + + src/hb-ot-layout.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 752bd8a192af209f44dacaf1d3510d0bfc6354b8 +Author: Behdad Esfahbod +Date: Sat Nov 10 21:13:13 2018 -0500 + + [kerx] Fix Format1 tupleKern sanitization + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11312 + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11305 + + src/hb-aat-layout-kerx-table.hh | 6 +++--- + ...uzz-testcase-minimized-hb-shape-fuzzer-5629524117553152 | Bin 0 -> 93 bytes + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit f9e0552debc45afedd86c848484bcd169af62dc2 +Author: Behdad Esfahbod +Date: Sat Nov 10 21:01:49 2018 -0500 + + [fuzzing] Make "make lib" faster and more usable + + src/Makefile.am | 2 +- + test/fuzzing/Makefile.am | 12 +++++++----- + 2 files changed, 8 insertions(+), 6 deletions(-) + +commit 4674655841bb810e7b68f03431d7b5a7c34c6f20 +Author: Behdad Esfahbod +Date: Sat Nov 10 20:11:10 2018 -0500 + + Minor + + src/hb-ot-shape-complex-arabic-fallback.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit a953b647507fe2ae8f5187fbfb04e69d2a2952e4 +Author: Behdad Esfahbod +Date: Sat Nov 10 20:10:03 2018 -0500 + + Revert parts of previous commit that made clang unhappy + + src/hb-machinery.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1d66cdcf770e45d995a318592352e4349faecb71 +Author: Behdad Esfahbod +Date: Sat Nov 10 19:54:08 2018 -0500 + + Better fix for MSVC 2008 + + Follow up on b4c61130324455bfd42095b01fa14ac901e441f1 + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1374 + + src/hb-machinery.hh | 8 ++++---- + src/hb-open-type.hh | 8 ++++++++ + src/hb-ot-cmap-table.hh | 4 ++-- + src/hb-ot-layout-gpos-table.hh | 4 ++-- + src/hb-ot-var-avar-table.hh | 9 ++++----- + 5 files changed, 20 insertions(+), 13 deletions(-) + +commit fb2a037f54f3cd323a447925f6534eccd1c709c1 +Merge: 87984165 b4c61130 +Author: Michiharu Ariza +Date: Sat Nov 10 16:23:11 2018 -0800 + + Merge branch 'master' into cff-subset + +commit b4c61130324455bfd42095b01fa14ac901e441f1 +Author: Behdad Esfahbod +Date: Sat Nov 10 16:35:39 2018 -0500 + + Try fixing MSVC 2008 build + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1374 + + src/hb-open-type.hh | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit f2e942f3023e3c5cb3e732ee7b4782b3df170a85 +Author: Behdad Esfahbod +Date: Sat Nov 10 16:11:14 2018 -0500 + + Fix hb_bytes_t's unused template array constructor + + src/hb-dsalgs.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6213a75b68825037fbaf6f5ad4eef66e8bad4b3c +Author: Behdad Esfahbod +Date: Sat Nov 10 16:09:21 2018 -0500 + + Add trivial casts to hb_bytes_t + + src/hb-dsalgs.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit 8bb97d2ce140b7fe81d0726c32e024d887e0be1c +Author: Behdad Esfahbod +Date: Sat Nov 10 15:54:33 2018 -0500 + + Revert back hb_bytes_t.cmp() to the scheme it was + + But fix UBSan complaint. + + There's nothing in hb_bytes_t that guarantees lexical ordering, and + ordering by length first is much faster. + + src/hb-dsalgs.hh | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +commit 534e1d7694c96f61e853daef481b41274d5d16d8 +Author: Behdad Esfahbod +Date: Sat Nov 10 15:43:16 2018 -0500 + + Fix hb_bytes_t.cmp() for realz this time + + src/hb-dsalgs.hh | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 929f07dbfc8b8c40771d27a502f6e5842c1c1e90 +Author: Behdad Esfahbod +Date: Sat Nov 10 15:38:48 2018 -0500 + + Fix hb_bytes_t.cmp() + + Ouch! + + src/hb-dsalgs.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 5547bfa9f2815df727fa524b0ea0f136a6f955b7 +Merge: 3a9fa8c0 1d82b476 +Author: Behdad Esfahbod +Date: Sat Nov 10 15:35:12 2018 -0500 + + Merge pull request #1376 from ebraminio/minor + + [colr/feat/trak] minor + +commit 1d82b4761d0a2e2e0be002e8a6bfe060f7b6dec3 +Author: Ebrahim Byagowi +Date: Sat Nov 10 18:08:11 2018 +0330 + + [colr/feat/trak] minor + + src/hb-aat-layout-feat-table.hh | 14 +++++++------- + src/hb-aat-layout-trak-table.hh | 35 +++++++++++++++++++---------------- + src/hb-ot-color-colr-table.hh | 18 ++++++------------ + 3 files changed, 32 insertions(+), 35 deletions(-) + +commit 3a9fa8c026bf28bf87e20ec95327f74fd7070b74 +Author: Behdad Esfahbod +Date: Sat Nov 10 01:56:37 2018 -0500 + + [qsort] Fix O(N^2) behavior if all array elements are the same + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11327 + + Reported as https://github.com/noporpoise/sort_r/issues/7 + + src/hb-dsalgs.hh | 15 +++++++++++---- + ...-testcase-minimized-hb-shape-fuzzer-5634443633491968 | Bin 0 -> 41814 bytes + 2 files changed, 11 insertions(+), 4 deletions(-) + +commit b308aaccf0773e252880b9b887f3d3d1dec00168 +Author: Behdad Esfahbod +Date: Sat Nov 10 00:37:17 2018 -0500 + + [post] Minor + + src/hb-ot-post-table.hh | 22 +++++++++------------- + 1 file changed, 9 insertions(+), 13 deletions(-) + +commit 4111c3b8cd1b1c44f722877614ec1ee25111e78c +Author: Behdad Esfahbod +Date: Sat Nov 10 00:26:36 2018 -0500 + + [post] Move sanitize close to data fields + + src/hb-ot-post-table.hh | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit e26e6dbb336e48a5898738dbbd9e56e3a00b7bed +Author: Behdad Esfahbod +Date: Sat Nov 10 00:19:50 2018 -0500 + + [post] Remove unnecessary hb_nonnull_ptr_t<> + + src/hb-ot-post-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6b8178c6499f8d0ee45a57332af778af0e48d1b5 +Author: Ebrahim Byagowi +Date: Sat Nov 10 02:42:08 2018 +0330 + + [glyf] minor + + src/hb-ot-glyf-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 87984165877c90bf4e0a0418a6407e44c048335d +Author: Michiharu Ariza +Date: Fri Nov 9 08:59:18 2018 -0800 + + fixed vstem handling (lack thereof) in check_width + + bug exposed by U+2261 equivalence in SourceCodePro-Regular.otf + + src/hb-cff1-interp-cs.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 5f97fe9956274d9de4e7813d7f2e850d9ffd8224 +Author: Behdad Esfahbod +Date: Fri Nov 9 10:01:50 2018 -0500 + + Fix a few MSVC 2008 warnings + + https://github.com/harfbuzz/harfbuzz/issues/1374 + + src/hb-set.hh | 4 ++-- + src/hb-vector.hh | 3 +++ + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit f51bb6ee7bd4ebca9b432851adc527ec086360fe +Merge: 2d987110 b986fead +Author: Behdad Esfahbod +Date: Thu Nov 8 14:42:40 2018 -0500 + + Merge pull request #1358 from ebraminio/lcar + + Hook AAT's lcar to _get_ligature_carets + +commit b986fead0aee52d219ce85dd49c9109bfaf31801 +Author: Ebrahim Byagowi +Date: Mon Nov 5 12:31:58 2018 +0330 + + Hook AAT's lcar to _get_ligature_carets + + src/Makefile.sources | 1 + + src/hb-aat-layout-lcar-table.hh | 92 +++++++++++++++++++++++++++++++++++++ + src/hb-ot-face.hh | 1 + + src/hb-ot-layout-gdef-table.hh | 6 +-- + src/hb-ot-layout.cc | 17 ++++--- + test/api/Makefile.am | 1 + + test/api/fonts/lcar.ttf | Bin 0 -> 808 bytes + test/api/test-ot-ligature-carets.c | 67 +++++++++++++++++++++++++++ + 8 files changed, 175 insertions(+), 10 deletions(-) + +commit 2d987110c067ccbf63b1399d2a87820121925e39 +Author: Ebrahim Byagowi +Date: Thu Nov 8 21:46:26 2018 +0330 + + [aat] Minor + + src/hb-aat-layout-just-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9fae611740f514e5fc101a18c4551a20b4a47b59 +Author: Behdad Esfahbod +Date: Thu Nov 8 12:17:09 2018 -0500 + + [test/text-rendering-tests] Update from upstream + + test/shaping/data/text-rendering-tests/DISABLED | 1 + + test/shaping/data/text-rendering-tests/Makefile.sources | 2 +- + .../data/text-rendering-tests/tests/MORX-31.tests | 16 ++++++++-------- + 3 files changed, 10 insertions(+), 9 deletions(-) + +commit b989507fa6b36eb9950001d4e28f3946ffbe75f9 +Author: Ebrahim Byagowi +Date: Thu Nov 8 20:48:54 2018 +0330 + + [aat] Minor (#1369) + + src/hb-aat-layout-just-table.hh | 11 ++++++----- + src/hb-aat-layout-trak-table.hh | 12 ++++++------ + 2 files changed, 12 insertions(+), 11 deletions(-) + +commit 26c291aaa023d31c793b6f505c76e0dd7acbff9b +Merge: 417963dd f9042384 +Author: Michiharu Ariza +Date: Thu Nov 8 09:06:49 2018 -0800 + + Merge branch 'master' into cff-subset + +commit 417963dd9f93a316e672c77493e763978bfdbc28 +Author: Michiharu Ariza +Date: Thu Nov 8 09:01:20 2018 -0800 + + got rid of Remap::fullset() as incorrect, redundant, inefficient + + src/hb-ot-cff-common.hh | 22 ---------------------- + 1 file changed, 22 deletions(-) + +commit f90423847b07ff9c9f66be6dfa3b6071f9c7d9d3 +Author: Ebrahim Byagowi +Date: Thu Nov 8 19:17:02 2018 +0330 + + [just] Initial table implementation (#1364) + + A starting point, its sanitization is not tested however + + src/Makefile.sources | 1 + + src/hb-aat-layout-just-table.hh | 416 ++++++++++++++++++++++++++++++++++++++++ + src/hb-aat-layout.cc | 1 + + 3 files changed, 418 insertions(+) + +commit b8b00fb3c60d23efca5720db15555c4a01c56a45 +Author: Ebrahim Byagowi +Date: Thu Nov 8 18:53:14 2018 +0330 + + [aat] Support Lookup>, needed by just and lcar (#1368) + + src/hb-aat-layout-common.hh | 57 +++++++++++++++++++++++++++++++++++++++++++++ + src/hb-open-type.hh | 11 +++++++++ + 2 files changed, 68 insertions(+) + +commit 073d0a9fbcf4f9cf44878f3f91afa27615b14e5c +Author: Ebrahim Byagowi +Date: Thu Nov 8 10:59:50 2018 +0330 + + [ci] minor + + .circleci/config.yml | 1 + + 1 file changed, 1 insertion(+) + +commit 15326826bf20f1f3d5ef3ddde2ad17b0ccbfa605 +Author: Behdad Esfahbod +Date: Wed Nov 7 21:58:04 2018 -0500 + + [aat] Ignore cross-stream offset of deleted-glyphs + + I think it makes sense to accumulate it, but Ned tells me that's + what CoreText does. + + src/hb-aat-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 636a6833c57eb88ebaa92034c1f4722471f70781 +Author: Michiharu Ariza +Date: Wed Nov 7 17:58:45 2018 -0800 + + fixed ends_in_hint bug + + subr ends in hint itself should be regarded as hint + this flag should propagate to its caller if the call itself is at the end of the caller + + src/hb-subset-cff-common.hh | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit 0bf76154f1bb15aa2fc361eb725977313f103a58 +Author: Behdad Esfahbod +Date: Wed Nov 7 19:11:43 2018 -0500 + + [fuzzing] Take whatever text we can + + test/fuzzing/hb-shape-fuzzer.cc | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +commit 517a1bac97b6273e03562deefcca129648698c31 +Merge: 9d502769 b18a56a2 +Author: Behdad Esfahbod +Date: Wed Nov 7 18:40:48 2018 -0500 + + Merge pull request #1362 from harfbuzz/cross-kern + + Vastly improve kern/kerx tables, including cross-stream "kerning" + +commit b18a56a290bf5330e81019b33f15e6951dd86a8b +Author: Behdad Esfahbod +Date: Wed Nov 7 18:13:22 2018 -0500 + + [kerx] Comment + + src/hb-aat-layout-kerx-table.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 4d740206943ecb72e4be7cc4815e0a3aa3edaa9d +Merge: e0c30b96 9d502769 +Author: Michiharu Ariza +Date: Wed Nov 7 15:09:30 2018 -0800 + + Merge branch 'master' into cff-subset + +commit e0c30b961de87d38bff8dd49e86785a5b74fcad3 +Merge: 0996c0ff ae8fd0db +Author: Michiharu Ariza +Date: Wed Nov 7 15:08:55 2018 -0800 + + merge with cff-subset branch + +commit 006386be3a069199ebaf22bcc55fa7233c62e0d5 +Author: Behdad Esfahbod +Date: Wed Nov 7 18:04:53 2018 -0500 + + [kern] Implement negative state numbers + + Let the fuzzing bots rip this code apart... + + src/hb-aat-layout-common.hh | 90 ++++++++++++++++++++++++++++++----------- + src/hb-aat-layout-kerx-table.hh | 10 ----- + 2 files changed, 66 insertions(+), 34 deletions(-) + +commit 0996c0ff6279f377e2b14f08663df2ce82de2b14 +Author: Michiharu Ariza +Date: Wed Nov 7 14:48:37 2018 -0800 + + implented no-desubroutinize with CFF2 along with API test + + replaced AdobeVFPrototype.abc.otf with a hinted (maually) & subroutinized copy + replaced expected results as well + + src/hb-cff-interp-dict-common.hh | 4 +- + src/hb-cff2-interp-cs.hh | 16 +- + src/hb-ot-cff-common.hh | 22 +-- + src/hb-subset-cff-common.hh | 64 +++++--- + src/hb-subset-cff2.cc | 180 ++++++++++++++++++--- + test/api/fonts/AdobeVFPrototype.abc.nohints.otf | Bin 7800 -> 0 bytes + test/api/fonts/AdobeVFPrototype.abc.otf | Bin 7800 -> 7460 bytes + test/api/fonts/AdobeVFPrototype.ac.nohints.otf | Bin 7152 -> 6780 bytes + .../fonts/AdobeVFPrototype.ac.nosubrs.nohints.otf | Bin 0 -> 6844 bytes + test/api/fonts/AdobeVFPrototype.ac.nosubrs.otf | Bin 0 -> 7060 bytes + test/api/fonts/AdobeVFPrototype.ac.otf | Bin 7336 -> 6996 bytes + test/api/test-subset-cff2.c | 51 +++++- + 12 files changed, 271 insertions(+), 66 deletions(-) + +commit 29c5302376ff2bc8f04b0fc0efba3ce40ef564a7 +Author: Behdad Esfahbod +Date: Wed Nov 7 17:29:37 2018 -0500 + + [morx] Minor + + src/hb-aat-layout-morx-table.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 385f78b3123f268e4c7ff423621e5ce9e8a5c54b +Author: Behdad Esfahbod +Date: Wed Nov 7 17:19:21 2018 -0500 + + [aat] Remove deleted-glyhs after applying kerx/kern + + Finally: Fixes https://github.com/harfbuzz/harfbuzz/issues/1356 + + Test case: + $ ./hb-shape GeezaPro.ttc -u U+0628,U+064A,U+064E,U+0651,U+0629 + [u0629.final.tehMarbuta=4+713|u064e_u0651.shaddaFatha=1@0,-200+0|u064a.medial.yeh=1+656|u0628.initial.beh=0+656] + + The mark positioning (kern table CrossStream kerning) only works if deleted + glyph (as result of ligation) is still in stream and pushed through the + state machine. + + src/hb-aat-layout-morx-table.hh | 16 ------- + src/hb-aat-layout.cc | 30 ++++++++++-- + src/hb-aat-layout.hh | 12 +++-- + src/hb-ot-layout-gpos-table.hh | 6 +-- + src/hb-ot-layout.cc | 60 +++++++++++++++++++++-- + src/hb-ot-layout.hh | 23 +++++---- + src/hb-ot-shape.cc | 102 ++++++++++++++-------------------------- + 7 files changed, 142 insertions(+), 107 deletions(-) + +commit 1909072235e59eb80f9169300279b65779b932a4 +Author: Behdad Esfahbod +Date: Wed Nov 7 16:42:16 2018 -0500 + + [aat] Add debug info to state machine + + src/hb-aat-layout-common.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit ca23567f41a2d6389f6fd2483a994cf5aa6aeaf8 +Author: Behdad Esfahbod +Date: Wed Nov 7 16:19:51 2018 -0500 + + Disable fallback mark positioning if kern table has cross-stream kerning + + Happens even if the cross-stream kerning is for cursive attachment only. Oh well.. + + src/hb-ot-layout.cc | 6 ++++++ + src/hb-ot-layout.hh | 3 +++ + src/hb-ot-shape.cc | 14 ++++++-------- + src/hb-ot-shape.hh | 2 +- + 4 files changed, 16 insertions(+), 9 deletions(-) + +commit 5cf6f94dfd30a468ab8464435e846811c39d9226 +Author: Behdad Esfahbod +Date: Wed Nov 7 16:07:22 2018 -0500 + + Don't apply both kerx and kern + + Ouch! + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 41cff7afc916048810a7ea4aa33ecdee7401df74 +Author: Behdad Esfahbod +Date: Wed Nov 7 16:05:36 2018 -0500 + + Minor + + src/hb-ot-shape.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 9af983af24788afad4b37bd2297b86cdca7c5c29 +Author: Behdad Esfahbod +Date: Wed Nov 7 16:03:09 2018 -0500 + + [kern] Switch to dispatch + + src/hb-aat-layout-kerx-table.hh | 7 +++++-- + src/hb-ot-kern-table.hh | 28 +++++++++++++++------------- + src/hb-ot-layout.cc | 6 ++---- + 3 files changed, 22 insertions(+), 19 deletions(-) + +commit bc06e2805ae55f5c152dfb70ee91c75830ad8f54 +Author: Behdad Esfahbod +Date: Wed Nov 7 16:02:40 2018 -0500 + + [kerx/kern] Add has_cross_stream() + + src/hb-aat-layout-kerx-table.hh | 15 +++++++++++++++ + src/hb-ot-kern-table.hh | 9 +++++++++ + 2 files changed, 24 insertions(+) + +commit ea579f9ccc87718d4c2ca8945a997e6679428a12 +Author: Behdad Esfahbod +Date: Wed Nov 7 15:44:40 2018 -0500 + + [kerx] Fix peculiar indexing that was needed previously + + Not needed now that we use GPOS attachment for cursive kerx. + + src/hb-aat-layout-kerx-table.hh | 20 +++++++------------- + 1 file changed, 7 insertions(+), 13 deletions(-) + +commit 6ee6cd93d8c61389cf242e42a531cc6e7214b21a +Author: Behdad Esfahbod +Date: Wed Nov 7 15:40:55 2018 -0500 + + [GPOS] Only mark unsafe-to-break if kerning happened + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1365 + + src/hb-ot-layout-gpos-table.hh | 56 ++++++++++++++++++++++++------------------ + 1 file changed, 32 insertions(+), 24 deletions(-) + +commit 501a364d9bb6c5828f9d660bae8b6e93b158b275 +Author: Behdad Esfahbod +Date: Wed Nov 7 15:02:16 2018 -0500 + + [GPOS] Add TODO item + + src/hb-ot-layout-gpos-table.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 7a9629f2f11a11d1c064662a08a0172ac2001668 +Author: Behdad Esfahbod +Date: Wed Nov 7 14:52:36 2018 -0500 + + [kerx] Implement CrossStream kerning for non-state-machine subtables + + Untested. + + src/hb-aat-layout-kerx-table.hh | 12 ++++++------ + src/hb-kern.hh | 43 +++++++++++++++++++++++++++++------------ + src/hb-ot-kern-table.hh | 4 ++-- + 3 files changed, 39 insertions(+), 20 deletions(-) + +commit 0eb4157011e78c332d781e28b54b020aa08957c0 +Author: Behdad Esfahbod +Date: Wed Nov 7 14:42:15 2018 -0500 + + [kerx] Disable backwards-kerning for non-state-machine tables + + That's what the spec says for Backwards flag, only applicable to + formats 1 and 4. + + src/hb-aat-layout-kerx-table.hh | 8 +++----- + src/hb-ot-kern-table.hh | 2 +- + 2 files changed, 4 insertions(+), 6 deletions(-) + +commit b2f687c2569a3cc0b1cd0335c5ca0f8d193f8a39 +Author: Behdad Esfahbod +Date: Wed Nov 7 14:38:29 2018 -0500 + + [kerx] Use GPOS attachment facilities for CrossStream kerning + + src/hb-aat-layout-kerx-table.hh | 51 ++++++++++++++++++++++++++++------------- + 1 file changed, 35 insertions(+), 16 deletions(-) + +commit e10a856eb24ae45e301c3ffa778caa4c0a995bb9 +Author: Behdad Esfahbod +Date: Wed Nov 7 14:11:48 2018 -0500 + + [kerx] Format + + src/hb-aat-layout-kerx-table.hh | 58 ++++++++++++++++++++--------------------- + 1 file changed, 28 insertions(+), 30 deletions(-) + +commit 649cc3ef2773950b0b5884d9d1caf414aac888bf +Author: Behdad Esfahbod +Date: Wed Nov 7 14:04:04 2018 -0500 + + [kerx] Don't disable crossKerning if kern feature is off + + src/hb-aat-layout-kerx-table.hh | 9 +++++---- + src/hb-ot-shape.cc | 2 +- + 2 files changed, 6 insertions(+), 5 deletions(-) + +commit 0c3b061ac244fa8a8657366e1b95523503fdf7be +Author: Behdad Esfahbod +Date: Wed Nov 7 13:58:41 2018 -0500 + + [kern] Apply erlier, where GPOS/kerx are applied + + src/hb-aat-layout-kerx-table.hh | 3 +-- + src/hb-ot-shape-fallback.cc | 9 +++++++++ + src/hb-ot-shape.cc | 12 +++++------- + 3 files changed, 15 insertions(+), 9 deletions(-) + +commit f4bad0086e40c70d66d6514f038ddda1411657c8 +Author: Behdad Esfahbod +Date: Wed Nov 7 13:51:17 2018 -0500 + + [kerx] Implement tupleKerning for Format1 + + Untested. + + src/hb-aat-layout-kerx-table.hh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 39b4ef6f18605e85c68cbcec534e137fc831dbca +Author: Behdad Esfahbod +Date: Wed Nov 7 13:48:45 2018 -0500 + + [kerx] Better sanitize tupleKerning + + src/hb-aat-layout-kerx-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 14772da06f9c67d0d40712369e26064e3dee2a91 +Author: Behdad Esfahbod +Date: Wed Nov 7 13:40:22 2018 -0500 + + [kern/kerx] Share KernTable, renamed to KerxTable + + src/hb-aat-layout-kerx-table.hh | 77 ++++++++++++++++++++++-------- + src/hb-ot-kern-table.hh | 103 ++-------------------------------------- + 2 files changed, 61 insertions(+), 119 deletions(-) + +commit c038f5be6b70b8edffc701dd3e4e3cd08d14e2f0 +Author: Behdad Esfahbod +Date: Wed Nov 7 13:35:06 2018 -0500 + + [fallback] Minor + + src/hb-ot-shape-fallback.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit db6e658e8c0c4953c2f026f6a67a5d2fb4bdc204 +Author: Behdad Esfahbod +Date: Wed Nov 7 13:33:23 2018 -0500 + + [kern/kerx] More towards sharing KernTable + + src/hb-aat-layout-kerx-table.hh | 48 ++++++++++++++++++--------------- + src/hb-ot-kern-table.hh | 59 ++++++++++++++++++++++++++++------------- + 2 files changed, 67 insertions(+), 40 deletions(-) + +commit 89ec095979bde94bd203ed2c394f6e40629e9e78 +Author: Behdad Esfahbod +Date: Wed Nov 7 13:10:05 2018 -0500 + + [kern] Disable Format1 and Format3 for OT-style tables + + src/hb-ot-kern-table.hh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit ab57bcae0fd4505c80bb4ccdef6838bb2805ce79 +Author: Behdad Esfahbod +Date: Wed Nov 7 13:04:21 2018 -0500 + + [kern] Minor + + src/hb-ot-kern-table.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 30af5b4a4c2071599dc87bc092a7329befcc45cc +Author: Behdad Esfahbod +Date: Wed Nov 7 12:57:10 2018 -0500 + + [kern] Move code + + src/hb-ot-kern-table.hh | 118 +++++++++++++++++++++++++----------------------- + 1 file changed, 62 insertions(+), 56 deletions(-) + +commit 1ff300464a1075b8cd5311970afbbcf4bb3b6f3d +Author: Behdad Esfahbod +Date: Wed Nov 7 12:51:49 2018 -0500 + + [kern] Massage more + + src/hb-ot-kern-table.hh | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +commit 8e9f6cd0fddd572e048487aae3141d3dbb1b99cb +Author: Behdad Esfahbod +Date: Wed Nov 7 12:49:20 2018 -0500 + + [kerx] More minor + + src/hb-aat-layout-kerx-table.hh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit f8c3df7d4a685bb86a1c15a5ef95485e8ef30305 +Author: Behdad Esfahbod +Date: Wed Nov 7 12:48:06 2018 -0500 + + [kern/kerx] Minor + + src/hb-aat-layout-kerx-table.hh | 5 +++-- + src/hb-ot-kern-table.hh | 19 ++++++++++--------- + 2 files changed, 13 insertions(+), 11 deletions(-) + +commit f5e0a63a22f91720a997f5070b84e982e57de661 +Author: Behdad Esfahbod +Date: Wed Nov 7 12:32:39 2018 -0500 + + [kern/kerx] Towards sharing KernTable + + src/hb-aat-layout-kerx-table.hh | 4 ++-- + src/hb-ot-kern-table.hh | 19 +++++++------------ + 2 files changed, 9 insertions(+), 14 deletions(-) + +commit 330508497d301c0ba5d5fb5d0900b62c191aabb5 +Author: Behdad Esfahbod +Date: Wed Nov 7 12:27:44 2018 -0500 + + [kern/kerx] Minor + + src/hb-aat-layout-kerx-table.hh | 2 +- + src/hb-ot-kern-table.hh | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit 1a5ef8490034f4bd8965a3c71d34a5930ebe11b7 +Author: Behdad Esfahbod +Date: Wed Nov 7 12:19:52 2018 -0500 + + [kern/kerx] Share Format2 + + This, enables Format2 for kern table, which was disabled before. + + src/hb-aat-layout-kerx-table.hh | 6 ++++ + src/hb-ot-kern-table.hh | 73 +---------------------------------------- + 2 files changed, 7 insertions(+), 72 deletions(-) + +commit 8faec4e33486616fdc0d690ad80d4a38a73c8182 +Author: Behdad Esfahbod +Date: Wed Nov 7 12:16:38 2018 -0500 + + [kerx] Towards merging Format2 + + src/hb-aat-layout-kerx-table.hh | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +commit ae8fd0dbfb57afadfe815c5bde4ad4a6485fd950 +Author: Michiharu Ariza +Date: Wed Nov 7 09:16:12 2018 -0800 + + clear stack after vsindex op + + src/hb-cff2-interp-cs.hh | 1 + + src/hb-ot-cff2-table.hh | 1 + + 2 files changed, 2 insertions(+) + +commit 7fed7d80f72b35900b41878ae59e38fd1cb49dc8 +Author: Michiharu Ariza +Date: Wed Nov 7 09:09:13 2018 -0800 + + fixed off-by-one error in CFF1 Encoding lookup + + src/hb-ot-cff1-table.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit d5c0ca210fef315fd039e5b1825a865f36606a3f +Author: Behdad Esfahbod +Date: Wed Nov 7 12:08:44 2018 -0500 + + [aat] Minor + + src/hb-aat-layout-common.hh | 16 ++++++++++------ + src/hb-ot-kern-table.hh | 4 ++-- + 2 files changed, 12 insertions(+), 8 deletions(-) + +commit e72e041c3cda164b2ffb02d770b35d0d70954818 +Author: Behdad Esfahbod +Date: Wed Nov 7 11:56:36 2018 -0500 + + [kerx] Rename + + src/hb-aat-layout-kerx-table.hh | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit 241ba7da518adee334fff105ae19dfb051868a57 +Author: Behdad Esfahbod +Date: Wed Nov 7 11:51:40 2018 -0500 + + [morx/kerx] Rename types + + src/hb-aat-layout-common.hh | 4 ++-- + src/hb-aat-layout-kerx-table.hh | 17 +++++++++-------- + src/hb-aat-layout-morx-table.hh | 4 ++-- + src/hb-ot-kern-table.hh | 4 ++-- + 4 files changed, 15 insertions(+), 14 deletions(-) + +commit c808e444da12840ac3ab1d78569504b9b7e876f9 +Author: Behdad Esfahbod +Date: Wed Nov 7 11:28:36 2018 -0500 + + [kern/kerx] Share Format1 subtable + + src/hb-aat-layout-kerx-table.hh | 9 +- + src/hb-ot-kern-table.hh | 187 +--------------------------------------- + 2 files changed, 4 insertions(+), 192 deletions(-) + +commit a244190afa90ac253724a2ff23a3bdf0c507d0e6 +Author: Behdad Esfahbod +Date: Wed Nov 7 11:43:25 2018 -0500 + + [kerx] Minor + + src/hb-aat-layout-kerx-table.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 2a720911964a00ad607ff712be09ea3ea0925c9b +Author: Behdad Esfahbod +Date: Wed Nov 7 11:25:55 2018 -0500 + + [kerx] Minor + + src/hb-aat-layout-kerx-table.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit f5f4ca7871ec2be2b5666a7b9e6e5e28133b8393 +Author: Behdad Esfahbod +Date: Wed Nov 7 11:21:09 2018 -0500 + + [kern/kerx] Enable crossStream kerning in vertical + + CoreText doesn't, but no reason we shouldn't do. + + src/hb-aat-layout-kerx-table.hh | 8 ++++---- + src/hb-ot-kern-table.hh | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +commit d5c88af4a23bffc09840c43e6b1403b64a9f74d5 +Author: Behdad Esfahbod +Date: Wed Nov 7 11:20:14 2018 -0500 + + [kerx] More towards sharing Format1 + + src/hb-aat-layout-kerx-table.hh | 35 +++++++++++++++++++++++++++++++---- + src/hb-aat-layout-morx-table.hh | 10 ++++++---- + 2 files changed, 37 insertions(+), 8 deletions(-) + +commit b693fd0dc6c7979dcacdff060ecf12a2e107071d +Author: Behdad Esfahbod +Date: Wed Nov 7 11:05:28 2018 -0500 + + [morx] Simplify + + src/hb-aat-layout-morx-table.hh | 27 +++++++++++---------------- + 1 file changed, 11 insertions(+), 16 deletions(-) + +commit ce3451dc2aad2241c148953842e696e9f53b5deb +Author: Behdad Esfahbod +Date: Wed Nov 7 11:02:04 2018 -0500 + + [kerx] Towards sharing Format1 + + src/hb-aat-layout-kerx-table.hh | 61 +++++++++++++++++++++++++++++++---------- + 1 file changed, 47 insertions(+), 14 deletions(-) + +commit e890753ebbf0d20c1c86796837918d530610df3b +Author: Behdad Esfahbod +Date: Wed Nov 7 10:58:50 2018 -0500 + + [morx] Minor + + src/hb-aat-layout-morx-table.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 5b17853547ca6848ee652ef6990a81bb345ac06f +Author: Behdad Esfahbod +Date: Wed Nov 7 10:45:25 2018 -0500 + + [kern/kerx] Share Format0 + + src/hb-aat-layout-kerx-table.hh | 22 +++++++++++++----- + src/hb-ot-kern-table.hh | 50 ++++++----------------------------------- + 2 files changed, 23 insertions(+), 49 deletions(-) + +commit c97dde5d55929df394fbe57c1ba1a725592c6732 +Author: Behdad Esfahbod +Date: Wed Nov 7 10:39:39 2018 -0500 + + [kern/kerx] Towards merge more + + src/hb-aat-layout-kerx-table.hh | 75 ++++++++++++++++++++++++++++++----------- + src/hb-kern.hh | 33 ------------------ + src/hb-ot-kern-table.hh | 7 ++-- + 3 files changed, 58 insertions(+), 57 deletions(-) + +commit 540ccc38b0f95804d08047f8b2d059bfd1e09337 +Author: Behdad Esfahbod +Date: Wed Nov 7 10:33:46 2018 -0500 + + [kern/kerx] More towards sharing + + src/hb-aat-layout-kerx-table.hh | 7 ++++--- + src/hb-ot-kern-table.hh | 10 +++++++--- + 2 files changed, 11 insertions(+), 6 deletions(-) + +commit d0f8f4c200670bc0bfbffbf301139a3613865a7f +Author: Behdad Esfahbod +Date: Wed Nov 7 10:25:25 2018 -0500 + + [kern] Move kern machine to hb-kern.hh + + src/Makefile.sources | 1 + + src/hb-aat-layout-kerx-table.hh | 5 +- + src/hb-kern.hh | 153 ++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-kern-table.hh | 115 +----------------------------- + src/hb-ot-shape-fallback.cc | 2 +- + 5 files changed, 157 insertions(+), 119 deletions(-) + +commit a6acff252c72457ecfa856fd6c57081b3a4290dd +Author: Behdad Esfahbod +Date: Wed Nov 7 10:19:46 2018 -0500 + + [kerx] Towards sharing subtables with kern + + src/hb-aat-layout-kerx-table.hh | 41 +++++++++++++++++++++++------------------ + 1 file changed, 23 insertions(+), 18 deletions(-) + +commit befac337ca2c705e2cea60a9a92e40e0dbbc40aa +Author: Behdad Esfahbod +Date: Wed Nov 7 09:53:02 2018 -0500 + + [kern] Remove Override business + + Not used in any fonts. Not well-specified when mixing kerning with + Cross-Stream positioning. + + src/hb-ot-kern-table.hh | 16 ---------------- + 1 file changed, 16 deletions(-) + +commit 9d5027696e418b7c2a5ccbc18faafe6b9290d08b +Author: Behdad Esfahbod +Date: Wed Nov 7 09:16:53 2018 -0500 + + [post] Return true on truncation + + Client can check that buffer was completely filled out and reallocate. + + src/hb-ot-post-table.hh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 7d91f07edf29c4923716af6cee8eb94f948ac91f +Author: Behdad Esfahbod +Date: Wed Nov 7 09:14:42 2018 -0500 + + [post] Protect against huge empty tables + + src/hb-ot-post-table.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 5ed816ab5900ac4ff7feca3d98cbd92e62fd1754 +Author: Behdad Esfahbod +Date: Wed Nov 7 09:13:51 2018 -0500 + + [post] Minor + + src/hb-ot-post-table.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 64f0becd89cc2b0136c7dc1609abc9f957525cf8 +Author: Behdad Esfahbod +Date: Wed Nov 7 09:10:55 2018 -0500 + + [post] Fix bound checking + + src/hb-ot-post-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7ec694ddf25a313483044256f7ed88b644432e15 +Author: HinTak +Date: Wed Nov 7 13:19:36 2018 +0000 + + Use non-GRID-fitted values for metrics (#1363) + + * Use non-GRID-fitted values for metrics + + See freetype/src/base/ftobjs.c:ft_recompute_scaled_metrics() and + the usage of GRID_FIT_METRICS inside. + + Fixes https://github.com/behdad/harfbuzz/issues/1262 + + * Update hb-ft.cc + + src/hb-ft.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 59e04e42312293c30714a666c4479e209aec3c0e +Author: Behdad Esfahbod +Date: Wed Nov 7 00:25:48 2018 -0500 + + [kern/kerx] Fix cursive joining + + Tested with Waseem TTC: + + $ hb-shape Waseem.ttc جحخج + [F1Jeem_R2=3@0,180+479|M1Khah_L2_R2=2@0,682+403|M1Hah_L2_R2=1@0,1184+403|I1Jeem_L2=0@0,1184+744] + + src/hb-aat-layout-kerx-table.hh | 2 ++ + src/hb-ot-kern-table.hh | 2 ++ + 2 files changed, 4 insertions(+) + +commit 8d0f797139e853d13cb2383d541c2e691d9dbae3 +Author: Behdad Esfahbod +Date: Wed Nov 7 00:04:40 2018 -0500 + + [kern/kerx] Fix "reset" magic value + + src/hb-aat-layout-kerx-table.hh | 2 +- + src/hb-ot-kern-table.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 0123976a0c1e2f629252969a7ff632dc2b1dbbc9 +Author: Behdad Esfahbod +Date: Tue Nov 6 21:45:40 2018 -0500 + + [kerx] Adjust CrossStream kern to match 'kern' table + + src/hb-aat-layout-kerx-table.hh | 62 +++++++++++++++++++++++++++++++---------- + 1 file changed, 48 insertions(+), 14 deletions(-) + +commit 80a33b9ac351d81793f35a92e0255ffbf5ceb8b9 +Author: Behdad Esfahbod +Date: Tue Nov 6 21:41:28 2018 -0500 + + [kern] More tweaks + + Solves a mystery or two. I'm fairly confident this is what CoreText does now. + + src/hb-ot-kern-table.hh | 40 ++++++++++++++++++++++------------------ + 1 file changed, 22 insertions(+), 18 deletions(-) + +commit 564e8ac0465d8ced3a98ecb55d09ffaa45eefc2f +Author: Behdad Esfahbod +Date: Tue Nov 6 21:04:40 2018 -0500 + + [kern] Adjust some more + + Getting closer. So many open questions still... + + src/hb-ot-kern-table.hh | 36 ++++++++++++++++++++++-------------- + 1 file changed, 22 insertions(+), 14 deletions(-) + +commit 4d003b8503f9c984abe2ac0de8c526a276ea8e54 +Author: Behdad Esfahbod +Date: Tue Nov 6 21:04:02 2018 -0500 + + [kern] Add TODO + + src/hb-ot-kern-table.hh | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 9810f0b80e5b6580a7a15debcec073dfc9ca759f +Author: Behdad Esfahbod +Date: Tue Nov 6 19:24:04 2018 -0500 + + [kern] Minor + + src/hb-ot-kern-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9c04b6058306cd4b2123a33a7cbeb47505434217 +Author: Behdad Esfahbod +Date: Tue Nov 6 18:35:58 2018 -0500 + + [kern] In Format1, adjust how kerning is done + + In a series of kerns in one action, kern all but last glyph forward, + and the last one backward. Seems to better match what CoreText is doing. + + Test cases, with GeezaPro Arabic: + + $ ./hb-shape GeezaPro_10_10.ttc -u U+0631,U+0628 + [u0628.beh=1+1415|u0631.reh=0@-202,0+700] + + $ ./hb-shape GeezaPro_10_10.ttc -u U+0628,U+064F + [u064f.damma=0@0,-250+-250|u0628.beh=0@250,0+1665] + + In a later change, I'll make kern machine avoid producing negative kerns. + + src/hb-ot-kern-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e8c47724638c29d78001905610c662de99c59cad +Author: Behdad Esfahbod +Date: Tue Nov 6 17:16:04 2018 -0500 + + [kern] XXX Negate CrossKerning sign + + Not sure why, but seems to better match GeezaPro Arabic w CoreText. + + Quite possibly I'm doing something very wrong... + + src/hb-ot-kern-table.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 01bf43ac01576a6415336cc56c74bb1a872566d1 +Author: Behdad Esfahbod +Date: Tue Nov 6 14:48:42 2018 -0500 + + [kern] Implement CrossStream kerning + + src/hb-aat-layout-kerx-table.hh | 75 ++++++++++++++++++++++++++--------------- + src/hb-ot-kern-table.hh | 63 ++++++++++++++++++++++++++++------ + 2 files changed, 101 insertions(+), 37 deletions(-) + +commit b11830c09e0d78bbdaf86ef02191d00b3d8256c4 +Author: Behdad Esfahbod +Date: Tue Nov 6 15:23:18 2018 -0500 + + [kern] Improve Format 2 + + Still disabled. + + src/hb-aat-layout-common.hh | 20 +++++++++----------- + src/hb-ot-kern-table.hh | 35 ++++++----------------------------- + 2 files changed, 15 insertions(+), 40 deletions(-) + +commit c0383c6bb725bed2a48485988a427348384f3f87 +Author: Behdad Esfahbod +Date: Tue Nov 6 15:07:19 2018 -0500 + + Minor + + src/hb-aat-layout-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 10e6f708f30986bab9f7b506935f2555d6b79ff4 +Author: Behdad Esfahbod +Date: Tue Nov 6 13:32:13 2018 -0500 + + [kern] Minor + + src/hb-ot-kern-table.hh | 30 +++++++++++------------------- + 1 file changed, 11 insertions(+), 19 deletions(-) + +commit 164eedd9181345d84d5f8059475ad4b97784fd46 +Author: Behdad Esfahbod +Date: Tue Nov 6 13:18:27 2018 -0500 + + [kern] Minor + + src/hb-ot-kern-table.hh | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit 220a5991baa213b7bd173ea02090dc6fc8aef655 +Author: Behdad Esfahbod +Date: Tue Nov 6 13:51:39 2018 -0500 + + [kern/kerx] Fix trace numbering + + src/hb-aat-layout-kerx-table.hh | 1 + + src/hb-ot-kern-table.hh | 1 + + 2 files changed, 2 insertions(+) + +commit 7b21319edfd6531a444846f71e87303bc09f4621 +Author: Michiharu Ariza +Date: Tue Nov 6 13:59:07 2018 -0800 + + don't reject empty Dict + + src/hb-cff-interp-dict-common.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 43ee0e4d006ce7b4ade4483f2c8ec3d39723fc94 +Merge: ec6817c1 bfafe208 +Author: Michiharu Ariza +Date: Tue Nov 6 09:57:17 2018 -0800 + + Merge branch 'master' into cff-subset + +commit bfafe208da11817b5ebf3751f02af2dcdf57bd19 +Author: Behdad Esfahbod +Date: Tue Nov 6 12:11:45 2018 -0500 + + [kern] Switch to dispatch + + src/hb-aat-layout-kerx-table.hh | 12 ++++++------ + src/hb-ot-kern-table.hh | 31 +++++++++++++++---------------- + 2 files changed, 21 insertions(+), 22 deletions(-) + +commit 213fa3bf711dae5028e3d041e305cdd35223de77 +Author: Behdad Esfahbod +Date: Tue Nov 6 12:07:15 2018 -0500 + + [kern] Refactor to include header in each subtable type + + src/hb-ot-kern-table.hh | 189 +++++++++++++++++++++++------------------------- + 1 file changed, 91 insertions(+), 98 deletions(-) + +commit b0da2cd0b9c1346b7cda5997fb799e895e34aace +Author: Behdad Esfahbod +Date: Tue Nov 6 11:16:45 2018 -0500 + + [kern] Some more + + src/hb-ot-kern-table.hh | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 75b00b51c8fca5d605c479333eb3abd608623613 +Author: Behdad Esfahbod +Date: Tue Nov 6 11:13:40 2018 -0500 + + [kern] Renames + + src/hb-ot-kern-table.hh | 20 +++++++++----------- + 1 file changed, 9 insertions(+), 11 deletions(-) + +commit 5c3ccbc634158ba9f84d365c9a31a596f6d8825b +Author: Khaled Hosny +Date: Tue Nov 6 18:10:56 2018 +0200 + + Another missing backlash + + Did this ever work? + + test/api/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d29602b962c13836f4c0d46796bc693f66f9b9fe +Author: Khaled Hosny +Date: Tue Nov 6 18:07:47 2018 +0200 + + Add missing backslash + + test/api/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9bddfde25dc8c302c765a1e9a8a2c38c4a836e2e +Author: Behdad Esfahbod +Date: Tue Nov 6 11:03:34 2018 -0500 + + [util] Fix up previous commit + + util/options.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 3ec2e4fa7bec07ec181a0390e5f5fd695abee611 +Author: Behdad Esfahbod +Date: Tue Nov 6 10:49:19 2018 -0500 + + [util] Don't terminate string after a a 0 in -u + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1361 + + util/options.cc | 4 +++- + util/options.hh | 2 ++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 8790b2740a334f1789fb0cf329f2b8ac9733793c +Author: Behdad Esfahbod +Date: Tue Nov 6 10:24:54 2018 -0500 + + [fuzzing] Fix test + + test/fuzzing/hb-shape-fuzzer.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 3af0a7edd0c99aaef846ae787056d7664bc69d35 +Author: Behdad Esfahbod +Date: Tue Nov 6 10:20:57 2018 -0500 + + [fuzzing] Add make check-valgrind + + test/fuzzing/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit b062378ce640eb418cb413b595b79cc81a193209 +Author: Behdad Esfahbod +Date: Tue Nov 6 10:20:36 2018 -0500 + + [test] Minor + + test/api/.valgrind-suppressions | 0 + test/api/Makefile.am | 2 +- + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit 37f421c951c853dff165df6731d0ab9c46350790 +Author: Behdad Esfahbod +Date: Tue Nov 6 10:03:38 2018 -0500 + + Minor + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b6112e5ea4d08fcbfa8f7cb4ef3903514a6e99f3 +Author: Ebrahim Byagowi +Date: Tue Nov 6 11:42:47 2018 +0330 + + [test] Fix -Weverything bot complain + + test/api/test-ot-name.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a49df419f04b4065fc7f70a77c5cbc453e6ba906 +Author: Ebrahim Byagowi +Date: Tue Nov 6 11:26:30 2018 +0330 + + [test] Test hb_ot_name_{list_names,get_utf8} on test-ot-name + + test/api/test-ot-name.c | 27 ++++++++++++++++++++++++--- + 1 file changed, 24 insertions(+), 3 deletions(-) + +commit 9139cc23ea9fb339be9426860e0c72038d32a2ab +Author: Ebrahim Byagowi +Date: Tue Nov 6 11:17:14 2018 +0330 + + Fix link issue of some of the bots + + e.g. https://circleci.com/gh/harfbuzz/harfbuzz/52410 + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 98b37f0c109d0f7454e91c9563c56d1903d6d496 +Author: Ebrahim Byagowi +Date: Tue Nov 6 09:16:28 2018 +0330 + + [mort] Fix table detection logic + + mort really needs some initial tests at least. + + src/hb-aat-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fa3ebf845fcffa827600fc4ca9fdde3aaa99f4c5 +Author: Behdad Esfahbod +Date: Mon Nov 5 23:34:07 2018 -0500 + + Simplify some more + + src/hb-aat-layout.cc | 10 +++++----- + src/hb-ot-layout.cc | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 61f52231f430c72e1b66b76dabb018cfe45a01d5 +Author: Behdad Esfahbod +Date: Mon Nov 5 23:28:52 2018 -0500 + + [math] Shorten names a bit + + src/hb-ot-math-table.hh | 4 ++-- + src/hb-ot-math.cc | 33 +++++++++++++++++++-------------- + 2 files changed, 21 insertions(+), 16 deletions(-) + +commit 737efbe65583a71d7df9ae7b423d9fb1d68599b7 +Author: Behdad Esfahbod +Date: Mon Nov 5 23:26:29 2018 -0500 + + [ot-layout] Simplify GSUB/GPOS access + + This concludes simplifying table access to face->table.XXXX. + + src/hb-ot-layout.cc | 31 +++++++++++++------------------ + 1 file changed, 13 insertions(+), 18 deletions(-) + +commit 5e68cec17913e9f6e98e5017a56c78a5614e4030 +Author: Behdad Esfahbod +Date: Mon Nov 5 23:23:57 2018 -0500 + + [ot-layout] Simplify GDEF access + + src/hb-ot-layout.cc | 44 ++++++++++++++++---------------------------- + 1 file changed, 16 insertions(+), 28 deletions(-) + +commit 33b006cc51b0d27cbe1d8ed498bbf2b548cb6554 +Author: Behdad Esfahbod +Date: Mon Nov 5 23:19:04 2018 -0500 + + [ot-layout] Simplify some access + + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 9 +++++---- + src/hb-ot-layout-gsub-table.hh | 9 +++++---- + src/hb-ot-layout-gsubgpos.hh | 2 +- + src/hb-ot-layout.hh | 12 +----------- + 5 files changed, 13 insertions(+), 21 deletions(-) + +commit db35409f0db9faf91a10defc81e4d6d60dc7822a +Author: Behdad Esfahbod +Date: Mon Nov 5 23:11:46 2018 -0500 + + [ot-layout] Remove ensures + + src/hb-ot-layout.cc | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) + +commit 9198de7b9b6020c1e3d6a48783e36db7e1f7e99a +Author: Behdad Esfahbod +Date: Mon Nov 5 23:10:37 2018 -0500 + + [ot-font] Remove ensure + + src/hb-ot-font.cc | 1 - + 1 file changed, 1 deletion(-) + +commit ea6d9b661fc3cf6bc4366feeb7694c0b712abfae +Author: Behdad Esfahbod +Date: Mon Nov 5 23:09:29 2018 -0500 + + [ot-face] Remove a few ensures + + src/hb-face.cc | 3 --- + 1 file changed, 3 deletions(-) + +commit 0fe7a745c9a323a3fc76beb011b6ab8919cf905b +Author: Behdad Esfahbod +Date: Mon Nov 5 23:08:33 2018 -0500 + + [ot-face] Simplify more table access + + src/hb-face.cc | 6 +++--- + src/hb-ot-face.hh | 3 --- + src/hb-ot-font.cc | 4 +--- + src/hb-ot-layout.cc | 34 +++++++++++++++++----------------- + 4 files changed, 21 insertions(+), 26 deletions(-) + +commit a35c92cbe771a75df40412fd248ad06f6a0cfebf +Author: Behdad Esfahbod +Date: Mon Nov 5 22:58:43 2018 -0500 + + [ot-face] Simplify table access + + Yoohoo! + + src/hb-aat-layout.cc | 107 ++++++++++----------------------------------------- + src/hb-ot-color.cc | 66 ++++++++----------------------- + src/hb-ot-layout.cc | 20 ++-------- + src/hb-ot-math.cc | 47 ++++++++-------------- + src/hb-ot-name.cc | 11 +----- + src/hb-ot-var.cc | 33 ++++------------ + 6 files changed, 64 insertions(+), 220 deletions(-) + +commit 914b595f2598d5bdb2c750832d567a57d45db84e +Author: Behdad Esfahbod +Date: Mon Nov 5 22:39:50 2018 -0500 + + [ot-face] Include hb-ot-face directly in hb_face_t + + Simplifying access coming next. + + src/hb-face.cc | 4 ++++ + src/hb-face.hh | 3 +++ + src/hb-ot-face.cc | 24 ++---------------------- + src/hb-ot-face.hh | 39 +++++++++++++++------------------------ + src/hb-ot-font.cc | 24 ++++++++++++------------ + src/hb-ot-math.cc | 3 +-- + src/hb-ot-shape.cc | 5 +++-- + 7 files changed, 40 insertions(+), 62 deletions(-) + +commit 56ba998cddbb2ba5d24fb0b02d2bf77a46c0f23f +Author: Behdad Esfahbod +Date: Mon Nov 5 19:49:54 2018 -0500 + + [cmap] Push get_nominal_glyphs down into cmap accelerator + + src/hb-ot-cmap-table.hh | 21 +++++++++++++++++++++ + src/hb-ot-font.cc | 13 +++---------- + 2 files changed, 24 insertions(+), 10 deletions(-) + +commit 36d85dce25abd079252d973f804220bf7b97e987 +Author: Behdad Esfahbod +Date: Mon Nov 5 19:46:29 2018 -0500 + + [cmap] Use hb_nonnullptr_t + + src/hb-ot-cmap-table.hh | 34 ++++++++++++++-------------------- + 1 file changed, 14 insertions(+), 20 deletions(-) + +commit 8be74d85534534dbdd39a0a6f496e26e9f3e661d +Author: Behdad Esfahbod +Date: Mon Nov 5 18:47:22 2018 -0500 + + 2.1.1 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 3 files changed, 11 insertions(+), 3 deletions(-) + +commit 6482fda519ca7d173e3bcb3717aa30e237f04b25 +Author: Behdad Esfahbod +Date: Mon Nov 5 15:03:18 2018 -0500 + + [fuzzing] Fuzz glyph-id etc in test-ot-face + + test/api/test-ot-face.c | 57 +++++++++++++++++++++-------------------- + test/fuzzing/hb-shape-fuzzer.cc | 19 +------------- + 2 files changed, 30 insertions(+), 46 deletions(-) + +commit 252632c477b963f305116d69fcafacd8bf7b97bf +Author: Behdad Esfahbod +Date: Mon Nov 5 14:33:41 2018 -0500 + + [uniscribe] Fix use of deprecated API + + src/hb-uniscribe.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit bb380ec18394b2c581b672ecbf98991e14897f2e +Author: Behdad Esfahbod +Date: Mon Nov 5 13:45:12 2018 -0500 + + [cmap] Make null accelerator safe + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1146 + + src/hb-ot-cmap-table.hh | 50 ++++++++++++++++++++++++------------------------- + 1 file changed, 25 insertions(+), 25 deletions(-) + +commit f6fc5574d3dae177a54b10195e0d1f368a74f768 +Author: Behdad Esfahbod +Date: Mon Nov 5 13:23:54 2018 -0500 + + Add pointer magic operators to hb_atomic_ptr_t + + src/hb-atomic.hh | 3 +++ + src/hb-common.cc | 6 +++--- + src/hb-face.cc | 2 +- + src/hb-graphite2.cc | 8 ++++---- + src/hb-machinery.hh | 1 + + src/hb-ot-shape-complex-arabic.cc | 4 ++-- + src/hb-shape-plan.cc | 2 +- + 7 files changed, 15 insertions(+), 11 deletions(-) + +commit f6e7cb51b13aabb447dc97a59602d65eb42edc4b +Author: Behdad Esfahbod +Date: Mon Nov 5 13:23:07 2018 -0500 + + Fix const-confusion in hb_array_t as well + + src/hb-dsalgs.hh | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 0da22fb0ada8a54fc59739057f281a406a993212 +Author: Behdad Esfahbod +Date: Mon Nov 5 13:13:39 2018 -0500 + + [null] Tweak hb_nonnull_ptr_t some more + + src/hb-null.hh | 18 ++++++------------ + 1 file changed, 6 insertions(+), 12 deletions(-) + +commit 03348ce0051cfae7172ac0d09b83ed5f82fa842a +Author: Behdad Esfahbod +Date: Mon Nov 5 12:59:32 2018 -0500 + + Minor + + src/hb-aat-layout.cc | 12 ++++++------ + src/hb-ot-color.cc | 10 +++++----- + src/hb-ot-font.cc | 18 +++++++++--------- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-math.cc | 2 +- + src/hb-ot-name.cc | 2 +- + src/hb-ot-var.cc | 6 ++---- + 7 files changed, 25 insertions(+), 27 deletions(-) + +commit ec6817c1bd82a60b84cb868e4d7ff4c65cb80ccc +Author: Michiharu Ariza +Date: Mon Nov 5 07:59:08 2018 -0800 + + remove build files accidentally pushed + + INSTALL | 370 - + Makefile | 954 -- + Makefile.in | 954 -- + aclocal.m4 | 1496 --- + ar-lib | 270 - + autom4te.cache/output.0 | 23333 ---------------------------------------------- + autom4te.cache/output.1 | 23333 ---------------------------------------------- + autom4te.cache/output.2 | 23333 ---------------------------------------------- + autom4te.cache/requests | 555 -- + autom4te.cache/traces.0 | 3823 -------- + autom4te.cache/traces.1 | 1229 --- + autom4te.cache/traces.2 | 3823 -------- + compile | 347 - + config.guess | 1421 --- + config.h | 227 - + config.h.in | 226 - + config.log | 1560 ---- + config.status | 2420 ----- + config.sub | 1807 ---- + configure | 23333 ---------------------------------------------- + depcomp | 791 -- + install-sh | 501 - + libtool | 11805 ----------------------- + ltmain.sh | 11147 ---------------------- + missing | 215 - + stamp-h1 | 1 - + test-driver | 148 - + 27 files changed, 139422 deletions(-) + +commit b721fdae662673ab706da897aaa1db126f8ca1a5 +Author: Michiharu Ariza +Date: Sun Nov 4 16:19:15 2018 -0800 + + fixed leaks in CFF subr subset + + src/hb-ot-cff-common.hh | 10 +++++++++- + src/hb-subset-cff-common.hh | 10 +++++++++- + 2 files changed, 18 insertions(+), 2 deletions(-) + +commit 85f5644e8e9fe18032e37d4153c3c928d087ac6a +Author: Michiharu Ariza +Date: Sun Nov 4 14:17:30 2018 -0800 + + added missing switch breaks + + src/hb-subset-cff-common.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 1682d1bbecaeeddc8a1678a01c57c0e0023bf7c4 +Merge: d8fadec0 b605db2f +Author: Michiharu Ariza +Date: Sun Nov 4 13:25:41 2018 -0800 + + Merge branch 'master' into cff-subset + +commit d8fadec098935335e69e46c1101da3f142824638 +Author: Michiharu Ariza +Date: Sun Nov 4 13:12:20 2018 -0800 + + added desubroutinize full font test profiles & expected fonts + + modified subset_test_suite.py to apply desubroutinize profiles to CFF only (not to TT) + + ...urceSansPro-Regular.default.1FC,21,41,20,62,63.otf | Bin 3640 -> 3784 bytes + .../SourceSansPro-Regular.default.61,62,63.otf | Bin 3400 -> 3496 bytes + .../SourceSansPro-Regular.default.D7,D8,D9,DA,DE.otf | Bin 3596 -> 3612 bytes + ...sPro-Regular.desubroutinize.1FC,21,41,20,62,63.otf | Bin 0 -> 3640 bytes + .../SourceSansPro-Regular.desubroutinize.61,62,63.otf | Bin 0 -> 3400 bytes + ...eSansPro-Regular.desubroutinize.D7,D8,D9,DA,DE.otf | Bin 0 -> 3596 bytes + ...eSansPro-Regular.drop-hints.1FC,21,41,20,62,63.otf | Bin 3480 -> 3564 bytes + .../SourceSansPro-Regular.drop-hints.61,62,63.otf | Bin 3276 -> 3340 bytes + ...ourceSansPro-Regular.drop-hints.D7,D8,D9,DA,DE.otf | Bin 3448 -> 3464 bytes + ...r.drop-hints.desubroutinize.1FC,21,41,20,62,63.otf | Bin 0 -> 3480 bytes + ...Pro-Regular.drop-hints.desubroutinize.61,62,63.otf | Bin 0 -> 3276 bytes + ...gular.drop-hints.desubroutinize.D7,D8,D9,DA,DE.otf | Bin 0 -> 3448 bytes + ...-Regular.default.3042,3044,3046,3048,304A,304B.otf | Bin 6248 -> 6324 bytes + ...-Regular.default.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 6432 -> 6568 bytes + .../SourceHanSans-Regular.default.61,63,65,6B.otf | Bin 5428 -> 5500 bytes + ...-Regular.default.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 6552 -> 6780 bytes + .../japanese/SourceHanSans-Regular.default.660E.otf | Bin 5196 -> 5248 bytes + ....otf => SourceHanSans-Regular.desubroutinize..otf} | Bin + ...r.desubroutinize.3042,3044,3046,3048,304A,304B.otf | Bin 0 -> 6248 bytes + ...r.desubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 0 -> 6432 bytes + ...urceHanSans-Regular.desubroutinize.61,63,65,6B.otf | Bin 0 -> 5428 bytes + ...r.desubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 0 -> 6552 bytes + .../SourceHanSans-Regular.desubroutinize.660E.otf | Bin 0 -> 5196 bytes + ...gular.drop-hints.3042,3044,3046,3048,304A,304B.otf | Bin 6076 -> 6132 bytes + ...gular.drop-hints.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 6180 -> 6304 bytes + .../SourceHanSans-Regular.drop-hints.61,63,65,6B.otf | Bin 5312 -> 5344 bytes + ...gular.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 6248 -> 6472 bytes + .../SourceHanSans-Regular.drop-hints.660E.otf | Bin 5088 -> 5140 bytes + ...rceHanSans-Regular.drop-hints.desubroutinize..otf} | Bin + ...s.desubroutinize.3042,3044,3046,3048,304A,304B.otf | Bin 0 -> 6076 bytes + ...s.desubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 0 -> 6180 bytes + ...-Regular.drop-hints.desubroutinize.61,63,65,6B.otf | Bin 0 -> 5312 bytes + ...s.desubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 0 -> 6248 bytes + ...HanSans-Regular.drop-hints.desubroutinize.660E.otf | Bin 0 -> 5140 bytes + test/subset/data/profiles/desubroutinize.txt | 1 + + .../data/profiles/drop-hints-desubroutinize.txt | 2 ++ + test/subset/generate-expected-outputs.py | 1 - + test/subset/subset_test_suite.py | 7 ++++++- + 38 files changed, 9 insertions(+), 2 deletions(-) + +commit b605db2f65e62ad6727a61481f78015933dbf207 +Author: Behdad Esfahbod +Date: Sun Nov 4 12:58:02 2018 -0500 + + [aat] Clean up ankr table include mess + + src/hb-aat-layout-ankr-table.hh | 2 ++ + src/hb-aat-layout-common.hh | 31 +++++++++--------------------- + src/hb-aat-layout-kerx-table.hh | 16 ++++++++-------- + src/hb-aat-layout.cc | 42 +++++++++++++++++++++++++++++++++++++++-- + src/hb-ot-kern-table.hh | 1 - + src/hb-static.cc | 1 - + 6 files changed, 59 insertions(+), 34 deletions(-) + +commit bce437cf0b71e9b60bbf058eaf61593fed30ae33 +Author: Behdad Esfahbod +Date: Sun Nov 4 02:47:34 2018 -0500 + + [test] Call test-ot-face.c test from hb-shape-fuzzer + + Should increase coverage... + + test/api/test-ot-face.c | 28 ++++++++++++++++++---------- + test/fuzzing/hb-shape-fuzzer.cc | 6 ++++++ + 2 files changed, 24 insertions(+), 10 deletions(-) + +commit 777c22425cae97009ca4dc5b1e400670c4aa0799 +Author: Behdad Esfahbod +Date: Sun Nov 4 02:40:20 2018 -0500 + + [test] More funcs in test-ot-face + + test/api/test-font.c | 5 +++++ + test/api/test-ot-face.c | 21 +++++++++++++++++++-- + 2 files changed, 24 insertions(+), 2 deletions(-) + +commit 17335a8161e674e630287e18a6d304ec0c33767c +Author: Behdad Esfahbod +Date: Sun Nov 4 02:25:07 2018 -0500 + + Clean up buffer->swap_buffers() calls + + That function checks for buffer->successful already. No need + to check at call site. + + src/gen-vowel-constraints.py | 4 +--- + src/hb-aat-layout-common.hh | 3 +-- + src/hb-aat-layout-morx-table.hh | 3 +-- + src/hb-ot-shape-complex-indic.cc | 1 - + src/hb-ot-shape-complex-khmer.cc | 1 - + src/hb-ot-shape-complex-myanmar.cc | 1 - + src/hb-ot-shape-complex-thai.cc | 3 +-- + src/hb-ot-shape-complex-use.cc | 1 - + src/hb-ot-shape-complex-vowel-constraints.cc | 5 ++--- + src/hb-ot-shape.cc | 1 - + 10 files changed, 6 insertions(+), 17 deletions(-) + +commit 191ca0f15b7fc9ab959e1f6472c48839687402ec +Author: Michiharu Ariza +Date: Sat Nov 3 22:42:22 2018 -0700 + + CFF1 no-desubr fixes + + make sure charstring/subrs not ending with endchar/return handled correctly + if no local subrs, skip serializing Subrs op in Private + misc fixes + + src/hb-ot-cff-common.hh | 13 +++++++++- + src/hb-subset-cff-common.hh | 59 +++++++++++++++++++++++---------------------- + src/hb-subset-cff1.cc | 27 +++++++++++++++------ + 3 files changed, 62 insertions(+), 37 deletions(-) + +commit 4eb52460c8c6dc48af240f2254f76fae065bfa97 +Author: Behdad Esfahbod +Date: Sat Nov 3 21:45:39 2018 -0400 + + Fix >> + + src/hb-ot-post-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ae9ad1076e536aee370f9863cde8351b79f01b3b +Author: Behdad Esfahbod +Date: Sat Nov 3 21:41:50 2018 -0400 + + Fix "Warning: extra ";" ignored." + + src/hb.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit d0163afb7bed83935c6a54d57a0e7366caeba0b3 +Author: Behdad Esfahbod +Date: Sat Nov 3 21:38:24 2018 -0400 + + Revert "Add operator char * to the naked array types as well" + + This reverts commit db889c182ee5f54127285bfaab5bc94dafe46bda. + + Was resulting in ambigious overloads... + + src/hb-dsalgs.hh | 4 +--- + src/hb-open-type.hh | 2 -- + 2 files changed, 1 insertion(+), 5 deletions(-) + +commit c8f94a1ca6928f07749285da910b63087d485537 +Author: Behdad Esfahbod +Date: Sat Nov 3 21:07:39 2018 -0400 + + Minor + + src/hb-ot-name.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9779e602ed7ac214c0da2c90e104b38460422476 +Author: Behdad Esfahbod +Date: Sat Nov 3 20:50:56 2018 -0400 + + [test] Add test for empty face + + test/api/Makefile.am | 1 + + test/api/test-ot-face.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 95 insertions(+) + +commit 1da4de7e7b71dfde734cb77ec6acb31f574585f2 +Author: Michiharu Ariza +Date: Sat Nov 3 15:41:29 2018 -0700 + + fix for subset fuzzer failure + + A called subr must be freshly parsed or completely parsed. otherwise the prevoius parse must have terminated prematurely + + src/hb-subset-cff1.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 0b0b38ec1e6a815a30bef98193043d255b52c4a1 +Author: Behdad Esfahbod +Date: Sat Nov 3 16:15:30 2018 -0400 + + Fix null accelerator's + + Fixes all except for cmap. To be done separately. + + Part of https://github.com/harfbuzz/harfbuzz/issues/1146 + + src/hb-ot-color-cbdt-table.hh | 10 ++-------- + src/hb-ot-color-sbix-table.hh | 11 ++++------- + src/hb-ot-color-svg-table.hh | 11 ++++------- + src/hb-ot-glyf-table.hh | 6 +++--- + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gsubgpos.hh | 2 +- + src/hb-ot-name-table.hh | 2 +- + src/hb-ot-post-table.hh | 2 +- + 8 files changed, 17 insertions(+), 29 deletions(-) + +commit db889c182ee5f54127285bfaab5bc94dafe46bda +Author: Behdad Esfahbod +Date: Sat Nov 3 16:04:19 2018 -0400 + + Add operator char * to the naked array types as well + + src/hb-dsalgs.hh | 4 +++- + src/hb-open-type.hh | 2 ++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit d6fdae310f2a98ca624c3a77c3aa03b8b3bd393a +Author: Behdad Esfahbod +Date: Sat Nov 3 16:02:03 2018 -0400 + + Add operator char * to hb_nonnull_ptr_t + + src/hb-null.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 7430ff604aa54bedcb07cc1c2962eae85fcade76 +Author: Behdad Esfahbod +Date: Sat Nov 3 15:59:13 2018 -0400 + + Template casts in hb_nonnull_ptr_t + + src/hb-null.hh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit da408fce98153e0fab3d82fe28813085feed0974 +Author: Behdad Esfahbod +Date: Sat Nov 3 15:49:37 2018 -0400 + + [blob] Allow null parent in create_sub_blob() + + Like font and unicode. + + src/hb-blob.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fb0f30f55a5d654b2f1f9b99efa9b8abc51dbf34 +Author: Behdad Esfahbod +Date: Sat Nov 3 15:24:14 2018 -0400 + + Add hb_nonnull_ptr_t + + Towards fixing https://github.com/harfbuzz/harfbuzz/issues/1146 + + src/hb-null.hh | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +commit 8d98c51d133b058a845ed7a84bfe8a43083bbb03 +Author: Behdad Esfahbod +Date: Sat Nov 3 15:14:57 2018 -0400 + + [kern] Third try fix access violation in Format3 + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11245 + + src/hb-ot-kern-table.hh | 1 - + 1 file changed, 1 deletion(-) + +commit f074da8c2b6a7061c71d12213a6c494c119eb20e +Author: Behdad Esfahbod +Date: Sat Nov 3 15:06:45 2018 -0400 + + [kern] Really fix access violation in Format3 + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11245 + + src/hb-ot-kern-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 93ef20a83b31e6528bb1835d2b4b83b913805885 +Author: Behdad Esfahbod +Date: Sat Nov 3 15:03:06 2018 -0400 + + Replace most uses of is_inert with is_immutable + + src/hb-buffer.cc | 32 ++++++++++++++++---------------- + src/hb-coretext.cc | 2 +- + src/hb-font.cc | 2 +- + src/hb-set.hh | 8 +++++--- + src/hb-shape-plan.cc | 2 +- + 5 files changed, 24 insertions(+), 22 deletions(-) + +commit 0589787ff55bff9bd5849c4443229e926cc574a5 +Author: Behdad Esfahbod +Date: Sat Nov 3 14:58:54 2018 -0400 + + [kern] Fix access violation in Format3 + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11245 + + src/hb-ot-kern-table.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 5570c87f21f061cc197e02bd0526ab44c63ed6f1 +Author: Behdad Esfahbod +Date: Sat Nov 3 14:51:38 2018 -0400 + + Port objects to use header.writable instead of immutable + + Saves 4 or 8 bytes per object on 64bit archs. + + src/hb-blob.cc | 12 ++++-------- + src/hb-blob.hh | 2 -- + src/hb-face.cc | 16 ++++++---------- + src/hb-face.hh | 2 -- + src/hb-font.cc | 46 +++++++++++++++++++--------------------------- + src/hb-font.hh | 4 ---- + src/hb-ft.cc | 2 +- + src/hb-object.hh | 11 ++++++++--- + src/hb-unicode.cc | 11 ++++------- + src/hb-unicode.hh | 2 -- + 10 files changed, 42 insertions(+), 66 deletions(-) + +commit ee351a38ec0c62b76dd1b3f20fe56cb4d63e62be +Author: Behdad Esfahbod +Date: Sat Nov 3 14:28:55 2018 -0400 + + [object] Add "writable" + + src/hb-object.hh | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +commit b8a78ce201608e9ac6d7f77447b2bbef6f09e9ff +Author: Ebrahim Byagowi +Date: Sat Nov 3 22:28:30 2018 +0330 + + [BASE] Improvements (#1347) + + src/hb-ot-layout-base-table.hh | 610 ++++++++++++++++++----------------------- + src/hb-ot-layout.cc | 65 ++++- + src/hb-ot-layout.h | 16 -- + test/api/Makefile.am | 1 + + test/api/fonts/base.ttf | Bin 0 -> 5596 bytes + test/api/test-baseline.c | 58 ++++ + 6 files changed, 380 insertions(+), 370 deletions(-) + +commit c560ca92512c0283e826c059431273ffecf5d993 +Author: Ebrahim Byagowi +Date: Sat Nov 3 13:03:36 2018 +0330 + + [fuzz] A new testcase + + ...uzz-testcase-minimized-hb-shape-fuzzer-5735679418433536 | Bin 0 -> 36 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 34b06d994a79124963d2a7432d0ec945e72bfdbd +Author: Michiharu Ariza +Date: Fri Nov 2 16:40:20 2018 -0700 + + fixed FDSelect size calcluation + + src/hb-ot-cff-common.hh | 2 +- + src/hb-subset-cff-common.cc | 6 +++--- + test/api/fonts/SourceHanSans-Regular.41,3041,4C2E.otf | Bin 2576 -> 3892 bytes + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 481fdfdc23f557400ad3aceeceeab07add78f005 +Merge: 1bc710a8 2840a104 +Author: Michiharu Ariza +Date: Fri Nov 2 15:28:09 2018 -0700 + + Merge branch 'cff-subset' of https://github.com/harfbuzz/harfbuzz into cff-subset + +commit 1bc710a8c94fbe08ca3a3e535c7b6597a57883df +Author: Michiharu Ariza +Date: Fri Nov 2 15:28:01 2018 -0700 + + added CFF1 desubr api test cases & bug fixes + + src/hb-cff1-interp-cs.hh | 7 -- + src/hb-ot-cff-common.hh | 56 ++++++---- + src/hb-subset-cff-common.hh | 100 +++++++++-------- + src/hb-subset-cff1.cc | 53 ++++----- + .../fonts/SourceHanSans-Regular.41,3041,4C2E.otf | Bin 3892 -> 2576 bytes + .../SourceHanSans-Regular.41,4C2E.nohints.otf | Bin 0 -> 2380 bytes + ...urceHanSans-Regular.41,4C2E.nosubrs.nohints.otf | Bin 0 -> 2360 bytes + .../SourceHanSans-Regular.41,4C2E.nosubrs.otf | Bin 0 -> 2548 bytes + test/api/fonts/SourceHanSans-Regular.41,4C2E.otf | Bin 2548 -> 2576 bytes + test/api/fonts/SourceSansPro-Regular.abc.otf | Bin 3412 -> 1812 bytes + .../api/fonts/SourceSansPro-Regular.ac.nohints.otf | Bin 3228 -> 1592 bytes + .../SourceSansPro-Regular.ac.nosubrs.nohints.otf | Bin 0 -> 1540 bytes + .../api/fonts/SourceSansPro-Regular.ac.nosubrs.otf | Bin 0 -> 1632 bytes + test/api/fonts/SourceSansPro-Regular.ac.otf | Bin 3332 -> 1708 bytes + test/api/test-subset-cff1.c | 122 +++++++++++++++++++++ + 15 files changed, 232 insertions(+), 106 deletions(-) + +commit 2c68f34bddbe506d0b22948562f2f59b9a5b6050 +Author: Khaled Hosny +Date: Fri Nov 2 23:06:00 2018 +0200 + + [os2] Capitalize table tag and struct + + Other tables follow the case of the OT tag, except this one. + + src/hb-ot-hmtx-table.hh | 6 +++--- + src/hb-ot-os2-table.hh | 12 ++++++------ + src/hb-subset.cc | 4 ++-- + 3 files changed, 11 insertions(+), 11 deletions(-) + +commit 8034d1dda091998d356e77f249d3c9f50501cc77 +Author: Behdad Esfahbod +Date: Fri Nov 2 14:47:42 2018 -0400 + + [kern] Implement Format1 + + Also, implement backwards kerning for Format1 in kern and kerx. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1350 + + src/hb-aat-layout-kerx-table.hh | 11 +++- + src/hb-ot-kern-table.hh | 127 ++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 136 insertions(+), 2 deletions(-) + +commit 46b3885c1a8ea3b85efbdd1704edcee385797c5d +Author: Behdad Esfahbod +Date: Fri Nov 2 14:43:38 2018 -0400 + + [kern] Set subtable on sanitizer + + src/hb-ot-kern-table.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 74c7a2c6c892446dcec574986e128967bd570e47 +Author: Behdad Esfahbod +Date: Fri Nov 2 14:26:04 2018 -0400 + + [kern] Respect more flags + + src/hb-ot-kern-table.hh | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +commit 9f880bad0d7291eaab10d814567c7a680e139c48 +Author: Behdad Esfahbod +Date: Fri Nov 2 13:57:41 2018 -0400 + + [kern] Minor + + We like check_struct() more. + + src/hb-ot-kern-table.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 04b82b181d06c229a98314c1620d3ae8a2825267 +Author: Behdad Esfahbod +Date: Fri Nov 2 13:47:33 2018 -0400 + + Remove pointer cast operators from ArrayOf<> + + ArrayOf<>, unlike UnsizedArrayOf<>, has data before the array. + This was confusing. Remove. + + src/hb-open-type.hh | 3 --- + 1 file changed, 3 deletions(-) + +commit f1df441bedaf5b2c7fadf9954ea39616af87702a +Author: Behdad Esfahbod +Date: Fri Nov 2 13:26:15 2018 -0400 + + [kern] Comment + + src/hb-ot-kern-table.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 095f5add0b1ca39dd09842594b80fae92f0796e4 +Author: Behdad Esfahbod +Date: Fri Nov 2 13:23:54 2018 -0400 + + [kern] Push apply loop to each subtable + + src/hb-ot-kern-table.hh | 153 ++++++++++++++++++++++++++++++++++++++---------- + src/hb-ot-layout.cc | 28 ++++++--- + src/hb-ot-layout.hh | 8 ++- + src/hb-ot-shape.cc | 2 +- + 4 files changed, 149 insertions(+), 42 deletions(-) + +commit 949dad89a81ff5b6ef92e8737962b667249a3f2b +Author: Behdad Esfahbod +Date: Fri Nov 2 12:47:55 2018 -0400 + + [kern] Remove accelerator + + It wasn't doing anything. + + src/hb-ot-face.hh | 2 +- + src/hb-ot-kern-table.hh | 55 ++++++++++++++----------------------------------- + src/hb-ot-layout.cc | 4 ++-- + 3 files changed, 18 insertions(+), 43 deletions(-) + +commit 0382b7184addf5b3723db40a57790e5e62ac1703 +Author: Behdad Esfahbod +Date: Fri Nov 2 12:23:26 2018 -0400 + + Use as_array in more places + + src/hb-aat-layout-morx-table.hh | 4 ++-- + src/hb-ot-layout-gsubgpos.hh | 22 +++++++++++++--------- + 2 files changed, 15 insertions(+), 11 deletions(-) + +commit 91de9dfcf3bba7cbeef1e709679c8e24ab684c97 +Author: Behdad Esfahbod +Date: Fri Nov 2 12:14:21 2018 -0400 + + Fix &array_of<> + + src/hb-dsalgs.hh | 3 +++ + src/hb-open-type.hh | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit 9b7cb137946013592c9a5a9f0a3464fb4613577b +Author: Behdad Esfahbod +Date: Fri Nov 2 12:00:55 2018 -0400 + + Fixup + + src/hb-dsalgs.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6e06fe162ed79bb47f62aae03669cd72b99014a0 +Author: Behdad Esfahbod +Date: Fri Nov 2 11:56:55 2018 -0400 + + [kern] Implement Format3 + + Untested. + + src/hb-ot-kern-table.hh | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 51 insertions(+) + +commit c6ef5dbd5c40cc8934756456221e080012a82530 +Author: Behdad Esfahbod +Date: Fri Nov 2 11:51:21 2018 -0400 + + Add cast operators to hb_array_t + + src/hb-dsalgs.hh | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +commit 72462eb76584a2892f1d961c90fd289240ea9380 +Author: Behdad Esfahbod +Date: Fri Nov 2 11:46:24 2018 -0400 + + Add UnsizedArrayOf::as_array() instead of hb_array() template + + src/hb-aat-layout-trak-table.hh | 2 +- + src/hb-dsalgs.hh | 2 -- + src/hb-open-file.hh | 2 +- + src/hb-open-type.hh | 11 +++-------- + src/hb-ot-color-cpal-table.hh | 6 +++--- + 5 files changed, 8 insertions(+), 15 deletions(-) + +commit 1cf075ecb674cc0c7043bffe2fef5ef187c15335 +Author: Behdad Esfahbod +Date: Fri Nov 2 11:38:00 2018 -0400 + + Add get_size to UnsizedArrayOf + + src/hb-open-type.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit a4a7a623893fd4c8db3a987d81a1c80243006f1e +Author: Behdad Esfahbod +Date: Fri Nov 2 11:16:43 2018 -0400 + + [kern] Add buffer message + + src/hb-ot-kern-table.hh | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 0b2870085ddecdde8370eebc7c2bb346b1992b93 +Author: Michiharu Ariza +Date: Thu Nov 1 22:43:17 2018 -0700 + + removed unused code + + src/hb-cff-interp-common.hh | 18 ------------------ + 1 file changed, 18 deletions(-) + +commit 6186dbf1be4da88d9c4f1ef5cea19fd7779f29ab +Author: Michiharu Ariza +Date: Thu Nov 1 17:25:23 2018 -0700 + + added hb_subset_input_set_desubroutinize API + + hooked up with CFF1 subroutinizer + a renaming + + src/hb-subset-cff-common.hh | 2 +- + src/hb-subset-cff1.cc | 4 ++-- + src/hb-subset-input.cc | 13 +++++++++++++ + src/hb-subset.h | 5 +++++ + util/hb-subset.cc | 1 + + util/options.cc | 2 +- + 6 files changed, 23 insertions(+), 4 deletions(-) + +commit b1d0c589154d080ff519c3e80aea923185787b13 +Author: Michiharu Ariza +Date: Thu Nov 1 16:33:46 2018 -0700 + + removed extraneous ;s + + src/hb-cff-interp-common.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 2840a104c1288af79cbda720afa9e37aec6fb29d +Author: Michiharu Ariza +Date: Thu Nov 1 16:18:13 2018 -0700 + + tweaks to build with new merge + + src/hb-cff2-interp-cs.hh | 11 +++++++---- + src/hb-ot-cff2-table.cc | 9 +++++---- + src/hb-ot-cff2-table.hh | 7 +++---- + src/hb-subset-cff-common.cc | 12 ++++-------- + src/hb-subset-cff-common.hh | 3 +-- + src/hb-subset-cff1.cc | 3 +-- + src/hb-subset-cff2.cc | 3 +-- + 7 files changed, 22 insertions(+), 26 deletions(-) + +commit e600e5440b3b77294df47fae947758137ea02501 +Merge: 82248b92 de96e5c8 +Author: Michiharu Ariza +Date: Thu Nov 1 16:13:56 2018 -0700 + + Merge branch 'master' into cff-subset + +commit de96e5c81c7f473520df93052ecea162baa5a350 +Author: Behdad Esfahbod +Date: Thu Nov 1 18:13:58 2018 -0400 + + [Crap] Avoid operator= + + src/hb-null.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f9353bd68c112dea8962dd586bf5e664f75a2a07 +Author: Behdad Esfahbod +Date: Thu Nov 1 18:05:22 2018 -0400 + + [aat] Rely on vector auto initialization + + src/hb-aat-map.hh | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +commit 5a18d97b35d05c826c242e6847764c2418831a55 +Author: Behdad Esfahbod +Date: Thu Nov 1 18:01:26 2018 -0400 + + [aat] Remove unused forward declaration + + src/hb-aat-map.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit 82248b9287e7b208c304e761393b745604a51c6e +Author: Michiharu Ariza +Date: Thu Nov 1 10:36:50 2018 -0700 + + fix leak attempt ^2 + + src/hb-subset-cff2.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a9c305c2b00b7e793dc3d8333eee43d677aebd42 +Author: Michiharu Ariza +Date: Thu Nov 1 10:31:21 2018 -0700 + + fix leaks + + src/hb-subset-cff1.cc | 4 ++-- + src/hb-subset-cff2.cc | 3 +-- + 2 files changed, 3 insertions(+), 4 deletions(-) + +commit 049ce078e51bebce50b17889f3edae3db3ea39f5 +Author: Michiharu Ariza +Date: Thu Nov 1 08:46:21 2018 -0700 + + fix bogus width with --no-hinting + + src/hb-cff1-interp-cs.hh | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +commit 07ec792212063851ee41eae33792d3d90d31e6a1 +Author: Behdad Esfahbod +Date: Thu Nov 1 10:31:12 2018 -0400 + + Warning fix + + src/test-ot-color.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c32280b30fb3844addda31a0d97ae7cb55ef07d2 +Author: Ebrahim Byagowi +Date: Thu Nov 1 15:31:14 2018 +0330 + + [ot-layout] minor + + src/hb-ot-layout.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit cad90be4ea56a85ddc084f86f36dd7129850f6d7 +Author: Ebrahim Byagowi +Date: Thu Nov 1 13:39:06 2018 +0330 + + [test] minor + + test/api/test-ot-color.c | 2 -- + 1 file changed, 2 deletions(-) + +commit d56e338a903a5a7c4f8ccd0f4d983cd492243ed6 +Author: Michiharu Ariza +Date: Wed Oct 31 22:30:34 2018 -0700 + + CFF1 no-desubroutinize + no-hinting + + no-desubroutinize option is disabled for now + code cleanup (esp. CFF1 width handling) + bug fixes & renaming + + src/hb-cff-interp-common.hh | 49 +++ + src/hb-cff-interp-cs-common.hh | 93 +++++- + src/hb-cff-interp-dict-common.hh | 45 +-- + src/hb-cff1-interp-cs.hh | 66 +++- + src/hb-cff2-interp-cs.hh | 1 + + src/hb-ot-cff-common.hh | 85 ++--- + src/hb-ot-cff1-table.hh | 20 +- + src/hb-ot-cff2-table.hh | 25 +- + src/hb-subset-cff-common.hh | 702 ++++++++++++++++++++++++++++++++++++--- + src/hb-subset-cff1.cc | 242 +++++++++++--- + src/hb-subset-cff2.cc | 45 +-- + src/hb-subset-input.hh | 1 + + src/hb-subset-plan.cc | 1 + + src/hb-subset-plan.hh | 1 + + util/options.cc | 2 + + util/options.hh | 2 + + 16 files changed, 1130 insertions(+), 250 deletions(-) + +commit 52a00cd87f63c8ab32413a1a9ce792a3e2ec84e2 +Author: Behdad Esfahbod +Date: Wed Oct 31 19:05:53 2018 -0700 + + [aat] Implement 'aalt' mapping + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1160 + + src/hb-aat-map.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 6e3ea269fa1fe0a3de7a8a13c6e853c91231808e +Author: Behdad Esfahbod +Date: Wed Oct 31 19:00:11 2018 -0700 + + [aat] Add 'afrc' feature mapping + + https://github.com/harfbuzz/harfbuzz/issues/1342#issuecomment-434829028 + + src/hb-aat-layout.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 40b19fd46951e2f9b402e59e1fbbf06fde7ecd61 +Author: Behdad Esfahbod +Date: Wed Oct 31 18:51:45 2018 -0700 + + [aat] Fallback to old style "Letter Case" small caps + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1342 + + src/hb-aat-layout-morx-table.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit f9289319481a1e9762ad366b287e781c44ba9fc6 +Author: Behdad Esfahbod +Date: Wed Oct 31 18:25:05 2018 -0700 + + [test] Minor + + test/shaping/run-tests.py | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit cf203af8a33591c163b63dbdf0fd341bc4606190 +Author: Behdad Esfahbod +Date: Wed Oct 31 18:21:48 2018 -0700 + + Implement space fallback in vertical direction + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1343 + + src/hb-ot-shape-fallback.cc | 36 +++++++++++++++++++-------- + test/shaping/data/in-house/tests/spaces.tests | 17 +++++++++++++ + 2 files changed, 42 insertions(+), 11 deletions(-) + +commit e01250230b1ad85e49cc0021365d1ee43feb9855 +Author: Behdad Esfahbod +Date: Wed Oct 31 18:14:00 2018 -0700 + + [hmtx/vmtx] Fix a crasher + + src/hb-ot-hmtx-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 36e90ef56e6c0643ef61e947d7361c6fa4eadf10 +Author: Behdad Esfahbod +Date: Wed Oct 31 15:09:09 2018 -0700 + + [mort] Massage some more + + src/hb-aat-layout-common.hh | 28 ++++++++++++++++++++++++++++ + src/hb-aat-layout-morx-table.hh | 21 +++++---------------- + 2 files changed, 33 insertions(+), 16 deletions(-) + +commit cbaff4ef1910e2872bfff61f3d5427c076b3673d +Author: Behdad Esfahbod +Date: Wed Oct 31 15:06:12 2018 -0700 + + [mort] Some more + + src/hb-aat-layout-morx-table.hh | 34 ++++++++++++++++------------------ + 1 file changed, 16 insertions(+), 18 deletions(-) + +commit 3087046d3144afb50bcc13e4afa2d20d9f71f2c8 +Author: Behdad Esfahbod +Date: Wed Oct 31 14:59:14 2018 -0700 + + [mort] Refactor offset-to-index mapping + + src/hb-aat-layout-morx-table.hh | 27 ++++++++++++++++----------- + 1 file changed, 16 insertions(+), 11 deletions(-) + +commit b9db610add702da0a257db2eb21f3a7fb56682f7 +Author: Behdad Esfahbod +Date: Wed Oct 31 14:22:31 2018 -0700 + + Minor + + src/hb-font.cc | 28 ++++++++++++++-------------- + src/hb-font.h | 2 +- + 2 files changed, 15 insertions(+), 15 deletions(-) + +commit 995bf6c6f82d6b2dabcb81e1426910ee82b91b44 +Author: Behdad Esfahbod +Date: Wed Oct 31 13:21:33 2018 -0700 + + [sbix] Rely on blob->as<> checking size against Type::min_size + + src/hb-ot-color-sbix-table.hh | 6 ------ + 1 file changed, 6 deletions(-) + +commit 4d4e526b5cc703111eb445b7e319a4cd1917489f +Author: Behdad Esfahbod +Date: Wed Oct 31 13:19:42 2018 -0700 + + Improve blob->as<> + + It's true that blob->as<> should only be called on null or sanitized + data. But this change is safe, so keep it. + + src/hb-blob.hh | 2 +- + src/hb-ot-glyf-table.hh | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 5854d3fa251069f8158b97a831d1439c2ff8b510 +Author: Behdad Esfahbod +Date: Wed Oct 31 10:42:49 2018 -0700 + + [set] Warning fix with gcc 8.1 + + https://github.com/harfbuzz/harfbuzz/pull/1334 + + src/hb-dsalgs.hh | 6 ++++-- + src/hb-set.hh | 4 ++-- + 2 files changed, 6 insertions(+), 4 deletions(-) + +commit 850a7af3a419c6c4ab92bff59991758a2951d41f +Author: Ebrahim Byagowi +Date: Wed Oct 31 14:20:23 2018 +0330 + + [ot-color-test] Remove the non-working exact strike size storing (#1339) + + src/test-ot-color.cc | 135 +++++++++++++++++++++++---------------------------- + 1 file changed, 62 insertions(+), 73 deletions(-) + +commit 2e639c47c9d35ff7dc4dde21f744f9ee695a27f3 +Author: Ebrahim Byagowi +Date: Wed Oct 31 14:20:14 2018 +0330 + + [aat] Fix older compilers by not referencing enum directly (#1340) + + src/hb-aat-layout-morx-table.hh | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 642c9dcf1b34b51ffdbf88ccbef4762aa12a5cbe +Author: Ebrahim Byagowi +Date: Wed Oct 31 14:02:37 2018 +0330 + + [aat] Minor, remove extra semicolons + + src/hb-aat-layout-morx-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit c962d5e714a6f88c4cb20bed219177b1bc4a2dfd +Author: Behdad Esfahbod +Date: Wed Oct 31 01:16:33 2018 -0700 + + [mort] Make ligatures work + + ./hb-shape Apple_Chancery_10_12.ttf "Th th ll te to tr fr fu fj" + [T_h=0+2308|space=2+569|t_h=3+1687|space=5+569|l_l=6+1108|space=8+569|t_e=9+1408|space=11+569|t_o=12+1531|space=14+569|t_r=15+1385|space=17+569|f_r=18+1432|space=20+569|f_u=21+1733|space=23+569|f_j=24+1098] + + Part of https://github.com/harfbuzz/harfbuzz/issues/1331 + + src/hb-aat-layout-morx-table.hh | 25 +++++++++++++++++-------- + 1 file changed, 17 insertions(+), 8 deletions(-) + +commit c07798960004439fcd8fa0f4ae33e225428d1065 +Author: Behdad Esfahbod +Date: Wed Oct 31 00:36:03 2018 -0700 + + [mort] More Ligature work + + src/hb-aat-layout-morx-table.hh | 54 ++++++++++++++++++++++++++++++----------- + 1 file changed, 40 insertions(+), 14 deletions(-) + +commit 431c6e496be56e441ee4b9b705f40a1246bdd0d6 +Author: Behdad Esfahbod +Date: Wed Oct 31 00:15:00 2018 -0700 + + [mort] Some Ligature work + + src/hb-aat-layout-morx-table.hh | 38 +++++++++++++++++++++++++++++++------- + 1 file changed, 31 insertions(+), 7 deletions(-) + +commit 28b68cffe4e5ebf82217ebf439f428431d672af3 +Author: Behdad Esfahbod +Date: Tue Oct 30 23:33:30 2018 -0700 + + [mort] Implement / adjust Contextual substitution + + src/hb-aat-layout-morx-table.hh | 70 ++++++++++++++++++++++++++++++----------- + src/hb-open-type.hh | 7 +++++ + 2 files changed, 59 insertions(+), 18 deletions(-) + +commit 11dbf0f12926b80d0c308c70a218342280045c23 +Author: Behdad Esfahbod +Date: Tue Oct 30 21:49:59 2018 -0700 + + [mort] More fixes] + + src/hb-aat-layout-common.hh | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit e1552af95b6c17571f7ee58ebac92f48d93c8f98 +Author: Behdad Esfahbod +Date: Tue Oct 30 21:09:05 2018 -0700 + + [maxp] Minor + + src/hb-ot-maxp-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0cf282a32e5b0fe1fec454ff293ffe04b33f1112 +Author: Behdad Esfahbod +Date: Tue Oct 30 20:51:44 2018 -0700 + + [mort] Grind some more + + src/hb-aat-layout-common.hh | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +commit 90667b31bc3e61e68e27966e4781aba456c6b93b +Author: Behdad Esfahbod +Date: Tue Oct 30 20:15:28 2018 -0700 + + [mort] Hook up more + + src/hb-aat-layout.cc | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +commit 9346b1f158dfd7d25ed0057b40aaa6980a85ea17 +Author: Behdad Esfahbod +Date: Tue Oct 30 20:04:13 2018 -0700 + + [morx] Remove stale comment + + src/hb-aat-layout-morx-table.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit f864ef215e1354a1e5a3c8796afafba761404e08 +Author: Behdad Esfahbod +Date: Tue Oct 30 19:42:21 2018 -0700 + + [mort] More massaging towards mort + + src/hb-aat-layout-morx-table.hh | 53 +++++++++++++++++++++-------------------- + 1 file changed, 27 insertions(+), 26 deletions(-) + +commit 2d9467340b1498ccc0cd47bf915b84ab12dfa025 +Author: Behdad Esfahbod +Date: Tue Oct 30 19:33:31 2018 -0700 + + [mort] Fix version check in sanitize + + src/hb-aat-layout-morx-table.hh | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit c2527a1bc2b493473f06ea6ae79f0a87b722c4d3 +Author: Behdad Esfahbod +Date: Tue Oct 30 19:26:16 2018 -0700 + + [mort] Make it compile / hook it up + + Untested. + + src/hb-aat-layout-common.hh | 11 +++++----- + src/hb-aat-layout-morx-table.hh | 2 +- + src/hb-aat-layout.cc | 47 ++++++++++++++++++++++++++--------------- + 3 files changed, 36 insertions(+), 24 deletions(-) + +commit 933babdc075c27fbcc1b726c3c9b2aa67338c6ad +Author: Behdad Esfahbod +Date: Tue Oct 30 19:22:43 2018 -0700 + + [mort] Fixup on previous commit + + src/hb-aat-layout-morx-table.hh | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit b053cabacd99ff69144a1459fe02ffd574c2416c +Author: Ebrahim Byagowi +Date: Tue Oct 30 18:41:34 2018 +0330 + + [mort] Bring back mort generalizations + + Started by reverting https://github.com/harfbuzz/harfbuzz/commit/1f1c85a5 + + Just a starting point, if we agree even mort can come back. + + src/hb-aat-layout-common.hh | 76 +++++++++++++++++++---- + src/hb-aat-layout-kerx-table.hh | 17 ++--- + src/hb-aat-layout-morx-table.hh | 133 ++++++++++++++++++++++++---------------- + src/hb-aat-layout.cc | 16 ++++- + src/hb-ot-face.hh | 1 + + 5 files changed, 171 insertions(+), 72 deletions(-) + +commit 5cd544a621f10b307bb97aea27ea54e55aacb2e9 +Author: Behdad Esfahbod +Date: Tue Oct 30 19:16:00 2018 -0700 + + Fix build + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1338 + + src/test-ot-color.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 69297bb21640677532b7030332f803c0768c6579 +Author: Behdad Esfahbod +Date: Tue Oct 30 19:06:21 2018 -0700 + + [fuzzing] Call hb-ot-color API + + test/fuzzing/hb-shape-fuzzer.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 1019391046cf01524c4ef20c9256a47b7411610b +Author: Behdad Esfahbod +Date: Tue Oct 30 15:52:26 2018 -0700 + + 2.1.0 + + NEWS | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++ + RELEASING.md | 3 +- + configure.ac | 2 +- + docs/harfbuzz-docs.xml | 1 + + src/hb-ot-color.cc | 22 +++++++++----- + src/hb-ot-color.h | 4 +-- + src/hb-version.h | 6 ++-- + 7 files changed, 105 insertions(+), 14 deletions(-) + +commit bfd549daaa078e7edba5a65971b1d3e872664f2d +Author: Behdad Esfahbod +Date: Tue Oct 30 14:47:27 2018 -0700 + + Fix everything-bot + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0e1ad5a075c6858ca60bad0e2da58b5256e15815 +Author: Garret Rieger +Date: Tue Oct 30 11:29:58 2018 -0700 + + [subset] Limit the number of scripts and langsys' that should be checked when collecting features. + + src/hb-ot-layout-common.hh | 8 ++++++++ + src/hb-ot-layout.cc | 11 ++++++++++- + 2 files changed, 18 insertions(+), 1 deletion(-) + +commit a7aba99baab2d6e6105675ceedbe22222fa0f166 +Author: Behdad Esfahbod +Date: Tue Oct 30 14:04:09 2018 -0700 + + [name] Rename hb_name_id_t to hb_ot_name_id_t + + https://github.com/harfbuzz/harfbuzz/pull/1254 + + docs/harfbuzz-sections.txt | 3 +- + src/hb-ot-color-cpal-table.hh | 12 +++--- + src/hb-ot-color.cc | 6 +-- + src/hb-ot-color.h | 4 +- + src/hb-ot-layout.cc | 44 +++++++++---------- + src/hb-ot-layout.h | 28 ++++++------- + src/hb-ot-name-table.hh | 6 +-- + src/hb-ot-name.cc | 38 ++++++++--------- + src/hb-ot-name.h | 98 +++++++++++++++++++++---------------------- + test/api/test-ot-color.c | 30 ++++++------- + test/api/test-ot-name.c | 8 ++-- + 11 files changed, 139 insertions(+), 138 deletions(-) + +commit 881e1054bc66fd07489d661dd5c3f84a5d077edc +Author: Simon Tooke +Date: Tue Oct 30 14:16:23 2018 -0400 + + fix various GCC function pointer warnings + + src/hb-debug.hh | 6 +++--- + src/hb-set.hh | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit dc9bd29feac6675c79343b88a06f03f356f9175b +Author: Behdad Esfahbod +Date: Tue Oct 30 13:16:07 2018 -0700 + + [CBDT] Implement Format18 get_extens + + Part of https://github.com/harfbuzz/harfbuzz/issues/1327 + + src/hb-ot-color-cbdt-table.hh | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit a2a7422aaf47dd43c2c55ad48dd15513f9d5b081 +Author: Behdad Esfahbod +Date: Tue Oct 30 13:14:56 2018 -0700 + + [CBDT] Bound checks in reference_png + + src/hb-ot-color-cbdt-table.hh | 57 ++++++++++++++++++++++++++----------------- + 1 file changed, 34 insertions(+), 23 deletions(-) + +commit f236f790884d7b5c7afb73768724c360d4ea5212 +Author: Nathan Willis +Date: Tue Oct 30 11:24:56 2018 -0500 + + Docs Makefile: sync SGML list to harfbuzz-docs.xml include list. Hopefully fixes distcheck failure. + + docs/Makefile.am | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 9f4b375e396fe65b30c792b9524a732da0b477d1 +Author: Nathan Willis +Date: Mon Oct 29 17:10:53 2018 -0500 + + Usermanual: minor wording updates, build fixes. + + ...rmanual-buffers-language-script-and-direction.xml | 8 +++++++- + docs/usermanual-clusters.xml | 6 ++++++ + docs/usermanual-fonts-and-faces.xml | 8 +++++++- + docs/usermanual-getting-started.xml | 6 ++++++ + docs/usermanual-glyph-information.xml | 8 +++++++- + docs/usermanual-install-harfbuzz.xml | 20 +++++++++++++++++--- + docs/usermanual-opentype-features.xml | 8 +++++++- + docs/usermanual-shaping-concepts.xml | 6 ++++++ + docs/usermanual-what-is-harfbuzz.xml | 12 +++++++----- + 9 files changed, 70 insertions(+), 12 deletions(-) + +commit e110032b914db9f417cc152b2beb51cda0a91dd7 +Author: Nathan Willis +Date: Mon Oct 29 16:42:59 2018 -0500 + + Usermanual: update DTD in chapter XML to avoid HTML entity parsing errors. + + docs/usermanual-what-is-harfbuzz.xml | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 01400f7425f7aec852f39ebee17aa502a74025fb +Author: Nathan Willis +Date: Sat Oct 20 17:21:49 2018 +0100 + + Usermanual; minor wording changes. + + docs/usermanual-getting-started.xml | 14 +++++++------- + docs/usermanual-install-harfbuzz.xml | 10 +++++++++- + docs/usermanual-what-is-harfbuzz.xml | 31 ++++++++++--------------------- + 3 files changed, 26 insertions(+), 29 deletions(-) + +commit e89f43dc0884cb4a73beff86e49b7bd8565a01f1 +Author: Khaled Hosny +Date: Sat Oct 20 16:12:45 2018 +0100 + + Minor; rewording unsafe-to-break note. + + Co-Authored-By: n8willis + + docs/usermanual-getting-started.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ccdfb634382596a6114380c72f2f344b1af23f94 +Author: Khaled Hosny +Date: Sat Oct 20 15:46:04 2018 +0100 + + Trivial; typo. + + Co-Authored-By: n8willis + + docs/usermanual-what-is-harfbuzz.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 722099487be72346e7109872b6abf30696f3b7c3 +Author: Khaled Hosny +Date: Sat Oct 20 15:45:24 2018 +0100 + + Minor; simplify example code + + Co-Authored-By: n8willis + + docs/usermanual-getting-started.xml | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 6e4dd58a4af003eeec93cbe90d1258d91a38b53c +Author: Khaled Hosny +Date: Sat Oct 20 15:44:51 2018 +0100 + + Minor: simplify example code + + Co-Authored-By: n8willis + + docs/usermanual-getting-started.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f9ee0deceebd8952a8d80f3fd7b264b33e70f703 +Author: Khaled Hosny +Date: Sat Oct 20 15:41:00 2018 +0100 + + Minor; drop 'OpenType' from sentence + + Co-Authored-By: n8willis + + docs/usermanual-what-is-harfbuzz.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f028da59d902c39e61021b48fc73f2821a9f3be2 +Author: Nathan Willis +Date: Sat Oct 20 15:18:29 2018 +0100 + + Minor. + + docs/harfbuzz-docs.xml | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit ed5547f828fe7559cc3331f05780ae9f041b1e0f +Author: Khaled Hosny +Date: Sat Oct 20 15:00:52 2018 +0100 + + Use 'glyphs' instead of 'text' + + Co-Authored-By: n8willis + + docs/harfbuzz-docs.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 236285545b5da8513f2b61fc8066ba78308a555a +Author: Nathan Willis +Date: Wed Oct 17 10:10:48 2018 -0500 + + Docs: minor, update Makefile w new file name. + + docs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 163ab81ab0f4000d968cc55b418402497e605e6c +Author: Nathan Willis +Date: Tue Oct 16 17:48:15 2018 -0500 + + Docs: rename Hello HarfBuzz to Getting Started. + + docs/harfbuzz-docs.xml | 2 +- + docs/{usermanual-hello-harfbuzz.xml => usermanual-getting-started.xml} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit 9e7efa3f47557a77852a15d89619787fd9933ed1 +Author: Nathan Willis +Date: Tue Oct 16 17:46:03 2018 -0500 + + Docs: usermanual, add API Overview to Hello HarfBuzz chapter. Start Terminology section. + + docs/usermanual-hello-harfbuzz.xml | 309 +++++++++++++++++++++++++------------ + 1 file changed, 212 insertions(+), 97 deletions(-) + +commit 3a27e8fb97f716c17b03e3a4a634a4900bcb6045 +Author: Nathan Willis +Date: Fri Oct 12 18:23:26 2018 -0500 + + Docs: usermanual, add Shaping Concepts chapter. + + docs/harfbuzz-docs.xml | 5 +- + docs/usermanual-shaping-concepts.xml | 368 +++++++++++++++++++++++++++++++++++ + 2 files changed, 371 insertions(+), 2 deletions(-) + +commit 9aa865dcc68ec207741e07ba3f7aacf4ac750c1c +Author: Nathan Willis +Date: Fri Oct 12 18:22:41 2018 -0500 + + Docs: usermanual, minor cleanup to What Is HarfBuzz chapter. + + docs/usermanual-what-is-harfbuzz.xml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 443f87213272be5ae0579dce4749b2036dfe3815 +Author: Nathan Willis +Date: Thu Oct 11 15:40:08 2018 -0500 + + Docs: move harfbuzz-ng-vs-old discussion down below the TOC; put in note. + + docs/harfbuzz-docs.xml | 63 ++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 43 insertions(+), 20 deletions(-) + +commit 792af5d254fddcdc4292dffb76b81d65754e65a9 +Author: Nathan Willis +Date: Thu Oct 11 14:05:59 2018 -0500 + + Docs: flesh out config options in Usermanual:Install chapter. + + docs/usermanual-install-harfbuzz.xml | 108 +++++++++++++++++++++++++++-------- + 1 file changed, 85 insertions(+), 23 deletions(-) + +commit 325e2745cfa55f9ef114ee8eeaf7bd8176743822 +Author: Nathan Willis +Date: Wed Oct 10 17:01:21 2018 -0500 + + Docs: add basic config-options section to Usermanual Installation chapter. + + docs/usermanual-install-harfbuzz.xml | 132 ++++++++++++++++++++++++++++++++++- + 1 file changed, 131 insertions(+), 1 deletion(-) + +commit 97c1c46cd2241d77b531a582dd1a2432af976357 +Author: Nathan Willis +Date: Wed Oct 10 16:38:22 2018 -0500 + + Docs: update and linearize build instructions; add installation overview material. + + docs/usermanual-install-harfbuzz.xml | 229 ++++++++++++++++++++++++++++------- + 1 file changed, 188 insertions(+), 41 deletions(-) + +commit 088755f9e654d2ec638dce0c68d523084b9eaf5a +Author: Nathan Willis +Date: Wed Oct 10 16:37:29 2018 -0500 + + Docs: update usermanual What Is HarfBuzz material. + + docs/usermanual-what-is-harfbuzz.xml | 220 +++++++++++++++++++++++++++-------- + 1 file changed, 172 insertions(+), 48 deletions(-) + +commit 0956ab41851d30f50c39c28730cf30ea0bbc5466 +Author: Nathan Willis +Date: Fri Sep 28 17:15:59 2018 -0500 + + Docs: Move What-HarfBuzz-doesnt-do to Usermanual-what-is-HarfBuzz. + + docs/usermanual-hello-harfbuzz.xml | 98 +++------------------------------ + docs/usermanual-what-is-harfbuzz.xml | 101 +++++++++++++++++++++++++++++++++-- + 2 files changed, 104 insertions(+), 95 deletions(-) + +commit fd270beedb331c4685e918f5a3ef5789a23ffaeb +Author: Nathan Willis +Date: Fri Sep 28 16:36:38 2018 -0500 + + Docs: Usermanual- What is HarfBuzz; add intro to shaping concepts. + + docs/usermanual-what-is-harfbuzz.xml | 51 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 51 insertions(+) + +commit d9fd92721002726c4aeaae9cc3a519a41f694e48 +Author: Nathan Willis +Date: Fri Sep 28 16:07:37 2018 -0500 + + Docs: update Usermanual-What Is HarfBuzz. + + docs/usermanual-what-is-harfbuzz.xml | 199 +++++++++++++++++++++++------------ + 1 file changed, 130 insertions(+), 69 deletions(-) + +commit 0af3d176a64c0a57c7acb2a64ce8b9d08f449241 +Author: Khaled Hosny +Date: Tue Oct 30 17:05:28 2018 +0200 + + [sbix] Fix memory leak in early return + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11210 + + src/hb-ot-color-sbix-table.hh | 3 +++ + ...zz-testcase-minimized-hb-shape-fuzzer-5768601332613120 | Bin 0 -> 108 bytes + 2 files changed, 3 insertions(+) + +commit edaa768253cfeb97d614537253f90d47aa93ff6f +Author: Behdad Esfahbod +Date: Tue Oct 30 01:35:58 2018 -0700 + + [util] Use fgets instead of getline such that windows passes + + util/hb-shape.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 56738429d667f6c35e5c7af30b51604fc133c23c +Author: Behdad Esfahbod +Date: Tue Oct 30 01:33:22 2018 -0700 + + [test] Fix warnings + + test/api/test-ot-tag.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 138f9e0f25752bbf7f8e867f230ca91442f40028 +Author: Behdad Esfahbod +Date: Tue Oct 30 01:31:13 2018 -0700 + + Minor + + src/hb-machinery.hh | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit 83a612739accf6b0f2e1cb1be15097402f7ecf33 +Author: Behdad Esfahbod +Date: Tue Oct 30 01:24:23 2018 -0700 + + [util] Minor + + util/options.cc | 6 ------ + util/options.hh | 8 ++------ + 2 files changed, 2 insertions(+), 12 deletions(-) + +commit 64e41d2c89c533f554e49ffbd18e6653a70ab999 +Author: Behdad Esfahbod +Date: Tue Oct 30 01:08:34 2018 -0700 + + [test] Fix Python3 + + test/shaping/run-tests.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f7a08cd41df1ff3e44aa838306218ae0565b7273 +Author: Ebrahim Byagowi +Date: Tue Oct 30 11:29:09 2018 +0330 + + Fix extra semicolon issues and test that on CI (#1330) + + .circleci/config.yml | 2 +- + src/hb-machinery.hh | 16 ++++++++-------- + src/hb-ot-layout-common.hh | 6 +++--- + src/hb-ot-layout-gsubgpos.hh | 2 +- + src/hb.hh | 2 +- + util/options.hh | 2 +- + 6 files changed, 15 insertions(+), 15 deletions(-) + +commit 422debb830fe150c26e1628f77531f41f0871325 +Author: Behdad Esfahbod +Date: Tue Oct 30 00:51:43 2018 -0700 + + [test/shaping] Spawn one hb-shape per test file + + Speeds up runnings in-house tests from over 20s to 2s. + + test/shaping/run-tests.py | 32 ++++++++++++-------------------- + 1 file changed, 12 insertions(+), 20 deletions(-) + +commit 58e20f53bf61244e3eef09be8ebed60aaf52fb11 +Author: Behdad Esfahbod +Date: Tue Oct 30 00:50:18 2018 -0700 + + [util] Add hb-shape --batch + + util/hb-shape.cc | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) + +commit 6131fb6283cff87333db14b9b32e92be6139c3d6 +Author: Behdad Esfahbod +Date: Tue Oct 30 00:38:01 2018 -0700 + + [util] Don't close stdin/stdout + + util/options.cc | 6 ++++++ + util/options.hh | 8 ++++++-- + 2 files changed, 12 insertions(+), 2 deletions(-) + +commit 7e998d193a1429b42bb69582f9e5738aa6fd1a72 +Author: Behdad Esfahbod +Date: Mon Oct 29 23:31:42 2018 -0700 + + Fix spurious warning re uninitialized use + + src/hb-ot-layout-common.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 1b7bfb5e1864fc355715b536faac6693b5ce0218 +Author: Ebrahim Byagowi +Date: Tue Oct 30 10:19:40 2018 +0330 + + [cmake] Make build of tests and subset optional (#1329) + + .circleci/config.yml | 2 +- + CMakeLists.txt | 19 ++++++------------- + 2 files changed, 7 insertions(+), 14 deletions(-) + +commit b186274362725b7501211c2a782c1a0badd57107 +Author: Behdad Esfahbod +Date: Mon Oct 29 23:21:14 2018 -0700 + + [set/map] Fix uninitialized memory + + I keep forgetting that primitive types are NOT initialized during construction. :| + + src/hb-map.hh | 4 ++-- + src/hb-object.hh | 1 + + src/hb-set.hh | 4 ++-- + 3 files changed, 5 insertions(+), 4 deletions(-) + +commit ad3cededdd5ee6a364161e9d27e4cf4d95a80177 +Author: Behdad Esfahbod +Date: Mon Oct 29 22:53:16 2018 -0700 + + [fuzzing] Make test runners less verbose + + test/fuzzing/run-shape-fuzzer-tests.py | 3 ++- + test/fuzzing/run-subset-fuzzer-tests.py | 1 - + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 4ef671f25f38895e3f87cd69687670c3d8ea4600 +Author: Behdad Esfahbod +Date: Mon Oct 29 22:46:19 2018 -0700 + + [unicode] Fix a long-standing double-declaration warning + + src/hb-unicode.cc | 31 +++++++------------------------ + 1 file changed, 7 insertions(+), 24 deletions(-) + +commit 166ae8b0aa3b1e7298a1bbb872647cb352a0f924 +Author: Behdad Esfahbod +Date: Mon Oct 29 22:40:37 2018 -0700 + + Remove now unused hb_auto_t<> + + src/hb-dsalgs.hh | 20 -------------------- + 1 file changed, 20 deletions(-) + +commit 56e0fd345c4e68753123a05cd80291e933d71061 +Author: Behdad Esfahbod +Date: Mon Oct 29 22:35:44 2018 -0700 + + Remove last use of hb_auto_t<> + + src/hb-ot-cmap-table.hh | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit ca5e5a4979fa4aca873ba986e60b3010aaf0b1de +Author: Behdad Esfahbod +Date: Mon Oct 29 22:30:21 2018 -0700 + + Port Coverage::Iter off hb_auto_t<> + + src/hb-ot-layout-common.hh | 4 +--- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 26 +++++++++++++------------- + src/hb-ot-layout-gsubgpos.hh | 8 ++++---- + 4 files changed, 19 insertions(+), 21 deletions(-) + +commit 3a4e5dd425a2a37ff4c37db953943386c0b6e5d8 +Author: Behdad Esfahbod +Date: Mon Oct 29 18:05:25 2018 -0700 + + Remove a few unnecessary hb_auto_t<>'s + + See a85641446c30247c4e948263f0f8c1147ed4efb9 + + src/hb-coretext.cc | 8 ++++---- + src/hb-ot-cmap-table.hh | 6 ++---- + src/hb-ot-layout-gsub-table.hh | 8 ++++---- + src/hb-ot-layout-gsubgpos.hh | 2 +- + src/hb-ot-layout.cc | 10 +++++----- + src/hb-subset-plan.cc | 2 +- + src/hb-subset.cc | 2 +- + src/hb-uniscribe.cc | 12 ++++++------ + 8 files changed, 24 insertions(+), 26 deletions(-) + +commit 67a22f377dee0dbd89f301f0a1fec6f787867b5e +Author: Behdad Esfahbod +Date: Mon Oct 29 17:37:41 2018 -0700 + + [set/map/vector] Make constructable, but not copy or assignable + + Disable copy/assign on them, as they shouldn't. + + Make constructor / destructor call init_shallow/fini_shallow, + and make those idempotent. So, these three can be constructed + on stack now and no init/fini call is needed. As such, + hb_auto_t<> is not needed anymore. I'll remove that separately. + + src/hb-map.hh | 6 ++++++ + src/hb-set.hh | 5 +++++ + src/hb-vector.hh | 37 ++++++++++++++++++++----------------- + src/hb.hh | 12 ++++++++++++ + 4 files changed, 43 insertions(+), 17 deletions(-) + +commit ea0e51d1b161245aaf5ad0f844bb5316b1cbcd5e +Author: Behdad Esfahbod +Date: Mon Oct 29 16:00:23 2018 -0700 + + Add HB_NO_CREATE_COPY_ASSIGN + + src/hb-open-type.hh | 10 +++++----- + src/hb.hh | 15 +++++++++------ + 2 files changed, 14 insertions(+), 11 deletions(-) + +commit 5b563640b2df5b100130c9901b666713b2e1767e +Author: Behdad Esfahbod +Date: Mon Oct 29 15:58:44 2018 -0700 + + Remove HB_DISALLOW_COPY_AND_ASSIGN from hb_ot_shape_planner_t + + It was arbitrary that this struct had it and not dozens of others. + + src/hb-ot-shape.hh | 3 --- + 1 file changed, 3 deletions(-) + +commit 14b353c1852be64db244f84bf5e95b4b7f3e65b6 +Author: Behdad Esfahbod +Date: Mon Oct 29 15:29:13 2018 -0700 + + One more iteration + + src/hb.hh | 1 - + 1 file changed, 1 deletion(-) + +commit c7c5df9ffd4f7bcc84a9a02a565ccc1807cca529 +Author: Behdad Esfahbod +Date: Mon Oct 29 15:16:52 2018 -0700 + + Try fixing older bots + + Older C++ doesn't allow struct-with-constructor in union. + + src/hb.hh | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +commit be87959a67b8ccf2b21d3cfdb7d16202f18df670 +Author: Behdad Esfahbod +Date: Mon Oct 29 15:16:38 2018 -0700 + + [cmap] Minor + + src/hb-ot-cmap-table.hh | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) + +commit 35d410f2bad62e98f3634c5ee156d0aea9031067 +Author: Behdad Esfahbod +Date: Mon Oct 29 14:45:44 2018 -0700 + + Remove ASSERT_POD + + Newer compilers / language allows structs with constructor in union. + So, this was not actually testing anything. Indeed, the recent + change in DISALLOW_COPY *is* making some of our types non-POD. + That broke some bots. + + Just remove this since it wasn't doing much, and I'd rather have + DISALLOW_COPY. + + src/hb-blob.hh | 1 - + src/hb-buffer.hh | 1 - + src/hb-face.hh | 1 - + src/hb-font.hh | 2 -- + src/hb-machinery.hh | 5 +---- + src/hb-object.hh | 6 +----- + src/hb-ot-shape-complex-arabic-fallback.hh | 2 -- + src/hb-ot-shape-complex-arabic.cc | 2 -- + src/hb-ot-shape-complex-hangul.cc | 2 -- + src/hb-ot-shape-complex-indic.cc | 2 -- + src/hb-ot-shape-complex-khmer.cc | 2 -- + src/hb-ot-shape-complex-use.cc | 2 -- + src/hb-set-digest.hh | 4 ---- + src/hb-shape-plan.hh | 1 - + src/hb-subset-input.hh | 1 - + src/hb-subset-plan.hh | 1 - + src/hb-unicode.hh | 1 - + src/hb.hh | 26 -------------------------- + 18 files changed, 2 insertions(+), 60 deletions(-) + +commit 6f0454e176efdb8b99c8aa59b5ad765ca455b8d6 +Author: Behdad Esfahbod +Date: Mon Oct 29 13:51:15 2018 -0700 + + Fix extra-semicolon warnings + + src/hb-machinery.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit a256a92b3fbb72487cf073a63e646eab952b42ed +Author: Behdad Esfahbod +Date: Mon Oct 29 11:25:35 2018 -0700 + + Make Array types uncopyable-unassignable + + Finally! Catches hard-to-find errors like this: + + - const SortedArrayOf docs = this+svgDocEntries; + + const SortedArrayOf &docs = this+svgDocEntries; + + We implement this for our array types. This, in turn, trickles down + into all types that embed the arrays. So, as long as we define all + open-ended structs in terms of Array types (all can be done using + UnsizedArrayOf), this achieves the goal of making uncopyable all + structs that are variable-sized. Yay! + + src/hb-open-type.hh | 11 +++++++++++ + src/hb.hh | 6 ++++++ + 2 files changed, 17 insertions(+) + +commit 31cc1f74b7028ef88fa0e93e7f12166c7e06de8e +Author: Behdad Esfahbod +Date: Mon Oct 29 11:14:37 2018 -0700 + + [svg] Minor + + src/hb-ot-color-svg-table.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 1366bb9760d0f171f8f655e5739e74dfd2537652 +Author: Behdad Esfahbod +Date: Mon Oct 29 11:01:25 2018 -0700 + + Fix g-i warnings + + src/hb-ot-color.h | 4 +++- + src/hb-ot-name.cc | 4 ++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit ae802c2c6e001492f8f639e4c24546f0e21d86c7 +Author: Ebrahim Byagowi +Date: Mon Oct 29 13:42:14 2018 +0330 + + [test-ot-color] Minor + + src/test-ot-color.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7170e35096f0afd084be1350d080695c70c65d40 +Author: Ebrahim Byagowi +Date: Mon Oct 29 13:11:01 2018 +0330 + + Rename deprecated symbols list file name and clean it up (#1328) + + src/Makefile.am | 6 +++--- + src/gen-def.py | 9 ++++----- + test/api/Makefile.am | 2 +- + 3 files changed, 8 insertions(+), 9 deletions(-) + +commit 1dfe964378e97e45eedf9db9b9a7f675fe38c0bf +Merge: f10252b4 9c692e5b +Author: Ebrahim Byagowi +Date: Mon Oct 29 12:34:33 2018 +0330 + + Merge pull request #1326 from ebraminio/test-ot-color + + Revive and rename dump-emoji to test-ot-color but use public APIs instead + +commit 9c692e5b8d195d8e82538594d89865c609d708f3 +Author: Ebrahim Byagowi +Date: Mon Oct 29 11:36:11 2018 +0330 + + [test-ot-color] Use public APIs on the tool + + src/Makefile.am | 9 +++ + src/test-ot-color.cc | 184 +++++++++++++++++++++++++++++---------------------- + 2 files changed, 113 insertions(+), 80 deletions(-) + +commit fb525f8943b43fe241424c93461bee2b94af28e3 +Author: Ebrahim Byagowi +Date: Mon Oct 29 09:43:17 2018 +0330 + + Rename dump-emoji to test-ot-color + + src/{dump-emoji.cc => test-ot-color.cc} | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 81bcf47e9ea7eb447ff95ce48ecbc5c4439cb53f +Author: Ebrahim Byagowi +Date: Mon Oct 29 09:40:39 2018 +0330 + + Revive dump-emoji + + src/dump-emoji.cc | 322 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 322 insertions(+) + +commit f10252b4b637b4aa0b74bb75963ae1e1a41b5b9f +Author: Ebrahim Byagowi +Date: Mon Oct 29 10:29:58 2018 +0330 + + [svg] Fix incorrect array referencing + + src/hb-ot-color-svg-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5eb251aab041d89b06b0d3f65906ff6712608263 +Author: Behdad Esfahbod +Date: Sun Oct 28 23:16:13 2018 -0700 + + [cbdt] Implement strike selection logic + + src/hb-ot-color-cbdt-table.hh | 25 ++++++++++++++++++++----- + 1 file changed, 20 insertions(+), 5 deletions(-) + +commit 98bddbc8ef3330bc5635f6255e6b9c16593a1934 +Author: Behdad Esfahbod +Date: Sun Oct 28 23:14:15 2018 -0700 + + [sbix] Minor + + src/hb-ot-color-sbix-table.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 8cffee0577284839a24d9fb863206886d2373974 +Author: Behdad Esfahbod +Date: Sun Oct 28 23:07:59 2018 -0700 + + [cbdt] Simplify more + + src/hb-ot-color-cbdt-table.hh | 22 +++++++--------------- + 1 file changed, 7 insertions(+), 15 deletions(-) + +commit 574579d3766b7b42e62495cb9a98f3ffd91079e8 +Author: Behdad Esfahbod +Date: Sun Oct 28 23:04:37 2018 -0700 + + [color] Rename get_strike() to choose_strike() + + src/hb-ot-color-cbdt-table.hh | 8 ++++---- + src/hb-ot-color-sbix-table.hh | 10 +++++----- + 2 files changed, 9 insertions(+), 9 deletions(-) + +commit 0aa90271fdbb2b85389cd5af029b6d4468fb8146 +Author: Behdad Esfahbod +Date: Sun Oct 28 23:03:20 2018 -0700 + + [tests] Fix for recent rounding change in CBDT + + test/shaping/data/in-house/tests/color-fonts.tests | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e2ba96da4c39ba5fe941bf2704c1e7cc5f98034f +Author: Behdad Esfahbod +Date: Sun Oct 28 23:01:57 2018 -0700 + + [cbdt] Refactor get_strike() + + src/hb-ot-color-cbdt-table.hh | 39 ++++++++++++++++----------------------- + src/hb-ot-color.cc | 2 +- + 2 files changed, 17 insertions(+), 24 deletions(-) + +commit 6983cca9c865752fe0a9a065f9b0278b686c3abc +Author: Behdad Esfahbod +Date: Sun Oct 28 22:46:18 2018 -0700 + + [cbdt] Minor + + src/hb-ot-color-cbdt-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e998fb9fbfbd79b476d758238af60f6a4ddff20c +Author: Behdad Esfahbod +Date: Sun Oct 28 22:45:53 2018 -0700 + + [color] Round extents when scaling + + src/hb-ot-color-cbdt-table.hh | 12 +++++++----- + src/hb-ot-color-sbix-table.hh | 12 ++++++------ + 2 files changed, 13 insertions(+), 11 deletions(-) + +commit c929ccfcea18c5c35d6d41ae921845eeffba978a +Author: Ebrahim Byagowi +Date: Mon Oct 29 08:41:13 2018 +0330 + + [ot-color/png] Consider strike ppem on scaling + + src/hb-ot-color-cbdt-table.hh | 5 +++-- + src/hb-ot-color-sbix-table.hh | 23 +++++++++++++++++++---- + src/hb-ot-color.cc | 2 +- + src/hb-ot-font.cc | 2 +- + test/api/test-ot-color.c | 4 ++-- + 5 files changed, 26 insertions(+), 10 deletions(-) + +commit a8c9facf7a73cca39e3fed1f637db4858e64414a +Author: Behdad Esfahbod +Date: Sun Oct 28 18:32:37 2018 -0700 + + [svg] Cosmetic + + src/hb-ot-color-svg-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9c1460e5685448ad4eac8faff9f05e456f87ed28 +Author: Behdad Esfahbod +Date: Sun Oct 28 18:29:14 2018 -0700 + + [svg] Use SortedArrayOf.bsearch + + src/hb-ot-color-svg-table.hh | 18 +++--------------- + 1 file changed, 3 insertions(+), 15 deletions(-) + +commit 18dd6363a5021cfd770b431a6320386f94447674 +Author: Behdad Esfahbod +Date: Sun Oct 28 18:26:49 2018 -0700 + + [svg] Minor + + src/hb-ot-color-svg-table.hh | 23 +++++++++++------------ + 1 file changed, 11 insertions(+), 12 deletions(-) + +commit 4876c938a20af356988d566ba95472d3bcbb133d +Author: Behdad Esfahbod +Date: Sun Oct 28 18:01:25 2018 -0700 + + [sbix] Comment + + src/hb-ot-color-sbix-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 519fca101466283ca5c993dec2ec2c6891d8add5 +Author: Behdad Esfahbod +Date: Sun Oct 28 16:32:20 2018 -0700 + + [color] Minor + + src/hb-ot-color.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e8ff27c2082ffcf3bd213e7a77d823dc1809857e +Author: Behdad Esfahbod +Date: Sun Oct 28 16:29:09 2018 -0700 + + Minor + + src/hb-open-type.hh | 6 ++++-- + src/hb-ot-layout-common.hh | 4 ++-- + 2 files changed, 6 insertions(+), 4 deletions(-) + +commit 65621723815138150e8a6354413ed14d53cf35b5 +Author: Behdad Esfahbod +Date: Sun Oct 28 16:27:18 2018 -0700 + + [sbix] Use LOffsetLArrayOf<> + + src/hb-open-type.hh | 2 ++ + src/hb-ot-color-sbix-table.hh | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit a3ddd8067f266e49d9451c53a0fd40aff8551af7 +Author: Behdad Esfahbod +Date: Sun Oct 28 16:26:03 2018 -0700 + + [sbix] Add get_strike + + src/hb-ot-color-sbix-table.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 95524ed9bccdcd0d6a46c5dcc372e96a0c34b5f0 +Author: Behdad Esfahbod +Date: Sun Oct 28 15:58:48 2018 -0700 + + [sbix] Remove sbix_len + + src/hb-ot-color-sbix-table.hh | 29 +++++++++++++++++++++-------- + 1 file changed, 21 insertions(+), 8 deletions(-) + +commit 69e9846452f829f82f6866a683845167b3d3d6e5 +Author: Behdad Esfahbod +Date: Sun Oct 28 15:53:11 2018 -0700 + + [sbix] Fix get_glyph_blob() on Null object + + src/hb-ot-color-sbix-table.hh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 4e0ee2af091634198c4b9b17036d9391a4e6b084 +Author: Behdad Esfahbod +Date: Sun Oct 28 15:44:40 2018 -0700 + + [sbix] Simplify ppem access + + If struct members are simple and needed publicly, we make them public. + + src/hb-ot-color-sbix-table.hh | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +commit 6ac9a4eaa3a47c9b9f2c7aa123255e82ccc53551 +Author: Behdad Esfahbod +Date: Sun Oct 28 15:43:54 2018 -0700 + + [sbix] Simplify glyph_length calc + + src/hb-ot-color-sbix-table.hh | 22 +++++----------------- + 1 file changed, 5 insertions(+), 17 deletions(-) + +commit 0730d623854dc17ce0c3f1f2755a90b656c8e52c +Author: Behdad Esfahbod +Date: Sun Oct 28 15:38:42 2018 -0700 + + [sbix] Check glyph data end is in range + + src/hb-ot-color-sbix-table.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit b76dc03108d04975335dbf3580f8d02321cb5d25 +Author: Behdad Esfahbod +Date: Sun Oct 28 15:36:17 2018 -0700 + + [sbix] Reduce code + + src/hb-ot-color-sbix-table.hh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 50fb02a219dbf168d300c4ccf9f29aee38a78e6c +Author: Behdad Esfahbod +Date: Sun Oct 28 15:33:12 2018 -0700 + + [sbix] Check glyph id before looking into unsafe array + + That 'Z' at end of imageOffsetsZ is a reminder that you should check... + + src/hb-ot-color-sbix-table.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit a8cb9c73da29afa89b0253b6475ff220613e100a +Author: Behdad Esfahbod +Date: Sun Oct 28 15:30:57 2018 -0700 + + [sbix] Simplify 'dupe' handling logic + + src/hb-ot-color-sbix-table.hh | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) + +commit d7eb534e59064633732959c3771b6557cc97005e +Author: Behdad Esfahbod +Date: Sun Oct 28 15:27:04 2018 -0700 + + [sbix] Check offsets before proceeding + + src/hb-ot-color-sbix-table.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit c8380bd3e4a2e51dfbe2e44e19738445be16ac75 +Author: Behdad Esfahbod +Date: Sun Oct 28 15:20:33 2018 -0700 + + [color] Remove more dump-emoji cruft + + src/hb-ot-color-cbdt-table.hh | 53 ------------------------------------------- + src/hb-ot-color-sbix-table.hh | 13 ----------- + 2 files changed, 66 deletions(-) + +commit 68f2c832c894d71715073d4748ad321a9d271a0e +Author: Behdad Esfahbod +Date: Sun Oct 28 15:18:55 2018 -0700 + + Remove dump-emoji + + src/Makefile.am | 9 -- + src/dump-emoji.cc | 322 ------------------------------------------ + src/hb-ot-color-sbix-table.hh | 4 +- + 3 files changed, 3 insertions(+), 332 deletions(-) + +commit b46de42b3a4bdf110154f4f067656f153f5a7d1b +Author: Behdad Esfahbod +Date: Sun Oct 28 15:13:45 2018 -0700 + + [sbix] Fix order of parameters + + src/hb-ot-color-sbix-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a91cda72abdfc5e401510474c59dd14026e8b6cb +Author: Behdad Esfahbod +Date: Sun Oct 28 15:12:05 2018 -0700 + + [sbix] Remove redundant parameter + + src/hb-ot-color-sbix-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c712005f55b2a1e5c782302d8a548cf1231c01f0 +Author: Behdad Esfahbod +Date: Sun Oct 28 15:11:10 2018 -0700 + + [sbix] Add get_strike() + + src/hb-ot-color-sbix-table.hh | 23 +++++++++++++---------- + 1 file changed, 13 insertions(+), 10 deletions(-) + +commit 400bc3f030b4ffebe24aa3562d8eb5fcc1cf4bdd +Author: Behdad Esfahbod +Date: Sun Oct 28 15:05:40 2018 -0700 + + [sbix] Remove a couple of extra checks + + src/hb-ot-color-sbix-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3770282c837aacbf49b16be1986c91a608faa7da +Author: Behdad Esfahbod +Date: Sun Oct 28 15:02:53 2018 -0700 + + [sbix] Rename sbix_table to table in accelerator + + src/hb-ot-color-sbix-table.hh | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit 7346841807ad96fc65bfc6ee9e78c3f190488f2a +Author: Behdad Esfahbod +Date: Sun Oct 28 15:00:13 2018 -0700 + + [cbdt] Rename reference_blob_for_glyph() to reference_png() + + src/hb-ot-color-cbdt-table.hh | 8 ++++---- + src/hb-ot-color.cc | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 1f33b8525d578323d6c798c08fc23c56896f9de0 +Author: Behdad Esfahbod +Date: Sun Oct 28 14:56:55 2018 -0700 + + [sbix] Rename ugly reference_blob_for_glyph() to reference_png() + + src/hb-ot-color-sbix-table.hh | 16 +++++++--------- + src/hb-ot-color.cc | 4 +--- + 2 files changed, 8 insertions(+), 12 deletions(-) + +commit 946b5344193183133bfc9799e26d3d0436d86404 +Author: Behdad Esfahbod +Date: Sun Oct 28 14:52:25 2018 -0700 + + [sbix] Fix uninitialized variables + + src/hb-ot-color-sbix-table.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 01c7d53fb739b547f3633972194893f68a4738bc +Author: Behdad Esfahbod +Date: Sun Oct 28 14:51:18 2018 -0700 + + [sbix] Select best strike based on ppem + + src/hb-ot-color-sbix-table.hh | 50 ++++++++++++++++++++++++------------------- + src/hb-ot-color.cc | 3 +-- + src/hb-ot-font.cc | 2 +- + 3 files changed, 30 insertions(+), 25 deletions(-) + +commit f9f26bff4c79d65a92affd6b73e2b3de017f2d6d +Author: Behdad Esfahbod +Date: Sun Oct 28 14:20:50 2018 -0700 + + [sbix] Move code around. Add get_extents() + + src/hb-ot-color-sbix-table.hh | 15 +++++++++++++-- + src/hb-ot-font.cc | 2 +- + 2 files changed, 14 insertions(+), 3 deletions(-) + +commit 48bc3039cb46d2b8cf672d86b63b4235a86252e6 +Author: Behdad Esfahbod +Date: Sun Oct 28 14:16:52 2018 -0700 + + [sbix] Check blob length against PNG header leangth + + src/hb-ot-color-sbix-table.hh | 37 +++++++++++++++++++++++-------------- + 1 file changed, 23 insertions(+), 14 deletions(-) + +commit d3ec31a57cb99048fb33bca65041da9dc884d8cb +Author: Ebrahim Byagowi +Date: Mon Oct 29 00:28:44 2018 +0330 + + [ot-color] More on PNGHeader fields + + src/hb-ot-color-sbix-table.hh | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit 35fa3d326096639a33635e19f204a9cb31f20826 +Author: Ebrahim Byagowi +Date: Mon Oct 29 00:07:26 2018 +0330 + + [ot-color] Apply Behdad comment + + src/hb-ot-color-sbix-table.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 307d61867a2b70073eecd1e0cb9b7d912e1c3f06 +Author: Ebrahim Byagowi +Date: Mon Oct 29 00:03:01 2018 +0330 + + [ot-color] Make PNGHeader reading actually work + + src/hb-ot-color-sbix-table.hh | 6 +++--- + test/api/test-ot-color.c | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 632e9af862aba49ab31343c4fd07dffef6d2749f +Author: Ebrahim Byagowi +Date: Sun Oct 28 23:43:50 2018 +0330 + + [ot-color] Implement PNGHeader and test it, it doesn't work however + + src/hb-ot-color-sbix-table.hh | 20 +++++++++++++++----- + src/hb-ot-font.cc | 4 +--- + test/api/test-ot-color.c | 16 ++++++++++++++++ + 3 files changed, 32 insertions(+), 8 deletions(-) + +commit 38706a0746822865008f810f9f577740c32580fa +Author: Ebrahim Byagowi +Date: Sun Oct 28 23:19:04 2018 +0330 + + [ot-color] Preparation for setting PNG width/height in extents + + src/dump-emoji.cc | 7 +++--- + src/hb-ot-color-sbix-table.hh | 52 +++++++++++++++++++++++++++++++++++-------- + src/hb-ot-color.cc | 14 +++++------- + src/hb-ot-font.cc | 7 +++++- + 4 files changed, 59 insertions(+), 21 deletions(-) + +commit d6d6f3bc225bab57c1ab29b41876c98ac4ec1e4d +Author: Behdad Esfahbod +Date: Sun Oct 28 11:41:33 2018 -0700 + + [docs] Add comment + + src/hb-ot-font.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 3d4c1f6a41022ec99adefa2bdd2489622e2f9a66 +Author: Ebrahim Byagowi +Date: Sun Oct 28 21:38:56 2018 +0330 + + [ot-color] Apply Behdad reviews + + docs/harfbuzz-sections.txt | 4 ++-- + src/hb-ot-color-cbdt-table.hh | 15 ++++----------- + src/hb-ot-color-sbix-table.hh | 6 ++---- + src/hb-ot-color.cc | 8 ++++---- + src/hb-ot-color.h | 4 ++-- + test/api/test-ot-color.c | 14 +++++++------- + 6 files changed, 21 insertions(+), 30 deletions(-) + +commit 8ef0d2ef928ac47278d7c6db8c8040a47f076e85 +Author: Ebrahim Byagowi +Date: Sun Oct 28 20:09:40 2018 +0330 + + [ot-color] Apply Behdad comment + + src/dump-emoji.cc | 2 +- + src/hb-ot-color-cbdt-table.hh | 16 +++++++--------- + src/hb-ot-color-sbix-table.hh | 14 ++++---------- + src/hb-ot-color.cc | 22 +++++++--------------- + src/hb-ot-color.h | 5 +---- + test/api/test-ot-color.c | 15 ++++----------- + 6 files changed, 24 insertions(+), 50 deletions(-) + +commit dbd419bedef06a07c844b6a748a5e2868016000c +Author: Ebrahim Byagowi +Date: Sat Oct 27 15:15:24 2018 +0330 + + [ot-color] Add public API for CBDT/sbix/SVG color Emojis + + docs/harfbuzz-sections.txt | 4 ++++ + src/dump-emoji.cc | 4 ++-- + src/hb-ot-color.cc | 39 ++++----------------------------------- + src/hb-ot-color.h | 24 ++++++++++++++++++++++++ + test/api/test-ot-color.c | 8 ++------ + 5 files changed, 36 insertions(+), 43 deletions(-) + +commit 6ce49a921a80f1238ddc537f77a1fceea5274a21 +Author: Behdad Esfahbod +Date: Sun Oct 28 08:26:30 2018 -0700 + + [name] Change hb_name_id_t back to unsigned int + + https://github.com/harfbuzz/harfbuzz/commit/d941f66c75fe26f909b1ba248535cc372bbde851#commitcomment-31076011 + + docs/harfbuzz-sections.txt | 2 -- + src/hb-ot-color-cpal-table.hh | 4 ++-- + src/hb-ot-layout.cc | 12 ++++++------ + src/hb-ot-name-table.hh | 2 +- + src/hb-ot-name.h | 6 +++--- + src/test-size-params.cc | 2 +- + 6 files changed, 13 insertions(+), 15 deletions(-) + +commit a4f4f5ba5f64174dea931e02367aa4067d034383 +Author: Behdad Esfahbod +Date: Sun Oct 28 08:23:36 2018 -0700 + + [docs] Fix titles here as well + + src/hb-map.cc | 2 +- + src/hb-set.cc | 2 +- + src/hb-shape-plan.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 213b6dd33564d0273b1db1c17a4e82548b727dfe +Author: Behdad Esfahbod +Date: Sat Oct 27 18:36:24 2018 -0700 + + [name] Make sure hb_name_id_t is int-sized + + https://github.com/harfbuzz/harfbuzz/commit/d941f66c75fe26f909b1ba248535cc372bbde851#commitcomment-31068905 + + src/hb-ot-name.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 4740a3593d6bbb97758593b7d5cd1b86eccbed78 +Author: Behdad Esfahbod +Date: Sat Oct 27 05:07:54 2018 -0700 + + [docs] Divide reference API into three chapters + + docs/harfbuzz-docs.xml | 213 +++++++++++++------------------------------------ + 1 file changed, 56 insertions(+), 157 deletions(-) + +commit 1d40d72f291ed5e11850f8bd51a8562b57de1997 +Author: Behdad Esfahbod +Date: Sat Oct 27 05:00:42 2018 -0700 + + [docs] Hook up hb-var + + docs/harfbuzz-docs.xml | 1 + + src/hb-ot-var.cc | 11 +++++++++++ + 2 files changed, 12 insertions(+) + +commit 80d9a427cf61f61512de13cd88bdc63d881019fe +Author: Behdad Esfahbod +Date: Sat Oct 27 04:58:32 2018 -0700 + + [docs] Document remaining sections + + src/hb-ot-color.cc | 10 ++++++++++ + src/hb-ot-font.cc | 10 ++++++++++ + src/hb-ot-layout.cc | 10 ++++++++++ + src/hb-ot-math.cc | 11 +++++++++++ + src/hb-ot-name.cc | 10 ++++++++++ + src/hb-ot-shape.cc | 10 ++++++++++ + 6 files changed, 61 insertions(+) + +commit cf5fa57f00613d324b55732d9e21c779ba0d2de2 +Author: Behdad Esfahbod +Date: Sat Oct 27 04:50:38 2018 -0700 + + [docs] Change section titles again + + I think I like the uniform "hb-*" more. + + src/hb-blob.cc | 2 +- + src/hb-buffer.cc | 2 +- + src/hb-common.cc | 4 ++-- + src/hb-deprecated.h | 12 ++++++++++++ + src/hb-face.cc | 2 +- + src/hb-font.cc | 2 +- + src/hb-shape.cc | 2 +- + src/hb-unicode.cc | 2 +- + 8 files changed, 20 insertions(+), 8 deletions(-) + +commit 04981ee05d83ed30c9f818106589a4de9c3e9b7f +Author: Behdad Esfahbod +Date: Sat Oct 27 04:40:43 2018 -0700 + + [docs] More + + src/hb-coretext.cc | 10 ++++++++++ + src/hb-ft.cc | 11 +++++++++++ + src/hb-glib.cc | 10 ++++++++++ + src/hb-gobject-structs.cc | 12 ++++++++++++ + src/hb-graphite2.cc | 10 ++++++++++ + src/hb-icu.cc | 10 ++++++++++ + src/hb-uniscribe.cc | 10 ++++++++++ + 7 files changed, 73 insertions(+) + +commit 5dd86aa33b4e52a0de4fcd96b2ea7bafcae8dd34 +Author: Behdad Esfahbod +Date: Sat Oct 27 04:28:40 2018 -0700 + + [docs] Rename section titles to object names + + More useful. + + src/hb-blob.cc | 2 +- + src/hb-buffer.cc | 2 +- + src/hb-face.cc | 4 ++-- + src/hb-font.cc | 4 ++-- + src/hb-map.cc | 2 +- + src/hb-set.cc | 2 +- + src/hb-shape-plan.cc | 2 +- + src/hb-unicode.cc | 2 +- + 8 files changed, 10 insertions(+), 10 deletions(-) + +commit 524fb70216d7fec17f5327237faa4d092ae15a00 +Author: Behdad Esfahbod +Date: Sat Oct 27 04:27:36 2018 -0700 + + [docs] More + + src/hb-map.cc | 11 ++++++++++- + src/hb-set.cc | 11 ++++++++++- + 2 files changed, 20 insertions(+), 2 deletions(-) + +commit 46072b7cb55bfeb8c46a78cbdb335dfdcce48298 +Author: Behdad Esfahbod +Date: Sat Oct 27 04:21:20 2018 -0700 + + [ot] Fold hb-ot-tag.h into hb-ot-layout.h + + docs/harfbuzz-docs.xml | 1 - + docs/harfbuzz-sections.txt | 20 +++++------- + src/Makefile.sources | 1 - + src/hb-graphite2.cc | 2 +- + src/hb-ot-layout.h | 42 ++++++++++++++++++++++++- + src/hb-ot-tag.h | 78 ---------------------------------------------- + src/hb-ot.h | 1 - + src/hb-uniscribe.cc | 2 +- + 8 files changed, 51 insertions(+), 96 deletions(-) + +commit 00cf4e5eb6dcb04406d5a519712da799277cec2e +Author: Behdad Esfahbod +Date: Sat Oct 27 04:07:33 2018 -0700 + + [docs] Fill in some sections + + docs/harfbuzz-docs.xml | 20 ++++++-------- + docs/harfbuzz-sections.txt | 65 +++++++++++++++++++--------------------------- + src/hb-blob.cc | 13 ++++++++++ + src/hb-buffer.cc | 3 ++- + src/hb-common.cc | 23 ++++++++++++++++ + src/hb-face.cc | 13 ++++++++++ + src/hb-font.cc | 13 ++++++++++ + src/hb-shape-plan.cc | 13 ++++++++++ + src/hb-shape.cc | 4 ++- + src/hb-unicode.cc | 14 ++++++++++ + 10 files changed, 129 insertions(+), 52 deletions(-) + +commit 55a19d73b4d5e7ddd328263d241a442f16f005b2 +Author: Behdad Esfahbod +Date: Sat Oct 27 04:01:19 2018 -0700 + + Move HB_EXTERN + + src/hb-common.h | 4 ++++ + src/hb.h | 4 ---- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 524e854c15f9d6c50c5456ae0e188f039dcf153c +Merge: 4ee3c827 8180c37d +Author: Ebrahim Byagowi +Date: Sat Oct 27 15:04:43 2018 +0330 + + Merge pull request #1318 from ebraminio/png + + Add a non-hooked _png _svg get emoji blob + +commit 8180c37df0a856dbc3564c0aefd8b2acab8baf8a +Author: Ebrahim Byagowi +Date: Sat Oct 27 14:45:00 2018 +0330 + + [ot-color] Remove _png and _svg public APIs + + docs/harfbuzz-sections.txt | 4 ---- + src/dump-emoji.cc | 11 ++++++++--- + src/hb-ot-color.cc | 39 +++++++++++++++++++++++++++++++++++---- + src/hb-ot-color.h | 24 ------------------------ + test/api/test-ot-color.c | 8 ++++++-- + 5 files changed, 49 insertions(+), 37 deletions(-) + +commit 9aa6279a2d64ab8057b0d7acbcc77044442c6d0e +Author: Ebrahim Byagowi +Date: Sat Oct 27 14:24:58 2018 +0330 + + [ot-color/png] Try to get image blob from sbix first options.aat is set + + src/hb-ot-color.cc | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +commit b42661ee91ea92309e827a970f370cacc62c73aa +Author: Ebrahim Byagowi +Date: Sat Oct 27 14:15:38 2018 +0330 + + [ot-color] Add some documentation + + src/hb-ot-color.cc | 37 +++++++++++++++++++------------------ + src/hb-ot-color.h | 2 +- + 2 files changed, 20 insertions(+), 19 deletions(-) + +commit 4ee3c8272c31736980218cba95f97fed53d24e14 +Author: Behdad Esfahbod +Date: Sat Oct 27 03:18:45 2018 -0700 + + [docs] Fix hb_name_id_t + + Yep, was not recognized without this patch! + + src/hb-ot-name.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9435fb24daadf08add9a701816da01bd54c0cd78 +Author: Ebrahim Byagowi +Date: Sat Oct 27 13:32:14 2018 +0330 + + [ot-color/png] Implement CBDT part + + src/hb-ot-color-cbdt-table.hh | 56 +++++++++++++++++++++++++++++++++++++++---- + src/hb-ot-color.cc | 19 ++------------- + src/hb-ot-color.h | 4 ++++ + test/api/test-ot-color.c | 25 ++++++++++++++++--- + 4 files changed, 79 insertions(+), 25 deletions(-) + +commit 9457cfd7bcc9c2fff38194f2bb82ab7be881bfeb +Author: Behdad Esfahbod +Date: Sat Oct 27 03:15:34 2018 -0700 + + [docs] Hook up hb-map + + docs/harfbuzz-docs.xml | 1 + + 1 file changed, 1 insertion(+) + +commit d941f66c75fe26f909b1ba248535cc372bbde851 +Author: Behdad Esfahbod +Date: Sat Oct 27 02:55:52 2018 -0700 + + [name] Make hb_name_id_t be the enum + + This is like hb_script_t. + + We had this exposed as unsigned int since 2.0.0 release in two APIs, + as well as hb_ot_layout_get_size_params() from earlier. + But since no one uses those (right?!), let's just fix this now. + + docs/harfbuzz-docs.xml | 6 ++++-- + docs/harfbuzz-sections.txt | 4 +++- + src/hb-ot-color-cpal-table.hh | 12 ++++++------ + src/hb-ot-layout.cc | 16 ++++++++-------- + src/hb-ot-name-table.hh | 2 +- + src/hb-ot-name.h | 15 ++++----------- + src/test-size-params.cc | 2 +- + 7 files changed, 27 insertions(+), 30 deletions(-) + +commit 40496a54a03864c5e6a1224c18b4b93a1f578eed +Author: Behdad Esfahbod +Date: Sat Oct 27 02:49:32 2018 -0700 + + [name] Move HB_NAME_ID_INVALID into the enum + + Don't know how to document anonymous enum members. + + src/hb-ot-name.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit a8a55b9f892a5e4f086b20bbe337dc29182210af +Author: Behdad Esfahbod +Date: Sat Oct 27 02:45:57 2018 -0700 + + [name] Move around + + src/hb-ot-name.h | 74 ++++++++++++++++++++++++++++---------------------------- + 1 file changed, 37 insertions(+), 37 deletions(-) + +commit 3b7e5f131383956e19642d28c938f1bc0d16295f +Author: Behdad Esfahbod +Date: Sat Oct 27 02:39:20 2018 -0700 + + [name] Rename hb_ot_name_get_names() to hb_ot_name_list_names() + + And swap return value positions, so can be annotated for gobject-introspectin. + + docs/harfbuzz-sections.txt | 2 +- + src/hb-ot-name.cc | 17 ++++++++--------- + src/hb-ot-name.h | 6 +++--- + src/test-name-table.cc | 4 ++-- + 4 files changed, 14 insertions(+), 15 deletions(-) + +commit 4025ad804383dc8d5ace9654ae21d4d726d0dbc4 +Author: Behdad Esfahbod +Date: Sat Oct 27 02:35:06 2018 -0700 + + Document new API + + src/hb-common.h | 30 +++++++++++++++++++++++++- + src/hb-ot-color.cc | 16 +++++++------- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-name.cc | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++- + src/hb-ot-name.h | 15 +++++++++++++ + 5 files changed, 113 insertions(+), 11 deletions(-) + +commit 5e2a52f71a8d081441fbc1c57a3550e3a9573e46 +Author: Ebrahim Byagowi +Date: Sat Oct 27 12:44:33 2018 +0330 + + [sbix] Remove dump method from sbix accelerator + + src/dump-emoji.cc | 36 ++++++++++++++++++++++++------------ + src/hb-ot-color-sbix-table.hh | 26 ++++++++++---------------- + 2 files changed, 34 insertions(+), 28 deletions(-) + +commit 0353ac6cde47df8f5386733f5c12cc60732a5bf4 +Author: Ebrahim Byagowi +Date: Sat Oct 27 12:24:53 2018 +0330 + + Fix test-name-table on older bots + + src/test-name-table.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dc11a38107ac1f0a2d3edacae33ff7f10f5e894c +Author: Ebrahim Byagowi +Date: Sat Oct 27 12:15:25 2018 +0330 + + [sbix] Set num_glyphs on accelerator + + dump-emoji was broken without it + + src/hb-ot-color-sbix-table.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 6a38fd68a8f4e66d9248e0c943ae3a1cf45c521b +Author: Ebrahim Byagowi +Date: Sat Oct 27 10:50:53 2018 +0330 + + [ot-color/png] sbix runtime memory check + + src/hb-ot-color-cbdt-table.hh | 16 +++++++--------- + src/hb-ot-color-sbix-table.hh | 18 ++++++++++++------ + src/hb-ot-color-svg-table.hh | 4 ++-- + 3 files changed, 21 insertions(+), 17 deletions(-) + +commit ca645accb97841e01846e45cda32e6bd2ad15940 +Author: Behdad Esfahbod +Date: Sat Oct 27 00:39:31 2018 -0700 + + Comment + + src/hb-ot-shape-complex-indic.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 265ad408ca41e9d0b5a1056a751d834d4eadc911 +Author: Ebrahim Byagowi +Date: Fri Oct 26 23:55:11 2018 +0330 + + [ot-color/png] Implement sbix part + + docs/harfbuzz-sections.txt | 2 + + src/dump-emoji.cc | 5 ++- + src/hb-ot-color-cbdt-table.hh | 27 ++++++++---- + src/hb-ot-color-sbix-table.hh | 98 +++++++++++++++++++++++++++++++++++++------ + src/hb-ot-color.cc | 64 ++++++++++++++++++++++++++++ + src/hb-ot-color.h | 9 ++++ + test/api/test-ot-color.c | 32 ++++++++++++++ + 7 files changed, 215 insertions(+), 22 deletions(-) + +commit 7f5941e162bf7806299656edafd452a47b5a55b9 +Author: Behdad Esfahbod +Date: Sat Oct 27 00:06:48 2018 -0700 + + Remove stale comment + + Ugliness was fixed in 30eab97a0072fbc22d353082249e0e6e546cd86b + But yeah, my smell detector was working. Ugliness was buggy. + + src/hb-ot-shape-normalize.cc | 1 - + 1 file changed, 1 deletion(-) + +commit e7400c0275cad4f584eeaf21ce6d5c6adca29bbb +Author: Behdad Esfahbod +Date: Fri Oct 26 22:09:17 2018 -0700 + + [docs] Hook up new symbols + + docs/harfbuzz-docs.xml | 46 +++++++++++++++++++++++++++++++++++++++++----- + docs/harfbuzz-sections.txt | 21 +++++++++++++++++++++ + src/hb-ot-color.cc | 2 +- + 3 files changed, 63 insertions(+), 6 deletions(-) + +commit 6aa019c4af6b64bb732205e6051f3e73e1b70721 +Author: Behdad Esfahbod +Date: Fri Oct 26 22:02:17 2018 -0700 + + [morx] Fix merge_cluster to end at last ligature component + + Don't assume current position was a component in the ligature. + + src/hb-aat-layout-morx-table.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 00ae4be6bf8b1d0800043167c5cf95187ac12515 +Author: Behdad Esfahbod +Date: Fri Oct 26 21:59:20 2018 -0700 + + [morx] Fix bailing out ligation at end-of-text + + Check was after a move_to, which wouldn't work. + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11147 + + src/hb-aat-layout-morx-table.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 30eab97a0072fbc22d353082249e0e6e546cd86b +Author: Behdad Esfahbod +Date: Fri Oct 26 21:54:07 2018 -0700 + + Fix invalid memory read + + Buffer might be relocated inside replace_glyphs(). + + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=895117 + + src/hb-ot-shape-normalize.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 79b2fa62ca7eb5a875778d3a2ecae63350083ba3 +Author: Behdad Esfahbod +Date: Fri Oct 26 21:21:18 2018 -0700 + + [indic] Fix infinite loop + + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=863044 + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 39bd07aed5fe6ccddde53206bafceec32d56dcc1 +Author: Behdad Esfahbod +Date: Fri Oct 26 21:01:11 2018 -0700 + + Fix bunch of unused parameter warnings + + Show up with gcc -O0. + + There's a few more but those are functions that need to be filled in. + + Maybe this is a lost battle... + + src/gen-vowel-constraints.py | 4 ++-- + src/hb-aat-layout-common.hh | 7 +++++-- + src/hb-aat-layout-kerx-table.hh | 4 ++-- + src/hb-aat-layout-morx-table.hh | 10 +++++----- + src/hb-face.cc | 2 +- + src/hb-font.cc | 29 ++++++++++++++-------------- + src/hb-graphite2.cc | 9 ++++++--- + src/hb-machinery.hh | 4 ++-- + src/hb-ot-color-cbdt-table.hh | 2 +- + src/hb-ot-glyf-table.hh | 4 ++-- + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-math-table.hh | 2 +- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-shape-complex-arabic-fallback.hh | 6 +++--- + src/hb-ot-shape-complex-arabic.cc | 6 +++--- + src/hb-ot-shape-complex-hangul.cc | 2 +- + src/hb-ot-shape-complex-khmer.cc | 2 +- + src/hb-ot-shape-complex-myanmar.cc | 6 +++--- + src/hb-ot-shape-complex-use.cc | 8 ++++---- + src/hb-ot-shape-complex-vowel-constraints.cc | 4 ++-- + src/hb-ot-shape-fallback.cc | 4 ++-- + src/hb-ot-shape-normalize.cc | 4 +++- + src/hb-ot-shape.cc | 2 +- + src/hb-ot-tag.cc | 3 +-- + src/hb-ot-vorg-table.hh | 2 +- + src/hb-set.cc | 2 +- + src/hb-shape-plan.cc | 2 +- + src/hb-utf.hh | 2 +- + 29 files changed, 73 insertions(+), 65 deletions(-) + +commit b2e1ec374cbd2a6e4d79419bd5601a4e2ecb9864 +Author: Behdad Esfahbod +Date: Fri Oct 26 20:45:28 2018 -0700 + + [subset] Fix warning + + src/hb-subset.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 337ea0b7175793305e9d8935aecf385b707a5bc4 +Author: Behdad Esfahbod +Date: Fri Oct 26 20:31:14 2018 -0700 + + [fuzzing] Remove HB_NDEBUG + + Not sure why it ever was added. + + src/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +commit 12058e44d100c28816f42c91c63a0f960a662181 +Author: Behdad Esfahbod +Date: Fri Oct 26 16:23:50 2018 -0700 + + [fuzzing] Add more test + + ...z-testcase-minimized-harfbuzz_fuzzer-5659690013556736 | Bin 0 -> 2732 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit c965eeadbc71943f2336a20dc16ac691c805b90e +Author: Behdad Esfahbod +Date: Thu Oct 25 13:43:25 2018 -0700 + + [name] Default to "en" if language is not specified + + src/hb-ot-name.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 3fd6e5dbefe52a4a2e604c28a4edfbd40ed16027 +Author: Behdad Esfahbod +Date: Wed Oct 24 13:42:38 2018 -0700 + + [name] Add pre-defined nameIDs + + src/hb-ot-name.h | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + +commit 20d0171d20cf9f3f93bdd6878bbc1d7d8329e75f +Author: Behdad Esfahbod +Date: Wed Oct 24 13:20:19 2018 -0700 + + [name] Fill out most missing language codes + + src/hb-ot-name-language.cc | 114 +++++++++++++++++++++++---------------------- + 1 file changed, 58 insertions(+), 56 deletions(-) + +commit 622b014faf7bbe7a97f9aff959c434d1664c10d0 +Author: Behdad Esfahbod +Date: Wed Oct 24 12:40:15 2018 -0700 + + [name] Skip enumerating names with unknown language + + src/hb-ot-name-table.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 2c39f359e4a7312e3b518f76815d79e42ee96a32 +Author: Behdad Esfahbod +Date: Wed Oct 24 12:34:30 2018 -0700 + + [utf] Remove unused typedef + + src/hb-utf.hh | 1 - + 1 file changed, 1 deletion(-) + +commit ce81c7429810ad3902c37e50016ca54b9bae6f91 +Author: Behdad Esfahbod +Date: Wed Oct 24 12:34:03 2018 -0700 + + [utf] Fix ASCII + + src/hb-utf.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 327546e633b590d6dedfb901810ccf490a0bf922 +Author: Behdad Esfahbod +Date: Tue Oct 23 23:33:44 2018 -0700 + + [name] Hook up ltag table + + src/hb-aat-layout.cc | 15 ++++++++++++++- + src/hb-aat-layout.hh | 5 +++++ + src/hb-aat-ltag-table.hh | 17 +++++++++++++++-- + src/hb-ot-face.hh | 3 ++- + src/hb-ot-name-table.hh | 9 +++++---- + 5 files changed, 41 insertions(+), 8 deletions(-) + +commit dc9a5f88b401fcad598946fcf735010c563741ac +Author: Behdad Esfahbod +Date: Tue Oct 23 23:16:06 2018 -0700 + + [name] Do record sanitization at run-time + + src/hb-dsalgs.hh | 62 +++++++++++++++++++++++++++---------------------- + src/hb-ot-name-table.hh | 22 +++++++++++------- + src/hb-ot-name.cc | 2 +- + 3 files changed, 49 insertions(+), 37 deletions(-) + +commit a53d301b1c9f72cb42cc0fc321e2ad4dbac8e064 +Author: Behdad Esfahbod +Date: Tue Oct 23 23:05:55 2018 -0700 + + [name] Minor + + src/hb-ot-name-table.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit c442fd9a10b3e91ab18720188afff08325adf6dc +Author: Behdad Esfahbod +Date: Tue Oct 23 22:45:45 2018 -0700 + + [name] Add src/test-name-table tool to show all font names + + src/Makefile.am | 17 ++++++++----- + src/test-name-table.cc | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 78 insertions(+), 6 deletions(-) + +commit 7007bd9dff9f8eef3263f1b39327552ff1ebae3f +Author: Behdad Esfahbod +Date: Tue Oct 23 22:44:36 2018 -0700 + + [name] Rebuild language list, include missing entries + + src/hb-ot-name-language.cc | 634 ++++++++++++++++++++++++++------------------- + 1 file changed, 370 insertions(+), 264 deletions(-) + +commit 68f172101c1228a7d669d71da1d0eeb96a10565e +Author: Behdad Esfahbod +Date: Tue Oct 23 22:19:09 2018 -0700 + + [name] Fix cmp for invalid language + + src/hb-ot-name-table.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit 888a65615c7b11222749ae85c124aaa9a36fe863 +Author: Behdad Esfahbod +Date: Tue Oct 23 22:16:32 2018 -0700 + + [name] Fix nul-termination bug + + src/hb-ot-name.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9b532e2ed432611005b19c40cac7e626afcccd08 +Author: Behdad Esfahbod +Date: Tue Oct 23 22:00:19 2018 -0700 + + [name] Add language mapping + + src/Makefile.sources | 2 + + src/hb-ot-name-language.cc | 349 +++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-name-language.hh | 40 ++++++ + src/hb-ot-name-table.hh | 21 ++- + 4 files changed, 399 insertions(+), 13 deletions(-) + +commit e2f9b657758cda3708c0a9db971c467ca59d5c19 +Author: Behdad Esfahbod +Date: Tue Oct 23 21:19:56 2018 -0700 + + [name] Start adding language support + + src/hb-ot-name-table.hh | 25 ++++++++++++++++++++++++- + 1 file changed, 24 insertions(+), 1 deletion(-) + +commit 6db6bbe64bd63554919647c5b527e03aedbaee4e +Author: Behdad Esfahbod +Date: Tue Oct 23 21:12:58 2018 -0700 + + [name] Remove unused cmp function + + src/hb-ot-name-table.hh | 16 ---------------- + 1 file changed, 16 deletions(-) + +commit 4668a05006e6c4797df19651489b4589817e1e01 +Author: Behdad Esfahbod +Date: Tue Oct 23 20:51:53 2018 -0700 + + [name] Hook things up + + Accept Mac Latin name entries as ASCII as well. + + src/hb-ot-name-table.hh | 24 +++++++++++++++------ + src/hb-ot-name.cc | 8 +++++-- + src/hb-utf.hh | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 79 insertions(+), 8 deletions(-) + +commit 69f5da0629f1e5a307fc49fe58490aa92d1bd0e2 +Author: Behdad Esfahbod +Date: Tue Oct 23 20:30:40 2018 -0700 + + [name] More + + It assumes all names are encoded in UTF16-BE. Other than that, and not + listing languages correctly, it's *supposed* to work. + + src/hb-dsalgs.hh | 21 +++++++++++++++++++++ + src/hb-ot-name-table.hh | 37 ++++++++++++++++++++++++++++++------- + src/hb-ot-name.cc | 12 ++++++++---- + src/hb-ot-os2-unicode-ranges.hh | 10 +++++----- + src/hb-unicode.cc | 8 ++++---- + src/hb-unicode.hh | 2 +- + 6 files changed, 69 insertions(+), 21 deletions(-) + +commit 64334aff8c2ea5aa066d77a95844bc6f84efe725 +Author: Behdad Esfahbod +Date: Tue Oct 23 20:15:53 2018 -0700 + + [name] Fix check + + src/hb-ot-name.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5531bd068e759a5acb3b8d301c0ff9c64844166e +Author: Behdad Esfahbod +Date: Tue Oct 23 20:04:05 2018 -0700 + + [name] Flesh out UTF-X to UTF-X conversion routines + + src/hb-ot-name.cc | 84 ++++++++++++++++++++++++++++++++++++------ + src/hb-ot-name.h | 10 ++--- + src/hb-utf.hh | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 182 insertions(+), 19 deletions(-) + +commit 84811a06a26508effe9f4a9eaf1be15297ecf0cb +Author: Behdad Esfahbod +Date: Tue Oct 23 03:16:03 2018 -0700 + + [name] Fix for rebase changes to hb_array_t + + src/hb-ot-name-table.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 1046b1938b16ab6be861b0828b446fa13cf0377b +Author: Behdad Esfahbod +Date: Wed Oct 17 05:42:23 2018 -0700 + + [name] Some more + + src/hb-ot-name.cc | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) + +commit b4d4d1ea787c829dea023d99f974a38bdc3de0ae +Author: Behdad Esfahbod +Date: Tue Oct 16 19:55:17 2018 -0700 + + [name] Return full string length from API + + src/hb-ot-name.cc | 6 +++--- + src/hb-ot-name.h | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 8d304ef7f9094a71fabc3efd87b37a030c437adf +Author: Behdad Esfahbod +Date: Tue Oct 16 19:04:48 2018 -0700 + + [utf] Add UTF16-BE and UTF32-BE + + src/hb-buffer.cc | 4 +-- + src/hb-utf.hh | 80 ++++++++++++++++++++++++++++++++------------------------ + 2 files changed, 48 insertions(+), 36 deletions(-) + +commit a826a8730f21ae996ae8f4d12c44dc18b9e8e933 +Author: Behdad Esfahbod +Date: Tue Oct 16 13:06:56 2018 -0700 + + [name] Hide internal details from public API + + src/hb-ot-name-table.hh | 23 +++++++++++++---------- + src/hb-ot-name.h | 3 +-- + 2 files changed, 14 insertions(+), 12 deletions(-) + +commit e7c595a9f09ba1552b2de1f8d56cbdcf376b9cad +Author: Behdad Esfahbod +Date: Mon Oct 15 23:34:54 2018 -0700 + + [name] More + + src/hb-ot-name.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 75cd8c86bd9b0973864bb92e0244bf038980765e +Author: Behdad Esfahbod +Date: Mon Oct 15 23:32:08 2018 -0700 + + [name] Add hb_ot_name_get_utf() + + src/hb-ot-name.cc | 24 ++++++++++++++++++------ + 1 file changed, 18 insertions(+), 6 deletions(-) + +commit c783d36324dd1e2031d3387064afab1ce5d90b6f +Author: Behdad Esfahbod +Date: Mon Oct 15 23:28:49 2018 -0700 + + [name] Pre-allocate array + + src/hb-ot-name-table.hh | 1 + + 1 file changed, 1 insertion(+) + +commit c2aa409537c3e8a7b8592ef90f8304bd6588561d +Author: Behdad Esfahbod +Date: Mon Oct 15 23:09:28 2018 -0700 + + [name] Start implementing hb_ot_name_get_utf16() + + src/hb-ot-name-table.hh | 6 ++++-- + src/hb-ot-name.cc | 22 ++++++++++++++++++++++ + src/hb-ot-name.h | 8 ++++++-- + 3 files changed, 32 insertions(+), 4 deletions(-) + +commit 740cde8991283b8b4e1e77e022175251eb37d3d1 +Author: Behdad Esfahbod +Date: Mon Oct 15 23:00:27 2018 -0700 + + [name] Implement hb_bytes_t get_name() + + src/hb-ot-name-table.hh | 24 +++++------------------- + 1 file changed, 5 insertions(+), 19 deletions(-) + +commit c3425f2401dffb1f3b5bd6fdbc0c3e9aad0f4306 +Author: Behdad Esfahbod +Date: Mon Oct 15 22:53:40 2018 -0700 + + [name] Add hb-ot-name.cc for realz + + src/hb-ot-name.cc | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 50 insertions(+) + +commit 90420ed8cb297f1ceff75f5a75c8fa7b6ea6f65e +Author: Behdad Esfahbod +Date: Mon Oct 15 22:48:48 2018 -0700 + + [name] Implement hb_ot_name_get_names() + + src/Makefile.sources | 1 + + src/hb-ot-name-table.hh | 3 +-- + src/hb-ot-name.h | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 9a6c87c17d51fd57e4225c776a0fabbfd313f4f4 +Author: Behdad Esfahbod +Date: Mon Oct 15 22:42:04 2018 -0700 + + [name] Finish accelerator sorting + + src/hb-ot-name-table.hh | 61 +++++++++++++++++++++++++++++++++++++++++-------- + src/hb-ot-name.h | 3 ++- + 2 files changed, 53 insertions(+), 11 deletions(-) + +commit 2157e56b34e7b932dd144ee3563f5bd682bbed30 +Author: Behdad Esfahbod +Date: Mon Oct 15 22:22:50 2018 -0700 + + [name] Start implementing public API infrastructure + + src/hb-ot-face.cc | 1 + + src/hb-ot-face.hh | 7 +++--- + src/hb-ot-name-table.hh | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-name.h | 3 +++ + 4 files changed, 68 insertions(+), 3 deletions(-) + +commit 0bf93ec0fb549d838b0a246de02a95559a9b2772 +Author: Behdad Esfahbod +Date: Mon Oct 15 21:34:10 2018 -0700 + + [name] Add public API declarations + + src/hb-ot-name.h | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +commit 982c2f4a65d127e56e09e7ab583f84099b8136bb +Author: Behdad Esfahbod +Date: Fri Oct 26 15:40:12 2018 -0700 + + [indic/khmer/myanmar/use] Clarify clear_syllable + + No logic change. + + src/hb-ot-shape-complex-indic.cc | 3 ++- + src/hb-ot-shape-complex-khmer.cc | 4 +--- + src/hb-ot-shape-complex-myanmar.cc | 40 ++++++++++++++++++-------------------- + src/hb-ot-shape-complex-use.cc | 22 +++++++++++++++------ + 4 files changed, 38 insertions(+), 31 deletions(-) + +commit 143ffe65aa7f20d6c53219905cbc2520d680b8dd +Author: Ebrahim Byagowi +Date: Fri Oct 26 12:14:30 2018 +0330 + + [fuzz] Add a new testcase + + ...z-testcase-minimized-hb-shape-fuzzer-5658272078495744 | Bin 0 -> 2252 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 30f18039b3c0e5748101f8934ae82aebfc5a83f7 +Author: Ebrahim Byagowi +Date: Fri Oct 26 09:34:34 2018 +0330 + + [svg] Rename _svg_create_blob to _glyph_reference_blob_svg + + docs/harfbuzz-sections.txt | 2 ++ + src/dump-emoji.cc | 2 +- + src/hb-ot-color.cc | 4 ++-- + src/hb-ot-color.h | 2 +- + test/api/test-ot-color.c | 6 +++--- + 5 files changed, 9 insertions(+), 7 deletions(-) + +commit 5cb1ce868138a10c0663a18c3891bc717aa4bc64 +Author: Ebrahim Byagowi +Date: Thu Oct 25 22:39:58 2018 +0330 + + [svg] Collapse SVGDocumentIndex into SVG + + src/hb-ot-color-svg-table.hh | 54 +++++++++++++++----------------------------- + src/hb-ot-color.cc | 2 +- + test/api/test-ot-color.c | 2 +- + 3 files changed, 20 insertions(+), 38 deletions(-) + +commit 4ceabb8c2126fe365303b8d69e667005276c0241 +Author: Ebrahim Byagowi +Date: Thu Oct 25 21:52:35 2018 +0330 + + [svg] Hide start_glyph and end_glyph from API + + src/dump-emoji.cc | 21 ++++++++------------- + src/hb-ot-color-svg-table.hh | 42 ++++++++++++------------------------------ + src/hb-ot-color.cc | 9 ++------- + src/hb-ot-color.h | 5 +---- + test/api/test-ot-color.c | 11 ++--------- + 5 files changed, 25 insertions(+), 63 deletions(-) + +commit c7a4e3dfb5c8dd4f8faf08e327bb1900c0096cf6 +Author: Ebrahim Byagowi +Date: Tue Oct 23 18:00:48 2018 +0330 + + [svg] Add public API + + * hb_ot_color_has_svg + * hb_ot_color_glyph_svg_create_blob + + src/dump-emoji.cc | 51 +++++++++++++++---------- + src/hb-open-type.hh | 1 - + src/hb-ot-color-sbix-table.hh | 2 + + src/hb-ot-color-svg-table.hh | 86 ++++++++++++++++++++++++++++++++----------- + src/hb-ot-color.cc | 53 ++++++++++++++++++++++---- + src/hb-ot-color.h | 13 +++++++ + src/hb-ot-face.cc | 2 + + src/hb-ot-face.hh | 4 +- + src/hb-ot-layout.cc | 4 -- + test/api/test-ot-color.c | 43 +++++++++++++++++++--- + 10 files changed, 199 insertions(+), 60 deletions(-) + +commit e98af6d1eda33346f72de8a45fbd317fc0e15935 +Author: Behdad Esfahbod +Date: Thu Oct 25 22:25:29 2018 -0700 + + [layout] Try to speed up collect_lookups some more + + Barely made a dent :(. + + src/hb-ot-layout-common.hh | 2 ++ + src/hb-ot-layout.cc | 23 ++++------------------- + 2 files changed, 6 insertions(+), 19 deletions(-) + +commit eb44bfc864f91c0c833c3156475d191ac1b79c72 +Author: Behdad Esfahbod +Date: Thu Oct 25 21:42:19 2018 -0700 + + [layout] Memoize collect_features + + Fixes https://github.com/harfbuzz/harfbuzz/pull/1317 + Fixes https://oss-fuzz.com/v2/testcase-detail/6543700493598720 + + src/hb-ot-layout.cc | 55 ++++++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 48 insertions(+), 7 deletions(-) + +commit 84098b1639775aea5bf3f5d91fa6e657b612ce3a +Author: Behdad Esfahbod +Date: Thu Oct 25 21:33:12 2018 -0700 + + [layout] Remove unintentionally added code + + src/hb-ot-layout-common.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit 941600a9e06309f148d51403fa07dc56ce542572 +Author: Behdad Esfahbod +Date: Thu Oct 25 21:26:08 2018 -0700 + + [layout] Add hb_collect_features_context_t + + Towards https://github.com/harfbuzz/harfbuzz/pull/1317 + + src/hb-ot-layout.cc | 66 +++++++++++++++++++++++++++++------------------------ + 1 file changed, 36 insertions(+), 30 deletions(-) + +commit c237cdfcc74d33f77b2399b4d08228c2fcf50df5 +Author: Behdad Esfahbod +Date: Thu Oct 25 21:17:30 2018 -0700 + + [lookup] Fold another function inline + + src/hb-ot-layout.cc | 48 +++++++++++++++++++++--------------------------- + 1 file changed, 21 insertions(+), 27 deletions(-) + +commit fe5520ddea3941f7a72888d908fd2b895e2f388e +Author: Behdad Esfahbod +Date: Thu Oct 25 20:58:34 2018 -0700 + + [layout] More prep work to memoize collect_features() work + + src/hb-ot-layout.cc | 62 ++++++++++++++++++++--------------------------------- + 1 file changed, 23 insertions(+), 39 deletions(-) + +commit e8e67503ff0a50eb10ad410d6a76a282ea494cf4 +Author: Behdad Esfahbod +Date: Thu Oct 25 20:48:20 2018 -0700 + + [lookup] More prep work for memoizing collect_features + + https://github.com/harfbuzz/harfbuzz/pull/1317 + + src/hb-ot-layout-common.hh | 2 ++ + src/hb-ot-layout.cc | 83 +++++++++++++++++++++------------------------- + 2 files changed, 40 insertions(+), 45 deletions(-) + +commit 96828b97a8fc2c50721ce040bdde63c462908791 +Author: Behdad Esfahbod +Date: Thu Oct 25 20:34:29 2018 -0700 + + [layout] Minor + + We were returning the accelerator's lookup count. Returns table's. + They are the same except for OOM cases. Just shorter code. + + src/hb-ot-layout.cc | 14 +------------- + 1 file changed, 1 insertion(+), 13 deletions(-) + +commit 73449cd213c3a12468e99b9c3d840fc60a334902 +Author: Behdad Esfahbod +Date: Thu Oct 25 20:32:05 2018 -0700 + + [layout] Fold one function inline + + Preparation for fixing https://github.com/harfbuzz/harfbuzz/pull/1317 + + src/hb-ot-layout.cc | 22 +++------------------- + 1 file changed, 3 insertions(+), 19 deletions(-) + +commit ba5ca6a762cb46a17f41673b14996a12e6cfe3d1 +Author: Behdad Esfahbod +Date: Thu Oct 25 17:41:26 2018 -0700 + + [morx] Use deleted-glyph, instead of actual deletion, in Ligation + + Closer to what CoreText does. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1302 + + src/hb-aat-layout-morx-table.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 5c272e3613667ca532f32764824784c63d797f57 +Author: Behdad Esfahbod +Date: Thu Oct 25 17:36:33 2018 -0700 + + [morx] Remove deleted-glyph at the end of processing + + src/hb-aat-layout-morx-table.hh | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit 1bb8ed86d6cfec0fc87c8e1930d9a86426b42001 +Author: Behdad Esfahbod +Date: Thu Oct 25 17:33:48 2018 -0700 + + [aat] Minor + + src/hb-aat-layout-common.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 102af615f15d04da20c17d80eb38f5948020f9ac +Author: Behdad Esfahbod +Date: Thu Oct 25 17:29:32 2018 -0700 + + [aat] Start adding support for DELETED-GLYPH + + https://github.com/harfbuzz/harfbuzz/issues/1302 + + src/hb-aat-layout-common.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 955aa56b11e4fa14bc6d5b1b56cb810e28fab6cd +Author: Behdad Esfahbod +Date: Thu Oct 25 16:50:38 2018 -0700 + + [vector] Make it act more like pointer + + Add pointer cast operator and plus operator. + + src/hb-coretext.cc | 2 +- + src/hb-machinery.hh | 2 +- + src/hb-ot-cmap-table.hh | 2 +- + src/hb-set.hh | 8 ++++---- + src/hb-subset.cc | 2 +- + src/hb-uniscribe.cc | 12 ++++++------ + src/hb-vector.hh | 6 ++++++ + 7 files changed, 20 insertions(+), 14 deletions(-) + +commit 8d55e2adef9a376a5cf83c20aff2dba27dd64da8 +Author: Behdad Esfahbod +Date: Thu Oct 25 16:37:53 2018 -0700 + + [set] Minor + + src/hb-set.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 64c32edfe18f5ef3b348e5c84077ee1f6faf4f48 +Author: Behdad Esfahbod +Date: Thu Oct 25 16:35:36 2018 -0700 + + [set] Make array access more explicit + + Follow up on 94e421abbfc7ede9aaf3c8d86bb0ff9992ea3123 + + src/hb-set.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit e3ceb2dde3525824de68914e12ad4e8a873ab90a +Author: Behdad Esfahbod +Date: Thu Oct 25 14:30:24 2018 -0700 + + Fix again + + test/shaping/data/in-house/fonts/DFONT.dfont | Bin 0 -> 3505 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit eceeb85666814023f57ee3517bbb304830a60c55 +Author: Ebrahim Byagowi +Date: Fri Oct 26 00:23:45 2018 +0330 + + [docs] Add hb-ot-color section + + docs/harfbuzz-sections.txt | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit be746009e9b7063dcb57e30e342f9410387ef8b6 +Author: Michiharu Ariza +Date: Thu Oct 25 13:40:40 2018 -0700 + + dropped support of legacy CFF CharString ops + + along with test & font + + src/hb-cff1-interp-cs.hh | 135 +------------------------------------- + test/api/fonts/cff1_legacyops.otf | Bin 3104 -> 0 bytes + test/api/test-ot-extents-cff.c | 23 ------- + 3 files changed, 1 insertion(+), 157 deletions(-) + +commit 1cfe702872058ebc50d6cb5543daa38fb3a7ebfb +Author: Behdad Esfahbod +Date: Thu Oct 25 13:37:08 2018 -0700 + + Fixup + + test/shaping/data/in-house/fonts/{TRAK.tff => TRAK.ttf} | Bin + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 5739c876d0d080e7feaefd323245702c663f33be +Author: Behdad Esfahbod +Date: Thu Oct 25 13:23:33 2018 -0700 + + [test] Rename some fonts + + If we have duplicae font files in different directories, that would + break the oss-fuzz build currently. So, rename some to avoid + name class with text-rendering-test. Would be better to find + another solution. + + ...TestMORXTwentyeight.ttf => MORXTwentyeight.ttf} | Bin + .../data/in-house/fonts/{TestTRAK.ttf => TRAK.tff} | Bin + .../data/in-house/fonts/{TestTTC.ttc => TTC.ttc} | Bin + test/shaping/data/in-house/fonts/TestDFONT.dfont | Bin 3505 -> 0 bytes + test/shaping/data/in-house/tests/aat-morx.tests | 2 +- + test/shaping/data/in-house/tests/aat-trak.tests | 22 ++++++++++----------- + test/shaping/data/in-house/tests/collections.tests | 12 +++++------ + 7 files changed, 18 insertions(+), 18 deletions(-) + +commit 21ede867df28d1214ca677a24ac65ab0b7e95f42 +Author: Behdad Esfahbod +Date: Thu Oct 25 13:19:34 2018 -0700 + + Fix possible overflow in bsearch impls + + From bungeman. + + Fixes https://github.com/harfbuzz/harfbuzz/pull/1314 + + src/hb-dsalgs.hh | 2 +- + src/hb-open-type.hh | 4 ++-- + src/hb-ot-cmap-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-vector.hh | 2 +- + 5 files changed, 6 insertions(+), 6 deletions(-) + +commit 2ebf36010206cebdbe58bab6edf4e3bc011b6479 +Merge: 36c2c374 94e421ab +Author: Michiharu Ariza +Date: Thu Oct 25 13:05:06 2018 -0700 + + Merge branch 'master' into cff-subset + +commit 94e421abbfc7ede9aaf3c8d86bb0ff9992ea3123 +Author: Ben Wagner +Date: Thu Oct 25 13:44:27 2018 -0400 + + Remove some use of Crap in hb-set. + + When hb_set_t::page_for_insert needs to insert at the end of the page_map + it ends up evaluating '&page_map[i + 1]' which has hb_vector return an + lvalue of a Crap so that nothing can be moved to its address. This turns + into issues with ThreadSanitizer on Crap when two threads modify different + hb_set_t instances. This can be avoided by using '&page_map[i] + 1' + instead. + + src/hb-set.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2798ac1c28edc4ba6f2283784d1027393f588f8c +Author: azure-pipelines[bot] +Date: Thu Oct 25 15:22:54 2018 +0000 + + Set up CI with Azure Pipelines + + azure-pipelines.yml | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit 9a830a17318446dab86e1439f7167d8a698eb856 +Author: Khaled Hosny +Date: Thu Oct 25 01:55:10 2018 +0200 + + [appveyor] Drop Cygwin builds again + + They are so slow and we had only a couple of Cygwin build failure + reported in ~5 years. + + appveyor.yml | 11 ----------- + 1 file changed, 11 deletions(-) + +commit 00e51a10832965f4c1d65a6d71c9582782f02c2b +Author: Khaled Hosny +Date: Wed Oct 24 22:58:22 2018 +0200 + + [appveyor] Limit make to three jobs + + https://github.com/harfbuzz/harfbuzz/pull/1309#issuecomment-432778270 + + appveyor.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ae9e8f292b2ad79b01776ae5785a94afbfc4b3e4 +Author: Behdad Esfahbod +Date: Wed Oct 24 16:46:07 2018 -0700 + + [vowel-constraints] Reset continuation on all dottedcircles + + One of the was missed before. Not intentional. + + src/gen-vowel-constraints.py | 9 +++++++-- + src/hb-ot-shape-complex-vowel-constraints.cc | 9 +++++++-- + 2 files changed, 14 insertions(+), 4 deletions(-) + +commit d2b20ba18dfe3fe507ee7cb64fd73e3f1e1e5ae0 +Author: Khaled Hosny +Date: Wed Oct 24 11:37:09 2018 +0200 + + [appveyor] Build on Cygwin and msys2 in parallel + + appveyor.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0d2fa7fd4c4df0dcf7800b1267d1126e5a4b1ab1 +Author: Khaled Hosny +Date: Wed Oct 24 11:23:21 2018 +0200 + + [appveyor] Do not update msys2 + + Looks like AppVeyor has new enough packages for our needs. Cuts CI build + time by 5 minutes. + + appveyor.yml | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 6a3ad245609ce8496d08404b28217dca8d01c10b +Author: Khaled Hosny +Date: Wed Oct 24 09:49:08 2018 +0200 + + [appveyor] Organize config file a bit + + appveyor.yml | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 0cd7d041d83ae28e8c7d8a156750464af76de291 +Author: Khaled Hosny +Date: Wed Oct 24 09:43:10 2018 +0200 + + [appveyor] Don’t build branches with open PR twice + + appveyor.yml | 3 +++ + 1 file changed, 3 insertions(+) + +commit 401cdf07922f66c762dabfd8e3d45c35e33de7c0 +Author: Behdad Esfahbod +Date: Tue Oct 23 17:00:49 2018 -0700 + + [ot-font] Fix sign of ascent/descent + + Some fonts, like msmincho, have positive number as descent + in vhea table. That's wrong. Just enforce sign on ascent/descent + when reading both horizontal and vertical metrics. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1248 + + src/hb-ot-hmtx-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit ba502dea1e81981f3893b5353400909bf60e354f +Author: Behdad Esfahbod +Date: Tue Oct 23 16:46:10 2018 -0700 + + [morx] Fix cluster-merging when ligating + + Only merge when actual ligature happened. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1305 + + src/hb-aat-layout-morx-table.hh | 7 ++++--- + test/shaping/data/in-house/Makefile.sources | 1 + + test/shaping/data/in-house/fonts/TestMORXTwentyeight.ttf | Bin 0 -> 2660 bytes + test/shaping/data/in-house/tests/aat-morx.tests | 1 + + 4 files changed, 6 insertions(+), 3 deletions(-) + +commit aa5af8d041521507f8bc8ded8a365ee56098388c +Author: Garret Rieger +Date: Tue Oct 23 15:45:35 2018 -0700 + + Fix size calculation in DEFINE_SIZE_ARRAY_SIZED. + + src/hb-machinery.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 36c2c374bf9c2d0ca903e601760e69bfc3da5388 +Author: Michiharu Ariza +Date: Tue Oct 23 15:11:09 2018 -0700 + + removed unused multi_val from DictVal + + src/hb-cff-interp-common.hh | 16 ---------------- + src/hb-cff-interp-dict-common.hh | 3 --- + src/hb-ot-cff1-table.hh | 2 +- + src/hb-ot-cff2-table.hh | 1 - + 4 files changed, 1 insertion(+), 21 deletions(-) + +commit f33ad6d69216a983624e832177895481549bdc07 +Author: Behdad Esfahbod +Date: Tue Oct 23 14:31:51 2018 -0700 + + [aat] Fix up previous commit and add files + + src/hb-aat-map.cc | 62 +++++++++++++++++++++++++++++++ + src/hb-aat-map.hh | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-map.cc | 1 + + src/hb-ot-shape.cc | 15 ++++++-- + 4 files changed, 181 insertions(+), 3 deletions(-) + +commit ffe347844803a6a9036d8357b744a982f5e5a6c9 +Author: Behdad Esfahbod +Date: Tue Oct 23 14:14:03 2018 -0700 + + [aat] Allow enabling/disabling features + + Only works at entire-buffer range, not sub-ranges. + + Test with: + + $ hb-shape Zapfino.dfont Zapfino + [Z_a_p_f_i_n_o=0+2333] + + $ hb-shape Zapfino.dfont Zapfino --features=-dlig + [Z=0+416|a=1@-21,0+264|p_f=2+433|i=4+181|n=5+261|o=6+250] + + $ hb-shape Zapfino.dfont Zapfino --features=+dlig + [Z_a_p_f_i_n_o=0+2333] + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1303 + + src/Makefile.sources | 2 ++ + src/hb-aat-layout-morx-table.hh | 29 +++++++++++++++++++++++++---- + src/hb-aat-layout.cc | 8 ++++++++ + src/hb-aat-layout.hh | 3 +++ + src/hb-ot-shape.cc | 4 ++++ + src/hb-ot-shape.hh | 5 +++++ + 6 files changed, 47 insertions(+), 4 deletions(-) + +commit 8be0e5fd4540b18e26b28b414bd99af3bb1548b1 +Author: Behdad Esfahbod +Date: Tue Oct 23 13:39:50 2018 -0700 + + [ot-map] Minor + + src/hb-ot-map.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e8fccbc36b2cc5e1c9f218c83cad7f606c03e7a1 +Author: Behdad Esfahbod +Date: Tue Oct 23 13:25:03 2018 -0700 + + Minor + + src/hb-ot-map.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 76324d95caa4b83cd4b515f516c2d3674455ea5e +Author: Behdad Esfahbod +Date: Tue Oct 23 13:09:30 2018 -0700 + + Shift code around + + src/hb-ot-shape.cc | 18 ++++++++++-------- + src/hb-ot-shape.hh | 9 +++------ + 2 files changed, 13 insertions(+), 14 deletions(-) + +commit e1241636d60a63cbfd741288716b55797a4dc8ee +Merge: 960267fc cf92d657 +Author: Michiharu Ariza +Date: Tue Oct 23 11:25:51 2018 -0700 + + Merge branch 'master' into cff-subset + +commit cf92d6579e91d326598dcff93457fe85dfa962c2 +Author: Behdad Esfahbod +Date: Tue Oct 23 03:10:56 2018 -0700 + + [trak] Allow disabling tracking for ranges of text + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1303 + + src/hb-aat-layout-trak-table.hh | 4 ++++ + src/hb-ot-shape.cc | 11 +++++++---- + src/hb-ot-shape.hh | 5 ++++- + test/shaping/data/in-house/tests/aat-trak.tests | 1 + + 4 files changed, 16 insertions(+), 5 deletions(-) + +commit 8869436cb8a338b46c138305966a4b7b2c3ee374 +Author: Behdad Esfahbod +Date: Tue Oct 23 03:07:48 2018 -0700 + + When parsing feature ranges, accept ';' instead of ':' + + src/hb-common.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 22ecefd88e1ea1841f363057b948aa792ac871a6 +Author: Ebrahim Byagowi +Date: Tue Oct 23 00:52:05 2018 +0330 + + Make tracking optout possible using 'trak' ot feature + + So '--features=-trak' or 'font-feature-settings: 'trak' 0;' can prevent + applying of tracking if used. + + src/hb-ot-shape.cc | 10 +++++++--- + test/shaping/data/in-house/tests/aat-trak.tests | 2 ++ + 2 files changed, 9 insertions(+), 3 deletions(-) + +commit 6d40eb8372a2c74a6e1294b44a2b19c99d11e7da +Author: Behdad Esfahbod +Date: Tue Oct 23 02:51:42 2018 -0700 + + Touch up on previous commit + + https://github.com/harfbuzz/harfbuzz/pull/1273 + + src/HBIndicVowelConstraints.txt | 97 ++++++ + src/Makefile.am | 6 +- + src/Makefile.sources | 1 + + src/gen-vowel-constraints.py | 124 ++------ + src/hb-ot-shape-complex-indic.cc | 10 +- + src/hb-ot-shape-complex-use.cc | 11 +- + src/hb-ot-shape-complex-vowel-constraints.cc | 433 ++++++++++++++++++++++++++ + src/hb-ot-shape-complex-vowel-constraints.hh | 447 ++------------------------- + 8 files changed, 606 insertions(+), 523 deletions(-) + +commit 205737acdc268b1c90cf00bde2d2038519a8bf48 +Author: David Corbett +Date: Fri Oct 12 16:54:54 2018 -0400 + + [use] Prohibit visually ambiguous vowel sequences + + src/Makefile.am | 7 +- + src/Makefile.sources | 1 + + src/gen-vowel-constraints.py | 286 ++++++++++++++ + src/hb-ot-shape-complex-indic.cc | 272 +------------ + src/hb-ot-shape-complex-use.cc | 3 +- + src/hb-ot-shape-complex-vowel-constraints.hh | 434 +++++++++++++++++++++ + test/shaping/README.md | 4 +- + .../46669c8860cbfea13562a6ca0d83130ee571137b.ttf | Bin 0 -> 7184 bytes + .../in-house/tests/use-vowel-letter-spoofing.tests | 94 +++++ + 9 files changed, 827 insertions(+), 274 deletions(-) + +commit 48ed598a356983f4623029dd5e87254fb59e3691 +Author: Behdad Esfahbod +Date: Tue Oct 23 02:19:32 2018 -0700 + + [VORG] Hook up to hb-ot-font's v_origin + + Fixes https://github.com/harfbuzz/harfbuzz/issues/544 + + Test added with NotoSansCJK, eg. with U+FF38. + + src/hb-ot-face.cc | 1 - + src/hb-ot-font.cc | 11 +++++++++-- + src/hb-ot-vorg-table.hh | 6 ++++-- + .../fonts/4cbbc461be066fccc611dcc634af6e8cb2705537.ttf | Bin 0 -> 2808 bytes + test/shaping/data/in-house/tests/vertical.tests | 1 + + 5 files changed, 14 insertions(+), 5 deletions(-) + +commit 097ecfd4a991d4fa306bab7330d9952966e94d1f +Author: Behdad Esfahbod +Date: Tue Oct 23 02:09:42 2018 -0700 + + [VORG] Add get_y_origin() + + Unhooked. + + src/hb-ot-vorg-table.hh | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +commit 6fb24d5e3e0cf61c0ed3574e5bcf4598a13d6b69 +Author: Behdad Esfahbod +Date: Tue Oct 23 01:58:59 2018 -0700 + + [VORG] Add VORG table + + Cherry-picked from cff-subset branch. + + src/Makefile.sources | 1 + + src/hb-ot-face.cc | 1 + + src/hb-ot-face.hh | 1 + + src/hb-ot-vorg-table.hh | 168 ++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 171 insertions(+) + +commit 531f9822b2e8a60f03c43d6f86ef9ed32c951f0e +Author: Behdad Esfahbod +Date: Tue Oct 23 01:32:08 2018 -0700 + + [morx] Add a few debug messages to Ligature chain + + src/hb-aat-layout-morx-table.hh | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 0e5bcdef7fb592f986ad5b4e07b80d2efb5e3344 +Author: Behdad Esfahbod +Date: Tue Oct 23 00:39:44 2018 -0700 + + [morx] Clear stack upon underflow when acting ligatures + + src/hb-aat-layout-morx-table.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 1bfb96a9c8d7653f0dee5c5fab3c6e85cea900cd +Author: Behdad Esfahbod +Date: Mon Oct 22 23:41:47 2018 -0700 + + [test/text-rendering-tests] Update from upstream + + test/shaping/data/text-rendering-tests/Makefile.sources | 2 +- + .../data/text-rendering-tests/fonts/TestTRAKOne.ttf | Bin 0 -> 1752 bytes + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit 792071de4075cb9af0793f0d7c70da0780923bb6 +Author: Behdad Esfahbod +Date: Mon Oct 22 23:38:34 2018 -0700 + + [morx] Leave ligature on stack after ligating + + Test with Apple Color Emoji.ttf of ~66MB and following sequence: + + ./hb-shape Apple\ Color\ Emoji-old.ttf --font-funcs=ot -u U+1F468,200d,U+1F469,200d,U+1F467,200d,1f466 + + Should form full family if matching works correctly. It first makes + family of three, then makes family of four out of that and the last + two characters. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1292 + + src/hb-aat-layout-morx-table.hh | 1 - + 1 file changed, 1 deletion(-) + +commit e1b8e933f099efae3c3e1f5706be19120b44de20 +Author: Ebrahim Byagowi +Date: Tue Oct 23 09:23:48 2018 +0330 + + [ci] Disable llvm-gcc + + #define Null(Type) Null::value>::value>() + + raises: + hb-blob.cc: In function 'hb_blob_t* hb_blob_get_empty()': + hb-blob.cc:194: error: using 'typename' outside of template + hb-blob.cc:194: error: using 'typename' outside of template + + Removing "typename"s fixes the issue but makes newer compiler fail apparently. + + Probably downstream can patch that locally till we get a solution. + + .circleci/config.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8c78ced95b639730efd0edc521e4e81ad50af501 +Author: Behdad Esfahbod +Date: Mon Oct 22 21:49:42 2018 -0700 + + Unbreak builds + + src/hb-dsalgs.hh | 2 +- + src/hb-open-type.hh | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 8d689f8a7bccda861bcb286d52f1a90fca52df0f +Author: Behdad Esfahbod +Date: Mon Oct 22 21:33:18 2018 -0700 + + Add hb_array<>() specialization for UnsizedArrayOf + + Related https://github.com/harfbuzz/harfbuzz/issues/1301 + + src/hb-aat-layout-trak-table.hh | 2 +- + src/hb-open-file.hh | 2 +- + src/hb-open-type.hh | 8 ++++++++ + src/hb-ot-color-cpal-table.hh | 6 +++--- + 4 files changed, 13 insertions(+), 5 deletions(-) + +commit abfbba191141c3e3cf2a391f365b5323f9dc37c0 +Author: Behdad Esfahbod +Date: Mon Oct 22 21:27:45 2018 -0700 + + Add hb_array<>() + + Simplifies transient object creation. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1301 + + src/hb-aat-layout-trak-table.hh | 2 +- + src/hb-dsalgs.hh | 2 ++ + src/hb-open-file.hh | 3 +-- + src/hb-ot-color-cpal-table.hh | 6 +++--- + 4 files changed, 7 insertions(+), 6 deletions(-) + +commit 17ffbc070ff4190d8ebaf88f8db62f19e6fa370d +Author: Behdad Esfahbod +Date: Mon Oct 22 21:22:25 2018 -0700 + + [color] Use Index for colorIdx + + Doesn't matter, but matches the description. + + src/hb-ot-color-colr-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 07386ea410af13e8fc844eb939a6c6e47c2adaf1 +Author: Behdad Esfahbod +Date: Mon Oct 22 21:18:27 2018 -0700 + + Remove const and references when binding Null() + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1299 + + Removes anomaly I was seeing in cpal table trying to use implicit Null(NameID). + + src/hb-atomic.hh | 5 +---- + src/hb-common.cc | 2 +- + src/hb-ft.cc | 2 +- + src/hb-null.hh | 4 ++-- + src/hb-open-type.hh | 6 ++---- + src/hb-ot-color-cpal-table.hh | 8 ++------ + src/hb-static.cc | 1 - + src/hb.hh | 9 +++++++++ + 8 files changed, 18 insertions(+), 19 deletions(-) + +commit b18acab7bce062fef397d3d8b0efc7826f473b50 +Author: Behdad Esfahbod +Date: Mon Oct 22 18:20:57 2018 -0700 + + [color] Add HB_COLOR + + Normally I would have added to_string / from_string like other types + have. But since we don't use hb_color_t much, I'm not going to do that. + Although, if we did, we could use it in hb-view to parse colors... + + src/hb-common.h | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit 228f96c9d09272c8f677935a640e75e173b817a3 +Author: Behdad Esfahbod +Date: Mon Oct 22 16:55:12 2018 -0700 + + [color] Finish reviewing / revamping CPAL + + Now to hb_color_t. + + src/hb-ot-color-cpal-table.hh | 52 ++++++++++++++++++++++--------------------- + src/hb-ot-color.cc | 33 +++++---------------------- + src/hb-ot-color.h | 10 ++++----- + 3 files changed, 38 insertions(+), 57 deletions(-) + +commit 960267fc4315a138f0963e78407e3af2ec6007af +Author: Michiharu Ariza +Date: Mon Oct 22 16:37:39 2018 -0700 + + fix build attempt ^4 + + src/hb-ot-cff-common.hh | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit 683fad062792a199e2fe86fe161f41b9389d08c3 +Author: Behdad Esfahbod +Date: Mon Oct 22 16:35:03 2018 -0700 + + [color] Minor + + src/hb-ot-color.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 14474d21040bf9b025b53bb9b0df599eaf260119 +Author: Behdad Esfahbod +Date: Mon Oct 22 16:30:30 2018 -0700 + + [color] Rely on CPALV1Tail Null object + + src/hb-ot-color-cpal-table.hh | 39 ++++++++++++++------------------------- + 1 file changed, 14 insertions(+), 25 deletions(-) + +commit d7865107ea4664e04c03a1d79678cdcadc0d5ea5 +Author: Behdad Esfahbod +Date: Mon Oct 22 16:18:34 2018 -0700 + + Remove const from hb_array_t details + + Will come in through if desired. + + src/hb-aat-layout-trak-table.hh | 6 +++--- + src/hb-dsalgs.hh | 6 +++--- + src/hb-open-file.hh | 4 ++-- + 3 files changed, 8 insertions(+), 8 deletions(-) + +commit f3336580dd0c6959a1871f92b4a37f7c0a4b2160 +Author: Behdad Esfahbod +Date: Mon Oct 22 16:16:21 2018 -0700 + + [color] Use hb_array_t in CPAL + + Doesn't work though, ouch :(. Need to figure out if it's unreasonable + to expect Null(T) inside hb_array_t to see the later specialization + of Null for NameID. + + src/hb-open-type.hh | 3 ++- + src/hb-ot-color-cpal-table.hh | 47 ++++++++++++++++++++++--------------------- + src/hb-static.cc | 1 + + 3 files changed, 27 insertions(+), 24 deletions(-) + +commit 5ae18855d115577ff796158d483db7b890d9956f +Author: Behdad Esfahbod +Date: Mon Oct 22 14:54:55 2018 -0700 + + [color] Check for null CPAL arrays + + We cannot use a nullable offset here though. + + src/hb-ot-color-cpal-table.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 69ab72e4aa7cbf197873d38f7e623866b4e40502 +Author: Behdad Esfahbod +Date: Mon Oct 22 14:51:40 2018 -0700 + + [color] More CPAL rename + + src/hb-ot-color-cpal-table.hh | 104 +++++++++++++++++++++--------------------- + src/hb-ot-color.cc | 6 +-- + 2 files changed, 54 insertions(+), 56 deletions(-) + +commit 0befb06c468aa36f3337b5ef2235f6d69dda8397 +Author: Behdad Esfahbod +Date: Mon Oct 22 14:46:21 2018 -0700 + + [color] More CPAL rename + + src/hb-ot-color-cpal-table.hh | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 3600d206037ef23d6448c79a3f010c4f903a971c +Author: Behdad Esfahbod +Date: Mon Oct 22 14:43:12 2018 -0700 + + [color] Rename vars in CPAL + + src/hb-ot-color-cpal-table.hh | 32 ++++++++++++++++---------------- + src/hb-ot-color.cc | 1 + + 2 files changed, 17 insertions(+), 16 deletions(-) + +commit ba055a8d53595ab49747ed3e02d90c9b6a3cf4f3 +Author: Michiharu Ariza +Date: Mon Oct 22 16:20:04 2018 -0700 + + fix build attempt ^3 + + test/api/test-ot-extents-cff.c | 2 +- + test/api/test-subset-cff1.c | 1 + + test/api/test-subset-cff2.c | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) + +commit b11032afaefb2c84f9a4bbffe95c91f6374df802 +Author: Michiharu Ariza +Date: Mon Oct 22 15:52:37 2018 -0700 + + fix build attempt ^2 + + src/hb-ot-cff-common.hh | 2 +- + test/api/test-ot-extents-cff.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 3d3df5575c5be0e3c69b99ca1d8df2cea1672aaf +Author: Michiharu Ariza +Date: Mon Oct 22 15:23:39 2018 -0700 + + fix build attempt + + src/hb-ot-cff-common.hh | 5 ++++- + test/api/test-ot-extents-cff.c | 11 +++++------ + test/api/test-subset-cff1.c | 19 +++++++++---------- + test/api/test-subset-cff2.c | 11 +++++------ + 4 files changed, 23 insertions(+), 23 deletions(-) + +commit 0babf761c986855f9cdd1a2679380ee6a02390c8 +Author: Ebrahim Byagowi +Date: Tue Oct 23 01:33:45 2018 +0330 + + Adopt dump-emoji with latest unreleased APIs changes (#1297) + + src/dump-emoji.cc | 24 +++++++++++------------- + 1 file changed, 11 insertions(+), 13 deletions(-) + +commit 7997144b5f08c81b2cce2c7c2a085fb7eeb506e3 +Author: Behdad Esfahbod +Date: Mon Oct 22 13:02:04 2018 -0700 + + [color] Revamp palette API + + src/hb-ot-color.cc | 81 ++++++++++++++--------------- + src/hb-ot-color.h | 26 +++++----- + test/api/test-ot-color.c | 130 +++++++++++++++++++++++------------------------ + 3 files changed, 117 insertions(+), 120 deletions(-) + +commit 3bf91bd2690cda34a7687ed5465dc4bb0672f2b6 +Author: Behdad Esfahbod +Date: Mon Oct 22 12:40:38 2018 -0700 + + [color] Rewrite colr access + + COLR table has one function: return layers for a glyph, and we expose exactly + that, so should just wire it through. Also use sub_array() for verifiable + safety. + + Also, BaseGlyphRecord's null object is enough. We don't need to special-case + the not-found. + + src/hb-dsalgs.hh | 11 +++++++++ + src/hb-open-type.hh | 2 +- + src/hb-ot-color-colr-table.hh | 53 +++++++++++++++++++++++-------------------- + src/hb-ot-color.cc | 19 +--------------- + 4 files changed, 41 insertions(+), 44 deletions(-) + +commit 1de17bdb80b0668f4d4a4700e3f80c8caee3303d +Author: Behdad Esfahbod +Date: Mon Oct 22 10:29:01 2018 -0700 + + [colr] Add hb_ot_color_layer_t + + We never return parallel arrays from functions. That's inconvenient + and hard to bind. + + src/hb-ot-color.cc | 18 ++++++++---------- + src/hb-ot-color.h | 22 ++++++++++++++++------ + test/api/test-ot-color.c | 33 +++++++++++++++------------------ + 3 files changed, 39 insertions(+), 34 deletions(-) + +commit 3b3668acc8b16afacb96d8c525eff603ef5f411f +Author: Behdad Esfahbod +Date: Sun Oct 21 19:23:11 2018 -0700 + + [color] Rename / reorder a bit + + Implement has_data() for realz. + + src/hb-ot-color-colr-table.hh | 2 ++ + src/hb-ot-color-cpal-table.hh | 2 ++ + src/hb-ot-color.cc | 78 ++++++++++++++++++++++++------------------- + src/hb-ot-color.h | 33 ++++++++++++------ + test/api/test-ot-color.c | 30 ++++++++--------- + 5 files changed, 85 insertions(+), 60 deletions(-) + +commit 570b77f7d2b41262ccb20fadbee2c6b455cd06c6 +Merge: 857c5827 d440c8d3 +Author: Michiharu Ariza +Date: Mon Oct 22 13:06:47 2018 -0700 + + Merge branch 'master' into cff-subset + +commit 9085a72deb041cf10edfa61d24b7c25f947f736b +Author: Behdad Esfahbod +Date: Sun Oct 21 19:08:25 2018 -0700 + + [cpal] Touch up palette flags + + src/hb-ot-color.h | 16 ++++++++++------ + test/api/test-ot-color.c | 4 ++-- + 2 files changed, 12 insertions(+), 8 deletions(-) + +commit ee11fae9d0d2c16a3a4b4ecf5cf328ffe950bb03 +Author: Behdad Esfahbod +Date: Sun Oct 21 19:02:47 2018 -0700 + + [color] Rename "gid" to "glyph" + + We don't expose "gid" in API. + + src/hb-ot-color.cc | 12 ++++++------ + src/hb-ot-color.h | 8 ++++---- + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit 228fa71bf9186faedff48b3a259d696c7c07b5b5 +Author: Behdad Esfahbod +Date: Sun Oct 21 17:43:29 2018 -0700 + + [colr] Move sanitize + + src/hb-ot-color-colr-table.hh | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +commit d440c8d3fbb907f17b1eb9287918009ced27a8c1 +Author: Ebrahim Byagowi +Date: Mon Oct 22 22:07:59 2018 +0330 + + Add chromacheck Emoji test fonts and minor preparations (#1294) + + src/hb-ot-color.cc | 26 ++++++++++++++++++++++++++ + src/hb-ot-face.hh | 8 +++++--- + test/api/fonts/README | 2 ++ + test/api/fonts/chromacheck-cbdt.ttf | Bin 0 -> 792 bytes + test/api/fonts/chromacheck-colr.ttf | Bin 0 -> 652 bytes + test/api/fonts/chromacheck-sbix.ttf | Bin 0 -> 864 bytes + test/api/fonts/chromacheck-svg.ttf | Bin 0 -> 792 bytes + test/api/hb-test.h | 2 +- + test/api/test-ot-color.c | 21 +++++++++++++++++++++ + 9 files changed, 55 insertions(+), 4 deletions(-) + +commit 857c58279e82897ed69e8ade2f736073fa12883b +Merge: 51fba41c b92b9d7e +Author: Michiharu Ariza +Date: Mon Oct 22 09:57:20 2018 -0700 + + Merge branch 'master' into cff-subset + +commit b92b9d7e5290eaa83e94fd40cddaee71628a3c2a +Author: Behdad Esfahbod +Date: Sun Oct 21 17:42:51 2018 -0700 + + [colr] Move compare function into a static + + Not sure if MSVC would be unhappy about this. + + src/hb-ot-color-colr-table.hh | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit b6b171732a12b396a704984699bd0da906f5dc24 +Author: Behdad Esfahbod +Date: Sun Oct 21 17:41:49 2018 -0700 + + [colr] Minor + + src/hb-ot-color-colr-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit a6ade3471e730d7a8b56e4ed706a8eb126e957f6 +Author: Behdad Esfahbod +Date: Sun Oct 21 17:39:39 2018 -0700 + + [colr] Move sanitize() to right place + + Sanitize always comes just before data member definitions, so + it's easy to cross-check. + + src/hb-ot-color-colr-table.hh | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 24adc1575745a711558dab79488760f1ceb24750 +Author: Behdad Esfahbod +Date: Sun Oct 21 17:39:00 2018 -0700 + + [colr] Touch up a bit + + When a struct is plain old data with no references, etc, it's okay + to mark its members public. + + src/hb-ot-color-colr-table.hh | 36 +++++++++++++++++++++++------------- + 1 file changed, 23 insertions(+), 13 deletions(-) + +commit cc6e77ca98e90fb531dd90a5c9c41d14d1dda9c4 +Author: Khaled Hosny +Date: Sun Oct 21 13:29:40 2018 +0200 + + [color] Fix documentation a bit + + src/hb-ot-color.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 37ba2413c19f6a1d62868178fc80f870ee44e7ab +Author: Ebrahim Byagowi +Date: Sun Oct 21 11:46:51 2018 +0330 + + Minor + + src/hb-ot-color-cpal-table.hh | 10 +++++----- + src/hb-ot-color.cc | 25 ++++++++++++++----------- + src/hb-ot-color.h | 12 ++++++------ + 3 files changed, 25 insertions(+), 22 deletions(-) + +commit 44f79b4bf8ac341c5968a27f6a2a13a8af48b34f +Author: Ebrahim Byagowi +Date: Sun Oct 21 10:17:34 2018 +0330 + + Remove _palette_entry_count as can be done with _palette_colors + + src/hb-ot-color.cc | 18 ++---------------- + src/hb-ot-color.h | 3 --- + test/api/test-ot-color.c | 8 ++------ + 3 files changed, 4 insertions(+), 25 deletions(-) + +commit 6795dcfc0884b87b72fce8d902654f28ffe1366c +Author: Ebrahim Byagowi +Date: Sun Oct 21 09:51:15 2018 +0330 + + [test] Test hb_ot_color_has_{colr,cpal}_data + + src/dump-emoji.cc | 3 ++- + src/hb-ot-color.cc | 7 ++++--- + test/api/test-ot-color.c | 23 +++++++++++++++++++++++ + 3 files changed, 29 insertions(+), 4 deletions(-) + +commit b8ee3a0ec89d63721618ac90c01ac6da228f5055 +Author: Ebrahim Byagowi +Date: Sun Oct 21 09:44:16 2018 +0330 + + [CPAL] Add palette entry and enable palette flag API + + src/hb-ot-color-cpal-table.hh | 66 +++++++++++++++---------- + src/hb-ot-color.cc | 109 ++++++++++++++++++++++++------------------ + src/hb-ot-color.h | 23 +++++++++ + test/api/test-ot-color.c | 35 ++++++++++++-- + 4 files changed, 158 insertions(+), 75 deletions(-) + +commit d4261b4bb6d20fac7deebacfbe120fb84a92e423 +Author: Ebrahim Byagowi +Date: Sun Oct 21 08:48:07 2018 +0330 + + Add API test for hb_ot_color_get_color_layers + + src/dump-emoji.cc | 3 ++- + src/hb-ot-color.cc | 2 +- + src/hb-ot-color.h | 2 ++ + test/api/test-ot-color.c | 31 +++++++++++++++++++++++++++++-- + 4 files changed, 34 insertions(+), 4 deletions(-) + +commit 456978d408cd41156e1123abfc3689800558e89b +Author: Ebrahim Byagowi +Date: Sun Oct 21 08:26:40 2018 +0330 + + Address COLR/CPAL reviews and revive cpal_v1 tests + + src/dump-emoji.cc | 26 ++++---- + src/hb-common.h | 12 ++++ + src/hb-ot-color-cpal-table.hh | 37 +++++------- + src/hb-ot-color.cc | 136 +++++++++++++++++++++++++----------------- + src/hb-ot-color.h | 38 +++--------- + test/api/test-ot-color.c | 101 +++++++++++++++---------------- + 6 files changed, 179 insertions(+), 171 deletions(-) + +commit 687f679b80c071c69d0924f07a315f9d2691b7fc +Author: Ebrahim Byagowi +Date: Sat Oct 20 17:50:39 2018 +0330 + + [color] Fix alpha channel value and adjust spaces + + src/dump-emoji.cc | 36 ++++++++++++++++++------------------ + src/hb-buffer-serialize.cc | 14 +++++++------- + src/hb-ot-color.cc | 10 +++++----- + 3 files changed, 30 insertions(+), 30 deletions(-) + +commit 00e94ce24efb1f5b3a9cd13c0b9f81f405ad8055 +Author: Ebrahim Byagowi +Date: Sat Oct 20 00:31:04 2018 +0330 + + [dump-emoji] Formatting + + src/dump-emoji.cc | 26 ++++++++++++++++---------- + 1 file changed, 16 insertions(+), 10 deletions(-) + +commit e9d798dc12d42e97ae8c19e7b73e25abc34d265a +Author: Ebrahim Byagowi +Date: Fri Oct 19 18:30:01 2018 +0330 + + [test] Use hb_test_open_font_file + + test/api/test-ot-color.c | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) + +commit e8a6f5b8039cce3f7ec568fd90fe73690e49a037 +Author: Ebrahim Byagowi +Date: Fri Oct 19 18:23:42 2018 +0330 + + Add three macros for separating color channels + + src/dump-emoji.cc | 8 ++++---- + src/hb-ot-color.cc | 1 - + src/hb-ot-color.h | 15 ++++++++++----- + test/api/test-ot-color.c | 10 +++++----- + 4 files changed, 19 insertions(+), 15 deletions(-) + +commit 0e33467e52942e62e04cf825a6bd105fa311c864 +Author: Ebrahim Byagowi +Date: Fri Oct 19 17:44:06 2018 +0330 + + Make ot-color tests pass + + test/api/test-ot-color.c | 52 ++++++++++++++++++++++++------------------------ + 1 file changed, 26 insertions(+), 26 deletions(-) + +commit d4e928b1421c154adbda9b6e1f2cf804b21654cb +Author: Khaled Hosny +Date: Tue May 1 17:16:46 2018 +0200 + + [color] Minimal API for COLR/CPAL + + src/Makefile.sources | 1 + + src/dump-emoji.cc | 114 +++++++++++---------- + src/hb-ot-color-colr-table.hh | 12 +-- + src/hb-ot-color-cpal-table.hh | 51 +++------ + src/hb-ot-color.cc | 87 +++++++++++----- + src/hb-ot-color.h | 85 +++++++++++++++ + src/hb-ot-face.hh | 3 + + src/hb-ot.h | 1 + + .../fonts/cpal-v0.ttf} | Bin + .../fonts/cpal-v1.ttf} | Bin + test/api/test-ot-color.c | 43 +++++--- + 11 files changed, 257 insertions(+), 140 deletions(-) + +commit 0229eaea299443b4faa3bd086f23ec1496d6112c +Author: Ebrahim Byagowi +Date: Mon Oct 22 10:51:37 2018 +0330 + + [fuzz] Add a found hb-subset testcase + + ...z-testcase-minimized-hb-subset-fuzzer-5725847365877760 | Bin 0 -> 880 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 0ecddad7c5948ecd7879bc7507f8a7a2d99eee86 +Author: Ebrahim Byagowi +Date: Mon Oct 22 00:44:28 2018 +0330 + + [ci] Disable flaky -windows-x64 and add a comment for iOS + + .circleci/config.yml | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +commit 9b3461574f6473c8ff7c995202858cf46012eed8 +Author: Ebrahim Byagowi +Date: Sun Oct 21 11:37:38 2018 +0330 + + [fuzz] Add more testcases + + Fixed already but better to have anyway. + + One didn't have minimized but it was only 164 B, so + + ...uzz-testcase-minimized-hb-shape-fuzzer-5706010589659136 | Bin 0 -> 52 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 4fa94a3e39c21bc1dcdbbd5bda99bff1e1490b0e +Merge: 217a3728 c110878c +Author: Ebrahim Byagowi +Date: Sun Oct 21 11:36:41 2018 +0330 + + Merge pull request #1290 from ebraminio/testopenfont + + [test] Unify font file opening across the tests + +commit c110878cb61f5df99e9d97dda253f2987ddce58e +Author: Ebrahim Byagowi +Date: Sun Oct 21 11:07:17 2018 +0330 + + [test] Unify font file opening across the tests + + test/api/hb-subset-test.h | 21 --------------------- + test/api/hb-test.h | 21 +++++++++++++++++++++ + test/api/test-collect-unicodes.c | 6 +++--- + test/api/test-multithread.c | 26 +++++--------------------- + test/api/test-ot-name.c | 27 ++++----------------------- + test/api/test-subset-cmap.c | 8 ++++---- + test/api/test-subset-glyf.c | 28 ++++++++++++++-------------- + test/api/test-subset-hdmx.c | 14 +++++++------- + test/api/test-subset-hmtx.c | 20 ++++++++++---------- + test/api/test-subset-os2.c | 4 ++-- + test/api/test-subset-post.c | 4 ++-- + test/api/test-subset-vmtx.c | 6 +++--- + test/api/test-subset.c | 6 +++--- + 13 files changed, 78 insertions(+), 113 deletions(-) + +commit 217a3728b4991a855070678bc079cb400eee605a +Author: Behdad Esfahbod +Date: Sat Oct 20 20:39:56 2018 -0700 + + [fuzzing] Add more font + + .../clusterfuzz-testcase-hb-shape-fuzzer-5097734906839040 | Bin 0 -> 164 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 1e39833ba8547c90a0a4ed7f265a6c4bc8eb8fe1 +Author: Behdad Esfahbod +Date: Sat Oct 20 16:56:06 2018 -0700 + + [docs] Minor + + src/hb-buffer.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit a5ad8c658dac1fbe63d1034cdfe8df33f50462b6 +Author: Behdad Esfahbod +Date: Sat Oct 20 16:52:55 2018 -0700 + + [docs] More fixes + + src/hb-ot-layout.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 2d9198f205fafda557520d7206f9cfbf3373353f +Author: Behdad Esfahbod +Date: Sat Oct 20 16:50:39 2018 -0700 + + [docs] Fix for hb-version.h being in src tree + + docs/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +commit 314b1af74f1fb71ea5cfcb5a58766773f0b2a5a1 +Author: Behdad Esfahbod +Date: Sat Oct 20 16:49:16 2018 -0700 + + [docs] Fix warning + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1260 + + src/hb-deprecated.h | 6 ------ + src/hb-unicode.cc | 1 + + 2 files changed, 1 insertion(+), 6 deletions(-) + +commit b713c1397718bf1f702a2ead2afb4dcee2c1505a +Author: Behdad Esfahbod +Date: Sat Oct 20 14:56:28 2018 -0700 + + [kerx] Implement tuple-kerning in Format0 + + src/hb-aat-layout-kerx-table.hh | 44 ++++++++++++++++++++++++++++------------- + 1 file changed, 30 insertions(+), 14 deletions(-) + +commit 0a3b7a0fb0734a66926dfda5d95d3cacea8890ce +Author: Behdad Esfahbod +Date: Sat Oct 20 13:14:07 2018 -0700 + + 2.0.2 + + NEWS | 6 ++++++ + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 3 files changed, 9 insertions(+), 3 deletions(-) + +commit 8931bc4a6b41a2a41069b99cb5c551fa30216f0b +Author: Ebrahim Byagowi +Date: Sat Oct 20 23:23:32 2018 +0330 + + [test] Fix -Wunused-parameter on test-font.c + + test/api/test-font.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 68b705076808d4b0a4ac3bfa945b8f9ae23db1df +Author: Behdad Esfahbod +Date: Sat Oct 20 12:09:41 2018 -0700 + + [kerx] Fix sanitize of KerxSubtableFormat2::array read + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11033 + + src/hb-aat-layout-kerx-table.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 00fdbca4f6a5c4623b9c4838da502cccce8aaa74 +Author: Behdad Esfahbod +Date: Sat Oct 20 12:04:51 2018 -0700 + + [aat] Fix LookupFormat10 sanitize + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11060 + + src/hb-aat-layout-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f11c557662dee16a59bb54276c50a96e4e675201 +Author: Behdad Esfahbod +Date: Sat Oct 20 11:56:30 2018 -0700 + + [test] Fix leak + + test/api/test-font.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit 440a675c7cc72c7c77b4ad7b20c855c53808ef48 +Author: Ebrahim Byagowi +Date: Sat Oct 20 21:13:25 2018 +0330 + + [TODO] Remove BCP 47 language handling item + + Closes https://github.com/harfbuzz/harfbuzz/issues/1286 + + TODO | 2 -- + 1 file changed, 2 deletions(-) + +commit d39acc5a95f968b0dbfd5a942abda606d9aa3343 +Author: Ebrahim Byagowi +Date: Sat Oct 20 12:20:30 2018 +0330 + + [fuzzing] Add new testcases + + .../clusterfuzz-testcase-hb-shape-fuzzer-5688420752424960 | Bin 0 -> 163 bytes + ...zz-testcase-minimized-hb-shape-fuzzer-5688420752424960 | Bin 0 -> 69 bytes + 2 files changed, 0 insertions(+), 0 deletions(-) + +commit 1e55e21dea78aaaddc0715e7df96fd198ec8f78a +Merge: 964ae32a d084719f +Author: Ebrahim Byagowi +Date: Sat Oct 20 07:45:46 2018 +0330 + + Merge pull request #1283 from khaledhosny/cygwin + + Cygwin fixes and CI build + +commit 964ae32aac793540a49c44efab878592394d48db +Author: Ebrahim Byagowi +Date: Sat Oct 20 07:39:18 2018 +0330 + + Run valgrind on run-shape-fuzzer only when RUN_VALGRIND is set (#1285) + + .circleci/config.yml | 2 +- + test/fuzzing/run-shape-fuzzer-tests.py | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit f70f994112b2577271c20a929f7b980fa1d17428 +Author: Behdad Esfahbod +Date: Fri Oct 19 20:00:36 2018 -0700 + + Minor + + test/api/test-ot-name.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4e09fb8f7a93ec0c8d7f71cd58772ba468b5523f +Author: Behdad Esfahbod +Date: Fri Oct 19 19:59:41 2018 -0700 + + Oops. Fix build + + test/api/test-map.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9e288d29d86ef27acacd397b1abf04d512f1e61e +Author: Behdad Esfahbod +Date: Fri Oct 19 19:47:27 2018 -0700 + + [test-map] Cosmetic + + test/api/test-map.c | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +commit 7c2c8ac301b526da8b5384d6b90f156ca096568e +Author: Behdad Esfahbod +Date: Fri Oct 19 19:37:46 2018 -0700 + + 2.0.1 + + NEWS | 15 ++++++++++++++- + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 3 files changed, 17 insertions(+), 4 deletions(-) + +commit 5a24ea15e0c242c3e2a4a49980da3ab7dd61a3df +Author: Bruce Mitchener +Date: Sat Oct 20 08:09:52 2018 +0700 + + Make more 'coords' params const. + + src/hb-ot-layout-common.hh | 8 ++++---- + src/hb-ot-layout-gsubgpos.hh | 2 +- + src/hb-ot-var-hvar-table.hh | 2 +- + src/hb-ot-var-mvar-table.hh | 2 +- + 4 files changed, 7 insertions(+), 7 deletions(-) + +commit 08b7172969b442cc83b47f44e685a0495b2d8cd4 +Author: Behdad Esfahbod +Date: Fri Oct 19 19:12:33 2018 -0700 + + [font] Fix parallel funcs passing to eachover in infinite-loop + + Fixes test just added. + + src/hb-font.cc | 20 +++++++++++++------- + src/hb-font.hh | 8 ++++++++ + 2 files changed, 21 insertions(+), 7 deletions(-) + +commit 77d5c3df07bec8e9d2dd57f89d5810b768bdc4f5 +Author: Behdad Esfahbod +Date: Fri Oct 19 19:01:01 2018 -0700 + + [font] Add failing test amongst font-func parallels infinite-looping + + Reported by Nona while updating Android to HarfBuzz 2.0.0. + + test/api/test-font.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 64 insertions(+) + +commit d084719ff5a9e0e363bf352037f85b884bff11a7 +Author: Khaled Hosny +Date: Sat Oct 20 00:18:36 2018 +0200 + + Add Cygwin CI build + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1274 + + appveyor.yml | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit 29d877518fc2c29083cd7b955b422087966235f7 +Author: Behdad Esfahbod +Date: Fri Oct 19 16:06:54 2018 -0700 + + [kerx] Implement variation-kerning tables (without the variation part) + + SFSNDisplay uses these. We just apply the default kern without + variations right now. But at least makes the default kern work. + + src/hb-aat-layout-kerx-table.hh | 37 +++++++++++++++++++++++++++++-------- + 1 file changed, 29 insertions(+), 8 deletions(-) + +commit f7c0b4319c6f82f1e0020a0029469d8953a7a161 +Author: Behdad Esfahbod +Date: Fri Oct 19 15:23:49 2018 -0700 + + [aat] Implement LookupFormat10 + + src/hb-aat-layout-ankr-table.hh | 6 +++-- + src/hb-aat-layout-common.hh | 55 ++++++++++++++++++++++++++++++++++++++--- + src/hb-machinery.hh | 4 +++ + src/hb-open-type.hh | 3 +++ + 4 files changed, 63 insertions(+), 5 deletions(-) + +commit cf92cb7e002f479505fed8c2c55ab12dcbea2d83 +Author: Khaled Hosny +Date: Fri Oct 19 22:21:39 2018 +0200 + + Use g_strdup instead of strdup + + Cygwin does not seem to have strdup. + + util/options.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 30cbe6158de1ddc0546d55e4edc1fe264e1b86ef +Author: Khaled Hosny +Date: Fri Oct 19 22:04:56 2018 +0200 + + Use O_BINARY instead of _O_BINARY + + Cygwin does not seem to have the later + + src/hb-blob.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 257ded1f9ec653d15e79d2ea0a83bd8c5c53d831 +Author: Behdad Esfahbod +Date: Fri Oct 19 11:20:14 2018 -0700 + + [trak] Fix test for previous fix + + test/shaping/data/in-house/tests/aat-trak.tests | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 72bb139b807c21f1569058fb5fb260dcdd81eba4 +Author: Behdad Esfahbod +Date: Fri Oct 19 11:15:35 2018 -0700 + + [RELEASING] Post-mortem + + Re https://github.com/harfbuzz/harfbuzz/issues/1271 + + RELEASING.md | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 79b63561552bdfe8dc67a450d740fda8802486ad +Author: Behdad Esfahbod +Date: Fri Oct 19 11:00:20 2018 -0700 + + [trak] Fix extrapolation at end side + + src/hb-aat-layout-trak-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2352cc3539b2e58d0481cdb8b9cd48cbc09a778e +Author: Behdad Esfahbod +Date: Fri Oct 19 09:58:45 2018 -0700 + + [kerx] Whitespace + + src/hb-aat-layout-kerx-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 114f66dda6a07d61b5e64da5c44b05db7aa51cc9 +Author: Ebrahim Byagowi +Date: Fri Oct 19 12:05:26 2018 +0330 + + Fix hb_map_is_empty logic + + This needs reviewing + + src/hb-map.hh | 2 +- + test/api/test-map.c | 13 ++++++++----- + 2 files changed, 9 insertions(+), 6 deletions(-) + +commit 9df2fb1611e03e401f0d5a9432b440641085ba1e +Author: Ebrahim Byagowi +Date: Fri Oct 19 12:04:47 2018 +0330 + + Add API tests for hb_map_t + + src/Makefile.am | 2 +- + test/api/Makefile.am | 6 ++- + test/api/test-map.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 120 insertions(+), 2 deletions(-) + +commit 8a5eba711069285e8d8b6d682eea0090256527bb +Author: Ebrahim Byagowi +Date: Fri Oct 19 10:20:16 2018 +0330 + + [test] cosmetic, use g_assert_cmpint + + test/api/test-ot-name.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit c6eb5e852c24e12fec3138cf9def5eb76acedfd6 +Author: Ebrahim Byagowi +Date: Fri Oct 19 10:14:25 2018 +0330 + + Don't report deprecated symbols as unused symbols + + src/Makefile.am | 2 ++ + test/api/Makefile.am | 4 +++- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 34f357c78a7a530fdb3580ec9d3d865600c06128 +Author: Ebrahim Byagowi +Date: Fri Oct 19 10:13:53 2018 +0330 + + Add test for hb_set_del + + test/api/test-set.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit 4594730f64e534e975065afce925b581fd9c6acd +Author: Bruce Mitchener +Date: Fri Oct 19 22:12:25 2018 +0700 + + Remove redundant return at end of void-returning function. + + src/hb-ot-layout-gsubgpos.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit 093c7c4a54b37f5b12ad21e2d67f109597d068b1 +Author: Ebrahim Byagowi +Date: Fri Oct 19 18:46:41 2018 +0330 + + [ci] Run valgrind on test/api + + run-shape-fuzzer-tests.py automatically runs valgrind if see available + but test/api runs it by request, we probably should normalize the approaches + later + + .circleci/config.yml | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 8d1e479d1dcf7789be99a6cd0db0b883a90299dc +Author: Bruce Mitchener +Date: Thu Oct 18 22:18:42 2018 +0700 + + Use bool literals instead of 0/1. + + src/hb-common.cc | 2 +- + src/hb-coretext.cc | 4 ++-- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-tag.cc | 2 +- + src/hb-shape-plan.cc | 8 ++++---- + 5 files changed, 9 insertions(+), 9 deletions(-) + +commit 257d0e5aa36fd5b3e54e04918ce12bb7d7e0d177 +Author: Bruce Mitchener +Date: Fri Oct 19 22:49:21 2018 +0700 + + Fix typos. + + BUILD.md | 2 +- + CMakeLists.txt | 8 ++++---- + README.python.md | 2 +- + README.wine.md | 6 +++--- + src/hb-machinery.hh | 2 +- + src/hb-null.hh | 4 ++-- + src/hb-open-file.hh | 2 +- + src/hb-ot-layout-common.hh | 2 +- + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos.hh | 2 +- + 11 files changed, 17 insertions(+), 17 deletions(-) + +commit b7cef8cb1dfaf1f0f2c0d79b96b171049b69466a +Author: Ebrahim Byagowi +Date: Fri Oct 19 09:24:21 2018 +0330 + + Enable valgrind and dedicate a bot to it + + .circleci/config.yml | 13 +++++++++++++ + test/fuzzing/run-shape-fuzzer-tests.py | 31 +++++++++++++++++++++++++++++++ + 2 files changed, 44 insertions(+) + +commit bccd09d6c7baa99fdaccb8c5b3ff7e1834edd3bf +Author: Ebrahim Byagowi +Date: Fri Oct 19 09:06:42 2018 +0330 + + Minor, tweak spaces on hb-shape-fuzzer.cc + + test/fuzzing/hb-shape-fuzzer.cc | 42 ++++++++++++++++++++--------------------- + 1 file changed, 21 insertions(+), 21 deletions(-) + +commit fbf665b307c8cc9f16f5897671bfdd8719a195b5 +Author: Ebrahim Byagowi +Date: Fri Oct 19 08:09:53 2018 +0330 + + [fuzz] Add more found cases (#1275) + + ...clusterfuzz-testcase-hb-shape-fuzzer-5728971283496960 | Bin 0 -> 101 bytes + ...terfuzz-testcase-minimized-hb-fuzzer-5713868010553344 | Bin 0 -> 370 bytes + ...terfuzz-testcase-minimized-hb-fuzzer-6278851874258944 | Bin 0 -> 598 bytes + ...z-testcase-minimized-hb-shape-fuzzer-5649959857160192 | Bin 0 -> 3608 bytes + ...z-testcase-minimized-hb-shape-fuzzer-5664873493561344 | Bin 0 -> 400 bytes + ...z-testcase-minimized-hb-shape-fuzzer-5762953198960640 | Bin 0 -> 62 bytes + ...z-testcase-minimized-hb-shape-fuzzer-5764636557705216 | Bin 0 -> 2184 bytes + ...-testcase-minimized-hb-subset-fuzzer-5690658895953920 | Bin 0 -> 2735 bytes + ...-testcase-minimized-hb-subset-fuzzer-5695279609675776 | Bin 0 -> 135 bytes + ...-testcase-minimized-hb-subset-fuzzer-5718215406125056 | Bin 0 -> 107 bytes + ...-testcase-minimized-hb-subset-fuzzer-5743250149736448 | Bin 0 -> 103 bytes + ...-testcase-minimized-hb-subset-fuzzer-5765071062958080 | Bin 0 -> 329 bytes + ...ized-hb-subset-get-codepoints-fuzzer-5930139383758848 | Bin 0 -> 9410 bytes + 13 files changed, 0 insertions(+), 0 deletions(-) + +commit 51fba41cc958ded3afc6c1e738895b0a81993e18 +Merge: e555ed96 3d9a0306 +Author: Michiharu Ariza +Date: Thu Oct 18 13:08:42 2018 -0700 + + Merge branch 'master' into cff-subset + +commit e555ed961e86104e059861efe4245b7b146dbd3b +Author: Michiharu Ariza +Date: Thu Oct 18 13:04:41 2018 -0700 + + added flex extents test + + test/api/fonts/cff1_flex.otf | Bin 0 -> 3152 bytes + test/api/test-ot-extents-cff.c | 23 +++++++++++++++++++++++ + 2 files changed, 23 insertions(+) + +commit 8679d02b4b3f2f9147c4ea0319eb39851c4e40e6 +Author: Michiharu Ariza +Date: Thu Oct 18 13:04:21 2018 -0700 + + implement flex ops for glyph extents/subset + + also removed unused CSInterpEnv::move_[xy]_with_arg + fixed bug a width being left over on argStack with CFF1 + + src/hb-cff-interp-cs-common.hh | 157 +++++++++++++++++++++++++++++++++++------ + src/hb-cff1-interp-cs.hh | 1 + + src/hb-subset-cff1.cc | 4 -- + src/hb-subset-cff2.cc | 4 -- + 4 files changed, 138 insertions(+), 28 deletions(-) + +commit 3d9a0306ebb48706778fd2c487c3cacc7d508d6c +Author: Behdad Esfahbod +Date: Thu Oct 18 05:58:17 2018 -0700 + + 2.0.0 + + NEWS | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + src/hb-buffer.cc | 4 ++-- + src/hb-common.h | 4 ++-- + src/hb-deprecated.h | 18 +++++++------- + src/hb-font.cc | 6 ++--- + src/hb-font.h | 2 +- + src/hb-ot-layout.cc | 8 +++---- + src/hb-ot-name.h | 4 ++-- + src/hb-ot-tag.cc | 4 ++-- + src/hb-ot-tag.h | 4 ++-- + src/hb-version.h | 6 ++--- + 12 files changed, 99 insertions(+), 31 deletions(-) + +commit 535ca678bf9c8ab470ebf5ad84a090328d79d42b +Author: Behdad Esfahbod +Date: Thu Oct 18 05:58:04 2018 -0700 + + [test] Don't use newer glib API + + test/api/test-ot-tag.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 03e144135b5c691e3942d1aef917fe2246665fb6 +Author: Ebrahim Byagowi +Date: Thu Oct 18 11:06:37 2018 +0330 + + [ubsan] Use unsigned int instead enum where needed (#1270) + + Actually the check is right, + + On -myanmar.hh, on that particular switch, OT_C is indic_category_t + but OT_D is myanmar_category_t so we are mixing the types in one variable. + + And on -arabic.cc, step can goes one number higher than step_t enum in the + loop so we are actually using it as an unsinged int. + + .circleci/config.yml | 2 +- + src/hb-ot-shape-complex-arabic.cc | 4 ++-- + src/hb-ot-shape-complex-myanmar.hh | 48 +++++++++++++++++++------------------- + 3 files changed, 27 insertions(+), 27 deletions(-) + +commit 64df6b0b0f9d221e14811084f2412a01cf4deb46 +Author: Behdad Esfahbod +Date: Thu Oct 18 00:35:01 2018 -0700 + + [AUTHORS] Add Ebrahim and Khaled + + AUTHORS | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit f1ced9be378d7c7ad3ea35a1cee6f9aff7a44a13 +Author: Behdad Esfahbod +Date: Wed Oct 17 23:06:53 2018 -0700 + + More warning fix + + Okay, let's see if the gods are happy now... + + src/hb-static.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 40606abd0cd40faf3973d0a8c30af90d36ae8231 +Author: Behdad Esfahbod +Date: Wed Oct 17 23:06:37 2018 -0700 + + Fix build + + src/hb-static.cc | 1 + + 1 file changed, 1 insertion(+) + +commit c406aca19303e61fa5ba15d215386cfc6d920124 +Author: Behdad Esfahbod +Date: Wed Oct 17 22:58:43 2018 -0700 + + Fix warning + + src/hb-machinery.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 270a37c3244b32dd839a99eb379be241613ee895 +Author: Behdad Esfahbod +Date: Wed Oct 17 22:42:47 2018 -0700 + + Kick bots + + src/hb-aat-layout-common.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6da8ef3f9f4706fe88715fabdba7904ff279539b +Author: Behdad Esfahbod +Date: Wed Oct 17 22:37:34 2018 -0700 + + Fix some wierdness... + + src/hb-static.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 83780308b41b029513ac2568b6688d3eaad77338 +Author: Behdad Esfahbod +Date: Wed Oct 17 22:34:16 2018 -0700 + + [aat] Fix sanitize slowdown + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11034 + + src/hb-aat-layout-common.hh | 4 ++++ + src/hb-machinery.hh | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit b9478e28ac4361353e4920d749cc5d29e5bfef67 +Author: Behdad Esfahbod +Date: Wed Oct 17 21:52:14 2018 -0700 + + Revert "[test] Remove not-fixed yet testcases (#1268)" + + This reverts commit 191eef823fe95355425621f8e002dfe7fe632383. + + ...rfuzz-testcase-minimized-hb-fuzzer-4548492505645056 | Bin 0 -> 122 bytes + ...rfuzz-testcase-minimized-hb-fuzzer-6210176798425088 | Bin 0 -> 1420 bytes + ...testcase-minimized-hb-shape-fuzzer-5738888765636608 | Bin 0 -> 267731 bytes + 3 files changed, 0 insertions(+), 0 deletions(-) + +commit af99b20dfddbca75e68f84c5aa465a54728990a6 +Author: Ebrahim Byagowi +Date: Thu Oct 18 08:35:20 2018 +0330 + + [ci/ubsan] Disable enum sanitization + + Behdad apparently not interested on them + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9e8a9b846ec24e9124d61706272a0e5fa58d7a24 +Author: Behdad Esfahbod +Date: Wed Oct 17 21:41:25 2018 -0700 + + [aat] Another try at fixing Lookup null objects... + + Ugly as hell, and don't even understand why some bits are needed. + But the logic is sound. + + src/hb-aat-layout-common.hh | 23 ++++++++++++++++++++--- + src/hb-static.cc | 4 ++++ + 2 files changed, 24 insertions(+), 3 deletions(-) + +commit 191eef823fe95355425621f8e002dfe7fe632383 +Author: Ebrahim Byagowi +Date: Thu Oct 18 08:04:18 2018 +0330 + + [test] Remove not-fixed yet testcases (#1268) + + I added them but now that I think, it is a bad idea to have them as + fuzzing bots will find good seeds to tweak in order to find easy new + testcases which causes duplicated issues. + + ...rfuzz-testcase-minimized-hb-fuzzer-4548492505645056 | Bin 122 -> 0 bytes + ...rfuzz-testcase-minimized-hb-fuzzer-6210176798425088 | Bin 1420 -> 0 bytes + ...testcase-minimized-hb-shape-fuzzer-5738888765636608 | Bin 267731 -> 0 bytes + 3 files changed, 0 insertions(+), 0 deletions(-) + +commit 392e1f4ddd7eb649e1a71755b9bcf6431739f98f +Author: Ebrahim Byagowi +Date: Thu Oct 18 07:42:20 2018 +0330 + + [test/shape-fuzzer] fail on timeout and ubsan errors (#1267) + + test/fuzzing/run-shape-fuzzer-tests.py | 38 ++++++++++++++++++++++++++++++---- + 1 file changed, 34 insertions(+), 4 deletions(-) + +commit eeddda3ec6c28b411d33c74938ec6198c7f6888d +Author: Ebrahim Byagowi +Date: Thu Oct 18 07:38:47 2018 +0330 + + [util] Better file-not-found error from hb-shape / hb-view + + fixes #1266 + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 751c10e55e43e2266a5bba024d560c5127fae4b8 +Author: Ebrahim Byagowi +Date: Thu Oct 18 06:36:48 2018 +0330 + + [fuzz] Add more new testcases + + ...testcase-minimized-hb-shape-fuzzer-5718464350650368 | Bin 0 -> 41 bytes + ...testcase-minimized-hb-shape-fuzzer-5738888765636608 | Bin 0 -> 267731 bytes + 2 files changed, 0 insertions(+), 0 deletions(-) + +commit fd282eb3285e6d20f77e8a3a7237b677433ccbb4 +Author: Ebrahim Byagowi +Date: Thu Oct 18 06:33:39 2018 +0330 + + [fuzz] Add a new testcase + + .../clusterfuzz-testcase-hb-shape-fuzzer-5634395566768128 | Bin 0 -> 106 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 9d42d70269b879e67f3c7724beab8e4cdbfc877a +Author: Behdad Esfahbod +Date: Wed Oct 17 17:55:47 2018 -0700 + + [trak] Fix calc + + We were getting the first track record always. Ie. this line: + + if (trackTable[i].get_track_value () == 0.f) + { + - trackTableEntry = &trackTable[0]; + + trackTableEntry = &trackTable[i]; + break; + } + + The rest is cleanup. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1263 for the most part. + + src/hb-aat-layout-trak-table.hh | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +commit 3341c7fbfb9bc8e137afd9f16da8cf18eb67b25b +Author: Behdad Esfahbod +Date: Wed Oct 17 15:04:35 2018 -0700 + + [fuzzing] Move fuzzing fonts from api/ here + + ...estcase-minimized-hb-subset-fuzzer-5521982557782016 | Bin 1228 -> 0 bytes + ...estcase-minimized-hb-subset-fuzzer-5542653037903872 | Bin 160249 -> 0 bytes + ...estcase-minimized-hb-subset-fuzzer-5609911946838016 | Bin 313 -> 0 bytes + ...estcase-minimized-hb-subset-fuzzer-5670861909524480 | Bin 1298 -> 0 bytes + ...estcase-minimized-hb-subset-fuzzer-5750092395970560 | Bin 72435 -> 0 bytes + ...estcase-minimized-hb-subset-fuzzer-6651660668502016 | Bin 15229 -> 0 bytes + ...ed-hb-subset-get-codepoints-fuzzer-5973295416475648 | Bin 109 -> 0 bytes + ...ed-hb-subset-get-codepoints-fuzzer-6136125075750912 | Bin 65816 -> 0 bytes + test/api/test-subset-glyf.c | 2 +- + test/api/test-subset-hdmx.c | 4 ++-- + test/api/test-subset-hmtx.c | 2 +- + test/api/test-subset.c | 6 +++--- + .../crash-4b60576767ee4d9fe1cc10959d89baf73d4e8249 | Bin + .../crash-b577db318b30f2851828a4c9ef97cb30678b1b54 | Bin + .../crash-ccc61c92d589f895174cdef6ff2e3b20e9999a1a | Bin + .../crash-e4e0bb1458a91b692eba492c907ae1f94e635480 | Bin + .../fonts/oom-6ef8c96d3710262511bcc730dce9c00e722cb653 | Bin + .../fonts/oom-ccc61c92d589f895174cdef6ff2e3b20e9999a1a | Bin + 18 files changed, 7 insertions(+), 7 deletions(-) + +commit 1f34388e8b40a77157f61c8e1a2fc7c4846c192e +Merge: 9ade3e7b 2e7c7165 +Author: Michiharu Ariza +Date: Wed Oct 17 09:34:48 2018 -0700 + + Merge branch 'master' into cff-subset + +commit 2e7c716511e8b2cfcd059fa2a2ed4cdd48b351bf +Author: Behdad Esfahbod +Date: Tue Oct 16 18:35:03 2018 -0700 + + [buffer] Add an assert + + See if it helps debugging https://bugs.chromium.org/p/chromium/issues/detail?id=895117 + + src/hb-buffer.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5842756b1398253d38749c4c8a23a1450e642caf +Author: Behdad Esfahbod +Date: Tue Oct 16 18:28:55 2018 -0700 + + [fuzzing] Delete blink fuzzed data + + These are text, not font. + + ...minimized-blink_harfbuzz_shaper_fuzzer-5099655095123968 | Bin 88 -> 0 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 25fe7e7e1031401d38db1efed360cd75ea7910b9 +Author: Behdad Esfahbod +Date: Tue Oct 16 18:22:54 2018 -0700 + + [aat] Comment + + src/hb-aat-layout-common.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 26092bb3d1aa239de5e933700e0371619d147f65 +Author: HinTak +Date: Wed Oct 17 00:54:39 2018 +0100 + + "allow-none" annotation for "out" parameters + + Fixes the following warnings: + hb-ot-tag.cc:330: Warning: HarfBuzz: invalid "allow-none" annotation: only valid for pointer types and out parameters + hb-ot-tag.cc:334: Warning: HarfBuzz: invalid "allow-none" annotation: only valid for pointer types and out parameters + + src/hb-ot-tag.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ba42651608da1be0d152e03ad42ea96fc8476ac7 +Author: Behdad Esfahbod +Date: Tue Oct 16 17:35:46 2018 -0700 + + Fix indent + + test/fuzzing/run-shape-fuzzer-tests.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 49bdb54427b17d439eadf31732a5f2a0add46bf5 +Author: HinTak +Date: Wed Oct 17 00:36:04 2018 +0100 + + typo in gobject annotation - "in/out" should be "inout" + + "in/out" should be "inout" + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c0c190c16a2c1b281f40dacdcf515dc5a59ab3bb +Author: Behdad Esfahbod +Date: Tue Oct 16 16:39:29 2018 -0700 + + [fuzzing] Run tests against fuzzing fonts + + Some disable. + + test/fuzzing/run-shape-fuzzer-tests.py | 12 ++-- + test/fuzzing/run-subset-fuzzer-tests.py | 35 ++++++----- + test/shaping/data/in-house/Makefile.sources | 1 - + test/shaping/data/in-house/tests/fuzzed.tests | 84 --------------------------- + 4 files changed, 24 insertions(+), 108 deletions(-) + +commit 7b37705fb579a39334be0618c6215c1b887bf9fc +Author: Behdad Esfahbod +Date: Tue Oct 16 16:33:06 2018 -0700 + + [fuzzing] Rename + + ...ebdebc6.ttf => 0509e80afb379d16560e9e47bdd7d888bebdebc6} | Bin + ...63b6daf.ttf => 1a6f1687b7a221f9f2c834b0b360d3c8463b6daf} | Bin + ...28b22cb.ttf => 205edd09bd3d141cc9580f650109556cc28b22cb} | Bin + ...f026462.ttf => 217a934cfe15c548b572c203dceb2befdf026462} | Bin + ...ac34f18.ttf => 3511ff5c1647150595846ac414c595cccac34f18} | Bin + ...675d5a3.ttf => 375d6ae32a3cbe52fbf81a4e5777e3377675d5a3} | Bin + ...9c9a56b.ttf => 43979b90b2dd929723cf4fe1715990bcb9c9a56b} | Bin + ...1a8e2b0.ttf => 558661aa659912f4d30ecd27bd09835171a8e2b0} | Bin + ...0655fa8.ttf => 5a5daf5eb5a4db77a2baa3ad9c7a6ed6e0655fa8} | Bin + ...c149ddc.ttf => 641bd9db850193064d17575053ae2bf8ec149ddc} | Bin + ...bcf861f.ttf => 8240789f6d12d4cfc4b5e8e6f246c3701bcf861f} | Bin + ...1386016.ttf => a34a9191d9376bda419836effeef7e75c1386016} | Bin + ...bdae30e.ttf => a69118c2c2ada48ff803d9149daa54c9ebdae30e} | Bin + ...6b31fe2.ttf => b9e2aaa0d75fcef6971ec3a96d806ba4a6b31fe2} | Bin + ...14a0467.ttf => e88c339237f52d21e01c55f01b9c1b4cc14a0467} | Bin + ...1395725.ttf => fab39d60d758cb586db5a504f218442cd1395725} | Bin + 16 files changed, 0 insertions(+), 0 deletions(-) + +commit 3676c685d407cc7b9b813b4a08e7c5bcd9a47ea1 +Author: Behdad Esfahbod +Date: Tue Oct 16 16:32:26 2018 -0700 + + [fuzzing] Move rest of fuzzing tests here + + .../fonts/0509e80afb379d16560e9e47bdd7d888bebdebc6.ttf | Bin + .../fonts/1a6f1687b7a221f9f2c834b0b360d3c8463b6daf.ttf | Bin + .../fonts/205edd09bd3d141cc9580f650109556cc28b22cb.ttf | Bin + .../fonts/217a934cfe15c548b572c203dceb2befdf026462.ttf | Bin + .../fonts/3511ff5c1647150595846ac414c595cccac34f18.ttf | Bin + .../fonts/375d6ae32a3cbe52fbf81a4e5777e3377675d5a3.ttf | Bin + .../fonts/43979b90b2dd929723cf4fe1715990bcb9c9a56b.ttf | Bin + .../fonts/558661aa659912f4d30ecd27bd09835171a8e2b0.ttf | Bin + .../fonts/5a5daf5eb5a4db77a2baa3ad9c7a6ed6e0655fa8.ttf | Bin + .../fonts/641bd9db850193064d17575053ae2bf8ec149ddc.ttf | Bin + .../fonts/8240789f6d12d4cfc4b5e8e6f246c3701bcf861f.ttf | Bin + .../fonts/a34a9191d9376bda419836effeef7e75c1386016.ttf | Bin + .../fonts/a69118c2c2ada48ff803d9149daa54c9ebdae30e.ttf | Bin + .../fonts/b9e2aaa0d75fcef6971ec3a96d806ba4a6b31fe2.ttf | Bin + .../fonts/e88c339237f52d21e01c55f01b9c1b4cc14a0467.ttf | Bin + .../fonts/fab39d60d758cb586db5a504f218442cd1395725.ttf | Bin + test/shaping/data/in-house/tests/fuzzed.tests | 16 ---------------- + 17 files changed, 16 deletions(-) + +commit 1487173dcf4137fb210b15d9a869aa1f0c626d15 +Author: Behdad Esfahbod +Date: Tue Oct 16 16:30:38 2018 -0700 + + [fuzzing] Delete duplicate fonts + + .../233c1e252e737ca79e03a9fd56b71aaa4a230f2b.ttf | Bin 1048576 -> 0 bytes + .../243798dd281c1c77c065958e1ff467420faa9bde.ttf | Bin 225 -> 0 bytes + .../9d8a94a67932a3ab75a596fc8b5c6d0392ca9e49.ttf | Bin 4545 -> 0 bytes + .../b6acef662e0beb8d5fcf5b61c6b0ca69537b7402.ttf | Bin 3301 -> 0 bytes + .../bbf4a308c402f0678c3e82844892a4da2ebe598f.ttf | Bin 204 -> 0 bytes + .../dd9f0c7c7c36f75a18be0cab1cddf8f3ab0f366b.ttf | Bin 2786 -> 0 bytes + .../ef2511f215aa3ca847cbfffbf861793b42170875.ttf | Bin 1152 -> 0 bytes + test/shaping/data/in-house/tests/fuzzed.tests | 7 ------- + 8 files changed, 7 deletions(-) + +commit 49c041f7c5b135cbcbd1663e18047afd54fc948b +Author: Behdad Esfahbod +Date: Tue Oct 16 16:25:24 2018 -0700 + + Minor + + test/fuzzing/clusterfuzz-testcase-6107935408390144 | Bin 16800 -> 0 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 36f38ea7033b4e52c6cd94a8a0d686a95c0cc148 +Author: Behdad Esfahbod +Date: Tue Oct 16 16:24:03 2018 -0700 + + [gpos] Protect mark attachment against out-of-bounds + + Not sure how can happen, but does... + + src/hb-ot-layout-gpos-table.hh | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit 1147ce2392ac6b3d12fdabe69ac5da9bae97e30d +Author: Behdad Esfahbod +Date: Tue Oct 16 16:18:32 2018 -0700 + + [fuzzing] Add more tests + + .../fuzzing/fonts/clusterfuzz-testcase-6107935408390144 | Bin 0 -> 16800 bytes + ...-testcase-minimized-harfbuzz_fuzzer-5973566991106048 | Bin 0 -> 4047 bytes + ...-testcase-minimized-hb-shape-fuzzer-5633985665826816 | Bin 0 -> 73 bytes + 3 files changed, 0 insertions(+), 0 deletions(-) + +commit 12cbe195ae65656dbc9e32b4d50696bc4223136b +Author: Behdad Esfahbod +Date: Tue Oct 16 16:13:53 2018 -0700 + + [aat] Another non-null offset + + src/hb-aat-layout-ankr-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 87205ef935ede70365187549d133014669ea47f2 +Author: Behdad Esfahbod +Date: Tue Oct 16 15:40:44 2018 -0700 + + [aat] Make sure Lookup offset is never nulled + + It has unbounded size... + + Fixes https://oss-fuzz.com/v2/testcase-detail/5718889451749376 + + src/hb-aat-layout-ankr-table.hh | 2 +- + src/hb-aat-layout-common.hh | 3 ++- + src/hb-aat-layout-kerx-table.hh | 18 ++++++++---------- + src/hb-aat-layout-morx-table.hh | 4 ++-- + src/hb-open-type.hh | 12 ++++++------ + 5 files changed, 19 insertions(+), 20 deletions(-) + +commit 1aa353e4fc79dfa880559ff75113ed58fac8392b +Author: Behdad Esfahbod +Date: Tue Oct 16 15:26:51 2018 -0700 + + Fix tests + + test/shaping/data/in-house/tests/fuzzed.tests | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 98d4ad02b97628e5a9a7bfe3187ccc3851c00b18 +Author: Behdad Esfahbod +Date: Tue Oct 16 15:17:31 2018 -0700 + + [fuzzing] One more + + test/fuzzing/clusterfuzz-testcase-6107935408390144 | Bin 0 -> 16800 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit e6f267c3dfe3e93dfc726266672da5a235fbd930 +Author: Behdad Esfahbod +Date: Tue Oct 16 15:16:20 2018 -0700 + + [fuzzing] Add more clusterfuzz tests I had lying around + + .../fonts/clusterfuzz-testcase-5517117891805184 | Bin 0 -> 178 bytes + ...sterfuzz-testcase-hb-shape-fuzzer-5746142327865344 | Bin 0 -> 219 bytes + ...sterfuzz-testcase-hb-shape-fuzzer-5750379279548416 | Bin 0 -> 317 bytes + .../clusterfuzz-testcase-minimized-4884742786777088 | Bin 0 -> 393 bytes + .../clusterfuzz-testcase-minimized-5255344882188288 | Bin 0 -> 65 bytes + .../clusterfuzz-testcase-minimized-5720051798769664 | Bin 0 -> 1048576 bytes + .../clusterfuzz-testcase-minimized-5924299061854208 | Bin 0 -> 2786 bytes + .../clusterfuzz-testcase-minimized-6460279560863744 | Bin 0 -> 589 bytes + ...ized-blink_harfbuzz_shaper_fuzzer-5099655095123968 | Bin 0 -> 88 bytes + ...estcase-minimized-hb-shape-fuzzer-5650286710882304 | Bin 0 -> 76 bytes + ...stcase-minimized-hb-shape-fuzzer-5672261407735808} | Bin + 11 files changed, 0 insertions(+), 0 deletions(-) + +commit e53206271db4a83834433ab5f82d16815a18b998 +Author: Ebrahim Byagowi +Date: Wed Oct 17 01:42:04 2018 +0330 + + Add all the fonts found by fuzzers to the repo (#1258) + + test/fuzzing/Makefile.am | 1 + + ...clusterfuzz-testcase-hb-fuzzer-4666056377368576 | Bin 0 -> 1152 bytes + ...clusterfuzz-testcase-hb-fuzzer-5662671558934528 | Bin 0 -> 242272 bytes + ...clusterfuzz-testcase-hb-fuzzer-6243458541944832 | Bin 0 -> 370187 bytes + ...clusterfuzz-testcase-hb-fuzzer-6303297511096320 | Bin 0 -> 4545 bytes + ...clusterfuzz-testcase-hb-fuzzer-6696647723581440 | Bin 0 -> 3266 bytes + ...z-testcase-minimized-hb-fuzzer-4523479581851648 | Bin 0 -> 322 bytes + ...z-testcase-minimized-hb-fuzzer-4535496598355968 | Bin 0 -> 2786 bytes + ...z-testcase-minimized-hb-fuzzer-4548492505645056 | Bin 0 -> 122 bytes + ...z-testcase-minimized-hb-fuzzer-4595692015190016 | Bin 0 -> 225 bytes + ...z-testcase-minimized-hb-fuzzer-4687441845813248 | Bin 0 -> 162 bytes + ...z-testcase-minimized-hb-fuzzer-4706238090706944 | Bin 0 -> 350 bytes + ...z-testcase-minimized-hb-fuzzer-4769173588672512 | Bin 0 -> 37 bytes + ...z-testcase-minimized-hb-fuzzer-4827735151083520 | Bin 0 -> 1384 bytes + ...z-testcase-minimized-hb-fuzzer-4841745322868736 | Bin 0 -> 660 bytes + ...z-testcase-minimized-hb-fuzzer-4884742786777088 | Bin 0 -> 393 bytes + ...z-testcase-minimized-hb-fuzzer-5216838347653120 | Bin 0 -> 157600 bytes + ...z-testcase-minimized-hb-fuzzer-5255344882188288 | Bin 0 -> 65 bytes + ...z-testcase-minimized-hb-fuzzer-5294584596791296 | Bin 0 -> 1602 bytes + ...z-testcase-minimized-hb-fuzzer-5303930168803328 | Bin 0 -> 7321 bytes + ...z-testcase-minimized-hb-fuzzer-5331901587914752 | Bin 0 -> 3301 bytes + ...z-testcase-minimized-hb-fuzzer-5388906574905344 | Bin 0 -> 9937 bytes + ...z-testcase-minimized-hb-fuzzer-5517117891805184 | Bin 0 -> 178 bytes + ...z-testcase-minimized-hb-fuzzer-5617496443846656 | Bin 0 -> 195 bytes + ...z-testcase-minimized-hb-fuzzer-5672141338968064 | Bin 0 -> 176 bytes + ...z-testcase-minimized-hb-fuzzer-5700697074958336 | Bin 0 -> 878 bytes + ...z-testcase-minimized-hb-fuzzer-5720051798769664 | Bin 0 -> 1048576 bytes + ...z-testcase-minimized-hb-fuzzer-5924299061854208 | Bin 0 -> 2786 bytes + ...z-testcase-minimized-hb-fuzzer-6023178755244032 | Bin 0 -> 2261 bytes + ...z-testcase-minimized-hb-fuzzer-6111685556305920 | Bin 0 -> 586 bytes + ...z-testcase-minimized-hb-fuzzer-6160439919509504 | Bin 0 -> 204 bytes + ...z-testcase-minimized-hb-fuzzer-6210176798425088 | Bin 0 -> 1420 bytes + ...z-testcase-minimized-hb-fuzzer-6260579246276608 | Bin 0 -> 700 bytes + ...z-testcase-minimized-hb-fuzzer-6264625609834496 | Bin 0 -> 1731 bytes + ...z-testcase-minimized-hb-fuzzer-6424351550210048 | Bin 0 -> 73 bytes + ...z-testcase-minimized-hb-fuzzer-6460279560863744 | Bin 0 -> 589 bytes + ...z-testcase-minimized-hb-fuzzer-6576177596596224 | Bin 0 -> 385 bytes + ...z-testcase-minimized-hb-fuzzer-6595199411159040 | Bin 0 -> 1862 bytes + ...z-testcase-minimized-hb-fuzzer-6624904746106880 | Bin 0 -> 42 bytes + ...z-testcase-minimized-hb-fuzzer-6723367514144768 | Bin 0 -> 1074 bytes + ...case-minimized-hb-shape-fuzzer-5630246225707008 | Bin 0 -> 109 bytes + ...case-minimized-hb-shape-fuzzer-5635082459545600 | Bin 0 -> 52 bytes + ...case-minimized-hb-shape-fuzzer-5652019562414080 | Bin 0 -> 49 bytes + ...case-minimized-hb-shape-fuzzer-5656511058018304 | Bin 0 -> 28 bytes + ...case-minimized-hb-shape-fuzzer-5659641787187200 | Bin 0 -> 3498 bytes + ...case-minimized-hb-shape-fuzzer-5668791174823936 | Bin 0 -> 3608 bytes + ...ase-minimized-hb-shape-fuzzer-56722614077358084 | Bin 0 -> 192 bytes + ...case-minimized-hb-shape-fuzzer-5674361600606208 | Bin 0 -> 518 bytes + ...case-minimized-hb-shape-fuzzer-5677421274071040 | Bin 0 -> 3608 bytes + ...case-minimized-hb-shape-fuzzer-5679244475105280 | Bin 0 -> 256 bytes + ...case-minimized-hb-shape-fuzzer-5685596677210112 | Bin 0 -> 58 bytes + ...case-minimized-hb-shape-fuzzer-5695615258853376 | Bin 0 -> 194 bytes + ...case-minimized-hb-shape-fuzzer-5696686572175360 | Bin 0 -> 256 bytes + ...case-minimized-hb-shape-fuzzer-5718889451749376 | Bin 0 -> 1680 bytes + ...case-minimized-hb-shape-fuzzer-5719982789361664 | Bin 0 -> 3608 bytes + ...case-minimized-hb-shape-fuzzer-5725129603022848 | Bin 0 -> 3608 bytes + ...case-minimized-hb-shape-fuzzer-5726089628876800 | Bin 0 -> 76 bytes + ...case-minimized-hb-shape-fuzzer-5729361857085440 | Bin 0 -> 2250 bytes + ...case-minimized-hb-shape-fuzzer-5733166795456512 | Bin 0 -> 78 bytes + ...case-minimized-hb-shape-fuzzer-5734736291430400 | Bin 0 -> 66 bytes + ...case-minimized-hb-shape-fuzzer-5740171484463104 | Bin 0 -> 186 bytes + ...case-minimized-hb-shape-fuzzer-5750379279548416 | Bin 0 -> 219 bytes + ...case-minimized-hb-shape-fuzzer-5762490181353472 | Bin 0 -> 101 bytes + ...ase-minimized-hb-subset-fuzzer-5359635656605696 | Bin 0 -> 393270 bytes + ...ase-minimized-hb-subset-fuzzer-5521982557782016 | Bin 0 -> 1228 bytes + ...ase-minimized-hb-subset-fuzzer-5542653037903872 | Bin 0 -> 160249 bytes + ...ase-minimized-hb-subset-fuzzer-5609911946838016 | Bin 0 -> 313 bytes + ...ase-minimized-hb-subset-fuzzer-5629878397829120 | Bin 0 -> 3746 bytes + ...ase-minimized-hb-subset-fuzzer-5651059347816448 | Bin 0 -> 2648 bytes + ...ase-minimized-hb-subset-fuzzer-5669437462544384 | Bin 0 -> 284427 bytes + ...ase-minimized-hb-subset-fuzzer-5670861909524480 | Bin 0 -> 1298 bytes + ...ase-minimized-hb-subset-fuzzer-5696607199166464 | Bin 0 -> 28 bytes + ...ase-minimized-hb-subset-fuzzer-5711951464759296 | Bin 0 -> 284521 bytes + ...ase-minimized-hb-subset-fuzzer-5747265633779712 | Bin 0 -> 177090 bytes + ...ase-minimized-hb-subset-fuzzer-5750092395970560 | Bin 0 -> 72435 bytes + ...ase-minimized-hb-subset-fuzzer-5758598970343424 | Bin 0 -> 64 bytes + ...ase-minimized-hb-subset-fuzzer-6543700493598720 | Bin 0 -> 138425 bytes + ...ase-minimized-hb-subset-fuzzer-6651660668502016 | Bin 0 -> 15229 bytes + ...b-subset-get-codepoints-fuzzer-5203067375976448 | Bin 0 -> 16310 bytes + ...b-subset-get-codepoints-fuzzer-5630904853069824 | Bin 0 -> 580 bytes + ...b-subset-get-codepoints-fuzzer-5687638085337088 | Bin 0 -> 1206 bytes + ...b-subset-get-codepoints-fuzzer-5736539338833920 | Bin 0 -> 512 bytes + ...b-subset-get-codepoints-fuzzer-5973295416475648 | Bin 0 -> 109 bytes + ...b-subset-get-codepoints-fuzzer-6136125075750912 | Bin 0 -> 65816 bytes + ...b-subset-get-codepoints-fuzzer-6394290358976512 | Bin 0 -> 1868 bytes + test/fuzzing/run-shape-fuzzer-tests.py | 4 + + test/shaping/data/in-house/tests/fuzzed.tests | 84 +++++++++++++++++++++ + 87 files changed, 89 insertions(+) + +commit 2137582c9696b6e38d70b4a0d4199b315c9fd4ce +Author: Behdad Esfahbod +Date: Tue Oct 16 14:46:07 2018 -0700 + + [morx] Reword ligation + + Still fails MORX-41. Am talking to Sascha to better understand what CoreText + is doing. + + src/hb-aat-layout-morx-table.hh | 25 ++++++++++++---------- + test/shaping/data/text-rendering-tests/DISABLED | 2 ++ + .../data/text-rendering-tests/Makefile.sources | 2 +- + 3 files changed, 17 insertions(+), 12 deletions(-) + +commit c53a25c6579a4d3fe8e6a6fc198d70add41035ec +Author: Behdad Esfahbod +Date: Tue Oct 16 13:57:35 2018 -0700 + + [morx] Comment + + src/hb-aat-layout-morx-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c46d42f8f2c303817467c6a4e19d69d0e433dba6 +Author: Behdad Esfahbod +Date: Tue Oct 16 13:39:54 2018 -0700 + + [test/text-rendering-tests] Update from upstream + + test/shaping/data/text-rendering-tests/Makefile.sources | 1 + + .../text-rendering-tests/fonts/TestMORXFourtyone.ttf | Bin 0 -> 2248 bytes + .../data/text-rendering-tests/tests/MORX-41.tests | 4 ++++ + 3 files changed, 5 insertions(+) + +commit 5eb7e7f6461bcf5b1e1d8ccb49eb904382762533 +Author: Behdad Esfahbod +Date: Tue Oct 16 13:32:52 2018 -0700 + + Revert "[vector] Simplify Sort" and "More of the same" + + This reverts commit de0b9a466490c2c13d6ec6f59d5122b0a87d3180. + This reverts commit 921f0e6ec722940a1e37660e1291aa69f9f39db8. + + Annnnd, revert. MSVC doesn't like it. + + src/hb-vector.hh | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +commit 661340c475dc928f227d54b3f36eaf6f41c2b6e3 +Author: Behdad Esfahbod +Date: Tue Oct 16 13:24:29 2018 -0700 + + [kern] Scale kern pairs before applying + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1255 + Fixes https://github.com/harfbuzz/harfbuzz/issues/1252 + + src/hb-ot-kern-table.hh | 18 ++++++++++++------ + src/hb-ot-shape-fallback.cc | 2 +- + 2 files changed, 13 insertions(+), 7 deletions(-) + +commit de0b9a466490c2c13d6ec6f59d5122b0a87d3180 +Author: Behdad Esfahbod +Date: Mon Oct 15 22:20:26 2018 -0700 + + [vector] More of the same + + src/hb-vector.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 921f0e6ec722940a1e37660e1291aa69f9f39db8 +Author: Behdad Esfahbod +Date: Mon Oct 15 22:19:17 2018 -0700 + + [vector] Simplify sort + + Hopefully this fits fine with SFINAE with all our compilers. + + src/hb-vector.hh | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +commit 61510b63c15e91d80e36a497260db0e2d6d36c66 +Author: Ebrahim Byagowi +Date: Tue Oct 16 14:17:21 2018 +0330 + + [test] Minor cleanup in test-multithread and test-ot-name (#1256) + + test/api/CMakeLists.txt | 2 +- + test/api/Makefile.am | 2 +- + test/api/test-multithread.c | 6 ++- + test/api/{test-ot-nameid.c => test-ot-name.c} | 58 ++++++++++++++------------- + 4 files changed, 36 insertions(+), 32 deletions(-) + +commit 42b75dc3a701b13665115e2a234bfa5dedafef3f +Author: Ebrahim Byagowi +Date: Tue Oct 16 10:58:09 2018 +0330 + + [kerx] Minor, remove debug bit + + src/hb-aat-layout-kerx-table.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 11703afce6cebbb4c5e7cdea59ca59a1787608b8 +Author: Behdad Esfahbod +Date: Mon Oct 15 21:16:58 2018 -0700 + + [kerx] Fix Format6 sanitize + + Fixes https://oss-fuzz.com/v2/testcase-detail/5650286710882304 + + src/hb-aat-layout-kerx-table.hh | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) + +commit 4c27da7638f6d072c3ff93223488c4ab316236c1 +Author: Behdad Esfahbod +Date: Mon Oct 15 19:46:45 2018 -0700 + + [CBDT] Fix more offsetting + + Fixes https://oss-fuzz.com/v2/testcase-detail/5750379279548416 + + src/hb-ot-color-cbdt-table.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 9ade3e7bb81be43b3c0811614b9b9533127894b0 +Merge: 6420ffe0 0f85edb7 +Author: Michiharu Ariza +Date: Mon Oct 15 14:03:23 2018 -0700 + + Merge branch 'master' into cff-subset + +commit 6420ffe00fc4f4c6ffa63b80d961f70bc36c2caf +Author: Michiharu Ariza +Date: Mon Oct 15 14:03:18 2018 -0700 + + fixed type casting bug + + src/hb-cff-interp-common.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0f85edb7781f4d5ec2de676979be75a0f6559d80 +Author: Behdad Esfahbod +Date: Mon Oct 15 11:15:54 2018 -0700 + + [morx] Another end-of-text corner case + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10990 + + src/hb-aat-layout-morx-table.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 55d5ea666c25f75e9b1bc2eb43cfb104a16ebe04 +Author: Behdad Esfahbod +Date: Mon Oct 15 11:04:49 2018 -0700 + + [kerx] Merge clusters in Ligature + + src/hb-aat-layout-morx-table.hh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit bb35725cd760f07fdb0586453512a106e534b739 +Author: Behdad Esfahbod +Date: Mon Oct 15 10:20:39 2018 -0700 + + [kerx/morx] More end-of-text protection + + src/hb-aat-layout-kerx-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8f3048a1f838484babc4948754c16dda8f53daf1 +Author: Ebrahim Byagowi +Date: Mon Oct 15 12:16:47 2018 +0330 + + [dump-emoji] minor + + src/dump-emoji.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 27e095a613ed0a753231405cab887da19e9aecd1 +Author: Ebrahim Byagowi +Date: Mon Oct 15 12:04:14 2018 +0330 + + [dump-emoji] better explaination of the usage + + src/dump-emoji.cc | 21 ++++++++++++++++++++- + 1 file changed, 20 insertions(+), 1 deletion(-) + +commit 8dc6296818e3a52c003852aa185f2b7eb6afa5d3 +Author: Behdad Esfahbod +Date: Mon Oct 15 01:09:05 2018 -0700 + + [ot-font] Implement TrueType v_origin + + Fixes https://github.com/harfbuzz/harfbuzz/issues/537 + + src/hb-ot-font.cc | 31 +++++++++++++++++- + src/hb-ot-hmtx-table.hh | 43 ++++++++++++++++--------- + test/shaping/data/in-house/tests/vertical.tests | 2 +- + 3 files changed, 59 insertions(+), 17 deletions(-) + +commit 6e07076fd094afc8c9c8ad8f08453e7882294592 +Author: Behdad Esfahbod +Date: Sun Oct 14 22:22:45 2018 -0700 + + [blob] Fix UBSan error + + src/hb-blob.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit fc812faaa96aa4e67814a92376b2da751d5a0aba +Author: Behdad Esfahbod +Date: Sun Oct 14 21:32:09 2018 -0700 + + [CBDT] Fix more offsetting issues + + Fixes https://github.com/harfbuzz/harfbuzz/issues/960 + + dump-emoji still segfaults. Needs debugging. + + src/hb-ot-color-cbdt-table.hh | 28 +++++++++++++++------------- + 1 file changed, 15 insertions(+), 13 deletions(-) + +commit 6aee3bb87cee88525b745a640df294cb721245f6 +Author: Behdad Esfahbod +Date: Sun Oct 14 21:08:42 2018 -0700 + + [CBDT] Fix offset handling + + Fixes https://github.com/harfbuzz/harfbuzz/issues/960 + + src/hb-ot-color-cbdt-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit da744c6b3e79b778f414ec9f4d9070d06ec2a706 +Author: Behdad Esfahbod +Date: Sun Oct 14 20:49:21 2018 -0700 + + [CBDT] More UnsizedArrayOf cleanup + + src/hb-ot-color-cbdt-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2995b4465bce52b30de2cb6ba24cc80d8602413d +Author: Behdad Esfahbod +Date: Sun Oct 14 20:37:57 2018 -0700 + + [CBDT] Simplify sanitize + + src/hb-ot-color-cbdt-table.hh | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +commit 1c76c8f6ff7877e486f6e94d04b2dc65348b26d5 +Author: Behdad Esfahbod +Date: Sun Oct 14 19:39:31 2018 -0700 + + [morx] Handle end-of-text conditions in Insertion + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10955 + + src/hb-aat-layout-morx-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 60c13976733ea05e71c66c486d62e31ffbb71bac +Author: Behdad Esfahbod +Date: Sun Oct 14 19:36:46 2018 -0700 + + [buffer] Fix output_glyph at end of buffer + + Part of https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10955 + + src/hb-buffer.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 7efa38257b6f79d1c6e2a9bad29c33af276abe29 +Author: Behdad Esfahbod +Date: Sun Oct 14 19:30:44 2018 -0700 + + [aat] More protection against buffer fail + + src/hb-aat-layout-common.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit e1add2a275a8afa5efc22aa44a4e62646f0b0ba4 +Author: Behdad Esfahbod +Date: Sun Oct 14 16:26:03 2018 -0700 + + [hmtx] Whitespace + + src/hb-ot-hmtx-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 62376a7d983442408059b0b8987e7ca8d1de154e +Author: Behdad Esfahbod +Date: Sun Oct 14 15:20:50 2018 -0700 + + Ignore signed-integer-overflow while kerning + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1247 + + src/hb-ot-kern-table.hh | 1 + + src/hb.hh | 9 +++++++++ + 2 files changed, 10 insertions(+) + +commit 40f2b9355cf827c7b82ea5e55b112ce0032a9abf +Author: Behdad Esfahbod +Date: Sun Oct 14 14:56:32 2018 -0700 + + [kerx] Fix Format1 sanitize + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10948 + + src/hb-aat-layout-kerx-table.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 44af1f93ee32e236a5c14085c72d3fa102a14f5e +Author: Behdad Esfahbod +Date: Sun Oct 14 14:52:17 2018 -0700 + + [aat] Whitespace + + src/hb-aat-layout-common.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit db0d83ddc73ecf50ec4489fc10eddf3fa5835ae2 +Merge: 9228db06 56b8dd17 +Author: Michiharu Ariza +Date: Sat Oct 13 17:25:38 2018 -0700 + + Merge branch 'master' into cff-subset + +commit 9228db06f46908afd0e62f5964470c37c66ba91f +Author: Michiharu Ariza +Date: Sat Oct 13 17:25:09 2018 -0700 + + added CFF1 Expert Encoding subset test & bug fixes + + src/hb-ot-cff1-table.hh | 8 +++++++- + src/hb-subset-cff1.cc | 10 ++++++++-- + test/api/fonts/cff1_expert.2D,F6E9,FB00.otf | Bin 0 -> 3096 bytes + test/api/fonts/cff1_expert.otf | Bin 0 -> 3656 bytes + test/api/test-subset-cff1.c | 21 +++++++++++++++++++++ + 5 files changed, 36 insertions(+), 3 deletions(-) + +commit 56b8dd17f677ffe97e4d917c47924e1ac7632c71 +Author: Behdad Esfahbod +Date: Sat Oct 13 19:03:33 2018 -0400 + + [aat] Finish off massaging table + + src/hb-aat-layout.cc | 163 +++++++++++++++++++++++++-------------------------- + 1 file changed, 81 insertions(+), 82 deletions(-) + +commit e0c5e0d91bbc0c8b2bb547ba5cb118989affc617 +Author: Behdad Esfahbod +Date: Sat Oct 13 18:37:14 2018 -0400 + + [aat] WIP remove feature mapping here from hb-coretext + + Need to map enum values to numerics since we don't have CoreText headers. + + src/hb-aat-layout.cc | 94 +++++++++++++++++++++++++ + src/hb-aat-layout.hh | 22 ++++++ + src/hb-coretext.cc | 189 +-------------------------------------------------- + 3 files changed, 117 insertions(+), 188 deletions(-) + +commit cb057749131826dd89bc3b92527116a974ae3bbe +Author: Behdad Esfahbod +Date: Sat Oct 13 17:03:32 2018 -0400 + + [coretext] Prepare AAT feature mapping to be moved + + src/hb-coretext.cc | 39 ++++++++++++++++++++++----------------- + 1 file changed, 22 insertions(+), 17 deletions(-) + +commit de6e414c565de5f27b9da8c7b8b11f88659a4c42 +Author: Behdad Esfahbod +Date: Sat Oct 13 13:48:22 2018 -0400 + + [kerx] Sanitize more + + src/hb-aat-layout-kerx-table.hh | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 71f76f2f39c88998b430b171c99b85818d4fa0ab +Author: Behdad Esfahbod +Date: Sat Oct 13 13:36:27 2018 -0400 + + [kerx] Fix-up previous commit + + A "&" was missing. Go back to using pointers that are less error-prone. + + src/hb-aat-layout-kerx-table.hh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 6d4b054234b4736ca9927268ee3e2d9a0f8f6ead +Author: Behdad Esfahbod +Date: Sat Oct 13 12:20:33 2018 -0400 + + [kerx] Use sanitizer instead of handcoded runtime sanitization + + src/hb-aat-layout-kerx-table.hh | 24 +++++++++--------------- + 1 file changed, 9 insertions(+), 15 deletions(-) + +commit 5733113662e668a25187e0042935d955e44fb488 +Author: Behdad Esfahbod +Date: Sat Oct 13 12:16:12 2018 -0400 + + [kerx] Wire up context down to get_kerning + + src/hb-aat-layout-kerx-table.hh | 32 ++++++++++++++------------------ + 1 file changed, 14 insertions(+), 18 deletions(-) + +commit c4502833b711a76cce1af0c5bf075692b965c991 +Author: Behdad Esfahbod +Date: Sat Oct 13 11:48:49 2018 -0400 + + [kerx] Use sanitizer.get_num_glyphs() instead of face->get_num_glyphs() + + src/hb-aat-layout-kerx-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit fc45e698f2d8a6d577f33b1e69a83714aceae528 +Author: Behdad Esfahbod +Date: Sat Oct 13 11:39:12 2018 -0400 + + [kerx] Protext against overflows + + src/hb-aat-layout-kerx-table.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit ed2ee78136c40de8e7b915dfdfd3ca92880912c3 +Author: Behdad Esfahbod +Date: Sat Oct 13 09:47:51 2018 -0400 + + [hangul] Fix use-after-free issue + + out_info might have moved since we copied it's position into local + info var. + + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=894937 + + src/hb-ot-shape-complex-hangul.cc | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +commit 63109432cf61333e01af4ef5163d4202bb43f84d +Author: Ebrahim Byagowi +Date: Sat Oct 13 14:00:05 2018 +0330 + + Cosmetic and minor changes + + src/hb-buffer-serialize.cc | 4 +- + src/hb-ot-cmap-table.hh | 4 +- + src/hb-ot-layout-common.hh | 4 +- + src/hb-ot-layout-gsubgpos.hh | 8 +-- + src/hb-ot-layout.cc | 127 +++++++++++++++++++------------------------ + src/hb-ot-layout.h | 25 +++++---- + src/hb-ot-math-table.hh | 8 +-- + src/hb-ot-name.h | 1 - + src/hb-ot-shape-complex.hh | 18 +++--- + 9 files changed, 93 insertions(+), 106 deletions(-) + +commit b64ef69b9e3d9cd4e81a2149cea3fe6e9e371cac +Author: Michiharu Ariza +Date: Fri Oct 12 14:14:21 2018 -0700 + + from encode_int removed assert hit by fuzzer + + clamp the value instead + + src/hb-subset-cff-common.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit c0a6814b49e376984a0cae9d385a6f6ba8c73579 +Author: Behdad Esfahbod +Date: Fri Oct 12 16:05:56 2018 -0400 + + Touch up new API + + New API: + +hb_ot_layout_feature_get_name_ids() + +hb_ot_layout_feature_get_characters() + + src/hb-ot-layout.cc | 16 +++++++++------- + src/hb-ot-layout.h | 2 -- + test/api/test-ot-nameid.c | 16 ++++++++++------ + 3 files changed, 19 insertions(+), 15 deletions(-) + +commit 477bc9aafeaf89708d13a436869126351e2d9b50 +Author: Behdad Esfahbod +Date: Fri Oct 12 15:52:31 2018 -0400 + + Add hb-ot-name.h + + Actual name-fetching API to come later. + + New API: + hb_name_id_t + HB_NAME_ID_INVALID + + src/Makefile.sources | 1 + + src/hb-ot-layout-common.hh | 2 +- + src/hb-ot-layout.h | 12 ++--------- + src/hb-ot-name.h | 54 ++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot.h | 1 + + 5 files changed, 59 insertions(+), 11 deletions(-) + +commit dc49bd8d813571fe16d9e5342e4a3926ff947bd6 +Author: Ebrahim Byagowi +Date: Fri Oct 12 03:00:59 2018 +0330 + + Add two APIs for getting stylistic set labels + + * hb_ot_layout_feature_get_characters + * hb_ot_layout_feature_get_name_ids + + However HarfBuzz currently doesn't expose an API for retrieving the actual + information associated with NameId from the `name` table and that should be + done separately. + + docs/harfbuzz-sections.txt | 2 + + src/hb-ot-layout-common.hh | 14 +++++ + src/hb-ot-layout.cc | 133 +++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout.h | 29 ++++++++++ + test/api/CMakeLists.txt | 2 + + test/api/Makefile.am | 1 + + test/api/fonts/cv01.otf | Bin 0 -> 1956 bytes + test/api/test-ot-nameid.c | 96 ++++++++++++++++++++++++++++++++ + 8 files changed, 277 insertions(+) + +commit e9f9c0d81c73d8b6d87700aadb5b886bd289769a +Author: Behdad Esfahbod +Date: Thu Oct 11 21:37:45 2018 -0400 + + [sanitize] Reorder condition to silence bogus gcc warning + + Was givin a dozen of: + + ../../src/hb-machinery.hh: In member function ‘bool AAT::ankr::sanitize(hb_sanitize_context_t*) const’: + ../../src/hb-machinery.hh:307:23: warning: missed loop optimization, the loop counter may overflow [-Wunsafe-loop-optimizations] + bool ok = --this->max_ops > 0 && + ~~~~~~~~~~~~~~~~~~~~~~ + this->start <= p && + ~~~~~~~~~~~~~~~~~~~ + p <= this->end && + ~~~~~~~~~~~~~~~^~ + (unsigned int) (this->end - p) >= len; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + I believe those are bogus, but this silences them and does not introduce + logic issues I believe. + + src/hb-machinery.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 1a6b5ac6c300ed2ccdcd8eadde433120f6e07f2a +Author: Behdad Esfahbod +Date: Thu Oct 11 21:22:49 2018 -0400 + + Add HB_DEPRECATED_FOR and mark relevant symbols + + src/hb-common.h | 8 ++++++++ + src/hb-deprecated.h | 10 +++++----- + src/hb-graphite2.h | 2 +- + 3 files changed, 14 insertions(+), 6 deletions(-) + +commit c9413d7bb575093411b39ac21974795b6ad91454 +Author: Behdad Esfahbod +Date: Thu Oct 11 21:19:39 2018 -0400 + + [graphite] Add HB_DEPRECATED annotation + + src/hb-graphite2.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 68c86af187ff645a1305ac3b64832f3bb2350519 +Author: Behdad Esfahbod +Date: Thu Oct 11 21:18:20 2018 -0400 + + Always compile deprecated symbols + + We haven't been keeping this updated. So, while we don't expose the + symbols in the headers if HB_DISABLE_DEPRECATED is defined, we still + always build them. + + src/hb-font.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit fc0153a1d4903a57b21974cc8d0b0a82d7bc43dc +Merge: 7d99a6ce c5510000 +Author: Michiharu Ariza +Date: Fri Oct 12 12:16:50 2018 -0700 + + Merge branch 'master' into cff-subset + +commit 7d99a6cef80ec178c10dcf0e848394614c5e6912 +Author: Michiharu Ariza +Date: Fri Oct 12 02:16:07 2018 -0700 + + overhauled error handling in CFF interpreter + + minimized "if (error) return false" idiom + + src/hb-cff-interp-common.hh | 138 +++++++++++++++++++++++---------------- + src/hb-cff-interp-cs-common.hh | 43 ++++++------ + src/hb-cff-interp-dict-common.hh | 72 +++++++++++--------- + src/hb-cff1-interp-cs.hh | 72 +++++++++++--------- + src/hb-cff2-interp-cs.hh | 50 +++++++------- + src/hb-ot-cff1-table.hh | 91 +++++++++++--------------- + src/hb-ot-cff2-table.hh | 71 +++++++++----------- + 7 files changed, 281 insertions(+), 256 deletions(-) + +commit c55100000bc20d7c8319cfc54294215a923ffc25 +Author: David Corbett +Date: Thu Oct 11 22:08:14 2018 -0400 + + Add missing colons to GObject annotations + + src/hb-ot-tag.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1e816d62efe1b3540ef605092b97794e68ec0832 +Author: David Corbett +Date: Thu Oct 11 20:37:49 2018 -0400 + + Fix Indic script tags in Graphite + + src/hb-graphite2.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bf8469be9a8932cc407b60daf4d494fef46e233b +Author: Behdad Esfahbod +Date: Thu Oct 11 20:45:00 2018 -0400 + + Attach CursivePositioning backwards, not forward + + This is how Uniscribe does it. So, adjust. This is only relevant + to fonts that apply cursive positioning from a contextual lookup. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1181 + + src/hb-ot-layout-gpos-table.hh | 20 ++++++++++---------- + .../9fc3e6960b3520e5304033ef5fd540285f72f14d.ttf | Bin 0 -> 2380 bytes + .../data/in-house/tests/cursive-positioning.tests | 1 + + 3 files changed, 11 insertions(+), 10 deletions(-) + +commit bdb53ca24a5ad9671d8e29e17d1d8981505bd882 +Author: Behdad Esfahbod +Date: Thu Oct 11 20:20:00 2018 -0400 + + [myanmar] Implement Zawgyi shaper + + Enabled if script tag 'Qaag' is passed to HarfBuzz. Disables mark + advance-zeroing and fallback mark-positioning. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1162 + + src/hb-ot-shape-complex-myanmar.cc | 22 +++++++++++++++++++++ + src/hb-ot-shape-complex.hh | 5 +++++ + src/hb.hh | 8 ++++++++ + test/shaping/data/in-house/Makefile.sources | 1 + + .../ab14b4eb9d7a67e293f51d30d719add06c9d6e06.ttf | Bin 0 -> 1792 bytes + .../data/in-house/tests/myanmar-zawgyi.tests | 1 + + 6 files changed, 37 insertions(+) + +commit 00c5c4a79dfb352a679a5c56bf9c756ab0fa98d2 +Author: Behdad Esfahbod +Date: Thu Oct 11 20:15:31 2018 -0400 + + [myanmar] Shuffle + + src/hb-ot-shape-complex-myanmar.cc | 33 +++++++++++++++++---------------- + 1 file changed, 17 insertions(+), 16 deletions(-) + +commit ec8f493bf9fefc33f027db24c4b175990b2d751c +Author: Behdad Esfahbod +Date: Thu Oct 11 20:15:00 2018 -0400 + + [graphite] Remove assert + + src/hb-graphite2.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 5646dcbd1125049c3af342fadfcfcbd523ce53d3 +Author: Behdad Esfahbod +Date: Thu Oct 11 19:39:07 2018 -0400 + + Minor + + src/hb-ot-tag.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 788e1478557603d30966f12449eef0d0bd51c880 +Author: Behdad Esfahbod +Date: Thu Oct 11 19:24:52 2018 -0400 + + [test] Add test for USE indic3 + + test/shaping/data/in-house/Makefile.sources | 1 + + .../fonts/3c96e7a303c58475a8c750bf4289bbe73784f37d.ttf | Bin 0 -> 3364 bytes + test/shaping/data/in-house/tests/use-indic3.tests | 1 + + 3 files changed, 2 insertions(+) + +commit a11972787a2a90b541f92cc56bb885859390a0c0 +Author: Behdad Esfahbod +Date: Thu Oct 11 19:23:36 2018 -0400 + + Minor + + test/shaping/record-test.sh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 654365dc894326f04abaaba415f48ca5ba2d1286 +Author: Behdad Esfahbod +Date: Thu Oct 11 17:51:21 2018 -0400 + + Pass indic3 tags to USE shaper + + Fixes https://github.com/harfbuzz/harfbuzz/issues/539 + + src/hb-ot-shape-complex.hh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 28d091d045b042506a1ec2cdefe7cf0d718e8b22 +Author: David Corbett +Date: Thu Oct 11 17:15:22 2018 -0400 + + Parse Indic3 tags + + src/hb-ot-tag.cc | 11 ++++++++--- + test/api/test-ot-tag.c | 44 +++++++++++++++++++++++++------------------- + 2 files changed, 33 insertions(+), 22 deletions(-) + +commit 211cd3691ba01b1cb2eeb8a91ac3532181791a8a +Author: Behdad Esfahbod +Date: Thu Oct 11 17:31:29 2018 -0400 + + Remove remains of get-codepoint-fuzzer + + test/fuzzing/CMakeLists.txt | 7 +------ + test/fuzzing/run-subset-fuzzer-tests.py | 12 ------------ + 2 files changed, 1 insertion(+), 18 deletions(-) + +commit 120ed0272569e6a34172a511d4a5a70a3a18f1d2 +Author: Behdad Esfahbod +Date: Thu Oct 11 17:08:12 2018 -0400 + + [fuzzing] Fold get-codepoints-fuzzer into subset-fuzzer + + test/fuzzing/Makefile.am | 16 ---------------- + test/fuzzing/hb-subset-fuzzer.cc | 5 +++++ + test/fuzzing/hb-subset-get-codepoints-fuzzer.cc | 23 ----------------------- + 3 files changed, 5 insertions(+), 39 deletions(-) + +commit 2c824d3644e16643c2bbe85fb88f9fb6fed53ce7 +Author: Behdad Esfahbod +Date: Thu Oct 11 16:41:01 2018 -0400 + + [aat] Fix two wrongs that made a right before! + + Unfortunately our static asserts (DEFINE_SIZE_STATIC) don't actually + fail when used in templates, thanks to SFINAE. Le sighs. + + Probably fixes https://oss-fuzz.com/v2/testcase-detail/5740171484463104 + + src/hb-aat-layout-common.hh | 4 ++-- + src/hb-open-type.hh | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit e940530c9723c3a581a5d5b31e5f419865dd6cc7 +Author: Behdad Esfahbod +Date: Thu Oct 11 15:56:17 2018 -0400 + + [aat] Fix mul overflow + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10897 + + src/hb-aat-layout-common.hh | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +commit 1d995a340b9e17fc8dca7a3e88e0918de2d8f02c +Author: Behdad Esfahbod +Date: Thu Oct 11 15:42:54 2018 -0400 + + Minor + + test/api/hb-subset-test.h | 6 ++---- + test/api/test-multithread.c | 5 +---- + test/fuzzing/main.cc | 2 +- + 3 files changed, 4 insertions(+), 9 deletions(-) + +commit 0744a02cb12e4d800abb611dfa5d268bb2dfd9f3 +Author: Behdad Esfahbod +Date: Thu Oct 11 15:14:18 2018 -0400 + + [arabic] Update to latest UTR#53 + + From Lorna Evans: "That was a new character added to Unicode 11.0" + + src/hb-ot-shape-complex-arabic.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 57b05210b1a8968d18ccbbe70879b2e11b6a09f2 +Author: Behdad Esfahbod +Date: Thu Oct 11 15:03:21 2018 -0400 + + [test] Fix use of deprecated symbols + + test/api/test-ot-tag.c | 60 ++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 46 insertions(+), 14 deletions(-) + +commit ca37172ee3908bac12cc3d97768b95ae571530d2 +Author: Michiharu Ariza +Date: Thu Oct 11 11:55:55 2018 -0700 + + fixed leak + + test/api/test-ot-extents-cff.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 4f9e36e8cf5d9d3d3e5a1ed46149355ee5f5e9fb +Author: Behdad Esfahbod +Date: Thu Oct 11 14:32:59 2018 -0400 + + [graphite] Remove deprecated symbol use + + src/hb-graphite2.cc | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit da591f2a9d2ae2a5878d3b2ef78a6d589b19aab0 +Author: Behdad Esfahbod +Date: Thu Oct 11 14:30:15 2018 -0400 + + Whitespace + + src/hb-ot-tag.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 4d205f0462b19f371df495b9cc12c0128f507de9 +Author: Behdad Esfahbod +Date: Thu Oct 11 14:25:48 2018 -0400 + + [graphite] Fix deva/dev2 resolution + + See https://github.com/harfbuzz/harfbuzz/pull/730#issuecomment-428277800 + + src/hb-graphite2.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8061664ad1a5933098adc3bc1dca0b5be48586ef +Author: Behdad Esfahbod +Date: Thu Oct 11 14:16:55 2018 -0400 + + Add doc stubs for recently added API + + Thanks to David Corbett who revamped our script and language processing + and implemented full BCP 47 support. + + https://github.com/harfbuzz/harfbuzz/pull/730 + + New API: + +hb_ot_layout_table_select_script() + +hb_ot_layout_script_select_language() + +HB_OT_MAX_TAGS_PER_SCRIPT + +HB_OT_MAX_TAGS_PER_LANGUAGE + +hb_ot_tags_from_script_and_language() + +hb_ot_tags_to_script_and_language() + + Deprecated API: + -hb_ot_layout_table_choose_script() + -hb_ot_layout_script_find_language() + -hb_ot_tags_from_script() + -hb_ot_tag_from_language() + + src/hb-ot-layout.cc | 10 ++++++++++ + src/hb-ot-tag.cc | 21 ++++++++++++++++----- + src/hb-ot-tag.h | 10 ++++++++++ + src/hb-unicode.h | 2 +- + 4 files changed, 37 insertions(+), 6 deletions(-) + +commit cf975ac653bff369f4ed7ba7fc04fae6ce2cec95 +Author: Behdad Esfahbod +Date: Thu Oct 11 14:07:44 2018 -0400 + + Remove use of deprecated function + + src/hb-ot-layout.cc | 23 ++++++++++++----------- + src/hb-ot-layout.h | 12 ++++++------ + 2 files changed, 18 insertions(+), 17 deletions(-) + +commit 66790d64c7120b75c72bf91c769dc52d95858909 +Author: David Corbett +Date: Mon Sep 10 13:15:00 2018 -0400 + + Increase HB_OT_MAX_TAGS_PER_SCRIPT to 3 + + No script has 3 tags yet, but the plan is for the Indic scripts to each + get a third tag someday. + + src/hb-ot-tag.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bca7a16938609539e4adb5cdf943734b7dfa1561 +Author: David Corbett +Date: Mon Sep 10 12:05:51 2018 -0400 + + Update language system tag registry to OT 1.8.3 + + src/gen-tag-table.py | 10 +++++++++- + src/hb-ot-tag-table.hh | 44 +++++++++++++++++++++++++++++++++----------- + 2 files changed, 42 insertions(+), 12 deletions(-) + +commit 7f1fbfe2e312f397db9271dd17a8e701489ffc79 +Author: David Corbett +Date: Mon Jul 23 21:19:23 2018 -0400 + + Add hb_ot_tags_to_script_and_language + + docs/harfbuzz-sections.txt | 3 +- + src/hb-ot-map.cc | 2 +- + src/hb-ot-tag.cc | 75 ++++++++++++++++++++++++++++++++++++++++------ + src/hb-ot-tag.h | 18 +++++++---- + test/api/test-ot-tag.c | 33 ++++++++++++++++++-- + 5 files changed, 112 insertions(+), 19 deletions(-) + +commit 3f8877473fb4c72a6f3edfcfc927b9993a5f3616 +Author: David Corbett +Date: Thu Jul 19 13:48:07 2018 -0400 + + Switch on the first char of a complex language tag + + This results in a tenfold speed-up for the common case of tags that are + not complex, in the sense of `hb_ot_tags_from_complex_language`. + + src/gen-tag-table.py | 171 ++++-- + src/hb-ot-tag-table.hh | 1580 ++++++++++++++++++++++++------------------------ + 2 files changed, 922 insertions(+), 829 deletions(-) + +commit a754d44195021603306af2a296d06187eda95409 +Author: David Corbett +Date: Mon Jul 16 21:14:48 2018 -0400 + + Map Quechua languages to closest ones with tags + + OpenType only officially maps four ISO 639 codes to Quechua languages, + but prior versions of HarfBuzz also mapped qu to 'QUZ '. Because qu is a + macrolanguage, the mapping now applies to all individual Quechua + languages. OpenType calls 'QUZ ' "Quechua", but it really corresponds to + Cusco Quechua, so the individual Quechua languages should not all + necessarily be mapped to it. + + src/gen-tag-table.py | 32 ++++++++++++++++++++++++++ + src/hb-ot-tag-table.hh | 62 +++++++++++++++++++++++++++----------------------- + 2 files changed, 65 insertions(+), 29 deletions(-) + +commit 65d01f77552a5102ee114d9917fd2ecf091a35c3 +Author: David Corbett +Date: Thu Jan 18 16:33:39 2018 -0500 + + Test deprecated tag fallback in a font + + The font supports the deprecated tag 'DHV ' instead of 'DIV '. dv is + mapped to 'DIV ' and 'DHV ', in that order. The test specifies + `--language=dv`, demonstrating that if a font does not support the first + OpenType tag mapped to a BCP 47 tag, it will fall back to the next tag. + + .../fonts/d3129450fafe5e5c98cfc25a4e71809b1b4d2855.ttf | Bin 0 -> 956 bytes + test/shaping/data/in-house/tests/language-tags.tests | 1 + + 2 files changed, 1 insertion(+) + +commit 7c7cb2a98907d99ca86bdbfca0bf9c48bfa4ed49 +Author: David Corbett +Date: Sat Jan 20 15:53:09 2018 -0500 + + Match extlang subtags + + If the second subtag of a BCP 47 tag is three letters long, it denotes + an extended language. The tag converter ignores the language subtag and + uses the extended language instead. + + There are some grandfathered exceptions, which are handled earlier. + + src/gen-tag-table.py | 2 +- + src/hb-ot-tag-table.hh | 21 +++++++++++++++++++++ + src/hb-ot-tag.cc | 10 +++++++++- + test/api/test-ot-tag.c | 7 +++++++ + 4 files changed, 38 insertions(+), 2 deletions(-) + +commit 2f1f961cc0f0f907916b4b00342d8a2dda8b4ee1 +Author: David Corbett +Date: Fri Dec 8 22:45:52 2017 -0500 + + Autogenerate the BCP 47 to OpenType mappings + + The new script, gen-tag-table.py, generates `ot_languages` automatically + from the [OpenType language system tag registry][ot] and the [IANA + Language Subtag Registry][bcp47] with some manual modifications. If an + OpenType tag maps to a BCP 47 macrolanguage, all the macrolanguage's + individual languages are mapped to the same OpenType tag, except for + individual languages with their own OpenType mappings. Deprecated + BCP 47 tags are canonicalized. + + [ot]: https://docs.microsoft.com/en-us/typography/opentype/spec/languagetags + [bcp47]: https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry + + Some OpenType tags correspond to multiple ISO 639 codes. The mapping + from ISO 639 codes lists OpenType tags in priority order, such that more + specific or more likely tags appear first. + + Some OpenType tags have no corresponding ISO 639 code in the registry so + their mappings use BCP 47 subtags besides the language. For example, any + BCP 47 tag with a fonipa variant subtag is mapped to 'IPPH', and 'IPPH' + is mapped back to und-fonipa. + + Other OpenType tags have no corresponding ISO 639 code because it is not + clear what they are for. HarfBuzz just ignores these tags. + + One such ignored tag is 'ZHP ' (Chinese Phonetic). It probably means + zh-Latn. However, it is used in Microsoft JhengHei and Microsoft YaHei + with the script tag 'hani', implying that it is not a romanization + scheme after all. It would be simple enough to add this mapping to + gen-tag-table.py once a definitive mapping is determined. + + The manual modifications are mainly either obvious mappings that the + OpenType registry omits or mappings for compatibility with previous + versions of HarfBuzz. Some of the old mappings were discarded, though, + for homophonous language names. For example, OpenType maps 'KUI ' to + kxu; previous versions of HarfBuzz also mapped it to kvd, because kvd + and kxu both happen to be called "Kui". + + gen-tag-table.py also generates a function to convert multi-subtag tags + like el-polyton and zh-HK to OpenType tags, replacing `ot_languages_zh` + and the hard-coded list of special cases in `hb_ot_tags_from_language`. + It also generates a function to convert OpenType tags to BCP 47, + replacing the hard-coded list of special cases in + `hb_ot_tag_to_language`. + + src/Makefile.am | 9 +- + src/Makefile.sources | 1 + + src/gen-tag-table.py | 1013 ++++++++++++++++++++++++ + src/hb-ot-tag-table.hh | 1997 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-tag.cc | 842 +------------------- + src/hb-ot-tag.h | 2 +- + test/api/test-ot-tag.c | 66 +- + 7 files changed, 3092 insertions(+), 838 deletions(-) + +commit 2c7d4db7af16e228bb30eddf7334a524b74ae26c +Author: David Corbett +Date: Fri Dec 29 20:19:05 2017 +0800 + + Deprecate obsolete functions + + `hb_ot_tags` replaces `hb_ot_tags_from_script` and + `hb_ot_tag_from_language`. + + `hb_ot_layout_table_select_script` replaces + `hb_ot_layout_table_choose_script`. + + `hb_ot_layout_script_select_language` replaces + `hb_ot_layout_script_find_language`. + + docs/harfbuzz-sections.txt | 8 ++++---- + src/hb-deprecated.h | 23 +++++++++++++++++++++++ + src/hb-ot-layout.h | 15 --------------- + src/hb-ot-tag.h | 8 -------- + 4 files changed, 27 insertions(+), 27 deletions(-) + +commit 91067716f5e7b15d9a642f69019246c83fc7c108 +Author: David Corbett +Date: Fri Dec 8 11:21:14 2017 -0500 + + Refactor the selection of script and language tags + + The old hb-ot-tag.cc functions, `hb_ot_tags_from_script` and + `hb_ot_tag_from_language`, are now wrappers around a new function: + `hb_ot_tags`. It converts a script and a language to arrays of script + tags and language tags. This will make it easier to add new script tags + to scripts, like 'dev3'. It also allows for language fallback chains; + nothing produces more than one language yet though. + + Where the old functions return the default tags 'DFLT' and 'dflt', + `hb_ot_tags` returns an empty array. The caller is responsible for + using the default tag in that case. + + The new function also adds a new private use subtag syntax for script + overrides: "x-hbscabcd" requests a script tag of 'abcd'. + + The old hb-ot-layout.cc functions,`hb_ot_layout_table_choose_script` and + `hb_ot_layout_script_find_language` are now wrappers around the new + functions `hb_ot_layout_table_select_script` and + `hb_ot_layout_script_select_language`. They are essentially the same as + the old ones plus a tag count parameter. + + Closes #495. + + docs/harfbuzz-sections.txt | 5 + + src/hb-ot-layout.cc | 43 +- + src/hb-ot-layout.h | 16 + + src/hb-ot-map.cc | 13 +- + src/hb-ot-tag.cc | 1639 ++++++++++++++++++++++++-------------------- + src/hb-ot-tag.h | 11 + + test/api/test-ot-tag.c | 107 +++ + 7 files changed, 1070 insertions(+), 764 deletions(-) + +commit a03f5f4dfbbf885db567c3909241a55eb5869fce +Author: David Corbett +Date: Thu Dec 28 22:59:29 2017 +0800 + + Replace "ISO 639" with "BCP 47" + + `hb_language_from_string` accepts not only ISO 639 but also BCP 47. Not + all ISO 639 codes are valid BCP 47 tags but the function does not accept + overlong language subtags anyway. + + src/hb-buffer.cc | 2 +- + src/hb-common.cc | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit ce6639cd27f79856466a5e8abf58f544f069e25d +Merge: a6b6faf2 0b9d60e1 +Author: Michiharu Ariza +Date: Thu Oct 11 10:53:48 2018 -0700 + + Merge branch 'master' into cff-subset + +commit a6b6faf2b87f113fb23cf8e040f8b7875e2daf80 +Author: Michiharu Ariza +Date: Thu Oct 11 10:53:44 2018 -0700 + + Replaced CFF1 J subset font for better coverage + + in api test-ot-extents-cff + + test/api/fonts/SourceHanSans-Regular.41,3041,4C2E.otf | Bin 0 -> 3892 bytes + test/api/fonts/SourceHanSans-Regular.41,3041,4E9D.otf | Bin 5864 -> 0 bytes + test/api/fonts/SourceHanSans-Regular.41,4C2E.otf | Bin 0 -> 2548 bytes + test/api/fonts/SourceHanSans-Regular.41,4E9D.otf | Bin 5500 -> 0 bytes + test/api/test-ot-extents-cff.c | 15 +++++++++++++++ + test/api/test-subset-cff1.c | 18 +++++++++--------- + 6 files changed, 24 insertions(+), 9 deletions(-) + +commit 0b9d60e1a1c4b7867ac907bbd7c004191a14e697 +Author: Behdad Esfahbod +Date: Thu Oct 11 13:26:58 2018 -0400 + + [aat] Apply kerx if GPOS kern was not applied + + Ned tells me this is what Apple does. + + src/hb-ot-shape.cc | 18 ++++++++---------- + 1 file changed, 8 insertions(+), 10 deletions(-) + +commit b59a428af08d6451a47f40ed01e594815ebf6303 +Author: Behdad Esfahbod +Date: Thu Oct 11 13:24:17 2018 -0400 + + Minor + + src/hb-ot-shape.cc | 6 +++++- + src/hb-ot-shape.hh | 5 +++-- + 2 files changed, 8 insertions(+), 3 deletions(-) + +commit 100e95f48e3d137c654d206e858d6419ea62a12c +Author: Behdad Esfahbod +Date: Thu Oct 11 11:30:45 2018 -0400 + + [trak] Add tests + + test/shaping/data/in-house/Makefile.sources | 1 + + test/shaping/data/in-house/fonts/TestTRAK.ttf | Bin 0 -> 2456 bytes + test/shaping/data/in-house/tests/aat-trak.tests | 8 ++++++++ + 3 files changed, 9 insertions(+) + +commit 04f72e8990ea61ffc6b62105c75e0a3e1b1ebab4 +Author: Behdad Esfahbod +Date: Thu Oct 11 11:25:07 2018 -0400 + + [trak] Implement extrapolation + + This concludes trak, as well as AAT shaping support! + + src/hb-aat-layout-trak-table.hh | 39 ++++++++++++++++++++------------------- + 1 file changed, 20 insertions(+), 19 deletions(-) + +commit d6a12dba6da6262fd9e5d8397b46ac8516136cae +Author: Behdad Esfahbod +Date: Thu Oct 11 11:10:06 2018 -0400 + + [trak] Fix, and hook up + + Works beautifully! Test coming. + + src/hb-aat-layout-common.hh | 4 ++-- + src/hb-aat-layout-trak-table.hh | 6 ++++-- + src/hb-aat-layout.cc | 25 ++++++++++++++++++++++++- + src/hb-aat-layout.hh | 8 ++++++++ + src/hb-ot-shape.cc | 2 ++ + 5 files changed, 40 insertions(+), 5 deletions(-) + +commit 3d7dea6dfdc9e75dcca100a79525aa3736dbe29c +Author: Behdad Esfahbod +Date: Thu Oct 11 10:32:08 2018 -0400 + + [trak] Handle nSizes=0 and 1 + + src/hb-aat-layout-trak-table.hh | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit 451f3de521ff1b7f4d3b8ebb2cc0b95d88c9314a +Author: Behdad Esfahbod +Date: Thu Oct 11 10:30:32 2018 -0400 + + [trak] Fix counting + + src/hb-aat-layout-trak-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit a5be380cae9b49ed85c8620f1921209ef61a72ad +Author: Behdad Esfahbod +Date: Thu Oct 11 10:29:02 2018 -0400 + + [trak] More + + src/hb-aat-layout-trak-table.hh | 26 +++++++++++++++++--------- + 1 file changed, 17 insertions(+), 9 deletions(-) + +commit d06c4a867f0d383d8c27f2957e646d9e3fe6853b +Author: Behdad Esfahbod +Date: Thu Oct 11 10:22:01 2018 -0400 + + [trak] Only adjust around first glyph + + Assumes graphemes only have one base glyph. + + src/hb-aat-layout-trak-table.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 071a2cbcddcbafae9458e674c21db5001b39518d +Author: Behdad Esfahbod +Date: Thu Oct 11 10:18:46 2018 -0400 + + [trak] Clean up + + src/hb-aat-layout-trak-table.hh | 67 +++++++++++++++++++++++------------------ + 1 file changed, 37 insertions(+), 30 deletions(-) + +commit fbbd926dba163d9a2a6a62f380951f03363c2b14 +Author: Behdad Esfahbod +Date: Thu Oct 11 01:22:29 2018 -0400 + + [kerx] Implement Format4 action_type=1 contour-point-based attachment + + Untested. + + This concludes kerx table support! + + src/hb-aat-layout-kerx-table.hh | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +commit b6bc0d4ff62e4509643db3b304306a72bbcb2c38 +Author: Behdad Esfahbod +Date: Thu Oct 11 01:17:57 2018 -0400 + + [kerx] Implement Format4 action_type=2 coordinate-based attachment + + Untested. + + src/hb-aat-layout-kerx-table.hh | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +commit 1622ba5943d14b2d50d45dc17fb723f4c9ddb0bb +Author: Behdad Esfahbod +Date: Thu Oct 11 01:14:18 2018 -0400 + + [kerx] Implement Format4 'ankr'-based mark attachment + + Tested with Kannada MN: + + $ HB_OPTIONS=aat ./hb-shape Kannada\ MN.ttc -u 0CCD,0C95,0CD6 + [kn_ka.vattu=0+230|kn_ai_length_mark=1@326,0+607] + + src/hb-aat-layout-common.hh | 8 ++++++-- + src/hb-aat-layout-kerx-table.hh | 20 +++++++++++++++++--- + src/hb-aat-layout.cc | 20 ++++++++++++++++---- + src/hb-ot-layout-gpos-table.hh | 4 ---- + 4 files changed, 39 insertions(+), 13 deletions(-) + +commit 7bb4da7d9538f3d4b1d28030d43e0c3d720d821b +Author: Behdad Esfahbod +Date: Thu Oct 11 00:52:07 2018 -0400 + + [aat] Wire up 'ankr' table to apply context + + src/hb-aat-layout-common.hh | 7 +++++-- + src/hb-aat-layout.cc | 8 +++++++- + 2 files changed, 12 insertions(+), 3 deletions(-) + +commit 28f0367aab648c486d6e8d0e13dbbb2af1b65dcc +Author: Behdad Esfahbod +Date: Thu Oct 11 00:12:49 2018 -0400 + + [kerx] Flesh out Format4 + + Doesn't apply actions yet. + + src/hb-aat-layout-kerx-table.hh | 122 ++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 118 insertions(+), 4 deletions(-) + +commit 947962a287d9aca2cb509c11f44cb5150aa6daf1 +Author: Behdad Esfahbod +Date: Wed Oct 10 23:07:03 2018 -0400 + + [ankr] Implement table access + + src/hb-aat-layout-ankr-table.hh | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit 7281cb3eeb00091c6e6085895afd4a38a0516f35 +Author: Behdad Esfahbod +Date: Wed Oct 10 22:56:52 2018 -0400 + + [ankr] Start fixing + + src/hb-aat-layout-ankr-table.hh | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 34caadc5c78e3d09faf11ef60bfade8f64f55de2 +Author: Behdad Esfahbod +Date: Wed Oct 10 22:17:07 2018 -0400 + + Ugh. Re-enable accidentally disabled GPOS + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f7c45bc33ec1559c960a039b770d5c37bd82f057 +Author: Behdad Esfahbod +Date: Wed Oct 10 22:15:13 2018 -0400 + + [kerx] Allow granularly disabling kerning + + src/hb-aat-layout-kerx-table.hh | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit 2b72c4b63d29eea39b646c8a1a1cfc2db732e1a6 +Author: Behdad Esfahbod +Date: Wed Oct 10 21:53:14 2018 -0400 + + [kerx] Comment + + src/hb-aat-layout-kerx-table.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit 9f450f07b0a1593962e3b45d00f2cf93916f3466 +Author: Behdad Esfahbod +Date: Wed Oct 10 21:46:58 2018 -0400 + + [kerx] Make Format1 work + + Tested using Kannada MN: + + $ HB_OPTIONS=aat ./hb-shape Kannada\ MN.ttc -u 0C95,0CCd,C95,CCD + [kn_ka.virama=0+1299|kn_ka.vattu=0+115|_blank=0@-115,0+385] + + $ HB_OPTIONS=aat ./hb-shape Kannada\ MN.ttc -u 0C95,0CCd,C95,CCD --features=-kern + [kn_ka.virama=0+1799|kn_ka.vattu=0+230|_blank=0+0] + + I don't see the GPOS table in the font do the same. ¯\_(ツ)_/¯ + + src/hb-aat-layout-kerx-table.hh | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +commit b5aa5dbb1158a5dfba29f7b119df9b4b319e8489 +Merge: af61c3b1 ab1f30bd +Author: Michiharu Ariza +Date: Wed Oct 10 18:36:35 2018 -0700 + + Merge branch 'master' into cff-subset + +commit af61c3b10f83a00b4862cc0cb92fc9f0856e7dd6 +Author: Michiharu Ariza +Date: Wed Oct 10 18:35:12 2018 -0700 + + added vsindex test & fixed process_vsindex + + src/hb-cff2-interp-cs.hh | 12 +++++----- + test/api/fonts/AdobeVFPrototype_vsindex.otf | Bin 0 -> 7036 bytes + test/api/test-ot-extents-cff.c | 33 ++++++++++++++++++++++++++++ + 3 files changed, 40 insertions(+), 5 deletions(-) + +commit 504cb68fc972c7f606bf9fc62015376382f78f45 +Author: Behdad Esfahbod +Date: Wed Oct 10 21:29:46 2018 -0400 + + Disable mark advance zeroing as well as mark fallback positioning if doing kerx + + src/hb-ot-shape.cc | 50 ++++++++++++++++++++++++++------------------------ + 1 file changed, 26 insertions(+), 24 deletions(-) + +commit 84967537966a76297c89460d95e7336f1bfc332d +Author: Behdad Esfahbod +Date: Wed Oct 10 21:18:37 2018 -0400 + + [kerx] Implement Format1 + + Untested. + + src/hb-aat-layout-kerx-table.hh | 62 +++++++++++++++++++++++++++++++++-------- + src/hb-aat-layout-morx-table.hh | 2 +- + 2 files changed, 52 insertions(+), 12 deletions(-) + +commit c9165f5450b99e6d93e2a168b198384a221eef58 +Author: Behdad Esfahbod +Date: Wed Oct 10 20:43:21 2018 -0400 + + [kerx] More UnsizedArrayOf<> + + src/hb-aat-layout-kerx-table.hh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit ca54eba4846d0afda4601929556617a7ebe51714 +Author: Behdad Esfahbod +Date: Wed Oct 10 20:41:16 2018 -0400 + + [kerx] Fix bound-checking error introduced a couple commits past + + src/hb-aat-layout-kerx-table.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 339036dd970625e03696b4533ced1e25fc4fd131 +Author: Behdad Esfahbod +Date: Wed Oct 10 20:37:22 2018 -0400 + + [kerx] Start fleshing out Format1 + + src/hb-aat-layout-kerx-table.hh | 59 +++++++++++++++++++++++++++++++++++------ + src/hb-aat-layout-morx-table.hh | 2 +- + 2 files changed, 52 insertions(+), 9 deletions(-) + +commit ab1f30bd059f1d2270793e9726b60666b328d2b8 +Author: Behdad Esfahbod +Date: Wed Oct 10 20:10:20 2018 -0400 + + [kerx] Implement Format6 + + Untested. The only Apple font shipping with this format is San Francisco fonts + that use this for their kerx variation tables, which we don't support. + + src/hb-aat-layout-kerx-table.hh | 73 +++++++++++++++++++++++++++++++++-------- + 1 file changed, 60 insertions(+), 13 deletions(-) + +commit c9a2ce9e05f91730a2150b9214dc6a49f31555c1 +Author: Behdad Esfahbod +Date: Wed Oct 10 20:00:44 2018 -0400 + + [kerx] Move bounds-checking to subtable length itself + + src/hb-aat-layout-kerx-table.hh | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +commit 22955b23cdeb48e46cdffd0eb906a855a420c4d1 +Author: Behdad Esfahbod +Date: Wed Oct 10 19:58:20 2018 -0400 + + [kerx] Start fleshing out Format6 + + src/hb-aat-layout-kerx-table.hh | 42 ++++++++++++++++++++++++++++++++--------- + src/hb-open-type.hh | 3 +++ + 2 files changed, 36 insertions(+), 9 deletions(-) + +commit f6aaad9b4ffb42e6cd8398f6439fe420e393c8f6 +Author: Behdad Esfahbod +Date: Wed Oct 10 19:20:06 2018 -0400 + + [kerx] When rejecting variable kerning, also check for tupleCount + + src/hb-aat-layout-kerx-table.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7ed5366d3cfca9c533250cb419e8cc878f32505d +Author: Behdad Esfahbod +Date: Wed Oct 10 19:11:30 2018 -0400 + + [kerx] No-op + + Tested that Format0 works with Kannada MN font: + + $ make -j5 lib -s && HB_OPTIONS=aat ./hb-shape Kannada\ MN.ttc -u 0C95,0CC2 + [kn_ka=0+1000|kn_matra_uu=0@-30,0+1345] + + $ make -j5 lib -s && HB_OPTIONS=aat ./hb-shape Kannada\ MN.ttc -u 0C95,0CC2 --features=-kern + [kn_ka=0+1030|kn_matra_uu=0+1375] + + Note that GPOS does the same with 'dist' feature, and applies the whole difference to the + same glyph: + + $ make -j5 lib -s && ./hb-shape Kannada\ MN.ttc -u 0C95,0CC2 + [kn_ka=0+970|kn_matra_uu=0+1375] + + $ make -j5 lib -s && ./hb-shape Kannada\ MN.ttc -u 0C95,0CC2 --features=-dist + [kn_ka=0+1030|kn_matra_uu=0+1375] + + src/hb-aat-layout-kerx-table.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 7fa69e92ca3dd9d8fa92aba0e01098165d2b7975 +Author: Behdad Esfahbod +Date: Wed Oct 10 19:02:32 2018 -0400 + + Comment + + src/hb-machinery.hh | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 7e6e5bf6147596d6d096e2ba37f3a6eefd7429cd +Author: Behdad Esfahbod +Date: Wed Oct 10 18:59:07 2018 -0400 + + Fix option string matching + + src/hb-common.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5d34164d98f04816aafaa0abfc44cd899c7d70b3 +Author: Behdad Esfahbod +Date: Wed Oct 10 18:14:41 2018 -0400 + + [kern/kerx] Fix offset base + + Disable kern Format2. + + Fix kerx Format2. Manually tested this with Tamil MN font and it works: + + $ HB_OPTIONS=aat ./hb-shape Tamil\ MN.ttc -u 0B94,0B95 + [tgv_au=0+3435|tgc_ka=1@-75,0+1517] + + HB_OPTIONS=aat ./hb-shape Tamil\ MN.ttc -u 0B94,0B95 --features=-kern + [tgv_au=0+3510|tgc_ka=1+1592] + + src/hb-aat-layout-kerx-table.hh | 73 +++++++++++++++++++++++++---------------- + src/hb-ot-kern-table.hh | 7 ++++ + 2 files changed, 52 insertions(+), 28 deletions(-) + +commit 60f86d32d7c735ccf783b382e18ecdc096eaa682 +Author: Behdad Esfahbod +Date: Wed Oct 10 18:10:05 2018 -0400 + + [kerx] Don't loop over kerning subtables if kerning disabled + + src/hb-aat-layout-kerx-table.hh | 12 ++++++++++++ + src/hb-ot-shape.cc | 4 ++-- + src/hb-ot-shape.hh | 1 + + 3 files changed, 15 insertions(+), 2 deletions(-) + +commit 38a7a8a89ed035a1d1fc34a675a1860ad660b6ff +Author: Behdad Esfahbod +Date: Wed Oct 10 17:44:46 2018 -0400 + + Allow HB_OPTIONS=aat to prefer AAT tables over OT + + Fixes https://github.com/harfbuzz/harfbuzz/issues/322 + + src/hb-common.cc | 23 +++++++++++++++++++++-- + src/hb-debug.hh | 7 ++++--- + src/hb-ot-shape.cc | 24 ++++++++++++++++-------- + 3 files changed, 41 insertions(+), 13 deletions(-) + +commit 44f09afd5bd4f4f1ea47ca54ac9d605219b06910 +Author: Behdad Esfahbod +Date: Wed Oct 10 17:32:32 2018 -0400 + + [kerx] Skip variation subtables + + src/hb-aat-layout-kerx-table.hh | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 1e8fdd285f90b7b715b6d9ca9222a3c91cbea6b8 +Author: Behdad Esfahbod +Date: Wed Oct 10 16:32:35 2018 -0400 + + Remove HAVE_OT + + We never tested compiling without it. Just kill it. We always build + our own shaper. + + CMakeLists.txt | 1 - + configure.ac | 6 ------ + src/Makefile.am | 2 -- + src/hb-shaper-list.hh | 2 -- + src/hb.hh | 2 -- + test/api/Makefile.am | 4 +--- + test/api/test-c.c | 5 +---- + util/Makefile.am | 4 ---- + util/options.cc | 4 ---- + util/options.hh | 2 -- + 10 files changed, 2 insertions(+), 30 deletions(-) + +commit 7727e737566ddc826647e19fc645b296ad5a0cac +Author: Behdad Esfahbod +Date: Wed Oct 10 13:24:51 2018 -0400 + + [kerx] Actually hook up, and fix crash + + src/hb-aat-layout-common.hh | 6 ++++++ + src/hb-aat-layout-kerx-table.hh | 4 ++-- + src/hb-ot-shape.cc | 4 ++-- + 3 files changed, 10 insertions(+), 4 deletions(-) + +commit b3390990f508def9c375716614b92fc7b0038228 +Author: Behdad Esfahbod +Date: Wed Oct 10 12:07:49 2018 -0400 + + Add per-subtable set-digests + + This speeds up Roboto shaping by ~10%. I was hoping for more. + Still, good defense against lookups with many subtables. + + src/hb-null.hh | 2 +- + src/hb-ot-layout-gsubgpos.hh | 108 +++++++++++++++++++++++-------------------- + 2 files changed, 59 insertions(+), 51 deletions(-) + +commit e78549edfb4df617128a5f5ddd12692f1d0af4bf +Author: Behdad Esfahbod +Date: Wed Oct 10 11:54:48 2018 -0400 + + Move apply down into subtables accel + + src/hb-ot-layout-gsubgpos.hh | 10 +++++++++- + src/hb-ot-layout.cc | 17 +++-------------- + 2 files changed, 12 insertions(+), 15 deletions(-) + +commit 78c09bf21335a0f2b538b37de6647af08e3b1161 +Author: Behdad Esfahbod +Date: Wed Oct 10 11:50:46 2018 -0400 + + Move subtable array into lookup accel + + src/hb-null.hh | 2 +- + src/hb-ot-layout-gsubgpos.hh | 14 +++++++++++--- + src/hb-ot-layout.cc | 16 ++++++---------- + 3 files changed, 18 insertions(+), 14 deletions(-) + +commit 97e5913d5ac2cd313fb3923e9602358d7f75f11d +Author: Behdad Esfahbod +Date: Wed Oct 10 11:41:05 2018 -0400 + + Move more code + + src/hb-ot-layout-gsubgpos.hh | 17 +++++++++++++++++ + src/hb-ot-layout.cc | 12 ++++++------ + src/hb-ot-layout.hh | 20 ++------------------ + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + 4 files changed, 26 insertions(+), 25 deletions(-) + +commit c8f2d9334c0f91ec30f1c7821eb44bb5149bd31c +Author: Behdad Esfahbod +Date: Wed Oct 10 11:36:28 2018 -0400 + + Move code + + In preparation to move add per-subtable set digests... + + src/hb-ot-layout-gsubgpos.hh | 50 ++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout.cc | 57 ++++---------------------------------------- + 2 files changed, 54 insertions(+), 53 deletions(-) + +commit a03850a3567d532c3a4d7655aa71bfe73dfb0e33 +Author: Behdad Esfahbod +Date: Wed Oct 10 10:57:28 2018 -0400 + + Fix GPOS/kern interaction + + Oops. Was checking for kern feature in GSUB, not GPOS. + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d1be805e784dfaadf2ce9caa830a3f851fdd67da +Author: Behdad Esfahbod +Date: Wed Oct 10 10:49:45 2018 -0400 + + More rewriting plan compile + + Hopefully more clear. + + src/hb-ot-shape.cc | 55 ++++++++++++++++++++++++++++++++++++++---------------- + src/hb-ot-shape.hh | 1 - + 2 files changed, 39 insertions(+), 17 deletions(-) + +commit 961ab46b24ca9f3ef42a56398646191f106bf5bd +Author: Behdad Esfahbod +Date: Wed Oct 10 10:42:10 2018 -0400 + + More reshuffle plan compile + + src/hb-ot-shape.cc | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 2091b509e3e3b7fb7315539679fae81da2879280 +Author: Behdad Esfahbod +Date: Wed Oct 10 10:41:08 2018 -0400 + + [kerx] Hook up to shaper + + src/hb-aat-layout.cc | 31 ++++++++++++++++++++++++------- + src/hb-aat-layout.hh | 3 +++ + src/hb-ot-shape.cc | 6 ++++-- + src/hb-ot-shape.hh | 1 + + 4 files changed, 32 insertions(+), 9 deletions(-) + +commit 8d00c39bfc558895c63e22148d88db51cde39164 +Author: Behdad Esfahbod +Date: Wed Oct 10 10:18:39 2018 -0400 + + [kern] Minor + + src/hb-ot-shape-fallback.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit e655fd38cf20eefb1c071a52282a4caccb6f08ea +Author: Behdad Esfahbod +Date: Wed Oct 10 10:16:09 2018 -0400 + + Apply TT or fallback kerning when GPOS does not have kern feature + + Previously we only did if there was no GPOS whatsoever. This applies + to Arial, Times New Roman, etc in Win7. Was not kerning before. It + is now. + + src/hb-ot-shape.cc | 25 ++++++++++++++++--------- + 1 file changed, 16 insertions(+), 9 deletions(-) + +commit 754cf440bf80ced36461a98a5d4607a700f44fd3 +Author: Behdad Esfahbod +Date: Wed Oct 10 10:04:05 2018 -0400 + + Minor + + src/hb-ot-shape-fallback.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 187df7d7a9a1d9cd67cb2f72d4d6ed8cae1eed61 +Author: Ebrahim Byagowi +Date: Wed Oct 10 17:12:52 2018 +0330 + + [circleci] Add an iOS bot (#1233) + + .circleci/config.yml | 12 +++++ + CMakeLists.txt | 140 ++++++++++++++++++++++++++++++++------------------- + 2 files changed, 100 insertions(+), 52 deletions(-) + +commit c06a5dff0b0f8d1c5aba53bcfd7fb0b680f1ca92 +Merge: 83c5298f 0537a401 +Author: Michiharu Ariza +Date: Tue Oct 9 22:00:10 2018 -0700 + + Merge branch 'master' into cff-subset + +commit 83c5298f33e66cfd3d84d246297683f0de80c57d +Author: Michiharu Ariza +Date: Tue Oct 9 21:59:36 2018 -0700 + + added cff1_legacyops.otf as test-ot-extents-cff test case + + fixed roll operator bugs uncovered by the test + + src/hb-cff-interp-common.hh | 4 ++-- + test/api/fonts/cff1_legacyops.otf | Bin 0 -> 3104 bytes + test/api/test-ot-extents-cff.c | 23 +++++++++++++++++++++++ + 3 files changed, 25 insertions(+), 2 deletions(-) + +commit 0537a40193e803d50a99cd6b993d6d9301e84ebf +Author: Behdad Esfahbod +Date: Tue Oct 9 23:35:07 2018 -0400 + + [kerx] Comment + + src/hb-aat-layout-kerx-table.hh | 2 +- + src/hb-ot-kern-table.hh | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 362d3241195bb7054c395fb4b029b6d55da4612a +Author: Behdad Esfahbod +Date: Tue Oct 9 23:27:00 2018 -0400 + + [aat] Rename + + src/hb-aat-layout-kerx-table.hh | 4 ++-- + src/hb-aat-layout-morx-table.hh | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 54c9ecb92d196e62901eef3f8bc025c024ed16bb +Author: Behdad Esfahbod +Date: Tue Oct 9 23:18:19 2018 -0400 + + [morx] Use subtable range for embedded sanitizer here as well + + src/hb-aat-layout-morx-table.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit d35315cc028e70dd1b3ffc8cb079a2336b22a0c3 +Author: Behdad Esfahbod +Date: Tue Oct 9 23:17:32 2018 -0400 + + [aat] Fixup recent commit + + For 329f2401082011007d9ce12b15ce0225cd267c57 + + max_ops is signed. + + src/hb-aat-layout-common.hh | 2 +- + src/hb-machinery.hh | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit 948f59a13a4c643ae310f5fc643e29fefd6c3787 +Author: Behdad Esfahbod +Date: Tue Oct 9 23:07:47 2018 -0400 + + [kerx] Use subtable range for runtime checks + + src/hb-aat-layout-kerx-table.hh | 4 +++- + src/hb-machinery.hh | 8 ++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 329f2401082011007d9ce12b15ce0225cd267c57 +Author: Behdad Esfahbod +Date: Tue Oct 9 23:02:53 2018 -0400 + + [aat] Set embedded sanitizer max ops really high + + Since we consume it legitimately during shaping. + + src/hb-aat-layout-common.hh | 1 + + src/hb-machinery.hh | 2 ++ + 2 files changed, 3 insertions(+) + +commit ad763074861da60ed51211931788ca5b27fc1512 +Author: Behdad Esfahbod +Date: Tue Oct 9 22:57:00 2018 -0400 + + [kerx] Comment + + src/hb-aat-layout-kerx-table.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit db9600bbe15035cea6c2d4e8e9d184a5e23e357e +Author: Behdad Esfahbod +Date: Tue Oct 9 22:55:47 2018 -0400 + + [kerx] Remove junk + + src/hb-aat-layout-kerx-table.hh | 16 ---------------- + 1 file changed, 16 deletions(-) + +commit 27db859416c0362f211e2b42dc9a2ebb53b0e0f4 +Author: Behdad Esfahbod +Date: Tue Oct 9 22:52:41 2018 -0400 + + [kern/kerx] Adjust bounds check + + src/hb-aat-layout-kerx-table.hh | 8 +++----- + src/hb-ot-kern-table.hh | 8 +++----- + 2 files changed, 6 insertions(+), 10 deletions(-) + +commit c66f7f8c5deaac109e34bf65fc16cff92b74e69a +Author: Behdad Esfahbod +Date: Tue Oct 9 22:49:33 2018 -0400 + + [kerx] Implement Format2 apply() + + Still, not hooked. + + src/hb-aat-layout-kerx-table.hh | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit 4b461785bdf356e4b5586cb6e5b226f47da04b7d +Author: Behdad Esfahbod +Date: Tue Oct 9 22:46:30 2018 -0400 + + Fix check + + src/hb-aat-layout-kerx-table.hh | 2 ++ + src/hb-aat-layout.cc | 4 +++- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 4df8eb200def767d342762654b96d5d9314e5b21 +Author: Behdad Esfahbod +Date: Tue Oct 9 22:46:12 2018 -0400 + + [kern] Use kern subtable length for sanitizing in the accelerator + + src/hb-ot-kern-table.hh | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 8bff1d2994876a5202c8605d1cc37522431c6c84 +Author: Behdad Esfahbod +Date: Tue Oct 9 22:39:31 2018 -0400 + + [kern] Minor + + src/hb-ot-kern-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 53e55945000347fb19168bb4c13a470d30d46251 +Author: Behdad Esfahbod +Date: Tue Oct 9 22:35:22 2018 -0400 + + [kerx] Implement Format0 apply() + + Not hooked up to be called yet. + + src/hb-aat-layout-common.hh | 6 ++++-- + src/hb-aat-layout-kerx-table.hh | 29 ++++++++++++++++++++++++++--- + src/hb-aat-layout.cc | 6 ++++-- + src/hb-aat-layout.hh | 12 +++++++----- + src/hb-ot-shape.cc | 2 +- + 5 files changed, 42 insertions(+), 13 deletions(-) + +commit 60318f87153b559e5da103f0bfcce6bad8bab3b0 +Author: Behdad Esfahbod +Date: Tue Oct 9 22:25:53 2018 -0400 + + Minor + + src/hb-mutex.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 210f899acad1959d60892538ac1968a36dbbb51b +Author: Behdad Esfahbod +Date: Tue Oct 9 21:56:37 2018 -0400 + + [kern] Sanitize 4 bytes, not 2 + + src/hb-ot-kern-table.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 588518ea51b2226bdb41417946848d18c3913a67 +Author: Michiharu Ariza +Date: Tue Oct 9 14:48:04 2018 -0700 + + fixed test-ot-extents-cff failure on some platforms + + test/api/test-ot-extents-cff.c | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +commit be2f148da474d6dd30132c22dd467ea33a942edf +Author: Behdad Esfahbod +Date: Tue Oct 9 16:24:50 2018 -0400 + + [ft] Use mutex to lock access to FT_Face + + Makes our FT-backed hb_font_t safe to use from multiple threads. Still, + the underlying FT_Face should NOT be used from other threads by client + or other libraries. + + Maybe I add a lock()/unlock() public API ala PangoFT2 and cairo-ft. + Maybe not. + + src/hb-ft.cc | 18 +++++++++++++++++- + src/hb-mutex.hh | 8 ++++++++ + test/api/test-multithread.c | 7 ++----- + 3 files changed, 27 insertions(+), 6 deletions(-) + +commit d18c3c5861d40291077eb8b8667dc2f12b649cf2 +Author: Behdad Esfahbod +Date: Tue Oct 9 16:07:55 2018 -0400 + + [ft] Remove (probably) stale comment + + src/hb-ft.cc | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +commit 7003b601afd02b0ba7e839510a7d0b886da09aaa +Author: Behdad Esfahbod +Date: Tue Oct 9 15:55:26 2018 -0400 + + Minor + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 07899435b8065d494e563f83e0a35300c828eefe +Author: Behdad Esfahbod +Date: Tue Oct 9 15:39:51 2018 -0400 + + Install ot-funcs on newly created funcs + + **Finally**! Casual users can stop caring about font-funcs completely now, + like they haven't been needing to care re unicode-funcs for a few years. + + src/hb-font.cc | 39 ++++++++++++++++++++++++++------------- + 1 file changed, 26 insertions(+), 13 deletions(-) + +commit 55153553675445e8aad06e363295d399aa79c54f +Author: Behdad Esfahbod +Date: Tue Oct 9 15:12:09 2018 -0400 + + [ot-font] Don't pre-load cmap table + + Now that we have get_h_advances() and get_nominal_glyphs() implemented, the + overhead of doing a proper atomic load would be once per run, NOT once per + glyph. So, no need to pre-load the tables to avoid that overhead. + + As such, hb_ot_font_set_funcs() has become really cheap. Can *finally* make + it be default font functions on all newly created fonts! + + src/hb-ot-font.cc | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +commit ec84460e46fdaa5f8a3c16c8d48dabe2b0c869da +Author: Behdad Esfahbod +Date: Tue Oct 9 15:07:04 2018 -0400 + + [ot/ft] Implement get_nominal_glyphs() callback + + Some more measurable speedup. The recent commits' speedups are as follows: + + Testing with Roboto, ****when disabling kern and liga****: + + Before: + + FT --features=-kern,-liga + user↦ 0m0.521s + + OT --features=-liga,-kern + user↦ 0m0.568s + + After: + + FT --features=-liga,-kern + user↦ 0m0.428s + + OT --features=-liga,-kern + user↦ 0m0.470s + + So, 17% speedup. + + Note that FT callbacks are faster than OT these days since we added an advance + cache to FT. I don't think the difference is enough to justify adding a cache + to OT. + + When not disabling kern, the thing is three times slower, so the speedups + are three times less impressive... Still, 5% not bad for a codebase that I + otherwise thought is optimized out. + + Note that, because of this and other optimiztions in our main shaper, + disabling kern and liga, the OT shaper is now *faster* than the fallback + shaper. So, that's my recommendation to clients that need the absolute + fastest... + + src/hb-ft.cc | 26 ++++++++++++++++++++++++++ + src/hb-ot-font.cc | 24 ++++++++++++++++++++++++ + 2 files changed, 50 insertions(+) + +commit e883f52732a25f5495ec30656489954afd8cc3a4 +Author: Behdad Esfahbod +Date: Tue Oct 9 14:50:57 2018 -0400 + + Call get_nominal_glyphs() for runs of simple clusters at a time + + Even without FT or OT font funcs implementing get_nominal_glyphs(), there's measurable + speedup. + + src/hb-buffer.hh | 20 +++++++++++++++++++- + src/hb-ot-shape-normalize.cc | 9 +++++++++ + 2 files changed, 28 insertions(+), 1 deletion(-) + +commit 8008bca83b0bb310fc434dbdd339545af951193b +Author: Behdad Esfahbod +Date: Tue Oct 9 14:38:23 2018 -0400 + + Whitespace + + src/hb-font.hh | 2 +- + src/hb-ot-shape-normalize.cc | 52 ++++++++++++++++++++++++-------------------- + 2 files changed, 29 insertions(+), 25 deletions(-) + +commit 30c114ffec335770452e60729224b1634586c5b0 +Author: Behdad Esfahbod +Date: Tue Oct 9 14:37:08 2018 -0400 + + Avoid sort and recompose stages if all clusters simple + + Even has measurable speedup... + + src/hb-ot-shape-normalize.cc | 52 ++++++++++++++++++++++++-------------------- + 1 file changed, 29 insertions(+), 23 deletions(-) + +commit 9f79365c3b183278d14352ba6241c7d4ec274984 +Author: Behdad Esfahbod +Date: Tue Oct 9 14:36:25 2018 -0400 + + Fix warning + + How come this one is not generated by clang everything bot?! + + ../../../test/api/test-multithread.c:37:26: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] + static char *font_path = "fonts/Inconsolata-Regular.abc.ttf"; + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ../../../test/api/test-multithread.c:38:21: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] + + test/api/test-multithread.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 24382debe893450088acd1e4b387ac31145d4553 +Author: Behdad Esfahbod +Date: Tue Oct 9 14:33:24 2018 -0400 + + Rewrite main normalizer loop to isolate runs of simple clusters + + src/hb-ot-shape-normalize.cc | 24 +++++++++++++++++++----- + 1 file changed, 19 insertions(+), 5 deletions(-) + +commit b5371f18effbeb91565fd8c554c120b911641f0b +Author: Behdad Esfahbod +Date: Tue Oct 9 14:12:59 2018 -0400 + + Inline decompose_cluster + + Towards separating the common case into its own loop. + + src/hb-ot-shape-normalize.cc | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) + +commit f5f505b5120c316f06306318c6c2f0db4496ba04 +Merge: 8b349040 4035158d +Author: Michiharu Ariza +Date: Tue Oct 9 10:10:35 2018 -0700 + + Merge branch 'master' into cff-subset + +commit b314c4e9abf4236c6650a63d1287471b61f64885 +Author: Behdad Esfahbod +Date: Tue Oct 9 09:23:51 2018 -0400 + + [font] Add get_nominal_glyphs() callback (note the plural) + + Unused as of now. To be wired up to normalizer, which would remove + overhead and allow hb-ot-font initialization to become a no-op, so + we can enable it by default. + + docs/harfbuzz-sections.txt | 3 +++ + src/hb-font.cc | 33 +++++++++++++++++++++++++++++++++ + src/hb-font.h | 24 ++++++++++++++++++++++++ + src/hb-font.hh | 13 +++++++++++++ + 4 files changed, 73 insertions(+) + +commit ca6a317012a13ee84b58a69e14e74c94c5b158ff +Author: Behdad Esfahbod +Date: Tue Oct 9 09:06:07 2018 -0400 + + Minor + + src/hb-font.cc | 6 +++--- + src/hb-font.h | 8 ++++---- + src/hb-font.hh | 2 +- + 3 files changed, 8 insertions(+), 8 deletions(-) + +commit 4035158de46ce373b7521daf61c5b6df83312968 +Author: Chun-wei Fan +Date: Wed Jul 25 18:26:10 2018 +0800 + + test/api/test-subset-*.c: Fix build on pre-C99 + + Ensure that we have the variables at the beginning of the block. These + are the only fixes that we need for building HarfBuzz on older + compilers. + + test/api/test-collect-unicodes.c | 9 ++++++--- + test/api/test-subset-glyf.c | 19 +++++++++++++------ + test/api/test-subset-hdmx.c | 8 ++++++-- + test/api/test-subset-hmtx.c | 3 ++- + test/api/test-subset-post.c | 3 ++- + test/api/test-subset-vmtx.c | 6 ++++-- + test/api/test-subset.c | 12 +++++++++--- + 7 files changed, 42 insertions(+), 18 deletions(-) + +commit 8e4ad1d7a0a35298ca04828ef1ef18b4c019ec03 +Author: Chun-wei Fan +Date: Wed Jul 25 18:12:34 2018 +0800 + + builds: Fix and clean up MSVC DLL builds + + Instead of passing a CFLAG/CXXFLAG to define HB_EXTERN, define it + directly in src/hb.hh as __declspec(dllexport) extern when we are + building HarfBuzz as DLLs on Visual Studio. Define HB_INTERNAL + as nothing without defining HB_NO_VISIBILITY when building HarfBuzz as + DLLs to avoid linker errors on Visual Studio builds. + + Also "install" harfbuzz-subset.dll into $(PREFIX)\bin as the + hb-subset utility will depend on that DLL at runtime, when HarfBuzz is + built as DLLs. Since it consists of private APIs that are subject to + change, we do not install its headers nor .lib file. + + CMakeLists.txt | 7 ++++++- + src/hb.hh | 10 ++++++++-- + 2 files changed, 14 insertions(+), 3 deletions(-) + +commit e640f3a6b16f41cee5f7868ec738fda01244e96a +Author: Behdad Esfahbod +Date: Tue Oct 9 08:28:07 2018 -0400 + + Another old bot fix + + src/hb-aat-layout-kerx-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e4f27f368f8f0509fa47f6a28f3984e90b40588f +Author: Behdad Esfahbod +Date: Tue Oct 9 08:20:10 2018 -0400 + + Try fixing older bots + + src/hb-ot-shape-fallback.cc | 42 +++++++++++++++++++++--------------------- + 1 file changed, 21 insertions(+), 21 deletions(-) + +commit bee93e269711a3eda4e7d762b730522564fe6e87 +Author: Behdad Esfahbod +Date: Tue Oct 9 08:01:49 2018 -0400 + + Add const to get_*_advances API + + Ouch! + + src/hb-font.cc | 10 +++++----- + src/hb-font.h | 8 ++++---- + src/hb-font.hh | 6 +++--- + src/hb-ft.cc | 2 +- + src/hb-ot-font.cc | 4 ++-- + 5 files changed, 15 insertions(+), 15 deletions(-) + +commit eb2be97f864c726feaa2434e290f962ddfa97069 +Author: Behdad Esfahbod +Date: Tue Oct 9 07:48:52 2018 -0400 + + Port test off deprecated API + + test/api/test-shape.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit cc126f2817844a2e83e973129e5b2caa18de599f +Author: Behdad Esfahbod +Date: Tue Oct 9 01:10:15 2018 -0400 + + Minor + + src/Makefile.am | 2 +- + test/shaping/Makefile.am | 2 ++ + test/subset/Makefile.am | 2 +- + 3 files changed, 4 insertions(+), 2 deletions(-) + +commit b2fbe55b828ea5864bc0aed54db7109a2e189de2 +Author: Behdad Esfahbod +Date: Tue Oct 9 01:07:36 2018 -0400 + + [icu] Unbreak + + src/hb-icu.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a353c1768dc1d7934b8ac293761620f561304bb2 +Author: Behdad Esfahbod +Date: Tue Oct 9 01:05:28 2018 -0400 + + Remove test for deprecated hb_set_invert() + + test/api/test-set.c | 4 ---- + 1 file changed, 4 deletions(-) + +commit a52bc039c33b3c01dbb96b815dc24df7f03bc4be +Author: Behdad Esfahbod +Date: Tue Oct 9 00:56:33 2018 -0400 + + Properly remove deprecated stuff + + src/hb-glib.cc | 15 ++++++--------- + src/hb-icu.cc | 15 ++++++--------- + src/hb-ucdn.cc | 15 ++++++--------- + 3 files changed, 18 insertions(+), 27 deletions(-) + +commit 8b349040e92b8894a7f8a609fac8070bcb110f96 +Merge: df964a09 fc509165 +Author: Michiharu Ariza +Date: Mon Oct 8 21:46:23 2018 -0700 + + Merge branch 'master' into cff-subset + +commit fc50916589a300e49183b5ee598e64ca28d0bd9a +Author: Behdad Esfahbod +Date: Tue Oct 9 00:39:42 2018 -0400 + + Remove deprecated decompose_compatibility stuff + + src/hb-glib.cc | 31 +----------------------------- + src/hb-icu.cc | 33 +------------------------------- + src/hb-ucdn.cc | 8 +------- + test/api/test-unicode.c | 51 ------------------------------------------------- + 4 files changed, 3 insertions(+), 120 deletions(-) + +commit eed737f6726d3408191a4e64592805b70d8bb247 +Author: Behdad Esfahbod +Date: Tue Oct 9 00:33:30 2018 -0400 + + Remove deprecated eastasian_width + + src/hb-glib.cc | 8 +------ + src/hb-icu.cc | 19 +-------------- + src/hb-ucdn.cc | 9 +------ + test/api/test-unicode.c | 64 ------------------------------------------------- + 4 files changed, 3 insertions(+), 97 deletions(-) + +commit 47030b1855f04c0d75899ffb6f5021fea3c19b90 +Author: Behdad Esfahbod +Date: Tue Oct 9 00:30:45 2018 -0400 + + [ft/ot] Remove implementation of deprecated kerning funcs + + src/hb-ft.cc | 19 ------------------- + src/hb-ot-font.cc | 13 ------------- + 2 files changed, 32 deletions(-) + +commit 977c8a8e5c811995f47b0eb721199d0dc3689e48 +Author: Behdad Esfahbod +Date: Tue Oct 9 00:22:08 2018 -0400 + + [kern] Minor + + src/hb-ot-kern-table.hh | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit ed5cfa42c7fb8d5ff2d74bdb452a0590174f4e19 +Author: Behdad Esfahbod +Date: Tue Oct 9 00:20:35 2018 -0400 + + [kern] Minor + + src/hb-aat-layout-kerx-table.hh | 1 + + 1 file changed, 1 insertion(+) + +commit d219f899f4b2fb4b39ebc1dff9fb648fc5d6d112 +Author: Behdad Esfahbod +Date: Tue Oct 9 00:01:09 2018 -0400 + + Deprecate font kern API + + docs/harfbuzz-sections.txt | 16 +++++++------- + src/hb-deprecated.h | 54 ++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-font.cc | 3 +++ + src/hb-font.h | 51 ------------------------------------------- + 4 files changed, 65 insertions(+), 59 deletions(-) + +commit a51958819fcf51ade3f8eb38001e680a419ebbba +Author: Behdad Esfahbod +Date: Mon Oct 8 23:57:45 2018 -0400 + + Apply TrueType/OpenType kern table when GPOS kern feature is not available + + Fixes https://github.com/harfbuzz/harfbuzz/issues/250 + + src/hb-ot-kern-table.hh | 24 +++++++++++-------- + src/hb-ot-layout.cc | 57 ++++++++++++++++++++------------------------- + src/hb-ot-layout.hh | 13 +++++++++++ + src/hb-ot-shape-fallback.cc | 4 ++-- + src/hb-ot-shape.cc | 10 +++++--- + src/hb-ot-shape.hh | 1 + + 6 files changed, 62 insertions(+), 47 deletions(-) + +commit 09ad2613c8d8a60dac69a878c2d568adfea054c8 +Author: Behdad Esfahbod +Date: Mon Oct 8 23:30:24 2018 -0400 + + Separate fallback kern vs mark positioning + + src/hb-ot-shape-fallback.cc | 12 ++++++------ + src/hb-ot-shape-fallback.hh | 12 ++++++------ + src/hb-ot-shape.cc | 15 ++++++++------- + src/hb-ot-shape.hh | 4 ++-- + 4 files changed, 22 insertions(+), 21 deletions(-) + +commit 3c23ff9b7c4241ec23054a95f1fdfbdef2c51f40 +Author: Behdad Esfahbod +Date: Mon Oct 8 23:26:26 2018 -0400 + + [kern] Add kerning driver to TT kern table + + src/hb-ot-kern-table.hh | 19 +++++++++++++++++-- + src/hb-ot-shape-fallback.cc | 2 +- + 2 files changed, 18 insertions(+), 3 deletions(-) + +commit 683c3a95330928129cfbb1488650f708414d68ba +Author: Behdad Esfahbod +Date: Mon Oct 8 23:09:48 2018 -0400 + + [kern] Abstract away kerning machine + + src/hb-font.hh | 2 +- + src/hb-ot-kern-table.hh | 71 +++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-shape-fallback.cc | 67 +++++++++++------------------------------- + 3 files changed, 89 insertions(+), 51 deletions(-) + +commit fb4f43838154a77912a9fc3437110c81e9d34aac +Author: Behdad Esfahbod +Date: Mon Oct 8 22:44:16 2018 -0400 + + Add HB_DEPRECATED + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1232 + + src/hb-common.h | 9 +++++++++ + src/hb-deprecated.h | 12 ++++++------ + 2 files changed, 15 insertions(+), 6 deletions(-) + +commit 80e3102b8a216f9a751d073f9a2f7900ca758086 +Author: Behdad Esfahbod +Date: Mon Oct 8 22:41:08 2018 -0400 + + [kerx] Process coverage flags + + src/hb-aat-layout-kerx-table.hh | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +commit 26d7305da7a7e2cf765b068f565836442872ffe7 +Author: Behdad Esfahbod +Date: Mon Oct 8 22:31:35 2018 -0400 + + Deprecate decompose_compatibility stuff + + docs/harfbuzz-sections.txt | 7 +++--- + src/hb-deprecated.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-unicode.h | 47 ---------------------------------- + 3 files changed, 67 insertions(+), 50 deletions(-) + +commit 42b51eee54f143854b7c6c3be5d84bfbbd895100 +Author: Behdad Esfahbod +Date: Mon Oct 8 22:26:39 2018 -0400 + + Deprecate eastasian_width stuff + + docs/harfbuzz-sections.txt | 5 +++-- + src/hb-deprecated.h | 37 +++++++++++++++++++++++++++++++++++++ + src/hb-unicode.h | 28 ---------------------------- + 3 files changed, 40 insertions(+), 30 deletions(-) + +commit df964a09319bbf5b0a7528b906311726d4f640d6 +Author: Michiharu Ariza +Date: Mon Oct 8 15:38:05 2018 -0700 + + fixed test-subset-cff2 + + src/hb-cff2-interp-cs.hh | 7 +++---- + src/hb-ot-cff2-table.cc | 2 +- + 2 files changed, 4 insertions(+), 5 deletions(-) + +commit a90fd8b9feeee3b02d139f2e7db774766d7855cb +Merge: b51418f5 e42cd58c +Author: Michiharu Ariza +Date: Mon Oct 8 15:07:58 2018 -0700 + + Merge branch 'master' into cff-subset + +commit b51418f596097aa5d1b28fb0a02b613c36bacd8e +Author: Michiharu Ariza +Date: Mon Oct 8 15:05:36 2018 -0700 + + added CFF2 get_extents + + added source hb-ot-cff2-table.cc + augmented VariationData to return scalars + misc bug fixes, renaming, cleanup + + src/Makefile.sources | 2 + + src/hb-cff-interp-common.hh | 37 ++++++----- + src/hb-cff-interp-cs-common.hh | 134 +++++++++++++++++++------------------- + src/hb-cff-interp-dict-common.hh | 6 +- + src/hb-cff2-interp-cs.hh | 102 ++++++++++++++++++++++++----- + src/hb-ot-cff1-table.hh | 4 +- + src/hb-ot-cff2-table.cc | 135 +++++++++++++++++++++++++++++++++++++++ + src/hb-ot-cff2-table.hh | 71 ++++++++++++-------- + src/hb-ot-face.cc | 1 + + src/hb-ot-face.hh | 1 + + src/hb-ot-font.cc | 4 ++ + src/hb-ot-layout-common.hh | 28 +++++++- + src/hb-subset-cff1.cc | 2 +- + src/hb-subset-cff2.cc | 4 +- + test/api/test-ot-extents-cff.c | 36 +++++++++++ + 15 files changed, 426 insertions(+), 141 deletions(-) + +commit 286a45641fc6732bb7cab02f06c90396834541b1 +Author: Behdad Esfahbod +Date: Mon Oct 8 16:41:08 2018 -0400 + + Minor + + src/hb-ot-shape-normalize.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c0d3bf1bafe7b6d2e8f2798c1f55aaec71350d90 +Author: Behdad Esfahbod +Date: Mon Oct 8 16:32:44 2018 -0400 + + Minor + + src/hb-ot-shape.cc | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit 9c1bb81f5c5ca64ad1c665edd16947e4bc6f6c46 +Author: Behdad Esfahbod +Date: Mon Oct 8 16:10:54 2018 -0400 + + [test/text-rendering-tests] Update from upstream + + test/shaping/data/text-rendering-tests/DISABLED | 3 --- + test/shaping/data/text-rendering-tests/Makefile.sources | 2 +- + test/shaping/data/text-rendering-tests/tests/MORX-35.tests | 4 ++-- + 3 files changed, 3 insertions(+), 6 deletions(-) + +commit 1a5a3325a26f4989ab8c4bb91515d4898ffa4631 +Author: Behdad Esfahbod +Date: Sun Oct 7 23:08:39 2018 -0400 + + [kerx] Minor + + src/hb-aat-layout-kerx-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d62b4011cc600ade2b130f81a077dd08d4e4464f +Author: Behdad Esfahbod +Date: Sun Oct 7 22:58:06 2018 -0400 + + [kern] Shout less + + src/hb-ot-kern-table.hh | 36 +++++++++++++++++++----------------- + 1 file changed, 19 insertions(+), 17 deletions(-) + +commit c6bb3a588f493630b40d8823532b482f407bacbf +Author: Behdad Esfahbod +Date: Sun Oct 7 22:52:53 2018 -0400 + + [kerx] Clean up Format2 + + src/hb-aat-layout-kerx-table.hh | 48 ++++++++--------------------------------- + 1 file changed, 9 insertions(+), 39 deletions(-) + +commit 8aa83d97f9e7f63e2fcb4ae965b75a39961c7d87 +Author: Behdad Esfahbod +Date: Sun Oct 7 22:43:59 2018 -0400 + + [kern/kerx] Fix Format2 offsetting + + "The values in the right class table are stored pre-multiplied by the + number of bytes in a single kerning value, and the values in the left + class table are stored pre-multiplied by the number of bytes in one + row. This eliminates needing to multiply the row and column values + together to determine the location of the kerning value. The array can + be indexed by doing the right- and left-hand class mappings, adding the + class values to the address of the array, and fetching the kerning + value to which the new address points." + + src/hb-aat-layout-kerx-table.hh | 2 +- + src/hb-ot-kern-table.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit ed2a404272bc99234c6f71f22b5a642834e59e6c +Author: Behdad Esfahbod +Date: Sun Oct 7 22:33:41 2018 -0400 + + [kerx] Clean up Format0 + + src/hb-aat-layout-kerx-table.hh | 48 +++++++++++------------------------------ + 1 file changed, 12 insertions(+), 36 deletions(-) + +commit 4c3b19d52ec7a1fa46f8d0971e377a7d29b87e27 +Author: Behdad Esfahbod +Date: Sun Oct 7 22:30:42 2018 -0400 + + Support HBUINT32 BinSearchArrayOf + + src/hb-open-type.hh | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit 456a68c506238e9c6b019244237d4443bd3589af +Author: Behdad Esfahbod +Date: Sun Oct 7 22:28:45 2018 -0400 + + Move code + + src/hb-aat-layout-common.hh | 105 -------------------------------------------- + src/hb-open-type.hh | 105 +++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 104 insertions(+), 106 deletions(-) + +commit 3515c8b187e2316dcf3abaefc84917b09449d485 +Author: Behdad Esfahbod +Date: Sun Oct 7 22:27:00 2018 -0400 + + [aat] Rename + + src/hb-aat-layout-common.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit e42cd58c997adafca5517faa9aacf651b90520f5 +Author: Behdad Esfahbod +Date: Sun Oct 7 20:46:11 2018 -0400 + + Rename invisible_codepoint to invisible_glyph in API + + Deleted recently added API: + hb_buffer_set_invisible_codepoint() + hb_buffer_get_invisible_codepoint() + + hb-shape / hb-view --invisible-codepoint + + New API: + hb_buffer_set_invisible_glyph() + hb_buffer_get_invisible_glyph() + + hb-shape / hb-view --invisible-glyph + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1216 + + docs/harfbuzz-sections.txt | 4 ++-- + src/hb-buffer.cc | 12 ++++++------ + src/hb-buffer.h | 6 +++--- + util/options.cc | 2 +- + util/options.hh | 6 +++--- + 5 files changed, 15 insertions(+), 15 deletions(-) + +commit 2a5cb37fdb43230217e055f3d7c770a35cfd5c21 +Author: Behdad Esfahbod +Date: Sun Oct 7 20:36:46 2018 -0400 + + Revert "[morx] Fix MORX-35" + + This reverts commit f62f6e90ad1f1a83f77771ad65ee1ffb79470a8a. + + src/hb-aat-layout-morx-table.hh | 14 +++++--------- + test/shaping/data/text-rendering-tests/DISABLED | 3 +++ + test/shaping/data/text-rendering-tests/Makefile.sources | 2 +- + 3 files changed, 9 insertions(+), 10 deletions(-) + +commit 14ebf8af0c04efcae6ca788ac85601bfe462f28d +Author: Behdad Esfahbod +Date: Sun Oct 7 20:35:06 2018 -0400 + + [buffer] Improve shift_forward() + + "Improve" is a strong word in this case though, I understand. + + src/hb-buffer.cc | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +commit f62f6e90ad1f1a83f77771ad65ee1ffb79470a8a +Author: Behdad Esfahbod +Date: Sun Oct 7 18:06:53 2018 -0400 + + [morx] Fix MORX-35 + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1224 + + src/hb-aat-layout-morx-table.hh | 14 ++++++++++---- + test/shaping/data/text-rendering-tests/DISABLED | 3 --- + test/shaping/data/text-rendering-tests/Makefile.sources | 2 +- + 3 files changed, 11 insertions(+), 8 deletions(-) + +commit 94368855c6bd7201d562cab3d2107685589e69c8 +Author: Behdad Esfahbod +Date: Sun Oct 7 18:52:12 2018 -0400 + + Remove some code + + We use scratch-flags to short-circuit this function. No need for previous + early loop. + + src/hb-ot-shape.cc | 16 +++------------- + 1 file changed, 3 insertions(+), 13 deletions(-) + +commit c07b91b812dc66b38b11329cd6a93258a3769f9e +Author: Behdad Esfahbod +Date: Sun Oct 7 18:00:14 2018 -0400 + + [test/text-rendering-tests] Update from upstream + + test/shaping/data/text-rendering-tests/Makefile.sources | 6 +++++- + .../data/text-rendering-tests/fonts/TestMORXForty.ttf | Bin 0 -> 2408 bytes + .../text-rendering-tests/fonts/TestMORXThirtyeight.ttf | Bin 0 -> 2444 bytes + .../text-rendering-tests/fonts/TestMORXThirtynine.ttf | Bin 0 -> 2436 bytes + .../text-rendering-tests/fonts/TestMORXThirtyseven.ttf | Bin 0 -> 2444 bytes + .../data/text-rendering-tests/tests/MORX-35.tests | 4 ++-- + .../data/text-rendering-tests/tests/MORX-37.tests | 4 ++++ + .../data/text-rendering-tests/tests/MORX-38.tests | 4 ++++ + .../data/text-rendering-tests/tests/MORX-39.tests | 4 ++++ + .../data/text-rendering-tests/tests/MORX-40.tests | 4 ++++ + 10 files changed, 23 insertions(+), 3 deletions(-) + +commit fdce1e15434f14b7f4802edd67f7af737cf2b075 +Author: Behdad Esfahbod +Date: Sun Oct 7 14:01:33 2018 -0400 + + [kerx] Clean up kerx and KerxTable structures + + src/hb-aat-layout-kerx-table.hh | 169 ++++++++++++++++++++++++++-------------- + src/hb-aat-layout-morx-table.hh | 2 +- + 2 files changed, 113 insertions(+), 58 deletions(-) + +commit 71b65eb27dd0867f51d9906887b9e372eb37f54a +Author: Behdad Esfahbod +Date: Sun Oct 7 18:41:52 2018 +0200 + + Add API for setting invisible-codepoint + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1216 + + New API: + hb_buffer_set_invisible_codepoint() + hb_buffer_get_invisible_codepoint() + + hb-shape / hb-view --invisible-codepoint + + docs/harfbuzz-sections.txt | 2 ++ + src/hb-buffer.cc | 42 ++++++++++++++++++++++++++++++++++++++++++ + src/hb-buffer.h | 7 +++++++ + src/hb-buffer.hh | 1 + + src/hb-ot-shape.cc | 8 ++++---- + util/options.cc | 1 + + util/options.hh | 3 +++ + 7 files changed, 60 insertions(+), 4 deletions(-) + +commit 13da3be0b342e8e2f060eba8753c6957c477c4ee +Author: Behdad Esfahbod +Date: Sun Oct 7 18:23:45 2018 +0200 + + [ot-font] Load hmtx/vmtx lazily + + Since we have get_*_advanes() API now, the overhead is once per shape, + not once per glyph. + + Only cmap is warmed-up at set_funcs() time now. + + src/hb-ot-font.cc | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit 856db4c9184e39c0457cc07c815f90058937c8a2 +Author: Behdad Esfahbod +Date: Sun Oct 7 18:21:15 2018 +0200 + + Minor + + src/hb-ot-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f92330b5e0b1a5a61768494bd7081e3fc235b182 +Author: Behdad Esfahbod +Date: Sun Oct 7 17:51:50 2018 +0200 + + Minor + + test/api/test-multithread.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit b2e398c077cf9437298bfe2ee53b7407a5865c14 +Author: Behdad Esfahbod +Date: Sun Oct 7 16:31:33 2018 +0200 + + [coretext] Fix OS X check + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1230 + + src/hb-coretext.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 55942ad5c1ee999c9f590b8cc8fbde12e937aa6f +Author: Michiharu Ariza +Date: Sat Oct 6 14:49:44 2018 -0700 + + Merge branch 'master' into cff-subset + + TODO | 10 +-- + configure.ac | 2 +- + src/hb-aat-layout-common.hh | 4 +- + src/hb-aat-layout-morx-table.hh | 9 +- + src/hb-aat-layout.cc | 6 ++ + src/hb-aat-layout.hh | 2 + + src/hb-face.cc | 2 +- + src/hb-machinery.hh | 2 +- + src/hb-ot-cmap-table.hh | 2 +- + src/hb-ot-post-table.hh | 2 +- + src/hb-ot-shape.cc | 27 ++++-- + src/hb-ot-shape.hh | 5 ++ + src/hb-set.hh | 4 +- + src/hb-subset.cc | 2 +- + src/hb-vector.hh | 100 ++++++++++++++------- + test/shaping/data/text-rendering-tests/DISABLED | 35 +------- + .../data/text-rendering-tests/Makefile.sources | 18 ++-- + .../data/text-rendering-tests/extract-tests.py | 18 +++- + .../text-rendering-tests/fonts/TestGSUBThree.ttf | Bin 0 -> 1504 bytes + .../fonts/TestMORXThirtyfive.ttf | Bin 0 -> 1968 bytes + .../fonts/TestMORXThirtyfour.ttf | Bin 0 -> 3608 bytes + .../fonts/TestMORXThirtysix.ttf | Bin 0 -> 1836 bytes + .../fonts/TestMORXThirtythree.ttf | Bin 0 -> 1520 bytes + .../fonts/TestMORXTwentyfour.ttf | Bin 0 -> 1828 bytes + .../data/text-rendering-tests/tests/GSUB-3.tests | 1 + + .../data/text-rendering-tests/tests/MORX-24.tests | 1 + + .../data/text-rendering-tests/tests/MORX-32.tests | 8 +- + .../data/text-rendering-tests/tests/MORX-33.tests | 3 + + .../data/text-rendering-tests/tests/MORX-34.tests | 1 + + .../data/text-rendering-tests/tests/MORX-35.tests | 2 + + .../data/text-rendering-tests/tests/MORX-36.tests | 1 + + test/shaping/run-tests.py | 19 ++-- + util/view-cairo.hh | 2 +- + 33 files changed, 173 insertions(+), 115 deletions(-) + +commit 7ee50af8366547c382047a30a94f7f5f739aabcb +Author: Behdad Esfahbod +Date: Sat Oct 6 21:31:44 2018 +0200 + + [morx] Fix memory access issues with unsafe_to_break + + src/hb-aat-layout-common.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit f58c5175890e666503b6f140d238e1abca91598e +Author: Ebrahim Byagowi +Date: Sat Oct 6 22:42:56 2018 +0330 + + Make msan output a little more readable + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e9abe33963739f753cdfb007eed40101ce33f550 +Author: Ebrahim Byagowi +Date: Sat Oct 6 12:19:33 2018 +0330 + + Use tempfile in run-tests as a fix for Windows CI fails (#1228) + + test/shaping/run-tests.py | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 0816a549789a1b647443c2b33cfda3f4400a0f87 +Author: Behdad Esfahbod +Date: Sat Oct 6 02:40:57 2018 +0200 + + [uniscribe/coretext] Fix for previous change + + src/hb-coretext.cc | 2 +- + src/hb-uniscribe.cc | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 341206eb609202e4b2f0d03d29cb577ebe8390b9 +Author: Behdad Esfahbod +Date: Fri Oct 5 18:39:48 2018 +0200 + + [vector] Make hb_vector_t relocatable / nestable + + Ugly, but... + Fixes https://github.com/harfbuzz/harfbuzz/issues/1227 + + src/hb-face.cc | 2 +- + src/hb-machinery.hh | 2 +- + src/hb-ot-cmap-table.hh | 2 +- + src/hb-ot-post-table.hh | 2 +- + src/hb-set.hh | 4 +-- + src/hb-subset.cc | 2 +- + src/hb-vector.hh | 94 +++++++++++++++++++++++++++++++------------------ + 7 files changed, 66 insertions(+), 42 deletions(-) + +commit 5469d80707d32c733b1c60f79ab2f217e879de55 +Author: Behdad Esfahbod +Date: Fri Oct 5 18:21:08 2018 +0200 + + Add hb_vector_t::fini_deep () + + src/hb-vector.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 4831e615d173be9c7e140be0fa9017e4d9e499af +Author: Behdad Esfahbod +Date: Fri Oct 5 18:14:13 2018 +0200 + + [morx] Fix memory access issue + + If buffer was enlarged, info was being outdated. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1225 + + src/hb-aat-layout-common.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 5a41cf6be69adb0b5b29976a33c4c6dd6ce7afc5 +Author: Behdad Esfahbod +Date: Fri Oct 5 11:33:19 2018 +0200 + + [test/text-rendering-tests] Update from upstream + + test/shaping/data/text-rendering-tests/DISABLED | 3 +++ + test/shaping/data/text-rendering-tests/Makefile.sources | 2 ++ + .../text-rendering-tests/fonts/TestMORXThirtyfive.ttf | Bin 0 -> 1968 bytes + .../text-rendering-tests/fonts/TestMORXThirtysix.ttf | Bin 0 -> 1836 bytes + .../data/text-rendering-tests/tests/MORX-35.tests | 2 ++ + .../data/text-rendering-tests/tests/MORX-36.tests | 1 + + 6 files changed, 8 insertions(+) + +commit a62f37d6fa412b799b7247b813f6e65a968e7645 +Author: Behdad Esfahbod +Date: Fri Oct 5 02:49:29 2018 +0200 + + Change vendor features from Harf/Buzz to HARF/BUZZ + + https://github.com/harfbuzz/harfbuzz/commit/a01194aaf4c15160330b4042066263b2c963b658#commitcomment-30772041 + + "The tag space of tags consisting of four uppercase letters (A-Z) with no punctuation, + spaces, or numbers, is reserved as a vendor space. Font vendors may use such tags to + identify private features." + + src/hb-ot-shape.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e7a045e4db39e037badcab0ad1239c0cb56c1170 +Author: Michiharu Ariza +Date: Thu Oct 4 14:16:07 2018 -0700 + + fixed leak exposed by test-ot-extents-cff + + src/hb-cff-interp-common.hh | 3 +++ + src/hb-cff-interp-dict-common.hh | 4 ++++ + 2 files changed, 7 insertions(+) + +commit 6238edbd8b654d105bbd191dffabc7820f0a3223 +Author: Michiharu Ariza +Date: Thu Oct 4 13:59:36 2018 -0700 + + added CFF glyph extents API test + + test/api/Makefile.am | 1 + + test/api/test-ot-extents-cff.c | 65 ++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 66 insertions(+) + +commit 0222d57c357c775f25866653700b9dcb7d5bb807 +Author: Michiharu Ariza +Date: Thu Oct 4 09:37:57 2018 -0700 + + tweaked previous warning fixes + + src/hb-cff-interp-common.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7b3ae5ffd202346cb3742fe0f8cfafe8c36a4bd5 +Author: Behdad Esfahbod +Date: Thu Oct 4 16:36:42 2018 +0200 + + More bot fixes + + test/shaping/run-tests.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 310bdac4a08b99a25de6a16a20464873f90b52e4 +Author: Behdad Esfahbod +Date: Thu Oct 4 16:31:14 2018 +0200 + + Fix a warning + + util/view-cairo.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0abce58139bb58b8b97171db6387d2ac7eebdee0 +Author: Behdad Esfahbod +Date: Thu Oct 4 16:23:42 2018 +0200 + + [test] Choose 'ot' shaper specifically + + Now that we added morx support, our OS X bot is running them through CoreText + and failing (with a DoS / infinite loop no less!). Always run tests through + our own shaper. + + test/shaping/run-tests.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c93d379bf2414eb6ee6d38fb9753ddf818a777ea +Author: Behdad Esfahbod +Date: Thu Oct 4 13:28:13 2018 +0200 + + [TODO] Clean up + + TODO | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +commit a01194aaf4c15160330b4042066263b2c963b658 +Author: Behdad Esfahbod +Date: Thu Oct 4 13:00:37 2018 +0200 + + Enable two OpenType features, 'Harf' and 'Buzz' + + One early, before script-specific features, one late, after. Allows font + developers to detect us and behave differently if needed. + + src/hb-ot-shape.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 55468ca01b4cdf274900fb752fbf9ae05a78705e +Author: Behdad Esfahbod +Date: Thu Oct 4 12:13:55 2018 +0200 + + [test/text-rendering-tests] Update from upstream + + test/shaping/data/text-rendering-tests/Makefile.sources | 6 +++++- + test/shaping/data/text-rendering-tests/extract-tests.py | 12 ++++++++++++ + .../data/text-rendering-tests/fonts/TestGSUBThree.ttf | Bin 0 -> 1504 bytes + .../text-rendering-tests/fonts/TestMORXThirtyfour.ttf | Bin 0 -> 3608 bytes + .../text-rendering-tests/fonts/TestMORXThirtythree.ttf | Bin 0 -> 1520 bytes + .../text-rendering-tests/fonts/TestMORXTwentyfour.ttf | Bin 0 -> 1828 bytes + .../shaping/data/text-rendering-tests/tests/GSUB-3.tests | 1 + + .../data/text-rendering-tests/tests/MORX-24.tests | 1 + + .../data/text-rendering-tests/tests/MORX-32.tests | 8 ++++---- + .../data/text-rendering-tests/tests/MORX-33.tests | 3 +++ + .../data/text-rendering-tests/tests/MORX-34.tests | 1 + + test/shaping/run-tests.py | 15 +++++++++------ + 12 files changed, 36 insertions(+), 11 deletions(-) + +commit 6ff8a8a10b62a54a87d53b0af66ccaba5d58b107 +Author: Behdad Esfahbod +Date: Thu Oct 4 12:09:45 2018 +0200 + + Minor + + test/shaping/data/text-rendering-tests/extract-tests.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 14ff3cbe0f30dea24e1bb175b1e8e41039f6afdc +Author: Behdad Esfahbod +Date: Thu Oct 4 11:34:21 2018 +0200 + + Apply morx if there's no GSUB! + + src/hb-ot-shape.cc | 23 ++++++++++++---- + src/hb-ot-shape.hh | 5 ++++ + test/shaping/data/text-rendering-tests/DISABLED | 32 ---------------------- + .../data/text-rendering-tests/Makefile.sources | 14 +++++----- + 4 files changed, 29 insertions(+), 45 deletions(-) + +commit 3417037eb13a59dce6add0b1691ddb1b2b54c1e4 +Author: Behdad Esfahbod +Date: Thu Oct 4 11:08:15 2018 +0200 + + [aat] Add +hb_aat_layout_has_substitution + + src/hb-aat-layout-morx-table.hh | 2 ++ + src/hb-aat-layout.cc | 6 ++++++ + src/hb-aat-layout.hh | 2 ++ + 3 files changed, 10 insertions(+) + +commit 1f14107f71a6c3da8270ed21c3588f945fa91733 +Author: Sascha Brawer +Date: Thu Oct 4 09:17:08 2018 +0200 + + Minor: Fix autoconf warning + + Before this change, autoconf was emitting the following warnings: + + ``` + configure.ac:22: warning: AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS + ../../lib/autoconf/specific.m4:368: AC_USE_SYSTEM_EXTENSIONS is expanded from... + configure.ac:22: the top level + configure.ac:22: warning: AC_RUN_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS + ../../lib/autoconf/specific.m4:368: AC_USE_SYSTEM_EXTENSIONS is expanded from... + configure.ac:22: the top level + configure.ac:22: warning: AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS + ../../lib/autoconf/specific.m4:368: AC_USE_SYSTEM_EXTENSIONS is expanded from... + configure.ac:22: the top level + configure.ac:22: warning: AC_RUN_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS + ../../lib/autoconf/specific.m4:368: AC_USE_SYSTEM_EXTENSIONS is expanded from... + configure.ac:22: the top level + configure.ac:22: warning: AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS + ../../lib/autoconf/specific.m4:368: AC_USE_SYSTEM_EXTENSIONS is expanded from... + configure.ac:22: the top level + configure.ac:22: warning: AC_RUN_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS + ../../lib/autoconf/specific.m4:368: AC_USE_SYSTEM_EXTENSIONS is expanded from... + configure.ac:22: the top level + configure.ac:22: warning: AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS + ../../lib/autoconf/specific.m4:368: AC_USE_SYSTEM_EXTENSIONS is expanded from... + configure.ac:22: the top level + configure.ac:22: warning: AC_RUN_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS + ../../lib/autoconf/specific.m4:368: AC_USE_SYSTEM_EXTENSIONS is expanded from... + configure.ac:22: the top level + ``` + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7810bb1a59ea71afeed7ea489400801ebdf642e4 +Author: Sascha Brawer +Date: Thu Oct 4 09:24:08 2018 +0200 + + [morx] Only insert glyphs at mark when a mark has been set before + + This reverts commit f4072e8cb81072cd6d51a2607efedb76c02e7db1. + https://github.com/harfbuzz/harfbuzz/issues/1195 + + src/hb-aat-layout-morx-table.hh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 3ef358909eb7e26ca9630e61c7ba142d9e94389e +Author: Michiharu Ariza +Date: Wed Oct 3 18:08:25 2018 -0700 + + fixed warnings + + src/hb-cff-interp-common.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1aeaee9dfc7ee3ca410919c41e55452a0b6b9bf6 +Author: Michiharu Ariza +Date: Wed Oct 3 17:44:45 2018 -0700 + + fixed cff2 subset test data + + test/api/fonts/AdobeVFPrototype.abc.nohints.otf | Bin 0 -> 7800 bytes + test/api/test-subset-cff2.c | 4 ++-- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 8be5a9186be3ca4c50c73f372be4dbad08ac1863 +Merge: d7b384ad 5de2d9cd +Author: Michiharu Ariza +Date: Wed Oct 3 17:06:18 2018 -0700 + + Merge branch 'master' into cff-subset + +commit 5de2d9cdbdca870901c0ba9472f5b78c48ba0a58 +Author: Ebrahim Byagowi +Date: Thu Oct 4 02:14:18 2018 +0330 + + Minor, fix double-promotion warnings (#1221) + + .circleci/config.yml | 2 +- + src/dump-emoji.cc | 2 +- + src/hb-common.cc | 2 +- + src/hb-ot-var-fvar-table.hh | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit c2c7e6471ca912c91c82f6d71338082978f13dc6 +Author: Ebrahim Byagowi +Date: Thu Oct 4 00:29:40 2018 +0330 + + State our graphite2 dependency no-deprecated compile flag (#1220) + + .circleci/config.yml | 2 +- + .travis.yml | 2 -- + configure.ac | 2 +- + 3 files changed, 2 insertions(+), 4 deletions(-) + +commit e4e74c2751ac24178086cce2811d34d8019b6f85 +Author: mhosken +Date: Thu Oct 4 02:33:26 2018 +0700 + + Update Graphite API to latest (#1215) + + src/hb-graphite2.cc | 28 +++++++++++++++++++++++++++- + 1 file changed, 27 insertions(+), 1 deletion(-) + +commit 81f5eb09eca010337ffb3369000a3d5c1e8e2cda +Author: Behdad Esfahbod +Date: Wed Oct 3 21:30:48 2018 +0200 + + Add emoji test for recent work + + test/shaping/data/in-house/Makefile.sources | 2 +- + .../fonts/3cf6f8ac6d647473a43a3100e7494b202b2cfafe.ttf | Bin 0 -> 16596 bytes + test/shaping/data/in-house/tests/emoji-flag-tags.tests | 2 -- + test/shaping/data/in-house/tests/emoji.tests | 4 ++++ + 4 files changed, 5 insertions(+), 3 deletions(-) + +commit 9e2824cca0e42a53fafda7b2feb095986df40675 +Author: Ebrahim Byagowi +Date: Wed Oct 3 22:49:02 2018 +0330 + + [ci] Delete azure-pipelines + + End of experiment, we might get back to it later + + azure-pipelines.yml | 10 ---------- + 1 file changed, 10 deletions(-) + +commit b710ea4fdeb1a620b396bd07665fc129fe5fc074 +Author: Behdad Esfahbod +Date: Wed Oct 3 21:17:59 2018 +0200 + + Clean Fitzpatrick hack + + src/hb-ot-layout.hh | 2 +- + src/hb-ot-shape.cc | 9 +++++++-- + src/hb-unicode.hh | 20 -------------------- + 3 files changed, 8 insertions(+), 23 deletions(-) + +commit 95e5f1ae69036108f318b93b11d85b2ebc19109b +Author: Behdad Esfahbod +Date: Wed Oct 3 21:11:13 2018 +0200 + + Unbreak Fitzpatrick + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1159 + + src/hb-ot-layout.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 03fb6dd4c7d12a98cc0ef325432658c3c76ab208 +Author: Behdad Esfahbod +Date: Wed Oct 3 21:02:16 2018 +0200 + + Rewrite grapheme-formation in terms of new work + + Also, don't attach ZWNJ to previous cluster. Closer to Unicode graphemes. + + src/hb-coretext.cc | 2 +- + src/hb-ot-shape.cc | 48 ++++++---------------- + .../in-house/tests/indic-joiner-candrabindu.tests | 2 +- + .../data/in-house/tests/indic-joiners.tests | 6 +-- + 4 files changed, 18 insertions(+), 40 deletions(-) + +commit 68106b1d9b96caf79b0a778a7da75caf54e7d44a +Author: Behdad Esfahbod +Date: Wed Oct 3 20:50:12 2018 +0200 + + Minor + + src/hb-ot-layout.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 3f1c741b7a85d9c2d66e7f2446e988470c538b49 +Author: Behdad Esfahbod +Date: Wed Oct 3 20:45:19 2018 +0200 + + [test] Split a test + + .../fonts/4d4206e30b2dbf1c1ef492a8eae1c9e7829ebad8.ttf | Bin 0 -> 51924 bytes + .../fonts/bb29ce50df2bdba2d10726427c6b7609bf460e04.ttf | Bin 74856 -> 0 bytes + .../in-house/tests/mongolian-variation-selector.tests | 17 ++++++++++++++++- + 3 files changed, 16 insertions(+), 1 deletion(-) + +commit ba813aab0909375af0c8f8e0c34595680c2762a4 +Author: Ebrahim Byagowi +Date: Wed Oct 3 21:52:15 2018 +0330 + + Update azure-pipelines.yml + + azure-pipelines.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 06922acbc4558699e43a4ed98ffb21f1e84abfc6 +Author: Behdad Esfahbod +Date: Wed Oct 3 20:19:17 2018 +0200 + + Fix distcheck + + src/Makefile.sources | 1 + + 1 file changed, 1 insertion(+) + +commit 4eea2e279b019ac627b2b9e2234a194957971022 +Author: Behdad Esfahbod +Date: Wed Oct 3 20:16:03 2018 +0200 + + [thai] Set continuation on decomposed nikhahit + + src/hb-ot-shape-complex-thai.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 8edc91022c3943fb306cee26ed6eb85381b5ea76 +Author: Behdad Esfahbod +Date: Wed Oct 3 20:13:20 2018 +0200 + + [indic] Reset continuation on inserted dottedcircle + + src/hb-ot-shape-complex-indic.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 2a6f15213ec30e5eb07465dd9dc81c2c386cb1e0 +Author: Behdad Esfahbod +Date: Wed Oct 3 20:09:14 2018 +0200 + + [buffer] Inline some more + + src/hb-buffer.cc | 44 -------------------------------------------- + src/hb-buffer.hh | 52 ++++++++++++++++++++++++++++++++++++++++++++-------- + 2 files changed, 44 insertions(+), 52 deletions(-) + +commit 6f39c22029867c6d00cf70d7df242a28ca8f12bc +Author: Behdad Esfahbod +Date: Wed Oct 3 20:06:32 2018 +0200 + + Add code + + src/hb-ot-layout.hh | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 19d50aa2620f1464da8e00185b746e46fb0d80c4 +Author: Behdad Esfahbod +Date: Wed Oct 3 20:05:28 2018 +0200 + + [indic] Simplify dottedcircle + + src/hb-ot-shape-complex-indic.cc | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) + +commit 3b7831851052ecf2611a115cc2b80ef970d83df8 +Author: Behdad Esfahbod +Date: Wed Oct 3 19:44:15 2018 +0200 + + [emoji] Mark emoji contination sequences as continuation + + This adds a new grapheme bit. Not used yet. + + Part of https://github.com/harfbuzz/harfbuzz/issues/1159 + + src/hb-ot-layout.hh | 83 +++++++++++++++++++++++++---------------------------- + src/hb-ot-shape.cc | 24 ++++++++++++++++ + src/hb-unicode.hh | 5 ---- + 3 files changed, 63 insertions(+), 49 deletions(-) + +commit 123326e20a30a51e25339c2eca272e4e6c847742 +Author: Behdad Esfahbod +Date: Wed Oct 3 19:19:51 2018 +0200 + + Dotted-circle all marks, not just non-spacing, at text beginning + + src/hb-ot-shape.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 4146c00caa29e53ee9a29def151f12792ac76596 +Author: Ebrahim Byagowi +Date: Wed Oct 3 21:26:58 2018 +0330 + + [test] Use an in-repo font for test-multithread (#1218) + + As Khaled's suggestion, hard-coded font paths was only for my own testing. + + test/api/hb-subset-test.h | 13 +++++++++---- + test/api/test-multithread.c | 41 ++++++++++++++++++++++++++--------------- + test/fuzzing/main.cc | 6 ++++++ + 3 files changed, 41 insertions(+), 19 deletions(-) + +commit fde9b8852d7cd6224afeffcfe363f4b445ab1ece +Author: azure-pipelines[bot] +Date: Wed Oct 3 17:47:05 2018 +0000 + + [ci] Add a test Azure Pipelines Linux bot + + Related #1219 + + azure-pipelines.yml | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 674560cf244054a7e8c16073a59aa1b01e1ba5ea +Author: Behdad Esfahbod +Date: Wed Oct 3 19:10:28 2018 +0200 + + Fix build + + src/test-unicode-ranges.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 45e55f70801e2ccd28e1ee30bdf5341b1ac6efe5 +Author: Behdad Esfahbod +Date: Wed Oct 3 18:07:49 2018 +0200 + + [indic] Fix clang everything + + src/hb-ot-shape-complex-indic.cc | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit 4df02e3240ada0734748a47572baa2fc1c6afbd1 +Author: Behdad Esfahbod +Date: Wed Oct 3 17:54:09 2018 +0200 + + Minor + + src/hb-ot-os2-unicode-ranges.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1e8f195b96765480007808da60789de9ac501c3b +Author: Behdad Esfahbod +Date: Wed Oct 3 17:46:48 2018 +0200 + + [emoji] Add emoji Extended_Pictographic table and function + + Part of https://github.com/harfbuzz/harfbuzz/issues/1159 + + . + + src/Makefile.am | 12 +- + src/gen-emoji-table.py | 64 ++++++++++ + src/hb-ot-os2-table.hh | 2 +- + src/hb-ot-os2-unicode-ranges.hh | 6 +- + src/hb-unicode-emoji-table.hh | 269 ++++++++++++++++++++++++++++++++++++++++ + src/hb-unicode.cc | 16 +++ + src/hb-unicode.hh | 37 +++++- + 7 files changed, 398 insertions(+), 8 deletions(-) + +commit 1dc601b04a816a5b5ed12ae1c01ddcfd60a8398f +Author: Behdad Esfahbod +Date: Wed Oct 3 17:27:46 2018 +0200 + + [os2] Minor rename/shuffle + + ...unicode-ranges.py => gen-os2-unicode-ranges.py} | 2 +- + src/hb-ot-os2-unicode-ranges.hh | 45 +++++++++++----------- + 2 files changed, 24 insertions(+), 23 deletions(-) + +commit 7a1ab0464d3ee1ca5c9b31215fbffb8601ae860d +Author: lantw44 +Date: Wed Oct 3 23:22:43 2018 +0800 + + Fix test-multithread build on FreeBSD (#1217) + + Add the default font path used by FreeBSD ports. + + test/api/test-multithread.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit df32eaae42b505b00de4a8b5efce9ab948bed847 +Author: Behdad Esfahbod +Date: Wed Oct 3 14:44:25 2018 +0200 + + [indic] Disallow vowel mark combinations that spoof other vowel marks + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1019 + + New numbers: + + BENGALI: 353725 out of 354188 tests passed. 463 failed (0.130722%) + DEVANAGARI: 707261 out of 707394 tests passed. 133 failed (0.0188014%) + GUJARATI: 366353 out of 366457 tests passed. 104 failed (0.0283799%) + GURMUKHI: 60729 out of 60747 tests passed. 18 failed (0.0296311%) + KANNADA: 951300 out of 951913 tests passed. 613 failed (0.0643966%) + MALAYALAM: 1048136 out of 1048334 tests passed. 198 failed (0.0188871%) + ORIYA: 42327 out of 42329 tests passed. 2 failed (0.00472489%) + SINHALA: 271596 out of 271847 tests passed. 251 failed (0.0923313%) + TAMIL: 1091754 out of 1091754 tests passed. 0 failed (0%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + + Devanagari regressed because Uniscribe doesn't enforce the full set. + + Tests added with the *-vowel-letters.txt files in tree and Noto fonts. + + src/hb-ot-shape-complex-indic.cc | 256 ++++++++++++++++++++- + test/shaping/data/in-house/Makefile.sources | 1 + + .../03e3f463c3a985bc42096620cc415342818454fb.ttf | Bin 0 -> 2904 bytes + .../1a5face3fcbd929d228235c2f72bbd6f8eb37424.ttf | Bin 0 -> 8188 bytes + .../2c25beb56d9c556622d56b0b5d02b4670c034f89.ttf | Bin 0 -> 2460 bytes + .../604026ae5aaca83c49cd8416909d71ba3e1c1194.ttf | Bin 0 -> 4120 bytes + .../738d9f3b8c2dfd03875bf35a61d28fd78faf17c8.ttf | Bin 0 -> 2336 bytes + .../7d18685e1529e4ceaad5b6095dfab2f9789e5bce.ttf | Bin 0 -> 3452 bytes + .../881642af1667ae30a54e58de8be904566d00508f.ttf | Bin 0 -> 2760 bytes + .../af85624080af5627fb050f570d148a62f04fda74.ttf | Bin 0 -> 2656 bytes + .../tests/indic-vowel-letter-spoofing.tests | 53 +++++ + 11 files changed, 309 insertions(+), 1 deletion(-) + +commit 1b8d5e999192035c08f918aa1fcfcebdea67d82e +Author: Behdad Esfahbod +Date: Wed Oct 3 14:44:19 2018 +0200 + + [thai] Minor + + src/hb-ot-shape-complex-thai.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit d3d0cbd27831a6ea41b89f50d380296565c0016d +Author: Behdad Esfahbod +Date: Wed Oct 3 13:54:21 2018 +0200 + + Typo + + .../{bengali-vowel-leters.txt => bengali-vowel-letters.txt} | 0 + .../{gujarati-vowel-letter.txt => gujarati-vowel-letters.txt} | 0 + 2 files changed, 0 insertions(+), 0 deletions(-) + +commit 0dd9101fd0ddff80fff10ba98e93523aed95c8f5 +Author: Behdad Esfahbod +Date: Wed Oct 3 13:26:26 2018 +0200 + + Minor + + src/hb-ot-shape-complex-indic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 9c4ffd10c4040ada9b1ffeb13c35f1330336359e +Author: Behdad Esfahbod +Date: Wed Oct 3 12:53:54 2018 +0200 + + Minor + + src/hb-ot-shape-complex.hh | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +commit bd1be8738fc4c73635cab7d77965264748d747cc +Author: HinTak +Date: Wed Oct 3 07:11:22 2018 +0800 + + Missing colon for gobject annotation + + There should be a colon separating "(transfer full)" and the rest. Warned by g-ir-scanner. + + src/hb-face.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 75114e01d29b90f72a9398ed5dbc4298aba5a6b8 +Author: Behdad Esfahbod +Date: Wed Oct 3 12:29:56 2018 +0200 + + [use] Add Halant_Or_Vowel_Modifier category + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1102 + + src/gen-use-table.py | 7 +- + src/hb-ot-shape-complex-use-machine.hh | 518 +++++++++++---------- + src/hb-ot-shape-complex-use-machine.rl | 9 +- + src/hb-ot-shape-complex-use-table.cc | 4 +- + src/hb-ot-shape-complex-use.hh | 5 +- + .../28f497629c04ceb15546c9a70e0730125ed6698d.ttf | Bin 0 -> 1496 bytes + .../shaping/data/in-house/tests/use-syllable.tests | 3 + + 7 files changed, 301 insertions(+), 245 deletions(-) + +commit d7b384ad0d0a3e1d35ef92a6e98a97bb9c367f48 +Author: Michiharu Ariza +Date: Tue Oct 2 21:08:36 2018 -0700 + + silence warning ^3 + + src/hb-subset-cff1.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e9cc71ac86bd771d9fcb2ee1eb620060db92ac1a +Author: Michiharu Ariza +Date: Tue Oct 2 20:44:30 2018 -0700 + + silence warning ^2 + + src/hb-subset-cff1.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2700db9ade23cbf69d17a7a1802a7f144c25f8dc +Author: Michiharu Ariza +Date: Tue Oct 2 15:05:26 2018 -0700 + + rm build files + + build/test/api/.libs/test-collect-unicodes | Bin 14336 -> 0 bytes + build/test/api/.libs/test-multithread | Bin 10936 -> 0 bytes + build/test/api/test-collect-unicodes | 210 ----------------------------- + build/test/api/test-multithread | 210 ----------------------------- + 4 files changed, 420 deletions(-) + +commit 51d5bf4ca2ebb9b8aa3b2777781e328fb93ceea7 +Author: Michiharu Ariza +Date: Tue Oct 2 14:38:06 2018 -0700 + + silence warnings + + src/hb-cff-interp-cs-common.hh | 2 +- + src/hb-subset-cff1.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 35b64dfb57cac0d949363e9b19352dd4274c2584 +Author: Michiharu Ariza +Date: Tue Oct 2 14:13:36 2018 -0700 + + silence & fix new warnings + + src/hb-cff-interp-dict-common.hh | 3 ++- + src/hb-cff1-interp-cs.hh | 9 +++++---- + src/hb-ot-cff-common.hh | 4 ++-- + src/hb-subset-cff1.cc | 4 ++-- + src/hb-subset-cff2.cc | 4 ++-- + 5 files changed, 13 insertions(+), 11 deletions(-) + +commit eed7e6bbc8e7be99d59a7822a1c37bc715c379b3 +Author: Michiharu Ariza +Date: Tue Oct 2 13:45:14 2018 -0700 + + redefine OpCodes as define instead of enum + + in order to eradicate duplicate enum warnings + + src/hb-cff-interp-common.hh | 348 ++++++++++++++++++++++---------------------- + 1 file changed, 174 insertions(+), 174 deletions(-) + +commit 9cdd70b344b9dc34a29aeca79028cbb5d949ca1d +Merge: 3dd43f02 6353cc1f +Author: Michiharu Ariza +Date: Tue Oct 2 13:43:21 2018 -0700 + + Merge branch 'master' into cff-subset + +commit 6353cc1f83c862910860976411a1157f7ed571bc +Author: Ebrahim Byagowi +Date: Tue Oct 2 21:39:19 2018 +0330 + + [circleci] Fix some of warnings from clang-everything bot (#1211) + + * -Wshift-sign-overflow + * -Wmissing-prototypes + + .circleci/config.yml | 4 ++-- + src/dump-emoji.cc | 19 ++++++++++--------- + src/hb-ucdn.cc | 3 +++ + src/test-unicode-ranges.cc | 4 ++-- + test/fuzzing/hb-subset-fuzzer.cc | 32 +++++++++++++++++--------------- + util/ansi-print.cc | 4 ++-- + 6 files changed, 36 insertions(+), 30 deletions(-) + +commit 9f1dee32fbad3b1486725c18570199156b57a94d +Author: Behdad Esfahbod +Date: Tue Oct 2 18:56:20 2018 +0200 + + [tests] Allow test-runner to ignore shaping output + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1212 + + test/shaping/data/in-house/tests/fuzzed.tests | 46 +++++++++++++-------------- + test/shaping/run-tests.py | 2 +- + 2 files changed, 24 insertions(+), 24 deletions(-) + +commit fef7af1e22efb399517137b35d0ba9f307411ca3 +Author: Behdad Esfahbod +Date: Tue Oct 2 18:46:13 2018 +0200 + + [tibetan] Remove unused Tibetan shaper + + src/Makefile.sources | 1 - + src/hb-ot-shape-complex-tibetan.cc | 63 -------------------------------------- + src/hb-ot-shape-complex.hh | 1 - + 3 files changed, 65 deletions(-) + +commit 32a438166fbccac6e0d9a615a492fc8cabfd21ab +Author: Behdad Esfahbod +Date: Tue Oct 2 18:43:29 2018 +0200 + + [tibetan] Route Tibetan through USE + + Fixes https://github.com/harfbuzz/harfbuzz/pull/933 + https://github.com/harfbuzz/harfbuzz/issues/1012 + + Tibetan failures go from 0 to 2: + + TIBETAN: 208467 out of 208469 tests passed. 2 failed (0.000959375%) + + src/gen-use-table.py | 30 ++++++++++------ + src/hb-ot-shape-complex-use-table.cc | 70 ++++++++++++++++++++++-------------- + src/hb-ot-shape-complex.hh | 8 +---- + 3 files changed, 65 insertions(+), 43 deletions(-) + +commit 77792187be1405599e6aecfc3ed1fc771d505ddb +Author: Behdad Esfahbod +Date: Tue Oct 2 18:20:16 2018 +0200 + + [khmer] Remove unused khmer_position() + + src/dump-khmer-data.cc | 8 +++----- + src/hb-ot-shape-complex-khmer.hh | 1 - + 2 files changed, 3 insertions(+), 6 deletions(-) + +commit 5101abd42f4027edf182eddfa58c629b11c2a7f6 +Author: Behdad Esfahbod +Date: Tue Oct 2 17:49:06 2018 +0200 + + [indic/use] Factor common expressions in ragel machine + + No machine change. + + src/hb-ot-shape-complex-indic-machine.hh | 46 ++++++++++++++++---------------- + src/hb-ot-shape-complex-indic-machine.rl | 10 ++++--- + src/hb-ot-shape-complex-use-machine.hh | 38 +++++++++++++------------- + src/hb-ot-shape-complex-use-machine.rl | 20 +++++++------- + 4 files changed, 58 insertions(+), 56 deletions(-) + +commit 6f457f8370de5d96452ee3a2d1b0a97b025ef1d1 +Author: Behdad Esfahbod +Date: Tue Oct 2 17:46:27 2018 +0200 + + [indic] Minor flip grammar around + + No behavior change. + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + src/hb-ot-shape-complex-use-machine.rl | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +commit d992982d23ef0c39ea42595ed0e8a4752977d1a5 +Author: Behdad Esfahbod +Date: Tue Oct 2 17:16:01 2018 +0200 + + [indic] Add some confusable sequences from Unicode Standard + + .../script-bengali/bengali-vowel-leters.txt | 3 ++ + .../devanagari-atomic-consonants.txt | 33 ++++++++++++++++++++++ + .../script-devanagari/devanagari-vowel-letters.txt | 17 +++++++++++ + .../script-gujarati/gujarati-vowel-letter.txt | 8 ++++++ + .../script-gurmukhi/gurmukhi-vowel-letters.txt | 9 ++++++ + .../script-kannada/kannada-vowel-letters.txt | 3 ++ + .../script-malayalam/malayalam-vowel-letters.txt | 5 ++++ + .../script-oriya/oriya-vowel-letters.txt | 3 ++ + .../script-telugu/telugu-vowel-letters.txt | 5 ++++ + 9 files changed, 86 insertions(+) + +commit 40d5d19d5b875eef526a2a66892c3f638f633fa3 +Author: Behdad Esfahbod +Date: Tue Oct 2 17:04:05 2018 +0200 + + [ragel] Use ts/te (token-start / token-end) instead of manual tracking + + src/hb-ot-shape-complex-indic-machine.hh | 22 ++++++++++------------ + src/hb-ot-shape-complex-indic-machine.rl | 8 +++----- + src/hb-ot-shape-complex-khmer-machine.hh | 22 ++++++++++------------ + src/hb-ot-shape-complex-khmer-machine.rl | 8 +++----- + src/hb-ot-shape-complex-myanmar-machine.hh | 22 ++++++++++------------ + src/hb-ot-shape-complex-myanmar-machine.rl | 8 +++----- + src/hb-ot-shape-complex-use-machine.hh | 22 ++++++++++------------ + src/hb-ot-shape-complex-use-machine.rl | 8 +++----- + 8 files changed, 52 insertions(+), 68 deletions(-) + +commit 9efddb9de821fc909a3ea8354f3dfd39c823e97b +Author: Behdad Esfahbod +Date: Tue Oct 2 16:05:26 2018 +0200 + + Treat a base+mark... ligature as base, not ligature + + Fixes https://github.com/harfbuzz/harfbuzz/issues/746 + + src/hb-ot-layout-gsubgpos.hh | 22 +++++++++++++++------- + 1 file changed, 15 insertions(+), 7 deletions(-) + +commit 3cca978723db43233d25402254d297dfccf991a3 +Author: Behdad Esfahbod +Date: Tue Oct 2 15:02:16 2018 +0200 + + Move code around + + src/hb-ot-layout-gsub-table.hh | 3 --- + src/hb-ot-layout-gsubgpos.hh | 22 +++++++++++----------- + 2 files changed, 11 insertions(+), 14 deletions(-) + +commit 0a371fee4d22ed63207aa76c00b05b75bbc95f5f +Author: Behdad Esfahbod +Date: Tue Oct 2 14:48:39 2018 +0200 + + Minor + + src/hb-ot-map.hh | 6 ++++-- + src/hb-ot-shape-complex-arabic.cc | 6 +++--- + src/hb-ot-shape-complex-myanmar.cc | 4 ++-- + src/hb-ot-shape-complex-use.cc | 8 ++++---- + src/hb-ot-shape.cc | 4 ++-- + 5 files changed, 15 insertions(+), 13 deletions(-) + +commit 94d15528f80dbb7110d816fb5845f257f605a0be +Author: Behdad Esfahbod +Date: Tue Oct 2 14:45:09 2018 +0200 + + Minor + + src/hb-ot-map.hh | 1 + + src/hb-ot-shape.cc | 39 ++++++++++++++++++--------------------- + 2 files changed, 19 insertions(+), 21 deletions(-) + +commit 729f634728fb553300021d52089495271dfb19fd +Author: Behdad Esfahbod +Date: Tue Oct 2 14:40:14 2018 +0200 + + Disable joiner-skipping when looking back for base to attach mark to + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1189 + + src/hb-ot-shape.cc | 5 ++++- + test/shaping/data/in-house/Makefile.sources | 1 + + .../fonts/641ca9d7808b01cafa9a666c13811c9b56eb9c52.ttf | Bin 0 -> 11492 bytes + .../data/in-house/tests/arabic-mark-attach.tests | 1 + + 4 files changed, 6 insertions(+), 1 deletion(-) + +commit c36f3f5bef52e660541933f003fafa6e3a14785d +Author: Behdad Esfahbod +Date: Tue Oct 2 14:34:29 2018 +0200 + + [arabic] Use manual-zwj instead of flipping joiners + + src/hb-buffer.hh | 3 +-- + src/hb-ot-layout.hh | 12 ++---------- + src/hb-ot-shape-complex-arabic.cc | 41 ++++++--------------------------------- + 3 files changed, 9 insertions(+), 47 deletions(-) + +commit 48c513fec978819927535bc86b43be74315f746c +Author: Behdad Esfahbod +Date: Tue Oct 2 14:17:42 2018 +0200 + + Minor + + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-default.cc | 2 +- + src/hb-ot-shape-complex-hangul.cc | 2 +- + src/hb-ot-shape-complex-hebrew.cc | 14 +------------- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-indic.hh | 2 -- + src/hb-ot-shape-complex-khmer.cc | 2 +- + src/hb-ot-shape-complex-myanmar.cc | 4 ++-- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape-complex-tibetan.cc | 2 +- + src/hb-ot-shape-complex-use.cc | 2 +- + src/hb-ot-shape-complex.hh | 11 ++++------- + src/hb-ot-shape.cc | 8 ++++---- + 13 files changed, 19 insertions(+), 36 deletions(-) + +commit cca757ae56d6a82cfad35edc6dbae58049a34f91 +Author: Behdad Esfahbod +Date: Tue Oct 2 13:27:11 2018 +0200 + + Minor + + src/hb-ot-shape.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 96eca87f89588126d3fa5c7f3884ae2f302a91e1 +Author: Behdad Esfahbod +Date: Tue Oct 2 13:24:40 2018 +0200 + + Move things + + src/hb-ot-shape.cc | 22 ++++++++++------------ + src/hb-ot-shape.hh | 3 +++ + 2 files changed, 13 insertions(+), 12 deletions(-) + +commit 588a4ac8bc9fd20464c7a77ead27ae34478c9bc8 +Author: Behdad Esfahbod +Date: Tue Oct 2 13:13:47 2018 +0200 + + Rename + + src/hb-ot-face.cc | 20 +++++++------- + src/hb-ot-face.hh | 78 +++++++++++++++++++++++++++---------------------------- + 2 files changed, 49 insertions(+), 49 deletions(-) + +commit 10b6c7c63870fa04cd8adcf9f38644c2a799db8a +Author: Behdad Esfahbod +Date: Tue Oct 2 13:11:18 2018 +0200 + + Minor include cleanup + + src/hb-ot-shape-complex.hh | 1 + + src/hb-ot-shape.cc | 4 +--- + src/hb-ot-shape.hh | 2 +- + 3 files changed, 3 insertions(+), 4 deletions(-) + +commit 1d1734e985e1f2a746b4fff0cd82d96d477577d5 +Author: Behdad Esfahbod +Date: Tue Oct 2 13:04:05 2018 +0200 + + Shuffle code around + + src/hb-ot-shape-complex-hebrew.cc | 2 +- + src/hb-ot-shape-fallback.cc | 2 +- + src/hb-ot-shape-normalize.cc | 2 +- + src/hb-ot-shape.cc | 32 ++++++++++++++++++++++++++++---- + src/hb-ot-shape.hh | 29 ++++++----------------------- + 5 files changed, 37 insertions(+), 30 deletions(-) + +commit bf5088b3dcd94106937290c180f3f40bc8524b48 +Author: Ebrahim Byagowi +Date: Tue Oct 2 11:07:06 2018 +0330 + + Minor, fix -Weverthing bot warnings (#1210) + + test/api/test-buffer.c | 8 ++++---- + test/api/test-multithread.c | 3 +-- + 2 files changed, 5 insertions(+), 6 deletions(-) + +commit d27e5ec3a236b8eb37ef9ce558ad54077e46b003 +Author: Khaled Hosny +Date: Tue Oct 2 08:25:29 2018 +0200 + + Skip BOM in the Python sample file + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1208 + + src/sample.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit f9ea3dc4c6e85c417dd4c8546e5ebe02b67131b9 +Author: HinTak +Date: Tue Oct 2 06:43:06 2018 +0100 + + Missing "out" indicator (#1209) + + Missing "out" indicator. Affect gobject introspection. + + src/hb-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9742679b8253919f8bfec8a77532092044e951aa +Author: Ebrahim Byagowi +Date: Tue Oct 2 03:20:48 2018 +0330 + + [circleci] Remove some of the not needed flags + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f72b748371da2d7ce327a5d15feea46960aa7dd3 +Author: Ebrahim Byagowi +Date: Tue Oct 2 00:16:08 2018 +0330 + + [circleci] Fix "msan" and "everything" bots (#1205) + + .circleci/config.yml | 13 ++++++------- + src/check-symbols.sh | 2 -- + test/fuzzing/main.cc | 22 +++++++++------------- + test/fuzzing/run-shape-fuzzer-tests.py | 2 -- + test/fuzzing/run-subset-fuzzer-tests.py | 2 -- + 5 files changed, 15 insertions(+), 26 deletions(-) + +commit 8bf4027d23318c7e1ff7fe9f5e7ad8b0380e5415 +Author: Behdad Esfahbod +Date: Mon Oct 1 20:05:00 2018 +0200 + + [indic] Remove Consonant_Medial from grammar and code + + The only Indic CM is U+0A75 GURMUKHI SIGN YAKASH, which Uniscribe doesn't treat + specially, and font designers design for that. So, do the same. + + src/hb-ot-shape-complex-indic-machine.hh | 1244 ++++++++++++++---------------- + src/hb-ot-shape-complex-indic-machine.rl | 10 +- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-indic.hh | 6 +- + 4 files changed, 589 insertions(+), 673 deletions(-) + +commit ab4c37f73a7d4fcf48584cda3fff94e98a672086 +Author: Behdad Esfahbod +Date: Mon Oct 1 19:35:48 2018 +0200 + + [khmer] Add mark-ordering tests + + Fixes https://github.com/harfbuzz/harfbuzz/issues/667 + + test/shaping/data/in-house/Makefile.sources | 2 ++ + .../b6031119874ae9ff1dd65383a335e361c0962220.ttf | Bin 0 -> 2564 bytes + .../data/in-house/tests/khmer-mark-order.tests | 25 +++++++++++++++++++++ + 3 files changed, 27 insertions(+) + +commit 51436547162a18e88144e7125ad6ce4a69a08d4b +Author: Behdad Esfahbod +Date: Mon Oct 1 19:09:58 2018 +0200 + + [khmer] Rewrite grammar completely + + Based on experimenting with Uniscribe to extract grammar and categories. + + Failures down from 44 to 35: + + KHMER: 299089 out of 299124 tests passed. 35 failed (0.0117008%) + + We still don't enforce the one-matra rule pre-decomposition, but enforce + an order and one-matra-per-position post-decomposition. + + https://github.com/harfbuzz/harfbuzz/issues/667 + + src/hb-ot-shape-complex-indic.hh | 2 +- + src/hb-ot-shape-complex-khmer-machine.hh | 300 ++++++++++++++++++++----------- + src/hb-ot-shape-complex-khmer-machine.rl | 42 +++-- + src/hb-ot-shape-complex-khmer.cc | 4 +- + src/hb-ot-shape-complex-khmer.hh | 99 +++++----- + 5 files changed, 270 insertions(+), 177 deletions(-) + +commit 3dd43f0234febd434d89927adf2ee19f0489c5a7 +Merge: ab16b24c eb1e6028 +Author: Michiharu Ariza +Date: Mon Oct 1 10:22:06 2018 -0700 + + Merge branch 'master' into cff-subset + +commit aaaa65baa7fcfb65ae814528bdd93cc5c4ea540d +Author: Behdad Esfahbod +Date: Mon Oct 1 16:59:48 2018 +0200 + + [khmer] Remove unused code + + src/hb-ot-shape-complex-khmer.hh | 12 ------------ + 1 file changed, 12 deletions(-) + +commit eb1e60287732ede6040ce6f7498c10909448d248 +Author: Behdad Esfahbod +Date: Mon Oct 1 15:31:50 2018 +0200 + + [test] Try import unicodedata2 as unicodedata + + test/shaping/hb_test_tools.py | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 81afdbe803ca949d915d03cab4a6ed6c6e6ff304 +Author: Behdad Esfahbod +Date: Mon Oct 1 15:01:04 2018 +0200 + + [use] Disable automatic ZWJ for 'akhn' feature + + Fixes https://github.com/harfbuzz/harfbuzz/issues/746 + + src/hb-ot-shape-complex-use.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ceef311dcaea7e1ecfedb4f1257a705572611f0f +Author: Behdad Esfahbod +Date: Mon Oct 1 12:45:06 2018 +0200 + + [use] Change categories for Left_And_* matras + + These are only relevant to Sinhala, because they decompose in other + cases. The USE spec categorizes them all as VPst. No idea why we + weren't following that before. + + src/gen-use-table.py | 4 ++-- + src/hb-ot-shape-complex-use-table.cc | 24 ++++++++++++------------ + 2 files changed, 14 insertions(+), 14 deletions(-) + +commit 3426a361571a1996b5a895fb9374ce3a4a7f9af3 +Author: Behdad Esfahbod +Date: Mon Oct 1 12:55:57 2018 +0200 + + Unbreak bots + + src/hb-cache.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 98ac01d3b3deb7c7f5411f6f25c6e7588d84b5f9 +Author: Behdad Esfahbod +Date: Mon Oct 1 12:10:00 2018 +0200 + + [morx] Break out if buffer gets into error + + Was getting stuck not making progress somehow. + + src/hb-aat-layout-common.hh | 2 ++ + src/hb-aat-layout-morx-table.hh | 4 ++++ + 2 files changed, 6 insertions(+) + +commit df827a6ab88cd8bde346176fc53a5c2d57eee808 +Author: Behdad Esfahbod +Date: Mon Oct 1 11:34:20 2018 +0200 + + [cache] Fix cache coherency corner-case + + If key_bits+value_bits-cache_bits==32 then -1 is ambiguous... + + src/hb-cache.hh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 0fa1edbd3bbf825be078677dc46c3440f9802551 +Author: Ebrahim Byagowi +Date: Mon Oct 1 09:40:29 2018 +0330 + + [circleci] Couple of fixes (#1200) + + * Raise error on warnings on -everything + * Enable fontconfig to two bots + * Fix msan bot now that all of its real complain are gone + + .circleci/config.yml | 14 ++++++-------- + src/check-symbols.sh | 2 ++ + src/hb-ucdn.cc | 2 ++ + test/fuzzing/run-shape-fuzzer-tests.py | 2 ++ + test/fuzzing/run-subset-fuzzer-tests.py | 2 ++ + util/helper-cairo.cc | 2 ++ + 6 files changed, 16 insertions(+), 8 deletions(-) + +commit 3babb0813c69d2b419f06773f366a44a9ad32cdb +Author: Behdad Esfahbod +Date: Sun Sep 30 20:02:30 2018 +0200 + + [msan] Disable icu explicitly + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dc9b47ae87096d34d146e50e44e742a76861976f +Author: Behdad Esfahbod +Date: Sun Sep 30 18:35:12 2018 +0200 + + [msan] Remove uninstrumented libraries + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ad1c190ecfbac66ffeef69db769073a33331eed3 +Author: Behdad Esfahbod +Date: Sun Sep 30 18:26:45 2018 +0200 + + Correct fix for glib-mkenum warning + + src/hb-buffer.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 1dd1e56bf42af5b11afc3e34f78869e93d39867e +Author: Behdad Esfahbod +Date: Sun Sep 30 18:25:58 2018 +0200 + + Revert "Fix glib-mkenum warning" + + This reverts commit 247756a7d89008ee6a7d1171dc07ba22454c6034. + + Was wrong. Right fix coming. + + src/hb-buffer.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit 3f08750fa6772e7e342b96192b84cb9963f7335b +Author: Behdad Esfahbod +Date: Sun Sep 30 18:23:34 2018 +0200 + + Move _POSIX_SOURCE to hb.hh + + src/hb-blob.cc | 5 ----- + src/hb.hh | 4 ++++ + 2 files changed, 4 insertions(+), 5 deletions(-) + +commit 90dd255e570bf8ea3436e2f29242068845256e55 +Author: Behdad Esfahbod +Date: Sun Sep 30 18:19:54 2018 +0200 + + Change _HB_SCRIPT_MAX_VALUE from 0xFFFFFFFF to 0x7FFFFFFF + + Fixes https://github.com/harfbuzz/harfbuzz/issues/504 + + src/hb-common.h | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit dcfcb950b81a2865ef01f5a69087264b79ed1bfd +Author: Behdad Esfahbod +Date: Sun Sep 30 18:14:50 2018 +0200 + + [test] Fix -Wunused-parameter warnings + + test/api/hb-test.h | 1 + + test/api/test-blob.c | 2 +- + test/api/test-c.c | 2 +- + test/api/test-font.c | 16 ++++++++-------- + test/api/test-multithread.c | 2 +- + test/api/test-ot-color.c | 2 +- + test/api/test-shape.c | 14 +++++++------- + test/api/test-unicode.c | 10 +++++----- + 8 files changed, 25 insertions(+), 24 deletions(-) + +commit be0b2ed3162f465dbf44a0f018d4e2af5dcdf87c +Author: Behdad Esfahbod +Date: Sun Sep 30 18:01:20 2018 +0200 + + More warning fixes + + test/api/test-multithread.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 5c65ed800de4caef5ee9ad2111225fa5d8235737 +Author: Behdad Esfahbod +Date: Sun Sep 30 17:48:55 2018 +0200 + + Fix bug introduced in 9b0b40b3c1ac8155c80ed5dc976228f4d3ec7e1f + + Also discovered by msan bot. + + src/hb-ot-shape-fallback.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 247756a7d89008ee6a7d1171dc07ba22454c6034 +Author: Behdad Esfahbod +Date: Sun Sep 30 13:10:54 2018 +0200 + + Fix glib-mkenum warning + + GEN hb-gobject-enums.h + WARNING: Failed to parse "/*< private >*/" in ../../src/hb-buffer.h + + src/hb-buffer.h | 2 -- + 1 file changed, 2 deletions(-) + +commit 0a89f9572fe2d0d9fbf0297e0a69307f0ba1a17c +Author: Ebrahim Byagowi +Date: Sun Sep 30 17:44:15 2018 +0330 + + [circleci] Pass ‌freetype compile flags to right place + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ad701f05cc86c22e8e53b7f5458887457e3a5e5f +Author: Ebrahim Byagowi +Date: Sun Sep 30 17:30:42 2018 +0330 + + [circleci] Use an instrumented freetype on msan bot + + .circleci/config.yml | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 57aabbc29ec6dfa7f1b57da7b6c62fdc547f8ef8 +Author: Ebrahim Byagowi +Date: Sun Sep 30 16:31:28 2018 +0330 + + [circleci] Another on fixing msan + + .circleci/config.yml | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 24f148df3ecc899c9cf6d5359d3d35ee5e84a98c +Author: Ebrahim Byagowi +Date: Sun Sep 30 14:46:56 2018 +0330 + + [circleci] minor + + .circleci/config.yml | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 0a9aab672287149540e8d90b5063ad4c562c423c +Author: Ebrahim Byagowi +Date: Sun Sep 30 14:45:43 2018 +0330 + + [circleci] Try to fix msan bot + + .circleci/config.yml | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit b5285b34798cb7ee672343d00cbe066ea8a2ef83 +Author: Behdad Esfahbod +Date: Sun Sep 30 12:23:01 2018 +0200 + + [util] Remove unneeded virtual + + clang warning: + + ../../util/options.hh:72:13: warning: destination for this 'memset' call is a pointer to dynamic class + 'option_parser_t'; vtable pointer will be overwritten [-Wdynamic-class-memaccess] + memset (this, 0, sizeof (*this)); + ~~~~~~ ^ + ../../util/options.hh:72:13: note: explicitly cast the pointer to silence this warning + memset (this, 0, sizeof (*this)); + ^ + (void*) + + util/options.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 89ed040b21b366c927199bedd0e4cb060389d076 +Author: Behdad Esfahbod +Date: Sun Sep 30 06:06:26 2018 -0400 + + [util] Fix more non-virtual-destructor warnings + + util/options.hh | 28 ++++++++++++++++++---------- + 1 file changed, 18 insertions(+), 10 deletions(-) + +commit 2382dd07fa6ff49638b146a523e9d2e93cf69ceb +Author: Behdad Esfahbod +Date: Sun Sep 30 05:54:47 2018 -0400 + + Minor + + util/options.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 9caa432d0c5c09c8151cfce1e2cc184fbdd89594 +Author: Behdad Esfahbod +Date: Sun Sep 30 05:49:08 2018 -0400 + + [util] Use HB_FALLTHROUGH + + Sure, gcc knows to warn about this as well: + + ../../util/options.cc:175:17: warning: this statement may fall through [-Wimplicit-fallthrough=] + case 1: m.r = m.t; + ~~~~^~~~~ + ../../util/options.cc:176:5: note: here + case 2: m.b = m.t; + ^~~~ + + But HOLY SMOKES, look at clang -Weverything bot message: + + options.cc:176:5: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough] + case 2: m.b = m.t; + ^ + options.cc:176:5: note: insert 'HB_FALLTHROUGH;' to silence this warning + case 2: m.b = m.t; + ^ + HB_FALLTHROUGH; + + Right, it's telling me to insert "HB_FALLTHROUGH;" there!!!!!!!!! + + util/options.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 2e728a7d86c714d845524a0722c2b653feb9d915 +Author: Behdad Esfahbod +Date: Sun Sep 30 05:47:36 2018 -0400 + + [util] Mark var static + + From clang -Weverything bot: + + options.cc:39:3: warning: no previous extern declaration for non-static variable 'supported_font_funcs' [-Wmissing-variable-declarations] + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e910a1aef4b2413c627240fc06d2a5696b24747a +Author: Behdad Esfahbod +Date: Sun Sep 30 05:46:20 2018 -0400 + + [util] Add empty virtual destructor to option_group_t + + From clang -Weverything bot: + + ./options.hh:57:8: warning: 'option_group_t' has virtual functions but non-virtual destructor [-Wnon-virtual-dtor] + struct option_group_t + ^ + + util/options.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit b1e07e1e6cc7a8e5445c7aeb9491ae629029011b +Author: Behdad Esfahbod +Date: Sun Sep 30 05:43:22 2018 -0400 + + [indic/khmer] Remove use of global constructors + + Alternative woul have been to resurrect F_COMBINE that I removed in + 70136a78cb9eda244767f8e8a3d30d0f3c569d01 + + But this does it for now. I'm not sure why check-static-inits.sh didn't + catch this before. Clang -Weverything bot did: + + CXX libharfbuzz_la-hb-ot-shape-complex-indic.lo + hb-ot-shape-complex-indic.cc:99:1: warning: declaration requires a global constructor [-Wglobal-constructors] + indic_features[] = + ^ + 1 warning generated. + CXX libharfbuzz_la-hb-ot-shape-complex-khmer.lo + hb-ot-shape-complex-khmer.cc:36:1: warning: declaration requires a global constructor [-Wglobal-constructors] + khmer_features[] = + ^ + 1 warning generated. + + src/hb-ot-map.hh | 2 ++ + src/hb-ot-shape-complex-indic.cc | 34 +++++++++++++++++----------------- + src/hb-ot-shape-complex-khmer.cc | 18 +++++++++--------- + 3 files changed, 28 insertions(+), 26 deletions(-) + +commit 00cd00e64130694ff7b49456d4bc421a153b4e6d +Author: Behdad Esfahbod +Date: Sun Sep 30 05:34:30 2018 -0400 + + Tweak HB_TAG and HB_UNTAG + + uint32_t was getting promoted to signed int, which is not what we wanted... + + Wow, clang has become good at generating warnings... + + ../../src/hb-common.h:349:29: warning: signed shift result (0xFF000000) sets the sign bit of the shift expression's type ('int') and becomes negative [-Wshift-sign-overflow] + _HB_SCRIPT_MAX_VALUE = HB_TAG_MAX, /*< skip >*/ + ^~~~~~~~~~ + ../../src/hb-common.h:93:20: note: expanded from macro 'HB_TAG_MAX' + define HB_TAG_MAX HB_TAG(0xff,0xff,0xff,0xff) + ^~~~~~~~~~~~~~~~~~~~~~~~~~~ + ../../src/hb-common.h:89:57: note: expanded from macro 'HB_TAG' + define HB_TAG(c1,c2,c3,c4) ((hb_tag_t)((((uint8_t)(c1))<<24)|(((uint8_t)(c2))<<16)|(((uint8_t)(c3))<<8)|((uint8_t)(c4)))) + ~~~~~~~~~~~~~~~^ ~~ + ../../src/hb-common.h:349:3: warning: ISO C restricts enumerator values to range of 'int' (4294967295 is too large) [-Wpedantic] + _HB_SCRIPT_MAX_VALUE = HB_TAG_MAX, /*< skip >*/ + ^ ~~~~~~~~~~ + + src/hb-common.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8a31e406291f4cb27480fc85049f08abd739cb59 +Author: Behdad Esfahbod +Date: Sun Sep 30 05:27:39 2018 -0400 + + [font] Make *_advance() fallback to *_advances + + And remove redundant implementations. + + src/hb-font.cc | 12 ++++++++++++ + src/hb-ft.cc | 19 ------------------- + src/hb-ot-font.cc | 22 ---------------------- + 3 files changed, 12 insertions(+), 41 deletions(-) + +commit bd07d2878ff28baecf7b4b587a18ffbb744b7eb1 +Author: Behdad Esfahbod +Date: Sun Sep 30 03:54:40 2018 -0400 + + Use buffer scratch_flags to remember if we had any joiners + + src/hb-buffer.hh | 3 ++- + src/hb-ot-layout.hh | 12 ++++++++++-- + src/hb-ot-shape-complex-arabic.cc | 3 +++ + 3 files changed, 15 insertions(+), 3 deletions(-) + +commit ba0f0f156fe05bda760efcb0c8d34f303fa26ab0 +Author: Behdad Esfahbod +Date: Sun Sep 30 03:49:52 2018 -0400 + + Document setlocale() threadsafety issue + + "Fixes" //github.com/harfbuzz/harfbuzz/issues/1191 + + src/hb-buffer.cc | 2 ++ + src/hb-common.cc | 7 +++++++ + 2 files changed, 9 insertions(+) + +commit 06be2aa93fa6ea8cc32684a4b51bfe927c5202bb +Author: Ebrahim Byagowi +Date: Sun Sep 30 00:15:25 2018 +0330 + + [ci] Build glib and freetype and enable msan bot (#1198) + + .circleci/config.yml | 41 +++++++++++++++++++++-------------------- + 1 file changed, 21 insertions(+), 20 deletions(-) + +commit cefdef0247026f941eba8930c73b66b0498bb63c +Author: Ebrahim Byagowi +Date: Sat Sep 29 10:19:54 2018 +0330 + + Minor on test-multithread, align the actual and expected results + + test/api/test-multithread.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 678beff64ca3b2963de25d8a76a2bf3710c3d7a6 +Author: Ebrahim Byagowi +Date: Sat Sep 29 10:16:14 2018 +0330 + + [circleci] Add -Wno-reserved-id-macro to clang-everything + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c763b9440189b541316054ba4f623e728b5aae77 +Author: Behdad Esfahbod +Date: Fri Sep 28 20:53:07 2018 -0400 + + [test-multithread] Disable FreeType funcs + + test/api/test-multithread.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 9b0b40b3c1ac8155c80ed5dc976228f4d3ec7e1f +Author: Behdad Esfahbod +Date: Fri Sep 28 11:16:18 2018 -0400 + + Fix fallback kerning to check for current glyph's mask + + src/hb-ot-shape-fallback.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 909a07b587884e9cd1d92ba9f3d5b96d8774c67a +Author: Ebrahim Byagowi +Date: Sat Sep 29 03:10:13 2018 +0330 + + [circleci] Improve clang-everything bot log, more to come + + #1196 + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9be8062b4d241f02bb96df436e98f10f08bda4f8 +Author: Ebrahim Byagowi +Date: Sat Sep 29 02:11:05 2018 +0330 + + [ci] Another try on mingw bot + + appveyor.yml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit d4d261a97723b27fb9ad9a69b8dc7fd8c560a98b +Author: Ebrahim Byagowi +Date: Sat Sep 29 01:57:50 2018 +0330 + + [ci] Another try on fixing mingw bots + + Per https://github.com/Alexpux/MSYS2-packages/issues/163#issuecomment-73555971 + + appveyor.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7b68edf2abc7680199360d52ed283cfc4f49b7d5 +Author: Ebrahim Byagowi +Date: Fri Sep 28 20:53:48 2018 +0330 + + [tests] Don't try to get glyph names on failures + + As it may cause a race unrelated to the issue actually happened + + test/api/test-multithread.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d289d6381864649504abfb1196ac20a1d4664a4e +Author: Ebrahim Byagowi +Date: Fri Sep 28 20:47:21 2018 +0330 + + [ci] Trying to fix mingw bot + + As https://github.com/Alexpux/MSYS2-packages/issues/702 + + appveyor.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 33231a855f0e3d2a14e5e2fcb921c6fc773ae6cf +Author: Behdad Esfahbod +Date: Fri Sep 28 11:06:49 2018 -0400 + + Fix pthread fail for real + + Using a hack... + + test/api/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 8cb8209c911a69442f23f744981e3ed01e44a3fc +Author: Behdad Esfahbod +Date: Fri Sep 28 10:55:28 2018 -0400 + + Fix bot fails + + test/api/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f4072e8cb81072cd6d51a2607efedb76c02e7db1 +Author: Behdad Esfahbod +Date: Fri Sep 28 10:14:23 2018 -0400 + + [morx] Remove mark_set from Insertion + + text-rendering-tests test MORX-32 shows that for Insertion, an unset mark is treated + as mark set at 0. This is unlike the Reordering lookup where un unset mark performs + nothing. + + Fixes MORX-32. + + src/hb-aat-layout-morx-table.hh | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +commit 0d18ec5467818fa8f763ec2871146a64d39987e7 +Author: Behdad Esfahbod +Date: Fri Sep 28 10:00:07 2018 -0400 + + [morx] unsafe-to-break in Insertion + + Makes MORX-29, MORX-30, MORX-31 pass. + + src/hb-aat-layout-morx-table.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 02bebe42c1ffbd8e11b232c943317c8cd8141afb +Author: Behdad Esfahbod +Date: Fri Sep 28 09:51:35 2018 -0400 + + [test/text-rendering-tests] Update from upstream + + test/shaping/data/text-rendering-tests/DISABLED | 4 ++++ + test/shaping/data/text-rendering-tests/Makefile.sources | 4 ++++ + .../text-rendering-tests/fonts/TestMORXThirtyone.ttf | Bin 0 -> 2964 bytes + .../text-rendering-tests/fonts/TestMORXThirtytwo.ttf | Bin 0 -> 2948 bytes + .../text-rendering-tests/fonts/TestMORXTwentynine.ttf | Bin 0 -> 3012 bytes + .../data/text-rendering-tests/tests/MORX-29.tests | 4 ++++ + .../data/text-rendering-tests/tests/MORX-30.tests | 4 ++++ + .../data/text-rendering-tests/tests/MORX-31.tests | 8 ++++++++ + .../data/text-rendering-tests/tests/MORX-32.tests | 4 ++++ + 9 files changed, 28 insertions(+) + +commit 4cd342baea323bf9709340bbabfc092c976c239c +Author: Behdad Esfahbod +Date: Fri Sep 28 09:47:45 2018 -0400 + + Fix ubsan bot + + test/api/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit b435df3a5b6f7fddc091c4362a36840305144a57 +Author: Behdad Esfahbod +Date: Fri Sep 28 09:13:14 2018 -0400 + + More atomic tuneup + + src/hb-atomic.hh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 7e6e094abd27fd022fe9aea1872ef82f6a0cdcec +Author: Behdad Esfahbod +Date: Fri Sep 28 08:45:57 2018 -0400 + + [test-multithread] Install ot funcs before filling ref buffer + + test/api/test-multithread.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 21fbee831e0eab2c2f4513825c939158f4578156 +Author: Behdad Esfahbod +Date: Fri Sep 28 08:43:37 2018 -0400 + + [test-multithread] Take num-threads and num-iters from command-line + + test/api/test-multithread.c | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 598be3bb38fd11a288f8155b8c27ffef4ebdd8b9 +Author: Behdad Esfahbod +Date: Fri Sep 28 08:33:26 2018 -0400 + + Minor + + test/api/test-multithread.c | 1 + + 1 file changed, 1 insertion(+) + +commit c09bf3d50589c8eb95b322ef3e4eb8a288dacebe +Author: Ebrahim Byagowi +Date: Fri Sep 28 16:13:01 2018 +0330 + + test-multithread, check the results on every iteration (#1194) + + test/api/test-multithread.c | 59 ++++++++++++++++++++++++--------------------- + 1 file changed, 32 insertions(+), 27 deletions(-) + +commit dbc3070a15290310bb5aade11d04eb24fe958094 +Author: Ebrahim Byagowi +Date: Fri Sep 28 16:01:15 2018 +0330 + + Make test-multithread pass the tsan bot test (#1193) + + test/api/test-multithread.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit d2542cd28c70b2ba7ab28c0fe5459a1b4a873478 +Author: Behdad Esfahbod +Date: Thu Sep 27 17:23:24 2018 -0400 + + More atomic fixup + + src/hb-atomic.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3ee96984f4633852736b33640c89d1706bc77e0b +Author: Behdad Esfahbod +Date: Thu Sep 27 17:20:26 2018 -0400 + + Fixup atomics from recent change + + src/hb-atomic.hh | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 305468708dc9ce9dadad36c117c380f13bcc6a26 +Author: Behdad Esfahbod +Date: Thu Sep 27 16:54:23 2018 -0400 + + [cache] Use atomic writes in clear() + + To help TSan. + + src/hb-cache.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 341b70a3b47ef3ceeb81e715937d6b2305258060 +Merge: bbf2a095 9e9a36ee +Author: n8willis +Date: Thu Sep 27 11:15:22 2018 -0500 + + Merge pull request #1 from harfbuzz/master + + Resync with upstream + +commit 9e9a36ee651502b69717895385387951a2d0802a +Author: Volker Krause +Date: Thu Sep 27 16:33:49 2018 +0200 + + Fix infinite loop when walking up the directory hierarchy (#1183) + + A single find_package(harfbuzz) line in user code resulted in this loop + getting stuck when _harfbuzz_libdir_iter became "/". + + src/harfbuzz-config.cmake.in | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 0c1d852bc41a4f69f890be4817c84bd7de56e07a +Author: Ebrahim Byagowi +Date: Thu Sep 27 11:53:17 2018 +0330 + + Use clang for compiling freetype for tsan bot + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ab16b24cc94389ac66a9353327d2a87a7c230ed4 +Author: Michiharu Ariza +Date: Wed Sep 26 18:51:36 2018 -0700 + + tweaked get_fd fix + + src/hb-ot-cff-common.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit dac70f252a84e1a255375eaacffc2cb3f3fc6e58 +Author: Michiharu Ariza +Date: Wed Sep 26 16:30:26 2018 -0700 + + Added CFF1 J font subset to api test + + Also fixed FDSelect3_4::get_fd + Fixed test_subset_cff1_strip_hints (wrong font names!) + + src/hb-ot-cff-common.hh | 2 +- + .../fonts/SourceHanSans-Regular.41,3041,4E9D.otf | Bin 0 -> 5864 bytes + test/api/fonts/SourceHanSans-Regular.41,4E9D.otf | Bin 0 -> 5500 bytes + test/api/test-subset-cff1.c | 25 +++++++++++++++++++-- + 4 files changed, 24 insertions(+), 3 deletions(-) + +commit 662f7d7e8bfa77b21ffa05e853f61dda993dcc8a +Author: Behdad Esfahbod +Date: Wed Sep 26 18:42:37 2018 -0400 + + [arabic] Do the joiner-flipping only for rlig feature + + See comment. + + src/hb-ot-shape-complex-arabic.cc | 24 +++++++++++++++++++----- + 1 file changed, 19 insertions(+), 5 deletions(-) + +commit 7f30629cddcf0196d7b754df0cb2d4a8e5fed4b6 +Author: Behdad Esfahbod +Date: Wed Sep 26 16:40:23 2018 -0400 + + [ft] Make TSan happy + + src/hb-ft.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit ec743fce2a72a1cb76ac9401747a442a03a051d9 +Author: Behdad Esfahbod +Date: Wed Sep 26 16:37:18 2018 -0400 + + Add more atomic intrinsics + + src/hb-atomic.hh | 21 ++++++++++++++++++--- + 1 file changed, 18 insertions(+), 3 deletions(-) + +commit d183b33c1dd42055a9432f4a756ea20856913201 +Author: Behdad Esfahbod +Date: Wed Sep 26 16:29:35 2018 -0400 + + Rename test + + test/api/Makefile.am | 2 +- + test/api/{test-subset-codepoints.c => test-collect-unicodes.c} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit c9c75fe3d9eb36f166d594ceb5889a1dc0b14fe6 +Author: Ebrahim Byagowi +Date: Thu Sep 27 00:08:06 2018 +0330 + + [ci] Compile freetype on tsan and put sanitizer flags on correct places (#1188) + + .circleci/config.yml | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 39da1914b4fd1c58d61cb29c78a0904ff6b905c6 +Author: Ebrahim Byagowi +Date: Wed Sep 26 23:32:45 2018 +0330 + + Test freetype funcs on test-multithread (#1187) + + test/api/Makefile.am | 6 ++++-- + test/api/test-multithread.c | 25 +++++++++++++++++-------- + 2 files changed, 21 insertions(+), 10 deletions(-) + +commit e88009a93f5d13ed31b6262f928761e9574dcef1 +Author: Ebrahim Byagowi +Date: Wed Sep 26 22:53:02 2018 +0330 + + Minor, remove the no longer needed comment on test-multithread + + test/api/test-multithread.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 90a0f9fa0c020c268ac3ba31c7f1337eed85f35e +Author: Behdad Esfahbod +Date: Wed Sep 26 15:03:07 2018 -0400 + + Make TSan happy with make_immutable() + + src/hb-blob.cc | 2 ++ + src/hb-face.cc | 2 ++ + src/hb-font.cc | 4 ++++ + src/hb-unicode.cc | 2 ++ + 4 files changed, 10 insertions(+) + +commit 34d5a2595331c568ae524057d031c9d5d2573978 +Author: Behdad Esfahbod +Date: Wed Sep 26 15:02:21 2018 -0400 + + Fix test-multithread and increase num_threads to 30 + + What were you thinking? ;) + + test/api/test-multithread.c | 56 +++++++++++++++++++++------------------------ + 1 file changed, 26 insertions(+), 30 deletions(-) + +commit 8bb73dad7f3279e1f1362cf9a137504e8ef08985 +Author: Ebrahim Byagowi +Date: Wed Sep 26 20:50:51 2018 +0330 + + Add a multithreaded test (#1184) + + test/api/Makefile.am | 6 ++ + test/api/test-multithread.c | 146 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 152 insertions(+) + +commit 04caf11608d2db13eb6ed2ecc3d406e284b4c13c +Author: Behdad Esfahbod +Date: Wed Sep 26 12:13:47 2018 -0400 + + [hb-view] Change subpixel bits from 8 to 6 + + To match FreeType units, such that FreeType gets correct size from us. + This matters more now that we allow setting --ft-load-flags. + + util/hb-view.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 824111d4842b9a7bbbdcd147325f8f372ed3d37c +Author: Behdad Esfahbod +Date: Tue Sep 25 12:47:37 2018 -0400 + + Fix iOS build + + Fixes https://github.com/harfbuzz/harfbuzz/pull/1179 + + src/hb-coretext.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4b4be7701f635f8378e7f868cfbe8d4571fc841f +Author: Ebrahim Byagowi +Date: Tue Sep 25 09:24:35 2018 +0330 + + [circle] Add an obsessive clang bot (#1178) + + .circleci/config.yml | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit ae7f0e83d4417fac2455c44eaea15b3cca03d18e +Author: Michiharu Ariza +Date: Mon Sep 24 22:49:44 2018 -0700 + + fixed memory leaks + + in CFF1 & CFF2 accelerators, VORG subsetter + + src/hb-ot-cff1-table.hh | 2 ++ + src/hb-ot-cff2-table.hh | 2 ++ + src/hb-ot-vorg-table.hh | 3 +++ + 3 files changed, 7 insertions(+) + +commit 258b456566abd266657725b3fc4e70f18b370d5d +Author: Michiharu Ariza +Date: Mon Sep 24 16:50:47 2018 -0700 + + Added CFF1 & CFF2 api tests + + test/api/Makefile.am | 4 + + test/api/fonts/AdobeVFPrototype.abc.otf | Bin 0 -> 7800 bytes + test/api/fonts/AdobeVFPrototype.ac.nohints.otf | Bin 0 -> 7152 bytes + test/api/fonts/AdobeVFPrototype.ac.otf | Bin 0 -> 7336 bytes + test/api/fonts/SourceSansPro-Regular.abc.otf | Bin 0 -> 3412 bytes + .../api/fonts/SourceSansPro-Regular.ac.nohints.otf | Bin 0 -> 3228 bytes + test/api/fonts/SourceSansPro-Regular.ac.otf | Bin 0 -> 3332 bytes + test/api/test-subset-cff1.c | 104 +++++++++++++++++++++ + test/api/test-subset-cff2.c | 104 +++++++++++++++++++++ + 9 files changed, 212 insertions(+) + +commit 8282e881b51363811078bce53fad6aa5b41f7b41 +Author: Behdad Esfahbod +Date: Mon Sep 24 19:43:01 2018 -0400 + + Disable msan bot again + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1175 + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6c0e7eb6a6f3f888442c0a97ce6a771631990ed6 +Author: Behdad Esfahbod +Date: Mon Sep 24 19:07:23 2018 -0400 + + Minor + + src/hb-ot-map.hh | 1 + + src/hb-ot-shape-complex-indic.cc | 34 +++++++++++++++++----------------- + src/hb-ot-shape-complex-khmer.cc | 18 +++++++++--------- + 3 files changed, 27 insertions(+), 26 deletions(-) + +commit d748dc76644f28d4130f9cb1dee7a22cbe81c25d +Author: Behdad Esfahbod +Date: Mon Sep 24 18:30:50 2018 -0400 + + More iter inits + + src/hb-ot-layout-gsubgpos.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit d9867497d09af929554eaa89cc6fee865b018646 +Author: Behdad Esfahbod +Date: Mon Sep 24 18:11:59 2018 -0400 + + Minor + + src/hb-ot-shape.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 70136a78cb9eda244767f8e8a3d30d0f3c569d01 +Author: Behdad Esfahbod +Date: Mon Sep 24 18:03:34 2018 -0400 + + Remove F_COMBINE + + Now I wonder if any bots will be unhappy we calling | in static const initializations... + Or would that cost runtime init? Our tests don't detect any.. + + src/hb-ot-map.hh | 2 -- + src/hb-ot-shape-complex-arabic.cc | 2 +- + 2 files changed, 1 insertion(+), 3 deletions(-) + +commit f048ead84a4d3fe0bb712ed228c2f39c01ce9705 +Author: Behdad Esfahbod +Date: Mon Sep 24 18:01:53 2018 -0400 + + Some more + + src/hb-ot-map.cc | 5 +++-- + src/hb-ot-map.hh | 13 +++++++------ + src/hb-ot-shape-complex-arabic.cc | 18 +++++++++--------- + src/hb-ot-shape-complex-hangul.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 8 ++++---- + src/hb-ot-shape-complex-khmer.cc | 8 ++++---- + src/hb-ot-shape-complex-myanmar.cc | 10 +++++----- + src/hb-ot-shape-complex-tibetan.cc | 2 +- + src/hb-ot-shape-complex-use.cc | 20 ++++++++++---------- + src/hb-ot-shape.cc | 30 +++++++++++++++--------------- + 10 files changed, 59 insertions(+), 57 deletions(-) + +commit 1676f608c8e4f880789252ca448bb008f6dd51b4 +Author: Behdad Esfahbod +Date: Mon Sep 24 17:55:03 2018 -0400 + + Minor refactoring + + src/hb-ot-map.hh | 15 ++++++++++- + src/hb-ot-shape-complex-hangul.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 52 +++++++++++++++----------------------- + src/hb-ot-shape-complex-khmer.cc | 38 ++++++++++------------------ + src/hb-ot-shape-complex-myanmar.cc | 2 +- + 5 files changed, 51 insertions(+), 58 deletions(-) + +commit 10203339600e85d6aaffba6034ac250e72fdfc12 +Author: Ebrahim Byagowi +Date: Tue Sep 25 01:00:32 2018 +0330 + + [circleci] Update sanitizer bots with newer clang and Ubuntu version (#1176) + + .circleci/config.yml | 48 ++++++++++++++++++++++++++++++++---------------- + 1 file changed, 32 insertions(+), 16 deletions(-) + +commit 12b8baa7653741ba13a89cd40f1f36b8bac11666 +Author: Behdad Esfahbod +Date: Mon Sep 24 17:22:39 2018 -0400 + + [msan] Enable again to get a build log, and try to play with suppressions + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit aec0d3cbc923a8801c5bd9e9ae05801a31a7260c +Author: Behdad Esfahbod +Date: Mon Sep 24 13:12:15 2018 -0400 + + [ubsan] Re-enable now that it passes locally + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4839807340cc73d5ba826dff4b4ba358775a213d +Author: Behdad Esfahbod +Date: Mon Sep 24 13:11:34 2018 -0400 + + [check-static-inits.sh] Allow some if ubsan is in effect + + src/check-static-inits.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0604bf2b3846b200c56447ffe542bf69c0529a06 +Merge: 76e54d2b 45f5aa97 +Author: Michiharu Ariza +Date: Mon Sep 24 10:09:25 2018 -0700 + + Merge branch 'master' into cff-subset + +commit e45ba31dc723988150ef766758fa89fecd50ca03 +Author: Behdad Esfahbod +Date: Mon Sep 24 13:04:48 2018 -0400 + + [check-symbols.sh] Allow weak objects "V" + + ubsan generates these. + + src/check-symbols.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d07f3111b4bc38798e16a2459b80a16d7a9f9ff1 +Author: Behdad Esfahbod +Date: Mon Sep 24 13:01:35 2018 -0400 + + Link API test programs with C++ linker + + Needed to make ubsan work. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1174 + + test/api/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit a96508cfc9bd9013d24b18547fcd9c03e08fe2f2 +Author: Behdad Esfahbod +Date: Mon Sep 24 12:52:42 2018 -0400 + + [msan] Add MSAN_OPTIONS=exitcode=42 + + Default exit value is 77, which causes autotools to "skip" test. + + .circleci/config.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 45f5aa97905996e3486c6dbba8493b11cfa0cf15 +Author: Behdad Esfahbod +Date: Mon Sep 24 12:43:29 2018 -0400 + + [circleci] Disable msan and ubsan builds + + https://github.com/harfbuzz/harfbuzz/issues/1174 + https://github.com/harfbuzz/harfbuzz/issues/1175 + + .circleci/config.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2d93148a0f915bb52433ecc9d66845191a2f9135 +Author: Behdad Esfahbod +Date: Mon Sep 24 11:52:22 2018 -0400 + + Ignore weak symbols in check-symbols.sh + + Some clang versions leave a std::round(float) weak symbol around... + + src/check-symbols.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 55bae6825ed2058255a512a73293e3cdff0e78a4 +Author: Behdad Esfahbod +Date: Mon Sep 24 10:43:06 2018 -0400 + + [docs] A few improvements + + If we wrote just this much every day... + + src/hb-buffer.cc | 4 ++++ + src/hb-buffer.h | 20 +++++++++++++++----- + src/hb-face.cc | 11 +++++++---- + src/hb-font.cc | 12 +++++++----- + 4 files changed, 33 insertions(+), 14 deletions(-) + +commit 57fa2c23de8b6b66894d6872d192ac90ec8bf05a +Author: Behdad Esfahbod +Date: Mon Sep 24 09:57:52 2018 -0400 + + Readjust Hebrew composition again + + src/hb-ot-shape-complex-hebrew.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7f335390f3a498119319a0e6c3ce7656a3902066 +Author: Behdad Esfahbod +Date: Mon Sep 24 09:56:18 2018 -0400 + + Revert change that would decompose text if GPOS mark feature is available + + https://github.com/harfbuzz/harfbuzz/issues/653#issuecomment-423905920 + + src/hb-ot-shape-normalize.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit a6f4b2f7cd088aeb44e1aac672434641f4f9e484 +Author: Behdad Esfahbod +Date: Mon Sep 24 09:54:37 2018 -0400 + + Fix normalization + + https://github.com/harfbuzz/harfbuzz/commit/62d1e0852a5549a1b510ad46a4b89f12730bb708#commitcomment-30613091 + + src/hb-ot-shape-normalize.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 3583fb03b14a10ec5ab5f9c480e150934101fd0b +Author: Behdad Esfahbod +Date: Sun Sep 23 22:33:38 2018 -0400 + + Simplify ZWJ-skipping a bit + + Towards disabling ZWJ-skipping in certain GPOS contexts. + + Part of https://github.com/flutter/flutter/issues/16886 + + src/hb-ot-layout-gsubgpos.hh | 6 +++--- + src/hb-ot-shape-complex-indic.cc | 21 ++++++++++++++++----- + src/hb-ot-shape-complex-khmer.cc | 21 ++++++++++++++------- + src/hb-ot-shape-complex-myanmar.cc | 15 ++++++++++++++- + src/hb-ot-shape-complex-use.cc | 15 +++++++++++++-- + 5 files changed, 60 insertions(+), 18 deletions(-) + +commit 9516cbd3df7ccdb40b27a7ba99a1e0da8a6b170c +Author: Behdad Esfahbod +Date: Sun Sep 23 22:00:34 2018 -0400 + + Reinit skippy iters when auto_zwj / auto_zwnj change + + Ouch. How did we not hit this bug before... + + src/hb-ot-layout-gsubgpos.hh | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +commit 62d1e0852a5549a1b510ad46a4b89f12730bb708 +Author: Behdad Esfahbod +Date: Sun Sep 23 21:32:18 2018 -0400 + + Prefer decomposed form if font has GPOS mark feature + + Fixes https://github.com/harfbuzz/harfbuzz/issues/653 + + src/hb-ot-shape-complex-hebrew.cc | 2 +- + src/hb-ot-shape-normalize.cc | 126 ++++++++++++++++++++------------------ + src/hb-ot-shape-normalize.hh | 7 ++- + 3 files changed, 72 insertions(+), 63 deletions(-) + +commit d7f21777e6a797758ab234555f5f7e07c87278f9 +Author: Behdad Esfahbod +Date: Sun Sep 23 19:12:52 2018 -0400 + + [ot-font] Fix leak + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1171 + + I'm glad we have leak-detector bots now. + + src/hb-ot-post-table.hh | 1 + + 1 file changed, 1 insertion(+) + +commit ae39a53f55e6b812defb4c7b48562651c9eb13a3 +Author: Ebrahim Byagowi +Date: Sat Sep 22 14:22:17 2018 +0330 + + Add bots with address- and thread-sanitizer + + .circleci/config.yml | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 52 insertions(+) + +commit 24dd6c1a9d8d571c30dce4d39c1975b1d1cedc2a +Author: Matt Oliver +Date: Sun Sep 23 18:08:30 2018 +1000 + + src/hb-blob.cc: Fix mmap functionality with UWP. + + src/hb-blob.cc | 27 +++++++++++++++++++++++++++ + src/hb.hh | 4 +++- + 2 files changed, 30 insertions(+), 1 deletion(-) + +commit b7f1bbc2f8b14a402fa9e42e88919dc0173373ce +Author: Khaled Hosny +Date: Sat Sep 22 16:41:56 2018 +0200 + + [test] Fix printing subprocess error messages + + Decode the string as Python 3 returns bytes string, and also don’t + assume that it ends with a new line. + + test/shaping/run-tests.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 403019482b0d7f17fbdb5def2be5f43e28bafcf3 +Author: Ebrahim Byagowi +Date: Sat Sep 22 17:24:03 2018 +0330 + + Fix test-subset-* leak issues + + See also https://github.com/harfbuzz/harfbuzz/pull/1169 + + test/api/hb-subset-test.h | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit f6ebe1f4dc95a7c4b3a0af23086873a11867c1d9 +Author: Ebrahim Byagowi +Date: Sat Sep 22 17:05:52 2018 +0330 + + Fix test-ot-math leak issue + + See also https://github.com/harfbuzz/harfbuzz/pull/1169 + + test/api/test-ot-math.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 669ac81ac52e9d559324db851a9ee46ef651e7b0 +Author: Ebrahim Byagowi +Date: Sat Sep 22 16:49:23 2018 +0330 + + Fix test-set leak issue + + See also https://github.com/harfbuzz/harfbuzz/pull/1169 + + test/api/test-set.c | 1 + + 1 file changed, 1 insertion(+) + +commit ef9307fd2227bf0f750d8f7fafae466affc81454 +Author: Ebrahim Byagowi +Date: Sat Sep 22 16:45:31 2018 +0330 + + Fix test-font leak issue + + See also https://github.com/harfbuzz/harfbuzz/pull/1169 + + test/api/test-font.c | 1 + + 1 file changed, 1 insertion(+) + +commit 76e54d2bd804414183858ca198157050419dfe6c +Author: Michiharu Ariza +Date: Fri Sep 21 12:16:36 2018 -0700 + + fixed subroutinized CFF2 flattening + + and some code cleanup + + src/hb-cff-interp-common.hh | 2 +- + src/hb-cff-interp-cs-common.hh | 13 ------------- + src/hb-cff2-interp-cs.hh | 7 ++++--- + 3 files changed, 5 insertions(+), 17 deletions(-) + +commit 321e592333014f713557e8ce8041dcb5de710218 +Author: Michiharu Ariza +Date: Thu Sep 20 10:31:06 2018 -0700 + + Added desubroutinize option to generate-expected-outputs.py + + Currently hb-subset always desubroutinizes CFF fonts. + Note that even with this option fonttools won't generate the expected subset CFF fonts. They were manually created & tweaked to match hb-subset output. + + test/subset/generate-expected-outputs.py | 1 + + 1 file changed, 1 insertion(+) + +commit f212c050ad50898d5105d1d3a6ea3498f94ee462 +Author: Michiharu Ariza +Date: Thu Sep 20 09:45:43 2018 -0700 + + Added VORG struct and its subsetter + + new file: hb-ot-vorg-table.hh + + src/Makefile.sources | 1 + + src/hb-ot-vorg-table.hh | 163 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-subset.cc | 5 +- + 3 files changed, 168 insertions(+), 1 deletion(-) + +commit 5fd8bce945e7efaa48d0c29eb8b2700027bd3c0b +Author: Behdad Esfahbod +Date: Wed Sep 19 22:34:09 2018 -0400 + + [morx] Fix mark_set check + + src/hb-aat-layout-morx-table.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 1377adc8a88c627891cb8b9cea511d8f9f5324f9 +Author: Michiharu Ariza +Date: Wed Sep 19 17:00:10 2018 -0700 + + Added SourceHanSans-Regular for CFF subset test + + Disabled FDSelect serialization to format 0 for compatibility with fonttools + + src/hb-subset-cff-common.cc | 16 +++++++++++++--- + .../japanese/SourceHanSans-Regular.default..otf | Bin 0 -> 2340 bytes + ...Regular.default.3042,3044,3046,3048,304A,304B.otf | Bin 0 -> 6248 bytes + ...Regular.default.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 0 -> 6432 bytes + .../SourceHanSans-Regular.default.61,63,65,6B.otf | Bin 0 -> 5428 bytes + ...Regular.default.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 0 -> 6552 bytes + .../japanese/SourceHanSans-Regular.default.660E.otf | Bin 0 -> 5196 bytes + .../japanese/SourceHanSans-Regular.drop-hints..otf | Bin 0 -> 2188 bytes + ...ular.drop-hints.3042,3044,3046,3048,304A,304B.otf | Bin 0 -> 6076 bytes + ...ular.drop-hints.3042,3044,3046,73E0,5EA6,8F38.otf | Bin 0 -> 6180 bytes + .../SourceHanSans-Regular.drop-hints.61,63,65,6B.otf | Bin 0 -> 5312 bytes + ...ular.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.otf | Bin 0 -> 6248 bytes + .../SourceHanSans-Regular.drop-hints.660E.otf | Bin 0 -> 5088 bytes + test/subset/data/fonts/SourceHanSans-Regular.otf | Bin 0 -> 16427580 bytes + test/subset/data/tests/japanese.tests | 1 + + 15 files changed, 14 insertions(+), 3 deletions(-) + +commit 0739b28169eb63332b31420deb5bf58b5446f154 +Author: Behdad Esfahbod +Date: Wed Sep 19 17:32:21 2018 -0400 + + [aat] Minor + + src/hb-aat-layout-common.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7671cb9b04770d50b1b2a05a24f6fadc35993cd1 +Author: Behdad Esfahbod +Date: Wed Sep 19 17:10:26 2018 -0400 + + [coretext] Minor + + src/hb-coretext.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit dc8ed45292ce4e522c3bda03fd83873da7b6591e +Author: Behdad Esfahbod +Date: Wed Sep 19 16:46:41 2018 -0400 + + [morx] Implement forward/backward processing + + We reverse too many times. Can be optimized. But I doubt many fonts + use reverse lookups, so doesn't matter. + + Other than not applying user features, this completes morx table + implementation. + + src/hb-aat-layout-morx-table.hh | 40 ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) + +commit 3bccd62196b5dff70d446c3fe053b1b47bb9c19e +Author: Behdad Esfahbod +Date: Wed Sep 19 16:24:34 2018 -0400 + + [morx] Implement horiz-only/vert-only subtables + + src/hb-aat-layout-morx-table.hh | 24 +++++++++++++++++++++++- + 1 file changed, 23 insertions(+), 1 deletion(-) + +commit 041a08de3d0ca74d3e2fdccfa5311ff26a8b97e4 +Author: Behdad Esfahbod +Date: Wed Sep 19 16:02:56 2018 -0400 + + [morx] Improve buffer position in Insertion w DontAdvance and wo + + Just speculation. Needs tests to determine which is correct behavior. + + src/hb-aat-layout-morx-table.hh | 23 ++++++++++++++++++----- + 1 file changed, 18 insertions(+), 5 deletions(-) + +commit ebeccf3e63bff96b7a7766dea566704a9cbeae44 +Author: Michiharu Ariza +Date: Tue Sep 18 17:24:30 2018 -0700 + + fixed char widths & standard Encoding in subset CFF + + also merged flush_n_args to flush_args into one + takes start index of the arguments on stack instead of count + + src/hb-cff-interp-cs-common.hh | 20 +++++--------------- + src/hb-cff1-interp-cs.hh | 11 +++++++---- + src/hb-cff2-interp-cs.hh | 2 +- + src/hb-subset-cff1.cc | 22 ++++++++++++++++------ + src/hb-subset-cff2.cc | 12 ++++++------ + 5 files changed, 35 insertions(+), 32 deletions(-) + +commit bf4eb2e4cf8d08b674f81954e22b331cca2b3721 +Author: Michiharu Ariza +Date: Tue Sep 18 15:53:37 2018 -0700 + + Added SourceSansPro-Regular along as CFF full-font test case + + derived "expected" subset fonts from fonttools then manually tweaked further so they resemble hb-subset output + + ...ourceSansPro-Regular.default.1FC,21,41,20,62,63.otf | Bin 0 -> 3640 bytes + .../SourceSansPro-Regular.default.61,62,63.otf | Bin 0 -> 3400 bytes + .../SourceSansPro-Regular.default.D7,D8,D9,DA,DE.otf | Bin 0 -> 3596 bytes + ...ceSansPro-Regular.drop-hints.1FC,21,41,20,62,63.otf | Bin 0 -> 3480 bytes + .../SourceSansPro-Regular.drop-hints.61,62,63.otf | Bin 0 -> 3276 bytes + ...SourceSansPro-Regular.drop-hints.D7,D8,D9,DA,DE.otf | Bin 0 -> 3448 bytes + test/subset/data/fonts/SourceSansPro-Regular.otf | Bin 0 -> 220852 bytes + test/subset/data/tests/full-font.tests | 1 + + test/subset/run-tests.py | 4 ++-- + test/subset/subset_test_suite.py | 5 +++++ + 10 files changed, 8 insertions(+), 2 deletions(-) + +commit e75e7224c9c02ab99e132a51fe8801e29827cac5 +Author: Michiharu Ariza +Date: Mon Sep 17 15:34:39 2018 -0700 + + include curve control points in extents + + this makes results consistent with FT + also optimized handling of path end points + + src/hb-cff-interp-cs-common.hh | 6 +++--- + src/hb-ot-cff1-table.cc | 27 +++++++++++++++++++++++++-- + 2 files changed, 28 insertions(+), 5 deletions(-) + +commit 98b94f8ba53276887ab583eeeb4cb097c7b84b2c +Author: Michiharu Ariza +Date: Mon Sep 17 13:56:39 2018 -0700 + + fix static_assert failure in OffsetTo + + src/hb-ot-cff2-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d050ab8d3e73debfb414fc8c9426180459150b61 +Merge: f0a4e0c2 388ab916 +Author: Michiharu Ariza +Date: Mon Sep 17 13:07:29 2018 -0700 + + Merge branch 'master' into cff-subset + +commit f0a4e0c2ca5ee0225765590384216d5d5367de7e +Author: Michiharu Ariza +Date: Mon Sep 17 12:11:56 2018 -0700 + + fix build attempt ^3 + + src/hb-ot-cff1-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f0d74971aee5ce309bdfa2a4397667f14ee15f42 +Author: Michiharu Ariza +Date: Mon Sep 17 12:02:12 2018 -0700 + + fix attempt ^2: unuse INT32_MAX/MIN + + src/hb-ot-cff1-table.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 4d963a2711e6035e97e246241d8420273363f857 +Author: Michiharu Ariza +Date: Mon Sep 17 11:28:33 2018 -0700 + + fix build attempt + + src/hb-ot-cff1-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 388ab91642734e1ba0d7a4a4f29a17b15f1b249d +Author: Behdad Esfahbod +Date: Mon Sep 17 19:29:34 2018 +0200 + + [morx] Implement InsertionChain + + src/hb-aat-layout-morx-table.hh | 87 ++++++++++++++++------------------------- + 1 file changed, 33 insertions(+), 54 deletions(-) + +commit c0c85b852d37dad75eeef473e6dd3ec91a3b559b +Author: Michiharu Ariza +Date: Mon Sep 17 11:14:56 2018 -0700 + + implemented get_glyph_extents with CFF1 + + Implemented path operators in a new struct PathProc hooked up to CSOpSet + Added current point to CSInterpEnv + + src/hb-cff-interp-common.hh | 86 ++++++++- + src/hb-cff-interp-cs-common.hh | 425 +++++++++++++++++++++++++++++++++++++++-- + src/hb-cff1-interp-cs.hh | 18 +- + src/hb-cff2-interp-cs.hh | 10 +- + src/hb-null.hh | 2 +- + src/hb-ot-cff1-table.cc | 82 ++++++++ + src/hb-ot-cff1-table.hh | 95 +++++---- + src/hb-ot-face.cc | 1 + + src/hb-ot-face.hh | 1 + + src/hb-ot-font.cc | 2 + + src/hb-subset-cff1.cc | 4 +- + src/hb-subset-cff2.cc | 10 +- + 12 files changed, 657 insertions(+), 79 deletions(-) + +commit d8d1e7df0057c79f54d855b7bfec2d21f59b09e8 +Author: David Corbett +Date: Mon Sep 17 11:09:51 2018 -0400 + + Don't enforce a native direction for Old Hungarian + + src/hb-common.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6a97d0f3d377a35ea691d15ac142ce043f953e71 +Author: Simon Hausmann +Date: Mon Sep 17 10:33:34 2018 +0200 + + Fix installation of cmake config when building with cmake (#1161) + + When building with the auto tools, the manually mantained + harfbuzz-config.cmake is installed. When building with cmake, we can use + cmake to generate the correct config files for us and install them. + + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 606bf57430370810f7bb62ba12b9685d8943685d +Author: Behdad Esfahbod +Date: Sun Sep 16 19:33:48 2018 +0200 + + Revert forcing use of single-parameter static_assert() + + Some clang versions define static_assert as a macro apparently, so we cannot + redefine it... + + This reverts commit 94bfea0ce6a7b4d5641c198d50751748a353df11. + This reverts commit 4e62627831e7457ed60ff87712570065b14b200a. + + src/hb-atomic.hh | 4 ++-- + src/hb-buffer.cc | 2 +- + src/hb-buffer.hh | 4 ++-- + src/hb-cache.hh | 4 ++-- + src/hb-coretext.cc | 2 +- + src/hb-debug.hh | 2 +- + src/hb-dsalgs.hh | 4 ++-- + src/hb-machinery.hh | 4 ++-- + src/hb-null.hh | 8 +++---- + src/hb-open-type.hh | 4 ++-- + src/hb-ot-layout-common.hh | 2 +- + src/hb-ot-layout-gdef-table.hh | 6 +++--- + src/hb-ot-layout.cc | 14 ++++++------ + src/hb-ot-map.cc | 2 +- + src/hb-ot-math-table.hh | 2 +- + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + src/hb-ot-shape-complex-indic.hh | 2 +- + src/hb-ot-shape-complex-use.cc | 2 +- + src/hb-set-digest.hh | 4 ++-- + src/hb-set.hh | 6 +++--- + src/hb-uniscribe.cc | 2 +- + src/hb.hh | 34 +++++++++++++----------------- + util/options.cc | 3 ++- + 23 files changed, 58 insertions(+), 61 deletions(-) + +commit cbcaba6ffdf6b147d45baa95d62fd29cec67ed54 +Author: Behdad Esfahbod +Date: Sun Sep 16 19:25:19 2018 +0200 + + One more bot fix + + src/hb-unicode.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 94bfea0ce6a7b4d5641c198d50751748a353df11 +Author: Behdad Esfahbod +Date: Sun Sep 16 19:12:19 2018 +0200 + + Fix build, another try + + util/options.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 89dd4b959773d35981299551074ccc7a1eb332bd +Author: Behdad Esfahbod +Date: Sun Sep 16 18:11:46 2018 +0200 + + Fix bots + + "Unused private member" warning turned error. ugh. + + src/hb-aat-layout-morx-table.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 4e62627831e7457ed60ff87712570065b14b200a +Author: Behdad Esfahbod +Date: Sun Sep 16 18:09:36 2018 +0200 + + Enforce single-param static_assert() only + + So we don't accidentally break it again. + + src/hb-atomic.hh | 4 ++-- + src/hb-buffer.cc | 2 +- + src/hb-buffer.hh | 4 ++-- + src/hb-cache.hh | 4 ++-- + src/hb-coretext.cc | 2 +- + src/hb-debug.hh | 2 +- + src/hb-dsalgs.hh | 4 ++-- + src/hb-machinery.hh | 4 ++-- + src/hb-null.hh | 8 +++---- + src/hb-open-type.hh | 4 ++-- + src/hb-ot-layout-common.hh | 2 +- + src/hb-ot-layout-gdef-table.hh | 6 +++--- + src/hb-ot-layout.cc | 14 ++++++------ + src/hb-ot-map.cc | 2 +- + src/hb-ot-math-table.hh | 2 +- + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + src/hb-ot-shape-complex-indic.hh | 2 +- + src/hb-ot-shape-complex-use.cc | 2 +- + src/hb-set-digest.hh | 4 ++-- + src/hb-set.hh | 6 +++--- + src/hb-uniscribe.cc | 2 +- + src/hb.hh | 34 +++++++++++++++++------------- + 22 files changed, 60 insertions(+), 56 deletions(-) + +commit f1a86e1e6f3906f33fc89de694a4bbbc3e40d2bc +Author: Behdad Esfahbod +Date: Sun Sep 16 18:01:32 2018 +0200 + + Remove unused try + + src/hb-null.hh | 13 ------------- + 1 file changed, 13 deletions(-) + +commit ebd50b3c83a22a0fdba53271275b8619a23739aa +Author: Behdad Esfahbod +Date: Sun Sep 16 17:57:12 2018 +0200 + + Fix static_assert + + src/hb-open-type.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 10642b3fbfbc1776e784b190c43a9e0693dd423a +Author: Behdad Esfahbod +Date: Sat Sep 15 19:43:33 2018 +0200 + + Disallow null-enabled offsets to unsized structures... + + ...like UnsizedArrayOf<>. + + This fixes a class of crasher bugs, mostly with color and AAT tables. We + cannot use nullable offsets to varsized data that does not declare min_size, + because it's nost safe to use our fixed-size null pool for types that have + their size external. So, use non_null'able offsets for these. + + A further enhancement would be to make use of min_size in Null<> itself. + Will try that after. + + src/hb-aat-layout-common.hh | 8 ++++---- + src/hb-aat-layout-feat-table.hh | 2 +- + src/hb-aat-layout-morx-table.hh | 10 +++++----- + src/hb-aat-layout-trak-table.hh | 4 ++-- + src/hb-aat-ltag-table.hh | 2 +- + src/hb-open-type.hh | 5 +++++ + src/hb-ot-color-cbdt-table.hh | 4 +--- + src/hb-ot-color-colr-table.hh | 4 ++-- + src/hb-ot-color-cpal-table.hh | 8 ++++---- + src/hb-ot-color-svg-table.hh | 2 +- + src/hb-ot-layout-common.hh | 18 ++++++++++-------- + src/hb-ot-layout-jstf-table.hh | 4 ++-- + 12 files changed, 38 insertions(+), 33 deletions(-) + +commit 9ff76c6025b55d184c96b193f23aa935ab32f1fc +Author: Behdad Esfahbod +Date: Sat Sep 15 18:31:14 2018 +0200 + + [morx] Respect default feature settings + + Does NOT apply user-selected features. But at least now enables + correct subtables. + + src/hb-aat-layout-morx-table.hh | 34 +++++++++++++++++++++++----------- + 1 file changed, 23 insertions(+), 11 deletions(-) + +commit 2f97da6e2d6629e112789d399765d90f96952c0a +Author: Behdad Esfahbod +Date: Sat Sep 15 14:51:50 2018 +0200 + + [aat] Change version field + + src/hb-aat-layout-morx-table.hh | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 29c2bd1795b933a611512af50a14f25e25d43159 +Author: Behdad Esfahbod +Date: Sat Sep 15 14:47:18 2018 +0200 + + [morx] Add stub for InsertionChain + + src/hb-aat-layout-morx-table.hh | 209 ++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 200 insertions(+), 9 deletions(-) + +commit f8ccb545c47abe8f0f4ed318ff7b5bf176913893 +Author: Behdad Esfahbod +Date: Fri Sep 14 18:59:53 2018 +0200 + + [dfont] Disable null-processsing for offsets + + An offset to unsized arrayis not safe to be redirected to our fixed-sized + null pool. Plus, we want to reject, not repair, bad-looking dfonts. + + src/hb-open-file.hh | 8 ++++---- + src/hb-open-type.hh | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 01b9148d9ae7d18228538774243e49840cfd2499 +Author: Behdad Esfahbod +Date: Fri Sep 14 14:23:09 2018 +0200 + + [unicode] Move Fitzpatrick hack from ot-layout into unicode.hh + + src/hb-ot-layout.hh | 12 +----------- + src/hb-unicode.hh | 36 +++++++++++++++++++++++++++--------- + 2 files changed, 28 insertions(+), 20 deletions(-) + +commit 6ebbf514ac90712fe089b2b64f68d1cf681edd5d +Author: Behdad Esfahbod +Date: Fri Sep 14 12:15:53 2018 +0200 + + Minor + + src/hb-ot-layout.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 957dbed388fc3214248f6aca65902ad277d070fb +Author: Behdad Esfahbod +Date: Fri Sep 14 12:14:42 2018 +0200 + + Fix builds + + src/hb-aat-layout-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4653e6cf3c1ef5005886d901df30e952d57eed6c +Author: Behdad Esfahbod +Date: Fri Sep 14 11:31:33 2018 +0200 + + [aat] Add enums for pre-defined state and classes + + Not sure how I didn't add before... + + src/hb-aat-layout-common.hh | 19 ++++++++++++++++--- + 1 file changed, 16 insertions(+), 3 deletions(-) + +commit 67449c39331babb88f7d29d737895d786cd5da33 +Author: Behdad Esfahbod +Date: Fri Sep 14 10:58:00 2018 +0200 + + Don't dereference offset before check_struct() + + src/hb-open-file.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit f2c4720ae696096d90493db218ef1283681561e7 +Merge: 1234a813 ca746f26 +Author: Michiharu Ariza +Date: Thu Sep 13 12:44:00 2018 -0700 + + Merge branch 'master' into cff-subset + +commit ca746f261e1e54cec2f9c8bc7a6f930491e19418 +Author: Behdad Esfahbod +Date: Thu Sep 13 20:35:21 2018 +0200 + + [dfont] Also check dataLen range in sanitize + + Just to disagree with myself re being done with this code... + + src/hb-open-file.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 3789c557ca06aef430726f4942cafecac6fe4eef +Author: Behdad Esfahbod +Date: Thu Sep 13 20:30:04 2018 +0200 + + [dfont] Solve the mystery +2 offset thing! + + Previously, ResourceForkHeader was defined as 30 bytes, having the typeCountM1 as last member. + There was a mysterious offset-by-2 in the code, derived from FontTools and JDK code this was + ported from. + + In testing, I observed that typeListZ offset is actually 28. Suggesting that the typeCountM1 + does NOT actually belong to ResourceForkHeader, but belongs to the array itself. Adjusting for + that resolves the mystery +2 offset hack, so everything is clean and good now. + + This, concludes my dfont hacking. The code looks great now, and I'm happy to leave it. + Fuzzers might disagree though, we will see! + + src/hb-open-file.hh | 30 ++++++++++++------------------ + src/hb-open-type.hh | 44 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 56 insertions(+), 18 deletions(-) + +commit effc7ced72a6ce0fea328a8b68dc3d55f09774f1 +Author: Behdad Esfahbod +Date: Thu Sep 13 20:21:54 2018 +0200 + + Rename HeadlessArrayOf::len to lenP1 + + So it doesn't accidentally match our templates, etc. + + src/hb-open-type.hh | 14 +++++++------- + src/hb-ot-layout-gsub-table.hh | 10 +++++----- + src/hb-ot-layout-gsubgpos.hh | 10 +++++----- + 3 files changed, 17 insertions(+), 17 deletions(-) + +commit 1234a8136891429bb7353f47480595f44615f322 +Author: Michiharu Ariza +Date: Thu Sep 13 10:55:56 2018 -0700 + + add head table to CFF/CFF2 + + src/hb-ot-cff1-table.hh | 4 ++++ + src/hb-ot-cff2-table.hh | 4 ++++ + 2 files changed, 8 insertions(+) + +commit 180a88a96ce327e4103df3635c73559de65d1546 +Author: Behdad Esfahbod +Date: Thu Sep 13 19:19:57 2018 +0200 + + [dfont] Some more + + src/hb-open-file.hh | 21 ++++++++------------- + 1 file changed, 8 insertions(+), 13 deletions(-) + +commit 0ab0f1e5ac5ccb07c57364e9f5be0b991398eb6f +Author: Behdad Esfahbod +Date: Thu Sep 13 19:13:01 2018 +0200 + + [dfont] Push methods further down + + src/hb-open-file.hh | 58 ++++++++++++++++++++++++++++++----------------------- + 1 file changed, 33 insertions(+), 25 deletions(-) + +commit 8c9bdcc1feeab321a642bdaac50b716e48ce4263 +Author: Behdad Esfahbod +Date: Thu Sep 13 19:08:22 2018 +0200 + + [dfont] Minor + + src/hb-open-file.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 4479d3a2eda57d278700f5c78414ef6ef617d2a9 +Author: Behdad Esfahbod +Date: Thu Sep 13 19:05:59 2018 +0200 + + [dfon]t Sanitize OpenTypeFontFace + + src/hb-dsalgs.hh | 6 ------ + src/hb-open-file.hh | 21 +++++++++------------ + 2 files changed, 9 insertions(+), 18 deletions(-) + +commit 3fba41906fba28c5ea01cc0749654de862453bf4 +Author: Behdad Esfahbod +Date: Thu Sep 13 18:49:16 2018 +0200 + + [dfont] Minor + + src/hb-open-file.hh | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +commit bf852f0e62a8bdbb809af6a975f8ae8eed708d70 +Author: Behdad Esfahbod +Date: Thu Sep 13 18:47:53 2018 +0200 + + [dfont] Make test pass + + Offset 0 is not null in this context. + + src/hb-open-file.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 29faebe911a13916aa3d737e93d38deedc53567f +Author: Behdad Esfahbod +Date: Thu Sep 13 18:45:35 2018 +0200 + + Allow Offset<>'s that have no 0==null + + src/hb-open-type.hh | 43 +++++++++++++++++++++---------------------- + 1 file changed, 21 insertions(+), 22 deletions(-) + +commit 82f4d776c21b7c1224dd7073ce69cdf76d85f16b +Author: Behdad Esfahbod +Date: Thu Sep 13 18:27:20 2018 +0200 + + [dfont] Minor + + src/hb-open-file.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 07e0ca930c29757217c2f9e4e0e6954657b6b82d +Author: Behdad Esfahbod +Date: Thu Sep 13 17:39:09 2018 +0200 + + [bytes] Rename content to arrayZ + + src/hb-dsalgs.hh | 16 ++++++++-------- + src/hb-ot-post-table.hh | 2 +- + 2 files changed, 9 insertions(+), 9 deletions(-) + +commit dbb764dceb61365b7360a48d581ba5a4b3526e98 +Author: Behdad Esfahbod +Date: Thu Sep 13 16:49:26 2018 +0200 + + [dfont] Clean up sanitize() + + I don't think I broke anything. Fuzzers will let me know.. + + src/hb-dsalgs.hh | 8 ++++ + src/hb-open-file.hh | 122 ++++++++++++++++++++++++---------------------------- + 2 files changed, 64 insertions(+), 66 deletions(-) + +commit 361fc2686152ad8c0ebaf19e0522e0fc58ba3953 +Author: Behdad Esfahbod +Date: Thu Sep 13 16:47:33 2018 +0200 + + Fix OffsetTo::sanitize() after reshuffling + + src/hb-open-type.hh | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 4c6b0fb5f6668a6e562260d16f629ad3c41e8961 +Author: Behdad Esfahbod +Date: Thu Sep 13 16:39:30 2018 +0200 + + OffsetTo::sanitize() Add version with three user_data + + src/hb-open-type.hh | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +commit a73bea69c599787b4cfeac92a3afd00749e00434 +Author: Behdad Esfahbod +Date: Thu Sep 13 16:31:31 2018 +0200 + + OffsetTo::sanitize() more shuffling + + src/hb-open-type.hh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit b482e5231cd5987082dd2c05fd649c3653f3c67a +Author: Behdad Esfahbod +Date: Thu Sep 13 16:29:49 2018 +0200 + + OffsetTo::sanitize() reshuffling + + src/hb-open-type.hh | 26 +++++++++++++++++++------- + 1 file changed, 19 insertions(+), 7 deletions(-) + +commit 3cae9c75153277b9cfaaba20e0de84e420aeb1eb +Author: Michiharu Ariza +Date: Wed Sep 12 17:23:08 2018 -0700 + + fixed hb_plan_subset_cff_fdselect + + FDSelect3/4 sentinel size wasn't taken into account + + src/hb-subset-cff-common.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0f159a38a62bbf1b7fb267694a5d91d8135da625 +Author: Michiharu Ariza +Date: Wed Sep 12 16:08:54 2018 -0700 + + fixed serialize_fdselect_3_4 + + src/hb-ot-cff-common.hh | 6 ++++ + src/hb-ot-cff1-table.hh | 6 ---- + src/hb-subset-cff-common.cc | 68 ++++++++++++++++++++++++++------------------- + src/hb-subset-cff-common.hh | 10 +++---- + src/hb-subset-cff1.cc | 12 ++++---- + src/hb-subset-cff2.cc | 12 ++++---- + 6 files changed, 63 insertions(+), 51 deletions(-) + +commit 1608481d88919ca748e367146e3a78458d5bbe8f +Author: Michiharu Ariza +Date: Wed Sep 12 13:22:19 2018 -0700 + + fixed bugs in Charset serialization + + also some code cleanup + + src/hb-ot-cff1-table.hh | 4 ++-- + src/hb-subset-cff1.cc | 44 ++++++++++++++++++++------------------------ + 2 files changed, 22 insertions(+), 26 deletions(-) + +commit f45ac6296add6435ea5a902f7519187414aa8092 +Author: Michiharu Ariza +Date: Tue Sep 11 22:41:50 2018 -0700 + + fixed name mixup in Remap::reset + + it was causing inconsistent Strings Index subset results + + src/hb-ot-cff-common.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 497e7fb264ec5cb799c038cbe693b70410b18da3 +Author: Michiharu Ariza +Date: Tue Sep 11 16:47:55 2018 -0700 + + misc bug fixes + + Added OpCode_FontMatrix to TopDictOpSet (yet to parse values) + fixed a wrong assert in encode_int + + src/hb-cff-interp-dict-common.hh | 3 +++ + src/hb-subset-cff-common.hh | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 5b453f77f804cd8421a45d8276ed3e04041da23c +Author: Michiharu Ariza +Date: Tue Sep 11 16:20:39 2018 -0700 + + fixed off-by-one error with offSize + + src/hb-ot-cff-common.hh | 5 +++-- + src/hb-subset-cff1.cc | 4 ++-- + src/hb-subset-cff2.cc | 2 +- + 3 files changed, 6 insertions(+), 5 deletions(-) + +commit 1499029a9695e26beaf72e11287be60ad9e40cfe +Author: Michiharu Ariza +Date: Tue Sep 11 13:56:52 2018 -0700 + + fixed a bug + + src/hb-cff-interp-dict-common.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0bd5912a08698fb7880e1354e45bf63ef45125a5 +Author: Michiharu Ariza +Date: Tue Sep 11 13:24:27 2018 -0700 + + make parse_bcd locale free + + src/hb-cff-interp-dict-common.hh | 92 +++++++++++++++++++++++++++++----------- + 1 file changed, 68 insertions(+), 24 deletions(-) + +commit bb38d0f66388ec37ee9b0e81176d60c66fc17a19 +Author: Michiharu Ariza +Date: Tue Sep 11 10:43:15 2018 -0700 + + Implement parse_bcd + + src/hb-cff-interp-common.hh | 15 -------------- + src/hb-cff-interp-dict-common.hh | 44 ++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 44 insertions(+), 15 deletions(-) + +commit 45e564a51917475ef6481825a6efb5b99bf1912e +Merge: c6f75c30 d5c50927 +Author: Michiharu Ariza +Date: Tue Sep 11 09:46:37 2018 -0700 + + Merge branch 'master' into cff-subset + +commit bd75fd45cdbd0edb24568326bb7fde59d299a82c +Author: Behdad Esfahbod +Date: Tue Sep 11 18:12:26 2018 +0200 + + [dfont] Some renaming, plus add link to reference doc + + src/hb-open-file.hh | 79 ++++++++++++++++++++++++----------------------------- + 1 file changed, 35 insertions(+), 44 deletions(-) + +commit 4134ec1307bbaff24972e238bc5e4a403cd3f1c1 +Author: Behdad Esfahbod +Date: Tue Sep 11 17:56:03 2018 +0200 + + [dfont] Sanitize only sfnt resources as OpenTypeFontFile + + src/hb-open-file.hh | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit 6b5e4d07adb6b739dc294da513c4a7acd03977f7 +Author: Behdad Esfahbod +Date: Tue Sep 11 17:26:24 2018 +0200 + + [dfont] Minor + + src/hb-open-file.hh | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +commit d5c509272f2fbd1b4c56e3b530da7e42e7f03901 +Author: Behdad Esfahbod +Date: Tue Sep 11 17:18:21 2018 +0200 + + [dfont] Fix test expecatation and minor touch up + + I have no way to authoritatively know, but looks like test font only has one + face. So, adjust test expectation instead. + + src/hb-open-file.hh | 18 ++++++------------ + test/shaping/data/in-house/tests/collections.tests | 2 +- + 2 files changed, 7 insertions(+), 13 deletions(-) + +commit 2b2ed1e536061cfd3a0f29522118f42b451678bd +Author: Ebrahim Byagowi +Date: Mon Jul 2 17:26:43 2018 +0430 + + [dfont] Add test + + test/shaping/data/in-house/Makefile.sources | 1 + + test/shaping/data/in-house/fonts/TestDFONT.dfont | Bin 0 -> 3505 bytes + test/shaping/data/in-house/fonts/TestTTC.ttc | Bin 0 -> 2608 bytes + test/shaping/data/in-house/tests/collections.tests | 6 ++++++ + 4 files changed, 7 insertions(+) + +commit 9479ffefbfa3ea4ee39747e34177d26ab1ebbec9 +Author: Behdad Esfahbod +Date: Tue Sep 11 16:41:26 2018 +0200 + + [dfont] Re-enable and fix offset handling + + Fixes https://github.com/harfbuzz/harfbuzz/pull/1085 + + src/hb-face.cc | 5 +++-- + src/hb-open-file.hh | 19 +++++++++++++------ + 2 files changed, 16 insertions(+), 8 deletions(-) + +commit a1814e2bec3a43b9eeb4d50a67daae3fc52fd0a5 +Author: Behdad Esfahbod +Date: Tue Sep 11 14:45:23 2018 +0200 + + Whitespace + + src/hb-open-file.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 383060cc3354e12611dec3082a6fe08fdb25f652 +Author: Behdad Esfahbod +Date: Tue Sep 11 14:41:19 2018 +0200 + + [ft] Invalidate advance cache if font size changed + + src/hb-ft.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 54998befc43ef38e47b74b3153380adbcf6279d4 +Author: Behdad Esfahbod +Date: Tue Sep 11 14:35:26 2018 +0200 + + [ft] Cache advances + + I decided to always use the cache, instead of my previous sketch direction + that was to only allocate and use cache if fast advances are not available. + The cache is a mere 1kb, so just use it... + + TODO: Invalidate cache on font size change. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/651 + Fixes https://github.com/harfbuzz/harfbuzz/pull/1082 + + src/hb-cache.hh | 2 +- + src/hb-ft.cc | 37 +++++++++++++++++-------------------- + 2 files changed, 18 insertions(+), 21 deletions(-) + +commit f90bab8560816b60b4b3f2379b36c08756b21e6c +Author: Behdad Esfahbod +Date: Tue Sep 11 14:21:15 2018 +0200 + + [util] Add --ft-load-flags + + Useful for performance testing. + + Not hooked to cairo yet. Just changes shaping, not rasterization. + + util/helper-cairo.cc | 2 +- + util/options.cc | 4 ++++ + util/options.hh | 2 ++ + 3 files changed, 7 insertions(+), 1 deletion(-) + +commit 93f7596254808d567b9e1e01fb4855efcd34677c +Author: Behdad Esfahbod +Date: Tue Sep 11 14:11:10 2018 +0200 + + [util] Add -n shorthand for --num-iterations + + Meh. + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 047a84c5dd76cdfc072de25c572e30866f87a1f7 +Author: Behdad Esfahbod +Date: Tue Sep 11 14:05:16 2018 +0200 + + [ft] Towards caching slow get_h_advance results + + Related to https://github.com/harfbuzz/harfbuzz/pull/1082 + + src/hb-ft.cc | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +commit 237f21537842e6b471cdd6c86b98edfc0da0756c +Author: Behdad Esfahbod +Date: Tue Sep 11 13:05:47 2018 +0200 + + [ft] Add advances() callback + + src/hb-ft.cc | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +commit cbea7d49ab8d4765a2d72dcbf608d326bdf9af3d +Author: Behdad Esfahbod +Date: Tue Sep 11 12:56:17 2018 +0200 + + [ot-font] Rename + + src/hb-ot-font.cc | 74 +++++++++++++++++++++++++++---------------------------- + 1 file changed, 37 insertions(+), 37 deletions(-) + +commit d8a67dac2a673138bb4d41cd7eab97c9ee987958 +Author: Behdad Esfahbod +Date: Tue Sep 11 12:55:54 2018 +0200 + + [ot-font] Add advances() callbacks + + src/hb-ot-font.cc | 43 ++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 42 insertions(+), 1 deletion(-) + +commit 0ea42e117ba2c76e118974fe114ae5d9ceef5743 +Author: Behdad Esfahbod +Date: Tue Sep 11 12:22:42 2018 +0200 + + [cache] Minor + + src/hb-cache.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0f520adaacca3c7b6d8e84a7722343184105f612 +Author: Behdad Esfahbod +Date: Tue Sep 11 12:02:34 2018 +0200 + + Revert "Remove unused hb_cache_t" + + This reverts commit 473b17af4d421f4ce7ac18c769731bb2aa4088f8. + + Updates to recent changes. + + src/Makefile.sources | 1 + + src/hb-cache.hh | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ft.cc | 1 + + 3 files changed, 77 insertions(+) + +commit cfdea884754ed40ffa5cc00cb1ecaa86cb46a394 +Author: Behdad Esfahbod +Date: Tue Sep 11 10:57:48 2018 +0200 + + [random] Switch to 32bit RNG + + src/hb-ot-layout-gsubgpos.hh | 7 ++++--- + test/shaping/data/in-house/tests/rand.tests | 4 ++-- + 2 files changed, 6 insertions(+), 5 deletions(-) + +commit 08260c708ae6adc4efa9bde5e9ede01b7e4d42cc +Author: Behdad Esfahbod +Date: Tue Sep 11 10:51:19 2018 +0200 + + [random] Shuffle + + src/hb-ot-layout-gsub-table.hh | 5 +---- + src/hb-ot-layout-gsubgpos.hh | 6 ++++++ + 2 files changed, 7 insertions(+), 4 deletions(-) + +commit 71c9f84e7c0afe41a8987b8a4ebc2b45a22fac56 +Author: Behdad Esfahbod +Date: Mon Sep 10 22:37:19 2018 +0200 + + Make --features rand=1 available to the user + + Use rand=255 to mean "randomize". + + Part of https://github.com/harfbuzz/harfbuzz/pull/803 + + src/hb-ot-layout-gsub-table.hh | 11 ++++------- + src/hb-ot-layout-gsubgpos.hh | 1 + + src/hb-ot-map.cc | 4 ++-- + src/hb-ot-map.hh | 3 +++ + src/hb-ot-shape.cc | 2 +- + 5 files changed, 11 insertions(+), 10 deletions(-) + +commit cc1c4fdf88f6953dcd07fb42ee963404657cdef4 +Author: Behdad Esfahbod +Date: Mon Sep 10 16:36:05 2018 +0200 + + Respect user's wish if they set rand feature manually + + Except if the set it to 1, which would mean "randomize"... Ugly. + + src/hb-ot-layout-gsub-table.hh | 30 ++++++++++++++++-------------- + 1 file changed, 16 insertions(+), 14 deletions(-) + +commit 80de4bcd2677bfb0907ea7059524f918b109ac37 +Author: Behdad Esfahbod +Date: Mon Sep 10 16:24:52 2018 +0200 + + Minor clean up of 'rand' patchset + + src/hb-ot-layout-gsub-table.hh | 7 +++++-- + src/hb-ot-layout-gsubgpos.hh | 7 ++++--- + src/hb-ot-shape.cc | 13 ++++++------- + test/shaping/data/in-house/tests/rand.tests | 2 +- + 4 files changed, 16 insertions(+), 13 deletions(-) + +commit b545e27d8891f1e7f1fd034dd84abe44c839c380 +Author: David Corbett +Date: Fri Feb 23 12:22:32 2018 -0500 + + Don't seed the RNG from the contents of the buffer + + src/hb-ot-layout-gsubgpos.hh | 7 ++----- + src/hb-ot-layout.cc | 5 +---- + test/shaping/data/in-house/tests/rand.tests | 2 +- + 3 files changed, 4 insertions(+), 10 deletions(-) + +commit 2de96e846844d21888af6893378b21a33fc19232 +Author: David Corbett +Date: Sat Jan 27 19:48:38 2018 -0500 + + Test 'rand' + + test/shaping/data/in-house/Makefile.sources | 1 + + .../fonts/5bb74492f5e0ffa1fbb72e4c881be035120b6513.ttf | Bin 0 -> 1352 bytes + test/shaping/data/in-house/tests/rand.tests | 3 +++ + 3 files changed, 4 insertions(+) + +commit f05df643b44d9bbfd742e93f02c235fc821190d0 +Author: David Corbett +Date: Fri Jan 26 21:36:15 2018 -0500 + + Allow requesting a specific glyph for 'rand' + + Randomization only happens by default. If the user specifies a value for + 'rand', that value is respected. + + src/hb-ot-map.cc | 3 ++- + src/hb-ot-map.hh | 4 +++- + src/hb-ot-shape.cc | 7 ++++++- + 3 files changed, 11 insertions(+), 3 deletions(-) + +commit c2a75e07e54314f6c611dda0f050ed5f09909e43 +Author: David Corbett +Date: Thu Jan 25 14:22:03 2018 -0500 + + Implement 'rand' + + src/hb-ot-layout-gsub-table.hh | 19 ++++++++++++------- + src/hb-ot-layout-gsubgpos.hh | 8 ++++++++ + src/hb-ot-layout.cc | 8 ++++++++ + src/hb-ot-map.cc | 7 +++++-- + src/hb-ot-map.hh | 4 +++- + src/hb-ot-shape.cc | 1 + + 6 files changed, 37 insertions(+), 10 deletions(-) + +commit c6f75c3049685440d166bd4169b36abac2df4fdd +Author: Michiharu Ariza +Date: Mon Sep 10 17:02:31 2018 -0700 + + fix build attempt + + src/hb-ot-cff1-table.hh | 70 ++++++++++++++++++++++++------------------------- + src/hb-subset-cff1.cc | 16 +++++------ + 2 files changed, 43 insertions(+), 43 deletions(-) + +commit 96471fe8593575deceb44d3757c227f65f10a25e +Author: Behdad Esfahbod +Date: Tue Sep 11 01:39:23 2018 +0200 + + [uniscribe] Fix build + + src/hb-uniscribe.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cc52e53cf0cb76809145ae7407a8b613e9e61153 +Author: Michiharu Ariza +Date: Mon Sep 10 16:27:49 2018 -0700 + + Removed unused subr subset code + + src/hb-subset-cff-common.hh | 98 ++------------------------------------------- + src/hb-subset-cff1.cc | 92 +++++------------------------------------- + src/hb-subset-cff2.cc | 90 ++++------------------------------------- + 3 files changed, 22 insertions(+), 258 deletions(-) + +commit becd84aa2f2902ea9d2d1677b28945e103a68816 +Author: Behdad Esfahbod +Date: Tue Sep 11 01:26:18 2018 +0200 + + Add HB_FEATURE_GLOBAL_START/END + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1141 + + New API: + HB_FEATURE_GLOBAL_START + HB_FEATURE_GLOBAL_END + + docs/harfbuzz-sections.txt | 2 ++ + src/hb-common.cc | 4 ++-- + src/hb-common.h | 13 +++++++++++++ + 3 files changed, 17 insertions(+), 2 deletions(-) + +commit 13a8786c7c580651d8a6db9345b9aa85ca8ed956 +Author: Behdad Esfahbod +Date: Tue Sep 11 01:07:06 2018 +0200 + + Add (unused) hb_array_t<> + + src/hb-dsalgs.hh | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +commit bccf3e1827eec07433340eea705597201b6d0a32 +Author: Behdad Esfahbod +Date: Tue Sep 11 01:04:50 2018 +0200 + + Minor + + src/hb-open-type.hh | 1 - + 1 file changed, 1 deletion(-) + +commit dff2c45f1e2a30767f6813d3cb6a70978d98d424 +Author: Behdad Esfahbod +Date: Mon Sep 10 23:29:26 2018 +0200 + + Port rest from VAR to UnsizedArrayOf<> + + src/hb-aat-layout-common.hh | 14 +++++++------- + src/hb-aat-layout-morx-table.hh | 16 ++++++++-------- + src/hb-open-type.hh | 10 +++++----- + src/hb-ot-cmap-table.hh | 8 +++++--- + src/hb-ot-color-cbdt-table.hh | 16 ++++++++-------- + src/hb-ot-glyf-table.hh | 10 +++++----- + src/hb-ot-hdmx-table.hh | 30 +++++++++++++----------------- + src/hb-ot-hmtx-table.hh | 8 ++++---- + src/hb-ot-kern-table.hh | 20 ++++++++++---------- + src/hb-ot-layout-common.hh | 9 +++++---- + src/hb-ot-layout-gpos-table.hh | 26 +++++++++++++------------- + src/hb-ot-math-table.hh | 36 +++++++++++++++++++----------------- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-name-table.hh | 13 +++++++------ + src/hb-ot-post-table.hh | 5 +++-- + 15 files changed, 113 insertions(+), 110 deletions(-) + +commit 1666b89e300c86347dc82131423463cbfed8cc0f +Author: Michiharu Ariza +Date: Mon Sep 10 16:00:20 2018 -0700 + + subset CFF1 String Index + + Repurposed FDMap as Remap then subclassed for remapping SIDs + misc code cleanup + + src/hb-cff-interp-common.hh | 2 - + src/hb-cff-interp-dict-common.hh | 12 +- + src/hb-ot-cff-common.hh | 96 +++++++++-- + src/hb-ot-cff1-table.hh | 251 +++++++++++++++++++---------- + src/hb-ot-cff2-table.hh | 12 +- + src/hb-subset-cff-common.cc | 24 +-- + src/hb-subset-cff-common.hh | 20 ++- + src/hb-subset-cff1.cc | 334 ++++++++++++++++++++++++++++++++------- + src/hb-subset-cff2.cc | 8 +- + 9 files changed, 565 insertions(+), 194 deletions(-) + +commit 9507b05a7a65962d5d02eb424e4f5d8570976f4e +Author: Behdad Esfahbod +Date: Mon Sep 10 23:18:07 2018 +0200 + + Simplify sanitize->check_array() + + Fix a bug in CBDT sanitize, and redundant check in avar. + + src/hb-aat-layout-common.hh | 10 ++++------ + src/hb-aat-layout-morx-table.hh | 2 +- + src/hb-machinery.hh | 3 ++- + src/hb-open-type.hh | 6 +++--- + src/hb-ot-color-cbdt-table.hh | 4 ++-- + src/hb-ot-kern-table.hh | 2 +- + src/hb-ot-layout-common.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 8 ++++---- + src/hb-ot-layout-gsubgpos.hh | 4 ++-- + src/hb-ot-math-table.hh | 8 ++------ + src/hb-ot-name-table.hh | 2 +- + src/hb-ot-var-avar-table.hh | 4 ++-- + src/hb-ot-var-fvar-table.hh | 2 +- + src/hb-ot-var-hvar-table.hh | 2 +- + src/hb-ot-var-mvar-table.hh | 2 +- + 15 files changed, 28 insertions(+), 33 deletions(-) + +commit bc485a98122131efc4768fef9147823f2bce146b +Author: Behdad Esfahbod +Date: Mon Sep 10 23:02:24 2018 +0200 + + Port some VAR arrays to UnsizedArrayOf<> + + Fix avar sanitize(). + + src/hb-ot-layout-gsubgpos.hh | 59 +++++++++++++++++++++++--------------------- + src/hb-ot-var-avar-table.hh | 10 +++++--- + src/hb-ot-var-fvar-table.hh | 7 +++--- + src/hb-ot-var-hvar-table.hh | 9 ++++--- + src/hb-ot-var-mvar-table.hh | 9 ++++--- + 5 files changed, 51 insertions(+), 43 deletions(-) + +commit 1bc7a8d6c4deb9fa6e010d7be08b68cad88579ae +Author: Behdad Esfahbod +Date: Mon Sep 10 22:51:26 2018 +0200 + + [indic] Cache hb_options().uniscribe_bug_compatible on indic_plan + + src/hb-ot-shape-complex-indic.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 24f1d9622489a016904314a5d4e3c637da2e1c77 +Author: Behdad Esfahbod +Date: Mon Sep 10 18:19:37 2018 +0200 + + Unbreak HB_OPTIONS + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1154 + + src/hb-debug.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit e46c51f1e985ac9c0ffa90fda4ea436d54b4009c +Author: Behdad Esfahbod +Date: Mon Sep 10 17:38:19 2018 +0200 + + [indic] Do NOT allow matra after Halant,ZWJ + + Fixes https://github.com/harfbuzz/harfbuzz/issues/556 + + Devanagari regresses 12 tests, and Gujarati 2. See: + + https://github.com/harfbuzz/harfbuzz/issues/556#issuecomment-419957472 + + New numbers: + + BENGALI: 353725 out of 354188 tests passed. 463 failed (0.130722%) + DEVANAGARI: 707299 out of 707394 tests passed. 95 failed (0.0134296%) + GUJARATI: 366353 out of 366457 tests passed. 104 failed (0.0283799%) + GURMUKHI: 60729 out of 60747 tests passed. 18 failed (0.0296311%) + KANNADA: 951300 out of 951913 tests passed. 613 failed (0.0643966%) + MALAYALAM: 1048136 out of 1048334 tests passed. 198 failed (0.0188871%) + ORIYA: 42327 out of 42329 tests passed. 2 failed (0.00472489%) + SINHALA: 271596 out of 271847 tests passed. 251 failed (0.0923313%) + TAMIL: 1091754 out of 1091754 tests passed. 0 failed (0%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + + src/hb-ot-shape-complex-indic-machine.hh | 1688 ++++++++++++++---------------- + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 2 files changed, 784 insertions(+), 906 deletions(-) + +commit 5dfd6e07626a9022a995eb7fa16767eff66c6047 +Author: Behdad Esfahbod +Date: Mon Sep 10 15:45:32 2018 +0200 + + Fix sanitize or Context Rule + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1110 + + src/hb-ot-layout-gsubgpos.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 20a11a824d2a07a8544649477ad03e809bdd8e19 +Author: Behdad Esfahbod +Date: Mon Sep 10 13:56:28 2018 +0200 + + Revert "[subset] Disable GSUB/GPOS subsetting for now" + + This reverts commit 616fd34a69bb69bc35c7e4ea939e71c3ea2e92cb. + + src/hb-subset.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 54d332dd9b0263821376161cdffb60ffb3c7847f +Author: Behdad Esfahbod +Date: Mon Sep 10 11:37:24 2018 +0200 + + 1.9.0 + + NEWS | 19 +++++++++++++++++++ + configure.ac | 2 +- + src/hb-face.cc | 10 +++++----- + src/hb-unicode.h | 5 +++++ + src/hb-version.h | 6 +++--- + 5 files changed, 33 insertions(+), 9 deletions(-) + +commit 616fd34a69bb69bc35c7e4ea939e71c3ea2e92cb +Author: Behdad Esfahbod +Date: Mon Sep 10 11:19:49 2018 +0200 + + [subset] Disable GSUB/GPOS subsetting for now + + So I can get a release out. I haven't debugged those yet, and they + are producing bad tables. + + src/hb-subset.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d42f0e5809964136911cbbd845bc423a8dfd5e31 +Author: Behdad Esfahbod +Date: Mon Sep 10 11:05:33 2018 +0200 + + [atomic] Fix pointer type passed to InterlockedExchangeAdd() + + John Emmas reported on mailing list that build with MSVC is failing. + Not sure why bots don't catch it, but this should fix. + + src/hb-atomic.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit fda994e1d45c4d34601af7272f37ea257f92a3d8 +Author: Behdad Esfahbod +Date: Fri Sep 7 15:02:57 2018 -0400 + + Use enum instead of "static const" in class scope + + Technically, static const needs an out-of-class definition. Eg: + + CXXLD libharfbuzz-subset.la + Undefined symbols for architecture x86_64: + "OT::FeatureVariationRecord::min_size", referenced from: + bool OT::GSUBGPOS::subset(hb_subset_context_t*) constin libharfbuzz_subset_la-hb-subset.o + bool OT::GSUBGPOS::subset(hb_subset_context_t*) constin libharfbuzz_subset_la-hb-subset.o + "OT::Record::min_size", referenced from: + OT::Script::subset(hb_subset_context_t*) constin libharfbuzz_subset_la-hb-subset.o + "OT::IntType::min_size", referenced from: + OT::Script::subset(hb_subset_context_t*) constin libharfbuzz_subset_la-hb-subset.o + OT::RecordListOf::subset(hb_subset_context_t*) const in libharfbuzz_subset_la-hb-subset.o + ld: symbol(s) not found for architecture x86_64 + collect2: ld returned 1 exit status + make[4]: *** [libharfbuzz-subset.la] Error 1 + make[3]: *** [all-recursive] Error 1 + make[2]: *** [all] Error 2 + make[1]: *** [all-recursive] Error 1 + make: *** [all] Error 2 + Exited with code 2 + + src/hb-buffer.hh | 2 +- + src/hb-machinery.hh | 8 ++++---- + src/hb-open-file.hh | 2 +- + src/hb-open-type.hh | 2 +- + src/hb-ot-layout-common.hh | 2 +- + src/hb-ot-layout.cc | 4 ++-- + src/hb-set-digest.hh | 4 ++-- + src/hb-set.hh | 12 ++++++------ + 8 files changed, 18 insertions(+), 18 deletions(-) + +commit 1e88b1755c37eaa171c08f7bedb93f110238c80f +Merge: 22b88632 ebe67137 +Author: Michiharu Ariza +Date: Fri Sep 7 10:50:55 2018 -0700 + + Merge branch 'master' into cff-subset + +commit ebe67137ab3559c2c6aaf53442ca223cb34df5af +Author: Behdad Esfahbod +Date: Fri Sep 7 10:46:13 2018 -0400 + + Try fixing bots + + src/hb-ot-layout-common.hh | 32 ++++++++++++++++++-------------- + 1 file changed, 18 insertions(+), 14 deletions(-) + +commit 5f17dbc3025093308d2191a4abd2eec24db35c0e +Author: Behdad Esfahbod +Date: Fri Sep 7 10:24:22 2018 -0400 + + [subset] Fix div-by-zero + + src/hb-subset.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 22b88632d5bd3676642b0a1d93f27e47438c140b +Merge: 2a74536a 21bf1470 +Author: Michiharu Ariza +Date: Thu Sep 6 22:27:44 2018 -0700 + + Merge branch 'master' into cff-subset + +commit 2a74536aae443a8b7f23ed018dec14a013c04dfe +Author: Michiharu Ariza +Date: Thu Sep 6 18:26:13 2018 -0700 + + fix build attempt ^2 + + Added hb-ot-cff1-table.cc to hb-subset sources + Deleted unused variable (charset) + + src/Makefile.sources | 1 + + src/hb-subset-cff1.cc | 1 - + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit 55268df9d4b287883c8266e316cda44f4011f424 +Author: Michiharu Ariza +Date: Thu Sep 6 17:56:05 2018 -0700 + + fix build attempt + + Added HB_INTERNAL to static funtion declarations + + src/hb-ot-cff1-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit aca73c9df2054f62cf10a5c27bc5fa7823747f8b +Author: Michiharu Ariza +Date: Thu Sep 6 17:28:15 2018 -0700 + + subset CFF1 Encoding & Charset + + fixed misc Charset bugs + added source file hb-ot-cff1.table.cc + renamed things for clarity & consistency + + src/Makefile.sources | 1 + + src/hb-cff-interp-dict-common.hh | 15 +- + src/hb-ot-cff-common.hh | 34 ++-- + src/hb-ot-cff1-table.cc | 130 +++++++++++++ + src/hb-ot-cff1-table.hh | 403 ++++++++++++++++++++++++++++++++------- + src/hb-ot-cff2-table.hh | 24 +-- + src/hb-subset-cff1.cc | 247 ++++++++++++++++++++---- + src/hb-subset-cff2.cc | 30 +-- + 8 files changed, 737 insertions(+), 147 deletions(-) + +commit 21bf147054f6b5bd1c430c0e02a8c4058ed229a1 +Author: Garret Rieger +Date: Wed Sep 5 18:04:52 2018 -0700 + + [subset] Fix hdmx subsetted size calculation. + + src/hb-ot-hdmx-table.hh | 14 ++++++++++---- + test/api/fonts/Roboto-Regular.multihdmx.a.ttf | Bin 0 -> 2052 bytes + test/api/fonts/Roboto-Regular.multihdmx.abc.ttf | Bin 0 -> 2468 bytes + test/api/test-subset-hdmx.c | 20 ++++++++++++++++++++ + 4 files changed, 30 insertions(+), 4 deletions(-) + +commit 1e6599f59680c81356b2e9ddddb61252490337a0 +Author: Behdad Esfahbod +Date: Wed Sep 5 19:29:42 2018 -0700 + + Fix older compilers re '>>' at nested template declarations + + src/hb-ot-layout-gsub-table.hh | 8 ++++---- + src/hb-subset.cc | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit a1e5e07c735091e82d66ac56a4e27341f589369d +Author: Behdad Esfahbod +Date: Wed Sep 5 16:24:28 2018 -0700 + + [subset] Hook up GSUB/GPOS, but still disabled + + They are still in the drop list. + + src/hb-ot-hdmx-table.hh | 3 +- + src/hb-subset.cc | 75 +++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 77 insertions(+), 1 deletion(-) + +commit 0d160d5ff5158fd4190201becd652c8f28ef4430 +Author: Behdad Esfahbod +Date: Mon Sep 3 20:50:11 2018 -0700 + + [subset] Implement subsetting of SingleSubst + + src/hb-machinery.hh | 2 ++ + src/hb-null.hh | 43 +++++++++++++++++++----------- + src/hb-ot-layout-gsub-table.hh | 59 +++++++++++++++++++++++++++++++++++------- + src/hb-vector.hh | 2 ++ + 4 files changed, 81 insertions(+), 25 deletions(-) + +commit 5ea03d2951375bfcc1258c2c0b5c33efc6ebf7f8 +Author: Michiharu Ariza +Date: Tue Sep 4 11:29:15 2018 -0700 + + fix build by untemplatizing DictOpSet & DictVal + + as they aren't instantiated with BlendArg (yet) + + src/hb-cff-interp-dict-common.hh | 21 +++++++++------------ + src/hb-cff2-interp-cs.hh | 1 - + src/hb-ot-cff1-table.hh | 8 ++++---- + src/hb-ot-cff2-table.hh | 16 ++++++++-------- + src/hb-subset-cff-common.hh | 4 ++-- + 5 files changed, 23 insertions(+), 27 deletions(-) + +commit f2d299b0b75fd110cdc6b16de31e7212e292cc14 +Author: Michiharu Ariza +Date: Tue Sep 4 10:25:21 2018 -0700 + + Drop hints from CFF2 charstrings + + Templatized ArgStack so it may store the default value along with blend deltas as BlendArg while parsing blend operator arguments in CFF2 charstring + Added get_region_count() method to VarRegionList & VariationStore + + src/hb-cff-interp-common.hh | 67 +++++++++++++++++++++++++++------ + src/hb-cff1-interp-cs.hh | 5 ++- + src/hb-cff2-interp-cs.hh | 91 +++++++++++++++++++++++++++++++++++++++------ + src/hb-ot-cff2-table.hh | 22 ++++++----- + src/hb-ot-layout-common.hh | 6 +++ + src/hb-subset-cff-common.hh | 60 ++++++++++++++++-------------- + src/hb-subset-cff1.cc | 5 ++- + src/hb-subset-cff2.cc | 54 ++++++++++++++++++++++----- + 8 files changed, 235 insertions(+), 75 deletions(-) + +commit 3f00d0b0df14d69859b15568ff28a810d08f59ea +Author: Behdad Esfahbod +Date: Mon Sep 3 18:54:32 2018 -0700 + + [subset] Keep glyph set in plan + + Should remove the vector version at some point... + + src/hb-subset-plan.cc | 19 ++++++++++--------- + src/hb-subset-plan.hh | 3 +-- + 2 files changed, 11 insertions(+), 11 deletions(-) + +commit dc50493a8da05d6561242136d63cae836486c150 +Author: Behdad Esfahbod +Date: Mon Sep 3 18:23:23 2018 -0700 + + [subset] Towards subsetting SingleSubstFormat1 + + Why does subset plan not have a hb_set_t of glyphs? + + src/hb-machinery.hh | 10 +++++++++- + src/hb-ot-layout-gsub-table.hh | 12 +++++++++++- + 2 files changed, 20 insertions(+), 2 deletions(-) + +commit 339d3603b916cebf24ff86d9842b766261e1b262 +Author: Behdad Esfahbod +Date: Mon Sep 3 17:33:34 2018 -0700 + + [subset] Wire up subset() call down to subtables + + src/hb-ot-layout-common.hh | 36 +++++++++++++++++++++++ + src/hb-ot-layout-gpos-table.hh | 67 +++++++++++++++++++++++++++++++++++++++--- + src/hb-ot-layout-gsub-table.hh | 54 ++++++++++++++++++++++++++++------ + src/hb-ot-layout-gsubgpos.hh | 42 ++++++++++++++++++++++++++ + 4 files changed, 186 insertions(+), 13 deletions(-) + +commit 7b2ef551da0d53cd94106035b1f065a759cf3cd5 +Author: Behdad Esfahbod +Date: Mon Sep 3 17:16:09 2018 -0700 + + Templatize Lookup::sanitize() + + src/hb-ot-layout-common.hh | 40 ++++++++++++++++++++++++++++------------ + src/hb-ot-layout-gpos-table.hh | 7 ++----- + src/hb-ot-layout-gsub-table.hh | 25 +++---------------------- + 3 files changed, 33 insertions(+), 39 deletions(-) + +commit 9c3747c5e50423e0a7202f249728d5c5b2b09073 +Author: Behdad Esfahbod +Date: Mon Sep 3 16:53:03 2018 -0700 + + [subset] More + + src/hb-ot-layout-gpos-table.hh | 10 +++++---- + src/hb-ot-layout-gsub-table.hh | 48 +++++++++++++++++++++--------------------- + src/hb-ot-layout-gsubgpos.hh | 22 +++++++++++++------ + 3 files changed, 45 insertions(+), 35 deletions(-) + +commit 6d618522d63a94230ad708fc49c1c73927da0137 +Author: Behdad Esfahbod +Date: Mon Sep 3 16:41:28 2018 -0700 + + Templatize GSUBGPOS::sanitize() + + src/hb-ot-layout-gpos-table.hh | 6 +----- + src/hb-ot-layout-gsub-table.hh | 14 +++++--------- + src/hb-ot-layout-gsubgpos.hh | 4 +++- + 3 files changed, 9 insertions(+), 15 deletions(-) + +commit 49c44b58f6c2536ea5f403c54a40cab41b905150 +Author: Behdad Esfahbod +Date: Mon Sep 3 16:37:17 2018 -0700 + + [subset] Fix serialize_subset() calls + + Ouch. + + src/hb-open-type.hh | 2 +- + src/hb-ot-layout-common.hh | 6 +++--- + src/hb-ot-layout-gsub-table.hh | 13 ++++++------- + src/hb-ot-layout-gsubgpos.hh | 6 +++--- + 4 files changed, 13 insertions(+), 14 deletions(-) + +commit 7c9cfa2b4002c18585a26134ab987ceb7ebc97a2 +Author: Behdad Esfahbod +Date: Sun Sep 2 19:47:50 2018 -0700 + + Add intersects() method to GSUB/GPOS lookups + + src/hb-ot-layout-common.hh | 77 +++++++++-- + src/hb-ot-layout-gpos-table.hh | 103 ++++++++++---- + src/hb-ot-layout-gsub-table.hh | 205 +++++++++++++++++++-------- + src/hb-ot-layout-gsubgpos.hh | 306 ++++++++++++++++++++++++++++++++--------- + 4 files changed, 528 insertions(+), 163 deletions(-) + +commit 61ce62e55455bb0d6c9db3b076676ab18e51d449 +Author: Behdad Esfahbod +Date: Sun Sep 2 17:00:27 2018 -0700 + + [subset] Minor + + Remove Lookup::subset(). + + src/hb-ot-layout-common.hh | 11 ----------- + src/hb-ot-layout-gsubgpos.hh | 2 +- + 2 files changed, 1 insertion(+), 12 deletions(-) + +commit bfa72a9a72a15d977f503f12eef376a355679d76 +Author: Behdad Esfahbod +Date: Sat Sep 1 18:34:50 2018 -0700 + + [subset] Towards GSUB/GPOS subsetting + + Add subset() call for GSUBGPOS struct and its dependencies. + Not hooked up anywhere. + + src/hb-machinery.hh | 10 ++++-- + src/hb-open-type.hh | 25 ++++++++++++- + src/hb-ot-layout-common.hh | 80 +++++++++++++++++++++++++++++++++++------- + src/hb-ot-layout-gdef-table.hh | 33 ++++++++++------- + src/hb-ot-layout-gsub-table.hh | 11 ++++-- + src/hb-ot-layout-gsubgpos.hh | 19 ++++++++++ + 6 files changed, 145 insertions(+), 33 deletions(-) + +commit 6803ed8674028a656957910381150ab28d75a5f8 +Author: Behdad Esfahbod +Date: Fri Aug 31 17:11:08 2018 -0700 + + [serialize] Add reset() + + src/hb-machinery.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit e58b190292f85c9676fe14cf63d2831d4d6e6bab +Author: Behdad Esfahbod +Date: Fri Aug 31 16:46:35 2018 -0700 + + [subset] De-templatize hb_subset_context_t + + We're going to (finally) use virtual methods for hb_serialize_context_t + customization, so don't need to carry a Serializer template variable + around... Simplifies code. + + src/hb-machinery.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 5 ++--- + src/hb-subset.hh | 7 +++---- + 3 files changed, 6 insertions(+), 8 deletions(-) + +commit 22acd424ca77c16d28405021f06c5562497920ab +Author: Behdad Esfahbod +Date: Fri Aug 31 16:38:04 2018 -0700 + + [serialize] Add a couple small methods + + src/hb-machinery.hh | 25 +++++++++++++++++-------- + src/hb-open-file.hh | 3 +-- + src/hb-ot-layout-gsub-table.hh | 1 + + 3 files changed, 19 insertions(+), 10 deletions(-) + +commit d1f29908c281b1685eea00b71bae934d9f1f20eb +Author: Behdad Esfahbod +Date: Fri Aug 31 16:31:00 2018 -0700 + + [subset] Add hb_subset_context_t<> + + src/hb-open-type.hh | 1 + + src/hb-ot-cmap-table.hh | 1 - + src/hb-ot-hdmx-table.hh | 1 - + src/hb-ot-hmtx-table.hh | 1 - + src/hb-ot-layout-gsub-table.hh | 9 +++++++++ + src/hb-ot-maxp-table.hh | 1 - + src/hb-ot-os2-table.hh | 1 - + src/hb-ot-post-table.hh | 1 - + src/hb-subset.hh | 21 +++++++++++++++++++++ + 9 files changed, 31 insertions(+), 6 deletions(-) + +commit fcf177885b4c3d732ffeb82936da906969a269d3 +Author: Michiharu Ariza +Date: Fri Aug 31 16:28:47 2018 -0700 + + templatized ArgStack as a prep to store blends + + src/hb-cff-interp-common.hh | 46 +++++++++++++++++++++--------------- + src/hb-cff-interp-cs-common.hh | 41 ++++++++++++++++++-------------- + src/hb-cff-interp-dict-common.hh | 35 ++++++++++++++++----------- + src/hb-cff1-interp-cs.hh | 15 +++++++----- + src/hb-cff2-interp-cs.hh | 14 +++++++---- + src/hb-ot-cff1-table.hh | 32 ++++++++++++------------- + src/hb-ot-cff2-table.hh | 51 ++++++++++++++++++++++++++-------------- + src/hb-subset-cff-common.hh | 4 ++-- + src/hb-subset-cff1.cc | 1 - + src/hb-subset-cff2.cc | 2 +- + 10 files changed, 142 insertions(+), 99 deletions(-) + +commit 968168bf0e369927cd6a7f63608d844abe123a7b +Author: Michiharu Ariza +Date: Fri Aug 31 13:28:16 2018 -0700 + + drop hints from CFF1 charstrings + + renamed confusing Stack.size to Stack.count + + src/hb-cff-interp-common.hh | 43 +++++++----- + src/hb-cff-interp-cs-common.hh | 140 +++++++++++++++++---------------------- + src/hb-cff-interp-dict-common.hh | 4 +- + src/hb-cff1-interp-cs.hh | 14 ++-- + src/hb-cff2-interp-cs.hh | 18 ++--- + src/hb-ot-cff1-table.hh | 26 ++++---- + src/hb-ot-cff2-table.hh | 20 +++--- + src/hb-subset-cff1.cc | 53 ++++++++------- + src/hb-subset-cff2.cc | 69 +++++++++---------- + 9 files changed, 190 insertions(+), 197 deletions(-) + +commit aba0a945c5f8724cc7bd1a9b7f7b5df1c64b03f4 +Author: Behdad Esfahbod +Date: Fri Aug 31 13:25:19 2018 -0700 + + [subset] Add hb-subset-input.hh and make hb-subset.hh toplevel include + + src/Makefile.sources | 1 + + src/hb-ot-cmap-table.hh | 2 +- + src/hb-ot-glyf-table.hh | 2 -- + src/hb-ot-hdmx-table.hh | 2 +- + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-os2-table.hh | 2 +- + src/hb-ot-post-table.hh | 2 +- + src/hb-subset-glyf.cc | 1 - + src/hb-subset-glyf.hh | 2 +- + src/hb-subset-input.hh | 57 +++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-subset-plan.cc | 3 +-- + src/hb-subset-plan.hh | 2 +- + src/hb-subset.cc | 3 +-- + src/hb-subset.hh | 23 +++----------------- + 15 files changed, 71 insertions(+), 35 deletions(-) + +commit 18d01eac7f2870e2804ceed2c70a604a5dc6a320 +Author: Behdad Esfahbod +Date: Fri Aug 31 13:00:57 2018 -0700 + + Minor + + src/hb-ot-shape-complex-arabic-fallback.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 8c5e03b5415f83312719ebb3cd284229e52a4843 +Author: Michiharu Ariza +Date: Thu Aug 30 17:21:56 2018 -0700 + + Added drop_hints to SubrFlattener + + src/hb-cff-interp-cs-common.hh | 20 +++++++++++++++++++- + src/hb-subset-cff-common.hh | 18 ++++++++++++++---- + src/hb-subset-cff1.cc | 35 ++++++++++++++++++++++------------ + src/hb-subset-cff2.cc | 43 ++++++++++++++++++++++++++---------------- + 4 files changed, 83 insertions(+), 33 deletions(-) + +commit a23b892fe6cc4859a30edc7ffc003ab7624aa5f0 +Author: Behdad Esfahbod +Date: Wed Aug 29 18:28:39 2018 -0700 + + Shuffle + + src/hb-machinery.hh | 62 +++++++++++++++++++++++++++-------------------------- + 1 file changed, 32 insertions(+), 30 deletions(-) + +commit 93fe0faaee45b8fb646f7aa33620105c62193885 +Author: Behdad Esfahbod +Date: Wed Aug 29 18:24:03 2018 -0700 + + [subset] Clean up hb_subset_input_t API + + src/hb-subset-input.cc | 44 +++++++++++++++++++--------------------- + src/hb-subset-plan.cc | 4 ++-- + src/hb-subset-plan.hh | 10 ++++----- + src/hb-subset.cc | 2 +- + src/hb-subset.h | 14 +++++++++---- + src/hb-subset.hh | 4 ++-- + test/api/test-subset-glyf.c | 10 ++++----- + test/fuzzing/hb-subset-fuzzer.cc | 10 ++++----- + util/hb-subset.cc | 3 +-- + 9 files changed, 52 insertions(+), 49 deletions(-) + +commit 9fd08cc238f8e2f7be1eaefca110021382efe606 +Author: Michiharu Ariza +Date: Wed Aug 29 18:18:18 2018 -0700 + + CFF2 subroutine flattner + + Factored out CFF1 & CFF2 common subsetting code in hb-subset-cff-common.hh + + src/hb-cff2-interp-cs.hh | 34 +++++-- + src/hb-subset-cff-common.hh | 154 +++++++++++++++++++++++++++++ + src/hb-subset-cff1.cc | 135 +++----------------------- + src/hb-subset-cff2.cc | 229 ++++++++++++++++++-------------------------- + 4 files changed, 285 insertions(+), 267 deletions(-) + +commit d237ce71810045ee400c52740cd8ab6e1113aada +Author: Behdad Esfahbod +Date: Wed Aug 29 18:13:07 2018 -0700 + + [subset] Bail if subsetting a table failed + + src/hb-subset.cc | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +commit f39166f0c0c09fac7874fda6b0b0825f20768e3e +Author: Behdad Esfahbod +Date: Wed Aug 29 18:09:55 2018 -0700 + + [subset] Remove unused hb_subset_profile_t + + We might reintroduce it later, but for now remove, as it was unused. + Some things that should have been in this object (drop_hints, etc) + are already in hb_subset_input_t. So, for now, keep everything there. + + src/hb-subset-plan.cc | 3 +-- + src/hb-subset-plan.hh | 1 - + src/hb-subset.cc | 39 +++------------------------------------ + src/hb-subset.h | 16 +--------------- + test/api/hb-subset-test.h | 4 +--- + test/api/test-subset-hdmx.c | 8 ++------ + test/api/test-subset-hmtx.c | 4 +--- + test/api/test-subset.c | 12 +++--------- + test/fuzzing/hb-subset-fuzzer.cc | 5 +---- + util/hb-subset.cc | 4 +--- + 10 files changed, 14 insertions(+), 82 deletions(-) + +commit 2ccc322cf88a01248aa5df88a5073db3dfb40eea +Author: Behdad Esfahbod +Date: Wed Aug 29 16:38:04 2018 -0700 + + [ot-font] Clean up cmap with gid=0 + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1145 + + src/hb-ot-cmap-table.hh | 25 +++++++++++++++---------- + 1 file changed, 15 insertions(+), 10 deletions(-) + +commit 0c7b633f528bae4a0cf5ca816f75a0d84206b3fb +Author: Ross Burton +Date: Wed Aug 29 22:37:39 2018 +0100 + + Delete pkg.m4 + + pkg.m4 is provided by pkg-config, which is a requirement to build, and this copy is ancient. Delete it to avoid it being used instead of the host copy. + + m4/pkg.m4 | 157 -------------------------------------------------------------- + 1 file changed, 157 deletions(-) + +commit b95bf075d7b62baf7d6fa1d8f0d1f16fad934975 +Author: Michiharu Ariza +Date: Wed Aug 29 14:41:52 2018 -0700 + + fix build attempt ^2 + + src/hb-subset-cff1.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 1d1afddfd21155ef136c2d96b1d6c286bdc8925f +Author: Michiharu Ariza +Date: Wed Aug 29 13:36:39 2018 -0700 + + corrected preprocessor guards + + src/hb-cff-interp-common.hh | 6 +++--- + src/hb-cff-interp-cs-common.hh | 6 +++--- + src/hb-cff-interp-dict-common.hh | 6 +++--- + src/hb-ot-cff-common.hh | 6 +++--- + src/hb-subset-cff-common.hh | 6 +++--- + 5 files changed, 15 insertions(+), 15 deletions(-) + +commit 8af9690ac7ce41fb1db878d556df5c4ee624eaa0 +Merge: 0ad081ec fee0f41c +Author: Michiharu Ariza +Date: Wed Aug 29 13:26:17 2018 -0700 + + Merge branch 'master' into cff-subset + + Renamed cff "private" source/headers without the suffix + +commit 0ad081ec324e734cfca60d4d2c36a1be5bc8a067 +Author: Michiharu Ariza +Date: Wed Aug 29 12:56:48 2018 -0700 + + attempt to fix build failure + + src/hb-subset-cff1.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a11420b48c405e1a43e2ba62893e9a0872e5f496 +Author: Michiharu Ariza +Date: Wed Aug 29 12:14:30 2018 -0700 + + Subroutine flattener for CFF1 + + Subr-flattened charstrings are temporarily re-encoded in ByteStrBuff during "plan" phase, then copied to hb_serialize_context_t during "write" phase + + CSOpSet may callback opcode processing "virtual" functions via CRTP + + Numer struct may store a value as fixed optionally in addition to int and float + + src/hb-cff-interp-common-private.hh | 53 ++++++++++-- + src/hb-cff-interp-cs-common-private.hh | 109 ++++++++++++++++++----- + src/hb-cff1-interp-cs.hh | 35 +++++--- + src/hb-cff2-interp-cs.hh | 14 +-- + src/hb-ot-cff-common-private.hh | 10 +-- + src/hb-subset-cff-common-private.hh | 102 +++++++++++++++++++++- + src/hb-subset-cff1.cc | 152 ++++++++++++++++++++++----------- + src/hb-subset-cff2.cc | 7 +- + 8 files changed, 372 insertions(+), 110 deletions(-) + +commit fee0f41c6c1e50621d10b07802ca36a9b295b53d +Author: Behdad Esfahbod +Date: Tue Aug 28 18:27:41 2018 -0700 + + Don't declare extern symbols as inline + + clang -O3 was completely removing _get_gdef(), causing link + failure when needed from another compilation unit. Surprisingly, + "extern inline" didn't fix it. + + src/hb-ot-layout.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 967741e4c468ebf0a40f91934ed1923506099806 +Author: Behdad Esfahbod +Date: Tue Aug 28 18:18:02 2018 -0700 + + Add explicit to hb_auto_t 1param constructors + + src/hb-dsalgs.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit c0a3f38f78362a183b30afd109dcebfca563d144 +Author: Behdad Esfahbod +Date: Tue Aug 28 17:22:38 2018 -0700 + + Fix distcheck + + src/Makefile.sources | 3 +++ + 1 file changed, 3 insertions(+) + +commit 2dde6c803a9e50c5bff74095187b0cb2e12eebdd +Author: Behdad Esfahbod +Date: Tue Aug 28 11:02:00 2018 -0700 + + Explicitly pass reference in hb_auto_t constructor + + Fixes clang bots as well as fuzzer issue. + + src/hb-dsalgs.hh | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit a26806801005c28115ae9e48bdcf3bbbc1bcd767 +Author: Behdad Esfahbod +Date: Sun Aug 26 15:18:46 2018 -0700 + + [ot-face] Remove tables_t. The face_data_t is what tables_t was + + src/hb-aat-layout.cc | 4 ++-- + src/hb-face.cc | 6 +++--- + src/hb-ot-face.cc | 8 ++++---- + src/hb-ot-face.hh | 28 ++++++++++++---------------- + src/hb-ot-font.cc | 25 +++++++++++-------------- + src/hb-ot-layout.cc | 36 ++++++++++++++++++------------------ + src/hb-ot-math.cc | 4 ++-- + src/hb-ot-var.cc | 4 ++-- + 8 files changed, 54 insertions(+), 61 deletions(-) + +commit 3a0b3a29cc246d0b1e5989c9e8c1e6d544046dcc +Author: Behdad Esfahbod +Date: Sun Aug 26 15:11:24 2018 -0700 + + Free up hb-ot-face.hh from includes + + There might be a better way to do this, but I couldn't find... + + src/hb-face.cc | 1 + + src/hb-ot-cmap-table.hh | 1 + + src/hb-ot-color-cbdt-table.hh | 2 ++ + src/hb-ot-face.cc | 10 ++++++++++ + src/hb-ot-face.hh | 15 ++------------- + src/hb-ot-font.cc | 7 +++++++ + src/hb-ot-glyf-table.hh | 2 ++ + src/hb-ot-hmtx-table.hh | 3 +++ + src/hb-ot-kern-table.hh | 2 ++ + src/hb-ot-layout-gdef-table.hh | 1 + + src/hb-ot-layout-gpos-table.hh | 2 ++ + src/hb-ot-layout-gsub-table.hh | 1 + + src/hb-ot-post-table.hh | 2 ++ + 13 files changed, 36 insertions(+), 13 deletions(-) + +commit a84309afc8817cd386e555af21dfcdc03388b329 +Author: Behdad Esfahbod +Date: Sun Aug 26 09:33:01 2018 -0700 + + [face] Use saved cmap in collect_unicodes() APIs + + src/hb-face.cc | 18 ++++++++---------- + 1 file changed, 8 insertions(+), 10 deletions(-) + +commit c624e18a24311c66737dde4ce515aa1eca892b94 +Author: Behdad Esfahbod +Date: Sun Aug 26 09:19:20 2018 -0700 + + [OT] Move code around + + src/hb-ot-layout-gsub-table.hh | 18 ------------------ + src/hb-ot-layout.cc | 23 +++++++++++++++++++++-- + 2 files changed, 21 insertions(+), 20 deletions(-) + +commit 399909468204b76769857508e74f802d648ca0a5 +Author: Behdad Esfahbod +Date: Sun Aug 26 09:12:25 2018 -0700 + + [OT] Use relaxed ops for recursing into GSUB/GPOS lookups again + + src/hb-ot-layout-gpos-table.hh | 4 ++-- + src/hb-ot-layout-gsub-table.hh | 4 ++-- + src/hb-ot-layout.cc | 12 ++++++++++-- + src/hb-ot-layout.hh | 4 ++-- + 4 files changed, 16 insertions(+), 8 deletions(-) + +commit d8c57e85d9981b4c7a11fae4f31100359574cf13 +Author: Behdad Esfahbod +Date: Sun Aug 26 09:03:31 2018 -0700 + + [GDEF] Move code around + + src/hb-ot-layout-gdef-table.hh | 118 +----------------------------------- + src/hb-ot-layout.cc | 134 ++++++++++++++++++++++++++++++++++++++--- + src/hb-ot-layout.hh | 14 +---- + 3 files changed, 128 insertions(+), 138 deletions(-) + +commit 453e0c60b1c87d2cd2527d6d2de673f65458a9fd +Author: Behdad Esfahbod +Date: Sun Aug 26 01:30:52 2018 -0700 + + Add template keyword + + I swear I have no idea why this is needed, but it is... + + src/hb-ot-layout-gsubgpos.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c44b0caf0d0cddb7228dcec0b9d25bb62f641abc +Author: Behdad Esfahbod +Date: Sun Aug 26 01:29:30 2018 -0700 + + Fixup + + src/hb-ot-layout-gpos-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4096fbe487d90de04020e32e8487295ecd4d8836 +Author: Behdad Esfahbod +Date: Sun Aug 26 01:25:54 2018 -0700 + + [ot-face] Port GDEF to unified table accelerator model as well + + src/hb-ot-face.cc | 108 ---------------------------------- + src/hb-ot-face.hh | 2 +- + src/hb-ot-layout-gdef-table.hh | 129 +++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout.cc | 14 ++++- + src/hb-ot-layout.hh | 5 +- + 5 files changed, 147 insertions(+), 111 deletions(-) + +commit b929100f8782816c2621715f6c007ecefc419d83 +Author: Behdad Esfahbod +Date: Sun Aug 26 01:15:47 2018 -0700 + + [ot-face] Unify GSUB/GPOS accelerators in the table accelerator framework + + src/hb-aat-layout.cc | 4 +--- + src/hb-ot-face.cc | 40 ++-------------------------------------- + src/hb-ot-face.hh | 25 +++++++++++-------------- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 6 +++--- + src/hb-ot-layout-gsubgpos.hh | 24 +++++++++++++----------- + src/hb-ot-layout.cc | 33 +++++++++++++++++---------------- + src/hb-ot-layout.hh | 17 +++++++++++++++++ + src/hb-ot-shape.cc | 1 + + 9 files changed, 66 insertions(+), 86 deletions(-) + +commit 963413fc5454d92621ae83a8d9c9324e404b8166 +Author: Behdad Esfahbod +Date: Sun Aug 26 00:47:55 2018 -0700 + + WIP + + src/hb-ot-cmap-table.hh | 1 - + src/hb-ot-face.hh | 22 ---------------------- + src/hb-ot-layout-gpos-table.hh | 2 ++ + src/hb-ot-layout-gsub-table.hh | 2 ++ + src/hb-ot-layout-gsubgpos.hh | 31 ++++++++++++++++++++++++++++++- + src/hb-ot-layout.hh | 18 +++++++++++++++++- + 6 files changed, 51 insertions(+), 25 deletions(-) + +commit e6cb9380651c753485f721bd3df523d03be41d91 +Author: Behdad Esfahbod +Date: Sun Aug 26 00:21:29 2018 -0700 + + [ot-face] Unify accelerators and tables + + src/hb-machinery.hh | 4 ++-- + src/hb-ot-cmap-table.hh | 3 ++- + src/hb-ot-face.cc | 6 +++-- + src/hb-ot-face.hh | 58 +++++++++++++------------------------------------ + src/hb-ot-font.cc | 6 ++--- + 5 files changed, 26 insertions(+), 51 deletions(-) + +commit 7f8b6fe67d64b41786edbf8650efb1c0deba573f +Author: Behdad Esfahbod +Date: Sun Aug 26 00:07:12 2018 -0700 + + Minor + + src/hb-ot-face.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 59bca0d2cb6010bc237afb2255ccda3b8dd0585d +Author: Behdad Esfahbod +Date: Sun Aug 26 00:06:12 2018 -0700 + + [ot-font] Rename + + src/hb-ot-face.hh | 12 ++++++------ + src/hb-ot-font.cc | 24 ++++++++++++------------ + 2 files changed, 18 insertions(+), 18 deletions(-) + +commit 1c48a7ef06b82ef9ca013066d1fb3c6fda82aa0c +Author: Behdad Esfahbod +Date: Sat Aug 25 23:54:06 2018 -0700 + + [ot-font] Cache tables on face, not font + + src/hb-ot-cmap-table.hh | 1 + + src/hb-ot-face.cc | 2 ++ + src/hb-ot-face.hh | 55 +++++++++++++++++++++++++++----- + src/hb-ot-font.cc | 75 ++++---------------------------------------- + src/hb-ot-layout-gsubgpos.hh | 1 + + src/hb-ot-layout.hh | 1 - + 6 files changed, 58 insertions(+), 77 deletions(-) + +commit 71f8893eff56bff651e3df6288becc68ecea6cd1 +Author: Behdad Esfahbod +Date: Sat Aug 25 23:27:45 2018 -0700 + + [ot-font] Use init0 + + src/hb-ot-font.cc | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit f36ae6f8a82485bbf727f24dfd7da8f32002cad6 +Author: Behdad Esfahbod +Date: Sat Aug 25 23:19:34 2018 -0700 + + [ot-font] Make everything (cmap/metrics) lazy + + src/hb-machinery.hh | 5 +++++ + src/hb-ot-font.cc | 51 ++++++++++++++++++++++++++------------------------- + 2 files changed, 31 insertions(+), 25 deletions(-) + +commit 62fc54725a3863473829f3a3748c9336e4dc0787 +Author: Behdad Esfahbod +Date: Sat Aug 25 23:15:52 2018 -0700 + + [ot-font] Fallback vertical advance to UPEM + + Used to be ascent+descent. Whatever. This is more convenient for + upcoming changes. + + src/hb-ot-font.cc | 2 +- + test/shaping/data/in-house/tests/vertical.tests | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit d950022c8ae3f85546272b38b187d6ed9f5ff16f +Author: Behdad Esfahbod +Date: Sat Aug 25 23:06:37 2018 -0700 + + Add hb-ot-face.cc/hh + + src/Makefile.sources | 2 + + src/hb-ot-face.cc | 206 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-face.hh | 144 +++++++++++++++++++++++++++++++++++ + src/hb-ot-layout.cc | 172 ------------------------------------------ + src/hb-ot-layout.hh | 108 +-------------------------- + src/hb-ot-math.cc | 2 +- + src/hb-ot-var.cc | 2 +- + 7 files changed, 355 insertions(+), 281 deletions(-) + +commit dae39c58fb63c2211e2842121bbe6d5b8b18651b +Author: Behdad Esfahbod +Date: Sat Aug 25 22:44:39 2018 -0700 + + [face] Introduce character-map API + + New API: + +hb_face_collect_unicodes + +hb_face_collect_variation_selectors + +hb_face_collect_variation_unicodes + + docs/harfbuzz-sections.txt | 3 ++ + src/hb-face.cc | 61 ++++++++++++++++++++++++- + src/hb-face.h | 19 ++++++++ + src/hb-subset.cc | 53 --------------------- + src/hb-subset.h | 15 ------ + test/api/test-subset-codepoints.c | 6 +-- + test/fuzzing/hb-subset-get-codepoints-fuzzer.cc | 2 +- + 7 files changed, 86 insertions(+), 73 deletions(-) + +commit 66384db97c439a64d729f9206657d0b37ec0cb32 +Author: Behdad Esfahbod +Date: Sat Aug 25 22:39:17 2018 -0700 + + Minor + + src/hb-subset.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit c77ae40852aabb1698da9e8d488f75bae2f4e734 +Author: Behdad Esfahbod +Date: Sat Aug 25 22:36:36 2018 -0700 + + Rename hb-*private.hh to hb-*.hh + + Sorry for the noise, downstream custom builders. Please adjust. + + src/Makefile.sources | 75 +++++++++++----------- + src/check-includes.sh | 8 +-- + src/dump-indic-data.cc | 2 +- + src/dump-khmer-data.cc | 2 +- + src/dump-myanmar-data.cc | 2 +- + src/dump-use-data.cc | 2 +- + src/gen-indic-table.py | 2 +- + src/gen-use-table.py | 2 +- + src/hb-aat-layout-ankr-table.hh | 2 +- + src/hb-aat-layout-bsln-table.hh | 2 +- + ...t-common-private.hh => hb-aat-layout-common.hh} | 8 +-- + src/hb-aat-layout-feat-table.hh | 2 +- + src/hb-aat-layout-kerx-table.hh | 4 +- + src/hb-aat-layout-morx-table.hh | 6 +- + src/hb-aat-layout-trak-table.hh | 6 +- + src/hb-aat-layout.cc | 8 +-- + src/{hb-aat-layout-private.hh => hb-aat-layout.hh} | 14 ++-- + src/hb-aat-ltag-table.hh | 2 +- + src/{hb-atomic-private.hh => hb-atomic.hh} | 8 +-- + src/hb-blob.cc | 4 +- + src/{hb-blob-private.hh => hb-blob.hh} | 8 +-- + src/hb-buffer-deserialize-json.hh | 2 +- + src/hb-buffer-deserialize-json.rl | 2 +- + src/hb-buffer-deserialize-text.hh | 2 +- + src/hb-buffer-deserialize-text.rl | 2 +- + src/hb-buffer-serialize.cc | 2 +- + src/hb-buffer.cc | 4 +- + src/{hb-buffer-private.hh => hb-buffer.hh} | 10 +-- + src/hb-common.cc | 4 +- + src/hb-coretext.cc | 4 +- + src/hb-debug.hh | 4 +- + src/hb-directwrite.cc | 4 +- + src/hb-dsalgs.hh | 2 +- + src/hb-face.cc | 8 +-- + src/{hb-face-private.hh => hb-face.hh} | 12 ++-- + src/hb-fallback-shape.cc | 2 +- + src/hb-font.cc | 6 +- + src/{hb-font-private.hh => hb-font.hh} | 12 ++-- + src/hb-ft.cc | 6 +- + src/hb-glib.cc | 6 +- + src/hb-gobject-enums.cc.tmpl | 2 +- + src/hb-gobject-structs.cc | 2 +- + src/hb-graphite2.cc | 2 +- + src/hb-icu.cc | 6 +- + src/{hb-iter-private.hh => hb-iter.hh} | 8 +-- + src/{hb-machinery-private.hh => hb-machinery.hh} | 12 ++-- + src/hb-map.cc | 2 +- + src/{hb-map-private.hh => hb-map.hh} | 8 +-- + src/{hb-mutex-private.hh => hb-mutex.hh} | 8 +-- + src/hb-null.hh | 2 +- + src/{hb-object-private.hh => hb-object.hh} | 14 ++-- + src/{hb-open-file-private.hh => hb-open-file.hh} | 8 +-- + src/{hb-open-type-private.hh => hb-open-type.hh} | 14 ++-- + src/hb-ot-cmap-table.hh | 4 +- + src/hb-ot-color-cbdt-table.hh | 2 +- + src/hb-ot-color-colr-table.hh | 2 +- + src/hb-ot-color-cpal-table.hh | 2 +- + src/hb-ot-color-sbix-table.hh | 2 +- + src/hb-ot-color-svg-table.hh | 2 +- + src/hb-ot-color.cc | 6 +- + src/hb-ot-font.cc | 6 +- + src/hb-ot-glyf-table.hh | 4 +- + src/hb-ot-hdmx-table.hh | 2 +- + src/hb-ot-head-table.hh | 2 +- + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-ot-kern-table.hh | 2 +- + src/hb-ot-layout-base-table.hh | 4 +- + ...ut-common-private.hh => hb-ot-layout-common.hh} | 14 ++-- + src/hb-ot-layout-gdef-table.hh | 4 +- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + ...subgpos-private.hh => hb-ot-layout-gsubgpos.hh} | 14 ++-- + src/hb-ot-layout-jstf-table.hh | 2 +- + src/hb-ot-layout.cc | 8 +-- + src/{hb-ot-layout-private.hh => hb-ot-layout.hh} | 16 ++--- + src/hb-ot-map.cc | 4 +- + src/{hb-ot-map-private.hh => hb-ot-map.hh} | 8 +-- + src/hb-ot-math-table.hh | 4 +- + src/hb-ot-math.cc | 4 +- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-name-table.hh | 2 +- + src/hb-ot-os2-table.hh | 2 +- + src/hb-ot-os2-unicode-ranges.hh | 2 +- + src/hb-ot-post-macroman.hh | 2 +- + src/hb-ot-post-table.hh | 2 +- + src/hb-ot-shape-complex-arabic-fallback.hh | 4 +- + src/hb-ot-shape-complex-arabic-win1256.hh | 2 +- + src/hb-ot-shape-complex-arabic.cc | 6 +- + ...ic-private.hh => hb-ot-shape-complex-arabic.hh} | 10 +-- + src/hb-ot-shape-complex-default.cc | 2 +- + src/hb-ot-shape-complex-hangul.cc | 2 +- + src/hb-ot-shape-complex-hebrew.cc | 2 +- + src/hb-ot-shape-complex-indic-machine.hh | 2 +- + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + src/hb-ot-shape-complex-indic-table.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 4 +- + ...dic-private.hh => hb-ot-shape-complex-indic.hh} | 12 ++-- + src/hb-ot-shape-complex-khmer-machine.hh | 2 +- + src/hb-ot-shape-complex-khmer-machine.rl | 2 +- + src/hb-ot-shape-complex-khmer.cc | 4 +- + ...mer-private.hh => hb-ot-shape-complex-khmer.hh} | 10 +-- + src/hb-ot-shape-complex-myanmar-machine.hh | 2 +- + src/hb-ot-shape-complex-myanmar-machine.rl | 2 +- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + ...r-private.hh => hb-ot-shape-complex-myanmar.hh} | 10 +-- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape-complex-tibetan.cc | 2 +- + src/hb-ot-shape-complex-use-machine.hh | 2 +- + src/hb-ot-shape-complex-use-machine.rl | 2 +- + src/hb-ot-shape-complex-use-table.cc | 2 +- + src/hb-ot-shape-complex-use.cc | 4 +- + ...x-use-private.hh => hb-ot-shape-complex-use.hh} | 10 +-- + ...e-complex-private.hh => hb-ot-shape-complex.hh} | 12 ++-- + src/hb-ot-shape-fallback.cc | 4 +- + ...fallback-private.hh => hb-ot-shape-fallback.hh} | 10 +-- + src/hb-ot-shape-normalize.cc | 6 +- + ...rmalize-private.hh => hb-ot-shape-normalize.hh} | 8 +-- + src/hb-ot-shape.cc | 20 +++--- + src/{hb-ot-shape-private.hh => hb-ot-shape.hh} | 12 ++-- + src/hb-ot-tag.cc | 2 +- + src/hb-ot-var-avar-table.hh | 2 +- + src/hb-ot-var-fvar-table.hh | 2 +- + src/hb-ot-var-hvar-table.hh | 2 +- + src/hb-ot-var-mvar-table.hh | 2 +- + src/hb-ot-var.cc | 4 +- + src/{hb-set-digest-private.hh => hb-set-digest.hh} | 8 +-- + src/hb-set.cc | 2 +- + src/{hb-set-private.hh => hb-set.hh} | 8 +-- + src/hb-shape-plan.cc | 10 +-- + src/{hb-shape-plan-private.hh => hb-shape-plan.hh} | 10 +-- + src/hb-shape.cc | 12 ++-- + ...hb-shaper-impl-private.hh => hb-shaper-impl.hh} | 16 ++--- + src/hb-shaper.cc | 6 +- + src/{hb-shaper-private.hh => hb-shaper.hh} | 8 +-- + src/hb-static.cc | 8 +-- + src/hb-string-array.hh | 2 +- + src/hb-subset-glyf.cc | 2 +- + src/hb-subset-glyf.hh | 2 +- + src/hb-subset-input.cc | 4 +- + src/hb-subset-plan.cc | 6 +- + src/hb-subset-plan.hh | 6 +- + src/hb-subset.cc | 8 +-- + src/{hb-subset-private.hh => hb-subset.hh} | 10 +-- + src/hb-ucdn.cc | 6 +- + src/hb-unicode.cc | 6 +- + src/{hb-unicode-private.hh => hb-unicode.hh} | 8 +-- + src/hb-uniscribe.cc | 6 +- + src/{hb-utf-private.hh => hb-utf.hh} | 8 +-- + src/{hb-vector-private.hh => hb-vector.hh} | 8 +-- + src/hb-warning.cc | 6 +- + src/{hb-private.hh => hb.hh} | 12 ++-- + src/main.cc | 4 +- + src/test-buffer-serialize.cc | 2 +- + src/test-size-params.cc | 2 +- + src/test-unicode-ranges.cc | 2 +- + src/test-would-substitute.cc | 2 +- + src/test.cc | 2 +- + test/api/test-common.c | 1 - + util/Makefile.am | 4 +- + util/ansi-print.hh | 3 +- + util/hb-subset.cc | 2 +- + util/helper-cairo-ansi.hh | 2 +- + util/helper-cairo.hh | 2 +- + util/main-font-text.hh | 2 +- + util/options.hh | 2 +- + util/shape-consumer.hh | 2 +- + util/view-cairo.hh | 2 +- + 168 files changed, 452 insertions(+), 455 deletions(-) + +commit 82b12bcadd50c9e86bbe82623a1cbc0b4afdd237 +Author: Behdad Esfahbod +Date: Sat Aug 25 22:07:17 2018 -0700 + + [unicode] Add HB_UNICODE_MAX + + New API: + HB_UNICODE_MAX + + docs/harfbuzz-sections.txt | 1 + + src/hb-ot-cmap-table.hh | 8 ++------ + src/hb-unicode.h | 3 +++ + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit b09a0336ca856a2b1040e7fabd5819b64749e308 +Author: Behdad Esfahbod +Date: Sat Aug 25 22:04:39 2018 -0700 + + [cmap] More hb_auto_t<>(...) + + src/hb-subset.cc | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +commit 28634db07e6ecbdb7e59ed8f989212272a97de86 +Author: Behdad Esfahbod +Date: Sat Aug 25 21:23:43 2018 -0700 + + [cmap] Fix skipping gid0 in Format4 collect_unicodes() + + src/hb-ot-cmap-table.hh | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +commit acce1fa3ea9707d0883cd66397fd187d3268905c +Author: Behdad Esfahbod +Date: Sat Aug 25 21:15:39 2018 -0700 + + Use new hb_auto_t<> constructor with Coverage::Iter + + src/hb-ot-layout-common-private.hh | 65 ++++++++++++++++++++++++-------------- + src/hb-ot-layout-gsub-table.hh | 30 ++++++------------ + 2 files changed, 52 insertions(+), 43 deletions(-) + +commit ddea4d19cf6d64270e14418f02e7ff1f1b9458db +Author: Behdad Esfahbod +Date: Sat Aug 25 21:08:15 2018 -0700 + + Add 1-param passthrough constructor to hb_auto_t<> + + And use. + + src/hb-dsalgs.hh | 1 + + src/hb-ot-cmap-table.hh | 7 +++---- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit c8cfb702e96bf4e89495fcc56f965c88bfa77dca +Author: Behdad Esfahbod +Date: Sat Aug 25 16:14:32 2018 -0700 + + [cmap] Minor + + src/hb-ot-cmap-table.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 1dcf5fb038e7c2d3d03a50c4cd9869a922f9adf7 +Author: Behdad Esfahbod +Date: Sat Aug 25 16:11:26 2018 -0700 + + [cmap Add hb_subset_collect_variation_unicodes() + + To be moved to hb-face.h later. + + src/hb-ot-cmap-table.hh | 59 +++++++++++++++++++++++++++++++++++++++++-------- + src/hb-subset.cc | 25 ++++++++++++++++++++- + src/hb-subset.h | 10 +++++++-- + 3 files changed, 82 insertions(+), 12 deletions(-) + +commit 4806b3800d77603c203e8bb2e88baeb2b3a14f05 +Author: Behdad Esfahbod +Date: Sat Aug 25 15:56:07 2018 -0700 + + [cmap] Add hb_subset_collect_variation_selectors() + + To be moved to hb-face later. + + src/hb-ot-cmap-table.hh | 20 ++++++++++++++++---- + src/hb-subset.cc | 30 ++++++++++++++++++++++++++---- + src/hb-subset.h | 8 +++++++- + 3 files changed, 49 insertions(+), 9 deletions(-) + +commit 3336de24790ac1a12852ac2a3e2fff4d6bb19bc7 +Author: Behdad Esfahbod +Date: Sat Aug 25 15:41:25 2018 -0700 + + [cmap] Remove unused code + + src/hb-ot-cmap-table.hh | 10 ---------- + 1 file changed, 10 deletions(-) + +commit 1becabe06c0c58aaf69a9ba641508e77a60f3451 +Author: Behdad Esfahbod +Date: Sat Aug 25 15:37:56 2018 -0700 + + [cmap] Use bsearch to find subtables + + src/hb-ot-cmap-table.hh | 5 +---- + test/shaping/data/in-house/tests/fuzzed.tests | 2 +- + 2 files changed, 2 insertions(+), 5 deletions(-) + +commit 02fe03e09a3258e07d2d6749990f6d31dd2a8525 +Author: Behdad Esfahbod +Date: Sat Aug 25 15:33:05 2018 -0700 + + [cmap] Factor out find_best_subtable + + src/hb-ot-cmap-table.hh | 52 +++++++++++++++++++++++++++++-------------------- + 1 file changed, 31 insertions(+), 21 deletions(-) + +commit b41c43b4e112bfa38fef35694842f242c28a7da2 +Author: Behdad Esfahbod +Date: Sat Aug 25 15:25:03 2018 -0700 + + Minor + + src/hb-ot-cmap-table.hh | 48 ++++++++++++++++++++++++++---------------------- + 1 file changed, 26 insertions(+), 22 deletions(-) + +commit 7d382fa276f44b7b163e98d434cc79f958bf87fb +Author: Behdad Esfahbod +Date: Sat Aug 25 09:35:45 2018 -0700 + + [cmap] Implement collect_unicodes() for Format0/6/10 + + src/hb-ot-cmap-table.hh | 23 +++++++++++++++++++---- + 1 file changed, 19 insertions(+), 4 deletions(-) + +commit bd0e542525d41d9ebe51cbcab8151d65eb984b2e +Author: Behdad Esfahbod +Date: Sat Aug 25 09:33:30 2018 -0700 + + [cmap] Simplify collect_unicodes() + + Don't use accelerator (almost). Hooks up Format13 as well. + + src/hb-ot-cmap-table.hh | 52 +++++++++++++++++++++++++++---------------------- + 1 file changed, 29 insertions(+), 23 deletions(-) + +commit d60c465627d76fcfbeb37d6b8f9382f3b84ace6e +Author: Behdad Esfahbod +Date: Sat Aug 25 08:47:06 2018 -0700 + + Rename get_all_codepoints() to collect_unicodes() + + src/hb-ot-cmap-table.hh | 26 ++++++++++++------------- + src/hb-subset.cc | 6 +++--- + src/hb-subset.h | 4 ++-- + test/api/test-subset-codepoints.c | 18 ++++++++--------- + test/fuzzing/hb-subset-get-codepoints-fuzzer.cc | 2 +- + 5 files changed, 28 insertions(+), 28 deletions(-) + +commit 531051b8b904cf4eb6a50bacebc11c2d85e40140 +Author: Behdad Esfahbod +Date: Sat Aug 25 08:44:18 2018 -0700 + + [ot-font] Return char-not-found if mapped to gid 0 + + OpenType cmap table can use gid=0 to mean "not covered" to produce + more optimized cmap subtables. Return false from get_nominal_glyph() + for those. hb-ft already does this. + + src/hb-ot-cmap-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit aadb2a9188f143126392c0b0f139326dcf7f9c8d +Author: Behdad Esfahbod +Date: Sat Aug 25 08:18:53 2018 -0700 + + Add face-builder + + New API: + +hb_face_builder_create + +hb_face_builder_add_table + + docs/harfbuzz-sections.txt | 5 +- + src/hb-face.cc | 149 +++++++++++++++++++++++++++++++++++++++++++++ + src/hb-face.h | 14 +++++ + src/hb-subset-plan.cc | 2 +- + src/hb-subset-plan.hh | 2 +- + src/hb-subset-private.hh | 7 --- + src/hb-subset.cc | 129 --------------------------------------- + 7 files changed, 169 insertions(+), 139 deletions(-) + +commit 6cac9dc9ccb76945e9dfacafc169afad4a6e1e88 +Author: Behdad Esfahbod +Date: Fri Aug 24 10:29:45 2018 -0700 + + [blob] Add as_bytes() + + src/hb-blob-private.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 29a9a0883877c598413de78cd0c61f07bc393b2c +Author: Behdad Esfahbod +Date: Fri Aug 24 10:24:45 2018 -0700 + + [sanitize] Document how sanitize machinery works + + src/hb-machinery-private.hh | 62 +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 62 insertions(+) + +commit 142ac5a6be6088771e0ee4b135ba753c80036a9a +Author: Behdad Esfahbod +Date: Fri Aug 24 10:07:49 2018 -0700 + + [serialize] Add copy_bytes() and copy_blob() + + src/hb-dsalgs.hh | 3 +++ + src/hb-machinery-private.hh | 21 ++++++++++++++++++++- + 2 files changed, 23 insertions(+), 1 deletion(-) + +commit 1c6b3693245d38103cab224d75262d45dc88c71c +Author: Behdad Esfahbod +Date: Wed Aug 15 20:12:25 2018 -0700 + + [ot] Rename hb_ot_layout_t to hb_ot_face_data_t + + src/hb-aat-layout.cc | 17 +----- + src/hb-ot-color.cc | 6 +-- + src/hb-ot-layout-gpos-table.hh | 6 +-- + src/hb-ot-layout-gsub-table.hh | 8 ++- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-layout-private.hh | 12 ++--- + src/hb-ot-layout.cc | 100 +++++++++++++++++------------------ + src/hb-ot-math.cc | 2 +- + src/hb-ot-shape.cc | 5 +- + src/hb-ot-var.cc | 4 +- + 10 files changed, 71 insertions(+), 91 deletions(-) + +commit 27c32d8afbdf5b587b14f3b194f79882680348ba +Author: Michiharu Ariza +Date: Wed Aug 22 11:36:39 2018 -0700 + + fixed "Fixed" number decoding + + src/hb-cff-interp-common-private.hh | 11 ++++++++++- + src/hb-cff-interp-cs-common-private.hh | 4 ++-- + 2 files changed, 12 insertions(+), 3 deletions(-) + +commit 811a651bbd3f1bda7ed8eaee9af8e9dbbc8f80de +Author: Michiharu Ariza +Date: Mon Aug 20 14:04:46 2018 -0700 + + fixed bugs with empty CFFIndex, fullset FDMap + + src/hb-ot-cff-common-private.hh | 21 ++++++++++++++++++--- + 1 file changed, 18 insertions(+), 3 deletions(-) + +commit 5cde2f55cd2f8917954f3a3f60bd571c86b3aa59 +Author: Michiharu Ariza +Date: Fri Aug 17 16:50:13 2018 -0700 + + drop hints from CFF & CFF2 Private + + src/hb-cff-interp-dict-common-private.hh | 24 ++++++++++++++ + src/hb-subset-cff1.cc | 53 +++++++++++++++++++++++++++--- + src/hb-subset-cff2.cc | 55 +++++++++++++++++++++++++++++--- + 3 files changed, 123 insertions(+), 9 deletions(-) + +commit cef75ea41a513a612a683bced27ced31761204b5 +Author: Michiharu Ariza +Date: Fri Aug 17 13:13:18 2018 -0700 + + Added CFF2 Subr nullifier + + along with CFF2 charstring interpreter + factored out common code between CFF1 & CFF2 to CSInterpreter + moved fetch_op from Interpreter to InterpEnv + misc code clean up & bug fixes + + src/Makefile.sources | 1 + + src/hb-cff-interp-common-private.hh | 44 +++++++-------- + src/hb-cff-interp-cs-common-private.hh | 95 +++++++++++++++++++++++++++++-- + src/hb-cff-interp-dict-common-private.hh | 3 +- + src/hb-cff1-interp-cs.hh | 82 --------------------------- + src/hb-cff2-interp-cs.hh | 97 ++++++++++++++++++++++++++++++++ + src/hb-ot-cff-common-private.hh | 4 ++ + src/hb-ot-cff2-table.hh | 7 ++- + src/hb-subset-cff1.cc | 1 + + src/hb-subset-cff2.cc | 62 ++++++++++++++++++-- + 10 files changed, 278 insertions(+), 118 deletions(-) + +commit f57d6bcbca276cec54d1e5308c308265e8e983b9 +Author: Michiharu Ariza +Date: Thu Aug 16 08:03:46 2018 -0700 + + renamed CFF::Index to CFF::CFFIndex + + to avoid confusion with OT::Index + + src/hb-ot-cff-common-private.hh | 38 +++++++++++++++++++------------------- + src/hb-ot-cff1-table.hh | 4 ++-- + src/hb-ot-cff2-table.hh | 2 +- + src/hb-subset-cff2.cc | 4 ++-- + 4 files changed, 24 insertions(+), 24 deletions(-) + +commit c4ae426a3d3f9411b94d35745ca0e14677cd7bdb +Author: Michiharu Ariza +Date: Thu Aug 16 00:59:46 2018 -0700 + + treat h/vstem the same as h/vstemhm + + src/hb-cff1-interp-cs.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit e67bb3fbcf39385ea1db136aeca61291364fb75b +Author: Michiharu Ariza +Date: Thu Aug 16 00:25:57 2018 -0700 + + renamed OT::cff to OT::cff1 for consistency + + along with HB_OT_TAG_cff1 + + src/hb-ot-cff1-table.hh | 14 +++++++------- + src/hb-subset-cff1.cc | 16 ++++++++-------- + src/hb-subset.cc | 4 ++-- + 3 files changed, 17 insertions(+), 17 deletions(-) + +commit fdbfa1848b2f279c0f7a885bc1a985fa3375cfcd +Author: Michiharu Ariza +Date: Thu Aug 16 00:13:09 2018 -0700 + + renamed CFF version 1 structs and sources to CFF1 from CFF + + "CFF" is used for shared structs & sources between CFF1 & CFF2 + except OT:cff is for CFF version 1 table + + src/Makefile.sources | 8 +- + src/{hb-cff-interp-cs.hh => hb-cff1-interp-cs.hh} | 22 ++-- + src/{hb-ot-cff-table.hh => hb-ot-cff1-table.hh} | 150 +++++++++++----------- + src/hb-ot-font.cc | 2 +- + src/{hb-subset-cff.cc => hb-subset-cff1.cc} | 86 ++++++------- + src/{hb-subset-cff.hh => hb-subset-cff1.hh} | 8 +- + src/hb-subset.cc | 2 +- + 7 files changed, 139 insertions(+), 139 deletions(-) + +commit 867f68bd8a74634ac6220bd76c8bafe3e2226041 +Author: Michiharu Ariza +Date: Wed Aug 15 15:53:50 2018 -0700 + + fix build attempt ^7 + + src/hb-subset-cff2.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 685db67bb07505729fdb997129ffd068bbe3c40d +Author: Michiharu Ariza +Date: Wed Aug 15 15:45:17 2018 -0700 + + fix build attempt ^6 + + src/hb-subset-cff2.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 2810caafeb9a621d53653f454dab0fa3e7f5c4a3 +Author: Michiharu Ariza +Date: Wed Aug 15 15:30:24 2018 -0700 + + fix build attempt ^5 + + src/hb-subset-cff2.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 25b8310b2a3e074c9d1d723ab6d10a29f8d189be +Merge: 7aa23f35 22defe09 +Author: Michiharu Ariza +Date: Wed Aug 15 15:00:55 2018 -0700 + + Merge branch 'master' into cff-subset + +commit 7aa23f3597e4783b88ad526021cc4cafc05395f2 +Author: Michiharu Ariza +Date: Wed Aug 15 15:00:32 2018 -0700 + + fix build attempt ^4 + + src/hb-cff-interp-cs.hh | 10 +++++----- + src/hb-subset-cff.cc | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 270452a44653773b3dc584729ec438ff922e2739 +Author: Michiharu Ariza +Date: Wed Aug 15 13:15:08 2018 -0700 + + fix build attempt ^3 + + src/hb-cff-interp-common-private.hh | 2 -- + src/hb-cff-interp-cs-common-private.hh | 1 + + src/hb-cff-interp-cs.hh | 1 + + src/hb-subset-cff.cc | 2 +- + 4 files changed, 3 insertions(+), 3 deletions(-) + +commit c234839f25e68700c3489c55fda2773f2e00eecb +Author: Michiharu Ariza +Date: Wed Aug 15 13:04:43 2018 -0700 + + fix build attempt ^2 + + src/hb-cff-interp-common-private.hh | 2 ++ + src/hb-cff-interp-cs-common-private.hh | 6 +++--- + src/hb-cff-interp-cs.hh | 6 +++--- + src/hb-cff-interp-dict-common-private.hh | 6 +++--- + src/hb-subset-cff.cc | 6 +++--- + 5 files changed, 14 insertions(+), 12 deletions(-) + +commit eab07e713a67da2c5b368c59808f7e2db1cf0b0b +Author: Michiharu Ariza +Date: Wed Aug 15 12:15:55 2018 -0700 + + fix build + + src/Makefile.sources | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 633ce88de93f5c565ee7fb8acdbd93c57779524b +Author: Michiharu Ariza +Date: Wed Aug 15 12:00:19 2018 -0700 + + CFF Subrs subsetting + + Unreferenced subroutines are nullified (not removed) in a subset font + + Separate Interpreter struct from hb-ot-cff-common-private.hh in a set of four header files, augmented for CharString (CS): + hb-cff-interp-common-private.hh + hb-cff-interp-dict-common-private.hh + hb-cff-interp-cs-common-private.hh + hb-cff-interp-cs.hh + + Interpreter runtime is separated off as a new struct InterpEnv sub-classed differently for Dict and CharString (CS) + + src/Makefile.sources | 8 +- + src/hb-cff-interp-common-private.hh | 581 +++++++++++++++++++++++++++++++ + src/hb-cff-interp-cs-common-private.hh | 174 +++++++++ + src/hb-cff-interp-cs.hh | 282 +++++++++++++++ + src/hb-cff-interp-dict-common-private.hh | 183 ++++++++++ + src/hb-ot-cff-common-private.hh | 562 ++---------------------------- + src/hb-ot-cff-table.hh | 165 ++++----- + src/hb-ot-cff2-table.hh | 147 ++++---- + src/hb-subset-cff-common-private.hh | 83 +++++ + src/hb-subset-cff.cc | 118 +++++-- + src/hb-subset-cff2.cc | 38 +- + 11 files changed, 1585 insertions(+), 756 deletions(-) + +commit 22defe0965adddaa09eebc13df7fa6c64e2abba3 +Author: Emil A Eklund +Date: Tue Aug 14 14:47:20 2018 -0700 + + Add guard around free_static_C_locale + + Add HB_USE_ATEXIT guard around free_static_C_locale missed by previous + commit. + + src/hb-common.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7112c6413ca7a1773847fe258145cc5162420953 +Author: Emil A Eklund +Date: Tue Aug 14 13:50:24 2018 -0700 + + Guard free_static function definitions with macro + + Add HB_USE_ATEXIT macros around free_static function definitions to + avoid unused function compiler warnings/errors. + + src/hb-ft.cc | 5 ++++- + src/hb-glib.cc | 3 ++- + src/hb-icu.cc | 3 ++- + src/hb-ot-font.cc | 3 ++- + src/hb-shape.cc | 4 +++- + src/hb-shaper.cc | 3 ++- + 6 files changed, 15 insertions(+), 6 deletions(-) + +commit 63be5dcdde61275822d931b2924425478bc1dac1 +Author: Behdad Esfahbod +Date: Tue Aug 14 10:59:34 2018 -0700 + + 1.8.8 + + NEWS | 18 ++++++++++++++++++ + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 3 files changed, 21 insertions(+), 3 deletions(-) + +commit c9a22fa124310c98c73b8d7b495ed354542a75de +Author: Behdad Esfahbod +Date: Mon Aug 13 17:02:21 2018 -0700 + + [icu] Pass normalizer instance down as user_data + + src/hb-icu.cc | 23 +++++++++-------------- + 1 file changed, 9 insertions(+), 14 deletions(-) + +commit f0ef096b8cab33aa9e26edba9b15696bf907e268 +Author: Behdad Esfahbod +Date: Mon Aug 13 10:30:41 2018 -0700 + + Don't add reference in get_unicode_funcs() functions + + Users don't expect a new reference returned from a get() function. + Indeed, all users of that API I foud where NOT destroying the reference. + Just change the implementations to NOT return a reference. + + This applies to the following APIs: + hb_unicode_funcs_get_default() + hb_glib_get_unicode_funcs() + hb_icu_get_unicode_funcs() + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1134 + + src/hb-buffer.cc | 3 +-- + src/hb-glib.cc | 2 +- + src/hb-icu.cc | 2 +- + src/hb-ucdn.cc | 2 +- + 4 files changed, 4 insertions(+), 5 deletions(-) + +commit 9bbd1cdf068635f4a737f1fc9ab54ba075601a5d +Author: Behdad Esfahbod +Date: Sun Aug 12 18:20:53 2018 -0700 + + [uniscribe] Use lazy loader + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1129 + + src/hb-uniscribe.cc | 56 +++++++++++++++++++++++++++-------------------------- + 1 file changed, 29 insertions(+), 27 deletions(-) + +commit 266368993625e0cfb6eef9188f8b9aa29fb97391 +Author: Behdad Esfahbod +Date: Sun Aug 12 18:10:59 2018 -0700 + + Another clang bot fix + + src/hb-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 989e71a982658145f28f83f2111bdab9561f3db0 +Author: Behdad Esfahbod +Date: Sun Aug 12 17:47:59 2018 -0700 + + Silence clang + + src/hb-machinery-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6750ec692cdd682bd33cb1c37b137cf3bb641d43 +Author: Behdad Esfahbod +Date: Sun Aug 12 17:42:16 2018 -0700 + + [lazy] Use for C_locale + + src/hb-common.cc | 60 ++++++++++++++++++++++++++++---------------------------- + 1 file changed, 30 insertions(+), 30 deletions(-) + +commit 747d2564e6bdcc15cf6a197e543fb732924159c5 +Author: Behdad Esfahbod +Date: Sun Aug 12 17:32:10 2018 -0700 + + [lazy] Port more + + src/hb-machinery-private.hh | 1 - + src/hb-shaper.cc | 78 ++++++++++++++++++++------------------------- + src/hb-uniscribe.cc | 3 +- + 3 files changed, 37 insertions(+), 45 deletions(-) + +commit 7bd508a0c4ce426f474bfcc729cb39207dd1f7b4 +Author: Behdad Esfahbod +Date: Sun Aug 12 17:19:55 2018 -0700 + + [lazy] Rename free() + + src/hb-ft.cc | 4 ++-- + src/hb-glib.cc | 2 +- + src/hb-icu.cc | 2 +- + src/hb-machinery-private.hh | 4 ++-- + src/hb-ot-font.cc | 2 +- + src/hb-shape.cc | 6 +++--- + src/hb-ucdn.cc | 2 +- + 7 files changed, 11 insertions(+), 11 deletions(-) + +commit a3b97db910662e26bafe6e6bc1c36b437f4ed931 +Author: Behdad Esfahbod +Date: Sun Aug 12 17:14:32 2018 -0700 + + [lazy] Port more to it + + src/hb-shape.cc | 75 +++++++++++++++++++++++++++++---------------------------- + 1 file changed, 38 insertions(+), 37 deletions(-) + +commit 6901090945d7e16102f3a2b168465434032b9a09 +Author: Behdad Esfahbod +Date: Sun Aug 12 16:57:06 2018 -0700 + + [lazy] Make hb_lazy_loader_t<> more usable + + src/hb-ft.cc | 7 +++--- + src/hb-machinery-private.hh | 57 +++++++++++++++++++++++++++------------------ + 2 files changed, 37 insertions(+), 27 deletions(-) + +commit bb905e9afcc3eb28a22ba78c09e661a814d04c1f +Author: Behdad Esfahbod +Date: Sun Aug 12 16:40:08 2018 -0700 + + [lazy] Minor + + src/hb-machinery-private.hh | 36 ++++++++++++++++++------------------ + src/hb-ot-font.cc | 8 ++++---- + 2 files changed, 22 insertions(+), 22 deletions(-) + +commit 3945cd78a96bdd287e203a0261bac490df1314b0 +Author: Behdad Esfahbod +Date: Sun Aug 12 16:33:48 2018 -0700 + + Minor + + src/hb-machinery-private.hh | 4 ---- + 1 file changed, 4 deletions(-) + +commit c21a1b95dffedb6ed66b384f4adf07e6d05d4b9f +Author: Behdad Esfahbod +Date: Sun Aug 12 16:30:39 2018 -0700 + + [icu] Use get_relaxed for normalizer access + + We've had the proper barriers already. No need for more with every access. + + src/hb-icu.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 125fefa2a6b23cf7eb4559904b23aff3731d5dba +Author: Behdad Esfahbod +Date: Sun Aug 12 16:29:41 2018 -0700 + + [icu] Fix for breakage after recent change + + src/hb-icu.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 53442be1edc73993bdcaffc4b895c07f1ea03ba0 +Author: Behdad Esfahbod +Date: Sun Aug 12 16:20:11 2018 -0700 + + [lazy] Use for ft_library + + src/hb-ft.cc | 61 ++++++++++++++++++++++----------------------- + src/hb-glib.cc | 2 +- + src/hb-icu.cc | 2 +- + src/hb-machinery-private.hh | 2 +- + src/hb-ot-font.cc | 2 +- + src/hb-ucdn.cc | 2 +- + 6 files changed, 35 insertions(+), 36 deletions(-) + +commit 7a8d480378af4094645dfb1527a61a94b4786b54 +Author: Behdad Esfahbod +Date: Sun Aug 12 16:00:13 2018 -0700 + + [lazy] Add .free() + + src/hb-ft.cc | 2 +- + src/hb-glib.cc | 2 +- + src/hb-icu.cc | 2 +- + src/hb-machinery-private.hh | 4 ++++ + src/hb-ot-font.cc | 2 +- + src/hb-ucdn.cc | 2 +- + 6 files changed, 9 insertions(+), 5 deletions(-) + +commit c7ca30a5337cb660e650d51ddd17d389909357c2 +Author: Behdad Esfahbod +Date: Sun Aug 12 13:46:53 2018 -0700 + + [ot/ft] Port font_funcs statis to lazy-loader + + src/hb-ft.cc | 56 ++++++++++++++++++++++----------------------- + src/hb-machinery-private.hh | 14 ++++++++++++ + src/hb-ot-font.cc | 49 +++++++++++++++++---------------------- + 3 files changed, 62 insertions(+), 57 deletions(-) + +commit cb3fc3685c03c8ed07bcf05188f5d6c582fd5aaa +Author: Behdad Esfahbod +Date: Sun Aug 12 13:39:01 2018 -0700 + + [ucdn/glib/icu] Port unicode_funcs statics to lazy-loader + + src/hb-glib.cc | 50 ++++++++++++++++++-------------------- + src/hb-icu.cc | 59 ++++++++++++++++----------------------------- + src/hb-machinery-private.hh | 28 ++++++++++++++++----- + src/hb-ucdn.cc | 51 +++++++++++++++++---------------------- + 4 files changed, 88 insertions(+), 100 deletions(-) + +commit 1b6b481262465ae1865c66c4d499b4b2c8d297fb +Author: Behdad Esfahbod +Date: Sun Aug 12 13:16:40 2018 -0700 + + [lazy] Allow calling fini() multiple times + + src/hb-machinery-private.hh | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 918ad9f5d9b85384f24157523272a4ffc1927d16 +Author: Behdad Esfahbod +Date: Sun Aug 12 13:12:29 2018 -0700 + + [lazy] More + + src/hb-machinery-private.hh | 45 +++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 37 insertions(+), 8 deletions(-) + +commit 5abdf5eebadf9a4fbd50c1a893c9654de74d22ac +Author: Behdad Esfahbod +Date: Sun Aug 12 12:40:24 2018 -0700 + + [lazy] More shuffle + + src/hb-machinery-private.hh | 80 +++++++++++++++++++-------------------------- + 1 file changed, 34 insertions(+), 46 deletions(-) + +commit 5d9863be6ecf873033cbab732207dd420f3866e7 +Author: Behdad Esfahbod +Date: Sun Aug 12 12:27:47 2018 -0700 + + Minor + + src/hb-machinery-private.hh | 6 ++++-- + src/hb-ot-layout-private.hh | 2 +- + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit f9a3eab81008c01a458d16f274b1a0eaaae00e7c +Author: Behdad Esfahbod +Date: Sun Aug 12 12:21:56 2018 -0700 + + Add explicit_operator + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1127 + + src/hb-iter-private.hh | 2 +- + src/hb-private.hh | 15 ++++++++++++++- + 2 files changed, 15 insertions(+), 2 deletions(-) + +commit 470acb6c322fc64556d59847d829d95caa2d51e6 +Author: Behdad Esfahbod +Date: Sun Aug 12 12:09:20 2018 -0700 + + Rename + + src/hb-machinery-private.hh | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +commit 39607dc98e433ef577c1de0f309ce40fc40529be +Author: Martin Hosken +Date: Thu Aug 9 15:16:32 2018 +0700 + + Support _ in feature ids + + src/hb-common.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a3a8c85b027779365bb33e2063221b4650fbac3b +Merge: 145f371d 652cd45c +Author: Michiharu Ariza +Date: Fri Aug 10 13:41:42 2018 -0700 + + Merge branch 'master' into cff-subset + +commit 145f371d71965b86635025c73117db0e24f2df75 +Author: Michiharu Ariza +Date: Fri Aug 10 13:07:53 2018 -0700 + + fixed TRACE build failure + + src/hb-ot-cff-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a97ed342d18bdb262400c8ab6501df110fe4e18f +Author: Michiharu Ariza +Date: Fri Aug 10 12:55:22 2018 -0700 + + fixed inclusion of excluded Private & local Subrs + + It was bloating a multi-FD subset font unnecessarily + defined a wrapper struct FDMap for fdmap + + src/hb-ot-cff-common-private.hh | 34 ++++++++++++++++++++----- + src/hb-subset-cff-common-private.cc | 6 ++--- + src/hb-subset-cff-common-private.hh | 4 +-- + src/hb-subset-cff.cc | 48 +++++++++++++++++++---------------- + src/hb-subset-cff2.cc | 50 ++++++++++++++++++++----------------- + 5 files changed, 87 insertions(+), 55 deletions(-) + +commit 64c541226457907ec1801a5766050ee64feb67e8 +Author: Michiharu Ariza +Date: Fri Aug 10 11:07:07 2018 -0700 + + Added CFF support + + Added sources hb-ot-cff-table.hh, hb-subset-cff.cc & hh + Templatized Index because CFF uses 16-bit count while CFF2 uses 32-bit + Misc code cleanup & bug fixes + + src/Makefile.sources | 9 +- + src/hb-ot-cff-common-private.hh | 477 ++++++++++++------- + src/hb-ot-cff-table.hh | 919 ++++++++++++++++++++++++++++++++++++ + src/hb-ot-cff2-table.hh | 235 ++++----- + src/hb-ot-font.cc | 1 + + src/hb-subset-cff-common-private.cc | 6 +- + src/hb-subset-cff-common-private.hh | 4 +- + src/hb-subset-cff.cc | 560 ++++++++++++++++++++++ + src/hb-subset-cff.hh | 38 ++ + src/hb-subset-cff2.cc | 104 ++-- + src/hb-subset.cc | 4 + + 11 files changed, 1991 insertions(+), 366 deletions(-) + +commit 652cd45c650b1cdce2585dcee614e5a9cdda530c +Author: Behdad Esfahbod +Date: Thu Aug 9 01:02:02 2018 -0700 + + [coretext] Another try + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3f3585ca1406edd74138f78739612c167ab57913 +Author: Behdad Esfahbod +Date: Thu Aug 9 00:58:17 2018 -0700 + + Fix coretext build (hopefully) + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit aa3b6017ed71fc251522ff1bedcdae965b4c1c1c +Author: Behdad Esfahbod +Date: Thu Aug 9 00:56:28 2018 -0700 + + Revert "[iter] Make operator bool explicit" + + This reverts commit 66920a6bace7c54c8166c4ed938b6ffc5fabcf2b. + + Some of our bots (Oracle Studio and Apple gcc 4.2) do not allow + explicit except for constructors. + + https://github.com/harfbuzz/harfbuzz/issues/1127 + + src/hb-iter-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e1a2354220c369bd5a62d255acc42c60cd14c473 +Author: Behdad Esfahbod +Date: Thu Aug 9 00:53:25 2018 -0700 + + [atomic] More + + src/hb-atomic-private.hh | 2 -- + src/hb-object-private.hh | 7 +++++-- + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit f1f4b45ac3d228a6b11e33357725de065e2ba2be +Author: Behdad Esfahbod +Date: Thu Aug 9 00:28:40 2018 -0700 + + Fix lazy_loader fini() + + Was creating object even if wasn't there. + + src/hb-machinery-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1f7380944df9aa81cd48a4764c763d692533c4a6 +Author: Behdad Esfahbod +Date: Thu Aug 9 00:22:37 2018 -0700 + + [atomic] Add hb_atomic_ptr_t<> and port all uses + + Found and fixed a couple bugs. + + Found a couple multithreading issues. Marked them with "XXX-MT-bug". + + src/hb-atomic-private.hh | 34 +++++++++++++++++++++++++++++++--- + src/hb-common.cc | 34 ++++++++++++++++++---------------- + src/hb-face-private.hh | 3 ++- + src/hb-face.cc | 6 +++--- + src/hb-font.cc | 2 +- + src/hb-ft.cc | 22 ++++++++++++---------- + src/hb-glib.cc | 11 ++++++----- + src/hb-graphite2.cc | 16 +++++++++------- + src/hb-icu.cc | 22 ++++++++++++---------- + src/hb-machinery-private.hh | 17 +++++++++-------- + src/hb-object-private.hh | 29 +++++++++++++++-------------- + src/hb-ot-font.cc | 11 ++++++----- + src/hb-ot-layout-private.hh | 2 +- + src/hb-ot-post-table.hh | 9 +++++---- + src/hb-ot-shape-complex-arabic.cc | 9 +++++---- + src/hb-shape-plan.cc | 19 +++++++++++-------- + src/hb-shape.cc | 11 ++++++----- + src/hb-shaper-impl-private.hh | 2 +- + src/hb-shaper-private.hh | 16 +++++++++------- + src/hb-shaper.cc | 18 ++++++++++-------- + src/hb-ucdn.cc | 11 ++++++----- + src/hb-uniscribe.cc | 14 +++++++------- + 22 files changed, 185 insertions(+), 133 deletions(-) + +commit 6e42f4c53ff52cc242051e80600e19513136f6d1 +Author: Behdad Esfahbod +Date: Wed Aug 8 22:51:35 2018 -0700 + + [atomic] Remove hb_atomic_int_impl_t now that it's always int + + src/hb-atomic-private.hh | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +commit 1227a9e5a5befffa688c1cce141533fd80144d14 +Author: Behdad Esfahbod +Date: Wed Aug 8 22:45:49 2018 -0700 + + [atomic] Unify typedef + + Removes volatile from fallback implementation. That was handwavy + anyway. + + src/hb-atomic-private.hh | 22 ++++++++-------------- + 1 file changed, 8 insertions(+), 14 deletions(-) + +commit 5cd1888c9dcb8b32bcfe08be38bdd13fd8a09b5e +Author: Behdad Esfahbod +Date: Wed Aug 8 22:43:53 2018 -0700 + + [atomic] Change Mac atomic int type to int + + If ever int is not 32bit, we'll fix this... + + src/hb-atomic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e1de86eac188e804c6737fcad66ae09cf25ef221 +Author: Behdad Esfahbod +Date: Wed Aug 8 22:42:33 2018 -0700 + + [atomic] Change Windows atomic int type to int + + src/hb-atomic-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit aee2d10b2bf09814b32bccdecd4c3fbebafc542e +Author: Behdad Esfahbod +Date: Wed Aug 8 22:40:10 2018 -0700 + + [atomic] Change Solaris atomic int to signed + + src/hb-atomic-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b6fdcf4f8bd09e065c767939125861c9dc8ff18f +Author: Behdad Esfahbod +Date: Wed Aug 8 21:54:08 2018 -0700 + + 1.8.7 + + NEWS | 6 ++++++ + RELEASING.md | 3 +++ + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 4 files changed, 12 insertions(+), 3 deletions(-) + +commit 51ffc3e65aacbece63995be99e2bc20538e3eb75 +Author: Behdad Esfahbod +Date: Wed Aug 8 22:01:04 2018 -0700 + + Fix previous commit to use atomic operations + + src/hb-machinery-private.hh | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +commit 883957688cc4aa4335e5131a60b3ac3b53290726 +Author: Behdad Esfahbod +Date: Wed Aug 8 21:42:18 2018 -0700 + + Fix assertion failure + + https://bugzilla.mozilla.org/show_bug.cgi?id=1476334 + + src/hb-machinery-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e49a38b20e82e50bca96751470e945cbe0524880 +Author: Behdad Esfahbod +Date: Tue Aug 7 09:55:42 2018 -0700 + + 1.8.6 + + NEWS | 15 +++++++++++++++ + configure.ac | 2 +- + src/hb-font.cc | 6 +++--- + src/hb-font.h | 4 ++-- + src/hb-version.h | 4 ++-- + 5 files changed, 23 insertions(+), 8 deletions(-) + +commit b0ff79acd804e47a2a3db73746cf9c6dc986950a +Author: Behdad Esfahbod +Date: Tue Aug 7 09:52:06 2018 -0700 + + Add +hb_font_get_glyph_advances_for_direction + + New API: + +hb_font_get_glyph_advances_for_direction + + docs/harfbuzz-sections.txt | 1 + + src/hb-font-private.hh | 12 ++++++++++++ + src/hb-font.cc | 20 ++++++++++++++++++++ + src/hb-font.h | 8 ++++++++ + 4 files changed, 41 insertions(+) + +commit 28e2f467e1c7dd5e82d105efa8c4580dbfc93960 +Author: Behdad Esfahbod +Date: Tue Aug 7 09:47:00 2018 -0700 + + Actually add hb_font_get_glyph_[hv]_advances + + New API: + +hb_font_get_glyph_h_advances + +hb_font_get_glyph_v_advances + + src/hb-font.cc | 37 +++++++++++++++++++++++++++++++++++++ + src/hb-font.h | 15 +++++++++++++++ + 2 files changed, 52 insertions(+) + +commit 996775191a3fdeeeaee80e3123ef2240e6390b3d +Author: Behdad Esfahbod +Date: Tue Aug 7 09:44:01 2018 -0700 + + Minor + + src/hb-font-private.hh | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +commit 3d7c555a19ca0725c386aa6da648ecf2ae50fc19 +Author: Behdad Esfahbod +Date: Tue Aug 7 09:37:52 2018 -0700 + + Remove get_advances_nil and alias it to get_advances_default + + src/hb-font.cc | 36 ++---------------------------------- + 1 file changed, 2 insertions(+), 34 deletions(-) + +commit 66920a6bace7c54c8166c4ed938b6ffc5fabcf2b +Author: Behdad Esfahbod +Date: Mon Aug 6 15:32:13 2018 -0700 + + [iter] Make operator bool explicit + + We would need to write: + + for (Iter it (...); bool (t); t++) + + instead of: + + for (Iter it (...); t; t++) + + But I think it's an improvement in code readability in the long term. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1127 + + src/hb-iter-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 161ece4c3097096f355dc5ea514320a8dc678bea +Merge: e8d695eb 79e21984 +Author: Michiharu Ariza +Date: Mon Aug 6 11:23:50 2018 -0700 + + Merge branch 'master' into cff-subset + +commit e8d695ebaa4b5d36d907042fb6930244e87b1e29 +Author: Michiharu Ariza +Date: Mon Aug 6 11:13:06 2018 -0700 + + removed CMakeCache.txt + + build/CMakeCache.txt | 1 - + 1 file changed, 1 deletion(-) + +commit 9fae33b9f3fd7fce816c3db71089db4ce0c82d4c +Author: Michiharu Ariza +Date: Mon Aug 6 10:44:12 2018 -0700 + + Silence Codacy + + build/CMakeCache.txt | 1 + + src/hb-subset-cff-common-private.cc | 8 +++++--- + src/hb-subset-cff2.cc | 4 +++- + 3 files changed, 9 insertions(+), 4 deletions(-) + +commit 5561b818498431adb52f958d1e9589620f0e6539 +Author: Michiharu Ariza +Date: Mon Aug 6 10:04:53 2018 -0700 + + subset FDSelect and FDArray + + Added a set of sources hb-subset-cff-common-private.cc & .hh for FDSelect subseting code. + Added FDSelect format 4 (CFF2 only) support. Shared its implementation with format 3 as a template. + + src/Makefile.sources | 2 + + src/hb-ot-cff-common-private.hh | 130 ++++++++++++++++------- + src/hb-ot-cff2-table.hh | 71 ++++++++++++- + src/hb-subset-cff-common-private.cc | 200 ++++++++++++++++++++++++++++++++++++ + src/hb-subset-cff-common-private.hh | 54 ++++++++++ + src/hb-subset-cff2.cc | 71 ++++++++++--- + 6 files changed, 476 insertions(+), 52 deletions(-) + +commit 79e21984b13bdb879f3007ba9a97fde47df340d3 +Author: Behdad Esfahbod +Date: Mon Aug 6 09:45:17 2018 -0700 + + Add batch advance width callback function + + New API: + +hb_font_funcs_set_glyph_h_advances_func + +hb_font_funcs_set_glyph_v_advances_func + +hb_font_get_glyph_h_advances + +hb_font_get_glyph_h_advances_func_t + +hb_font_get_glyph_v_advances + +hb_font_get_glyph_v_advances_func_t + + docs/harfbuzz-sections.txt | 6 + + src/hb-font-private.hh | 41 +++++-- + src/hb-font.cc | 299 +++++++++++++++++++++++++++------------------ + src/hb-font.h | 53 ++++++-- + src/hb-ot-shape.cc | 3 +- + 5 files changed, 255 insertions(+), 147 deletions(-) + +commit 9533364cc3a8cccbae793de1873a727de73f64d5 +Author: Koji Ishii +Date: Wed Aug 1 13:01:08 2018 +0900 + + batchwidth + + src/hb-font-private.hh | 13 +++++++++++++ + src/hb-font.cc | 37 +++++++++++++++++++++++++++++++++++++ + src/hb-font.h | 15 +++++++++++++++ + src/hb-ot-shape.cc | 4 ++-- + 4 files changed, 67 insertions(+), 2 deletions(-) + +commit b912fbea17c50e229977345012227810ed7641e9 +Author: Behdad Esfahbod +Date: Mon Aug 6 06:30:12 2018 -0700 + + Remove most uses of direct comparison to Null objects + + src/hb-ot-glyf-table.hh | 6 +++--- + src/hb-ot-head-table.hh | 4 ++-- + src/hb-ot-layout-gdef-table.hh | 1 + + src/hb-ot-layout-gsubgpos-private.hh | 1 + + src/hb-ot-layout.cc | 6 +++--- + src/hb-ot-math-table.hh | 2 ++ + src/hb-ot-math.cc | 2 +- + src/hb-ot-shape-complex-arabic-fallback.hh | 3 ++- + src/hb-ot-var-fvar-table.hh | 2 ++ + src/hb-ot-var.cc | 2 +- + src/hb-subset.cc | 2 +- + src/main.cc | 2 +- + 12 files changed, 20 insertions(+), 13 deletions(-) + +commit 3506672ce9d8685ce4e113716b0d06adbc7981b7 +Author: Behdad Esfahbod +Date: Mon Aug 6 06:17:48 2018 -0700 + + Port _nil objects to Null() machinery + + Finally, unified! + + src/hb-blob-private.hh | 1 + + src/hb-blob.cc | 29 ++++++------- + src/hb-buffer-private.hh | 4 +- + src/hb-buffer.cc | 44 ++++++++++---------- + src/hb-face-private.hh | 6 +-- + src/hb-face.cc | 5 ++- + src/hb-font-private.hh | 10 +++-- + src/hb-font.cc | 66 ++++++++++++++++-------------- + src/hb-null.hh | 11 ++++- + src/hb-ot-shape-complex-arabic-fallback.hh | 11 +++-- + src/hb-shape-plan-private.hh | 1 + + src/hb-shape-plan.cc | 50 +++++++++++----------- + src/hb-unicode-private.hh | 7 ++-- + src/hb-unicode.cc | 5 ++- + 14 files changed, 137 insertions(+), 113 deletions(-) + +commit 1abd427acfb7229b8607646bdde59f29306b86e1 +Author: Behdad Esfahbod +Date: Mon Aug 6 05:53:35 2018 -0700 + + [BASE] Rename horzi/vert to h/v + + src/hb-ot-layout-base-table.hh | 68 +++++++++++++++++++++--------------------- + 1 file changed, 34 insertions(+), 34 deletions(-) + +commit da48aca1be89efbb8b3ca4471f542aa54aff17c4 +Author: Behdad Esfahbod +Date: Mon Aug 6 05:52:12 2018 -0700 + + [BASE] Misc fixes + + The code was badly broken. In better shape now, but still, needs + a full review before ever working. + + src/hb-ot-layout-base-table.hh | 163 +++++++++++++++++------------------------ + 1 file changed, 68 insertions(+), 95 deletions(-) + +commit f9cfa5cb0e70203279e74fb6adb0cd4570238ff8 +Author: Behdad Esfahbod +Date: Mon Aug 6 05:29:15 2018 -0700 + + Change null-pool specialization to min_size again + + src/hb-null.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 25147ff8086ab65995fe046cfdf8007604de6962 +Author: Behdad Esfahbod +Date: Mon Aug 6 05:01:52 2018 -0700 + + Move Null system to hb-null.hh + + src/Makefile.sources | 1 + + src/hb-null.hh | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-private.hh | 65 +---------------------------------- + 3 files changed, 99 insertions(+), 64 deletions(-) + +commit f800368df33e7ec15c3e77bdb9f4b464899322d3 +Author: Behdad Esfahbod +Date: Mon Aug 6 04:58:34 2018 -0700 + + Remove unused macros + + src/hb-object-private.hh | 1 - + src/hb-vector-private.hh | 1 - + 2 files changed, 2 deletions(-) + +commit 19e0091299f06856002c702792b448b06da637a8 +Author: Behdad Esfahbod +Date: Mon Aug 6 04:54:31 2018 -0700 + + Minor + + src/hb-private.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 37be774af921812018f723521b90f2ab54f661c5 +Author: Behdad Esfahbod +Date: Mon Aug 6 04:51:38 2018 -0700 + + Minor + + src/hb-private.hh | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit e1acff806b469e58f568bf5ad6ba578207821e87 +Author: Behdad Esfahbod +Date: Mon Aug 6 04:42:46 2018 -0700 + + Move hb_vector_t to hb-vector-private.hh + + src/Makefile.sources | 1 + + src/hb-dsalgs.hh | 297 ----------------------------------------------- + src/hb-object-private.hh | 109 ++++++++++++++++- + src/hb-vector-private.hh | 239 ++++++++++++++++++++++++++++++++++++++ + 4 files changed, 346 insertions(+), 300 deletions(-) + +commit be336dadc07460a53de51be32dd5d1f218b398b6 +Author: Behdad Esfahbod +Date: Mon Aug 6 04:32:51 2018 -0700 + + Move some more code around + + src/hb-dsalgs.hh | 43 +++++++++++++++++++++++++++++++++++++++++++ + src/hb-private.hh | 51 +-------------------------------------------------- + 2 files changed, 44 insertions(+), 50 deletions(-) + +commit 92806ee055c8efb68fcbe9e1750ce2532a1f8ab3 +Author: Behdad Esfahbod +Date: Sun Aug 5 21:41:52 2018 -0700 + + Move null data definitions to hb-static.cc + + Also remove " " null data for Tag. Just use zeroes. + + src/hb-open-type-private.hh | 3 +-- + src/hb-ot-layout-common-private.hh | 5 ++--- + src/hb-private.hh | 12 +++++++----- + src/hb-static.cc | 10 +++++++++- + 4 files changed, 19 insertions(+), 11 deletions(-) + +commit 1b4d5a2402302e90867c178b6b2ad07541091a74 +Author: Behdad Esfahbod +Date: Fri Aug 3 19:55:09 2018 -0700 + + Minor + + src/hb-ot-layout-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7df7963b46223f47e89a5a38c597c874aaa93141 +Author: Behdad Esfahbod +Date: Fri Aug 3 19:54:33 2018 -0700 + + Make lazy loader deal with OOM + + src/hb-machinery-private.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 30ff8ac865a266c8dca11eeac155c2cd3d1aa159 +Author: Behdad Esfahbod +Date: Fri Aug 3 17:32:00 2018 -0700 + + Rename + + src/hb-machinery-private.hh | 6 +++--- + src/hb-ot-font.cc | 8 ++++---- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 85ba4a190f30da5147d3b2ddac4d58dda31181f1 +Author: Behdad Esfahbod +Date: Fri Aug 3 17:06:42 2018 -0700 + + [ot] Comment + + src/hb-ot-layout-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 07afc1a213bde91fdfc44dd613f2e82ac1617c9f +Author: Behdad Esfahbod +Date: Fri Aug 3 17:03:32 2018 -0700 + + [ot] Add misc tables to tables_t + + Most unused. + + src/hb-ot-layout-private.hh | 36 ++++++++++++++++++++++-------------- + 1 file changed, 22 insertions(+), 14 deletions(-) + +commit 74b4df2cdef68b74536d9c29426b242199a63a6f +Author: Behdad Esfahbod +Date: Fri Aug 3 16:57:40 2018 -0700 + + [ot] Move GDEF into tables_t + + src/hb-machinery-private.hh | 6 ++++++ + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-layout-private.hh | 7 +------ + src/hb-ot-layout.cc | 15 +++++---------- + 5 files changed, 14 insertions(+), 18 deletions(-) + +commit 0271c7ab3b76dbf8a4e3e92eaf67d9d61b7a63dc +Author: Behdad Esfahbod +Date: Fri Aug 3 16:45:57 2018 -0700 + + [ot] Move GSUB/GPOS into tables_t + + src/hb-machinery-private.hh | 6 ++---- + src/hb-ot-layout-gpos-table.hh | 4 ++-- + src/hb-ot-layout-gsub-table.hh | 4 ++-- + src/hb-ot-layout-private.hh | 7 ++---- + src/hb-ot-layout.cc | 49 +++++++++++++++++++----------------------- + 5 files changed, 30 insertions(+), 40 deletions(-) + +commit f73d2775cf649d148ace7c2593da9666d60fc1be +Author: Behdad Esfahbod +Date: Fri Aug 3 16:34:25 2018 -0700 + + [ot] More shuffling + + Misc. table loading now properly automated. + + src/hb-ot-layout-private.hh | 67 +++++++++++++++++++++++++++++---------------- + src/hb-ot-layout.cc | 25 +++++++++++------ + src/hb-ot-math.cc | 2 +- + 3 files changed, 61 insertions(+), 33 deletions(-) + +commit 52fbd23d868a989d51b7df5be40be582890d13e5 +Author: Behdad Esfahbod +Date: Fri Aug 3 16:22:16 2018 -0700 + + [ot] Minor + + src/hb-aat-layout.cc | 4 ++-- + src/hb-face-private.hh | 7 ++----- + src/hb-machinery-private.hh | 1 + + src/hb-ot-layout-private.hh | 15 +++++++++------ + src/hb-ot-layout.cc | 20 ++++++++++---------- + src/hb-ot-math.cc | 2 +- + src/hb-ot-var.cc | 4 ++-- + 7 files changed, 27 insertions(+), 26 deletions(-) + +commit cc3f4e00aa5da1d9f0430adefe30689b3daa8282 +Author: Michiharu Ariza +Date: Fri Aug 3 15:00:37 2018 -0700 + + silence gcc + + src/hb-ot-cff2-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 00970dd2420c3dcc58c25568be4abe6586c159df +Author: Michiharu Ariza +Date: Fri Aug 3 14:35:09 2018 -0700 + + Removed parsed hint fields from CFF2PrivateDictValues + + Instead moved & stored uniformly in values vector (renamed from opstrs) + This should be fine as we aren't likely going to use them as hints after all + Templatized DictValues whether to parse them out + For subsetter, they aren't parsed + + src/hb-ot-cff-common-private.hh | 113 ++++++++++++++---------- + src/hb-ot-cff2-table.hh | 185 ++++++++++++---------------------------- + src/hb-subset-cff2.cc | 2 +- + 3 files changed, 120 insertions(+), 180 deletions(-) + +commit 6a0a298aabe777e2c1ed443f100fe6142c83e3b3 +Author: Behdad Esfahbod +Date: Thu Aug 2 23:13:19 2018 -0700 + + [ot] Move code around + + src/hb-ot-layout.cc | 211 ++++++++++++++++++++++++++-------------------------- + 1 file changed, 106 insertions(+), 105 deletions(-) + +commit 5e718a751efdda89511c9f30238b500125193499 +Author: Behdad Esfahbod +Date: Thu Aug 2 23:04:42 2018 -0700 + + [ot] Use switch for checking for blacklisted GDEF tables + + Faster / more compact code. + + src/hb-ot-layout.cc | 107 +++++++++++++++++++++++++++++----------------------- + 1 file changed, 59 insertions(+), 48 deletions(-) + +commit b5cdf5280d5b00df5356cc5c3236844ca0576bd0 +Author: Behdad Esfahbod +Date: Thu Aug 2 22:56:42 2018 -0700 + + [ot] In GDEF blacklisting logic, remove the glyph index check for Times + + Just blacklist based on table sizes like we do for other fonts. + + src/hb-ot-layout.cc | 12 ------------ + 1 file changed, 12 deletions(-) + +commit c988b119994ef78d400bc7d3139785312da0be75 +Author: Behdad Esfahbod +Date: Thu Aug 2 20:04:37 2018 -0700 + + Move code around + + src/hb-ot-font.cc | 41 ++++++++++++++++++++++++++--------------- + 1 file changed, 26 insertions(+), 15 deletions(-) + +commit 76f7397c10832b891a082e30afc74222bd5ffd7b +Author: Michiharu Ariza +Date: Thu Aug 2 16:28:10 2018 -0700 + + templatized CFF2 accelerator for lean Private dict interpretting for subset + + also fixed local subrs serialization + + src/hb-ot-cff-common-private.hh | 8 ++- + src/hb-ot-cff2-table.hh | 119 ++++++++++++++++++++++++++++++++-------- + src/hb-subset-cff2.cc | 13 +++-- + 3 files changed, 109 insertions(+), 31 deletions(-) + +commit 43040564e661fdd616d39e84fde07612d55bb785 +Author: Michiharu Ariza +Date: Thu Aug 2 12:23:10 2018 -0700 + + removed TRACE_SERIALIZE from non-member function _write_cff2 + + src/hb-subset-cff2.cc | 29 ++++++++++++++--------------- + 1 file changed, 14 insertions(+), 15 deletions(-) + +commit e2fd49e4779663e3138bd1990736a9cf850303bf +Merge: 693ae804 d4d1bf81 +Author: Michiharu Ariza +Date: Thu Aug 2 11:39:22 2018 -0700 + + Merge branch 'master' into cff-subset + +commit 693ae804743c60968d4339465fa6480e0ed8396c +Author: Michiharu Ariza +Date: Thu Aug 2 11:22:42 2018 -0700 + + more silencing fixes + + src/hb-ot-cff2-table.hh | 2 +- + src/hb-subset-cff2.cc | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit f6da44983178e345ddbac1bcd1691ddb330399c6 +Author: Michiharu Ariza +Date: Thu Aug 2 10:52:08 2018 -0700 + + silence archlinux + + src/hb-ot-cff-common-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 58279c3db4f31bf3f9a509d1d88bca01b57c6b81 +Author: Michiharu Ariza +Date: Thu Aug 2 10:18:01 2018 -0700 + + silence Codacy + + src/hb-ot-cff-common-private.hh | 25 +++++++++++++++++++------ + src/hb-ot-cff2-table.hh | 14 +++++++------- + 2 files changed, 26 insertions(+), 13 deletions(-) + +commit 574b37e933f98e35c2bdae04458a95522bbfbb82 +Author: Behdad Esfahbod +Date: Thu Aug 2 02:22:38 2018 -0700 + + Minor + + src/hb-ot-font.cc | 2 +- + src/hb-ot-layout-private.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit d4d1bf8177b127caa57b146c932f553dca1ad933 +Author: Behdad Esfahbod +Date: Thu Aug 2 02:04:02 2018 -0700 + + Fix for recent rename + + src/hb-graphite2.cc | 2 +- + src/hb-uniscribe.cc | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 91126aa11a5fa2bff72137df4768ad13fc9b7803 +Author: Behdad Esfahbod +Date: Thu Aug 2 02:03:13 2018 -0700 + + [uniscribe] Update for recent changes + + src/hb-uniscribe.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 66952ec47b5f09d88b83fb6a71b1cdb26c53668d +Author: Behdad Esfahbod +Date: Thu Aug 2 01:44:20 2018 -0700 + + Remove unused table reference + + src/hb-ot-layout-private.hh | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 443de26fa56dd1ef149d3ce4206f4495eceec2eb +Author: Behdad Esfahbod +Date: Thu Aug 2 01:41:19 2018 -0700 + + Minor + + src/hb-face.cc | 1 - + src/hb-ot-layout-private.hh | 12 ++++++------ + 2 files changed, 6 insertions(+), 7 deletions(-) + +commit ee35af738b5c802ca62eb1c39b77f0bd992329df +Author: Behdad Esfahbod +Date: Thu Aug 2 01:37:57 2018 -0700 + + Make lazy-loader safe for nil objectification + + src/hb-machinery-private.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 6404c49d0735d92779089ddef5c1d34aad1542d7 +Author: Behdad Esfahbod +Date: Thu Aug 2 01:36:08 2018 -0700 + + Minor + + src/hb-machinery-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit ff7826e90bce46985651015059872d1d8559b6ce +Author: Behdad Esfahbod +Date: Thu Aug 2 01:27:40 2018 -0700 + + Reduce storage by sharing face amongst lazy_loaders + + src/hb-machinery-private.hh | 113 ++++++++++++++++++++++++-------------------- + src/hb-ot-font.cc | 19 ++++---- + src/hb-ot-layout-private.hh | 11 +++-- + src/hb-ot-layout.cc | 9 ++-- + 4 files changed, 85 insertions(+), 67 deletions(-) + +commit bdd3c11a19d87999eeaff2c82f21c6938d1d9342 +Author: Behdad Esfahbod +Date: Thu Aug 2 00:38:46 2018 -0700 + + Internal templatization of lazy-loaders + + src/hb-machinery-private.hh | 74 ++++++++++++++++++++------------------------- + 1 file changed, 32 insertions(+), 42 deletions(-) + +commit ed7b2e58fc9afb547656cf28eb4a253d989de43c +Author: Behdad Esfahbod +Date: Wed Aug 1 23:59:09 2018 -0700 + + Remove OT namespace from hb-machinery-private.hh + + src/dump-emoji.cc | 4 ++-- + src/hb-aat-layout.cc | 2 +- + src/hb-face.cc | 4 ++-- + src/hb-machinery-private.hh | 14 +++++--------- + src/hb-ot-font.cc | 8 ++++---- + src/hb-ot-layout-private.hh | 10 +++++----- + src/hb-ot-layout.cc | 8 ++++---- + src/hb-ot-shape-complex-arabic-fallback.hh | 18 +++++++++--------- + src/hb-static.cc | 4 ++-- + src/hb-subset-glyf.cc | 2 +- + src/hb-subset.cc | 8 ++++---- + src/hb-uniscribe.cc | 2 +- + 12 files changed, 40 insertions(+), 44 deletions(-) + +commit cb1491f92e24649433988ff81a89347dccf07c8b +Author: Behdad Esfahbod +Date: Wed Aug 1 22:50:45 2018 -0700 + + Minor + + src/hb-blob-private.hh | 5 ----- + src/hb-machinery-private.hh | 10 ++++++---- + 2 files changed, 6 insertions(+), 9 deletions(-) + +commit 16ccfafbbd48c7a9737ce1d12e75406a050b71a9 +Author: Behdad Esfahbod +Date: Wed Aug 1 22:50:06 2018 -0700 + + [face] Sprinkle const in the API + + src/hb-face.cc | 17 +++++++++-------- + src/hb-face.h | 16 ++++++++-------- + 2 files changed, 17 insertions(+), 16 deletions(-) + +commit 3d22aefedebb5277c5d79011e48e7be1a26a53c1 +Author: Behdad Esfahbod +Date: Wed Aug 1 18:03:32 2018 -0700 + + Rename + + src/hb-coretext.cc | 46 +++++++++++++++++++++++----------------------- + src/hb-directwrite.cc | 28 ++++++++++++++-------------- + src/hb-fallback-shape.cc | 24 ++++++++++++------------ + src/hb-graphite2.cc | 26 +++++++++++++------------- + src/hb-ot-shape.cc | 20 ++++++++++---------- + src/hb-shaper-private.hh | 2 +- + src/hb-uniscribe.cc | 34 +++++++++++++++++----------------- + 7 files changed, 90 insertions(+), 90 deletions(-) + +commit 1a624c6e06763a8a61bc686d2d44272d4ef50d4a +Author: Behdad Esfahbod +Date: Wed Aug 1 17:53:30 2018 -0700 + + Add comment re (our only) race condition + + src/hb-shaper-private.hh | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 19ce0b24c0173fed11104a8ab039e856cbf40924 +Author: Michiharu Ariza +Date: Wed Aug 1 17:34:59 2018 -0700 + + removed unused field OpStr::update + + src/hb-ot-cff-common-private.hh | 4 +--- + src/hb-ot-cff2-table.hh | 22 +++++++++++----------- + 2 files changed, 12 insertions(+), 14 deletions(-) + +commit 3bda54c43b248ee2bc18a9210fb4d880bb4d82ac +Author: Michiharu Ariza +Date: Wed Aug 1 16:32:27 2018 -0700 + + fixed Index::serialize + + The bug was causing CharString of the last glyph corrupt + + src/hb-ot-cff-common-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 16f4dc9b73a197a5ab0ad29dcf5a7ed7495ec4e1 +Author: Michiharu Ariza +Date: Wed Aug 1 16:06:52 2018 -0700 + + fixed CFF2VariationStore::serialize + + also get_size + + src/hb-ot-cff2-table.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 44d1fb37efa20852cc466c0f0bba95dbd24ce288 +Author: Behdad Esfahbod +Date: Wed Aug 1 14:51:51 2018 -0700 + + 1.8.5 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-version.h | 4 ++-- + 4 files changed, 12 insertions(+), 4 deletions(-) + +commit 13f4c137c686aed5c2888b5c47d9f16892be0d5e +Author: Behdad Esfahbod +Date: Wed Aug 1 14:13:59 2018 -0700 + + [atomic] Fix Solaris ones to add proper barriers + + src/hb-atomic-private.hh | 52 +++++++++++++++++++++++++++++++++--------------- + 1 file changed, 36 insertions(+), 16 deletions(-) + +commit 19dfaa351568887a74cee2c46d6acfcc3fa718ff +Author: Behdad Esfahbod +Date: Wed Aug 1 14:02:39 2018 -0700 + + [atomic] Remove volatile from IBM impl signature + + src/hb-atomic-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2093a3e0cbb98c2daa39f308d50a12f0a719bc81 +Author: Behdad Esfahbod +Date: Wed Aug 1 14:00:46 2018 -0700 + + [atomic] Oops + + src/hb-atomic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 19b98348ffc660501e518bf48cd63d232f7585e7 +Author: Behdad Esfahbod +Date: Wed Aug 1 13:59:59 2018 -0700 + + [atomic] Use read-barrier for get() + + src/hb-atomic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 006d4f031a30dd04f5bb9c3d1daca187ef6b7f1e +Author: Behdad Esfahbod +Date: Wed Aug 1 13:59:31 2018 -0700 + + [atomic] Some more minor tweaks + + src/hb-atomic-private.hh | 31 ++++++++++++++++++++----------- + 1 file changed, 20 insertions(+), 11 deletions(-) + +commit 28d03a8afcc1f0ba6d9d0d88f669cc53bb030dd8 +Author: Ebrahim Byagowi +Date: Thu Aug 2 00:11:43 2018 +0430 + + [ci] Fix Appveyor bot (#1123) + + appveyor.yml | 1 + + 1 file changed, 1 insertion(+) + +commit b2ff582c8c1a0fea60ee323dc820ce6fe807b063 +Author: Michiharu Ariza +Date: Wed Aug 1 11:30:38 2018 -0700 + + Implemented hb_subset_cff2 + + Added serialize functions to CFF2 structs + Fixed issues & bugs & code cleanup + Now subsetting CFF2 table outputs something + + src/hb-ot-cff-common-private.hh | 428 +++++++++++++++++++++++++++++++++++----- + src/hb-ot-cff2-table.hh | 237 +++++++++++++++++----- + src/hb-private.hh | 2 +- + src/hb-subset-cff2.cc | 392 +++++++++++++++++++++++++++++++----- + 4 files changed, 914 insertions(+), 145 deletions(-) + +commit 1a7fed631880fff8a947ebec9c7427efff581916 +Author: Ebrahim Byagowi +Date: Wed Aug 1 12:15:44 2018 +0430 + + Revert "Add a new API, hb_ot_layout_get_feature_name_ids (#976)" (#1121) + + This reverts commit 0c1b287b72e91e0898d75acb5d5acf1c6b9a7498. + + docs/harfbuzz-sections.txt | 1 - + src/hb-ot-layout-common-private.hh | 14 ------- + src/hb-ot-layout.cc | 86 -------------------------------------- + src/hb-ot-layout.h | 8 ---- + 4 files changed, 109 deletions(-) + +commit dfc86e4b35ffdeb8f73e83511712e75413bbb7d9 +Author: Behdad Esfahbod +Date: Wed Aug 1 00:22:18 2018 -0700 + + [atomic] Fix cast to fallback ptr_get() + + src/hb-atomic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7a4d576e81c4de68ea66b2d5fe7712e29d715272 +Author: Behdad Esfahbod +Date: Wed Aug 1 00:19:25 2018 -0700 + + [gobject] Fix copy/paste error + + src/hb-gobject-structs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ad275627425c9b3c4fb1e69aa408067bd0bb77da +Author: Behdad Esfahbod +Date: Tue Jul 31 23:01:05 2018 -0700 + + [atomic] On IBM, use light-weight sync for everything + + lwsync() is a full read/write-barrier. That's all we need, never + need sync(). I'm not sure why an isync() was used in fetch_and_add, + but since that's a read-modify-write, I just changed it to have + lwsync() on both sides. + + src/hb-atomic-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit fd638d215feb058c2294e447cc68f6f50e2b481d +Author: Behdad Esfahbod +Date: Tue Jul 31 23:00:15 2018 -0700 + + [atomic] Add XXX items around Solaris ops + + Since add_int and cas are both read-modify-write, I wonder if we + also need a barrier after them. + + src/hb-atomic-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 896ff15ae60a4a4b94c62946e69196b877839bb5 +Author: Behdad Esfahbod +Date: Tue Jul 31 22:51:38 2018 -0700 + + [atomic] Fix get() impl + + Originally, glib's atomic_get was implemented as "memory_barrier; load". + I copied this into cairo, fontconfig, and harfbuzz. However, that's + wrong. Correct way is "load; memory_barrier". The details are long + and hard to fully grasp. Best to read: + + https://www.kernel.org/doc/Documentation/memory-barriers.txt + + Also see my report against GNOME: + + https://gitlab.gnome.org/GNOME/glib/issues/1449 + + Note that this is irrelevant if C++11-like atomic ops are available. + + src/hb-atomic-private.hh | 28 +++++++++++++++++----------- + 1 file changed, 17 insertions(+), 11 deletions(-) + +commit d7a15799d40dac1f9521674a82c3293a7cb42ee4 +Author: Behdad Esfahbod +Date: Tue Jul 31 22:28:28 2018 -0700 + + [gobject] Hook up hb_map_t + + docs/harfbuzz-sections.txt | 2 ++ + src/hb-gobject-structs.cc | 1 + + src/hb-gobject-structs.h | 4 ++++ + src/hb-map.cc | 6 ++---- + 4 files changed, 9 insertions(+), 4 deletions(-) + +commit 63c74e8d1d85067cbeffe635eb5ed4e8aa130776 +Author: Behdad Esfahbod +Date: Tue Jul 31 22:21:21 2018 -0700 + + [atomic] Fix fallback impl + + src/hb-atomic-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4bc16aca4760ac9ffd8c63bbaea24fc7d234f715 +Author: Behdad Esfahbod +Date: Tue Jul 31 21:05:51 2018 -0700 + + [atomic] Add get_relaxed / set_relaxed + + To help TSan and be more "correct". + + src/hb-atomic-private.hh | 37 ++++++++++++++++++++++------------- + src/hb-common.cc | 4 ++-- + src/hb-debug.hh | 42 ++++++++++++++++++++++++++++++++++++++++ + src/hb-object-private.hh | 12 ++++++------ + src/hb-ot-shape-complex-indic.cc | 22 +++++++++++---------- + src/hb-private.hh | 28 --------------------------- + 6 files changed, 86 insertions(+), 59 deletions(-) + +commit 3dd1b88765f6ce91bd0558a16cdd8cf0c1e15d1b +Author: Behdad Esfahbod +Date: Tue Jul 31 19:33:37 2018 -0700 + + [atomic] Use CONSUME, not ACQUIRE, memory-order for get() + + Although, all implementations just elevate that to ACQUIRE. + But requirement for us is just CONSUME. + + src/hb-atomic-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 06b91d935da1a40ef9de6697717eb0af1015989e +Author: Behdad Esfahbod +Date: Tue Jul 31 19:29:49 2018 -0700 + + Revert "[atomic] Make pointer get op relaxed instead of acquire" + + This reverts commit b1e5650c67266dc158f22355fed206cd1c413f70. + + After lots of head-scratching and finally finding the only truly + readable source to be the good old: + + https://www.kernel.org/doc/Documentation/memory-barriers.txt + + I've convinced myself that we need consume memory-ordering on get(). + The location of memory-barrier in a load should be after, not before + the load. That needs fixing. I'll do that separately. + + src/hb-atomic-private.hh | 34 +++++++++++++++++++++++++--------- + 1 file changed, 25 insertions(+), 9 deletions(-) + +commit 2bdd903c69eb3a34f3d3bf5e4f4c94cd66337117 +Author: Garret Rieger +Date: Tue Jul 31 17:44:02 2018 -0700 + + [subset] limit the max codepoint value to the unicode limit. + When collecting all codepoints in the cmap avoid using large amount of memory for fonts that declare coverage over all 32 bit integers. + + src/hb-ot-cmap-table.hh | 9 +++++++-- + ...mized-hb-subset-get-codepoints-fuzzer-5973295416475648 | Bin 0 -> 109 bytes + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit 7278d9df3093a87f99cec9b4cea38bd688c5d020 +Author: Garret Rieger +Date: Tue Jul 31 17:59:19 2018 -0700 + + [subset] Add hb_ot_layout_collect_features to harfbuzz-sections.txt. + Add the fuzzer test case for feature collection timeout. + + docs/harfbuzz-sections.txt | 1 + + ...estcase-minimized-hb-subset-fuzzer-5542653037903872 | Bin 0 -> 160249 bytes + 2 files changed, 1 insertion(+) + +commit 89733755a48feef0a663e1ea7b8294949581ce7e +Author: Garret Rieger +Date: Mon Jul 30 18:10:43 2018 -0700 + + [subset] use add_array to populate feature_indexes. + This is much faster then calling a bunch of individual add()'s. + + src/hb-ot-layout-common-private.hh | 7 +++++++ + src/hb-ot-layout.cc | 40 +++++++++++++++++++------------------- + 2 files changed, 27 insertions(+), 20 deletions(-) + +commit 7d92bef9c5afb319d125f60b0fce4763afeaa686 +Author: Garret Rieger +Date: Mon Jul 30 17:17:43 2018 -0700 + + [subset] collect features first, then use those to collect lookups. + + src/hb-ot-layout.cc | 148 +++++++++++++++++++++++++--------------------------- + src/hb-ot-layout.h | 7 +++ + 2 files changed, 78 insertions(+), 77 deletions(-) + +commit af876cce3066833c7c34d213a578eec6b09dd5c9 +Author: Behdad Esfahbod +Date: Tue Jul 31 15:27:29 2018 -0700 + + [indic] Flip default logic for double-halants in old-school + + Oriya went down from 9 to 2. + + BENGALI: 353725 out of 354188 tests passed. 463 failed (0.130722%) + DEVANAGARI: 707311 out of 707394 tests passed. 83 failed (0.0117332%) + GUJARATI: 366355 out of 366457 tests passed. 102 failed (0.0278341%) + GURMUKHI: 60729 out of 60747 tests passed. 18 failed (0.0296311%) + KANNADA: 951300 out of 951913 tests passed. 613 failed (0.0643966%) + MALAYALAM: 1048136 out of 1048334 tests passed. 198 failed (0.0188871%) + MYANMAR: 1115830 out of 1123883 tests passed. 8053 failed (0.716534%) + ORIYA: 42327 out of 42329 tests passed. 2 failed (0.00472489%) + SINHALA: 271596 out of 271847 tests passed. 251 failed (0.0923313%) + TAMIL: 1091754 out of 1091754 tests passed. 0 failed (0%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + + src/hb-ot-shape-complex-indic.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 92ba9905caa060466230f63b428ccee767696464 +Author: Behdad Esfahbod +Date: Tue Jul 31 15:19:32 2018 -0700 + + [indic] Allow double-halant in old-spec Devanagari + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1071 + + src/hb-ot-shape-complex-indic.cc | 18 ++++++++++++------ + .../b722a7d09e60421f3efbc706ad348ab47b88567b.ttf | Bin 0 -> 4672 bytes + test/shaping/data/in-house/tests/indic-old-spec.tests | 2 ++ + 3 files changed, 14 insertions(+), 6 deletions(-) + +commit fe099a844b9b8fe05dd4eb187b5ca3769441f012 +Author: Behdad Esfahbod +Date: Tue Jul 31 14:20:31 2018 -0700 + + [test] Add Khmer tests, with NotoSansKhmer-Regular.ttf + + Note that there's minor positioning differences, and ONE reordering + difference between what we get for these and what Uniscribe gets. + Probably same as what's described in commit message for + 1a96cc825dc9c8e3b6eef1403fe0864a1cfc0245 + + .../3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf | Bin 0 -> 24392 bytes + test/shaping/data/in-house/tests/khmer-misc.tests | 89 +++++++++++++++++++++ + 2 files changed, 89 insertions(+) + +commit 5772edc0ea8f697c6123e439c5d0c3e813ebeb45 +Author: Behdad Esfahbod +Date: Tue Jul 31 14:10:31 2018 -0700 + + [khmer] Typo + + src/hb-ot-shape-complex-khmer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2d6edc9008182c1446951f2c5c04df20094597f8 +Author: Behdad Esfahbod +Date: Tue Jul 31 13:56:55 2018 -0700 + + [test] Add Khmer test texts from recent bugs + + test/shaping/texts/in-house/shaper-khmer/misc.txt | 66 +++++++++++++++++++++++ + 1 file changed, 66 insertions(+) + +commit df26a32c8fd22cbd486e2a1014d30b9f38f51cd1 +Author: Behdad Esfahbod +Date: Tue Jul 31 13:55:53 2018 -0700 + + [test] Move things around for shaper updates + + .../texts/in-house/shaper-indic/{indic => }/script-assamese/utrrs/LICENSE | 0 + .../texts/in-house/shaper-indic/{indic => }/script-assamese/utrrs/README | 0 + .../texts/in-house/shaper-indic/{indic => }/script-assamese/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../script-assamese/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../script-assamese/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../{indic => }/script-assamese/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../texts/in-house/shaper-indic/{indic => }/script-bengali/misc/misc.txt | 0 + .../texts/in-house/shaper-indic/{indic => }/script-bengali/misc/reph.txt | 0 + .../texts/in-house/shaper-indic/{indic => }/script-bengali/utrrs/LICENSE | 0 + .../texts/in-house/shaper-indic/{indic => }/script-bengali/utrrs/README | 0 + .../texts/in-house/shaper-indic/{indic => }/script-bengali/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../script-bengali/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../script-bengali/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../{indic => }/script-bengali/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/{indic => }/script-devanagari/misc/dottedcircle.txt | 0 + .../in-house/shaper-indic/{indic => }/script-devanagari/misc/eyelash.txt | 0 + .../in-house/shaper-indic/{indic => }/script-devanagari/misc/joiners.txt | 0 + .../in-house/shaper-indic/{indic => }/script-devanagari/misc/misc.txt | 0 + .../shaper-indic/{indic => }/script-devanagari/misc/spec-deviations.txt | 0 + .../shaper-indic/{indic => }/script-devanagari/misc/tricky-reordering.txt | 0 + .../in-house/shaper-indic/{indic => }/script-devanagari/utrrs/LICENSE | 0 + .../in-house/shaper-indic/{indic => }/script-devanagari/utrrs/README | 0 + .../in-house/shaper-indic/{indic => }/script-devanagari/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../codepoint/IndicFontFeatureCodepoint-DevnagariSpecificAddition.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-GenericPunctuation.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../{indic => }/script-devanagari/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../texts/in-house/shaper-indic/{indic => }/script-gujarati/utrrs/LICENSE | 0 + .../texts/in-house/shaper-indic/{indic => }/script-gujarati/utrrs/README | 0 + .../texts/in-house/shaper-indic/{indic => }/script-gujarati/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../{indic => }/script-gujarati/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../texts/in-house/shaper-indic/{indic => }/script-gurmukhi/misc/misc.txt | 0 + .../texts/in-house/shaper-indic/{indic => }/script-gurmukhi/utrrs/LICENSE | 0 + .../texts/in-house/shaper-indic/{indic => }/script-gurmukhi/utrrs/README | 0 + .../texts/in-house/shaper-indic/{indic => }/script-gurmukhi/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-GurmukhiSpecific.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../{indic => }/script-gurmukhi/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../texts/in-house/shaper-indic/{indic => }/script-kannada/misc/misc.txt | 0 + .../shaper-indic/{indic => }/script-kannada/misc/right-matras.txt | 0 + .../texts/in-house/shaper-indic/{indic => }/script-kannada/utrrs/LICENSE | 0 + .../texts/in-house/shaper-indic/{indic => }/script-kannada/utrrs/README | 0 + .../texts/in-house/shaper-indic/{indic => }/script-kannada/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../script-kannada/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../{indic => }/script-kannada/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../in-house/shaper-indic/{indic => }/script-malayalam/misc/cibu.txt | 0 + .../in-house/shaper-indic/{indic => }/script-malayalam/misc/dot-reph.txt | 0 + .../in-house/shaper-indic/{indic => }/script-malayalam/misc/misc.txt | 0 + .../in-house/shaper-indic/{indic => }/script-malayalam/utrrs/LICENSE | 0 + .../texts/in-house/shaper-indic/{indic => }/script-malayalam/utrrs/README | 0 + .../in-house/shaper-indic/{indic => }/script-malayalam/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../{indic => }/script-malayalam/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../texts/in-house/shaper-indic/{indic => }/script-oriya/misc/bindu.txt | 0 + .../texts/in-house/shaper-indic/{indic => }/script-oriya/misc/misc.txt | 0 + .../texts/in-house/shaper-indic/{indic => }/script-oriya/utrrs/LICENSE | 0 + .../texts/in-house/shaper-indic/{indic => }/script-oriya/utrrs/README | 0 + .../texts/in-house/shaper-indic/{indic => }/script-oriya/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-OriyaSpecific.txt | 0 + .../script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../{indic => }/script-oriya/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../in-house/shaper-indic/{indic => }/script-sinhala/misc/extensive.txt | 0 + .../texts/in-house/shaper-indic/{indic => }/script-sinhala/misc/misc.txt | 0 + .../texts/in-house/shaper-indic/{indic => }/script-sinhala/misc/reph.txt | 0 + .../shaper-indic/{indic => }/script-sinhala/misc/split-matras.txt | 0 + .../texts/in-house/shaper-indic/{indic => }/script-sinhala/utrrs/LICENSE | 0 + .../texts/in-house/shaper-indic/{indic => }/script-sinhala/utrrs/README | 0 + .../texts/in-house/shaper-indic/{indic => }/script-sinhala/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Punctuation.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../{indic => }/script-sinhala/utrrs/gpos/IndicFontFeatureGPOS.txt | 0 + .../script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Conjunct.txt | 0 + .../script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Rakaaraansaya.txt | 0 + .../{indic => }/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Repaya.txt | 0 + .../script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Special-Cases.txt | 0 + .../script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-TouchingLetters.txt | 0 + .../script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Yansaya.txt | 0 + .../{indic => }/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../texts/in-house/shaper-indic/{indic => }/script-tamil/misc/misc.txt | 0 + .../texts/in-house/shaper-indic/{indic => }/script-tamil/utrrs/LICENSE | 0 + .../texts/in-house/shaper-indic/{indic => }/script-tamil/utrrs/README | 0 + .../texts/in-house/shaper-indic/{indic => }/script-tamil/utrrs/SOURCES | 0 + .../script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-CurrencySymbols.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Numerics.txt | 0 + .../script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Symbols.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-TamilSymbol.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../script-tamil/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../script-tamil/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../{indic => }/script-tamil/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../texts/in-house/shaper-indic/{indic => }/script-telugu/misc/misc.txt | 0 + .../texts/in-house/shaper-indic/{indic => }/script-telugu/utrrs/LICENSE | 0 + .../texts/in-house/shaper-indic/{indic => }/script-telugu/utrrs/README | 0 + .../texts/in-house/shaper-indic/{indic => }/script-telugu/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../script-telugu/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../{indic => }/script-telugu/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../south-east-asian/script-khmer/misc => shaper-khmer}/misc.txt | 0 + .../script-khmer/misc => shaper-khmer}/other-marks-invalid.txt | 0 + .../south-east-asian/script-khmer/misc => shaper-khmer}/other-marks.txt | 0 + .../south-east-asian => shaper-use}/script-javanese/misc.txt | 0 + 174 files changed, 0 insertions(+), 0 deletions(-) + +commit 6ddd669e205cf2c1c3b0a362330b686386f68519 +Author: Behdad Esfahbod +Date: Tue Jul 31 13:38:07 2018 -0700 + + [khmer] Clear syllables before presentation features + + Probably not what Uniscribe does, but good idea? + + src/hb-ot-shape-complex-khmer.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 8eef1964a708c3db52e5e7312689c4664afa9839 +Author: Behdad Esfahbod +Date: Tue Jul 31 13:35:10 2018 -0700 + + [khmer] Revert previous change, and remove pauses + + This makes test suite happy again (at 44) while fixing the sequences + we were fixing, which were the following with KhmerUI.ttf: + + U+1789,U+17BC + U+1789,U+17D2,U+1789 + U+1789,U+17D2,U+1789,U+17BC + + Fixes rest of https://github.com/harfbuzz/harfbuzz/issues/974 + + src/hb-ot-shape-complex-khmer.cc | 23 ++++++++++------------- + 1 file changed, 10 insertions(+), 13 deletions(-) + +commit 7c658ea2f20a77cac35e8988e54316425396198a +Author: Behdad Esfahbod +Date: Tue Jul 31 12:49:02 2018 -0700 + + [khmer] Apply ccmp after basic features + + Part of https://github.com/harfbuzz/harfbuzz/issues/974 + + src/hb-ot-shape-complex-khmer.cc | 22 +++++++++++++++++----- + 1 file changed, 17 insertions(+), 5 deletions(-) + +commit 1a96cc825dc9c8e3b6eef1403fe0864a1cfc0245 +Author: Behdad Esfahbod +Date: Tue Jul 31 11:45:32 2018 -0700 + + [khmer] Rewrite most of shaper to better follow spec + + Khmer spec has only one reordering phase, and only simple prebase + matra and Coeng-Ro reordering. Implement that. Specifically, + this was done to address recognizing different orders of the matra + and Coeng-Ro sequence. That said, some combinations are now + reordered differently from Uniscribe. Not clear if that's intended + or a bug in Uniscribe. The following two sequences render the same + in Uniscribe whereas we reorder them differently: + + U+17A0,U+17D2,U+179A,U+17C2 + U+17A0,U+17C2,U+17D2,U+179A + + For that reason, our test suite numbers regressed slightly. Used + to be at 34 for fails, now at: + + KHMER: 299080 out of 299124 tests passed. 44 failed (0.0147096%) + + But generally a good change, and removed lots of code. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1026 + + src/hb-ot-shape-complex-indic-private.hh | 4 +- + src/hb-ot-shape-complex-khmer.cc | 460 ++++--------------------------- + src/hb-ot-shape-complex-private.hh | 13 - + 3 files changed, 64 insertions(+), 413 deletions(-) + +commit f5152cea423947cd8a85332566443b4e2e091672 +Author: Behdad Esfahbod +Date: Tue Jul 31 01:27:04 2018 -0700 + + [shaper] Move code around + + src/hb-shaper-private.hh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 36d0fbbc52bdf2c71da022fb1fdc31eca17078ce +Author: Behdad Esfahbod +Date: Tue Jul 31 01:15:04 2018 -0700 + + [shaper] Remove a macro + + src/hb-shaper-private.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit b1e5650c67266dc158f22355fed206cd1c413f70 +Author: Behdad Esfahbod +Date: Tue Jul 31 01:02:31 2018 -0700 + + [atomic] Make pointer get op relaxed instead of acquire + + We only use it before cmpexch, so relaxed is fine and faster for + common case. + + src/hb-atomic-private.hh | 34 +++++++++------------------------- + 1 file changed, 9 insertions(+), 25 deletions(-) + +commit 66ccd8ac405c9c25b37de9eb467a7382880dda35 +Author: Behdad Esfahbod +Date: Mon Jul 30 17:03:06 2018 -0700 + + [serialize] Increase stage count from 8 to 32 + + Indic shaper uses many stages. Now we are provably not limiting + functionality whereas the previous limit of 8 was assuming real-world + practices. + + src/hb-ot-layout-common-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit ee8cf919654cb191e955fe1f89b1ebfb2b8b32ee +Author: Behdad Esfahbod +Date: Mon Jul 30 16:59:41 2018 -0700 + + [serialize] Remove unused truncate() method + + src/hb-machinery-private.hh | 6 ------ + 1 file changed, 6 deletions(-) + +commit 8782f80cce147c101b605501d9fd9c7d64338314 +Author: Michiharu Ariza +Date: Mon Jul 30 15:27:20 2018 -0700 + + fixed FDSelect0::sanitize + + src/hb-ot-cff-common-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 9c4cadaef01733b32ab6190dd91552ee7145f3c3 +Author: Michiharu Ariza +Date: Mon Jul 30 14:28:40 2018 -0700 + + Added sanitize functions & calls + + Added sanitize functions to FDSelect + Added satnitize calls for FDSelect, VariationStore, FDArray, TopDict + + src/hb-ot-cff-common-private.hh | 67 ++++++++++++++++++++++++++++++++--------- + src/hb-ot-cff2-table.hh | 26 +++++++++++----- + src/hb-subset-cff2.cc | 2 +- + 3 files changed, 72 insertions(+), 23 deletions(-) + +commit 161b642ec5babc7e4b81d41f725d81ad2caa9330 +Merge: 3a61c3e9 5edf454a +Author: Michiharu Ariza +Date: Mon Jul 30 12:22:09 2018 -0700 + + Merge branch 'master' into cff-subset + +commit 5edf454aa64aad461c90bd991e7eaf27668b7e6b +Author: Garret Rieger +Date: Thu Jul 26 17:42:02 2018 -0700 + + [subset] During lookup collection remember the features we've already processed. + + src/hb-ot-layout.cc | 26 +++++++++++++++++---- + ...ase-minimized-hb-subset-fuzzer-5670861909524480 | Bin 0 -> 1298 bytes + ...b-subset-get-codepoints-fuzzer-6136125075750912 | Bin 0 -> 65816 bytes + 3 files changed, 21 insertions(+), 5 deletions(-) + +commit 42c183f80355fe7cadac2931a23d389285c8b98c +Author: Behdad Esfahbod +Date: Fri Jul 27 14:55:29 2018 -0700 + + Minor + + src/hb-ft.cc | 5 +++-- + src/hb-ot-shape.cc | 5 +++-- + 2 files changed, 6 insertions(+), 4 deletions(-) + +commit ecab6604e57ea2bb4e78250a7a400e15b3e86f7a +Author: Behdad Esfahbod +Date: Wed Jul 25 17:37:38 2018 -0700 + + [serialize] Allocate for markFilteringSet + + src/hb-ot-layout-common-private.hh | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 7f08818c441517f73c5bea0a2a88f494dfc8fa58 +Author: Behdad Esfahbod +Date: Wed Jul 25 17:22:05 2018 -0700 + + Minor + + src/hb-iter-private.hh | 8 +++++--- + src/hb-machinery-private.hh | 1 - + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit 2e25d8f49181ab1d7fda520ae6587d293a982acf +Author: prrace +Date: Fri Jul 27 13:58:27 2018 -0700 + + Fix unlikely leaks + + src/hb-ft.cc | 4 +++- + src/hb-ot-shape.cc | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit 3c2842cbcf8cded73d1e310379e1a4ca124a6fc2 +Author: Behdad Esfahbod +Date: Wed Jul 25 17:07:17 2018 -0700 + + Add hb-iter-private.hh + + Unused so far. + + src/Makefile.sources | 1 + + src/hb-iter-private.hh | 147 ++++++++++++++++++++++++++++++++++++++++++++ + src/hb-machinery-private.hh | 1 + + 3 files changed, 149 insertions(+) + +commit 92b1e025c639d006f55400bf68fc23bdeaa1c716 +Author: Behdad Esfahbod +Date: Wed Jul 25 16:58:47 2018 -0700 + + Move some code from hb-open-type-private.hh to hb-machinery-private.hh + + src/Makefile.sources | 1 + + src/hb-machinery-private.hh | 702 ++++++++++++++++++++++++++++++++++++++++++++ + src/hb-open-type-private.hh | 669 +---------------------------------------- + 3 files changed, 706 insertions(+), 666 deletions(-) + +commit 6b11fea99716e22522b563d919ef7c72fe9a3c45 +Author: Behdad Esfahbod +Date: Wed Jul 25 16:01:37 2018 -0700 + + [closure] Allocate out set on the stack + + src/hb-ot-layout-gsubgpos-private.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 74467b790154838e86c3ca8df0eaafe82e87f976 +Author: Behdad Esfahbod +Date: Wed Jul 25 14:30:07 2018 -0700 + + Fix compile + + src/hb-shaper-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit bf90f35302c319ec4699ccbcd1e28b15ef2ec423 +Author: Behdad Esfahbod +Date: Tue Jul 24 18:00:14 2018 -0700 + + [coretext] Add note + + src/hb-shaper-private.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit fb58cb4b5ca7043fa746b1a01790abf53bedfa86 +Author: Garret Rieger +Date: Wed Jul 25 13:39:17 2018 -0700 + + [subset] Only used reachable lookups for gsub closure. + + src/hb-subset-plan.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit c38bd4025f3f6ff4c1a39cc106b8618361a0c62b +Author: Behdad Esfahbod +Date: Tue Jul 24 09:43:27 2018 -0700 + + [closure] Separate in and out glyphs + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1107 + + src/hb-ot-layout-gsub-table.hh | 26 ++++++++++++++++++-------- + src/hb-ot-layout-gsubgpos-private.hh | 16 +++++++++++++++- + 2 files changed, 33 insertions(+), 9 deletions(-) + +commit 85646fdadb2f102333485e07425361795b4e0412 +Author: Garret Rieger +Date: Mon Jul 23 15:37:18 2018 -0700 + + [subset] Limit the iterations of the closure algorithm. + Prevents O(n^2) run times. + + src/hb-ot-layout-common-private.hh | 7 +++++++ + src/hb-ot-layout.cc | 5 ++++- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 94759d4cf8986388399026ef5204ac55ee187180 +Author: Behdad Esfahbod +Date: Mon Jul 23 15:01:39 2018 -0700 + + Fix visibility on mingw32 + + Should fix bots again. + + src/hb-private.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 61eddbd8ef64dc66e3c42723533d53967e61c9af +Author: Behdad Esfahbod +Date: Mon Jul 23 14:44:10 2018 -0700 + + Fix infinite loop in loading num_glyphs within sanitizer + + src/hb-open-type-private.hh | 13 ++++++++++--- + src/hb-static.cc | 4 +++- + 2 files changed, 13 insertions(+), 4 deletions(-) + +commit e22a48ac95a60fac5e1bca26eed7f5623d73a7be +Author: Behdad Esfahbod +Date: Mon Jul 23 13:24:26 2018 -0700 + + One more visibility trick + + Should fix Windows build again. + + src/hb-common.cc | 9 +++++++++ + src/hb-private.hh | 20 ++------------------ + src/hb-static.cc | 4 +++- + 3 files changed, 14 insertions(+), 19 deletions(-) + +commit e57a638bdec378eed8e83513818c8add3ffae896 +Author: Behdad Esfahbod +Date: Mon Jul 23 12:00:02 2018 -0700 + + One more + + src/hb-ot-cmap-table.hh | 40 ++++++++++++++++++++-------------------- + 1 file changed, 20 insertions(+), 20 deletions(-) + +commit 36ed163fdd50419e4619c665a4a9dbf97f66c349 +Author: Behdad Esfahbod +Date: Mon Jul 23 11:57:45 2018 -0700 + + Remove unnecessary OT:: namespace specifiers + + src/hb-ot-cmap-table.hh | 30 +++++++++++++++--------------- + src/hb-ot-color-sbix-table.hh | 4 ++-- + src/hb-ot-color-svg-table.hh | 4 ++-- + src/hb-ot-glyf-table.hh | 4 ++-- + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-ot-maxp-table.hh | 6 +++--- + src/hb-ot-os2-table.hh | 4 ++-- + src/hb-ot-post-table.hh | 2 +- + 8 files changed, 28 insertions(+), 28 deletions(-) + +commit c6bc7c38314ea831418fdd1434bbe5afc0875f33 +Author: Behdad Esfahbod +Date: Mon Jul 23 11:46:46 2018 -0700 + + Set num glyphs on sanitizer reference_table() + + Move out-of-class definitions of two methods to hb-static so they + are accessible in libharfbuzz-subset. + + src/hb-face.cc | 20 -------------------- + src/hb-open-type-private.hh | 1 + + src/hb-static.cc | 22 ++++++++++++++++++++++ + 3 files changed, 23 insertions(+), 20 deletions(-) + +commit 9401829d4e93f6f433957fa2d053f3b9d42da557 +Author: Behdad Esfahbod +Date: Sun Jul 22 22:50:58 2018 -0700 + + Remove Sanitizer<> + + src/hb-open-type-private.hh | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +commit 8e3e41272b3896274459c5961aac813ef2666321 +Author: Behdad Esfahbod +Date: Sun Jul 22 22:49:26 2018 -0700 + + Port rest of code away from Sanitizer<> + + src/hb-face.cc | 4 ++-- + src/main.cc | 3 +-- + 2 files changed, 3 insertions(+), 4 deletions(-) + +commit d6a8f64045ca3bf4c7d01520909fa0c7dfca4d64 +Author: Behdad Esfahbod +Date: Sun Jul 22 22:47:19 2018 -0700 + + Port dump-emoji away from Sanitizer<> + + src/dump-emoji.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 14f78d2b3bb1e1292efbd6a3e3f0d618179c171a +Author: Behdad Esfahbod +Date: Sun Jul 22 22:45:26 2018 -0700 + + . + + src/hb-aat-layout.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 4547051f48ca6aa53309b81a768b5b44c4ab6e3b +Author: Behdad Esfahbod +Date: Sun Jul 22 22:44:22 2018 -0700 + + Minor + + src/hb-open-file-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit 740ae27d5c0f5ff87e2ff489fb49d5db1a0c95be +Author: Behdad Esfahbod +Date: Sun Jul 22 22:40:56 2018 -0700 + + Port sbix off of Sanitizer<> + + src/hb-ot-color-sbix-table.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 9583e0077d0a3a043f8b5bd23925014e04da8d32 +Author: Behdad Esfahbod +Date: Sun Jul 22 22:40:32 2018 -0700 + + Port more off of Sanitizer<> + + src/hb-face.cc | 4 ++-- + src/hb-open-type-private.hh | 2 +- + src/hb-ot-cmap-table.hh | 2 +- + src/hb-ot-color-cbdt-table.hh | 4 ++-- + src/hb-ot-color-svg-table.hh | 4 +--- + src/hb-ot-glyf-table.hh | 8 ++++---- + src/hb-ot-hmtx-table.hh | 10 +++++----- + src/hb-ot-kern-table.hh | 2 +- + src/hb-ot-layout.cc | 6 +++--- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-os2-table.hh | 2 +- + src/hb-ot-post-table.hh | 2 +- + src/hb-subset.cc | 4 +--- + 13 files changed, 24 insertions(+), 28 deletions(-) + +commit e7737b41d793bfce9455d1797eb5e0af60794f23 +Author: Behdad Esfahbod +Date: Sun Jul 22 22:24:31 2018 -0700 + + Add sanitizer reference_table, also fix clang build + + Clang is being really peculiar. Fix with: + + - inline hb_blob_t *sanitize (hb_blob_t *blob) { return c->sanitize (blob); } + + inline hb_blob_t *sanitize (hb_blob_t *blob) { return c[0].template/*clang idiosyncrasy*/sanitize_blob (blob); } + + src/hb-open-type-private.hh | 10 ++++++++-- + src/hb-ot-post-table.hh | 2 +- + src/hb-subset-glyf.cc | 2 +- + src/hb-uniscribe.cc | 2 +- + 4 files changed, 11 insertions(+), 5 deletions(-) + +commit 62fa7cd1ccff4d4448ef84f9cc146464672636aa +Author: David Corbett +Date: Fri Apr 13 18:45:37 2018 -0400 + + Order Chakma split vowels in accordance with NFC + + Fixes #1105. + + src/gen-use-table.py | 10 ++++++++++ + src/hb-ot-shape-complex-use-table.cc | 4 ++-- + src/hb-ot-shape-complex-use.cc | 21 +-------------------- + .../2a670df15b73a5dc75a5cc491bde5ac93c5077dc.ttf | Bin 0 -> 1344 bytes + test/shaping/data/in-house/tests/use.tests | 5 +++++ + 5 files changed, 18 insertions(+), 22 deletions(-) + +commit 0c1b287b72e91e0898d75acb5d5acf1c6b9a7498 +Author: Ebrahim Byagowi +Date: Sat Jul 21 21:14:48 2018 +0430 + + Add a new API, hb_ot_layout_get_feature_name_ids (#976) + + This new API returns cvXX and ssXX related NameId, things like + featUiLabelNameId, featUiTooltipTextNameId, sampleTextNameId, ... of cvXX + and UINameId of ssXX, in a unified way. + + However HarfBuzz currently doesn't expose an API for retrieving the actual + information associated with NameId from the `name` table and that should be + done separately. + + docs/harfbuzz-sections.txt | 1 + + src/hb-ot-layout-common-private.hh | 14 +++++++ + src/hb-ot-layout.cc | 86 ++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout.h | 8 ++++ + 4 files changed, 109 insertions(+) + +commit 3a61c3e935cf649ba65ef0cb4daa9f06ab5d3c0a +Author: Michiharu Ariza +Date: Wed Jul 18 14:17:52 2018 -0700 + + first push of CFF/CFF2 work + + Index, Dict structs + hooked up to hb-subset (takes CFF2, outputs empty CFF2) + + src/Makefile.sources | 4 + + src/hb-ot-cff-common-private.hh | 475 ++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-cff2-table.hh | 386 ++++++++++++++++++++++++++++++++ + src/hb-ot-font.cc | 2 + + src/hb-subset-cff2.cc | 121 ++++++++++ + src/hb-subset-cff2.hh | 38 ++++ + src/hb-subset.cc | 4 + + 7 files changed, 1030 insertions(+) + +commit 93b65d9fe331a217640069fad4159cb7c3ec35e6 +Author: Ebrahim Byagowi +Date: Tue Jul 17 23:29:16 2018 +0430 + + Remove dump-fon (#1100) + + It had interesting stuffs like EXE parsing and + big-endian parsers but added in an attempt to find + a solution for #681 which later found not related. + + src/Makefile.am | 4 - + src/dump-fon.cc | 555 -------------------------------------------------------- + 2 files changed, 559 deletions(-) + +commit d5cd47a69c40966b4d5b5aed87dd7ac6f070c37a +Author: Ebrahim Byagowi +Date: Tue Jul 17 22:32:37 2018 +0430 + + Remove AAT's gcid/fmtx (#1099) + + We are not going to use them, at least in the foreseeable future + + src/Makefile.sources | 2 -- + src/hb-aat-fmtx-table.hh | 67 -------------------------------------------- + src/hb-aat-gcid-table.hh | 73 ------------------------------------------------ + src/hb-aat-layout.cc | 2 -- + 4 files changed, 144 deletions(-) + +commit 1e9e344b2ba076a5fd6d57d1705e17a59c3875ce +Author: Behdad Esfahbod +Date: Tue Jul 17 19:17:59 2018 +0200 + + Fix hb_face_count() sanitize referencing + + src/hb-face.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit a8cc0b5907e61199334a3a886fe22efe9cc17149 +Author: Behdad Esfahbod +Date: Tue Jul 17 19:09:03 2018 +0200 + + Remove TODO that is not gonna be done + + Previously the idea was to cache sanitize results externally (think, + in Fontconfig) and avoid resanitizing every time. That's, not a good + idea. + + src/hb-open-type-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit be7073840097c873ce4954c6cffadab175a007d3 +Author: Behdad Esfahbod +Date: Tue Jul 17 18:45:25 2018 +0200 + + Move sanitizer code around a bit + + src/hb-aat-layout-common-private.hh | 4 +- + src/hb-open-type-private.hh | 95 ++++++++++++++++++++----------------- + src/hb-ot-color-sbix-table.hh | 12 ++--- + src/hb-ot-layout-common-private.hh | 3 -- + 4 files changed, 58 insertions(+), 56 deletions(-) + +commit db5d430effce67db57ddea2545694b7275ee8b35 +Author: Behdad Esfahbod +Date: Tue Jul 17 18:14:45 2018 +0200 + + [aat] Update for blob changes + + Also, uncomment code again, just "if (0)" it out, so it doesn't get stale again. + + src/hb-aat-layout.cc | 58 ++------------------------------------------- + src/hb-open-type-private.hh | 27 +++++++++++++-------- + src/hb-ot-layout-private.hh | 1 + + src/hb-ot-layout.cc | 2 ++ + src/hb-ot-shape.cc | 6 ++--- + 5 files changed, 25 insertions(+), 69 deletions(-) + +commit 68310a65cba7eed20f8696f4c670bb195677f467 +Author: Behdad Esfahbod +Date: Tue Jul 17 13:20:40 2018 +0200 + + 1.8.4 + + NEWS | 7 +++++++ + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 3 files changed, 10 insertions(+), 3 deletions(-) + +commit 04b7b81bcbf19cb85d06d930192d6591ba45ef72 +Author: Behdad Esfahbod +Date: Tue Jul 17 10:57:01 2018 +0200 + + Reland "Implement C++11-style GCC builtin atomic ops" + + Fixed the crasher in it. + + src/hb-atomic-private.hh | 22 +++++++++++++++++++--- + src/hb-object-private.hh | 2 +- + 2 files changed, 20 insertions(+), 4 deletions(-) + +commit 019d18e9ae643134bfc3861be65ac618a5892c92 +Author: Behdad Esfahbod +Date: Tue Jul 17 10:59:19 2018 +0200 + + Minor + + src/Makefile.am | 1 + + test/api/Makefile.am | 2 ++ + 2 files changed, 3 insertions(+) + +commit 3edef5a19b5c0f30381ae6fe01c3370ded37f6ca +Author: Behdad Esfahbod +Date: Tue Jul 17 10:50:01 2018 +0200 + + Revert "Implement C++11-style GCC builtin atomic ops" + + This reverts commit 21fa170f0bfb0109c506ed17f5aff8b062564ffa. + + Is crashing. Oops. + + src/hb-atomic-private.hh | 22 +++------------------- + src/hb-object-private.hh | 2 +- + 2 files changed, 4 insertions(+), 20 deletions(-) + +commit 21fa170f0bfb0109c506ed17f5aff8b062564ffa +Author: Behdad Esfahbod +Date: Mon Jul 16 17:58:02 2018 +0200 + + Implement C++11-style GCC builtin atomic ops + + Hopefully fixes bots. + + src/hb-atomic-private.hh | 22 +++++++++++++++++++--- + src/hb-object-private.hh | 2 +- + 2 files changed, 20 insertions(+), 4 deletions(-) + +commit 804b59cf4901d471253016e0cbf82cc1bbbc1d15 +Author: Behdad Esfahbod +Date: Mon Jul 16 15:44:58 2018 +0200 + + Relax C++11 atomic ops memory order to acquire-release + + src/hb-atomic-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit bda242409fc0cbb79a0ff00eba9856c4b0a9c7a1 +Author: Behdad Esfahbod +Date: Mon Jul 16 15:41:09 2018 +0200 + + Implement C++11 operations + + Fixes https://github.com/harfbuzz/harfbuzz/issues/345 + + src/hb-atomic-private.hh | 27 ++++++++++++++++++++++++--- + src/hb-open-type-private.hh | 2 +- + src/hb-ot-shape-complex-arabic.cc | 2 +- + 3 files changed, 26 insertions(+), 5 deletions(-) + +commit 524411224054b23bab4adad7343314df45c9c183 +Merge: 2aae617a 269eb456 +Author: Cosimo Lupo +Date: Mon Jul 16 14:42:43 2018 +0200 + + Merge pull request #1094 from anthrotype/fix-appveyor-msys2 + + appveyor.yml: try updating msys2 to fix failing mingw-w64-x86_64 build + +commit 269eb45650be66901627da7f1014339065a948a5 +Author: Cosimo Lupo +Date: Mon Jul 16 14:14:42 2018 +0200 + + appveyor.yml: try only updating msys2 core, not the rest of the packages + + maybe it'll get a bit faster + + appveyor.yml | 1 - + 1 file changed, 1 deletion(-) + +commit 3ab52c6cb5c405366af804d278216e2d02a39ecb +Author: Cosimo Lupo +Date: Mon Jul 16 12:57:27 2018 +0200 + + appveyor.yml: pass --needed option to pacman + + so it won't attempt reinstalling packages which are already installed + + appveyor.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5631d70d36aa7952d343ea794bd5169a730706ae +Author: Cosimo Lupo +Date: Mon Jul 16 12:41:59 2018 +0200 + + appveyor.yml: try updating msys2 to fix failing mingw-w64-x86_64 build + + https://github.com/harfbuzz/harfbuzz/pull/1093#issuecomment-405201903 + https://ci.appveyor.com/project/harfbuzz/harfbuzz/build/job/ky7lao1ii1bi7ew4#L71 + + appveyor.yml | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2aae617a84f47836f10efd30df43e13e3a9447e1 +Author: Behdad Esfahbod +Date: Wed Jul 11 17:27:23 2018 +0200 + + Move _hb_alignof later again + + It uses constexpr... + + src/hb-private.hh | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit f3a74c16ecafdca135a647ebe85117c35c1ef585 +Author: Behdad Esfahbod +Date: Wed Jul 11 17:23:53 2018 +0200 + + Make hb_vector_t 8 bytes smaller + + src/hb-dsalgs.hh | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +commit 44999f8b758374015f5d48c83f9adcb464607c2f +Author: Behdad Esfahbod +Date: Wed Jul 11 17:00:59 2018 +0200 + + Align NullPool and CrapPool to HB_VECTOR_SIZE + + src/hb-dsalgs.hh | 3 +-- + src/hb-private.hh | 64 ++++++++++++++++++++++++++++++++----------------------- + src/hb-static.cc | 4 ++-- + 3 files changed, 40 insertions(+), 31 deletions(-) + +commit 20a318d06acaabdee0090339dfa621aab46f1441 +Author: Behdad Esfahbod +Date: Wed Jul 11 17:00:13 2018 +0200 + + Fix return type of alignof() fallback + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 58cb4d9f73f1292454e3673d5e7ae5a58a566522 +Author: Behdad Esfahbod +Date: Wed Jul 11 16:44:21 2018 +0200 + + Minor + + test/api/test-ot-math.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7796857c93b779e3c93eedd1cceb217d691dfd81 +Author: Behdad Esfahbod +Date: Wed Jul 11 15:27:37 2018 +0200 + + Minor + + RELEASING.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2b76767bf572364d3d647cdd139f2044a7ad06b2 +Author: Behdad Esfahbod +Date: Wed Jul 11 15:27:13 2018 +0200 + + 1.8.3 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 3 files changed, 11 insertions(+), 3 deletions(-) + +commit 718dfd4189275b1e4233dc7c12ab457352fccfcb +Author: Behdad Esfahbod +Date: Tue Jul 10 16:34:31 2018 +0200 + + Fix shift + + src/hb-dsalgs.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 25aa411ac524ed08624033da473a5e050ff41633 +Author: Behdad Esfahbod +Date: Tue Jul 10 16:05:03 2018 +0200 + + Put back include dependencies + + src/hb-object-private.hh | 2 ++ + src/hb-private.hh | 7 ++++--- + 2 files changed, 6 insertions(+), 3 deletions(-) + +commit 491d93bf74dd0483715ecca430715b69664e1211 +Author: Behdad Esfahbod +Date: Tue Jul 10 16:03:31 2018 +0200 + + Move more stuff from hb-private.hh to hb-dsalgs.hh + + src/hb-debug.hh | 1 + + src/hb-dsalgs.hh | 237 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-private.hh | 246 +----------------------------------------------------- + 3 files changed, 240 insertions(+), 244 deletions(-) + +commit f477765661c196ac17b2c86731881a3da36a5ae6 +Author: Behdad Esfahbod +Date: Tue Jul 10 15:49:05 2018 +0200 + + Move more stuff to hb-dsalgs.hh + + src/hb-dsalgs.hh | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-private.hh | 81 ----------------------------------------------------- + 2 files changed, 83 insertions(+), 81 deletions(-) + +commit be7f664f723fb4e7bcf15c1c2b7c6bec46f90393 +Author: Behdad Esfahbod +Date: Tue Jul 10 15:23:08 2018 +0200 + + Move hb_bytes_t to hb-dsalgs.hh + + src/hb-dsalgs.hh | 45 ++++++++++++++++++++++++++++++++++----------- + src/hb-private.hh | 26 -------------------------- + 2 files changed, 34 insertions(+), 37 deletions(-) + +commit 7a00f7eb2e3859db4563071934e76142bfd13916 +Author: Behdad Esfahbod +Date: Tue Jul 10 14:42:10 2018 +0200 + + Remove hb_auto_array_t + + src/hb-dsalgs.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit be458eb05962dd5f5c60a25f54cf0b20e7d8b055 +Author: Behdad Esfahbod +Date: Tue Jul 10 14:41:04 2018 +0200 + + Include more basic internal headers from hb-private.hh + + src/hb-blob-private.hh | 2 -- + src/hb-blob.cc | 1 - + src/hb-buffer-private.hh | 1 - + src/hb-common.cc | 2 -- + src/hb-coretext.cc | 1 - + src/hb-directwrite.cc | 1 - + src/hb-face-private.hh | 1 - + src/hb-font-private.hh | 1 - + src/hb-ft.cc | 1 - + src/hb-map-private.hh | 1 - + src/hb-object-private.hh | 4 ---- + src/hb-open-type-private.hh | 1 - + src/hb-ot-layout-common-private.hh | 1 - + src/hb-ot-layout-gsubgpos-private.hh | 1 - + src/hb-ot-shape-complex-arabic.cc | 1 - + src/hb-private.hh | 6 +++++- + src/hb-set-private.hh | 1 - + src/hb-shape-plan-private.hh | 1 - + src/hb-shape-plan.cc | 1 - + src/hb-subset-input.cc | 1 - + src/hb-subset-plan.hh | 1 - + src/hb-subset.cc | 1 - + src/hb-unicode-private.hh | 1 - + src/hb-uniscribe.cc | 1 - + src/hb-warning.cc | 4 +--- + 25 files changed, 6 insertions(+), 32 deletions(-) + +commit bddeb2b10ca2f4b4bee6f7eaaf5615875a67111d +Author: Behdad Esfahbod +Date: Tue Jul 10 14:12:37 2018 +0200 + + Minor renamings of internal inline functions + + src/hb-buffer.cc | 4 ++-- + src/hb-dsalgs.hh | 2 +- + src/hb-map-private.hh | 2 +- + src/hb-open-type-private.hh | 4 ++-- + src/hb-ot-cmap-table.hh | 2 +- + src/hb-ot-hdmx-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 4 ++-- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-map.cc | 4 ++-- + src/hb-ot-shape.cc | 4 ++-- + src/hb-private.hh | 27 ++++++++++++++------------- + src/hb-set-private.hh | 6 +++--- + src/hb-subset.cc | 2 +- + 13 files changed, 33 insertions(+), 32 deletions(-) + +commit d652ef299d123f28409e755ed2d2411295293f19 +Author: Behdad Esfahbod +Date: Tue Jul 10 14:05:00 2018 +0200 + + Move hb_vector_t and hb_lockable_set_t to hb-dsalgs.hh + + src/hb-dsalgs.hh | 311 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-private.hh | 315 ------------------------------------------------------ + 2 files changed, 311 insertions(+), 315 deletions(-) + +commit 9e53b083295ad910a87e778ebd16cbe69ebe2130 +Author: Behdad Esfahbod +Date: Tue Jul 10 14:03:58 2018 +0200 + + Move hb_stable_sort to hb-dsalgs.hh + + Also, include hb-dsalgs.hh from end of hb-pricate.hh + + src/hb-dsalgs.hh | 51 +++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-os2-unicode-ranges.hh | 1 - + src/hb-ot-post-table.hh | 1 - + src/hb-private.hh | 51 ++--------------------------------------- + 4 files changed, 53 insertions(+), 51 deletions(-) + +commit 39f11d8e72c6b2568f3b70847c6c9d1f374cd49c +Author: Behdad Esfahbod +Date: Tue Jul 10 14:01:39 2018 +0200 + + Minor + + src/hb-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 763f878cc0595162255c58ffe7a82ac1ca51cb0b +Author: Behdad Esfahbod +Date: Tue Jul 10 13:47:41 2018 +0200 + + Fix syntax + + Oops. + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 83ea277178544cd7e417bdfb7b600ede94910e13 +Author: Behdad Esfahbod +Date: Tue Jul 10 13:17:27 2018 +0200 + + Add posix_memalign() fallback + + configure.ac | 2 +- + src/hb-private.hh | 40 ++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 41 insertions(+), 1 deletion(-) + +commit 292c100d6141eb2e981fa632602d73768f748727 +Author: Behdad Esfahbod +Date: Tue Jul 10 13:16:52 2018 +0200 + + Always compile (but not use) alignof() and round() fallback codes + + Catches compile-errors in them better. + + src/hb-private.hh | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +commit 27c5317d918971c2fb67c213621a19ac790440e4 +Author: Behdad Esfahbod +Date: Tue Jul 10 13:03:42 2018 +0200 + + Fix alignof impl + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bca83618cda7ee4f683b4685d10db9e1bef4983c +Author: Behdad Esfahbod +Date: Tue Jul 10 12:58:13 2018 +0200 + + Add fallback implementation for constexpr and alignof + + src/hb-private.hh | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit 7cb47d0f3f202843ebc7fb8801bf388bb90ba3aa +Author: Behdad Esfahbod +Date: Tue Jul 10 12:51:29 2018 +0200 + + Minor + + src/hb-set-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit bf9e9676dda686f5b76826b4e3148f4a0b512e3c +Merge: 46d8f0d5 53f73409 +Author: Cosimo Lupo +Date: Mon Jul 9 20:24:22 2018 +0200 + + Merge pull request #1091 from anthrotype/fix-gen-def-py + + gen-def.py: pass headers as arguments so that msys2 can convert posix paths + +commit 53f73409a91241765ae6a0cadf7600676988b6af +Author: Cosimo Lupo +Date: Mon Jul 9 18:54:23 2018 +0100 + + CMakeLists.txt: don't pass header args as single space-separated string + + let python's parse command-line args as usual + + CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 83d2233a5c47cf1feadcdece5bd4a6b498c6ee7a +Author: Cosimo Lupo +Date: Mon Jul 9 18:48:20 2018 +0100 + + CMakeLists.txt: pass headers as arguments to gen-def.py; call using PYTHON_EXECUTABLE + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ccdd15655480fe35226c0b757e28d3527fe2e6af +Author: Cosimo Lupo +Date: Mon Jul 9 18:26:44 2018 +0100 + + src/Makefile.am: pass headers to gen-def.py as arguments, not env vars + + src/Makefile.am | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit e3a931ef0b86419b5e4ba17de51535393471ed9d +Author: Cosimo Lupo +Date: Mon Jul 9 18:11:29 2018 +0100 + + gen-def.py: pass headers as arguments so that msys2 can convert posix paths + + When one is not using the msys2 python, the header files that are passed in as environment + variable cannot be found. + + https://ci.appveyor.com/project/fonttools/ttfautohint-py/build/1.0.65/job/rkremny4jjid9nl2#L803 + + This is because msys2 shell and make use POSIX paths (e.g. /c/Users/clupo/...) + whereas non-msys2 python.exe uses native Windows paths (e.g. C:\Users\clupo\...). + + Msys2 will automatically convert command line arguments (but not environment variables) from + POSIX to Windows paths when calling a native win32 executable, so we pass the header paths + as arguments instead of environment variables. + + This way the gen-def.py script can support both mingw python running in an MSYS2 shell, and + native win32 python. + + src/gen-def.py | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit 46d8f0d5521c3dd0b10c78e66153faefdb9046db +Author: David Corbett +Date: Fri Jul 6 15:47:03 2018 -0400 + + Do not enforce a native direction of LTR for Runic + + Fixes #481 + + src/hb-common.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 936dadc6610666aa5781e8662b859f18f9baa636 +Author: David Corbett +Date: Sat Jul 7 11:08:17 2018 -0400 + + Regenerate the USE table for Grantha and Bhaiksuki (#1090) + + Completes #1037 and fixes #1035. + + src/hb-ot-shape-complex-use-table.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1ebaa090d80bf0b59308d2c70f5e58dd8da47450 +Author: Behdad Esfahbod +Date: Thu Jul 5 14:04:13 2018 +0430 + + Disable vectorization + + Disable vectorization for now. To correctly use them, we should + use posix_memalign() to allocate them. Otherwise, can cause + misaligned access. + + https://bugs.chromium.org/p/chromium/issues/detail?id=860184 + + src/hb-private.hh | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 18a06f8a662ca7a9e63f74c6443e24a035c40655 +Author: Behdad Esfahbod +Date: Thu Jul 5 14:03:48 2018 +0430 + + Fix warning + + ../../src/hb-ot-layout-gsubgpos-private.hh:391:18: warning: missed loop optimization, the loop counter may overflow [-Wunsafe-loop-optimizations] + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 058708a665cdd9e796581dbcf60a5778d3f5e240 +Author: Behdad Esfahbod +Date: Thu Jul 5 13:16:00 2018 +0430 + + Allow disabling vector_size use + + src/hb-private.hh | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit d8a7dedc83042c5a643195172830acf78f2e59ff +Author: Ebrahim Byagowi +Date: Wed Jul 4 15:33:39 2018 +0430 + + Use CreateFileW explicitly and pass wchar_t to it (#1087) + + src/hb-blob.cc | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit 9940504e933d6766f87dca7fccc3c2f889976a22 +Author: Behdad Esfahbod +Date: Tue Jul 3 14:29:25 2018 +0430 + + [indic] Adjust left-matra repositioning and Halant,ZWJ sequence + + From the new code (first paragraph is from the OT Devanagari spec.): + + /* o Reorder matras: + * + * If a pre-base matra character had been reordered before applying basic + * features, the glyph can be moved closer to the main consonant based on + * whether half-forms had been formed. Actual position for the matra is + * defined as “after last standalone halant glyph, after initial matra + * position and before the main consonant”. If ZWJ or ZWNJ follow this + * halant, position is moved after it. + * + * IMPLEMENTATION NOTES: + * + * It looks like the last sentence is wrong. Testing, with Windows 7 Uniscribe + * and Devanagari shows that the behavior is best described as: + * + * "If ZWJ follows this halant, matra is NOT repositioned after this halant. + * If ZWNJ follows this halant, position is moved after it." + * + * Test case, with Adobe Devanagari or Nirmala UI: + * + * U+091F,U+094D,U+200C,U+092F,U+093F + * (Matra moves to the middle, after ZWNJ.) + * + * U+091F,U+094D,U+200D,U+092F,U+093F + * (Matra does NOT move, stays to the left.) + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1070 + + Test case added with Adobe Devanagari. + + src/hb-ot-shape-complex-indic.cc | 37 +++++++++++++++++++++ + .../8116e5d8fedfbec74e45dc350d2416d810bed8c4.ttf | Bin 0 -> 4364 bytes + .../data/in-house/tests/indic-joiners.tests | 4 +++ + 3 files changed, 41 insertions(+) + +commit 2cb075fe26201f3e370fccfff6c1bc242b5acc79 +Author: Behdad Esfahbod +Date: Tue Jul 3 13:04:05 2018 +0430 + + Fix unused function '_hb_mapped_file_destroy' if no mmap + + src/hb-blob.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 343e8c694b03eea625523229a9468fbb456e3aea +Author: Behdad Esfahbod +Date: Tue Jul 3 12:43:59 2018 +0430 + + 1.8.2 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 3 files changed, 11 insertions(+), 3 deletions(-) + +commit 29e7879bcf3fe955a0be3bb41e929e68f39ad01e +Author: Behdad Esfahbod +Date: Tue Jul 3 12:38:21 2018 +0430 + + Disable .dfont code for now + + The get_table imple was wrong, as table offsets in a dfont are + relative to the resource. We were treating them as relative to + the big blob itself. To be fixed. + + Part of https://github.com/harfbuzz/harfbuzz/pull/1085 + + src/hb-open-file-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 32348a43c154eac6bfb21b9e8044b38ed763601e +Author: Ebrahim Byagowi +Date: Sun Jul 1 15:32:43 2018 +0430 + + Fix trak table apply logic + + In collaboration with Behdad + + src/hb-aat-layout-trak-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 225b92b7d4437360f8779850ee0aae85966679b5 +Author: Ebrahim Byagowi +Date: Sun Jul 1 14:32:00 2018 +0430 + + Support dfont font files (#949) + + src/hb-open-file-private.hh | 196 ++++++++++++++++++++++++++++++++++++++++++++ + src/hb-open-type-private.hh | 1 + + src/main.cc | 3 + + 3 files changed, 200 insertions(+) + +commit 5d8cafcf6a47ce73afff06499f6be23c72ab6797 +Author: Ebrahim Byagowi +Date: Sun Jul 1 01:54:14 2018 +0430 + + Improve nommap naming and use C style comments on create_from_file (#1084) + + .circleci/config.yml | 2 +- + src/hb-blob.cc | 16 ++++++++-------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +commit d3c0980ac234698627cb281e5526cc99139eed30 +Author: Behdad Esfahbod +Date: Sat Jun 30 15:59:25 2018 +0430 + + Adjust MarkBasePos heuristic in presence of MultipleSubst + + From the issue: + "In this font, the virama,ya first forms a ligature, then decomposes back to + virama,ya. This causes those two to be marked parts of a MultipleSubst + sequence. When attaching the matra, we look for the first of the MultipleSubst + sequence because that's where we attach to (because of eg #740). In this case, + the first glyph in the MultipleSubst sequence is a mark, so we skip it and + attach to the base char before it." + + Font in question is Nirmala UI from Windows 10. Test sequence: + + U+0926,U+094D,U+092F,U+0941 + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1020 + + src/hb-ot-layout-gpos-table.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 8b9cbe3b24be2ae0166e682103e22ec916316ecf +Author: Behdad Esfahbod +Date: Sat Jun 30 12:28:03 2018 +0430 + + [indic] Tweak for old-spec Bengali and halant-ya-halant + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1073 + + src/hb-ot-shape-complex-indic.cc | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +commit 9541c9dae10156fb61e4786545d1976cdcfb6bda +Author: punchcutter +Date: Sun Jun 24 22:54:57 2018 -0700 + + Rebase and update USE overrides for Bhaiksuki Gap Fillers and Grantha Anusvara + + src/gen-use-table.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 7b8dfac560abe89d48cfc2f6efb4a61820bd28bf +Author: Behdad Esfahbod +Date: Sat Jun 30 09:16:54 2018 +0430 + + [khmer] Fix infinite-loop in cluster merging + + Indic shaper already had this check. We removed it when forking + Khmer shaper by mistake. + + Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1464623 + + src/hb-ot-shape-complex-khmer.cc | 31 +++++++++++++++++-------------- + 1 file changed, 17 insertions(+), 14 deletions(-) + +commit 25970a93aa6596d50ae538c6274625f95153572c +Author: Ebrahim Byagowi +Date: Thu Jun 28 14:32:36 2018 +0430 + + armcc compatibility, don't use EINTR if doesn't exist + + Fixes #1081 + + src/hb-blob.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 8a51f91b7035bbfaf39af1b962faf1613d2ea3b7 +Author: Ebrahim Byagowi +Date: Thu Jun 28 13:22:21 2018 +0430 + + Minor on hb_blob_create_from_file, reuse ferror result + + Oops + + src/hb-blob.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 71971800ed1c0501a58e6ff7730e3cebec2ef2f8 +Author: Ebrahim Byagowi +Date: Wed Jun 27 18:14:52 2018 +0430 + + [ci] Don't fail on apt update and revive clang-O3-O0 + + .circleci/config.yml | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7b4099f35f766d33d483a4b9d0805ef16020ea23 +Author: Ebrahim Byagowi +Date: Wed Jun 27 16:54:44 2018 +0430 + + Minor, rename blob to data on blob_from_file + + src/hb-blob.cc | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit fa090ed4d47df12b2e611c9a667c398742f7e4ba +Author: Ebrahim Byagowi +Date: Wed Jun 27 14:13:26 2018 +0430 + + Minor touches on hb_blob_create_from_file (#1079) + + * Handle EINTR on fallback reader + * Increase fallback reader limitation size limitation to 2 << 28 + * Ensure _O_BINARY does exist if MMAP is used on Windows + (maybe superfluous but makes me more confident) + + src/hb-blob.cc | 22 +++++++++++++--------- + 1 file changed, 13 insertions(+), 9 deletions(-) + +commit 01dff1ea1aa871fa19a92c2afd63c8cb5dd6e455 +Author: Behdad Esfahbod +Date: Tue Jun 26 18:00:58 2018 -0400 + + Make round() fallback portable to systems that do have round() + + Makes compiling without HAVE_ROUND on systems that do have it work. + + src/hb-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7db2e9ea38329b9393c9e8cc905b180735c9b0f4 +Author: Ebrahim Byagowi +Date: Tue Jun 26 10:46:10 2018 +0430 + + Minor on hb_blob_create_from_file + + Add one more "unlikely" annotation and use explicit nullptr check for more consistency. + + src/hb-blob.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4f8753464ae44dfb60bee81ede10448175db7b90 +Author: Garret Rieger +Date: Fri Jun 22 15:29:34 2018 -0700 + + [subset] Add fuzzer test case that caused a timeout to the corpus. + + ...testcase-minimized-hb-subset-fuzzer-5750092395970560 | Bin 0 -> 72435 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit bbf2a09549a88bd52ac3db89a0ae93f3b71b3e37 +Merge: 8db058d2 35ce8f31 +Author: Nathan Willis +Date: Mon Jun 25 13:02:11 2018 -0500 + + Merge branch 'master' of http://github.com/behdad/harfbuzz + + Catching up. + +commit 35ce8f31d37cf7c2a1f8265d36ba4c2c9a3efb2c +Author: Ebrahim Byagowi +Date: Mon Jun 25 22:23:43 2018 +0430 + + Unify our pipe reader with the fallback reader (#1068) + + And assign one bot to use the path always using NOMMAPFILEREADER token. + + It's limited to 200mb so no more fun with using /dev/zero on hb-view! + + .circleci/config.yml | 6 +- + src/hb-blob.cc | 152 ++++++++++++++++++++++----------------------------- + 2 files changed, 68 insertions(+), 90 deletions(-) + +commit f57804a8a596e88843ddc8b88afac7526349b89b +Author: Ebrahim Byagowi +Date: Mon Jun 25 18:45:49 2018 +0430 + + Resolve ttx absolute path before use (#1075) + + test/subset/run-tests.py | 101 ++++++++++++++++++++++++++--------------------- + 1 file changed, 57 insertions(+), 44 deletions(-) + +commit 159ddb872986f121818e816d2ea75d271075ba1f +Author: Ebrahim Byagowi +Date: Sun Jun 24 23:09:16 2018 +0430 + + Treat - just as /dev/stdin and remove one extra file reader (#1065) + + util/options.cc | 27 +++++++++------------------ + 1 file changed, 9 insertions(+), 18 deletions(-) + +commit b2a187918757a0faaf0f564ec2b0766c09fa364c +Author: Behdad Esfahbod +Date: Sat Jun 23 10:32:28 2018 -0400 + + In Coverage iterator, bail out if table smells + + In particular, if CoverageFormat2 has unsorted ranges, bail out. + Otherwise, 64k ranges of each 64k glyphs can DoS closure() method. + + We can do the same for CoverageFormat1, but that one does not expose + the quadratic behavior, so, fine. + + src/hb-ot-layout-common-private.hh | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +commit 941f2b85489b344698bf036922c589483034a7f2 +Author: Ebrahim Byagowi +Date: Mon Jun 18 20:35:40 2018 +0430 + + Support pipe and friends on hb_blob_create_from_file (#1061) + + With this hb-view/hb-shape support pipes and possibly socket and named pipe + also, anything fails just on mmap. + + We can later do the same for Windows also. + + This however reveals two issues, the fact most of our bots don't have HAVE_MMAP and using + this instead the other fread/fopen reader can make failure on CI. I should look at them separately + this change however is very low risk I believe. + + src/hb-blob.cc | 44 +++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 43 insertions(+), 1 deletion(-) + +commit d0c2889dfc43da92c76d6eab5482b1298744dc9c +Author: Ebrahim Byagowi +Date: Mon Jun 18 19:59:33 2018 +0430 + + Revert file blob sanitization and index checking (#1062) + + As https://github.com/harfbuzz/harfbuzz/pull/1059#issuecomment-397912812 we + like to still work with blobs that harfbuzz itself can't handle directly that are failing sanitization + currently apparently. + + util/options.cc | 12 ++---------- + util/options.hh | 2 +- + 2 files changed, 3 insertions(+), 11 deletions(-) + +commit c53697d3f2a3fae8b68ec4c5146c7000a07e0963 +Author: Ebrahim Byagowi +Date: Sun Jun 17 17:04:55 2018 +0430 + + Verbose fail when something is wrong with hb-shape/hb-view input font file (#1059) + + This checks if the blob isn't empty and uses `hb_face_count` + to see if the font file passes the simple font file sanitization + so can detect if the input is actually a font and checks also + whether input font-index is out of range. + + util/options.cc | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit aa0c5df4199ef4e96df2b856c8f629e49fdd5120 +Author: Ebrahim Byagowi +Date: Sun Jun 17 16:49:34 2018 +0430 + + Fix reading fonts from stdin (#1060) + + We were passing the font path directly to freetype so rendering + was broken when we are getting the font from stdin. + + This fixes it by using FT_New_Memory_Face instead. + + This fixes: + * build/util/hb-view /dev/stdin text < font.ttf + * build/util/hb-view - text < font.ttf + * cat font.ttf | build/util/hb-view - text + + but doesn't work on + * cat font.ttf | build/util/hb-view /dev/stdin text + + which I will try to fix separately. + + util/helper-cairo.cc | 14 ++++++++++---- + util/options.cc | 5 ++--- + util/options.hh | 4 +++- + 3 files changed, 15 insertions(+), 8 deletions(-) + +commit 3654d9be6b017e66307fe0ffe635266938b14702 +Author: Behdad Esfahbod +Date: Tue Jun 12 19:38:04 2018 -0400 + + 1.8.1 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 3 files changed, 11 insertions(+), 3 deletions(-) + +commit f3e58ab8a957cdf36bddef793c473664744885a7 +Author: Behdad Esfahbod +Date: Tue Jun 12 19:32:04 2018 -0400 + + [docs] Enlist misc new symbols + + RELEASING.md | 3 ++- + docs/harfbuzz-sections.txt | 24 +++++++++++++++++++++++- + 2 files changed, 25 insertions(+), 2 deletions(-) + +commit f6893ef82c51a35dd075973b2041b1b19f81faff +Author: Behdad Esfahbod +Date: Tue Jun 12 19:20:20 2018 -0400 + + Move hb-version.h generation to Makefile + + Fixes https://github.com/harfbuzz/harfbuzz/issues/864 + + Unfortunately 1.7.7 and 1.8.0 went out with the wrong hb-version.h contents. + + configure.ac | 1 - + src/Makefile.am | 21 ++++++++++++++++----- + src/hb-version.h | 6 +++--- + 3 files changed, 19 insertions(+), 9 deletions(-) + +commit cc0b04f48f261c1deb8f4142e7ae0222fbec67fb +Author: Behdad Esfahbod +Date: Tue Jun 12 18:24:54 2018 -0400 + + [subset] Remove HB_SUBSET_BUILTIN + + Just include hb-static.cc in libharfbuzz-subset.so source list as + well. Those building it built-in will include hb-static.cc once + already. No need for any gymnastics. + + src/Makefile.sources | 1 + + src/hb-subset.cc | 5 ----- + 2 files changed, 1 insertion(+), 5 deletions(-) + +commit ba0ea56efab9caa942d59bf51c78e490969cab87 +Author: Behdad Esfahbod +Date: Mon Jun 11 23:24:41 2018 -0400 + + [substitute-closure] Rename function for clarity + + src/hb-ot-layout-gsub-table.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 7b5ce416383101cb9d72a775a32d0088984e6817 +Author: Behdad Esfahbod +Date: Mon Jun 11 23:23:40 2018 -0400 + + Whitespace + + src/hb-ot-layout-gsub-table.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit c4d0d11c55f018026fc9c1db75fe7a4f8a38f81f +Author: Behdad Esfahbod +Date: Mon Jun 11 22:11:45 2018 -0400 + + [vector] Always 0-fill new items + + src/hb-private.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit a7e1b4a3b2d7b853ca244156571dd83321739bb1 +Author: Behdad Esfahbod +Date: Mon Jun 11 22:05:08 2018 -0400 + + Fix compiler warning re reordering of initializations + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f56cd9df10824fbbef52172470d07ff673d460cc +Author: Behdad Esfahbod +Date: Mon Jun 11 22:02:38 2018 -0400 + + Style + + src/hb-ot-layout.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit a95cde15af4aa34e76c4394dfdf17e7d25164d5b +Author: Jonathan Kew +Date: Mon Jun 11 18:09:35 2018 -0700 + + [hb-set] Additional testcase for hb-set-intersect. + + test/api/test-set.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 82484b05ca7a51dec6f3f9e9b0d7967823d7657f +Author: Jonathan Kew +Date: Mon Jun 11 20:55:14 2018 -0700 + + [hb-set] Don't shrink vectors until after processing their contents. + + Fixes #1054. + + src/hb-set-private.hh | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit eb585033cae33ca069bbcdaa21e4074678b6a6e9 +Author: Ebrahim Byagowi +Date: Mon Jun 11 03:47:43 2018 +0430 + + Fetch the updated dwrite_1.h header from a better place + + Following to https://ci.appveyor.com/project/harfbuzz/harfbuzz/build/1.0.1693/job/mfkjdhcdykjuqdfc + + appveyor.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b8e406f0c7c381d46e2d2bbe35a6107d560f2122 +Author: Behdad Esfahbod +Date: Sun Jun 10 17:22:38 2018 -0400 + + More fixes for SunStudio 12.6 build + + Followup to https://github.com/harfbuzz/harfbuzz/pull/1053 + + src/hb-ft.cc | 8 ++++---- + src/hb-subset.cc | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 498e4373dc2eb98fa9b18a0824c7912ed84a4c80 +Author: prrace +Date: Sat Jun 9 16:04:28 2018 -0700 + + Fix SunStudio 12.6 build (#1053) + + src/hb-face.cc | 2 +- + src/hb-private.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 46f7e7760f4c9b1b2886a27eff3c0fabdab45dbe +Author: Garret Rieger +Date: Thu Jun 7 15:55:45 2018 -0700 + + [subset] Use REPLACEME instead of version. + + src/hb-subset-input.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fc246ec985890f8256f6e03cdf74c86b9b51ff2a +Author: Garret Rieger +Date: Thu Jun 7 15:54:19 2018 -0700 + + [subset] Move variable declaration out of loop. + + test/api/test-subset-glyf.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 197cb18b22ce11f32f5f2c68c13f7068fb5cc338 +Author: Garret Rieger +Date: Thu Jun 7 15:32:52 2018 -0700 + + [subset] Add test cases for gsub closure in subsetting. + + test/api/fonts/Roboto-Regular.gsub.fi.ttf | Bin 0 -> 2652 bytes + test/api/fonts/Roboto-Regular.gsub.fil.ttf | Bin 0 -> 3228 bytes + test/api/fonts/Roboto-Regular.nogsub.fi.ttf | Bin 0 -> 1856 bytes + test/api/test-subset-glyf.c | 52 ++++++++++++++++++++++++++++ + 4 files changed, 52 insertions(+) + +commit 37eab27be3b88079614f66e484c700bb2d40af10 +Author: Garret Rieger +Date: Thu Jun 7 14:39:03 2018 -0700 + + [subset] Add fuzzing of gsub closure to hb-subset-fuzzer. + + test/fuzzing/hb-subset-fuzzer.cc | 27 ++++++++++++++++++++------- + 1 file changed, 20 insertions(+), 7 deletions(-) + +commit feb23892a36a7c855306db6d21521d5e8362bdf7 +Author: Garret Rieger +Date: Thu Jun 7 14:32:34 2018 -0700 + + [subset] Use gsub closure if ot layout is not being dropped. + + src/hb-ot-layout.cc | 10 ++++++++-- + src/hb-subset-plan.cc | 20 ++++++++++++++++++-- + 2 files changed, 26 insertions(+), 4 deletions(-) + +commit a5673da9be70f2ba0ff79aab4bd9a4480cb0223e +Author: Garret Rieger +Date: Thu Jun 7 14:23:03 2018 -0700 + + [subset] Add drop_ot_layout setting to subset input. + + src/hb-subset-input.cc | 17 +++++++++++++++++ + src/hb-subset-plan.cc | 1 + + src/hb-subset-plan.hh | 1 + + src/hb-subset-private.hh | 1 + + src/hb-subset.cc | 3 ++- + src/hb-subset.h | 3 +++ + 6 files changed, 25 insertions(+), 1 deletion(-) + +commit 57badadb769d0bcdbee00afce3af4972bc5c6bf1 +Author: Garret Rieger +Date: Wed Jun 6 16:02:51 2018 -0700 + + [subset] add a new closure call to hb-ot-layout that can compute the closure over multiple lookups. + + src/hb-ot-layout.cc | 26 ++++++++++++++++++++++++++ + src/hb-ot-layout.h | 6 ++++++ + src/hb-ot-shape.cc | 10 +--------- + 3 files changed, 33 insertions(+), 9 deletions(-) + +commit 11f1f4131b722f0e0338bee222a78110806f5a3d +Author: Behdad Esfahbod +Date: Wed Jun 6 16:46:50 2018 -0700 + + [set] Add is_subset + + New API: + +hb_set_is_subset() + + src/hb-set-private.hh | 13 +++++++++++++ + src/hb-set.cc | 22 ++++++++++++++++++++-- + src/hb-set.h | 4 ++++ + test/api/test-set.c | 4 ++++ + test/api/test-subset-glyf.c | 11 +++++------ + 5 files changed, 46 insertions(+), 8 deletions(-) + +commit 45186b9b8cbffa7b5c8509624fb431a0f79f5130 +Author: Garret Rieger +Date: Tue Jun 5 17:14:42 2018 -0700 + + [subset] Add memoization of GSUB lookup closures. + + src/hb-ot-layout-gsub-table.hh | 15 +++++++++++++-- + src/hb-ot-layout-gsubgpos-private.hh | 20 ++++++++++++++++++++ + src/hb-ot-layout.cc | 6 ++++-- + 3 files changed, 37 insertions(+), 4 deletions(-) + +commit 78d92e0f27e8b688efac014526ef5c4f1f53a58f +Author: Behdad Esfahbod +Date: Wed Jun 6 15:24:43 2018 -0700 + + Minorish + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 676b19f0d1d21629b654e69f220bf53965735940 +Author: Behdad Esfahbod +Date: Wed Jun 6 15:23:35 2018 -0700 + + Compiler gymnastics + + Part of https://github.com/harfbuzz/harfbuzz/issues/630 + + src/hb-private.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit 0a5952e8ddb3ec955496d582ef5a559a27684a0c +Author: Behdad Esfahbod +Date: Wed Jun 6 14:55:30 2018 -0700 + + Move prime_for back into map + + This was causing problem on systems without visibility when map was used + from both libharfbuzz and libharfbuzz-subset. Sigh. + + https://ci.appveyor.com/project/harfbuzz/harfbuzz/build/1.0.1669/job/dey47nmff0770vp3 + + src/hb-map-private.hh | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++- + src/hb-private.hh | 3 --- + src/hb-static.cc | 51 ------------------------------------------------- + 3 files changed, 52 insertions(+), 55 deletions(-) + +commit a2a1484ef93d5b5c3748b15219eca669d866b0a9 +Author: David Corbett +Date: Wed Jun 6 12:57:28 2018 -0400 + + Convert Consonant_Initial_Postfixed to CONS_FINAL + + Consonant_Initial_Postfixed was split off of Consonant_Succeeding_Repha, + so it should correspond to the same USE class, CONS_FINAL. + + src/gen-use-table.py | 5 +++-- + src/hb-ot-shape-complex-use-table.cc | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit 37986aa9b7ac44b1c4c50ebba9902d06cc8a45e0 +Author: Behdad Esfahbod +Date: Tue Jun 5 18:04:40 2018 -0700 + + 1.8.0 + + NEWS | 5 +++++ + configure.ac | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 9d3cd13c30d8df41a2f7ff6c4208a1b2d75ddd64 +Author: Behdad Esfahbod +Date: Tue Jun 5 17:59:31 2018 -0700 + + [ucdn] Update to Unicode 11 + + https://github.com/grigorig/ucdn/issues/19 + + src/hb-ucdn.cc | 7 + + src/hb-ucdn/ucdn_db.h | 2754 ++++++++++++++++++++++++++----------------------- + 2 files changed, 1479 insertions(+), 1282 deletions(-) + +commit 060e6b4a13a4224de885214d374b079610224123 +Author: Behdad Esfahbod +Date: Tue Jun 5 17:31:46 2018 -0700 + + Update to Unicode 11.0.0 + + UCDN is not updated yet. + + src/gen-use-table.py | 13 +++-- + src/hb-common.cc | 5 ++ + src/hb-common.h | 11 ++++ + src/hb-ot-shape-complex-arabic-table.hh | 43 ++++++++++++--- + src/hb-ot-shape-complex-indic-table.cc | 77 ++++++++++++++------------- + src/hb-ot-shape-complex-private.hh | 9 ++++ + src/hb-ot-shape-complex-use-machine.rl | 2 +- + src/hb-ot-shape-complex-use-table.cc | 94 +++++++++++++++++++++------------ + 8 files changed, 170 insertions(+), 84 deletions(-) + +commit 105a3b5e2d2ff228cdc1fbe8618f6c8fdfdabe9e +Author: Behdad Esfahbod +Date: Tue Jun 5 15:31:04 2018 -0700 + + Minor + + src/Makefile.am | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 60c516789bab499c5a423f80071638955b7b13fd +Author: Behdad Esfahbod +Date: Tue Jun 5 15:20:23 2018 -0700 + + [RELEASING] Update + + RELEASING.md | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit df01f3e560d21900e234c4a6616bcf9c98f5f567 +Author: Behdad Esfahbod +Date: Tue Jun 5 15:17:39 2018 -0700 + + 1.7.7 + + NEWS | 37 +++++++++++++++++++++++++++++++++++++ + RELEASING.md | 5 +++-- + configure.ac | 2 +- + src/hb-blob.cc | 2 +- + src/hb-face.cc | 2 +- + src/hb-map.cc | 28 ++++++++++++++-------------- + src/hb-map.h | 2 +- + 7 files changed, 58 insertions(+), 20 deletions(-) + +commit ba3b6d6c6512b58a3d0e5277fbbe4e69b085467d +Author: Behdad Esfahbod +Date: Mon Jun 4 16:47:45 2018 -0700 + + [khmer] Fix Coeng vs Halant confusion + + Test suite results are unchanged (34). + + src/hb-ot-shape-complex-khmer.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 8220ef8a54bcc94f122d50804c0a5e829de81be1 +Author: Ebrahim Byagowi +Date: Tue Jun 5 22:50:53 2018 +0430 + + Fix hb_face_count build issue + + I should've rebased #1002 before the merge, my bad + + src/hb-face.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 32da0c6bc4770568346f6c05fd6b374be2bbd2b2 +Author: Ebrahim Byagowi +Date: Tue Jun 5 18:56:26 2018 +0430 + + Add hb_face_count, a new API (#1002) + + Simply, it returns the number of faces on a font blob. + + To be used on hb-sanitizer tool but other clients also + can benefit from it. + + TODO | 2 - + docs/harfbuzz-sections.txt | 1 + + src/hb-face.cc | 95 ++++++++++++++++++++++++++++------------------ + src/hb-face.h | 4 ++ + 4 files changed, 64 insertions(+), 38 deletions(-) + +commit 4a115fe7fe71e381decb7c894208540663419f75 +Author: Behdad Esfahbod +Date: Mon Jun 4 15:40:43 2018 -0700 + + [sinhala] Move reph to after post-consonants + + Apparently this changed between Win 7 and Win 10. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/967 + + To be continued in https://github.com/harfbuzz/harfbuzz/issues/1044 + + src/hb-ot-shape-complex-indic.cc | 2 +- + test/shaping/data/in-house/Makefile.sources | 1 + + .../fonts/5af5361ed4d1e8305780b100e1730cb09132f8d1.ttf | Bin 0 -> 3152 bytes + test/shaping/data/in-house/tests/sinhala.tests | 1 + + 4 files changed, 3 insertions(+), 1 deletion(-) + +commit 3e494caae3dc096339a46d5a3fdeb5a718de6911 +Author: Behdad Esfahbod +Date: Mon Jun 4 15:38:05 2018 -0700 + + [test] Fix record-test to use gids not glyph-names + + as those might not match what FontTools think of the glyphs if font + does NOT have glyph names. + + test/shaping/record-test.sh | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 58400a2ad8b18aeb1da40d6c327135cd62312316 +Author: Behdad Esfahbod +Date: Sat Jun 2 20:30:09 2018 -0700 + + Remove DISALLOW_* from vector, set, and map + + Some of the build bots, still fail on this. I suppose mine pass because + I enable C++11... + + Anyway, remove these again. + + src/hb-map-private.hh | 3 --- + src/hb-private.hh | 6 ------ + src/hb-set-private.hh | 3 --- + src/hb-subset-plan.hh | 3 ++- + 4 files changed, 2 insertions(+), 13 deletions(-) + +commit f9abbf83b6404bc9eb0c0983f562c9dbba1ef57c +Author: Behdad Esfahbod +Date: Sat Jun 2 15:30:59 2018 -0700 + + Fix fallout from 975bdd5ef562e37655067b703b2b9ca7481f4985 + + Ouch! + + src/hb-ot-map-private.hh | 40 ++++++++++++++++++++++------------------ + src/hb-ot-map.cc | 11 +++++++++++ + src/hb-ot-post-table.hh | 3 ++- + src/hb-ot-shape-private.hh | 10 ++++++++-- + src/hb-ot-shape.cc | 2 ++ + src/hb-subset.cc | 2 ++ + 6 files changed, 47 insertions(+), 21 deletions(-) + +commit f7515769fd024faca888a47c58f87fb868b0e760 +Author: Behdad Esfahbod +Date: Fri Jun 1 17:48:37 2018 -0700 + + [vector] Use Crap pool in push() as well + + src/hb-coretext.cc | 20 +++----------------- + src/hb-ot-cmap-table.hh | 3 ++- + src/hb-ot-layout.cc | 3 +-- + src/hb-ot-map.cc | 17 ++++------------- + src/hb-ot-post-table.hh | 6 +----- + src/hb-private.hh | 11 ++++------- + src/hb-subset-plan.cc | 2 -- + src/hb-subset.cc | 2 -- + src/hb-uniscribe.cc | 28 ++++++++-------------------- + 9 files changed, 23 insertions(+), 69 deletions(-) + +commit 975bdd5ef562e37655067b703b2b9ca7481f4985 +Author: Behdad Esfahbod +Date: Fri Jun 1 17:37:13 2018 -0700 + + [vector] Keep success status + + src/hb-private.hh | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit 1ab3c3ed1bbc404086aefffaef4b8261bb77caa7 +Author: Behdad Esfahbod +Date: Fri Jun 1 17:34:24 2018 -0700 + + [vector] Whitespace + + src/hb-private.hh | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit fb07d1a3ce896f8ebf8b5d5fef51dee91b6ead11 +Author: Behdad Esfahbod +Date: Fri Jun 1 17:32:07 2018 -0700 + + Another attempt at making every compiler happy... + + Sigh. + + src/hb-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 4f76f956bb3a95b307322cdad4f8d3b97851678e +Author: Behdad Esfahbod +Date: Fri Jun 1 17:28:47 2018 -0700 + + [map] Move prime_for to hb-static + + src/hb-map-private.hh | 53 +-------------------------------------------------- + src/hb-private.hh | 2 ++ + src/hb-static.cc | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 54 insertions(+), 52 deletions(-) + +commit 33d6f46bbbb4fdee110f1cb024a37ed2e46e5e22 +Author: Behdad Esfahbod +Date: Fri Jun 1 17:25:35 2018 -0700 + + [set] Shrink page-map size again + + src/hb-set-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4ca211bce192b01644c82f721251604df935b603 +Author: Behdad Esfahbod +Date: Fri Jun 1 17:18:57 2018 -0700 + + Fix hb_vector_size_t + + src/hb-private.hh | 4 ++-- + src/hb-set-private.hh | 3 ++- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit a070dfd333f411bf720120eb332f7da93077054f +Author: Garret Rieger +Date: Thu May 31 16:47:39 2018 -0700 + + [subset] Have the subset fuzzer pull the text string to subset to from the end of the fuzzer provided data. + + test/fuzzing/hb-subset-fuzzer.cc | 54 +++++++++++++++++++++++++--------------- + 1 file changed, 34 insertions(+), 20 deletions(-) + +commit bb6f4adac70a161505953414aa85ba78cd993c65 +Author: Behdad Esfahbod +Date: Fri Jun 1 16:30:38 2018 -0700 + + Add Codacy badge + + README | 1 + + 1 file changed, 1 insertion(+) + +commit a7dd90f519fb7ab046e92ea3b7101c21d5040bbc +Author: Behdad Esfahbod +Date: Fri Jun 1 16:07:55 2018 -0700 + + Revert "Remove HB_DISALLOW_COPY_AND_ASSIGN" + + This reverts commit ff92de766bf775bfdd3a01bda94de699180ff86a. + + Revert that and remove ASSERT_POD. Let's see which bots are + unhappy with this configuration... + + src/hb-map-private.hh | 3 +-- + src/hb-ot-shape-private.hh | 2 +- + src/hb-private.hh | 6 +++++- + src/hb-set-private.hh | 3 +-- + 4 files changed, 8 insertions(+), 6 deletions(-) + +commit 7b50bf52f274f75f0b41008e0eab150124ae928a +Author: Behdad Esfahbod +Date: Thu May 31 20:20:17 2018 -0700 + + Use NullPool for _hb_set_nil and _hb_map_nil + + src/hb-map.cc | 12 +----------- + src/hb-private.hh | 2 +- + src/hb-set.cc | 8 +------- + 3 files changed, 3 insertions(+), 19 deletions(-) + +commit f040ca40ab3ebd4fdb85747477e0e656ab8b073e +Author: Behdad Esfahbod +Date: Thu May 31 20:15:21 2018 -0700 + + [set] Minor + + src/hb-set.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 7185b273b3d92ee0ba0a589eb94387f25ea40b82 +Author: Behdad Esfahbod +Date: Thu May 31 20:03:00 2018 -0700 + + Rename in_error to !successful + + Towards possibly using Null pool for some nil objects. + + src/hb-buffer-deserialize-json.hh | 758 +++++++++++++++++------------------ + src/hb-buffer-deserialize-json.rl | 2 +- + src/hb-buffer-deserialize-text.hh | 510 +++++++++++------------ + src/hb-buffer-deserialize-text.rl | 2 +- + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 24 +- + src/hb-map-private.hh | 10 +- + src/hb-map.cc | 4 +- + src/hb-ot-layout-gsubgpos-private.hh | 4 +- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-shape-complex-hangul.cc | 8 +- + src/hb-ot-shape-complex-indic.cc | 4 +- + src/hb-ot-shape-complex-khmer.cc | 4 +- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape-complex-thai.cc | 4 +- + src/hb-ot-shape-complex-use.cc | 4 +- + src/hb-ot-shape-normalize.cc | 12 +- + src/hb-ot-shape.cc | 2 +- + src/hb-set-private.hh | 28 +- + src/hb-set.cc | 4 +- + 20 files changed, 696 insertions(+), 694 deletions(-) + +commit 353f4d2efc6c0ce32f5bee08bbdf5a268d720a6a +Author: Behdad Esfahbod +Date: Thu May 31 19:52:16 2018 -0700 + + Fix a whitespace inconsistency + + Null() and Crap() are only places that there's no space before '('... + + src/dump-fon.cc | 12 ++++++------ + src/hb-private.hh | 2 +- + src/main.cc | 2 +- + 3 files changed, 8 insertions(+), 8 deletions(-) + +commit e36cd1dfd36ed336f63883098dc870c56a5fc10d +Author: Behdad Esfahbod +Date: Thu May 31 19:31:39 2018 -0700 + + Remove trivial HB_ATOMIC_INT_INIT() + + src/hb-atomic-private.hh | 9 +-------- + src/hb-object-private.hh | 2 +- + 2 files changed, 2 insertions(+), 9 deletions(-) + +commit 550a70f8011c4c1cfd27d739469e79cb98bcdd6e +Author: Behdad Esfahbod +Date: Thu May 31 19:28:04 2018 -0700 + + Use 0 as inert object reference value instead of -1 + + Towards using Null object for nil objects. + + src/hb-object-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dcd1b07eeaf2c28f0d20b9812749810d069041e3 +Author: Behdad Esfahbod +Date: Thu May 31 17:58:40 2018 -0700 + + Add const OffsetTo<> dereference + + Unused, but now that we have CrapPool, implement it. + + src/hb-open-type-private.hh | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 2baa357ac7fe2ae91029dff26a01b8ba1cc0b365 +Author: Ebrahim Byagowi +Date: Thu May 31 12:27:31 2018 +0430 + + Fix symbol export issue of prime_mod on Alpine bot + + Apparently our gcc-6.4.0 on Alpine Linux distribution doesn't like defining static const + inside a method, lets put that on outside the classes. + + src/hb-map-private.hh | 89 ++++++++++++++++++++++++++------------------------- + 1 file changed, 45 insertions(+), 44 deletions(-) + +commit 54800f8322e8ab106d801fc332b7e813c58138ac +Author: Behdad Esfahbod +Date: Wed May 30 16:26:50 2018 -0700 + + [map] Mark prime_for HB_INTERNAL + + Trying to see if it fixes gcc-4.2 bots. + + src/hb-map-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d600e844aa4736b52fe71c1b2a9fa785be5cfecc +Author: Behdad Esfahbod +Date: Wed May 30 16:25:46 2018 -0700 + + Add CrapOrNull + + src/hb-private.hh | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 251cc977e93a75cfdc34671760ef4241daebf60f +Author: Garret Rieger +Date: Wed May 30 12:23:51 2018 -0700 + + [subset] Switch to using hb_map_t inside of hb_subset_plan_t. + + src/hb-ot-cmap-table.hh | 20 +++--- + src/hb-ot-glyf-table.hh | 12 ++-- + src/hb-ot-hdmx-table.hh | 10 +-- + src/hb-ot-hmtx-table.hh | 6 +- + src/hb-ot-maxp-table.hh | 4 +- + src/hb-ot-os2-table.hh | 35 +++-------- + src/hb-ot-post-table.hh | 2 +- + src/hb-subset-glyf.cc | 9 ++- + src/hb-subset-plan.cc | 159 ++++++++++++++++-------------------------------- + src/hb-subset-plan.hh | 68 +++++++++++++-------- + src/hb-subset.cc | 2 +- + 11 files changed, 139 insertions(+), 188 deletions(-) + +commit b3d45de6cff4501e6171ec9d9069af7de29584d4 +Author: Behdad Esfahbod +Date: Wed May 30 14:02:49 2018 -0700 + + [map] Fix size calculation + + Don't know why I thought I should subtract one there... + + src/hb-map-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ff92de766bf775bfdd3a01bda94de699180ff86a +Author: Behdad Esfahbod +Date: Tue May 29 18:48:45 2018 -0700 + + Remove HB_DISALLOW_COPY_AND_ASSIGN + + llvm-gcc-4.2 bot had this problem: + hb-private.hh:812: error: initializer specified for non-virtual method 'void hb_vector_t::operator=(const hb_vector_t&) [with Type = hb_user_data_array_t::hb_user_data_item_t, unsigned int StaticSize = 1u]' + + Removing the delete didn't work with a constructor. So, remove constructor. + Just disallow assignment. Still better than nothing. + + src/hb-map-private.hh | 2 +- + src/hb-ot-shape-private.hh | 2 +- + src/hb-private.hh | 6 +----- + src/hb-set-private.hh | 2 +- + 4 files changed, 4 insertions(+), 8 deletions(-) + +commit a2444346220757e7743c972cbd24f925e72b419d +Author: Behdad Esfahbod +Date: Tue May 29 18:32:57 2018 -0700 + + [map] Fix resize + + src/hb-map-private.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit efbab6ba3f7434fca41be1b38e4a5281695f231c +Author: Behdad Esfahbod +Date: Tue May 29 18:21:55 2018 -0700 + + Disable use of thread_local + + Clang build was failing with: + + /usr/bin/ld: .libs/libharfbuzz_la-hb-blob.o: relocation R_X86_64_PC32 against undefined hidden symbol `_ZTH12_hb_CrapPool' can not be used when making a shared object + + Instead of fighting it, just disable use of it. + + src/hb-private.hh | 4 ++-- + src/hb-static.cc | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 8c2c5d450817d4cb6f782d286da6ac6d9e5a5e95 +Author: Behdad Esfahbod +Date: Tue May 29 18:15:52 2018 -0700 + + [map] Not going to implement is_equal which is complicated + + src/hb-map.h | 7 ------- + 1 file changed, 7 deletions(-) + +commit ccd01c65559122499b38a44e4449cd5a828d0b05 +Author: Behdad Esfahbod +Date: Tue May 29 18:13:13 2018 -0700 + + [map] Move prime_mod to header to avoid linkage issues in subset.so + + src/hb-map-private.hh | 53 +++++++++++++++++++++++++++++++++++++++++++++++++-- + src/hb-map.cc | 52 -------------------------------------------------- + 2 files changed, 51 insertions(+), 54 deletions(-) + +commit 6baebc5d559e15c7903a81f21be08b45537e7903 +Author: Behdad Esfahbod +Date: Tue May 29 17:58:46 2018 -0700 + + [map] Fix copyright year + + src/hb-map-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b0158129d2b161665f8872deeb540ac73349c2de +Author: Behdad Esfahbod +Date: Tue May 29 17:52:37 2018 -0700 + + [map] Minor + + src/hb-map-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 4099c66f70e1acf89013215ab3add42b11e31fea +Author: Behdad Esfahbod +Date: Tue May 29 17:52:07 2018 -0700 + + [map] Don't return INVALID from get() just because in_error + + src/hb-map-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 25783907737b561f7b8648b8e92dba601a439828 +Author: Behdad Esfahbod +Date: Tue May 29 17:34:35 2018 -0700 + + [map] Fix bool use in C API + + src/hb-map.cc | 2 +- + src/hb-map.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit a9fa39dca56d3a96dddcdbeb1c55a3d55a6537da +Author: Behdad Esfahbod +Date: Tue May 29 17:31:01 2018 -0700 + + [map] More minor + + src/hb-map-private.hh | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit f76c4a7708773eca7a2b8c7ff47f8b5ade5ca0d9 +Author: Behdad Esfahbod +Date: Tue May 29 17:27:25 2018 -0700 + + [map] Make initial resize actually work + + src/hb-map-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 661e9ae4a55c198eb9fdb2c104979dd55a0fa1f1 +Author: Behdad Esfahbod +Date: Tue May 29 17:09:17 2018 -0700 + + [map] Add clear(), is_empty(), and get_population() + + src/hb-map-private.hh | 22 ++++++++++++++++++---- + src/hb-map.cc | 43 +++++++++++++++++++++++++++++++++++++++++++ + src/hb-map.h | 17 +++++++++-------- + 3 files changed, 70 insertions(+), 12 deletions(-) + +commit b6959c33e23b464ddbe5fe98fafc80bbb669189c +Author: Behdad Esfahbod +Date: Tue May 29 17:02:22 2018 -0700 + + [map] Minor + + src/hb-map-private.hh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 686476a8ae0039f277eb55ab7bd69386d43a8dc7 +Author: Behdad Esfahbod +Date: Tue May 29 17:00:02 2018 -0700 + + [map] Track population and occupancy separately + + src/hb-map-private.hh | 30 +++++++++++++++++++++--------- + src/hb-map.cc | 1 + + 2 files changed, 22 insertions(+), 9 deletions(-) + +commit 8a978790cb4dc66816c2cd7b617829f3e9d6e88e +Author: Behdad Esfahbod +Date: Tue May 29 16:45:20 2018 -0700 + + [map] Minor + + src/hb-map.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6f12ce47c0ed8c2c4bb251cd6e685459af104db8 +Author: Behdad Esfahbod +Date: Tue May 29 16:45:06 2018 -0700 + + Revert "[map] Return bool from set()" + + This reverts commit face7cf55d4895ffca314c8448c0a749a26cc182. + + src/hb-map-private.hh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit fc51c45079feb7d77d25204c4c17a0733f1eca56 +Author: Behdad Esfahbod +Date: Tue May 29 16:44:55 2018 -0700 + + Revert "[map] Make hb_map_set() return bool" + + This reverts commit 7bf1980146cfc081b06264ac367b23ae9397adf1. + + src/hb-map.cc | 4 ++-- + src/hb-map.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 7bf1980146cfc081b06264ac367b23ae9397adf1 +Author: Behdad Esfahbod +Date: Tue May 29 16:42:44 2018 -0700 + + [map] Make hb_map_set() return bool + + src/hb-map.cc | 4 ++-- + src/hb-map.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit face7cf55d4895ffca314c8448c0a749a26cc182 +Author: Behdad Esfahbod +Date: Tue May 29 16:39:03 2018 -0700 + + [map] Return bool from set() + + src/hb-map-private.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit e94be200bd7976a26ea2d6df5050d9dab4de0f08 +Author: Behdad Esfahbod +Date: Tue May 29 16:37:44 2018 -0700 + + [map] Implement operator[] for get()ting + + src/hb-map-private.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit 743fdd9c618c949d7f45324386bd0bb37435db46 +Author: Behdad Esfahbod +Date: Tue May 29 16:28:48 2018 -0700 + + [map] First try at implementing an integer-to-integer hashmap + + Fully untested. + + src/Makefile.sources | 3 + + src/hb-map-private.hh | 180 ++++++++++++++++++++++++++++++++ + src/hb-map.cc | 279 ++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-map.h | 110 ++++++++++++++++++++ + src/hb.h | 1 + + 5 files changed, 573 insertions(+) + +commit 65c82179c9b3aafd90987485a49c09dbbb473c90 +Author: Ebrahim Byagowi +Date: Sat May 26 23:50:10 2018 +0430 + + [blob] Use MAP_NORESERVE if available (#1039) + + MAP_NORESERVE is not available on macOS for example so set the flag + to zero if not defined on the headers. + + src/hb-blob.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 1ce40d900a9c451d8d5814a9b30759d1e66f99c8 +Author: Behdad Esfahbod +Date: Fri May 25 16:34:08 2018 -0700 + + [set] Remove stale comment + + src/hb-set.h | 2 -- + 1 file changed, 2 deletions(-) + +commit 6c2227640bc14754c9472fead5cd04ff25f91b52 +Author: Behdad Esfahbod +Date: Fri May 25 16:21:27 2018 -0700 + + Add HB_DISALLOW_COPY_AND_ASSIGN + + src/hb-ot-map-private.hh | 1 - + src/hb-ot-shape-private.hh | 4 +--- + src/hb-ot-shape.cc | 2 -- + src/hb-private.hh | 10 ++++++++++ + src/hb-set-private.hh | 3 +++ + 5 files changed, 14 insertions(+), 6 deletions(-) + +commit fd3d0042319c33c923a60d435779bf7ed5a9a6f5 +Author: Behdad Esfahbod +Date: Thu May 24 15:58:26 2018 -0700 + + Move pool definitions to hb-static.cc + + src/Makefile.sources | 1 + + src/dump-emoji.cc | 8 +------- + src/dump-fon.cc | 6 +----- + src/hb-ot-layout.cc | 6 ------ + src/hb-static.cc | 32 ++++++++++++++++++++++++++++++++ + src/hb-subset.cc | 5 ++--- + src/main.cc | 6 +----- + 7 files changed, 38 insertions(+), 26 deletions(-) + +commit 7f7b1370d37b9187f688dea5e6fee5ea7c2b7290 +Author: Behdad Esfahbod +Date: Thu May 24 14:09:04 2018 -0700 + + Fix Uniscribe build + + If a pointer type was passed to Null(), reinterpret_cast<> was + complaining about qualifiers being removed. Turns out I need the const on + the other side of "Type" to fix that. Also remove unused const from + NullPool type. + + src/dump-emoji.cc | 2 +- + src/dump-fon.cc | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-private.hh | 6 +++--- + src/hb-subset.cc | 2 +- + src/main.cc | 2 +- + 6 files changed, 8 insertions(+), 8 deletions(-) + +commit 31c4236d9643063e518289b28c3e17cedd8401e0 +Author: Behdad Esfahbod +Date: Thu May 24 13:38:46 2018 -0700 + + Underflow protection in hb_vector_t + + src/hb-private.hh | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit f83e992c8b27111ab802fd7e5678592a0c717518 +Author: Behdad Esfahbod +Date: Thu May 24 11:46:57 2018 -0700 + + Mark CrapPool thread_local + + Not sure if I like to keep it. For now, aim for correctness. + + src/dump-emoji.cc | 2 +- + src/dump-fon.cc | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-private.hh | 14 +++++++++++++- + src/hb-subset.cc | 2 +- + src/main.cc | 2 +- + 6 files changed, 18 insertions(+), 6 deletions(-) + +commit 5d80129891107c7f629c6950b5d257f2a867eee0 +Author: Behdad Esfahbod +Date: Thu May 24 11:33:15 2018 -0700 + + Add CrapPool + + Common Regoin for Access Protection. Like the NullPool, but writable. + + src/dump-emoji.cc | 1 + + src/dump-fon.cc | 1 + + src/hb-open-type-private.hh | 11 +++++++++++ + src/hb-ot-layout.cc | 1 + + src/hb-private.hh | 39 +++++++++++++++++++++++++++++++++++---- + src/hb-subset.cc | 1 + + src/main.cc | 1 + + 7 files changed, 51 insertions(+), 4 deletions(-) + +commit 673b764de050957b2d3b9972d9e55b3a2e5615f4 +Author: Behdad Esfahbod +Date: Wed May 23 20:12:23 2018 -0700 + + Move code around + + src/hb-private.hh | 91 ++++++++++++++++++++++++++++++------------------------- + 1 file changed, 49 insertions(+), 42 deletions(-) + +commit 65aeabd62275b37c6bb6715f3341e45625f4ba6e +Author: Behdad Esfahbod +Date: Wed May 23 16:15:28 2018 -0700 + + Add hb_vector_t::push(const Type &v) + + Makes for cleaner code. + + src/hb-coretext.cc | 3 +-- + src/hb-ot-post-table.hh | 3 +-- + src/hb-private.hh | 18 +++++++++++------- + src/hb-subset-plan.cc | 12 +++++------- + src/hb-uniscribe.cc | 8 ++------ + 5 files changed, 20 insertions(+), 24 deletions(-) + +commit 38ae0add7001c4db506d3a2c18b9960a2cae7b5d +Author: Ebrahim Byagowi +Date: Wed May 23 13:37:57 2018 +0430 + + [ci] Revive the SunCC bot + + * Adds libnsl to the bot as it is now needed apparently + * Disables hb-icu, apparently the newer ICU itself is not compatible with SunCC + + .circleci/config.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6c818c5516913f2c8192d58bd2724b1d3bb60d24 +Author: Behdad Esfahbod +Date: Tue May 22 22:00:05 2018 -0700 + + Actually enable vectorized operations + + Fixup for previous commit. Was accidentally turned off. + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f56a250b04f50f12c78d81d1a068187be3d95a8c +Author: Behdad Esfahbod +Date: Tue May 22 21:36:07 2018 -0700 + + Another try at smart vectorization + + Make clang happy. Also, don't use anonymous union. + + src/hb-private.hh | 36 +++++++++++++++++++++++++----------- + 1 file changed, 25 insertions(+), 11 deletions(-) + +commit b995b501ef5cf113534c5aead6c85baea6cc423c +Author: Behdad Esfahbod +Date: Tue May 22 21:06:22 2018 -0700 + + Try enabling vectorization smartly + + We'll see if this sticks to the bots. + + src/hb-private.hh | 25 +++++++++++++++++-------- + src/hb-set-private.hh | 7 ------- + 2 files changed, 17 insertions(+), 15 deletions(-) + +commit dd22c29f951ceec98516d7cb378bf2aa7e21d89a +Author: Behdad Esfahbod +Date: Tue May 22 20:57:19 2018 -0700 + + [set] Always check population before checking for equality + + src/hb-set-private.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 2eb9bbd986f6930f1b2594b8971ac677e9647c93 +Author: Behdad Esfahbod +Date: Tue May 22 18:28:13 2018 -0700 + + [test/text-rendering-tests] Update from upstream + + test/shaping/data/text-rendering-tests/DISABLED | 2 ++ + test/shaping/data/text-rendering-tests/Makefile.sources | 2 ++ + .../text-rendering-tests/fonts/TestMORXTwentyeight.ttf | Bin 0 -> 2660 bytes + .../text-rendering-tests/fonts/TestMORXTwentyseven.ttf | Bin 0 -> 2432 bytes + .../data/text-rendering-tests/fonts/TestShapeKndaV3.ttf | Bin 0 -> 89400 bytes + .../data/text-rendering-tests/tests/MORX-27.tests | 3 +++ + .../data/text-rendering-tests/tests/MORX-28.tests | 5 +++++ + 7 files changed, 12 insertions(+) + +commit 8eb53b853dcc4b0cc8e240cff6bfc5acb92182b0 +Author: Ebrahim Byagowi +Date: Fri May 11 22:44:44 2018 +0430 + + Minor, make CreateFile compatible with the disabled writable flag + + "writable" is not in use and probably we can go in the reverse direction + and remove the flags that are useful for enabled writable, this is just + for the sake of completeness however. + + src/hb-blob.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 33eb1bd23b100a8e65a0e66621760368b5aecdaf +Author: Ebrahim Byagowi +Date: Fri May 11 14:36:41 2018 +0430 + + Remove unnecessary headers and definitions of hb-blob (#1028) + + It removes io.h and other polyfills which we no longer need as 7e76d74 + + src/hb-blob.cc | 22 ++++------------------ + 1 file changed, 4 insertions(+), 18 deletions(-) + +commit 7e76d746e2555d5bba7f65d3958aa97a7f179d7b +Author: Ebrahim Byagowi +Date: Fri May 11 13:40:33 2018 +0430 + + Make hb_blob_create_from_file more portable (#1027) + + This makes it compatible with ARMCC which I had access in + a collaboration with @imgtec, thanks! + + Basically hb_blob_create_from_file features three code paths, + mmap, Win32 and fallback. + + We had fallback implementation even before this but it was relied + to "open" which is not available on some environments. This change + improved the situtation by using only fopen and friends for + fallback path. + + Interestingly we could use "open" on Windows but in fact it was + emulated by MSVCRT so I've completely split that from Unix path + now that we have a distinct path for fallback path also. + + src/hb-blob.cc | 64 +++++++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 43 insertions(+), 21 deletions(-) + +commit e99d75ea9c4fe1f64d7f8408093741a682ed5243 +Author: Behdad Esfahbod +Date: Wed May 9 15:28:30 2018 -0700 + + Fix warning + + src/hb-ot-cmap-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 191c4edc5423017d9123d291462fbfa87a805218 +Author: Behdad Esfahbod +Date: Wed May 9 15:27:17 2018 -0700 + + Reinstante DEFINE_NULL_DATA + + Seems like I messed up; buffer overrun got reported. + + src/hb-open-type-private.hh | 2 ++ + src/hb-ot-layout-common-private.hh | 13 +++---------- + src/hb-private.hh | 13 +++++++++++++ + 3 files changed, 18 insertions(+), 10 deletions(-) + +commit 93bdf9b2dfe18af0f1aa93b890f0be260f31d90e +Author: Ebrahim Byagowi +Date: Wed May 9 23:24:17 2018 +0430 + + Use arrayZ on hb-coretext and hb-uniscribe and fix macOS/Win bots (#1024) + + Following to 63f57f4 + + src/hb-coretext.cc | 2 +- + src/hb-uniscribe.cc | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 63f57f4dab3d3179838d5d1cd03d116837a7e5c2 +Author: Behdad Esfahbod +Date: Tue May 8 16:56:11 2018 -0700 + + Mark more unsized array's as arrayZ + + src/hb-aat-layout-common-private.hh | 14 ++++---- + src/hb-aat-layout-kerx-table.hh | 2 +- + src/hb-aat-layout-morx-table.hh | 6 ++-- + src/hb-open-file-private.hh | 6 ++-- + src/hb-open-type-private.hh | 40 +++++++++++----------- + src/hb-ot-cmap-table.hh | 2 +- + src/hb-ot-color-cbdt-table.hh | 10 +++--- + src/hb-ot-layout-common-private.hh | 12 +++---- + src/hb-ot-layout-gsub-table.hh | 16 ++++----- + src/hb-ot-layout-gsubgpos-private.hh | 64 ++++++++++++++++++------------------ + src/hb-ot-post-table.hh | 4 +-- + src/hb-ot-var-avar-table.hh | 26 +++++++-------- + src/hb-private.hh | 54 +++++++++++++++--------------- + src/hb-set-private.hh | 4 +-- + src/hb-subset.cc | 2 +- + 15 files changed, 131 insertions(+), 131 deletions(-) + +commit 091c17df5ac5f7ddc9b776481da845f4eda67570 +Author: Behdad Esfahbod +Date: Tue May 8 16:42:45 2018 -0700 + + Use UnsizedArrayOf<> in one place where [VAR] was used + + Trying to see how many can converted meaningfully. + + src/hb-ot-layout-common-private.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 0644d92ef32b09e32d473c758d2a968f2d125628 +Merge: 2a2e28e7 3be050f0 +Author: Behdad Esfahbod +Date: Tue May 8 15:21:09 2018 -0700 + + Merge pull request #1018 from googlefonts/cmap4 + + [subset] Add cmap format 4 subsetting. + +commit 2a2e28e701319b4053a5c95f06c68f859e4ce99b +Author: Behdad Esfahbod +Date: Tue May 8 03:00:21 2018 -0700 + + Don't keep instance in hb_table_lazy_loader_t + + src/hb-open-type-private.hh | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +commit 57bac8f6995fabbb98eb9824d822f370f9449488 +Author: Behdad Esfahbod +Date: Tue May 8 02:55:20 2018 -0700 + + Rename + + src/hb-open-type-private.hh | 6 +++--- + src/hb-ot-layout-private.hh | 8 ++++---- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 2a46a020fd2fa2fe99886ab06188db5f0fa37ad1 +Author: Behdad Esfahbod +Date: Tue May 8 02:53:03 2018 -0700 + + Minor + + src/hb-open-type-private.hh | 4 ++-- + src/hb-ot-kern-table.hh | 2 +- + src/hb-ot-layout.cc | 6 +++--- + src/hb-ot-post-table.hh | 2 +- + 4 files changed, 7 insertions(+), 7 deletions(-) + +commit eba1c16a604d1be774f22541bf3e417f27a27c68 +Author: Behdad Esfahbod +Date: Tue May 8 02:47:42 2018 -0700 + + Always lock blob in sanitize. Remove blob->lock_as() in favor of blob->lock() + + src/dump-emoji.cc | 4 ++-- + src/dump-fon.cc | 2 +- + src/hb-aat-layout.cc | 4 ++-- + src/hb-blob-private.hh | 6 ------ + src/hb-face.cc | 8 ++++---- + src/hb-open-type-private.hh | 8 ++++++-- + src/hb-ot-cmap-table.hh | 2 +- + src/hb-ot-color-cbdt-table.hh | 4 ++-- + src/hb-ot-color-sbix-table.hh | 2 +- + src/hb-ot-color-svg-table.hh | 2 +- + src/hb-ot-glyf-table.hh | 6 +++--- + src/hb-ot-hmtx-table.hh | 8 ++++---- + src/hb-ot-kern-table.hh | 2 +- + src/hb-ot-layout.cc | 6 +++--- + src/hb-ot-post-table.hh | 2 +- + src/hb-subset.cc | 2 +- + src/main.cc | 2 +- + 17 files changed, 34 insertions(+), 36 deletions(-) + +commit b4fa50501414b7471e840f2ee6b9dfe87080b078 +Author: Behdad Esfahbod +Date: Tue May 8 02:45:08 2018 -0700 + + Move Sanitizer::lock_instance<>() to blob->lock_as<>(). + + src/dump-emoji.cc | 4 ++-- + src/dump-fon.cc | 3 +-- + src/hb-aat-layout.cc | 4 ++-- + src/hb-blob-private.hh | 17 +++++++++++++++++ + src/hb-face.cc | 9 +++++---- + src/hb-open-type-private.hh | 9 ++------- + src/hb-ot-cmap-table.hh | 2 +- + src/hb-ot-color-cbdt-table.hh | 4 ++-- + src/hb-ot-color-sbix-table.hh | 2 +- + src/hb-ot-color-svg-table.hh | 2 +- + src/hb-ot-glyf-table.hh | 6 +++--- + src/hb-ot-hmtx-table.hh | 8 ++++---- + src/hb-ot-kern-table.hh | 2 +- + src/hb-ot-layout.cc | 6 +++--- + src/hb-ot-post-table.hh | 2 +- + src/hb-subset.cc | 2 +- + src/main.cc | 2 +- + 17 files changed, 48 insertions(+), 36 deletions(-) + +commit abc12f7b8157c3981216d82ead60627db31a6c14 +Author: Behdad Esfahbod +Date: Tue May 8 02:23:36 2018 -0700 + + Move null pool to hb-private + + src/dump-emoji.cc | 6 ++--- + src/dump-fon.cc | 14 +++++------ + src/hb-aat-layout.cc | 8 +++---- + src/hb-open-type-private.hh | 48 +++----------------------------------- + src/hb-ot-cmap-table.hh | 4 ++-- + src/hb-ot-color.cc | 4 ++-- + src/hb-ot-layout-common-private.hh | 13 ++++++++--- + src/hb-ot-layout.cc | 22 ++++++++--------- + src/hb-ot-math.cc | 4 ++-- + src/hb-ot-var.cc | 6 ++--- + src/hb-private.hh | 29 +++++++++++++++++++++++ + src/hb-subset.cc | 4 ++-- + src/main.cc | 2 +- + 13 files changed, 79 insertions(+), 85 deletions(-) + +commit 08e280fd84384f73d395918646ee044a5bbfee45 +Author: Behdad Esfahbod +Date: Tue May 8 01:57:27 2018 -0700 + + Rename hb_string_t to hb_bytes_t + + src/hb-ot-post-table.hh | 16 ++++++++-------- + src/hb-private.hh | 12 ++++++------ + src/hb-string-array.hh | 6 +++--- + 3 files changed, 17 insertions(+), 17 deletions(-) + +commit bd021a67203aa5b07c31c02d63e6154da0c05d31 +Author: Behdad Esfahbod +Date: Tue May 8 01:50:30 2018 -0700 + + Minor + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 16e4ccf7b417f021948643012cbe7641ba02c039 +Author: Behdad Esfahbod +Date: Tue May 8 01:47:05 2018 -0700 + + Allocate user-data-array on the heap + + This saves each object allocation 72 bytes. Now object overhead is just + 16 bytes (on x86) instead of 88 bytes. Neat. + + src/hb-object-private.hh | 36 ++++++++++++++++++++++++++++-------- + 1 file changed, 28 insertions(+), 8 deletions(-) + +commit 61920b21ca0c632ba58aef95c7f65f409cc0fbd2 +Author: Behdad Esfahbod +Date: Tue May 8 01:28:19 2018 -0700 + + Oops + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1023 + + src/hb-blob-private.hh | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 77 insertions(+) + +commit f673cfbd64d0c9d97123500a7b851b9cfc09deb3 +Author: Behdad Esfahbod +Date: Mon May 7 13:58:32 2018 -0700 + + Support scripts that are written both LTR and RTL + + Right now only Old Italic is marked as such. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/1000 + + src/hb-buffer.cc | 4 ++++ + src/hb-common.cc | 6 ++++++ + src/hb-ot-shape.cc | 7 +++++-- + test/api/test-common.c | 1 + + test/shaping/data/in-house/Makefile.sources | 1 + + .../fonts/73e84dac2fc6a2d1bc9250d1414353661088937d.ttf | Bin 0 -> 1136 bytes + test/shaping/data/in-house/tests/none-directional.tests | 3 +++ + 7 files changed, 20 insertions(+), 2 deletions(-) + +commit 90869e6962caf0e55a480b5d7e777cc521596e8b +Author: Behdad Esfahbod +Date: Mon May 7 14:04:01 2018 -0700 + + [ot] Apply langsys's required feature even if no other feature exists + + src/hb-ot-map.cc | 3 --- + 1 file changed, 3 deletions(-) + +commit 90baf721978236f2e06dff89ad1cb0cace0753ea +Author: Behdad Esfahbod +Date: Thu May 3 22:14:54 2018 -0400 + + Move some blob functions to methods + + src/hb-blob.cc | 80 +++++++++++++++++++++++++--------------------------------- + 1 file changed, 34 insertions(+), 46 deletions(-) + +commit 5c64d61475f15d7f8de8993a52639735b2bcf750 +Author: Behdad Esfahbod +Date: Thu May 3 21:10:57 2018 -0400 + + Add hb-blob-private.hh + + Towards making blob more memory-allocation-friendly + + src/Makefile.sources | 1 + + src/hb-blob.cc | 21 +++++---------------- + 2 files changed, 6 insertions(+), 16 deletions(-) + +commit 203dc44ebc141af0ba8c54edec2dc0405664997a +Author: Behdad Esfahbod +Date: Thu May 3 21:03:27 2018 -0400 + + [ot-layout] Remove unused members + + We should hang those off somewhere else. For now, the unused ones can go. + + src/hb-aat-layout-common-private.hh | 2 +- + src/hb-aat-layout.cc | 6 ++++++ + src/hb-ot-layout-private.hh | 6 ------ + src/hb-ot-layout.cc | 29 ++++++++--------------------- + 4 files changed, 15 insertions(+), 28 deletions(-) + +commit ac92ed7d6875374451246a2391859fb763329adb +Author: Ebrahim Byagowi +Date: Tue May 8 01:05:15 2018 +0430 + + Set inline hidden flag only on shared library building + + To avoid need of CMP0063 which is not available on older CMake versions + + CMakeLists.txt | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 3be050f07572d8556726b188668d727e3e7ba643 +Author: Garret Rieger +Date: Fri May 4 11:23:32 2018 -0700 + + [subset] entrySelectorZ -> entrySelector. + + src/hb-ot-cmap-table.hh | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 7c22f98da789f831e1afb9078085b2e33d864d25 +Author: Garret Rieger +Date: Thu May 3 13:14:28 2018 -0700 + + [subset] add missing template parameter. + + src/hb-ot-cmap-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 95eb0f3bafb7ab0e2451e3e2f8afc5008e18e88e +Author: Garret Rieger +Date: Thu May 3 13:00:19 2018 -0700 + + [subset] Switch to a non-log using implementation of caculating searchRangeZ, entrySelectorZ, and rangeShiftZ in cmap4. + + src/hb-ot-cmap-table.hh | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +commit b0d7971be0fa3c9393b04038b8d0a76398b0d8d7 +Author: Garret Rieger +Date: Thu May 3 11:22:51 2018 -0700 + + [subset] Updated expected files for japanese subset integration tests to include cmap4. + + ...gular.default.3042,3044,3046,3048,304A,304B.ttf | Bin 3032 -> 3112 bytes + ...gular.default.3042,3044,3046,73E0,5EA6,8F38.ttf | Bin 3268 -> 3356 bytes + .../Mplus1p-Regular.default.61,63,65,6B.ttf | Bin 2584 -> 2656 bytes + ...gular.default.660E,6975,73E0,5EA6,8F38,6E05.ttf | Bin 3564 -> 3652 bytes + .../japanese/Mplus1p-Regular.default.660E.ttf | Bin 2348 -> 2396 bytes + ...ar.drop-hints.3042,3044,3046,3048,304A,304B.ttf | Bin 2304 -> 2384 bytes + ...ar.drop-hints.3042,3044,3046,73E0,5EA6,8F38.ttf | Bin 2540 -> 2628 bytes + .../Mplus1p-Regular.drop-hints.61,63,65,6B.ttf | Bin 1856 -> 1928 bytes + ...ar.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.ttf | Bin 2836 -> 2924 bytes + .../japanese/Mplus1p-Regular.drop-hints.660E.ttf | Bin 1620 -> 1668 bytes + test/subset/data/fonts/Mplus1p-Regular.ttf | Bin 1758820 -> 1757292 bytes + 11 files changed, 0 insertions(+), 0 deletions(-) + +commit 79479273170275447042aa50912acee74bbacdf6 +Author: Garret Rieger +Date: Thu May 3 11:18:02 2018 -0700 + + [subset] Update expected files for subset integration tests to include cmap4. + + .../basics/Roboto-Regular.abc.default.61,62,63.ttf | Bin 2120 -> 2168 bytes + .../basics/Roboto-Regular.abc.default.61,63.ttf | Bin 1932 -> 1988 bytes + .../expected/basics/Roboto-Regular.abc.default.61.ttf | Bin 1744 -> 1792 bytes + .../expected/basics/Roboto-Regular.abc.default.62.ttf | Bin 1692 -> 1740 bytes + .../expected/basics/Roboto-Regular.abc.default.63.ttf | Bin 1668 -> 1716 bytes + .../basics/Roboto-Regular.abc.drop-hints.61,62,63.ttf | Bin 876 -> 924 bytes + .../basics/Roboto-Regular.abc.drop-hints.61,63.ttf | Bin 792 -> 848 bytes + .../basics/Roboto-Regular.abc.drop-hints.61.ttf | Bin 684 -> 732 bytes + .../basics/Roboto-Regular.abc.drop-hints.62.ttf | Bin 652 -> 700 bytes + .../basics/Roboto-Regular.abc.drop-hints.63.ttf | Bin 656 -> 704 bytes + .../Roboto-Regular.default.1FC,21,41,20,62,63.ttf | Bin 3700 -> 3772 bytes + .../full-font/Roboto-Regular.default.61,62,63.ttf | Bin 3320 -> 3368 bytes + .../Roboto-Regular.default.D7,D8,D9,DA,DE.ttf | Bin 3668 -> 3732 bytes + .../Roboto-Regular.drop-hints.1FC,21,41,20,62,63.ttf | Bin 2152 -> 2224 bytes + .../full-font/Roboto-Regular.drop-hints.61,62,63.ttf | Bin 1968 -> 2016 bytes + .../Roboto-Regular.drop-hints.D7,D8,D9,DA,DE.ttf | Bin 2188 -> 2252 bytes + 16 files changed, 0 insertions(+), 0 deletions(-) + +commit a8e7f9b958dcb4e00226f78d0ff83f031bc1323d +Author: Garret Rieger +Date: Thu May 3 10:59:00 2018 -0700 + + [subset] Get cmap tests passing again. + + test/api/fonts/Roboto-Regular.D7,D8,D9,DA,DE.ttf | Bin 2972 -> 2816 bytes + test/api/test-subset-cmap.c | 2 +- + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit c817992f495cba21bf468014f22afe349fbc799f +Author: Garret Rieger +Date: Thu May 3 10:53:20 2018 -0700 + + [subset] Write out a format 4, plat 0 encoding record to match fontTools. + + src/hb-ot-cmap-table.hh | 24 +++++++++++++++--------- + test/api/test-subset-cmap.c | 2 +- + 2 files changed, 16 insertions(+), 10 deletions(-) + +commit 9ef55a4c1354028f4d5e81300cdaf8ce5e03b8e9 +Author: Garret Rieger +Date: Wed May 2 18:50:56 2018 -0700 + + [subset] A few bug fixes for cmap format 4 subsetting. + + src/hb-ot-cmap-table.hh | 57 ++++++++++++++++++++++++++++--------------------- + 1 file changed, 33 insertions(+), 24 deletions(-) + +commit 81ea75f5c860ef682184bd2c9d0ff8b48251e3ce +Author: Garret Rieger +Date: Wed May 2 17:46:30 2018 -0700 + + [subset] Complete implementation of cmap4 subsetting. + + src/hb-ot-cmap-table.hh | 31 ++++++++++++++++++++++++++++--- + 1 file changed, 28 insertions(+), 3 deletions(-) + +commit 4195a52b041af749046b716dcac7d6560ae37611 +Author: Garret Rieger +Date: Wed May 2 17:11:18 2018 -0700 + + [subset] WIP implementation of serialize for cmap format 4. + + src/hb-ot-cmap-table.hh | 39 ++++++++++++++++++++++++++++++++++++++- + 1 file changed, 38 insertions(+), 1 deletion(-) + +commit cfa592d31ce2fd1ec2765a69ab31bf80161479dd +Author: Garret Rieger +Date: Wed May 2 16:37:38 2018 -0700 + + [subset] Add an implement for cmap format 4 create_sub_table_plan. + + src/hb-ot-cmap-table.hh | 43 ++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 42 insertions(+), 1 deletion(-) + +commit 295d67ea7d0ddac5666bd6aa4b647dd9cbf8e8f7 +Author: Garret Rieger +Date: Wed May 2 16:12:04 2018 -0700 + + [subset] WIP cmap format 4 subsetting. + + src/hb-ot-cmap-table.hh | 104 ++++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 88 insertions(+), 16 deletions(-) + +commit 0053d13283458996372f04bd501001d450523605 +Author: Garret Rieger +Date: Wed May 2 15:42:43 2018 -0700 + + [subset] Refactor cmap subsetting to make it possible to add support for more sub tables. + + src/hb-ot-cmap-table.hh | 161 ++++++++++++++++++++++++++++++------------------ + 1 file changed, 102 insertions(+), 59 deletions(-) + +commit 03b27548123756dfd9988a8fc74bc78733fb2c44 +Author: Garret Rieger +Date: Wed May 2 15:42:08 2018 -0700 + + [subset] Add const to the hb_subset_plan_t input to a couple functions in hb-subset-plan. + + src/hb-subset-plan.cc | 4 ++-- + src/hb-subset-plan.hh | 18 +++++++++--------- + 2 files changed, 11 insertions(+), 11 deletions(-) + +commit 5b93f6916958e6096044372c1195501ea9f37436 +Author: Behdad Esfahbod +Date: Wed May 2 14:59:14 2018 -0400 + + Rename some X-terminated members to Z-terminated + + X-terminated means don't access this, it's not located correctly. + Z-terminated means this is a C array with no bound checking. + + src/hb-aat-layout-morx-table.hh | 4 ++-- + src/hb-open-type-private.hh | 16 ++++++++-------- + src/hb-ot-cmap-table.hh | 28 ++++++++++++++-------------- + src/hb-ot-glyf-table.hh | 14 +++++++------- + src/hb-ot-var-avar-table.hh | 6 +++--- + 5 files changed, 34 insertions(+), 34 deletions(-) + +commit f1f6bc0a6f28a6611a247f37b8a83e6f782d7227 +Author: Behdad Esfahbod +Date: Wed May 2 12:56:21 2018 -0400 + + [set] Fix init/fini of set on the stack to call object init/fini + + Part of https://github.com/harfbuzz/harfbuzz/issues/1017 + + src/hb-set-private.hh | 14 ++++++++++++-- + src/hb-set.cc | 4 ++-- + 2 files changed, 14 insertions(+), 4 deletions(-) + +commit 37b95612d4ae8a9d75a1a5a5165bc073c709cf30 +Author: Behdad Esfahbod +Date: Tue May 1 19:09:00 2018 -0400 + + Remove hb_auto_array_t + + Part of https://github.com/harfbuzz/harfbuzz/issues/1017 + + src/hb-coretext.cc | 8 ++++---- + src/hb-ot-cmap-table.hh | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-subset-plan.cc | 2 +- + src/hb-uniscribe.cc | 12 ++++++------ + 5 files changed, 13 insertions(+), 13 deletions(-) + +commit 5c3112aec8b77d0fe39164f0f700e2a1aa810022 +Author: Behdad Esfahbod +Date: Tue May 1 19:07:04 2018 -0400 + + s/hb_prealloced_array_t/hb_vector_t/g + + Part of https://github.com/harfbuzz/harfbuzz/issues/1017 + + src/hb-ot-cmap-table.hh | 6 +++--- + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-ot-map-private.hh | 10 +++++----- + src/hb-ot-os2-table.hh | 4 ++-- + src/hb-ot-post-table.hh | 2 +- + src/hb-private.hh | 6 +++--- + src/hb-set-private.hh | 4 ++-- + src/hb-subset-glyf.cc | 12 ++++++------ + src/hb-subset-plan.cc | 8 ++++---- + src/hb-subset-plan.hh | 6 +++--- + src/hb-subset.cc | 2 +- + 11 files changed, 31 insertions(+), 31 deletions(-) + +commit 4a01eb1234a72e6a91ed66d3ed60b5db378fe340 +Author: Behdad Esfahbod +Date: Tue May 1 19:05:58 2018 -0400 + + Add hb_auto_t + + Part of https://github.com/harfbuzz/harfbuzz/issues/1017 + + src/hb-private.hh | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +commit a60ba7964ea196a3a02c48e813f2d9505d0cded2 +Author: Behdad Esfahbod +Date: Tue May 1 19:01:25 2018 -0400 + + s/finish/fini + + For consistency. + + src/hb-common.cc | 8 ++++---- + src/hb-mutex-private.hh | 2 +- + src/hb-object-private.hh | 10 +++++----- + src/hb-ot-layout-private.hh | 4 ++-- + src/hb-ot-map-private.hh | 14 +++++++------- + src/hb-ot-post-table.hh | 2 +- + src/hb-ot-shape-private.hh | 4 ++-- + src/hb-ot-shape.cc | 2 +- + src/hb-private.hh | 16 ++++++++-------- + src/hb-set-private.hh | 6 +++--- + src/hb-set.cc | 2 +- + src/hb-subset-glyf.cc | 6 +++--- + src/hb-subset-plan.cc | 6 +++--- + src/hb-subset.cc | 2 +- + 14 files changed, 42 insertions(+), 42 deletions(-) + +commit 17618ee2ecd02cb100ca911bd1907d108e9df475 +Author: Behdad Esfahbod +Date: Tue May 1 18:39:25 2018 -0400 + + Add hb_object_fini() + + src/hb-object-private.hh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit bd5f918e2f86241d3e2cb706bf558de21c198860 +Author: Behdad Esfahbod +Date: Tue May 1 18:27:41 2018 -0400 + + [set] Cache population + + Part of https://github.com/harfbuzz/harfbuzz/issues/1017 + + src/hb-set-private.hh | 24 +++++++++++++++++++++++- + src/hb-set.cc | 1 + + 2 files changed, 24 insertions(+), 1 deletion(-) + +commit 93b03119da8674a3eddb7879857e9f17fa16fd2a +Author: violet-sippial <38817272+violet-sippial@users.noreply.github.com> +Date: Sat Apr 28 20:29:13 2018 +0200 + + [subset] Do not compare ttx progress output in the tests + + Suppress progress messages of ttx. This avoids comparing this output to the reference file which lets the test fail. + + test/subset/run-tests.py | 1 + + 1 file changed, 1 insertion(+) + +commit a57f5a1a185c333ae21a4ac1577387312895e107 +Author: Ebrahim Byagowi +Date: Sat Apr 28 13:58:55 2018 +0430 + + [dwrite] Minor, enable the original code assertions + + src/hb-directwrite.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9925030f19851957381b78c197e6f50c77fde756 +Author: Ebrahim Byagowi +Date: Fri Apr 13 12:43:29 2018 +0430 + + Don't decompose Bengali Rra and Rha + + Fixes #779 and follow up to b01d9b3d90e892341ee4463f2eda4600850b97d8 + + src/hb-ot-shape-complex-indic.cc | 3 +++ + test/shaping/data/in-house/Makefile.sources | 1 + + .../fonts/932ad5132c2761297c74e9976fe25b08e5ffa10b.ttf | Bin 0 -> 22980 bytes + test/shaping/data/in-house/tests/indic-decompose.tests | 1 + + 4 files changed, 5 insertions(+) + +commit 5ad87a93fefcb94ee5f28de8d75903b2550c8d94 +Author: Ebrahim Byagowi +Date: Wed Apr 25 16:44:04 2018 +0430 + + Minor, improve file reading failing condition comment + + https://bugzilla.gnome.org/show_bug.cgi?id=659212 for more context + + src/hb-blob.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 2eaba80cbd3afb32363da93ebf6e60b11509d3f8 +Author: Ebrahim Byagowi +Date: Tue Apr 24 09:04:15 2018 +0430 + + Minor, re-add unused mark to some of ragel defined state machines (#1005) + + src/hb-ot-shape-complex-indic-machine.hh | 2 +- + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + src/hb-ot-shape-complex-khmer-machine.hh | 2 +- + src/hb-ot-shape-complex-khmer-machine.rl | 2 +- + src/hb-ot-shape-complex-myanmar-machine.hh | 2 +- + src/hb-ot-shape-complex-myanmar-machine.rl | 2 +- + src/hb-ot-shape-complex-use-machine.hh | 2 +- + src/hb-ot-shape-complex-use-machine.rl | 2 +- + 8 files changed, 8 insertions(+), 8 deletions(-) + +commit 48f0204cfea616a788d75c5065ad4999c7685513 +Author: Ebrahim Byagowi +Date: Tue Apr 24 08:11:13 2018 +0430 + + Minor, re-add unused mark for two TRACE_ macros + + To revive Travis CI bot + + src/hb-debug.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 816b8169a90e0454b82a83719fc9ec1c83934d6f +Author: Ebrahim Byagowi +Date: Mon Apr 23 19:36:53 2018 +0430 + + Resolve some of clang's double-promotion warnings + + src/hb-aat-layout-trak-table.hh | 6 +++--- + src/hb-open-type-private.hh | 8 ++++---- + src/hb-ot-layout-common-private.hh | 2 +- + 3 files changed, 8 insertions(+), 8 deletions(-) + +commit 24b8b9b227f53b4f67a713c994cec04a5f774634 +Author: Ebrahim Byagowi +Date: Mon Apr 23 19:03:57 2018 +0430 + + Resolve clang's used-but-marked-unused warnings + + src/hb-debug.hh | 4 ++-- + src/hb-font.cc | 4 ++-- + src/hb-ft.cc | 8 ++++---- + src/hb-open-type-private.hh | 2 +- + src/hb-ot-font.cc | 6 +++--- + src/hb-ot-shape-complex-indic-machine.hh | 2 +- + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + src/hb-ot-shape-complex-khmer-machine.hh | 2 +- + src/hb-ot-shape-complex-khmer-machine.rl | 2 +- + src/hb-ot-shape-complex-myanmar-machine.hh | 2 +- + src/hb-ot-shape-complex-myanmar-machine.rl | 2 +- + src/hb-ot-shape-complex-use-machine.hh | 2 +- + src/hb-ot-shape-complex-use-machine.rl | 2 +- + src/hb-set.cc | 2 +- + src/hb-unicode.cc | 2 +- + 15 files changed, 22 insertions(+), 22 deletions(-) + +commit eaf649450a29115ca0b2aac2921cc40c17aa55ac +Author: Ebrahim Byagowi +Date: Mon Apr 23 18:39:40 2018 +0430 + + Resolve clang's conditional-uninitialize warnings + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-shape-normalize.cc | 4 ++-- + util/view-cairo.cc | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 8b0d642e6610dd44f98a986580451eb562276897 +Author: Ebrahim Byagowi +Date: Mon Apr 23 18:37:35 2018 +0430 + + Resolve some of clang's zero-as-null-pointer-constant warnings + + src/hb-coretext.cc | 4 ++-- + src/hb-dsalgs.hh | 2 +- + src/hb-ot-os2-unicode-ranges.hh | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 8100380d9e6fdd52eb7054f3300046028dcde8f9 +Author: Ebrahim Byagowi +Date: Sun Apr 22 10:58:37 2018 +0430 + + Minor, fix calloc call order + + src/hb-blob.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2a4cdfad20fa8f0d2894383c2f10a6983f88b34b +Author: Ebrahim Byagowi +Date: Fri Apr 20 21:12:58 2018 +0430 + + [aat/kerx] Minor (#1003) + + src/hb-aat-layout-kerx-table.hh | 46 +++++++++++++++++++++-------------------- + 1 file changed, 24 insertions(+), 22 deletions(-) + +commit ce17340b23d96f543cd88e400e631bdb5656331c +Author: Ebrahim Byagowi +Date: Fri Apr 20 10:29:06 2018 +0430 + + Add hb_blob_create_from_file, a new API (#926) + + TODO | 2 - + docs/harfbuzz-sections.txt | 1 + + src/dump-emoji.cc | 33 +---------- + src/dump-fon.cc | 11 +--- + src/hb-blob.cc | 131 ++++++++++++++++++++++++++++++++++++++++--- + src/hb-blob.h | 2 + + src/main.cc | 26 +-------- + src/test-buffer-serialize.cc | 42 +------------- + src/test-size-params.cc | 42 +------------- + src/test-would-substitute.cc | 42 +------------- + src/test.cc | 42 +------------- + test/api/hb-subset-test.h | 54 +----------------- + test/api/hb-test.h | 33 ----------- + util/options.cc | 88 +++++++---------------------- + util/options.hh | 6 -- + util/view-cairo.hh | 3 +- + 16 files changed, 159 insertions(+), 399 deletions(-) + +commit 4fa1c6705a1bc5299adb5a848ceaf6ac8f33c0ba +Author: Garret Rieger +Date: Thu Apr 19 15:30:35 2018 -0700 + + [subset] Check instruction offsets in glyph to ensure they are in bounds. + + src/hb-ot-glyf-table.hh | 18 ++++++++++-- + .../oom-ccc61c92d589f895174cdef6ff2e3b20e9999a1a | Bin 0 -> 63302 bytes + test/api/test-subset-glyf.c | 31 +++++++++++++++++++++ + 3 files changed, 47 insertions(+), 2 deletions(-) + +commit 3c97614598ecd0bbccb2c90a8e0e99f010952b76 +Author: Garret Rieger +Date: Thu Apr 19 13:39:57 2018 -0700 + + [subset] In subset fuzzer run through drop hints and keep hints pathways. + + test/fuzzing/hb-subset-fuzzer.cc | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit 6fdeeb2ae3059ac1bc5ff99fd1655b4e94576151 +Author: Khaled Hosny +Date: Thu Apr 19 23:41:37 2018 +0300 + + [util] Check all specified shapers are known (#993) + + A bit brute force and requires all shapers to be known, not just one. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/956 + + util/options.cc | 22 ++++++++++++++++++++-- + 1 file changed, 20 insertions(+), 2 deletions(-) + +commit 535fb23c0211c733d59f72c3431643d89dc16d16 +Author: Garret Rieger +Date: Wed Apr 18 17:37:39 2018 -0700 + + [subset] Add integration tests for cmap breakge. + + .../full-font/Roboto-Regular.default.D7,D8,D9,DA,DE.ttf | Bin 0 -> 3668 bytes + .../Roboto-Regular.drop-hints.D7,D8,D9,DA,DE.ttf | Bin 0 -> 2188 bytes + test/subset/data/tests/full-font.tests | 1 + + 3 files changed, 1 insertion(+) + +commit e29c8e33f3debf721e18306b896df7a3233386ac +Author: Garret Rieger +Date: Wed Apr 18 17:32:43 2018 -0700 + + [subset] Add a test for previous cmap breakage. + + test/api/fonts/Roboto-Regular.D7,D8,D9,DA,DE.ttf | Bin 0 -> 2972 bytes + test/api/test-subset-cmap.c | 23 +++++++++++++++++++++++ + 2 files changed, 23 insertions(+) + +commit 5e318e09ba590eef7b7ec047d7857f7f1eb7d787 +Author: Garret Rieger +Date: Wed Apr 18 17:13:37 2018 -0700 + + [subset] Fix broken cmap creation. + It was ignoring the restriction that gids must be consecutive to be placed into a single group. + + src/hb-ot-cmap-table.hh | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +commit a47070cd40cee51fe792cb838ff9f21e0ea482c6 +Author: Ebrahim Byagowi +Date: Wed Apr 18 12:09:37 2018 +0430 + + Minor, annotate the added tables with likely/unlikely (#997) + + src/hb-aat-fmtx-table.hh | 2 +- + src/hb-aat-gcid-table.hh | 2 +- + src/hb-aat-layout-ankr-table.hh | 7 ++++--- + src/hb-aat-layout-bsln-table.hh | 9 +++++---- + src/hb-aat-layout-feat-table.hh | 10 +++++----- + src/hb-aat-layout-kerx-table.hh | 12 ++++++------ + src/hb-aat-layout-trak-table.hh | 21 +++++++++++++-------- + src/hb-aat-ltag-table.hh | 2 +- + src/hb-ot-color-colr-table.hh | 10 +++++----- + src/hb-ot-color-cpal-table.hh | 18 ++++++++++-------- + src/hb-ot-color-sbix-table.hh | 2 +- + src/hb-ot-color-svg-table.hh | 6 +++--- + 12 files changed, 55 insertions(+), 46 deletions(-) + +commit 1a309dcd72f9f54672a7341788a9b2241c922793 +Author: Garret Rieger +Date: Tue Apr 17 18:11:32 2018 -0700 + + [subset] Remove printf's from fuzzing targets. + + test/fuzzing/hb-subset-fuzzer.cc | 1 - + test/fuzzing/hb-subset-get-codepoints-fuzzer.cc | 1 - + 2 files changed, 2 deletions(-) + +commit c55aa147c33eb733ab552d404a88749cb6ff6d73 +Author: Ebrahim Byagowi +Date: Wed Apr 18 00:01:20 2018 +0430 + + Do sanitization before the use on 'main' mini-program (#994) + + src/main.cc | 22 ++++++++++++++++++---- + 1 file changed, 18 insertions(+), 4 deletions(-) + +commit c02b40e58f35ecd10c4945d2fa2b7074137c2c04 +Author: Garret Rieger +Date: Tue Apr 17 08:21:22 2018 -0600 + + [subset] add a fuzzer target for subset_get_all_codepoints method. (#987) + + test/fuzzing/CMakeLists.txt | 7 ++++++- + test/fuzzing/Makefile.am | 16 ++++++++++++++++ + test/fuzzing/hb-subset-get-codepoints-fuzzer.cc | 24 ++++++++++++++++++++++++ + test/fuzzing/run-subset-fuzzer-tests.py | 19 ++++++++++++++++++- + 4 files changed, 64 insertions(+), 2 deletions(-) + +commit 924803166e074c569ecfa7e598686f334777770f +Author: Behdad Esfahbod +Date: Tue Apr 17 15:32:02 2018 +0200 + + [colr] Check layer record access + + src/hb-ot-color-colr-table.hh | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 5dadbb0fa096574b6bccd75cced203baf615fedf +Author: Garret Rieger +Date: Tue Apr 17 07:00:23 2018 -0600 + + [subset] Add implementation of cmap format 12 codepoint listing. (#988) + + src/hb-ot-cmap-table.hh | 21 +++++++++++- + test/api/fonts/Roboto-Regular.abc.format12.ttf | Bin 0 -> 2412 bytes + test/api/test-subset-codepoints.c | 44 +++++++++++++++++++++++++ + 3 files changed, 64 insertions(+), 1 deletion(-) + +commit 6771e79bcc2166b5c03ca615d271c8508d692416 +Author: Ebrahim Byagowi +Date: Tue Apr 17 09:36:52 2018 +0430 + + Add pre-opentype font pages detection code (#986) + + As Khaled's finding on #981 this is the way Uniscribe detects those fonts. This is its detection part. + + src/hb-ot-os2-table.hh | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit 277e328986d5887fa93c72dc8b12d842d41db87f +Author: Ebrahim Byagowi +Date: Tue Apr 17 09:13:35 2018 +0430 + + Make some of implicit header uses explicit (#989) + + Splitted from #950 and #986 IIRC Chromium had a policy about this encouraging it, + not sure about automated way to detect and add them but for now lets have the needed + ones of them. + + src/hb-aat-layout-morx-table.hh | 1 + + src/hb-aat-layout-trak-table.hh | 1 + + src/hb-ot-hdmx-table.hh | 1 + + src/hb-ot-hmtx-table.hh | 1 + + src/hb-ot-os2-table.hh | 1 + + src/hb-ot-post-table.hh | 1 + + 6 files changed, 6 insertions(+) + +commit f5811bad04be9dac8a4fca8e16904d6270e47777 +Author: Ebrahim Byagowi +Date: Tue Apr 17 09:13:03 2018 +0430 + + Add round to F2DOT14 inner store setter (#990) + + It uses floor implicitly without it but explicit use of round will be more correct. + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 39754fb65981fa8d11615e1dced852285ad09e4e +Author: Garret Rieger +Date: Mon Apr 16 15:09:27 2018 -0700 + + [subset] Don't assume the last segment in cmap 4 can be skipped, actually check it. + + src/hb-ot-cmap-table.hh | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 21a181af2bf1582991c55de5f9281494733c5d12 +Author: Garret Rieger +Date: Tue Apr 10 15:40:24 2018 -0700 + + [subset] sketch out support for a call that lists all codepoints present in a font. Implement support for it in format 4 cmap sub table. + + src/hb-ot-cmap-table.hh | 37 ++++++++++++++-- + src/hb-subset.cc | 14 ++++++ + src/hb-subset.h | 5 ++- + test/api/Makefile.am | 2 + + test/api/fonts/Roboto-Regular.abc.format4.ttf | Bin 0 -> 2424 bytes + test/api/test-subset-codepoints.c | 59 ++++++++++++++++++++++++++ + 6 files changed, 113 insertions(+), 4 deletions(-) + +commit aef96e246cb695c4c83b8b6daed06a0d14fe1d32 +Author: Ebrahim Byagowi +Date: Mon Apr 16 18:30:25 2018 +0430 + + Further improvements on dump-fon (#985) + + src/dump-fon.cc | 153 +++++++++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 123 insertions(+), 30 deletions(-) + +commit 67dfb1937b703b3f1dc45251f4f884abf35c8576 +Author: Ebrahim Byagowi +Date: Mon Apr 16 14:25:45 2018 +0430 + + Add dump-fon, a prototype on how to work with .fon/.fnt files (#981) + + src/Makefile.am | 4 + + src/dump-fon.cc | 475 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 479 insertions(+) + +commit ce99dd04de830c8426af14c11dbee45f8bcc9e60 +Author: Ebrahim Byagowi +Date: Sun Apr 15 22:08:50 2018 +0430 + + Implement to_float and set_float of F2DOT14 (#984) + + src/hb-open-type-private.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 435b1878e710b67e21872572ad9fd5ed1369e97f +Author: Ebrahim Byagowi +Date: Sun Apr 15 21:18:48 2018 +0430 + + Rename UINT24 to HBUINT24 for consistency (#983) + + src/hb-open-type-private.hh | 2 +- + src/hb-ot-cmap-table.hh | 6 +++--- + src/hb-ot-layout-common-private.hh | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit 3737c652a5e0b6d73b6090dc6c3863008c9dc8fd +Merge: 632713ba 8f4c1230 +Author: Ebrahim Byagowi +Date: Fri Apr 13 23:19:19 2018 +0430 + + Merge pull request #979 from ebraminio/msvc05 + + Reinstate support for Visual Studio 2005 + +commit 8f4c12308a8d9e61922fb352e913acae46b28a88 +Author: Tor Andersson +Date: Fri Apr 13 23:01:54 2018 +0430 + + Reinstate support for Visual Studio 2005 + + src/hb-common.h | 10 ++++++++++ + src/hb-private.hh | 6 +++--- + src/hb-ucdn/ucdn.h | 10 ++++++++++ + 3 files changed, 23 insertions(+), 3 deletions(-) + +commit 632713babbc349920f71f73cc304c9a18078fd6b +Author: Ebrahim Byagowi +Date: Thu Apr 12 14:17:03 2018 +0430 + + Always enable atexit on Android (#971) + + Obviously one can use a newer NDK for building an updated HarfBuzz + instead that now pretty old version however I am concerned if that + version checking is working with clang that is used with the newer + NDK versions. + + src/hb-private.hh | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +commit f24b0b9728f87d7599867a4ba6ec7d30da43b869 +Author: Ebrahim Byagowi +Date: Thu Apr 12 13:40:45 2018 +0430 + + Update the links and revive the dead ones + + src/hb-common.cc | 4 ++-- + src/hb-common.h | 6 +++--- + src/hb-coretext.cc | 6 +++--- + src/hb-ft.cc | 2 +- + src/hb-ot-cmap-table.hh | 12 ++++++------ + src/hb-ot-layout-common-private.hh | 8 ++++---- + src/hb-ot-layout-private.hh | 2 +- + src/hb-ot-layout.h | 2 +- + src/hb-ot-shape-complex-arabic.cc | 4 ++-- + src/hb-ot-shape-complex-indic-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 4 ++-- + src/hb-ot-shape-complex-khmer.cc | 2 +- + src/hb-ot-shape-complex-myanmar-private.hh | 2 +- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape-complex-use-private.hh | 2 +- + src/hb-ot-shape-complex-use.cc | 2 +- + src/hb-ot-shape-fallback.cc | 2 +- + src/hb-ot-tag.cc | 9 ++++----- + src/hb-private.hh | 4 ++-- + src/hb-string-array.hh | 2 +- + src/hb-unicode-private.hh | 18 +++++++++--------- + test/api/test-buffer.c | 2 +- + test/api/test-ot-tag.c | 6 +++--- + test/api/test-shape.c | 2 +- + 25 files changed, 54 insertions(+), 55 deletions(-) + +commit a02c3ee70f4ca9de1fd55f1d8d535f6bd0d32606 +Author: Ebrahim Byagowi +Date: Thu Apr 12 13:38:19 2018 +0430 + + Add or update tables specifications links + + src/hb-aat-fmtx-table.hh | 9 ++++----- + src/hb-aat-gcid-table.hh | 8 ++++---- + src/hb-aat-layout-ankr-table.hh | 8 ++++---- + src/hb-aat-layout-bsln-table.hh | 10 +++++----- + src/hb-aat-layout-feat-table.hh | 10 +++++----- + src/hb-aat-layout-kerx-table.hh | 4 ++++ + src/hb-aat-layout-morx-table.hh | 4 ++++ + src/hb-aat-layout-trak-table.hh | 4 ++++ + src/hb-aat-ltag-table.hh | 10 +++++----- + src/hb-ot-color-cbdt-table.hh | 24 ++++++++++++------------ + src/hb-ot-color-colr-table.hh | 6 +++--- + src/hb-ot-color-cpal-table.hh | 6 +++--- + src/hb-ot-color-sbix-table.hh | 11 ++++++----- + src/hb-ot-color-svg-table.hh | 3 ++- + src/hb-ot-glyf-table.hh | 4 ++-- + src/hb-ot-hdmx-table.hh | 11 ++++++----- + src/hb-ot-head-table.hh | 10 +++++----- + src/hb-ot-hhea-table.hh | 15 ++++++++------- + src/hb-ot-hmtx-table.hh | 14 +++++++------- + src/hb-ot-kern-table.hh | 10 ++++++---- + src/hb-ot-layout-base-table.hh | 3 ++- + src/hb-ot-layout-gdef-table.hh | 3 ++- + src/hb-ot-layout-gpos-table.hh | 3 ++- + src/hb-ot-layout-gsub-table.hh | 3 ++- + src/hb-ot-layout-jstf-table.hh | 3 ++- + src/hb-ot-math-table.hh | 3 ++- + src/hb-ot-maxp-table.hh | 3 ++- + src/hb-ot-name-table.hh | 4 ++-- + src/hb-ot-os2-table.hh | 3 +-- + src/hb-ot-post-table.hh | 8 ++++---- + src/hb-ot-var-avar-table.hh | 14 ++++++++------ + src/hb-ot-var-fvar-table.hh | 15 ++++++++------- + src/hb-ot-var-hvar-table.hh | 7 ++++--- + src/hb-ot-var-mvar-table.hh | 4 ++-- + 34 files changed, 142 insertions(+), 115 deletions(-) + +commit b799fc80777c1424e469a835f782b4e0f41c0043 +Author: Ebrahim Byagowi +Date: Wed Apr 11 18:36:09 2018 +0430 + + minor, use LOffsetTo and LArrayOf whenever possible (#966) + + src/hb-aat-layout-morx-table.hh | 10 ++++++---- + src/hb-aat-ltag-table.hh | 2 +- + src/hb-open-file-private.hh | 2 +- + src/hb-ot-cmap-table.hh | 4 ++-- + 4 files changed, 10 insertions(+), 8 deletions(-) + +commit cb3fa70cd4c33e9f1c736f778cb3b606d15c0936 +Author: Ebrahim Byagowi +Date: Wed Apr 11 18:00:13 2018 +0430 + + [dwrite] Cosmetic change (#963) + + src/hb-directwrite.cc | 39 +++++++++++++++++++-------------------- + src/hb-directwrite.h | 5 +++-- + 2 files changed, 22 insertions(+), 22 deletions(-) + +commit 09d5e5468858f4403ce91aca46749397b23825d9 +Author: Ebrahim Byagowi +Date: Wed Apr 11 17:41:48 2018 +0430 + + [graphite] Use tabs instead 8 spaces (#965) + + src/hb-graphite2.cc | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 211da5efdcaff203eafda2a5081cd81e3d6cc35b +Author: Ebrahim Byagowi +Date: Wed Apr 11 17:41:24 2018 +0430 + + [aat] Cosmetic changes (#964) + + src/hb-aat-gcid-table.hh | 4 ++-- + src/hb-aat-layout-ankr-table.hh | 11 ++++++----- + src/hb-aat-layout-common-private.hh | 6 +++--- + src/hb-aat-layout-kerx-table.hh | 29 +++++++++++++++-------------- + src/hb-aat-layout-morx-table.hh | 6 +++--- + src/hb-aat-layout-trak-table.hh | 10 +++++----- + src/hb-aat-ltag-table.hh | 8 ++++---- + 7 files changed, 38 insertions(+), 36 deletions(-) + +commit f8bb582bcc2af6cae531d8255da002f0c514f1a9 +Author: Ebrahim Byagowi +Date: Wed Apr 11 17:13:20 2018 +0430 + + [ot-color] Cosmetic changes (#962) + + src/hb-open-type-private.hh | 1 - + src/hb-ot-color-cbdt-table.hh | 10 +++++----- + src/hb-ot-color-cpal-table.hh | 4 ++-- + src/hb-ot-color-sbix-table.hh | 41 ++++++++++++++++++++--------------------- + src/hb-ot-color-svg-table.hh | 37 +++++++++++++++++++------------------ + 5 files changed, 46 insertions(+), 47 deletions(-) + +commit 1e1e9086c09185a7bd6f65d1e391418642229616 +Author: Ebrahim Byagowi +Date: Tue Apr 10 03:26:01 2018 +0430 + + minor + + src/dump-emoji.cc | 1 + + 1 file changed, 1 insertion(+) + +commit a62554af89b8324c73c623e64f87ec822c757515 +Author: Ebrahim Byagowi +Date: Tue Apr 10 00:53:50 2018 +0430 + + [colr/cpal] Improvements and add a sample renderer (#927) + + src/Makefile.am | 13 ++- + src/dump-emoji.cc | 181 +++++++++++++++++++++++++++++++++++++++--- + src/hb-ot-color-colr-table.hh | 43 +++++++++- + src/hb-ot-color-cpal-table.hh | 70 +++++++++------- + 4 files changed, 259 insertions(+), 48 deletions(-) + +commit f25731a3606ff0972505eeb934477480019ffcd3 +Author: Ebrahim Byagowi +Date: Tue Apr 10 00:51:57 2018 +0430 + + [ci] Don't fail on brew warnings + + Not the best fix but it works and we don't care about brew warnings, so + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 58e569e5f7143a12cadcd6c42434558f9981e00e +Author: Ryan Schmidt +Date: Thu Apr 5 17:03:36 2018 -0500 + + Fix build with CoreText on OS X 10.7 and earlier (#952) + + src/hb-coretext.cc | 30 ++++++++++++++++++++++++++++-- + 1 file changed, 28 insertions(+), 2 deletions(-) + +commit d3984b45b5d110f34febbb9e1d8a9c2203080a1b +Author: Ebrahim Byagowi +Date: Sun Apr 1 12:16:42 2018 +0430 + + [aat] Further improvements on feat (#948) + + src/Makefile.sources | 2 +- + ...t-feat-table.hh => hb-aat-layout-feat-table.hh} | 48 +++++++++++----------- + src/hb-aat-layout.cc | 2 +- + 3 files changed, 25 insertions(+), 27 deletions(-) + +commit 93dad9ade7078d28086b2e5c3b5e8dafa67617d2 +Author: Behdad Esfahbod +Date: Sat Mar 31 17:06:17 2018 +0200 + + [hangul] Fix comment + + src/hb-ot-shape-complex-hangul.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 44bf4320922d340d1357c4d42d093fa466c3610f +Author: Ebrahim Byagowi +Date: Sat Mar 31 16:51:36 2018 +0430 + + [aat] Implement feat table parsing (#947) + + src/Makefile.sources | 3 +- + src/hb-aat-feat-table.hh | 122 +++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-aat-layout.cc | 1 + + 3 files changed, 125 insertions(+), 1 deletion(-) + +commit 08b8eb678a6cb74c118a32e75b880599e3ac4a7c +Author: Behdad Esfahbod +Date: Sat Mar 31 12:15:50 2018 +0200 + + Another try at fixing linker issue + + Fixes https://github.com/harfbuzz/harfbuzz/issues/880 + + configure.ac | 11 +++++++++-- + src/Makefile.am | 6 ------ + 2 files changed, 9 insertions(+), 8 deletions(-) + +commit eff36cd8f06ee992218ed3f198f6a4ea19d7089c +Author: Ebrahim Byagowi +Date: Fri Mar 30 22:25:35 2018 +0430 + + Minor build related changes + + .editorconfig | 3 +++ + CMakeLists.txt | 6 +++--- + configure.ac | 2 +- + 3 files changed, 7 insertions(+), 4 deletions(-) + +commit 9d68f73d5cf3f3df6bc5516ada987d9019d3fe3d +Author: Ebrahim Byagowi +Date: Fri Mar 30 21:57:10 2018 +0430 + + [aat] Implement gcid table parsing (#944) + + src/Makefile.sources | 1 + + src/hb-aat-gcid-table.hh | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-aat-layout.cc | 1 + + 3 files changed, 75 insertions(+) + +commit 0e230a83ae8a2c5fbe40dc0e74e5e7ead106e45e +Author: Ebrahim Byagowi +Date: Fri Mar 30 19:36:00 2018 +0430 + + [aat] Implement bsln table parsing (#943) + + src/Makefile.sources | 1 + + src/hb-aat-layout-bsln-table.hh | 156 ++++++++++++++++++++++++++++++++++++++++ + src/hb-aat-layout.cc | 3 +- + 3 files changed, 159 insertions(+), 1 deletion(-) + +commit 70d36543aa929320ff82a9ce589786e58adb1836 +Author: Ebrahim Byagowi +Date: Fri Mar 30 05:00:28 2018 +0430 + + Make atexit callbacks threadsafe (#930) + + src/hb-common.cc | 60 +++++++++++++++++++++++++++++------------------------ + src/hb-ft.cc | 44 ++++++++++++++++++++++++--------------- + src/hb-glib.cc | 7 ++++++- + src/hb-icu.cc | 7 ++++++- + src/hb-ot-font.cc | 7 ++++++- + src/hb-shape.cc | 7 ++++++- + src/hb-shaper.cc | 9 ++++++-- + src/hb-ucdn.cc | 7 ++++++- + src/hb-uniscribe.cc | 8 +++++++ + 9 files changed, 105 insertions(+), 51 deletions(-) + +commit d3a432a7b272917edb83f8fe8468120beb37206b +Author: Ebrahim Byagowi +Date: Fri Mar 30 04:58:47 2018 +0430 + + [graphite] Make get_table threadsafe (#931) + + src/hb-graphite2.cc | 10 ++++++---- + src/hb-graphite2.h | 4 ++-- + 2 files changed, 8 insertions(+), 6 deletions(-) + +commit 80395f14e8873f30d2c9a49e42fc9febf5c87e45 +Author: Ebrahim Byagowi +Date: Thu Mar 29 22:00:41 2018 +0430 + + Make gen-* scripts LC_ALL=C compatible (#942) + + src/gen-arabic-table.py | 5 ++--- + src/gen-indic-table.py | 4 ++-- + src/gen-use-table.py | 4 ++-- + 3 files changed, 6 insertions(+), 7 deletions(-) + +commit 26e0cbd834e7a8bab331b395257e9c21dde4c2b1 +Author: Ebrahim Byagowi +Date: Thu Mar 29 21:22:47 2018 +0430 + + Actual py3 compatibility making on gen-* scripts (#941) + + src/gen-arabic-table.py | 6 ++---- + src/gen-indic-table.py | 13 +++++-------- + src/gen-use-table.py | 12 +++++++++--- + test/shaping/hb_test_tools.py | 4 ++-- + 4 files changed, 18 insertions(+), 17 deletions(-) + +commit cab2c2c08c67e7d1606c03700df3e4e9c0dc59fd +Author: Ebrahim Byagowi +Date: Thu Mar 29 12:48:47 2018 +0430 + + Make more gen-* scripts py3 compatible (#940) + + src/Makefile.am | 2 +- + src/gen-arabic-table.py | 163 +++++++++++---------- + src/gen-def.py | 2 +- + src/gen-indic-table.py | 120 +++++++-------- + src/gen-unicode-ranges.py | 8 +- + src/gen-use-table.py | 3 +- + src/hb-ot-shape-complex-indic-table.cc | 2 - + src/sample.py | 5 +- + test/fuzzing/run-shape-fuzzer-tests.py | 3 +- + test/fuzzing/run-subset-fuzzer-tests.py | 3 +- + .../data/text-rendering-tests/extract-tests.py | 3 +- + test/shaping/hb_test_tools.py | 3 +- + test/shaping/run-tests.py | 3 +- + test/subset/run-tests.py | 2 +- + 14 files changed, 166 insertions(+), 156 deletions(-) + +commit 5f7f0bfa1ecef6406cb9670b4eb057ea12c28730 +Author: Ebrahim Byagowi +Date: Thu Mar 29 04:22:53 2018 +0430 + + Add README.wine.md and touch some other docs (#939) + + Makefile.am | 3 ++- + README.python => README.python.md | 12 +++++++++--- + README.wine.md | 40 +++++++++++++++++++++++++++++++++++++++ + RELEASING.md | 25 +++++++++++++----------- + 4 files changed, 65 insertions(+), 15 deletions(-) + +commit 5aa2c6e194bc75637d3f4862a096c0e7100072e2 +Author: Behdad Esfahbod +Date: Wed Mar 28 15:33:51 2018 -0700 + + [atexit] Make hb_languate_item_t *langs freeing threadsafe + + Part of https://github.com/harfbuzz/harfbuzz/issues/923 + + src/hb-common.cc | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +commit 8c9451107d46c87ed0e50e718977f0c286972f3b +Author: Behdad Esfahbod +Date: Wed Mar 28 14:06:58 2018 -0700 + + Fix one UBSan warning + + Fixes https://github.com/harfbuzz/harfbuzz/issues/935 + + src/hb-font-private.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 48baf7e389faf8a57649ddc572da2ec8ec8829bb +Author: Behdad Esfahbod +Date: Wed Mar 28 13:38:51 2018 -0700 + + [uniscribe] Fixup for previous commit + + Fixes https://github.com/harfbuzz/harfbuzz/issues/934 + + src/hb-uniscribe.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit b17e1a40885245df690a14c7528939b3881e1fe4 +Author: Behdad Esfahbod +Date: Wed Mar 28 10:44:52 2018 -0700 + + [uniscribe] Fix assertion fail in checksum calc + + Program: Z:\Users\ebrahim\Desktop\harfbuzz\winbuild\util\.libs\hb-shape.exe + File: ../../src/hb-open-type-private.hh, Line 769 + + Expression: 0 == (Length & 3) + + abnormal program termination + + src/hb-uniscribe.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a48dd6ef235d569d4b6f6f213ba93a54e142458d +Author: Ebrahim Byagowi +Date: Wed Mar 28 19:08:19 2018 +0430 + + Make gen-use-table.py py3 compatible (#932) + + src/gen-use-table.py | 105 ++++++++++++++++++++++++++------------------------- + 1 file changed, 53 insertions(+), 52 deletions(-) + +commit 1c3372786c503f3f9108971dfa8956e4cb95f65d +Author: Garret Rieger +Date: Tue Mar 27 10:42:19 2018 -0700 + + [subset] fix infinite loop bug in looping through tables for subsetting. + + src/hb-subset.cc | 2 +- + ...ase-minimized-hb-subset-fuzzer-5521982557782016 | Bin 0 -> 1228 bytes + test/api/test-subset.c | 23 +++++++++++++++++++++ + 3 files changed, 24 insertions(+), 1 deletion(-) + +commit 8fd55422c3fa2279991d93875d912fca4ee89cf5 +Author: Ebrahim Byagowi +Date: Tue Mar 27 16:57:09 2018 +0430 + + Implement an internal emojis dumper tool (#909) + + Later to be expanded to a more general tool but for now it only supports CBDT, SVG and CBDT. + + CMakeLists.txt | 2 +- + src/Makefile.am | 4 ++ + src/dump-emoji.cc | 141 ++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-color-cbdt-table.hh | 71 +++++++++++++++++++++ + src/hb-ot-color-sbix-table.hh | 79 ++++++++++++++--------- + src/hb-ot-color-svg-table.hh | 56 ++++++++++++----- + 6 files changed, 307 insertions(+), 46 deletions(-) + +commit 430f82817d048ac917f1956e07d9089b9fd7e695 +Author: Ebrahim Byagowi +Date: Tue Mar 27 13:59:56 2018 +0430 + + [ci] Fix coverage build fail (#925) + + src/Makefile.am | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 07851aae9d28fed751663c543799f2b59369f892 +Author: Garret Rieger +Date: Mon Mar 26 20:56:56 2018 -0600 + + [subset] Couple of fixes for fuzzer discovered issues. (#924) + + * [subset] sanitize individual DeviceRecord's as part of hdmx sanitization. + + * [subset] Fix out of bounds read with non-two byte align glyphs. + + * [subset] Just use size_device_record >= DeviceRecord::min_size. + + * [subset] Add TODO. + + * [subset] Re-order checks in hdmx sanitize. + + src/hb-ot-hdmx-table.hh | 1 + + src/hb-subset-glyf.cc | 6 +++--- + src/hb-subset.cc | 6 +++++- + ...ase-minimized-hb-subset-fuzzer-5609911946838016 | Bin 0 -> 313 bytes + ...ase-minimized-hb-subset-fuzzer-6651660668502016 | Bin 0 -> 15229 bytes + test/api/test-subset-hdmx.c | 23 +++++++++++++++++++++ + 6 files changed, 32 insertions(+), 4 deletions(-) + +commit 6f46883f5b74b206a3b77246891ab2ac57a27c4e +Author: Behdad Esfahbod +Date: Mon Mar 26 19:55:22 2018 -0700 + + [hdmx] Minor + + src/hb-ot-hdmx-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c589681926e50834bdc614479efced7382dfbf61 +Author: Behdad Esfahbod +Date: Mon Mar 26 19:55:16 2018 -0700 + + Minor + + src/check-symbols.sh | 2 -- + 1 file changed, 2 deletions(-) + +commit 19ec366fb12afe5fce23239bbeb61e67d732a169 +Author: Behdad Esfahbod +Date: Mon Mar 26 15:09:54 2018 -0700 + + Fix previous commit + + Automake has this stupid behavior where if your Makefile.am has + syntactic error, it can get to a state that make succeeds but just + ignores broken Makefile.am. Ouch. + + src/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +commit 44b6c77c64d367eb3c9227cf1c0fbaff4ab294b2 +Author: Behdad Esfahbod +Date: Mon Mar 26 14:26:45 2018 -0700 + + Try fixing linking again + + Before 1.7.5, we were setting -fno-exceptions etc on CXXFLAGS. In 1.7.6 + we set it as CPPFLAGS. Try fixing. Also, I'm fairly sure it's safe to + set these unconditionally. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/880 (or so I hope) + + src/Makefile.am | 19 +++++++------------ + test/api/Makefile.am | 2 +- + 2 files changed, 8 insertions(+), 13 deletions(-) + +commit e4d1cbfb4fbc17d7dbe08133d1e5e181e1c9bbc5 +Author: Behdad Esfahbod +Date: Mon Mar 26 14:09:29 2018 -0700 + + Add HB_SUBSET_BUILTIN + + Fixes https://github.com/harfbuzz/harfbuzz/issues/865 + + src/hb-subset.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c14b24fcd0052fc6100c32deea6ee1dcb0c98f85 +Author: Behdad Esfahbod +Date: Mon Mar 26 10:44:54 2018 -0700 + + Add HB_NO_ATEXIT + + src/hb-private.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit aa53cb50ba3eea5c23458207faf879bd162d6599 +Author: Ebrahim Byagowi +Date: Mon Mar 26 13:28:26 2018 +0430 + + [aat] Unprefix not essentially layout tables (#921) + + src/Makefile.sources | 4 ++-- + src/{hb-aat-layout-fmtx-table.hh => hb-aat-fmtx-table.hh} | 7 ++++--- + src/hb-aat-layout.cc | 4 ++-- + src/{hb-aat-layout-ltag-table.hh => hb-aat-ltag-table.hh} | 7 ++++--- + 4 files changed, 12 insertions(+), 10 deletions(-) + +commit 8269791900cc765234915b29c974b34ed1f35519 +Author: David Corbett +Date: Sun Mar 25 20:50:41 2018 -0400 + + Allow trailing non-numeric chars in --unicodes + + util/options.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit a289aaff477dfbda25b90ba5ffb1296518d68d21 +Author: Behdad Esfahbod +Date: Mon Mar 26 01:14:07 2018 -0700 + + [aat/ltag] Whitespace + + src/hb-aat-layout-ltag-table.hh | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +commit 158f2810b2868c7398dc80cbb089b88a566ce99e +Author: Ebrahim Byagowi +Date: Mon Mar 26 12:04:30 2018 +0430 + + [aat/ltag] Implement the table parsing (#911) + + src/Makefile.sources | 2 ++ + src/hb-aat-layout-fmtx-table.hh | 6 ++-- + src/hb-aat-layout-kerx-table.hh | 4 +-- + src/hb-aat-layout-ltag-table.hh | 80 +++++++++++++++++++++++++++++++++++++++++ + src/hb-aat-layout-morx-table.hh | 4 +-- + src/hb-aat-layout-trak-table.hh | 4 +-- + src/hb-aat-layout.cc | 3 +- + 7 files changed, 93 insertions(+), 10 deletions(-) + +commit 9eee38a55cdcbfd34b530dcc8defff84057a9eb2 +Author: Ebrahim Byagowi +Date: Sun Mar 25 23:56:02 2018 +0430 + + [aat/fmtx] Implement the table parsing (#910) + + src/hb-aat-layout-fmtx-table.hh | 67 +++++++++++++++++++++++++++++++++++++++++ + src/hb-aat-layout-trak-table.hh | 4 +-- + src/hb-aat-layout.cc | 1 + + 3 files changed, 70 insertions(+), 2 deletions(-) + +commit 1d3f4f835175c658c63e96be12052b80d27cf6fa +Author: Ebrahim Byagowi +Date: Sun Mar 25 18:45:50 2018 +0430 + + [ci] Add a build only apple-gcc-4.2 i686 bot + + .circleci/config.yml | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit fe18c471a4aee1f6eba62383b64f0a8969cbc6ea +Author: Ebrahim Byagowi +Date: Sun Mar 25 18:19:23 2018 +0430 + + [dwrite] minor + + src/dev-run.sh | 5 ++- + src/hb-directwrite.cc | 118 ++++++++++++++++++++------------------------------ + 2 files changed, 50 insertions(+), 73 deletions(-) + +commit ebccd019749e24e6c045518ee1ffbfc947744204 +Author: Behdad Esfahbod +Date: Sat Mar 24 17:51:55 2018 -0700 + + More ULL fixes + + Fixes https://github.com/harfbuzz/harfbuzz/issues/901 + + src/hb-private.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 7ec3ba21f0dc43f9f8ea1fc4344d3ea4524841b1 +Author: Behdad Esfahbod +Date: Sat Mar 24 14:12:12 2018 -0700 + + Define uint64_t constants with ULL suffix + + Fixes https://github.com/harfbuzz/harfbuzz/issues/901 + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 19256bef9d264f96187261929992b96e61fa43fd +Author: Chun-wei Fan +Date: Mon Mar 12 13:33:03 2018 +0800 + + hb-private.hh: Add fallback implementation for round() + + For pre-C99 compilers that do not support round(), we need to have a + simplistic implementation for it, when it is not detected during build + configuration, either via CMake or autotools, by using floor() and + ceil(), which are provided in the pre-C99 compilers. + + Please see discussion at commit 86a0ac2 for more details for re-adding + this patch. + + src/hb-private.hh | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 95f0458f44e9a7ec250f1bc7d9f060745dbabcf3 +Author: Nikolaus Waxweiler +Date: Fri Mar 23 19:38:11 2018 +0000 + + Policy 0063 must be enabled to have hidden inline visibility... (#900) + + ...on static builds. + + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2a236063392c4f7c4d718be36d2dec2b8804b560 +Author: Ebrahim Byagowi +Date: Fri Mar 23 18:37:01 2018 +0430 + + Fix llvm-gcc-4.2 compile issue and add a macOS bot to test it (#899) + + .circleci/config.yml | 16 ++++++++++++++++ + src/hb-open-file-private.hh | 12 +++++++----- + src/hb-ot-glyf-table.hh | 40 ++++++++++++++++++++++------------------ + src/hb-ot-kern-table.hh | 2 +- + 4 files changed, 46 insertions(+), 24 deletions(-) + +commit 7919033ce8f6fd32b2dd980ad0aa59c7149a4827 +Author: Ebrahim Byagowi +Date: Thu Mar 22 16:04:38 2018 +0430 + + [dwrite] Replace rest of 'malloc/free's with 'new/delete' (#897) + + src/hb-directwrite.cc | 251 +++++++++++++++++++++++++------------------------- + 1 file changed, 127 insertions(+), 124 deletions(-) + +commit 3f55e0e74680c246819233a7250df612821698d7 +Author: Garret Rieger +Date: Tue Mar 20 17:36:52 2018 -0700 + + [subset] Check for the Null table and not nullptr to detect failure to find a table in glyf accelerator. + + src/hb-ot-glyf-table.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 45def99eae81e470be3c38d2962aafaaa85500b9 +Author: Garret Rieger +Date: Tue Mar 20 17:28:47 2018 -0700 + + [subset] Fix to debug message. + + src/hb-subset-glyf.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 139661404006b8be039436a81cb6b1a73ec44042 +Author: Garret Rieger +Date: Tue Mar 20 16:55:42 2018 -0700 + + [subset] don't use pointers returned from push after array has resized in hb-subset-glyf.cc + + src/hb-subset-glyf.cc | 9 +++++++-- + .../crash-b577db318b30f2851828a4c9ef97cb30678b1b54 | Bin 0 -> 22473 bytes + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit 3531efdb4c641ef543ea0686fef9289307d52096 +Author: Garret Rieger +Date: Tue Mar 20 16:31:21 2018 -0700 + + [subset] Fixed out of bounds read when subsetting hdmx. + + src/hb-ot-hdmx-table.hh | 30 ++++++++++++++++----- + .../crash-ccc61c92d589f895174cdef6ff2e3b20e9999a1a | Bin 0 -> 63302 bytes + test/api/test-subset-hdmx.c | 23 ++++++++++++++++ + 3 files changed, 47 insertions(+), 6 deletions(-) + +commit e597436b994c0a553e85e4c2dbd74aa037e69b60 +Author: Garret Rieger +Date: Tue Mar 20 13:00:49 2018 -0700 + + [subset] Disable glyf accelerator_t methods if it didn't successfully init. + + src/hb-ot-glyf-table.hh | 7 ++++++- + .../crash-4b60576767ee4d9fe1cc10959d89baf73d4e8249 | Bin 0 -> 3140 bytes + test/api/test-subset.c | 23 +++++++++++++++++++++ + 3 files changed, 29 insertions(+), 1 deletion(-) + +commit 7251181b56af564e2a9444f002f8ac03f98c7ee3 +Author: Garret Rieger +Date: Tue Mar 20 11:21:06 2018 -0700 + + [subset] Fix infinite loop in there are more then 32 tables. + + src/hb-subset.cc | 1 + + test/api/Makefile.am | 1 + + .../oom-6ef8c96d3710262511bcc730dce9c00e722cb653 | Bin 0 -> 24233 bytes + test/api/test-subset.c | 62 +++++++++++++++++++++ + 4 files changed, 64 insertions(+) + +commit 1a94804d35d533d39849d21a177039c4cbfade98 +Author: Garret Rieger +Date: Mon Mar 19 18:39:22 2018 -0700 + + [subset] Add a fix for segfault in hmtx/vmtx subsetting code. + + src/hb-ot-hmtx-table.hh | 13 +++++++++++-- + test/api/test-subset-hmtx.c | 3 ++- + 2 files changed, 13 insertions(+), 3 deletions(-) + +commit 31281d6a17a03a124456a4cab54e31b248b41267 +Author: Garret Rieger +Date: Mon Mar 19 17:47:57 2018 -0700 + + [subset] Add a test demonstrating a seg fault while subsetting hmtx. + + .../crash-e4e0bb1458a91b692eba492c907ae1f94e635480 | Bin 0 -> 63302 bytes + test/api/test-subset-hmtx.c | 22 +++++++++++++++++++++ + 2 files changed, 22 insertions(+) + +commit b5c7d6cffc2098dafa06822b28a5fd4f6218b60c +Author: Garret Rieger +Date: Fri Mar 16 10:20:21 2018 -0700 + + [subset] Restore subset to hb-subset-fuzzer. + + test/fuzzing/Makefile.am | 2 +- + test/fuzzing/hb-subset-fuzzer.cc | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) + +commit 957e7756634a4fdf1654041e20e883cf964ecac9 +Author: Ebrahim Byagowi +Date: Mon Mar 19 12:19:42 2018 +0330 + + [dwrite] Use new again and enable the build on msys2 bots (#890) + + appveyor.yml | 7 ++++--- + src/hb-directwrite.cc | 19 ++++++++----------- + 2 files changed, 12 insertions(+), 14 deletions(-) + +commit 8d1b4082ae01b8fd87b2e83c89f670c1c7cfa0b1 +Author: Ebrahim Byagowi +Date: Sat Mar 17 01:05:03 2018 +0330 + + Appropriate fix for msys2 bot fail on gen-def.py (#894) + + src/Makefile.am | 2 +- + src/gen-def.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 7b4333b090a3adf04519ec853456cafff07dedf0 +Author: Ebrahim Byagowi +Date: Fri Mar 16 22:45:09 2018 +0330 + + Do feature test before adding -Bsymbolic-functions, autotools part (#892) + + configure.ac | 2 +- + m4/ax_check_link_flag.m4 | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 75 insertions(+), 1 deletion(-) + +commit d68f00e4d8b061f56d3bd46d5ed1bc51406a4f1a +Author: Joel Winarske +Date: Fri Mar 16 12:14:27 2018 -0700 + + Do feature test before adding -Bsymbolic-functions, cmake part (#889) + + CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 42d3271cc39050c9df5f8c7345322ae90592158e +Author: Ebrahim Byagowi +Date: Fri Mar 16 22:39:58 2018 +0330 + + [cmake] Don't hide symbols by default (#891) + + But keep use of cmake idiomatic way of making inlines hidden + + CMakeLists.txt | 17 ++--------------- + 1 file changed, 2 insertions(+), 15 deletions(-) + +commit 584693e0cb3585a910b18d7916d7e554ecdf619a +Author: Garret Rieger +Date: Thu Mar 15 18:27:01 2018 -0700 + + [subset] Test not linking libharfbuzz-subset-fuzzing into hb-subset-fuzzer. + + test/fuzzing/Makefile.am | 2 +- + test/fuzzing/hb-subset-fuzzer.cc | 2 ++ + test/fuzzing/run-subset-fuzzer-tests.py | 2 +- + 3 files changed, 4 insertions(+), 2 deletions(-) + +commit 3f9361fe7a68896d2a5a44709ec08fe510144215 +Author: Garret Rieger +Date: Thu Mar 15 18:06:15 2018 -0700 + + [subset] Test hb-shape-fuzzer in run-subset-fuzzer-tests. + + test/fuzzing/run-subset-fuzzer-tests.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ce368e0d05147e70d8ad90383d748644b07f1d6f +Author: Garret Rieger +Date: Thu Mar 15 18:04:54 2018 -0700 + + [subset] make libharfbuzz-subset-fuzzing.la depend on lib target. + + test/fuzzing/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 85a57029cdad634f56aa3ccc768e72bcb03888e3 +Author: Garret Rieger +Date: Thu Mar 15 16:31:38 2018 -0700 + + [subset] %d -> %zu + + test/fuzzing/hb-subset-fuzzer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 318eea585329807477aab4eec173b561a08a46ca +Author: Garret Rieger +Date: Thu Mar 15 16:14:01 2018 -0700 + + [subset] Add some more logging to hb-subset-fuzzer. + + test/fuzzing/hb-subset-fuzzer.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 64bab8b3d009ed4327c2db9fa3425682de225810 +Author: Garret Rieger +Date: Thu Mar 15 16:12:00 2018 -0700 + + [subset] Fix run-shape-fuzzer-tests.py. It was generating incorrect paths for input fonts. + + test/fuzzing/run-shape-fuzzer-tests.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 6f9a584371ba4a9a63be3fa89f46474047a43ceb +Author: Garret Rieger +Date: Thu Mar 15 15:41:08 2018 -0700 + + [subset] Add more verbose output for subset fuzzer test. + + test/fuzzing/run-shape-fuzzer-tests.py | 2 +- + test/fuzzing/run-subset-fuzzer-tests.py | 8 ++++++-- + 2 files changed, 7 insertions(+), 3 deletions(-) + +commit 0ce0f8781213f8f01b9ebc8cfa31434784899952 +Author: Garret Rieger +Date: Thu Mar 15 13:04:31 2018 -0700 + + [subset] Rename hb-fuzzer -> hb-shape-fuzzer. + + test/fuzzing/CMakeLists.txt | 16 ++++++++-------- + test/fuzzing/Makefile.am | 16 ++++++++-------- + test/fuzzing/{hb-fuzzer.cc => hb-shape-fuzzer.cc} | 0 + .../{run-fuzzer-tests.py => run-shape-fuzzer-tests.py} | 12 ++++++------ + 4 files changed, 22 insertions(+), 22 deletions(-) + +commit 1e9bd6d5ff0af0189b6398c5e13cff11ee70762b +Author: Garret Rieger +Date: Wed Mar 14 19:58:15 2018 -0700 + + [subset] Add rub-subset-fuzzer-tests.py to dist files. + + test/fuzzing/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 474afaafd908a9c8174e05d693ac214ef2cc2597 +Author: Garret Rieger +Date: Wed Mar 14 19:15:33 2018 -0700 + + [subset] Add a test runner for hb-subset-fuzzer and cmake build config. + + test/fuzzing/CMakeLists.txt | 9 +++++++++ + test/fuzzing/Makefile.am | 3 ++- + test/fuzzing/run-subset-fuzzer-tests.py | 31 +++++++++++++++++++++++++++++++ + 3 files changed, 42 insertions(+), 1 deletion(-) + +commit aa9612d35f59f7f269fba4797c8da491844c56ec +Author: Garret Rieger +Date: Mon Mar 12 18:04:34 2018 -0700 + + [subset] Fix fuzzing build for hb-subset-fuzzer. + + src/Makefile.am | 19 +++---------------- + test/fuzzing/Makefile.am | 1 + + 2 files changed, 4 insertions(+), 16 deletions(-) + +commit b674fc1f9fa36857214ddaba3d32877f03ffec8c +Author: Garret Rieger +Date: Mon Mar 12 16:33:47 2018 -0700 + + [subset] Add missing destroy of subsetting result in subset fuzzer. + + test/fuzzing/hb-subset-fuzzer.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 1beb08862e9bd668599f0385d7ba59272fc24912 +Author: Garret Rieger +Date: Mon Mar 12 16:08:16 2018 -0700 + + [subset] First pass at setting up a fuzzing program for hb-subset. + + src/Makefile.am | 24 +++++++++++++++++++++++- + test/fuzzing/Makefile.am | 15 +++++++++++++++ + test/fuzzing/hb-subset-fuzzer.cc | 37 +++++++++++++++++++++++++++++++++++++ + 3 files changed, 75 insertions(+), 1 deletion(-) + +commit 127096e4748d6381339342fc2750dd540e815fa5 +Author: Behdad Esfahbod +Date: Thu Mar 15 13:23:27 2018 -0700 + + [util] Remove line buffering + + Something weird seems to be going on. Just kill it. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/888 + + configure.ac | 2 +- + util/options.cc | 12 ------------ + 2 files changed, 1 insertion(+), 13 deletions(-) + +commit e6e2ee2b923f8ab7c0694d4557375ba316e15dff +Author: Behdad Esfahbod +Date: Thu Mar 15 09:05:22 2018 -0700 + + Remove extra stdbool includes + + They are handled in our common header. + + test/api/test-subset-post.c | 2 -- + test/api/test-subset-vmtx.c | 2 -- + 2 files changed, 4 deletions(-) + +commit a0dccb6188d7a9174643c7239041cb1a5300b957 +Author: Behdad Esfahbod +Date: Wed Mar 14 16:31:53 2018 +0100 + + Add NameID + + src/hb-aat-layout-trak-table.hh | 8 ++++---- + src/hb-open-type-private.hh | 3 +++ + src/hb-ot-layout-common-private.hh | 10 +++++----- + src/hb-ot-var-fvar-table.hh | 6 +++--- + 4 files changed, 15 insertions(+), 12 deletions(-) + +commit 56946d21c0696ed6a098434537979396171c9bfb +Author: Behdad Esfahbod +Date: Wed Mar 14 16:26:33 2018 +0100 + + [color/COLR] Simplify + + src/hb-ot-color-colr-table.hh | 48 +++---------------------------------------- + 1 file changed, 3 insertions(+), 45 deletions(-) + +commit 6418ae4e8a3f4681cb4e7d54c589562930bc0678 +Author: Behdad Esfahbod +Date: Wed Mar 14 16:18:42 2018 +0100 + + [color/COLR] Clean up + + src/hb-aat-layout-common-private.hh | 84 ------------------------------------- + src/hb-open-type-private.hh | 84 +++++++++++++++++++++++++++++++++++++ + src/hb-ot-color-colr-table.hh | 30 ++++++------- + 3 files changed, 99 insertions(+), 99 deletions(-) + +commit 150c53ee969876c2831b6165cb71655e7ce2dbdb +Author: Behdad Esfahbod +Date: Wed Mar 14 16:08:12 2018 +0100 + + [color/COLR] Fix bad sanitize + + Bad bad bad bad code. Don't do that. If compiler's not happy, understand why. + + src/hb-ot-color-colr-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 399c800b93879186da2b7c892c7aa21468f062f2 +Author: Behdad Esfahbod +Date: Wed Mar 14 16:03:01 2018 +0100 + + [color/COLR] Clean up + + src/hb-ot-color-colr-table.hh | 32 +++++++++++++++++--------------- + 1 file changed, 17 insertions(+), 15 deletions(-) + +commit 9e337341d54c4ee12eec58e025a6831bb976d61f +Author: Behdad Esfahbod +Date: Wed Mar 14 15:52:53 2018 +0100 + + [color/cbdt] Clean up + + src/hb-ot-color-cbdt-table.hh | 112 ++++++++++++++++++++---------------------- + 1 file changed, 54 insertions(+), 58 deletions(-) + +commit 86a0ac284fc4c2ce96354bfdf32878b6db5c77bd +Author: Behdad Esfahbod +Date: Wed Mar 14 15:51:33 2018 +0100 + + Revert "hb-private.hh: Add fallback implementation for round()" + + This reverts commit b9dcbb1f8312d8606b230f75594d40b7d4087004. + + This is gross. Should be only done if a specific macro is defined. Not the other way + around. This fails my build as autotools companions where not added anyway. + + src/hb-private.hh | 13 ------------- + 1 file changed, 13 deletions(-) + +commit 791d80a1d42ce0bd7c5f0a3d3d10c562a6161a82 +Merge: d4907e83 22de9bf5 +Author: Ebrahim Byagowi +Date: Thu Mar 15 11:40:52 2018 +0330 + + Merge pull request #886 from madig/only-export-visible-symbols + + CMake: hide symbols by default on non-MSVC, define export attribute + +commit 22de9bf56d80dbf6a13a06beafd21711bdab78af +Author: Nikolaus Waxweiler +Date: Wed Mar 14 10:29:24 2018 +0000 + + Enable implicit symbol hiding for all libraries, static and shared + + This covers all built libraries now and both static and shared builds. + + CMakeLists.txt | 35 +++++++++++++++++++++++------------ + 1 file changed, 23 insertions(+), 12 deletions(-) + +commit d4907e83ef8e0d03acb701957cc1ee9acacb0a19 +Author: Ebrahim Byagowi +Date: Wed Mar 14 11:04:28 2018 +0330 + + [dwrite] GCC/mingw/msys2 compatibility (#884) + + src/hb-directwrite.cc | 37 +++++++++++++++++++++---------------- + 1 file changed, 21 insertions(+), 16 deletions(-) + +commit 93f8f89dedd2f8cf5eb40165a20d009de24c5eda +Author: Ebrahim Byagowi +Date: Wed Mar 14 09:56:31 2018 +0330 + + [ci] Trying to fix gen-def issue on appveyor (#885) + + src/gen-def.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ce975dce7ae8950b6e7b9a2d0c00ead9d45f73ff +Author: Nikolaus Waxweiler +Date: Wed Mar 14 00:50:32 2018 +0000 + + CMake: hide symbols by default on non-MSVC, define export attribute + + This change makes sure that non-MSVC builds using CMake properly hide + non-exported functions. + + CMakeLists.txt | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +commit a12dd6f75d85cf29ed78182ac97a12ebbcf77375 +Merge: 28f25f32 7c43adab +Author: Ebrahim Byagowi +Date: Wed Mar 14 02:54:07 2018 +0330 + + Merge pull request #877 from fanc999/master.msvc + + Fix CMake builds on Windows, MSVC in particular + +commit 7c43adab6deb9302a24cc857c4aaa9b6b62215d2 +Author: Chun-wei Fan +Date: Mon Mar 12 16:43:53 2018 +0800 + + CMake: Fix utility program installation + + Put in the utility program that was missed in installation by replacing + the one that was duplicated. + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e9b8002a6024d7a9b6de204897345ae77bb50881 +Author: Chun-wei Fan +Date: Mon Mar 12 16:23:57 2018 +0800 + + CMake: Fix introspection on Windows + + The list of source files to pass to g-ir-scanner is becoming too + long for Windows, as Windows imposes a 8192-character limit for command + lines, so we need to first transform that list into a listings file, and + then use the --filelist option for g-ir-scanner to build the + introspection files. + + CMakeLists.txt | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 831d4a2dab1f229811c3a90b791f2a19c88fc1b5 +Author: Chun-wei Fan +Date: Mon Mar 12 13:48:55 2018 +0800 + + test/api: Fix building subset tests + + Include stdbool.h in hb-setset-test.h instead of in the individual + sources, if it is found; otherwise use a simplistic fallback for it if + it is not found. + + Also declare variables at the top of the block, to build on pre-C99 + compiliers. + + test/api/hb-subset-test.h | 17 +++++++++++++++-- + test/api/test-subset-cmap.c | 8 ++++---- + test/api/test-subset-glyf.c | 23 ++++++++++++++--------- + test/api/test-subset-hdmx.c | 8 ++++---- + test/api/test-subset-hmtx.c | 17 ++++++++++------- + test/api/test-subset-os2.c | 4 ++-- + 6 files changed, 49 insertions(+), 28 deletions(-) + +commit eda6a5ea807ba8a4e7fa20ad0273b394ed72d106 +Author: Chun-wei Fan +Date: Mon Mar 12 13:38:01 2018 +0800 + + CMake: Fix running tests on Windows + + For the API tests, output the test programs at $(TOP_BUILDDIR) so that + the freshly-built DLLs will be available for the test programs. For + those that are run through the Python wrapper scripts, use + ${PYTHON_EXECUTABLE} instead of plain 'python' in case the Python + interpreter is not in the PATH. + + test/api/CMakeLists.txt | 7 ++++++- + test/fuzzing/CMakeLists.txt | 2 +- + test/shaping/CMakeLists.txt | 4 ++-- + test/subset/CMakeLists.txt | 2 +- + 4 files changed, 10 insertions(+), 5 deletions(-) + +commit b9dcbb1f8312d8606b230f75594d40b7d4087004 +Author: Chun-wei Fan +Date: Mon Mar 12 13:33:03 2018 +0800 + + hb-private.hh: Add fallback implementation for round() + + Add a simplistic round() implementation for our purposes, used when the + compiler does not support round() directly. + + src/hb-private.hh | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 89dbabff65a39dfb0d9ad036516d5b96c37739de +Author: Chun-wei Fan +Date: Mon Mar 12 13:27:38 2018 +0800 + + configure.ac/CMake: Check for round() and stdbool.h + + Not all the compilers that HarfBuzz is buildable on supports round() and + has the header stdbool.h, so we check for them and define HAVE_ROUND and + HAVE_STDBOOL_H repsectively in our CFLAGS so that we include them only + when they are found, or use fallback implementations when necessary. + + Also include FindPythonInterp earlier as we need PYTHON_EXECUTABLE to be + set for running the tests. + + CMakeLists.txt | 12 ++++++++++-- + configure.ac | 9 ++++++++- + 2 files changed, 18 insertions(+), 3 deletions(-) + +commit 28f25f32fc63c3e1ae0d04b6eb5ea6b729fb2228 +Author: Ebrahim Byagowi +Date: Mon Mar 12 14:00:11 2018 +0330 + + [ot-color/SVG] Minor (#878) + + src/hb-ot-color-svg-table.hh | 24 ++++++++++++++++-------- + 1 file changed, 16 insertions(+), 8 deletions(-) + +commit fb0f3e3767b488651f13978c1fd8651aefdd6b83 +Author: Behdad Esfahbod +Date: Sun Mar 11 20:38:40 2018 +0100 + + [sbix] Clean up + + src/hb-ot-color-sbix-table.hh | 70 +++++++++++++++++++++++-------------------- + 1 file changed, 37 insertions(+), 33 deletions(-) + +commit 218fa7166e9626f2036d08882854a86d753e4192 +Author: Ebrahim Byagowi +Date: Sat Mar 10 11:13:52 2018 +0330 + + [ot-color] SVG table implementation (#874) + + src/Makefile.sources | 3 +- + src/hb-ot-color-svg-table.hh | 111 +++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout.cc | 1 + + 3 files changed, 114 insertions(+), 1 deletion(-) + +commit 4c63c82383cba11f2c44c00cbc953863346e627c +Author: Ebrahim Byagowi +Date: Sat Mar 10 11:07:56 2018 +0330 + + [ot-color] sbix table implementation (#870) + + src/Makefile.sources | 1 + + src/hb-ot-color-sbix-table.hh | 128 ++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout.cc | 1 + + 3 files changed, 130 insertions(+) + +commit 62b3d8fb7034c53e0804689d58e2eb7330e04430 +Author: Ebrahim Byagowi +Date: Sat Mar 10 00:44:36 2018 +0330 + + [dev-run] minor + + src/dev-run.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 743ef317619a57ebf5a75935db0eecccade5d5b7 +Merge: 9206762b 39b2f69f +Author: Garret Rieger +Date: Fri Mar 9 12:06:52 2018 -0700 + + Merge pull request #872 from googlefonts/drop-tables + + [subset] Drop the same tables by default as fontTools does. + +commit 9206762bbd4033e97d6d35ef1cce1b7940fbc935 +Author: Ebrahim Byagowi +Date: Fri Mar 9 15:43:03 2018 +0330 + + Make subset test runner compatible with py3 + + Fixes #873 + + test/subset/run-tests.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit dbadb871d1ca62eff10768564fc0a17b9aaa4d63 +Author: Ebrahim Byagowi +Date: Fri Mar 9 15:25:59 2018 +0330 + + [ci] Enable subset tests on ArchLinux to test + + This makes ArchLinux bots fail, a starting point to #873 + + .circleci/config.yml | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 39b2f69fab3b8aec1296dcda111d358559d39f0b +Author: Garret Rieger +Date: Thu Mar 8 16:30:36 2018 -0800 + + [subset] Drop the same tables by default as fontTools does. + + src/hb-subset.cc | 49 ++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 34 insertions(+), 15 deletions(-) + +commit dbe552770fa7cec91bba750e0e81aaeae96b3caf +Merge: 2ebf4c69 8548fa15 +Author: Garret Rieger +Date: Thu Mar 8 15:50:25 2018 -0700 + + Merge pull request #871 from googlefonts/mplus + + [subset] Add a Japanese font to the subset integration tests. + +commit 8548fa152241d6c5b020146f97aac15934ba0065 +Author: Garret Rieger +Date: Wed Mar 7 12:37:03 2018 -0800 + + [subset] Drop cmap 12, platform 0 tables from Mplus1p expected files. + + ...-Regular.default.3042,3044,3046,3048,304A,304B.ttf | Bin 3040 -> 3032 bytes + ...-Regular.default.3042,3044,3046,73E0,5EA6,8F38.ttf | Bin 3276 -> 3268 bytes + .../japanese/Mplus1p-Regular.default.61,63,65,6B.ttf | Bin 2592 -> 2584 bytes + ...-Regular.default.660E,6975,73E0,5EA6,8F38,6E05.ttf | Bin 3572 -> 3564 bytes + .../japanese/Mplus1p-Regular.default.660E.ttf | Bin 2356 -> 2348 bytes + ...gular.drop-hints.3042,3044,3046,3048,304A,304B.ttf | Bin 2312 -> 2304 bytes + ...gular.drop-hints.3042,3044,3046,73E0,5EA6,8F38.ttf | Bin 2548 -> 2540 bytes + .../Mplus1p-Regular.drop-hints.61,63,65,6B.ttf | Bin 1864 -> 1856 bytes + ...gular.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.ttf | Bin 2844 -> 2836 bytes + .../japanese/Mplus1p-Regular.drop-hints.660E.ttf | Bin 1628 -> 1620 bytes + 10 files changed, 0 insertions(+), 0 deletions(-) + +commit 9b00b9a10d5fdfd2d9deb1b0e847695797b7e09b +Author: Garret Rieger +Date: Tue Mar 6 17:47:40 2018 -0800 + + [subset] Fix deadlock waiting for process output in subset test runner. + + test/subset/run-tests.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit bfec28a7db0631f42dd420a8c04638624e4602af +Author: Garret Rieger +Date: Tue Mar 6 15:43:08 2018 -0800 + + [subset] add some extra logging to subset run-tests.py. + + test/subset/run-tests.py | 2 ++ + 1 file changed, 2 insertions(+) + +commit c7d814eaa8e9af6c447124ceeaa896eb5e17abd7 +Author: Garret Rieger +Date: Thu Mar 1 18:20:00 2018 -0800 + + [subset] Add japanese font file to subset integration tests. + + test/subset/data/Makefile.am | 1 + + test/subset/data/Makefile.sources | 1 + + ...-Regular.default.3042,3044,3046,3048,304A,304B.ttf | Bin 0 -> 3040 bytes + ...-Regular.default.3042,3044,3046,73E0,5EA6,8F38.ttf | Bin 0 -> 3276 bytes + .../japanese/Mplus1p-Regular.default.61,63,65,6B.ttf | Bin 0 -> 2592 bytes + ...-Regular.default.660E,6975,73E0,5EA6,8F38,6E05.ttf | Bin 0 -> 3572 bytes + .../japanese/Mplus1p-Regular.default.660E.ttf | Bin 0 -> 2356 bytes + ...gular.drop-hints.3042,3044,3046,3048,304A,304B.ttf | Bin 0 -> 2312 bytes + ...gular.drop-hints.3042,3044,3046,73E0,5EA6,8F38.ttf | Bin 0 -> 2548 bytes + .../Mplus1p-Regular.drop-hints.61,63,65,6B.ttf | Bin 0 -> 1864 bytes + ...gular.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.ttf | Bin 0 -> 2844 bytes + .../japanese/Mplus1p-Regular.drop-hints.660E.ttf | Bin 0 -> 1628 bytes + test/subset/data/fonts/Mplus1p-Regular.ttf | Bin 0 -> 1758820 bytes + test/subset/data/tests/japanese.tests | 16 ++++++++++++++++ + 14 files changed, 18 insertions(+) + +commit 2ebf4c69b18452caa0c871aebec9785e80348166 +Merge: 1ab51480 869ccac5 +Author: Garret Rieger +Date: Thu Mar 8 14:41:59 2018 -0700 + + Merge pull request #868 from googlefonts/post + + [subset] Drop glyph names from post when subsetting. + +commit 869ccac5ab69060f2db2893014b5538539fd4f45 +Author: Garret Rieger +Date: Thu Mar 8 11:06:49 2018 -0800 + + [subset] use create_sub_blob instead of manually copying the post table. + + src/hb-ot-post-table.hh | 20 +++++++------------- + 1 file changed, 7 insertions(+), 13 deletions(-) + +commit ec47cd95ba6c550314a1cbcc46fafd7946e52ece +Author: Garret Rieger +Date: Wed Mar 7 10:33:02 2018 -0800 + + [subset] Unit test to check that post subsetting drops glyph names. + + test/api/Makefile.am | 2 + + ...lus1p-Regular.660E,6975,73E0,5EA6,8F38,6E05.ttf | Bin 3572 -> 3724 bytes + test/api/test-subset-post.c | 61 +++++++++++++++++++++ + 3 files changed, 63 insertions(+) + +commit dd107699938740e261948e4b525fa0ad501beb03 +Author: Garret Rieger +Date: Tue Mar 6 18:33:39 2018 -0800 + + [subset] drop all glyph names from the post table. + + src/hb-ot-post-table.hh | 28 ++++++++++++++++++++++++++++ + src/hb-subset.cc | 4 ++++ + 2 files changed, 32 insertions(+) + +commit 1ab514805ced190efdabc2103e4800d40b248300 +Merge: 70ad69f2 362f2824 +Author: Garret Rieger +Date: Wed Mar 7 12:36:00 2018 -0700 + + Merge pull request #867 from googlefonts/vmtx + + [subset] Add vmtx subsetting. + +commit 362f28240683fde395ff52f4fc1216fbc7131452 +Author: Garret Rieger +Date: Wed Mar 7 11:08:55 2018 -0800 + + [subset] fix author. + + test/api/test-subset-vmtx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 89465cb1c7b8ab61c0ef4887f51572ba91039f3e +Author: Garret Rieger +Date: Wed Mar 7 10:29:15 2018 -0800 + + [subset] s/hmetrics/vmetrics. + + test/api/test-subset-vmtx.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 91867cda6ae5ae063482b28b0a52ebc30718cb40 +Author: Garret Rieger +Date: Wed Mar 7 10:17:06 2018 -0800 + + [subset] cleanup. + + src/hb-subset.cc | 2 +- + test/api/test-subset-vmtx.c | 3 +-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +commit d9263f0230693d108249be0904bc5a3280560cb3 +Author: Garret Rieger +Date: Tue Mar 6 15:40:35 2018 -0800 + + [subset] add unit tests for vmtx subsetting. + + test/api/Makefile.am | 2 + + ...lus1p-Regular.660E,6975,73E0,5EA6,8F38,6E05.ttf | Bin 0 -> 3572 bytes + test/api/fonts/Mplus1p-Regular.660E.ttf | Bin 0 -> 2356 bytes + test/api/test-subset-vmtx.c | 100 +++++++++++++++++++++ + 4 files changed, 102 insertions(+) + +commit 0e8f9430c83c076993a0c7a320713bb484051343 +Author: Garret Rieger +Date: Tue Mar 6 13:08:20 2018 -0800 + + [subset] Skip subsetting vhea. + + src/hb-subset.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 64cf53d6197a0e6c56aef744ceff2f8a0ff85654 +Author: Garret Rieger +Date: Fri Mar 2 17:33:49 2018 -0800 + + [subset] Subset vmtx if present. + + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-subset.cc | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 70ad69f2449d754fcc5270ff3ca3848a77f4c7af +Author: Behdad Esfahbod +Date: Wed Mar 7 16:11:44 2018 +0100 + + [test] Fix build with older glib + + test/api/hb-subset-test.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ff2f81432bb0484a019a678058595e10217df51d +Author: Behdad Esfahbod +Date: Wed Mar 7 16:05:14 2018 +0100 + + 1.7.6 + + NEWS | 15 +++++++++++++++ + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 3 files changed, 18 insertions(+), 3 deletions(-) + +commit ac2ece3e153167224c85cc384e2826ea9711a8b5 +Author: Behdad Esfahbod +Date: Wed Mar 7 15:52:42 2018 +0100 + + [ot] Comment out AAT include + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 23a9ac993862b4a9032d38e80491a769b7ee86da +Author: Behdad Esfahbod +Date: Wed Mar 7 15:51:42 2018 +0100 + + Remove hb-ot-color.h + + So I can make a release. + + src/Makefile.sources | 1 - + src/hb-ot-color-cpal-table.hh | 48 +++++++++++++++++++++++++ + src/hb-ot-color.h | 81 ------------------------------------------- + src/hb-ot.h | 1 - + 4 files changed, 48 insertions(+), 83 deletions(-) + +commit 790a11700773dd664e4d5edac63c404c5ebce080 +Author: Behdad Esfahbod +Date: Wed Mar 7 15:31:15 2018 +0100 + + [ot] Remove hb-ot-base.h + + BASE table API will go into hb-ot-layout.h. + + src/Makefile.sources | 1 - + src/hb-ot-base.h | 56 ------------------------------------------ + src/hb-ot-layout-base-table.hh | 1 - + src/hb-ot-layout.h | 16 ++++++++++++ + src/hb-ot.h | 1 - + 5 files changed, 16 insertions(+), 59 deletions(-) + +commit f014a124f582215fa96afc28b534a1ca0bf17167 +Author: Behdad Esfahbod +Date: Wed Mar 7 10:49:26 2018 +0100 + + [set] Fix algebra + + Was totally b0rked. Ouch! + + Fixes https://github.com/harfbuzz/harfbuzz/issues/863 + + src/hb-set-private.hh | 20 +++++++++++++++++--- + 1 file changed, 17 insertions(+), 3 deletions(-) + +commit 7587683cdce8ee9b7f07bae82aa1bb163e79ab92 +Author: Behdad Esfahbod +Date: Wed Mar 7 09:55:22 2018 +0100 + + [set] Minor + + In preparation to fix https://github.com/harfbuzz/harfbuzz/issues/863 + + Binary operations are sets are completely broken. Ouch. + + src/hb-set-private.hh | 21 ++++++++++++++------- + 1 file changed, 14 insertions(+), 7 deletions(-) + +commit e4cbb87bd3512c3a6e97ea3923ecd1b26b0a1251 +Author: Behdad Esfahbod +Date: Wed Mar 7 09:37:22 2018 +0100 + + Minor + + src/hb-ot-color-colr-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c6150333c29b458ed34858f24e94acc0f771aa0b +Author: Behdad Esfahbod +Date: Wed Mar 7 09:27:16 2018 +0100 + + Sign + + src/test-unicode-ranges.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9a6f9b4d4284f0378a71a181fe216d97c913669e +Author: Garret Rieger +Date: Tue Mar 6 13:46:51 2018 -0800 + + [set] add a test demonstrating a bug in hb_set_union. + + test/api/test-set.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 9b4a5d7ef1ec068042e3c793845a4dbc3308d4b7 +Author: Ebrahim Byagowi +Date: Wed Mar 7 00:23:40 2018 +0330 + + [ci] Enable -Werror=unused (#862) + + .travis.yml | 4 ++-- + src/hb-ot-glyf-table.hh | 1 - + 2 files changed, 2 insertions(+), 3 deletions(-) + +commit 54cbe6702c1e4c934c60512367abaf801294c1bb +Author: Ebrahim Byagowi +Date: Tue Mar 6 16:41:08 2018 +0330 + + [ot-color] Further improvements on COLR/CPAL implementation (#859) + + * Implemented a bsearch on get_base_glyph_record + * Made get_color_record_argb actually work + + src/hb-ot-color-colr-table.hh | 35 ++++++++++++++----------- + src/hb-ot-color-cpal-table.hh | 59 +++++++++++++++---------------------------- + src/hb-ot-color.h | 12 ++------- + 3 files changed, 42 insertions(+), 64 deletions(-) + +commit 18d14b8e0d5d28106800ebf835ff3155a4f4de7c +Author: Ebrahim Byagowi +Date: Mon Mar 5 14:25:11 2018 +0330 + + [dev-run] an option to open using a GUI app + + src/dev-run.sh | 22 ++++++++++++++++++---- + 1 file changed, 18 insertions(+), 4 deletions(-) + +commit 1db83954948dfae3f75f61c535c5de1b3a843a69 +Author: Ebrahim Byagowi +Date: Mon Mar 5 13:02:50 2018 +0330 + + [ci] minor, bring back the removed assertion + + .ci/run-coveralls.sh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5895fe3d4d0441dacf8989740cf4150193397796 +Author: Ebrahim Byagowi +Date: Mon Mar 5 12:58:34 2018 +0330 + + [ci] minor + + .ci/trigger-coverity.sh | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit a3e29fd38f01b26b6306f9f7142a54cc7d6c6080 +Author: Ebrahim Byagowi +Date: Sun Mar 4 02:56:27 2018 +0330 + + [aat/kerx] Add a TODO + + src/hb-aat-layout-kerx-table.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 0ef6ab25ab4456e387711ae246900486ad738d26 +Author: Ebrahim Byagowi +Date: Sun Mar 4 02:47:26 2018 +0330 + + [ot-color] Move cbdt to the namespace (#860) + + src/Makefile.sources | 2 +- + src/{hb-ot-cbdt-table.hh => hb-ot-color-cbdt-table.hh} | 6 +++--- + src/hb-ot-font.cc | 3 ++- + 3 files changed, 6 insertions(+), 5 deletions(-) + +commit 6659cb56fae0c900ae88e95bedcb3b76234c8838 +Author: Ebrahim Byagowi +Date: Sun Mar 4 02:31:53 2018 +0330 + + [ci] Remove --coverage as use of --enable-code-coverage + + .travis.yml | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 00dd321ace75ff0d1824cf75cd41490c5dd6ad76 +Author: Ebrahim Byagowi +Date: Sat Mar 3 23:26:11 2018 +0330 + + [ci] Don't run coveralls on freetype folder + + .travis.yml | 1 + + 1 file changed, 1 insertion(+) + +commit f50aedd371f1a6894d1bf7732f017b51cbdd59bd +Author: Ebrahim Byagowi +Date: Sat Mar 3 23:17:36 2018 +0330 + + [ci] Remove failing check on run-coveralls + + .ci/run-coveralls.sh | 2 -- + 1 file changed, 2 deletions(-) + +commit a0031c120e3ac5c059b81a004b9386fab3d662fc +Author: Ebrahim Byagowi +Date: Sat Mar 3 23:09:25 2018 +0330 + + Add lcov tool for coverage tests + + .travis.yml | 1 + + 1 file changed, 1 insertion(+) + +commit ecef95b21264347f9505e3ed4fb25ec7e4ccca5d +Author: Ebrahim Byagowi +Date: Sat Mar 3 23:03:13 2018 +0330 + + [ci] Enable code coverage on Travis Linux builds + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f7399796a1ed36cfc4f1ef7631584569baa80981 +Author: Ebrahim Byagowi +Date: Sat Mar 3 22:55:09 2018 +0330 + + Enable coverage test on autotools (#857) + + configure.ac | 1 + + m4/ax_code_coverage.m4 | 264 +++++++++++++++++++++++++++++++++++++++++++++++++ + src/Makefile.am | 6 +- + 3 files changed, 269 insertions(+), 2 deletions(-) + +commit c446c23f0f09e541891b49184febdfc75cb3505f +Author: Ebrahim Byagowi +Date: Sat Mar 3 22:43:23 2018 +0330 + + [ot-color] Move the related tables to hb-ot-color-* (#858) + + src/Makefile.sources | 4 ++-- + src/{hb-ot-colr-table.hh => hb-ot-color-colr-table.hh} | 6 +++--- + src/{hb-ot-cpal-table.hh => hb-ot-color-cpal-table.hh} | 6 +++--- + src/hb-ot-color.cc | 4 ++-- + src/hb-ot-layout.cc | 4 ++-- + 5 files changed, 12 insertions(+), 12 deletions(-) + +commit 48ed15a2bcdc1999e2d39fdcb2644ba4c3beccfe +Author: Ebrahim Byagowi +Date: Sat Mar 3 22:00:29 2018 +0330 + + [COLR/CPAL] Provide enough helper for rasterization (#855) + + src/hb-ot-colr-table.hh | 47 ++++++++++++++++++++++++++++++++++++++++++++--- + src/hb-ot-cpal-table.hh | 18 +++++++++++++++--- + 2 files changed, 59 insertions(+), 6 deletions(-) + +commit 432758a7ac3c1a857e67069f157efbf4ebf5521b +Author: Ebrahim Byagowi +Date: Sat Mar 3 01:05:59 2018 +0330 + + [COLR] Revert previous sanitization on the table + + That sanitization wasn't right, firstLayerIndex is an index from beginning of the Layer Records + not the table itself. + + src/hb-ot-colr-table.hh | 23 ++++++----------------- + 1 file changed, 6 insertions(+), 17 deletions(-) + +commit 71b4598ea37b316571bae22ced2f1b38185c9f44 +Author: Ebrahim Byagowi +Date: Fri Mar 2 11:04:09 2018 +0330 + + [aat/kerx] Improve format 6 subtable + + src/hb-aat-layout-kerx-table.hh | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit b73a5a1c240478616827529c94f0133018f9f790 +Author: Ebrahim Byagowi +Date: Fri Mar 2 00:07:26 2018 +0330 + + [aat/kerx] Make parsing of the table actually work (#850) + + src/hb-aat-layout-kerx-table.hh | 298 +++++++++++++++++----------------------- + 1 file changed, 124 insertions(+), 174 deletions(-) + +commit a570edcde2f89e59b5ccd4867a8c0eed084bf35d +Author: Ebrahim Byagowi +Date: Fri Mar 2 00:06:03 2018 +0330 + + [COLR] Sanitize BaseGlyphRecord (#854) + + src/hb-ot-colr-table.hh | 27 ++++++++++++++++++--------- + 1 file changed, 18 insertions(+), 9 deletions(-) + +commit 7e958646a4a825bfe3aac56ddb96100d68c5592c +Author: Ebrahim Byagowi +Date: Thu Mar 1 10:27:18 2018 +0330 + + [CPAL] Fix version checking logic on sanitizer (#851) + + src/hb-ot-cpal-table.hh | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +commit bcf578fefe6d7af0a962329ceb9989ce61ec467d +Author: Behdad Esfahbod +Date: Wed Feb 28 16:31:46 2018 -0800 + + [test] Add test suite for Brahmi Number Joiners + + https://github.com/harfbuzz/harfbuzz/pull/660 + + .../fonts/1ed7e9064f008f62de6ff0207bb4dd29409597a5.ttf | Bin 0 -> 2768 bytes + test/shaping/data/in-house/tests/use-syllable.tests | 1 + + test/shaping/record-test.sh | 2 +- + 3 files changed, 2 insertions(+), 1 deletion(-) + +commit b4ba71ea7ccce70e24138373774741c7f03dd24e +Author: Garret Rieger +Date: Wed Feb 28 15:44:00 2018 -0800 + + [subset] In subset integration test pass output through ots-sanitize if present. + + test/subset/run-tests.py | 25 +++++++++++++++++++++++-- + 1 file changed, 23 insertions(+), 2 deletions(-) + +commit 588a4e0f9b2d71362503a274de7200f3eb4367f7 +Merge: 55a4dfa3 b3f1a045 +Author: rsheeter +Date: Wed Feb 28 13:52:29 2018 -0800 + + Merge pull request #845 from googlefonts/drophints + + [subset] drop hints from composites + +commit b3f1a045a8b86747afce6bc154f2a166ea678efb +Author: Rod Sheeter +Date: Wed Feb 28 11:41:24 2018 -0800 + + [subset] kick the build + + src/hb-subset-glyf.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 20d57399235b410d2bdc98103c8bb3dfd1c34176 +Author: Rod Sheeter +Date: Wed Feb 28 11:15:08 2018 -0800 + + [subset] extract a method to flip off composite instruction flag + + src/hb-subset-glyf.cc | 24 +++++++++++++++--------- + 1 file changed, 15 insertions(+), 9 deletions(-) + +commit 55a4dfa374bae1db846c3b848b7e59fb0014b627 +Author: Ebrahim Byagowi +Date: Wed Feb 28 15:43:23 2018 +0330 + + Use old project location of coverity + + https://github.com/harfbuzz/harfbuzz/commit/8089711a61687d565f207c56d3d2b658f514d7ab#commitcomment-27835452 + + .travis.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3821978bcd92cbdb607111452796e051c456f391 +Merge: 77227462 f671f7f0 +Author: Ebrahim Byagowi +Date: Wed Feb 28 13:30:17 2018 +0330 + + Merge pull request #847 from ebraminio/colr + + [colr] Implement + +commit f671f7f0a8caa7b5763e00146e1ec4b9a7258227 +Author: Ebrahim Byagowi +Date: Wed Feb 28 13:19:40 2018 +0330 + + [colr] Implement + + src/Makefile.sources | 1 + + src/hb-ot-color.cc | 9 +++++ + src/hb-ot-color.h | 9 ----- + src/hb-ot-colr-table.hh | 98 +++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-cpal-table.hh | 6 +-- + src/hb-ot-layout-private.hh | 6 ++- + src/hb-ot-layout.cc | 11 +++-- + 7 files changed, 122 insertions(+), 18 deletions(-) + +commit 772274625e9f17d726f2a1da8192ec3ec24793a3 +Merge: 0eec3315 5b9c2340 +Author: Ebrahim Byagowi +Date: Wed Feb 28 12:05:49 2018 +0330 + + Merge pull request #841 from ebraminio/color + + Support CPAL table + +commit 0eec33154a418fba97a08be7169b59e748b7e785 +Author: Ebrahim Byagowi +Date: Wed Feb 28 11:53:39 2018 +0330 + + [cmake] cleanup (#846) + + CMakeLists.txt | 70 ++++++++++++++++++++----------------------------- + test/api/CMakeLists.txt | 2 +- + 2 files changed, 30 insertions(+), 42 deletions(-) + +commit 5b9c234043d0483e53e9da5fe4afd7743190b538 +Author: Ebrahim Byagowi +Date: Tue Feb 27 22:56:17 2018 +0330 + + [CPAL] Refactor and address the reviews + + NEWS | 3 +- + src/Makefile.am | 1 - + src/hb-ot-color.cc | 70 +++---------- + src/hb-ot-color.h | 31 +++--- + src/hb-ot-cpal-table.hh | 116 +++++++++++++++------ + src/hb-ot-layout-private.hh | 3 +- + src/hb-ot-layout.cc | 5 +- + test/api/hb-test.h | 2 + + test/api/test-ot-color.c | 39 +++---- + .../319f5d7ebffbefc5c5e6569f8cea73444d7a7268.ttf | Bin + .../e90374e5e439e00725b4fe7a8d73db57c5a97f82.ttf | Bin + 11 files changed, 141 insertions(+), 129 deletions(-) + +commit 6836a821428b714b9f2e95d5c4ebbd73867d9a53 +Author: Rod Sheeter +Date: Tue Feb 27 20:51:12 2018 -0800 + + [subset] remove WE_HAVE_INSTRUCTIONS from composites when dropping hints + + src/hb-subset-glyf.cc | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit ffcb5cbf71b312cdd4606a3285e10e201ff5bccd +Author: Rod Sheeter +Date: Tue Feb 27 20:17:04 2018 -0800 + + [subset] update the test file for composite, fix an offset calculation + + src/hb-ot-glyf-table.hh | 2 +- + test/api/fonts/Roboto-Regular.components.1fc.nohints.ttf | Bin 0 -> 932 bytes + test/api/test-subset-glyf.c | 5 ++--- + 3 files changed, 3 insertions(+), 4 deletions(-) + +commit c8b230e4377bc8e80d37835a229511ce0e30cc47 +Merge: b3790a65 904dd7be +Author: Rod Sheeter +Date: Tue Feb 27 17:25:32 2018 -0800 + + Merge branch 'expand-tests' of github.com:googlefonts/harfbuzz into drophints + +commit 904dd7beea756fd7429fad36f5c37321aedb4e81 +Author: Garret Rieger +Date: Tue Feb 27 14:33:36 2018 -0800 + + [subset] Add drop hinting profile to full-font.tests + + .../Roboto-Regular.drop-hints.1FC,21,41,20,62,63.ttf | Bin 0 -> 2152 bytes + .../full-font/Roboto-Regular.drop-hints.61,62,63.ttf | Bin 0 -> 1968 bytes + test/subset/data/tests/full-font.tests | 1 + + 3 files changed, 1 insertion(+) + +commit 70a1049b3f8dc241fcb9b524bd010f0c1606f6ad +Author: Garret Rieger +Date: Tue Feb 27 14:28:50 2018 -0800 + + [subset] Add a drop hints profile to basics.tests + + .../basics/Roboto-Regular.abc.drop-hints.61,62,63.ttf | Bin 0 -> 876 bytes + .../basics/Roboto-Regular.abc.drop-hints.61,63.ttf | Bin 0 -> 792 bytes + .../expected/basics/Roboto-Regular.abc.drop-hints.61.ttf | Bin 0 -> 684 bytes + .../expected/basics/Roboto-Regular.abc.drop-hints.62.ttf | Bin 0 -> 652 bytes + .../expected/basics/Roboto-Regular.abc.drop-hints.63.ttf | Bin 0 -> 656 bytes + test/subset/data/profiles/drop-hints.txt | 1 + + test/subset/data/tests/basics.tests | 1 + + 7 files changed, 2 insertions(+) + +commit 5241d7f4b999d5457de564bd950b60d70f9d0e19 +Author: Garret Rieger +Date: Tue Feb 27 13:15:40 2018 -0800 + + [subset] apply subset profiles (flags) to the subset integration tests. + + test/subset/generate-expected-outputs.py | 27 ++++++++++++++------------- + test/subset/run-tests.py | 3 ++- + test/subset/subset_test_suite.py | 11 ++++++++--- + 3 files changed, 24 insertions(+), 17 deletions(-) + +commit a4aca190a93f94c25c906ec0269183d8b2d0b5e8 +Author: Garret Rieger +Date: Tue Feb 27 11:36:16 2018 -0800 + + [subset] add expected/full-font to dist files. + + test/subset/data/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit d31ace32740b1777ebb023ffdb10cd0cfec3997e +Author: Garret Rieger +Date: Mon Feb 26 18:51:56 2018 -0800 + + [subset] Add subset integration tests using the full roboto font. + + test/subset/data/Makefile.sources | 1 + + .../Roboto-Regular.default.1FC,21,41,20,62,63.ttf | Bin 0 -> 3700 bytes + .../full-font/Roboto-Regular.default.61,62,63.ttf | Bin 0 -> 3320 bytes + test/subset/data/fonts/Roboto-Regular.ttf | Bin 0 -> 171676 bytes + test/subset/data/tests/full-font.tests | 10 ++++++++++ + test/subset/generate-expected-outputs.py | 12 ++++++++---- + 6 files changed, 19 insertions(+), 4 deletions(-) + +commit 33f4381314c5248b8b112e344af7548806f93a82 +Author: Garret Rieger +Date: Mon Feb 26 18:39:09 2018 -0800 + + [subset] Add some more variations of the basic test. + + .../basics/Roboto-Regular.abc.default.61,62,63.ttf | Bin 0 -> 2120 bytes + .../expected/basics/Roboto-Regular.abc.default.61,63.ttf | Bin 0 -> 1932 bytes + .../expected/basics/Roboto-Regular.abc.default.61.ttf | Bin 0 -> 1744 bytes + .../expected/basics/Roboto-Regular.abc.default.63.ttf | Bin 0 -> 1668 bytes + test/subset/data/tests/basics.tests | 4 ++++ + 5 files changed, 4 insertions(+) + +commit b3790a65a18e8402b2b09dfc24aaea40a51de569 +Author: Rod Sheeter +Date: Tue Feb 27 17:23:30 2018 -0800 + + [subset] add a (failing for now) test for composite glyf hint dropping + + src/hb-ot-glyf-table.hh | 8 ++++---- + test/api/test-subset-glyf.c | 27 +++++++++++++++++++++++++-- + 2 files changed, 29 insertions(+), 6 deletions(-) + +commit 4c6023f861a4b87782c17ac626ffee7e93f15fc8 +Merge: d7633d0a 921b65cb +Author: Garret Rieger +Date: Tue Feb 27 17:06:27 2018 -0700 + + Merge pull request #842 from googlefonts/maxp + + [subset] when dropping hints, clear hint related fields in maxp. + +commit 921b65cbc29f0c2c9c13e9fb272dafe4c8a14591 +Author: Garret Rieger +Date: Tue Feb 27 14:37:18 2018 -0800 + + [subset] minor fixes in hb-ot-maxp-table.hh + + src/hb-ot-maxp-table.hh | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +commit b26db48bfff804e139331817a86ecc811547afcd +Author: Garret Rieger +Date: Tue Feb 27 14:14:05 2018 -0800 + + [subset] whitespace for hb-ot-maxp-table.hh + + src/hb-ot-maxp-table.hh | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +commit a76344da796670f33b2fa48a9b1676545dac93c2 +Author: Garret Rieger +Date: Tue Feb 27 14:11:36 2018 -0800 + + [subset] Add maxpV1Tail instead of defining a struct inside maxp for v1 data. + + src/hb-ot-maxp-table.hh | 81 ++++++++++++++++++++++++++++++------------------- + 1 file changed, 49 insertions(+), 32 deletions(-) + +commit f14d1b64c2d148ffdec95c17adbee3f185d5d436 +Author: Garret Rieger +Date: Tue Feb 27 13:49:00 2018 -0800 + + [subset] when dropping hints, clear hint related fields in maxp. + + src/hb-ot-maxp-table.hh | 43 ++++++++++++++++++++++++++++++++++++++++--- + test/api/test-subset-glyf.c | 30 +++++++++++++++++++++++------- + 2 files changed, 63 insertions(+), 10 deletions(-) + +commit d7633d0a4091c025638ba3fc8fb0d8e9a0e9ff8c +Author: Behdad Esfahbod +Date: Tue Feb 27 12:50:57 2018 -0800 + + [BASE] More + + src/hb-ot-layout-base-table.hh | 153 ++++------------------------------------- + 1 file changed, 12 insertions(+), 141 deletions(-) + +commit 7a70c20fec6ece9e729dc2634e2896a8d8eb9962 +Author: Behdad Esfahbod +Date: Tue Feb 27 12:45:26 2018 -0800 + + [BASE] Clean up first 29% + + src/hb-ot-layout-base-table.hh | 262 +++++++++++++++++++---------------------- + src/hb-ot-layout-gsub-table.hh | 2 +- + 2 files changed, 125 insertions(+), 139 deletions(-) + +commit 101850f9e6b9e0932fe1dd4169f88d6764c669c1 +Merge: 5967eaba f110c0c8 +Author: Ebrahim Byagowi +Date: Tue Feb 27 20:15:54 2018 +0330 + + Merge with master + +commit f110c0c8866c853c0d5a930564a2b69231a33322 +Merge: 4a1d51ef 0ad8c663 +Author: Ebrahim Byagowi +Date: Tue Feb 27 11:41:12 2018 +0330 + + Merge pull request #838 from harfbuzz/BASE + + BASE table + +commit 0ad8c663e0b4602e2a413e77a8158bf8a46755d5 +Author: Ebrahim Byagowi +Date: Mon Feb 26 12:45:08 2018 +0330 + + Remove public API of the branch + + src/hb-ot-base.h | 4 ++-- + src/hb-ot-layout-base-table.hh | 20 +++++++++--------- + src/hb-ot-layout.cc | 48 ++++++++++++++++++++---------------------- + 3 files changed, 35 insertions(+), 37 deletions(-) + +commit 4a1d51ef15a423706406f784a146078073147885 +Merge: d0caf7e5 903771b6 +Author: rsheeter +Date: Mon Feb 26 20:23:41 2018 -0800 + + Merge pull request #818 from googlefonts/drophints + + [subset] Drop hints + +commit 903771b6c7689b9eee9a11bac128c42f39833b2e +Author: Rod Sheeter +Date: Mon Feb 26 19:50:06 2018 -0800 + + [subset] clearer name for trim() and better comment about composite handling, per review feedback + + src/hb-ot-glyf-table.hh | 8 +++++--- + src/hb-subset-glyf.cc | 17 ++++++++--------- + 2 files changed, 13 insertions(+), 12 deletions(-) + +commit d0caf7e5e3294c25230ed0e5580c647fa0f1a2c8 +Merge: 6c844ae8 44dc36dd +Author: Garret Rieger +Date: Mon Feb 26 19:24:18 2018 -0700 + + Merge pull request #840 from googlefonts/os2 + + [subset] During os2 subsetting update ulUnicodeRange[]c + +commit 44dc36dd82fc948a15e2ad0d605eb4a466b3553d +Author: Garret Rieger +Date: Mon Feb 26 17:56:23 2018 -0800 + + [subset] update to comment in hb-ot-os2-unicode-ranges.hh + + src/hb-ot-os2-unicode-ranges.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ad3f2f77dafdee524e836e732077ee9670602369 +Author: Garret Rieger +Date: Mon Feb 26 17:51:27 2018 -0800 + + [subset] small cleanups in hb-ot-os2-table. + + src/hb-ot-os2-table.hh | 5 +++-- + src/hb-ot-os2-unicode-ranges.hh | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit f1c8fc3487d5c5efb8ee1804acb07e6e282d3bc5 +Author: Garret Rieger +Date: Mon Feb 26 17:48:51 2018 -0800 + + [subset] small updates to gen-unicode-ranges.py + + src/gen-unicode-ranges.py | 6 ++++-- + src/hb-ot-os2-unicode-ranges.hh | 3 ++- + 2 files changed, 6 insertions(+), 3 deletions(-) + +commit 0c0fe2ff8209228f2ddfce464b7b6f1b1ee1654a +Author: Garret Rieger +Date: Mon Feb 26 17:47:10 2018 -0800 + + [subset] Move util/generated-unicode-ranges.py to src/gen-unicode-ranges.py + + util/generate-unicode-ranges.py => src/gen-unicode-ranges.py | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit f630ae5161bfc8420f9ae0127fd8c7f447874fdd +Author: Garret Rieger +Date: Mon Feb 26 17:46:17 2018 -0800 + + [subset] unsigned int -> hb_codepoint_t. + + src/hb-ot-os2-unicode-ranges.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6368ce4c927b1457cf19945d5957e91d4621dc8b +Author: Garret Rieger +Date: Mon Feb 26 17:44:39 2018 -0800 + + [subset] const in _compare_range. + + src/hb-ot-os2-unicode-ranges.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 0be9fea0a96701b159a9db190e55b1c3efc38a28 +Author: Garret Rieger +Date: Mon Feb 26 16:15:09 2018 -0800 + + [subset] Add comment to os2UnicodeRangesSorted. + + src/hb-ot-os2-unicode-ranges.hh | 1 + + 1 file changed, 1 insertion(+) + +commit e20ab71d12b032371b830b76462e5e979d963b58 +Author: Garret Rieger +Date: Mon Feb 26 16:13:10 2018 -0800 + + [subset] Fix incorrect index. + + src/hb-ot-os2-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 074b5a29a166d1812abc7229a71af4a3bb311536 +Author: Garret Rieger +Date: Mon Feb 26 16:11:24 2018 -0800 + + [subset] Add special case handling of bit 57 in os2 ulUnicodeRange. + + src/hb-ot-os2-table.hh | 7 +++++++ + src/test-unicode-ranges.cc | 3 --- + 2 files changed, 7 insertions(+), 3 deletions(-) + +commit ddc4f2b9fc5566e70558a57133289f84d467cc98 +Author: Garret Rieger +Date: Mon Feb 26 15:59:32 2018 -0800 + + [subset] Add python util that was used to generated hb-ot-os2-unicode-ranges.hh + + util/generate-unicode-ranges.py | 50 +++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 50 insertions(+) + +commit f757757eda5f00a89a156e3427bdf8c4313611ef +Author: Garret Rieger +Date: Mon Feb 26 15:56:36 2018 -0800 + + [subset] Add cmake build def for test-unicode-ranges. + + CMakeLists.txt | 2 +- + src/Makefile.am | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +commit f82f2a3e50805503d93aa1aa1ccb27da4967a14a +Author: Garret Rieger +Date: Mon Feb 26 15:52:01 2018 -0800 + + [subset] Rename hb-os2-unicode-ranges.cc to test-unicode-ranges.cc. + + src/Makefile.am | 2 +- + src/{hb-ot-os2-unicode-ranges.cc => test-unicode-ranges.cc} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit 4014555ca083dea3e4f42120aeaf52a2186b8a09 +Author: Garret Rieger +Date: Mon Feb 26 15:50:13 2018 -0800 + + [subset] set ulUnicodeRange[] in os2. + + src/Makefile.sources | 1 - + src/hb-ot-os2-table.hh | 23 ++++- + src/hb-ot-os2-unicode-ranges.cc | 221 ++-------------------------------------- + src/hb-ot-os2-unicode-ranges.hh | 210 +++++++++++++++++++++++++++++++++++++- + 4 files changed, 236 insertions(+), 219 deletions(-) + +commit a570142d0c6d819feeeeb9e209fc90a33c1c2b48 +Author: Garret Rieger +Date: Mon Feb 26 15:20:23 2018 -0800 + + [subset] Move hb-ot-os2-unicode-ranges into a cc file with a helper methods and tests. + + src/Makefile.am | 9 +- + src/Makefile.sources | 2 + + src/hb-ot-os2-unicode-ranges.cc | 279 ++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-os2-unicode-ranges.hh | 189 +-------------------------- + 4 files changed, 292 insertions(+), 187 deletions(-) + +commit 8e81799b32f3dfaca000fa5d42943ceed9af8d17 +Author: Garret Rieger +Date: Fri Feb 23 18:35:41 2018 -0800 + + [subset] Add hb-ot-os2-unicode-ranges.hh, a map of os2 unicode ranges. + + src/hb-ot-os2-unicode-ranges.hh | 220 ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 220 insertions(+) + +commit 6c844ae8e89f52f5f40eace66bb987544fc316e3 +Author: Ebrahim Byagowi +Date: Mon Feb 26 23:04:27 2018 +0330 + + [dev-run] show images using iTerm2 images feature + + src/dev-run.sh | 32 ++++++++++++++++++++++++++++---- + 1 file changed, 28 insertions(+), 4 deletions(-) + +commit 28c4245e9f76c6c53a4589e7745a60ed0e97414a +Author: Behdad Esfahbod +Date: Mon Feb 26 01:10:42 2018 -0800 + + [aat/ankr] Define Anchor struct + + src/hb-aat-layout-ankr-table.hh | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +commit e347fb908b188f71df13215c8939b0f3a12c716f +Author: Behdad Esfahbod +Date: Mon Feb 26 01:08:00 2018 -0800 + + Minor + + src/hb-ot-layout-gdef-table.hh | 4 ++-- + src/hb-ot-layout-gpos-table.hh | 12 ++++++------ + 2 files changed, 8 insertions(+), 8 deletions(-) + +commit 05fbd14e715ed5d0f0f86388b1538ad8e8c7c506 +Author: Behdad Esfahbod +Date: Mon Feb 26 01:04:16 2018 -0800 + + [aat/ankr] Minor + + DEFINE_SIZE_MIN is to be used only in rare cases. For fixed-size structs + we want DEFINE_SIZE_STATIC. + + src/hb-aat-layout-ankr-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f90cd9b1f5ade8ad5e3b7caf0272936ad7a0f419 +Author: Behdad Esfahbod +Date: Mon Feb 26 01:03:23 2018 -0800 + + [aat/ankr] Hook up Lookup table + + src/hb-aat-layout-ankr-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c36598450e9698168851c0ae7d0b4c9e562c4924 +Author: Behdad Esfahbod +Date: Mon Feb 26 00:57:07 2018 -0800 + + [aat/ankr] Simplify + + src/hb-aat-layout-ankr-table.hh | 36 ++++++++---------------------------- + 1 file changed, 8 insertions(+), 28 deletions(-) + +commit fa3a69e2334ec4122d672670614a8e5a95611d75 +Author: Behdad Esfahbod +Date: Mon Feb 26 00:32:11 2018 -0800 + + [aat/trak] Simplify sanitize() + + src/hb-aat-layout-trak-table.hh | 67 ++++++++++------------------------------- + 1 file changed, 16 insertions(+), 51 deletions(-) + +commit f0bc6c0992c4302ae1a20f155ad256bfa331087c +Author: Behdad Esfahbod +Date: Mon Feb 26 00:18:17 2018 -0800 + + [aat/trak] Clean up + + We always just used "unsigned int" for counter values. There's + no use for uint16_t outside of a struct. + + Also, no need for explict casting where implicit does. + + src/hb-aat-layout-trak-table.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit bb82f01383db7cf05040fbd5881e17e263ef6369 +Author: Ebrahim Byagowi +Date: Sun Feb 25 12:30:33 2018 +0330 + + [aat] trak sanitization + + src/dev-run.sh | 4 +- + src/hb-aat-layout-trak-table.hh | 95 ++++++++++++++++++++++++++++++++--------- + src/hb-aat-layout.cc | 2 +- + util/options.hh | 2 +- + 4 files changed, 78 insertions(+), 25 deletions(-) + +commit becb1d9eea15c07f9ea4e229be56f9aca0f768af +Author: Ebrahim Byagowi +Date: Mon Feb 26 11:29:48 2018 +0330 + + [aat] minor + + Ops, this was done for testing + + src/hb-aat-layout-ankr-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit df1c7d5b60520d2b3c756b700d5ac41668fc0983 +Author: Behdad Esfahbod +Date: Sun Feb 25 19:06:25 2018 -0800 + + Minor + + src/hb-open-type-private.hh | 5 +++-- + src/hb-subset.cc | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit 6dd46fa598cacdd046ba4548bc6ddf7f37c46dee +Author: Behdad Esfahbod +Date: Sun Feb 25 18:54:52 2018 -0800 + + [aat/trak] Minor + + Maybe we should make DEFINE_* make structs uncopyable. + + src/hb-aat-layout-trak-table.hh | 56 +++++++++++++++++++++++------------------ + 1 file changed, 32 insertions(+), 24 deletions(-) + +commit ae14dd0fb0a176f6f0143690907b51626999d248 +Author: Ebrahim Byagowi +Date: Mon Feb 26 00:31:09 2018 +0330 + + [aat] Implement ankr + + src/Makefile.sources | 3 +- + src/hb-aat-layout-ankr-table.hh | 86 +++++++++++++++++++++++++++++++++++++++++ + src/hb-aat-layout-kerx-table.hh | 2 +- + src/hb-aat-layout.cc | 37 +++++++++++++----- + src/hb-ot-layout-private.hh | 6 ++- + src/hb-ot-layout.cc | 6 ++- + 6 files changed, 124 insertions(+), 16 deletions(-) + +commit 551fa2d200a06d00d054f2c8e7aad1cb4d25249b +Author: Behdad Esfahbod +Date: Sun Feb 25 16:32:17 2018 -0800 + + [BASE] Minor + + src/Makefile.sources | 1 - + src/hb-ot-base.cc | 58 ----------------------- + src/hb-ot-layout-base-table.hh | 103 ++++++++++++++++++++++++++++------------- + src/hb-ot-layout.cc | 34 ++++++++++++++ + src/hb-ot-layout.h | 1 + + 5 files changed, 105 insertions(+), 92 deletions(-) + +commit 05699fd996ed9c0e5dde8918388ac188e58df1a7 +Merge: 83af6c23 3ebcd5a3 +Author: Behdad Esfahbod +Date: Sat Feb 24 12:01:54 2018 -0800 + + Merge remote-tracking branch 'eroux/add-base' + +commit a8d3c2c030d2c21c70e0b8bd43f7d05ff4818b75 +Author: Ebrahim Byagowi +Date: Sat Feb 24 16:42:12 2018 +0330 + + [ci] Add clang O3/O0 testers (#834) + + .circleci/config.yml | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit c73255f3eb2f060ec72d18790b374f6b6e4032aa +Author: Khaled Hosny +Date: Sat Feb 24 00:44:07 2018 +0200 + + Workaround for old automake on Travis Linux images + + https://github.com/harfbuzz/harfbuzz/pull/821#issuecomment-368116538 + + .ci/fail.sh | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit cd28eb9f5dc237325c64380d9d87e673b8e94985 +Author: Ebrahim Byagowi +Date: Sat Feb 24 14:17:54 2018 +0330 + + Add -Werror=unused-function check to Travis (#832) + + .travis.yml | 4 ++-- + src/hb-aat-layout.cc | 24 ++++++++++++------------ + test/api/test-set.c | 19 ++++++++++--------- + 3 files changed, 24 insertions(+), 23 deletions(-) + +commit 1ab16f4556ef3e54a40b63cf4570c0ae986894e7 +Author: Ebrahim Byagowi +Date: Sat Feb 24 12:49:42 2018 +0330 + + [aat] Implement trak logic (#816) + + src/hb-aat-layout-kerx-table.hh | 7 ++++ + src/hb-aat-layout-private.hh | 3 ++ + src/hb-aat-layout-trak-table.hh | 78 +++++++++++++++++++++++++++++++++++++++-- + src/hb-aat-layout.cc | 46 ++++++++++++++++++++++++ + src/hb-open-type-private.hh | 4 +-- + src/hb-ot-layout-private.hh | 22 ++++++++++++ + src/hb-ot-layout.cc | 4 +++ + src/hb-ot-shape.cc | 2 ++ + 8 files changed, 161 insertions(+), 5 deletions(-) + +commit b91e8da36e164168cd532fd6e6950c5d743a14dd +Author: Behdad Esfahbod +Date: Fri Feb 23 22:51:17 2018 -0800 + + Include hb-version.h in git (#825) + + CMakeLists.txt | 36 ++++++++++++++-------------- + src/Makefile.am | 8 +++---- + src/Makefile.sources | 3 --- + src/hb-version.h | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 87 insertions(+), 26 deletions(-) + +commit 5267520e078ed413df78f3a6781fd5370b6da63a +Author: Rod Sheeter +Date: Fri Feb 23 18:36:22 2018 -0800 + + [subset] update hdmx test to create input explicitly + + test/api/test-subset-hdmx.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2e3ee489f8374227fa94a8d8684e839e643888ea +Author: Rod Sheeter +Date: Fri Feb 23 18:18:54 2018 -0800 + + [subset] format tweak, doc string + + src/hb-subset-input.cc | 12 +++++++++--- + src/hb-subset.h | 2 +- + 2 files changed, 10 insertions(+), 4 deletions(-) + +commit d78393b5547135b8db0356b0ec14d5ed0d334768 +Merge: 1454d82a 83af6c23 +Author: Rod Sheeter +Date: Fri Feb 23 17:53:26 2018 -0800 + + Merge branch 'master' of https://github.com/harfbuzz/harfbuzz into drophints + +commit 1454d82a9d3d9a47901b3d92ff7f2c05c596c0d5 +Author: Rod Sheeter +Date: Fri Feb 23 17:49:23 2018 -0800 + + [subset] keep glyph trim separate of more general get_offset + + src/hb-ot-glyf-table.hh | 12 ++++-------- + src/hb-subset-glyf.cc | 6 ++++-- + 2 files changed, 8 insertions(+), 10 deletions(-) + +commit 0ac8c0c1e6a6c076ce33b16baa173ff8763ac04e +Author: Rod Sheeter +Date: Fri Feb 23 17:43:00 2018 -0800 + + [subset] zero glyf and loca memory before writing so pads are clean. Test just the part of maxp we care about + + src/hb-ot-glyf-table.hh | 6 +++--- + src/hb-subset-glyf.cc | 4 ++-- + test/api/test-subset-glyf.c | 19 ++++++++++++++++--- + 3 files changed, 21 insertions(+), 8 deletions(-) + +commit 83af6c237f2bfd66af76a8647a62b3d1ab996744 +Merge: 7e5e1feb dc5c7927 +Author: Garret Rieger +Date: Fri Feb 23 18:33:25 2018 -0700 + + Merge pull request #829 from googlefonts/test-checksum + + [subset] Caclculate head table checksum adjustment + +commit dc5c7927e75ea09461e46fe6e56897091b4b4f00 +Author: Behdad Esfahbod +Date: Fri Feb 23 16:42:06 2018 -0800 + + [subset] Caclculate head table checksum adjustment + + Test still fails, because we do not serialize tables in the same + order that fonttools subsetter does. + + src/hb-open-file-private.hh | 51 ++++++++++++++++++++++++++++++++++----------- + src/hb-ot-head-table.hh | 2 ++ + src/hb-subset.cc | 2 ++ + 3 files changed, 43 insertions(+), 12 deletions(-) + +commit 7e5e1feb666d6a861b5cd64bf29a16e3854fb812 +Merge: ec2538c8 99967e21 +Author: Garret Rieger +Date: Fri Feb 23 17:59:08 2018 -0700 + + Merge pull request #828 from googlefonts/mem-fixes + + [subset] Fix several memory leaks in subsetting. + +commit ec2538c8803be254b6e09ca0ea724b07c35126da +Author: Behdad Esfahbod +Date: Fri Feb 23 15:51:26 2018 -0800 + + [subset] Fix checksum calc out-of-bounds access + + src/hb-open-file-private.hh | 18 ++++++++++-------- + src/hb-open-type-private.hh | 3 ++- + 2 files changed, 12 insertions(+), 9 deletions(-) + +commit 99967e21c6e3f6882d6eadf5c22f4120684b1fc5 +Author: Garret Rieger +Date: Fri Feb 23 15:45:45 2018 -0800 + + [subset] Fix memory leak in hb-subset-glyf. + + src/hb-subset-glyf.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit e61f360dc828bfd46477b7ddff56874da9f03538 +Author: Garret Rieger +Date: Fri Feb 23 15:44:21 2018 -0800 + + [subset] Fix memory leak in hb-subset-plan. + + src/hb-subset-plan.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 66b0a390793ab06692dd49e67baef52a6a7d82aa +Author: Garret Rieger +Date: Fri Feb 23 15:41:52 2018 -0800 + + [subset] Fix memory leak in hb-subset. + + src/hb-subset.cc | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +commit 0fb8a5ce192025ffd83ae714db932e4b86594ae1 +Author: Garret Rieger +Date: Fri Feb 23 15:37:43 2018 -0800 + + [subset] Fix memory leak in cmap subsetting. + + src/hb-ot-cmap-table.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 4665aaa19304bdf0362bdfcebcae65feb19a8964 +Author: Garret Rieger +Date: Fri Feb 23 15:36:14 2018 -0800 + + [subset] Fix memory leak in hmtx subsetting. + + src/hb-ot-hmtx-table.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 5a36b55fba03cd07c9b101f0222b8d189bcd3bbf +Author: Garret Rieger +Date: Fri Feb 23 15:30:14 2018 -0800 + + [subset] Fix memory leak in subset face destroy. + + src/hb-subset.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit d38f37b2e37942a3fd13cd753c8b8587a06c0f3a +Author: Ben Boeckel +Date: Fri Feb 23 16:55:53 2018 -0500 + + autoconf: provide a harfbuzz-config for use from CMake (#822) + + configure.ac | 2 ++ + src/Makefile.am | 4 ++- + src/harfbuzz-config.cmake.in | 82 ++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 87 insertions(+), 1 deletion(-) + +commit e0939d811f1fdeda9c5763e7e53887b3d3cb21eb +Author: Behdad Esfahbod +Date: Fri Feb 23 13:19:34 2018 -0800 + + Clean up check-defs and check-symbols (#821) + + Also, call c++filt on their results. + + Also build and fix and check harfbuzz-gobject.def + + Also changes harfbuzz-gobject to distribute generated enum sources. + + CMakeLists.txt | 3 +-- + src/Makefile.am | 33 ++++++++++++++++------------ + src/Makefile.sources | 9 +++++--- + src/check-defs.sh | 52 --------------------------------------------- + src/check-symbols.sh | 30 ++++++++++++++++++++------ + src/hb-gobject-enums.h.tmpl | 3 ++- + src/hb-gobject-structs.h | 45 ++++++++++++++++++++++++++------------- + 7 files changed, 81 insertions(+), 94 deletions(-) + +commit 9bd6d25254d9bfc612004982dba286a3751d1d29 +Author: Rod Sheeter +Date: Fri Feb 23 13:05:58 2018 -0800 + + [subset] clone trim logic from fonttools glyf handling + + src/hb-ot-glyf-table.hh | 92 ++++++++++++++++++++++++++- + src/hb-subset-glyf.cc | 26 ++++---- + src/hb-subset-plan.cc | 3 + + src/hb-subset.cc | 13 ++-- + test/api/fonts/Roboto-Regular.ac.nohints.ttf | Bin 1128 -> 848 bytes + test/api/hb-subset-test.h | 1 + + test/api/test-subset-glyf.c | 6 +- + 7 files changed, 117 insertions(+), 24 deletions(-) + +commit b1ec82105189053d648a798cf5b3ab2887046298 +Merge: e15e41ef c2e4713b +Author: Garret Rieger +Date: Fri Feb 23 12:32:18 2018 -0700 + + Merge pull request #823 from googlefonts/hdmx + + [subset] Add hdmx subsetting. + +commit e15e41ef12e146333e355defef8db210378b5be0 +Author: Garret Rieger +Date: Thu Feb 22 18:41:50 2018 -0800 + + [subset] Remove commented code from run-tests.py. + + test/subset/run-tests.py | 3 --- + 1 file changed, 3 deletions(-) + +commit 2b844803433bd1557a7fd0c93a91c66ef5319b21 +Author: Garret Rieger +Date: Thu Feb 22 18:38:44 2018 -0800 + + [subset] Update expected files for subsetting integration test to not include cmap 4. + + .../expected/basics/Roboto-Regular.abc.default.62.ttf | Bin 1740 -> 1692 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit a88504c601ac95601730bd602861c13e5ac4fdd8 +Author: Garret Rieger +Date: Thu Feb 22 14:28:18 2018 -0800 + + [subset] Fix checksum clearning in subset test diff. Add an updated expected file (has cmap4 restored). + + .../expected/basics/Roboto-Regular.abc.default.62.ttf | Bin 1692 -> 1740 bytes + test/subset/run-tests.py | 7 +++++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit 537698b60131bd3d7999919a04596c41dda6b2e4 +Author: Garret Rieger +Date: Thu Feb 22 14:07:52 2018 -0800 + + [subset] Don't compare actual to itself in Fix test/subset/run-tests. Print a diff on failure. + + test/subset/run-tests.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit c2e4713b5b561675b0f7b358ccf83d64ef0b6c41 +Author: Behdad Esfahbod +Date: Fri Feb 23 10:45:03 2018 -0800 + + [hdmx] Fix sanitize() + + src/hb-ot-hdmx-table.hh | 23 +++++++---------------- + 1 file changed, 7 insertions(+), 16 deletions(-) + +commit 84d4bb91ceca22484abb597c19eb18311e2514f1 +Author: Behdad Esfahbod +Date: Fri Feb 23 10:38:35 2018 -0800 + + [hdmx] Minor + + src/hb-ot-hdmx-table.hh | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) + +commit cf7a6e520e9601da9d27bc8f6bbe5d2eff23998d +Author: Behdad Esfahbod +Date: Fri Feb 23 10:34:26 2018 -0800 + + [hdmx] Move DeviceRecord to toplevel again + + More readable. + + src/hb-ot-hdmx-table.hh | 112 ++++++++++++++++++++++++------------------------ + 1 file changed, 57 insertions(+), 55 deletions(-) + +commit 96d7805a9235443972c6b6c5cd9502283c8836e9 +Author: Garret Rieger +Date: Thu Feb 22 16:48:28 2018 -0800 + + [subset] More complete sanitization implementation for hdmx. + + src/hb-ot-hdmx-table.hh | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +commit c02532a3d2325c8fb9332f63f687cbaec77b2239 +Author: Garret Rieger +Date: Thu Feb 22 16:40:50 2018 -0800 + + [subset] Formatting and comments in hdmx. + + src/hb-ot-hdmx-table.hh | 31 +++++++++++++++++++------------ + 1 file changed, 19 insertions(+), 12 deletions(-) + +commit 6b372f439b257808b048d02ebf5a867dabcd1231 +Author: Garret Rieger +Date: Thu Feb 22 12:00:00 2018 -0800 + + [subset] In hb-ot-hdmx-table, s/glyf/hdmx. + + src/hb-ot-hdmx-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ec302ad5bda6bea870f6d33f9698a1782472a213 +Author: Garret Rieger +Date: Thu Feb 22 11:57:35 2018 -0800 + + [subset] Fail subset if a table fails to sanitize. + + src/hb-subset.cc | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +commit 15fc45bfedef433025145289fe916739907b573b +Author: Garret Rieger +Date: Wed Feb 21 17:59:57 2018 -0800 + + [subset] Add a unit test for hdmx subsetting. + + test/api/Makefile.am | 2 ++ + test/api/test-subset-hdmx.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 83 insertions(+) + +commit aa4aa2353c52f86fd56446de6b7ff86a9e990b9c +Author: Garret Rieger +Date: Wed Feb 21 17:43:32 2018 -0800 + + [subset] Enable hdmx subsetting. + + src/hb-subset.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit bd18b6adf8697c1ce3f4e3831b9f2a99d930e97d +Author: Garret Rieger +Date: Wed Feb 21 17:42:58 2018 -0800 + + [subset] Move DeviceRecord inside of hdmx. + + src/hb-ot-hdmx-table.hh | 98 +++++++++++++++++++++++++------------------------ + 1 file changed, 50 insertions(+), 48 deletions(-) + +commit 6704cded65985b2de262bdd3bb0887929e5a3b0b +Author: Garret Rieger +Date: Wed Feb 21 16:00:10 2018 -0800 + + [subset] Add hdmx subsetting implementation. + + src/hb-ot-hdmx-table.hh | 29 ++++++++++++++++++++++++++--- + 1 file changed, 26 insertions(+), 3 deletions(-) + +commit 84b68e58862647b4ede414b2e608c47d390fd60a +Author: Garret Rieger +Date: Wed Feb 21 15:43:47 2018 -0800 + + [subset] In hdmx serialize set the correct value of sizeDeviceRecord. + + src/hb-ot-hdmx-table.hh | 29 ++++++++++++++++------------- + 1 file changed, 16 insertions(+), 13 deletions(-) + +commit dddf44279f610e77e8b9a0819fd91f48802158b6 +Author: Garret Rieger +Date: Wed Feb 21 15:36:09 2018 -0800 + + [subset] When serializing a DeviceRecord in hdmx pad to make 32 bit aligned. + + src/hb-ot-hdmx-table.hh | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) + +commit ab7a8f3b7419b604816e12cb93e77c0ba45a57af +Author: Garret Rieger +Date: Wed Feb 21 15:15:22 2018 -0800 + + [subset] Begin implementing serialize for hdmx. + + src/hb-ot-hdmx-table.hh | 79 +++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 77 insertions(+), 2 deletions(-) + +commit fe42862ab30d17483a1d0c2e2b1d859d01bbaff1 +Author: Garret Rieger +Date: Wed Feb 21 14:18:49 2018 -0800 + + [subset] Sketch out a basic hb-ot-hdmx.hh. + + src/Makefile.sources | 1 + + src/hb-ot-hdmx-table.hh | 77 +++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-subset.cc | 1 + + 3 files changed, 79 insertions(+) + +commit 4f6f7c3b22ec788f609bdffc7e0893816657b3a0 +Author: Ebrahim Byagowi +Date: Fri Feb 23 02:54:12 2018 +0330 + + [util] Implement ppem/ptem on hb-{shape,view} (#811) + + util/options.cc | 33 ++++++++++++++++++++++++++++----- + util/options.hh | 6 ++++++ + 2 files changed, 34 insertions(+), 5 deletions(-) + +commit a6bd6bcee08c9522f9269b5c63f784688abddcff +Author: Ebrahim Byagowi +Date: Thu Feb 22 16:52:56 2018 +0330 + + [dev-run] minor + + src/dev-run.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fa13a04cf3345311a2434f0d7f6346f967491c45 +Author: Ebrahim Byagowi +Date: Thu Feb 22 16:48:03 2018 +0330 + + [dev-run] Add gdb/lldb shortcuts + + src/dev-run.sh | 40 +++++++++++++++++++++++++++++++--------- + 1 file changed, 31 insertions(+), 9 deletions(-) + +commit 4f07437dfebd3dc5923f40154c6f1b7e1dce1bd4 +Author: Rod Sheeter +Date: Wed Feb 21 22:23:05 2018 -0800 + + [subset] sketch out dropping in-glyf instructions. Sometimes yields differnet size glyphs than fonttools, possibly due to padding not being corrected + + src/hb-ot-glyf-table.hh | 45 ++++++++++++++++ + src/hb-subset-glyf.cc | 78 +++++++++++++++++++++------ + src/hb-subset-input.cc | 6 +++ + src/hb-subset.h | 2 + + test/api/fonts/Roboto-Regular.ac.nohints.ttf | Bin 0 -> 1128 bytes + test/api/hb-subset-test.h | 15 +++--- + test/api/test-subset-cmap.c | 4 +- + test/api/test-subset-glyf.c | 32 +++++++++-- + test/api/test-subset-hmtx.c | 10 ++-- + test/api/test-subset-os2.c | 2 +- + 10 files changed, 160 insertions(+), 34 deletions(-) + +commit 2d0265242bb9a080886d6e0aa653c62e5770a15a +Author: Rod Sheeter +Date: Wed Feb 21 09:42:46 2018 -0800 + + [subset] keep the result of _subset + + src/hb-subset.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4fb97be78d9287e489c9f67d1bfe7682235bdf38 +Author: Behdad Esfahbod +Date: Wed Feb 21 14:38:02 2018 -0800 + + Add two more ragel-generated headers + + Fixes https://github.com/harfbuzz/harfbuzz/issues/817 + + src/hb-buffer-deserialize-json.hh | 643 ++++++++++++++++++++++++++++++++++++++ + src/hb-buffer-deserialize-text.hh | 571 +++++++++++++++++++++++++++++++++ + 2 files changed, 1214 insertions(+) + +commit 74e0c13a4a55848e797242c02c8f067e587ea603 +Author: Rod Sheeter +Date: Wed Feb 21 11:19:18 2018 -0800 + + [subset] drop hint tables if so flagged. Still need to dump glyf instructions. + + src/hb-subset-plan.cc | 1 + + src/hb-subset-plan.hh | 2 ++ + src/hb-subset-private.hh | 2 +- + src/hb-subset.cc | 11 +++++++++-- + util/hb-subset.cc | 2 +- + util/options.cc | 2 +- + util/options.hh | 4 ++-- + 7 files changed, 17 insertions(+), 7 deletions(-) + +commit edee28801e4dbb5b734b4038d93fe1594e267ab1 +Author: Ebrahim Byagowi +Date: Wed Feb 21 22:13:58 2018 +0330 + + Add .editorconfig (#810) + + More information: http://editorconfig.org/ + + .editorconfig | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit 0bd100e144885ed8144cf23e7e106014858a1724 +Author: Rod Sheeter +Date: Wed Feb 21 10:34:00 2018 -0800 + + [subset] add --hinting flag + + src/hb-subset-private.hh | 1 + + util/hb-subset.cc | 6 +++++- + util/options.cc | 15 +++++++++++++++ + util/options.hh | 14 ++++++++++++++ + 4 files changed, 35 insertions(+), 1 deletion(-) + +commit 7ecca8c0a83a6c71154fcc80887a4f895c0c5a23 +Author: Rod Sheeter +Date: Wed Feb 21 09:42:46 2018 -0800 + + [subset] keep the result of _subset + + src/hb-subset.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit eada749e4642ea90300c9c68c226fa76a3e35a75 +Author: Behdad Esfahbod +Date: Wed Feb 21 00:35:23 2018 -0800 + + Use HB_SET_VALUE_INVALID consistently + + src/hb-ot-layout-common-private.hh | 6 +++--- + src/hb-ot-shape.cc | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 2cc845f311b6dc4f0feda8b8fc5609fbd51b5923 +Author: Garret Rieger +Date: Tue Feb 20 18:13:41 2018 -0800 + + [subset] fix calculation of range shiftz. Should be 16 * len - searchRange not 16 * (len - searchRange). + + src/hb-open-type-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 8e614ade5aef102baed56f91c2fcb1f3d1788ea9 +Author: Garret Rieger +Date: Tue Feb 20 17:36:54 2018 -0800 + + [subset] Reverse table order for font serialization to match what OTS expects. + + src/hb-open-file-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a998eeee4ad7bba4a1574c9735618891b6bd0948 +Author: Garret Rieger +Date: Tue Feb 20 16:48:52 2018 -0800 + + [subset] sanity check glyph data writes during glyph subsetting to ensure they are inbounds. + + src/hb-subset-glyf.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 0ab73e594275cf064e09b9df2e1df337a589745d +Author: Garret Rieger +Date: Tue Feb 20 15:33:03 2018 -0800 + + [subset] Sanity check that loca writes are inbounds. + + src/hb-subset-glyf.cc | 55 ++++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 41 insertions(+), 14 deletions(-) + +commit 73e20ec6e9ad86bea023fc8b6fc10287889ed048 +Merge: 6ae4013f 69e443b2 +Author: Garret Rieger +Date: Tue Feb 20 17:34:59 2018 -0700 + + Merge pull request #812 from googlefonts/cleanup + + Clean up of glyf subsetting. + +commit 6ae4013f2e53d6496507a58b715298fee4eadcee +Author: Behdad Esfahbod +Date: Tue Feb 20 15:02:25 2018 -0800 + + [aat] Cosmetic touch-ups to trak table + + src/hb-aat-layout-trak-table.hh | 31 +++++++++++++++++-------------- + 1 file changed, 17 insertions(+), 14 deletions(-) + +commit abc82b493e301e5588d689baa1434b3ce6577fcd +Author: Behdad Esfahbod +Date: Tue Feb 20 14:34:16 2018 -0800 + + Add Ragel-generated files to git + + I know it's bad form; I know I've said no to this multiple times... + But this is part of an experiment to see if we can make rolling HarfBuzz + into Chrome much faster. That will give us a lot more testing exposure + that currently Chrome does. + + Doing this while those files are still considered ignored by our + gitignore rules; will see how that flies. + + autogen.sh | 10 +- + src/Makefile.am | 3 +- + src/hb-ot-shape-complex-indic-machine.hh | 1319 ++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-khmer-machine.hh | 294 +++++++ + src/hb-ot-shape-complex-myanmar-machine.hh | 413 +++++++++ + src/hb-ot-shape-complex-use-machine.hh | 502 +++++++++++ + 6 files changed, 2535 insertions(+), 6 deletions(-) + +commit 69e443b254fceb29f26f6a0c0129fe3c93c19cfb +Author: Garret Rieger +Date: Tue Feb 20 14:29:21 2018 -0800 + + [subset] Switch to hb_blob_copy_writable_or_fail in glyf subsetting. + + src/hb-ot-glyf-table.hh | 29 +++++++++++------------------ + src/hb-ot-maxp-table.hh | 3 +-- + 2 files changed, 12 insertions(+), 20 deletions(-) + +commit e3e0ac98238b78530a625a6b7e7647dbabbe1c4d +Author: Garret Rieger +Date: Tue Feb 20 14:07:40 2018 -0800 + + [subset] Move glyf subsetting code into hb-ot-glyf-table.hh + + src/hb-ot-glyf-table.hh | 49 +++++++++++++++++++++++++++++++++++++++++++++++- + src/hb-subset.cc | 50 +------------------------------------------------ + 2 files changed, 49 insertions(+), 50 deletions(-) + +commit d1f16fce963092404bf0b59e449a3215ca031b54 +Author: Behdad Esfahbod +Date: Tue Feb 20 10:32:09 2018 -0800 + + Don't use %zu + + Some of our bots / compilers don't like it. Wasn't caught by bots because this + is only in debug code. + + https://github.com/harfbuzz/harfbuzz/pull/809/commits/825ad378e0f0e6e6bb690894a0d5d25f198be21b + + src/hb-ot-cmap-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c7e834a2fc5f8fb81f5316447e4075902d58d8a3 +Author: Ebrahim Byagowi +Date: Tue Feb 20 17:59:04 2018 +0330 + + [dev-run] minor + + src/dev-run.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 975c35214f8c8f0d90a8b114e1a8c06d5ecdecfd +Author: Ebrahim Byagowi +Date: Tue Feb 20 17:49:29 2018 +0330 + + [dev-run] Support autotools builds + + src/dev-run.sh | 46 +++++++++++++++++++++++++++++++--------------- + 1 file changed, 31 insertions(+), 15 deletions(-) + +commit 25136d9b7265d8920a78f3f832f1c69da4ef1f5b +Author: Dominik Röttsches +Date: Tue Feb 20 10:26:07 2018 +0200 + + Use %zu format specifier for size_t to fix cross platform build + + Fixes Chromium Android builds, compare + https://ci.chromium.org/buildbot/tryserver.chromium.android/linux_android_rel_ng/491787 + + src/hb-ot-cmap-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 53cf61b0299775f94c625de1bb0a7979b3b0c379 +Author: Ebrahim Byagowi +Date: Tue Feb 20 10:53:10 2018 +0330 + + Change Alpine and ArchLinux bot to test O3 and O0 on gcc, #801 + + .circleci/config.yml | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit a64eacd8a6cb9811bcaadf20b8b8ae56306cbd75 +Author: Ebrahim Byagowi +Date: Mon Feb 19 23:27:08 2018 +0330 + + [aat] First dig on 'trak' + + src/Makefile.sources | 3 +- + src/hb-aat-layout-trak-table.hh | 100 ++++++++++++++++++++++++++++++++++++++++ + src/hb-aat-layout.cc | 3 +- + src/hb-ot-layout-private.hh | 6 ++- + 4 files changed, 108 insertions(+), 4 deletions(-) + +commit 0bff6991de308044b077ce74bd45d57d8c4afe5f +Author: Behdad Esfahbod +Date: Mon Feb 19 11:51:25 2018 -0800 + + Ugh. Really fix build. + + src/hb-subset-private.hh | 2 +- + src/hb-subset.cc | 3 +-- + test/api/hb-subset-test.h | 1 + + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 4fcbd22b18040cbfd7410e6a090c5f9624eb9a0f +Author: Behdad Esfahbod +Date: Mon Feb 19 11:49:25 2018 -0800 + + Fix build after previous commit + + src/hb-subset-plan.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 0bbf90ded00dd00ee3f79c1bd16c775d7c893278 +Author: Behdad Esfahbod +Date: Mon Feb 19 11:38:53 2018 -0800 + + [subset] Don't include hb-subset.h from hb.h + + src/hb.h | 1 - + 1 file changed, 1 deletion(-) + +commit fde04777d1d429fd0981002194f5c19599fda350 +Author: Ebrahim Byagowi +Date: Mon Feb 19 20:00:07 2018 +0330 + + Check availability of entr instead now that this works with it + + src/dev-run.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b095ce59ebc5723a1b9c049eebb8f204455c9a72 +Author: Ebrahim Byagowi +Date: Mon Feb 19 11:58:20 2018 +0330 + + Simplify hb-fuzzer output printing and fix ArchLinux bot + + test/fuzzing/run-fuzzer-tests.py | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit be51f763a752bed1c395bff19afe3291a6063d00 +Author: Ebrahim Byagowi +Date: Mon Feb 19 11:06:13 2018 +0330 + + Test debug builds on ArchLinux bot + + Fixes #805 + + .circleci/config.yml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit e2d2d819848ed0ff1c60b9bde1f9c8f9495ec5b4 +Author: Behdad Esfahbod +Date: Sun Feb 18 17:28:53 2018 -0800 + + Limit how much work sanitize() can do + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=6022 + + src/Makefile.am | 2 ++ + src/hb-open-type-private.hh | 16 ++++++++++++++-- + .../233c1e252e737ca79e03a9fd56b71aaa4a230f2b.ttf | Bin 0 -> 1048576 bytes + test/shaping/data/in-house/tests/fuzzed.tests | 1 + + 4 files changed, 17 insertions(+), 2 deletions(-) + +commit 7033fe5877c6f9500575f20f17135f74dc9c0547 +Author: Behdad Esfahbod +Date: Sun Feb 18 17:12:04 2018 -0800 + + [aat] Minor + + src/hb-aat-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6fa690c75a572a1076124b428b76929b2674e532 +Author: Behdad Esfahbod +Date: Sun Feb 18 16:27:59 2018 -0800 + + Fix debug build + + Context needs to be called 'c'. The TRACE_* rely on that. + + src/hb-ot-cmap-table.hh | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit 05d1e77db8f3e5280e93b6885ff4f7df113b612b +Author: Behdad Esfahbod +Date: Sun Feb 18 16:26:04 2018 -0800 + + [aat] Silence warning + + src/hb-aat-layout-kerx-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a21fceb05311f61ef179b2f3aa6497562555f241 +Author: Behdad Esfahbod +Date: Sun Feb 18 16:10:15 2018 -0800 + + [ci] Make AppVeyor less noisy + + appveyor.yml | 3 +++ + 1 file changed, 3 insertions(+) + +commit 1c50a88623a881a9e2b2b0f1f6a783962626f03a +Author: Behdad Esfahbod +Date: Sun Feb 18 15:57:09 2018 -0800 + + Readjust mark attachment heuristic a bit more + + Previously adjusted logic could fail if nothing around was ligated, + and something moved. This should take care of that. + + CC https://github.com/harfbuzz/harfbuzz/issues/740 + + src/hb-ot-layout-gpos-table.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 246e280d88b6b26757297a349f01e52c15eaec53 +Author: Behdad Esfahbod +Date: Sun Feb 18 15:42:25 2018 -0800 + + [test] Add test for https://github.com/harfbuzz/harfbuzz/issues/740 + + .../fonts/573d3a3177c9a8646e94c8a0d7b224334340946a.ttf | Bin 0 -> 5680 bytes + test/shaping/data/in-house/tests/use.tests | 1 + + 2 files changed, 1 insertion(+) + +commit 79756c9039a628b0df441228ca1ea20b8a91e3e8 +Author: Ebrahim Byagowi +Date: Mon Feb 19 03:17:44 2018 +0330 + + [aat] First dig on 'kerx' (#704) + + src/Makefile.sources | 1 + + src/hb-aat-layout-kerx-table.hh | 377 ++++++++++++++++++++++++++++++++++++++++ + src/hb-aat-layout.cc | 1 + + src/hb-ot-layout-private.hh | 2 + + 4 files changed, 381 insertions(+) + +commit 279c70a5b36446f444e5d2f4ac1db7614c8a3db8 +Merge: e9164478 89b82814 +Author: Behdad Esfahbod +Date: Sun Feb 18 14:04:33 2018 -0800 + + Merge pull request #796 from ebraminio/dev-run + + Add a continuous builder using fswatch + +commit e91644786bf7c278e75962b851d5d47011ff175c +Author: Behdad Esfahbod +Date: Sun Feb 18 12:41:24 2018 -0800 + + Remove unused check + + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 89b82814b605d2bfcc481a47607e642a928dff15 +Author: Ebrahim Byagowi +Date: Fri Feb 16 12:53:33 2018 +0330 + + Add a continuous builder using fswatch + + CMakeLists.txt | 24 +++++++++++++----------- + src/dev-run.sh | 22 ++++++++++++++++++++++ + test/api/CMakeLists.txt | 2 +- + 3 files changed, 36 insertions(+), 12 deletions(-) + +commit 0bd2d76bdd83569366762416bf7c8fd8e90021aa +Author: Behdad Esfahbod +Date: Sun Feb 18 11:55:26 2018 -0800 + + [test] Fix a couple of coverity_scan issues + + test/api/hb-subset-test.h | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +commit 8089711a61687d565f207c56d3d2b658f514d7ab +Author: Ebrahim Byagowi +Date: Sun Feb 18 23:25:15 2018 +0330 + + Another attempt on fixing coverity + + I hope I am in a correct direction at least + + .travis.yml | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 79d0d791b9ee920e1f687a93de5adf5d113cc829 +Merge: 21646cc4 97a71102 +Author: Behdad Esfahbod +Date: Sun Feb 18 11:35:51 2018 -0800 + + Merge pull request #800 from harfbuzz/bitops + + Optimize set through optimized bit operations + +commit 97a71102153d28982297a190739c7d82e76b109e +Author: Behdad Esfahbod +Date: Sun Feb 18 10:50:24 2018 -0800 + + Fix BitScanForward() usage + + Should fix Win64 bot. + + src/hb-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit fe8f40a4180e7b02831a264c0b3c66763156abb6 +Merge: cd11107b 21646cc4 +Author: Behdad Esfahbod +Date: Sun Feb 18 10:45:33 2018 -0800 + + Merge branch 'master' into bitops + +commit 21646cc4a6160088933774e179df9be4865a9f4b +Author: David Corbett +Date: Fri Feb 16 12:08:55 2018 -0500 + + Do not mark the first glyph as unsafe to break + + Fixes #791. + + src/hb-buffer-private.hh | 3 +-- + src/hb-coretext.cc | 4 ---- + src/hb-directwrite.cc | 2 -- + src/hb-graphite2.cc | 1 - + src/hb-uniscribe.cc | 2 -- + 5 files changed, 1 insertion(+), 11 deletions(-) + +commit 04dedec96b76600eecdb739b72814a4a56b270ae +Author: Behdad Esfahbod +Date: Fri Feb 16 18:32:57 2018 -0800 + + [test] Remove unused var + + test/api/test-subset-hmtx.c | 1 - + 1 file changed, 1 deletion(-) + +commit 181b7471074cc814e0f498fc05fd6850c3f5e403 +Author: Behdad Esfahbod +Date: Fri Feb 16 17:08:44 2018 -0800 + + Update outdated TODO file + + TODO | 29 +---------------------------- + 1 file changed, 1 insertion(+), 28 deletions(-) + +commit 6d56db8983e03fbebbeb61282bef8cb1f9abb8e2 +Author: Behdad Esfahbod +Date: Fri Feb 16 17:02:57 2018 -0800 + + [test/api] Distribute all fonts + + test/api/Makefile.am | 21 ++------------------- + 1 file changed, 2 insertions(+), 19 deletions(-) + +commit e5ab34fd3a104f7ff2f0b36c66770c88b2ea1051 +Author: Behdad Esfahbod +Date: Fri Feb 16 16:58:17 2018 -0800 + + Misc fixes + + Should bring bag djgpp bot. + + src/hb-ot-os2-table.hh | 54 +++++++++++++++++++++++++------------------------- + src/hb-subset-plan.cc | 16 +++++++-------- + 2 files changed, 34 insertions(+), 36 deletions(-) + +commit df9e22656de746bde65dee775a66f1a80f1c2e32 +Author: Garret Rieger +Date: Fri Feb 16 17:02:51 2018 -0700 + + [subset] add a glyf subsetting test for a font with composite glyphs. + + .../api/fonts/Roboto-Regular.components.subset.ttf | Bin 0 -> 2052 bytes + test/api/fonts/Roboto-Regular.components.ttf | Bin 0 -> 2572 bytes + test/api/test-subset-glyf.c | 21 +++++++++++++++++++++ + 3 files changed, 21 insertions(+) + +commit c36d015b0e9c363431cd9d228b776ad419fde474 +Author: Garret Rieger +Date: Fri Feb 16 17:02:15 2018 -0700 + + [subset] missing return. + + test/api/hb-subset-test.h | 1 + + 1 file changed, 1 insertion(+) + +commit 2130392dcc30784ee34c487ab16316006c91f16d +Author: Garret Rieger +Date: Fri Feb 16 17:01:00 2018 -0700 + + [subset] Add support for updating reference gids in components to their new values. + + src/hb-subset-glyf.cc | 38 +++++++++++++++++++++++++++++++++----- + 1 file changed, 33 insertions(+), 5 deletions(-) + +commit 49544eb860e523838892d6ce88eeca72ffd19da4 +Author: Garret Rieger +Date: Fri Feb 16 16:56:15 2018 -0700 + + [subset] Refactor composite glyf iteration code into an Iterator outside of the accelerator. + + src/hb-ot-glyf-table.hh | 110 +++++++++++++++++++++++++----------------------- + src/hb-subset-plan.cc | 6 +-- + 2 files changed, 60 insertions(+), 56 deletions(-) + +commit dc6d67df1395faf38d7587b1dd3c6661ee7cd6f0 +Author: Garret Rieger +Date: Fri Feb 16 15:20:14 2018 -0700 + + [subset] Use gids_to_retain_sorted to produce old gid -> new gid mapping since it now has the more complete set. + + src/hb-subset-plan.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit dcac9fe96429d4e272a3fbd60a6162f988f58f71 +Author: Garret Rieger +Date: Fri Feb 16 11:27:03 2018 -0700 + + [subset] Use complex glyph closure to populate gids_to_retain_sorted. + + src/hb-subset-plan.cc | 43 ++++++++++++++++++++++++------------------- + src/hb-subset-plan.hh | 6 ++++++ + 2 files changed, 30 insertions(+), 19 deletions(-) + +commit 58a54c9d4f72e228c012451c4469da730742d3d8 +Author: Garret Rieger +Date: Fri Feb 16 11:20:38 2018 -0700 + + [subset] add constant to get_composite and in_table methods in hb-ot-glyf-table + + src/hb-ot-glyf-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 73e1434814eb37005b4159babf972a2743b25700 +Author: Garret Rieger +Date: Thu Feb 15 14:41:56 2018 -0800 + + [subset] Add a DFS search to produce a closure of composite glyphs. + + src/hb-subset-plan.cc | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit d3684141437fad6ebf5f9945f92125c9a42ea853 +Author: Garret Rieger +Date: Thu Feb 15 14:03:34 2018 -0800 + + [subset] add helper methods to glyf accelerator for reading composite glyph information. + + src/hb-ot-glyf-table.hh | 115 ++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 112 insertions(+), 3 deletions(-) + +commit cd11107bb44ac719709e10264e9e6ba6a1cfae0c +Author: Behdad Esfahbod +Date: Fri Feb 16 18:28:58 2018 -0800 + + Another bitops fallback fix + + I'm confident that all bugs are hashed out now. + + src/hb-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4e517ecb6b7c27d4053a6476bb9262858e2567ed +Author: Behdad Esfahbod +Date: Fri Feb 16 18:20:12 2018 -0800 + + Another bitops fallback impl fix + + src/hb-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit f18b9fbf6583dff72675be7859fc147ec24a0dd2 +Author: Behdad Esfahbod +Date: Fri Feb 16 18:14:41 2018 -0800 + + [set] Implement iteration using bitop intrinsics + + src/hb-set-private.hh | 55 ++++++++++++++++++--------------------------------- + 1 file changed, 19 insertions(+), 36 deletions(-) + +commit 6a91a2eb04951f6e33706c2b8e9cd987b429fce9 +Author: Behdad Esfahbod +Date: Fri Feb 16 17:49:41 2018 -0800 + + Fix wide bitops implemenetation + + src/hb-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d25c3e69e9b0cb9d947e98845b9e3a14ce58e350 +Author: Behdad Esfahbod +Date: Fri Feb 16 17:45:09 2018 -0800 + + [set] Readjust parameters + + src/hb-set-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 6d5c0bf8b18ed53e8d40dcbae83ec66ed2116843 +Author: Behdad Esfahbod +Date: Fri Feb 16 17:33:26 2018 -0800 + + Fix bitops fallback impl + + src/hb-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 82eb1dac163cb4aef8a2e4ebad542378f4e28dca +Author: Behdad Esfahbod +Date: Fri Feb 16 16:52:09 2018 -0800 + + Flesh out other bit ops some more for 128bit as well + + src/hb-private.hh | 165 +++++++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 126 insertions(+), 39 deletions(-) + +commit 864a2dddae9eb1303c59d0d3717fce307a72a524 +Author: Behdad Esfahbod +Date: Fri Feb 16 14:21:40 2018 -0800 + + Clean up bit functions + + Compile all code-paths possible, to better catch errors. + Also enable MSVC ones on mingw which seems to support them. + + src/hb-private.hh | 43 +++++++++++++++++++++++++++---------------- + 1 file changed, 27 insertions(+), 16 deletions(-) + +commit 978ace6fbbc828adc20f21591d138f41d8508ebc +Author: Behdad Esfahbod +Date: Fri Feb 16 16:06:17 2018 -0800 + + Improve _hb_popcount() + + Support 128bit type. + + configure.ac | 3 ++- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-map.cc | 2 +- + src/hb-private.hh | 61 +++++++++++++++++++++++++++--------------- + 4 files changed, 44 insertions(+), 24 deletions(-) + +commit 7b5ce7404716a17f91ff86d374c7b76ee7ce3247 +Author: Behdad Esfahbod +Date: Fri Feb 16 15:37:22 2018 -0800 + + Fix warnings + + src/hb-ot-os2-table.hh | 2 +- + test/api/hb-subset-test.h | 3 ++- + test/api/hb-test.h | 9 +++++++-- + 3 files changed, 10 insertions(+), 4 deletions(-) + +commit 94d32d1b83892ed4f124463cf4322bf74b3e850d +Author: Behdad Esfahbod +Date: Fri Feb 16 15:36:20 2018 -0800 + + Enable C99 if available + + Hopefully we can now mix-and-match code and declaration in the C test files. + + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +commit 926db874552519734fab6c04258887ea634f5324 +Merge: 882a3bf4 c7a633f9 +Author: rsheeter +Date: Fri Feb 16 15:27:29 2018 -0800 + + Merge pull request #792 from googlefonts/master + + Support more tables in subsetter + +commit 882a3bf4abcdac60414db41d54dbbb7d2368c908 +Author: Behdad Esfahbod +Date: Fri Feb 16 14:17:20 2018 -0800 + + That didn't work... + + RELEASING.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b1f186df78ed14cbc8be919e7f552df2bd7561e0 +Author: Behdad Esfahbod +Date: Fri Feb 16 14:13:38 2018 -0800 + + Add mingw32.sh and mingw64.sh + + RELEASING.md | 28 +--------------------------- + mingw32.sh | 22 ++++++++++++++++++++++ + mingw64.sh | 22 ++++++++++++++++++++++ + 3 files changed, 45 insertions(+), 27 deletions(-) + +commit d37310ac5d5f8a3fd1ce1e535647e7c6bb0d7926 +Author: Arkady Shapkin +Date: Fri Feb 16 21:45:08 2018 +0300 + + Remove checking macros __OPTIMIZE__ for MSVC + + Visual C++ compiler doesn't define macros __OPTIMIZE__ when optimizations enabled + + src/hb-private.hh | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 4eff0fc5b87084765ac2e36ba9f09d7d257f32fb +Author: Khaled Hosny +Date: Fri Feb 16 20:22:52 2018 +0200 + + Make this work for old versions of automake + + .ci/fail.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit f8077c97909778c117d37773c9da570d831dacd2 +Author: Khaled Hosny +Date: Thu Feb 15 11:47:08 2018 +0200 + + Print only the failed log + + .ci/fail.sh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 8e3b4c0e11642470069b866a73768a866ac3fdb3 +Author: Khaled Hosny +Date: Thu Feb 15 11:25:24 2018 +0200 + + Simplify calls to collect-logs.sh + + .ci/{collect-logs.sh => fail.sh} | 3 +++ + .circleci/config.yml | 13 +++++++++---- + .travis.yml | 6 +++--- + appveyor.yml | 2 +- + 4 files changed, 16 insertions(+), 8 deletions(-) + +commit c7a633f95710fcf2fe9151b41feba7db4b1bab0e +Author: Rod Sheeter +Date: Fri Feb 16 11:11:20 2018 -0800 + + [subset] try to get more info from bot where g_assert_cmpmem fails + + test/api/hb-subset-test.h | 12 +++++------- + test/api/hb-test.h | 11 ++++++++--- + 2 files changed, 13 insertions(+), 10 deletions(-) + +commit 0bb2d7ac12b7cf482580b6d2e8534eef8a233f96 +Author: Rod Sheeter +Date: Fri Feb 16 06:26:02 2018 -0800 + + [subset] fix int type for blob length in hb-subset-test.h + + test/api/hb-subset-test.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit be0a01a67613f45db7f7e9be84cb883f0344c817 +Merge: 7acaa3b7 139c9928 +Author: Rod Sheeter +Date: Fri Feb 16 06:01:41 2018 -0800 + + Merge branch 'master' of https://github.com/harfbuzz/harfbuzz + +commit 139c9928f6152088fa6eee0279e33cb821aeb541 +Author: Ebrahim Byagowi +Date: Fri Feb 16 13:27:26 2018 +0330 + + Fix hb-private.hh compile issue + + src/hb-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6c10328eb88b0641586f31a782b63f45eada5609 +Author: Arkady Shapkin +Date: Thu Feb 15 23:17:46 2018 +0300 + + Use _BitScanForward and _BitScanReverse on MSVC + + src/hb-private.hh | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 7acaa3b781da835cdb11dbe523c819feb4eef996 +Author: Rod Sheeter +Date: Thu Feb 15 14:28:29 2018 -0800 + + [subset] apparently C99 is too much to ask in 2018 + + src/hb-ot-hmtx-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b1740106a9c825874faf3f1315770d1e3c790cf9 +Author: Rod Sheeter +Date: Thu Feb 15 13:55:21 2018 -0800 + + [subset] fix format specifier for size_t + + src/hb-ot-hmtx-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e00c37aaae3922b425c0528bfdd36d59cf9c5796 +Author: Rod Sheeter +Date: Thu Feb 15 12:53:52 2018 -0800 + + [subset] fix no matching function MIN in djgpp + + src/hb-ot-hmtx-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6122ad2442666d89ef39bdf5a2bb9d3f6d8e2b03 +Author: Rod Sheeter +Date: Thu Feb 15 11:40:28 2018 -0800 + + [subset] add files to EXTRA_DIST + + test/api/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +commit 0758cbc4c2f52c629d05515b8d2816e8d6a2a2c1 +Author: Rod Sheeter +Date: Thu Feb 15 11:29:01 2018 -0800 + + [subset] correct bug introduced to get_advance + + src/hb-ot-hmtx-table.hh | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 3fd11f4397aec9cda3a7d29246ab3ae56115ad36 +Author: Rod Sheeter +Date: Thu Feb 15 11:15:12 2018 -0800 + + [subset] remove unused decl + + src/hb-subset-private.hh | 3 --- + 1 file changed, 3 deletions(-) + +commit 23d21a74b55eaf6d6d367097099e6b3bb78bae37 +Author: Khaled Hosny +Date: Thu Feb 15 02:52:15 2018 +0200 + + Move collect_logs to .ci dir + + Next to other CI scripts. + + .collect_logs => .ci/collect-logs.sh | 0 + .circleci/config.yml | 8 ++++---- + .travis.yml | 6 +++--- + appveyor.yml | 2 +- + 4 files changed, 8 insertions(+), 8 deletions(-) + +commit 0e088a63d10dd09e025515bfa8ae68aa2922eaf6 +Author: Rod Sheeter +Date: Wed Feb 14 21:11:45 2018 -0800 + + [subset] hmtx space bracket. authors++ + + src/hb-ot-hmtx-table.hh | 40 ++++++++++++++++++++-------------------- + 1 file changed, 20 insertions(+), 20 deletions(-) + +commit 1725c35da0ea2f829b6d6b6c1963607fd6dfb577 +Author: Rod Sheeter +Date: Wed Feb 14 19:36:33 2018 -0800 + + [subset] cmap space bracket + + src/hb-ot-cmap-table.hh | 72 ++++++++++++++++++++++++------------------------- + 1 file changed, 36 insertions(+), 36 deletions(-) + +commit e158739bfb9e5d60989e179fcc8744f3125e2067 +Author: Rod Sheeter +Date: Wed Feb 14 19:22:37 2018 -0800 + + [subset] space bracket + + src/hb-ot-hmtx-table.hh | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 2d6b1e2af74abea645a943d264e148d56d018101 +Author: Rod Sheeter +Date: Wed Feb 14 19:14:01 2018 -0800 + + [subset] maxp copy writeable fn + + src/hb-ot-maxp-table.hh | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 1efecd965fe81d65e2763be4f43df2d8c4d8be44 +Author: Rod Sheeter +Date: Wed Feb 14 18:42:29 2018 -0800 + + [subset] hmtx use copy writeable fn instead of direct memory + + src/hb-ot-hmtx-table.hh | 23 ++++------------------- + 1 file changed, 4 insertions(+), 19 deletions(-) + +commit 27012526f9b3848676bc2a4fb8e68c630af18620 +Author: Rod Sheeter +Date: Wed Feb 14 19:01:00 2018 -0800 + + [subset] whitespace + + test/api/test-subset-hmtx.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit b1bd0b5f506dad9d04fd3a6abcb92122f231e0f7 +Author: Behdad Esfahbod +Date: Wed Feb 14 18:50:19 2018 -0800 + + [subset] Minor + + src/hb-ot-cmap-table.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 83f57e24bfc2000373192ec44b067fdd7dee8a65 +Author: Behdad Esfahbod +Date: Wed Feb 14 18:43:53 2018 -0800 + + [test] Reinstate test/shaping/data/in-house/tests/myanmar-syllable.tests + + test/shaping/data/in-house/tests/myanmar-syllable.tests | 1 + + 1 file changed, 1 insertion(+) + +commit 5ae6526ef4aa9b3c943cad984dc2fff09cdf597b +Merge: 2903b2f3 04c1ec2b +Author: Behdad Esfahbod +Date: Wed Feb 14 18:42:32 2018 -0800 + + [subset] Merge remote-tracking branch 'googlefonts/master' + +commit 04c1ec2b7396c05f6e8afc9d87679422782aa1e8 +Author: Garret Rieger +Date: Wed Feb 14 17:00:18 2018 -0800 + + [subset] Don't fail on different checksum adjustment in subsetting tests. + + .../expected/basics/Roboto-Regular.abc.default.62.ttf | Bin 1740 -> 1692 bytes + test/subset/run-tests.py | 8 ++++++++ + 2 files changed, 8 insertions(+) + +commit 0775bc0f7a59241456142b48abced75fd3db5a42 +Author: Garret Rieger +Date: Wed Feb 14 16:37:35 2018 -0800 + + [subset] Fix hhea subsetting and clean up some memory leaks. + + src/hb-ot-hmtx-table.hh | 25 ++++++++++++++----------- + 1 file changed, 14 insertions(+), 11 deletions(-) + +commit b56c9384bcc177236debd26fdbbf14319e4c62b9 +Author: Garret Rieger +Date: Wed Feb 14 16:05:39 2018 -0800 + + [subset] Add missing face reference in hb-subset-plan plus ensure all struct members are cleaned up on destroy. + + src/hb-subset-plan.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit e0ffebead6230b8e1ee8dd97425505706321793e +Author: Garret Rieger +Date: Wed Feb 14 16:01:08 2018 -0800 + + [subset] In hb-subset-test use hb_set_union instead of manually copying set. + + test/api/hb-subset-test.h | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +commit e330ef3711c543372f9f8550a967c512bbf87d83 +Author: Garret Rieger +Date: Wed Feb 14 15:57:11 2018 -0800 + + [subset] Restore hb_face_data_destroy to be internal. + + src/hb-subset.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 3ab7d2649bf5c92d3837b3132d65d4659d0fa003 +Author: Garret Rieger +Date: Wed Feb 14 15:48:57 2018 -0800 + + [subset] Fix memory leak in hb-ot-{maxp,os2}. Plus some formatting. + + src/hb-ot-maxp-table.hh | 6 ++++-- + src/hb-ot-os2-table.hh | 24 +++++++++++++----------- + 2 files changed, 17 insertions(+), 13 deletions(-) + +commit 2903b2f357eb495c9badac1b2f74e65e1d1075bd +Author: Behdad Esfahbod +Date: Wed Feb 14 15:46:27 2018 -0800 + + Another linker tweaking + + Trying to fix this warning: + cc1: warning: command line option ‘-fno-threadsafe-statics’ is valid for C++/ObjC++ but not for C + + Let's see what the clang bots think of it. + + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e1f1f96577a80846749782b6e199a661f4189ec0 +Author: Behdad Esfahbod +Date: Wed Feb 14 15:44:48 2018 -0800 + + [set] Tune size again + + Switch from a 128+64 hierarchy, to 32+32. New page size is 1024. + This should make set iteration faster, without affecting other op + performances much. + + src/hb-set-private.hh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 66e282df32410831f1c4e157e9dcf8c76f2bc3d8 +Author: Rod Sheeter +Date: Wed Feb 14 15:31:13 2018 -0800 + + [subset] remove TODO that was already done + + src/hb-subset-plan.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 4696624ad9987b0eebcf5c84dafdb204b886f28e +Author: Rod Sheeter +Date: Wed Feb 14 15:30:49 2018 -0800 + + [subset] maxp wrong int type, note to use copy_writable_or_fail + + src/hb-ot-maxp-table.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 3ed70e5e64910e1c22225f542a525807b000cb2a +Author: Rod Sheeter +Date: Wed Feb 14 15:24:49 2018 -0800 + + [subset] return bool not hb_bool_t from table::subset + + src/hb-ot-cmap-table.hh | 2 +- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-os2-table.hh | 2 +- + src/hb-subset.cc | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 88d56e241bd6bb768656d77cf8f99ccc97fb2446 +Author: Rod Sheeter +Date: Wed Feb 14 15:20:43 2018 -0800 + + [subset] Use a supplier instead of memcpy and fix a few unnecessary {}s for cmap + + src/hb-ot-cmap-table.hh | 24 ++++++------------------ + 1 file changed, 6 insertions(+), 18 deletions(-) + +commit 42a80f00d51317207c49611b76d6bba06230371b +Author: Rod Sheeter +Date: Wed Feb 14 15:04:35 2018 -0800 + + [subset] add free + + src/hb-ot-hmtx-table.hh | 1 + + 1 file changed, 1 insertion(+) + +commit d463e9f6b57bebb3aa4875fe11c927c26c3e3974 +Author: Rod Sheeter +Date: Wed Feb 14 15:04:15 2018 -0800 + + [subset] Give Behdad credit again + + src/hb-subset.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fa87770372a3156658412ff0d70e32083c6b0484 +Author: Rod Sheeter +Date: Wed Feb 14 14:16:25 2018 -0800 + + [subset] First pass at hmtx + + src/hb-ot-cmap-table.hh | 19 +-- + src/hb-ot-hhea-table.hh | 6 +- + src/hb-ot-hmtx-table.hh | 163 ++++++++++++++++++--- + src/hb-ot-maxp-table.hh | 8 +- + src/hb-ot-os2-table.hh | 8 +- + src/hb-subset-glyf.cc | 5 +- + src/hb-subset-glyf.hh | 1 - + src/hb-subset-plan.cc | 12 ++ + src/hb-subset-plan.hh | 10 ++ + src/hb-subset-private.hh | 11 ++ + src/hb-subset.cc | 85 ++++++----- + test/api/Makefile.am | 7 + + test/api/fonts/Inconsolata-Regular.ab.ttf | Bin 0 -> 5048 bytes + test/api/fonts/Inconsolata-Regular.abc.ttf | Bin 0 -> 5224 bytes + test/api/fonts/Inconsolata-Regular.abc.widerc.ttf | Bin 0 -> 5228 bytes + test/api/fonts/Inconsolata-Regular.ac.ttf | Bin 0 -> 4940 bytes + test/api/fonts/Inconsolata-Regular.ac.widerc.ttf | Bin 0 -> 4944 bytes + test/api/fonts/README | 2 + + test/api/test-subset-hmtx.c | 164 ++++++++++++++++++++++ + 19 files changed, 422 insertions(+), 79 deletions(-) + +commit 20022575c658b29796db80c387641309d0c49586 +Author: Ebrahim Byagowi +Date: Thu Feb 15 01:15:39 2018 +0330 + + Redirect email notifications to another mailing list dedicated for this (#790) + + .travis.yml | 4 ++-- + appveyor.yml | 5 +++++ + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit 581996ea7976847b6356c9cc81b564f0c278f0f3 +Author: Ebrahim Byagowi +Date: Thu Feb 15 00:43:46 2018 +0330 + + Add .collect_logs and use it on CI bots, fixes #786 (#789) + + .circleci/config.yml | 8 ++++---- + .collect_logs | 6 ++++++ + .travis.yml | 6 +++--- + appveyor.yml | 2 +- + 4 files changed, 14 insertions(+), 8 deletions(-) + +commit e5edcc81bf14311c56bd2f50808552076c3c4d77 +Author: Garret Rieger +Date: Wed Feb 14 11:17:53 2018 -0800 + + [subset] Fix codepoint iteration in hb-subset-test. + + test/api/hb-subset-test.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ccae99fdadcf86aeda15dc230a3ddcd6ff176533 +Author: Behdad Esfahbod +Date: Wed Feb 14 11:12:09 2018 -0800 + + Another try + + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8b1dbbef1aec3b6880186070e7386a5553d67b15 +Author: Garret Rieger +Date: Wed Feb 14 11:04:12 2018 -0800 + + Fix compile error in hb-subset-test. + + test/api/hb-subset-test.h | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit f53627e19100df6eb7f32d58e7c4ce47a783f1a6 +Author: Behdad Esfahbod +Date: Wed Feb 14 10:59:22 2018 -0800 + + [test] Fix warning + + test/api/test-subset.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8c3612af650e4c8e01a9fdc127342b07b5c77962 +Author: Behdad Esfahbod +Date: Wed Feb 14 10:57:34 2018 -0800 + + Tweak Makefile some more + + src/Makefile.am | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit d594f947b68ad36d32ce107847f5f02ec3528076 +Author: Behdad Esfahbod +Date: Wed Feb 14 10:55:25 2018 -0800 + + [subset] Allow linking to libstdc++ + + We want to use it. + + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a0fe3011bafbe36e7d5810acc7df21bea08c802a +Author: Rod Sheeter +Date: Wed Feb 14 10:52:41 2018 -0800 + + copy all cmap groups at once + + src/hb-ot-cmap-table.hh | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) + +commit d008b62887afe631f50009f40e605c8456ddd011 +Merge: b0eefacf 109314cb +Author: Garret Rieger +Date: Wed Feb 14 10:38:52 2018 -0800 + + Merge remote-tracking branch 'upstream/master' into fixed + +commit b0eefacf4cb885f510f9551bf2e9216808ca61e8 +Author: Garret Rieger +Date: Mon Feb 12 18:15:58 2018 -0800 + + [subset] Drop GSUB, GDEF, GPOS, and DSIG from subsetter expected test outputs. + + .../expected/basics/Roboto-Regular.abc.default.62.ttf | Bin 2460 -> 1740 bytes + test/subset/generate-expected-outputs.py | 1 + + 2 files changed, 1 insertion(+) + +commit 89f17e3965ba776565f2de2bf56a4b135f336e53 +Author: Garret Rieger +Date: Mon Feb 12 18:14:50 2018 -0800 + + [subset] capitalize dsig. + + src/hb-subset.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit df6d780355d7da805a9b9033452f8814c5360bba +Author: Garret Rieger +Date: Mon Feb 12 17:56:17 2018 -0800 + + [subset] Extract maxp subsetting into hb-ot-maxp-table. + + src/hb-ot-maxp-table.hh | 19 ++++++++++++++++++- + src/hb-subset.cc | 28 ++-------------------------- + test/api/test-subset-glyf.c | 5 +++-- + 3 files changed, 23 insertions(+), 29 deletions(-) + +commit 865b6971ad5c2ec4bc33c36a78a36b90da5f5543 +Author: Garret Rieger +Date: Mon Feb 12 17:42:20 2018 -0800 + + [subset] Add a test for OS/2 fixes during subsetting. + + test/api/Makefile.am | 2 ++ + test/api/fonts/Roboto-Regular.b.ttf | Bin 0 -> 1996 bytes + test/api/test-subset-os2.c | 59 ++++++++++++++++++++++++++++++++++++ + 3 files changed, 61 insertions(+) + +commit 343dfe89655683966836e44afb4fd32c47377844 +Author: Garret Rieger +Date: Mon Feb 12 17:33:48 2018 -0800 + + [subset] white and add inline in hb-ot-cmap-table. + + src/hb-ot-cmap-table.hh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 24904383df03c472c865bd97bfe844f5e86a7172 +Author: Garret Rieger +Date: Mon Feb 12 17:31:01 2018 -0800 + + [subset] Correct usFirstCharIndex and usLastCharIndex in OS2 table when subsetting. + + src/hb-ot-os2-table.hh | 45 +++++++++++++++++++++++++++++++++++++++++++++ + src/hb-subset.cc | 16 ++++++++++------ + 2 files changed, 55 insertions(+), 6 deletions(-) + +commit 109314cb55e6d95d5c3a87b9ed1ba4e74a880078 +Author: Ebrahim Byagowi +Date: Wed Feb 14 21:05:11 2018 +0330 + + Another attempt on fixing the tests on Travis (#788) + + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 694eaf636713b8d0bbe13f38c2553b1a2f3d2d3a +Author: Behdad Esfahbod +Date: Wed Feb 14 01:00:10 2018 -0800 + + [set] Add backwards iterator + + New API: + - hb_set_previous() + - hb_set_previous_range() + + docs/harfbuzz-sections.txt | 2 ++ + src/hb-set-private.hh | 79 +++++++++++++++++++++++++++++++++++++++++++++- + src/hb-set.cc | 49 +++++++++++++++++++++++++++- + src/hb-set.h | 19 ++++++++--- + test/api/test-set.c | 53 +++++++++++++++++++++++++++++-- + 5 files changed, 194 insertions(+), 8 deletions(-) + +commit fe3bc524bd4f93bd67c13ed402720a13dd3484d3 +Author: Behdad Esfahbod +Date: Tue Feb 13 23:51:45 2018 -0800 + + [set] Allow starting iteration from a non-member of the set + + src/hb-set-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a989f3edec5864d5de8b217aa595c962d8fc4b0a +Author: Behdad Esfahbod +Date: Tue Feb 13 22:12:36 2018 -0800 + + Add hb_blob_copy_writable_or_fail() + + New API: + - hb_blob_copy_writable_or_fail() + + docs/harfbuzz-sections.txt | 1 + + src/hb-blob.cc | 25 +++++++++++++++++++++++++ + src/hb-blob.h | 3 +++ + 3 files changed, 29 insertions(+) + +commit 9046e924421869bf167b52cd394e868796091f62 +Author: Behdad Esfahbod +Date: Tue Feb 13 22:07:12 2018 -0800 + + [subset] Rename constructor to hb_subset_input_create_or_fail() + + To signify that unlike rest of library, returns nullptr on failure. + + src/hb-subset-input.cc | 6 ++---- + src/hb-subset.h | 2 +- + test/api/test-subset-glyf.c | 3 ++- + test/api/test-subset.c | 7 +++++-- + util/hb-subset.cc | 2 +- + 5 files changed, 11 insertions(+), 9 deletions(-) + +commit 507804479a81672ec0c089313adad9fa308d78fd +Author: Behdad Esfahbod +Date: Tue Feb 13 21:46:28 2018 -0800 + + [use] Add dump-use-data + + src/Makefile.am | 4 ++++ + src/dump-use-data.cc | 38 ++++++++++++++++++++++++++++++++++ + src/gen-use-table.py | 2 +- + src/hb-ot-shape-complex-use-private.hh | 2 +- + src/hb-ot-shape-complex-use-table.cc | 2 +- + src/hb-ot-shape-complex-use.cc | 4 ++-- + 6 files changed, 47 insertions(+), 5 deletions(-) + +commit 15ba4fbe01433c8627f9e6a60106ca77d3e1ad4c +Author: Behdad Esfahbod +Date: Tue Feb 13 21:41:51 2018 -0800 + + [khmer] Add dump-khmer-data + + src/Makefile.am | 4 + + src/Makefile.sources | 1 + + src/dump-khmer-data.cc | 43 +++++++++++ + src/hb-ot-shape-complex-khmer-private.hh | 124 +++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-khmer.cc | 98 +----------------------- + 5 files changed, 173 insertions(+), 97 deletions(-) + +commit effddd03bd6fb0aac14b46a16b281f3749e44780 +Author: Behdad Esfahbod +Date: Tue Feb 13 21:38:15 2018 -0800 + + [myanmar] Add dump-myanmar-data + + src/Makefile.am | 4 + + src/Makefile.sources | 1 + + src/dump-myanmar-data.cc | 43 ++++++++ + src/hb-ot-shape-complex-indic-private.hh | 8 +- + src/hb-ot-shape-complex-myanmar-private.hh | 171 +++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-myanmar.cc | 138 +---------------------- + 6 files changed, 225 insertions(+), 140 deletions(-) + +commit c0e45b60a001a45c8ed1f12af8f2f222161eca6a +Author: Behdad Esfahbod +Date: Tue Feb 13 21:23:38 2018 -0800 + + [indic] Rename print-indic-table to dump-indic-data + + Makes more sense given what this prints, err, dumps. + + src/Makefile.am | 8 ++++---- + src/{print-indic-table.cc => dump-indic-data.cc} | 0 + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 9b878bd2165236b067d59410673cf5cc54968fa7 +Author: Behdad Esfahbod +Date: Tue Feb 13 21:22:47 2018 -0800 + + [indic] Explicitly number indic_position_t + + So it's easier to cross-reference from output of print-indic-table. + + src/hb-ot-shape-complex-indic-private.hh | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +commit 8634846a0a1049c42ea84ca34402957c981b4c73 +Author: Behdad Esfahbod +Date: Tue Feb 13 21:18:00 2018 -0800 + + More tweaking linker and linker flags + + src/Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit d830d3d2448b2248dff642c701b442e1260e2d85 +Author: Behdad Esfahbod +Date: Tue Feb 13 19:01:03 2018 -0800 + + [indic] Share some copy/pasta code + + src/hb-ot-shape-complex-indic-private.hh | 29 +++++++++++++++++++++++++++-- + src/hb-ot-shape-complex-indic.cc | 27 --------------------------- + src/hb-ot-shape-complex-khmer.cc | 30 ++++++++---------------------- + src/hb-ot-shape-complex-myanmar.cc | 19 ++----------------- + 4 files changed, 37 insertions(+), 68 deletions(-) + +commit 397ed53e55b9450742867a43d164b498ec735f50 +Author: Behdad Esfahbod +Date: Tue Feb 13 18:54:26 2018 -0800 + + [indic] Add print-indic-table + + src/Makefile.am | 14 ++- + src/hb-ot-shape-complex-indic-private.hh | 185 ++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-indic.cc | 187 ------------------------------- + src/print-indic-table.cc | 43 +++++++ + 4 files changed, 239 insertions(+), 190 deletions(-) + +commit fd0bde6325a7dfe3ba54b683646ca0693c414446 +Author: Behdad Esfahbod +Date: Tue Feb 13 16:35:30 2018 -0800 + + [subset] Fix loca offsets + + Was writing source font's offsets. Ouch. + + src/hb-subset-glyf.cc | 30 +++++++++++------------------- + 1 file changed, 11 insertions(+), 19 deletions(-) + +commit aeed082e282b97e40c2e8590bdd8818affc7de6c +Author: Behdad Esfahbod +Date: Tue Feb 13 14:02:59 2018 -0800 + + Another tweak at libstdc++ things + + To fix this warning: + + cc1: warning: command line option ‘-fno-threadsafe-statics’ is valid for C++/ObjC++ but not for C + + src/Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit c7d7c9898e22905888dc4304f6d8e79b55654174 +Author: Behdad Esfahbod +Date: Tue Feb 13 14:00:14 2018 -0800 + + [aat] Minor + + src/hb-aat-layout-morx-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2dbfeecf96c6993d42594f43133d945d67ddbdbc +Author: Behdad Esfahbod +Date: Tue Feb 13 13:59:39 2018 -0800 + + Minor + + src/hb-aat-layout-morx-table.hh | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit d5b33f2fe1603e894e21f45afb4c00c8d670fb5c +Author: Behdad Esfahbod +Date: Tue Feb 13 13:50:50 2018 -0800 + + [subset] hb_subset_input_t changes + + src/Makefile.sources | 1 + + src/hb-face.h | 1 - + src/hb-set.cc | 14 +++--- + src/hb-subset-input.cc | 109 ++++++++++++++++++++++++++++++++++++++++++++ + src/hb-subset-plan.cc | 2 +- + src/hb-subset-private.hh | 11 ++++- + src/hb-subset.cc | 40 ++-------------- + src/hb-subset.h | 12 ++++- + test/api/test-subset-glyf.c | 4 +- + test/api/test-subset.c | 2 +- + util/hb-subset.cc | 20 ++++---- + 11 files changed, 153 insertions(+), 63 deletions(-) + +commit 28e63a1287fd38a98eed6725c2f4d0820066b0d8 +Author: Behdad Esfahbod +Date: Tue Feb 13 13:39:50 2018 -0800 + + Disable threadsafe static's for all libraries + + Even in libharfbuzz-subset, we still will handle our own threadsafety + for statics. + + src/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7caddb51b1e69a2803f86756e2ce2acff685c7d0 +Author: Ebrahim Byagowi +Date: Tue Feb 13 15:12:43 2018 +0330 + + Specify the project name for coverity, trying to fix #785 + + .travis.yml | 1 + + 1 file changed, 1 insertion(+) + +commit b969a82e30f0ff7bf6b2ea2600ef170764774a8c +Author: Behdad Esfahbod +Date: Mon Feb 12 20:51:26 2018 -0800 + + Pass no-libstdc++ flags only to libraries suppressing it + + src/Makefile.am | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit 97a2f0320056b591d7a747022869fe9cd8ecc6e1 +Author: Behdad Esfahbod +Date: Mon Feb 12 18:51:10 2018 -0800 + + [subset] Allocate bulk memory with malloc(), not calloc() + + We use calloc() to allocate simple structs and set them to zero. + For bulk memory, use malloc() that doesn't zero. + + src/hb-subset-glyf.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 96f1f52ea3a42b27f59aecffe65c918295e53b3b +Author: Behdad Esfahbod +Date: Mon Feb 12 18:48:51 2018 -0800 + + Use hb_face_get_upem() instead of face->get_upem() + + Such that hmtx accelerator can be used from libharfbuzz-subset. + + src/hb-ot-cbdt-table.hh | 2 +- + src/hb-ot-hmtx-table.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 3d66f441cc4d4feb2fd4b03be9f764c91f4de8b2 +Author: Behdad Esfahbod +Date: Mon Feb 12 18:43:42 2018 -0800 + + [subset] Remove unreachable code + + sanitizer.sanitize never return nullptr. + + src/hb-subset.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit 42040a273facc696d9a54fc4d89857665e87e3d1 +Author: Behdad Esfahbod +Date: Mon Feb 12 18:41:36 2018 -0800 + + Allow libharfbuzz-subset to link to libstdc++ + + We want to use it instead of reinventing hashmap... + + Also, don't change linker for ICU since libicu also uses libstdc++. + + src/Makefile.am | 2 -- + src/check-libstdc++.sh | 3 ++- + 2 files changed, 2 insertions(+), 3 deletions(-) + +commit 4af3c5e25822cc5a401837da547c75a17b7f7b48 +Author: Ebrahim Byagowi +Date: Mon Feb 12 23:21:24 2018 +0330 + + Move linker specifying to a better place + + src/Makefile.am | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +commit 8cf8b78faaf3e7ee261bdc44a1ad5a1973eab1a2 +Author: Garret Rieger +Date: Mon Feb 12 16:30:21 2018 -0800 + + [subset] whitespace + + test/api/test-subset-cmap.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit d1a4d5616f792c6ad84bcc5011040167ddd7cc3f +Author: Rod Sheeter +Date: Mon Feb 12 16:25:32 2018 -0800 + + output format 12 as enc 10 to match how Roboto did it + + src/hb-ot-cmap-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 89ee20f1a39ac78268b57a9aebe8e7428f9944bf +Author: Rod Sheeter +Date: Mon Feb 12 16:01:15 2018 -0800 + + basic wiring for a (failing) cmap test + + test/api/Makefile.am | 2 + + test/api/fonts/README | 1 + + .../Roboto-Regular.abc.cmap-format12-only.ttf | Bin 0 -> 2412 bytes + .../fonts/Roboto-Regular.ac.cmap-format12-only.ttf | Bin 0 -> 2212 bytes + test/api/hb-subset-test.h | 3 +- + test/api/test-subset-cmap.c | 82 +++++++++++++++++++++ + test/api/test-subset-glyf.c | 5 +- + .../data/in-house/tests/myanmar-syllable.tests | 1 - + 8 files changed, 87 insertions(+), 7 deletions(-) + +commit afb1da3a1891b7c0fdd047bcb7b3bde86e830444 +Author: Rod Sheeter +Date: Mon Feb 12 14:37:47 2018 -0800 + + auto-completed the wrong gids_to_retain + + src/hb-subset-plan.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1330edc4fe3ffbf18313d6432045606865c610c4 +Author: Rod Sheeter +Date: Mon Feb 12 14:29:23 2018 -0800 + + Use functions to get new gids. Avoid 0; fonttools drops it from cmap. + + src/hb-ot-cmap-table.hh | 24 ++++++++++++++++++------ + src/hb-subset-plan.cc | 25 ++++++++++++++++++++----- + src/hb-subset-plan.hh | 5 +++++ + src/hb-subset.cc | 2 +- + 4 files changed, 44 insertions(+), 12 deletions(-) + +commit 1639bdd33122dc8e5522b95c37660273d1fc609e +Author: Garret Rieger +Date: Mon Feb 12 13:40:42 2018 -0800 + + [subset] Remove test-subset, testing is planned to be done at the table level here with test/subset covering the complete subsetting operation. + + test/api/Makefile.am | 1 - + test/api/test-subset.c | 73 -------------------------------------------------- + 2 files changed, 74 deletions(-) + +commit 4cdd1b16c99f2681eb11d626c4408eebcc1672be +Author: Garret Rieger +Date: Mon Feb 12 13:36:28 2018 -0800 + + [subset] added todo in test-subset-glyf. + + test/api/test-subset-glyf.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit 1714feef4f7ec9e758e65edcbe5d5591562f46ee +Author: Garret Rieger +Date: Mon Feb 12 13:35:17 2018 -0800 + + [subset] re-enable test-subset-glyf. Refactor to use common functions in hb-subset-test.h + + test/api/test-subset-glyf.c | 109 +++++++++++--------------------------------- + 1 file changed, 27 insertions(+), 82 deletions(-) + +commit d8d8bd8405ec0db781c4c2bbb7ebd6ff520b3c2d +Author: Garret Rieger +Date: Mon Feb 12 13:33:55 2018 -0800 + + [subset] Add some helper functions for writing tests around subsetting. + + test/api/Makefile.am | 2 +- + test/api/hb-subset-test.h | 123 ++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 124 insertions(+), 1 deletion(-) + +commit e8318188c0e53a267a01c45b0fc8d29ad775738a +Author: Garret Rieger +Date: Mon Feb 12 11:38:28 2018 -0800 + + [subset] Fix loca generation, was previously writing the original glyph starting offset. + + src/hb-subset-glyf.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 0b94d590d971de0b44b0db941c7a3e095f15fbc9 +Author: Khaled Hosny +Date: Mon Feb 12 16:45:36 2018 +0200 + + Rename --with-stdcpp → --with-libstdc++ + + Also improve wording a bit and fix make check in --with-libstdc++=yes. + + configure.ac | 11 ++++++----- + src/Makefile.am | 11 ++++++++--- + 2 files changed, 14 insertions(+), 8 deletions(-) + +commit a5713bc2cb4a3fd71d3bc94b9f155339b09eb71a +Author: Rod Sheeter +Date: Mon Feb 12 11:30:45 2018 -0800 + + we love all our groups + + src/hb-ot-cmap-table.hh | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +commit 692f86e569847adb332186cbb08f344ebe41fa6c +Author: Rod Sheeter +Date: Mon Feb 12 11:29:23 2018 -0800 + + drop GDEF, GPOS, GSUB, and dsig + + src/hb-subset.cc | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +commit 83e1ef92156d8688b96d14957efcdf7601768799 +Author: Garret Rieger +Date: Mon Feb 12 11:22:32 2018 -0800 + + [subset] Set the new number of glyphs in maxp. + + src/hb-ot-maxp-table.hh | 5 +++++ + src/hb-subset.cc | 37 ++++++++++++++++++++++++++++++++----- + 2 files changed, 37 insertions(+), 5 deletions(-) + +commit 427f9e4b90bfadb8af13cbd27b7c3ee0153ca8b1 +Author: Garret Rieger +Date: Mon Feb 12 11:18:28 2018 -0800 + + Don't force loca version to long. + + src/hb-subset-glyf.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 5df080bf155a12f98929b99438da492063ab9218 +Author: Garret Rieger +Date: Mon Feb 12 10:15:59 2018 -0800 + + Destroy the subset plan at the end of subsetting. + + src/hb-subset.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 0301e5be286f5080ec34e9f30c75e73f28d0218b +Author: Rod Sheeter +Date: Mon Feb 12 10:12:11 2018 -0800 + + Build a working cmap format 12 + + src/hb-ot-cmap-table.hh | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +commit ebd31d376d63c9698c0eae34ed295558f7230918 +Author: Rod Sheeter +Date: Mon Feb 12 10:10:08 2018 -0800 + + subset for real + + src/hb-subset.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 62c7d677e8699143e55e7bfa0cc3c1db75f32506 +Author: Rod Sheeter +Date: Mon Feb 12 10:09:35 2018 -0800 + + C-style comments + + src/hb-open-file-private.hh | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +commit 91f0d51f0525097fef6173046379a89414cb515f +Author: Ebrahim Byagowi +Date: Mon Feb 12 17:20:12 2018 +0330 + + Fix symbol exporting issue on msys2 and ✅ bringing all the bots (#781) + + src/Makefile.am | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit 133e17fe2335abb77f61dbf1cff1955c21334137 +Author: Ebrahim Byagowi +Date: Mon Feb 12 15:24:22 2018 +0330 + + Minor + + src/check-defs.sh | 1 + + 1 file changed, 1 insertion(+) + +commit 16f5b53eec4c3238cf92438a17e6dc532e8a61f5 +Author: Ebrahim Byagowi +Date: Mon Feb 12 15:18:13 2018 +0330 + + Minor, don't skip the whole test when one .def file not found + + src/check-defs.sh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit a9b650d38407f6f2a26d8386e801600b1004d5d6 +Author: Ebrahim Byagowi +Date: Mon Feb 12 15:10:13 2018 +0330 + + Apply check-defs.sh to -icu and -subset, toward mingw fix (#780) + + CMakeLists.txt | 11 ++++++++--- + src/Makefile.am | 21 ++++++++++++++++----- + src/check-defs.sh | 12 +++++------- + src/gen-def.py | 9 ++++++--- + 4 files changed, 35 insertions(+), 18 deletions(-) + +commit 2efc8965506d8fd31934be1dba3322f922f3409d +Author: Ebrahim Byagowi +Date: Mon Feb 12 12:00:07 2018 +0330 + + Add --with-stdcpp for ossfuzzer and mupdf use (#770) + + configure.ac | 12 ++++++------ + src/Makefile.am | 14 +++++++++++++- + 2 files changed, 19 insertions(+), 7 deletions(-) + +commit 82e04758c895ce2cd6bddde5f72e592c718fcb69 +Author: Ebrahim Byagowi +Date: Mon Feb 12 11:56:32 2018 +0330 + + minor + + .travis.yml | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 7daa2822f6320801dfed09782ae46687e7c8cbb3 +Author: Ebrahim Byagowi +Date: Mon Feb 12 11:27:00 2018 +0330 + + Add Travis based Coverity trigger (#778) + + .ci/trigger-coverity.sh | 13 +++++++++++++ + .travis.yml | 14 ++++++++++++++ + 2 files changed, 27 insertions(+) + +commit 7747bdb11b0635738a14c099bfaf58461cadd79a +Author: Behdad Esfahbod +Date: Sun Feb 11 19:12:52 2018 -0800 + + Remove linker selection from hb-ucdn + + Since this is a convenience library, it's not actually linked. Or so I think. + Hoping this might fix this Appveyor failure: + + https://ci.appveyor.com/project/harfbuzz/harfbuzz/build/job/9884jyb5vryja9pw + + Making all in hb-ucdn + make[4]: Entering directory '/c/projects/harfbuzz/src/hb-ucdn' + CC libhb_ucdn_la-ucdn.lo + GEN libhb-ucdn.la + /bin/sh: libhb_ucdn_la-ucdn.lo: command not found + make[4]: *** [Makefile:404: libhb-ucdn.la] Error 127 + make[4]: Leaving directory '/c/projects/harfbuzz/src/hb-ucdn' + make[3]: *** [Makefile:2548: all-recursive] Error 1 + make[3]: Leaving directory '/c/projects/harfbuzz/src' + make[2]: *** [Makefile:1382: all] Error 2 + make[2]: Leaving directory '/c/projects/harfbuzz/src' + make[1]: *** [Makefile:486: all-recursive] Error 1 + make[1]: Leaving directory '/c/projects/harfbuzz' + make: *** [Makefile:418: all] Error 2 + + src/hb-ucdn/Makefile.am | 11 ----------- + 1 file changed, 11 deletions(-) + +commit 90d1c740c370b97dfff52420db013ed50075b984 +Author: Behdad Esfahbod +Date: Sun Feb 11 19:08:59 2018 -0800 + + Add MSVC to no-visibility list + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0db6c6f214a83ffeeefb7c3b77476567e534facb +Author: Behdad Esfahbod +Date: Sun Feb 11 18:28:10 2018 -0800 + + Add Sun compiler to no-visibility as well + + Fixes https://github.com/harfbuzz/harfbuzz/pull/776 + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d33ba163611c42acd0125472191ea40745f905eb +Author: Behdad Esfahbod +Date: Sun Feb 11 18:26:41 2018 -0800 + + Fix more warnings + + test/api/test-buffer.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit dde6448379c9eeb0fc7cc476688002be661229b8 +Author: Behdad Esfahbod +Date: Sun Feb 11 18:24:22 2018 -0800 + + Another try at fixing multiple-defintion of NullPool + + This one might do it... + + src/hb-open-type-private.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit b5f25844fbdd3167051c8d3586b404ae7f077b3b +Author: Behdad Esfahbod +Date: Sun Feb 11 19:49:18 2018 -0600 + + [docs] Minor update + + docs/harfbuzz-sections.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 41906cd5efc2fe17f5fff3fa5fe8488e0cdc6399 +Author: Behdad Esfahbod +Date: Sun Feb 11 19:46:06 2018 -0600 + + [subset] Another fixup + + I broke this in c31fcf4c58d96eb7d9781a986991b1a79ac7be44 + + src/hb-ot-cmap-table.hh | 2 +- + test/subset/run-tests.py | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit cd32177a322b5fd70c92f67f21b64686bf5d5533 +Author: Behdad Esfahbod +Date: Sun Feb 11 19:34:05 2018 -0600 + + Try at fixing multiple-definition of NullPool + + If we don't have visibility, make NullPool static. + + src/hb-open-type-private.hh | 8 +++++++- + src/hb-ot-layout.cc | 2 ++ + src/hb-private.hh | 4 +--- + 3 files changed, 10 insertions(+), 4 deletions(-) + +commit 3d421ce30713582484471baba76470c84dabc118 +Author: Behdad Esfahbod +Date: Sun Feb 11 19:01:44 2018 -0600 + + [subset] Use auto_array_t where it does make sense + + Better fix for https://github.com/harfbuzz/harfbuzz/pull/775 + + src/hb-subset-plan.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 9aa2eb61e6cb3e4308140bed8a8531877ffd6adf +Author: Behdad Esfahbod +Date: Sun Feb 11 19:00:42 2018 -0600 + + Minor + + src/hb-ot-cmap-table.hh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit ae6d0259b4f075885070f833d0f2a96333bf4af3 +Author: Ebrahim Byagowi +Date: Sun Feb 11 15:40:55 2018 +0330 + + Install fonttools on two bots and enable cmake hb-subset test (#777) + + .circleci/config.yml | 6 ++++-- + test/subset/CMakeLists.txt | 8 ++++---- + 2 files changed, 8 insertions(+), 6 deletions(-) + +commit c8d4c2e32f1cea610a9c91dc6b0c32e9ffe84f20 +Author: Ebrahim Byagowi +Date: Sun Feb 11 13:15:44 2018 +0330 + + Initialize bad_indices on hb-subset (#775) + + src/hb-subset-plan.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 5845e5ca3bac21c0b03e71eab282b02fb7e868a4 +Author: Ebrahim Byagowi +Date: Sun Feb 11 12:03:33 2018 +0330 + + fix gobject compile issue (#773) + + src/hb-gobject-structs.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9b5af3ec7f80a7793d5d3891e762d83026de0a5b +Author: Behdad Esfahbod +Date: Sat Feb 10 21:50:26 2018 -0600 + + [gpos] Adjust mark attachment heuristic + + Hopefully it... + fixes https://github.com/harfbuzz/harfbuzz/issues/740 + + src/hb-ot-layout-gpos-table.hh | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 70b06cc6e71e15f0d7550f67b113eed5e6f30a5f +Author: Behdad Esfahbod +Date: Sat Feb 10 16:13:06 2018 -0600 + + More fixes + + util/hb-subset.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 6c1848b1e3b8969afc441f094b0d7b64b4b14933 +Author: Behdad Esfahbod +Date: Sat Feb 10 15:52:35 2018 -0600 + + Misc warning fixes + + test/api/test-blob.c | 2 +- + test/api/test-buffer.c | 14 +++++++------- + test/api/test-ot-tag.c | 2 +- + 3 files changed, 9 insertions(+), 9 deletions(-) + +commit 7039803b51f23cb15dd7e12b105c379bd2e38d71 +Author: Behdad Esfahbod +Date: Sat Feb 10 15:47:50 2018 -0600 + + Fix djgpp bot + + src/hb-subset-glyf.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit cdab20df1e55da196ffc6bc00d580e5ef74c1975 +Author: Behdad Esfahbod +Date: Sat Feb 10 15:45:17 2018 -0600 + + Minor + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 203b647530b1550388bb3ce2f67e3b17e019d3e4 +Author: Ebrahim Byagowi +Date: Sun Feb 11 01:00:03 2018 +0330 + + Favor use of static instead HB_INTERNAL + + src/hb-subset-glyf.cc | 8 ++++---- + src/hb-subset-plan.cc | 4 ++-- + src/hb-subset.cc | 2 +- + 3 files changed, 7 insertions(+), 7 deletions(-) + +commit 4c5bdb4b39a723b624346d9b9ff9ace964fff0fe +Author: Behdad Esfahbod +Date: Sat Feb 10 15:40:54 2018 -0600 + + [test] Disable test-subset-glyf for now + + test/api/test-subset-glyf.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 43314ff4c05076decbd1eb07ed78f732b6ebcba9 +Author: Behdad Esfahbod +Date: Sat Feb 10 15:40:03 2018 -0600 + + More fixes + + test-subset-glyf still failing. No idea why :( + + src/hb-subset.cc | 3 +-- + test/api/test-subset-glyf.c | 26 ++++++++++++++++---------- + 2 files changed, 17 insertions(+), 12 deletions(-) + +commit a981d798eab41b6a7c6484776f04fe178bd536ba +Author: Behdad Esfahbod +Date: Sat Feb 10 15:17:28 2018 -0600 + + Fix more build issues + + Hopefully most bots come back with this... + + src/check-libstdc++.sh | 5 +++-- + src/check-symbols.sh | 2 +- + src/hb-buffer.h | 1 - + src/hb-gobject-structs.h | 6 ++++++ + src/hb-subset-plan.cc | 10 +++++++--- + src/hb-subset.cc | 6 +++--- + 6 files changed, 20 insertions(+), 10 deletions(-) + +commit 6c4ca6135a2ce846431b0ede6a288d3b2f97167e +Author: Ebrahim Byagowi +Date: Sun Feb 11 00:42:06 2018 +0330 + + Hide more symbols of hb-subset (#771) + + src/hb-subset-plan.cc | 2 +- + src/hb-subset.cc | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit c31fcf4c58d96eb7d9781a986991b1a79ac7be44 +Author: Behdad Esfahbod +Date: Sat Feb 10 14:20:10 2018 -0600 + + [subset] Replace auto_array with prealloced_array + + auto_array has constructor/destructor. Cannot be used in POD object, as the clang + bots all noticed... + + src/hb-ot-cmap-table.hh | 8 ++++---- + src/hb-subset-glyf.cc | 6 +++--- + src/hb-subset-plan.cc | 23 +++++++++++------------ + src/hb-subset-plan.hh | 9 +++------ + 4 files changed, 21 insertions(+), 25 deletions(-) + +commit 931d67900ee6d96b5962a475c1b71a58b821bcba +Author: Behdad Esfahbod +Date: Sat Feb 10 14:11:16 2018 -0600 + + Fix some other bots + + src/hb-subset-glyf.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 4011d885b7fca87c717fdaa4bd0318a42308865a +Author: Behdad Esfahbod +Date: Sat Feb 10 14:09:06 2018 -0600 + + [util] Remove use of ssize_t which was failing on MSVC + + util/hb-subset.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit bfa871634ce9ef9f4ed18348d898686952d6cbe3 +Author: Behdad Esfahbod +Date: Sat Feb 10 13:37:28 2018 -0600 + + Minor + + src/hb-subset-glyf.hh | 2 +- + src/hb-subset-plan.hh | 2 +- + src/hb-subset.cc | 3 +-- + src/hb-subset.h | 2 +- + 4 files changed, 4 insertions(+), 5 deletions(-) + +commit 844f48ea9a72d28e2c088497f6c403c54e1751a8 +Author: Ebrahim Byagowi +Date: Sat Feb 10 23:13:12 2018 +0330 + + Fix symbol exporting and libstdc++ linkage of hb-subset (#769) + + CMakeLists.txt | 6 ++---- + src/Makefile.am | 3 +++ + src/check-defs.sh | 2 +- + src/check-libstdc++.sh | 20 +++++++++++--------- + src/check-symbols.sh | 28 +++++++++++++++------------- + src/hb-subset-glyf.cc | 8 ++++---- + src/hb-subset-glyf.hh | 2 +- + src/hb-subset-plan.cc | 4 ++-- + src/hb-subset-plan.hh | 8 ++++---- + src/hb-subset.cc | 2 +- + src/hb-ucdn/Makefile.am | 11 +++++++++++ + 11 files changed, 55 insertions(+), 39 deletions(-) + +commit 91519c6a5b130ced569cedc3710ab395b663240d +Author: Behdad Esfahbod +Date: Sat Feb 10 13:35:17 2018 -0600 + + [aat] Add buffer messages + + src/hb-aat-layout-morx-table.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit af274507c4f4c5a582543affa71d81a87d6d9151 +Author: Behdad Esfahbod +Date: Sat Feb 10 13:25:49 2018 -0600 + + Minor + + src/hb-private.hh | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +commit 570d523761b23a3c668d9071712d5f10944d21fc +Merge: 71130a20 d18decd2 +Author: Behdad Esfahbod +Date: Sat Feb 10 13:24:22 2018 -0600 + + [subset] Merge remote-tracking branch 'googlefonts/master' + +commit 71130a20fae7c256b0ab1aa397cc1ac2d11dd487 +Author: Behdad Esfahbod +Date: Sat Feb 10 13:15:57 2018 -0600 + + Replace Supplier.advance with Supplier::operator+= + + src/hb-open-file-private.hh | 4 ++-- + src/hb-open-type-private.hh | 7 ++++--- + src/hb-ot-layout-common-private.hh | 4 ++-- + src/hb-ot-layout-gsub-table.hh | 10 +++++----- + 4 files changed, 13 insertions(+), 12 deletions(-) + +commit d0f3e7f59719bdb6a2105ee85a8f3ee799741dab +Author: Behdad Esfahbod +Date: Sat Feb 10 12:45:28 2018 -0600 + + [util] Use setlinebuf() if present + + To work around mysterious bug on OS X. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/727 + + configure.ac | 6 ++---- + util/options.cc | 12 ++++++++++-- + 2 files changed, 12 insertions(+), 6 deletions(-) + +commit ad575a5f47a51ee553710873ac2672479b76ba5e +Author: Ebrahim Byagowi +Date: Sat Feb 10 19:50:11 2018 +0330 + + Fix cast warnings on clang (#768) + + src/hb-open-type-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d18decd2013f24f315dbd3b15cdd80c5a734e7e9 +Author: Garret Rieger +Date: Fri Feb 9 18:41:21 2018 -0800 + + In glyf subsetting add suport for writing out a short loca table when possible. + + src/hb-subset-glyf.cc | 42 +++++++++++++++++++++++++++++++++--------- + 1 file changed, 33 insertions(+), 9 deletions(-) + +commit 9275bd03ea427eb607dde6a8e65f78a350b88323 +Author: Rod Sheeter +Date: Fri Feb 9 17:33:34 2018 -0800 + + First pass at building a cmap + + src/hb-ot-cmap-table.hh | 103 ++++++++++++++++++++++++++++++++++++++++++++---- + src/hb-subset.cc | 37 +++++++++-------- + 2 files changed, 115 insertions(+), 25 deletions(-) + +commit d2170d14780ad6f8e0d17a1e011445c3bcc20871 +Author: Garret Rieger +Date: Fri Feb 9 17:24:16 2018 -0800 + + Check for failures from add table. + + src/hb-subset.cc | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 4816064c0e5464d032a55001a959a9abcef7f70e +Author: Rod Sheeter +Date: Fri Feb 9 17:14:37 2018 -0800 + + add missing return + + src/hb-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 0089443756cdcef0182e55cf8480b96a64d31cc7 +Author: Garret Rieger +Date: Fri Feb 9 16:22:09 2018 -0800 + + Keep a second set of glyph ids in subset plan which is sorted by glyph id and always has gid 0 + + src/hb-subset-glyf.cc | 2 +- + src/hb-subset-plan.cc | 34 +++++++++++++++++++++++++--------- + src/hb-subset-plan.hh | 1 + + 3 files changed, 27 insertions(+), 10 deletions(-) + +commit 3bc81558d836e27e77bda0d6da9c71f530719579 +Author: Garret Rieger +Date: Fri Feb 9 16:06:33 2018 -0800 + + Formatting for hb-subset-plan. + + src/hb-subset-plan.cc | 51 +++++++++++++++++++++++++++------------------------ + 1 file changed, 27 insertions(+), 24 deletions(-) + +commit 8cef3a61995317d3a5724221108647d7e66fe24a +Author: Behdad Esfahbod +Date: Fri Feb 9 16:04:23 2018 -0600 + + Try fixing build with Sun Studio + + Trying to fix: + https://circleci.com/gh/harfbuzz/harfbuzz/6635 + + Also part of: + https://github.com/harfbuzz/harfbuzz/issues/630 + + src/hb-private.hh | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 86aa4b3ba7cd075f01614874dae88a771b8c54fd +Author: Garret Rieger +Date: Fri Feb 9 13:54:43 2018 -0800 + + Return empty face on hb_subset failure instead of null. Plus some minor cleanups for _add_head_and_set_loca_version + + src/hb-subset.cc | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit d45f240e4e330cedad737fdb792b311c37a19e32 +Author: Behdad Esfahbod +Date: Fri Feb 9 15:51:45 2018 -0600 + + Typo + + src/hb-buffer.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3b7aa651b4714b996816023a4929c0289065493f +Author: Behdad Esfahbod +Date: Fri Feb 9 15:43:20 2018 -0600 + + [docs] Improve UNSAFE_TO_BREAK docs + + src/hb-buffer.h | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +commit 671f0a7733a496eb46b08dc88c3c46b804cdd895 +Author: bungeman +Date: Thu Feb 1 13:31:25 2018 -0500 + + Documentation for HB_GLYPH_FLAG_UNSAFE_TO_BREAK. + + HB_GLYPH_FLAG_UNSAFE_TO_BREAK means that the glyph with this flag is somehow affected by the previous logical glyph (the previous index in the buffer if ltr and the next index if the buffer is rtl). If these two glyphs are separated by a break (line or otherwise) then the underlying text should be re-shaped on both sides up to corresponding position in the text of some glyph not marked with this flag. + + src/hb-buffer.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 1582eabee6017839518b821ef93a329a0a86a453 +Author: Garret Rieger +Date: Fri Feb 9 12:52:08 2018 -0800 + + Update head table with loca format selected by glyf+loca subsetting. + + src/hb-subset-glyf.cc | 7 +++---- + src/hb-subset-glyf.hh | 1 + + src/hb-subset.cc | 37 +++++++++++++++++++++++++++++++++++-- + 3 files changed, 39 insertions(+), 6 deletions(-) + +commit 335bbaa66f66e86d417cc123a2bf397e8b834f64 +Author: Garret Rieger +Date: Fri Feb 9 10:55:15 2018 -0800 + + Remove uneeded code in hb-subset. + + src/hb-subset.cc | 19 ------------------- + 1 file changed, 19 deletions(-) + +commit 3346ba9cd5198d27c7416b8c71fecb6c8d3cb335 +Author: Behdad Esfahbod +Date: Fri Feb 9 11:05:17 2018 -0600 + + [test/text-rendering-tests] Update from upstream + + .../text-rendering-tests/fonts/TestMORXTwentysix.ttf | Bin 3260 -> 3252 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 1cd98d05e07498653ba60a68b6342d1a90429eba +Author: Rod Sheeter +Date: Thu Feb 8 19:39:57 2018 -0800 + + Create the groups for a cmap format12. Does not yet build the actual table. + + src/hb-ot-cmap-table.hh | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +commit 59c658c8d53481990fe0efa66422353d0687474b +Author: Rod Sheeter +Date: Thu Feb 8 19:22:47 2018 -0800 + + capture codepoints sorted so we can use them for cmap later. one day we will have a map + + src/hb-ot-cmap-table.hh | 14 --------- + src/hb-private.hh | 61 +++++++++++++++++++++++++--------------- + src/hb-subset-glyf.cc | 16 +++++------ + src/hb-subset-plan.cc | 75 ++++++++++++++++++++++++++++++++++--------------- + src/hb-subset-plan.hh | 8 ++++-- + src/hb-subset.cc | 29 ++++++++++++------- + 6 files changed, 123 insertions(+), 80 deletions(-) + +commit 8431c38cdc05ddcddb1aa5fbb72a95446b500fd2 +Author: Rod Sheeter +Date: Thu Feb 8 19:20:58 2018 -0800 + + remove output noise + + util/hb-subset.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 5cca0c07afbe9ab4b28d333f6f853063ecd75aff +Author: Rod Sheeter +Date: Thu Feb 8 19:05:46 2018 -0800 + + fix comment + + src/hb-open-file-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a19138e668e77a0c05da2ab065c5366c8359b377 +Author: Rod Sheeter +Date: Thu Feb 8 19:03:41 2018 -0800 + + comment the serialization of table + + src/hb-open-file-private.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 5a34114f9685680d4a8cdf85a8ac90172c5620d7 +Author: Garret Rieger +Date: Thu Feb 8 18:32:24 2018 -0800 + + Add an extra entry to the end of the loca table to identify the end of the last glyph's data. + + src/hb-subset-glyf.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit aac7d962120aa137385324b33a173df4f19fd80b +Author: Garret Rieger +Date: Thu Feb 8 18:18:16 2018 -0800 + + Apply per table subsetting while building the new face in hb_subset. + + src/hb-subset-glyf.cc | 1 + + src/hb-subset.cc | 105 ++++++++++++++++++++++++++++++-------------------- + 2 files changed, 65 insertions(+), 41 deletions(-) + +commit 3e81832432a1cae0dc28242bb6ff279753effd27 +Author: Garret Rieger +Date: Thu Feb 8 15:55:12 2018 -0800 + + Disable subset tests on cmake for now. + + test/subset/CMakeLists.txt | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 2f941053111d60433ab39cc70edd69c962896961 +Author: Garret Rieger +Date: Thu Feb 8 15:55:12 2018 -0800 + + Disable subset tests on cmake for now. + + test/subset/CMakeLists.txt | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit e081c9e8fc84843740c8a55b49403acc3fe4f0b7 +Author: Behdad Esfahbod +Date: Thu Feb 8 17:44:24 2018 -0600 + + Oops! + + test/subset/run-tests.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1c49afe179e7e1884ceeae1d93e50fa51f18f894 +Author: Behdad Esfahbod +Date: Thu Feb 8 17:38:58 2018 -0600 + + Whitespace + + test/subset/run-tests.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9682ef135f16cb3368b9c5970fdcec71301b687e +Author: Behdad Esfahbod +Date: Thu Feb 8 17:35:57 2018 -0600 + + Minor fixups + + CMakeLists.txt | 2 +- + src/hb-ot-cmap-table.hh | 6 +++--- + src/hb-subset.cc | 6 +++--- + test/api/hb-test.h | 5 +++++ + test/api/test-subset-glyf.c | 4 ---- + test/api/test-subset.c | 4 ---- + 6 files changed, 12 insertions(+), 15 deletions(-) + +commit 35eeb893efcdfa2bf6a136cd2911d564334e573c +Author: Garret Rieger +Date: Thu Feb 8 15:17:34 2018 -0800 + + Don't include subset headers in libharfbuzz. + + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +commit 42234424a0fc43d298be082b4c7b1e288e94bbb6 +Author: Garret Rieger +Date: Thu Feb 8 15:11:15 2018 -0800 + + Fix include gaurds and include order in hb-subset-glyf and hb-subset-plan + + src/hb-subset-glyf.hh | 6 ++++-- + src/hb-subset-plan.cc | 2 +- + src/hb-subset-plan.hh | 5 +++-- + 3 files changed, 8 insertions(+), 5 deletions(-) + +commit 0f3c756cbfe8a263ee388481acac7a24d9684c44 +Author: Garret Rieger +Date: Thu Feb 8 14:59:32 2018 -0800 + + Add CMake config for building a separate harfbuzz-subset. + + CMakeLists.txt | 17 ++++++++++++++--- + test/api/CMakeLists.txt | 2 +- + 2 files changed, 15 insertions(+), 4 deletions(-) + +commit d4d120ad79ff65c6987ca127da5d9ee30740b0b1 +Author: Garret Rieger +Date: Thu Feb 8 14:26:18 2018 -0800 + + Skip subset to fonttools comparison test if TTX is not present. + + test/subset/run-tests.py | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 29d915284e46fb9be01221a88c9e969080daa1b2 +Author: Garret Rieger +Date: Thu Feb 8 11:31:27 2018 -0800 + + Whitespace + + test/subset/run-tests.py | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit f9420d9effcfb3464d4b99e54decb3d90e4a410d +Author: Garret Rieger +Date: Thu Feb 8 11:30:36 2018 -0800 + + In the hb-subset to fontTools comparison, use ttx to compare the fonts. This allows for some binary differences such as re-ordered tables. + + test/subset/run-tests.py | 21 ++++++++++++++------- + 1 file changed, 14 insertions(+), 7 deletions(-) + +commit 8e9fd6f1ab491519cf7205467bc5d20056fce99d +Author: Garret Rieger +Date: Wed Feb 7 19:01:21 2018 -0800 + + Implement basic loca (long version only) subsetting. + + src/hb-subset-glyf.cc | 66 +++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 46 insertions(+), 20 deletions(-) + +commit f9c665fed1347f7af6d36ba129f9d174f4ac54dc +Author: Garret Rieger +Date: Wed Feb 7 16:53:18 2018 -0800 + + Update interface to hb-subset-glyf to subset glyf and loca. + + src/hb-subset-glyf.cc | 10 +++++++--- + src/hb-subset-glyf.hh | 7 ++++--- + src/hb-subset.cc | 7 +++++-- + 3 files changed, 16 insertions(+), 8 deletions(-) + +commit f2ceb5ee4d745e0e6e754f0b0ea16b29dbedbf1b +Author: Garret Rieger +Date: Wed Feb 7 16:47:31 2018 -0800 + + Comment out failing assert in test-subset-glyf for now. Should be re-enabled once hb_subset is writing out a new face. + + test/api/test-subset-glyf.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 89dbebd4ad948ddad8e10323315a809c11d7cafa +Author: Garret Rieger +Date: Wed Feb 7 16:32:56 2018 -0800 + + Add a basic test for glyf subsetting. + + test/api/Makefile.am | 4 + + test/api/fonts/Roboto-Regular.abc.ttf | Bin 0 -> 2460 bytes + test/api/fonts/Roboto-Regular.ac.ttf | Bin 0 -> 2268 bytes + test/api/test-subset-glyf.c | 134 ++++++++++++++++++++++++++++++++++ + 4 files changed, 138 insertions(+) + +commit 217ed5e3c885532fa8b332cc0d0f9cb4eef32e2b +Author: Garret Rieger +Date: Wed Feb 7 16:30:07 2018 -0800 + + Cleanups in hb-subset-glyf and hb-subset-plan. + + src/hb-subset-glyf.cc | 30 +++++++++++++++--------------- + src/hb-subset-plan.hh | 2 +- + 2 files changed, 16 insertions(+), 16 deletions(-) + +commit 13193a9b97302480cc11787787fa6826a97be4bb +Author: Rod Sheeter +Date: Wed Feb 7 16:09:52 2018 -0800 + + move to the hb_face_t dest pattern + + src/hb-ot-cmap-table.hh | 7 ++++++- + src/hb-subset.cc | 28 +++++++++++++--------------- + 2 files changed, 19 insertions(+), 16 deletions(-) + +commit 0859a006695097c2a66a07284f3cc5b8de8edb05 +Author: Rod Sheeter +Date: Wed Feb 7 15:59:36 2018 -0800 + + sketch a subset and call it for cmap. Add subset to cmap, albeit not working even for the msot basic case just yet + + src/hb-ot-cmap-table.hh | 18 ++++++++++++++++-- + src/hb-subset.cc | 30 ++++++++++++++++++++++++++++++ + 2 files changed, 46 insertions(+), 2 deletions(-) + +commit c1ab95dd907b1c4a2e2de17447683fe803fe4087 +Author: Behdad Esfahbod +Date: Thu Feb 8 17:22:07 2018 -0600 + + Fix overflow in space fallback shaping + + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=657466 + + src/hb-ot-shape-fallback.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b220b5a44425db387b2149c4904a43ab369a2d6a +Author: Behdad Esfahbod +Date: Thu Feb 8 17:14:52 2018 -0600 + + Avoid undefined-behavior in fallback mark positioning + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5584 + + src/hb-ot-shape-fallback.cc | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 3b68a03a1c5a23adbc73f4508009dd5b72bc9d81 +Author: Behdad Esfahbod +Date: Thu Feb 8 17:00:37 2018 -0600 + + [fuzzer] Minor + + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 194140d3f352b53b95757cccb7fff50425747cd6 +Author: Behdad Esfahbod +Date: Thu Feb 8 16:27:57 2018 -0600 + + [util] Minor + + util/hb-subset.cc | 2 +- + util/options.hh | 10 ++++++++-- + 2 files changed, 9 insertions(+), 3 deletions(-) + +commit 5021ba2a2186a77d7d70be5602b960d14634d8b2 +Author: Behdad Esfahbod +Date: Thu Feb 8 15:11:28 2018 -0600 + + [aat] Minor + + src/hb-aat-layout-common-private.hh | 10 +++++----- + src/hb-aat-layout-morx-table.hh | 7 +++---- + 2 files changed, 8 insertions(+), 9 deletions(-) + +commit 1242ad8424f5e8357fe6fd2143430aa8cfaf0954 +Author: Behdad Esfahbod +Date: Thu Feb 8 14:10:01 2018 -0600 + + [test/text-rendering-tests] Update from upstream + + test/shaping/data/text-rendering-tests/DISABLED | 2 ++ + test/shaping/data/text-rendering-tests/Makefile.sources | 2 ++ + .../text-rendering-tests/fonts/TestMORXTwentyfive.ttf | Bin 0 -> 3260 bytes + .../text-rendering-tests/fonts/TestMORXTwentysix.ttf | Bin 0 -> 3260 bytes + .../data/text-rendering-tests/tests/MORX-25.tests | 9 +++++++++ + .../data/text-rendering-tests/tests/MORX-26.tests | 2 ++ + 6 files changed, 15 insertions(+) + +commit 77ad8b5c8b3a9148cf2944abdd494618e642ee2c +Author: Behdad Esfahbod +Date: Wed Feb 7 21:54:33 2018 -0600 + + TODO + + src/hb-open-file-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 941bbd9f257367f838e55d079751c6059974fe2f +Author: Behdad Esfahbod +Date: Wed Feb 7 21:49:01 2018 -0600 + + [subset] Fix thinko + + src/hb-open-file-private.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 931f8b7eb5e740ce81e5be6bfec60dbe3ac7ebc4 +Author: Behdad Esfahbod +Date: Wed Feb 7 21:42:03 2018 -0600 + + Fix another thinko + + src/hb-open-file-private.hh | 2 +- + src/hb-private.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 39b86695cf56736170c772424c9a8b75bca0254c +Author: Behdad Esfahbod +Date: Wed Feb 7 21:37:03 2018 -0600 + + [subset] Fix thinko + + src/hb-subset.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit eeffabc87572193a9e95f22647e80ae44e5a0089 +Author: Behdad Esfahbod +Date: Wed Feb 7 21:34:05 2018 -0600 + + Build + + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c479a59988b0cf3e557e22e97e1977962c803fa7 +Author: Behdad Esfahbod +Date: Wed Feb 7 21:13:10 2018 -0600 + + [subset] Assemble font + + src/hb-open-file-private.hh | 50 +++++++++++++++++++++++++++++++++++++++++++- + src/hb-open-type-private.hh | 33 +++++++++++++++++++++++------ + src/hb-ot-map-private.hh | 10 ++++----- + src/hb-private.hh | 20 +++++++++++------- + src/hb-set-private.hh | 8 +++---- + src/hb-subset.cc | 51 +++++++++++++++++++++++++++++++++++++++------ + test/api/test-subset.c | 9 ++++++-- + 7 files changed, 150 insertions(+), 31 deletions(-) + +commit 34ac3548b7c9dbc57f277cf9a7a337cd1a8a04bb +Author: Behdad Esfahbod +Date: Wed Feb 7 18:07:45 2018 -0600 + + [set] Respect stride + + Ouch! + + src/hb-set-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 577becaf7b5ccd9de8ba533447f944427b9e4452 +Author: Behdad Esfahbod +Date: Wed Feb 7 17:38:40 2018 -0600 + + [subset] Fixup + + src/hb-subset.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c9acab3cfbe4a21e86ad309ebb452f103b1c1b04 +Author: Behdad Esfahbod +Date: Wed Feb 7 17:12:55 2018 -0600 + + Whitespace + + src/hb-open-file-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 7fd0b61dee18380c302009f8be9cd68dadab7308 +Author: Behdad Esfahbod +Date: Wed Feb 7 16:44:52 2018 -0600 + + [subset] Create new face and copy all tables to it + + test-subset fails now because subset-face does not know how to compile itself. + + src/hb-subset.cc | 37 ++++++++++++++++++++++++++----------- + 1 file changed, 26 insertions(+), 11 deletions(-) + +commit 4e1abe2ce0b5163cbbbb8f8be0e9f7deba5ab2cb +Author: Garret Rieger +Date: Wed Feb 7 13:28:11 2018 -0800 + + Refactor subset glyf to remove multiple calls to glyf.fini() + + src/hb-subset-glyf.cc | 52 +++++++++++++++++++++++++++++---------------------- + 1 file changed, 30 insertions(+), 22 deletions(-) + +commit 0a5d1440f829f07454592adde9dd3aa93ad74442 +Author: Garret Rieger +Date: Wed Feb 7 13:09:54 2018 -0800 + + Add implementation of glyf subsetting. + + src/hb-subset-glyf.cc | 81 +++++++++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 76 insertions(+), 5 deletions(-) + +commit 05d65baa1bb64664ba838993fd35f3899d52eb8d +Author: Garret Rieger +Date: Wed Feb 7 10:55:30 2018 -0800 + + Extract glyf offset calculation into it's own method. + + src/hb-ot-glyf-table.hh | 26 ++++++++++++++++++-------- + 1 file changed, 18 insertions(+), 8 deletions(-) + +commit 6d7c6e19dc769cf9997b7c1f8a4598eb44ca0b3c +Author: Behdad Esfahbod +Date: Wed Feb 7 14:09:56 2018 -0600 + + Fix two undefined-behavior issues + + Fixes https://github.com/harfbuzz/harfbuzz/issues/761 + Fixes https://github.com/harfbuzz/harfbuzz/issues/762 + + src/hb-ot-hmtx-table.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 10 +++++----- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit b87cbe2bec1d589621ba143af59443f63230ffeb +Author: Behdad Esfahbod +Date: Wed Feb 7 14:11:26 2018 -0500 + + Try fixing build for platforms that have no visibility attributes + + src/hb-private.hh | 1 + + src/hb-subset.cc | 2 ++ + src/main.cc | 2 ++ + 3 files changed, 5 insertions(+) + +commit f70100417c71cff071c119607a7b75dcead05a05 +Author: Behdad Esfahbod +Date: Wed Feb 7 13:58:23 2018 -0500 + + [test] Minor + + test/api/test-ot-tag.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6804b61d2e49fcf9eac9fa0b86497ba91b220bee +Author: Behdad Esfahbod +Date: Wed Feb 7 13:47:35 2018 -0500 + + [subset] Add hb_subset_face + + It's a hb_face_t that has add_table() and in the future knows how to + compile itself into a font blob. + + src/hb-private.hh | 9 ++++++ + src/hb-subset.cc | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 97 insertions(+) + +commit af02812fc51812a7e2265a1100bbca1a5bf8af45 +Author: Behdad Esfahbod +Date: Wed Feb 7 13:07:46 2018 -0500 + + [subset] Change hb_subset API to remove hb_subset_face_t + + src/hb-subset-plan.cc | 12 ++++++++--- + src/hb-subset-plan.hh | 2 +- + src/hb-subset-private.hh | 10 ---------- + src/hb-subset.cc | 52 ++++++++---------------------------------------- + src/hb-subset.h | 25 ++++++----------------- + test/api/test-subset.c | 9 +++++---- + util/hb-subset.cc | 12 ++++++----- + 7 files changed, 36 insertions(+), 86 deletions(-) + +commit 2da0d87e769b2ced71e4281e336bdbca65de2b3f +Author: Behdad Esfahbod +Date: Wed Feb 7 12:44:35 2018 -0500 + + Remove NullPool visibility hack + + We keep a separate private NullPool in libharfbuzz-subset.so + This can fire back later since now there are two separate null objects, + and comparisons to the null pool can be confused. Something to deal + with when it comes up. Ouch! + + src/hb-open-type-private.hh | 4 +--- + src/hb-subset.cc | 4 ++++ + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit b95aa204ee284c47e63dc1e34b3c5b4bdf9e7ab7 +Author: Rod Sheeter +Date: Wed Feb 7 09:37:06 2018 -0800 + + glyph ids to retain should most likely keep the glyph id not the codepoint + + src/hb-subset-plan.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 91428713bd6975b3bbfbdce54701f6aef5457121 +Author: Rod Sheeter +Date: Wed Feb 7 09:35:59 2018 -0800 + + Remove \ns leftover from fprintf + + src/hb-subset-plan.cc | 4 ++-- + src/hb-subset.cc | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit eb485bb9e90017abaf7dcdd7e39a82125d6807c3 +Author: Rod Sheeter +Date: Wed Feb 7 09:32:36 2018 -0800 + + Horrid hack to assign new gids. Use DEBUG_MSG over fprintf + + src/hb-subset-plan.cc | 27 +++++++++++++++++++++++---- + src/hb-subset-plan.hh | 5 +++++ + src/hb-subset.cc | 9 +++++++++ + 3 files changed, 37 insertions(+), 4 deletions(-) + +commit 8b80cbb1dd13e2870a956825f5dafc4419b44200 +Author: Rod Sheeter +Date: Wed Feb 7 09:31:31 2018 -0800 + + Add a subset debug category + + src/hb-debug.hh | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit ee433d36fa544c3138718cc3f796b29e6df8a195 +Author: Behdad Esfahbod +Date: Wed Feb 7 12:30:18 2018 -0500 + + [aat] Set debug lookup_index + + src/hb-aat-layout-common-private.hh | 2 ++ + src/hb-aat-layout-morx-table.hh | 3 +++ + 2 files changed, 5 insertions(+) + +commit 38df1ec8e0b457be9140c67e2c5c19153714d90e +Author: Rod Sheeter +Date: Wed Feb 7 07:58:58 2018 -0800 + + TEMPORARY: remove HB_INTERNAL from null pool so subset builds again + + src/hb-open-type-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 53aa0e95420c5c3bfe8af21cf7956535d35b06e6 +Author: Garret Rieger +Date: Tue Feb 6 17:05:22 2018 -0800 + + Add an instance of glyf::accelerator_t to hb-subset-glyf. + + src/hb-subset-glyf.cc | 13 ++++++++++--- + src/hb-subset-glyf.hh | 2 +- + src/hb-subset.cc | 4 +--- + 3 files changed, 12 insertions(+), 7 deletions(-) + +commit ef62dfed3fc7cfad7f7ce9292cb3bd1616f09384 +Author: Rod Sheeter +Date: Tue Feb 6 17:12:17 2018 -0800 + + add back assert_pod + + src/hb-subset-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit d0ce3c66e2af2785203f7bbb1d4abca5c226045d +Author: Rod Sheeter +Date: Tue Feb 6 16:58:35 2018 -0800 + + Resolve codepoints:glyph ids. Does not compile; undefined reference to OT::_hb_NullPool + + src/hb-subset-plan.cc | 25 +++++++++++++++++++------ + src/hb-subset-plan.hh | 2 +- + src/hb-subset-private.hh | 17 +++++++++++++++-- + src/hb-subset.cc | 13 ++++--------- + 4 files changed, 39 insertions(+), 18 deletions(-) + +commit 6a45e5df24ccc59c5a39bf42323c9b550f49e16d +Author: Garret Rieger +Date: Tue Feb 6 16:04:09 2018 -0800 + + Add skeleton of hb-subset-glyf, call if from hb_subset(...) + + src/Makefile.sources | 2 ++ + src/hb-subset-glyf.cc | 45 +++++++++++++++++++++++++++++++++++++++++++++ + src/hb-subset-glyf.hh | 37 +++++++++++++++++++++++++++++++++++++ + src/hb-subset.cc | 18 ++++++++++++++++-- + 4 files changed, 100 insertions(+), 2 deletions(-) + +commit 31ec3c2ec41161c6ae75bc91d1c237bf2d245e37 +Author: Garret Rieger +Date: Tue Feb 6 15:37:34 2018 -0800 + + Create a subset plan in hb_subset. + + src/hb-subset.cc | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 6c52d94fd11915b76e858bc45633ee60b8c1d8f4 +Author: Rod Sheeter +Date: Tue Feb 6 15:31:14 2018 -0800 + + capture the set of codepoints passed by --unicodes + + util/hb-subset.cc | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +commit 25e9173fe8446735f7e36ec963c7d3554c85631b +Author: Garret Rieger +Date: Mon Feb 5 17:26:25 2018 -0800 + + Make hb-subset-plan private. + + src/Makefile.sources | 2 +- + src/hb-subset-plan.cc | 27 ++++++++++++++++----------- + src/{hb-subset-plan.h => hb-subset-plan.hh} | 22 +++++++++++++--------- + 3 files changed, 30 insertions(+), 21 deletions(-) + +commit af46a4da5a47dd6e0dd98e1740f18e93c337e689 +Author: Garret Rieger +Date: Mon Feb 5 17:14:46 2018 -0800 + + Move definition of hb_subset_input into hb-subset-private.hh. + + src/Makefile.sources | 1 + + src/hb-subset-plan.cc | 2 +- + src/hb-subset-private.hh | 40 ++++++++++++++++++++++++++++++++++++++++ + src/hb-subset.cc | 12 ++---------- + 4 files changed, 44 insertions(+), 11 deletions(-) + +commit 7481f0ce21489d2b19b2e33d05358736ddee20bf +Author: Garret Rieger +Date: Mon Feb 5 16:05:12 2018 -0800 + + Add codepoints to subset input. + + src/hb-subset.cc | 24 ++++++++++++++++-------- + src/hb-subset.h | 2 +- + test/api/test-subset.c | 2 +- + util/hb-subset.cc | 2 +- + 4 files changed, 19 insertions(+), 11 deletions(-) + +commit 1cfe650f020cf440bf157daa9907bffd6e35bd7a +Author: Garret Rieger +Date: Mon Feb 5 15:22:30 2018 -0800 + + Add a basic sketch of hb-subset-plan. + + src/Makefile.sources | 2 ++ + src/hb-subset-plan.cc | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-subset-plan.h | 49 +++++++++++++++++++++++++++++++++++ + 3 files changed, 123 insertions(+) + +commit 126ffdbe95020c04dc61413690febd8a56bf264f +Author: Behdad Esfahbod +Date: Wed Feb 7 12:26:41 2018 -0500 + + [aat] Fix debug compile + + src/hb-aat-layout-common-private.hh | 6 +++++- + src/hb-aat-layout-morx-table.hh | 2 +- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit 8cb8bfd5b5eff75247cd447f3766294fdff2d644 +Author: Ebrahim Byagowi +Date: Tue Feb 6 20:40:42 2018 +0330 + + [test] Fix test-subset on old distros (#758) + + https://developer.gnome.org/glib/stable/glib-Testing.html#g-assert-cmpmem + + test/api/test-subset.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 2971e9da49d6ac07f8a9a4e9b00e167b800a5c7f +Author: Behdad Esfahbod +Date: Tue Feb 6 11:48:04 2018 -0500 + + [aat] Adjust unsafe-to-break logic some more + + I believe I'm happy with it now. + + src/hb-aat-layout-common-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit f49256d80f19bc265e6a197719345313ba26f9d6 +Author: Behdad Esfahbod +Date: Tue Feb 6 11:39:36 2018 -0500 + + [aat] Simplify unsafe-to-break logic + + src/hb-aat-layout-common-private.hh | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +commit cc1e0840baed881f2bfd8468a9645bfe94f47303 +Author: Behdad Esfahbod +Date: Tue Feb 6 10:20:48 2018 -0500 + + [buffer] Tweak diff re glyph_flags again + + We expect the buffer to have no flags that the reference doesn't... + Meh. Makes MORX tests pass now. Need to better define the behavior. + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d49ae5154e0b069ffa2605ea3f66abb583319ec8 +Author: Ebrahim Byagowi +Date: Tue Feb 6 13:48:10 2018 +0330 + + Fix hb-buffer logic error + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 70e13ade81a2a09e17d75bdc7e3fe45d8ec9e2c6 +Author: Ebrahim Byagowi +Date: Tue Feb 6 13:20:38 2018 +0330 + + [subset] Fix Windows issue on endlines (#756) + + util/hb-subset.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f41b92134a276716b7e2d7ef54996b30f36a10a9 +Author: Behdad Esfahbod +Date: Mon Feb 5 19:51:09 2018 -0500 + + Fix fallthrough compiler warning with gcc >= 7 + + Fixes https://github.com/harfbuzz/harfbuzz/issues/755 + + src/hb-private.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit b7b7f0ac59ec85b224e13d9e6c3c4063e731ad32 +Author: Behdad Esfahbod +Date: Mon Feb 5 19:40:31 2018 -0500 + + [test] Minor + + test/api/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 0ff007daaa471d05cc0473beec4ba4d434b084b1 +Author: Behdad Esfahbod +Date: Sun Feb 4 20:22:07 2018 -0500 + + [subset] Minor + + src/hb-subset.h | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +commit fc1e82a5aef410138381bc8f5476dcff5679b464 +Merge: ae39fc81 2ea22893 +Author: Garret Rieger +Date: Mon Feb 5 15:35:13 2018 -0800 + + Merge pull request #754 from googlefonts/master + + Fix build for subsetting code. + +commit 2ea228935d41b55fed45b7423b69bc15b42e3abc +Author: Garret Rieger +Date: Mon Feb 5 15:10:01 2018 -0800 + + ssize_t -> size_t + + util/hb-subset.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c25898eb54217e2a1c681233a6b9adcd7940652e +Author: Garret Rieger +Date: Mon Feb 5 14:35:32 2018 -0800 + + Switch to fopen() instead of open() in subset test. open wasn't compiling on windows. + + util/hb-subset.cc | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +commit fc04f11ce1999da042a39c5b271351223033292f +Author: Garret Rieger +Date: Mon Feb 5 11:12:33 2018 -0800 + + Rename HB_SUBSET_sources -> HB_SUBSET_CLI_sources to match what cmake is looking for. + + util/Makefile.am | 3 +-- + util/Makefile.sources | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) + +commit e428f7b1c21e0a7d6b9af507d98031b8eebcbeb5 +Author: Garret Rieger +Date: Mon Feb 5 10:24:16 2018 -0800 + + Wrap unistd.h include in ifdef. + + util/hb-subset.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5f6eb1256fb6c251303d3728fc27875fe7a9ffb8 +Author: Garret Rieger +Date: Mon Feb 5 10:23:38 2018 -0800 + + Add libharfbuzz-subset.la to linking when building api tests. + + test/api/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ae39fc8171b2c26d4ae64954a8055732c9241bcc +Author: Behdad Esfahbod +Date: Sun Feb 4 20:18:52 2018 -0500 + + [subset] Build hb-subset into separate libharfbuzz-subset.so + + src/Makefile.am | 19 +++++++++++++------ + src/harfbuzz-subset.pc.in | 12 ++++++++++++ + util/Makefile.am | 2 ++ + 3 files changed, 27 insertions(+), 6 deletions(-) + +commit eac20e459564134e0087497ed76b1c84195ad7e3 +Author: Behdad Esfahbod +Date: Sun Feb 4 20:08:50 2018 -0500 + + [subset] Minor + + util/Makefile.am | 2 +- + util/Makefile.sources | 2 +- + util/hb-subset.cc | 10 +++++----- + 3 files changed, 7 insertions(+), 7 deletions(-) + +commit 257022b1789f928975b04b5d214bbe9192e11997 +Merge: 3615f344 edcd3b80 +Author: Behdad Esfahbod +Date: Sun Feb 4 20:01:35 2018 -0500 + + Merge pull request #745 from googlefonts/master + + Interface for hb_subset, skeleton for the hb-subset cli, and basic testing rigging. + +commit 3615f344ec00059972d8ce75522022b5294764a7 +Author: Behdad Esfahbod +Date: Sun Feb 4 17:19:58 2018 -0500 + + [test/text-rendering-tests] Update from upstream + + test/shaping/data/text-rendering-tests/DISABLED | 1 + + test/shaping/data/text-rendering-tests/Makefile.sources | 3 ++- + .../text-rendering-tests/fonts/TestMORXTwentythree.ttf | Bin 0 -> 1836 bytes + .../data/text-rendering-tests/tests/MORX-23.tests | 1 + + 4 files changed, 4 insertions(+), 1 deletion(-) + +commit 54e6efadd6a30587736858d3fb497ed4e5e5f252 +Author: Behdad Esfahbod +Date: Sun Feb 4 14:58:02 2018 -0500 + + [aat] Fix unsafe-to-break + + At any position, if state is not zero, mark unsafe-to-break before, + unless we can reason it safe. + + At any position, if there's an action entry for end-of-text, mark + unsafe to break. + + Also changes buffer diff impl to allow for flag differences as long + as the buffer glyph flags are superset of reference glyph flags. + + With this, all MORX tests pass. + + src/hb-aat-layout-common-private.hh | 31 +++++++++++++++++++++++++------ + src/hb-aat-layout-morx-table.hh | 35 +++++++++++++++++++++++------------ + src/hb-buffer.cc | 2 +- + 3 files changed, 49 insertions(+), 19 deletions(-) + +commit edcd3b80e9617ec8c4c4a55536938fb510b6aeba +Author: Rod Sheeter +Date: Sun Feb 4 12:31:24 2018 -0800 + + Actually call hb_subset + + util/hb-subset.cc | 51 ++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 34 insertions(+), 17 deletions(-) + +commit 7b01761adef6f64f1139b30c985aa5f52314073a +Author: Garret Rieger +Date: Fri Feb 2 17:54:11 2018 -0800 + + Add CMakeLists.txt to dist files for subset test. + + test/subset/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit f83a43b56134188c2e1f3496d40ec0cd9109f250 +Author: Garret Rieger +Date: Fri Feb 2 17:50:45 2018 -0800 + + Add CMake configuration for all of the new subsetting code. + + CMakeLists.txt | 14 ++++++++++++++ + src/Makefile.sources | 9 +++++++-- + test/CMakeLists.txt | 1 + + test/subset/CMakeLists.txt | 9 +++++++++ + util/Makefile.am | 2 +- + util/Makefile.sources | 2 +- + 6 files changed, 33 insertions(+), 4 deletions(-) + +commit 5bc0cda179bca452145d4523eeba415986edb6e3 +Author: Garret Rieger +Date: Fri Feb 2 17:49:14 2018 -0800 + + Add missing unistd header to hb-subset. + + util/hb-subset.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 06fe297f2a9fc6ee98179ddd26ef089b7fdb9e74 +Author: Garret Rieger +Date: Thu Feb 1 18:36:15 2018 -0800 + + Properly include subset test data files. + + test/subset/data/Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 058b1260ad1105d0d8d6bf21f8f65a336e735bd2 +Author: Garret Rieger +Date: Thu Feb 1 18:22:14 2018 -0800 + + Re-write hb-subset utility to use main-font-text driver. + + test/subset/run-tests.py | 15 +++--- + util/Makefile.sources | 3 ++ + util/hb-subset.cc | 131 +++++++++++++++++++++++++---------------------- + 3 files changed, 82 insertions(+), 67 deletions(-) + +commit ede84ffa426edb950c4ec4f89833c85475a1c64f +Author: Garret Rieger +Date: Thu Feb 1 17:17:36 2018 -0800 + + Whitespace + + util/hb-subset.cc | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +commit 2763a2c5982c0db072697abe8ba01342d5977237 +Author: Garret Rieger +Date: Thu Feb 1 17:14:51 2018 -0800 + + Include subset test files in distribution. + + test/subset/Makefile.am | 7 ++++++- + test/subset/data/Makefile.am | 7 +++++++ + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit 34fa7b3ad23b544b0914bc6002d60525224c68e1 +Author: Garret Rieger +Date: Thu Feb 1 16:50:18 2018 -0800 + + Whitespace + + src/hb-subset.h | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit 8c3a6727377895f18e1b5c7076404d8aede17176 +Author: Garret Rieger +Date: Wed Jan 31 15:43:24 2018 -0800 + + Get test-subset to pass. + + src/hb-subset.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 74d39ed2639857d5f1a90d9c0d864227a6482b40 +Author: Garret Rieger +Date: Wed Jan 31 15:20:52 2018 -0800 + + Attach add a hb_face_t to hb_subset_face_t. + + src/hb-subset.cc | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +commit 76b84c36b9560e132918adb4c0c5a0d9bdfb0978 +Author: Garret Rieger +Date: Wed Jan 31 14:53:28 2018 -0800 + + Whitespace + + test/api/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a2965f2ea5428c19be54f998ef9152c5ff6975ea +Author: Garret Rieger +Date: Wed Jan 31 14:53:09 2018 -0800 + + Add a basic implementation of hb-subset to enable compilation of test-subset. + + src/hb-subset.cc | 146 +++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-subset.h | 5 +- + test/api/Makefile.am | 1 + + test/api/test-subset.c | 12 ++-- + 4 files changed, 156 insertions(+), 8 deletions(-) + +commit 38af23b8df1a84f24d379d27d1a1e20f9ce07f34 +Author: Garret Rieger +Date: Wed Jan 31 11:32:23 2018 -0800 + + Make the expected output for subsetting basics test be equal to the input file for now. + + .../expected/basics/Roboto-Regular.abc.default.62.ttf | Bin 1996 -> 2460 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit b59c08eb045db2b6c952de81510b8159a4f72fb1 +Author: Garret Rieger +Date: Wed Jan 31 11:14:53 2018 -0800 + + Add the beginning of a unit test for hb-subset + + test/api/test-subset.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 67 insertions(+) + +commit e9d154ac8ddd2712a34c53c95a17e469f95e5b30 +Author: Rod Sheeter +Date: Tue Jan 30 19:27:11 2018 -0800 + + tweak test failure output. write to a temp file not stdout. test still fails because expected is not just an identical copy of input + + test/subset/run-tests.py | 41 +++++++++++++++++++++++++++---------- + util/hb-subset.cc | 53 +++++++++++++++++++++++++++++++++--------------- + 2 files changed, 67 insertions(+), 27 deletions(-) + +commit cf403e1a53381f293aceac5cdbe031bbb2a7af77 +Author: Garret Rieger +Date: Tue Jan 30 18:40:23 2018 -0800 + + Add hb-subset.h to hb.h + + src/hb.h | 1 + + 1 file changed, 1 insertion(+) + +commit c02573516c05ac97acb243ef5dec26af86086ded +Author: Garret Rieger +Date: Tue Jan 30 18:39:41 2018 -0800 + + Fix typo in hb-subset.h + + src/hb-subset.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 76351518ca9bc88aa6fbc975e1e35bd86432d652 +Author: Garret Rieger +Date: Tue Jan 30 14:03:16 2018 -0800 + + Remove basic subset test from XFAIL + + test/subset/data/Makefile.sources | 1 - + 1 file changed, 1 deletion(-) + +commit b029b7c19a733a2a39860238ad300e6c4a3f7802 +Author: Garret Rieger +Date: Mon Jan 29 13:31:49 2018 -0800 + + Whitespace + + test/subset/data/Makefile.sources | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0853260e997aded264f42bb369d4fcb39cccb7d6 +Author: Garret Rieger +Date: Mon Jan 29 13:30:02 2018 -0800 + + Configure automake to run the new subset tests. + + configure.ac | 2 ++ + test/Makefile.am | 2 +- + test/subset/Makefile.am | 16 ++++++++++++++++ + test/subset/data/Makefile.am | 16 ++++++++++++++++ + test/subset/data/Makefile.sources | 10 ++++++++++ + test/subset/data/tests/{basics.txt => basics.tests} | 0 + 6 files changed, 45 insertions(+), 1 deletion(-) + +commit 5c63c37b2b5aba8bf2f8ff35b7da0d116ebfe8b5 +Author: Garret Rieger +Date: Fri Jan 26 16:57:42 2018 -0800 + + WIP test runner for subset tests. + + test/subset/run-tests.py | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 64 insertions(+) + +commit cc46cd88a1b84b02694fa6d88c4286e93336f096 +Author: Garret Rieger +Date: Fri Jan 26 14:25:39 2018 -0800 + + In generate-expected-outputs read the test definition with utf8 encoding. + + test/subset/generate-expected-outputs.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 4cdae914e2e2fff1ff91e2f42648a8acb82a5494 +Author: Garret Rieger +Date: Fri Jan 26 13:57:48 2018 -0800 + + Add basic directory structure for subsetter integration tests. Plus a utility for generating expected output files. + + .../basics/Roboto-Regular.abc.default.62.ttf | Bin 0 -> 1996 bytes + test/subset/data/fonts/Roboto-Regular.abc.ttf | Bin 0 -> 2460 bytes + test/subset/data/profiles/default.txt | 0 + test/subset/data/tests/basics.txt | 8 ++ + test/subset/generate-expected-outputs.py | 40 ++++++++++ + test/subset/subset_test_suite.py | 82 +++++++++++++++++++++ + 6 files changed, 130 insertions(+) + +commit 9ccb8366f603a9e4a7a3c3f96420a19d4f6fb390 +Author: Rod Sheeter +Date: Wed Jan 17 22:09:07 2018 -0800 + + Start to sketch APIs for subsetting + + src/Makefile.am | 2 ++ + src/Makefile.sources | 4 +++ + src/hb-subset.cc | 0 + src/hb-subset.h | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++ + util/Makefile.am | 3 ++ + util/Makefile.sources | 4 +++ + util/hb-subset.cc | 61 +++++++++++++++++++++++++++++++++++ + 7 files changed, 162 insertions(+) + +commit 89b1906d990658c763f35113c8978a5e21bffc22 +Author: Behdad Esfahbod +Date: Sun Feb 4 14:45:02 2018 -0500 + + [aat] More adjustment to ContextualSubtable + + See comment. + + With this, MORX-20 passes if I turn --verify off. Our unsafe-to-break + logic is currently broken in presence of end-of-text actions. That's, + ugh, extra work to fix. Let me try... + + src/hb-aat-layout-morx-table.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 8be596f0b76543e19644c0b77c1bcf4d9e783c2b +Author: Behdad Esfahbod +Date: Sun Feb 4 14:40:17 2018 -0500 + + [aat] In ContextualSubstitute, apply end-of-text action to last glyph + + src/hb-aat-layout-morx-table.hh | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit c0b1c7eb2eed67147adec3d2c9e02d01f279c8f4 +Author: Behdad Esfahbod +Date: Sun Feb 4 14:19:41 2018 -0500 + + [aat] Remove unneeded check + + src/hb-aat-layout-morx-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fcb8be1a385cb4432dc6064fba77939716d27a02 +Author: Behdad Esfahbod +Date: Sun Feb 4 12:38:18 2018 -0500 + + [configure] Fix wording + + Fixes https://github.com/harfbuzz/harfbuzz/issues/741 + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit aed32589af6d5fce3e68fe41865e258ea7eb2413 +Author: Behdad Esfahbod +Date: Fri Feb 2 16:08:50 2018 -0500 + + [aat] In ContextualSubtable, mark mark after substituting mark + + Fixes MORX-21. + + src/hb-aat-layout-morx-table.hh | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit fe5f9b1ae318939eaa23d0175a5eb7e1739177ac +Author: Behdad Esfahbod +Date: Fri Feb 2 15:53:25 2018 -0500 + + [aat] Fix ContextualSubtable sanitization + + Fixes MORX-18, MORX-19, and MORX-22. + + src/hb-aat-layout-morx-table.hh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit cf943f682bcdd73e3ad1f6108c1a1870b991d5e4 +Author: Khaled Hosny +Date: Sun Feb 4 12:05:12 2018 +0200 + + Correctly show documentation build status + + Correctly show if building documentation is enabled or not in configure + summary. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/741 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e8859fca3eafb5aab6d029563b31219ccca0d673 +Author: Bruce Mitchener +Date: Sun Feb 4 01:26:57 2018 +0700 + + Enable use of atexit() on macOS and related platforms. + + The atexit() man page indicates that this is expected to behave + in the expected way on unloading of shared libraries. + + src/hb-private.hh | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit a89573770b4c0f9c444ad6499bec5dc022087a97 +Author: Bruce Mitchener +Date: Sun Feb 4 01:31:53 2018 +0700 + + Use nullptr, not NULL. + + src/hb-aat-layout-common-private.hh | 2 +- + src/hb-buffer-deserialize-json.rl | 4 ++-- + src/hb-buffer-deserialize-text.rl | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit 07885e65adf1d3cb324de99501f9867f1a2553f8 +Author: Ebrahim Byagowi +Date: Sat Feb 3 12:53:48 2018 +0330 + + [cmake] unistd typo fix (#747) + + CMakeLists.txt | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit ccb0367dae4cbb9c8215dbf20ac7f9acfba2fa14 +Author: David Corbett +Date: Fri Feb 2 12:04:04 2018 -0500 + + Let VS1 follow U+1031 MYANMAR VOWEL SIGN E + + src/hb-ot-shape-complex-myanmar-machine.rl | 2 +- + src/hb-ot-shape-complex-myanmar.cc | 5 +++++ + test/shaping/README.md | 10 +++++----- + test/shaping/data/in-house/Makefile.sources | 1 + + .../fonts/af3086380b743099c54a3b11b96766039ea62fcd.ttf | Bin 0 -> 1536 bytes + test/shaping/data/in-house/tests/myanmar-syllable.tests | 1 + + 6 files changed, 13 insertions(+), 6 deletions(-) + +commit c6dbf6e77cae30772ffa110c651cb4287ab3b0dc +Author: punchcutter +Date: Wed Jan 31 14:09:04 2018 -0800 + + Allow optional ZWJ in virama terminated cluster + + src/hb-ot-shape-complex-use-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dae20fb5a79caad9a4af14137a961b60fe256235 +Author: Bruce Mitchener +Date: Wed Jan 31 20:16:08 2018 +0700 + + Use nullptr instead of 0. + + src/hb-coretext.cc | 4 ++-- + src/test-buffer-serialize.cc | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 90218fa93cf8b5d4b192be12d31aed92d271d09e +Author: Bruce Mitchener +Date: Wed Jan 31 20:44:45 2018 +0700 + + Fix typos. + + src/hb-blob.cc | 2 +- + src/hb-buffer-private.hh | 2 +- + src/hb-common.cc | 2 +- + src/hb-coretext.cc | 2 +- + src/hb-directwrite.cc | 2 +- + src/hb-ft.cc | 2 +- + src/hb-graphite2.cc | 2 +- + src/hb-ot-layout-common-private.hh | 2 +- + 8 files changed, 8 insertions(+), 8 deletions(-) + +commit 148ca61075d821a09e42e2c75fbc9be47cfc6003 +Author: Bruce Mitchener +Date: Wed Jan 31 22:24:51 2018 +0700 + + [ot-layout] Fix nullptr dereference. + + If the `calloc` for `gsub_accels` or `gpos_accels` fails, then the + unlikely branch afterwards can be taken, which frees up the + `hb_ot_layout_t`, but since those fields can now be `nullptr`, then + we don't want to dereference them. + + src/hb-ot-layout.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 0c66043a924fd114017a862d2cacd70f64b92370 +Author: Bruce Mitchener +Date: Wed Jan 31 20:24:27 2018 +0700 + + [coretext] Fix memory leaks. + + In `reference_table`, if the data is empty and we return early, + we still need to release the data object. + + In `hb_coretext_shape`, there two edge cases where an early + return should release the attributed string. + + src/hb-coretext.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit f0b700db394ccdff30ff83961a3e2ea9ff4ea472 +Author: Behdad Esfahbod +Date: Tue Jan 30 11:16:51 2018 -0800 + + 1.7.5 + + NEWS | 9 +++++++++ + configure.ac | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +commit 585b5760987e1ddd31e11fc55a2ce55ddb5b1663 +Author: Behdad Esfahbod +Date: Tue Jan 30 11:51:56 2018 -0800 + + Fix distcheck + + test/shaping/data/in-house/Makefile.am | 2 +- + test/shaping/data/text-rendering-tests/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit e89df6e1aee9cb6fe1268643ce19816808baf0c4 +Author: Behdad Esfahbod +Date: Tue Jan 30 10:58:44 2018 -0800 + + [aat] Limit number of DontAdvance transitions + + Remove the faulty loop-detection logic. Use max-ops for breaking + out of infinite loops or heavy work. + + https://twitter.com/behdadesfahbod/status/958065026262183936 + + src/hb-aat-layout-common-private.hh | 33 ++------------------------------- + 1 file changed, 2 insertions(+), 31 deletions(-) + +commit e00743b47d25a2487b7f232a514a042e2962a089 +Author: Behdad Esfahbod +Date: Mon Jan 29 10:07:05 2018 -0800 + + [test/text-rendering-tests] Update from upstream + + test/shaping/data/text-rendering-tests/DISABLED | 7 +++++++ + test/shaping/data/text-rendering-tests/Makefile.sources | 7 +++++++ + .../data/text-rendering-tests/fonts/TestMORXEighteen.ttf | Bin 0 -> 3256 bytes + .../text-rendering-tests/fonts/TestMORXSeventeen.ttf | Bin 0 -> 1788 bytes + .../data/text-rendering-tests/fonts/TestMORXSixteen.ttf | Bin 0 -> 1812 bytes + .../data/text-rendering-tests/fonts/TestMORXTwenty.ttf | Bin 0 -> 3232 bytes + .../text-rendering-tests/fonts/TestMORXTwentyone.ttf | Bin 0 -> 3244 bytes + .../text-rendering-tests/fonts/TestMORXTwentytwo.ttf | Bin 0 -> 3256 bytes + .../data/text-rendering-tests/tests/MORX-14.tests | 1 + + .../data/text-rendering-tests/tests/MORX-16.tests | 1 + + .../data/text-rendering-tests/tests/MORX-17.tests | 1 + + .../data/text-rendering-tests/tests/MORX-18.tests | 4 ++++ + .../data/text-rendering-tests/tests/MORX-19.tests | 2 ++ + .../data/text-rendering-tests/tests/MORX-20.tests | 7 +++++++ + .../data/text-rendering-tests/tests/MORX-21.tests | 1 + + .../data/text-rendering-tests/tests/MORX-22.tests | 1 + + 16 files changed, 32 insertions(+) + +commit 29d901286e632fa4de5ea198cc455cae56bc09a8 +Author: Ebrahim Byagowi +Date: Tue Jan 30 10:01:46 2018 +0330 + + [cmake] Build src/ executables (#733) + + CMakeLists.txt | 40 ++++++++++++++++++++++++++-------------- + 1 file changed, 26 insertions(+), 14 deletions(-) + +commit 55cae0d72eecb5116008815b598481dd1404fc6a +Author: Ebrahim Byagowi +Date: Mon Jan 29 18:05:24 2018 +0330 + + [test] Use 'otool -L' where ldd doesn't exist (macOS) (#732) + + src/check-libstdc++.sh | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +commit 2ec7dd1f6cb78ee6a0621aa98f18500d3318c90c +Author: David Corbett +Date: Sun Jan 28 17:48:28 2018 -0500 + + Fix Travis build on macOS (#731) + + .travis.yml | 2 +- + src/check-defs.sh | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 12757b692905062fe0fc266a6230238b3492abfd +Author: Behdad Esfahbod +Date: Fri Jan 26 18:14:05 2018 -0800 + + Misc warning fixes + + Fixes https://github.com/harfbuzz/harfbuzz/issues/712 + + src/hb-ot-layout-gsubgpos-private.hh | 9 ++++----- + src/hb-ot-map-private.hh | 1 - + src/hb-ot-map.cc | 5 ++--- + 3 files changed, 6 insertions(+), 9 deletions(-) + +commit 85be365ed9238caf0283346ab4e5c5127096fc8a +Author: bungeman +Date: Fri Jan 26 13:38:06 2018 -0500 + + Use KernSubTableFormat2::rightClassTable + + Issue originally reported at http://cppfiles.com/chromium.txt . + + This fixes what appears to be a copy - paste issue which causes both + KernSubTableFormat2::rightClassTable and the 'right' argument to + KernSubTableFormat2::get_kerning to go unused. + + src/hb-ot-kern-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c41b7fc10588323b5d8c0007befa701994115f7b +Author: Ebrahim Byagowi +Date: Thu Jan 25 09:53:32 2018 +0330 + + [cmake] Use -fvisibility-inlines-hidden instead (#726) + + CMakeLists.txt | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +commit 3d615766060e34a6e716c8737f651b6d6871ae85 +Author: Ebrahim Byagowi +Date: Mon Jan 22 21:23:19 2018 +0330 + + [cmake] fix symbol exporting issue on newer gcc (#724) + + CMakeLists.txt | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit 8b60e7c2c301a24906d591c80c42fd5e506072d2 +Author: Ebrahim Byagowi +Date: Mon Jan 22 18:37:26 2018 +0330 + + [ci] minor, less hacks (#722) + + .circleci/config.yml | 20 ++++++-------------- + .travis.yml | 8 ++++---- + CMakeLists.txt | 11 +++++++---- + 3 files changed, 17 insertions(+), 22 deletions(-) + +commit aaf934de3b9e3447897b4da566655d6d0494e87b +Author: Ebrahim Byagowi +Date: Mon Jan 22 13:16:54 2018 +0330 + + [ci] minor (#721) + + .circleci/config.yml | 4 ++-- + .travis.yml | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit bd752db733e3d8c2c8773d831aebdd8a5cbb5e04 +Author: Ebrahim Byagowi +Date: Mon Jan 22 13:08:35 2018 +0330 + + [ci] unbreak bots with outdated freetype version (#718) + + .circleci/config.yml | 10 +++++++++- + .travis.yml | 10 +++++++++- + 2 files changed, 18 insertions(+), 2 deletions(-) + +commit 19a93fcf1946ad29f07306a0b6c65377bdaa49f0 +Author: Bruce Mitchener +Date: Sun Jan 21 20:40:34 2018 +0700 + + Fix typos. + + src/hb-blob.h | 2 +- + src/hb-buffer.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 51ce3828e67a8ca7e4ea4b69e88c395e243bf01f +Author: Behdad Esfahbod +Date: Fri Jan 19 18:36:39 2018 -0800 + + [aat] Fix Ligature matching + + I hope... Makes "ffi" work with Zapfino. I'm not sure if doing it correctly though... + + src/hb-aat-layout-morx-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bef509855c7a2c4400a947d2527d1dc048da1284 +Author: Behdad Esfahbod +Date: Fri Jan 19 18:24:00 2018 -0800 + + [aat] Add TODO + + src/hb-aat-layout-morx-table.hh | 1 + + 1 file changed, 1 insertion(+) + +commit e6f283ed7db6f8e2f8016dcbf07e589c40976aa6 +Author: Behdad Esfahbod +Date: Fri Jan 19 18:08:56 2018 -0800 + + [aat] Implement LigatureSubtable + + We form the Zapfino ligature now. Yay! No further testing done. + + src/hb-aat-layout-common-private.hh | 25 ++++++--- + src/hb-aat-layout-morx-table.hh | 108 +++++++++++++++++++++++++++++++++--- + 2 files changed, 115 insertions(+), 18 deletions(-) + +commit f07ce661a2056965c573c99bdb721c065563ea7b +Author: Behdad Esfahbod +Date: Fri Jan 19 16:52:01 2018 -0800 + + [aat] Embed a sanitizer context in hb_aat_apply_context_t + + For run-time checking. + + src/hb-aat-layout-common-private.hh | 22 ++++++++++++++++------ + src/hb-aat-layout.cc | 16 ++++++++-------- + 2 files changed, 24 insertions(+), 14 deletions(-) + +commit 046690a4df0fdc93e3490210ef105f26057b1462 +Author: Behdad Esfahbod +Date: Wed Jan 17 16:59:55 2018 -0800 + + [aat] Add hb_aat_apply_context_t + + src/hb-aat-layout-common-private.hh | 23 +++++++++++++++++++++++ + src/hb-aat-layout-morx-table.hh | 27 +++++++++++++-------------- + src/hb-aat-layout-private.hh | 2 +- + src/hb-aat-layout.cc | 8 +++++--- + src/hb-ot-shape.cc | 3 +-- + 5 files changed, 43 insertions(+), 20 deletions(-) + +commit fd034490942c06e31cfb42f32023c78734f8aeeb +Author: Behdad Esfahbod +Date: Wed Jan 17 16:46:51 2018 -0800 + + Rename hb_apply_context_t to hb_ot_apply_context_t + + src/hb-aat-layout-morx-table.hh | 16 ++++----- + src/hb-aat-layout-private.hh | 2 +- + src/hb-aat-layout.cc | 2 +- + src/hb-ot-layout-gpos-table.hh | 48 ++++++++++++------------- + src/hb-ot-layout-gsub-table.hh | 24 ++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 58 +++++++++++++++--------------- + src/hb-ot-layout-private.hh | 4 +-- + src/hb-ot-layout.cc | 16 ++++----- + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + src/hb-ot-shape-fallback.cc | 4 +-- + src/hb-ot-shape.cc | 2 +- + 11 files changed, 89 insertions(+), 89 deletions(-) + +commit 94b49beee972fec98cbb80658df3d8491b45485d +Author: Behdad Esfahbod +Date: Wed Jan 17 12:46:08 2018 -0800 + + Whitespace + + src/hb-ot-head-table.hh | 20 +++++++++----------- + src/hb-ot-post-table.hh | 10 +++++----- + 2 files changed, 14 insertions(+), 16 deletions(-) + +commit e849b8a85bb66219db4d797d86ddd60ed7c26a2e +Author: Ebrahim Byagowi +Date: Fri Jan 19 16:12:24 2018 +0330 + + [cmake] Always put test/api/CMakeLists.txt on distributions + + test/api/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit c8f2a4f5b99d3be3079286817386b4185d35a545 +Author: Cosimo Lupo +Date: Thu Jan 18 22:49:40 2018 +0100 + + hb-common.cc: Hatran script is right-to-left (#714) + + "Hatran is written from right to left horizontally" + + http://www.unicode.org/L2/L2012/12312-n4324-hatran.pdf + + This ancient script was added with Unicode 8.0. + + Also this spreadsheet (referenced in an inline comment in the + source code) has it as RTL: http://goo.gl/x9ilM + + src/hb-common.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 00806149b9b591e4ec15996d3d56bdbd60687821 +Author: Ebrahim Byagowi +Date: Fri Jan 19 01:12:31 2018 +0330 + + Improve avoiding C++ linkage, definition creation and cmake tests (#710) + + .circleci/config.yml | 4 ++-- + CMakeLists.txt | 46 ++++++++++++++++++++++++++-------------------- + configure.ac | 3 +++ + src/Makefile.am | 11 ++--------- + src/check-defs.sh | 37 +++++++++++++++++++++++-------------- + src/gen-def.py | 16 ++++++++++++++++ + 6 files changed, 72 insertions(+), 45 deletions(-) + +commit 9b693212a834a96252f4ebe0b006b85e9f35fc91 +Author: David Corbett +Date: Thu Jan 18 16:34:13 2018 -0500 + + Update record-test.sh to the new directory layout (#716) + + test/shaping/README.md | 11 ++++++----- + test/shaping/record-test.sh | 17 +++++++++++++---- + 2 files changed, 19 insertions(+), 9 deletions(-) + +commit 461a605fdec3361a038d3715adf615353c4f91fa +Author: Behdad Esfahbod +Date: Wed Jan 17 10:02:48 2018 -0800 + + [aat] Allocate set dynamically + + src/hb-aat-layout-common-private.hh | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +commit 4c4a9fc8617fed9bc1a7805c9aed294b4f6b66ea +Author: Behdad Esfahbod +Date: Wed Jan 17 09:47:50 2018 -0800 + + Typo + + Fixes https://github.com/harfbuzz/harfbuzz/issues/711 + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 90f01bad637c8b1214f46d4df6d9552a6a728e29 +Author: Ebrahim Byagowi +Date: Tue Jan 16 22:00:21 2018 +0330 + + [cmake] don't link to libstdc++ (#707) + + CMakeLists.txt | 38 +++++++++++++++++++++++++------------- + 1 file changed, 25 insertions(+), 13 deletions(-) + +commit 5e14e5f65d3dd1ed471ed73fab7e3207ae04e8fb +Author: rdb +Date: Tue Jan 16 17:04:33 2018 +0100 + + [cmake] Fix for CMake 3.0 and below (#706) + + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit c97a7eca7f7b6fc1c50a4ac7fccf3fa2d777430e +Author: Ebrahim Byagowi +Date: Tue Jan 16 14:18:09 2018 +0330 + + [cmake] Fix symbols visibility and enable check-symbols.sh test (#705) + + .circleci/config.yml | 2 +- + CMakeLists.txt | 22 ++++++++++++++-------- + 2 files changed, 15 insertions(+), 9 deletions(-) + +commit 60f84ef014f9280da24d5eb9ce833a7f37210242 +Author: Behdad Esfahbod +Date: Mon Jan 15 20:46:58 2018 -0500 + + Disable MORX-13/14 + + Really, need better way to catch these :(. + + test/shaping/data/text-rendering-tests/DISABLED | 2 ++ + test/shaping/data/text-rendering-tests/Makefile.sources | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit 949f6af2897b8982c81a059ea98e1c29bbce4772 +Author: Behdad Esfahbod +Date: Mon Jan 15 20:44:10 2018 -0500 + + Disallow sanitize recursing into Extension subtables multiple times + + Fixes https://oss-fuzz.com/v2/testcase-detail/5216838347653120 + which is a stack overflow, not by way of infinite recursion, just + being deep. That's disallowed anyway, so catch it as it happens, + not afterwards. + + src/hb-ot-layout-gsub-table.hh | 5 ++--- + src/hb-ot-layout-gsubgpos-private.hh | 4 +++- + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit bcb6f1ae0a08e5c7af88a7affaad42a67c5adac5 +Author: Behdad Esfahbod +Date: Mon Jan 15 20:34:05 2018 -0500 + + Whitespace + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 12fffce10eb6ffebdedd655d0b1f10a99adf1808 +Author: Behdad Esfahbod +Date: Mon Jan 15 15:41:51 2018 -0500 + + [aat] Sanitize classTable in StateTable + + src/hb-aat-layout-common-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e6263c7142ca22efd9a3c93353a513f475c1c48d +Author: Behdad Esfahbod +Date: Mon Jan 15 15:37:55 2018 -0500 + + [aat] Wire up table length to apply() + + src/hb-aat-layout-morx-table.hh | 17 +++++++++-------- + src/hb-aat-layout.cc | 20 +++++++++++++++----- + src/hb-open-type-private.hh | 6 +++--- + 3 files changed, 27 insertions(+), 16 deletions(-) + +commit 679ae744d07db7746a983ece54c22635a9dc3cff +Author: Behdad Esfahbod +Date: Sun Jan 14 15:03:31 2018 -0500 + + [aat] Towards implementing LigatureSubtable + + src/hb-aat-layout-morx-table.hh | 61 +++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 58 insertions(+), 3 deletions(-) + +commit c9e12a2b9b34d73d37def2261a5c1a7ef20b8349 +Author: Behdad Esfahbod +Date: Sat Jan 13 17:05:12 2018 +0000 + + Fix set initializer + + src/hb-set-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 54a1e250a839f030b43dbeba66cadc50ab5f90f6 +Author: Behdad Esfahbod +Date: Sat Jan 13 14:44:39 2018 +0000 + + [test/text-rendering-tests] Update from upstream + + test/shaping/data/text-rendering-tests/Makefile.sources | 2 ++ + .../data/text-rendering-tests/fonts/TestMORXFourteen.ttf | Bin 0 -> 1816 bytes + .../data/text-rendering-tests/fonts/TestMORXThirteen.ttf | Bin 0 -> 1820 bytes + .../data/text-rendering-tests/tests/MORX-13.tests | 1 + + .../data/text-rendering-tests/tests/MORX-14.tests | 1 + + 5 files changed, 4 insertions(+) + +commit 9009b341c46caaa81deae8ea55e6f7dd98565f59 +Author: Behdad Esfahbod +Date: Fri Jan 12 12:04:53 2018 +0100 + + [aat] Fix some struct sizes + + I hate it that with my compiler at least, it doesn't catch totally uncompilable + statements in templates if they are not used... + + src/hb-aat-layout-common-private.hh | 2 +- + src/hb-aat-layout-morx-table.hh | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 57051b4f672d7d9dd10c45cc95b1e50e32cd42a9 +Author: Behdad Esfahbod +Date: Fri Jan 12 11:42:25 2018 +0100 + + [aat] Flush rest of buffer if state machine failed + + src/hb-aat-layout-common-private.hh | 12 +++++++++--- + src/hb-aat-layout-morx-table.hh | 2 ++ + 2 files changed, 11 insertions(+), 3 deletions(-) + +commit 369dfab0f8b7f22338bbd7a58a27e2e02e1efc29 +Author: Behdad Esfahbod +Date: Fri Jan 12 11:37:01 2018 +0100 + + Minor + + docs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 25364c4f0020a66bd6f4bce1656ea47f1093396d +Author: Behdad Esfahbod +Date: Fri Jan 12 11:31:20 2018 +0100 + + [aat] Fix symbol visibility + + Not sure why only one of the bots sees this as visible... + + src/hb-aat-layout-morx-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ee16b9d8d35af1e74369edf7b733886c4b743a68 +Author: Behdad Esfahbod +Date: Fri Jan 12 11:28:09 2018 +0100 + + Revert accidental morx enablement + + src/hb-ot-shape.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 44f0ee346f53c51ec4abccc81cc24abf6f018e85 +Author: Behdad Esfahbod +Date: Fri Jan 12 11:27:51 2018 +0100 + + Fix docs + + docs/harfbuzz-sections.txt | 1 + + 1 file changed, 1 insertion(+) + +commit cdfa801ff4fe301d7bd41c9eee57cae75001ce4b +Author: Behdad Esfahbod +Date: Fri Jan 12 11:12:20 2018 +0100 + + [aat] Tweak previous commit + + src/hb-aat-layout-common-private.hh | 2 ++ + src/hb-ot-shape.cc | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit f7600228a4b37e6f6b65394aceeeb14bf4133c23 +Author: Behdad Esfahbod +Date: Fri Jan 12 11:09:21 2018 +0100 + + [aat] Detect infinite-loops in state machine + + src/hb-aat-layout-common-private.hh | 36 +++++++++++++++++++++++++++++------- + 1 file changed, 29 insertions(+), 7 deletions(-) + +commit d514f1480cffb81850ef212155c66ee9e0383350 +Author: Behdad Esfahbod +Date: Fri Jan 12 10:55:44 2018 +0100 + + [circleci] cat test logs on failure on autotools-based builds + + .circleci/config.yml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 1facef337862a0ceee9a8ac1d4dc94ff94fcb3b3 +Author: Behdad Esfahbod +Date: Fri Jan 12 10:53:52 2018 +0100 + + [travis] On test failure, cat all .log files + + .travis.yml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit cdd86bf3a28961e85a8918d77937587df313d47b +Author: Behdad Esfahbod +Date: Fri Jan 12 10:51:51 2018 +0100 + + [travis] Update cat'ing test-suite.log files + + .travis.yml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 22d8c765e7b556601173a3e70f5bc9f310263a98 +Author: Behdad Esfahbod +Date: Fri Jan 12 09:46:38 2018 +0100 + + Disable C++11 + + To better catch errors locally. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dd38db523a1001178bf4cae3721c098466534736 +Author: Behdad Esfahbod +Date: Fri Jan 12 09:45:42 2018 +0100 + + [aat] Fix more builds + + Maybe I should disable C++11 detection such that my compiler also catches + these. Doesn't look like we can switch to it for a while anyway... + + src/hb-aat-layout-common-private.hh | 2 +- + src/hb-aat-layout-morx-table.hh | 18 +++++++++--------- + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit 72cb2b1f57ba79938c74e0406fc7457fce287f69 +Author: Behdad Esfahbod +Date: Fri Jan 12 09:38:55 2018 +0100 + + [aat] Fix builds + + src/hb-aat-layout-morx-table.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit e3a15d0c6d088963e61f7fbebe25e1096d8e2903 +Author: Ting-Wei Lan +Date: Fri Jan 12 15:33:16 2018 +0800 + + Update _POSIX_C_SOURCE to the latest version + + Defining _POSIX_C_SOURCE to an old version on FreeBSD can cause C99 to + be disabled in libc. + + src/hb-blob.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c70d58f97da7dcbdd7ea72a44f39130a75a279f7 +Author: Behdad Esfahbod +Date: Fri Jan 12 00:08:22 2018 +0100 + + [aat] Port RearrangementSubtable to StateTableDriver + + src/hb-aat-layout-morx-table.hh | 91 ++++++++++++++++++++--------------------- + 1 file changed, 44 insertions(+), 47 deletions(-) + +commit 117cfe7bb7cef682eb151b94f1eb12363ba3af67 +Author: Behdad Esfahbod +Date: Fri Jan 12 00:01:36 2018 +0100 + + [aat] Add StateTableDriver and convert ContextualSubtable to it + + src/hb-aat-layout-common-private.hh | 51 ++++++++++++++++++++ + src/hb-aat-layout-morx-table.hh | 93 ++++++++++++++++++------------------- + 2 files changed, 95 insertions(+), 49 deletions(-) + +commit 0d39ac224c680b1f0134b58e78391497fbe47370 +Author: Behdad Esfahbod +Date: Thu Jan 11 22:47:08 2018 +0100 + + [test/text-rendering-tests] Update README + + test/shaping/data/text-rendering-tests/README | 3 +++ + 1 file changed, 3 insertions(+) + +commit 17a66f133c7e523403b6c90b011fcf0acb6356c6 +Author: Behdad Esfahbod +Date: Thu Jan 11 22:46:19 2018 +0100 + + [test] Disable MORX-12 + + Ouch. I need a better workflow for this. + + test/shaping/data/text-rendering-tests/Makefile.sources | 1 - + 1 file changed, 1 deletion(-) + +commit 1f1c85a54aad8a25a67041cbb9c4277d28c1c761 +Author: Behdad Esfahbod +Date: Thu Jan 11 22:43:57 2018 +0100 + + [aat] Remove 'mort' support + + It's dead, Jim! + + src/hb-aat-layout-common-private.hh | 55 +++++----------- + src/hb-aat-layout-morx-table.hh | 122 ++++++++++-------------------------- + 2 files changed, 46 insertions(+), 131 deletions(-) + +commit 7e2fed6d73f89986e5777028cdcd24e3baf2f86c +Author: Behdad Esfahbod +Date: Thu Jan 11 19:25:21 2018 +0100 + + [aat] Allow DontAdvance + + Apparently CoreText does allow these. To be done: detect infinite + loops. + + Fixes MORX-12 test. + + src/hb-aat-layout-morx-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1387fe8f9c474e88f86828733d4c01bd56f44432 +Author: Behdad Esfahbod +Date: Thu Jan 11 19:22:37 2018 +0100 + + [test/text-rendering-tests] Update from upstream + + test/shaping/data/text-rendering-tests/DISABLED | 1 + + test/shaping/data/text-rendering-tests/Makefile.sources | 2 ++ + .../data/text-rendering-tests/fonts/TestMORXTwelve.ttf | Bin 0 -> 2200 bytes + .../data/text-rendering-tests/tests/MORX-12.tests | 3 +++ + 4 files changed, 6 insertions(+) + +commit 17f01aff910b3871d0a6c45fd4305304b7f68ab5 +Author: Behdad Esfahbod +Date: Thu Jan 11 18:54:49 2018 +0100 + + [aat] Sanitize ContextualSubtable + + src/hb-aat-layout-common-private.hh | 23 +++++++++++++++++++---- + src/hb-aat-layout-morx-table.hh | 34 ++++++++++++++++++++++++---------- + 2 files changed, 43 insertions(+), 14 deletions(-) + +commit 9b82aa19d812e70b7fade4b7669a9ce27855951e +Author: Behdad Esfahbod +Date: Thu Jan 11 18:19:42 2018 +0100 + + More warning fixes + + src/hb-open-type-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 680cbc2eb325edc6b8562f39485b146aa56b3872 +Author: Behdad Esfahbod +Date: Thu Jan 11 18:15:53 2018 +0100 + + [aat] Sanitize StateTable + + src/hb-aat-layout-common-private.hh | 43 ++++++++++++++++++++++++++++++++++--- + 1 file changed, 40 insertions(+), 3 deletions(-) + +commit 0e3b3379a04a67a22e44e17d6bf849359f4fca68 +Author: Behdad Esfahbod +Date: Thu Jan 11 18:01:10 2018 +0100 + + [aat] Actually fix d887f931485b715775e922516a4b0de5bb92c34f + + src/hb-aat-layout-morx-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1eb98c9916c6cb447f999170840b7f37de4b282d +Author: Behdad Esfahbod +Date: Thu Jan 11 17:59:03 2018 +0100 + + [test/text-rendering-tests] Actually disable MORX-11 + + test/shaping/data/text-rendering-tests/Makefile.sources | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3f291ffd5a9480ac0f528eaedd43c7e9af738ee2 +Author: Behdad Esfahbod +Date: Thu Jan 11 17:57:46 2018 +0100 + + [buffer] Fix compiler warnings + + line 323: Warning: info hides hb_buffer_t::info + ... + + src/hb-buffer-private.hh | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit d887f931485b715775e922516a4b0de5bb92c34f +Author: Behdad Esfahbod +Date: Thu Jan 11 17:41:34 2018 +0100 + + [aat] Make bots happy + + Don't know why this is not caught by my compiler. Looks like clang catches it + while gcc doesn't. + + In file included from ../src/hb-aat-layout-morx-table.hh:31: + ../src/hb-aat-layout-common-private.hh:523:30: error: no member named 'static_size' in 'AAT::ContextualSubtable::EntryData' + DEFINE_SIZE_STATIC (4 + T::static_size); + ~~~^ + + src/hb-aat-layout-morx-table.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit f6be730994434e706cc27d68b796492d876e82b6 +Author: Behdad Esfahbod +Date: Thu Jan 11 15:23:24 2018 +0100 + + [aat] In NoncontextualSubtable, handle MarkLast with end-of-line transition + + Fixes MORX-11 test. + + src/hb-aat-layout-morx-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1d20d109a07bf9c775ab91dfbbb55f7bd80fd9d6 +Author: Behdad Esfahbod +Date: Thu Jan 11 15:18:22 2018 +0100 + + [test/text-rendering-tests] Update from upstream + + test/shaping/data/text-rendering-tests/DISABLED | 3 ++- + test/shaping/data/text-rendering-tests/Makefile.sources | 3 ++- + .../data/text-rendering-tests/fonts/TestMORXEleven.ttf | Bin 0 -> 1624 bytes + .../data/text-rendering-tests/tests/MORX-11.tests | 1 + + 4 files changed, 5 insertions(+), 2 deletions(-) + +commit f9be673814aeb2c8abab52a672598576c6ed20c2 +Author: Behdad Esfahbod +Date: Thu Jan 11 15:15:07 2018 +0100 + + [aat] Implement ContextualSubtable + + Tested with Zapfino and text "2nd". Sascha will create tests later. + + src/hb-aat-layout-morx-table.hh | 70 ++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 66 insertions(+), 4 deletions(-) + +commit 335a9c1fe489db53549801b4996dd0f6f5eded62 +Author: Behdad Esfahbod +Date: Thu Jan 11 14:50:47 2018 +0100 + + [aat] Towards implementing ContextualSubtable + + src/hb-aat-layout-common-private.hh | 58 ++++++++++++++++++++++-- + src/hb-aat-layout-morx-table.hh | 88 ++++++++++++++++++++++++++----------- + 2 files changed, 117 insertions(+), 29 deletions(-) + +commit 62348f647f7b1604e008dbed46a54eff245fc106 +Author: Behdad Esfahbod +Date: Thu Jan 11 12:00:28 2018 +0100 + + [aat] Implement end-of-text in state machine + + Passes MORX-10 test now. + + src/hb-aat-layout-morx-table.hh | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit fc405b7ca77088135cb7de11cb32c254b85272fd +Author: Behdad Esfahbod +Date: Thu Jan 11 11:55:29 2018 +0100 + + [test/text-rendering-tests] Update from upstream + + test/shaping/data/text-rendering-tests/DISABLED | 1 + + test/shaping/data/text-rendering-tests/Makefile.sources | 11 ++++++----- + .../data/text-rendering-tests/fonts/TestMORXTen.ttf | Bin 0 -> 1620 bytes + .../data/text-rendering-tests/tests/MORX-10.tests | 1 + + 4 files changed, 8 insertions(+), 5 deletions(-) + +commit 9adbd938fafe1de4e279489fc37ae33c900e22f0 +Author: Behdad Esfahbod +Date: Thu Jan 11 11:55:10 2018 +0100 + + Minor + + src/hb-aat-layout-morx-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4177f646aa60180f094e064a53e54c5402fe53c6 +Author: Ebrahim Byagowi +Date: Thu Jan 11 15:43:23 2018 +0330 + + [cmake] Update and unbreak (#700) + + test/shaping/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 94644d7ea4cf217e4d6c6ff57d65e1e20866ea6d +Author: Behdad Esfahbod +Date: Thu Jan 11 11:49:07 2018 +0100 + + [aat] Generate finegrained unsafe-to-break in state-machine! + + Neato. + + src/hb-aat-layout-morx-table.hh | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 994eb7744c530bbaa5d6d8b8e07ca936e81aade8 +Author: Behdad Esfahbod +Date: Thu Jan 11 11:37:12 2018 +0100 + + [buffer] Fix crash + + src/hb-buffer-serialize.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d6076747ac6706b4d8361714d46aced9683c44a8 +Author: Behdad Esfahbod +Date: Thu Jan 11 10:51:46 2018 +0100 + + [test/text-rendering-tests] Add DISABLED list + + test/shaping/data/text-rendering-tests/DISABLED | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +commit de02b5093c42a527ae67084b30943369ed59efe6 +Author: Behdad Esfahbod +Date: Thu Jan 11 10:48:42 2018 +0100 + + [test/in-house] Add Makefile.sources + + test/shaping/data/in-house/Makefile.am | 46 ++--------------------------- + test/shaping/data/in-house/Makefile.sources | 46 +++++++++++++++++++++++++++++ + 2 files changed, 48 insertions(+), 44 deletions(-) + +commit 7c32e01d04deaab511d41f5dec0dfd9fc0469f39 +Author: Behdad Esfahbod +Date: Thu Jan 11 10:47:31 2018 +0100 + + Minor + + src/Makefile.am | 1 + + src/Makefile.sources | 2 -- + test/shaping/data/text-rendering-tests/update.sh | 2 -- + util/Makefile.am | 1 + + util/Makefile.sources | 2 -- + 5 files changed, 2 insertions(+), 6 deletions(-) + +commit a5adc5aa84c03184fd1c8a486be80ff0af1f448c +Author: Behdad Esfahbod +Date: Thu Jan 11 10:30:22 2018 +0100 + + [test/text-rendering-tests] Update from upstream + + Also adds an update.sh script that does this automatically. + + test/shaping/data/text-rendering-tests/Makefile.am | 52 +++------------------ + .../data/text-rendering-tests/Makefile.sources | 51 ++++++++++++++++++++ + .../text-rendering-tests/fonts/TestMORXEight.ttf | Bin 0 -> 2184 bytes + .../text-rendering-tests/fonts/TestMORXNine.ttf | Bin 0 -> 1624 bytes + .../data/text-rendering-tests/tests/MORX-5.tests | 25 ++++++++++ + .../data/text-rendering-tests/tests/MORX-6.tests | 1 + + .../data/text-rendering-tests/tests/MORX-7.tests | 1 + + .../data/text-rendering-tests/tests/MORX-8.tests | 3 ++ + .../data/text-rendering-tests/tests/MORX-9.tests | 1 + + test/shaping/data/text-rendering-tests/update.sh | 48 +++++++++++++++++++ + 10 files changed, 136 insertions(+), 46 deletions(-) + +commit c861daacc4255d41d2358868b917277422949dc9 +Author: Behdad Esfahbod +Date: Thu Jan 11 10:11:01 2018 +0100 + + [test/text-rendering-tests] Add README and COPYING + + test/shaping/data/text-rendering-tests/COPYING | 13 +++++++++++++ + test/shaping/data/text-rendering-tests/Makefile.am | 2 ++ + test/shaping/data/text-rendering-tests/README | 4 ++++ + 3 files changed, 19 insertions(+) + +commit 14b4d84eef18bd54287c10ce44eaef4f642f6238 +Author: Behdad Esfahbod +Date: Thu Jan 11 10:08:25 2018 +0100 + + [aat] Fix RearrangementSubtable action + + src/hb-aat-layout-morx-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ea3e86c6401d41cf54d82692eccbf44c87be2fd5 +Author: Behdad Esfahbod +Date: Thu Jan 11 09:58:42 2018 +0100 + + Minor + + test/shaping/data/Makefile.am | 4 ++++ + test/shaping/data/in-house/Makefile.am | 4 ++++ + test/shaping/data/text-rendering-tests/Makefile.am | 4 ++++ + 3 files changed, 12 insertions(+) + +commit 800e4ae80232f022404be155afd497b0421a6a64 +Author: Behdad Esfahbod +Date: Thu Jan 11 09:57:55 2018 +0100 + + [aat] Mark state-machine-based lookup as completely unsafe-to-break + + To be improved later. + + src/hb-aat-layout-morx-table.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit ca42d961293a9e4dfd0817c1a02d454008583282 +Author: Behdad Esfahbod +Date: Thu Jan 11 09:15:34 2018 +0100 + + [aat] Implement RearrangementSubtable + + src/hb-aat-layout-common-private.hh | 89 ++++++++++++++++- + src/hb-aat-layout-morx-table.hh | 192 +++++++++++++++++++++++++++++++----- + src/hb-open-type-private.hh | 2 - + src/hb-private.hh | 7 +- + 4 files changed, 254 insertions(+), 36 deletions(-) + +commit 5dbbd0fdb9a343554112a846b392803f11c13197 +Author: Ebrahim Byagowi +Date: Thu Jan 11 12:33:22 2018 +0330 + + Move the #define of _GNU_SOURCE to the top of hb-private.hh (#697) + + This fixes the build on Cygwin. + + src/hb-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 90e3c9e69e93e05d9fb534fd43b5c99cf58a7cb4 +Author: Ebrahim Byagowi +Date: Thu Jan 11 12:31:05 2018 +0330 + + [cmake] Fix hb-blob test (#699) + + CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 1461965c2220cd957c26b3fe5835200e426bc715 +Author: Ebrahim Byagowi +Date: Thu Jan 11 08:48:22 2018 +0330 + + [test] Better tests output by converting stderr to stdout (#696) + + https://gitlab.kitware.com/cmake/cmake/issues/17630 + + test/shaping/run-tests.py | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit ebb9b7d6335536804b50002fb83dd30da42a8ad5 +Author: Ebrahim Byagowi +Date: Thu Jan 11 08:15:06 2018 +0330 + + [test] Print shaping output on CI fails (#695) + + .circleci/config.yml | 4 ++-- + test/shaping/run-tests.py | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit e24bea8e91ba9f447f1f7f252bdefacef1f83593 +Author: Ebrahim Byagowi +Date: Wed Jan 10 23:51:56 2018 +0330 + + [cmake] Another try on making sure feature testing is working (#691) + + .circleci/config.yml | 131 ++++++++++++++++++++++++++++----------------------- + CMakeLists.txt | 17 ++++--- + 2 files changed, 79 insertions(+), 69 deletions(-) + +commit 746a37d5bdd2e965aa316e95ba5a7bad809d76a7 +Author: Behdad Esfahbod +Date: Wed Jan 10 16:47:47 2018 +0100 + + [util] Replace setlinebuf + + util/options.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ff2083c53eecc67c011b96b0b9a58331043e53cf +Author: Behdad Esfahbod +Date: Wed Jan 10 13:54:36 2018 +0100 + + [util] Set stdio files to line buffering + + So we can stream lines to hb-shape and read output. + + util/options.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 80fd5743200cbe221ae3adf057fe0e5ef54a894c +Author: Behdad Esfahbod +Date: Wed Jan 10 11:09:53 2018 +0100 + + [aat] Add Class subtable thingy + + From old 'mort' table. + + src/hb-aat-layout-common-private.hh | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +commit 71e0ed9cbad8438239dcedf1bcfa8e19b9dfdc89 +Author: Ebrahim Byagowi +Date: Wed Jan 10 15:45:12 2018 +0330 + + [cmake] Add header existence tests (#685) + + .circleci/config.yml | 4 ++-- + CMakeLists.txt | 53 ++++++++++++++++++++++++++++++--------------- + test/shaping/CMakeLists.txt | 1 - + 3 files changed, 37 insertions(+), 21 deletions(-) + +commit a073621b5dc2865a014821307128a8fdd1d7d992 +Author: Ebrahim Byagowi +Date: Wed Jan 10 12:13:28 2018 +0330 + + [cmake] Fix tests against latest changes (#690) + + test/shaping/CMakeLists.txt | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +commit 0b22da954142ad7a1e949a56448cee4e836fff75 +Author: Khaled Hosny +Date: Wed Jan 10 07:12:07 2018 +0200 + + Improve HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES docs + + Add the note about absolute glyph positions from the commit message. + + src/hb-buffer.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 6db0b17c4ce56bd7477941e7a2fc85997c04588e +Author: Behdad Esfahbod +Date: Wed Jan 10 05:40:43 2018 +0100 + + [test] Move test handling to sundirectories + + configure.ac | 3 + + test/shaping/Makefile.am | 98 +--------------------- + test/shaping/data/Makefile.am | 9 ++ + test/shaping/data/in-house/Makefile.am | 58 +++++++++++++ + test/shaping/data/text-rendering-tests/Makefile.am | 60 +++++++++++++ + 5 files changed, 131 insertions(+), 97 deletions(-) + +commit 4c982b4867707fcd2259b344b06e5bba8dd0c1e3 +Author: Behdad Esfahbod +Date: Wed Jan 10 05:26:55 2018 +0100 + + [test] Whitelist one more passing test + + test/shaping/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 188ee6e5eeef3c63c332cfa30795d37da1bc1682 +Author: Behdad Esfahbod +Date: Wed Jan 10 05:13:47 2018 +0100 + + Calculate anchor positions in float, then round + + Hoping to reduce rounding error, to make tests happier... + No luck. + + src/hb-font-private.hh | 6 ++++++ + src/hb-ot-layout-gpos-table.hh | 44 +++++++++++++++++++++--------------------- + 2 files changed, 28 insertions(+), 22 deletions(-) + +commit 0b28e1199d62765db4e855756b96022e423dcc17 +Author: Behdad Esfahbod +Date: Wed Jan 10 05:02:42 2018 +0100 + + [test] Whitelist one more passing test + + test/shaping/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7cdd6ab068500aa18de9a856bfbe730d0aac9a27 +Author: Behdad Esfahbod +Date: Wed Jan 10 04:33:08 2018 +0100 + + Round, instead of floor, when applying variations + + Hoping this would fix remaining text-rendering-tests failures, + but so far no luck. + + src/hb-font-private.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-private.hh | 1 + + 3 files changed, 3 insertions(+), 2 deletions(-) + +commit 6dc6f0c9f844a006b4518ce789e319fcef6e9680 +Author: Behdad Esfahbod +Date: Wed Jan 10 04:12:35 2018 +0100 + + [test] Whitelist one passing test + + test/shaping/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ec939761e4d1b2f825db715290d70e18b1c9dd12 +Author: Behdad Esfahbod +Date: Wed Jan 10 03:56:43 2018 +0100 + + Minor + + test/shaping/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit c4eac531dfad55f691557a684b3a6bde83c4bcea +Author: Behdad Esfahbod +Date: Wed Jan 10 03:51:09 2018 +0100 + + Minor + + test/shaping/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +commit 285a0bd799426c544d896f8fbcc27f4613a28e9a +Author: Behdad Esfahbod +Date: Wed Jan 10 03:49:32 2018 +0100 + + [test] Another try + + Making cmake happy this time. + + test/shaping/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 95b32b00557d6afcfc469f8dcc51d8bfa8243a00 +Author: Behdad Esfahbod +Date: Wed Jan 10 03:48:09 2018 +0100 + + [test] Fix text disabling + + Ouch, make! + + test/shaping/Makefile.am | 27 ++++++++++++++------------- + 1 file changed, 14 insertions(+), 13 deletions(-) + +commit a938d105b8d6e2d654079ea7d89e2e3ef5e0aed4 +Author: Behdad Esfahbod +Date: Wed Jan 10 03:41:55 2018 +0100 + + [test/text-rendering-tests] Disable failing tests + + test/shaping/Makefile.am | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit ed95d5e374a10770eb305dfa43a9f5b39933aac7 +Author: Behdad Esfahbod +Date: Wed Jan 10 03:38:52 2018 +0100 + + [test/text-rendering-tests] Disable failing tests + + test/shaping/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3b1e97f364e5ffdc08b52f889e3fea80a7e83e99 +Author: Behdad Esfahbod +Date: Wed Jan 10 03:35:20 2018 +0100 + + Add HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES + + New API: + HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES + hb-shape / hb-view --remove-default-ignorables + + One more text-rendering-tests test passing. Eleven failing. + + src/hb-buffer.h | 17 ++++-- + src/hb-ot-shape.cc | 6 +- + .../data/text-rendering-tests/extract-tests.py | 2 +- + .../data/text-rendering-tests/tests/AVAR-1.tests | 34 +++++------ + .../data/text-rendering-tests/tests/CFF-1.tests | 26 ++++----- + .../data/text-rendering-tests/tests/CFF-2.tests | 26 ++++----- + .../data/text-rendering-tests/tests/CFF2-1.tests | 18 +++--- + .../data/text-rendering-tests/tests/CMAP-1.tests | 8 +-- + .../data/text-rendering-tests/tests/CMAP-2.tests | 4 +- + .../data/text-rendering-tests/tests/CMAP-3.tests | 40 ++++++------- + .../data/text-rendering-tests/tests/CVAR-1.tests | 6 +- + .../data/text-rendering-tests/tests/CVAR-2.tests | 6 +- + .../data/text-rendering-tests/tests/GLYF-1.tests | 2 +- + .../data/text-rendering-tests/tests/GPOS-1.tests | 38 ++++++------ + .../data/text-rendering-tests/tests/GPOS-2.tests | 6 +- + .../data/text-rendering-tests/tests/GPOS-3.tests | 8 +-- + .../data/text-rendering-tests/tests/GPOS-4.tests | 8 +-- + .../data/text-rendering-tests/tests/GPOS-5.tests | 10 ++-- + .../data/text-rendering-tests/tests/GSUB-1.tests | 2 +- + .../data/text-rendering-tests/tests/GSUB-2.tests | 22 +++---- + .../data/text-rendering-tests/tests/GVAR-1.tests | 18 +++--- + .../data/text-rendering-tests/tests/GVAR-2.tests | 18 +++--- + .../data/text-rendering-tests/tests/GVAR-3.tests | 18 +++--- + .../data/text-rendering-tests/tests/GVAR-4.tests | 22 +++---- + .../data/text-rendering-tests/tests/GVAR-5.tests | 22 +++---- + .../data/text-rendering-tests/tests/GVAR-6.tests | 22 +++---- + .../data/text-rendering-tests/tests/GVAR-7.tests | 14 ++--- + .../data/text-rendering-tests/tests/GVAR-8.tests | 12 ++-- + .../data/text-rendering-tests/tests/GVAR-9.tests | 20 +++---- + .../data/text-rendering-tests/tests/HVAR-1.tests | 12 ++-- + .../data/text-rendering-tests/tests/HVAR-2.tests | 12 ++-- + .../data/text-rendering-tests/tests/KERN-1.tests | 2 +- + .../data/text-rendering-tests/tests/KERN-2.tests | 2 +- + .../data/text-rendering-tests/tests/MORX-1.tests | 2 +- + .../data/text-rendering-tests/tests/MORX-2.tests | 32 +++++----- + .../data/text-rendering-tests/tests/MORX-3.tests | 32 +++++----- + .../data/text-rendering-tests/tests/MORX-4.tests | 30 +++++----- + .../data/text-rendering-tests/tests/SHARAN-1.tests | 12 ++-- + .../data/text-rendering-tests/tests/SHBALI-1.tests | 44 +++++++------- + .../data/text-rendering-tests/tests/SHBALI-2.tests | 24 ++++---- + .../data/text-rendering-tests/tests/SHBALI-3.tests | 18 +++--- + .../data/text-rendering-tests/tests/SHKNDA-1.tests | 68 +++++++++++----------- + .../data/text-rendering-tests/tests/SHKNDA-2.tests | 32 +++++----- + .../data/text-rendering-tests/tests/SHKNDA-3.tests | 62 ++++++++++---------- + util/options.cc | 1 + + util/options.hh | 14 +++-- + 46 files changed, 435 insertions(+), 419 deletions(-) + +commit 46e4ed552fb1205eb6cbc16450bb231998fc7347 +Author: Behdad Esfahbod +Date: Wed Jan 10 03:22:08 2018 +0100 + + [test/text-rendering-tests] Hook up font variations + + Six more passing. Twelve failing now. + + .../data/text-rendering-tests/extract-tests.py | 6 +++- + .../data/text-rendering-tests/tests/AVAR-1.tests | 34 +++++++++++----------- + .../data/text-rendering-tests/tests/CFF2-1.tests | 18 ++++++------ + .../data/text-rendering-tests/tests/CVAR-1.tests | 6 ++-- + .../data/text-rendering-tests/tests/CVAR-2.tests | 6 ++-- + .../data/text-rendering-tests/tests/GPOS-5.tests | 10 +++---- + .../data/text-rendering-tests/tests/GVAR-1.tests | 18 ++++++------ + .../data/text-rendering-tests/tests/GVAR-2.tests | 18 ++++++------ + .../data/text-rendering-tests/tests/GVAR-3.tests | 18 ++++++------ + .../data/text-rendering-tests/tests/GVAR-4.tests | 22 +++++++------- + .../data/text-rendering-tests/tests/GVAR-5.tests | 22 +++++++------- + .../data/text-rendering-tests/tests/GVAR-6.tests | 22 +++++++------- + .../data/text-rendering-tests/tests/GVAR-7.tests | 14 ++++----- + .../data/text-rendering-tests/tests/GVAR-8.tests | 12 ++++---- + .../data/text-rendering-tests/tests/GVAR-9.tests | 20 ++++++------- + .../data/text-rendering-tests/tests/HVAR-1.tests | 12 ++++---- + .../data/text-rendering-tests/tests/HVAR-2.tests | 12 ++++---- + 17 files changed, 137 insertions(+), 133 deletions(-) + +commit 2b3f62fc4de8f10c2168f212b1368478312e6dec +Author: Behdad Esfahbod +Date: Wed Jan 10 03:16:56 2018 +0100 + + [test] Add tests from text-rendering-tests repo + + https://github.com/unicode-org/text-rendering-tests + + test/shaping/Makefile.am | 44 ++++++++++++++- + .../fonts/AdobeVFPrototype-Subset.otf | Bin 0 -> 7096 bytes + .../text-rendering-tests/fonts/FDArrayTest257.otf | Bin 0 -> 145212 bytes + .../fonts/FDArrayTest65535.otf | Bin 0 -> 492740 bytes + .../fonts/NotoSansBalinese-Regular.ttf | Bin 0 -> 32304 bytes + .../fonts/NotoSansKannada-Regular.ttf | Bin 0 -> 83868 bytes + .../fonts/NotoSerifKannada-Regular.ttf | Bin 0 -> 96936 bytes + .../text-rendering-tests/fonts/Selawik-README.md | 60 +++++++++++++++++++++ + .../fonts/Selawik-variable.ttf | Bin 0 -> 481504 bytes + .../data/text-rendering-tests/fonts/TestAVAR.ttf | Bin 0 -> 1608 bytes + .../data/text-rendering-tests/fonts/TestCMAP14.otf | Bin 0 -> 1628 bytes + .../fonts/TestCMAPMacTurkish.ttf | Bin 0 -> 19644 bytes + .../text-rendering-tests/fonts/TestCVARGVAROne.ttf | Bin 0 -> 12336 bytes + .../text-rendering-tests/fonts/TestCVARGVARTwo.ttf | Bin 0 -> 12256 bytes + .../text-rendering-tests/fonts/TestGLYFOne.ttf | Bin 0 -> 1516 bytes + .../text-rendering-tests/fonts/TestGPOSFour.ttf | Bin 0 -> 315020 bytes + .../text-rendering-tests/fonts/TestGPOSOne.ttf | Bin 0 -> 10384 bytes + .../text-rendering-tests/fonts/TestGPOSThree.ttf | Bin 0 -> 3500 bytes + .../text-rendering-tests/fonts/TestGPOSTwo.otf | Bin 0 -> 1680 bytes + .../text-rendering-tests/fonts/TestGSUBOne.otf | Bin 0 -> 1788 bytes + .../text-rendering-tests/fonts/TestGVAREight.ttf | Bin 0 -> 4692 bytes + .../text-rendering-tests/fonts/TestGVARFour.ttf | Bin 0 -> 3204 bytes + .../text-rendering-tests/fonts/TestGVARNine.ttf | Bin 0 -> 2168 bytes + .../text-rendering-tests/fonts/TestGVAROne.ttf | Bin 0 -> 14312 bytes + .../text-rendering-tests/fonts/TestGVARThree.ttf | Bin 0 -> 14336 bytes + .../text-rendering-tests/fonts/TestGVARTwo.ttf | Bin 0 -> 15668 bytes + .../text-rendering-tests/fonts/TestHVAROne.otf | Bin 0 -> 3984 bytes + .../text-rendering-tests/fonts/TestHVARTwo.ttf | Bin 0 -> 4004 bytes + .../text-rendering-tests/fonts/TestKERNOne.otf | Bin 0 -> 1380 bytes + .../text-rendering-tests/fonts/TestMORXFour.ttf | Bin 0 -> 4764 bytes + .../text-rendering-tests/fonts/TestMORXOne.ttf | Bin 0 -> 2404 bytes + .../text-rendering-tests/fonts/TestMORXThree.ttf | Bin 0 -> 4104 bytes + .../text-rendering-tests/fonts/TestMORXTwo.ttf | Bin 0 -> 4960 bytes + .../text-rendering-tests/fonts/TestShapeAran.ttf | Bin 0 -> 116044 bytes + .../text-rendering-tests/fonts/TestShapeEthi.ttf | Bin 0 -> 5292 bytes + .../data/text-rendering-tests/fonts/Zycon.ttf | Bin 0 -> 21036 bytes + .../data/text-rendering-tests/tests/AVAR-1.tests | 17 ++++++ + .../data/text-rendering-tests/tests/CFF-1.tests | 13 +++++ + .../data/text-rendering-tests/tests/CFF-2.tests | 13 +++++ + .../data/text-rendering-tests/tests/CFF2-1.tests | 9 ++++ + .../data/text-rendering-tests/tests/CMAP-1.tests | 4 ++ + .../data/text-rendering-tests/tests/CMAP-2.tests | 2 + + .../data/text-rendering-tests/tests/CMAP-3.tests | 20 +++++++ + .../data/text-rendering-tests/tests/CVAR-1.tests | 3 ++ + .../data/text-rendering-tests/tests/CVAR-2.tests | 3 ++ + .../data/text-rendering-tests/tests/GLYF-1.tests | 1 + + .../data/text-rendering-tests/tests/GPOS-1.tests | 19 +++++++ + .../data/text-rendering-tests/tests/GPOS-2.tests | 3 ++ + .../data/text-rendering-tests/tests/GPOS-3.tests | 4 ++ + .../data/text-rendering-tests/tests/GPOS-4.tests | 4 ++ + .../data/text-rendering-tests/tests/GPOS-5.tests | 5 ++ + .../data/text-rendering-tests/tests/GSUB-1.tests | 1 + + .../data/text-rendering-tests/tests/GSUB-2.tests | 11 ++++ + .../data/text-rendering-tests/tests/GVAR-1.tests | 9 ++++ + .../data/text-rendering-tests/tests/GVAR-2.tests | 9 ++++ + .../data/text-rendering-tests/tests/GVAR-3.tests | 9 ++++ + .../data/text-rendering-tests/tests/GVAR-4.tests | 11 ++++ + .../data/text-rendering-tests/tests/GVAR-5.tests | 11 ++++ + .../data/text-rendering-tests/tests/GVAR-6.tests | 11 ++++ + .../data/text-rendering-tests/tests/GVAR-7.tests | 7 +++ + .../data/text-rendering-tests/tests/GVAR-8.tests | 6 +++ + .../data/text-rendering-tests/tests/GVAR-9.tests | 10 ++++ + .../data/text-rendering-tests/tests/HVAR-1.tests | 6 +++ + .../data/text-rendering-tests/tests/HVAR-2.tests | 6 +++ + .../data/text-rendering-tests/tests/KERN-1.tests | 1 + + .../data/text-rendering-tests/tests/KERN-2.tests | 1 + + .../data/text-rendering-tests/tests/MORX-1.tests | 1 + + .../data/text-rendering-tests/tests/MORX-2.tests | 16 ++++++ + .../data/text-rendering-tests/tests/MORX-3.tests | 16 ++++++ + .../data/text-rendering-tests/tests/MORX-4.tests | 15 ++++++ + .../data/text-rendering-tests/tests/SHARAN-1.tests | 6 +++ + .../data/text-rendering-tests/tests/SHBALI-1.tests | 22 ++++++++ + .../data/text-rendering-tests/tests/SHBALI-2.tests | 12 +++++ + .../data/text-rendering-tests/tests/SHBALI-3.tests | 9 ++++ + .../data/text-rendering-tests/tests/SHKNDA-1.tests | 34 ++++++++++++ + .../data/text-rendering-tests/tests/SHKNDA-2.tests | 16 ++++++ + .../data/text-rendering-tests/tests/SHKNDA-3.tests | 31 +++++++++++ + 77 files changed, 510 insertions(+), 1 deletion(-) + +commit 6b19178ee35fec3b2115d6a06a86db36dc838b38 +Author: Behdad Esfahbod +Date: Wed Jan 10 03:07:30 2018 +0100 + + Prefix int types with HB + + Such a headache that Windows defines UINT8, ...; Just prefix it. + + src/hb-aat-layout-common-private.hh | 29 +++--- + src/hb-aat-layout-morx-table.hh | 65 +++++++------ + src/hb-open-file-private.hh | 6 +- + src/hb-open-type-private.hh | 70 +++++++------- + src/hb-ot-cbdt-table.hh | 78 ++++++++-------- + src/hb-ot-cmap-table.hh | 90 +++++++++--------- + src/hb-ot-glyf-table.hh | 10 +- + src/hb-ot-head-table.hh | 28 +++--- + src/hb-ot-hhea-table.hh | 18 ++-- + src/hb-ot-kern-table.hh | 36 ++++---- + src/hb-ot-layout-common-private.hh | 120 ++++++++++++------------ + src/hb-ot-layout-gdef-table.hh | 22 ++--- + src/hb-ot-layout-gpos-table.hh | 94 +++++++++---------- + src/hb-ot-layout-gsub-table.hh | 30 +++--- + src/hb-ot-layout-gsubgpos-private.hh | 172 +++++++++++++++++------------------ + src/hb-ot-math-table.hh | 26 +++--- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-name-table.hh | 16 ++-- + src/hb-ot-os2-table.hh | 70 +++++++------- + src/hb-ot-post-table.hh | 16 ++-- + src/hb-ot-var-avar-table.hh | 4 +- + src/hb-ot-var-fvar-table.hh | 20 ++-- + src/hb-ot-var-hvar-table.hh | 8 +- + src/hb-ot-var-mvar-table.hh | 10 +- + 24 files changed, 517 insertions(+), 523 deletions(-) + +commit 81e321c802afcc43186737e6900f8d7e2f9d4fd3 +Author: Behdad Esfahbod +Date: Wed Jan 10 02:56:29 2018 +0100 + + [aat] Try fixing VC bots + + c:\projects\harfbuzz\src\hb-aat-layout-common-private.hh(51): error C2872: 'UINT16': ambiguous symbol [C:\projects\harfbuzz\build\harfbuzz.vcxproj] + C:\Program Files (x86)\Windows Kits\10\Include\10.0.14393.0\shared\basetsd.h(80): note: could be 'unsigned short UINT16' + c:\projects\harfbuzz\src\hb-open-type-private.hh(648): note: or 'OT::UINT16' + + src/hb-aat-layout-common-private.hh | 3 +++ + src/hb-aat-layout-morx-table.hh | 3 +++ + 2 files changed, 6 insertions(+) + +commit 0ed69c946247feb5bbb5be06d5314c5e0c0fec67 +Author: Behdad Esfahbod +Date: Wed Jan 10 02:49:36 2018 +0100 + + Disable processing of morx table in ot shaper + + So I can merge this to master... + + src/hb-ot-shape.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3f29ea91441b2e8c86cf379b4803f638a2e8dcfc +Author: Behdad Esfahbod +Date: Wed Jan 10 02:48:04 2018 +0100 + + [util] Add hb-shape --ned + + For not displaying extra data: no clusters, no advance. Just data pertaining + to where glyphs end up on the screen. + + test/shaping/data/text-rendering-tests/extract-tests.py | 2 +- + util/options.cc | 13 +++++++++++++ + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit 7020130665316365c288d0960fc288faa8f5bdf7 +Author: Behdad Esfahbod +Date: Wed Jan 10 02:37:39 2018 +0100 + + [test] Minor + + test/shaping/run-tests.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5f94b4cc39f2f61b38c954ddac1aae6a052845bd +Author: Behdad Esfahbod +Date: Wed Jan 10 02:35:59 2018 +0100 + + [kern] Mark unsafe-to-break + + src/hb-ot-shape-fallback.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 71fd6325b6cba2586709022dd33530c61141bf8f +Author: Behdad Esfahbod +Date: Wed Jan 10 02:20:14 2018 +0100 + + Add option to buffer serialization to not output glyph advances + + When advances are not printed, glyph offsets reflect absolute glyph + positions. + + New API: + HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES + hb-shape --no-advances + + src/hb-buffer-serialize.cc | 38 ++++++++++++++++++++++++++++---------- + src/hb-buffer.h | 5 ++++- + util/hb-shape.cc | 2 ++ + util/options.cc | 2 ++ + util/options.hh | 2 ++ + 5 files changed, 38 insertions(+), 11 deletions(-) + +commit 316a28f8f8a9c459936ce9f2786d4d64a8f4e2c0 +Author: Behdad Esfahbod +Date: Wed Jan 10 01:54:12 2018 +0100 + + [test] Add script for extracting tests from text-rendering-tests + + Work in progress... + + https://github.com/unicode-org/text-rendering-tests + + .../data/text-rendering-tests/extract-tests.py | 45 ++++++++++++++++++++++ + 1 file changed, 45 insertions(+) + +commit 6b4d63f295f419f55983a8fc72f582802f55b09f +Author: Behdad Esfahbod +Date: Wed Jan 10 01:13:36 2018 +0100 + + [test] Minor + + test/shaping/run-tests.py | 9 --------- + 1 file changed, 9 deletions(-) + +commit 504f913654d5904604e6abdbf7d0653f40db51fc +Author: Behdad Esfahbod +Date: Tue Jan 9 23:15:54 2018 +0100 + + [test] Simplify test runner + + Always pass hb-shape as first argument to run-tests.py. + + Also require automake 1.13. + + configure.ac | 3 +-- + test/shaping/Makefile.am | 18 ++---------------- + test/shaping/run-tests.py | 22 +++++----------------- + 3 files changed, 8 insertions(+), 35 deletions(-) + +commit 141db8b7a3abf2adbf0caa0659d9239396f6a2db +Author: Behdad Esfahbod +Date: Tue Jan 9 23:11:00 2018 +0100 + + [test] Minor + + test/shaping/Makefile.am | 4 ---- + test/shaping/run-tests.py | 4 ++-- + 2 files changed, 2 insertions(+), 6 deletions(-) + +commit 44c65eee28e2de5c54028cb0ef144f56da16ef58 +Author: Behdad Esfahbod +Date: Tue Jan 9 21:58:57 2018 +0100 + + [test] Reorganize test suite + + In anticipation of importing more test suites. + + test/fuzzing/run-fuzzer-tests.py | 2 +- + test/shaping/Makefile.am | 86 +++++++++--------- + test/shaping/{fonts => data/in-house}/COPYING | 7 +- + .../0509e80afb379d16560e9e47bdd7d888bebdebc6.ttf | Bin + .../051d92f8bc6ff724511b296c27623f824de256e9.ttf | Bin + .../074a5ae6b19de8f29772fdd5df2d3d833f81f5e6.ttf | Bin + .../07f054357ff8638bac3711b422a1e31180bba863.ttf | Bin + .../15dfc433a135a658b9f4b1a861b5cdd9658ccbb9.ttf | Bin + .../1735326da89f0818cd8c51a0600e9789812c0f94.ttf | Bin + .../191826b9643e3f124d865d617ae609db6a2ce203.ttf | Bin + .../1a3d8f381387dd29be1e897e4b5100ac8b4829e1.ttf | Bin + .../1a6f1687b7a221f9f2c834b0b360d3c8463b6daf.ttf | Bin + .../1c04a16f32a39c26c851b7fc014d2e8d298ba2b8.ttf | Bin + .../1c2c3fc37b2d4c3cb2ef726c6cdaaabd4b7f3eb9.ttf | Bin + .../1c2fb74c1b2aa173262734c1f616148f1648cfd6.ttf | Bin + .../205edd09bd3d141cc9580f650109556cc28b22cb.ttf | Bin + .../217a934cfe15c548b572c203dceb2befdf026462.ttf | Bin + .../21b7fb9c1eeae260473809fbc1fe330f66a507cd.ttf | Bin + .../226bc2deab3846f1a682085f70c67d0421014144.ttf | Bin + .../243798dd281c1c77c065958e1ff467420faa9bde.ttf | Bin + .../24b8d24d00ae86f49791b746da4c9d3f717a51a8.ttf | Bin + .../270b89df543a7e48e206a2d830c0e10e5265c630.ttf | Bin + .../298c9e1d955f10f6f72c6915c3c6ff9bf9695cec.ttf | Bin + .../2de1ab4907ab688c0cfc236b0bf51151db38bf2e.ttf | Bin + .../341421e629668b1a1242245d39238ca48432d35d.ttf | Bin + .../3493e92eaded2661cadde752a39f9d58b11f0326.ttf | Bin + .../3511ff5c1647150595846ac414c595cccac34f18.ttf | Bin + .../37033cc5cf37bb223d7355153016b6ccece93b28.ttf | Bin + .../373e67bf41ca264e260a9716162b71a23549e885.ttf | Bin + .../375d6ae32a3cbe52fbf81a4e5777e3377675d5a3.ttf | Bin + .../3cae6bfe5b57c07ba81ddbd54c02fe4f3a1e3bf6.ttf | Bin + .../3d0b77a2360aa6faa1385aaa510509ab70dfbeff.ttf | Bin + .../43979b90b2dd929723cf4fe1715990bcb9c9a56b.ttf | Bin + .../43ef465752be9af900745f72fe29cb853a1401a5.ttf | Bin + .../45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf | Bin + .../49c9f7485c1392fa09a1b801bc2ffea79275f22e.ttf | Bin + .../4cce528e99f600ed9c25a2b69e32eb94a03b4ae8.ttf | Bin + .../4fac3929fc3332834e93673780ec0fe94342d193.ttf | Bin + .../5028afb650b1bb718ed2131e872fbcce57828fff.ttf | Bin + .../53374c7ca3657be37efde7ed02ae34229a56ae1f.ttf | Bin + .../54674a3111d209fb6be0ed31745314b7a8d2c244.ttf | Bin + .../558661aa659912f4d30ecd27bd09835171a8e2b0.ttf | Bin + .../55c88ebbe938680b08f92c3de20713183e0c7481.ttf | Bin + .../56cfd0e18d07f41c38e9598545a6d369127fc6f9.ttf | Bin + .../57a9d9f83020155cbb1d2be1f43d82388cbecc88.ttf | Bin + .../59a585a63b3df608fbeef00956c8c108deec7de6.ttf | Bin + .../5a5daf5eb5a4db77a2baa3ad9c7a6ed6e0655fa8.ttf | Bin + .../5dfad7735c6a67085f1b90d4d497e32907db4c78.ttf | Bin + .../641bd9db850193064d17575053ae2bf8ec149ddc.ttf | Bin + .../663aef6b019dbf45ffd74089e2b5f2496ceceb18.ttf | Bin + .../6991b13ce889466be6de3f66e891de2bc0f117ee.ttf | Bin + .../6ff0fbead4462d9f229167b4e6839eceb8465058.ttf | Bin + .../706c5d7b625f207bc0d874c67237aad6f1e9cd6f.ttf | Bin + .../757ebd573617a24aa9dfbf0b885c54875c6fe06b.ttf | Bin + .../7a37dc4d5bf018456aea291cee06daf004c0221c.ttf | Bin + .../7e14e7883ed152baa158b80e207b66114c823a8b.ttf | Bin + .../8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf | Bin + .../813c2f8e5512187fd982417a7fb4286728e6f4a8.ttf | Bin + .../81c368a33816fb20e9f647e8f24e2180f4720263.ttf | Bin + .../8228d035fcd65d62ec9728fb34f42c63be93a5d3.ttf | Bin + .../8240789f6d12d4cfc4b5e8e6f246c3701bcf861f.ttf | Bin + .../82f4f3b57bb55344e72e70231380202a52af5805.ttf | Bin + .../8454d22037f892e76614e1645d066689a0200e61.ttf | Bin + .../85414f2552b654585b7a8d13dcc3e8fd9f7970a3.ttf | Bin + .../856ff9562451293cbeff6f396d4e3877c4f0a436.ttf | Bin + .../85fe0be440c64ac77699e21c2f1bd933a919167e.ttf | Bin + .../87f85d17d26f1fe9ad28d7365101958edaefb967.ttf | Bin + .../8a9fea2a7384f2116e5b84a9b31f83be7850ce21.ttf | Bin + .../94a5d6fb15a27521fba9ea4aee9cb39b2d03322a.ttf | Bin + .../96490dd2ff81233b335a650e7eb660e0e7b2eeea.ttf | Bin + .../98b7887cff91f722b92a8ff800120954606354f9.ttf | Bin + .../9d8a94a67932a3ab75a596fc8b5c6d0392ca9e49.ttf | Bin + .../a014549f766436cf55b2ceb40e462038938ee899.ttf | Bin + .../a02a7f0ad42c2922cb37ad1358c9df4eb81f1bca.ttf | Bin + .../a34a7b00f22ffb5fd7eef6933b81c7e71bc2cdfb.ttf | Bin + .../a34a9191d9376bda419836effeef7e75c1386016.ttf | Bin + .../a69118c2c2ada48ff803d9149daa54c9ebdae30e.ttf | Bin + .../a6c76d1bafde4a0b1026ebcc932d2e5c6fd02442.ttf | Bin + .../a919b33197965846f21074b24e30250d67277bce.ttf | Bin + .../a98e908e2ed21b22228ea59ebcc0f05034c86f2e.ttf | Bin + .../b151cfcdaa77585d77f17a42158e0873fc8e2633.ttf | Bin + .../b6acef662e0beb8d5fcf5b61c6b0ca69537b7402.ttf | Bin + .../b9e2aaa0d75fcef6971ec3a96d806ba4a6b31fe2.ttf | Bin + .../bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf | Bin + .../bb29ce50df2bdba2d10726427c6b7609bf460e04.ttf | Bin + .../bb9473d2403488714043bcfb946c9f78b86ad627.ttf | Bin + .../bbf4a308c402f0678c3e82844892a4da2ebe598f.ttf | Bin + .../bf39b0e91ef9807f15a9e283a21a14a209fd2cfc.ttf | Bin + .../bf962d3202883a820aed019d9b5c1838c2ff69c6.ttf | Bin + .../c4e48b0886ef460f532fb49f00047ec92c432ec0.ttf | Bin + .../cc5f3d2d717fb6bd4dfae1c16d48a2cb8e12233b.ttf | Bin + .../d23d76ea0909c14972796937ba072b5a40c1e257.ttf | Bin + .../d629e7fedc0b350222d7987345fe61613fa3929a.ttf | Bin + .../d9b8bc10985f24796826c29f7ccba3d0ae11ec02.ttf | Bin + .../dd9f0c7c7c36f75a18be0cab1cddf8f3ab0f366b.ttf | Bin + .../df768b9c257e0c9c35786c47cae15c46571d56be.ttf | Bin + .../e207635780b42f898d58654b65098763e340f5c7.ttf | Bin + .../e68a88939e0f06e34d2bc911f09b70890289c8fd.ttf | Bin + .../e88c339237f52d21e01c55f01b9c1b4cc14a0467.ttf | Bin + .../ee39587d13b2afa5499cc79e45780aa79293bbd4.ttf | Bin + .../ef2511f215aa3ca847cbfffbf861793b42170875.ttf | Bin + .../ef86fe710cfea877bbe0dbb6946a1f88d0661031.ttf | Bin + .../f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf | Bin + .../f443753e8ffe8e8aae606cfba158e00334b6efb1.ttf | Bin + .../f499fbc23865022234775c43503bba2e63978fe1.ttf | Bin + .../f518eb6f6b5eec2946c9fbbbde44e45d46f5e2ac.ttf | Bin + .../f9b1dd4dcb515e757789a22cb4241107746fd3d0.ttf | Bin + .../fab39d60d758cb586db5a504f218442cd1395725.ttf | Bin + .../fbb6c84c9e1fe0c39e152fbe845e51fd81f6748e.ttf | Bin + .../fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf | Bin + .../ffa0f5d2d9025486d8469d8b1fdd983e7632499b.ttf | Bin + .../in-house/tests/arabic-fallback-shaping.tests | 1 + + .../data/in-house/tests/arabic-feature-order.tests | 4 + + .../data/in-house/tests/arabic-like-joining.tests | 1 + + .../data/in-house/tests/arabic-mark-order.tests | 6 ++ + test/shaping/data/in-house/tests/arabic-stch.tests | 1 + + .../data/in-house/tests/automatic-fractions.tests | 3 + + test/shaping/data/in-house/tests/cluster.tests | 2 + + test/shaping/data/in-house/tests/color-fonts.tests | 1 + + .../data/in-house/tests/context-matching.tests | 3 + + .../data/in-house/tests/cursive-positioning.tests | 4 + + .../data/in-house/tests/default-ignorables.tests | 2 + + .../data/in-house/tests/emoji-flag-tags.tests | 2 + + .../data/in-house/tests/fallback-positioning.tests | 2 + + test/shaping/data/in-house/tests/fuzzed.tests | 22 +++++ + test/shaping/data/in-house/tests/hangul-jamo.tests | 2 + + test/shaping/data/in-house/tests/hyphens.tests | 2 + + .../tests/indic-consonant-with-stacker.tests | 4 + + test/shaping/data/in-house/tests/indic-init.tests | 1 + + .../in-house/tests/indic-joiner-candrabindu.tests | 2 + + .../data/in-house/tests/indic-joiners.tests | 2 + + .../data/in-house/tests/indic-old-spec.tests | 2 + + .../data/in-house/tests/indic-pref-blocking.tests | 2 + + .../in-house/tests/indic-script-extensions.tests | 2 + + .../data/in-house/tests/indic-special-cases.tests | 3 + + .../data/in-house/tests/indic-syllable.tests | 8 ++ + .../data/in-house/tests/language-tags.tests | 12 +++ + test/shaping/data/in-house/tests/ligature-id.tests | 36 ++++++++ + .../data/in-house/tests/mark-attachment.tests | 1 + + .../data/in-house/tests/mark-filtering-sets.tests | 5 ++ + .../tests/mongolian-variation-selector.tests | 4 + + test/shaping/data/in-house/tests/simple.tests | 2 + + test/shaping/data/in-house/tests/spaces.tests | 17 ++++ + .../in-house/tests/tibetan-contractions-1.tests | 60 +++++++++++++ + .../in-house/tests/tibetan-contractions-2.tests | 53 +++++++++++ + .../data/in-house/tests/tibetan-vowels.tests | 11 +++ + test/shaping/data/in-house/tests/use-marchen.tests | 35 ++++++++ + .../shaping/data/in-house/tests/use-syllable.tests | 7 ++ + test/shaping/data/in-house/tests/use.tests | 4 + + .../data/in-house/tests/variations-rvrn.tests | 100 +++++++++++++++++++++ + test/shaping/data/in-house/tests/vertical.tests | 3 + + .../data/in-house/tests/zero-width-marks.tests | 11 +++ + test/shaping/run-tests.py | 48 ++++------ + .../tests/misc/arabic-fallback-shaping.tests | 1 - + test/shaping/tests/misc/arabic-feature-order.tests | 4 - + test/shaping/tests/misc/arabic-like-joining.tests | 1 - + test/shaping/tests/misc/arabic-mark-order.tests | 6 -- + test/shaping/tests/misc/arabic-stch.tests | 1 - + test/shaping/tests/misc/automatic-fractions.tests | 3 - + test/shaping/tests/misc/cluster.tests | 2 - + test/shaping/tests/misc/color-fonts.tests | 1 - + test/shaping/tests/misc/context-matching.tests | 3 - + test/shaping/tests/misc/cursive-positioning.tests | 4 - + test/shaping/tests/misc/default-ignorables.tests | 2 - + test/shaping/tests/misc/emoji-flag-tags.tests | 2 - + test/shaping/tests/misc/fallback-positioning.tests | 2 - + test/shaping/tests/misc/fuzzed.tests | 22 ----- + test/shaping/tests/misc/hangul-jamo.tests | 2 - + test/shaping/tests/misc/hyphens.tests | 2 - + .../tests/misc/indic-consonant-with-stacker.tests | 4 - + test/shaping/tests/misc/indic-init.tests | 1 - + .../tests/misc/indic-joiner-candrabindu.tests | 2 - + test/shaping/tests/misc/indic-joiners.tests | 2 - + test/shaping/tests/misc/indic-old-spec.tests | 2 - + test/shaping/tests/misc/indic-pref-blocking.tests | 2 - + .../tests/misc/indic-script-extensions.tests | 2 - + test/shaping/tests/misc/indic-special-cases.tests | 3 - + test/shaping/tests/misc/indic-syllable.tests | 8 -- + test/shaping/tests/misc/language-tags.tests | 12 --- + test/shaping/tests/misc/ligature-id.tests | 36 -------- + test/shaping/tests/misc/mark-attachment.tests | 1 - + test/shaping/tests/misc/mark-filtering-sets.tests | 5 -- + .../tests/misc/mongolian-variation-selector.tests | 4 - + test/shaping/tests/misc/simple.tests | 2 - + test/shaping/tests/misc/spaces.tests | 17 ---- + .../tests/misc/tibetan-contractions-1.tests | 60 ------------- + .../tests/misc/tibetan-contractions-2.tests | 53 ----------- + test/shaping/tests/misc/tibetan-vowels.tests | 11 --- + test/shaping/tests/misc/use-marchen.tests | 35 -------- + test/shaping/tests/misc/use-syllable.tests | 7 -- + test/shaping/tests/misc/use.tests | 4 - + test/shaping/tests/misc/variations-rvrn.tests | 100 --------------------- + test/shaping/tests/misc/vertical.tests | 3 - + test/shaping/tests/misc/zero-width-marks.tests | 11 --- + .../script-arabic/language-persian/mehran.txt | 14 +-- + .../language-urdu/crulp/ligatures/2grams.txt | 0 + .../language-urdu/crulp/ligatures/3grams.txt | 0 + .../language-urdu/crulp/ligatures/4grams.txt | 0 + .../language-urdu/crulp/ligatures/5grams.txt | 0 + .../language-urdu/crulp/ligatures/6grams.txt | 0 + .../language-urdu/crulp/ligatures/7grams.txt | 0 + .../language-urdu/crulp/ligatures/8grams.txt | 0 + .../language-urdu/crulp/ligatures/LICENSE | 0 + .../language-urdu/crulp/ligatures/README | 0 + .../language-urdu/crulp/ligatures/SOURCES | 0 + .../script-arabic/misc/diacritics/lam-alef.txt | 0 + .../misc/diacritics/language-arabic.txt | 0 + .../misc/diacritics/language-persian.txt | 0 + .../misc/diacritics/language-urdu.txt | 0 + .../misc/diacritics/ligature-components.txt | 0 + .../misc/diacritics/ligature-diacritics.txt | 0 + .../misc/diacritics/mark-skipping.txt | 0 + .../shaper-arabic/script-mongolian/misc/misc.txt | 0 + .../script-mongolian/misc/non-joining.txt | 0 + .../shaper-arabic/script-mongolian/misc/poem.txt | 0 + .../script-mongolian/misc/variation-selectors.txt | 0 + .../shaper-arabic/script-nko/misc/misc.txt | 0 + .../shaper-arabic/script-phags-pa/misc/misc.txt | 0 + .../script-syriac/misc/abbreviation-mark.txt | 11 +++ + .../shaper-arabic/script-syriac/misc/alaph.txt | 0 + .../shaper-default/script-ethiopic/misc/misc.txt | 0 + .../shaper-default/script-han/misc/cjk-compat.txt | 0 + .../script-hiragana/misc/kazuraki-liga-lines.txt | 0 + .../script-hiragana/misc/kazuraki-liga.txt | 0 + .../shaper-default/script-linear-b/misc/misc.txt | 0 + .../shaper-default/script-tifinagh/misc/misc.txt | 1 - + .../shaper-hangul/script-hangul/misc/misc.txt | 0 + .../script-hebrew/misc/diacritics.txt | 0 + .../indic/script-assamese/utrrs/LICENSE | 0 + .../indic/script-assamese/utrrs/README | 0 + .../indic/script-assamese/utrrs/SOURCES | 0 + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../IndicFontFeatureCodepoint-Consonants.txt | 0 + .../IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../IndicFontFeatureCodepoint-Reserved.txt | 0 + .../IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../indic/script-bengali/misc/misc.txt | 0 + .../indic/script-bengali/misc/reph.txt | 0 + .../indic/script-bengali/utrrs/LICENSE | 0 + .../shaper-indic/indic/script-bengali/utrrs/README | 0 + .../indic/script-bengali/utrrs/SOURCES | 0 + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../IndicFontFeatureCodepoint-Consonants.txt | 0 + .../IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../IndicFontFeatureCodepoint-Reserved.txt | 0 + .../IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../indic/script-devanagari/misc/dottedcircle.txt | 0 + .../indic/script-devanagari/misc/eyelash.txt | 0 + .../indic/script-devanagari/misc/joiners.txt | 0 + .../indic/script-devanagari/misc/misc.txt | 0 + .../script-devanagari/misc/spec-deviations.txt | 0 + .../script-devanagari/misc/tricky-reordering.txt | 0 + .../indic/script-devanagari/utrrs/LICENSE | 0 + .../indic/script-devanagari/utrrs/README | 0 + .../indic/script-devanagari/utrrs/SOURCES | 0 + ...icFontFeatureCodepoint-AdditionalConsonants.txt | 0 + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../IndicFontFeatureCodepoint-Consonants.txt | 0 + .../IndicFontFeatureCodepoint-DependentVowels.txt | 0 + ...tFeatureCodepoint-DevnagariSpecificAddition.txt | 0 + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + ...ndicFontFeatureCodepoint-GenericPunctuation.txt | 0 + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../indic/script-gujarati/utrrs/LICENSE | 0 + .../indic/script-gujarati/utrrs/README | 0 + .../indic/script-gujarati/utrrs/SOURCES | 0 + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../IndicFontFeatureCodepoint-Consonants.txt | 0 + .../IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../IndicFontFeatureCodepoint-Reserved.txt | 0 + .../IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../indic/script-gurmukhi/misc/misc.txt | 0 + .../indic/script-gurmukhi/utrrs/LICENSE | 0 + .../indic/script-gurmukhi/utrrs/README | 0 + .../indic/script-gurmukhi/utrrs/SOURCES | 0 + .../IndicFontFeatureCodepoint-Consonants.txt | 0 + .../IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../IndicFontFeatureCodepoint-GurmukhiSpecific.txt | 0 + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../IndicFontFeatureCodepoint-Reserved.txt | 0 + .../IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../indic/script-kannada/misc/misc.txt | 0 + .../indic/script-kannada/misc/right-matras.txt | 0 + .../indic/script-kannada/utrrs/LICENSE | 0 + .../shaper-indic/indic/script-kannada/utrrs/README | 0 + .../indic/script-kannada/utrrs/SOURCES | 0 + ...icFontFeatureCodepoint-AdditionalConsonants.txt | 0 + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../IndicFontFeatureCodepoint-Consonants.txt | 0 + .../IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../IndicFontFeatureCodepoint-Reserved.txt | 0 + .../IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../indic/script-malayalam/misc/cibu.txt | 0 + .../indic/script-malayalam/misc/dot-reph.txt | 0 + .../indic/script-malayalam/misc/misc.txt | 0 + .../indic/script-malayalam/utrrs/LICENSE | 0 + .../indic/script-malayalam/utrrs/README | 0 + .../indic/script-malayalam/utrrs/SOURCES | 0 + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../IndicFontFeatureCodepoint-Consonants.txt | 0 + .../IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../IndicFontFeatureCodepoint-Reserved.txt | 0 + .../IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-oriya/misc/bindu.txt | 0 + .../shaper-indic/indic/script-oriya/misc/misc.txt | 0 + .../shaper-indic/indic/script-oriya/utrrs/LICENSE | 0 + .../shaper-indic/indic/script-oriya/utrrs/README | 0 + .../shaper-indic/indic/script-oriya/utrrs/SOURCES | 0 + ...icFontFeatureCodepoint-AdditionalConsonants.txt | 0 + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../IndicFontFeatureCodepoint-Consonants.txt | 0 + .../IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../IndicFontFeatureCodepoint-OriyaSpecific.txt | 0 + .../IndicFontFeatureCodepoint-Reserved.txt | 0 + .../IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../indic/script-sinhala/misc/extensive.txt | 0 + .../indic/script-sinhala/misc/misc.txt | 0 + .../indic/script-sinhala/misc/reph.txt | 0 + .../indic/script-sinhala/misc/split-matras.txt | 0 + .../indic/script-sinhala/utrrs/LICENSE | 0 + .../shaper-indic/indic/script-sinhala/utrrs/README | 0 + .../indic/script-sinhala/utrrs/SOURCES | 0 + .../IndicFontFeatureCodepoint-Consonants.txt | 0 + .../IndicFontFeatureCodepoint-DependentVowels.txt | 0 + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../IndicFontFeatureCodepoint-Punctuation.txt | 0 + .../IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../utrrs/gpos/IndicFontFeatureGPOS.txt | 0 + .../utrrs/gsub/IndicFontFeatureGSUB-Conjunct.txt | 0 + .../gsub/IndicFontFeatureGSUB-Rakaaraansaya.txt | 0 + .../utrrs/gsub/IndicFontFeatureGSUB-Repaya.txt | 0 + .../gsub/IndicFontFeatureGSUB-Special-Cases.txt | 0 + .../gsub/IndicFontFeatureGSUB-TouchingLetters.txt | 0 + .../utrrs/gsub/IndicFontFeatureGSUB-Yansaya.txt | 0 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-tamil/misc/misc.txt | 0 + .../shaper-indic/indic/script-tamil/utrrs/LICENSE | 0 + .../shaper-indic/indic/script-tamil/utrrs/README | 0 + .../shaper-indic/indic/script-tamil/utrrs/SOURCES | 0 + .../IndicFontFeatureCodepoint-Consonants.txt | 0 + .../IndicFontFeatureCodepoint-CurrencySymbols.txt | 0 + .../IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../IndicFontFeatureCodepoint-Numerics.txt | 0 + .../IndicFontFeatureCodepoint-Reserved.txt | 0 + .../IndicFontFeatureCodepoint-Symbols.txt | 0 + .../IndicFontFeatureCodepoint-TamilSymbol.txt | 0 + .../IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-telugu/misc/misc.txt | 0 + .../shaper-indic/indic/script-telugu/utrrs/LICENSE | 0 + .../shaper-indic/indic/script-telugu/utrrs/README | 0 + .../shaper-indic/indic/script-telugu/utrrs/SOURCES | 0 + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../IndicFontFeatureCodepoint-Consonants.txt | 0 + .../IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../IndicFontFeatureCodepoint-Reserved.txt | 0 + .../IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../south-east-asian/script-javanese/misc.txt | 0 + .../south-east-asian/script-khmer/misc/misc.txt | 0 + .../script-khmer/misc/other-marks-invalid.txt | 0 + .../script-khmer/misc/other-marks.txt | 0 + .../shaper-myanmar/script-myanmar/misc/misc.txt | 0 + .../shaper-myanmar/script-myanmar/misc/otspec.txt | 1 - + .../shaper-myanmar/script-myanmar/misc/utn11.txt | 0 + .../shaper-thai/script-lao/misc/sara-am.txt | 0 + .../shaper-thai/script-thai/misc/misc.txt | 0 + .../shaper-thai/script-thai/misc/phinthu.txt | 0 + .../shaper-thai/script-thai/misc/pua-shaping.txt | 0 + .../shaper-thai/script-thai/misc/sara-am.txt | 0 + .../script-tibetan/misc/contractions.txt | 0 + .../shaper-tibetan/script-tibetan/misc/misc.txt | 0 + .../shaper-use/script-batak/misc.txt | 0 + .../shaper-use/script-buginese/misc.txt | 92 +++++++++---------- + .../shaper-use/script-cham/misc.txt | 0 + .../shaper-use/script-kaithi/misc.txt | 0 + .../shaper-use/script-kharoshti/misc.txt | 0 + .../shaper-use/script-tai-tham/misc.txt | 0 + .../shaper-use/script-tai-tham/torture.txt | 0 + .../script-syriac/misc/abbreviation-mark.txt | 11 --- + 420 files changed, 573 insertions(+), 590 deletions(-) + +commit 9a3ad307ea91794712531dfc688700c11a1ff263 +Author: Behdad Esfahbod +Date: Tue Jan 9 21:35:21 2018 +0100 + + [test] Remove unused hb-diff-ngrams + + test/shaping/Makefile.am | 1 - + test/shaping/hb-diff-ngrams | 5 ----- + test/shaping/hb_test_tools.py | 26 -------------------------- + 3 files changed, 32 deletions(-) + +commit b6b460024d29362914c72cc5f8fbaec215db5b16 +Author: Behdad Esfahbod +Date: Tue Jan 9 21:33:38 2018 +0100 + + [test] Remove unused manifest stuff + + test/shaping/Makefile.am | 7 ------- + test/shaping/hb-manifest-read | 5 ----- + test/shaping/hb-manifest-update | 5 ----- + 3 files changed, 17 deletions(-) + +commit ebbee7c2475db789b622250addbf549695da2890 +Author: Behdad Esfahbod +Date: Tue Jan 9 18:23:19 2018 +0100 + + [test] Move test files around + + test/fuzzing/run-fuzzer-tests.py | 2 +- + test/shaping/Makefile.am | 82 +++++++++++----------- + .../tests/{ => misc}/arabic-fallback-shaping.tests | 0 + .../tests/{ => misc}/arabic-feature-order.tests | 0 + .../tests/{ => misc}/arabic-like-joining.tests | 0 + .../tests/{ => misc}/arabic-mark-order.tests | 0 + test/shaping/tests/{ => misc}/arabic-stch.tests | 0 + .../tests/{ => misc}/automatic-fractions.tests | 0 + test/shaping/tests/{ => misc}/cluster.tests | 0 + test/shaping/tests/{ => misc}/color-fonts.tests | 0 + .../tests/{ => misc}/context-matching.tests | 0 + .../tests/{ => misc}/cursive-positioning.tests | 0 + .../tests/{ => misc}/default-ignorables.tests | 0 + .../shaping/tests/{ => misc}/emoji-flag-tags.tests | 0 + .../tests/{ => misc}/fallback-positioning.tests | 0 + test/shaping/tests/{ => misc}/fuzzed.tests | 0 + test/shaping/tests/{ => misc}/hangul-jamo.tests | 0 + test/shaping/tests/{ => misc}/hyphens.tests | 0 + .../{ => misc}/indic-consonant-with-stacker.tests | 0 + test/shaping/tests/{ => misc}/indic-init.tests | 0 + .../{ => misc}/indic-joiner-candrabindu.tests | 0 + test/shaping/tests/{ => misc}/indic-joiners.tests | 0 + test/shaping/tests/{ => misc}/indic-old-spec.tests | 0 + .../tests/{ => misc}/indic-pref-blocking.tests | 0 + .../tests/{ => misc}/indic-script-extensions.tests | 0 + .../tests/{ => misc}/indic-special-cases.tests | 0 + test/shaping/tests/{ => misc}/indic-syllable.tests | 0 + test/shaping/tests/{ => misc}/language-tags.tests | 0 + test/shaping/tests/{ => misc}/ligature-id.tests | 0 + .../shaping/tests/{ => misc}/mark-attachment.tests | 0 + .../tests/{ => misc}/mark-filtering-sets.tests | 0 + .../{ => misc}/mongolian-variation-selector.tests | 0 + test/shaping/tests/{ => misc}/simple.tests | 0 + test/shaping/tests/{ => misc}/spaces.tests | 0 + .../tests/{ => misc}/tibetan-contractions-1.tests | 0 + .../tests/{ => misc}/tibetan-contractions-2.tests | 0 + test/shaping/tests/{ => misc}/tibetan-vowels.tests | 0 + test/shaping/tests/{ => misc}/use-marchen.tests | 0 + test/shaping/tests/{ => misc}/use-syllable.tests | 0 + test/shaping/tests/{ => misc}/use.tests | 0 + .../shaping/tests/{ => misc}/variations-rvrn.tests | 0 + test/shaping/tests/{ => misc}/vertical.tests | 0 + .../tests/{ => misc}/zero-width-marks.tests | 0 + 43 files changed, 42 insertions(+), 42 deletions(-) + +commit 748b989a1fa931b011d6a4e3db39dfdc632946b2 +Author: Behdad Esfahbod +Date: Tue Jan 9 17:55:17 2018 +0100 + + [aat/morx] Implement NoncontextualSubtables + + Also makes hb-ot-shape call morx for now instead of GSUB... Just for testing. + + src/hb-aat-layout-common-private.hh | 34 +++++++-------- + src/hb-aat-layout-morx-table.hh | 82 ++++++++++++++++++++++++++++++++++--- + src/hb-aat-layout-private.hh | 3 ++ + src/hb-aat-layout.cc | 13 +++++- + src/hb-ot-shape.cc | 6 +++ + 5 files changed, 111 insertions(+), 27 deletions(-) + +commit 4cf3ab1d8192862f8d3c52fdcaec567735916116 +Author: Behdad Esfahbod +Date: Tue Jan 9 16:32:58 2018 +0100 + + Minor + + src/hb-ot-shape.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 470fe5b603b409bef136fdd4e9b33d2704dc77b7 +Author: Behdad Esfahbod +Date: Tue Jan 9 15:48:51 2018 +0100 + + [aat] Implement Lookup table + + Untested, but compiles. + + src/hb-aat-layout-common-private.hh | 308 +++++++++++++++++++++++++++++++++++- + src/hb-aat-layout-morx-table.hh | 9 +- + src/hb-aat-layout.cc | 14 ++ + src/hb-face.cc | 6 +- + src/hb-open-type-private.hh | 16 +- + src/hb-ot-cbdt-table.hh | 4 +- + src/hb-ot-cmap-table.hh | 2 +- + src/hb-ot-glyf-table.hh | 6 +- + src/hb-ot-hmtx-table.hh | 8 +- + src/hb-ot-kern-table.hh | 2 +- + src/hb-ot-layout.cc | 6 +- + src/hb-ot-post-table.hh | 2 +- + src/hb-uniscribe.cc | 2 +- + 13 files changed, 355 insertions(+), 30 deletions(-) + +commit 4646a80a873fa164b9cf09128bc6b6fe2fc5cce2 +Author: Behdad Esfahbod +Date: Tue Jan 9 12:06:38 2018 +0100 + + Minor + + src/hb-ot-layout-common-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 7c7cb42d8125d7e598bfa70f93053cafe38b325a +Author: Behdad Esfahbod +Date: Mon Jan 8 14:32:55 2018 +0000 + + [aat] Update previous commits for rebase on master + + src/hb-aat-layout-common-private.hh | 14 +++++++------- + src/hb-aat-layout-morx-table.hh | 28 ++++++++++++++-------------- + src/hb-open-type-private.hh | 5 ----- + 3 files changed, 21 insertions(+), 26 deletions(-) + +commit a0175e75bc40b5496d7fd37afd434cb2000e5b9b +Author: Behdad Esfahbod +Date: Thu Aug 17 16:55:54 2017 -0700 + + [aat] Start implementing common table formats + + src/Makefile.sources | 2 + + src/hb-aat-layout-common-private.hh | 134 ++++++++++++++++++++++++++++++++++++ + src/hb-aat-layout-morx-table.hh | 1 + + src/hb-aat-layout-private.hh | 37 ++++++++++ + src/hb-aat-layout.cc | 1 + + 5 files changed, 175 insertions(+) + +commit c71b55a223d14f8bb7fa355efc586e824b7d4d8f +Author: Behdad Esfahbod +Date: Mon Aug 14 17:24:36 2017 -0700 + + [aat] Start implementing Apple AAT morx table + + src/Makefile.sources | 2 + + src/hb-aat-layout-morx-table.hh | 275 ++++++++++++++++++++++++++++++++++++++++ + src/hb-aat-layout.cc | 42 ++++++ + src/hb-open-type-private.hh | 5 + + src/hb-ot-layout-private.hh | 5 + + src/hb-ot-layout.cc | 2 + + 6 files changed, 331 insertions(+) + +commit 3c7aeb5c6437b26ad638ab993b724e28376d3ff8 +Author: Ebrahim Byagowi +Date: Tue Jan 9 01:39:42 2018 +0330 + + [cmake] Add autotools like feature testing (#683) + + CMakeLists.txt | 22 ++++++++++++++++------ + 1 file changed, 16 insertions(+), 6 deletions(-) + +commit 0473d95e276ae5df722bc7d371733d8202bdbc3c +Author: Behdad Esfahbod +Date: Mon Jan 8 10:07:46 2018 +0000 + + [ft] Use FT_Done_MM_Var() if available + + configure.ac | 1 + + src/hb-ft.cc | 4 ++++ + 2 files changed, 5 insertions(+) + +commit 66d7beff96d622599e1ee8895f2aa84fe2299f1a +Author: Behdad Esfahbod +Date: Fri Jan 5 18:09:29 2018 +0000 + + [khmer] Relax! + + Apparently we don't use OT_A either. + + src/hb-ot-shape-complex-khmer-machine.rl | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit db0207baff358b20fbe9c3498275ba33f69caf87 +Author: Behdad Esfahbod +Date: Fri Jan 5 18:06:00 2018 +0000 + + [khmer] Drop another joiner + + src/hb-ot-shape-complex-khmer-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 90affe831f08fabcb2dd5ac837c7b0cfbd14e554 +Author: Behdad Esfahbod +Date: Fri Jan 5 18:04:56 2018 +0000 + + [khmer] Shuffle + + src/hb-ot-shape-complex-khmer-machine.rl | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 65795e3ca246bf65b3cb53e3fe65eca312774e3e +Author: Behdad Esfahbod +Date: Fri Jan 5 18:03:00 2018 +0000 + + [khmer] Simplify grammar some more + + Numbers down (from 38): + + KHMER: 299090 out of 299124 tests passed. 34 failed (0.0113665%) + + src/hb-ot-shape-complex-khmer-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e13ee937310a7aadd83fd266dae382da40dce4f8 +Author: Behdad Esfahbod +Date: Fri Jan 5 18:01:01 2018 +0000 + + [khmer] Clean + + src/hb-ot-shape-complex-khmer-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a71c7eb2ca9f8ba90117e1a0c4ce890f0a1640f4 +Author: Behdad Esfahbod +Date: Fri Jan 5 17:59:43 2018 +0000 + + [khmer] Limit number of joiners + + src/hb-ot-shape-complex-khmer-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 574e42e1cf6679c8df065d6bb3e8d21bc82395c1 +Author: Behdad Esfahbod +Date: Fri Jan 5 17:57:39 2018 +0000 + + [khmer] Relax number of consonants / matras allowed + + New numbers (down from 39): + + KHMER: 299086 out of 299124 tests passed. 38 failed (0.0127038%) + + src/hb-ot-shape-complex-khmer-machine.rl | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 80c870bcda2f421e80f5579e71fe17fe8db991b8 +Author: Behdad Esfahbod +Date: Fri Jan 5 17:52:24 2018 +0000 + + [khmer] Allow Independent Vowels where stacked consonants are allowed + + New numbers (down from 44): + + KHMER: 299085 out of 299124 tests passed. 39 failed (0.0130381%) + + src/hb-ot-shape-complex-khmer-machine.rl | 4 ++-- + src/hb-ot-shape-complex-khmer.cc | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 9bd486c480b8fd3125ef6b6cc0442a566f669cb8 +Author: Behdad Esfahbod +Date: Fri Jan 5 17:47:35 2018 +0000 + + [khmer] Drop some more joiners + + src/hb-ot-shape-complex-khmer-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5278265853c36400ffc284fd517cc7b7c42ed0e7 +Author: Behdad Esfahbod +Date: Fri Jan 5 17:46:49 2018 +0000 + + [khmer] Drop some more + + src/hb-ot-shape-complex-khmer-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit efefd87f3354d0ae6f599ea30672cb0b74dfcd80 +Author: Behdad Esfahbod +Date: Fri Jan 5 17:45:48 2018 +0000 + + [khmer] Drop some more grammar + + src/hb-ot-shape-complex-khmer-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 82e6bf8e0c27d2fd16a908eed0c73e95b1a2c0f5 +Author: Behdad Esfahbod +Date: Fri Jan 5 17:44:18 2018 +0000 + + [khmer] Drop some more from grammar + + src/hb-ot-shape-complex-khmer-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 957e8ea8a9f981775ecde7dd1e2bf4023cf79dba +Author: Behdad Esfahbod +Date: Fri Jan 5 17:43:31 2018 +0000 + + [khmer] Drop final_halant_group + + src/hb-ot-shape-complex-khmer-machine.rl | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit bbfdbbdc5eca96e8c527147e5a78cd185b9f243d +Author: Behdad Esfahbod +Date: Fri Jan 5 17:34:26 2018 +0000 + + Minor + + src/hb-ot-shape-complex-indic-machine.rl | 1 - + src/hb-ot-shape-complex-khmer-machine.rl | 1 - + 2 files changed, 2 deletions(-) + +commit f6df2515210e9d828fc40173696b185efa5083e3 +Author: Behdad Esfahbod +Date: Fri Jan 5 17:27:48 2018 +0000 + + [indic] Remove unused OT_VD category + + src/hb-ot-shape-complex-indic-machine.rl | 3 +-- + src/hb-ot-shape-complex-indic-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 2 +- + 3 files changed, 3 insertions(+), 4 deletions(-) + +commit e6618f3bdf79a51f6fb270b468b653dc9cea5b57 +Author: Behdad Esfahbod +Date: Fri Jan 5 17:21:55 2018 +0000 + + [khmer] Shave off some more from the grammar + + src/hb-ot-shape-complex-khmer-machine.rl | 9 ++------- + src/hb-ot-shape-complex-khmer.cc | 34 ++------------------------------ + 2 files changed, 4 insertions(+), 39 deletions(-) + +commit 014494d5c0469fe6b3112db3fdb3f2f262673ba1 +Author: Behdad Esfahbod +Date: Fri Jan 5 17:17:02 2018 +0000 + + [khmer] Remove unused symbol clusters + + src/hb-ot-shape-complex-khmer-machine.rl | 4 ---- + 1 file changed, 4 deletions(-) + +commit bbac984b9390a66c6ae5ee931b278b607f2f2a50 +Author: Behdad Esfahbod +Date: Fri Jan 5 17:15:31 2018 +0000 + + Minor + + src/hb-ot-shape-complex-indic-machine.rl | 1 - + src/hb-ot-shape-complex-khmer-machine.rl | 1 - + 2 files changed, 2 deletions(-) + +commit 185b68946ad67443e8725e77d724128802de5572 +Author: Behdad Esfahbod +Date: Fri Jan 5 17:14:27 2018 +0000 + + [khmer] Remove medials from grammar + + src/hb-ot-shape-complex-khmer-machine.rl | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +commit c265dffdf6c4930e271292226d38a8e515b6b0f8 +Author: Behdad Esfahbod +Date: Fri Jan 5 17:06:29 2018 +0000 + + [khmer] Better fix for dangling final Coeng + + This is how 1471cfee3bb2734dc44c58471362851ad27e8bd8 should have + been done. + + src/hb-ot-shape-complex-khmer-machine.rl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e3fdf1fc2f399e6b79ea022501526a422d372e64 +Author: Behdad Esfahbod +Date: Fri Jan 5 17:05:53 2018 +0000 + + [khmer] Remove reph/repha support from grammar + + src/hb-ot-shape-complex-khmer-machine.rl | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +commit 0d3a274de1ff8e6a21c7c9857730e2eda402e310 +Author: Behdad Esfahbod +Date: Fri Jan 5 17:01:37 2018 +0000 + + [khmer] Remove forced_rakar from grammar + + Used by Sinhala only. + + src/hb-ot-shape-complex-khmer-machine.rl | 3 +-- + src/hb-ot-shape-complex-khmer.cc | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) + +commit 1471cfee3bb2734dc44c58471362851ad27e8bd8 +Author: Behdad Esfahbod +Date: Fri Jan 5 16:34:20 2018 +0000 + + [khmer] Allow a dangling final Coeng after matras + + Uniscribe seems to allow that. New numbers: + + KHMER: 299080 out of 299124 tests passed. 44 failed (0.0147096%) + + src/hb-ot-shape-complex-khmer-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9eaf077ded0306d492de96b223133431f1a6d42b +Author: Behdad Esfahbod +Date: Fri Jan 5 16:28:00 2018 +0000 + + [khmer] Remove some more unused code + + src/hb-ot-shape-complex-khmer.cc | 49 ++-------------------------------------- + 1 file changed, 2 insertions(+), 47 deletions(-) + +commit bfad6ab897a38aedc82de694ee1a17132f90b25e +Author: Behdad Esfahbod +Date: Fri Jan 5 16:13:09 2018 +0000 + + [khmer] Remove features not used by Khmer + + src/hb-ot-shape-complex-khmer.cc | 60 ++++------------------------------------ + 1 file changed, 5 insertions(+), 55 deletions(-) + +commit 92a99ce084b19dff32d434de446144f0c4796803 +Author: Behdad Esfahbod +Date: Fri Jan 5 16:08:44 2018 +0000 + + [khmer] Remove rphf feature + + src/hb-ot-shape-complex-khmer.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 238b90e77c12674edfd2e03160b8ba2a0298b79d +Author: Behdad Esfahbod +Date: Fri Jan 5 16:06:53 2018 +0000 + + [khmer] Remove non-Khmer matra positioning code + + src/hb-ot-shape-complex-khmer.cc | 76 +++++++--------------------------------- + 1 file changed, 12 insertions(+), 64 deletions(-) + +commit f8553c898a414298403c335f8d2ed6c588a1189f +Author: Behdad Esfahbod +Date: Fri Jan 5 16:04:02 2018 +0000 + + [khmer] Remove indic_config_t + + src/hb-ot-shape-complex-khmer.cc | 28 ---------------------------- + 1 file changed, 28 deletions(-) + +commit a119a8bce57abc440ae4c8b9a1342d428a7c9b6a +Author: Behdad Esfahbod +Date: Fri Jan 5 16:02:27 2018 +0000 + + [khmer] Remove indic_config->reph_mode + + src/hb-ot-shape-complex-khmer.cc | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +commit c135324af107d3e33420cd0dca4d5bb12fd3f4a1 +Author: Behdad Esfahbod +Date: Fri Jan 5 16:01:17 2018 +0000 + + [khmer] Remove indic_config->reph_pos + + src/hb-ot-shape-complex-khmer.cc | 333 ++------------------------------------- + 1 file changed, 10 insertions(+), 323 deletions(-) + +commit ffcd6c7efd21bf89b41ddbf148b05672a42ecadd +Author: Behdad Esfahbod +Date: Fri Jan 5 15:50:05 2018 +0000 + + [khmer] Remove indic_config->base_pos + + src/hb-ot-shape-complex-khmer.cc | 229 ++------------------------------------- + 1 file changed, 7 insertions(+), 222 deletions(-) + +commit 0c91638d48d6fb86d1e30fb94c15785707395b42 +Author: Behdad Esfahbod +Date: Fri Jan 5 15:45:30 2018 +0000 + + [khmer] Remove other scripts + + src/hb-ot-shape-complex-khmer.cc | 131 ++++++++++----------------------------- + 1 file changed, 34 insertions(+), 97 deletions(-) + +commit 4c0199c573f79be5f40e7d4f8433ef6a1c9c24b2 +Author: Behdad Esfahbod +Date: Fri Jan 5 15:43:48 2018 +0000 + + [khmer] Remove indic_config->script + + src/hb-ot-shape-complex-khmer.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 9b135d9524e51cc1e1f35479e015c746ccd8ca5f +Author: Behdad Esfahbod +Date: Fri Jan 5 15:43:11 2018 +0000 + + [khmer] Remove indic_config->virama + + src/hb-ot-shape-complex-khmer.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 7eb3ac29d388432c311981b20b1aa75f47249bfc +Author: Behdad Esfahbod +Date: Fri Jan 5 15:41:31 2018 +0000 + + [khmer] Remove indic_config->has_old_spec + + src/hb-ot-shape-complex-khmer.cc | 157 ++++++--------------------------------- + 1 file changed, 21 insertions(+), 136 deletions(-) + +commit 961ebf85f1e7d417e056c3927ee73857f6f4cde6 +Author: Behdad Esfahbod +Date: Fri Jan 5 15:36:53 2018 +0000 + + [khmer] Remove Halant from Khmer shaper + + src/hb-ot-shape-complex-indic-private.hh | 1 - + src/hb-ot-shape-complex-khmer-machine.rl | 7 +++---- + src/hb-ot-shape-complex-khmer.cc | 32 ++++++++++++++++---------------- + 3 files changed, 19 insertions(+), 21 deletions(-) + +commit 9761f9d78214323b9ad58dd0b8ba41851c9e2d54 +Author: Behdad Esfahbod +Date: Fri Jan 5 15:33:11 2018 +0000 + + [indic] Remove more Khmer-specific stuff from Indic shaper + + No numbers changed. + + src/hb-ot-shape-complex-indic-machine.rl | 8 ++--- + src/hb-ot-shape-complex-indic.cc | 57 ++++++++++++-------------------- + 2 files changed, 25 insertions(+), 40 deletions(-) + +commit 075895364435ee88936696bcb5457283c4bb1a29 +Author: Behdad Esfahbod +Date: Fri Jan 5 15:08:28 2018 +0000 + + [indic] Remove main Khmer stuff + + src/hb-ot-shape-complex-indic.cc | 73 ++-------------------------------------- + 1 file changed, 2 insertions(+), 71 deletions(-) + +commit dcf4d95fea45e19fbb3b39f0211b2aa96a907473 +Author: Behdad Esfahbod +Date: Fri Jan 5 14:54:31 2018 +0000 + + [khmer] Split off Khmer shaper from Indic + + Towards fixing https://github.com/harfbuzz/harfbuzz/issues/667 + The Khmer spec is different enough from other Indic ones to require + its own grammar. + + No change in functionality. Test numbers are: + + BENGALI: 353725 out of 354188 tests passed. 463 failed (0.130722%) + DEVANAGARI: 707307 out of 707394 tests passed. 87 failed (0.0122987%) + GUJARATI: 366355 out of 366457 tests passed. 102 failed (0.0278341%) + GURMUKHI: 60729 out of 60747 tests passed. 18 failed (0.0296311%) + KANNADA: 951300 out of 951913 tests passed. 613 failed (0.0643966%) + KHMER: 299071 out of 299124 tests passed. 53 failed (0.0177184%) + MALAYALAM: 1048136 out of 1048334 tests passed. 198 failed (0.0188871%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271662 out of 271847 tests passed. 185 failed (0.068053%) + TAMIL: 1091754 out of 1091754 tests passed. 0 failed (0%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + + src/Makefile.sources | 3 + + src/hb-ot-shape-complex-khmer-machine.rl | 130 +++ + src/hb-ot-shape-complex-khmer.cc | 1867 ++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-private.hh | 5 +- + 4 files changed, 2003 insertions(+), 2 deletions(-) + +commit 1e05ea79d057fbae5f680589d4ee7d3c6a971689 +Author: Behdad Esfahbod +Date: Fri Jan 5 14:01:37 2018 +0000 + + [ot] Short-circuit base instance advance variation + + src/hb-ot-hmtx-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 54b2b93722c9f067199cd7145dfd065d5b6b2f0c +Author: Behdad Esfahbod +Date: Fri Jan 5 13:20:21 2018 +0000 + + [ot] Fix VariationStore evaluation algorithm + + Ouch! Missing coords should still be evaluated as coord=0, which + most of the time results in a factor of 0. We were skipping these, + which was equivalent to a factor of 1. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/652 + + src/hb-ot-layout-common-private.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit a3afdd1e080bb181ddec126b6233d52438882a13 +Author: Behdad Esfahbod +Date: Fri Jan 5 13:17:02 2018 +0000 + + Minor + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cb43bdbc2f3a16061c33596b15b29eb7f9713871 +Author: Behdad Esfahbod +Date: Fri Jan 5 13:06:25 2018 +0000 + + [ft] If there's no variations set, don't set them on hb-font + + src/hb-ft.cc | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit ed2f458b143327d07e67fdb976ead9d7ff2863f8 +Author: Behdad Esfahbod +Date: Fri Jan 5 12:55:39 2018 +0000 + + Add test font for previous commit + + .../sha1sum/21b7fb9c1eeae260473809fbc1fe330f66a507cd.ttf | Bin 0 -> 4816 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 127bcc6ece4da64e807f652dd84a17c6a8c5e300 +Merge: 72bec1cd 8c0d1916 +Author: Behdad Esfahbod +Date: Fri Jan 5 12:50:22 2018 +0000 + + Merge remote-tracking branch 'fdo/master' + +commit 8c0d1916a41f0fb32340ce5257de780acf598353 +Author: Behdad Esfahbod +Date: Fri Jan 5 12:46:12 2018 +0000 + + Improve CGJ skipping logic + + Previously we made CGJ unskippable. Now, if CGJ did NOT prevent + any reordering, allow skipping over it. To make this work we + had to make changes to the Arabic mark reordering algorithm + implementation to renumber moved MCM marks. See comments. + + Fixes https://github.com/harfbuzz/harfbuzz/issues/554 + + src/hb-buffer-private.hh | 1 + + src/hb-ot-layout-private.hh | 11 ++++++++- + src/hb-ot-shape-complex-arabic.cc | 37 ++++++++++++++++++++++-------- + src/hb-ot-shape-normalize.cc | 30 +++++++++++++----------- + test/shaping/tests/arabic-mark-order.tests | 4 ++++ + 5 files changed, 58 insertions(+), 25 deletions(-) + +commit 72bec1cd09f919f3826345db4832752ec96ff5c5 +Author: Ebrahim Byagowi +Date: Fri Jan 5 12:42:20 2018 +0330 + + Improve tests (#679) + + .circleci/config.yml | 2 +- + CMakeLists.txt | 52 +++++++++++++++++++++++++++++++++++---------- + autogen.sh | 6 ++++-- + src/Makefile.am | 3 +-- + src/check-defs.sh | 2 +- + src/check-header-guards.sh | 2 +- + src/check-libstdc++.sh | 2 +- + src/check-static-inits.sh | 2 +- + src/check-symbols.sh | 2 +- + test/fuzzing/CMakeLists.txt | 11 +++++++++- + 10 files changed, 62 insertions(+), 22 deletions(-) + +commit 293e443529d0621b9f94ea15d1425104394f6b9e +Author: Behdad Esfahbod +Date: Thu Jan 4 16:06:25 2018 +0000 + + Minor + + src/check-c-linkage-decls.sh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 8a0952db7e521320cd4d8b67b287f7d33c21b6e0 +Author: Bruce Mitchener +Date: Thu Jan 4 18:40:10 2018 +0700 + + atomics: Favor compiler primitives over macOS APIs. (#676) + + In macOS 10.12, the `OSMemoryBarrier` and related APIs were deprecated + in favor of using `std::atomic`. On the way to supporting `std::atomic`, + we can favor using the "Intel primitives" which are also available on + macOS. + + src/hb-atomic-private.hh | 46 +++++++++++++++++++++++----------------------- + 1 file changed, 23 insertions(+), 23 deletions(-) + +commit 4f80078eb035054db0f6e33cf4f7345c6c85cb12 +Author: Bruce Mitchener +Date: Thu Jan 4 18:37:35 2018 +0700 + + [cmake] Colorize output when using cmake + ninja. (#674) + + Due to how ninja runs clang and gcc, it doesn't colorize the output + like make does. This forces color output in this situation. + + CMakeLists.txt | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 5ed26fc5bdfdab0ff41a8861b54395c0bbbad248 +Author: Ebrahim Byagowi +Date: Thu Jan 4 10:11:34 2018 +0330 + + [cmake] Run src/ tests (#675) + + .circleci/config.yml | 9 ++++----- + CMakeLists.txt | 35 ++++++++++++++++++++++++++++++++--- + src/Makefile.am | 1 + + src/check-defs.sh | 3 ++- + src/check-libstdc++.sh | 3 ++- + src/check-static-inits.sh | 3 ++- + src/check-symbols.sh | 3 ++- + 7 files changed, 45 insertions(+), 12 deletions(-) + +commit f8daeef4c4451084a781db3a8a04807c0f0051ef +Author: Behdad Esfahbod +Date: Wed Jan 3 14:27:34 2018 +0000 + + [use] Simplify more + + src/gen-use-table.py | 11 +------ + src/hb-ot-shape-complex-use-table.cc | 62 +++++++++++++++++++++--------------- + 2 files changed, 38 insertions(+), 35 deletions(-) + +commit 877d15e73c24159b26bb7cc6d2f62045d445d0fc +Author: Behdad Esfahbod +Date: Wed Jan 3 14:24:44 2018 +0000 + + [use] Simplify + + Fixes https://github.com/harfbuzz/harfbuzz/pull/661 + + src/gen-use-table.py | 2 +- + src/hb-ot-shape-complex-use-table.cc | 3 +-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +commit 308f419215716460479fbde482d66d1687176102 +Author: Behdad Esfahbod +Date: Wed Jan 3 14:22:07 2018 +0000 + + [use] Fix Brahmi Number Joiner 1107F + + Fixes https://github.com/harfbuzz/harfbuzz/pull/660 + + src/gen-indic-table.py | 6 +++--- + src/gen-use-table.py | 6 +++--- + src/hb-ot-shape-complex-indic-table.cc | 4 ++-- + src/hb-ot-shape-complex-use-table.cc | 6 +++--- + 4 files changed, 11 insertions(+), 11 deletions(-) + +commit 7b837e20d2b4b6cd7be0b181ac5cdfeb467bd146 +Author: Behdad Esfahbod +Date: Wed Jan 3 12:46:29 2018 +0000 + + [util] Add TODO item + + util/options.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 70807ad274be39d58a5b43e12d4585325cb314c4 +Author: Ebrahim Byagowi +Date: Tue Jan 2 23:52:12 2018 +0330 + + Fix make check issue on out-of-tree builds and test it (#672) + + .circleci/config.yml | 8 ++++---- + test/fuzzing/Makefile.am | 18 +----------------- + test/fuzzing/run-fuzzer-tests.py | 8 +++++--- + test/shaping/run-tests.py | 5 +++++ + 4 files changed, 15 insertions(+), 24 deletions(-) + +commit 85ec6d34439194a88c7dfdd8303369311e08e031 +Author: Bruce Mitchener +Date: Wed Jan 3 01:23:23 2018 +0700 + + Fix typos. + + docs/usermanual-clusters.xml | 4 ++-- + docs/usermanual-install-harfbuzz.xml | 2 +- + src/hb-font.h | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 4f6754ac0190f04b5f27306b087827b8f2e13046 +Author: Bruce Mitchener +Date: Wed Jan 3 00:15:18 2018 +0700 + + Improve Markdown usage in BUILD.md. + + BUILD.md | 36 +++++++++++++++++++++++------------- + 1 file changed, 23 insertions(+), 13 deletions(-) + +commit 3db1d34264d9405c7356668aa3c8ed3ab103da3c +Author: Romain Ouabdelkader +Date: Thu Dec 21 14:39:34 2017 +0100 + + link with CoreFoundation when using CoreText + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4e3cf91af29ff654eca91e43c0af1c1a7171b9fa +Author: Ebrahim Byagowi +Date: Mon Jan 1 11:17:51 2018 +0330 + + [cmake] Run rest of the tests on Windows (#668) + + appveyor.yml | 6 +++--- + test/CMakeLists.txt | 5 +---- + test/fuzzing/CMakeLists.txt | 12 ++++++------ + test/fuzzing/Makefile.am | 5 +---- + test/fuzzing/run-fuzzer-tests.py | 12 +++++++++--- + test/shaping/CMakeLists.txt | 9 ++++----- + test/shaping/run-tests.py | 10 +++++++++- + 7 files changed, 33 insertions(+), 26 deletions(-) + +commit 2dbdeb14214487acd0ff011386c49263ce800813 +Author: Ebrahim Byagowi +Date: Fri Dec 29 23:13:29 2017 +0330 + + [cmake] Run fuzzing and shaping tests (#666) + + .circleci/config.yml | 2 +- + CMakeLists.txt | 59 ++++++++++++++++++++++++---------------- + appveyor.yml | 4 +-- + test/CMakeLists.txt | 5 ++++ + test/api/CMakeLists.txt | 48 +++++++++++++------------------- + test/fuzzing/CMakeLists.txt | 9 ++++++ + test/fuzzing/Makefile.am | 18 ++++++++++++ + test/fuzzing/run-fuzzer-tests.py | 28 +++++++++++++++++++ + test/shaping/CMakeLists.txt | 11 ++++++++ + test/shaping/Makefile.am | 3 +- + test/shaping/run-tests.py | 3 +- + 11 files changed, 132 insertions(+), 58 deletions(-) + +commit 24b30faa2a285c6e4e46a18c346def2183fc2793 +Author: Ebrahim Byagowi +Date: Mon Dec 25 22:01:28 2017 +0330 + + [cmake] Use GNUInstallDirs values (#665) + + CMakeLists.txt | 170 ++++++++++++++++++++++++++++----------------------------- + 1 file changed, 85 insertions(+), 85 deletions(-) + +commit 7d397c5d5ca684fae824a61dabf5bc422d0a516b +Author: Behdad Esfahbod +Date: Sun Dec 24 17:53:32 2017 -0500 + + Add Coverity badge + + README | 1 + + 1 file changed, 1 insertion(+) + +commit 50163976d2a5fb34e0b4c011408d581b33aaa255 +Author: Ebrahim Byagowi +Date: Mon Dec 25 01:55:48 2017 +0330 + + [cmake] Enable cmake tests on distribution and test it (#664) + + .circleci/config.yml | 3 ++- + test/Makefile.am | 6 ++++++ + test/api/Makefile.am | 1 + + 3 files changed, 9 insertions(+), 1 deletion(-) + +commit 7bfdf1a94192dd83ab55202d259703f36ed060e5 +Author: David Corbett +Date: Wed Nov 22 16:32:52 2017 -0500 + + Forbid Batak killers after vowel signs + + src/gen-use-table.py | 3 +++ + src/hb-ot-shape-complex-use-table.cc | 2 +- + .../sha1sum/59a585a63b3df608fbeef00956c8c108deec7de6.ttf | Bin 0 -> 1164 bytes + test/shaping/tests/use-syllable.tests | 1 + + 4 files changed, 5 insertions(+), 1 deletion(-) + +commit 9890782736b9ce708c1fedd1cbb3db45cfef4c69 +Author: Ebrahim Byagowi +Date: Mon Dec 25 01:32:46 2017 +0330 + + [ci] Add -Wno-attributes to djgpp, add alpine, format (#663) + + .circleci/config.yml | 40 ++++++++++++++++++++++++++++++---------- + 1 file changed, 30 insertions(+), 10 deletions(-) + +commit 72ecaae0ad4c9f1685f7d524990e92a26fcd5611 +Author: Behdad Esfahbod +Date: Sun Dec 24 16:05:07 2017 -0500 + + [use] Allow ZWJ before/after Halant + + https://github.com/harfbuzz/harfbuzz/issues/542#issuecomment-353169729 + + src/hb-ot-shape-complex-use-machine.rl | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit bc92245b681098f0bfa712217851a5ba3dabeaf3 +Author: Behdad Esfahbod +Date: Wed Dec 20 13:19:33 2017 -0500 + + Minor + + src/main.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 81dfc29d2dbc755301e702ea5427829d02abc693 +Author: Ebrahim Byagowi +Date: Thu Dec 21 20:15:37 2017 +0330 + + [ci] Add a DOS/djgpp compiler (#659) + + .circleci/config.yml | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 007a2a4317227b8fb4c764c590203c85fc3da5fd +Author: Behdad Esfahbod +Date: Wed Dec 20 12:09:00 2017 -0500 + + 1.7.4 + + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit a9432bde7e61894056a42ea24d56fd7fd908a1ce +Author: Volker H. Simonis +Date: Tue Dec 19 11:33:25 2017 +0100 + + HarfBuzz 1.7.1 and later don't compile on AIX with xlC (#655) + + src/hb-ot-shape-complex-arabic-fallback.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2fe5f885b6f66f2665292b93e07baaae0aa46da8 +Author: Behdad Esfahbod +Date: Tue Dec 19 14:48:26 2017 -0500 + + [set] Handle nil set in add_range() / add_sorted_array() + + Fixes https://github.com/harfbuzz/harfbuzz/issues/657 + + src/hb-set-private.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit b5bbb791d32467b91caf6f1bf7ccee7cb2ca8c52 +Author: Behdad Esfahbod +Date: Mon Dec 18 09:18:51 2017 -0500 + + 1.7.3 + + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 1245395a60ab6b04fc4653c448a97bb6ffee672c +Author: Behdad Esfahbod +Date: Sun Dec 17 12:32:33 2017 -0500 + + [coretext] In hb_coretext_font_create() set ptem + + Otherwise setting the CTFont was ineffective as it would have been + recreated anyway unless font size was set to 18 CSS points. + + src/hb-coretext.cc | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +commit 493a005d9527b6075f3c1ca4b41c22d7805f975c +Author: Behdad Esfahbod +Date: Sat Dec 16 11:49:39 2017 -0500 + + [set] In add_sorted_array(), bail if data is not sorted + + src/hb-set-private.hh | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit a7bd6d7a4c53ff61d7d8286a594aaa0a0e15b1a1 +Author: Behdad Esfahbod +Date: Sat Dec 16 11:11:18 2017 -0500 + + [collect_glyphs] Bail if input data looks like garbage + + Specificaly, when a range or sorted array has unexpected order, we take that as + font data being garbage and bail out. This fixes significant slowdown on a bad + version of Chandas font which has a 600KB GPOS with garbage inside. + + Later on, I like to add a maximum-work counter for collect_glyphs to protect + against malicious fonts as well. + + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=794896 + + src/hb-ot-layout-common-private.hh | 14 +++++++------- + src/hb-set-private.hh | 4 ++-- + 2 files changed, 9 insertions(+), 9 deletions(-) + +commit 1ce7d6e215ef9d5386010bcdbbca79ef01811596 +Author: Behdad Esfahbod +Date: Sat Dec 16 11:36:16 2017 -0500 + + [set] Optimize add_array() / add_sorted_array() + + Does page lookup as needed. + + src/hb-set-private.hh | 54 ++++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 38 insertions(+), 16 deletions(-) + +commit 71e6adf1e2d65eb905a0ba247672fe36169955ef +Author: Behdad Esfahbod +Date: Sat Dec 16 11:07:37 2017 -0500 + + [collect_glyphs] handle ClassDef better + + src/hb-ot-layout-common-private.hh | 63 ++++++++++++++++++++++++++++++------ + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 5 +-- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 4 files changed, 56 insertions(+), 16 deletions(-) + +commit 87cc5a65cb4b98a3a857b5846085ef0814b392a8 +Author: Behdad Esfahbod +Date: Sat Dec 16 06:18:07 2017 -0800 + + [collect_glyphs] In PairPosFornat2 do not collect classDef1 + + The coverage already covered that. + + src/hb-ot-layout-gpos-table.hh | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +commit 81f27df4d9db1bfc1dd04593cbd121397b86e9a6 +Author: Behdad Esfahbod +Date: Sat Dec 16 06:12:06 2017 -0800 + + More work towards improving collect_glyphs() against bad input + + The three "XXXXX"'s should be switched to false. Doing that separately for ease + of bisecting... + + src/hb-ot-layout-common-private.hh | 7 +++---- + src/hb-ot-layout-gpos-table.hh | 25 ++++++++++--------------- + src/hb-ot-layout-gsub-table.hh | 35 +++++++++++++---------------------- + src/hb-set-digest-private.hh | 6 ++++-- + src/hb-set-private.hh | 36 ++++++++++++++++++------------------ + 5 files changed, 48 insertions(+), 61 deletions(-) + +commit 5d02572034e3dafbe87000fd0aa34b858bd95075 +Author: Behdad Esfahbod +Date: Thu Dec 14 19:33:55 2017 -0800 + + [set] Add add_sorted_array() + + Not optimized to use sortedness yet. Also start putting in place infra + to faster reject bad data. + + A version of Chandas.ttf found on some Chrome bots has 660kb of GPOS, + mostly junk. That is causing 48 million of set->add() calls in + collect_glyphs(), which is insane. + + In the upcoming commits, I'll be speeding that up by optimizing + add_sorted_array(), while also reducing work by rejecting out-of-sort + arrays quickly and propagate the rejection. + + Part of https://bugs.chromium.org/p/chromium/issues/detail?id=794896 + + src/hb-ot-layout-common-private.hh | 51 +++++++++++++++++++++++------------- + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 10 +++---- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-set-digest-private.hh | 31 ++++++++++++++++++---- + src/hb-set-private.hh | 21 +++++++++++++-- + 6 files changed, 84 insertions(+), 33 deletions(-) + +commit 9d6511a7343ba150e8072e5fe91732db54a92309 +Author: Behdad Esfahbod +Date: Thu Dec 14 19:04:55 2017 -0800 + + [set] Reduce number of preallocated pages from 8 to 1 + + Now that pagesize is 8192, this feels better. + + src/hb-set-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ae2e2b068e1ab68d1f814165cb86fa38deef1f5b +Author: Behdad Esfahbod +Date: Thu Dec 14 18:15:14 2017 -0800 + + Fix partial tracing debug builds + + src/hb-debug.hh | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +commit 9daa88cd790b80a8bc7eaae2e7eec6f2f9fc60cf +Author: Behdad Esfahbod +Date: Thu Dec 14 13:37:48 2017 -0800 + + Minor + + src/hb-set-private.hh | 11 +++++++++++ + src/hb-set.cc | 6 ++---- + 2 files changed, 13 insertions(+), 4 deletions(-) + +commit f424a342233ae32bbfabbdeadf59c82420b0880b +Author: Behdad Esfahbod +Date: Thu Dec 14 13:30:38 2017 -0800 + + [set] Change pagesize from 512 bits to 8192 bits + + Fixes perf regression on some heavy fonts in Chrome's FT+HB + interaction. + + See: + https://bugs.chromium.org/p/chromium/issues/detail?id=782220 + + More work to be done: + https://bugs.chromium.org/p/chromium/issues/detail?id=794896 + + src/hb-set-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0fe62c1f333200523e10663f47a58b82e3f22154 +Author: Behdad Esfahbod +Date: Wed Dec 13 13:12:20 2017 -0800 + + [set] Add add_array() + + To be used to optimize adding a whole bunch of (sorted) items at the same time, + as in CoverageFormat1. + + src/hb-ot-layout-common-private.hh | 4 +--- + src/hb-set-digest-private.hh | 12 ++++++++++++ + src/hb-set-private.hh | 6 ++++++ + 3 files changed, 19 insertions(+), 3 deletions(-) + +commit 20e69c950d431391f92335f8845e5d4291aca8f3 +Author: ebraminio +Date: Thu Dec 7 12:24:12 2017 +0330 + + [test] print commented line, like the original script (#649) + + test/shaping/run-tests.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 71ad2777c52aeb0842038881899499a49cb895f2 +Author: ebraminio +Date: Thu Dec 7 11:35:36 2017 +0330 + + [ci] Add an after distribution test runner (#648) + + .circleci/config.yml | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 5f061d27d5289c7608a6579dca668b1f5be7f4e8 +Author: ebraminio +Date: Thu Dec 7 11:22:55 2017 +0330 + + Rewrite run-tests in python (#647) + + test/shaping/Makefile.am | 4 +- + test/shaping/run-tests.py | 115 ++++++++++++++++++++++++++++++++++++++++++++++ + test/shaping/run-tests.sh | 65 -------------------------- + 3 files changed, 117 insertions(+), 67 deletions(-) + +commit 3ce6c7bd96296a44950110e84ade76c7c1df06e4 +Author: Khaled Hosny +Date: Wed Dec 6 21:08:20 2017 +0200 + + [ci] Sort out Travis configuration + + Use a matrix to avoid a gazillion if's. + + .ci/deploy-docs.sh | 2 ++ + .ci/run-coveralls.sh | 14 +++++++++++ + .travis.yml | 69 ++++++++++++++++++++++++++++++++-------------------- + 3 files changed, 58 insertions(+), 27 deletions(-) + +commit 5a6d2b986a02fc47fa9dcbb330e6949af8e375ff +Author: ebraminio +Date: Wed Dec 6 18:27:27 2017 +0330 + + [ci] minor improvements (#644) + + .circleci/config.yml | 3 +++ + appveyor.yml | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 840a32e3f3ed0a85bfa84e69efaeb504d92d1aa7 +Author: Khaled Hosny +Date: Wed Dec 6 00:49:25 2017 +0200 + + Run cmake tests on CI builds + + .circleci/config.yml | 6 ++++-- + appveyor.yml | 2 +- + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit c8609551485cfca6f9629c565b9dd5f02aa14f3e +Author: Khaled Hosny +Date: Wed Dec 6 00:43:28 2017 +0200 + + Add API tests to cmake build + + CMakeLists.txt | 5 +++++ + test/CMakeLists.txt | 1 + + test/api/CMakeLists.txt | 39 +++++++++++++++++++++++++++++++++++++++ + test/api/hb-test.h | 2 ++ + test/api/test-c.c | 2 ++ + 5 files changed, 49 insertions(+) + +commit f19126dd35b03f6e05a67cbc406b3ce4a3e35022 +Author: Khaled Hosny +Date: Tue Dec 5 22:52:54 2017 +0200 + + We are already inside “if HAVE_GLIB” check + + test/api/Makefile.am | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 7af48a3f37abac0aa1a1ad79c98399a9a71bd903 +Author: ebraminio +Date: Wed Dec 6 14:22:19 2017 +0330 + + [ci] Don't cache msys2 folder + + appveyor.yml | 1 - + 1 file changed, 1 deletion(-) + +commit b6f505c7164e302d2990cf056b73e918a641e976 +Author: ebraminio +Date: Wed Dec 6 13:51:04 2017 +0330 + + [ci] Enable glib and freetype on appveyor cmake (#643) + + appveyor.yml | 29 +++++++++++++++++++++-------- + 1 file changed, 21 insertions(+), 8 deletions(-) + +commit 03b7a221f701a9b003890878e730ad175c3fdd86 +Author: Behdad Esfahbod +Date: Tue Dec 5 13:12:11 2017 -0800 + + [debug] Use %p to print pointers + + Fixes https://github.com/harfbuzz/harfbuzz/issues/640 + + src/hb-debug.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 353cc6fbf09d16aad18b48a3a46ec7dd348aedc6 +Author: Ebrahim Byagowi +Date: Wed Dec 6 00:04:30 2017 +0330 + + [ci] Fix appveyor badge + + README | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0dc03ef75724376927a7d63b991508c2901fcdf9 +Author: Nathan Willis +Date: Tue Dec 5 17:43:09 2017 +0000 + + Indic: always hyphenate pre-base-reordering, for clarity. + + src/hb-ot-shape-complex-indic.cc | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 8db058d20c1b7efce33157c676d4aee97591deb1 +Author: Nathan Willis +Date: Tue Dec 5 17:43:09 2017 +0000 + + Indic: always hyphenate pre-base-reordering, for clarity. + + src/hb-ot-shape-complex-indic.cc | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit be59f3cbf4e3269ea05d5a707cdae04a32e097ce +Author: Behdad Esfahbod +Date: Tue Dec 5 09:01:28 2017 -0800 + + Silence unused-variables warning on MSVC + + Fixes https://github.com/harfbuzz/harfbuzz/issues/635 + + src/hb-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 80c1b01f054c5d65ca96a568aaf1c28ffe97215b +Author: David Corbett +Date: Tue Dec 5 08:28:42 2017 -0500 + + Allow digits in language system tags + + src/hb-ot-tag.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 85bb89a88bdfae02fb7c27c7b994f4f22723442a +Author: David Corbett +Date: Mon Dec 4 15:15:27 2017 -0500 + + Fix string matching in parse_bool + + src/hb-common.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0fd89dc61c6a26253aa9bb85e8dfd9faded11440 +Author: Olivier Blin +Date: Mon Dec 4 18:58:41 2017 +0100 + + [hb-ft] Fix build when Multiple Master font support is disabled in freetype + + FT_Set_Var_Blend_Coordinates() is not available when "Multiple Master + font interface" is disabled in freetype's modules.cfg + + configure.ac | 1 + + src/hb-ft.cc | 2 ++ + util/helper-cairo.cc | 2 ++ + 3 files changed, 5 insertions(+) + +commit 843f7f70355f62511a5d8be3b905c853bf362629 +Author: Behdad Esfahbod +Date: Mon Dec 4 08:52:39 2017 -0800 + + 1.7.2 + + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit eeb26d21d493183f54704487754d53a127b017ae +Author: Behdad Esfahbod +Date: Sat Dec 2 15:22:04 2017 -0800 + + [set] Actually commit fixes mentioned in previous commit! + + src/hb-set-private.hh | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 20b4672754baf9751642bb37344a6ff4e224dc37 +Author: Behdad Esfahbod +Date: Sat Dec 2 15:14:26 2017 -0800 + + [set] Fix recent changes + + Ouch! + + Add tests. + + test/api/test-set.c | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +commit 0744149cdabd85d632822ff810d3994787bca4b7 +Author: Behdad Esfahbod +Date: Sat Dec 2 15:06:15 2017 -0800 + + [set] Protect against bad input in hb_set_add_range() + + src/hb-set-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d5e29303db47a1868fa9b044ca61e146f882179c +Author: Behdad Esfahbod +Date: Tue Nov 28 23:11:34 2017 -0800 + + [coretext] Add hb_coretext_font_create() + + Fixes https://github.com/harfbuzz/harfbuzz/issues/628 + + New API: + hb_coretext_font_create() + + src/hb-coretext.cc | 55 ++++++++++++++++++++++++++++++++++-------------------- + src/hb-coretext.h | 3 +++ + 2 files changed, 38 insertions(+), 20 deletions(-) + +commit 9d0194b3a8e0c562249337fa0cf4d72e89334263 +Author: Behdad Esfahbod +Date: Fri Dec 1 13:56:06 2017 -0800 + + [set] Optimize add_range() some more + + It's as good as it gets, and seems to be on par with previous set implementation + in my benchmark. + + Would be great if someone can double-check my bitops. + + src/hb-set-private.hh | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +commit 438c325a256f040c6be840924ed42dcbcd8a049a +Author: Behdad Esfahbod +Date: Fri Dec 1 13:34:14 2017 -0800 + + [set] Optimize add_range() + + With new set implementation, this became really costy. Optimize it. + There's more to be done, but this shaves off most of the fat. + + Part of fixing https://bugs.chromium.org/p/chromium/issues/detail?id=782220 + + src/hb-set-private.hh | 56 +++++++++++++++++++++++++++++++++++++-------------- + 1 file changed, 41 insertions(+), 15 deletions(-) + +commit be9e307a889e04d198042ad39949d3971232ab26 +Author: Behdad Esfahbod +Date: Fri Dec 1 12:36:26 2017 -0800 + + [ot] Ensure layout in hb_ot_layout_table_get_lookup_count() + + src/hb-ot-layout.cc | 1 + + 1 file changed, 1 insertion(+) + +commit d9066afd6bc260d2f2ad5cd5b3e8b196e944d3d8 +Author: Behdad Esfahbod +Date: Wed Nov 29 16:18:18 2017 -0800 + + Add another test for previous commit + + From https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=4273 + + .../sha1sum/bbf4a308c402f0678c3e82844892a4da2ebe598f.ttf | Bin 0 -> 204 bytes + test/shaping/tests/fuzzed.tests | 1 + + 2 files changed, 1 insertion(+) + +commit 16fba5b2158a0e093e6df32637eba5058942e299 +Author: Behdad Esfahbod +Date: Wed Nov 29 16:08:11 2017 -0800 + + [ot] Fix Extension type recurse to disallow recursing to another Extension + + Particularly hazardous if the second layer mixes forward and backward lookups. + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=4336 + + src/hb-ot-layout-gsub-table.hh | 6 ++++-- + .../sha1sum/9d8a94a67932a3ab75a596fc8b5c6d0392ca9e49.ttf | Bin 0 -> 4545 bytes + .../sha1sum/ef2511f215aa3ca847cbfffbf861793b42170875.ttf | Bin 0 -> 1152 bytes + test/shaping/tests/fuzzed.tests | 2 ++ + 4 files changed, 6 insertions(+), 2 deletions(-) + +commit 7ab49de987b856312d7ad1d02639f7306aa0ad2f +Author: Behdad Esfahbod +Date: Wed Nov 29 14:20:09 2017 -0800 + + Try fixing Mac build with 10.12 + + Related + https://github.com/harfbuzz/harfbuzz/issues/345 + https://github.com/harfbuzz/harfbuzz/pull/629 + + .travis.yml | 1 + + 1 file changed, 1 insertion(+) + +commit d672bcf9d72bb473f5f53089c8af595c4047bc99 +Author: Behdad Esfahbod +Date: Tue Nov 28 22:20:57 2017 -0800 + + Minor + + docs/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 23ade70783a17ed6822d13e7a910544de2ef181f +Author: Behdad Esfahbod +Date: Tue Nov 21 16:36:07 2017 -0800 + + [doc] Optimize HarfBuzz.png; add HarfBuzz.svg + + SVG is unused. Just keeping it here. + + docs/HarfBuzz.png | Bin 14203 -> 8814 bytes + docs/HarfBuzz.svg | 277 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 277 insertions(+) + +commit 77efdecadddbd68bbbc0ff85ac84e24976ad4d4f +Author: Khaled Hosny +Date: Wed Nov 22 00:14:29 2017 +0200 + + Improve the docs commit message a bit + + .ci/deploy-docs.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a13c0748c59a92812469ada762d57bce3b02fe34 +Author: Ebrahim Byagowi +Date: Tue Nov 21 09:52:18 2017 +0330 + + Move gh-pages docs to harfbuzz.github.io + + .ci/deploy-docs.sh | 10 +++++----- + README | 2 ++ + docs/HarfBuzz.png | Bin 12710 -> 14203 bytes + docs/circle.yml | 3 --- + 4 files changed, 7 insertions(+), 8 deletions(-) + +commit 9f259769a61f17b47701bbad79e1865571338417 +Author: David Corbett +Date: Tue Nov 21 14:16:10 2017 -0500 + + Categorize U+A8B4 as Consonant_Medial + + src/gen-use-table.py | 3 +++ + src/hb-ot-shape-complex-use-table.cc | 2 +- + .../sha1sum/373e67bf41ca264e260a9716162b71a23549e885.ttf | Bin 0 -> 1164 bytes + test/shaping/tests/use-syllable.tests | 1 + + 4 files changed, 5 insertions(+), 1 deletion(-) + +commit cd8c62fd41ca824c5db3c55fd1faa20318ca0bf9 +Author: ebraminio +Date: Tue Nov 21 01:07:26 2017 -0500 + + [ci] Add Oracle Developer Studio (former Sun Studio) based compiler (#621) + + .circleci/config.yml | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 8d55340593ce32e55cfbd86a17c0be8750e8fb72 +Author: Behdad Esfahbod +Date: Mon Nov 20 19:43:22 2017 -0800 + + Fix fallback positioning of double diacritic marks + + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=787284 + + src/hb-ot-shape-fallback.cc | 4 ++-- + .../sha1sum/856ff9562451293cbeff6f396d4e3877c4f0a436.ttf | Bin 0 -> 892 bytes + test/shaping/tests/fallback-positioning.tests | 1 + + 3 files changed, 3 insertions(+), 2 deletions(-) + +commit bb7cc4eada06839a3892cea5919f0c310cbaf7c3 +Author: Behdad Esfahbod +Date: Mon Nov 20 19:39:47 2017 -0800 + + Minor + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a0ad0d5bb8260cb297ff114adca7c8d05b6128bb +Author: Behdad Esfahbod +Date: Mon Nov 20 15:07:48 2017 -0800 + + [docs] s/Harfbuzz/HarfBuzz/g + + docs/harfbuzz-docs.xml | 2 +- + ...anual-buffers-language-script-and-direction.xml | 10 +++---- + docs/usermanual-fonts-and-faces.xml | 2 +- + docs/usermanual-hello-harfbuzz.xml | 34 +++++++++++----------- + docs/usermanual-install-harfbuzz.xml | 2 +- + docs/usermanual-what-is-harfbuzz.xml | 20 ++++++------- + 6 files changed, 35 insertions(+), 35 deletions(-) + +commit 87d74605f5f9db685bef7329f498437b4d868e6f +Author: David Corbett +Date: Mon Nov 20 13:19:34 2017 -0500 + + Categorize U+0C80 as Consonant_Placeholder + + src/hb-ot-shape-complex-indic.cc | 1 + + .../sha1sum/81c368a33816fb20e9f647e8f24e2180f4720263.ttf | Bin 0 -> 1152 bytes + test/shaping/tests/indic-syllable.tests | 1 + + 3 files changed, 2 insertions(+) + +commit 7c6937e7c7b62602fef10ac4b2e164d0c67c932b +Author: ebraminio +Date: Mon Nov 20 14:49:22 2017 -0500 + + Move all references of old url to the new address (#622) + + .travis.yml | 2 +- + BUILD.md | 2 +- + CMakeLists.txt | 2 +- + NEWS | 20 ++++++++++---------- + README | 8 ++++---- + RELEASING.md | 2 +- + configure.ac | 2 +- + docs/HarfBuzz.png | Bin 3419 -> 12710 bytes + docs/harfbuzz-docs.xml | 2 +- + docs/usermanual-install-harfbuzz.xml | 2 +- + harfbuzz.doap | 2 +- + src/gen-use-table.py | 4 ++-- + src/hb-coretext.cc | 2 +- + src/hb-debug.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 22 +++++++++++----------- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-layout-private.hh | 8 ++++---- + src/hb-ot-shape-complex-arabic.cc | 4 ++-- + src/hb-ot-shape-complex-hebrew.cc | 2 +- + src/hb-ot-shape-complex-indic-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 8 ++++---- + src/hb-ot-shape-complex-use-machine.rl | 2 +- + src/hb-ot-shape.cc | 2 +- + src/hb-private.hh | 2 +- + src/hb-unicode-private.hh | 2 +- + src/sample.py | 2 +- + test/api/test-set.c | 2 +- + test/fuzzing/README | 2 +- + 28 files changed, 57 insertions(+), 57 deletions(-) + +commit baf7779d2d6e4810168a8f036bbf8f9e6493dd1a +Author: Behdad Esfahbod +Date: Tue Nov 14 21:53:48 2017 -0800 + + Limit how much recursion GSUB/GPOS does + + This only counts recursions right now. Good start. + + Hopefully... + Fixes https://github.com/behdad/harfbuzz/issues/429 + + src/Makefile.am | 5 ++++- + src/hb-buffer-private.hh | 15 +++++++++++++-- + src/hb-buffer.cc | 2 ++ + src/hb-ot-layout-gsubgpos-private.hh | 5 ++++- + src/hb-ot-shape.cc | 10 ++++++++-- + test/shaping/tests/fuzzed.tests | 2 +- + 6 files changed, 32 insertions(+), 7 deletions(-) + +commit 173dab6300d9b492f2d1c68f9e8f7817211a3462 +Author: Behdad Esfahbod +Date: Tue Nov 14 21:27:24 2017 -0800 + + Minor move + + src/hb-buffer-private.hh | 26 ++++++++++++++------------ + 1 file changed, 14 insertions(+), 12 deletions(-) + +commit c6173a392cfaa3d339c768836e8cddf3ae4adc53 +Author: Behdad Esfahbod +Date: Tue Nov 14 21:09:03 2017 -0800 + + Add Offset16 and Offset32 + + src/hb-open-type-private.hh | 5 ++++- + src/hb-ot-layout-common-private.hh | 4 ++-- + src/hb-ot-name-table.hh | 2 +- + src/hb-ot-var-fvar-table.hh | 2 +- + 4 files changed, 8 insertions(+), 5 deletions(-) + +commit 6f335ed1e52c6161fa0b0295776856fc07f7f46f +Author: Behdad Esfahbod +Date: Tue Nov 14 21:06:07 2017 -0800 + + Replace USHORT/SHORT/ULONG/etc with UINT16/INT16/UINT32/etc + + src/hb-open-file-private.hh | 6 +- + src/hb-open-type-private.hh | 67 ++++++------ + src/hb-ot-cbdt-table.hh | 78 +++++++------- + src/hb-ot-cmap-table.hh | 90 ++++++++-------- + src/hb-ot-glyf-table.hh | 10 +- + src/hb-ot-head-table.hh | 28 ++--- + src/hb-ot-hhea-table.hh | 18 ++-- + src/hb-ot-kern-table.hh | 36 +++---- + src/hb-ot-layout-common-private.hh | 118 ++++++++++---------- + src/hb-ot-layout-gdef-table.hh | 22 ++-- + src/hb-ot-layout-gpos-table.hh | 94 ++++++++-------- + src/hb-ot-layout-gsub-table.hh | 30 +++--- + src/hb-ot-layout-gsubgpos-private.hh | 172 +++++++++++++++--------------- + src/hb-ot-math-table.hh | 26 ++--- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-name-table.hh | 16 +-- + src/hb-ot-os2-table.hh | 70 ++++++------ + src/hb-ot-post-table.hh | 16 +-- + src/hb-ot-shape-complex-arabic-win1256.hh | 32 +++--- + src/hb-ot-var-avar-table.hh | 4 +- + src/hb-ot-var-fvar-table.hh | 20 ++-- + src/hb-ot-var-hvar-table.hh | 8 +- + src/hb-ot-var-mvar-table.hh | 10 +- + 23 files changed, 486 insertions(+), 487 deletions(-) + +commit a130ee6df50a50f541d0e8018deea9cee8c6738a +Author: Behdad Esfahbod +Date: Tue Nov 14 20:30:03 2017 -0800 + + Remove a couple of unused consts + + src/hb-ot-hhea-table.hh | 5 ----- + src/hb-ot-layout-gsubgpos-private.hh | 3 --- + src/main.cc | 4 ++-- + 3 files changed, 2 insertions(+), 10 deletions(-) + +commit e20e47eaa1b7dd33ac63ab0eaa8f5ea1bf7775c2 +Author: Behdad Esfahbod +Date: Tue Nov 14 20:25:29 2017 -0800 + + [glyf] Try fixing undefined-behavior + + Might fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1463 + + src/hb-ot-glyf-table.hh | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +commit 7b40876a58d331200e1d7cda1dec72578139ff9c +Author: Behdad Esfahbod +Date: Tue Nov 14 20:22:05 2017 -0800 + + [ot] Remove unneeded TODO item + + Looks like hb-ot-font is complete after all! + + CFF font names and CFF glyph metrics don't work though... + + src/hb-ot-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit eab4feb5e221b8219c071ea882de79405aca4e84 +Author: Behdad Esfahbod +Date: Tue Nov 14 20:16:45 2017 -0800 + + [hmtx] Use curiously recurring template pattern + + https://en.wikipedia.org/wiki/Curiously_recurring_template_pattern + + src/hb-ot-font.cc | 11 ++++------- + src/hb-ot-hmtx-table.hh | 29 +++++++++++++++-------------- + 2 files changed, 19 insertions(+), 21 deletions(-) + +commit 977ddff1f1e0f0f71a46c60ba713d160b96f5a3c +Author: Behdad Esfahbod +Date: Tue Nov 14 20:06:19 2017 -0800 + + [ot] Move hb_ot_face_cmap_accelerator_t + + src/hb-ot-cmap-table.hh | 149 +++++++++++++++++++++++++++++++++++++++++++++--- + src/hb-ot-font.cc | 130 +----------------------------------------- + 2 files changed, 142 insertions(+), 137 deletions(-) + +commit a7f15959b5e6e14e5241a3155c413ff70e7d1eb3 +Author: Behdad Esfahbod +Date: Tue Nov 14 20:02:24 2017 -0800 + + Shuffle + + src/hb-ot-hmtx-table.hh | 76 ++++++++++++++++++++++++------------------------- + 1 file changed, 38 insertions(+), 38 deletions(-) + +commit a85d7ead04aff81d2f9df9110316892dbbefe1c2 +Author: Behdad Esfahbod +Date: Tue Nov 14 20:00:34 2017 -0800 + + [ot] Move hb_ot_face_metrics_accelerator_t + + src/hb-ot-font.cc | 108 +----------------------------------------------- + src/hb-ot-hmtx-table.hh | 108 +++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 109 insertions(+), 107 deletions(-) + +commit f00a94e1ec73c08d4bde1f50bff57d2dc9583ca8 +Author: Behdad Esfahbod +Date: Tue Nov 14 19:54:48 2017 -0800 + + Adjust privacy for recent changes + + src/hb-ot-cbdt-table.hh | 6 ++++-- + src/hb-ot-glyf-table.hh | 6 ++++-- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit 7e2839c438beea216c7c8a3881e88961940e67be +Author: Behdad Esfahbod +Date: Tue Nov 14 19:52:09 2017 -0800 + + [ot] Move hb_ot_face_glyf_accelerator_t + + src/hb-ot-font.cc | 75 +---------------------------------- + src/hb-ot-glyf-table.hh | 103 +++++++++++++++++++++++++++++++++++++++++------- + 2 files changed, 90 insertions(+), 88 deletions(-) + +commit c4e18e54dc5ffecac7b327bde9f52dd0927d6a08 +Author: Behdad Esfahbod +Date: Tue Nov 14 19:47:31 2017 -0800 + + [ot] Move hb_ot_face_cbdt_accelerator_t + + src/hb-ot-cbdt-table.hh | 85 +++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-font.cc | 87 +------------------------------------------------ + src/hb-ot-post-table.hh | 1 + + 3 files changed, 87 insertions(+), 86 deletions(-) + +commit 9b04b0384fe746bdb1885c57e1ce73c4c6cae9e5 +Author: Behdad Esfahbod +Date: Tue Nov 14 19:31:50 2017 -0800 + + [ot] Fold hb_ot_face_post_accelerator_t + + src/hb-ot-font.cc | 35 +---------------------------------- + src/hb-ot-post-table.hh | 9 +++++++-- + 2 files changed, 8 insertions(+), 36 deletions(-) + +commit 702d86ba6b4a2e41cbee46fea18b3f8eb8986dc9 +Author: Behdad Esfahbod +Date: Tue Nov 14 19:25:38 2017 -0800 + + [ot] Fold hb_ot_face_kern_accelerator_t + + src/hb-ot-font.cc | 23 +---------------------- + src/hb-ot-kern-table.hh | 13 +++++++++---- + 2 files changed, 10 insertions(+), 26 deletions(-) + +commit 909de95a112ffe4d05ddcfed97a235763e8af068 +Author: Behdad Esfahbod +Date: Tue Nov 14 16:22:52 2017 -0800 + + Minor build fix + + src/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +commit b9c96b5d7cce80ef75cbdf0f0c47d1db62797c55 +Author: Behdad Esfahbod +Date: Tue Nov 14 15:56:21 2017 -0800 + + Add test for previous commit + + At some point we should run tests under valgrind... + + .../sha1sum/dd9f0c7c7c36f75a18be0cab1cddf8f3ab0f366b.ttf | Bin 0 -> 2786 bytes + test/shaping/tests/fuzzed.tests | 3 ++- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit e5930722d485207ca158612a2b08816337fed7e8 +Author: Behdad Esfahbod +Date: Tue Nov 14 15:47:55 2017 -0800 + + Fix invalid buffer access in OOM times + + Hopefully fully fixes + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1856 + + src/hb-ot-layout-gsubgpos-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit fcd6c338ff4968a0d7fc297da1c6d8058823aaa1 +Author: Behdad Esfahbod +Date: Tue Nov 14 14:40:21 2017 -0800 + + Fix more compiler warnings + + src/hb-debug.hh | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit 7fdf16b2ceb709b78654f99e6513fa878cd4d575 +Author: Behdad Esfahbod +Date: Tue Nov 14 14:40:11 2017 -0800 + + Fix compiler warning + + src/hb-string-array.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 87f0ad183c489ef3208cf454d43c448638316092 +Author: David Corbett +Date: Thu Nov 2 10:59:25 2017 -0400 + + Allow U+20F0 in USE clusters + + src/gen-use-table.py | 4 +++ + src/hb-ot-shape-complex-use-table.cc | 34 +++++++++++++-------- + .../074a5ae6b19de8f29772fdd5df2d3d833f81f5e6.ttf | Bin 0 -> 2296 bytes + test/shaping/tests/use-syllable.tests | 1 + + 4 files changed, 26 insertions(+), 13 deletions(-) + +commit f93c6f8bfa228e95311d8d6d02dcc64b603c6e36 +Author: Behdad Esfahbod +Date: Tue Nov 14 11:09:19 2017 -0800 + + 1.7.1 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 93f7c1652a05e806c2e3ac7edf498d2f4a508a3a +Author: Behdad Esfahbod +Date: Tue Nov 14 10:59:54 2017 -0800 + + Revert "[glib/ucdn/icu/ft/ot] Make returned funcs inert" + + This reverts commit 5daf3bd4494cce6b4fb074533be9e99c4d9e0edd. + + If other atexit callbacks try to destruct the objects we destruct + in atexit callbacks, bad things will happen. + + I'll come up with some other way to catch premature destruction + of HB-owned objects. + + Fixes https://github.com/behdad/harfbuzz/issues/618 + + src/hb-ft.cc | 3 --- + src/hb-glib.cc | 3 --- + src/hb-icu.cc | 3 --- + src/hb-object-private.hh | 37 ++++++------------------------------- + src/hb-ot-font.cc | 3 --- + src/hb-ucdn.cc | 3 --- + 6 files changed, 6 insertions(+), 46 deletions(-) + +commit c48475f33ab88be6664d41b039f7be7c3e56a5a7 +Author: Behdad Esfahbod +Date: Mon Nov 13 20:26:29 2017 -0800 + + Whitespace + + src/hb-open-type-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 83d68027360ff655d3b59371fb606fc9e40df4ac +Author: Behdad Esfahbod +Date: Mon Nov 13 20:25:02 2017 -0800 + + Clean up GlyphID + + After 4a27c17ea0234dfe33e62f5830d9f92c26d48d30 we do not need + the special GlyphID.cmp(hb_codepoint_t), so just make GlyphID + a typedef. + + Fixes https://github.com/behdad/harfbuzz/issues/612 + + src/hb-open-type-private.hh | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit 7f39f576148643b4790fd70361e328b4b4da3149 +Author: Behdad Esfahbod +Date: Mon Nov 13 15:04:13 2017 -0800 + + Implement strtod_l() on MSVC + + Patch from Jean Ghali on mailing list. + + src/hb-common.cc | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +commit e5d709889200571b62a611e0f44a410591983f8a +Author: Behdad Esfahbod +Date: Mon Nov 13 09:42:37 2017 -0800 + + 1.7.0 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit e4da38020021a92afa4062ed676f286945070dc4 +Author: Behdad Esfahbod +Date: Fri Nov 10 17:14:27 2017 -0800 + + [coretext/uniscribe/directwrite/graphite/fallback] Update for unsafe-to-break + + Fixes https://github.com/behdad/harfbuzz/issues/615 + + We'll see which bots I broke. + + src/hb-buffer-private.hh | 17 +++++++++++++++-- + src/hb-coretext.cc | 2 ++ + src/hb-directwrite.cc | 3 +-- + src/hb-fallback-shape.cc | 2 ++ + src/hb-graphite2.cc | 2 ++ + src/hb-uniscribe.cc | 2 ++ + 6 files changed, 24 insertions(+), 4 deletions(-) + +commit 4de03a1585cf735e3ac09847af761ff85fca5a02 +Author: Martin Hosken +Date: Fri Nov 10 13:47:38 2017 +0700 + + Fix graphite intergration reordered clusters problem + + src/hb-graphite2.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 8eed9cb11e28728a58e265fde5c13f519ccbdb4e +Author: Behdad Esfahbod +Date: Thu Nov 9 18:09:40 2017 -0800 + + [kern] Fix invalid memory access if offset is zero + + If offset is zero, we return Null() object. Wasn't prepared for that. + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=4088 + + src/hb-ot-kern-table.hh | 9 +++++---- + .../sha1sum/243798dd281c1c77c065958e1ff467420faa9bde.ttf | Bin 0 -> 225 bytes + test/shaping/tests/fuzzed.tests | 1 + + 3 files changed, 6 insertions(+), 4 deletions(-) + +commit b68fba4dc81ce2e7552c5d50a93013281889a65b +Author: Khaled Hosny +Date: Fri Nov 3 14:27:33 2017 +0200 + + [test] Use glyph ids instead of forcing ft funcs + + We were using ft funcs because these are CFF fonts, but we can avoid + glyph names instead and keep testing both ot and ft. + + test/shaping/tests/indic-consonant-with-stacker.tests | 8 ++++---- + test/shaping/tests/indic-script-extensions.tests | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 2fcfbcf8052bba0db7590a5f057730075fdbd5e1 +Author: Khaled Hosny +Date: Thu Nov 2 09:45:06 2017 +0200 + + [test] Fix another instance of component rounding + + See https://github.com/behdad/harfbuzz/pull/590#issuecomment-341194673 + + .../sha1sum/7ef276fc886ea502a03b9b0e5c8b547d5dc2b61c.ttf | Bin 784 -> 0 bytes + .../sha1sum/8228d035fcd65d62ec9728fb34f42c63be93a5d3.ttf | Bin 0 -> 784 bytes + test/shaping/tests/fallback-positioning.tests | 3 +-- + 3 files changed, 1 insertion(+), 2 deletions(-) + +commit c4f4c0a2faab0635dd2ab3078243994ad3066287 +Author: Behdad Esfahbod +Date: Wed Nov 8 17:04:31 2017 -0800 + + Fix indexing in unsafe-to-break marking for 'stch' feature + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=4099 + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 822035ce73931ccd5d2455584aad603037892498 +Author: Behdad Esfahbod +Date: Wed Nov 8 17:03:55 2017 -0800 + + [tests/arabic-stch.tests] Don't show flags + + We don't need to test the actual flag values. For unsafe-to-break, + the --verify in run-tests.sh checks what we are interested in. + + test/shaping/tests/arabic-stch.tests | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 53f0c27ddca92af1af27b6ffa9dcd0949afed664 +Author: Behdad Esfahbod +Date: Wed Nov 8 17:02:54 2017 -0800 + + Minor + + test/shaping/run-tests.sh | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 5a9cba9744876dfc56bdc9aed805f571bd0d4b0a +Author: David Corbett +Date: Wed Nov 8 13:15:27 2017 -0500 + + Mark non-initial left matras as unsafe to break + + src/hb-ot-shape-complex-indic.cc | 14 +++++++++----- + test/shaping/Makefile.am | 1 + + .../sha1sum/1a3d8f381387dd29be1e897e4b5100ac8b4829e1.ttf | Bin 0 -> 1380 bytes + test/shaping/tests/indic-init.tests | 1 + + 4 files changed, 11 insertions(+), 5 deletions(-) + +commit a6150306838b168475a9aa661ad569b0405c9f91 +Author: Behdad Esfahbod +Date: Mon Nov 6 15:40:07 2017 -0500 + + [kern] Implement format-2 kern subtable + + src/hb-ot-kern-table.hh | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 82a38d1f7a65537a4ef540af08c489512d6297ac +Author: Behdad Esfahbod +Date: Mon Nov 6 15:28:24 2017 -0500 + + [kern] Allow subtables longer than 64kb + + Apparently calibri.ttf does this: + https://github.com/fonttools/fonttools/pull/1094#discussion_r148933791 + + src/hb-ot-font.cc | 23 ++++++++++++++++++++++- + src/hb-ot-kern-table.hh | 41 +++++++++++++++++++++++++++++------------ + 2 files changed, 51 insertions(+), 13 deletions(-) + +commit 625ae08fcee747fbdc33a3a6865fb3aa425662ca +Author: Behdad Esfahbod +Date: Sat Nov 4 12:01:11 2017 -0400 + + [kern] Towards implementing format-2 + + src/hb-open-type-private.hh | 4 +-- + src/hb-ot-kern-table.hh | 69 +++++++++++++++++++++++++++------------------ + 2 files changed, 42 insertions(+), 31 deletions(-) + +commit 74e82adaea08ced18493e3341823dbd5b6cd493e +Author: David Corbett +Date: Mon Nov 6 14:41:55 2017 -0500 + + Mark glyphs involved in 'stch' as unsafe to break + + src/hb-ot-shape-complex-arabic.cc | 1 + + test/shaping/Makefile.am | 1 + + .../sha1sum/d9b8bc10985f24796826c29f7ccba3d0ae11ec02.ttf | Bin 0 -> 1420 bytes + test/shaping/tests/arabic-stch.tests | 1 + + 4 files changed, 3 insertions(+) + +commit 601126ad401d05b9c7fe4a34e870f1d1a1b057c8 +Author: Behdad Esfahbod +Date: Fri Nov 3 20:34:11 2017 -0400 + + [configure] Fix gobject default value in help output + + Fixes https://github.com/behdad/harfbuzz/issues/607 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5aad81943329df199501e9473e2cc39f9d4421a1 +Author: Behdad Esfahbod +Date: Fri Nov 3 17:16:26 2017 -0400 + + Simplify tracing code when tracing is disabled + + Fixes https://github.com/behdad/harfbuzz/pull/605 + + src/hb-debug.hh | 58 +++++++++++++++++++++++++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 10 +++---- + 2 files changed, 52 insertions(+), 16 deletions(-) + +commit 40ec3bbb55b8af1668bb3d5f6232a85b15cff136 +Author: Behdad Esfahbod +Date: Fri Nov 3 16:57:30 2017 -0400 + + Consolidate debug stuff into hb-debug.hh + + Part of fixing https://github.com/behdad/harfbuzz/pull/605 + + src/Makefile.sources | 1 + + src/hb-blob.cc | 7 +- + src/hb-coretext.cc | 8 +- + src/hb-debug.hh | 383 +++++++++++++++++++++++++++++++++++ + src/hb-directwrite.cc | 6 +- + src/hb-ft.cc | 7 +- + src/hb-object-private.hh | 8 +- + src/hb-open-type-private.hh | 21 +- + src/hb-ot-layout-common-private.hh | 8 +- + src/hb-ot-layout-gsubgpos-private.hh | 46 +---- + src/hb-ot-shape-complex-arabic.cc | 7 +- + src/hb-private.hh | 260 +----------------------- + src/hb-shape-plan.cc | 7 +- + src/hb-uniscribe.cc | 7 +- + 14 files changed, 404 insertions(+), 372 deletions(-) + +commit 384862d7ee2e27e6678844feafab69f03f77ac9a +Author: Behdad Esfahbod +Date: Fri Nov 3 16:31:47 2017 -0400 + + Remove NO_COPY() + + src/hb-ot-shape-private.hh | 4 +++- + src/hb-private.hh | 8 -------- + 2 files changed, 3 insertions(+), 9 deletions(-) + +commit 97145df2496f90e1ea4a41784f3224c60e973fd4 +Author: Unknown +Date: Fri Nov 3 09:05:00 2017 -0400 + + Trivial typos + + Found using `codespell -i 3 -w -I '../harf-whitelist.txt'` + whereas the whitelist contents were: + ``` + beng + iff + pres + ot + te + teh + ``` + + NEWS | 2 +- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-fallback.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 4a591a0e515f5c15c807fe648c073d249820e5ec +Author: ebraminio +Date: Thu Nov 2 09:33:12 2017 -0700 + + [ci] Add ArchLinux (#604) + + .circleci/config.yml | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +commit d18ee5afe8b1992d234402cd71f809cd904113a5 +Author: ebraminio +Date: Thu Nov 2 07:56:25 2017 -0700 + + Copy dummy docs/circle.yml to gh-pages branch (#603) + + .ci/deploy-docs.sh | 1 + + 1 file changed, 1 insertion(+) + +commit 1955cbecc98ee88ba8a62df1d8c77a09ed5d2c75 +Author: ebraminio +Date: Thu Nov 2 04:55:46 2017 -0700 + + Add a dummy CircleCI config to gh-pages branch (#602) + + docs/circle.yml | 3 +++ + 1 file changed, 3 insertions(+) + +commit 4b3278ef8dc71ad4f744d763068d9a2e02d3d75d +Author: Behdad Esfahbod +Date: Wed Nov 1 19:41:29 2017 -0600 + + [ot] Hook up horizontal kerning to kern table + + Seems to work. Yay! + + Still to do: run kerning if GPOS doesn't have 'kern' feature. + + src/hb-ot-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 77acc1106e6d984ee74ec606e145f455e6e55509 +Author: Behdad Esfahbod +Date: Wed Nov 1 19:33:09 2017 -0600 + + [kern] More... + + Almost there. + + src/hb-ot-font.cc | 14 +++++++++ + src/hb-ot-kern-table.hh | 75 ++++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 88 insertions(+), 1 deletion(-) + +commit 49c0f35580946c74bc64dae2d2c65c7834e46ab2 +Author: Behdad Esfahbod +Date: Wed Nov 1 18:16:07 2017 -0600 + + [kern] See if this helps with making VS bot happy + + src/hb-ot-kern-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 2c439210c9734cd21b08beba07d21147a6eb6d8a +Author: Behdad Esfahbod +Date: Wed Nov 1 18:13:35 2017 -0600 + + [uniscribe] Fix a couple of VS warnings + + src/hb-uniscribe.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4c43a23bf479b42d42192bab56df6075c8ae0090 +Author: Behdad Esfahbod +Date: Wed Nov 1 18:12:26 2017 -0600 + + [kern] Implement Format0 + + src/hb-ot-kern-table.hh | 51 +++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 45 insertions(+), 6 deletions(-) + +commit ac3d937c6cb0e2c7e019aa391b02da25aa6970de +Author: Behdad Esfahbod +Date: Wed Nov 1 17:54:56 2017 -0600 + + [kern] Implement some more + + src/hb-ot-kern-table.hh | 98 ++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 77 insertions(+), 21 deletions(-) + +commit 2a16f647ae4c5115a356ba82245c77e0d01fcebf +Author: Behdad Esfahbod +Date: Wed Nov 1 17:31:29 2017 -0600 + + [kern] Start implementing kern table + + Pushing this out early to catch bot errors since I'm using template tricks + we were not using in HarfBuzz before. + + src/Makefile.sources | 1 + + src/hb-ot-font.cc | 1 + + src/hb-ot-kern-table.hh | 184 ++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 186 insertions(+) + +commit 292ef2675edb2cb579210183e77ac30335318a21 +Author: ebraminio +Date: Wed Nov 1 16:24:46 2017 -0700 + + [ci] minor cleanup (#600) + + .circleci/config.yml | 4 ---- + 1 file changed, 4 deletions(-) + +commit 260246a279699d313a45583c6a61e4bab717f739 +Author: ebraminio +Date: Wed Nov 1 14:10:55 2017 -0700 + + [ci] Add Fedora builder (#598) + + .circleci/config.yml | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 0e63cbed9cceb1d0238974ddfa9bc68d25d9c616 +Author: Khaled Hosny +Date: Wed Nov 1 20:49:42 2017 +0200 + + [test] Fix difference between ft and ot font funcs + + See https://github.com/behdad/harfbuzz/pull/590#issuecomment-341194673. + + I simply removed the composite glyph and use the referenced simple + glyph directly. + + .../sha1sum/4fac3929fc3332834e93673780ec0fe94342d193.ttf | Bin 0 -> 804 bytes + .../sha1sum/6466d38c62e73a39202435a4f73bf5d6acbb73c0.ttf | Bin 824 -> 0 bytes + test/shaping/tests/cluster.tests | 2 +- + 3 files changed, 1 insertion(+), 1 deletion(-) + +commit 0b8f8dd869212ed2889cbdb79c4c4b639b8eff7a +Author: Khaled Hosny +Date: Wed Nov 1 20:33:43 2017 +0200 + + Revert "[test] We don’t care about glyph positions here" + + This reverts commit 70137e2b4b46918d9608f824a4b4b5cef2819158. + + test/shaping/tests/cluster.tests | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f1245013bf7e9d490b43d9b8bebd467b2c1d14cc +Author: Khaled Hosny +Date: Wed Nov 1 12:06:59 2017 +0200 + + [test] Run shaping tests with both ot and ft funcs + + test/shaping/run-tests.sh | 21 ++++++++++++++++----- + 1 file changed, 16 insertions(+), 5 deletions(-) + +commit 70137e2b4b46918d9608f824a4b4b5cef2819158 +Author: Khaled Hosny +Date: Wed Nov 1 12:03:39 2017 +0200 + + [test] We don’t care about glyph positions here + + Freetype and OT font functions give different positions for some glyphs + in this font (OT seems to be correct), but that is not what we are + interested in in this test. + + See https://github.com/behdad/harfbuzz/pull/590#issuecomment-341045223. + + test/shaping/tests/cluster.tests | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9234b364b178d44a11148d5c613169731667a2ae +Author: Khaled Hosny +Date: Wed Nov 1 10:34:36 2017 +0200 + + [test] Use ft functions for this test + + https://github.com/behdad/harfbuzz/pull/590#issuecomment-340967271 + + test/shaping/tests/vertical.tests | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit afbfb9279cbebcd0a85ab2fcc822a3fdbb035272 +Author: Khaled Hosny +Date: Mon Oct 30 22:02:50 2017 +0200 + + [test] Always use ft font funcs for these tests + + These are CFF fonts and ot functions don’t support CFF glyph names yet. + The next commit will run all tests with ot functions. + + test/shaping/tests/indic-consonant-with-stacker.tests | 8 ++++---- + test/shaping/tests/indic-script-extensions.tests | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 33e62636f739680ffbc1875391f05e80039a3259 +Author: ebraminio +Date: Wed Nov 1 03:05:46 2017 -0700 + + [ci] Add FreeBSD9 (gcc4) (#595) + + .circleci/config.yml | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit 102f5ead493ad2eac6c11c3fc8f2e793d3d57058 +Author: ebraminio +Date: Wed Nov 1 02:10:18 2017 -0700 + + Enable PSVita (arm-none-eabi) compile again and add it to CI (#594) + + .circleci/config.yml | 17 ++++++++++++++--- + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 4 ++-- + src/hb-open-file-private.hh | 2 +- + 4 files changed, 18 insertions(+), 7 deletions(-) + +commit 65d4e5bcda543c17e09867418365ba44b441d5d6 +Author: Behdad Esfahbod +Date: Wed Nov 1 01:15:27 2017 -0600 + + [CircleCI] Ignore gh-pages branch + + https://github.com/behdad/harfbuzz/pull/592 + + .circleci/config.yml | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 92bb5086424d7454d666732e39117a7d32490646 +Author: Behdad Esfahbod +Date: Tue Oct 31 22:58:03 2017 -0600 + + [indic] Use mutable for virama_glyph + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6c04dcb28dcafc7d97799c80c0bc714c76d51d1c +Author: Behdad Esfahbod +Date: Tue Oct 31 20:11:00 2017 -0600 + + Use bsearch() for large SFNT table directories + + src/hb-open-file-private.hh | 21 +++++++++------------ + 1 file changed, 9 insertions(+), 12 deletions(-) + +commit b0e33da02d062200dd41e4503ecc21fb4bd636e6 +Author: Behdad Esfahbod +Date: Tue Oct 31 20:05:37 2017 -0600 + + Add BinSearchArrayOf<> + + src/hb-open-file-private.hh | 25 +++++++++++-------------- + src/hb-open-type-private.hh | 33 ++++++++++++++++++++++++++++++++- + src/hb-ot-font.cc | 2 +- + 3 files changed, 44 insertions(+), 16 deletions(-) + +commit aca378f51ecf682ea1454071f671bbc7eef808bd +Author: Behdad Esfahbod +Date: Tue Oct 31 18:11:10 2017 -0600 + + Sanitize (Headless)ArrayOf()::len to ensure it doesn't use offsets + + src/hb-open-type-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5f047113142349ecf0dd6d00384f7ef7b3d1a85e +Author: Behdad Esfahbod +Date: Tue Oct 31 18:10:40 2017 -0600 + + Fix HeadlessArrayOf::sanitize_shallow() + + src/hb-open-type-private.hh | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +commit 7ce9f397d1e5fe68c49375ad904d4fce2c7ccc0a +Author: Behdad Esfahbod +Date: Tue Oct 31 15:34:01 2017 -0600 + + Rename hb-sort-r.hh -> hb-dsalgs.hh + + src/Makefile.sources | 2 +- + src/{hb-sort-r.hh => hb-dsalgs.hh} | 14 +++++++------- + src/hb-ot-post-table.hh | 2 +- + 3 files changed, 9 insertions(+), 9 deletions(-) + +commit 8eaff980fc6d15856fa853479454b58668809c7a +Author: Behdad Esfahbod +Date: Tue Oct 31 15:30:06 2017 -0600 + + Remove HB_TAG_CHAR4 + + src/hb-common.cc | 2 +- + src/hb-ot-tag.cc | 2 +- + src/hb-private.hh | 5 ----- + 3 files changed, 2 insertions(+), 7 deletions(-) + +commit d016c5bdb94704e726b104c318262b47c6a4b7c8 +Author: David Corbett +Date: Fri Oct 27 12:14:00 2017 -0400 + + Categorize Grantha candrabindu for use in Tamil + + src/hb-ot-shape-complex-indic.cc | 2 +- + .../sha1sum/b151cfcdaa77585d77f17a42158e0873fc8e2633.ttf | Bin 0 -> 1120 bytes + test/shaping/tests/indic-script-extensions.tests | 1 + + 3 files changed, 2 insertions(+), 1 deletion(-) + +commit b902605133ef4a411afdaa8abda194e81facf525 +Author: Behdad Esfahbod +Date: Tue Oct 31 14:25:46 2017 -0600 + + [CircleCI] Fix build + + Fixes https://github.com/behdad/harfbuzz/issues/589 + + .circleci/config.yml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 0f78d78aae604cb8e61bd21785adb915da74626e +Merge: b7982c9e 0feff4ba +Author: Behdad Esfahbod +Date: Tue Oct 31 14:13:31 2017 -0600 + + Merge commit '0feff4ba7b16501341c575e06b4c98a6e1bd2809' + +commit 0feff4ba7b16501341c575e06b4c98a6e1bd2809 +Author: Behdad Esfahbod +Date: Tue Oct 31 14:02:32 2017 -0600 + + Simplify hb-sort-r.hh + + See https://github.com/behdad/harfbuzz/pull/592 + + src/hb-sort-r.hh | 147 ++++++------------------------------------------------- + 1 file changed, 14 insertions(+), 133 deletions(-) + +commit b7982c9e65e0b58616cc8264dd52cac37753ef79 +Author: ebraminio +Date: Tue Oct 31 12:42:08 2017 -0700 + + [ci] Add CircleCI for cross-compiling (#592) + + .circleci/config.yml | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + README | 1 + + 2 files changed, 62 insertions(+) + +commit c290ba5b7d4e9e4a5f02340a22e6c9c46564906b +Author: Behdad Esfahbod +Date: Tue Oct 31 13:18:21 2017 -0600 + + Define _GNU_SOURCE + + Might help with https://github.com/behdad/harfbuzz/pull/592 + Ie. bringing in qsort_r() prototype always. + + src/hb-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 98acdde3c6bd0745c3cbfb510e82fbd87ebd1a33 +Author: Behdad Esfahbod +Date: Tue Oct 31 11:17:43 2017 -0600 + + [coretext/uniscribe] Fix build + + https://travis-ci.org/behdad/harfbuzz/jobs/295039536#L3468 + https://ci.appveyor.com/project/behdad/harfbuzz/build/1.0.697/job/dr1ujlntxafeqbej#L142 + + src/hb-coretext.cc | 8 ++++++-- + src/hb-uniscribe.cc | 8 ++++++-- + 2 files changed, 12 insertions(+), 4 deletions(-) + +commit ec86cc5e552e9e8d64101feb1f540a9dc94a9025 +Author: Behdad Esfahbod +Date: Mon Oct 30 14:11:59 2017 -0600 + + Fix Windows build + + (And prevent it from happening in the future.) + + src/hb-ot-layout.cc | 1 + + src/hb-ot-name-table.hh | 4 +++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit e35a763c07b60da6e5fbdb6edd9d25f575cd3d8b +Author: Behdad Esfahbod +Date: Mon Oct 30 13:15:05 2017 -0600 + + [post] Implement glyph_from_name() + + This concludes https://github.com/behdad/harfbuzz/pull/568 + + src/hb-ot-post-table.hh | 119 ++++++++++++++++++++++++++++++++++++------------ + src/hb-private.hh | 10 ++-- + src/hb-sort-r.hh | 2 +- + 3 files changed, 96 insertions(+), 35 deletions(-) + +commit 6c738f353ec4ab5974414fbb8ff1fb9383c4bde6 +Author: Behdad Esfahbod +Date: Mon Oct 30 12:21:44 2017 -0600 + + Make string-array return hb_string_t + + src/hb-ot-post-table.hh | 17 ++--------------- + src/hb-string-array.hh | 11 +++++++++-- + 2 files changed, 11 insertions(+), 17 deletions(-) + +commit e1a37f3db4f2364e98ff057209a94aa9b23e5c9d +Author: Behdad Esfahbod +Date: Mon Oct 30 11:42:28 2017 -0600 + + Add hb_string_t + + src/hb-ot-post-table.hh | 25 ++++++++----------------- + src/hb-private.hh | 27 +++++++++++++++++++++++++++ + 2 files changed, 35 insertions(+), 17 deletions(-) + +commit 21ac5678583259e673d961a26fadaad2bf33f1f8 +Author: Behdad Esfahbod +Date: Mon Oct 30 09:48:09 2017 -0600 + + Fix tests + + src/check-includes.sh | 2 +- + src/hb-sort-r.hh | 32 ++++++++++++++++++++++++++++++-- + 2 files changed, 31 insertions(+), 3 deletions(-) + +commit 0f8b5aa1bc2c831044a35fc8e52df58652cec86b +Author: Behdad Esfahbod +Date: Mon Oct 30 09:46:36 2017 -0600 + + [post] Minor; towards implementing get_glyph_from_name() + + src/hb-ot-post-table.hh | 56 +++++++++++++++++++++++++++---------------------- + 1 file changed, 31 insertions(+), 25 deletions(-) + +commit 977679f229a10868dc668294082bd82125e4fe48 +Author: Behdad Esfahbod +Date: Sun Oct 29 17:33:32 2017 -0600 + + Add hb_bsearch_r() + + src/hb-ot-post-table.hh | 1 + + src/hb-sort-r.hh | 25 +++++++++++++++++++++++++ + 2 files changed, 26 insertions(+) + +commit 0712e915b4814e350aa1d833c1dee5010cdbd8f9 +Author: Behdad Esfahbod +Date: Sun Oct 29 17:01:47 2017 -0600 + + Remove hb_compare_func_t + + src/hb-ot-map-private.hh | 18 +++++++++++++----- + src/hb-ot-name-table.hh | 2 +- + src/hb-ot-tag.cc | 8 +++++--- + src/hb-ot-var-mvar-table.hh | 10 +++++++--- + src/hb-private.hh | 9 ++------- + 5 files changed, 28 insertions(+), 19 deletions(-) + +commit 538da7496d70c86b41070ecf52592e52920d8808 +Author: Behdad Esfahbod +Date: Sun Oct 29 16:38:58 2017 -0600 + + Add hb-sort-r, a portable qsort_r() replacement + + src/Makefile.sources | 1 + + src/hb-sort-r.hh | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 228 insertions(+) + +commit 923a8f520addba095384b975ba8934e5a18fb696 +Author: Behdad Esfahbod +Date: Sun Oct 29 15:00:54 2017 -0600 + + Fix up 5de83fab947e23cc729d69f8d44a28311298af9d + + src/hb-ot-post-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b98c7c3f1fc8581ce9a0f40ae25aee5e1b2b3106 +Author: Behdad Esfahbod +Date: Sun Oct 29 14:52:52 2017 -0600 + + [post] Minor + + src/hb-ot-post-table.hh | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit 5de83fab947e23cc729d69f8d44a28311298af9d +Author: Behdad Esfahbod +Date: Sat Oct 28 19:54:04 2017 -0600 + + [ot] Speed up get_glyph_name() + + get_glyph_from_name() coming soon. + + src/hb-ot-font.cc | 13 ++-- + src/hb-ot-post-table.hh | 160 +++++++++++++++++++------------------------ + src/test-buffer-serialize.cc | 4 +- + 3 files changed, 81 insertions(+), 96 deletions(-) + +commit feadee079e09e43e5f712a66816605e19155594e +Author: Behdad Esfahbod +Date: Sat Oct 28 16:58:56 2017 -0600 + + [post] Refactor a bit, use our data types + + src/hb-ot-post-table.hh | 25 ++++++++++--------------- + 1 file changed, 10 insertions(+), 15 deletions(-) + +commit 5014c60afaab51a7a4813cf427a3d6053458279b +Author: Behdad Esfahbod +Date: Sat Oct 28 12:00:49 2017 -0600 + + More nullptr fix + + Fixes https://github.com/behdad/harfbuzz/issues/585 + + src/test.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 5daf3bd4494cce6b4fb074533be9e99c4d9e0edd +Author: Behdad Esfahbod +Date: Fri Oct 27 16:34:01 2017 -0600 + + [glib/ucdn/icu/ft/ot] Make returned funcs inert + + Such that client cannot accidentally destroy them, even though that + will be a bug in their code... + + src/hb-ft.cc | 3 +++ + src/hb-glib.cc | 3 +++ + src/hb-icu.cc | 3 +++ + src/hb-object-private.hh | 37 +++++++++++++++++++++++++++++++------ + src/hb-ot-font.cc | 3 +++ + src/hb-ucdn.cc | 3 +++ + 6 files changed, 46 insertions(+), 6 deletions(-) + +commit bfa7f37a73508ca185cf2f3e06755db8c8258ddf +Author: Behdad Esfahbod +Date: Fri Oct 27 16:03:51 2017 -0600 + + Fix previous commit + + Oops. + + src/hb-glib.cc | 2 +- + src/hb-icu.cc | 2 +- + src/hb-ucdn.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 8864864b624590d95ae5dca61956695cbff1269a +Author: Behdad Esfahbod +Date: Fri Oct 27 15:26:45 2017 -0600 + + [glib/icu/ucdn] Make the funcs object allocated on demand + + src/hb-glib.cc | 36 +++++++++++++++++++++++++++++------- + src/hb-icu.cc | 51 +++++++++++++++++++++++++++++++++++++-------------- + src/hb-ucdn.cc | 37 +++++++++++++++++++++++++++++-------- + 3 files changed, 95 insertions(+), 29 deletions(-) + +commit af3f72f9eb7d7b80ea827976a3303390b5deae8d +Author: Behdad Esfahbod +Date: Fri Oct 27 15:13:50 2017 -0600 + + Correctly mark NullPool const + + Saves some more code size as well! + + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout.cc | 2 +- + src/main.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 51f4d4d5cd5a0dd1a581bee5b55b3cc0a74cbea3 +Author: Behdad Esfahbod +Date: Fri Oct 27 15:09:22 2017 -0600 + + Reduce prealloced number of user-data items from 2 to 1 + + Even 1 is too many but putting 0 breaks compile. Saves 3k in .so + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3205de7906abab9d12e614e86e2c182a41420698 +Author: Behdad Esfahbod +Date: Fri Oct 27 15:01:40 2017 -0600 + + Make the NullPool HB_INTERNAL shared + + Saves 2k of .bss section. + + src/hb-open-type-private.hh | 10 ++++++---- + src/hb-ot-layout.cc | 3 +++ + src/main.cc | 1 + + 3 files changed, 10 insertions(+), 4 deletions(-) + +commit 7036f1d22c4001b79d3205c16aac3fefbfcaae24 +Author: Behdad Esfahbod +Date: Fri Oct 27 14:42:59 2017 -0600 + + [ot] Remove shaper name + + In ten years we never used them... + + src/hb-ot-shape-complex-arabic.cc | 1 - + src/hb-ot-shape-complex-default.cc | 1 - + src/hb-ot-shape-complex-hangul.cc | 1 - + src/hb-ot-shape-complex-hebrew.cc | 1 - + src/hb-ot-shape-complex-indic.cc | 1 - + src/hb-ot-shape-complex-myanmar.cc | 2 -- + src/hb-ot-shape-complex-private.hh | 2 -- + src/hb-ot-shape-complex-thai.cc | 1 - + src/hb-ot-shape-complex-tibetan.cc | 1 - + src/hb-ot-shape-complex-use.cc | 1 - + 10 files changed, 12 deletions(-) + +commit 4a27c17ea0234dfe33e62f5830d9f92c26d48d30 +Author: Behdad Esfahbod +Date: Fri Oct 27 14:29:12 2017 -0600 + + Fix IntType.cmp() to avoid narrowing down integer types + + Fixes https://github.com/behdad/harfbuzz/issues/571 + + src/hb-open-type-private.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 919b4b76a7b1f9dd7c71310a729982242f9060a5 +Author: Behdad Esfahbod +Date: Fri Oct 27 10:29:25 2017 -0600 + + Make c++11 optional + + Fixes https://github.com/behdad/harfbuzz/issues/585 + + configure.ac | 4 +- + m4/ax_cxx_compile_stdcxx.m4 | 982 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 983 insertions(+), 3 deletions(-) + +commit 6c4689704071a76c49be819b8034feaf93e26a42 +Author: Behdad Esfahbod +Date: Fri Oct 27 10:24:58 2017 -0600 + + [m4] Update ax_pthread.m4 + + m4/ax_pthread.m4 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 2e025507634e54a64fa5d0cbfefc4b65177c06c5 +Author: Behdad Esfahbod +Date: Fri Oct 27 10:23:01 2017 -0600 + + [git.mk] Update + + git.mk | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 55 insertions(+), 2 deletions(-) + +commit 62e312ead808cec055049592b0d40aa3a8882bc9 +Author: Behdad Esfahbod +Date: Fri Oct 27 09:29:20 2017 -0600 + + Use NULL instead of polyfill, if nullptr is not available + + Part of fixing https://github.com/behdad/harfbuzz/issues/585 + + src/hb-private.hh | 22 +++------------------- + 1 file changed, 3 insertions(+), 19 deletions(-) + +commit 17f40b7cad240eadeccdf23eb11da7ed52252ca2 +Author: Behdad Esfahbod +Date: Fri Oct 27 09:22:30 2017 -0600 + + Include hb-private.hh more consistently + + Part of fixing https://github.com/behdad/harfbuzz/issues/585 + + src/test-buffer-serialize.cc | 4 +--- + src/test-size-params.cc | 4 +--- + src/test-would-substitute.cc | 4 +--- + util/ansi-print.hh | 1 + + util/helper-cairo-ansi.hh | 5 +++-- + util/helper-cairo.hh | 7 ++++--- + util/main-font-text.hh | 5 +++-- + util/options.hh | 11 +---------- + util/shape-consumer.hh | 5 +++-- + util/view-cairo.hh | 7 ++++--- + 10 files changed, 22 insertions(+), 31 deletions(-) + +commit 42d518513c683fd5e932898ceec891c3003d75e1 +Author: Behdad Esfahbod +Date: Fri Oct 27 00:25:11 2017 -0600 + + Towards compiling with pre-C++11 compilers and nullptr fallback + + https://github.com/behdad/harfbuzz/issues/585 + + src/hb-atomic-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0e9256984e76f055f1868ecc497724977caba11d +Author: Behdad Esfahbod +Date: Thu Oct 26 20:34:04 2017 -0600 + + [post] Make format1 names array avoid relocations + + src/Makefile.sources | 1 + + src/hb-ot-post-macroman.hh | 294 +++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-post-table.hh | 55 ++------- + 3 files changed, 305 insertions(+), 45 deletions(-) + +commit 2a749680441bbe6b4aa8134bb6ce9f21a8b1bc3c +Author: Behdad Esfahbod +Date: Thu Oct 26 19:48:33 2017 -0600 + + Add hb-string-array.hh + + Used to build static string arrays that use no relocation. + + src/Makefile.sources | 1 + + src/hb-private.hh | 6 ++-- + src/hb-string-array.hh | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 79 insertions(+), 2 deletions(-) + +commit 6f08b12bc38166dee2f9740d396d617b32e887a3 +Author: Behdad Esfahbod +Date: Thu Oct 26 18:23:03 2017 -0600 + + Minor + + src/hb-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 223686d64f5e149ba8aa334a2a54bd5b22017d9e +Author: Behdad Esfahbod +Date: Thu Oct 26 12:52:02 2017 -0600 + + 1.6.3 + + NEWS | 9 +++++++++ + configure.ac | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +commit 729c9e13355eefafdc0fdef9aa68bd792ca4dba4 +Author: David Corbett +Date: Thu Oct 26 10:29:28 2017 -0400 + + Include all relevant glyphs in the subsetted font + + test/shaping/record-test.sh | 2 ++ + 1 file changed, 2 insertions(+) + +commit cb6c6b0c425e560f32b297c15dc6775e297d5b1d +Author: Behdad Esfahbod +Date: Thu Oct 26 11:43:33 2017 -0600 + + Fix warning + + https://github.com/behdad/harfbuzz/commit/49a41dc75931cc2d2f7e74b7801f8cc327039e8e#commitcomment-25203194 + + test/api/test-set.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit dfd234a97d2e2f9908eaf0598de765f76ba86c82 +Author: Jonathan Kew +Date: Thu Oct 26 16:59:50 2017 +0100 + + [set] Fix page_map[] indexing in backward loop. + + Fixes https://github.com/behdad/harfbuzz/issues/579. + + src/hb-set-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7339926525416620aa7922371775ed65eed4eae4 +Author: Jonathan Kew +Date: Thu Oct 26 12:55:36 2017 +0100 + + [test] Extend hb_set test for issue 579 (currently failing) + + test/api/test-set.c | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit 3d6f7df42a87ef366197581cb4696c5f30c3bcbb +Author: Jonathan Kew +Date: Thu Oct 26 17:54:55 2017 +0100 + + [test] Additional coverage in test_set_iter. + + This adds a couple extra entries to the set used, such that iteration + would fail in 1.6.2 due to the bug in hb_set_t::page_t::next(). + + test/api/test-set.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit d511cfb5577a58e31d8dd4214750b0ad4efa625a +Author: Jonathan Kew +Date: Thu Oct 26 15:08:29 2017 +0100 + + [set] Bugfix for hb_set_next + + src/hb-set-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 92bac64bd2d5fffe70229790be27d335aa6c6de3 +Author: Behdad Esfahbod +Date: Wed Oct 25 18:22:47 2017 -0600 + + [post] Oops! + + https://ci.appveyor.com/project/behdad/harfbuzz/build/1.0.668/job/ikfj8peowgrp059t + + src/hb-ot-post-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 543bd58d7a4fbe285ec9304ff3223a728dbdbb76 +Author: Behdad Esfahbod +Date: Wed Oct 25 17:40:50 2017 -0600 + + [post] Touch up and fixes + + The get_glyph_from_name() is incorrect; needs fixing. + + src/hb-ot-font.cc | 9 ++-- + src/hb-ot-post-table.hh | 139 +++++++++++++++++++++++++++--------------------- + 2 files changed, 81 insertions(+), 67 deletions(-) + +commit d9e166f74c3ba3128c9ef3ccd8d7799e67f14eab +Author: Khaled Hosny +Date: Wed Oct 18 20:49:16 2017 +0200 + + [ot-font] Implement hb_ot_get_glyph_from_name + + src/hb-ot-font.cc | 22 ++++++++++++++++++- + src/hb-ot-post-table.hh | 58 +++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 79 insertions(+), 1 deletion(-) + +commit 9d4d2fb9af446d5d41058fbb1da8117b3af048d3 +Author: Khaled Hosny +Date: Mon Oct 16 10:05:42 2017 +0200 + + [ot-font] Implement hb_ot_get_glyph_name + + Turns out we already have support for “post” table, it just needed to be + activated and put in use. + + src/hb-ot-font.cc | 46 ++++++++++++- + src/hb-ot-post-table.hh | 96 +++++++++++++++++++++++++++ + test/shaping/tests/fallback-positioning.tests | 2 +- + test/shaping/tests/indic-syllable.tests | 2 +- + test/shaping/tests/use.tests | 2 +- + 5 files changed, 143 insertions(+), 5 deletions(-) + +commit bf133497e53e8b1dcd22df62080d33e7f3d85b68 +Merge: fd786c76 49a41dc7 +Author: Behdad Esfahbod +Date: Wed Oct 25 17:23:20 2017 -0600 + + Merge commit '49a41dc75931cc2d2f7e74b7801f8cc327039e8e' + +commit 49a41dc75931cc2d2f7e74b7801f8cc327039e8e +Author: Behdad Esfahbod +Date: Wed Oct 25 16:17:45 2017 -0600 + + [test] Add more hb-set tests + + https://github.com/behdad/harfbuzz/issues/579 + + test/api/test-set.c | 40 ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) + +commit fd786c768f838ab61090004dd46b8cefeb270dfd +Author: David Corbett +Date: Wed Oct 25 14:31:22 2017 -0400 + + Use `mktemp -d` instead of `mktemp --directory` + + test/shaping/record-test.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c4944920c0c11d6424d600ebc9130c9055382f80 +Author: David Corbett +Date: Wed Oct 25 16:06:40 2017 -0400 + + Fix and run indic-script-extensions.tests + + test/shaping/Makefile.am | 1 + + test/shaping/tests/indic-script-extensions.tests | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit d8df714251c61e13d7d12eb3f7393dd3a75a3719 +Author: David Corbett +Date: Wed Oct 25 16:06:01 2017 -0400 + + Fix code point iteration in narrow Python + + test/shaping/hb_test_tools.py | 27 ++++++++++++++++++++++++++- + 1 file changed, 26 insertions(+), 1 deletion(-) + +commit 33ca3b67bfb5d9ae4e490c796c93793a7e03ef2c +Author: Behdad Esfahbod +Date: Wed Oct 25 12:09:11 2017 -0400 + + Check for headers in builddir first, in check-*.sh + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=103346 + + src/check-c-linkage-decls.sh | 4 ++-- + src/check-externs.sh | 2 +- + src/check-header-guards.sh | 2 +- + src/check-includes.sh | 4 ++-- + 4 files changed, 6 insertions(+), 6 deletions(-) + +commit 9ac2e5c6c01db3ebe419e3aa07f4d1a3777d2bb6 +Author: Behdad Esfahbod +Date: Tue Oct 24 10:06:25 2017 -0400 + + check-externs.sh: Make output more verbose + + Trying to figure out why this is failing on some Debian bots: + https://bugs.freedesktop.org/show_bug.cgi?id=103346 + + Maybe I should check for GNU grep specifically now that I'm using -n as well. + + src/check-externs.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 3b7388aab6889b5d1fc602b5780a7b29da84e100 +Author: Behdad Esfahbod +Date: Mon Oct 23 14:35:16 2017 -0400 + + 1.6.2 + + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 30a591e3cef67818ef1ffec92c6a022b5a5f5e77 +Author: Behdad Esfahbod +Date: Mon Oct 23 14:28:35 2017 -0400 + + [set] Rewrite another way :P + + src/hb-set-private.hh | 25 +++++++++++++------------ + 1 file changed, 13 insertions(+), 12 deletions(-) + +commit 8170801d78a5bf9480d8c06ade849b30bc4e2956 +Author: Behdad Esfahbod +Date: Mon Oct 23 14:26:48 2017 -0400 + + [set] Fix crash + + Ouch! That's what happens when one plays with increment/decrement operators! + + Fixes https://github.com/behdad/harfbuzz/issues/578 + + src/hb-set-private.hh | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 61d1c60a1c555c58205964df4e449ee57125a739 +Author: Behdad Esfahbod +Date: Mon Oct 23 13:10:21 2017 -0400 + + [RELEASING] Format + + RELEASING.md | 67 +++++++++++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 48 insertions(+), 19 deletions(-) + +commit 6a2e1649debd992211bf96ef80d075d2d04a49ed +Author: Behdad Esfahbod +Date: Mon Oct 23 13:01:34 2017 -0400 + + [doap] Switch to github issues + + https://github.com/behdad/harfbuzz/pull/575#issuecomment-338514596 + + harfbuzz.doap | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8a898c1929cf7ffc9b0011461b34281ecc98705c +Author: Behdad Esfahbod +Date: Mon Oct 23 13:00:36 2017 -0400 + + [RELEASING] Minor + + https://github.com/behdad/harfbuzz/pull/575 + + RELEASING.md | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2ee710e02fad1a8a4b94589bb6f0b90e2aeb7121 +Author: Behdad Esfahbod +Date: Mon Oct 23 08:37:48 2017 -0400 + + Minor + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dd33e4e96b9345a6b1a9051a6aa4b7d114c74f1e +Author: Behdad Esfahbod +Date: Mon Oct 23 08:36:40 2017 -0400 + + [set] Don't use major() + + Fixes https://github.com/behdad/harfbuzz/issues/577 + + src/hb-set-private.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit d0f0ff85b9fe959ef4b90f8daf58be73fca49dd0 +Author: Behdad Esfahbod +Date: Mon Oct 23 08:34:30 2017 -0400 + + [set] Don't use PAGE_SIZE + + Fixes https://github.com/behdad/harfbuzz/issues/576 + + src/hb-set-private.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 57cf978fa314bd87405a2b133e58fcb116e574a6 +Merge: ce979454 6cc49762 +Author: Behdad Esfahbod +Date: Sun Oct 22 18:24:59 2017 -0400 + + Merge commit '6cc49762c4fdfd0e2770a84d1b1f055acf42376f' + +commit ce979454400c3870717ba40b1065a2f3727cfb93 +Author: Behdad Esfahbod +Date: Sun Oct 22 18:23:38 2017 -0400 + + [icu] Fix error check + + src/hb-icu.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6cc49762c4fdfd0e2770a84d1b1f055acf42376f +Merge: 8b9d9b71 19923279 +Author: ebraminio +Date: Mon Oct 23 01:48:22 2017 +0330 + + Merge pull request #575 from behdad/releasing-edit + + Clarify the last step of release + +commit 19923279abd4c7615e8b02e05a02ba18f5c0b298 +Author: ebraminio +Date: Mon Oct 23 01:47:51 2017 +0330 + + Clarify the last step of release + + RELEASING.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8b9d9b71b04c9d5698ec146658b31381060c700d +Author: Behdad Esfahbod +Date: Sun Oct 22 17:48:06 2017 -0400 + + Fix set initialization issues + + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++------ + src/hb-ot-shape.cc | 17 +++++++++-------- + src/hb-set-private.hh | 9 --------- + src/hb-set.cc | 6 ++++-- + 4 files changed, 19 insertions(+), 25 deletions(-) + +commit 0ca915efc3734111a57ff71f05d9cbf0e8af3de9 +Author: Behdad Esfahbod +Date: Sun Oct 22 17:38:33 2017 -0400 + + 1.6.1 + + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit d59d5dc7d339deb45cc84cffd084b52752765a08 +Merge: ced86da7 3ee15a60 +Author: Behdad Esfahbod +Date: Sun Oct 22 17:08:29 2017 -0400 + + Merge commit '3ee15a60358f4d894bbf2431d7a7df38b7acc4ce' + +commit ced86da7ddbbd0d64f8ba1290b8e67600b1db2d4 +Author: Behdad Esfahbod +Date: Sun Oct 22 17:03:36 2017 -0400 + + Another try at fixing mingw32 build bot fail + + src/hb-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit bc1183aa6ba45a527084d391d6e7f801d6196060 +Merge: d45a2138 bfe0faf1 +Author: Behdad Esfahbod +Date: Sun Oct 22 17:06:00 2017 -0400 + + Merge commit 'bfe0faf1a2d39302129a7202994456afd96694ca' + +commit 3ee15a60358f4d894bbf2431d7a7df38b7acc4ce +Author: Behdad Esfahbod +Date: Sun Oct 22 17:03:36 2017 -0400 + + Another try at fixing mingw32 build bot fail + + src/hb-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit bfe0faf1a2d39302129a7202994456afd96694ca +Author: Behdad Esfahbod +Date: Sun Oct 22 15:54:50 2017 -0400 + + [docs] Deprecate hb_set_invert() + + docs/harfbuzz-sections.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d45a2138d9d54eab158046d6503f1bb104efce25 +Merge: d8adaa97 41b18251 +Author: ebraminio +Date: Sat Oct 21 10:19:55 2017 +0330 + + Merge pull request #572 from fanc999/master.msvc + + builds: Support HarfBuzz-GObject and introspection in CMake builds + +commit d8adaa97fbf33071b8a4b5c05c3f2f15f2fd22ea +Author: Behdad Esfahbod +Date: Fri Oct 20 13:57:43 2017 -0400 + + Another try at fixing build bots + + hb-ot-shape.cc:287:18: error: comparison of constant 32 with expression of type 'hb_unicode_general_category_t' is always true [-Werror,-Wtautological-constant-out-of-range-compare] + + src/hb-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6058f98825e8f134893a1bbfb402e45d85b56ff0 +Author: Behdad Esfahbod +Date: Thu Oct 19 11:39:52 2017 -0700 + + Remove FLAG_SAFE() + + No flag is safe, over time... See previous commit. + + src/hb-ot-shape-complex-arabic.cc | 4 ++-- + src/hb-ot-shape-complex-indic.cc | 12 ++++++------ + src/hb-ot-shape-complex-use.cc | 2 +- + src/hb-private.hh | 5 ++--- + src/hb-unicode-private.hh | 4 ++-- + 5 files changed, 13 insertions(+), 14 deletions(-) + +commit 7c561dacc3c5fb9306db8bda27b7289331bd523f +Author: Behdad Esfahbod +Date: Thu Oct 19 11:35:51 2017 -0700 + + [myanmar] Fix unsafe usage of FLAG_SAFE() + + The commit f559c633073f63b9d87cb2440048b4413cfa1c05 caused + "undefined-shift" errors in Myanmar shaper as we changed the + numeric value of type D from 19 to 32 there, making the + "FLAG_SAFE (info.myanmar_category())" wrong. + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=3546 + + src/hb-ot-shape-complex-myanmar.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 41b1825196235d4337c76f97e09f0b7c6d6c56ae +Author: Chun-wei Fan +Date: Thu Oct 19 18:36:32 2017 +0800 + + CMake builds: Support introspection builds + + This adds support for introspection builds on Windows that is enabled by + the HB_HAVE_INTROSPECTION option, which will also enable HB_HAVE_GOBJECT + (and so HB_HAVE_GLIB) as they are required for introspection. + + In order for this to work one must ensure that the Python installation + listed in PYTHON_EXECUTABLE is the same Python release series that was + used to build _giscanner.pyd (the Python module that is used by + g-ir-scanner), with the same architecture. PKG_CONFIG_PATH and PATH + must be set correctly if $(PREFIX)\bin and/or $(PREFIX)\lib\pkgconfig + are not in the standard PATH and PKG_CONFIG_PATH, which is actually + in-line with the *NIX builds. + + CMakeLists.txt | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 154 insertions(+), 7 deletions(-) + +commit 53db221259b5eea4d2244321b2fe96beb39aef7d +Author: Chun-wei Fan +Date: Wed Oct 18 15:43:57 2017 +0800 + + CMake: Support building HarfBuzz-GObject + + This adds support to the CMake build files to support building + HarfBuzz-GObject, which is actually a little bit complicated, + as we need to: + + -Run glib-mkenums, which is a Python (for newer GLib/GObject) or PERL + (for older, pre 2.53.4, GLib/GObject) script. This matters more for + Visual Studio builds as shebang lines are not supported, so we need to + test-run it with PERL or Python to determine which is the correct + interpretor to use. + + -Next, we need to replace strings in the sources that we obtain from + running glib-mkenums. So, the solution here is to use a small utility + CMake script for our purposes here, to maintain maximum compatibility. + + -Ensure that things do work in the Visual Studio IDE builds. + + CMakeLists.txt | 128 +++++++++++++++++++++++++++++++++++++++++++++ + Makefile.am | 1 + + replace-enum-strings.cmake | 21 ++++++++ + 3 files changed, 150 insertions(+) + +commit 162575f2c69f519aae1b18ff1c501e7e4c2cdd4b +Author: Chun-wei Fan +Date: Wed Oct 18 22:27:28 2017 +0800 + + CMake builds: Fix builds + + Include the fallback sources in the build, and update + src/Makefile.sources so that it can be read by the CMake build files. + + Fix a typo in the DirectWrite configure option so that we can properly + enable DirectWrite builds. + + Also, when building the utility program, install them as well. + + CMakeLists.txt | 21 ++++++++++++++++++++- + src/Makefile.sources | 4 +++- + 2 files changed, 23 insertions(+), 2 deletions(-) + +commit d6f612fac800c31989c298b5101845baed2297b1 +Author: Behdad Esfahbod +Date: Tue Oct 17 16:32:12 2017 -0700 + + [bsearch] Micro-optimization + + src/hb-open-type-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 41b1984be946cc2f53313dd48eac392cc8a3ad2b +Author: Fredrik Roubert +Date: Tue Oct 17 15:06:31 2017 -0700 + + Switch from ICU deprecated unorm_normalize to unorm2_normalize. (#569) + + The new unorm2_normalize has been public API since ICU 4.4, while + the old unorm_normalize has been deprecated since ICU 56. + + Now, beginning with ICU 60, unorm_normalize will also be annotated + U_DEPRECATED and trigger the compiler -Wdeprecated-declarations warning. + + src/hb-icu.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit b98adefbb9ee45fc1e800a52f701bf4224e9bb81 +Author: Behdad Esfahbod +Date: Tue Oct 17 12:00:34 2017 -0700 + + Update docs symbols + + docs/harfbuzz-sections.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit ba8b56960733b25bbb88fbdb60e7e244127d6e0c +Author: Behdad Esfahbod +Date: Tue Oct 17 11:16:36 2017 -0700 + + Try fixing build on VC + + c:\projects\harfbuzz\src\hb-set-private.hh(151): error C2327: 'hb_set_t::page_t::v': is not a type name, static, or enumerator [C:\projects\harfbuzz\build\harfbuzz.vcxproj] + + src/hb-set-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 80cc0a7e3e05fb7fcfbdc0188cb60b115ad47d04 +Author: Behdad Esfahbod +Date: Tue Oct 17 11:14:48 2017 -0700 + + [coretext] Fix build + + error: static_assert expression is not an integral constant expression + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a11249ee93439856ea2410524b993ac1f1379961 +Author: Behdad Esfahbod +Date: Mon Oct 16 01:33:32 2017 -0400 + + [set] Fix merge logic + + src/hb-set-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ab8f327eb47184409d9e9208ca46b631d1afd0d4 +Author: Behdad Esfahbod +Date: Sun Oct 15 18:21:35 2017 -0400 + + Ouch. + + src/hb-set-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bb9917913f735855aea54f41f10e0c7be3632e88 +Author: Behdad Esfahbod +Date: Sun Oct 15 18:20:25 2017 -0400 + + [set] Disable vectorization + + Fixes clang "non-const reference cannot bind to vector element" error. + + src/hb-set-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 221ce6c18f2a1e878b68eb0a97f235efa4c044d3 +Author: Behdad Esfahbod +Date: Sun Oct 15 17:58:58 2017 -0400 + + Fix bots + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0cf7d957b7ffb17c4cec75b631c9829327ab5d52 +Author: Behdad Esfahbod +Date: Sun Oct 15 17:01:31 2017 -0400 + + [set] Remove TODO items not worth pursuing + + src/hb-set-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit 10d43658e7655b36cb86e674dde8af4036b7cc52 +Author: Behdad Esfahbod +Date: Sun Oct 15 16:56:05 2017 -0400 + + [set] Speed up intersects() + + src/hb-set-private.hh | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +commit 56ef4e0c52d5b474518bf0c1e4adba80f2ae6946 +Author: Behdad Esfahbod +Date: Sun Oct 15 16:38:29 2017 -0400 + + Simplify hb_prealloced_array_t initialization + + src/hb-private.hh | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit 7737e87ac4582d57945f3ffbbae1012f62c6b482 +Author: Behdad Esfahbod +Date: Sun Oct 15 16:21:03 2017 -0400 + + Properly detect vector_size attribute and use fallback otherwise + + src/hb-private.hh | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-set-private.hh | 62 ++--------------------------------------------- + 2 files changed, 69 insertions(+), 60 deletions(-) + +commit f8a0ec50e23264fdfe9e3a5a2e0453a87f415b3d +Author: Behdad Esfahbod +Date: Sun Oct 15 16:10:35 2017 -0400 + + [set] Add fallback implementation of int-vector type + + src/hb-set-private.hh | 64 ++++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 45 insertions(+), 19 deletions(-) + +commit deed4a48d15d4a475f8695aa3269547adf63867a +Author: Behdad Esfahbod +Date: Sun Oct 15 16:53:09 2017 +0200 + + Faster hb_set_t + + Fixes https://github.com/behdad/harfbuzz/pull/23 + + src/hb-private.hh | 56 ++++--- + src/hb-set-private.hh | 431 +++++++++++++++++++++++++++++++++++++++++--------- + test/api/test-set.c | 6 - + 3 files changed, 391 insertions(+), 102 deletions(-) + +commit 1d3971200be5b1c949d3eca185654e48584a0868 +Author: Behdad Esfahbod +Date: Sun Oct 15 16:15:24 2017 +0200 + + Deprecate hb_set_invert() + + src/hb-deprecated.h | 4 ++++ + src/hb-set.cc | 3 ++- + src/hb-set.h | 3 --- + 3 files changed, 6 insertions(+), 4 deletions(-) + +commit 5e74044b6bd78c495561eb7d2981415d2c3336f4 +Author: Behdad Esfahbod +Date: Sun Oct 15 16:15:06 2017 +0200 + + Add bfind() to prealloaced_array_t + + src/hb-private.hh | 31 ++++++++++++++++--------------- + 1 file changed, 16 insertions(+), 15 deletions(-) + +commit db5f7ef18916abb0907bc8b569a65c9c6bbd4015 +Author: Behdad Esfahbod +Date: Sun Oct 15 16:00:22 2017 +0200 + + Inline another bsearch() + + src/hb-ot-map-private.hh | 4 ++-- + src/hb-private.hh | 32 ++++++++++++++++++++++++++++---- + 2 files changed, 30 insertions(+), 6 deletions(-) + +commit 6fb4ac73f94636d19fcac143472b84f9d91985c9 +Author: Behdad Esfahbod +Date: Sun Oct 15 16:00:09 2017 +0200 + + Add popcount for 64bit ints + + src/hb-private.hh | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 473b17af4d421f4ce7ac18c769731bb2aa4088f8 +Author: Behdad Esfahbod +Date: Sun Oct 15 14:10:34 2017 +0200 + + Remove unused hb_cache_t + + src/Makefile.sources | 1 - + src/hb-cache-private.hh | 74 ------------------------------------------------- + src/hb-ft.cc | 2 -- + 3 files changed, 77 deletions(-) + +commit a433e60a43c4594c41a82c3741d3f870f6eec247 +Author: Behdad Esfahbod +Date: Sun Oct 15 14:09:46 2017 +0200 + + Remove unused hb_frozen_set_t + + src/hb-set-private.hh | 55 --------------------------------------------------- + 1 file changed, 55 deletions(-) + +commit 826a1daf2f2075459ff25a20ed8abec030d95c52 +Author: Behdad Esfahbod +Date: Sun Oct 15 14:09:05 2017 +0200 + + Move set-digests into their own header file + + src/Makefile.sources | 1 + + src/hb-ot-layout-private.hh | 2 +- + src/hb-set-digest-private.hh | 144 +++++++++++++++++++++++++++++++++++++++++++ + src/hb-set-private.hh | 113 --------------------------------- + 4 files changed, 146 insertions(+), 114 deletions(-) + +commit 3c13e153fe89d559d33027c0a5b30a19a6de1bad +Author: Behdad Esfahbod +Date: Sun Oct 15 14:02:58 2017 +0200 + + Try fixing AppVeyor bots + + src/hb-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7e3015a315afe2312134ac33b9cb2d73689a044f +Author: Behdad Esfahbod +Date: Sun Oct 15 12:13:19 2017 +0200 + + Fix warnings + + src/hb-font.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2075008f3e0b1cfbd7006f1d8c1fa22ac014f4bb +Author: Behdad Esfahbod +Date: Sun Oct 15 12:12:10 2017 +0200 + + Use C++11 + + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +commit dbdbfe3d7b36613d893832dcb1884c756c20bfda +Author: Behdad Esfahbod +Date: Sun Oct 15 12:11:08 2017 +0200 + + Use nullptr instead of NULL + + src/hb-blob.cc | 12 ++-- + src/hb-buffer-serialize.cc | 16 ++--- + src/hb-buffer.cc | 10 +-- + src/hb-common.cc | 18 ++--- + src/hb-coretext.cc | 66 ++++++++--------- + src/hb-directwrite.cc | 28 ++++---- + src/hb-face.cc | 10 +-- + src/hb-font.cc | 32 ++++----- + src/hb-ft.cc | 56 +++++++-------- + src/hb-glib.cc | 2 +- + src/hb-gobject-structs.cc | 2 +- + src/hb-graphite2.cc | 26 +++---- + src/hb-icu.cc | 4 +- + src/hb-mutex-private.hh | 2 +- + src/hb-object-private.hh | 2 +- + src/hb-open-type-private.hh | 32 ++++----- + src/hb-ot-cbdt-table.hh | 4 +- + src/hb-ot-cmap-table.hh | 2 +- + src/hb-ot-font.cc | 42 +++++------ + src/hb-ot-layout-common-private.hh | 14 ++-- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 54 +++++++------- + src/hb-ot-layout-jstf-table.hh | 4 +- + src/hb-ot-layout.cc | 30 ++++---- + src/hb-ot-map-private.hh | 6 +- + src/hb-ot-map.cc | 4 +- + src/hb-ot-math-table.hh | 8 +-- + src/hb-ot-shape-complex-arabic-fallback.hh | 8 +-- + src/hb-ot-shape-complex-arabic.cc | 32 ++++----- + src/hb-ot-shape-complex-default.cc | 22 +++--- + src/hb-ot-shape-complex-hangul.cc | 12 ++-- + src/hb-ot-shape-complex-hebrew.cc | 18 ++--- + src/hb-ot-shape-complex-indic.cc | 12 ++-- + src/hb-ot-shape-complex-myanmar.cc | 40 +++++------ + src/hb-ot-shape-complex-private.hh | 26 +++---- + src/hb-ot-shape-complex-thai.cc | 22 +++--- + src/hb-ot-shape-complex-tibetan.cc | 20 +++--- + src/hb-ot-shape-complex-use.cc | 16 ++--- + src/hb-ot-shape-private.hh | 2 +- + src/hb-ot-shape.cc | 8 +-- + src/hb-ot-tag.cc | 2 +- + src/hb-ot-var.cc | 2 +- + src/hb-private.hh | 37 +++++----- + src/hb-set-private.hh | 2 +- + src/hb-shape-plan.cc | 24 +++---- + src/hb-shape.cc | 8 +-- + src/hb-shaper-private.hh | 6 +- + src/hb-shaper.cc | 6 +- + src/hb-ucdn.cc | 2 +- + src/hb-unicode.cc | 4 +- + src/hb-uniscribe.cc | 50 ++++++------- + src/main.cc | 4 +- + src/test-buffer-serialize.cc | 8 +-- + src/test-size-params.cc | 6 +- + src/test-would-substitute.cc | 8 +-- + src/test.cc | 12 ++-- + util/ansi-print.cc | 2 +- + util/hb-fc.cc | 6 +- + util/hb-ot-shape-closure.cc | 10 +-- + util/hb-shape.cc | 14 ++-- + util/helper-cairo.cc | 12 ++-- + util/main-font-text.hh | 4 +- + util/options.cc | 110 ++++++++++++++--------------- + util/options.hh | 56 +++++++-------- + util/shape-consumer.hh | 10 +-- + 65 files changed, 563 insertions(+), 568 deletions(-) + +commit fbb937b6807597c9ae002280c6a6278a97b701f3 +Author: Behdad Esfahbod +Date: Sun Oct 15 12:04:16 2017 +0200 + + Don't use NULL in public headers + + src/hb-buffer.h | 4 ++-- + src/hb-common.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit c3448e8d21963eb7fc357a37a7a426a4bf130ef3 +Author: Behdad Esfahbod +Date: Sun Oct 15 12:02:00 2017 +0200 + + Use static_assert instead of custom ASSERT_STATIC + + src/hb-buffer-private.hh | 4 ++-- + src/hb-buffer.cc | 2 +- + src/hb-cache-private.hh | 4 ++-- + src/hb-coretext.cc | 2 +- + src/hb-open-type-private.hh | 6 +++--- + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gdef-table.hh | 6 +++--- + src/hb-ot-layout.cc | 14 ++++++------ + src/hb-ot-map.cc | 2 +- + src/hb-ot-math-table.hh | 4 ++-- + src/hb-ot-shape-complex-arabic-fallback.hh | 6 +++--- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-use.cc | 2 +- + src/hb-private.hh | 34 +++++++++++++----------------- + src/hb-set-private.hh | 8 +++---- + src/hb-uniscribe.cc | 2 +- + util/options.cc | 3 ++- + 17 files changed, 50 insertions(+), 53 deletions(-) + +commit 76dcbf8b23475b25f8f1918f982bfd8f0dd3456e +Author: Behdad Esfahbod +Date: Sun Oct 15 11:24:35 2017 +0200 + + Add polyfill for static_assert and nullptr + + Also fix hb_assert_constant_t. + + src/hb-private.hh | 38 ++++++++++++++++++++++++++++++++++---- + 1 file changed, 34 insertions(+), 4 deletions(-) + +commit dad431e75bf998dcb09cff795c0f1083b3bd5449 +Author: Behdad Esfahbod +Date: Sun Oct 15 10:55:32 2017 +0200 + + [util] Include hb-private.hh + + Simplifies compatibility issues by centralizing all boilerplate code + in hb-private.hh. + + util/options.hh | 31 +++++-------------------------- + 1 file changed, 5 insertions(+), 26 deletions(-) + +commit 81e2b9b8a959cb7d7503f58fca70761238697fc1 +Author: Behdad Esfahbod +Date: Sun Oct 15 10:48:19 2017 +0200 + + Never skip over CGJ + + We might want to tweak this some more. For now, never skipping over + it is better behavior than always skipping. + + Part of https://github.com/behdad/harfbuzz/issues/554 + + src/hb-ot-layout-private.hh | 19 +++++++++++-------- + .../bf962d3202883a820aed019d9b5c1838c2ff69c6.ttf | Bin 0 -> 2468 bytes + test/shaping/tests/default-ignorables.tests | 1 + + 3 files changed, 12 insertions(+), 8 deletions(-) + +commit 25846cc39fb8a9516b8de4333f909851d471156f +Author: Behdad Esfahbod +Date: Fri Oct 13 16:30:33 2017 +0200 + + 1.6.0 + + NEWS | 35 +++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + docs/harfbuzz-docs.xml | 4 ++++ + 3 files changed, 40 insertions(+), 1 deletion(-) + +commit 74f1b88e3720103562552780af7058131c5492d5 +Author: Behdad Esfahbod +Date: Fri Oct 13 11:01:55 2017 +0200 + + [ucdn] Fix compiler warnings + + src/hb-ucdn.cc | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +commit c2cf68dbdffcbf45297dd161b4b6b2de667b5ae4 +Author: Behdad Esfahbod +Date: Fri Oct 13 10:30:19 2017 +0200 + + [coretext] Fix build + + src/hb-coretext.cc | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +commit 95883fc5d486ecd194253bb223802f930de73e28 +Author: Behdad Esfahbod +Date: Fri Oct 13 10:21:07 2017 +0200 + + [coretext] Pass correct font size to CoreText + + CoreText "point"s are not typographic points, but CSS pixels. Ie. + they are 96 per inch, not 72 per inch. + + src/hb-coretext.cc | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +commit 4f9a83ec2109b754a75c962e88117d063e6fed43 +Merge: fa48ccbe 40b05d7b +Author: Behdad Esfahbod +Date: Thu Oct 12 14:08:58 2017 +0200 + + Merge remote-tracking branch 'origin/master' + +commit fa48ccbe127a2e61ab316f3638e4056940964dae +Author: Behdad Esfahbod +Date: Thu Oct 12 14:07:37 2017 +0200 + + [indic] Special-case Kannada Ra,H,ZWJ sequence + + Fixes https://github.com/behdad/harfbuzz/issues/435 + + src/hb-ot-shape-complex-indic.cc | 15 +++++++++++++++ + test/shaping/Makefile.am | 1 + + .../sha1sum/3cae6bfe5b57c07ba81ddbd54c02fe4f3a1e3bf6.ttf | Bin 0 -> 2984 bytes + test/shaping/tests/indic-special-cases.tests | 3 +++ + 4 files changed, 19 insertions(+) + +commit 40b05d7b770b8045f176f66231c412b32482d874 +Author: n8willis +Date: Thu Oct 12 12:48:48 2017 +0100 + + Replacing 'cluster' with 'syllable' when comments describe certain Indic shaping behavior (#563) + + * Clarified wording of syllable/cluster behavior in Uniscribe in final_reordering; changed one other probable typo. + + * Additional syllable/cluster swap in comments for final reordering and for initial-reordering matra decomposition. + + src/hb-ot-shape-complex-indic.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 6bac4ac2bebb612debecc8ec10b845e977c0afe1 +Author: ebraminio +Date: Thu Oct 12 15:15:49 2017 +0330 + + Minor BUILD.md fix (#565) + + BUILD.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8923033eb2dab75e9361e9ea1333deb1213393ce +Author: Behdad Esfahbod +Date: Thu Oct 12 12:01:48 2017 +0200 + + [coretext] Use fabs() to silence compiler warning + + src/hb-coretext.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit dd4b321b4a429c6e6a28441ea9ae52f8f9dd1dad +Author: Dominik Röttsches +Date: Thu Oct 12 11:49:37 2017 +0200 + + [coretext] Activate tracking for system fonts + + Another attempt at fully fixing + https://github.com/behdad/harfbuzz/issues/360 + + src/hb-coretext.cc | 28 +++++++++++++++++++++++++++- + 1 file changed, 27 insertions(+), 1 deletion(-) + +commit 6760021d6f4beef852c6560607b32090bcfa5acb +Author: Khaled Hosny +Date: Thu Oct 12 12:05:08 2017 +0300 + + CMakelists.txt fix for Freetype builds (#564) + + Instead of searching for freetype using pkg-config, use the FindFreetype + feature of CMake. This allows for better integration with other projects + that make use of CMake. + + Fixes https://github.com/behdad/harfbuzz/issues/518 + + CMakeLists.txt | 24 +++++++----------------- + 1 file changed, 7 insertions(+), 17 deletions(-) + +commit 6a2cbc6ef51680309eb3970ed9c66ff766dc8040 +Author: Behdad Esfahbod +Date: Thu Oct 12 10:46:09 2017 +0200 + + [coretext] Use fabsf() instead of abs() + + Fixes bots. + + Link libharfbuzz.so with -lm. Surprising that we survived without + it so far! + + src/Makefile.am | 2 +- + src/harfbuzz.pc.in | 2 +- + src/hb-coretext.cc | 5 +++-- + 3 files changed, 5 insertions(+), 4 deletions(-) + +commit dfeccd073a5e78f6a2c630355c04121b70d2b4aa +Author: ebraminio +Date: Thu Oct 12 12:11:47 2017 +0330 + + Remove nmake port of harfbuzz (#562) + + BUILD.md | 12 ++- + Makefile.am | 2 +- + appveyor.yml | 30 ------ + configure.ac | 2 - + win32/Makefile.am | 18 ---- + win32/Makefile.vc | 67 ------------ + win32/README.txt | 97 ----------------- + win32/build-rules-msvc.mak | 130 ----------------------- + win32/config-msvc.mak | 230 ---------------------------------------- + win32/config.h.win32.in | 158 --------------------------- + win32/create-lists-msvc.mak | 147 ------------------------- + win32/create-lists.bat | 42 -------- + win32/detectenv-msvc.mak | 146 ------------------------- + win32/generate-msvc.mak | 39 ------- + win32/hb-introspection-msvc.mak | 42 -------- + win32/info-msvc.mak | 162 ---------------------------- + win32/install.mak | 25 ----- + win32/introspection-msvc.mak | 73 ------------- + win32/pc_base.py | 124 ---------------------- + win32/replace.py | 115 -------------------- + win32/sed-enums-srcs.py | 36 ------- + win32/setup.py | 62 ----------- + 22 files changed, 9 insertions(+), 1750 deletions(-) + +commit 4e4781319b36bba154f3e5d4eb678945d8f6b4fc +Author: Behdad Esfahbod +Date: Thu Oct 12 10:33:16 2017 +0200 + + [ft] Add hb_ft_font_changed() + + When the font size or variations settings on underlying FT_Face change, + one can call hb_ft_font_changed() and continue using hb_font created using + hb_ft_font_create(). + + Fixes https://github.com/behdad/harfbuzz/issues/559 + + New API: + hb_ft_font_changed() + + docs/harfbuzz-sections.txt | 1 + + src/hb-ft.cc | 15 +++++++++++++-- + src/hb-ft.h | 8 +++++++- + 3 files changed, 21 insertions(+), 3 deletions(-) + +commit 94b3cafc3a042aea69ee7040227557fe98a21d87 +Author: Behdad Esfahbod +Date: Wed Oct 11 17:22:44 2017 +0200 + + Add hb_face_get_table_tags() + + New API: + hb_face_get_table_tags() + + Fixes https://github.com/behdad/harfbuzz/issues/560 + + src/hb-face.cc | 29 +++++++++++++++++++++++++++++ + src/hb-face.h | 5 +++++ + src/hb-open-file-private.hh | 18 ++++++++++++++++++ + 3 files changed, 52 insertions(+) + +commit e1b6d923021f68713784e2fd68f631c053ef3497 +Author: Behdad Esfahbod +Date: Wed Oct 11 15:51:31 2017 +0200 + + Remove cast of functions to (hb_destroy_func_t) + + Fixes https://github.com/behdad/harfbuzz/issues/474 + + src/hb-blob.cc | 8 +++++++- + src/hb-coretext.cc | 10 ++++++++-- + src/hb-face.cc | 6 ++++-- + src/hb-ft.cc | 20 +++++++++++--------- + src/hb-glib.cc | 9 ++++++++- + src/hb-ot-font.cc | 6 ++++-- + 6 files changed, 42 insertions(+), 17 deletions(-) + +commit 717fcb51dd051ca27d8537e5cf3a32d0447f78b5 +Author: Behdad Esfahbod +Date: Wed Oct 11 15:38:21 2017 +0200 + + [coretext] Minor + + src/hb-coretext.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 374bb48d902025e8b8d8acbe525ff43540daee36 +Author: Behdad Esfahbod +Date: Wed Oct 11 15:37:50 2017 +0200 + + Change ptem API to make 0 mean unset + + src/hb-font.cc | 5 ++--- + src/hb-font.h | 2 +- + 2 files changed, 3 insertions(+), 4 deletions(-) + +commit 06c14225b20aa43ae88d362be2de577f6cf3f7b9 +Author: Behdad Esfahbod +Date: Wed Oct 11 15:29:53 2017 +0200 + + [coretext] Minor + + src/hb-coretext.cc | 1 + + 1 file changed, 1 insertion(+) + +commit a4b46212c5e76494cfde5af6f299e08902aff0d5 +Author: Behdad Esfahbod +Date: Wed Oct 11 15:29:22 2017 +0200 + + [coretext] Adjust font size check for 0 + + src/hb-coretext.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 269cf1ca82c34c6f6ea126e7333743e5c381453b +Author: Behdad Esfahbod +Date: Wed Oct 11 15:24:22 2017 +0200 + + Correctly initialize ptem + + src/hb-font.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 84686bf4c75c001e7cfb2eabdf391b2e76cae335 +Author: Behdad Esfahbod +Date: Wed Oct 11 15:02:48 2017 +0200 + + [coretext-aat] Also pass through CoreText if font has kerx table + + SFNSText has kerx table which apparently is applied. + + src/hb-coretext.cc | 20 +++++++++----------- + src/hb-coretext.h | 1 + + 2 files changed, 10 insertions(+), 11 deletions(-) + +commit 296d0134c9d04c82cc0bffd545b0fd9a308a2530 +Author: Behdad Esfahbod +Date: Wed Oct 11 14:09:30 2017 +0200 + + [coretext] Change default point size to 12 + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7b23c286a71883ac3e5777a2dee262af48c76854 +Merge: 8d450dd1 a5ebe1d4 +Author: Behdad Esfahbod +Date: Wed Oct 11 13:35:32 2017 +0200 + + Merge branch 'coretext-optical-sizing' + + Should fix https://github.com/behdad/harfbuzz/issues/360 + +commit a5ebe1d4aec41bc5e289a7969e5e5f7bb57733b6 +Author: Dominik Röttsches +Date: Wed Oct 11 13:32:38 2017 +0200 + + [coretext] Recreate CTFont if pt size changed + + Attempt at fixing #360 + + src/hb-coretext.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit db7a73ce0781d1fec0235e419ac448565dcfc8ca +Author: Dominik Röttsches +Date: Wed Oct 11 13:24:39 2017 +0200 + + [coretext] Fix build + + src/hb-coretext.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit f33413075655e6383cd16bc31f0bf804dcec1c64 +Author: Behdad Esfahbod +Date: Wed Oct 11 13:17:46 2017 +0200 + + [coretext] Another try + + src/hb-coretext.cc | 32 +++++++++++++------------------- + 1 file changed, 13 insertions(+), 19 deletions(-) + +commit a8e466c3c12a3499028cb576721e5f85ff4cbf2d +Author: Behdad Esfahbod +Date: Wed Oct 11 13:05:59 2017 +0200 + + [coretext] Move CT_Font to font data + + Towards implementing optical sizing. Untested; won't compile. + + https://github.com/behdad/harfbuzz/issues/360 + + src/hb-coretext.cc | 85 ++++++++++++++++++++++++------------------------------ + 1 file changed, 37 insertions(+), 48 deletions(-) + +commit f9b4c6570a4725eec5393f86e6468a189ac8c6be +Author: Behdad Esfahbod +Date: Wed Oct 11 12:51:25 2017 +0200 + + [coretext] Move font size to a macro + + src/hb-coretext.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 8d450dd188dea2d63a03f74d903a76741de8a217 +Author: Behdad Esfahbod +Date: Wed Oct 11 12:43:46 2017 +0200 + + Infrastructure for creating CTFont with correct font size + + https://github.com/behdad/harfbuzz/issues/360 + + src/hb-shaper-private.hh | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 16d02a58cf187dbcecc1c796acdc5d3a70ca288e +Author: Behdad Esfahbod +Date: Wed Oct 11 12:28:06 2017 +0200 + + [coretext] Change default font size from 36 to 18 + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c0c2dbc871667c32ac8eedb11de64078ef24a429 +Author: Behdad Esfahbod +Date: Wed Oct 11 12:23:35 2017 +0200 + + Remove dirty tracking + + Turns out I don't need this to resolve CoreText optical sizing + issue after all. + + https://github.com/behdad/harfbuzz/issues/360 + + src/hb-face-private.hh | 9 --------- + src/hb-face.cc | 17 ----------------- + src/hb-font-private.hh | 13 ------------- + src/hb-font.cc | 39 --------------------------------------- + 4 files changed, 78 deletions(-) + +commit b57f18da700837a57df9606290160ea6e96accc8 +Author: Behdad Esfahbod +Date: Wed Oct 11 11:47:47 2017 +0200 + + Add hb_font_[sg]et_ptem() to set/get point size on font + + New API: + hb_font_set_ptem() + hb_font_get_ptem() + + Needed for hb-coretext optical sizing: + https://github.com/behdad/harfbuzz/issues/360 + + docs/harfbuzz-sections.txt | 2 ++ + src/hb-font-private.hh | 5 ++++- + src/hb-font.cc | 41 +++++++++++++++++++++++++++++++++++++++++ + src/hb-font.h | 10 ++++++++++ + 4 files changed, 57 insertions(+), 1 deletion(-) + +commit 3f9370d9e5051b1abf2fc94be2e10a39c8069f75 +Author: Behdad Esfahbod +Date: Wed Oct 11 11:34:53 2017 +0200 + + Fix TODO item + + src/hb-font.cc | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +commit 5f50f8837f918ca1d176355d1538e0e6c9703f41 +Author: Behdad Esfahbod +Date: Sat Oct 7 13:17:33 2017 +0200 + + [arabic] Fix cluster merging + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c2545b921523538e8237ff6a2591f6cb75ee79f1 +Author: Behdad Esfahbod +Date: Sat Oct 7 12:56:53 2017 +0200 + + Add check for HB_EXTERNs + + https://github.com/behdad/harfbuzz/pull/555 + + src/Makefile.am | 1 + + src/check-externs.sh | 21 +++++++++++++++++++++ + 2 files changed, 22 insertions(+) + +commit 48a9406839f086735a05a2f1a07987b8a6bd6d33 +Author: fanc999 +Date: Sat Oct 7 18:57:14 2017 +0800 + + Fix build of HarfBuzz tools and HarfBuzz-GObject on Visual Studio (#555) + + * hb-buffer.h: Mark hb_buffer_diff() for export + + This will fix the tools builds on Visual Studio, as the symbol is used + by the tools. + + * build: Adapt NMake Makefiles for GLib 2.53.4 or later + + glib-mkenums was ported from a PERL script to a Python script, so we + need to update how we generate the enum sources for HarfBuzz-GObject in + the NMake builds. Let this be known in the build documentation for MSVC + builds. + + One of the problems with the underlying cmd.exe that the NMake Makefiles + run on is that shebang lines are not recognized, so we need to to test + run the script with Python and see whether it succeeded by outputing a + source file that is larger than 0 in file size (since running the PERL + version of the script will clearly fail and cause an empty file to be + created). + + If it succeeds, we then run a small Python utility script that makes the + necessary string replacements, and we are done. If that fails, then we + run the glib-mkenums script with PERL, and do the replacements with the + PERL one-liners as we did before. + + We need to make replace.py use latin-1 encoding when using Python 3.x to + cope with the copyright sign that is in the generated enum sources. + + src/hb-buffer.h | 2 +- + win32/Makefile.am | 4 +++- + win32/README.txt | 5 +++-- + win32/generate-msvc.mak | 17 ++++++++++++----- + win32/info-msvc.mak | 5 ++++- + win32/replace.py | 2 +- + win32/sed-enums-srcs.py | 36 ++++++++++++++++++++++++++++++++++++ + 7 files changed, 60 insertions(+), 11 deletions(-) + +commit c9e2cf6f55c7682b8e7020654945ddd074ebfd24 +Author: Behdad Esfahbod +Date: Wed Oct 4 16:59:22 2017 +0200 + + [ot] Remove 'mal' and 'gle' lang tags + + Fixes https://github.com/behdad/harfbuzz/issues/477 + + src/hb-ot-tag.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 621c49cb8657a79ee6897c4d313d0e825b2b228f +Author: Behdad Esfahbod +Date: Wed Oct 4 15:06:48 2017 +0200 + + Improve performance of ligature component matching + + This O(N^2) was introduced in 8b2c94c43fd335b944d5e5487265706b8e0f9041. + Make it O(N). + + src/hb-ot-layout-gsubgpos-private.hh | 37 +++++++++++++++++++++++------------- + 1 file changed, 24 insertions(+), 13 deletions(-) + +commit ab8d70ec7023e51ba6fd7267d2b41c5f95ef0787 +Author: Behdad Esfahbod +Date: Wed Oct 4 14:47:10 2017 +0200 + + [arabic] Implement Unicode Arabic Mark Ordering Algorithm UTR#53 + + Fixes https://github.com/behdad/harfbuzz/issues/509 + + src/hb-ot-shape-complex-arabic.cc | 75 +++++++++++++++++++++ + src/hb-ot-shape-complex-default.cc | 1 + + src/hb-ot-shape-complex-hangul.cc | 1 + + src/hb-ot-shape-complex-hebrew.cc | 1 + + src/hb-ot-shape-complex-indic.cc | 1 + + src/hb-ot-shape-complex-myanmar.cc | 2 + + src/hb-ot-shape-complex-private.hh | 12 ++++ + src/hb-ot-shape-complex-thai.cc | 1 + + src/hb-ot-shape-complex-tibetan.cc | 1 + + src/hb-ot-shape-complex-use.cc | 1 + + src/hb-ot-shape-normalize.cc | 8 ++- + test/shaping/Makefile.am | 1 + + .../24b8d24d00ae86f49791b746da4c9d3f717a51a8.ttf | Bin 0 -> 7160 bytes + .../94a5d6fb15a27521fba9ea4aee9cb39b2d03322a.ttf | Bin 0 -> 6816 bytes + test/shaping/record-test.sh | 2 +- + test/shaping/tests/arabic-mark-order.tests | 2 + + 16 files changed, 106 insertions(+), 3 deletions(-) + +commit b6fe0ab636ffac0a246e160b3508cc4841cb1823 +Author: Behdad Esfahbod +Date: Wed Oct 4 13:37:08 2017 +0200 + + Add info_cc() convenience macro + + src/hb-ot-layout-private.hh | 2 ++ + src/hb-ot-shape-normalize.cc | 6 +++--- + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit 7f9e7f8689e1d260596f5256947dfbd474afb1ec +Author: Behdad Esfahbod +Date: Wed Oct 4 13:20:33 2017 +0200 + + Adjust normalizer for out-of-order marks + + We are going to implement Unicode Arabic Mark Ordering Algorithm: + + http://www.unicode.org/reports/tr53/tr53-1.pdf + + which will reorder marks out of their sorted ccc order. Adjust + normalizer to stop combining as soon as dangerous ordering is + detected. + + src/hb-ot-shape-normalize.cc | 62 ++++++++++++++++++++++++++------------------ + 1 file changed, 37 insertions(+), 25 deletions(-) + +commit a252ad61f077c3b7bbfd8335e1b105a57beb58ce +Author: Behdad Esfahbod +Date: Wed Oct 4 13:07:08 2017 +0200 + + Minor + + src/hb-unicode-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4c05a405acc25c4ef0d70a97c0ae59013abca2df +Author: Behdad Esfahbod +Date: Wed Oct 4 13:06:51 2017 +0200 + + Revert "Treat HAMZA ABOVE similar to SHADD for sorting purposes" + + This reverts commit 5a330575768f5a213072230b9ec8faabac9c5737. + + Proper fix coming soon. + + src/hb-unicode-private.hh | 4 ---- + 1 file changed, 4 deletions(-) + +commit d695cacbf4dd5f77b5e7134cf60553775c515ef1 +Author: Behdad Esfahbod +Date: Wed Oct 4 11:33:47 2017 +0200 + + Shorthand format controls should not be ignored + + Fixes https://github.com/behdad/harfbuzz/issues/503 + + src/hb-unicode-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 50e95229d79bd258ad1d3f6392bfffa128f6df2a +Author: Behdad Esfahbod +Date: Wed Oct 4 11:28:04 2017 +0200 + + Add Chinantec language tags + + Fixes https://github.com/behdad/harfbuzz/issues/516 + + src/hb-ot-tag.cc | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit 9786fcd8fdc0adbe8b6269ddd174ee2818d6fa9e +Author: Behdad Esfahbod +Date: Tue Oct 3 17:22:43 2017 +0200 + + Fix GPOS v_origin ordering + + This should affect mark attachment in vertical text. I have no font to test, + but this sounds the right order. + + Noticed while debugging https://github.com/behdad/harfbuzz/issues/532 + + src/hb-ot-shape.cc | 44 ++++++++++++++++++++------------------------ + 1 file changed, 20 insertions(+), 24 deletions(-) + +commit 63db692fa9efcd760f2e90f93f4e1428d79a3433 +Author: Behdad Esfahbod +Date: Tue Oct 3 16:00:18 2017 +0200 + + [indic] Fix shaping of U+0AFB GUJARATI SIGN SHADDA + + Fixes https://github.com/behdad/harfbuzz/issues/552 + + src/hb-ot-shape-complex-indic-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit f559c633073f63b9d87cb2440048b4413cfa1c05 +Author: Behdad Esfahbod +Date: Tue Oct 3 15:20:07 2017 +0200 + + [indic] Implement Consonent_With_Stacker + + Fixes https://github.com/behdad/harfbuzz/issues/528 + + src/hb-ot-shape-complex-indic-machine.rl | 5 +++-- + src/hb-ot-shape-complex-indic-private.hh | 7 ++++--- + src/hb-ot-shape-complex-myanmar-machine.rl | 5 +++-- + src/hb-ot-shape-complex-myanmar.cc | 6 +++--- + 4 files changed, 13 insertions(+), 10 deletions(-) + +commit e07669fc43c0e23d337ad984aa128c3a08c9c1bb +Author: Behdad Esfahbod +Date: Tue Oct 3 14:57:14 2017 +0200 + + [use] Implement Consonant_With_Stacker + + Related to https://github.com/behdad/harfbuzz/issues/528 + + src/gen-use-table.py | 7 ++++--- + src/hb-ot-shape-complex-use-machine.rl | 5 +++-- + src/hb-ot-shape-complex-use-private.hh | 3 ++- + src/hb-ot-shape-complex-use-table.cc | 6 ++++-- + 4 files changed, 13 insertions(+), 8 deletions(-) + +commit 3ca9c92aa68956889642690e176c9161ff52edfe +Author: David Corbett +Date: Tue Oct 3 08:07:02 2017 -0400 + + Test Consonant_With_Stacker in Kannada (#530) + + test/shaping/Makefile.am | 1 + + test/shaping/fonts/COPYING | 100 +++++++++++++++++++++ + .../341421e629668b1a1242245d39238ca48432d35d.ttf | Bin 0 -> 1084 bytes + .../55c88ebbe938680b08f92c3de20713183e0c7481.ttf | Bin 0 -> 3300 bytes + .../663aef6b019dbf45ffd74089e2b5f2496ceceb18.ttf | Bin 0 -> 1204 bytes + .../a014549f766436cf55b2ceb40e462038938ee899.ttf | Bin 0 -> 2720 bytes + .../tests/indic-consonant-with-stacker.tests | 4 + + 7 files changed, 105 insertions(+) + +commit 5d98de1f382254a8a21fd9a04b642268a21be16f +Author: Behdad Esfahbod +Date: Tue Oct 3 13:46:25 2017 +0200 + + Tweak mark-base attachment + + Apparently a base glyph can also become an attached component of a + ligature if the ligature-forming lookup used IgnoreBase. This was + being confused with a non-first component of a MultipleSubst and + hence not matched for mark-attachment. Tweak test to fix. + + Fixes https://github.com/behdad/harfbuzz/issues/543 + + src/hb-ot-layout-gpos-table.hh | 4 +++- + test/shaping/Makefile.am | 1 + + .../sha1sum/98b7887cff91f722b92a8ff800120954606354f9.ttf | Bin 0 -> 1168 bytes + test/shaping/tests/mark-attachment.tests | 1 + + 4 files changed, 5 insertions(+), 1 deletion(-) + +commit ea772932d2430ebc7ea712a8c46ec2500966225d +Merge: 771970ef c44657a0 +Author: Behdad Esfahbod +Date: Tue Oct 3 13:25:44 2017 +0200 + + Merge commit 'c44657a05d565ec5f2c32ac15d4ecfbee00ac5f7' + +commit 771970efa15fc0b77841b7f0a3e266cdcf51246e +Author: Behdad Esfahbod +Date: Tue Oct 3 13:23:31 2017 +0200 + + Minor + + .travis.yml | 2 +- + appveyor.yml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 09cbeb2246217dce61ccc0638edb6211facca4b0 +Author: Behdad Esfahbod +Date: Tue Oct 3 13:22:07 2017 +0200 + + Make bots happy + + Fixes https://github.com/behdad/harfbuzz/issues/551 + + test/shaping/tests/indic-syllable.tests | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c44657a05d565ec5f2c32ac15d4ecfbee00ac5f7 +Author: Behdad Esfahbod +Date: Tue Oct 3 13:14:17 2017 +0200 + + Tweak input matching some more + + Followup to 8b2c94c43fd335b944d5e5487265706b8e0f9041 + + Allow matching sequences of marks attached to different ligatures, + as supposedly the base of the subsequent marks were already jumped + over. + + src/hb-ot-layout-gsubgpos-private.hh | 3 --- + 1 file changed, 3 deletions(-) + +commit bbe94777c94637da1bcf944124b5079662618a1e +Author: Khaled Hosny +Date: Mon Oct 2 22:36:14 2017 +0200 + + Print test-suite.log when CI builds fail + + .travis.yml | 2 +- + appveyor.yml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 1633513996f902e95642fcaf9205dded55f509ff +Author: Behdad Esfahbod +Date: Mon Oct 2 20:28:56 2017 +0200 + + Add test for U+0A51 + + New Indic numbers are: + + BENGALI: 353725 out of 354188 tests passed. 463 failed (0.130722%) + DEVANAGARI: 707307 out of 707394 tests passed. 87 failed (0.0122987%) + GUJARATI: 366355 out of 366457 tests passed. 102 failed (0.0278341%) + GURMUKHI: 60729 out of 60747 tests passed. 18 failed (0.0296311%) + KANNADA: 951201 out of 951913 tests passed. 712 failed (0.0747968%) + KHMER: 299071 out of 299124 tests passed. 53 failed (0.0177184%) + MALAYALAM: 1048136 out of 1048334 tests passed. 198 failed (0.0188871%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271662 out of 271847 tests passed. 185 failed (0.068053%) + TAMIL: 1091754 out of 1091754 tests passed. 0 failed (0%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + + Before 71c0a1429db7c7e7e32507be248c9457e1cbfc7d GURMUKHI used to be at 15, + because Uniscribe seems to allow this character standalone, but that looks + wrong. + + .../sha1sum/1735326da89f0818cd8c51a0600e9789812c0f94.ttf | Bin 0 -> 1008 bytes + test/shaping/tests/indic-syllable.tests | 2 ++ + 2 files changed, 2 insertions(+) + +commit 8b2c94c43fd335b944d5e5487265706b8e0f9041 +Author: Behdad Esfahbod +Date: Mon Oct 2 20:02:45 2017 +0200 + + Tweak ligature component matching for ligature formation + + If two marks want to ligate and they belong to different components of the + same ligature glyph, and said ligature glyph is to be ignored according to + mark-filtering rules, then allow. + + Example Burmese senquence: + + U+1004,U+103A,U+1039,U+101B,U+103D,U+102D + + Test font provided by Norbert Lindenberg. + + Fixes https://github.com/behdad/harfbuzz/issues/545 + + src/hb-ot-layout-gsubgpos-private.hh | 59 +++++++++++++++++---- + .../a6c76d1bafde4a0b1026ebcc932d2e5c6fd02442.ttf | Bin 0 -> 1384 bytes + test/shaping/tests/ligature-id.tests | 1 + + 3 files changed, 51 insertions(+), 9 deletions(-) + +commit 71c0a1429db7c7e7e32507be248c9457e1cbfc7d +Author: Behdad Esfahbod +Date: Mon Oct 2 18:56:10 2017 +0200 + + [indic] Fix shaping of U+0A51 + + Mark it as matra below to allow the sequence U+0A15, U+0A51, U+0A47. + Oh well... + + Fixes https://github.com/behdad/harfbuzz/issues/524 + + src/hb-ot-shape-complex-indic.cc | 6 ++++++ + .../sha1sum/85fe0be440c64ac77699e21c2f1bd933a919167e.ttf | Bin 0 -> 1224 bytes + test/shaping/tests/indic-syllable.tests | 1 + + 3 files changed, 7 insertions(+) + +commit 6eb8950e6265b23d88ba35daab1cff4fc3fe8753 +Author: Behdad Esfahbod +Date: Mon Oct 2 18:30:05 2017 +0200 + + [ucdn] Oops! + + src/hb-ucdn/{unicodedata_db.h => ucdn_db.h} | 4324 ++++++++++++++------------- + 1 file changed, 2175 insertions(+), 2149 deletions(-) + +commit cbec0cd65e1787b20ea55dd5583a7444938bd381 +Author: Behdad Esfahbod +Date: Mon Oct 2 18:26:52 2017 +0200 + + Remove some really old cruft + + src/hb-common.h | 14 -------------- + src/hb-ucdn/ucdn.h | 14 -------------- + 2 files changed, 28 deletions(-) + +commit b3dff7720c1fac8ca9bdd7087ac368a0af4349e8 +Author: Behdad Esfahbod +Date: Mon Oct 2 18:22:51 2017 +0200 + + [ucdn] Update README + + src/hb-ucdn/README | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 57c55ef8341c760145170dedd002c5afb380e6c8 +Author: Behdad Esfahbod +Date: Mon Oct 2 18:21:27 2017 +0200 + + [ot] Improve shaper selection heuristic + + src/hb-ot-shape-complex-private.hh | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 5680ef884cf31ab9b42c587ffa260e390c88b8eb +Author: Behdad Esfahbod +Date: Mon Oct 2 18:20:51 2017 +0200 + + [use] Hack to fix shaping of U+1A7F + + Fixes https://github.com/behdad/harfbuzz/issues/525 + + src/gen-use-table.py | 3 +++ + src/hb-ot-shape-complex-use-table.cc | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 0faa16a25349906ee0ab98b73d9a3d96327a0955 +Author: Behdad Esfahbod +Date: Mon Oct 2 17:15:46 2017 +0200 + + [ucdn] Update to Unicode 10 + + Update to commit c000ebf79c095a7d58cf90090bde5715592c4834 + plus this bug-fix: https://github.com/grigorig/ucdn/issues/18 + + src/hb-ucdn.cc | 4 +++ + src/hb-ucdn/Makefile.sources | 2 +- + src/hb-ucdn/ucdn.c | 69 ++++++++++++++++++++++---------------------- + src/hb-ucdn/ucdn.h | 7 +++++ + 4 files changed, 47 insertions(+), 35 deletions(-) + +commit ea535a1dfa63f82280607273cd282a6134c334da +Author: Behdad Esfahbod +Date: Mon Oct 2 17:02:39 2017 +0200 + + [use] Update to Unicode 10 + + src/gen-use-table.py | 5 +-- + src/hb-ot-shape-complex-use-table.cc | 69 ++++++++++++++++++++++++++---------- + 2 files changed, 54 insertions(+), 20 deletions(-) + +commit 29c244aff6e3c359796bb033496c14ad5537dbe0 +Author: Behdad Esfahbod +Date: Mon Oct 2 16:36:21 2017 +0200 + + Minor + + src/gen-use-table.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 1535f8c67216e8559fa48691fe6d9c2726c08973 +Author: Behdad Esfahbod +Date: Mon Oct 2 16:12:18 2017 +0200 + + Add Unicode 10 scripts + + src/hb-common.h | 8 ++++++++ + src/hb-ot-shape-complex-private.hh | 5 +++++ + 2 files changed, 13 insertions(+) + +commit bdbe974f525d33b8c735fb5d7fd76c236c4dd0ea +Author: Behdad Esfahbod +Date: Mon Oct 2 10:00:31 2017 -0400 + + [indic] Update table to Unicode 10 + + src/hb-ot-shape-complex-indic-table.cc | 70 +++++++++++++++++----------------- + 1 file changed, 36 insertions(+), 34 deletions(-) + +commit cc79b666bc4a81a0342ed1e706dd7db109739dc5 +Author: Behdad Esfahbod +Date: Mon Oct 2 09:19:15 2017 -0400 + + [indic] Add test for 1a0a356a0f2b2932581e4fd0437c01c058f4f6d1 + + https://github.com/behdad/harfbuzz/issues/538 + + .../sha1sum/87f85d17d26f1fe9ad28d7365101958edaefb967.ttf | Bin 0 -> 1000 bytes + test/shaping/tests/indic-syllable.tests | 1 + + 2 files changed, 1 insertion(+) + +commit 819cc360499a5f136325b5a1a18098ebc2aee081 +Author: Behdad Esfahbod +Date: Mon Oct 2 09:03:16 2017 -0400 + + [indic] Move manual code out of generated table + + src/hb-ot-shape-complex-indic-table.cc | 7 ------- + src/hb-ot-shape-complex-indic.cc | 5 +++++ + 2 files changed, 5 insertions(+), 7 deletions(-) + +commit da4866f7177a4e2836cc70b844e2e64ab671761f +Author: Behdad Esfahbod +Date: Mon Oct 2 08:57:06 2017 -0400 + + [arabic] Update table to Unicode 10 data + + src/hb-ot-shape-complex-arabic-table.hh | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +commit 1a0a356a0f2b2932581e4fd0437c01c058f4f6d1 +Author: Behdad Esfahbod +Date: Mon Oct 2 08:49:23 2017 -0400 + + [indic] Categorize U+0980 BENGALI ANJI as placeholder + + Fixes https://github.com/behdad/harfbuzz/issues/538 + + src/hb-ot-shape-complex-indic.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 19e77e01bc13f44138e1d50533327d314dd0a018 +Author: jfkthame +Date: Mon Oct 2 13:08:49 2017 +0100 + + [shape-plan] Don't look for a cached plan if variation coords are specified. Fixes #549. (#550) + + This is a temporary hack just to avoid incorrect shaping results, pending proper support + for caching shape-plans with variation coordinates. + + src/hb-shape-plan.cc | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +commit db446cce4ef4cd1a4f1652e3aa3e5e5ed1881d39 +Author: Behdad Esfahbod +Date: Sun Oct 1 12:06:00 2017 -0400 + + Add RELEASING.md to dist + + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 933a81d74fee0d5856fc7b15b58a16e0e0168e48 +Author: ebraminio +Date: Sun Oct 1 19:35:24 2017 +0330 + + Add release checklist (#529) + + RELEASING.md | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 96 insertions(+) + +commit 66128d3cfb12705530141b5a4bd2706f0cbb9fc5 +Author: mhosken +Date: Wed Sep 27 01:29:45 2017 +0700 + + Fix missing xscale in rtl graphite unpacking (#541) + + * Fix missing xscale in rtl graphite unpacking + + * Oops didn't need to mess with yscale + + src/hb-graphite2.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3ca69c8c32b8408dd9f8e6e866cd07e58c0d79b7 +Author: Behdad Esfahbod +Date: Thu Sep 14 20:50:35 2017 -0400 + + Use strtod_l() to correctly parse decimal numbers in French & other locales + + Test with, eg.: + $ LC_ALL=fr_FR.utf-8 ./hb-view NotoSansArabic-VF.ttf بهداد --variations wght=1.2 + + configure.ac | 4 ++-- + src/hb-common.cc | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++-- + 2 files changed, 53 insertions(+), 4 deletions(-) + +commit 9355218f582a6c2425cadcb868204f81b17d5767 +Author: Behdad Esfahbod +Date: Sat Sep 9 11:21:07 2017 -0700 + + [util] Add a few shorthand forms for commandline options + + -o, -O, -u, -v, -V + + util/options.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit a984e0c4d921a6dff82cc1b5c686cc957215bc7e +Author: Behdad Esfahbod +Date: Tue Sep 5 11:18:35 2017 -0700 + + 1.5.1 + + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit d03f11f246efec13e48fd68a9ce136db771b22bf +Author: Behdad Esfahbod +Date: Mon Sep 4 20:14:13 2017 -0700 + + Fix buffer_diff for empty buffers + + If buffers are empty, content type should be ignored. + + This fixes last of the failing tests: fuzzed.tests. Green again! + + src/hb-buffer.cc | 2 +- + src/hb-buffer.h | 4 ++-- + util/options.hh | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 7cc348041d0b026ca6d2c240134e8f9100600e99 +Author: Behdad Esfahbod +Date: Mon Sep 4 20:04:59 2017 -0700 + + [unsafe-to-break] Fix unsafe-to-break for cluster-level=1 + + Fixes tests/shaping/tests/cluster.tests + + src/hb-ot-shape.cc | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +commit 61a9d7e6d0e6df7b48f58fa1679f0f93407993b2 +Author: Behdad Esfahbod +Date: Mon Sep 4 19:48:52 2017 -0700 + + Minor + + test/shaping/run-tests.sh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 03a5a6f873e5a50011f1c2418f5ceab86d9c2931 +Author: Behdad Esfahbod +Date: Fri Sep 1 19:09:54 2017 -0700 + + [util] Add --unicodes to hb-view / hb-shape + + Fixes https://github.com/behdad/harfbuzz/issues/154 + + test/shaping/hb_test_tools.py | 2 +- + util/options.cc | 65 ++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 65 insertions(+), 2 deletions(-) + +commit 0e5b475d98dd67e927534508fe2cd8dc9765e24e +Author: Behdad Esfahbod +Date: Fri Sep 1 18:28:47 2017 -0700 + + Minor + + test/shaping/run-tests.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3e1fc6d18ba0019bbeede78b95070a6e7156c314 +Author: Behdad Esfahbod +Date: Fri Sep 1 10:46:48 2017 -0700 + + Minor + + test/shaping/run-tests.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 04f009f84891b513087830c7aa1b755addd016d9 +Author: Behdad Esfahbod +Date: Fri Sep 1 10:38:25 2017 -0700 + + Add test accidentally removed in previous commit + + test/shaping/tests/indic-syllable.tests | 1 + + 1 file changed, 1 insertion(+) + +commit 06cb162cd79cc922b572e5f532ca867223b6dc4c +Author: Behdad Esfahbod +Date: Fri Sep 1 10:34:21 2017 -0700 + + [indic] Treat Consonant_With_Stacker as consonant + + Fixes https://github.com/behdad/harfbuzz/issues/528 + "Kannada JIHVAMULIYA and UPADHMANIYA insert dotted circles" + + src/hb-ot-shape-complex-indic-private.hh | 2 +- + .../sha1sum/3d0b77a2360aa6faa1385aaa510509ab70dfbeff.ttf | Bin 0 -> 988 bytes + test/shaping/tests/indic-syllable.tests | 3 ++- + 3 files changed, 3 insertions(+), 2 deletions(-) + +commit c449d2d8c9e27502380faa0b568a374c838ac9a7 +Author: Behdad Esfahbod +Date: Wed Aug 30 17:28:22 2017 -0700 + + [unsafe-to-break] Mark during fraction-slash formation + + Fixes tests/automatic-fractions.tests + + src/hb-ot-shape.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit b262ebcc9c9539076d17751e9bae06a8fd5001ff +Author: Behdad Esfahbod +Date: Wed Aug 30 17:25:10 2017 -0700 + + [util] Fix cluster sweeping during --verify + + If *I* get this wrong in 2017, I have no idea how others get their head around + cluster math... + + Fixes tests/arabic-fallback-shaping.tests + + util/options.hh | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +commit 69d701b02e5ebc3597b0d0576dbab8e1ece51944 +Author: Behdad Esfahbod +Date: Wed Aug 30 17:07:29 2017 -0700 + + [util] When --verify fails, return reconstructed shape results + + util/options.hh | 8 +++----- + util/view-cairo.hh | 2 +- + 2 files changed, 4 insertions(+), 6 deletions(-) + +commit 099472e08bf81d6dd8ca1647999592df6b7fdfb9 +Author: Behdad Esfahbod +Date: Wed Aug 30 16:45:06 2017 -0700 + + hb_buffer_diff() tweak + + I like to have a mode where CONTAINS_NOTDEF and CONTAINS_DOTTEDCIRCLE are not + returned. Abused a value of -1 for that. hb-shape now uses it. Fixes two + of the six tests failing with --verify in test/shaping/run-tests.sh. + + src/hb-buffer.cc | 16 ++++++++-------- + test/shaping/run-tests.sh | 4 ++-- + util/options.hh | 2 +- + 3 files changed, 11 insertions(+), 11 deletions(-) + +commit e8b364b86023731e0416ab4eb433467c4b7a0ec2 +Author: Behdad Esfahbod +Date: Wed Aug 23 15:00:45 2017 -0700 + + 1.5.0 + + NEWS | 44 ++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 45 insertions(+), 1 deletion(-) + +commit 224d20e4e1c62416ff842a81188dfeff069f895b +Author: Behdad Esfahbod +Date: Wed Aug 23 14:41:48 2017 -0700 + + [docs] Minor + + docs/harfbuzz-docs.xml | 12 ++++++++++++ + docs/harfbuzz-sections.txt | 10 ++++++++++ + src/hb-buffer.cc | 8 +++++++- + 3 files changed, 29 insertions(+), 1 deletion(-) + +commit 4387b059a0603b17024de48d57bee6a3b5e9e56c +Author: Behdad Esfahbod +Date: Wed Aug 23 14:35:58 2017 -0700 + + [test] Add --verify to hb-shape + + Disabled for now. Will enable and fix failures after next release. + + test/shaping/run-tests.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit b2dd0c1c32ba30714355baca1857d64c1608b4c2 +Author: Behdad Esfahbod +Date: Wed Aug 23 13:12:54 2017 -0700 + + Add hb_glyph_info_get_glyph_flags() + + New API. + + src/hb-buffer.cc | 17 +++++++++++++++++ + src/hb-buffer.h | 9 ++++++++- + 2 files changed, 25 insertions(+), 1 deletion(-) + +commit 3e8f4f145255a905029c6b5cb8f40e6dcca096f3 +Author: Behdad Esfahbod +Date: Tue Aug 22 17:56:25 2017 -0700 + + Rename HB_BUFFER_DIFF_FLAG_MASK_MISMATCH to HB_BUFFER_DIFF_FLAG_GLYPH_FLAGS_MISMATCH + + src/hb-buffer.cc | 2 +- + src/hb-buffer.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit a9e52a1af4c039bc53090a9c1e4c1136fc542605 +Author: Behdad Esfahbod +Date: Tue Aug 15 17:30:18 2017 -0700 + + [util] Prefix trace lines with "trace:", and error lines with "error:" + + util/hb-shape.cc | 12 ++++++------ + util/options.cc | 4 ++-- + util/options.hh | 1 + + 3 files changed, 9 insertions(+), 8 deletions(-) + +commit 7ea10c35a34c894e87ee6576d6d4ba3e78535a27 +Author: Behdad Esfahbod +Date: Tue Aug 15 17:12:28 2017 -0700 + + [util] Respect eot/bot in safe-to-break test; hook up hb_buffer_diff() + + util/options.hh | 38 ++++++++++++++++++++++++++------------ + 1 file changed, 26 insertions(+), 12 deletions(-) + +commit 8820ba29dfd2e1302377da62a0527939a0d7d9fb +Author: Behdad Esfahbod +Date: Tue Aug 15 17:12:21 2017 -0700 + + Fix warning about "may be used uninitialized" + + src/hb-ot-layout-common-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 91770e1c567d87fc513e8d39576e51c3853b1f23 +Author: Emil A Eklund (eae) +Date: Tue Aug 15 16:25:18 2017 -0700 + + Fix signed/unsigned warning (#522) + + Change hb_buffer_diff to explicitly cast result of abs to unsigned when + comparing with position_fuzz to avoid unsafe signed/unsigned comparions + warnings on windows. + + src/hb-buffer.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 587f15ece316df7c86f386518aba48a6a44c061d +Author: Behdad Esfahbod +Date: Mon Aug 14 15:23:10 2017 -0700 + + Minor + + src/hb-face-private.hh | 8 ++++---- + src/hb-face.cc | 8 ++++---- + src/hb-font-private.hh | 14 +++++++------- + src/hb-font.cc | 14 +++++++------- + 4 files changed, 22 insertions(+), 22 deletions(-) + +commit a88e2a73f34067381a81577c3f60bc5c2a6f2eea +Author: Behdad Esfahbod +Date: Mon Aug 14 14:49:21 2017 -0700 + + [util] Fix leaks + + util/options.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 338e61ad1b40110a70c4fb497b117bcb07548467 +Author: Behdad Esfahbod +Date: Mon Aug 14 12:36:38 2017 -0700 + + Fix typo + + src/hb-buffer.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 331d66c7fe27a7649454486000827f0c36d6eb36 +Author: Jonathan Kew +Date: Sat Jul 19 23:09:09 2014 +0100 + + Add function to compare two buffers + + Based on patch from Jonathan Kew. + + Needs more cleaning up and documentation. + + New API: + hb_buffer_diff_flags_t + hb_buffer_diff() + + src/hb-buffer-private.hh | 1 + + src/hb-buffer-serialize.cc | 4 +-- + src/hb-buffer.cc | 82 ++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-buffer.h | 39 ++++++++++++++++++++++ + 4 files changed, 124 insertions(+), 2 deletions(-) + +commit 219af509ef8269e51f1396b18521c75b000d8dda +Author: Behdad Esfahbod +Date: Sun Aug 13 15:10:26 2017 -0700 + + [graphite2] Fix warning + + src/hb-graphite2.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 239119a631fee7701be4d444adeda808b915863a +Author: Behdad Esfahbod +Date: Sun Aug 13 15:08:34 2017 -0700 + + [unsafe-to-break] Mark all positions as unsafe in alternative shapers + + src/hb-coretext.cc | 6 ++++++ + src/hb-directwrite.cc | 2 ++ + src/hb-graphite2.cc | 1 + + src/hb-uniscribe.cc | 2 ++ + 4 files changed, 11 insertions(+) + +commit 05fabbd03eae7b84ebbce7abbdc55c1d67ceacf9 +Author: Behdad Esfahbod +Date: Fri Aug 11 19:51:06 2017 -0700 + + [unsafe-to-break] Towards verifying unsafe-to-break in --verify + + We break and shape fragments and reconstruct shape result from them. + Remains to compare to original buffer. Going to add some buffer + comparison API and use here, instead of open-coding. + + src/hb-buffer.cc | 5 ++- + util/options.hh | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 133 insertions(+), 3 deletions(-) + +commit 6ce25f57c663f86326262a5ff7a42288f358ed51 +Author: Behdad Esfahbod +Date: Fri Aug 11 19:31:05 2017 -0700 + + Fix hb_buffer_append() + + Ouch! + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1c17c2bde5bdf74a652b78d71b64e3aaa75ec43d +Author: Behdad Esfahbod +Date: Fri Aug 11 19:06:07 2017 -0700 + + [unsafe-to-break] Copy flag to all glyphs in a cluster + + Makes consumption easier. + + src/hb-buffer-private.hh | 46 +++++++++++++++++++++++++++++++++++++++++++++ + src/hb-buffer.cc | 28 ++++++--------------------- + src/hb-ot-layout-private.hh | 3 +-- + src/hb-ot-shape.cc | 27 ++++++++++++++++++++++++++ + 4 files changed, 80 insertions(+), 24 deletions(-) + +commit ec104e5912417c0fdc8c7cb004c684aea26eb1dc +Author: Behdad Esfahbod +Date: Fri Aug 11 18:24:27 2017 -0700 + + [unsafe-to-break] Mark unsafe is cluster merging is disabled + + We were relying on cluster merges not requiring unsafe flagging because + they get merged. If cluster level requests no merging, then we flag + unsafe when merge would have happened. + + src/hb-buffer.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 39a97494304a7e6b8999e59a92ce4d24ba9b881a +Author: Behdad Esfahbod +Date: Fri Aug 11 15:52:06 2017 -0700 + + New API: hb_buffer_append() + + src/hb-buffer.cc | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- + src/hb-buffer.h | 6 ++++++ + 2 files changed, 57 insertions(+), 1 deletion(-) + +commit d2052278f24b3279503d5fa215a7834c2d21f91c +Author: Behdad Esfahbod +Date: Fri Aug 11 15:12:25 2017 -0700 + + [util] Add --verify to hb-shape / hb-view that verifies shape results + + Right now it checks for monotone cluster values. Other checks to be added. + + util/hb-shape.cc | 7 ++----- + util/options.cc | 2 ++ + util/options.hh | 42 +++++++++++++++++++++++++++++++++++++++--- + util/shape-consumer.hh | 12 ++++++++---- + util/view-cairo.hh | 7 ++----- + 5 files changed, 53 insertions(+), 17 deletions(-) + +commit 14a639ea592cba971e5548f0942dd395c602c7a8 +Author: Behdad Esfahbod +Date: Fri Aug 11 11:30:39 2017 -0700 + + [unsafe-to-break] Fix Use-of-uninitialized-value in unsafe_to_break_set_mask + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=3011 + + src/hb-ot-shape-complex-hangul.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e43aad55524cc1d4008ce337c2863a8546706d2e +Author: Behdad Esfahbod +Date: Thu Aug 10 20:54:15 2017 -0700 + + [unsafe-to-break] Flag in Thai PUA shaping + + src/hb-ot-shape-complex-thai.cc | 1 + + 1 file changed, 1 insertion(+) + +commit eae009602b5503c53a7f8ab053912563a97bbfa4 +Author: Behdad Esfahbod +Date: Thu Aug 10 20:50:48 2017 -0700 + + [unsafe-to-break] Flag in Hangul shaper + + src/hb-ot-shape-complex-hangul.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit b65aa1cd4778e0103a2a1ed0e1b1012a09cf1f48 +Author: Behdad Esfahbod +Date: Thu Aug 10 20:32:02 2017 -0700 + + [unsafe-to-break] Flag during mark attachment + + src/hb-ot-layout-gpos-table.hh | 1 + + 1 file changed, 1 insertion(+) + +commit c4712f8e372ee42749cda56cc7c28dc110a07ea9 +Author: Behdad Esfahbod +Date: Thu Aug 10 20:27:21 2017 -0700 + + Fix test + + test/api/test-buffer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 882ebdadd6b3420ef2d3f296cd7416c76ee9901f +Author: Behdad Esfahbod +Date: Thu Aug 10 20:23:17 2017 -0700 + + [unsafe-to-break] Flag during cursive positioning + + src/hb-ot-layout-gpos-table.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 2d158ca37673f2b262f2381854559d6872d8fb45 +Author: Behdad Esfahbod +Date: Thu Aug 10 20:19:15 2017 -0700 + + [unsafe-to-break] Flag during kerning + + src/hb-ot-layout-gpos-table.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit a7c4972ccefaaf48dfd6f0f4588df0c785aa33d2 +Author: Behdad Esfahbod +Date: Thu Aug 10 20:16:15 2017 -0700 + + [unsafe-to-break] Flag during fallback positioning + + src/hb-ot-shape-fallback.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit e2a2b5b229c92f1de3b9c3ea111cd1ffa75b18fc +Author: Behdad Esfahbod +Date: Thu Aug 10 20:10:12 2017 -0700 + + [unsafe-to-break] Be careful with flag propagation when merging clusters + + src/hb-buffer-private.hh | 13 +++++++++++++ + src/hb-buffer.cc | 17 ++++++++++------- + src/hb-ot-shape.cc | 3 ++- + 3 files changed, 25 insertions(+), 8 deletions(-) + +commit f2868c200896a96a34fc1bba4d43eddc03789da2 +Author: Behdad Esfahbod +Date: Thu Aug 10 19:58:05 2017 -0700 + + Set mask to 0, instead of 1, by default + + This shouldn't matter. + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9e005c5d86cd4c19383093f76a237cc8f5f12fb7 +Author: Behdad Esfahbod +Date: Thu Aug 10 18:45:33 2017 -0700 + + [unsafe-to-break] Mark Indic-like clusters as unsafe-to-break + + src/hb-ot-shape-complex-indic.cc | 2 ++ + src/hb-ot-shape-complex-myanmar.cc | 2 ++ + src/hb-ot-shape-complex-use.cc | 2 ++ + 3 files changed, 6 insertions(+) + +commit 5287ccc935c86b6f5e6867592b64bc2461384f45 +Author: Behdad Esfahbod +Date: Thu Aug 10 14:25:53 2017 -0700 + + [unsafe-to-break] Allocate public bits from 0 + + src/hb-buffer.h | 5 +++-- + src/hb-ot-map.cc | 15 +++++++++------ + 2 files changed, 12 insertions(+), 8 deletions(-) + +commit 91ce0c45d6782057a2736f7b76a3c49cadbea070 +Author: Behdad Esfahbod +Date: Thu May 5 16:13:03 2016 +0100 + + [safe-to-break] Fix logic when there is no out-buffer + + src/hb-buffer.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit a043c99f778ffdde15d212fe23468cb9f51036bc +Author: Behdad Esfahbod +Date: Wed May 4 19:51:22 2016 +0200 + + [unsafe-to-break] Simplify logic + + Always use the algorithm for non-monotone case. It's more robust. + + src/hb-buffer.cc | 57 +++++++++++++------------------------------------------- + 1 file changed, 13 insertions(+), 44 deletions(-) + +commit 40bd7e9a1cf422b17f15d0f66547bde9098e6ef3 +Author: Behdad Esfahbod +Date: Mon May 2 14:47:45 2016 +0200 + + [unsafe-to-break] Add UNSAFE_TO_BREAK flag + + Not all shapers code is updated to set this properly. + GSUB and Arabic shaper are updated. + GPOS and other shapers are NOT. + + Fixes https://github.com/behdad/harfbuzz/issues/224 + + src/hb-buffer-private.hh | 26 ++++++++------ + src/hb-buffer-serialize.cc | 24 +++++++++---- + src/hb-buffer.cc | 67 ++++++++++++++++++++++++++++++++++++ + src/hb-buffer.h | 10 ++++-- + src/hb-ot-layout-gsub-table.hh | 7 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 27 ++++++++++----- + src/hb-ot-map.cc | 2 ++ + src/hb-ot-shape-complex-arabic.cc | 3 ++ + util/hb-shape.cc | 2 ++ + util/options.cc | 1 + + util/options.hh | 2 ++ + 11 files changed, 142 insertions(+), 29 deletions(-) + +commit 3e44748ebe1524aef6feb01c42d342e8a2d77d34 +Author: Behdad Esfahbod +Date: Wed Aug 9 22:09:01 2017 -0700 + + [util] Fix two other Coverity warnings + + util/options.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 356f93b64b6005f44bcfc329f6f9e150ec32fc26 +Author: Behdad Esfahbod +Date: Wed Aug 9 22:06:53 2017 -0700 + + [util] Fix warning + + util/shape-consumer.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit ac8c4e56d8b8c2e7a8f4802f83deb935bd6bbbd3 +Author: Behdad Esfahbod +Date: Wed Aug 9 22:05:08 2017 -0700 + + [ft] Fix theoretical leak + + src/hb-ft.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5a330575768f5a213072230b9ec8faabac9c5737 +Author: Behdad Esfahbod +Date: Wed Aug 9 17:23:28 2017 -0700 + + Treat HAMZA ABOVE similar to SHADD for sorting purposes + + Part of https://github.com/behdad/harfbuzz/issues/509 + + src/hb-unicode-private.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 68af14d5cc666ebf0596766cbed87cc9404fd50f +Author: Behdad Esfahbod +Date: Wed Aug 9 17:09:21 2017 -0700 + + Protect against div-by-zero in CBDT extent code + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1452#c5 + + CC https://github.com/behdad/harfbuzz/issues/139 + + src/hb-ft.cc | 4 ++-- + src/hb-ot-font.cc | 6 +++--- + src/hb-shape-plan.cc | 4 ++-- + 3 files changed, 7 insertions(+), 7 deletions(-) + +commit 3b54d0337e6119a4397573f5589b771a68b2ecd9 +Author: Behdad Esfahbod +Date: Tue Aug 8 18:37:03 2017 -0700 + + Add tests for 'avar' fix 5dc30451b80f6bb0079424a130875c10486e4d34 + + test/shaping/Makefile.am | 1 + + .../d23d76ea0909c14972796937ba072b5a40c1e257.ttf | Bin 0 -> 1812 bytes + test/shaping/record-test.sh | 1 + + test/shaping/tests/variations-rvrn.tests | 100 +++++++++++++++++++++ + 4 files changed, 102 insertions(+) + +commit 7917792f01603f91b703d12e12d8baced655a615 +Author: Behdad Esfahbod +Date: Tue Aug 8 13:17:03 2017 -0700 + + 1.4.8 + + NEWS | 9 +++++++++ + configure.ac | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +commit 5dc30451b80f6bb0079424a130875c10486e4d34 +Author: Behdad Esfahbod +Date: Mon Aug 7 21:37:07 2017 -0700 + + Two fixes to avar mapping + + 1. Handle segment with two entries correctly, + + 2. Fix rounding math. Ouch! + + Fixes https://github.com/behdad/harfbuzz/issues/521 + + src/hb-ot-var-avar-table.hh | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +commit dc2c418e397bf251faf03d824fc780ac19bb1dee +Author: Behdad Esfahbod +Date: Thu Aug 3 12:34:15 2017 +0100 + + [check-defs/symbols.sh] Drop empty-symbol lines + + Fixes https://github.com/behdad/harfbuzz/issues/510 + + src/check-defs.sh | 2 +- + src/check-symbols.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 6f38845d9c6852812eb1963a1fd7e5ec771e5ce3 +Author: Behdad Esfahbod +Date: Wed Jul 19 17:20:55 2017 -0700 + + [hb-shape] Rename --show-messages to --trace + + https://github.com/behdad/harfbuzz/issues/506 + + util/hb-shape.cc | 2 +- + util/options.cc | 2 +- + util/options.hh | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit e60350551addbd945491f662e98464c9e3e9fec5 +Author: Behdad Esfahbod +Date: Tue Jul 18 19:14:19 2017 -0700 + + [hb-shape] Improve shaping-debug output + + Before, that was printed using --debug (and in both hb-shape and hb-view). + Changed it, now hb-shape has a new command-line argument called --show-messages. + When invoked, it also respects other output formatting options. The messages + are better formatted and printed to te same place that hb-shape output is + directed to. Previously they were written to stderr. + + Fixes https://github.com/behdad/harfbuzz/issues/506 + + util/hb-ot-shape-closure.cc | 10 +++++++--- + util/hb-shape.cc | 33 +++++++++++++++++++++++++++++++-- + util/main-font-text.hh | 27 ++++----------------------- + util/options.cc | 10 +++++++--- + util/options.hh | 2 ++ + util/shape-consumer.hh | 18 ++++++++++++------ + util/view-cairo.hh | 4 ++-- + 7 files changed, 65 insertions(+), 39 deletions(-) + +commit 65f64d14005e4d0808e818b3c97bd3d600628011 +Author: Ebrahim Byagowi +Date: Wed Jul 19 02:42:53 2017 +0430 + + Unbreak arm-none-eabi build again (#514) + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fc15e60eadfc89aca5b8815262b8ee888f285169 +Author: Behdad Esfahbod +Date: Tue Jul 18 11:24:42 2017 -0700 + + 1.4.7 + + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit c1432bce3cfc1156d19b21892d4083afa8838d94 +Author: Behdad Esfahbod +Date: Fri Jul 14 17:34:47 2017 +0100 + + [arabic] Adjust feature order again + + Fixes https://github.com/behdad/harfbuzz/issues/505 + + src/hb-ot-shape-complex-arabic.cc | 7 ++++++- + .../sha1sum/bf39b0e91ef9807f15a9e283a21a14a209fd2cfc.ttf | Bin 0 -> 7312 bytes + test/shaping/tests/arabic-feature-order.tests | 1 + + 3 files changed, 7 insertions(+), 1 deletion(-) + +commit 9813be3d1212eef5a525d64978e0bb2032cd44d9 +Author: Cosimo Lupo +Date: Fri Jul 14 17:11:46 2017 +0100 + + [coretext] Allow to disable kern (#508) + + * Minor + + * [coretext] Fix leak + + * [coretext] Do not reset num_features + + * [coretext] allow to disable kern; re-enabling doesn't seem to be working + + src/hb-coretext.cc | 41 ++++++++++++++++++++++++++++++++--------- + 1 file changed, 32 insertions(+), 9 deletions(-) + +commit 9dd29c681e8e856c139f20f405d7c0e04928aa70 +Author: Behdad Esfahbod +Date: Fri Jul 14 17:01:27 2017 +0100 + + [use] Allow up to two medial-below letters + + Fixes https://github.com/behdad/harfbuzz/issues/376 + + src/hb-ot-shape-complex-use-machine.rl | 3 ++- + .../sha1sum/e68a88939e0f06e34d2bc911f09b70890289c8fd.ttf | Bin 0 -> 2192 bytes + test/shaping/tests/use-syllable.tests | 3 +++ + 3 files changed, 5 insertions(+), 1 deletion(-) + +commit 216b003c914d2209a6846b1ce61fe7a3421c789c +Author: Behdad Esfahbod +Date: Fri Jul 14 16:38:51 2017 +0100 + + [use] Fix shaping of U+AA29 CHAM VOWEL SIGN AA + + Part of https://github.com/behdad/harfbuzz/issues/376 + Also see https://github.com/roozbehp/unicode-data/issues/6 + + Test added, using NotoSansCham built from Noto Phase III sources. + + src/gen-arabic-table.py | 2 +- + src/gen-indic-table.py | 2 +- + src/gen-use-table.py | 8 +++++--- + src/hb-ot-shape-complex-use-table.cc | 4 ++-- + test/shaping/Makefile.am | 1 + + .../sha1sum/96490dd2ff81233b335a650e7eb660e0e7b2eeea.ttf | Bin 0 -> 1368 bytes + test/shaping/tests/use-syllable.tests | 1 + + 7 files changed, 11 insertions(+), 7 deletions(-) + +commit f1cd7ca89306ff252816e9747177d8dab00524f6 +Author: Behdad Esfahbod +Date: Fri Jul 14 15:59:40 2017 +0100 + + [indic] Add github URL + + src/hb-ot-shape-complex-indic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 3cc84f45b995b243fca82ce18481f11d69846eb5 +Author: Behdad Esfahbod +Date: Fri Jul 14 15:50:22 2017 +0100 + + [indic] Fix https://github.com/behdad/harfbuzz/issues/478 + + src/hb-ot-shape-complex-indic-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 8 ++++++++ + test/shaping/Makefile.am | 1 + + .../sha1sum/54674a3111d209fb6be0ed31745314b7a8d2c244.ttf | Bin 0 -> 1352 bytes + test/shaping/tests/indic-syllable.tests | 1 + + 5 files changed, 11 insertions(+), 1 deletion(-) + +commit e359a4b8f57bbc778843f233c4f5d6fb07ff11d9 +Author: Behdad Esfahbod +Date: Fri Jul 14 14:14:35 2017 +0100 + + [indic] Disable automatic ZWNJ handling for Indic features + + Fixes https://github.com/behdad/harfbuzz/issues/294 + + Also fixes a bunch of other Indic issues. Test results after: + + BENGALI: 353725 out of 354188 tests passed. 463 failed (0.130722%) + DEVANAGARI: 707307 out of 707394 tests passed. 87 failed (0.0122987%) + GUJARATI: 366355 out of 366457 tests passed. 102 failed (0.0278341%) + GURMUKHI: 60732 out of 60747 tests passed. 15 failed (0.0246926%) + KANNADA: 951201 out of 951913 tests passed. 712 failed (0.0747968%) + KHMER: 299071 out of 299124 tests passed. 53 failed (0.0177184%) + MALAYALAM: 1048136 out of 1048334 tests passed. 198 failed (0.0188871%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271662 out of 271847 tests passed. 185 failed (0.068053%) + TAMIL: 1091754 out of 1091754 tests passed. 0 failed (0%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + + Before: + + BENGALI: 353725 out of 354188 tests passed. 463 failed (0.130722%) + DEVANAGARI: 707307 out of 707394 tests passed. 87 failed (0.0122987%) + GUJARATI: 366349 out of 366457 tests passed. 108 failed (0.0294714%) + GURMUKHI: 60732 out of 60747 tests passed. 15 failed (0.0246926%) + KANNADA: 951190 out of 951913 tests passed. 723 failed (0.0759523%) + KHMER: 299070 out of 299124 tests passed. 54 failed (0.0180527%) + MALAYALAM: 1048136 out of 1048334 tests passed. 198 failed (0.0188871%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271662 out of 271847 tests passed. 185 failed (0.068053%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + test/shaping/Makefile.am | 1 + + .../sha1sum/f443753e8ffe8e8aae606cfba158e00334b6efb1.ttf | Bin 0 -> 3972 bytes + test/shaping/tests/indic-joiners.tests | 2 ++ + 4 files changed, 5 insertions(+), 2 deletions(-) + +commit cdf1fd0627c5517c948ca05d2e9427c3e441adf9 +Author: Behdad Esfahbod +Date: Fri Jul 14 12:43:34 2017 +0100 + + [indic] Add infrastructure to disable ZWNJ-skipping in context-matching + + Not used yet. + + src/hb-ot-layout-gsubgpos-private.hh | 45 ++++++++++++++++++++---------------- + src/hb-ot-layout.cc | 1 + + src/hb-ot-map-private.hh | 10 +++++--- + src/hb-ot-map.cc | 8 +++++-- + 4 files changed, 39 insertions(+), 25 deletions(-) + +commit 3a73e0d5e17b87ac7e307d855c2cb43d040bd195 +Author: Dominik Schlösser +Date: Fri Jul 14 13:14:55 2017 +0200 + + Shaping tests for Tibetan vowels (#446) + + * Shaping tests for Tibetan vowels + + * Test-cases for the Dzongkha contractions with multiple vowel-signs added. + + * going to be removed + + * Extended contraction-test-cases to all test cases in contractions.txt that actually use multiple-vowels (113 cases) + + test/shaping/Makefile.am | 3 ++ + .../2de1ab4907ab688c0cfc236b0bf51151db38bf2e.ttf | Bin 0 -> 125256 bytes + .../82f4f3b57bb55344e72e70231380202a52af5805.ttf | Bin 0 -> 11116 bytes + .../a02a7f0ad42c2922cb37ad1358c9df4eb81f1bca.ttf | Bin 0 -> 106096 bytes + test/shaping/tests/tibetan-contractions-1.tests | 60 +++++++++++++++++++++ + test/shaping/tests/tibetan-contractions-2.tests | 53 ++++++++++++++++++ + test/shaping/tests/tibetan-vowels.tests | 11 ++++ + 7 files changed, 127 insertions(+) + +commit 4e21ec546932c2a982aa52fce718c1a0d90a71d6 +Author: Dominik Schlösser +Date: Fri Jul 14 13:14:23 2017 +0200 + + Fix for reordering of Tibetan vowel u (#443) + + * Undone change for Tibetan vowel u + + * removed comment on reordering that became invalid with roll-back + + * Support for Dzongkha contractions with multiple vowel-signs + + * Removed non-functional and unnecessary defines for HB_MODIFIED_COMBINING_CLASS_CCC138,140 + + src/hb-unicode-private.hh | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit ad52e044bcf733bcc6c0373bafcd78a8c0beb400 +Author: fanc999 +Date: Wed Jun 21 22:19:57 2017 +0800 + + Win32/NMake builds: Support builds from GIT (#498) + + Add Python scripts to generate the full win32/config.h.win32 and + src/hb-version.h which can be used to build directly from a GIT + checkout. Since the scripts are currently intended for building from a + GIT checkout, these are not distributed in the release tarballs. + + Also, support the re-build of Ragel-generated .hh headers using the NMake + build system, and allow one to specify the path of the Ragel executable + if a suitable one cannot be found in the PATH. + + Update the Win32/NMake build documentation to let people know about how + these mechanisms can be utilized. + + win32/README.txt | 20 ++++++- + win32/build-rules-msvc.mak | 5 +- + win32/config-msvc.mak | 7 +++ + win32/create-lists-msvc.mak | 9 ++++ + win32/generate-msvc.mak | 6 +++ + win32/info-msvc.mak | 8 ++- + win32/pc_base.py | 124 ++++++++++++++++++++++++++++++++++++++++++++ + win32/replace.py | 115 ++++++++++++++++++++++++++++++++++++++++ + win32/setup.py | 62 ++++++++++++++++++++++ + 9 files changed, 353 insertions(+), 3 deletions(-) + +commit 3b0e47ca006b8fe6a24ace72dd931e3649bb8e6f +Author: Ebrahim Byagowi +Date: Mon Jun 19 14:47:09 2017 +0430 + + Fix arm-none-eabi build (fixes #451) (#496) + + CMakeLists.txt | 4 ++-- + src/hb-buffer.cc | 4 ++-- + src/hb-common.cc | 28 ++++++++++++++++++++-- + src/hb-ot-font.cc | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-shape-complex-arabic-table.hh | 14 +++++------ + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-hangul.cc | 16 ++++++------- + src/hb-ot-shape-complex-indic-table.cc | 22 ++++++++--------- + src/hb-ot-shape-complex-indic.cc | 12 +++++----- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape-complex-thai.cc | 12 +++++----- + src/hb-ot-shape-complex-use-table.cc | 42 ++++++++++++++++----------------- + src/hb-unicode-private.hh | 16 ++++++------- + src/hb-utf-private.hh | 18 +++++++------- + 15 files changed, 110 insertions(+), 86 deletions(-) + +commit 76c4873e8cad2871d2d547318d371b9a89d8c806 +Author: Ebrahim Byagowi +Date: Fri Jun 2 21:53:10 2017 +0430 + + Support branch prediction helpers on clang compiles (#491) + + src/hb-private.hh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 7dba30639a6f62803dfc21706bc7c654799f373e +Author: Behdad Esfahbod +Date: Thu Jun 1 11:44:42 2017 -0400 + + Handle allocation failure in hb-language code + + src/hb-common.cc | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +commit 92e2c4baafa0401cb8d7dd2bbd70acfaeaf2aabf +Author: Sebastian Rasmussen +Date: Mon May 29 12:53:30 2017 -0500 + + Avoid using strdup inside library. (#488) + + If an application provides a malloc replacement through + hb_malloc_impl() it is important that it is used to allocate + everything, but the use of strdup() circumvents this and + causes system malloc() to be called instead. This pairs + badly with the custom hb_free_impl() being called later. + + src/hb-common.cc | 8 +++++++- + src/hb-private.hh | 4 ---- + 2 files changed, 7 insertions(+), 5 deletions(-) + +commit 06cfe3f7369684fc05fa16da7f6778350f8bcba5 +Author: Khaled Hosny +Date: Wed May 17 21:32:47 2017 +0300 + + Do not skip TAG characters in glyph substitution (#487) + + Hide them like Mongolian Free Variation Selectors instead. + + Fixes https://github.com/behdad/harfbuzz/issues/463 + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-layout-private.hh | 13 +++++++++---- + test/shaping/Makefile.am | 1 + + .../sha1sum/53374c7ca3657be37efde7ed02ae34229a56ae1f.ttf | Bin 0 -> 5044 bytes + test/shaping/tests/emoji-flag-tags.tests | 2 ++ + 5 files changed, 13 insertions(+), 5 deletions(-) + +commit 1817221620dce713aae67352568ebcc231ab9512 +Author: Behdad Esfahbod +Date: Tue May 16 14:26:28 2017 -0700 + + Minor + + src/hb-atomic-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 152736981d5bb9e098c1a8b86fcf8fe577a4a9ec +Author: Ebrahim Byagowi +Date: Sat May 13 21:32:56 2017 +0430 + + [cmake] Add framework build support (#484) + + CMakeLists.txt | 46 +++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 39 insertions(+), 7 deletions(-) + +commit bf50ddaf2b416bd80ae8849593bc745b578193d9 +Author: Ebrahim Byagowi +Date: Thu May 4 20:31:42 2017 +0430 + + [cmake] minor (#482) + + CMakeLists.txt | 30 +++++++++++++++++++----------- + 1 file changed, 19 insertions(+), 11 deletions(-) + +commit 141b33de9a141248e2f034d55f48460159536cb9 +Author: Behdad Esfahbod +Date: Sun Apr 23 16:19:13 2017 -0700 + + 1.4.6 + + NEWS | 9 +++++++++ + configure.ac | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +commit 74b99ef2249107e7cd01bd1ee522a5d9ce61e05f +Author: mhosken +Date: Thu Apr 20 19:13:22 2017 +0100 + + Fix graphite2 rtl conversion (#475) + + src/hb-graphite2.cc | 32 ++++++++++++++------------------ + 1 file changed, 14 insertions(+), 18 deletions(-) + +commit 696641314e7eb60a5a2e08c1c4fd1e5e41022148 +Author: ebraminio +Date: Wed Apr 19 22:59:46 2017 +0430 + + [cmake] Final touches (#473) + + CMakeLists.txt | 113 +++++++++++++++++++++++++++------------------------------ + 1 file changed, 54 insertions(+), 59 deletions(-) + +commit aacca37590656e235218557ea509eb5624dfbff9 +Author: Chris Peterson +Date: Mon Apr 17 23:25:24 2017 -0700 + + Fix clang -Wcomma warnings (#471) (#472) + + clang's new -Wcomma compiler option warns about possible misuse of the + comma operator such as between two statements. + + hb-common.cc:190:9 [-Wcomma] possible misuse of comma operator here + hb-ot-layout-gsubgpos-private.hh:345:30 [-Wcomma] possible misuse of + comma operator here + hb-shape-plan.cc:438:26 [-Wcomma] possible misuse of comma operator here + + src/hb-common.cc | 6 ++++-- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-shape-plan.cc | 7 ++++--- + 3 files changed, 9 insertions(+), 6 deletions(-) + +commit 4d7c52066b5b205b20ba2679cb57a4e593942102 +Author: ebraminio +Date: Mon Apr 17 15:53:46 2017 +0430 + + [cmake] Remove HB_DISABLE_DEPRECATED as it seems needed for pango build (#470) + + CMakeLists.txt | 2 -- + 1 file changed, 2 deletions(-) + +commit 5ecf96e3a22e896184710a9f146a8bf149af6ca4 +Author: William Hua +Date: Mon Apr 17 01:33:42 2017 -0400 + + Use absolute paths of ragel generated headers (#467) + + https://github.com/behdad/harfbuzz/issues/455 + + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c42869eb713f53504e1b77a679cff2f88ebd0c20 +Author: Dominik Schlösser +Date: Sat Apr 15 21:17:05 2017 +0200 + + Small doc fix: `make check` runs the tests (#469) + + test/shaping/README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 75931427aa4344cd75321c618b8373ffcf1ffc33 +Author: ebraminio +Date: Fri Apr 14 05:08:11 2017 +0430 + + [cmake] Fix try compile link issues (#466) + + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit cb021e14ab345def326fb58ce486515af179b2cf +Author: ebraminio +Date: Fri Apr 14 04:31:17 2017 +0430 + + [cmake] typo (#465) + + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a41d5ea4453995dfd7c523427c6017623164c6ff +Author: ebraminio +Date: Fri Apr 14 04:25:50 2017 +0430 + + [cmake] Add atomic ops availability detection (#464) + + CMakeLists.txt | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) + +commit 8568588202dd718b089e43cd6d46f689c706f665 +Author: ebraminio +Date: Thu Apr 13 02:17:16 2017 +0430 + + [cmake] Remove NO_MT flag (#462) + + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +commit c04c1fe86ee4b9b58ad88dad5593239ade4c75b8 +Author: jfkthame +Date: Tue Apr 11 22:29:13 2017 +0100 + + Blacklist GDEF table in additional Tahoma versions. (#459) + + There are more broken versions of Tahoma out there on various Windows releases, + so we need to add them to our blacklist to avoid broken rendering. + See https://bugzilla.mozilla.org/show_bug.cgi?id=1279925 for details. + + src/hb-ot-layout.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit adfd4ae1cf6c4abe66aecf1eb0a05c7183a0f4e2 +Author: ebraminio +Date: Tue Apr 11 23:18:18 2017 +0430 + + [cmake] Improve third party libraries support (#461) + + CMakeLists.txt | 57 ++++++++++++++++++++++++++++++++++++-------- + src/hb-ucdn/Makefile.sources | 5 +++- + 2 files changed, 51 insertions(+), 11 deletions(-) + +commit 3a8bc572115a28741d5a80f3f1e28e6756b9abfa +Author: ebraminio +Date: Tue Apr 11 21:32:14 2017 +0430 + + [cmake] Add utils build support (#460) + + CMakeLists.txt | 150 +++++++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 108 insertions(+), 42 deletions(-) + +commit bc1244e2395f844b2b41315cb1eef29570e46b29 +Author: Chun-wei Fan +Date: Thu Apr 6 18:44:28 2017 +0800 + + NMake Makefiles: Fix ICU builds + + Fix the check conditions in config-msvc.mak and info-msvc.mak so that + the ICU items does indeed get built into the HarfBuzz main DLL, and that + the correct configuration info is displayed. + + Also update the checks in detectenv-msvc.mak so that we can detect that + we are using Visual Studio 2017 (although the 2015-built binaries use + the same CRT DLL as the 2017 ones). + + win32/config-msvc.mak | 22 ++++++++++++---------- + win32/detectenv-msvc.mak | 4 +++- + win32/info-msvc.mak | 12 ++++++++---- + 3 files changed, 23 insertions(+), 15 deletions(-) + +commit a4471d0c2cc4baa81e2cea695f9bd15e03d0f15e +Author: Behdad Esfahbod +Date: Wed Apr 5 15:42:11 2017 +0200 + + Move list of ragel sources to Makefile.sources as well + + src/Makefile.am | 14 ++++---------- + src/Makefile.sources | 9 +++++++++ + 2 files changed, 13 insertions(+), 10 deletions(-) + +commit d2acaf6d729727f47c5aacf7ee40097580b6f18d +Author: ebraminio +Date: Wed Apr 5 02:21:23 2017 -0700 + + Split ragel generated files lists and remove hardcoded rl files lists (#453) + + CMakeLists.txt | 126 +++++++++++++++++++++----------------------------- + src/Makefile.am | 2 + + src/Makefile.sources | 16 +++++-- + win32/config-msvc.mak | 8 ++-- + 4 files changed, 71 insertions(+), 81 deletions(-) + +commit 7d64c0ef37dd930e9807bd80d398491aa9c4428c +Author: ebraminio +Date: Tue Apr 4 15:03:51 2017 +0430 + + Add CMake build support (#444) + + CMakeLists.txt | 254 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + Makefile.am | 1 + + appveyor.yml | 61 +++++++++----- + 3 files changed, 295 insertions(+), 21 deletions(-) + +commit 740fdbcd0e6d25c1d6f12537ca2aa559650b9d52 +Author: jfkthame +Date: Mon Apr 3 12:22:39 2017 +0100 + + avoid UBSan warning in get_stage_lookups (#450) + + See https://bugzilla.mozilla.org/show_bug.cgi?id=1336600 + + src/hb-ot-map-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8d256841ca7462fd596329abf6f71bafb56fd621 +Author: Dominik Schloesser +Date: Sun Mar 26 09:22:34 2017 +0200 + + Current fonttools (3.9.1) generate subset-file called font.subset.ttf instead of older font.ttf.subset + + test/shaping/record-test.sh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit c2a9de15f5d9477c6f1c143ed8265f71fdb04584 +Author: Dominik Schloesser +Date: Sun Mar 26 09:21:13 2017 +0200 + + Updated samples: record-it.sh is now record-test.sh + + test/shaping/README.md | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f2e6c7ce51283809033d08692a2dee7cf04aefc5 +Author: Khaled Hosny +Date: Sun Mar 26 10:48:53 2017 +0200 + + [tools] Make hb-unicode-code work with Python 3 + + Related to https://github.com/behdad/harfbuzz/pull/445 + + test/shaping/hb_test_tools.py | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +commit edcf6344bc62af9ea726a633468c9243e127fa13 +Author: Behdad Esfahbod +Date: Fri Mar 24 10:24:52 2017 -0700 + + Blacklist more versions of Padauk + + Patch from Phil Race. + + src/hb-ot-layout.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit e693ba77980d5ded65bf773d48b6b58274933fb7 +Author: Khaled Hosny +Date: Thu Mar 23 00:35:36 2017 +0200 + + [ci] Fix msys2 build on AppVeyor + + For whatever reason the env variables need to be the Windows way or they + end up being empty. + + appveyor.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 91570a1eeb1eca425372e203656369f39ede5c61 +Author: Khaled Hosny +Date: Wed Mar 22 23:07:15 2017 +0200 + + Just always use strtod here + + src/hb-common.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit 539571c1a9cb5d443d029247874af37fed75432f +Author: Chun-wei Fan +Date: Fri Feb 24 17:58:25 2017 +0800 + + src/hb-common.cc: Fix build on older Visual Studio + + Visual Studio only supported strtof() from Visual Studio 2013 onwards, so + use strtod() instead to do the operation, which should do the same thing, + sans going to a double, not a float. + + src/hb-common.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit b90fb83ea6067802e62af9e1ea0c61c7ac79e9a9 +Author: Chun-wei Fan +Date: Fri Feb 24 17:47:44 2017 +0800 + + Visual Studio builds: Fix Introspection when UCDN enabled + + The sources in src/hb-ucdn and not included correctly into the NMake + Makefiles, as we need their explicit relative location as we pass all the + sources we used into the introspection scanner. This was not an issue + before as we excluded the UCDN sources in the build when we enabled + introspection (meaning GLib is enabled), but since we default on using + UCDN on all builds unless explicitly disabled, we need to deal with this. + + This did not affect builds using UCDN without introspection due to the use + of NMake batch rules. + + Fix this by creating a NMake Makefile module on-the-fly with the correct + subdir info, and using that list in there instead. + + win32/Makefile.vc | 15 +++++++++++++++ + win32/config-msvc.mak | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) + +commit f0aa167e447e8aa818a63a4a325be57844bf0353 +Author: Chun-wei Fan +Date: Thu Feb 23 13:02:49 2017 +0800 + + Update Visual Studio builds for UCDN usage + + We now use UCDN by default, so make it so in the build files; however + don't hardcode HAVE_UCDN as one may still opt not to use it (but pass + it in as a CFLAG unless one explicitly disables UCDN by using NO_UCDN=1 + on the NMake command line). + + Note that we are not blocking builds where UCDN is disabled along with + GLib and ICU, as that will trigger a build error anyways which will tell + the user what needs to be done to remedy this. + + win32/README.txt | 6 +++--- + win32/config-msvc.mak | 28 +++++++++++++++------------- + win32/config.h.win32.in | 2 +- + win32/info-msvc.mak | 43 +++++++++++++++++++++++++------------------ + 4 files changed, 44 insertions(+), 35 deletions(-) + +commit 60e2586f7652aaa0ee908eb8f54b1498e2ad299e +Author: Behdad Esfahbod +Date: Fri Mar 10 23:02:28 2017 -0800 + + 1.4.5 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 47e7a1800fba9b8bf042a1f4976a15ab012ebfc7 +Author: Behdad Esfahbod +Date: Fri Mar 10 13:23:02 2017 -0800 + + Revert "Fix Context lookup application when moving back after a glyph delete" + + This reverts commit b9b005f3a44ccf78a45b212b126287b69b9f4b40. + + This introduced invalid access cases. Revert until I fix correctly. + + src/hb-ot-layout-gsubgpos-private.hh | 7 ++++--- + .../sha1sum/5bbf3712e6f79775c66a4407837a90e591efbef2.ttf | Bin 6400 -> 0 bytes + test/shaping/tests/context-matching.tests | 1 - + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 3c080a7a0aefec1e9620e3fb399ad280ea4ee5a2 +Author: Behdad Esfahbod +Date: Tue Mar 7 18:13:28 2017 -0800 + + Fix buffer serialize of empty buffer + + Ouch! + + src/hb-buffer-serialize.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 8e42c3cb2bb81351d0a28f213cb4f6d35f4b5e46 +Author: Behdad Esfahbod +Date: Sun Mar 5 13:54:56 2017 -0800 + + 1.4.4 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 9ac9af725c781f4597e8db46cf330d595c072739 +Author: Behdad Esfahbod +Date: Sun Mar 5 13:51:01 2017 -0800 + + Add TODO item + + src/hb-ot-layout-gsubgpos-private.hh | 24 +++++++++++++++++++++++- + 1 file changed, 23 insertions(+), 1 deletion(-) + +commit 3ebcd5a381e2de27a0cfb5af3359331f0b7e7108 +Author: Elie Roux +Date: Sun Mar 5 16:26:01 2017 +0100 + + first working version! + + src/hb-ot-layout.cc | 2 ++ + src/hb-ot.h | 1 + + 2 files changed, 3 insertions(+) + +commit e65aaaa00a3b5ac811b5c73b5186cd7d65731f7b +Author: Elie Roux +Date: Sun Mar 5 14:53:39 2017 +0100 + + BASE: start api + + src/Makefile.sources | 2 ++ + src/hb-ot-base.cc | 58 ++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-base.h | 56 ++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout-base-table.hh | 15 ++--------- + 4 files changed, 118 insertions(+), 13 deletions(-) + +commit 5aec2fb8d0a4db52ae414d980b66018ca5ce1e9c +Author: Behdad Esfahbod +Date: Thu Mar 2 11:46:33 2017 -0800 + + Remove TODO item that is not going to happen + + src/hb-ot-shape.cc | 1 - + 1 file changed, 1 deletion(-) + +commit b9b005f3a44ccf78a45b212b126287b69b9f4b40 +Author: Behdad Esfahbod +Date: Wed Mar 1 14:27:23 2017 -0800 + + Fix Context lookup application when moving back after a glyph delete + + This was broken forever, since days that we did not allow moving + tape backwards. Works now. Reported by Doug Felt. + + src/hb-ot-layout-gsubgpos-private.hh | 7 +++---- + .../sha1sum/5bbf3712e6f79775c66a4407837a90e591efbef2.ttf | Bin 0 -> 6400 bytes + test/shaping/tests/context-matching.tests | 1 + + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit f72726c52b104a71ebf5b39fa1e3eb9febd446fc +Author: Elie Roux +Date: Sun Feb 26 15:08:43 2017 +0100 + + BASE: add function in main BASE object + + src/hb-ot-layout-base-table.hh | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +commit 3963315f1b2eae2504bc683760245c827cd1ef16 +Author: Elie Roux +Date: Sun Feb 26 15:07:53 2017 +0100 + + BASE: first complete version + + src/hb-ot-layout-base-table.hh | 444 +++++++++++++++++++++++++++++------------ + 1 file changed, 317 insertions(+), 127 deletions(-) + +commit a11501444cfc4854bfe2b1d3ce0fc5a957e959d8 +Author: Behdad Esfahbod +Date: Sat Feb 25 13:37:54 2017 -0800 + + Add few tests found by libFuzzer and oss-fuzz + + .../sha1sum/a34a9191d9376bda419836effeef7e75c1386016.ttf | Bin 0 -> 1010 bytes + .../sha1sum/a69118c2c2ada48ff803d9149daa54c9ebdae30e.ttf | Bin 0 -> 820 bytes + .../sha1sum/b6acef662e0beb8d5fcf5b61c6b0ca69537b7402.ttf | Bin 0 -> 3301 bytes + .../sha1sum/e88c339237f52d21e01c55f01b9c1b4cc14a0467.ttf | Bin 0 -> 515 bytes + test/shaping/tests/fuzzed.tests | 4 ++++ + 5 files changed, 4 insertions(+) + +commit 85630996b8afa699f7b5d19346cdf5c72fcd6e2d +Author: Behdad Esfahbod +Date: Sat Feb 25 13:30:38 2017 -0800 + + Fix buffer-overrun with Bengali reph positioning code + + This has no security implications whatsoever since we always keep + and extra element at the end of buffer, just in case. + + Discovered by oss-fuzz + CC https://github.com/behdad/harfbuzz/issues/139 + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=660 + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d34e35b47457e757781b1769a1fbaf107ec6e32f +Author: Elie Roux +Date: Sat Feb 25 20:41:05 2017 +0100 + + BASE: WIP: more access functions + + src/hb-ot-layout-base-table.hh | 212 +++++++++++++++++++++++++++++++++++++---- + 1 file changed, 191 insertions(+), 21 deletions(-) + +commit 6685d281d6f50bf046bbfef4a5263e15d15f2f02 +Author: Behdad Esfahbod +Date: Sat Feb 25 11:35:05 2017 -0800 + + 1.4.3 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit bd15567ed6a3667e6f8332b7374aece6a6f2361b +Author: Elie Roux +Date: Sat Feb 25 17:08:01 2017 +0100 + + BASE: align member's names + + src/hb-ot-layout-base-table.hh | 70 +++++++++++++++++++++--------------------- + 1 file changed, 35 insertions(+), 35 deletions(-) + +commit 499b4bef2a5b6d49374ab4977509d1fbf7bd6038 +Author: Elie Roux +Date: Sat Feb 25 16:48:22 2017 +0100 + + BASE: more consistent naming (with spec and Harfbuzz code base) + + src/hb-ot-layout-base-table.hh | 44 +++++++++++++++++++++--------------------- + 1 file changed, 22 insertions(+), 22 deletions(-) + +commit a0bdd546c584eb7c7ea3ca7e19a178723e6fe77f +Author: Elie Roux +Date: Sat Feb 25 16:34:58 2017 +0100 + + factorize horiz+vertAxis + + src/hb-ot-layout-base-table.hh | 31 +++++-------------------------- + 1 file changed, 5 insertions(+), 26 deletions(-) + +commit 1d30c6d935535743c73b2d18abcc6ae86a1cfc5b +Author: Elie Roux +Date: Sat Feb 25 16:19:35 2017 +0100 + + BASE: sanitize + + src/hb-ot-layout-base-table.hh | 151 ++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 148 insertions(+), 3 deletions(-) + +commit a657f23ca31237d652b5c101ed24194b6aeadaf8 +Author: Dominik Röttsches +Date: Mon Feb 20 21:52:07 2017 +0200 + + Blacklist another instance of Padauk (#419) + + In https://crbug.com/681813 another instance of Padauk was identified + triggering collapsed glyphs. Blacklist this version by patching + hb-ot-layout.cc to print out gdef, gsub, and gpos table length, then + adding those to the list of blacklisted versions. + + src/hb-ot-layout.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit f131f00b1779b44633223915e17cbce358ad063a +Author: Elie Roux +Date: Sun Feb 19 10:12:22 2017 +0100 + + compile, move into hb-ot-layout.cc + + src/hb-ot-font.cc | 1 - + src/hb-ot-layout-base-table.hh | 57 +++++++++++++++++++++++++++++++----------- + src/hb-ot-layout.cc | 1 + + 3 files changed, 43 insertions(+), 16 deletions(-) + +commit d0b97353e930d9b258f42f1cc1ac1a75306b76a8 +Author: Elie Roux +Date: Sun Feb 19 08:48:22 2017 +0100 + + hb-ot-base-table.hh -> hb-ot-layout-base-table.hh + + per https://github.com/behdad/harfbuzz/issues/418#issuecomment-280873811 + + src/Makefile.sources | 2 +- + src/hb-ot-font.cc | 2 +- + src/{hb-ot-base-table.hh => hb-ot-layout-base-table.hh} | 0 + 3 files changed, 2 insertions(+), 2 deletions(-) + +commit f748e11645a3361f94d6fb10ce59febbaa5ba8ca +Author: Elie Roux +Date: Sat Feb 18 19:54:33 2017 +0100 + + bootstraping structure + + src/Makefile.sources | 1 + + src/hb-ot-base-table.hh | 238 ++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-font.cc | 1 + + src/hb-ot-layout-private.hh | 2 + + 4 files changed, 242 insertions(+) + +commit 70202983f57fe85b2d3b56a9c205effeee66222d +Author: ebraminio +Date: Sat Feb 18 10:37:36 2017 +0330 + + [ci] Disable vcpkg freetype installation and fix Appveyor CI (#422) + + appveyor.yml | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 44f7d6ecde9bf7427a05cbe73ed5d668b8a72b2a +Author: jfkthame +Date: Fri Feb 17 03:03:24 2017 +0000 + + Guard against underflow when adjusting length (#421) + + * Guard against underflow when adjusting length + + With the fuzz-testcase in mozilla bug 1295299, we end up with a recursed lookup that removes 3 items, when `match_positions[idx]` is 0, which results in (unsigned) `end` wrapping to a huge value. + + Making `end` a signed int is probably the simplest route to a fix. + + Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1295299. + + * Add testcase for #421. + + src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- + .../sha1sum/558661aa659912f4d30ecd27bd09835171a8e2b0.ttf | Bin 0 -> 1358 bytes + test/shaping/tests/fuzzed.tests | 1 + + 3 files changed, 4 insertions(+), 3 deletions(-) + +commit 45766b673f427bb791c9d5886cadedfac0447066 +Author: jfkthame +Date: Thu Feb 16 17:40:21 2017 +0000 + + [indic] Add support for Grantha marks that may be used in Tamil to th… (#401) + + * [indic] Add support for Grantha marks that may be used in Tamil to the Indic table. + + See https://bugzilla.mozilla.org/show_bug.cgi?id=1331339. + + Testcase: U+0BA4,U+0BC6,U+1133c,U+0BAA,U+1133c,U+0BC6,U+1133c + + * [indic] Add test for Grantha nukta that is allowed in Tamil by ScriptExtensions.txt + + src/hb-ot-shape-complex-indic-table.cc | 7 +++++++ + .../sha1sum/3493e92eaded2661cadde752a39f9d58b11f0326.ttf | Bin 0 -> 1400 bytes + test/shaping/tests/indic-script-extensions.tests | 1 + + 3 files changed, 8 insertions(+) + +commit d4bb52b9fd8a5bc4af13752ea3e464eccfe3223b +Author: Behdad Esfahbod +Date: Thu Feb 9 14:13:25 2017 -0800 + + Unbreak hb-coretext build + + src/hb-coretext.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit c8dfed8e1ee4ab64b6936f5c8561db0666e37647 +Merge: 7c47474f b435c7c4 +Author: Behdad Esfahbod +Date: Wed Feb 8 14:36:18 2017 -0800 + + Merge pull request #357 from khaledhosny/graphite-scale + + [graphite] Fix shaping with varying font sizes + +commit 7c47474f209bdf84cf87844c277ed711cad78196 +Author: Behdad Esfahbod +Date: Wed Feb 8 14:33:28 2017 -0800 + + Set LC_ALL instead of LANG when creating harfbuzz.def + + Hopefully fixes Travis faliure? + https://github.com/behdad/harfbuzz/pull/413#issuecomment-278481882 + https://travis-ci.org/khaledhosny/harfbuzz/jobs/199785332#L1065 + + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ffde3c9f9effcd2b47f5fd76df45551e68c0b1ec +Author: Philip Withnall +Date: Wed Feb 8 21:56:57 2017 +0000 + + hb-font: Fix a potentially undefined use of memcmp() (#413) + + While it’s fine to call memcmp(x, 0, 0) in practice, the C99 standard + explicitly says that this is not allowed: even if the length is zero, + the pointer arguments must be valid. + + http://stackoverflow.com/a/16363034 + + Coverity ID: 141178 + + Signed-off-by: Philip Withnall + + src/hb-font.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 09594df1aecbb7d37093055147c25cc7d7b7fef6 +Author: Behdad Esfahbod +Date: Tue Feb 7 18:25:12 2017 -0800 + + Update ax_pthread.m4 to latest upstream version + + Might help with https://github.com/behdad/harfbuzz/issues/399 + + m4/ax_pthread.m4 | 394 ++++++++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 285 insertions(+), 109 deletions(-) + +commit a6ced90efccf869defc0b310effca220f01cf318 +Author: Philip Withnall +Date: Wed Feb 8 02:18:33 2017 +0000 + + test: Fix some memory leaks in test-font.c (#409) + + Coverity IDs: 141039, 141040, 141041 + + test/api/test-font.c | 35 ++++++++++++++++++++++++++++++----- + 1 file changed, 30 insertions(+), 5 deletions(-) + +commit 925ceacfed45c44dd2a025c32bebb1358b560741 +Author: Philip Withnall +Date: Wed Feb 8 02:17:48 2017 +0000 + + util: Add missing field initialisers in constructor (#410) + + Coverity ID: 141042 + + util/hb-shape.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 73c6dcbb45269186f204b2212288b6384ce42c9d +Author: Behdad Esfahbod +Date: Tue Feb 7 16:53:21 2017 -0800 + + Silence Coverity warning + + Fixes https://github.com/behdad/harfbuzz/issues/408 + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 466b3e58bdc64229dab08c6e0e0079c789540370 +Author: Behdad Esfahbod +Date: Fri Feb 3 16:43:25 2017 -0800 + + Shuffle things around a bit + + src/hb-coretext.cc | 4 ++-- + src/hb-directwrite.cc | 4 ++-- + src/hb-fallback-shape.cc | 4 ++++ + src/hb-graphite2.cc | 4 ++-- + src/hb-ot-layout-private.hh | 1 - + src/hb-ot-layout.cc | 2 -- + src/hb-ot-math.cc | 3 +-- + src/hb-ot-shape.cc | 4 ++++ + src/hb-ot-var.cc | 2 -- + src/hb-shape-plan.cc | 7 ------- + src/hb-shaper-private.hh | 11 +++++++---- + src/hb-uniscribe.cc | 4 ++-- + 12 files changed, 24 insertions(+), 26 deletions(-) + +commit fc8189b63931f03c5d2e70dde198e9c856bd78f5 +Author: Behdad Esfahbod +Date: Fri Feb 3 16:17:08 2017 -0800 + + Minor + + src/hb-shaper-private.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit d3d3691806aaa6aed93a88c845d472e727e7f850 +Author: Behdad Esfahbod +Date: Fri Feb 3 15:42:03 2017 -0800 + + Add dirty-state tracking to hb_face_t + + src/hb-face-private.hh | 9 +++++++++ + src/hb-face.cc | 19 ++++++++++++++++++- + src/hb-font.cc | 2 +- + 3 files changed, 28 insertions(+), 2 deletions(-) + +commit 2171f48b4b1e66a3c16a83cc00b0006d32ae9738 +Author: Behdad Esfahbod +Date: Fri Feb 3 10:58:09 2017 -0800 + + Add dirty-state tracking to hb_font_t + + src/hb-font-private.hh | 12 ++++++++++++ + src/hb-font.cc | 30 ++++++++++++++++++++++++++++++ + 2 files changed, 42 insertions(+) + +commit 95808bad2c17a9ef41c58c04faf1b4706fb7d72e +Author: Behdad Esfahbod +Date: Fri Feb 3 10:39:40 2017 -0800 + + Add new API hb_font_set_face() + + For completeness. + + src/hb-font.cc | 29 +++++++++++++++++++++++++++++ + src/hb-font.h | 4 ++++ + 2 files changed, 33 insertions(+) + +commit 4ec19319ab195d852708661e12da2a6485fce544 +Author: jfkthame +Date: Thu Feb 2 18:48:23 2017 +0000 + + Add Win10 Anniversary Update version of Tahoma to GDEF blacklist. (#412) + + src/hb-ot-layout.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 1dd630a7f2c2cec780fee507367341bc9050cdb3 +Author: Behdad Esfahbod +Date: Wed Feb 1 11:57:21 2017 -0800 + + Minor + + Fixes https://github.com/behdad/harfbuzz/issues/411 + + src/hb-fallback-shape.cc | 2 +- + src/hb-ot-shape-normalize.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit e888f642db16f52836cbfec29de43ff20236dc85 +Author: Behdad Esfahbod +Date: Thu Jan 26 14:50:14 2017 -0800 + + Route Adlam through Arabic shaper + + Fixes joined Adlam rendering. + + Fixes https://github.com/googlei18n/noto-fonts/issues/828 + + src/hb-ot-shape-complex-private.hh | 3 +++ + test/shaping/Makefile.am | 1 + + .../5dfad7735c6a67085f1b90d4d497e32907db4c78.ttf | Bin 0 -> 21160 bytes + test/shaping/tests/arabic-like-joining.tests | 1 + + 4 files changed, 5 insertions(+) + +commit 72c754873c6b15cecb32d9e491c98495f804347a +Author: jfkthame +Date: Thu Jan 26 22:35:41 2017 +0000 + + Add Win7 version of himalaya.ttf to the GDEF table blacklist. (#407) + + src/hb-ot-layout.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 22af28a3f14c6d748ed589f8980b168152116c8c +Author: Behdad Esfahbod +Date: Mon Jan 23 23:42:53 2017 -0800 + + [var] Implement MVAR table + + Unhooked. Untested. + + src/Makefile.sources | 1 + + src/hb-font.cc | 2 +- + src/hb-ot-var-mvar-table.hh | 110 ++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-var.cc | 1 + + 4 files changed, 113 insertions(+), 1 deletion(-) + +commit 67a191164dec2cfcab97363175c58e459f6ff8f9 +Author: Behdad Esfahbod +Date: Mon Jan 23 23:21:30 2017 -0800 + + [var] Whitespace + + src/hb-ot-var-hvar-table.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 6af6c1114a3495584ac4197c62592741c407b5a2 +Author: Behdad Esfahbod +Date: Mon Jan 23 18:35:00 2017 -0800 + + 1.4.2 + + NEWS | 31 +++++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 32 insertions(+), 1 deletion(-) + +commit 79e8e27ffd3da29ca27d3aebd2ef425bf1cb7f9d +Author: Behdad Esfahbod +Date: Mon Jan 23 17:55:31 2017 -0800 + + [var] Hook up advance variations to hb-ot-font + + Yay, works! + + src/hb-ot-font.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 607434037199ccca422287e4d097487f17f3cfb5 +Author: Behdad Esfahbod +Date: Mon Jan 23 17:55:16 2017 -0800 + + [var] Fix bug in HVAR/VVAR impl + + src/hb-ot-var-hvar-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bd3b11d92663343350813ca29606b369f691af03 +Author: Behdad Esfahbod +Date: Mon Jan 23 17:34:44 2017 -0800 + + [var] Prepare for hooking up advance variations to hb-ot-font + + src/hb-ot-font.cc | 28 +++++++++++++++++----------- + src/hb-ot-var-hvar-table.hh | 8 ++++---- + 2 files changed, 21 insertions(+), 15 deletions(-) + +commit a4fca9f0051dbc177390a4e555b2d0fe642f724e +Author: Behdad Esfahbod +Date: Mon Jan 23 11:56:08 2017 -0800 + + [var] Implement DeltaSetIndexMap and advance delta fetching + + Not hooked up to hb-ot-font yet. + + src/hb-ot-layout-common-private.hh | 8 ++++++ + src/hb-ot-var-hvar-table.hh | 56 ++++++++++++++++++++++++++++++++++++-- + 2 files changed, 61 insertions(+), 3 deletions(-) + +commit 7b399f73efa76cd97131fd123a9a1566f8639cfd +Author: Behdad Esfahbod +Date: Mon Jan 23 11:41:43 2017 -0800 + + [var] Start adding HVAR/VVAR + + src/Makefile.sources | 1 + + src/hb-ot-font.cc | 1 + + src/hb-ot-var-avar-table.hh | 1 - + src/hb-ot-var-fvar-table.hh | 1 - + src/hb-ot-var-hvar-table.hh | 115 ++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 117 insertions(+), 2 deletions(-) + +commit b732c53eb5bd0c2cc86f35a9d9623c92579a0b8c +Author: Behdad Esfahbod +Date: Sun Jan 22 20:31:53 2017 -0800 + + Add LArrayOf<> + + src/hb-open-type-private.hh | 1 + + src/hb-ot-cbdt-table.hh | 4 ++-- + src/hb-ot-layout-common-private.hh | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) + +commit 5e156fa5ed33cd1a8ff388833563f15930bb12f9 +Author: Behdad Esfahbod +Date: Sun Jan 22 20:28:56 2017 -0800 + + Add LOffsetTo<> + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 1 + + src/hb-ot-cbdt-table.hh | 4 ++-- + src/hb-ot-cmap-table.hh | 6 +++--- + src/hb-ot-layout-common-private.hh | 10 +++++----- + src/hb-ot-layout-gdef-table.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 7 files changed, 15 insertions(+), 14 deletions(-) + +commit d6bdbbca307d1a4aed60a78133eea40a1a9d5bf3 +Author: Behdad Esfahbod +Date: Sun Jan 22 20:16:51 2017 -0800 + + [var] Remove HB_OT_TAG_fvar/avar + + We're not going to define public macros for tags for tables. + There's little use to those and they are implementation detail. + + docs/harfbuzz-sections.txt | 2 -- + src/hb-ot-var-avar-table.hh | 2 ++ + src/hb-ot-var-fvar-table.hh | 2 ++ + src/hb-ot-var.h | 3 --- + 4 files changed, 4 insertions(+), 5 deletions(-) + +commit a11d9a0466e480efebd69a34827675387cd2ca34 +Author: Behdad Esfahbod +Date: Sun Jan 22 20:09:47 2017 -0800 + + Minor + + src/hb-ot-font.cc | 6 +++--- + src/hb-ot-hmtx-table.hh | 8 +++----- + 2 files changed, 6 insertions(+), 8 deletions(-) + +commit 7a860f656e4aec45c45e0f5fb28c49a91dc5eef2 +Author: Behdad Esfahbod +Date: Sun Jan 22 19:52:09 2017 -0800 + + [var] Add macros for standard axes + + docs/harfbuzz-sections.txt | 7 +++++++ + src/hb-ot-var.h | 6 ++++++ + 2 files changed, 13 insertions(+) + +commit a484e237b11650d00092329855d33dd2f67980e4 +Author: Behdad Esfahbod +Date: Sun Jan 22 19:41:33 2017 -0800 + + [var] Implement 'avar' table mapping + + Untested! + + src/hb-ot-math.cc | 2 -- + src/hb-ot-var-avar-table.hh | 46 ++++++++++++++++++++++++++++++++++++++++++++- + src/hb-ot-var.cc | 23 +++++++++++++++-------- + 3 files changed, 60 insertions(+), 11 deletions(-) + +commit a42909057207cbed1ef95716170434c05beb0002 +Author: Behdad Esfahbod +Date: Sun Jan 22 19:01:07 2017 -0800 + + [var] Flesh out --variations documentation + + util/options.cc | 53 ++++++++++++++--------------------------------------- + 1 file changed, 14 insertions(+), 39 deletions(-) + +commit 5ec96d30cad1592b5e468bd8ad1832dbaf0ad32b +Author: Behdad Esfahbod +Date: Sun Jan 22 18:52:00 2017 -0800 + + [var] Adjust API in prep for 'avar' implementation + + The 'avar' table does not allow random access to axis maps, + so change API to avoid quadratic-time implementation. + + Removed -hb_ot_var_normalize_axis_value(), added + +hb_ot_var_normalize_variations() and + +hb_ot_var_normalize_coords() instead. + + docs/harfbuzz-sections.txt | 3 ++- + src/Makefile.sources | 1 + + src/hb-font.cc | 20 +++++--------------- + src/hb-ot-var.cc | 45 +++++++++++++++++++++++++++++++++++++++------ + src/hb-ot-var.h | 16 ++++++++++++---- + 5 files changed, 59 insertions(+), 26 deletions(-) + +commit 8a577aaa0dd760409bcad1ae3d4f5fb561a62a4b +Author: Behdad Esfahbod +Date: Sun Jan 22 18:22:40 2017 -0800 + + [var] Stub implementation of avar table + + src/hb-ot-var-avar-table.hh | 99 +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 99 insertions(+) + +commit 7647a05a0b37c53465560952b412db4e590f2716 +Author: Behdad Esfahbod +Date: Sun Jan 22 17:47:49 2017 -0800 + + Minor + + src/hb-font.cc | 5 ++++- + src/hb-font.h | 2 +- + src/hb-ft.cc | 2 +- + util/helper-cairo.cc | 14 +++++++++----- + 4 files changed, 15 insertions(+), 8 deletions(-) + +commit d2f249e745a9179943ee39c719b73e1057acbc13 +Author: Behdad Esfahbod +Date: Sun Jan 22 17:42:33 2017 -0800 + + Stub out doc comments for new symbols + + docs/harfbuzz-docs.xml | 2 +- + docs/harfbuzz-sections.txt | 35 +++++++++++++++++++++++++++++++++-- + src/hb-common.cc | 10 ++++++++++ + src/hb-common.h | 5 +++++ + src/hb-directwrite.cc | 2 +- + src/hb-directwrite.h | 2 +- + src/hb-font.cc | 20 ++++++++++++++++++++ + src/hb-ot-var.cc | 24 ++++++++++++++++++++++-- + src/hb-ot-var.h | 12 +++++------- + src/hb-set.cc | 2 +- + 10 files changed, 99 insertions(+), 15 deletions(-) + +commit 5dfd341f51543279039ddafe883c0a1de205fb8a +Author: Behdad Esfahbod +Date: Sun Jan 22 16:55:40 2017 -0800 + + Minor + + src/hb-directwrite.cc | 4 ++-- + src/hb-shape.cc | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 825e40407da74576f8e83ce0bacad5b0459b83c8 +Author: Behdad Esfahbod +Date: Sun Jan 22 16:41:45 2017 -0800 + + [hb-ft] Remove use of variable-length array + + Hopefully also fixes build failure on msvc. + + src/hb-ft.cc | 33 +++++++++++++++++++++------------ + 1 file changed, 21 insertions(+), 12 deletions(-) + +commit 47ee34e84745756a9aaeb964772377b6c1417ed1 +Author: Behdad Esfahbod +Date: Sat Jan 21 18:10:08 2017 -0800 + + [var] Hook up variations to FreeType face + + hb-view correctly renders variations with ft font-funcs now. + hb-ot-font needs HVAR implementation. + + src/hb-ft.cc | 10 ++++++++++ + util/helper-cairo.cc | 16 +++++++++++++++- + 2 files changed, 25 insertions(+), 1 deletion(-) + +commit 111f3e55178f7cd5a8ae4e8ae111cb48aea4acb5 +Author: Behdad Esfahbod +Date: Sat Jan 21 17:51:41 2017 -0800 + + [util] Add --variations + + Is hooked up to the font, but not to FreeType, so raster doesn't show yet. + + Documentation needs to be done. + + util/options.cc | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + util/options.hh | 8 ++++- + 2 files changed, 98 insertions(+), 1 deletion(-) + +commit bb1e19268f02d4aad2240c52852e72afcf0f79ad +Author: Behdad Esfahbod +Date: Sat Jan 21 17:41:37 2017 -0800 + + [var] Rename var_coord to variation + + Looks much better. + + src/hb-common.cc | 36 ++++++++++++++++++------------------ + src/hb-common.h | 10 +++++----- + src/hb-font.cc | 20 ++++++++++---------- + src/hb-font.h | 6 +++--- + 4 files changed, 36 insertions(+), 36 deletions(-) + +commit 64fe92bf2d43a0ea31743d774e073f202021dbd1 +Author: Behdad Esfahbod +Date: Sat Jan 21 15:36:35 2017 -0800 + + [var] Remove use of variable-length arrays + + src/hb-font.cc | 30 +++++++++++++++++++++--------- + 1 file changed, 21 insertions(+), 9 deletions(-) + +commit 2491134b386507f611a47e43e3f7c2766d0d288b +Author: Behdad Esfahbod +Date: Sat Jan 21 15:21:50 2017 -0800 + + [var] Add hb_font_set_var_coords() + + src/hb-font.cc | 38 ++++++++++++++++++++++++++++++++++++-- + src/hb-font.h | 8 ++++++-- + 2 files changed, 42 insertions(+), 4 deletions(-) + +commit 113393efec5e0c4c10c141a6d4b801d50fcd8ab8 +Author: Behdad Esfahbod +Date: Sat Jan 21 15:12:03 2017 -0800 + + Remove a few unused includes + + src/hb-face.cc | 6 +----- + src/hb-font.cc | 7 ------- + src/hb-ot-layout.cc | 5 +---- + src/hb-ot-tag.cc | 3 --- + 4 files changed, 2 insertions(+), 19 deletions(-) + +commit 2d40923ca914c90304d07d6e7b9b1040c79c76fe +Author: Behdad Esfahbod +Date: Sat Jan 21 15:06:15 2017 -0800 + + Minor + + src/hb-ot-math.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8b2a58047095604dcdc576ecbe3e8c2ebb8f48f0 +Author: Behdad Esfahbod +Date: Sat Jan 21 15:05:00 2017 -0800 + + [var] Add hb_font_set_var_coords_design() + + src/hb-font.cc | 21 +++++++++++++++++++-- + src/hb-font.h | 7 ++++++- + 2 files changed, 25 insertions(+), 3 deletions(-) + +commit 0dcc7b49a830e2680d3e6d86d953efab85cef6ff +Author: Behdad Esfahbod +Date: Sat Jan 21 14:50:22 2017 -0800 + + [var] Minor lifecycle adjustment + + src/hb-font.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bf0d3a665baac9e33c0f774b22197c321b864c80 +Author: Behdad Esfahbod +Date: Sat Jan 21 14:48:46 2017 -0800 + + [var] Add hb_font_get_var_coords_normalized() + + src/hb-font.cc | 10 ++++++++++ + src/hb-font.h | 4 ++++ + 2 files changed, 14 insertions(+) + +commit b3c0714b4bbb726b2b3e5e0416ac84cb5c6eb34e +Author: Behdad Esfahbod +Date: Fri Jan 20 20:30:03 2017 -0800 + + [var] Add hb_var_coord_t and parsing routines + + src/hb-common.cc | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- + src/hb-common.h | 15 ++++++++- + 2 files changed, 103 insertions(+), 6 deletions(-) + +commit 72364103bc9d910d19f23a3764d045af79d076d5 +Author: Behdad Esfahbod +Date: Fri Jan 20 20:16:53 2017 -0800 + + Move code around + + src/hb-common.cc | 250 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-common.h | 18 ++++ + src/hb-shape.cc | 248 ------------------------------------------------------ + src/hb-shape.h | 16 ---- + 4 files changed, 268 insertions(+), 264 deletions(-) + +commit 785982bf830723552270db5649abcb9f9f0b46b1 +Author: Behdad Esfahbod +Date: Fri Jan 20 19:57:27 2017 -0800 + + [var] Flesh out some more + + src/Makefile.am | 2 ++ + src/hb-ot-var-fvar-table.hh | 69 ++++++++++++++++++++++++++++++++------------- + src/hb-ot-var.cc | 39 ++++++++++++++++++++++++- + src/hb-ot-var.h | 21 +++++++++----- + 4 files changed, 104 insertions(+), 27 deletions(-) + +commit 422c0c36c80145a2d993f80d5c7d3265e3d8357a +Author: Behdad Esfahbod +Date: Fri Jan 20 19:14:54 2017 -0800 + + [var] Flesh out a bit + + src/hb-ot-var-fvar-table.hh | 72 ++++++++++++++++++++++++++++++++++++--------- + src/hb-ot-var.h | 10 ++++++- + 2 files changed, 67 insertions(+), 15 deletions(-) + +commit b8376b10904e1772b8d34d852d1100ca7e2185e2 +Author: Behdad Esfahbod +Date: Fri Jan 20 18:19:28 2017 -0800 + + Minor + + src/hb-ft.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f2e73d37e77ccea8b948d1ecf5f11e7a699386dc +Author: Behdad Esfahbod +Date: Fri Jan 20 17:42:18 2017 -0800 + + [var] Remove over-optimization + + src/hb-font.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit 469926cc45760cb681d44e5757b18b9bdd736189 +Author: Behdad Esfahbod +Date: Fri Jan 20 17:40:46 2017 -0800 + + [var] Change double to float in API + + src/hb-ot-var.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 55d42fd667b9c34a1109bb850bf2ea7322c01040 +Author: Behdad Esfahbod +Date: Thu Jan 19 19:35:48 2017 -0800 + + Start adding hb-ot-var.h and implementation + + Supports enumerating variation axes, normalizing values, etc. + + src/Makefile.sources | 3 + + src/hb-ot-layout-private.hh | 6 ++ + src/hb-ot-layout.cc | 4 ++ + src/hb-ot-var-fvar-table.hh | 133 ++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-var.cc | 63 +++++++++++++++++++++ + src/hb-ot-var.h | 81 +++++++++++++++++++++++++++ + src/hb-ot.h | 1 + + 7 files changed, 291 insertions(+) + +commit 272b5115325b785e92ff5500d4bfc3a67490b6f8 +Author: Behdad Esfahbod +Date: Thu Jan 19 19:33:07 2017 -0800 + + Minor + + src/hb-ot-math.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit a8a5e81a52f56f5f8bf975dc4d9f79bede5d895b +Author: Behdad Esfahbod +Date: Thu Jan 19 16:55:04 2017 -0800 + + [test-ot-math] Add test with nil face/font + + test/api/test-ot-math.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 331d07bd40a3d9ff30db5cdf85fdc4f10f0fcb99 +Author: Behdad Esfahbod +Date: Thu Jan 19 16:51:36 2017 -0800 + + Minor + + test/api/test-ot-math.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit b5ecf1bfa459a755e36bc4c7f545c7f803b7d016 +Author: Behdad Esfahbod +Date: Thu Jan 19 16:50:29 2017 -0800 + + Fix warnings + + test/api/test-ot-math.c | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +commit 2f2ceee1853649d1b2ad4315a38cd9c07659932a +Author: Behdad Esfahbod +Date: Thu Jan 19 16:48:01 2017 -0800 + + Minor + + test/api/test-ot-math.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 2452543fdd383e62b8c4bc44b11bfd6796fc9963 +Author: Khaled Hosny +Date: Wed Jan 18 22:48:13 2017 +0200 + + [ot] Fix automatic fraction for RTL scripts (#405) + + The numbers for right-to-left scripts are processed also from right to + left, so the order of applying “numr” and “dnom” features should be + reversed in such case. + + Fixes https://github.com/behdad/harfbuzz/issues/395 + + src/hb-ot-shape.cc | 16 ++++++++++++++-- + test/shaping/Makefile.am | 1 + + .../15dfc433a135a658b9f4b1a861b5cdd9658ccbb9.ttf | Bin 0 -> 4936 bytes + test/shaping/tests/automatic-fractions.tests | 3 +++ + 4 files changed, 18 insertions(+), 2 deletions(-) + +commit 1337428e4f8a2a4c78312c581bf4e96cd49d783f +Author: Sascha Brawer +Date: Wed Jan 18 13:51:02 2017 +0100 + + Update language tags to OpenType 1.8.1 (#403) + + Resolves https://github.com/behdad/harfbuzz/issues/324 + + src/hb-ot-tag.cc | 77 ++++++++++++++++++++++++++++++++++++++++++++------ + test/api/test-ot-tag.c | 58 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 126 insertions(+), 9 deletions(-) + +commit 784d1180de19fbf4948f08ee2124277cc06066dd +Author: Behdad Esfahbod +Date: Wed Jan 11 11:58:13 2017 -0800 + + Fix build with clang + + src/hb-open-type-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1f810daf1640f279c2f7aad8c312664cf2293987 +Author: Behdad Esfahbod +Date: Mon Jan 9 23:50:56 2017 -0800 + + Port math table to hb_lazy_table_loader_t + + src/hb-open-type-private.hh | 22 +++++++++++++++++----- + src/hb-ot-layout-private.hh | 4 ++-- + src/hb-ot-layout.cc | 7 +++---- + src/hb-ot-math.cc | 17 +---------------- + 4 files changed, 23 insertions(+), 27 deletions(-) + +commit ebbcc1112229cde9ed469efdfeac7ef79dfcd834 +Author: Behdad Esfahbod +Date: Mon Jan 9 22:45:25 2017 -0800 + + Add hb_lazy_table_loader_t + + src/hb-open-type-private.hh | 40 ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) + +commit 1af9d924a474f210fda10b5e8ab6b388241aa0b5 +Author: Behdad Esfahbod +Date: Mon Jan 9 22:22:37 2017 -0800 + + Move lazy-loader to more generic place + + src/hb-open-type-private.hh | 47 ++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-font.cc | 48 ++------------------------------------------- + 2 files changed, 49 insertions(+), 46 deletions(-) + +commit ac274331c285e1b42632870e150e1d66a9e21933 +Author: Behdad Esfahbod +Date: Mon Jan 9 22:20:38 2017 -0800 + + In lazy-loading, remember allocation failure + + src/hb-ot-font.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 29fb0cb727555ea60460d794a3c6f30179546af9 +Author: Behdad Esfahbod +Date: Mon Jan 9 21:18:55 2017 -0800 + + Minor + + src/hb-face-private.hh | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 93ef684b9bc411b7642df3adeb2248ad6010ee66 +Author: Behdad Esfahbod +Date: Mon Jan 9 21:11:00 2017 -0800 + + Rename hb-ot-layout-math-table.hh to hb-ot-math-table.hh + + src/Makefile.sources | 2 +- + src/{hb-ot-layout-math-table.hh => hb-ot-math-table.hh} | 6 +++--- + src/hb-ot-math.cc | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit 3b5263b0e9e23e56e14ce6a8498c21c5ce95cc35 +Author: Behdad Esfahbod +Date: Mon Jan 9 15:49:08 2017 -0800 + + Typo + + src/hb-ot-layout-math-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ebf927d3d4394159e480fec2042a0456df8dd0f4 +Author: ebraminio +Date: Mon Jan 9 13:12:09 2017 +0330 + + Make UCDN default enabled (fixes #389) (#391) + + win32/config-msvc.mak | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 00adf9c8a4573a2b3ef61991197821af03bca310 +Author: Behdad Esfahbod +Date: Mon Jan 9 00:00:49 2017 -0800 + + Minor + + Should be enough to get -hangul.cc out of SOURCES in Firefox build: + https://dxr.mozilla.org/mozilla-central/source/gfx/harfbuzz/src/moz.build + + No one else should care! + + src/hb-ot-shape-complex-hangul.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7cf9952e7fc015d0b08d3de6c95357662d57ad8d +Author: Behdad Esfahbod +Date: Sun Jan 8 23:55:54 2017 -0800 + + [USE] Remove non-canonical decompositions + + We have had added this in Indic shaper to assist shaping these scripts. + In Universal Shaping Engine however, it is up to font designer to + decompose them. Hence moving them from Indic shaper to USE was + wrong. + + Fixup for f6ba63b2e8eb577385f70758efdd3b8408c8a9cb + + Part of fixing https://github.com/behdad/harfbuzz/issues/387 + + src/hb-ot-shape-complex-use.cc | 22 ---------------------- + 1 file changed, 22 deletions(-) + +commit b435c7c46a46350771e837e87fee448fd9dc06d3 +Author: Khaled Hosny +Date: Fri Nov 11 02:16:39 2016 +0200 + + [graphite] Stop creating unused gr_face + + It is unused after previous commit, hb_graphite2_font_get_gr_font() + makes no sense now so deprecating it. + + src/hb-graphite2.cc | 22 +++++----------------- + src/hb-graphite2.h | 4 ++++ + 2 files changed, 9 insertions(+), 17 deletions(-) + +commit 1b00a3b0488a5d1c6ede141ae0545e2eb9af0ed8 +Author: Khaled Hosny +Date: Sun Oct 30 20:16:41 2016 +0200 + + [graphite] Fix shaping with varying font sizes + + Shape using design units and scale the output. + + See https://bugs.documentfoundation.org/show_bug.cgi?id=103403#c7 + + src/hb-graphite2.cc | 27 +++++++++++++++------------ + 1 file changed, 15 insertions(+), 12 deletions(-) + +commit af596a5655ee2ed09da17a7de79f619e1547dcd9 +Author: Behdad Esfahbod +Date: Thu Jan 5 20:24:41 2017 -0800 + + 1.4.1 + + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 31f7b1bb94c2cef7ce58df52ddd1b09b42e8f596 +Author: Behdad Esfahbod +Date: Thu Jan 5 20:20:06 2017 -0800 + + Add tests for USE using Marchen font and text + + From http://www.babelstone.co.uk/Fonts/Marchen.html + + test/shaping/Makefile.am | 1 + + .../85414f2552b654585b7a8d13dcc3e8fd9f7970a3.ttf | Bin 0 -> 66936 bytes + test/shaping/tests/use-marchen.tests | 35 +++++++++++++++++++++ + 3 files changed, 36 insertions(+) + +commit 53543f8b3e19456279c86f711feba42ce976668c +Author: Behdad Esfahbod +Date: Thu Jan 5 20:12:32 2017 -0800 + + Ship UCDN and use it by default + + So we are not relying on version of Unicode data in glib... + + Fixes https://github.com/behdad/harfbuzz/issues/386 + Fixes https://github.com/behdad/harfbuzz/issues/388 + + configure.ac | 12 ++++++++---- + src/hb-unicode.cc | 6 +++--- + 2 files changed, 11 insertions(+), 7 deletions(-) + +commit f3397069479cae34e6bdc658e2875fb178b03e43 +Author: Behdad Esfahbod +Date: Thu Jan 5 01:27:49 2017 -0800 + + 1.4.0 + + NEWS | 34 ++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 35 insertions(+), 1 deletion(-) + +commit ae00af4a47587308969dfaf7baa93164d7842710 +Author: Frédéric Wang +Date: Tue Jan 3 05:55:09 2017 +0100 + + Move math-specific code from hb-ot-layout to hb-ot-math #235 (#384) + + src/Makefile.sources | 1 + + src/hb-ot-layout.cc | 244 --------------------------------------------- + src/hb-ot-math.cc | 272 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 273 insertions(+), 244 deletions(-) + +commit e053ccc5bb7268fe5900dd364d906638c58b2908 +Author: Behdad Esfahbod +Date: Wed Dec 28 15:51:57 2016 -0500 + + Remove Android.mk + + Android uses its own file these days and third-party developers should + be using the autotools-based system against Android NDK. + + Android.mk | 107 ------------------------------------------------------------ + Makefile.am | 1 - + 2 files changed, 108 deletions(-) + +commit 6cff75394192a1ab0dda82981752ade532838333 +Author: Behdad Esfahbod +Date: Wed Dec 28 13:46:21 2016 -0500 + + Remove Tibetan decomposition rules from Indic shaper + + The decomposition is very obscure and unlikely to help + any fonts. Just remove it since Uniscribe probably doesn't + do this either. + + Fixes https://github.com/behdad/harfbuzz/issues/382 + + src/hb-ot-shape-complex-indic.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit f6ba63b2e8eb577385f70758efdd3b8408c8a9cb +Author: Behdad Esfahbod +Date: Wed Dec 28 13:45:32 2016 -0500 + + Port decompositions from Indic to USE shaper + + Part of https://github.com/behdad/harfbuzz/issues/382 + + src/hb-ot-shape-complex-indic.cc | 16 ---------------- + src/hb-ot-shape-complex-use.cc | 22 ++++++++++++++++++++++ + 2 files changed, 22 insertions(+), 16 deletions(-) + +commit e678b537f77954615721abd65fef28854f95dc5d +Author: Behdad Esfahbod +Date: Mon Dec 26 14:11:59 2016 -0500 + + [indic] Remove Chakma decomposition rule from Indic shaper + + This is now added to USE: + https://github.com/behdad/harfbuzz/pull/383 + + See: + https://github.com/behdad/harfbuzz/issues/381 + https://github.com/behdad/harfbuzz/issues/382 + + src/hb-ot-shape-complex-indic.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit 49ba698124399373cea000d08e0e9fe5fc2396e8 +Author: jfkthame +Date: Wed Dec 28 18:00:51 2016 +0000 + + [use] Special-case Chakma split-vowel decomp in the USE shaper. (#383) + + src/hb-ot-shape-complex-use.cc | 21 ++++++++++++++++++++- + 1 file changed, 20 insertions(+), 1 deletion(-) + +commit c4ca49d55b49c65e04f0b2acecacd6a5c70978f4 +Author: Behdad Esfahbod +Date: Mon Dec 26 14:52:08 2016 -0500 + + Revert "[indic] Remove redundant Chakma decomposition rule" + + This reverts commit 805f76fc002d703acfcc4c5727f0b4d1baecefaa. + + Need to investigate why having this rule (with the reversed order) + fixes decomposition as reported by punchcutter: + https://github.com/behdad/harfbuzz/issues/381#issuecomment-269237796 + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 805f76fc002d703acfcc4c5727f0b4d1baecefaa +Author: Behdad Esfahbod +Date: Mon Dec 26 14:11:59 2016 -0500 + + [indic] Remove redundant Chakma decomposition rule + + This was not used BTW since Chakma doesn't go through Indic shaper + anymore. + + See: + https://github.com/behdad/harfbuzz/issues/381 + https://github.com/behdad/harfbuzz/issues/382 + + src/hb-ot-shape-complex-indic.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit 3cc48a46b56be06e6734aaabf37a4b521606380c +Author: Behdad Esfahbod +Date: Mon Dec 26 13:10:31 2016 -0500 + + [indix] Comment + + src/hb-ot-shape-complex-indic.cc | 25 ++++++++++++++++++++++--- + 1 file changed, 22 insertions(+), 3 deletions(-) + +commit 7d1c5d8281b05a5c178ea3ae048b0062145968aa +Author: nvelinov +Date: Sat Dec 24 02:46:37 2016 +0100 + + Compilation Error for ASSERT_STATIC on Some Compilers (#380) + + * this pointer in type definitions is not interpreted as a constant. + This rule is not enforced strictly by all compilers, but the Green Hills Software compiler will regard this as an error. + + * Merging branches for the DEFINE_SIZE_UNION macro + Adding check for the existence of static_size field in the tested member. + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e2b878055bb1c0b84e1f7cfbf3d3f80bfc6811ea +Author: Behdad Esfahbod +Date: Thu Dec 22 14:40:19 2016 -0600 + + Disable OTL processing for Hebrew if GPOS doesn't have Hebrew subtable + + New approach to fix this: + https://github.com/behdad/harfbuzz/commit/69f9fbc4200442a35484d3c790ae8f4979be5d60 + + Previous approach was reverted as it was too broad. See context: + https://github.com/behdad/harfbuzz/issues/347#issuecomment-267838368 + + With U+05E9,U+05B8,U+05C1,U+05DC and Arial Unicode, we now (correctly) disable + GDEF and GPOS, so we get results very close to Uniscribe, but slightly different + since our fallback position logic is not exactly the same: + + Before: [gid1166=3+991|gid1142=0+737|gid5798=0+1434] + After: [gid1166=3+991|gid1142=0@402,-26+0|gid5798=0+1434] + Uniscribe: [gid1166=3+991|gid1142=0@348,0+0|gid5798=0+1434] + + src/hb-ot-shape-complex-arabic.cc | 1 + + src/hb-ot-shape-complex-default.cc | 1 + + src/hb-ot-shape-complex-hangul.cc | 1 + + src/hb-ot-shape-complex-hebrew.cc | 13 +++++++++++++ + src/hb-ot-shape-complex-indic.cc | 1 + + src/hb-ot-shape-complex-myanmar.cc | 2 ++ + src/hb-ot-shape-complex-private.hh | 8 ++++++++ + src/hb-ot-shape-complex-thai.cc | 1 + + src/hb-ot-shape-complex-tibetan.cc | 1 + + src/hb-ot-shape-complex-use.cc | 1 + + src/hb-ot-shape.cc | 29 ++++++++++++++++------------- + 11 files changed, 46 insertions(+), 13 deletions(-) + +commit 1a0f4aa6dfee69236b422f7c8825eff940f45c19 +Author: Behdad Esfahbod +Date: Thu Dec 22 13:33:54 2016 -0600 + + Revert "Synthesize GDEF glyph class for any glyph that does not have one in GDEF" + + This reverts commit 69f9fbc4200442a35484d3c790ae8f4979be5d60. + + See https://github.com/behdad/harfbuzz/issues/347#issuecomment-268873401 + Fixes https://github.com/behdad/harfbuzz/issues/347 + + src/hb-ot-layout-gsub-table.hh | 22 ++-------------------- + src/hb-ot-shape.cc | 29 +++++++++++++++++++++++++++++ + 2 files changed, 31 insertions(+), 20 deletions(-) + +commit 4b4a1b9f235598b04ce9ae1f9670fc978ab7620d +Author: Behdad Esfahbod +Date: Wed Dec 21 23:10:43 2016 -0600 + + Fix assert fail with contextual matching + + As discovered by libFuzzer / Chromium fuzzing. + + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=659496 + CC https://github.com/behdad/harfbuzz/issues/139 + + src/hb-ot-layout-gsubgpos-private.hh | 6 +++++- + .../sha1sum/217a934cfe15c548b572c203dceb2befdf026462.ttf | Bin 0 -> 1384 bytes + test/shaping/tests/fuzzed.tests | 1 + + 3 files changed, 6 insertions(+), 1 deletion(-) + +commit df98ce5fc8cf1dafd58c329975f07aafbeee3263 +Author: Behdad Esfahbod +Date: Wed Dec 21 19:27:30 2016 -0600 + + Improve debug output with really deep nesting + + src/hb-private.hh | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit eab418c5e6fa34b90133862cc8ce11e617ce08bf +Author: Behdad Esfahbod +Date: Wed Dec 21 15:51:28 2016 -0600 + + Avoid infinite loop in CoverageFormat2 iteration with bad fonts + + Fixes https://github.com/behdad/harfbuzz/issues/363 + + src/hb-ot-layout-common-private.hh | 29 ++++++++++++++++++----------- + 1 file changed, 18 insertions(+), 11 deletions(-) + +commit a0688e8e7b58c156f5809c272b5884bfe75f68ae +Author: Behdad Esfahbod +Date: Tue Dec 20 20:52:50 2016 -0600 + + Ouch, finish previous change + + test/fuzzing/Makefile.am | 3 ++- + test/fuzzing/hb-fuzzer.cc | 30 ++++-------------------------- + 2 files changed, 6 insertions(+), 27 deletions(-) + +commit de14c19d14be90367a1231de56dd347e3f54931c +Author: Behdad Esfahbod +Date: Tue Dec 20 20:50:38 2016 -0600 + + [fuzzer] Separate main() into a new file + + test/fuzzing/hb-fuzzer.hh | 4 ++++ + test/fuzzing/main.cc | 21 +++++++++++++++++++++ + 2 files changed, 25 insertions(+) + +commit 7ed71eb347c894c5b4b012bcca0816922c3052c2 +Author: Behdad Esfahbod +Date: Tue Dec 20 15:01:16 2016 -0600 + + Protect collect_glyphs() and closure() against malicious DDOS fonts + + Fixes https://github.com/behdad/harfbuzz/issues/363 + + src/hb-ot-layout-gsub-table.hh | 58 ++++++++++++++++++++++++++++++++++-------- + 1 file changed, 48 insertions(+), 10 deletions(-) + +commit 1c98ff87c76536553e53c131e75aba33033ee3a0 +Author: Mike Hommey +Date: Fri Sep 30 18:15:37 2016 +0900 + + Support building with older glib versions + + It is desirable to be able to build against older versions of glib. + + fd7a245 changed the configure check to require glib > 2.38 for + G_TEST_DIST. Before that, version 2.16 was required, but in fact, + since aafe395, G_PASTE is being used, which was introduced in 2.19.1. + And since 0ef179e2, hb-glib uses GBytes, which were introduced in + 2.31.10. + + 2.19.1 is rather old, but 2.38 is rather new. For Firefox, building + against 2.22 is still supported, although we could probably get away + with bumping that to 2.28. Either way, GBytes is not available. + + Arguably, if you build against a glib that doesn't support GBytes, + you're not going to use the hb_glib_blob_create function, so we hide + the function when building against such a glib. + + As for G_TEST_DIST, when building against versions of glib that don't + support it, we can fallback to the previous behavior, which, AIUI, was + just making the test not work when building in a separate directory. + + configure.ac | 2 +- + src/hb-glib.cc | 2 ++ + src/hb-glib.h | 3 ++- + test/api/test-ot-math.c | 4 ++++ + 4 files changed, 9 insertions(+), 2 deletions(-) + +commit ad273881c597a95929ce3b84f63865f9d7dcdb7e +Author: Volker H. Simonis +Date: Wed Dec 14 18:56:17 2016 +0100 + + Minor fixes to pacify Coverity code scan + + Fixes https://github.com/behdad/harfbuzz/pull/377 + + src/hb-ot-font.cc | 6 +++++- + src/hb-ot-layout-gpos-table.hh | 14 +++++++------- + 2 files changed, 12 insertions(+), 8 deletions(-) + +commit 1e1825bf47aa29968f75a78305d4541ce2c9d40c +Author: ebraminio +Date: Sat Dec 17 10:30:40 2016 +0330 + + [dwrite] Provide an experimental API for justification (#279) + + src/hb-directwrite.cc | 48 ++++++++++++++++++++++++++++++++++++++++-------- + src/hb-directwrite.h | 4 ++++ + 2 files changed, 44 insertions(+), 8 deletions(-) + +commit 4cd0cd67914db1da10906e40335faea7dbec1d0a +Author: elmarb +Date: Wed Dec 7 11:50:27 2016 +0100 + + NMake ICU option builds with builtin ICU (#375) + + win32/build-rules-msvc.mak | 13 ------------- + win32/config-msvc.mak | 37 ++++++++++++++++++++----------------- + win32/create-lists-msvc.mak | 13 ------------- + win32/detectenv-msvc.mak | 4 +++- + win32/generate-msvc.mak | 2 +- + win32/info-msvc.mak | 12 +++++------- + win32/install.mak | 4 ---- + 7 files changed, 29 insertions(+), 56 deletions(-) + +commit 75fa884f925c203a839b5874f30bf9ebf025b6e4 +Author: Khaled Hosny +Date: Mon Dec 5 23:20:47 2016 +0200 + + [win32] Fix wrong description of the ICU option (#372) + + win32/README.txt | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 219cb29c5d230ecc6ee154b447fabd7b59fbe089 +Author: Behdad Esfahbod +Date: Wed Sep 28 17:16:06 2016 +0200 + + Fix build after rebasing opentype-gx branch on top of MATH table + + src/hb-ot-layout-common-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0aedfd59be54972e61a952753ffc0d12631771fe +Author: Behdad Esfahbod +Date: Wed Sep 28 17:05:43 2016 +0200 + + [GX] Apply 'rvrn' feature before any other feature + + src/hb-ot-shape.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 42c81425316190f6424ecb9b19d5a886aa1e4136 +Author: Behdad Esfahbod +Date: Tue Sep 13 23:49:46 2016 +0200 + + [GX] Fix build with older FreeType + + configure.ac | 4 ++++ + src/hb-ft.cc | 12 ++++++++---- + 2 files changed, 12 insertions(+), 4 deletions(-) + +commit 72873cf522a6e3bec1b6508d8d20d3d2ce233cd6 +Author: Sascha Brawer +Date: Tue Sep 13 18:40:07 2016 +0200 + + Call hb_font_set_var_coords_normalized() from FT_Face coords + + src/hb-ft.cc | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit 4ebbeb7c50e5c1e934d230ceacf792602c6eb9b9 +Author: Behdad Esfahbod +Date: Sat Sep 10 04:52:34 2016 -0700 + + [GX] Make FeatureVariations actually work + + Yay!!!! + + src/hb-ot-layout-common-private.hh | 19 +++++++------------ + src/hb-ot-layout-gsubgpos-private.hh | 3 ++- + 2 files changed, 9 insertions(+), 13 deletions(-) + +commit 72ada4f0c6998fc2a282efc2a573733e37db8be5 +Author: Behdad Esfahbod +Date: Sat Sep 10 03:57:24 2016 -0700 + + [GX] Hook up feature variations + + Shape-plan caching is not implemented. + + src/hb-coretext.cc | 8 +++- + src/hb-directwrite.cc | 6 ++- + src/hb-fallback-shape.cc | 4 +- + src/hb-font.cc | 6 +-- + src/hb-graphite2.cc | 4 +- + src/hb-ot-map-private.hh | 17 +++++--- + src/hb-ot-map.cc | 25 ++++++++--- + src/hb-ot-shape-private.hh | 6 ++- + src/hb-ot-shape.cc | 9 ++-- + src/hb-shape-plan-private.hh | 9 +++- + src/hb-shape-plan.cc | 102 +++++++++++++++++++++++++++++++++++++++---- + src/hb-shape-plan.h | 19 ++++++++ + src/hb-shape.cc | 5 ++- + src/hb-uniscribe.cc | 4 +- + 14 files changed, 183 insertions(+), 41 deletions(-) + +commit ec87ba9ba32a374d49dd3e40137f75f4f4232aee +Author: Behdad Esfahbod +Date: Sat Sep 10 03:53:11 2016 -0700 + + [GX] Add hb_ot_layout_feature_with_variations_get_lookups() + + src/hb-ot-layout-common-private.hh | 30 +++++++++++++++++++++++++++++- + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++++++++ + src/hb-ot-layout.cc | 28 ++++++++++++++++++++++++---- + src/hb-ot-layout.h | 9 +++++++++ + 4 files changed, 74 insertions(+), 5 deletions(-) + +commit 30c42b644eb33551aa0986287182a46f2d8c32ed +Author: Behdad Esfahbod +Date: Sat Sep 10 03:32:39 2016 -0700 + + [GX] Add hb_ot_layout_table_find_feature_variations() + + src/hb-ot-layout-common-private.hh | 18 +++++++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- + src/hb-ot-layout.cc | 15 +++++++++++++++ + src/hb-ot-layout.h | 10 ++++++++++ + 4 files changed, 39 insertions(+), 10 deletions(-) + +commit 7ceadbe981aa50481163bb365f0fe3f994266165 +Author: Behdad Esfahbod +Date: Sat Sep 10 02:44:20 2016 -0700 + + Shuffle code around + + src/hb-ot-map.cc | 81 ++++++++++++++++++++++++++++---------------------------- + 1 file changed, 41 insertions(+), 40 deletions(-) + +commit bde5e3959c0ffdb92db87668035b01aaee9b2352 +Author: Behdad Esfahbod +Date: Sat Sep 10 02:43:20 2016 -0700 + + Move add_lookups from map to map-builder + + In prep for more changes. + + src/hb-ot-map-private.hh | 15 ++++++++------- + src/hb-ot-map.cc | 29 +++++++++++++++-------------- + 2 files changed, 23 insertions(+), 21 deletions(-) + +commit 26648cebcd14bd26142ccfe5ac8c0be08a213671 +Author: Behdad Esfahbod +Date: Sat Sep 10 02:11:05 2016 -0700 + + [GX] Remove (partial) support for anisotropic variations + + It doesn't always work, not part of FreeType, and we were not going + to expose it in the API anyway. Can always be added later. + + src/hb-font-private.hh | 3 +-- + src/hb-font.cc | 17 ++++++----------- + src/hb-ot-layout-common-private.hh | 9 ++++----- + 3 files changed, 11 insertions(+), 18 deletions(-) + +commit c22176d4bac720b4c9121b3d6629595831f19fb0 +Author: Behdad Esfahbod +Date: Sat Sep 10 01:58:27 2016 -0700 + + [GX] Handle setting var coords to NULL + + src/hb-font.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 59055b5494f802013ca3613a15e565ae1ca0c589 +Author: Behdad Esfahbod +Date: Sat Sep 10 01:24:28 2016 -0700 + + [GX] Implement Feature Variations + + Not hooked up to shaper yet. + + src/hb-ot-layout-common-private.hh | 168 ++++++++++++++++++++++++++++++++++- + src/hb-ot-layout-gdef-table.hh | 1 - + src/hb-ot-layout-gpos-table.hh | 2 - + src/hb-ot-layout-gsub-table.hh | 2 - + src/hb-ot-layout-gsubgpos-private.hh | 15 +++- + 5 files changed, 180 insertions(+), 8 deletions(-) + +commit 85ec4944346a1ac111217698e1424669a9732280 +Author: Behdad Esfahbod +Date: Sat Sep 10 00:25:16 2016 -0700 + + [GX] Fix another x/y thinko + + Thanks Werner! + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cf3de4d8f79fc6e8413957cdef034e975343ce30 +Author: Behdad Esfahbod +Date: Sat Sep 10 00:22:24 2016 -0700 + + [GX] Rename VarStore to VariationStore + + src/hb-ot-layout-common-private.hh | 12 ++++++------ + src/hb-ot-layout-gdef-table.hh | 14 +++++++------- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 4 files changed, 15 insertions(+), 15 deletions(-) + +commit 1f6ed356e0a849b61ce98b6a2f38d04d98c2191e +Author: Behdad Esfahbod +Date: Sat Sep 10 00:01:10 2016 -0700 + + [GX] Fix build with some compilers + + Eg. https://ci.appveyor.com/project/behdad/harfbuzz/build/1.0.48/job/o9mnd33kcdeeg30r + + hb-open-type-private.hh:103:29: error: static data member 'OT::Device::::::static_size' in unnamed class [-fpermissive] + + src/hb-ot-layout-common-private.hh | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +commit 250bcd6fb691d6f15fa9ca71b475ce419d0b5e37 +Author: Behdad Esfahbod +Date: Fri Sep 9 23:12:14 2016 -0700 + + [GX] Skip tail zero entries when setting variation coordinates + + src/hb-font.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 1124d2ece55e323ed934357b30e68df75829cfaa +Author: Behdad Esfahbod +Date: Fri Sep 9 22:48:27 2016 -0700 + + [GX] Fix thinko + + src/hb-ot-layout-common-private.hh | 1 - + src/hb-ot-layout-gpos-table.hh | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +commit ad69e8f07c6e3e47fe7e7103c2ff7c053d272b1a +Author: Behdad Esfahbod +Date: Fri Sep 9 22:23:34 2016 -0700 + + [GX] Add new API hb_font_set_var_coords_normalized() + + Will probably change. + + src/hb-font.cc | 23 +++++++++++++++++++++++ + src/hb-font.h | 5 +++++ + 2 files changed, 28 insertions(+) + +commit 151d93de8a595924a8dcb00fcba648b4b3df0bf5 +Author: Behdad Esfahbod +Date: Fri Sep 9 17:03:11 2016 -0700 + + [GX] Hook up GPOS to Variation Store stored in GDEF + + Untested. + + src/hb-ot-layout-common-private.hh | 22 ++++++++++---------- + src/hb-ot-layout-gdef-table.hh | 27 +++++++++++++++--------- + src/hb-ot-layout-gpos-table.hh | 40 ++++++++++++++++-------------------- + src/hb-ot-layout-gsubgpos-private.hh | 2 ++ + 4 files changed, 48 insertions(+), 43 deletions(-) + +commit dcfd309533ac83e44369dea7204d668623b08207 +Author: Behdad Esfahbod +Date: Fri Sep 9 16:51:07 2016 -0700 + + [GX] Change GDEF API to return varStore + + src/hb-ot-layout-gdef-table.hh | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 49cb87850c2692be45b201168c8ce10b263168cc +Author: Behdad Esfahbod +Date: Fri Sep 9 16:27:03 2016 -0700 + + [GX] Pass apply-context down to get_anchor() + + Needed to access GDEF for varStore. + + src/hb-ot-layout-gpos-table.hh | 57 ++++++++++++++++++++++-------------------- + 1 file changed, 30 insertions(+), 27 deletions(-) + +commit f0c3fd8c9ab402be923fe0845fb51d99841829b6 +Author: Behdad Esfahbod +Date: Fri Sep 9 16:22:45 2016 -0700 + + [GX] Add varStore member to GDEF + + Still not hooked up from GPOS. + + src/hb-ot-layout-gdef-table.hh | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +commit 5c971f8dbc823dbad4a2869cf9e835095ab6ddb2 +Author: Behdad Esfahbod +Date: Fri Sep 9 16:05:17 2016 -0700 + + Minor change to GDEF, in prep for new version + + src/hb-ot-layout-gdef-table.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit dc9f2297998b4cbc4f9e4c2591fc2bb5f92986d1 +Author: Behdad Esfahbod +Date: Fri Sep 9 15:40:15 2016 -0700 + + [GX] Port variation stuff to Variation Store design + + Not hooked up to GDEF yet. + + src/hb-ot-layout-common-private.hh | 294 +++++++++++++++++++++++-------------- + src/hb-ot-layout-gpos-table.hh | 2 +- + 2 files changed, 184 insertions(+), 112 deletions(-) + +commit a7edeb6f02cbc4418285fdfc58ef8a8740a380e9 +Author: Behdad Esfahbod +Date: Fri Sep 9 15:39:52 2016 -0700 + + Make OffsetArrayOf take OffsetType template argument + + src/hb-open-type-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8dddc231cf9d934eb93a39f2657717cbdad43a64 +Author: Behdad Esfahbod +Date: Fri Sep 9 13:17:33 2016 -0700 + + [GX] Revert "[GX] Add VariationAlternates, to allow conditional lookups in GSUB/GPOS" + + This reverts commit 2859f1c7174d6f7ae5dcf0db5411bc0182b21594. + We are going in a different direction. + + src/hb-open-type-private.hh | 1 - + src/hb-ot-layout-common-private.hh | 99 +------------------------------------- + 2 files changed, 2 insertions(+), 98 deletions(-) + +commit bb4d2e6ed562c248fff15313a013d49e38a18789 +Author: Behdad Esfahbod +Date: Fri Sep 9 13:08:52 2016 -0700 + + [GX] Free GX coordinates + + src/hb-font.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit baa329c6a12c7ffd56feed32351d9405b7d1651b +Author: Behdad Esfahbod +Date: Fri Mar 18 15:52:24 2016 -0700 + + [GX] Add compact VariationDevice implementation + + Add compact format that uses signed bytes instead of shorts. + + src/hb-open-type-private.hh | 1 + + src/hb-ot-layout-common-private.hh | 35 ++++++++++++++++++++++++----------- + 2 files changed, 25 insertions(+), 11 deletions(-) + +commit 71b06fd392680b6fcfece60d8a83ba6c56eada09 +Author: Behdad Esfahbod +Date: Sat Mar 12 23:49:09 2016 -0800 + + [GX] Add VariationAlternates, to allow conditional lookups in GSUB/GPOS + + Not hooked up to runtime yet. + + src/hb-open-type-private.hh | 1 + + src/hb-ot-layout-common-private.hh | 99 +++++++++++++++++++++++++++++++++++++- + 2 files changed, 98 insertions(+), 2 deletions(-) + +commit 976eeb8e025e2b7601a91e661d6e9a88bf8afbd2 +Author: Behdad Esfahbod +Date: Sat Mar 12 23:28:12 2016 -0800 + + [GX] Minor + + src/hb-ot-layout-common-private.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit ed8a9067ca0fe51ac4b80dab55db596763df72bb +Author: Behdad Esfahbod +Date: Wed Mar 2 12:54:35 2016 -0800 + + [GX] Minor + + src/hb-ot-layout-common-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 15c5ee67473a17859a919104c5e6fed1f813aa65 +Author: Behdad Esfahbod +Date: Wed Mar 2 12:41:49 2016 +0900 + + [GX] Minor rename + + src/hb-ot-layout-common-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 4c535a822f16b23a4e41e14d1b17fe179b83eabc +Author: Behdad Esfahbod +Date: Wed Mar 2 12:21:36 2016 +0900 + + [GX] Hookup VariationDevice to Device table implementation + + src/hb-ot-layout-common-private.hh | 65 +++++++++++++++++++++++++++++++++++++- + 1 file changed, 64 insertions(+), 1 deletion(-) + +commit a0c2366075fcb894212b9bf137e4dd34bb65537c +Author: Behdad Esfahbod +Date: Tue Mar 1 19:42:24 2016 +0900 + + [GX] Break out early if factor is zero + + Also disable sanity-checking of variation records. + + src/hb-ot-layout-common-private.hh | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit ca286703164caf1eda665f6f27ef83bf04e2f8ba +Author: Behdad Esfahbod +Date: Tue Mar 1 19:29:36 2016 +0900 + + [GX] Towards anisotropic interpolation + + Also hookup to ValueRecord and Anchors. + + src/hb-font-private.hh | 5 +++-- + src/hb-font.cc | 9 +++++++-- + src/hb-ot-layout-common-private.hh | 4 ++-- + src/hb-ot-layout-gpos-table.hh | 20 ++++++++++---------- + 4 files changed, 22 insertions(+), 16 deletions(-) + +commit 6d9d3c55bbd4209ba339ccd2b925bb4a6c97f622 +Author: Behdad Esfahbod +Date: Tue Mar 1 19:12:08 2016 +0900 + + [GX] Add data types for encoding numerical variations + + src/hb-font-private.hh | 10 ++++ + src/hb-font.cc | 3 + + src/hb-ot-layout-common-private.hh | 113 +++++++++++++++++++++++++++++++++++++ + 3 files changed, 126 insertions(+) + +commit b843c6d8b66c2833cd35407ee494546465e6d775 +Author: Behdad Esfahbod +Date: Mon Dec 5 13:42:28 2016 -0800 + + 1.3.4 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 8c842e4a44908cce0f416481c73dc0866a0a9c95 +Author: Behdad Esfahbod +Date: Sun Dec 4 20:28:38 2016 -0800 + + [hb-fuzzer] Get glyph extents for output glyphs + + To exercise glyph-extents codepaths (glyf / CBLC+CBDT). + + test/fuzzing/hb-fuzzer.cc | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 9f6144cdb9dd2bc8cd147306e678d76ae82663d8 +Author: Behdad Esfahbod +Date: Sun Dec 4 19:55:17 2016 -0800 + + [CBDT] Add test for fetching glyph extents + + test/shaping/Makefile.am | 1 + + .../sha1sum/ee39587d13b2afa5499cc79e45780aa79293bbd4.ttf | Bin 0 -> 3724 bytes + test/shaping/tests/color-fonts.tests | 1 + + 3 files changed, 2 insertions(+) + +commit e4bfccfb2a0f425ff69b0a50ca8a4731c4001069 +Author: Behdad Esfahbod +Date: Sun Dec 4 19:43:33 2016 -0800 + + [CBDT] Minor + + src/hb-ot-cbdt-table.hh | 21 ++++++++++++++------- + src/hb-ot-font.cc | 38 ++++++++++++++++++++------------------ + 2 files changed, 34 insertions(+), 25 deletions(-) + +commit b7068af423dba30fd831041aabf4b805d26fe349 +Author: Behdad Esfahbod +Date: Sun Dec 4 19:36:30 2016 -0800 + + [CBDT] Fix thinko! + + src/hb-ot-cbdt-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a141d1da9bb0f91521a9a7749f9533c75cfe6a2f +Author: Behdad Esfahbod +Date: Sun Dec 4 19:26:54 2016 -0800 + + [CBDT] Implement IndexSubtableFormat3 + + src/hb-ot-cbdt-table.hh | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 9eda74c92c9024ffb8ec6e9344c99d51dd763f0c +Author: Behdad Esfahbod +Date: Sun Dec 4 19:12:52 2016 -0800 + + [cbdt] Move some more code around + + src/hb-ot-cbdt-table.hh | 61 ++++++++++++++++++++++++++++++++++--------------- + src/hb-ot-font.cc | 18 ++++++--------- + 2 files changed, 49 insertions(+), 30 deletions(-) + +commit 654f9ab0d8d5ee032b5da763e34e7b1f454416b9 +Author: Behdad Esfahbod +Date: Sun Dec 4 18:56:24 2016 -0800 + + [cbdt] Fix sign bug + + Was introduced in d495fc5e38038f4cfb20425b1109324fa70bf2f9 + + src/hb-ot-cbdt-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c27d6fcf8db6f02e075dd1868ae67d878fff39d4 +Author: Behdad Esfahbod +Date: Fri Dec 2 22:43:05 2016 -0800 + + [cbdt] Last of sanitization fixes + + Should be all good now.. + + src/hb-ot-font.cc | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +commit d495fc5e38038f4cfb20425b1109324fa70bf2f9 +Author: Behdad Esfahbod +Date: Fri Dec 2 21:36:42 2016 -0800 + + [cbdt] Clean up some more + + Almost there.. + + src/hb-ot-cbdt-table.hh | 134 +++++++++++++++++++++++++++++++++++++++++++----- + src/hb-ot-font.cc | 38 ++++---------- + 2 files changed, 131 insertions(+), 41 deletions(-) + +commit ce09e90e1502d5f944bafd64e51c29e365a963ae +Author: Behdad Esfahbod +Date: Fri Dec 2 20:12:57 2016 -0800 + + [cbdt] More sanitize work + + src/hb-ot-cbdt-table.hh | 65 +++++++++++++++++++++++++++++-------------------- + src/hb-ot-font.cc | 46 ++++++++++++++++++---------------- + 2 files changed, 63 insertions(+), 48 deletions(-) + +commit 70eb2ff682344688635cebb716fee0b73557c925 +Author: Behdad Esfahbod +Date: Fri Dec 2 19:51:23 2016 -0800 + + Check for offset overflows during sanitize + + src/hb-open-type-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 4b58c9e326acde09d389c699014e4e7f6259f50a +Author: Behdad Esfahbod +Date: Fri Dec 2 19:25:54 2016 -0800 + + [cbdt] Start fixing sanitization (or lack thereof) + + src/hb-ot-cbdt-table.hh | 77 ++++++++++++++++++++++++++++++++++++------------- + src/hb-ot-font.cc | 22 +++++++------- + 2 files changed, 68 insertions(+), 31 deletions(-) + +commit b92ba7bafcd9545a401fb871eb342e6284032c47 +Author: Behdad Esfahbod +Date: Fri Dec 2 15:21:43 2016 -0800 + + [CBDT] Use CHAR instead of int8_t + + src/hb-open-type-private.hh | 1 + + src/hb-ot-cbdt-table.hh | 28 ++++++++++++++-------------- + 2 files changed, 15 insertions(+), 14 deletions(-) + +commit efca7bf97f9967af4fa399a6665b723af643cecd +Author: Behdad Esfahbod +Date: Fri Dec 2 15:11:37 2016 -0800 + + Rename 'ebdt' to 'cbdt' since we only support the PNG format + + src/Makefile.sources | 2 +- + src/{hb-ot-ebdt-table.hh => hb-ot-cbdt-table.hh} | 6 +++--- + src/hb-ot-font.cc | 12 ++++++------ + 3 files changed, 10 insertions(+), 10 deletions(-) + +commit 831852594b777f250efedb76d19bee1cfc8eeaa4 +Author: Seigo Nonaka +Date: Fri Dec 2 15:03:50 2016 -0800 + + Introduce get_extent support for color bitmap font. (#351) + + hb_font_get_glyph_extents now works for color bitmap fonts. + Currently only font having index format 1 and image format 17 + is supported. + + src/Makefile.sources | 1 + + src/hb-ot-ebdt-table.hh | 193 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-font.cc | 96 ++++++++++++++++++++++++ + 3 files changed, 290 insertions(+) + +commit 261837e7202ec584f653f379851e1c6457396b07 +Author: Ebrahim Byagowi +Date: Fri Oct 28 21:49:11 2016 +0330 + + Fix "nmake install" when ADDITIONAL_LIB_DIR is provided and test it on CI (#356) + + appveyor.yml | 1 + + win32/detectenv-msvc.mak | 4 ++-- + win32/generate-msvc.mak | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) + +commit d163cd956246449e3e48b54ce6eb5cdb14e3a0a6 +Author: Behdad Esfahbod +Date: Wed Oct 26 18:27:48 2016 +0200 + + [tests] Add tests for vertical origin with ft and ot font-funcs + + .../sha1sum/f9b1dd4dcb515e757789a22cb4241107746fd3d0.ttf | Bin 0 -> 1004 bytes + test/shaping/tests/vertical.tests | 2 ++ + 2 files changed, 2 insertions(+) + +commit 2b117720c03869c7714304fd7fbfb2b01199bb3a +Author: Behdad Esfahbod +Date: Wed Oct 26 18:12:50 2016 +0200 + + Use horizontal ascent as fallback vertical origin + + src/hb-font-private.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit a7b32f2057098012b3ab43121397766ae45b3559 +Author: Behdad Esfahbod +Date: Wed Oct 26 18:08:41 2016 +0200 + + Move code around + + src/hb-font-private.hh | 38 +++++++++++++++++++++++--------------- + 1 file changed, 23 insertions(+), 15 deletions(-) + +commit 63635c763dd9393df236f49d491510cca18a1ccc +Author: Behdad Esfahbod +Date: Wed Oct 26 17:54:04 2016 +0200 + + [hb-ot-font] Use ascent+descent as fallback vertical advance + + src/hb-ot-font.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 9ee23c49a7a7b2479ae0d36a64720e92eb8a36e7 +Author: Behdad Esfahbod +Date: Wed Oct 26 17:44:16 2016 +0200 + + Fix vertical glyph origin with hb-ot-font + + src/hb-font-private.hh | 51 ++++++++++++++++++++++++++++---------------------- + 1 file changed, 29 insertions(+), 22 deletions(-) + +commit b3b0816d5fc00298621f738cf400de60f8a42c5d +Author: Behdad Esfahbod +Date: Wed Oct 26 17:19:07 2016 +0200 + + Fix vertical font metrics + + Ouch! + + src/hb-font-private.hh | 4 ++-- + src/hb-ot-font.cc | 8 ++++++-- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit 966ac7ecd3d0128a3adacdd26aacef2bd8afa4d4 +Author: Behdad Esfahbod +Date: Wed Oct 26 16:17:15 2016 +0200 + + 1.3.3 + + NEWS | 24 ++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 25 insertions(+), 1 deletion(-) + +commit 118164293cc7eb18ba03896f602aff816400134b +Author: Behdad Esfahbod +Date: Wed Oct 26 16:04:30 2016 +0200 + + Fix "make distcheck" + + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit b6c765871b752c9436ec993e47b48f9d4fecaed5 +Author: Behdad Esfahbod +Date: Wed Oct 26 10:33:33 2016 +0200 + + [ci] Fix appveyor.yml syntax error + + appveyor.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0e79ebb3ca9b7b6d238a0007e5ca022845ee9afc +Author: Behdad Esfahbod +Date: Sun Oct 23 14:39:43 2016 +0200 + + [gobject] Update for new MATH structs + + src/hb-gobject-structs.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 8c854dc023b1f9e081a3bbd16416b88a4671c267 +Merge: bb9805f5 c3fa5d0e +Author: Khaled Hosny +Date: Tue Oct 25 00:31:36 2016 +0300 + + Merge pull request #352 from fred-wang/makefile-am + + Remove inexistent file ttx file from test/api/Makefile.am + +commit c3fa5d0e03b57be131c66ea8720806c946d0e10f +Author: Frédéric Wang +Date: Mon Oct 24 21:42:04 2016 +0200 + + Remove inexistent file ttx file from test/api/Makefile.am + + test/api/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +commit bb9805f5419f18c7f5cab32d660fd4109c30f7cc +Merge: 702d9f52 755a0c20 +Author: Ebrahim Byagowi +Date: Sat Oct 22 12:23:05 2016 +0330 + + Merge pull request #349 from ebraminio/mergebackvcpkgpatches + + [ci] Enable hb-freetype on Windows build tests + +commit 755a0c20798e3c3e6bb933a28e38f9667fccdadc +Author: Ebrahim Byagowi +Date: Fri Oct 21 11:48:58 2016 +0330 + + [ci] Enable freetype on msvc using vcpkg + + appveyor.yml | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit 4631d84c2bb51395efe3156f9c9f1a6b0e277947 +Author: Ebrahim Byagowi +Date: Tue Oct 18 14:30:00 2016 +0330 + + Merge back @vlj's local patches of vcpkg + + win32/config-msvc.mak | 7 +++++++ + win32/detectenv-msvc.mak | 3 +++ + 2 files changed, 10 insertions(+) + +commit 702d9f522d1ac4797700f0ea056f69169b8d1a78 +Merge: 331c46c7 d8e2eb9e +Author: Ebrahim Byagowi +Date: Fri Oct 14 13:54:55 2016 +0330 + + Merge pull request #340 from ebraminio/nouniscribe + + Make Uniscribe optional on nmake win32 builds + +commit d8e2eb9ee0f47af7e90056d8db5949d10a88786a +Author: Ebrahim Byagowi +Date: Sun Oct 9 09:06:05 2016 +0330 + + Make Uniscribe optional on nmake win32 builds + + Most of harfbuzz clients don't need Uniscribe and DirectWrite support at all + as harfbuzz is a replacement for Uniscribe so Chromium and Firefox are using + harfbuzz without them on Windows. + + This removal also helps win32 nmake clients to have reduced binary size and + libs count. + + appveyor.yml | 2 +- + win32/README.txt | 13 +++++++------ + win32/config-msvc.mak | 18 +++++++++++++----- + win32/config.h.win32.in | 2 +- + win32/info-msvc.mak | 11 +++++++++-- + 5 files changed, 31 insertions(+), 15 deletions(-) + +commit 331c46c79b4d18cb4948be12c78ebb71a143e7ac +Author: Behdad Esfahbod +Date: Tue Oct 11 13:45:22 2016 -0700 + + Fix configure on iOS + + Fixes https://github.com/behdad/harfbuzz/issues/342 + + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit f6e194e77a2c34cd118b47c0d73a22afde85dfda +Merge: 7201fdd0 bef240b3 +Author: Ebrahim Byagowi +Date: Tue Oct 11 17:23:41 2016 +0330 + + Merge pull request #344 from ebraminio/fixmacci + + [ci] Whitelist more symbols and unbreak mac CI + +commit bef240b36ee9086b0d92e351e4c5118c0bbb5df6 +Author: Ebrahim Byagowi +Date: Mon Oct 10 17:27:52 2016 +0330 + + [ci] Whitelist more symbols and unbreak mac CI + + Thanks to @khaledhosny, actually this is his work :) + + src/check-symbols.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7201fdd0a8e26d49b13e289b53de375d5b1c9fcb +Author: Behdad Esfahbod +Date: Tue Oct 4 14:53:17 2016 -0700 + + LFS (large file system?) support in hb-*shap*, hb-view + + Fixes https://github.com/behdad/harfbuzz/issues/336 + + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +commit 34fc4a2cfa61089b7ec2d9510d99cdc4c13bceb4 +Author: Behdad Esfahbod +Date: Wed Sep 28 19:17:27 2016 +0200 + + Fix dist + + test/api/Makefile.am | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit d1c62370a0c2bdb365a1468dc8d782b9a7245946 +Author: Behdad Esfahbod +Date: Wed Sep 28 19:11:22 2016 +0200 + + Aim math API for 1.3.3 instead of 1.4.0 + + docs/harfbuzz-docs.xml | 6 +++--- + docs/harfbuzz-sections.txt | 12 ++++++------ + src/hb-ot-layout.cc | 18 +++++++++--------- + src/hb-ot-math.h | 10 +++++----- + 4 files changed, 23 insertions(+), 23 deletions(-) + +commit 7adbc5dd62ca03a65d1886e0f32e7026964dc5e5 +Author: Khaled Hosny +Date: Fri Sep 30 04:01:24 2016 -0700 + + Fix building math docs (#335) + + src/hb-ot-layout.cc | 9 --------- + 1 file changed, 9 deletions(-) + +commit fd7a245d3525905ffbce57472b52900fcb0e330b +Author: Behdad Esfahbod +Date: Tue Sep 27 17:56:35 2016 +0200 + + Require glib >= 2.38.0 for G_TEST_DIST + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6d3e6abf0c6ad55dabae96c76b4da9ab14bf16ef +Merge: f73a87d9 c3e21a66 +Author: Behdad Esfahbod +Date: Tue Sep 27 17:15:59 2016 +0200 + + Merge branch 'math' + + Supercedes https://github.com/behdad/harfbuzz/pull/326 + Fixes https://github.com/behdad/harfbuzz/pull/331 + +commit c3e21a6620c35500afa350d11620f69802920df3 +Author: Behdad Esfahbod +Date: Tue Sep 27 16:51:38 2016 +0200 + + [MATH] Fix more docs + + src/hb-ot-layout.cc | 18 +++++++++--------- + src/hb-ot-math.h | 25 +++++++++++++++++++++++++ + 2 files changed, 34 insertions(+), 9 deletions(-) + +commit 46cc4a3a2a529c80677babe38ca1542f9c773ac0 +Author: Behdad Esfahbod +Date: Tue Sep 27 16:44:22 2016 +0200 + + [MATH] Rename hb_math_*_t types to hb_ot_math_*_t + + With this, I believe MATH table API is not ready to be merged. + + docs/harfbuzz-sections.txt | 6 +++--- + src/hb-ot-layout-math-table.hh | 12 ++++++------ + src/hb-ot-layout.cc | 8 ++++---- + src/hb-ot-math.h | 16 ++++++++-------- + test/api/test-ot-math.c | 4 ++-- + 5 files changed, 23 insertions(+), 23 deletions(-) + +commit db5ebcf10f8595d1f4a9df27befd6cb5e76ca94d +Author: Behdad Esfahbod +Date: Tue Sep 27 16:42:25 2016 +0200 + + Update docs + + docs/harfbuzz-docs.xml | 9 +++++++++ + docs/harfbuzz-sections.txt | 30 ++++++++++++++++++++++++++++-- + 2 files changed, 37 insertions(+), 2 deletions(-) + +commit 0762b35474c47171e5661904e93851eb73a44e5c +Author: Frédéric Wang +Date: Tue Sep 27 15:28:35 2016 +0200 + + Document API for MathVariants (#330) + + src/hb-ot-layout.cc | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 56 insertions(+) + +commit 8d622f1114d6a0eca1786b94c7fc1a0bcd87f74b +Author: Frédéric Wang +Date: Tue Sep 27 13:53:34 2016 +0200 + + Add tests for get_mathvariant (#329) + + test/api/test-ot-math.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 160 insertions(+) + +commit f73a87d9a8c76a181794b74b527ea268048f78e3 +Author: Behdad Esfahbod +Date: Tue Sep 27 13:50:54 2016 +0200 + + 1.3.2 + + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit 485e4873fb7cacfa9d853272c2275bbc5826023e +Author: Frédéric Wang +Date: Tue Sep 27 13:18:00 2016 +0200 + + Add tests for hb_ot_math_get_glyph_variants (#328) + + test/api/test-ot-math.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 126 insertions(+) + +commit f16bf6c2dacf5b9c82b2d1ffacc092cc396189a7 +Author: Phil Krylov +Date: Tue Sep 27 12:38:49 2016 +0200 + + Allow building with graphite2 without pkg-config (#318) + + configure.ac | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit a5629a2ed9c2e69f2b4ebb74d85fbe0b5ba2be67 +Author: Behdad Esfahbod +Date: Tue Sep 27 11:30:44 2016 +0200 + + [MATH] Simplify test + + test/api/test-ot-math.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit edcfa789bf92c18f5badad31c0ad04a6a77d7226 +Author: Frédéric Wang +Date: Tue Sep 27 11:02:08 2016 +0200 + + test-ot-math: Use different scales for vertical and horizontal directions and add test for hb_ot_math_get_min_connector_overlap. (#327) + + test/api/test-ot-math.c | 81 ++++++++++++++++++++++++++++++------------------- + 1 file changed, 49 insertions(+), 32 deletions(-) + +commit bc19f7fe20e89823dba07a46c3d48c7406b781b6 +Author: Behdad Esfahbod +Date: Tue Sep 27 10:58:08 2016 +0200 + + [MATH] Add HB_OT_MATH_SCRIPT + + src/hb-ot-math.h | 3 +++ + 1 file changed, 3 insertions(+) + +commit cdc9eef7da934ae71578694f29665e439686c3bd +Author: Behdad Esfahbod +Date: Mon Sep 26 22:18:41 2016 +0200 + + [MATH] Enable tests for glyph-assembly italics-correction + + test/api/test-ot-math.c | 49 ++++++++++++++++++++++++++++++------------------- + 1 file changed, 30 insertions(+), 19 deletions(-) + +commit 86106c7528d9bff8de6bc3e1487be780c31ea4fd +Author: Behdad Esfahbod +Date: Mon Sep 26 22:12:48 2016 +0200 + + [MATH] Rename all API to hb_ot_math_* + + src/hb-ot-layout-private.hh | 10 -- + src/hb-ot-layout.cc | 69 ++++---- + src/hb-ot-math.h | 56 +++--- + test/api/Makefile.am | 6 +- + test/api/test-ot-layout-math.c | 382 ----------------------------------------- + test/api/test-ot-math.c | 381 ++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 447 insertions(+), 457 deletions(-) + +commit 1ba767cd4e3606beb9dc59806b83b1e61f5958d4 +Author: Behdad Esfahbod +Date: Mon Sep 26 21:57:14 2016 +0200 + + [MATH] Move API from hb-ot-layout.h to hb-ot-math.h + + src/hb-ot-layout.h | 52 -------------------------------------------------- + src/hb-ot-math.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot.h | 1 + + 3 files changed, 57 insertions(+), 52 deletions(-) + +commit 97b72da6006d8d6355ee90d514f627e6604a4936 +Author: Behdad Esfahbod +Date: Mon Sep 26 21:53:25 2016 +0200 + + Whitespace + + src/hb-ot-layout-math-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 559eb564472575ae4d87a241314b8a3ca24418c4 +Author: Behdad Esfahbod +Date: Mon Sep 26 21:46:05 2016 +0200 + + [MATH] Wire up get_glyph_assembly() + + src/hb-ot-layout-math-table.hh | 64 ++++++++++++++++++++++++++++++++++++++---- + src/hb-ot-layout.cc | 26 +++++++++-------- + src/hb-ot-layout.h | 14 ++++----- + 3 files changed, 81 insertions(+), 23 deletions(-) + +commit 353f455af7ccbc1af8338dcb0c8ab87aef866c79 +Author: Behdad Esfahbod +Date: Mon Sep 26 21:22:48 2016 +0200 + + [MATH] Wire up get_glyph_variants() + + src/hb-font-private.hh | 11 ++- + src/hb-ot-layout-math-table.hh | 178 +++++++++++++++++++---------------------- + src/hb-ot-layout.cc | 7 +- + src/hb-ot-layout.h | 2 +- + 4 files changed, 95 insertions(+), 103 deletions(-) + +commit 7fe0e28c22331a353d396f8bc1e3a60f1580a96d +Author: Behdad Esfahbod +Date: Mon Sep 26 17:51:47 2016 +0100 + + [MATH] Start fleshing out glyph variant API + + src/hb-font-private.hh | 4 +++ + src/hb-ot-layout-math-table.hh | 10 ++---- + src/hb-ot-layout.cc | 73 +++++++++++++++--------------------------- + src/hb-ot-layout.h | 20 ++++++++++++ + src/hb-ot-math.h | 18 +++++++++++ + 5 files changed, 71 insertions(+), 54 deletions(-) + +commit 1f3327f21045df8a050a21a949b44b9ce186ceaa +Author: Behdad Esfahbod +Date: Mon Sep 26 16:10:08 2016 +0100 + + [MATH] Clean up math variants + + src/hb-ot-layout-math-table.hh | 35 +++++++++-------------------------- + 1 file changed, 9 insertions(+), 26 deletions(-) + +commit 51da7a1cd672aada84bdbb3a2a8dd77ab1134249 +Author: Frédéric Wang +Date: Thu Aug 25 11:17:50 2016 +0200 + + MATH table: Add API to access math variants. + + src/hb-ot-layout-math-table.hh | 253 +++++++++++++++++++++++++++++++- + src/hb-ot-layout-private.hh | 10 ++ + src/hb-ot-layout.cc | 54 +++++++ + test/api/fonts/MathTestFontPartial4.otf | Bin 0 -> 14360 bytes + test/api/test-ot-layout-math.c | 51 +++++++ + 5 files changed, 364 insertions(+), 4 deletions(-) + +commit 722e620f20fa2225cf874f4aeb115a064142fcf1 +Author: Frédéric Wang +Date: Mon Sep 26 11:51:36 2016 +0200 + + Use G_TEST_DIST to build the path of math test fonts + + test/api/Makefile.am | 2 ++ + test/api/test-ot-layout-math.c | 8 ++++++-- + 2 files changed, 8 insertions(+), 2 deletions(-) + +commit 8d58e3433e242bd9dd18aa08f55ab0a406583fb0 +Author: Behdad Esfahbod +Date: Mon Sep 26 13:39:58 2016 +0100 + + [MATH] Fix get_kerning() with negative y-scale + + src/hb-ot-layout-math-table.hh | 36 +++++++++++++++++++++--------------- + 1 file changed, 21 insertions(+), 15 deletions(-) + +commit 94f5df5626b223ad92d0c167f560c1f2e2f19042 +Author: Behdad Esfahbod +Date: Mon Sep 26 13:31:47 2016 +0100 + + [MATH] Clean up get_kerning() + + src/hb-ot-layout-math-table.hh | 29 +++++++++++++++++------------ + src/hb-ot-layout.cc | 5 +---- + 2 files changed, 18 insertions(+), 16 deletions(-) + +commit 17ff30e9afde79e41c17786223293e867b49ebba +Author: Behdad Esfahbod +Date: Mon Sep 26 12:18:32 2016 +0100 + + [MATH] Clean up get_top_accent_attachment() + + Note, the function now returns "half of horizontal advance width" + if top accent attachment for glyph is not explicitly defined. + This is what the spec requires. Updated tests. + + src/hb-ot-layout-math-table.hh | 31 +++++++++++-------------------- + src/hb-ot-layout.cc | 7 +------ + test/api/test-ot-layout-math.c | 8 ++++---- + 3 files changed, 16 insertions(+), 30 deletions(-) + +commit 8bcf517fe59608d2247a8974445b3ff0f4b4b4ac +Author: Behdad Esfahbod +Date: Mon Sep 26 12:12:41 2016 +0100 + + [MATH] Clean up get_italics_correction() + + src/hb-ot-layout-math-table.hh | 16 ++++++++-------- + src/hb-ot-layout.cc | 17 ++++++----------- + src/hb-ot-layout.h | 4 ++-- + test/api/test-ot-layout-math.c | 18 +++++++++--------- + 4 files changed, 25 insertions(+), 30 deletions(-) + +commit 06003f71ba0d0327fb1a17098a9d7faa8fb336f0 +Author: Behdad Esfahbod +Date: Mon Sep 26 12:07:29 2016 +0100 + + [MATH] Clean up a bit more + + src/hb-ot-layout-math-table.hh | 12 +-------- + src/hb-ot-layout.cc | 57 ++++++++++++++++-------------------------- + 2 files changed, 22 insertions(+), 47 deletions(-) + +commit 54c0cc38fba24fa4370231408ba121589b190a28 +Author: Behdad Esfahbod +Date: Mon Sep 26 11:56:40 2016 +0100 + + [MATH] Clean up get_math_constant implementation + + src/hb-ot-layout-math-table.hh | 10 +++++----- + src/hb-ot-layout.cc | 5 ++--- + 2 files changed, 7 insertions(+), 8 deletions(-) + +commit 8a8cfad9a0834fe278a747c1d755144bd78f564b +Author: Behdad Esfahbod +Date: Mon Sep 26 11:47:05 2016 +0100 + + [MATH] Cleanup previous commit a bit + + src/hb-ot-layout-math-table.hh | 186 ++++++++++++++++++++--------------------- + src/hb-ot-layout.cc | 30 +++---- + src/hb-ot-layout.h | 14 ++-- + 3 files changed, 113 insertions(+), 117 deletions(-) + +commit d7182d129612c619b9026ee9b15f2dcfada132db +Author: Frédéric Wang +Date: Thu Aug 25 11:15:31 2016 +0200 + + MATH Table: Add API to access glyph info. + + src/hb-ot-layout-math-table.hh | 271 +++++++++++++++++++++++++++++++- + src/hb-ot-layout.cc | 114 ++++++++++++++ + src/hb-ot-layout.h | 18 +++ + src/hb-ot-math.h | 7 + + test/api/fonts/MathTestFontPartial1.otf | Bin 0 -> 14348 bytes + test/api/fonts/MathTestFontPartial2.otf | Bin 0 -> 14356 bytes + test/api/fonts/MathTestFontPartial3.otf | Bin 0 -> 14380 bytes + test/api/test-ot-layout-math.c | 155 ++++++++++++++++++ + 8 files changed, 563 insertions(+), 2 deletions(-) + +commit 6fd2fe418dc838743f0d4a8a2222cdcaf587500c +Author: Behdad Esfahbod +Date: Mon Sep 26 11:24:39 2016 +0100 + + [MATH] Fixup math constants commit a bit more + + src/hb-ot-layout-math-table.hh | 24 +++++++++++------------- + 1 file changed, 11 insertions(+), 13 deletions(-) + +commit 1a381153a2e6a15bded1f8e31f6b0e0cadb078af +Author: Behdad Esfahbod +Date: Mon Sep 26 11:15:59 2016 +0100 + + [MATH] Fixups for math constants commit + + src/hb-ot-layout-math-table.hh | 19 +++++++++---------- + 1 file changed, 9 insertions(+), 10 deletions(-) + +commit 319ff59161e6b027391f8b9fdce0db6dd44cc20d +Author: Frédéric Wang +Date: Thu Aug 25 11:06:41 2016 +0200 + + MATH Table: Add API to access math contants. + + src/Makefile.sources | 1 + + src/hb-ot-layout-math-table.hh | 146 +++++++++++++++++++++++++++++++++++- + src/hb-ot-layout.cc | 25 ++++++ + src/hb-ot-layout.h | 5 ++ + src/hb-ot-math.h | 100 ++++++++++++++++++++++++ + test/api/fonts/MathTestFontFull.otf | Bin 0 -> 25412 bytes + test/api/test-ot-layout-math.c | 72 ++++++++++++++++++ + 7 files changed, 345 insertions(+), 4 deletions(-) + +commit 4d3892e9b05a4df67b2f5cfd6dd3a1e0f5b38fc7 +Author: Behdad Esfahbod +Date: Mon Sep 26 10:45:58 2016 +0100 + + [MATH] Fixups for previous commit + + src/hb-ot-layout-math-table.hh | 8 ++++---- + src/hb-ot-layout.cc | 29 +++++++++++++++++++---------- + src/hb-ot-layout.h | 2 ++ + test/api/Makefile.am | 6 ++---- + test/api/test-ot-layout-math.c | 16 +++++++++------- + 5 files changed, 36 insertions(+), 25 deletions(-) + +commit 5fbcb992bd7887f95b1cf2ca045c9226de8148fc +Author: Frédéric Wang +Date: Thu Aug 25 10:47:15 2016 +0200 + + MATH Table: Add API to check availability of math data. + + src/Makefile.sources | 1 + + src/hb-ot-layout-math-table.hh | 60 +++++++++++++++++++++ + src/hb-ot-layout-private.hh | 3 ++ + src/hb-ot-layout.cc | 45 ++++++++++++++++ + src/hb-ot-layout.h | 7 +++ + test/api/Makefile.am | 14 ++++- + test/api/fonts/MathTestFontEmpty.otf | Bin 0 -> 14320 bytes + test/api/fonts/MathTestFontNone.otf | Bin 0 -> 14284 bytes + test/api/test-ot-layout-math.c | 98 +++++++++++++++++++++++++++++++++++ + 9 files changed, 227 insertions(+), 1 deletion(-) + +commit 02bfd965af588640250c47f344ad3096c8a373e0 +Author: Gregory Morse +Date: Mon Sep 12 10:22:15 2016 +0200 + + Update detectenv-msvc.mak (#316) + + Windows x86 ARM capability + + win32/detectenv-msvc.mak | 3 +++ + 1 file changed, 3 insertions(+) + +commit fc4e671f311241e21c1cc3ed941b1fc651875a2e +Author: Ebrahim Byagowi +Date: Fri Sep 9 23:28:28 2016 +0430 + + [coretext] Use intended coretext version check logic (#315) + + src/hb-coretext.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 48677345281a93d8829dd37d0480a6062945416a +Author: Khaled Hosny +Date: Thu Sep 8 04:44:37 2016 +0300 + + Try to unbreak building on older macOS again (#314) + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d22ab6cf040467e7f17476ccdfe9cab4dce16639 +Author: Behdad Esfahbod +Date: Wed Sep 7 14:28:47 2016 -0700 + + 1.3.1 + + NEWS | 9 +++++++++ + configure.ac | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +commit b717cd7be506217e466e32a456df9af4d2720c0c +Author: Dominik Röttsches +Date: Wed Sep 7 23:56:57 2016 +0300 + + Do reconfigure the cascade list for Emoji font on OS X 10.9.5 (#313) + + This seems to fix crash issues on 10.9.5 reported on Chrome, compare + crbug.com/549610 + + src/hb-coretext.cc | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +commit 67e9fdf427e8536f0a134f84ad3bf1740245fe12 +Author: Dominik Röttsches +Date: Mon Sep 5 11:27:25 2016 +0300 + + Blacklist Padauk 2.80 and 3.00 (#311) + + According to comments in issue #305 broken GDEF tables lead + to incorrect rendering of Latin characters. Blacklisting + this font. + + src/hb-ot-layout.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 17f0dd2dfb9a15aed9d1a229115940cc23bdbc97 +Author: Ebrahim Byagowi +Date: Fri Sep 2 01:21:48 2016 +0430 + + [ci] Add msys2 build to CI and run its testsuite on Windows (#310) + + appveyor.yml | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +commit 5362ce6a6455c539d615e7fb221a904ac744b74c +Author: Ebrahim Byagowi +Date: Thu Sep 1 20:05:45 2016 +0430 + + [dwrite] Minor, don't include unnecessary headers (#309) + + src/hb-directwrite.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit c4f36b04e32ae5111ef11d225e5d6e82c8216185 +Author: Ebrahim Byagowi +Date: Thu Sep 1 17:31:16 2016 +0430 + + [ci] Add Windows CI support, provided by AppVeyor (#308) + + README | 1 + + appveyor.yml | 28 ++++++++++++++++++++++++++++ + win32/generate-msvc.mak | 2 +- + 3 files changed, 30 insertions(+), 1 deletion(-) + +commit 3d976d20f1b97c771e64a9cfed2760ebec64037a +Author: Khaled Hosny +Date: Sat Aug 27 16:38:42 2016 +0300 + + Show the shaper name in the debug message (#306) + + src/hb-shape-plan.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 547ddb0721365dca985aef5b759d08718f7c5f82 +Merge: bd1aac9c e7ecbba2 +Author: Sascha Brawer +Date: Thu Aug 18 22:33:14 2016 +0200 + + Merge pull request #303 from behdad/fonnapa + + Support Americanist Phonetic Notation + +commit e7ecbba2cc3c9369c5e7dc7296cb210018aca3bb +Author: Sascha Brawer +Date: Thu Aug 18 12:48:38 2016 +0200 + + Support Americanist Phonetic Notation + + OpenType language system tag: `APPH` + https://www.microsoft.com/typography/otspec/languagetags.htm + + IETF BCP47 variant tag: `fonnapa` + http://www.iana.org/assignments/language-subtag-registry/language-subtag-registry + + src/hb-ot-tag.cc | 14 ++++++++++++-- + test/api/test-ot-tag.c | 6 ++++++ + 2 files changed, 18 insertions(+), 2 deletions(-) + +commit bd1aac9c0021a936058637424a478abf792533dd +Merge: 18c19dd3 a0f1b44b +Author: Sascha Brawer +Date: Thu Aug 18 13:59:38 2016 +0200 + + Merge pull request #302 from khaledhosny/master + + [travis] Fix MacOS libtool issue + +commit a0f1b44b6c0e3b1e6a1ba63dde2be22e0425353f +Author: Khaled Hosny +Date: Tue Aug 16 03:09:04 2016 +0200 + + [coretext] Blind fix for build on MacOS 10.9 + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0634d5600e559a69a92d49173ffb8e715fe7576c +Author: Khaled Hosny +Date: Tue Aug 16 02:49:48 2016 +0200 + + [travis] Fix MacOS libtool issue + + Reveals another MacOS build breakage in the Core Text shaper. + + .travis.yml | 1 + + 1 file changed, 1 insertion(+) + +commit 18c19dd34dcdcaab0a6d47768339f8fb70c0d3f0 +Author: Behdad Esfahbod +Date: Tue Aug 9 13:03:14 2016 -0700 + + Fix build + + test/api/test-ot-tag.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 91f2585411aaf5565fcf0c991b9055b0b397f1cd +Author: Behdad Esfahbod +Date: Mon Aug 8 18:08:08 2016 -0700 + + Actually add test + + test/shaping/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit f1b76275da716a4174092e6389979e03c0e3be59 +Author: Behdad Esfahbod +Date: Mon Aug 8 18:06:09 2016 -0700 + + Add tests for Chinese language tags + + Using font from https://github.com/behdad/harfbuzz/issues/300 + + .../sha1sum/6991b13ce889466be6de3f66e891de2bc0f117ee.ttf | Bin 0 -> 5596 bytes + test/shaping/tests/language-tags.tests | 12 ++++++++++++ + 2 files changed, 12 insertions(+) + +commit 37f21bdbb75c98d741e749b7f1e0f367941aef4e +Author: Behdad Esfahbod +Date: Mon Aug 8 17:57:06 2016 -0700 + + Map Macao to ZHH lang tag + + Fixes https://github.com/behdad/harfbuzz/issues/300 + + src/hb-ot-tag.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 09c7a2d6bf00dc902343e999f92cac0e8146f949 +Author: Behdad Esfahbod +Date: Mon Aug 8 17:28:54 2016 -0700 + + Limit bits-per-feature to eight + + Limits number of alternatives per glyph per feature to 255, so be it. + That's better than possibly breaking shaping because of one bad feature + value. + + src/hb-ot-map.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 333173103bb618f721bd25d0c565a3c3c9ea224e +Author: Behdad Esfahbod +Date: Mon Aug 8 17:24:04 2016 -0700 + + Fix sign of shift operators + + This one: + + map->mask = (1 << (next_bit + bits_needed)) - (1 << next_bit); + + before the fix, the shift was done as an int, causing overflow + if it ever got to 1 << 31. Sprinkle 'u's around. + + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=634805 + + src/hb-buffer-private.hh | 6 +++--- + src/hb-cache-private.hh | 8 ++++---- + src/hb-coretext.cc | 2 +- + src/hb-directwrite.cc | 2 +- + src/hb-face.cc | 2 -- + src/hb-font.cc | 2 -- + src/hb-ft.cc | 6 ++++-- + src/hb-ot-map.cc | 4 ++-- + src/hb-set-private.hh | 4 ++-- + src/hb-uniscribe.cc | 4 ++-- + 10 files changed, 19 insertions(+), 21 deletions(-) + +commit 10a0d4aa2254f783758bb908175047df3a0b41fe +Author: Behdad Esfahbod +Date: Mon Aug 8 16:51:08 2016 -0700 + + Map zh-Hant-HK to ZHH + + Fixes https://github.com/behdad/harfbuzz/issues/300 + + src/hb-ot-tag.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit dd31fc9f7e6d23b414b22874de96eb3c002c80ba +Author: Khaled Hosny +Date: Fri Jul 22 02:26:54 2016 +0300 + + Don’t build UCDN support when building with GLib (#296) + + Regression from: b424b6c372dfe4c0ed75a49761eb34a416819446. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 489acf6c3180d3726158864fa0e1adeea3c23fae +Author: Behdad Esfahbod +Date: Fri Jul 22 17:41:43 2016 -0700 + + [coretext] "Fix" crashes on CoreText < 10.10 + + Fixes https://github.com/behdad/harfbuzz/issues/297 + + src/hb-coretext.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit a732e00ea4fffebaa85a89420f09df4c11d650e0 +Author: Behdad Esfahbod +Date: Thu Jul 21 01:58:00 2016 -0700 + + 1.3.0 + + NEWS | 15 +++++++++++++++ + configure.ac | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) + +commit 08c08af2f9ed683ad20322c3ef1ba0f87ce15426 +Author: Behdad Esfahbod +Date: Thu Jul 21 01:23:33 2016 -0700 + + [ucdn] Update to Unicode 9.0.0 + + Fixes https://github.com/grigorig/ucdn/issues/12 + + src/hb-ucdn.cc | 6 + + src/hb-ucdn/README | 1 - + src/hb-ucdn/ucdn.c | 80 +- + src/hb-ucdn/ucdn.h | 98 +- + src/hb-ucdn/unicodedata_db.h | 4750 +++++++++++++++++++++++------------------- + 5 files changed, 2783 insertions(+), 2152 deletions(-) + +commit f3f6c1ccbf89e15cda03e0c3a2df4297e98adf60 +Author: jfkthame +Date: Thu Jun 16 00:10:42 2016 +0100 + + Blacklist GDEF tables of more fonts + + This is based on bug reports that have been filed against Firefox since it + updated to a version of harfbuzz that uses zeroing by GDEF rather than by + Unicode. I'm sure there are a bunch more font versions that should also be + included; these are just the ones I have on hand and have confirmed as having + bad GDEF data. + + Given how the list here is growing, I think we should reconsider the approach, + and perhaps revert to zeroing by Unicode instead. + + Fixes https://github.com/behdad/harfbuzz/issues/264 + Fixes https://github.com/behdad/harfbuzz/pull/266 + + src/hb-ot-layout.cc | 39 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 39 insertions(+) + +commit 34f9aa582c3a03b578c7eae3d2e8860a0bd5cb00 +Author: Behdad Esfahbod +Date: Wed Jul 20 02:35:54 2016 -0700 + + Implement symbol cmap in ft and ot fonts + + Fixes https://github.com/behdad/harfbuzz/issues/236 + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=627953 + + src/hb-ft.cc | 27 +++++++++++++++++++++++---- + src/hb-ot-font.cc | 50 ++++++++++++++++++++++++++++++++++++++------------ + 2 files changed, 61 insertions(+), 16 deletions(-) + +commit 6363d7df28dc4307ef1abb9857d14c35e656b85a +Author: Behdad Esfahbod +Date: Wed Jul 20 01:43:56 2016 -0700 + + Clean up buffer area when rewinding + + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=614647 + If allocation fails, we might be leaving junk behind. At least + clear it up. + + src/hb-buffer.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit f80c34eb556d12c45c961d6742c289baef58899d +Author: Behdad Esfahbod +Date: Tue Jul 12 11:18:26 2016 -0700 + + Whitespace + + src/hb-unicode-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 874421203e0161db2cbfb27be6c039cba57f7c63 +Author: Ebrahim Byagowi +Date: Tue Jul 12 03:49:21 2016 +0430 + + [coretext] Speculative fix for CoreText nullptr access (#288) + + src/hb-coretext.cc | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit 6bf9db4f1e1d51f9acb5e37b89caa8f4d275e7ce +Author: Birunthan Mohanathas +Date: Mon Jul 11 13:38:23 2016 -0700 + + [ft] Fix unsafe cast of FT_Done_Face in hb_ft_{face,font}_create_referenced (#289) + + Prior to this change the function `FT_Error FT_Done_Face(FT_Face *)` was + called through a pointer with the signature `void (void *)` resulting in + undefined behaviour. + + src/hb-ft.cc | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit 0b8f3ab0220ca4731516313828515f26bb480645 +Author: Steve Lhomme +Date: Mon Jul 11 21:57:26 2016 +0200 + + clang in MSVC mode doesn't like when we redefine __attribute__ (#283) + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2f522fd485c2e946c9bce9e3828b6ff6247c59e4 +Merge: d3e2a06b e4d451ee +Author: Behdad Esfahbod +Date: Fri Jul 1 17:09:28 2016 -0700 + + Merge pull request #286 from khaledhosny/gi-tag_from_string + + [introspection] Fix hb_tag_from_string annotation + +commit e4d451ee55a57e1231b4076fcd1e87994f6b9528 +Author: Khaled Hosny +Date: Sat Jul 2 00:04:57 2016 +0200 + + [introspection] Fix hb_tag_from_string annotation + + src/hb-common.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d3e2a06b0f2587e913a9c3ff1a20c187f260db80 +Author: Behdad Esfahbod +Date: Thu Jun 30 11:01:22 2016 -0700 + + [python] Use utf-32 / utf-16 based on build of Python + + Fixes https://github.com/behdad/harfbuzz/pull/271 + + src/sample.py | 22 +++++++++++++++++++++- + 1 file changed, 21 insertions(+), 1 deletion(-) + +commit fc9de44a03a97f6e93bd98d804596cb1f9f4b5fd +Author: Behdad Esfahbod +Date: Thu Jun 30 09:46:52 2016 -0700 + + Comments + + src/hb-coretext.cc | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 46809dee30232d493539519b1bb527fa816c37db +Merge: 70e72e5f 1bea49eb +Author: Behdad Esfahbod +Date: Thu Jun 30 09:41:03 2016 -0700 + + Merge pull request #268 from drott/conflictingFontFix + + Discard reconfigured CTFont if URL changes + +commit 1bea49eb4b7a94ab6222f9c3c40320cbdb247b2d +Merge: 7aa3631d 70e72e5f +Author: Dominik Röttsches +Date: Wed Jun 29 12:10:41 2016 +0200 + + Merge branch 'master' into conflictingFontFix + +commit 70e72e5f61d73c33d3c8f3bf07f5a9afd0db046a +Author: Behdad Esfahbod +Date: Tue Jun 28 21:00:37 2016 -0700 + + [gobject] Fix a few warnings + + Part of https://github.com/behdad/harfbuzz/issues/277 + + src/hb-buffer.cc | 2 +- + src/hb-gobject-structs.h | 12 ++++++++++++ + src/hb-shape.cc | 2 -- + src/hb-unicode.h | 15 --------------- + 4 files changed, 13 insertions(+), 18 deletions(-) + +commit d8273aac19771033c5064a2f079c29d09a86e7c0 +Merge: abae93fa ae9054c7 +Author: Behdad Esfahbod +Date: Tue Jun 28 21:15:28 2016 -0700 + + Merge pull request #280 from behdad/revert-271-patch-2 + + Revert "use utf32" + +commit ae9054c740631e36b7582b44c5afb42ff4509461 +Author: Behdad Esfahbod +Date: Tue Jun 28 21:14:38 2016 -0700 + + Revert "use utf32" + + src/sample.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 7aa3631dd06af74a1fa9f0bfaa5f721876be817f +Merge: f7da0486 abae93fa +Author: Dominik Röttsches +Date: Tue Jun 28 09:52:18 2016 +0200 + + Merge branch 'master' into conflictingFontFix + +commit abae93faef32562f34a72981d252c848cc4f7565 +Merge: 07461d06 8179ff5d +Author: Behdad Esfahbod +Date: Mon Jun 27 14:33:27 2016 -0400 + + Merge pull request #273 from ebraminio/master + + [dwrite] Use stream font loader instead GDI interop + +commit 8179ff5d7ba4a140cf6743729a22072800e98a79 +Author: Ebrahim Byagowi +Date: Mon Jun 27 03:54:15 2016 +0430 + + [dwrite] Don't allocate more than needed + + Addressing Nikolay Sivov reviews on harfbuzz mailing list + + src/hb-directwrite.cc | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +commit 5967eaba728ca3e4f5026142c25d455fa3a59764 +Author: Sascha Brawer +Date: Fri Jun 24 16:42:27 2016 +0200 + + [CPAL] Return 0xFFFF as name id for unnamed palettes + + The name id 0 is used as Copyright notice. It's quite unlikely that a + font supplies a color palette with the exact same name as the font's + copyright notice, but the API should not prevent this. + + Also, try to fix a problem with GObject introspection, where the + auto-generated Python bindings could not return palette colors. + + src/hb-ot-color.cc | 13 ++++++------- + test/api/test-ot-color.c | 14 +++++++------- + 2 files changed, 13 insertions(+), 14 deletions(-) + +commit 07b724f3419a28c479cd8a75ae0eecb841a6d2f3 +Author: Ebrahim Byagowi +Date: Fri Jun 24 12:23:25 2016 +0430 + + [dwrite] Delete remained objects + + No longer noticeable memory increase on create/destroy iterations, + highly better than current state of uniscribe backend + + src/hb-directwrite.cc | 33 ++++++++++++++++++++++++--------- + 1 file changed, 24 insertions(+), 9 deletions(-) + +commit be565d17141818e006aa1e4582f3ae14c726fa85 +Author: Ebrahim Byagowi +Date: Fri Jun 24 11:42:01 2016 +0430 + + [dwrite] Release allocated blob on face destroy + + This reduces memory consumption of my iterated font create/destroy cycle test + significantly and makes it much better than uniscribe backend even + + src/hb-directwrite.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit f3f0ea980a359343ac0e3d359a95855c2cf7be25 +Author: Ebrahim Byagowi +Date: Thu Jun 23 16:41:37 2016 +0430 + + [dwrite] Remove ifdefs without breaking execution on old Windows versions + + src/hb-directwrite.cc | 205 +++++++++++++++++++++++++------------------------- + 1 file changed, 103 insertions(+), 102 deletions(-) + +commit 6b861dbd8b3662d0fa0e51fad1736d72192da868 +Author: Ebrahim Byagowi +Date: Tue Jun 21 13:57:26 2016 +0430 + + [dwrite] Use stream font loader instead GDI interop + + With help of + https://dxr.mozilla.org/mozilla-central/source/gfx/2d/NativeFontResourceDWrite.cpp + + src/hb-directwrite.cc | 350 +++++++++++++++++++------------------------------- + src/hb-directwrite.h | 2 +- + 2 files changed, 135 insertions(+), 217 deletions(-) + +commit f7da0486ed8884481d477ce08fcf928c4da9a0a3 +Merge: a0223274 07461d06 +Author: Dominik Röttsches +Date: Mon Jun 20 10:25:43 2016 +0300 + + Merge branch 'master' into conflictingFontFix + +commit d34d3ac985a6c8c848ae49635b648a72e0c8f30d +Author: Sascha Brawer +Date: Mon Apr 25 18:20:57 2016 +0200 + + Support CPAL table + + NEWS | 6 +- + src/Makefile.am | 3 + + src/Makefile.sources | 3 + + src/hb-ot-color.cc | 213 ++++++++++++++ + src/hb-ot-color.h | 99 +++++++ + src/hb-ot-cpal-table.hh | 121 ++++++++ + src/hb-ot-layout-private.hh | 3 + + src/hb-ot-layout.cc | 7 + + src/hb-ot.h | 1 + + test/api/Makefile.am | 1 + + test/api/hb-test.h | 30 ++ + test/api/test-ot-color.c | 318 +++++++++++++++++++++ + .../319f5d7ebffbefc5c5e6569f8cea73444d7a7268.ttf | Bin 0 -> 2128 bytes + .../e90374e5e439e00725b4fe7a8d73db57c5a97f82.ttf | Bin 0 -> 1948 bytes + 14 files changed, 804 insertions(+), 1 deletion(-) + +commit 07461d06d242cd5cfda7ccb891189f074a89b460 +Author: Kelvin +Date: Sat Jun 18 22:46:38 2016 +0000 + + Use UTF-32 in Python sample + + src/sample.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit fca0c61d67aa309fc824fb18f247493c2b7701ef +Merge: 4b8de1ea 98835058 +Author: Khaled Hosny +Date: Sun Jun 19 00:08:51 2016 +0300 + + Merge pull request #270 from khaledhosny/travis-failure + + Fix make check on Travis + +commit 988350586f607c7a46bbb658a2abecfd004f41fb +Author: Khaled Hosny +Date: Sat Jun 18 21:12:19 2016 +0200 + + [tests] Workaround Python 2 “narrow” builds + + The so-called Python 2 “narrow” builds support UCS2 only, this is a + workaround to allow unichr to work with any Unicode character in such + builds. This fixes Travis-CI failure as it has narrow Python 2 builds. + + Copied from: + https://github.com/behdad/fonttools/blob/master/Lib/fontTools/misc/py23.py + + test/shaping/hb_test_tools.py | 38 +++++++++++++++++++++++++++++++++++++- + 1 file changed, 37 insertions(+), 1 deletion(-) + +commit a0223274b97e82fe02730fd45729172511fec459 +Author: Dominik Röttsches +Date: Thu Jun 16 14:19:39 2016 +0200 + + Discard reconfigured CTFont if URL changes + + Fixes https://github.com/behdad/harfbuzz/issues/267 + + src/hb-coretext.cc | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +commit 4b8de1ea804b225e8357422d0686aad76b05ccf3 +Author: Behdad Esfahbod +Date: Mon Jun 6 23:08:54 2016 -0700 + + Round, not truncate, when scaling values + + Fixes https://github.com/behdad/harfbuzz/issues/255 + + src/hb-font-private.hh | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit a93078a0ece6dcdea8c5b46cabd30854dd7cf593 +Author: Behdad Esfahbod +Date: Mon Jun 6 15:58:41 2016 -0700 + + Change bugreport URL to github + + That's where everything is happening these days. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bed201d2b839c1b1e727e17efc2e0c8f705b86c5 +Author: Behdad Esfahbod +Date: Mon Jun 6 14:14:24 2016 -0700 + + Update for latest Unicode 9 data files + + src/hb-ot-shape-complex-indic-table.cc | 10 +++++----- + src/hb-ot-shape-complex-indic.cc | 5 ----- + src/hb-ot-shape-complex-use-table.cc | 4 ++-- + 3 files changed, 7 insertions(+), 12 deletions(-) + +commit aba4b0ca52f490adfc2f3c6ec0accddd6596fdf6 +Author: Behdad Esfahbod +Date: Wed Jun 1 16:57:29 2016 -0700 + + Add TODO + + src/hb-font.cc | 1 + + 1 file changed, 1 insertion(+) + +commit a2b03de5b30b7e83f7fbf3457e9ba9c00eb88d00 +Author: Behdad Esfahbod +Date: Fri May 6 17:56:07 2016 +0100 + + [myanmar] Handle U+AA74..U+AA76 + + Fixes https://github.com/behdad/harfbuzz/issues/218 + + src/hb-ot-shape-complex-myanmar.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 6c0aa9e92bbd22011c85d98c6db021012f7b4101 +Author: Behdad Esfahbod +Date: Fri May 6 17:50:06 2016 +0100 + + Fix build on droid.io + + test/shaping/tests/use.tests | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9b6312f9451db790db00dc2c2e27a5a1db852e72 +Author: Behdad Esfahbod +Date: Fri May 6 17:41:49 2016 +0100 + + [use] Update to draft spec from Andrew Glass from August 2015 + + src/gen-use-table.py | 29 +++-- + src/hb-ot-shape-complex-use-machine.rl | 15 +-- + src/hb-ot-shape-complex-use-private.hh | 1 - + src/hb-ot-shape-complex-use-table.cc | 142 ++++++++++----------- + src/hb-ot-shape-complex-use.cc | 11 +- + .../6ff0fbead4462d9f229167b4e6839eceb8465058.ttf | Bin 0 -> 1148 bytes + test/shaping/tests/use.tests | 1 + + 7 files changed, 93 insertions(+), 106 deletions(-) + +commit 3e4e7616a8ca80a50a438601b84428b4ba4c8694 +Author: Behdad Esfahbod +Date: Fri May 6 17:28:25 2016 +0100 + + [use] Add a catch-all clause to the machine + + src/hb-ot-shape-complex-use-machine.rl | 2 ++ + src/hb-ot-shape-complex-use.cc | 2 ++ + 2 files changed, 4 insertions(+) + +commit d04e461fe3310ccaf8633efcb79b8eb6ca2201c3 +Author: Behdad Esfahbod +Date: Fri May 6 17:17:00 2016 +0100 + + [use] Fix 'Number-joiner terminated cluster' to use HN instead of H + + From draft update to USE. + + src/hb-ot-shape-complex-use-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 359dead960c825edeb4587915a511d323f1c1f2a +Author: Behdad Esfahbod +Date: Fri May 6 16:19:19 2016 +0100 + + Allow MultipleSubst to delete glyph + + Fixes https://github.com/behdad/harfbuzz/issues/253 + + Hopefully we got the logic right. + + src/hb-ot-layout-gsub-table.hh | 17 +++++++---------- + src/hb-ot-layout-gsubgpos-private.hh | 11 +++++++---- + 2 files changed, 14 insertions(+), 14 deletions(-) + +commit 3c1666cfb589275de96d54eecb95a13a98e3819e +Author: Behdad Esfahbod +Date: Fri May 6 16:05:07 2016 +0100 + + [indic] Remove more unused logic after Javanese is gone + + src/hb-ot-shape-complex-indic.cc | 50 +++++++++++++++------------------------- + 1 file changed, 18 insertions(+), 32 deletions(-) + +commit 8b5d6e755b271d0d22b31a7726d5bfbf2aae8b2f +Author: Behdad Esfahbod +Date: Fri May 6 15:59:27 2016 +0100 + + [indic] Remove unused Javanese bits + + src/hb-ot-shape-complex-indic-machine.rl | 3 +-- + src/hb-ot-shape-complex-indic-private.hh | 5 ++--- + src/hb-ot-shape-complex-indic.cc | 4 ---- + 3 files changed, 3 insertions(+), 9 deletions(-) + +commit 30e6e29f0f0f77eb65bfd1c4576b38c2da555017 +Author: Behdad Esfahbod +Date: Fri May 6 15:52:27 2016 +0100 + + [indic/use] Move Javanese from Indic shaper to USE + + Fixes https://github.com/behdad/harfbuzz/issues/243 + + With javatext.ttf, the reodering medial Ra gets its advance width + zero'ed in Uniscribe implementation, and the font adds the advance + back. Our Indic shaper does not do that, but USE does. So, route + Javanese through USE. That's what Microsoft does anyway. Test: + + U+A9A5,U+A9BA + + This also seems to fix the following sequence, and variations thereof: + + U+A99F,U+A9C0,U+A9A2,U+A9BF + + src/gen-indic-table.py | 1 - + src/hb-ot-shape-complex-indic-table.cc | 23 ++++------------------ + src/hb-ot-shape-complex-private.hh | 5 +---- + .../south-east-asian/script-javanese/misc.txt | 1 + + 4 files changed, 6 insertions(+), 24 deletions(-) + +commit c6ee5f5f06a27a6f147f63aaf51186622821f20b +Author: Behdad Esfahbod +Date: Fri May 6 15:39:02 2016 +0100 + + Add Javanese sample text + + .../south-east-asian/script-javanese/misc.txt | 53 ++++++++++++++++++++++ + 1 file changed, 53 insertions(+) + +commit e21921a68a959b7e929f71a4260a6cbe055ab4e6 +Author: Behdad Esfahbod +Date: Fri May 6 15:24:39 2016 +0100 + + Minor + + BUILD.md | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 01a30a6aa9a5827c93245961e3392a1f361745fe +Author: Behdad Esfahbod +Date: Fri May 6 11:50:02 2016 +0100 + + [indic] Remove data for scripts that don't go thorough this shaper + + src/gen-indic-table.py | 29 +- + src/hb-ot-shape-complex-indic-table.cc | 604 +-------------------------------- + 2 files changed, 43 insertions(+), 590 deletions(-) + +commit 7cd9269f4eba7b85cd72301a3fc39fab42a4e439 +Author: Behdad Esfahbod +Date: Fri May 6 11:34:46 2016 +0100 + + Update tables to Unicode 9.0.0 beta + + Fixes https://github.com/behdad/harfbuzz/issues/251 + + src/hb-ot-shape-complex-arabic-table.hh | 56 ++++++++----- + src/hb-ot-shape-complex-indic-table.cc | 137 +++++++++++++++++++++++--------- + src/hb-ot-shape-complex-use-table.cc | 86 ++++++++++++++------ + 3 files changed, 196 insertions(+), 83 deletions(-) + +commit f718fe370ea89e8aeb407addaa6cc926d52a4cdb +Author: Behdad Esfahbod +Date: Fri May 6 11:21:12 2016 +0100 + + Minor + + src/gen-indic-table.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 691086f131cb6c9d97e98730c27673484bf93f87 +Author: Behdad Esfahbod +Date: Fri May 6 12:08:18 2016 +0100 + + Add Unicode 9 beta scripts + + These are frozen, so good time to add. + + src/hb-common.cc | 3 +++ + src/hb-common.h | 9 +++++++++ + src/hb-ot-shape-complex-private.hh | 9 +++++++++ + src/hb-ot-shape-complex-use.cc | 3 +++ + 4 files changed, 24 insertions(+) + +commit bc5198fe1277d662926a4f616913c085cd4fc8ee +Author: Behdad Esfahbod +Date: Fri May 6 11:59:05 2016 +0100 + + Whitespace + + src/hb-common.h | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit a5b7b0dd4508d8a1e7573b75c4cb8832c9e34e3f +Author: Behdad Esfahbod +Date: Mon May 2 10:44:13 2016 +0200 + + 1.2.7 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit 9879fc1db3cad684f412c2f3d6b49e0435697d0e +Author: Behdad Esfahbod +Date: Mon May 2 10:29:12 2016 +0200 + + [ot-font] Remove unused 'post' table include for now + + To make a release... + + src/hb-ot-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f8061ae7972462ad800c23be7cd7b3d7ab94b93b +Author: Behdad Esfahbod +Date: Mon May 2 10:28:24 2016 +0200 + + [tests] Fix test + + test/shaping/Makefile.am | 2 +- + .../tests/{fallback-positioning.test => fallback-positioning.tests} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit f00ab2a33ab34ba64f38cbbe65830c770a3e071e +Author: Behdad Esfahbod +Date: Mon May 2 10:24:00 2016 +0200 + + [hb-ot-font] Make 'glyf' table loading lazy + + Apparently some clients have reference-table callbacks that copy the table. + As such, avoid loading 'glyf' table which is only needed if fallback positioning + happens. + + src/hb-ot-font.cc | 45 ++++++++++++++++++++- + test/shaping/Makefile.am | 1 + + .../7ef276fc886ea502a03b9b0e5c8b547d5dc2b61c.ttf | Bin 0 -> 784 bytes + test/shaping/tests/fallback-positioning.test | 2 + + 4 files changed, 46 insertions(+), 2 deletions(-) + +commit 587d46227a56940a7f5bb053cbeda6144394acf7 +Author: Behdad Esfahbod +Date: Sat Apr 30 19:20:56 2016 +0200 + + [ot-font] Start implementing 'post' table, for accessing glyph names + + src/Makefile.sources | 1 + + src/hb-open-type-private.hh | 12 ++++- + src/hb-ot-font.cc | 1 + + src/hb-ot-post-table.hh | 119 ++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 132 insertions(+), 1 deletion(-) + +commit 9abaaac409b8e3a0a9182b67dc384133013f7878 +Merge: 2f560ee4 264b7a72 +Author: Behdad Esfahbod +Date: Wed Apr 27 03:38:24 2016 -0700 + + Merge commit '264b7a728a41becfbf23ce258fc2a3af19d0cbbe' into HEAD + +commit 2f560ee44b7b08683e8e6955fe3b95187e8bda32 +Author: Behdad Esfahbod +Date: Wed Apr 27 03:11:41 2016 -0700 + + [tibetan] Reorder marks to better match Uniscribe + + Fixes https://github.com/behdad/harfbuzz/issues/237 + + Note that Uniscribe enforces a certain syllable order. We don't. + But with this change, I get all of the tibetan contractions pass + with Microsoft Himalaya font. + + src/hb-unicode-private.hh | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit f68390f196216718c22c434e1d8921118e646824 +Author: Behdad Esfahbod +Date: Wed Apr 27 02:44:35 2016 -0700 + + [test] Add text for Tibetan shorthand contractions + + From http://www.babelstone.co.uk/Tibetan/Contractions.html + + .../script-tibetan/misc/contractions.txt | 612 +++++++++++++++++++++ + 1 file changed, 612 insertions(+) + +commit 264b7a728a41becfbf23ce258fc2a3af19d0cbbe +Merge: 7e2da035 adafdcdd +Author: Khaled Hosny +Date: Wed Apr 27 03:48:23 2016 +0300 + + Merge pull request #247 from khaledhosny/update-opentype-language-tags + + Update opentype language tags + +commit adafdcddced076da4bfa3114a00e15a387aaf1f7 +Author: Arthur Reutenauer +Date: Sat Nov 7 23:37:21 2015 +0000 + + Mass-added “difficult” tags – to be curated. + + src/hb-ot-tag.cc | 69 +++++++++++++++++++++++++++++--------------------------- + 1 file changed, 36 insertions(+), 33 deletions(-) + +commit 3d6a2c0d7d9f6c5b3097f78c1123f9e59dcc76e2 +Author: Arthur Reutenauer +Date: Sat Nov 7 22:59:13 2015 +0000 + + Initial import of missing OpenType 1.7 language tags. + + src/hb-ot-tag.cc | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 61 insertions(+), 6 deletions(-) + +commit 7e2da035f68e46ce8f4759b67b4ed3a1b211d793 +Author: Behdad Esfahbod +Date: Tue Apr 26 16:42:25 2016 -0700 + + Undo accidental change + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b20305022a8235b19e6b640bc62651854e1336f1 +Author: Behdad Esfahbod +Date: Tue Apr 26 16:41:17 2016 -0700 + + Do NOT ignore Mongolian Free Variation Selectors during matching + + Fixes https://github.com/behdad/harfbuzz/issues/234 + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-layout-private.hh | 23 +++++++++++++++++++-- + src/hb-ot-shape-complex-arabic.cc | 2 +- + .../a34a7b00f22ffb5fd7eef6933b81c7e71bc2cdfb.ttf | Bin 0 -> 3700 bytes + .../tests/mongolian-variation-selector.tests | 1 + + 5 files changed, 24 insertions(+), 4 deletions(-) + +commit 21ab5501f5f5267d20cf23256866dd9d82a667ef +Author: Behdad Esfahbod +Date: Tue Apr 26 16:02:04 2016 -0700 + + Move ZWJ/ZWNJ bits to top byte of unicode_props() + + To make room to remember Mongolian Free Variation Selectors. + Part of fixing https://github.com/behdad/harfbuzz/issues/234 + + src/hb-ot-layout-private.hh | 40 ++++++++++++++++++++++------------------ + 1 file changed, 22 insertions(+), 18 deletions(-) + +commit de508516cb06ddb064d75bd7be8e843a5ebcf70d +Author: Behdad Esfahbod +Date: Tue Apr 26 11:28:37 2016 -0700 + + [util] Print out --debug buffer to stderr + + util/main-font-text.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 29393884b9f045460fb65d6ad10a94461ba93430 +Author: Behdad Esfahbod +Date: Tue Apr 26 10:35:23 2016 -0700 + + Annotate blacklisted fonts with their sha1sum + + src/hb-ot-layout.cc | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +commit 14bb4a56971fd45063cd6c1288d911627088abb2 +Merge: 1c625dff 5069062d +Author: Sascha Brawer +Date: Tue Apr 26 11:38:16 2016 +0200 + + Merge pull request #245 from KonstantinRitt/fixes/ce + + Unbreak build on Windows CE + +commit 5069062d0a9342bb716eebf3ddc1efad91924caa +Author: Konstantin Ritt +Date: Tue Apr 26 12:02:26 2016 +0400 + + Unbreak build on Windows CE + + 0475ef2f97e3035a2eea9a0f96031331e07e8e29 broke the build by using + vsnprintf(), which is not defined on Windows CE + + src/hb-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 1c625dff2269c54ff429ca45be88893ff1fa6c34 +Author: Behdad Esfahbod +Date: Sat Apr 9 12:53:23 2016 -0700 + + Minor + + src/hb-ot-layout.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 851b0db36d1b724fc1e0db506445119c78186285 +Author: Behdad Esfahbod +Date: Fri Apr 8 23:46:55 2016 -0700 + + Minor. We should never get to this branch, but fix it anyway. + + src/hb-ot-layout-common-private.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 00ea66f35754a1e6e4d3b7b139d611a9a623a9d1 +Author: Behdad Esfahbod +Date: Fri Apr 8 13:51:01 2016 -0700 + + 1.2.6 + + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 4f3d59a1877dcb94d09da48e9694a6c1b05a86fe +Author: Behdad Esfahbod +Date: Fri Apr 8 13:41:20 2016 -0700 + + Blacklist another set of timesi.ttf and timesbi.ttf + + src/hb-ot-layout.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit ef476be80d773332e0c768a3465d99381d76edd9 +Merge: a0331b55 d3134a66 +Author: Behdad Esfahbod +Date: Fri Apr 8 13:16:33 2016 -0700 + + Merge pull request #239 from ebraminio/dwfix + + Improve DirectWrite backend + +commit d3134a66ad551ded726db9528d3c25459088f105 +Author: Ebrahim Byagowi +Date: Tue Apr 5 21:01:05 2016 +0000 + + Fix when no feature is given + + src/hb-directwrite.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit a0331b55f7b45437980e1fc323251f4091bf2c4e +Author: Behdad Esfahbod +Date: Mon Apr 4 16:25:32 2016 -0700 + + 1.2.5 + + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit 6e55199b5f097ac93bad38f32e9813e2da14c5a7 +Author: Behdad Esfahbod +Date: Mon Apr 4 16:24:27 2016 -0700 + + Add test for 6dd80faf0dcb3e8a8915c3a25da44e2a67cb0cd8 + + test/shaping/Makefile.am | 1 + + .../f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf | Bin 0 -> 16736 bytes + test/shaping/tests/mark-filtering-sets.tests | 5 +++++ + 3 files changed, 6 insertions(+) + +commit 59089622dbb8dda783b1639c932123f125c3592d +Author: Behdad Esfahbod +Date: Mon Apr 4 14:54:32 2016 -0700 + + [coretext] Clarify comment + + src/hb-coretext.cc | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +commit 6dd80faf0dcb3e8a8915c3a25da44e2a67cb0cd8 +Author: Behdad Esfahbod +Date: Mon Apr 4 14:34:25 2016 -0700 + + Fix FixedVersion::to_int() + + Ouch. Had broken it in 9a13ed453ef96822a47d6e6f58332b87f38d5c59 + + Fixes https://github.com/behdad/harfbuzz/issues/238 + Will add test soon. + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4a104021697439fd21390a1f4cdc9310348882fa +Author: Ebrahim Byagowi +Date: Sat Apr 2 13:47:59 2016 +0000 + + Hide justification behind HB_DIRECTWRITE_EXPERIMENTAL_JUSTIFICATION + + src/hb-directwrite.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 63ee9ca5d81b53eb035972754ed95572821c393c +Author: Ebrahim Byagowi +Date: Fri Apr 1 15:47:07 2016 +0000 + + Use standard types instead Windows favourites ones + + src/hb-directwrite.cc | 100 +++++++++++++++++++++++++------------------------- + 1 file changed, 50 insertions(+), 50 deletions(-) + +commit adf20ba0d18d1506e633dcd9b4827a6c93abcadd +Author: Ebrahim Byagowi +Date: Fri Apr 1 15:36:40 2016 +0000 + + Limit GetJustifiedGlyphs only to scripts with custom justification character + + src/hb-directwrite.cc | 98 +++++++++++++++++++++++++++++++-------------------- + 1 file changed, 60 insertions(+), 38 deletions(-) + +commit 32ae9d1b3ffbe7e26e654437a56a26a95fe9f5a6 +Author: Ebrahim Byagowi +Date: Fri Apr 1 06:39:57 2016 +0000 + + Add justification support + + src/hb-directwrite.cc | 321 ++++++++++++++++++++++++++++++++------------------ + 1 file changed, 205 insertions(+), 116 deletions(-) + +commit 10c3d9e41520595c88dd2a8321590e03ce8fcf47 +Author: Ebrahim Byagowi +Date: Thu Mar 31 18:19:44 2016 +0000 + + Basic opentype features support + + src/hb-directwrite.cc | 62 ++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 42 insertions(+), 20 deletions(-) + +commit d129897120d3ad414220d603557c15a60aa69fa6 +Author: Ebrahim Byagowi +Date: Thu Mar 31 13:45:37 2016 +0000 + + Refactor and remove dupe getglyphs call + + src/hb-directwrite.cc | 106 ++++++++++++++++++++++++-------------------------- + 1 file changed, 51 insertions(+), 55 deletions(-) + +commit 5f1a8961008b93f72acc47336109af3a64e248d0 +Author: Ebrahim Byagowi +Date: Thu Mar 31 12:26:16 2016 +0000 + + Better glyph offset support + + src/hb-directwrite.cc | 44 ++++++++++++++++++++++++-------------------- + 1 file changed, 24 insertions(+), 20 deletions(-) + +commit d691ba3f405738c6857450752b8cc0911dfcdb01 +Author: Ebrahim Byagowi +Date: Wed Mar 30 20:21:40 2016 +0000 + + Don't fail when language is not set + + src/hb-directwrite.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 1c00a46c7a608ebc0b03c5abfcfe7f2b9881d0df +Author: Ebrahim Byagowi +Date: Wed Mar 30 20:15:09 2016 +0000 + + Make DirectWrite backend to work with different font sizes + + Actually copyedited same logic from Uniscribe to make it just work + + src/hb-directwrite.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 0251b0cc5c39272d2299d4b2ab802faaafe96837 +Author: Behdad Esfahbod +Date: Thu Mar 17 14:37:11 2016 -0700 + + 1.2.4 + + NEWS | 15 +++++++++++++++ + configure.ac | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) + +commit 69f9fbc4200442a35484d3c790ae8f4979be5d60 +Author: Behdad Esfahbod +Date: Thu Mar 17 11:59:43 2016 -0700 + + Synthesize GDEF glyph class for any glyph that does not have one in GDEF + + Previously we only synthesized GDEF glyph classes if the glyphClassDef + array in GDEF was null. This worked well enough, and is indeed what + OpenType requires: "If the font does not include a GlyphClassDef table, + the client must define and maintain this information when using the + GSUB and GPOS tables." That sentence does not quite make sense since + one needs Unicode properties as well, but is close enough. + + However, looks like Arial Unicode as shipped on WinXP, does have GDEF + glyph class array, but defines no classes for Hebrew. This results + in Hebrew marks not getting their widths zeroed. So, with this change, + we synthesize glyph class for any glyph that is not specified in the + GDEF glyph class table. Since, from our point of view, a glyph not + being listed in that table is a font bug, any unwanted consequence of + this change is a font bug :). + + Note that we still don't get the same rendering as Uniscribe, since + Uniscribe seems to do fallback positioning as well, even though the + font does have a GPOS table (which does NOT cover Hebrew!). We are + not going to try to match that though. + + Test string for Arial Unicode: + + U+05E9,U+05B8,U+05C1,U+05DC + + Before: [gid1166=3+991|gid1142=0+737|gid5798=0+1434] + After: [gid1166=3+991|gid1142=0+0|gid5798=0+1434] + Uniscribe: [gid1166=3+991|gid1142=0@348,0+0|gid5798=0+1434] + + Note that our new output matches what we were generating until July + 2014, because the Hebrew shaper used to zero mark advances based on + Unicode, NOT GDEF. That's 9e834e29e0b657f0555df1ab9cea79ff7abcf08d. + + Reported by Greg Douglas. + + src/hb-ot-layout-gsub-table.hh | 22 ++++++++++++++++++++-- + src/hb-ot-shape.cc | 29 ----------------------------- + 2 files changed, 20 insertions(+), 31 deletions(-) + +commit fef5dd9a72f326c160a7194f558749d24bac7283 +Merge: 01ea9eaa 5f995db1 +Author: Behdad Esfahbod +Date: Sat Mar 12 19:15:15 2016 -0800 + + Merge pull request #232 from c0nk/wip-icu + + Add --with-icu=builtin option; fix compile error + +commit 01ea9eaac373d9f3de6e56c1ca26cdcd259ecc8e +Author: Behdad Esfahbod +Date: Fri Mar 11 18:50:02 2016 -0800 + + [build] Use tar-ustar instead of tar-pax + + The default tar-v7 is not good enough for us (99 char filename + limit), so I have had bumped to tar-pax. We got one complaint + that someone's tar couldn't handle tar-pax. Set to tar-ustar + which is ~13 years earlier than tar-pax and is good enough for us. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3e10460a1dd41de32752e308771aa30d23565cc0 +Author: Behdad Esfahbod +Date: Fri Mar 11 18:45:19 2016 -0800 + + Minor comment + + src/hb-unicode-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d14fea4bdcc1423fe9a585af3abdefa9605d17e6 +Author: Behdad Esfahbod +Date: Tue Mar 8 12:16:41 2016 -0800 + + Remove default clause in minor switch statements + + Bending to clang warnings... + https://bugs.chromium.org/p/chromium/issues/detail?id=593057 + + src/hb-ot-shape-complex-indic.cc | 4 ---- + src/hb-ot-shape-complex-thai.cc | 1 - + 2 files changed, 5 deletions(-) + +commit ce8ae9970102f83b67bb1e8e8b2bf894a0e26c07 +Merge: 731a430c 71248a84 +Author: Behdad Esfahbod +Date: Fri Mar 4 17:20:35 2016 -0800 + + Merge pull request #231 from KonstantinRitt/post123buildfix + + Fix build with HB_DISABLE_DEPRECATED + +commit 731a430cd36caabcef04e099b21ebc6daedd536f +Author: Behdad Esfahbod +Date: Wed Mar 2 13:32:42 2016 -0800 + + Fix requiredFeature stage handling logic + + Originally the way Jonathan had written this was correct in + "continue"ing: + + https://github.com/jfkthame/harfbuzz/commit/35e28c7a733eaffcd9f062b18d7db9fbb3d990fc#diff-ead86a33a5cc9ad7f6e6381031a0baddR199 + + When I rewrote his patch, I messed it up: + + https://github.com/behdad/harfbuzz/commit/da132937989acb4d8ca9bd41c79f98750e7dda30#diff-ead86a33a5cc9ad7f6e6381031a0baddR209 + + the intended behavior was NOT to set found=TRUE and NOT to continue. + This was resulting in feature_index[table_index] being left unset. + Oops! + + src/hb-ot-map.cc | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit 68b6296d3333fd38bd5442d2ba087ced481603bc +Author: Behdad Esfahbod +Date: Tue Mar 1 16:41:53 2016 +0900 + + Add F2DOT14 type + + src/hb-open-type-private.hh | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 082b79fe9f06607998178dcdcbe817af28b017de +Author: Behdad Esfahbod +Date: Tue Mar 1 16:41:26 2016 +0900 + + Use FWORD and UFWORD when it makes sense + + I had forgotten about those types. + + src/hb-ot-glyf-table.hh | 8 ++++---- + src/hb-ot-hmtx-table.hh | 6 +++--- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 5f995db10381172ec63fd7ffbb0acf2c6b3dae5e +Author: Kal Conley +Date: Fri Feb 26 00:36:17 2016 +0100 + + Fix missing ICU #include + + Fix compile error in hb-icu.cc when ICU configured with + U_NO_DEFAULT_INCLUDE_UTF_HEADERS=1 + + src/hb-icu.cc | 1 + + 1 file changed, 1 insertion(+) + +commit b424b6c372dfe4c0ed75a49761eb34a416819446 +Author: Kal Conley +Date: Fri Feb 26 00:35:15 2016 +0100 + + Add --with-icu=builtin configure option + + configure.ac | 33 +++++++++++++++++++-------------- + src/Makefile.am | 7 +++++++ + 2 files changed, 26 insertions(+), 14 deletions(-) + +commit 71248a843f976c86022eb5bb8c6e8880b2499937 +Author: Konstantin Ritt +Date: Thu Feb 25 18:55:28 2016 +0400 + + Fix build with HB_DISABLE_DEPRECATED + + When HB_DISABLE_DEPRECATED is defined, no code from hb-deprecated.h + should be used, even from within HB itself. + + src/hb-font.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 0c7fb7419c20d04b803412945565562c32b42929 +Author: Behdad Esfahbod +Date: Thu Feb 25 14:40:09 2016 +0900 + + Speed up buffer variable allocation sanity check + + This makes defining HB_NDEBUG much less relevant, to the + point of irrelevance. Sorry about all the fuss in previous + release! + + src/hb-buffer-private.hh | 67 ++++++++++++++++++++++++++++----------------- + src/hb-buffer.cc | 70 ------------------------------------------------ + 2 files changed, 43 insertions(+), 94 deletions(-) + +commit 91dd11565221bdb108c138662ea013aac14bb968 +Author: Behdad Esfahbod +Date: Thu Feb 25 13:56:47 2016 +0900 + + Add HB_NDEBUG + + API changes: + - If NDEBUG is defined, define HB_NDEBUG + - Disable costlier sanity checks if HB_NDEBUG is defined. + + In 1.2.3 introduced some code to disable costly sanity checks if + NDEBUG is defined. NDEBUG, however, disables all assert()s as + well. With HB_NDEBUG, one can disable costlier checks but keep + assert()s. + + I'll probably add a way to define HB_NDEBUG automatically in + release tarballs. But for now, production systems that do NOT + define NDEBUG, are encouraged to define HB_NDEBUG for our build. + + src/Makefile.am | 2 +- + src/hb-buffer-private.hh | 4 ++-- + src/hb-buffer.cc | 4 ++-- + src/hb-private.hh | 9 +++++++++ + 4 files changed, 14 insertions(+), 5 deletions(-) + +commit 75568b0a7f811ea18e23037735ec8541a7431f88 +Author: Behdad Esfahbod +Date: Thu Feb 25 12:26:26 2016 +0900 + + 1.2.3 + + NEWS | 42 ++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 43 insertions(+), 1 deletion(-) + +commit 988165021f8d48dc7120b071d056491256569f4f +Author: Behdad Esfahbod +Date: Thu Feb 25 12:23:02 2016 +0900 + + Disable internal buffer variable bookkeeping in NDEBUG builds + + Saves some sweet time and binary size! + + src/Makefile.am | 1 + + src/hb-buffer-private.hh | 30 ++++++++++++++++++++---------- + src/hb-buffer.cc | 6 ++++-- + 3 files changed, 25 insertions(+), 12 deletions(-) + +commit 94dd0bb7e78125994cb7c833a5b03110f1ffc822 +Author: Behdad Esfahbod +Date: Thu Feb 25 11:31:03 2016 +0900 + + Add blacklist signature for Times New Roman (Bold) Italic on OS X + + src/hb-ot-layout.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit dd8598c1c7f29fc92253b0cd4e856c1941b1d0c0 +Author: Behdad Esfahbod +Date: Thu Feb 25 11:20:05 2016 +0900 + + [test] Pass closure to hb_font_set_glyph_func() + + Exercises fix in c335fd7986fe360ab8e1c032c9b988d0d30511eb + + test/api/test-shape.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e23cf902e91142a10229e3514be4ceee69efde04 +Author: Behdad Esfahbod +Date: Thu Feb 25 11:11:15 2016 +0900 + + Blacklist GDEF table of timesi.ttf and timesbi.ttf on Win 7 + + See discussion: + https://lists.freedesktop.org/archives/harfbuzz/2016-February/005489.html + + src/hb-ot-layout.cc | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +commit c335fd7986fe360ab8e1c032c9b988d0d30511eb +Author: Behdad Esfahbod +Date: Thu Feb 25 09:16:05 2016 +0900 + + In trampoline implementation of get_glyph(), don't destroy user data twice! + + src/hb-font.cc | 41 +++++++++++++++++++++++++++-------------- + 1 file changed, 27 insertions(+), 14 deletions(-) + +commit 23335deaad9d4d9824ff41343264514d3f9f7e37 +Author: Behdad Esfahbod +Date: Wed Feb 24 20:27:13 2016 +0900 + + [ot-font] Accelerate cmap format4 get_glyph + + src/hb-ot-cmap-table.hh | 111 ++++++++++++++++++++++++++++-------------------- + src/hb-ot-font.cc | 14 +++++- + 2 files changed, 77 insertions(+), 48 deletions(-) + +commit e0f16a715bc3e621ff21a8be88102e9672630574 +Author: Behdad Esfahbod +Date: Wed Feb 24 19:52:36 2016 +0900 + + [ot-font] Towards accelerating get_glyph() + + src/hb-ot-font.cc | 23 ++++++++++++++++++++--- + 1 file changed, 20 insertions(+), 3 deletions(-) + +commit 5473ebfb84c7b6059ac16e04676b363acc51aa00 +Author: Behdad Esfahbod +Date: Wed Feb 24 19:32:43 2016 +0900 + + [ot-font] Remove level of indirection in get_glyph_variant + + src/hb-ot-cmap-table.hh | 14 ++------------ + src/hb-ot-font.cc | 13 +++++++++---- + 2 files changed, 11 insertions(+), 16 deletions(-) + +commit 49fe6ecf19522413e79a11a29aa0ffc5bdfcd2f8 +Author: Behdad Esfahbod +Date: Wed Feb 24 19:10:06 2016 +0900 + + [TODO] Update + + This file is rather obsolete. Still, give it a refresh. + + TODO | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) + +commit 8b5bc141cd3a6bfcea3c91a882a630426876ceb3 +Author: Behdad Esfahbod +Date: Wed Feb 24 19:05:23 2016 +0900 + + Add get_nominal_glyph() and get_variation_glyph() instead of get_glyph() + + New API: + - hb_font_get_nominal_glyph_func_t + - hb_font_get_variation_glyph_func_t + - hb_font_funcs_set_nominal_glyph_func() + - hb_font_funcs_set_variation_glyph_func() + - hb_font_get_nominal_glyph() + - hb_font_get_variation_glyph() + + Deprecated API: + - hb_font_get_glyph_func_t + - hb_font_funcs_set_glyph_func() + + Clients that implement their own font-funcs are encouraged to replace + their get_glyph() implementation with a get_nominal_glyph() and + get_variation_glyph() pair. The variation version can assume that + variation_selector argument is not zero. + + src/hb-deprecated.h | 10 ++ + src/hb-fallback-shape.cc | 4 +- + src/hb-font-private.hh | 26 +++-- + src/hb-font.cc | 203 ++++++++++++++++++++++++++++++++++--- + src/hb-font.h | 55 +++++++--- + src/hb-ft.cc | 38 ++++--- + src/hb-ot-font.cc | 57 +++++++---- + src/hb-ot-shape-complex-indic.cc | 8 +- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape-complex-use.cc | 2 +- + src/hb-ot-shape-fallback.cc | 6 +- + src/hb-ot-shape-normalize.cc | 18 ++-- + src/hb-ot-shape.cc | 6 +- + 13 files changed, 344 insertions(+), 91 deletions(-) + +commit b30a971bf792b9c683c345e1be25c5a5869a113c +Author: Behdad Esfahbod +Date: Wed Feb 24 17:32:22 2016 +0900 + + 1.2.2 + + NEWS | 14 +++++++++++++- + configure.ac | 2 +- + 2 files changed, 14 insertions(+), 2 deletions(-) + +commit af48e3d27c01c538f46f1dc376d994a0c24a8170 +Author: Behdad Esfahbod +Date: Wed Feb 24 16:06:40 2016 +0900 + + Fix recent test + + Not sure why the FT functions were returning advance 1024. This + caused failure on drone.io. Switch to hb-ot-font and disable + glyph names. + + test/shaping/tests/cursive-positioning.tests | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 17c831701756bb46300c412fd64b19d67f299c18 +Author: Behdad Esfahbod +Date: Wed Feb 24 16:06:23 2016 +0900 + + [tests] Fix for multiple options in test runner scripts + + test/shaping/run-tests.sh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit ebd7431f824c718db6ce5b85e94f2b3911127af4 +Author: Behdad Esfahbod +Date: Wed Feb 24 15:53:40 2016 +0900 + + Partially revert 86c68c7a2c971efe8e35b1f1bd99401dc8b688d2 + + That commit moved the advance adjustment for mark positioning to + be applied immediately, instead of doing late before. This breaks + if mark advances are zeroed late, like in Arabic. Also, easier to + hit it in RTL scripts since a single mark with non-zero advance is + enough to hit the bug, whereas in LTR, at least two marks are needed. + + This reopens https://github.com/behdad/harfbuzz/issues/211 + The cursive+mark interaction is broken again. To be fixed in a + different way. + + src/hb-ot-layout-gpos-table.hh | 28 ++++++++++++---------------- + test/shaping/tests/cursive-positioning.tests | 2 +- + 2 files changed, 13 insertions(+), 17 deletions(-) + +commit 284481b3120963353f5f34ed094f07ffc13480ef +Author: Behdad Esfahbod +Date: Wed Feb 24 15:52:37 2016 +0900 + + Add test for mark positioning in rtl with non-zero mark advance + + Apparently I broke this 86c68c7a2c971efe8e35b1f1bd99401dc8b688d2. + Fix coming. + + .../sha1sum/07f054357ff8638bac3711b422a1e31180bba863.ttf | Bin 0 -> 848 bytes + test/shaping/tests/cursive-positioning.tests | 1 + + 2 files changed, 1 insertion(+) + +commit 56a84e8dd18c63782b8db3a86e94651dae5bb01b +Author: Behdad Esfahbod +Date: Wed Feb 24 15:50:33 2016 +0900 + + [tests] Allow commenting out tests to be skipped + + test/shaping/run-tests.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 7cfd6cc486f2751d7f78c5008a636d677af4e12f +Author: Behdad Esfahbod +Date: Wed Feb 24 12:30:57 2016 +0900 + + [Android.mk] Update with warning flags + + Android.mk | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit dabf32a5ad706726412ba5c64e1ea614a707b928 +Author: Behdad Esfahbod +Date: Tue Feb 23 15:38:43 2016 +0900 + + 1.2.1 + + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit 525cc7d28cbe4e8149ddba677224f134dc0a3274 +Author: Behdad Esfahbod +Date: Tue Feb 23 15:19:27 2016 +0900 + + Add note re only adding tests with Free Software fonts + + test/shaping/README.md | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 6a09d7e34b949f9929f616ee53278b2edfd9b7ea +Author: Behdad Esfahbod +Date: Tue Feb 23 13:47:16 2016 +0900 + + [test] Add README about how to add shaping tests + + test/shaping/Makefile.am | 1 + + test/shaping/README.md | 37 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 38 insertions(+) + +commit f8ee7906d0454d950081c621f2b04a6d08e1b92f +Author: Behdad Esfahbod +Date: Tue Feb 23 13:45:38 2016 +0900 + + Remove MANIFEST files + + They are unused currently. We can add later if we hook them up + to anything useful. + + test/shaping/fonts/sha1sum/MANIFEST | 52 ---------------------- + test/shaping/tests/MANIFEST | 19 -------- + test/shaping/texts/MANIFEST | 1 - + test/shaping/texts/in-tree/MANIFEST | 9 ---- + test/shaping/texts/in-tree/shaper-arabic/MANIFEST | 6 --- + .../in-tree/shaper-arabic/script-arabic/MANIFEST | 3 -- + .../script-arabic/language-persian/MANIFEST | 1 - + .../script-arabic/language-urdu/MANIFEST | 1 - + .../script-arabic/language-urdu/crulp/MANIFEST | 1 - + .../language-urdu/crulp/ligatures/MANIFEST | 7 --- + .../shaper-arabic/script-arabic/misc/MANIFEST | 1 - + .../script-arabic/misc/diacritics/MANIFEST | 7 --- + .../in-tree/shaper-arabic/script-mandaic/MANIFEST | 1 - + .../shaper-arabic/script-mandaic/misc/MANIFEST | 0 + .../shaper-arabic/script-mongolian/MANIFEST | 1 - + .../shaper-arabic/script-mongolian/misc/MANIFEST | 4 -- + .../in-tree/shaper-arabic/script-nko/MANIFEST | 1 - + .../in-tree/shaper-arabic/script-nko/misc/MANIFEST | 1 - + .../in-tree/shaper-arabic/script-phags-pa/MANIFEST | 1 - + .../shaper-arabic/script-phags-pa/misc/MANIFEST | 1 - + .../in-tree/shaper-arabic/script-syriac/MANIFEST | 1 - + .../shaper-arabic/script-syriac/misc/MANIFEST | 2 - + test/shaping/texts/in-tree/shaper-default/MANIFEST | 5 --- + .../shaper-default/script-ethiopic/MANIFEST | 1 - + .../shaper-default/script-ethiopic/misc/MANIFEST | 1 - + .../in-tree/shaper-default/script-han/MANIFEST | 1 - + .../shaper-default/script-han/misc/MANIFEST | 1 - + .../shaper-default/script-hiragana/MANIFEST | 1 - + .../shaper-default/script-hiragana/misc/MANIFEST | 2 - + .../shaper-default/script-linear-b/MANIFEST | 1 - + .../shaper-default/script-linear-b/misc/MANIFEST | 1 - + .../shaper-default/script-tifinagh/MANIFEST | 1 - + .../shaper-default/script-tifinagh/misc/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-hangul/MANIFEST | 1 - + .../in-tree/shaper-hangul/script-hangul/MANIFEST | 1 - + .../shaper-hangul/script-hangul/misc/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-hebrew/MANIFEST | 1 - + .../in-tree/shaper-hebrew/script-hebrew/MANIFEST | 1 - + .../shaper-hebrew/script-hebrew/misc/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-indic/MANIFEST | 2 - + .../texts/in-tree/shaper-indic/indic/MANIFEST | 11 ----- + .../shaper-indic/indic/script-assamese/MANIFEST | 2 - + .../indic/script-assamese/misc/MANIFEST | 0 + .../indic/script-assamese/utrrs/MANIFEST | 3 -- + .../indic/script-assamese/utrrs/codepoint/MANIFEST | 7 --- + .../indic/script-assamese/utrrs/gpos/MANIFEST | 2 - + .../indic/script-assamese/utrrs/gsub/MANIFEST | 1 - + .../shaper-indic/indic/script-bengali/MANIFEST | 2 - + .../indic/script-bengali/misc/MANIFEST | 2 - + .../indic/script-bengali/utrrs/MANIFEST | 3 -- + .../indic/script-bengali/utrrs/codepoint/MANIFEST | 7 --- + .../indic/script-bengali/utrrs/gpos/MANIFEST | 2 - + .../indic/script-bengali/utrrs/gsub/MANIFEST | 1 - + .../shaper-indic/indic/script-devanagari/MANIFEST | 2 - + .../indic/script-devanagari/misc/MANIFEST | 6 --- + .../indic/script-devanagari/utrrs/MANIFEST | 3 -- + .../script-devanagari/utrrs/codepoint/MANIFEST | 9 ---- + .../indic/script-devanagari/utrrs/gpos/MANIFEST | 2 - + .../indic/script-devanagari/utrrs/gsub/MANIFEST | 1 - + .../shaper-indic/indic/script-gujarati/MANIFEST | 2 - + .../indic/script-gujarati/misc/MANIFEST | 0 + .../indic/script-gujarati/utrrs/MANIFEST | 3 -- + .../indic/script-gujarati/utrrs/codepoint/MANIFEST | 7 --- + .../indic/script-gujarati/utrrs/gpos/MANIFEST | 2 - + .../indic/script-gujarati/utrrs/gsub/MANIFEST | 1 - + .../shaper-indic/indic/script-gurmukhi/MANIFEST | 2 - + .../indic/script-gurmukhi/misc/MANIFEST | 1 - + .../indic/script-gurmukhi/utrrs/MANIFEST | 3 -- + .../indic/script-gurmukhi/utrrs/codepoint/MANIFEST | 7 --- + .../indic/script-gurmukhi/utrrs/gpos/MANIFEST | 2 - + .../indic/script-gurmukhi/utrrs/gsub/MANIFEST | 1 - + .../shaper-indic/indic/script-kannada/MANIFEST | 2 - + .../indic/script-kannada/misc/MANIFEST | 2 - + .../indic/script-kannada/utrrs/MANIFEST | 3 -- + .../indic/script-kannada/utrrs/codepoint/MANIFEST | 8 ---- + .../indic/script-kannada/utrrs/gpos/MANIFEST | 1 - + .../indic/script-kannada/utrrs/gsub/MANIFEST | 1 - + .../shaper-indic/indic/script-malayalam/MANIFEST | 2 - + .../indic/script-malayalam/misc/MANIFEST | 3 -- + .../indic/script-malayalam/utrrs/MANIFEST | 2 - + .../script-malayalam/utrrs/codepoint/MANIFEST | 7 --- + .../indic/script-malayalam/utrrs/gsub/MANIFEST | 1 - + .../shaper-indic/indic/script-oriya/MANIFEST | 2 - + .../shaper-indic/indic/script-oriya/misc/MANIFEST | 2 - + .../shaper-indic/indic/script-oriya/utrrs/MANIFEST | 2 - + .../indic/script-oriya/utrrs/codepoint/MANIFEST | 9 ---- + .../indic/script-oriya/utrrs/gsub/MANIFEST | 1 - + .../shaper-indic/indic/script-sinhala/MANIFEST | 2 - + .../indic/script-sinhala/misc/MANIFEST | 4 -- + .../indic/script-sinhala/utrrs/MANIFEST | 3 -- + .../indic/script-sinhala/utrrs/codepoint/MANIFEST | 5 --- + .../indic/script-sinhala/utrrs/gpos/MANIFEST | 1 - + .../indic/script-sinhala/utrrs/gsub/MANIFEST | 7 --- + .../shaper-indic/indic/script-tamil/MANIFEST | 2 - + .../shaper-indic/indic/script-tamil/misc/MANIFEST | 1 - + .../shaper-indic/indic/script-tamil/utrrs/MANIFEST | 3 -- + .../indic/script-tamil/utrrs/codepoint/MANIFEST | 10 ----- + .../indic/script-tamil/utrrs/gpos/MANIFEST | 2 - + .../indic/script-tamil/utrrs/gsub/MANIFEST | 1 - + .../shaper-indic/indic/script-telugu/MANIFEST | 2 - + .../shaper-indic/indic/script-telugu/misc/MANIFEST | 1 - + .../indic/script-telugu/utrrs/MANIFEST | 3 -- + .../indic/script-telugu/utrrs/codepoint/MANIFEST | 7 --- + .../indic/script-telugu/utrrs/gpos/MANIFEST | 1 - + .../indic/script-telugu/utrrs/gsub/MANIFEST | 1 - + .../in-tree/shaper-indic/south-east-asian/MANIFEST | 1 - + .../south-east-asian/script-khmer/MANIFEST | 1 - + .../south-east-asian/script-khmer/misc/MANIFEST | 3 -- + test/shaping/texts/in-tree/shaper-myanmar/MANIFEST | 1 - + .../in-tree/shaper-myanmar/script-myanmar/MANIFEST | 1 - + .../shaper-myanmar/script-myanmar/misc/MANIFEST | 3 -- + test/shaping/texts/in-tree/shaper-thai/MANIFEST | 2 - + .../texts/in-tree/shaper-thai/script-lao/MANIFEST | 1 - + .../in-tree/shaper-thai/script-lao/misc/MANIFEST | 1 - + .../texts/in-tree/shaper-thai/script-thai/MANIFEST | 1 - + .../in-tree/shaper-thai/script-thai/misc/MANIFEST | 4 -- + test/shaping/texts/in-tree/shaper-tibetan/MANIFEST | 1 - + .../in-tree/shaper-tibetan/script-tibetan/MANIFEST | 1 - + .../shaper-tibetan/script-tibetan/misc/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-use/MANIFEST | 6 --- + .../texts/in-tree/shaper-use/script-batak/MANIFEST | 1 - + .../in-tree/shaper-use/script-buginese/MANIFEST | 1 - + .../texts/in-tree/shaper-use/script-cham/MANIFEST | 1 - + .../in-tree/shaper-use/script-kaithi/MANIFEST | 1 - + .../in-tree/shaper-use/script-kharoshti/MANIFEST | 1 - + .../in-tree/shaper-use/script-tai-tham/MANIFEST | 2 - + 126 files changed, 381 deletions(-) + +commit 815bdd7700155efcffa9a4c3ca5bfc31833d0586 +Author: Behdad Esfahbod +Date: Mon Feb 22 18:22:44 2016 +0900 + + In cluster-level=0, group ZWJ/ZWNJ with previous cluster + + This better emulates Unicode grapheme clusters. + + Note that Uniscribe does NOT do this, but should be harmless with most clients, + and improve fallback with clients that use HarfBuzz cluster as unit of fallback. + + Fixes https://github.com/behdad/harfbuzz/issues/217 + + src/hb-ot-layout-private.hh | 6 ++++++ + src/hb-ot-shape.cc | 3 ++- + test/shaping/tests/indic-joiner-candrabindu.tests | 2 +- + test/shaping/tests/mongolian-variation-selector.tests | 2 +- + 4 files changed, 10 insertions(+), 3 deletions(-) + +commit 89137e325a19d62fb00979e1e8ab2ca59a2c1147 +Author: Behdad Esfahbod +Date: Mon Feb 22 16:00:59 2016 +0900 + + Minor + + src/hb-coretext.cc | 2 +- + src/hb-ot-shape.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 15063b12f7619d4f44981248e28f38c172d12e1f +Author: Behdad Esfahbod +Date: Mon Feb 22 15:56:29 2016 +0900 + + [coretext] Move CTFont construction to face_data + + src/hb-coretext.cc | 66 +++++++++++++++++++++++++----------------------------- + 1 file changed, 30 insertions(+), 36 deletions(-) + +commit ba3d49d9a56932d341bf1916a30f322be665e3a6 +Author: Behdad Esfahbod +Date: Mon Feb 22 15:50:12 2016 +0900 + + [coretext] Move code around + + src/hb-coretext.cc | 70 +++++++++++++++++++++++++++++++----------------------- + 1 file changed, 40 insertions(+), 30 deletions(-) + +commit 90194efb8480d58c55b7a19962624c7aadbdca63 +Author: Behdad Esfahbod +Date: Mon Feb 22 15:42:53 2016 +0900 + + [coretext] Move code around + + src/hb-coretext.cc | 46 ++++++++++++++++++++++++++-------------------- + 1 file changed, 26 insertions(+), 20 deletions(-) + +commit ca539e37a4b71e585a267a288db1a3975cbb99fc +Author: Behdad Esfahbod +Date: Mon Feb 22 15:37:18 2016 +0900 + + [build] git.mk fix for m4/gtk-doc.m4 + + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 54788cb1ecc5a5ffd63d07cd1f0b07b2afa9a8ca +Author: Behdad Esfahbod +Date: Mon Feb 22 15:32:52 2016 +0900 + + [win32] Install git.mk + + win32/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit 9a13ed453ef96822a47d6e6f58332b87f38d5c59 +Author: Behdad Esfahbod +Date: Mon Feb 22 11:44:45 2016 +0900 + + Make FixedVersion a template + + src/hb-open-file-private.hh | 4 ++-- + src/hb-open-type-private.hh | 9 +++++---- + src/hb-ot-head-table.hh | 4 ++-- + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-layout-jstf-table.hh | 2 +- + src/hb-ot-maxp-table.hh | 2 +- + 8 files changed, 14 insertions(+), 13 deletions(-) + +commit 238b943e850ea1ab0093e12c74d2cd7c686f318e +Author: Behdad Esfahbod +Date: Mon Feb 22 15:31:22 2016 +0900 + + [coretext] Fix leak! + + src/hb-coretext.cc | 1 + + 1 file changed, 1 insertion(+) + +commit e561122856a50ed405d71cb1629317e7ae63f316 +Author: Behdad Esfahbod +Date: Mon Feb 22 15:28:37 2016 +0900 + + [coretext] Move code around + + src/hb-coretext.cc | 109 ++++++++++++++++++++++++++++++----------------------- + 1 file changed, 62 insertions(+), 47 deletions(-) + +commit 04c64431530a4a6d9ebd33674c4665a8e6d25bdd +Author: Behdad Esfahbod +Date: Mon Feb 22 15:12:27 2016 +0900 + + [coretext] Ignore PPEM in font size selection + + src/hb-coretext.cc | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) + +commit 62c2711121fe78f373c15c0f53090b62b52d11c1 +Author: Behdad Esfahbod +Date: Mon Feb 22 15:07:20 2016 +0900 + + [coretext] Limit grapheme-cluster forming to cluster-level=0 + + src/hb-coretext.cc | 1 + + src/hb-ot-shape.cc | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 061105ec443eb7350ffe217305f9d8902c179e2f +Author: Behdad Esfahbod +Date: Mon Feb 22 14:59:39 2016 +0900 + + [coretext] Fix shaping with varying font size + + Fixes https://github.com/libass/libass/issues/212 + + src/hb-coretext.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 27847cab1264b4ce8342603f4626b4e0645979e4 +Author: Behdad Esfahbod +Date: Fri Feb 19 15:56:50 2016 +0700 + + 1.2.0 + + NEWS | 20 ++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 21 insertions(+), 1 deletion(-) + +commit c3731559042e1730e85d19574321ad850010f7de +Author: Behdad Esfahbod +Date: Fri Feb 19 15:13:07 2016 +0700 + + [fuzzing] Add test for recent fix + + Test from https://github.com/behdad/harfbuzz/issues/223 + + I forgot that we do run hb-fuzzer on tests in shaping/tests/fuzzed.tests. + + .../sha1sum/205edd09bd3d141cc9580f650109556cc28b22cb.ttf | Bin 0 -> 1966 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/fuzzed.tests | 1 + + 3 files changed, 2 insertions(+) + +commit aa33cb72ab29c31e87f0cca9a0e72fe3a68247b7 +Author: Behdad Esfahbod +Date: Fri Feb 19 15:12:24 2016 +0700 + + [fuzzing] Make test runner actually work + + test/fuzzing/Makefile.am | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 2735555c6b0c95db7dfc2b391f92a1a5c06084c4 +Author: Behdad Esfahbod +Date: Fri Feb 19 15:12:16 2016 +0700 + + [fuzzing] Add TODO item + + test/fuzzing/hb-fuzzer.cc | 1 + + 1 file changed, 1 insertion(+) + +commit b87e36f6f119fac80b8fd55f3abae563c2c5b798 +Author: Behdad Esfahbod +Date: Fri Feb 19 14:52:31 2016 +0700 + + Avoid buffer->move_to() in case of buffer error + + Fixes https://github.com/behdad/harfbuzz/issues/223 + + Right now we cannot test this because it has to be tested using hb-fuzzer. + We should move all fuzzing tests from test/shaping/tests/fuzzed.tests to + test/fuzzing/ and have its own test runner. At that point, should add + test from this issue as well. + + src/hb-buffer.cc | 2 ++ + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit 7e76bbabbaa56af314abff8ddba8866c634919cd +Author: Behdad Esfahbod +Date: Fri Feb 19 14:43:39 2016 +0700 + + [fuzzing] Make "make hb-fuzzer" build lib dependency + + Not going to do with util/, but is convenient here. + + test/fuzzing/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +commit 568a0c60e8695a6ad8a93ec60d55b137c48890cb +Author: Behdad Esfahbod +Date: Thu Feb 18 19:31:51 2016 +0700 + + Remove pointless overflow check in pointer math + + Fixes https://github.com/behdad/harfbuzz/issues/227 + + src/hb-blob.cc | 1 - + 1 file changed, 1 deletion(-) + +commit aae2847099cbf05bf0668fbe526fc58736837c1b +Author: Behdad Esfahbod +Date: Thu Feb 18 17:06:25 2016 +0700 + + Emoji skin tone modifiers need to be treated as combining marks + + Fixes https://github.com/behdad/harfbuzz/issues/169 + + src/hb-ot-layout-private.hh | 15 ++++++++++++++- + src/hb-unicode-private.hh | 5 +++-- + 2 files changed, 17 insertions(+), 3 deletions(-) + +commit da41e48f0a1a6af6d44ef25185d2421a29bd4166 +Author: Behdad Esfahbod +Date: Tue Feb 16 17:16:33 2016 +0700 + + [USE] Zero mark advances by GDEF early + + This is what Microsoft's implementation does. Marks that need advance + need to add it back using 'dist' or other feature in GPOS. Update tests to + match. + + src/hb-ot-shape-complex-use.cc | 2 +- + test/shaping/fonts/sha1sum/MANIFEST | 1 + + .../sha1sum/f518eb6f6b5eec2946c9fbbbde44e45d46f5e2ac.ttf | Bin 0 -> 1356 bytes + test/shaping/tests/context-matching.tests | 2 +- + test/shaping/tests/use.tests | 2 ++ + 5 files changed, 5 insertions(+), 2 deletions(-) + +commit 86c68c7a2c971efe8e35b1f1bd99401dc8b688d2 +Author: Behdad Esfahbod +Date: Tue Feb 16 16:07:20 2016 +0700 + + [GPOS] Fix interaction of mark attachments and cursive chaining + + Fixes https://github.com/behdad/harfbuzz/issues/211 + + What happens in that bug is that a mark is attached to base first, + then a second mark is cursive-chained to the first mark. This only + "works" because it's in the Indic shaper where mark advances are + not zeroed. + + Before, we didn't allow cursive to run on marks at all. Fix that. + We also where updating mark major offsets at the end of GPOS, such + that changes in advance of base will not change the mark attachment + position. That was superior to the alternative (which is what Uniscribe + does BTW), but made it hard to apply cursive to the mark after it + was positioned. We could track major-direction offset changes and + apply that to cursive in the post process, but that's a much trickier + thing to do than the fix here, which is to immediately apply the + major-direction advance-width offsets... Ie.: + + https://github.com/behdad/harfbuzz/issues/211#issuecomment-183194739 + + If this breaks any fonts, the font should be fixed to do mark attachment + after all the advances are set up first (kerning, etc). + + Finally, this, still doesn't make us match Uniscribe, for I explained + in that bug. Looks like Uniscribe applies minor-direction cursive + adjustment immediate as well. We don't, and we like it our way, at + least for now. Eg. the sequence in the test case does this: + + - The first subscript attaches with mark-to-base, moving in x only, + - The second subscript attaches with cursive attachment to first subscript + moving in x only, + - A final context rule moves the first subscript up by 104 units. + + The way we do, the final shift-up, also shifts up the second subscript + mark because it's cursively-attached. Uniscribe doesn't. We get: + + [ttaorya=0+1307|casubscriptorya=0@-242,104+-231|casubscriptnarroworya=0@20,104+507] + + while Uniscribe gets: + + [ttaorya=0+1307|casubscriptorya=0@-242,104+-211|casubscriptnarroworya=0+487] + + note the different y-offset of the last glyph. In our view, after cursive, + things move together, period. + + src/hb-ot-layout-gpos-table.hh | 31 +++++++++++---------- + .../706c5d7b625f207bc0d874c67237aad6f1e9cd6f.ttf | Bin 0 -> 3868 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/cursive-positioning.tests | 1 + + 4 files changed, 18 insertions(+), 15 deletions(-) + +commit 80c8855cfeffa028d74a25df884d0e5577c95c6c +Author: Behdad Esfahbod +Date: Fri Feb 12 12:50:17 2016 +0700 + + Minor + + src/hb-common.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6ab920224c32e38072a0bec5e84d4b0d58b74167 +Author: Behdad Esfahbod +Date: Thu Feb 11 16:57:52 2016 +0700 + + [GPOS] Minor + + No effect. + + src/hb-ot-layout-gpos-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit cbc3a76c5a38ab24f72e80357377711bd3f54d56 +Author: Behdad Esfahbod +Date: Thu Feb 11 16:48:13 2016 +0700 + + [GPOS] Merge fixing of offsets for cursive and mark attachments + + Part of fixing https://github.com/behdad/harfbuzz/issues/211 + + src/hb-buffer-private.hh | 3 +- + src/hb-ot-layout-gpos-table.hh | 73 ++++++++++++++++++------------------------ + 2 files changed, 33 insertions(+), 43 deletions(-) + +commit 7d8d58ac81fe267e29ea68cdc6f4a4fa8c22d40f +Author: Behdad Esfahbod +Date: Thu Feb 11 16:34:28 2016 +0700 + + [GPOS] Divide position_finish() into two phases, for advances and offsets + + Right now the position_finish_advances() is empty. To be used for + spacing attachments proposal later. + + src/hb-ot-layout-gpos-table.hh | 11 +++++++++-- + src/hb-ot-layout-gsub-table.hh | 6 ------ + src/hb-ot-layout-private.hh | 19 +++++++++---------- + src/hb-ot-layout.cc | 16 ++++++++-------- + src/hb-ot-shape.cc | 7 +++---- + 5 files changed, 29 insertions(+), 30 deletions(-) + +commit 8474231567a08873cc5e0aa08fea60316a04c27e +Author: Behdad Esfahbod +Date: Thu Feb 11 16:27:41 2016 +0700 + + [ot] Minor shuffling code around + + src/hb-ot-layout-gpos-table.hh | 2 -- + src/hb-ot-shape.cc | 13 ++++++++----- + 2 files changed, 8 insertions(+), 7 deletions(-) + +commit b0b11614e9fb9ecd1faae28b0ed71ac6bf5c1266 +Author: Behdad Esfahbod +Date: Thu Feb 11 15:28:55 2016 +0700 + + [GPOS] Add harmless recursion in fix_mark_attachment() + + Will do nothing. Just useful for merging two functions. + + src/hb-ot-layout-gpos-table.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 686567baab5a32ffea843538643e01de2885fa4f +Author: Behdad Esfahbod +Date: Thu Feb 11 15:25:28 2016 +0700 + + [GPOS] Merge attach_chain() and cursive_chain() + + Differentiate, using new attach_type(). + + src/hb-ot-layout-gpos-table.hh | 50 +++++++++++++++++++++++++++--------------- + 1 file changed, 32 insertions(+), 18 deletions(-) + +commit 806ad8dc65931ab7893bff7d5592a67a9bd237ca +Author: Behdad Esfahbod +Date: Thu Feb 11 14:53:11 2016 +0700 + + [GPOS] Minor shuffling + + src/hb-ot-layout-gpos-table.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 0f6278d1fbb75856132f1fa2d29648979f033316 +Author: Behdad Esfahbod +Date: Thu Feb 11 14:49:10 2016 +0700 + + [GPOS] Negate sign of attach_lookback(), and rename it to attach_chain() + + No behavior change. Preparing to unify how cursive and mark attachments + work. + + src/hb-ot-layout-gpos-table.hh | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +commit 5b5dc2c0406d8180e72d97a54334c722fda325b1 +Author: Behdad Esfahbod +Date: Thu Feb 11 12:15:38 2016 +0700 + + [tests] Add test for advance zeroing of an ASCII letter marked as mark in GDEF + + test/shaping/fonts/sha1sum/MANIFEST | 1 + + .../sha1sum/a98e908e2ed21b22228ea59ebcc0f05034c86f2e.ttf | Bin 0 -> 1016 bytes + test/shaping/tests/zero-width-marks.tests | 1 + + 3 files changed, 2 insertions(+) + +commit 660c9d3fc21172e8dc340b017122c084dac6334c +Author: Behdad Esfahbod +Date: Thu Feb 11 12:14:27 2016 +0700 + + Remove font-dependent ASCII-only perf hack + + Is confusing. I already hit it myself. Remove. We can optimize + ASCII based on Unicode properties. But should not do based on + assumptions on the font. + + src/hb-ot-shape.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit 3fe0cf10401875f1e9b8b5fbaf59826e64ea61d2 +Author: Behdad Esfahbod +Date: Wed Feb 10 18:43:43 2016 +0700 + + Fix previous commit! + + test/shaping/fonts/sha1sum/MANIFEST | 6 +++--- + test/shaping/tests/zero-width-marks.tests | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 293a210eee0a53b59f4b33298f42ec6e59d785e0 +Author: Behdad Esfahbod +Date: Wed Feb 10 18:39:59 2016 +0700 + + [tests] Fix fonts in cc4a78bf22c4a735b84c89b04be3bb531f42135e + + They had an invalid LookupFlag (32). + + .../sha1sum/0dd3a51c3ea50997cb1f72515d1060408f8b4b59.ttf | Bin 1412 -> 0 bytes + .../sha1sum/56cfd0e18d07f41c38e9598545a6d369127fc6f9.ttf | Bin 0 -> 1412 bytes + .../sha1sum/828114d00931885bc25abf7cdb878b2914a2e743.ttf | Bin 1448 -> 0 bytes + .../sha1sum/894e96a367f00c196d82e6243673a1d4414f4f6a.ttf | Bin 1448 -> 0 bytes + .../sha1sum/cc5f3d2d717fb6bd4dfae1c16d48a2cb8e12233b.ttf | Bin 0 -> 1448 bytes + .../sha1sum/ffa0f5d2d9025486d8469d8b1fdd983e7632499b.ttf | Bin 0 -> 1448 bytes + 6 files changed, 0 insertions(+), 0 deletions(-) + +commit eaadcbbc53e02838c847e53ef214a55d6915d677 +Author: Behdad Esfahbod +Date: Wed Feb 10 18:29:54 2016 +0700 + + Remove now-unused mark zeroing BY_UNICODE + + src/hb-ot-shape-complex-private.hh | 2 -- + src/hb-ot-shape.cc | 29 ----------------------------- + 2 files changed, 31 deletions(-) + +commit cc4a78bf22c4a735b84c89b04be3bb531f42135e +Author: Behdad Esfahbod +Date: Wed Feb 10 18:24:08 2016 +0700 + + [tests] Add tests for Latin mark zeroing + + .../sha1sum/0dd3a51c3ea50997cb1f72515d1060408f8b4b59.ttf | Bin 0 -> 1412 bytes + .../sha1sum/828114d00931885bc25abf7cdb878b2914a2e743.ttf | Bin 0 -> 1448 bytes + .../sha1sum/894e96a367f00c196d82e6243673a1d4414f4f6a.ttf | Bin 0 -> 1448 bytes + test/shaping/fonts/sha1sum/MANIFEST | 4 ++++ + .../sha1sum/fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf | Bin 0 -> 1344 bytes + test/shaping/tests/zero-width-marks.tests | 4 ++++ + 6 files changed, 8 insertions(+) + +commit 55ff34b9c157a839d026465af8f30424ce7f891b +Author: Behdad Esfahbod +Date: Wed Feb 10 18:20:02 2016 +0700 + + [tests] Add tests for Thai mark zeroing + + .../sha1sum/45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf | Bin 0 -> 1088 bytes + .../sha1sum/7a37dc4d5bf018456aea291cee06daf004c0221c.ttf | Bin 0 -> 1080 bytes + .../sha1sum/8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf | Bin 0 -> 1024 bytes + test/shaping/fonts/sha1sum/MANIFEST | 4 ++++ + .../sha1sum/bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf | Bin 0 -> 976 bytes + test/shaping/tests/zero-width-marks.tests | 4 ++++ + 6 files changed, 8 insertions(+) + +commit b3582a8ee82942a931130a83b2867b239f8ca71a +Author: Behdad Esfahbod +Date: Wed Feb 10 18:10:15 2016 +0700 + + Change default mark advance zeroing behavior from Unicode to GDEF + + See thread at: + https://lists.freedesktop.org/archives/harfbuzz/2016-February/005462.html + + src/hb-ot-shape-complex-default.cc | 2 +- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape-complex-tibetan.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 43bb2b8fb00705c3334730a58ade7984181018b2 +Author: Behdad Esfahbod +Date: Wed Feb 10 14:11:43 2016 +0700 + + Minor + + test/shaping/hb_test_tools.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bdaa784bb610ec65626d63cc068a0958ff5005fc +Merge: a168db47 f6ffba63 +Author: Behdad Esfahbod +Date: Wed Feb 10 11:11:36 2016 +0700 + + Merge pull request #164 from fanc999/msvc.build + + Enable Build of HarfBuzz under Visual Studio using NMake Makefiles + +commit a168db4739148459bc33c7dae88e73efa0153d72 +Author: Behdad Esfahbod +Date: Wed Feb 10 11:10:08 2016 +0700 + + [README] Add ABI Tracker link + + README | 1 + + 1 file changed, 1 insertion(+) + +commit f6ffba634bb33d6d4b051abce9c23fcae280c3fe +Author: Chun-wei Fan +Date: Wed Dec 9 14:57:15 2015 +0800 + + MSVC builds: Add support to build DirectWrite shaping backend + + Add into the NMake Makefiles to build the DirectWrite shaping backend, + but as PR #134 mentions, this is considered to be in an experimental state, + so don't include this in the build by default for now. This is most probably + going to replace the Uniscribe backend eventually, since DirectWrite is meant + to be Uniscribe's replacement, and is needed for Windows Store apps if a + system shaping API is to be used. + + win32/README.txt | 4 ++++ + win32/config-msvc.mak | 10 ++++++++++ + win32/config.h.win32.in | 3 +++ + win32/info-msvc.mak | 7 +++++++ + 4 files changed, 24 insertions(+) + +commit c6792854557ca104948e8f0b142c9384105b0d05 +Author: Chun-wei Fan +Date: Wed Feb 3 18:31:23 2016 +0800 + + build: Build the DirectWrite sources if requested + + This adds to the autotools build system so that the (experimental) + DirectWrite support for HarfBuzz is built (and dist'ed). + + configure.ac | 25 +++++++++++++++++++++++++ + src/Makefile.am | 7 +++++++ + src/Makefile.sources | 3 +++ + 3 files changed, 35 insertions(+) + +commit d7b6636e5ebf1ddf7d7a04007ffbc411cf7e462e +Author: Chun-wei Fan +Date: Tue Nov 3 19:00:42 2015 +0800 + + build: Support Visual Studio builds using NMake + + This adds a set of NMake Makefiles that can be used to build HarfBuzz, from + the standard basic build building the minimal HarfBuzz DLL (consisting + of OpenType, fallback and Uniscribe support only), to a full fledged build + consisting of GLib and FreeType support, as well as building the utilities, + the test programs in src/ and test/api, and HarfBuzz-ICU and + HarfBuzz-GObject, and up to building the introspection files. This means a + flexible build mechanism is supported here, so anything that is supported + for a Windows build (code-wise), should all be supported by this build + system. + + As in an earlier commit, the source listings are shared with the autotools + builds with the various Makefile.sources in src/, src/hb-ucdn and util/, and + this set of NMake Makefiles will transform these lists into the form they + want. + + In the current form, all the test programs in test/api pass, and this has + been checked successfully with 'make -j8 distcheck'. + + BUILD.md | 4 +- + Makefile.am | 2 +- + configure.ac | 2 + + win32/Makefile.am | 14 +++ + win32/Makefile.vc | 52 +++++++++++ + win32/README.txt | 75 ++++++++++++++++ + win32/build-rules-msvc.mak | 140 ++++++++++++++++++++++++++++++ + win32/config-msvc.mak | 188 ++++++++++++++++++++++++++++++++++++++++ + win32/create-lists-msvc.mak | 151 ++++++++++++++++++++++++++++++++ + win32/create-lists.bat | 42 +++++++++ + win32/detectenv-msvc.mak | 136 +++++++++++++++++++++++++++++ + win32/generate-msvc.mak | 26 ++++++ + win32/hb-introspection-msvc.mak | 42 +++++++++ + win32/info-msvc.mak | 130 +++++++++++++++++++++++++++ + win32/install.mak | 29 +++++++ + win32/introspection-msvc.mak | 73 ++++++++++++++++ + 16 files changed, 1104 insertions(+), 2 deletions(-) + +commit 5c3e7260bcb4999b8b7cb9afb26e6eaff867634b +Author: Chun-wei Fan +Date: Tue Nov 3 18:52:46 2015 +0800 + + MSVC builds: Add a pre-configured config.h(.win32) template + + This adds a pre-configured config.h template that can be used for Visual + Studio builds, where autotools is not normally available. This has the + configs that are suitable for Visual Studio builds, as well as all the + features used for Windows builds enabled (HAVE_OT, HAVE_FALLBACK and + HAVE_UNISCRIBE). + + Note that the optional features are not enabled here, they are enabled by + /D's (or -D's) in the NMake Makefiles as requested. + + win32/config.h.win32.in | 155 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 155 insertions(+) + +commit 35ded3af74a5bc4b038a07308354d5f7501ae3c7 +Author: Chun-wei Fan +Date: Tue Nov 3 16:56:27 2015 +0800 + + build: Move source listings into separate Makefile snippets + + This moves all the source listings in src/Makefile.am, + src/hb-ucdn/Makefile.am and util/Makefile.am into separate Makefile + snippets, so that they may be shared between different Makefile-based + build systems, such as NMake for Visual Studio. + + src/Makefile.am | 165 +++++++++---------------------------------- + src/Makefile.sources | 147 ++++++++++++++++++++++++++++++++++++++ + src/hb-ucdn/Makefile.am | 6 +- + src/hb-ucdn/Makefile.sources | 4 ++ + util/Makefile.am | 34 ++------- + util/Makefile.sources | 32 +++++++++ + 6 files changed, 223 insertions(+), 165 deletions(-) + +commit b894a85ad1e7c3ecfb6d3732a7c9779f5462fe70 +Author: Behdad Esfahbod +Date: Tue Feb 2 16:39:19 2016 +0800 + + Fix more hangs in case of buffer allocation errors + + Hopefully + fixes https://github.com/behdad/harfbuzz/issues/214 + + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape-complex-use.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit b693992ea160b66541f678dc9be29b513c77a30b +Merge: 9a6a33cc 498574e6 +Author: Behdad Esfahbod +Date: Tue Feb 2 12:33:32 2016 +0800 + + Merge pull request #222 from n8willis/master + + Add usermanual chapter on cluster levels + +commit 498574e6c1a83bbd2768925af6e39806fe1ea8bb +Author: n8willis +Date: Thu Jan 28 12:21:32 2016 -0600 + + Update Makefile.am + + docs/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit e12fc666994573dbabb6928a8b2e8698667088ce +Author: n8willis +Date: Thu Jan 28 12:14:12 2016 -0600 + + Added initial usermanual chapter on cluster levels. + + docs/harfbuzz-docs.xml | 1 + + docs/usermanual-clusters.xml | 304 +++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 305 insertions(+) + +commit 9a6a33ccbea8a2e23e779bd955958fa41974c1c7 +Merge: d05b7833 146fe252 +Author: Behdad Esfahbod +Date: Mon Jan 18 12:47:18 2016 +0100 + + Merge pull request #216 from mhosken/master + + Refactor graphite2 to make ovleraps into negative width spaces + +commit 146fe252c3ebd0253344ce20981554e40926497b +Author: Martin Hosken +Date: Sat Jan 16 17:24:00 2016 -0600 + + Refactor graphite2 to make ovleraps into negative width spaces + + src/hb-graphite2.cc | 71 ++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 43 insertions(+), 28 deletions(-) + +commit d05b783322d90208b2ddf06a5ebffc7c301be3d7 +Author: Behdad Esfahbod +Date: Tue Jan 12 16:17:21 2016 +0000 + + Fix compiler warning + + Fixes https://github.com/behdad/harfbuzz/issues/212 + + src/hb-ot-tag.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d163dc18e66c9e2f404d09310482464245cae704 +Author: Behdad Esfahbod +Date: Tue Jan 12 13:05:01 2016 +0000 + + Minor + + src/hb-ot-layout-common-private.hh | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +commit 505b7d4732c6a8c423f43c0de46e05dc583e82c0 +Author: Behdad Esfahbod +Date: Mon Jan 11 18:31:04 2016 +0000 + + [fuzzing] Fuzz input text + + Very rudimentary right now, but will get kcc's bot going. + + From + https://github.com/behdad/harfbuzz/issues/139#issuecomment-163580783 + + test/fuzzing/hb-fuzzer.cc | 25 +++++++++++++++++++------ + 1 file changed, 19 insertions(+), 6 deletions(-) + +commit 3e704521f67e021fb51cda7319925fd39eba4f97 +Author: Behdad Esfahbod +Date: Mon Jan 11 17:38:41 2016 +0000 + + [OT] Get list of lookup subtables once and loop through them + + This speeds up shaping the Amiri font by over 15%. + + This was primarily needed for my work on OpenType GX, since + we will be collecting only sublookups that are "active" for + current font instance; but it's a nice boost in general as + well. + + We might, in the future, collect subtables in the lookup_accel. + That would also allow us to do a per-subtbale set-digest, which + should speed things up some more, specially for ContextChainFormat3 + lookups... Amiri, for example, contains one lookup with 53 + subtables! + + src/hb-ot-layout.cc | 120 +++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 81 insertions(+), 39 deletions(-) + +commit 11441291bbf4326dca9b14ec3e9cad3d4d229303 +Author: Behdad Esfahbod +Date: Mon Jan 11 13:16:35 2016 +0000 + + 1.1.3 + + NEWS | 29 +++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 30 insertions(+), 1 deletion(-) + +commit 97624d9244de0fdb9c03f60e03fe242028efa8a1 +Author: Behdad Esfahbod +Date: Mon Jan 11 12:58:45 2016 +0000 + + [docs] Minor fixes. + + src/hb-buffer.h | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit a39ff95fce39226e80850ff251cb34a7aad12bd7 +Author: Behdad Esfahbod +Date: Mon Jan 11 12:28:37 2016 +0000 + + [coretext] Speed up CoreText font fallback + + Fixes https://code.google.com/p/chromium/issues/detail?id=547912 + + src/hb-coretext.cc | 45 ++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 40 insertions(+), 5 deletions(-) + +commit 5afebbdcb2dab0e9a42d580df629d8e60b50d2f9 +Author: Behdad Esfahbod +Date: Thu Jan 7 22:53:59 2016 +0000 + + Add Homebrew build instructions + + BUILD.md | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit e8a27d79476a5d7a83cf2287d92ca291257546f4 +Author: Behdad Esfahbod +Date: Thu Jan 7 22:52:16 2016 +0000 + + Don't build hb-fuzzer in "make", only "make check" + + test/fuzzing/Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 25671466d245449187f8ab17e1a233f1d087d5ed +Author: Behdad Esfahbod +Date: Thu Jan 7 19:11:41 2016 +0000 + + Add 9 reserved entries to hb_font_extents_t + + Might add italic-angle, underline/strikethrough-position/thickness + in the future. Do this before new struct goes into a release. + + src/hb-font.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit e6d5e4c3106180cb22253c2c278b40f7c4c98f2f +Author: Behdad Esfahbod +Date: Wed Jan 6 12:29:50 2016 +0000 + + [uniscribe] Fix negative advance + + This happens with at least one test font I have. + + src/hb-uniscribe.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 99d34955762d0fff4b66a30e6fbe65fd1cf9976b +Author: Behdad Esfahbod +Date: Wed Jan 6 12:20:47 2016 +0000 + + [test] Add test text for Kaithi + + test/shaping/texts/in-tree/shaper-hangul/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-hebrew/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-tibetan/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-use/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-use/script-kaithi/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-use/script-kaithi/misc.txt | 6 ++++++ + 6 files changed, 11 insertions(+) + +commit 53c47c85827a7e3ca82000e3baa9aa87c5770ce9 +Author: Behdad Esfahbod +Date: Tue Jan 5 13:26:20 2016 +0000 + + Increase sanitize edit count from 8 to 32 + + See previous commit. + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit da2fcfdc51a2cc0d0a782efa6c91b733f7aa84ba +Author: Behdad Esfahbod +Date: Tue Jan 5 13:23:45 2016 +0000 + + Don't count fixing-up FeatureParams offset as error + + The font Garamond Premier Pro Caption (and possibly many other + Adobe fonts), have many FeatureParamsSize tables with the old + wrong offset. We handle fixing those up, but they were still + contributing to edit_count, and when I reduced HB_SANITIZE_MAX_EDIT + from 100 to 8 in 14c2de321826c36037adde859ccca3e2011325a9, these + fonts were now getting GPOS dropped and hence kerning disabled. + + Fix, by not counting edits made towareds offset fix-up. I'll + also increase edit count again, in the next commit. + + src/hb-ot-layout-common-private.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit d0adc80965506810820f9ec165b8df80cc8907e3 +Author: Behdad Esfahbod +Date: Sat Jan 2 13:25:18 2016 +0000 + + Check magicNumber in head table during sanitize + + src/hb-ot-head-table.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 3a48c776701a919e11b067129586e40372d90d54 +Merge: 9230911f 4b4948d3 +Author: Behdad Esfahbod +Date: Sat Jan 2 00:59:14 2016 +0000 + + Merge pull request #208 from khaledhosny/travis-trusty + + [travis] Try building on Trusty + +commit 4b4948d360a2141e0ffda2994aa308645dc32f59 +Author: Khaled Hosny +Date: Sat Jan 2 00:36:19 2016 +0400 + + [travis] Try building on Trusty + + Trusty has gtk-doc 1.20 which has better markdown support which should + fix some of the brokenness in the newly added documentation. The build + seems to be as fast as the current container-based build on Precise. + + .travis.yml | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 9230911facf90c06626e54023ca4d99f5e05f1a4 +Author: Behdad Esfahbod +Date: Fri Jan 1 19:06:43 2016 +0000 + + [travis] Only run coveralls if testing behdad/harfbuzz + + Fixes failures in others' forks, like: + https://travis-ci.org/khaledhosny/harfbuzz/jobs/99719710#L3912 + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6f66f05757d3d5738571b3d4ee40afffb8f26ff9 +Merge: bfdf684f 9ab9f974 +Author: Behdad Esfahbod +Date: Fri Jan 1 16:44:01 2016 +0000 + + Merge pull request #207 from khaledhosny/docs-4 + + [docs] More buffers documentation + +commit 9ab9f974d42e0001966e243a23a64e6aefbd4764 +Author: Khaled Hosny +Date: Fri Jan 1 20:38:21 2016 +0400 + + [docs] More buffers documentation + + docs/harfbuzz-sections.txt | 4 +- + src/hb-buffer-serialize.cc | 85 ++++++++++++++++++++++++++++++------------- + src/hb-buffer.cc | 91 +++++++++++++++++++++++++++++++++++----------- + src/hb-buffer.h | 78 +++++++++++++++++++++++++-------------- + src/hb-shape.cc | 10 +++-- + 5 files changed, 187 insertions(+), 81 deletions(-) + +commit bfdf684f7957645dd016fbf76700c5911c4bee2d +Merge: d7ed6f50 85c2443b +Author: Behdad Esfahbod +Date: Wed Dec 30 22:20:14 2015 +0100 + + Merge pull request #205 from khaledhosny/more-docs + + More docs + +commit d7ed6f50b4ff13a94701131913d931f13a4d1266 +Merge: b758e5ea a7f0e25d +Author: Behdad Esfahbod +Date: Wed Dec 30 22:20:00 2015 +0100 + + Merge pull request #206 from nico/patch-3 + + Remove unused HB_SHAPER_DATA_ENSURE_DECLARE lines. + +commit a7f0e25dafa90bd21b01c38cb0782ade54b75cdc +Author: Nico Weber +Date: Wed Dec 30 16:05:52 2015 -0500 + + Remove unused HB_SHAPER_DATA_ENSURE_DECLARE lines. + + The coretext_aat shaper delegates to the regular coretext_..._ensure() functions, so coretext_aat_..._ensure() functions defined by these macros are unused. The compiler warns about them, which in turn can confuse people to think that the coretext_aat_..._ensure() functions weren't called by accident. + + src/hb-coretext.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit 85c2443b737335b77c7e9bb6fd6741912f70fcef +Author: Khaled Hosny +Date: Wed Dec 30 22:57:04 2015 +0400 + + [docs] Reduce gtkdoc-check errors + + Now it is just reporting one error about “503 undocumented or incomplete + symbols”, that will be the easy part I guess. + + docs/harfbuzz-docs.xml | 74 ++++++++++++++++++++++++++++++++++++++++++++++ + docs/harfbuzz-sections.txt | 40 +++++++++++++++++++++++++ + 2 files changed, 114 insertions(+) + +commit 9cffe329f15b3a74a3af4e68c1884f1dbda49666 +Author: Khaled Hosny +Date: Wed Dec 30 22:50:08 2015 +0400 + + [docs] Typo + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b758e5ea223eced0fde9a3e62d0fdf04c04914a1 +Merge: 266bfa37 8b1224f0 +Author: Behdad Esfahbod +Date: Wed Dec 30 16:44:19 2015 +0100 + + Merge pull request #203 from nico/patch-1 + + Remove unused `retry:` label. + +commit 266bfa3772e75fedcd93db22bf8672a13ad7a7d9 +Author: Behdad Esfahbod +Date: Wed Dec 30 16:25:48 2015 +0100 + + [docs] Minor + + .ci/deploy-docs.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d08035f8f15b7ddd89a318ea34bc386a9e33a8ea +Author: Behdad Esfahbod +Date: Wed Dec 30 16:15:36 2015 +0100 + + [docs] Fix up build, really + + .ci/deploy-docs.sh | 9 ++++----- + .travis.yml | 2 +- + 2 files changed, 5 insertions(+), 6 deletions(-) + +commit 0d45c3cf63692151166ca7071f755dfaa8922a67 +Author: Behdad Esfahbod +Date: Wed Dec 30 16:09:39 2015 +0100 + + [docs] Turn bash tracing on + + .ci/deploy-docs.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 33b2d981a0b12ea165ef9282204a73f4a1ce0477 +Author: Behdad Esfahbod +Date: Wed Dec 30 15:56:56 2015 +0100 + + [docs] Another try, not sure why the bot isn't building + + .ci/deploy-docs.sh | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) + +commit f3a051149b3b565b5ad4e489bf730c5203c3549e +Author: Behdad Esfahbod +Date: Wed Dec 30 15:45:43 2015 +0100 + + [docs] Shuffling code around in deploy-docs.sh + + Temporarily makes it rebuild docs on every change again. + + .ci/deploy-docs.sh | 46 +++++++++++++++++++++++++++------------------- + 1 file changed, 27 insertions(+), 19 deletions(-) + +commit 8f31d0a94b27bb658aabe600472fc10bc47885f6 +Merge: 9d280cf4 fb192c26 +Author: Behdad Esfahbod +Date: Wed Dec 30 15:13:37 2015 +0100 + + Merge pull request #202 from khaledhosny/doc-fixes + + Doc fixes + +commit fb192c263e17081c87f4cc971274d9be42f19513 +Author: Khaled Hosny +Date: Wed Dec 30 15:05:50 2015 +0400 + + [docs] A bit more buffers documentation + + docs/harfbuzz-sections.txt | 2 ++ + src/hb-buffer.cc | 7 +++--- + src/hb-buffer.h | 56 ++++++++++++++++++++++++++++++++++++++++++++-- + 3 files changed, 60 insertions(+), 5 deletions(-) + +commit 8ab797c5b86c33eab6ee024471fd3c147325d26a +Author: Khaled Hosny +Date: Tue Dec 29 17:42:16 2015 +0400 + + [docs] A bit more buffers documentation + + docs/harfbuzz-sections.txt | 60 +++++++++++++++--------------- + src/hb-buffer.cc | 93 +++++++++++++++++++++++++++++++--------------- + src/hb-buffer.h | 7 +++- + src/hb-common.cc | 43 +++++++++++++-------- + src/hb-common.h | 15 +++++--- + 5 files changed, 135 insertions(+), 83 deletions(-) + +commit f18d2226b62f20d29e6299c01ae8467c725ea971 +Author: Khaled Hosny +Date: Tue Dec 29 15:21:20 2015 +0400 + + [docs] Some documentation on buffers + + Some of it (create, reference, destroy) are adapted from Cairo docs. + + docs/harfbuzz-sections.txt | 55 +++++++------- + src/hb-buffer.cc | 174 +++++++++++++++++++++++++++------------------ + 2 files changed, 132 insertions(+), 97 deletions(-) + +commit d7bf9d05c519a369a7b3a02e9ed5ecc05a20cd3e +Author: Khaled Hosny +Date: Tue Dec 29 02:23:24 2015 +0400 + + [docs] Fix comment syntax + + To lower the number of gtk-doc warnings. + + .travis.yml | 2 +- + src/hb-directwrite.cc | 4 ++-- + src/hb-ot-layout.cc | 14 ++++++++++++++ + src/hb-unicode.h | 16 ++++++++++++++++ + 4 files changed, 33 insertions(+), 3 deletions(-) + +commit 8b1224f0eece7a5b6846e206333e57ac4653a705 +Author: Nico Weber +Date: Mon Dec 28 21:31:28 2015 -0500 + + Remove unused `retry:` label. + + Fixes a -Wunused-label warning when building harfbuzz with clang -Wall. + + src/hb-coretext.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 1f5559293f9bb1b4e911f4bdecf276ff1f6ae01c +Author: Khaled Hosny +Date: Tue Dec 29 02:15:21 2015 +0400 + + [docs] Ignore the new HB_EXTERN decoration + + Otherwise, almost all API functions are not extracted. + + docs/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 9d280cf49f25181f64c978752f926b79e7c3746a +Author: Khaled Hosny +Date: Sat Dec 26 06:45:51 2015 +0400 + + Fix previous commit + + .ci/deploy-docs.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b789199f107912cfce5e4a95d6152f9a1a7993f2 +Author: Khaled Hosny +Date: Sat Dec 26 06:35:08 2015 +0400 + + [travis] Build docs only on tagged revisions + + Lets see if it works… + + .ci/deploy-docs.sh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit e5b90c08a4c1f475560209a5e47628f695606d89 +Author: Behdad Esfahbod +Date: Fri Dec 25 18:41:41 2015 +0100 + + [travis] Remove secure var + + I've set up a secure var for behdad/harfbuzz through Travis web interface, no need + to set the var here. + + .ci/deploy-docs.sh | 2 +- + .travis.yml | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +commit e75c1ffdf548185ce1f1df7937f0d028e5e40efe +Merge: 6173c2a6 d25317f6 +Author: Behdad Esfahbod +Date: Fri Dec 25 18:21:08 2015 +0100 + + Merge pull request #199 from behdad/travis-docs + + Deploy docs to gh-pages branch from Travis builds + +commit 6173c2a6fc6ea0bf812f7f398770b5342974f9bf +Author: Behdad Esfahbod +Date: Fri Dec 25 18:18:23 2015 +0100 + + Fix flaky test + + This test font had a upem of 769, which results in rounding-related errors with + the FreeType font funcs. Change the upem to 1024 to fix that. + + Fixes https://github.com/behdad/harfbuzz/issues/201 + + ...> 1c2fb74c1b2aa173262734c1f616148f1648cfd6.ttf} | Bin 4064 -> 4064 bytes + test/shaping/fonts/sha1sum/MANIFEST | 2 +- + test/shaping/tests/ligature-id.tests | 70 ++++++++++----------- + 3 files changed, 36 insertions(+), 36 deletions(-) + +commit 3fcae6d82da389c9944386a8ab41eb1c13b99330 +Author: Behdad Esfahbod +Date: Fri Dec 25 18:18:02 2015 +0100 + + [tests] Add --reference, for re-recording tests + + test/shaping/run-tests.sh | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +commit d25317f67f3c5c77f9059961935b0f35cbaa9ac4 +Author: Khaled Hosny +Date: Wed Dec 23 01:29:48 2015 +0400 + + Move more docs from FreeDesktop page + + docs/Makefile.am | 1 + + docs/harfbuzz-docs.xml | 15 ++++---- + docs/usermanual-install-harfbuzz.xml | 70 ++++++++++++++++++++++++++++++++++++ + 3 files changed, 80 insertions(+), 6 deletions(-) + +commit 493a92220844c8996be67c8a7a2c5447942fe2c1 +Author: Khaled Hosny +Date: Wed Dec 23 00:33:41 2015 +0400 + + Rename user manual files + + Use chapter ids instead of numbers, so that we can reorder them, + introduce new ones etc. without the numbers becoming out of date. + + docs/Makefile.am | 12 ++++++------ + docs/harfbuzz-docs.xml | 12 ++++++------ + ... => usermanual-buffers-language-script-and-direction.xml} | 0 + docs/{usermanual-ch04.xml => usermanual-fonts-and-faces.xml} | 0 + ...{usermanual-ch06.xml => usermanual-glyph-information.xml} | 0 + docs/{usermanual-ch02.xml => usermanual-hello-harfbuzz.xml} | 0 + ...{usermanual-ch05.xml => usermanual-opentype-features.xml} | 0 + .../{usermanual-ch01.xml => usermanual-what-is-harfbuzz.xml} | 0 + 8 files changed, 12 insertions(+), 12 deletions(-) + +commit 4dc2265918089ee08c6d82eed0cfd41e02d7d231 +Author: Khaled Hosny +Date: Wed Dec 23 00:26:20 2015 +0400 + + Intro from freedesktop.org/wiki/Software/HarfBuzz/ + + docs/HarfBuzz.png | Bin 0 -> 3419 bytes + docs/Makefile.am | 3 ++- + docs/harfbuzz-docs.xml | 31 ++++++++++++++++++++++++++++++- + 3 files changed, 32 insertions(+), 2 deletions(-) + +commit 22b07782ced6503a0bf33f2fe157b70540238f6d +Author: Khaled Hosny +Date: Mon Dec 14 23:33:51 2015 +0400 + + Deploy docs to gh-pages branch from Travis builds + + Build docs in Travis and push them to the gh-pages branch, which makes + them available at http://behdad.github.io/harfbuzz/ + + .ci/deploy-docs.sh | 25 +++++++++++++++++++++++++ + .travis.yml | 4 ++++ + 2 files changed, 29 insertions(+) + +commit fc38e6034c76d5450f5398d667184bc3696efcc4 +Author: Behdad Esfahbod +Date: Wed Dec 23 14:50:53 2015 +0100 + + [layout] Collect coverage glyphs in PairPos + + Apparently class=0 is used for ClassDef1. See: + https://github.com/adobe-type-tools/afdko/issues/90 + + src/hb-ot-layout-gpos-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8718dae818b22c3933c33bdfc8a7413ef4c3110a +Author: Behdad Esfahbod +Date: Fri Dec 18 19:53:40 2015 +0000 + + [python] Hook up sample debugger + + src/sample.py | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 0475ef2f97e3035a2eea9a0f96031331e07e8e29 +Author: Behdad Esfahbod +Date: Fri Dec 18 18:17:07 2015 +0000 + + [buffer] Add debugging, aka, message, API + + Currently just announces lookup applications. Message-API *will* change. + hb-shape / hb-view are updated to print-out messages to stder if --debug + is specified. + + src/hb-buffer-private.hh | 18 ++++++++++++++++++ + src/hb-buffer.cc | 44 ++++++++++++++++++++++++++++++++++++++++++++ + src/hb-buffer.h | 15 +++++++++++++++ + src/hb-ot-layout.cc | 12 ++---------- + util/main-font-text.hh | 18 ++++++++++++++++++ + 5 files changed, 97 insertions(+), 10 deletions(-) + +commit 9ea0aa43ac5cf243b698aae0ec80241b5efd7488 +Author: Behdad Esfahbod +Date: Fri Dec 18 17:30:18 2015 +0000 + + Don't deserialize positions if buffer has no positions + + src/hb-buffer-serialize.cc | 3 +++ + src/hb-ot-layout.cc | 2 -- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 862b1644e9469a7e70555141f53729409d50d0d2 +Author: Behdad Esfahbod +Date: Fri Dec 18 13:54:06 2015 +0000 + + [use] Only set syllable-based topographical features if not Arabic-joining + + src/hb-ot-shape-complex-use.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 45b7ec365225109eb0854e6c417f48860b5f24af +Author: Behdad Esfahbod +Date: Fri Dec 18 13:47:16 2015 +0000 + + [indic] Followup fix for Malayalam context matching + + We regeressed Malayalam in 508cc3d3cfcfb0383df0fe795cc28db4e0fd5729 + This brings down the failures to 198 (from 750). + + BENGALI: 353725 out of 354188 tests passed. 463 failed (0.130722%) + DEVANAGARI: 707307 out of 707394 tests passed. 87 failed (0.0122987%) + GUJARATI: 366349 out of 366457 tests passed. 108 failed (0.0294714%) + GURMUKHI: 60732 out of 60747 tests passed. 15 failed (0.0246926%) + KANNADA: 951190 out of 951913 tests passed. 723 failed (0.0759523%) + KHMER: 299070 out of 299124 tests passed. 54 failed (0.0180527%) + MALAYALAM: 1048136 out of 1048334 tests passed. 198 failed (0.0188871%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271662 out of 271847 tests passed. 185 failed (0.068053%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + MYANMAR: 1123865 out of 1123883 tests passed. 18 failed (0.00160159%) + + src/hb-ot-shape-complex-indic.cc | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +commit 2813e3049a69d64e5395f68c52c4690e1d256d55 +Author: Behdad Esfahbod +Date: Fri Dec 18 11:05:11 2015 +0000 + + [indic] Update data tables to Unicode 8.0 + + Test stats remain unchanged, except for Malayalam, which we investigate: + + BENGALI: 353725 out of 354188 tests passed. 463 failed (0.130722%) + DEVANAGARI: 707307 out of 707394 tests passed. 87 failed (0.0122987%) + GUJARATI: 366349 out of 366457 tests passed. 108 failed (0.0294714%) + GURMUKHI: 60732 out of 60747 tests passed. 15 failed (0.0246926%) + KANNADA: 951190 out of 951913 tests passed. 723 failed (0.0759523%) + KHMER: 299070 out of 299124 tests passed. 54 failed (0.0180527%) + MALAYALAM: 1047584 out of 1048334 tests passed. 750 failed (0.0715421%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271662 out of 271847 tests passed. 185 failed (0.068053%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + + Myanmar, compared to Windows 10 mmrtext.ttf: + + MYANMAR: 1123865 out of 1123883 tests passed. 18 failed (0.00160159%) + + src/gen-indic-table.py | 1 + + src/hb-ot-shape-complex-indic-private.hh | 40 ++-- + src/hb-ot-shape-complex-indic-table.cc | 372 ++++++++++++++++++------------- + src/hb-ot-shape-complex-indic.cc | 23 +- + src/hb-ot-shape-complex-myanmar.cc | 4 + + 5 files changed, 244 insertions(+), 196 deletions(-) + +commit fc06cff40f136440f6402d0a5e735e2a4a3c062a +Author: Behdad Esfahbod +Date: Thu Dec 17 17:47:35 2015 +0000 + + Remove HB_OT_SHAPE_ZERO_WIDTH_MARKS_DEFAULT + + The DEFAULT naming wasn't helpful, so just remove it. + + src/hb-ot-shape-complex-default.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 4 +--- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape-complex-tibetan.cc | 2 +- + 4 files changed, 4 insertions(+), 6 deletions(-) + +commit 508cc3d3cfcfb0383df0fe795cc28db4e0fd5729 +Author: Behdad Esfahbod +Date: Thu Dec 17 17:31:17 2015 +0000 + + [indic] Allow context when matching for Malayalam new-spec + + Test sequence: + U+0995,U+09CD,U+09B0 + + With Nirmala shipped on Windows 10, this failed to form the below form. + Works now. + + Reported by Sairus. + + src/hb-ot-shape-complex-indic.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit eaf1e93ef1ee19a3e72d781e8abbd7f1165c1618 +Author: Behdad Esfahbod +Date: Thu Dec 17 16:57:47 2015 +0000 + + [uniscribe] Handle E_NOT_SUFFICIENT_BUFFER as well as E_OUTOFMEMORY + + On Windows 10 we are seeing that other error message... + + Test sequence: U+0995,U+-9CD,U+09B0 + With Nirmala shipped on Windows 10, this failed to form the below form. + Works now. + + Reported by Sairus. + + src/hb-uniscribe.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 21e5d7edc4f28157254ef29a8ac247f3a572f6a6 +Author: Behdad Esfahbod +Date: Thu Dec 17 16:28:38 2015 +0000 + + [util] Use O_BINARY instead of _O_BINARY + + The latter doesn't seem to be available in Cygwin. I'm surprised it + compiled before... + + util/options.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 100fbeaf196515774c985ee839d0fa0695f9a6fa +Author: Behdad Esfahbod +Date: Thu Dec 17 15:23:09 2015 +0000 + + Fix ligature component of a mark happening after a ligature within a ligature! + + Say, if we are ligating "A B_C m D", then previously 'm' was being + attached to 'B' in the combined A_B_C_D ligature. Now we attach it + to 'C'. No test for this though :(. + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2f02fc79a5018e3348fccf366c470803554e1e58 +Author: Behdad Esfahbod +Date: Thu Dec 17 15:21:14 2015 +0000 + + Improve ligature-component handling + + We use three bits for lig_id these days, so we finally got a report of + two separate ligatures with the same lig_id happening adjacent to each + other, and then the component-handling code was breaking things. + Protect against that by ignoring same-lig-id but lig-comp=0 glyphs after + a new ligature. + + Fixes https://github.com/behdad/harfbuzz/issues/198 + + src/hb-ot-layout-gsubgpos-private.hh | 12 +++++-- + test/shaping/Makefile.am | 1 + + test/shaping/fonts/sha1sum/MANIFEST | 1 + + .../c78d1f25ea1df1210414f2fe2e0e1e53082bba76.ttf | Bin 0 -> 4064 bytes + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/ligature-id.tests | 35 +++++++++++++++++++++ + 6 files changed, 47 insertions(+), 3 deletions(-) + +commit 2ab0de9fbd03231b647345b01e31b136e2e00978 +Author: Behdad Esfahbod +Date: Thu Dec 17 11:59:15 2015 +0000 + + [use] Fix halant detection + + Before, we were just checking the use_category(). This detects as + halant a ligature that had the halant as first glyph (as seen in + NotoSansBalinese.) Change that to use the is_ligated() glyph prop + bit. The font is forming this ligature in ccmp, which is before + the rphf / pref tests. So we need to make sure the "ligated" bit + survives those tests. Since those only check the "substituted" bit, + we now only clear that bit for them and "ligated" survives. + + Fixes https://github.com/behdad/harfbuzz/issues/180 + + src/hb-ot-layout-private.hh | 6 ++---- + src/hb-ot-shape-complex-use.cc | 19 ++++++++++++------- + test/shaping/Makefile.am | 1 + + test/shaping/fonts/sha1sum/MANIFEST | 1 + + .../fbb6c84c9e1fe0c39e152fbe845e51fd81f6748e.ttf | Bin 0 -> 2616 bytes + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/use.tests | 1 + + 7 files changed, 18 insertions(+), 11 deletions(-) + +commit 86bcbd65b0d98357fb3d67a2f4f2a704ace55e10 +Author: Behdad Esfahbod +Date: Thu Dec 17 11:04:33 2015 +0000 + + [arabic] Use glyph advance width in apply_stch() instead of extents + + That seems to be what Windows is doing, and makes more sense. + + src/hb-ot-shape-complex-arabic.cc | 24 +++++++----------------- + 1 file changed, 7 insertions(+), 17 deletions(-) + +commit f11c11a1f123ef245e59ba892230db14170a8e5a +Author: Behdad Esfahbod +Date: Wed Dec 16 17:08:36 2015 +0100 + + Fix Since: tags for new API + + https://github.com/behdad/harfbuzz/commit/e1d4d0f1dbd8518b5672245c05d73f22a9ed03ea#commitcomment-15006653 + + src/hb-font.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 15f2c055c17c54b0a6ae6eef50dcda13c58cda75 +Merge: 49e72634 a13b023d +Author: Behdad Esfahbod +Date: Mon Dec 14 14:19:03 2015 +0100 + + Merge pull request #196 from srl295/aix + + AIX fixes + +commit a13b023dbfd0532e8cd74c356fbbd4453d0ffaa0 +Author: Steven R. Loomis +Date: Fri Dec 11 10:21:27 2015 -0800 + + AIX fixes + + - use '-w' instead of '\<...\>' for check-header-guards + grep manpage says these are the same + + - put '-q' first in the grep options + + - move VAR into hb-private.hh + + - hb-font-private.hh - use [VAR] instead of [] for variable array + + src/check-header-guards.sh | 5 ++--- + src/hb-font-private.hh | 2 +- + src/hb-open-type-private.hh | 3 --- + src/hb-private.hh | 2 ++ + 4 files changed, 5 insertions(+), 7 deletions(-) + +commit 49e72634af74a9fbad01f42f48e104218413acc0 +Author: Behdad Esfahbod +Date: Thu Dec 10 17:44:19 2015 +0100 + + Limit use of AIX intrinsics to IBM's compiler + + src/hb-atomic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e1d4d0f1dbd8518b5672245c05d73f22a9ed03ea +Merge: 70b33eda 808d3fc0 +Author: Behdad Esfahbod +Date: Thu Dec 10 16:56:07 2015 +0100 + + Merge branch 'font-extents' + + Fixes https://github.com/behdad/harfbuzz/pull/165 + +commit 808d3fc0eadd379909f2a0308fd3db474f1efde8 +Author: Behdad Esfahbod +Date: Thu Dec 10 16:55:16 2015 +0100 + + [util] Port hb-view to use font metrics from HarfBuzz instead of cairo + + util/helper-cairo.cc | 4 +++- + util/view-cairo.cc | 24 ++++++++++++------------ + 2 files changed, 15 insertions(+), 13 deletions(-) + +commit 31fa3892947138c7950303ea3719bb5ceb813625 +Author: Behdad Esfahbod +Date: Thu Dec 10 16:38:29 2015 +0100 + + [ft] Use ftface->size->metrics for font extent info + + src/hb-ft.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 3ad16048fdd841f31f1cb98d7ff9ea1871841146 +Author: Behdad Esfahbod +Date: Thu Dec 10 16:37:49 2015 +0100 + + [ot-font] Respect OS/2 fsSelection USE_TYPO_METRICS bit + + src/hb-ot-font.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 70b33edae7c8b9c031b83c95f00cb383789f1041 +Author: Behdad Esfahbod +Date: Thu Dec 10 15:54:42 2015 +0100 + + Add atomic ops for AIX + + Patch from Volker Simonis. + + src/hb-atomic-private.hh | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +commit 98460779bae19e4d64d29461ff154b3527bf8420 +Author: Behdad Esfahbod +Date: Mon Dec 7 21:38:47 2015 +0100 + + Remove final pause from Arabic shaper + + Back in the old days, we used to apply 'calt' and 'cswh' in Arabic shaper, + with a pause in between. Then we disabled the 'cswh' because Microsoft + disabled it, but forgot to remove the unnecessary pause. Do that now. + + This has the benefit that it fixes shaping with monbaiti from Windows 10. + In that version of that font, the lookups from 'calt' are duplicated in + 'rclt', and Mongolian was changed to go through Universal Shaping Engine. + We still use the Arabic shaper for Mongolian. With a pause after 'calt', + we were applying the duplicate lookups from 'calt' and 'rclt' twice. It + happened to be the case that these lookups were NOT idempotent. So we + were getting wrong shaping. See thread "Windows 10 monbaiti.ttf upgrade + (5.01 -> 5.51) caused loss of diacritical marks when shaped with harfbuz" + on the mailing list. This fixes that. + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dee0fbf9e2eac8b61730efc4978bc10c552b5227 +Merge: 255df680 a7ffe353 +Author: Behdad Esfahbod +Date: Mon Dec 7 10:44:08 2015 +0100 + + Merge pull request #192 from behdad/jfkthame-stch + + [issue 191] Make apply_stch() give a more precise fit + +commit 255df6801201fb22402420f7b7b7ea8b042df8ba +Author: Behdad Esfahbod +Date: Mon Dec 7 10:34:47 2015 +0100 + + Fix undefined behavior in cmp function + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=93274 + + src/hb-ot-map-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit fcf9e61bad13c828b5482f26491c82db65d91c96 +Author: Behdad Esfahbod +Date: Mon Dec 7 10:30:43 2015 +0100 + + Fix sorting order of ot_languages array + + Looks like the original sort was wrongly done. + Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=93275 + + src/hb-ot-tag.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 70952ddb5a29c5bcbb4b6c3a05a428496033234a +Author: Behdad Esfahbod +Date: Mon Dec 7 10:28:46 2015 +0100 + + Add test to make sure ot-languages array is sorted + + Currently fails. Part of + https://bugs.freedesktop.org/show_bug.cgi?id=93275 + + src/Makefile.am | 9 ++++++++- + src/hb-ot-tag.cc | 23 +++++++++++++++++++++++ + 2 files changed, 31 insertions(+), 1 deletion(-) + +commit 8c37556f730d7e961394075cd863f624af4c53c4 +Merge: 8e5f9026 f35b3e93 +Author: Behdad Esfahbod +Date: Mon Dec 7 09:34:58 2015 +0100 + + Merge pull request #134 from ebraminio/dwrite + + Add working but less prefect DirectWrite backend + +commit a7ffe3535836032dba5559080dffeec79473197b +Author: jfkthame +Date: Sat Dec 5 17:47:37 2015 +0000 + + Make apply_stch() give a more precise fit + + This aims to make Syriac Abbr Mark sizing more accurate when repeating segments are used, by adding an extra repeat and tightening up the spacing slightly rather than leaving a shortfall corresponding to a partial repeat-width. + + src/hb-ot-shape-complex-arabic.cc | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +commit 8e5f902656d2882d24c30e8b26ddbd3963baa55c +Author: Behdad Esfahbod +Date: Mon Nov 30 16:53:21 2015 -0800 + + src/test.cc: wrong field printed + + Fixes https://github.com/behdad/harfbuzz/issues/188 + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=93182 + + src/test.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6f2e6de1fae0ab2269b472a750788817de6c2a6e +Author: Simon Cozens +Date: Mon Oct 26 16:23:22 2015 +0900 + + Get font ascender and descender metrics from OS/2 table. + + src/hb-font-private.hh | 39 ++++++++++++++++++- + src/hb-font.cc | 102 ++++++++++++++++++++++++++++++++++++++++++++++++- + src/hb-font.h | 62 ++++++++++++++++++++++++++++-- + src/hb-ft.cc | 21 ++++++++++ + src/hb-ot-font.cc | 58 ++++++++++++++++++++++++++-- + 5 files changed, 274 insertions(+), 8 deletions(-) + +commit 097c998a0c7b250924801bb69f5fa0c529edd183 +Author: Simon Cozens +Date: Mon Oct 26 16:22:38 2015 +0900 + + Parse the OS/2 table. + + src/Makefile.am | 1 + + src/hb-ot-os2-table.hh | 105 +++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 106 insertions(+) + +commit d44d52bd0da033865641dfd39d94852119fd4fd7 +Author: Behdad Esfahbod +Date: Thu Nov 26 19:35:43 2015 -0500 + + 1.1.2 + + NEWS | 15 +++++++++++++++ + configure.ac | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) + +commit 35d18585fc57750d817f57bfffe569069f9803b5 +Author: Behdad Esfahbod +Date: Thu Nov 26 19:30:37 2015 -0500 + + Fix a few docs blocks + + src/hb-buffer.cc | 4 ++++ + src/hb-glib.cc | 2 ++ + src/hb-ot-font.cc | 2 ++ + src/hb-ot-layout.cc | 6 ++++++ + src/hb-ot-shape.cc | 4 ++++ + 5 files changed, 18 insertions(+) + +commit 0e38c918b66df31978d8fd3d8271a9b781384545 +Author: Behdad Esfahbod +Date: Thu Nov 26 19:26:26 2015 -0500 + + [introspection] Make scanner happy with HB_EXTERN + + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit ea512f71084296be3bd893f78650def894066de0 +Author: Behdad Esfahbod +Date: Thu Nov 26 19:22:22 2015 -0500 + + Use C-style casts instead of compare to 0, to convert hb_bool_t to bool + + src/hb-common.cc | 2 +- + src/hb-fallback-shape.cc | 2 +- + src/hb-font-private.hh | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-map.cc | 2 +- + src/hb-ot-shape-complex-hangul.cc | 2 +- + src/hb-ot-shape-complex-hebrew.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 4 ++-- + src/hb-ot-shape-normalize.cc | 6 +++--- + src/hb-ot-shape.cc | 2 +- + 10 files changed, 13 insertions(+), 13 deletions(-) + +commit 67a36a725e2a61a096ba0324f359d17f9b02d312 +Author: Behdad Esfahbod +Date: Thu Nov 26 18:48:42 2015 -0500 + + Fix vertical GPOS + + This was brorken earlier, though, it's really hard to notice it. + Unlike the glyph_h_origin(), an unset glyph_v_origin() does NOT + mean that the vertical origin is at 0,0. + + Related to https://github.com/behdad/harfbuzz/issues/187 + + src/hb-ot-shape.cc | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +commit 1c6a057dd1a52511474630896a597bf8e5215214 +Author: Behdad Esfahbod +Date: Thu Nov 26 18:48:30 2015 -0500 + + Add tests for previous commit + + test/shaping/Makefile.am | 1 + + .../sha1sum/49c9f7485c1392fa09a1b801bc2ffea79275f22e.ttf | Bin 0 -> 1496 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/simple.tests | 2 ++ + 5 files changed, 5 insertions(+) + +commit c41c145c7386ebe72b1cfb0475d836a689fecc5e +Author: Behdad Esfahbod +Date: Thu Nov 26 18:43:15 2015 -0500 + + Make nil glyph_h_origin() function return true + + Fixes https://github.com/behdad/harfbuzz/issues/187 + + Funcs implementations that have a non-zero horizontal origin must + implement the glyph_h_origin() callback, nothing new here. + + Other implementations (all I know of!) can simply not set + glyph_h_origin() now. I did that for hb-ot and hb-ft in + 44f82750807475aa5b16099ccccd917d488df703, though that broke the + fallback shaper because the default was returning false... + + src/hb-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 766963adba6770dcd45de4417481ed8eda60a716 +Merge: b344af80 f798b8e2 +Author: Behdad Esfahbod +Date: Tue Nov 24 15:38:43 2015 -0600 + + Merge pull request #114 from ThePhD/vc++-fixes + + Fix all VC++ warnings and errors + +commit b344af80ca95b9eddfd6017aa6ae103388d6b5f8 +Merge: 662acd26 835bbdc7 +Author: Behdad Esfahbod +Date: Tue Nov 24 15:30:27 2015 -0600 + + Merge pull request #177 from fanc999/exporting + + Enable use of compiler directives to export symbols + +commit 662acd26d10c38e96a9afcdaab2cb2979794966f +Merge: b24e93e3 1979f6fe +Author: Behdad Esfahbod +Date: Tue Nov 24 15:29:44 2015 -0600 + + Merge pull request #181 from mhosken/master + + Fix y_scale problems in hb-gr + +commit b24e93e3a4d98111c4684fa08e9080b471881d5c +Author: Behdad Esfahbod +Date: Tue Nov 24 13:18:20 2015 -0600 + + 1.1.1 + + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit 233944ac91bb81250c0e63150eecfedfaf09f590 +Merge: 5a24b1d2 d5382019 +Author: Khaled Hosny +Date: Tue Nov 24 18:37:35 2015 +0400 + + Merge pull request #185 from khaledhosny/travis-osx + + [travis] Enable Mac OS X support + +commit d538201918e6932ef7645f8d5b2c3491954936f8 +Author: Khaled Hosny +Date: Tue Nov 24 12:46:35 2015 +0400 + + [travis] Enable Mac OS X support + + Fixes https://github.com/behdad/harfbuzz/issues/182 + + .travis.yml | 22 ++++++++++++++++------ + 1 file changed, 16 insertions(+), 6 deletions(-) + +commit 5a24b1d25c59865e298bf105f54503e79587265c +Author: Behdad Esfahbod +Date: Mon Nov 23 16:46:14 2015 -0600 + + [travis] Remove coverity scan + + I never could get it to work, and it's a proprietary platform. + + .travis.yml | 11 ----------- + README | 1 - + 2 files changed, 12 deletions(-) + +commit 1979f6fedca82fa1e4f65491de491db1aa6dc645 +Author: Martin Hosken +Date: Mon Nov 23 10:03:56 2015 +0700 + + Fix y_scale problems in hb-gr + + src/hb-graphite2.cc | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 835bbdc7c92bd774ff92c42a9277ded72066d29d +Author: Chun-wei Fan +Date: Thu Nov 19 18:34:12 2015 +0800 + + Public headers: Decorate public symbols with HB_EXTERN + + This prepares the headers for exporting symbols using visibility + attributes or __declspec(dllexport), so that we do not need to maintain + symbols listing files, as this is what was and is done in GLib and GTK+. + + src/hb-blob.h | 24 +++++----- + src/hb-buffer.h | 100 +++++++++++++++++++------------------- + src/hb-common.h | 22 ++++----- + src/hb-coretext.h | 6 +-- + src/hb-face.h | 34 ++++++------- + src/hb-font.h | 114 ++++++++++++++++++++++---------------------- + src/hb-ft.h | 18 +++---- + src/hb-glib.h | 8 ++-- + src/hb-gobject-enums.h.tmpl | 2 +- + src/hb-gobject-structs.h | 26 +++++----- + src/hb-graphite2.h | 4 +- + src/hb-icu.h | 6 +-- + src/hb-ot-font.h | 2 +- + src/hb-ot-layout.h | 56 +++++++++++----------- + src/hb-ot-shape.h | 4 +- + src/hb-ot-tag.h | 8 ++-- + src/hb-set.h | 52 ++++++++++---------- + src/hb-shape-plan.h | 18 +++---- + src/hb-shape.h | 10 ++-- + src/hb-unicode.h | 52 ++++++++++---------- + src/hb-uniscribe.h | 4 +- + src/hb-version.h.in | 6 +-- + src/hb.h | 4 ++ + 23 files changed, 292 insertions(+), 288 deletions(-) + +commit f798b8e2d683a1b89b6905b1a8615375b847b468 +Author: ThePhD +Date: Sat Nov 21 16:57:26 2015 -0500 + + c-style cast + + src/hb-ot-shape-complex-use.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a6991813659376a6a11c00a9f67d85b4f7ba9b5d +Merge: 1dc32ea4 f19c6db1 +Author: Behdad Esfahbod +Date: Fri Nov 20 13:28:42 2015 -0800 + + Merge pull request #176 from behdad/missing-braces + + Add braces for subobject initializer in _hb_font_funcs_nil + +commit 1dc32ea4d2f294f9d1ae1c8fd19fb75f9278223b +Author: Behdad Esfahbod +Date: Fri Nov 20 13:24:19 2015 -0800 + + Whitespace + + src/hb-private.hh | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit f94c0ecbb1488138d3ec3b9d6d9fb78113dfee4f +Author: Behdad Esfahbod +Date: Fri Nov 20 13:21:29 2015 -0800 + + Define HB_MARK_AS_FLAG_T as a macro instead of using templates + + The generic template operator overloading was causing more problems than it + solved. Eg: + + https://github.com/behdad/harfbuzz/pull/163 + https://github.com/behdad/harfbuzz/issues/175 + + So, just use macros. + + Fixes https://github.com/behdad/harfbuzz/issues/175 + Fixes https://github.com/behdad/harfbuzz/pull/178 + + src/hb-private.hh | 27 +++++++++++---------------- + 1 file changed, 11 insertions(+), 16 deletions(-) + +commit f19c6db18e2e2dd0e9a406fc7e8533049fab48b0 +Author: jfkthame +Date: Fri Nov 20 08:43:49 2015 +0000 + + Add braces for subobject initializer in _hb_font_funcs_nil + + To avoid triggering -Wmissing-braces; see https://bugzilla.mozilla.org/show_bug.cgi?id=1226175#c8 + + src/hb-font.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 9cc1ed4fa68075b3b142a2737438109772dd0002 +Author: Behdad Esfahbod +Date: Thu Nov 19 12:39:09 2015 -0800 + + Do not allow recursiving to same position and same lookup + + This is just to make it harder to be extremely slow. There definitely + are ways still, just harder. Oh well... how do we tame this problem + without solving halting problem?! + + Fixes https://github.com/behdad/harfbuzz/issues/174 + + src/hb-ot-layout-gsubgpos-private.hh | 5 +++++ + test/shaping/fonts/sha1sum/MANIFEST | 1 + + .../sha1sum/fab39d60d758cb586db5a504f218442cd1395725.ttf | Bin 0 -> 1894 bytes + test/shaping/tests/fuzzed.tests | 1 + + 4 files changed, 7 insertions(+) + +commit 7d75eee799bbb5ee7eef2651cf7b7d3aee6f09b0 +Author: Behdad Esfahbod +Date: Thu Nov 19 12:03:04 2015 -0800 + + [fuzzing] Run fuzzing tests using hb-fuzzer as well + + test/fuzzing/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 13188cba7f0eaacd587beeb1c2258526ae24c438 +Author: Behdad Esfahbod +Date: Thu Nov 19 11:59:03 2015 -0800 + + Revert "Fix hang in OOM situations" + + This reverts commit f0599db761d7fc2d585d86e757a797f75ebc7499. + + Commit abadc1717d997b69f987fdf1be9e12156d2d13d6 provides a better + fix for this. + + src/hb-buffer-private.hh | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit 18e1c6b6ef7c85a1b02e3dae86280d8ed6b65118 +Author: Behdad Esfahbod +Date: Thu Nov 19 11:50:58 2015 -0800 + + Revert "Make sure we make progress in OOM situations" + + This reverts commit 68b507a3c3c62c28c38e13fee733702bb703b6ca. + + Commit abadc1717d997b69f987fdf1be9e12156d2d13d6 provides a better + fix for this. + + src/hb-buffer-private.hh | 7 +++++-- + src/hb-buffer.cc | 31 ++++++++----------------------- + 2 files changed, 13 insertions(+), 25 deletions(-) + +commit e1118aeac3b5556df0ce502732df8ac92bdac45a +Author: Behdad Esfahbod +Date: Wed Nov 18 23:40:47 2015 -0800 + + 1.1.0 + + NEWS | 22 ++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 23 insertions(+), 1 deletion(-) + +commit 63fe05c8b1cd4f08b525028409e1299f34750810 +Author: Behdad Esfahbod +Date: Wed Nov 18 23:52:34 2015 -0800 + + Fix make distcheck + + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 9b087dec7753ad96d256ce1b9ae347bd8d697c75 +Author: Behdad Esfahbod +Date: Wed Nov 18 23:23:35 2015 -0800 + + [travis] Only coverity-scan the coverity_scan branch + + This essentially disables coverity-scan right now, until we find + a pattern to continuously submit branches there. + + For background reasoning, see: + Fixes https://github.com/behdad/harfbuzz/issues/171 + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 85062e3b4655ec6d5c3cf5344ce22cd88c21a2aa +Author: Behdad Esfahbod +Date: Wed Nov 18 23:09:13 2015 -0800 + + Add tests for previous two commits + + To fully test what these are supposed to test, they should be run + against libharfbuzz-fuzzing.la instead of libharfbuzz.la, but for + now just record the files. + + .../sha1sum/43979b90b2dd929723cf4fe1715990bcb9c9a56b.ttf | Bin 0 -> 1804 bytes + test/shaping/fonts/sha1sum/MANIFEST | 2 ++ + .../sha1sum/b9e2aaa0d75fcef6971ec3a96d806ba4a6b31fe2.ttf | Bin 0 -> 1804 bytes + test/shaping/tests/fuzzed.tests | 2 ++ + 4 files changed, 4 insertions(+) + +commit 37b40cd8a18e25d3324f829acec197f016f4a524 +Author: Behdad Esfahbod +Date: Wed Nov 18 23:04:45 2015 -0800 + + Fix another move_to assertion failure + + If buf->idx is at end, don't set end past it... + + Fixes https://github.com/behdad/harfbuzz/issues/173 + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit abadc1717d997b69f987fdf1be9e12156d2d13d6 +Author: Behdad Esfahbod +Date: Wed Nov 18 17:52:08 2015 -0800 + + Try to better handle OOM situations + + Fixes assert fail in https://github.com/behdad/harfbuzz/issues/161 + with libharfbuzz-fuzzing. + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-shape-complex-hangul.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape-complex-use.cc | 8 +------- + src/hb-ot-shape-normalize.cc | 10 +++++----- + src/hb-ot-shape.cc | 2 +- + 8 files changed, 12 insertions(+), 18 deletions(-) + +commit ec625f7dfb5f6df19d35d81af6605d05e08321f2 +Author: Behdad Esfahbod +Date: Wed Nov 18 16:37:59 2015 -0800 + + Try to fix gnome-continuous build fail + + test/fuzzing/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit ff16ef3379e06afe44b5e78b8893aeae0cee2b5b +Author: Behdad Esfahbod +Date: Wed Nov 18 16:27:32 2015 -0800 + + Enable building a bounded version of the library for fuzzing + + test/fuzzing/hb-fuzzer links against libharfbuzz-fuzzing.so now. + + src/Makefile.am | 16 ++++++++++++++++ + test/fuzzing/Makefile.am | 9 ++------- + test/fuzzing/README | 6 ++---- + 3 files changed, 20 insertions(+), 11 deletions(-) + +commit e0082ae60dbd87d433f3b2b9d2bfa64b9a4c3663 +Author: Behdad Esfahbod +Date: Tue Nov 17 18:42:13 2015 -0800 + + Move things around + + src/hb-private.hh | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit dde8cc87bd880bd35baf764820f4c85bd0a58696 +Merge: e97835ad 167c3271 +Author: Behdad Esfahbod +Date: Tue Nov 17 18:40:10 2015 -0800 + + Merge pull request #163 from fanc999/msvc.src + + Update the sources so they will compile under Visual Studio + +commit 167c3271778cd1a8c4433b9d2230901ce17c099e +Author: Chun-wei Fan +Date: Mon Nov 9 17:17:56 2015 +0800 + + Fix build on MSVC >= 2012 + + Use the DEFINE_ENUM_FLAG_OPERATORS macro in winnt.h on Visual Studio, + which defines the bitwise operators for the enumerations that we want to + mark as hb_mark_as_flags_t, which will take care of the situation on newer + Visual Studio (>= 2012), where the build breaks with C2057 errors as the + underlying types of the enumerations is not clear to the compiler when we + do a bitwise op within the declaration of the enumerations themselves. + + Also disable the C4200 (nonstandard extension used : zero-sized array in + struct/union) and C4800 ('type' : forcing value to bool 'true' or 'false' + (performance warning)) warnings as the C4200 is the intended scenario and + C4800 is harmless but is so far an unavoidable side effect of using + DEFINE_ENUM_FLAG_OPERATORS. + + src/hb-buffer-private.hh | 6 +++--- + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-private.hh | 4 ++-- + src/hb-ot-map-private.hh | 2 +- + src/hb-private.hh | 11 +++++++++++ + 5 files changed, 18 insertions(+), 7 deletions(-) + +commit 4d27bb87468a1b84387e7ce084e3d92c0fc8f065 +Author: Chun-wei Fan +Date: Fri Nov 6 14:28:30 2015 +0800 + + hb-ot-shape-complex-arabic.cc: Fix build on Visual Studio + + Visual Studio does not like declaring a enum variable within a for + statement, so fix the build by declaring the enum before doing the for + loop. + + src/hb-ot-shape-complex-arabic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit a49e7b7e40127beba25f39ef3c10d7a77e2bb0f0 +Author: Chun-wei Fan +Date: Tue Nov 3 18:49:34 2015 +0800 + + MSVC builds: Add fallback implementation for pre-2013 MSVC + + Pre-2013 MSVC does not have scalbn() and scalbnf(), which are used in the + utility programs. Add fallback implementations for these, which can be + used when necessary. + + util/options.hh | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit 998e8dda938cfef0146f1bfc4e8973a0e12d7d35 +Author: Chun-wei Fan +Date: Mon Nov 2 16:55:29 2015 +0800 + + util: Fix build on Visual Studio + + Use the fallback implementation for lround() only on pre-2013 Visual + Studio, and ensure we are clear about the types of the parameters for + lround() and scalbnf(), since Visual Studio can be quite picky on + ambiguous parameter types. Also, use g_ascii_strcasecmp() rather than + strcasecmp() as we are already using GLib for this code and we are + assured that g_ascii_strcasemp() is available. + + For scalbnf() on pre-2013 Visaul Studio, a fallback implementation is + needed, but use another forced-included header for those compilers, which + will be added later. + + Also use (char)27 on Visual Studio builds as '\e' is not a recognized + escape sequence, which will do the same thing. + + util/ansi-print.cc | 16 +++++++++------- + util/helper-cairo.cc | 20 ++++++++++---------- + util/options.cc | 2 +- + 3 files changed, 20 insertions(+), 18 deletions(-) + +commit e97835ad43f5c68e8cb29599246cae0f4461d663 +Author: Behdad Esfahbod +Date: Tue Nov 10 11:37:01 2015 -0800 + + [util] Fix crash when --output-file is specified but not --output-format + + util/options.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit d5f0d7c9fb14255388ab616f56e178cb7ca10ec2 +Merge: 04ff23e7 529a9331 +Author: Behdad Esfahbod +Date: Sat Nov 7 07:50:58 2015 -0800 + + Merge pull request #167 from KonstantinRitt/unicode_cp_opt + + Micro optimizations to UTF-16 and UTF-32 codecs + +commit 04ff23e73d847ab3a5da0e9fac4fbca19aefd284 +Author: Behdad Esfahbod +Date: Fri Nov 6 16:29:44 2015 -0800 + + [arabic] Improve stretch length calculation + + Err on the side of being too short, than too wide. Reduces chance + of overlaps with neighboring glyphs. + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 59821ab8b413df3a444c38b80582a5137e364a70 +Author: Behdad Esfahbod +Date: Fri Nov 6 16:27:44 2015 -0800 + + [arabic] Don't stretch over cased letters + + Addresses + https://github.com/behdad/harfbuzz/commit/6e6f82b6f3dde0fc6c3c7d991d9ec6cfff57823d#commitcomment-14248516 + + src/hb-ot-shape-complex-arabic.cc | 24 +++++++++++++++++++++- + src/hb-unicode-private.hh | 20 ------------------ + .../script-syriac/misc/abbreviation-mark.txt | 4 ++-- + 3 files changed, 25 insertions(+), 23 deletions(-) + +commit 5337db29af39084d677a63154f404eca0c20cfeb +Author: Behdad Esfahbod +Date: Fri Nov 6 16:18:09 2015 -0800 + + Revert "Don't process lookups if buffer is in error" + + This reverts commit f92bd86cc8c11d262d1830c631cb7c63fc9d4bc8. + + We don't want to be like cairo, where as soon as there's an error, + nothing works anymore. So, lets process lookups as long as there's + no new memory needed. That's also a model that hides fewer bugs. + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 529a93312815dff3c2f37f880bf6ccb428bd3da0 +Author: Konstantin Ritt +Date: Sat Nov 7 02:00:04 2015 +0400 + + Micro optimization to hb_utf16_t and hb_utf32_t ::prev() + + Implement reverse lookup instead of re-using next() + + src/hb-utf-private.hh | 29 +++++++++++++++++++---------- + 1 file changed, 19 insertions(+), 10 deletions(-) + +commit 44ae9be7a29eebd6003cad2fdb90b40512a9c8eb +Author: Konstantin Ritt +Date: Sat Nov 7 01:58:38 2015 +0400 + + Nano optimization to hb_utf16_t and hb_utf32_t ::next() + + src/hb-utf-private.hh | 17 ++++++----------- + 1 file changed, 6 insertions(+), 11 deletions(-) + +commit a6d7668a954a763a053f8af8edbff4731aa43729 +Author: Behdad Esfahbod +Date: Fri Nov 6 09:46:54 2015 -0800 + + [fuzzing] Cap max buffer len at 128 + + test/fuzzing/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit f1c4adbcd3f6275e81e118ddadc9396f82daeccf +Author: Behdad Esfahbod +Date: Fri Nov 6 09:46:05 2015 -0800 + + Fix typo + + src/hb-buffer-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 68b507a3c3c62c28c38e13fee733702bb703b6ca +Author: Behdad Esfahbod +Date: Fri Nov 6 00:09:26 2015 -0800 + + Make sure we make progress in OOM situations + + src/hb-buffer-private.hh | 7 ++----- + src/hb-buffer.cc | 31 +++++++++++++++++++++++-------- + 2 files changed, 25 insertions(+), 13 deletions(-) + +commit 5a7eb5d4d862f402136044c19ead87ad098bd78f +Author: Behdad Esfahbod +Date: Fri Nov 6 00:01:24 2015 -0800 + + [fuzzing] Add test case for OOM + + From https://github.com/behdad/harfbuzz/issues/161 + + .../sha1sum/3511ff5c1647150595846ac414c595cccac34f18.ttf | Bin 0 -> 1483 bytes + test/shaping/fonts/sha1sum/MANIFEST | 2 +- + test/shaping/tests/fuzzed.tests | 1 + + 3 files changed, 2 insertions(+), 1 deletion(-) + +commit f0599db761d7fc2d585d86e757a797f75ebc7499 +Author: Behdad Esfahbod +Date: Thu Nov 5 23:52:41 2015 -0800 + + Fix hang in OOM situations + + Fixes https://github.com/behdad/harfbuzz/issues/161 + + src/hb-buffer-private.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit f92bd86cc8c11d262d1830c631cb7c63fc9d4bc8 +Author: Behdad Esfahbod +Date: Thu Nov 5 23:52:29 2015 -0800 + + Don't process lookups if buffer is in error + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4301703bddb63a01651a0d58474bb15ac0ebbcf6 +Author: Behdad Esfahbod +Date: Thu Nov 5 23:44:59 2015 -0800 + + Limit buffer max size growth + + https://github.com/behdad/harfbuzz/issues/161 + + src/hb-buffer-private.hh | 11 +++++++++++ + src/hb-buffer.cc | 8 ++++++++ + src/hb-ot-shape.cc | 6 ++++++ + test/fuzzing/Makefile.am | 2 ++ + 4 files changed, 27 insertions(+) + +commit 19300183a6f0bac0d23f7a994b40a51e9c90d6e1 +Author: Behdad Esfahbod +Date: Thu Nov 5 23:08:50 2015 -0800 + + [fuzzing] Add build system + + configure.ac | 1 + + test/Makefile.am | 2 +- + test/fuzzing/Makefile.am | 44 ++++++++++++++++++++++++++++++++++++++++++++ + test/fuzzing/README | 2 ++ + test/fuzzing/hb-fuzzer.cc | 4 ++-- + 5 files changed, 50 insertions(+), 3 deletions(-) + +commit 9c9ad214af43685b00f6d8493b7807d6607d4e2d +Author: Behdad Esfahbod +Date: Thu Nov 5 22:50:52 2015 -0800 + + [fuzzer] Add README + + https://github.com/behdad/harfbuzz/issues/139#issuecomment-154202645 + + test/fuzzing/README | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit 6e6f82b6f3dde0fc6c3c7d991d9ec6cfff57823d +Author: Behdad Esfahbod +Date: Thu Nov 5 17:29:03 2015 -0800 + + Implement SYRIAC ABBREVIATION MARK with 'stch' feature + + The feature is enabled for any character in the Arabic shaper. + We should experiment with using it for Arabic subtending marks. + Though, that has a directionality problem as well, since those + are used with digits... + + Fixes https://github.com/behdad/harfbuzz/issues/141 + + src/hb-ot-shape-complex-arabic.cc | 219 ++++++++++++++++++++- + src/hb-unicode-private.hh | 19 ++ + .../shaper-arabic/script-syriac/misc/MANIFEST | 1 + + .../script-syriac/misc/abbreviation-mark.txt | 11 ++ + 4 files changed, 244 insertions(+), 6 deletions(-) + +commit c743ec5886a1f6d57de26da33a770a8706be83d6 +Author: Behdad Esfahbod +Date: Thu Nov 5 17:33:57 2015 -0800 + + [ft] Fix extents with negative scales + + Fixes https://github.com/behdad/harfbuzz/issues/162 + + src/hb-ft.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 73fec3992acb492829bde1d885f1ebeed8dcc133 +Author: Behdad Esfahbod +Date: Thu Nov 5 15:22:18 2015 -0800 + + Reserve a few scratch-flags bits for complex shapers + + src/hb-buffer-private.hh | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 136863371c1402769426d892aef1b92f9ca1a25e +Author: Behdad Esfahbod +Date: Thu Nov 5 13:24:15 2015 -0800 + + Add new shaper method postprocess_glyphs() + + Unused currently. To be used for Syriac stretch implementation. + + https://github.com/behdad/harfbuzz/issues/141 + + src/hb-ot-shape-complex-arabic.cc | 3 ++- + src/hb-ot-shape-complex-default.cc | 1 + + src/hb-ot-shape-complex-hangul.cc | 7 ++++--- + src/hb-ot-shape-complex-hebrew.cc | 1 + + src/hb-ot-shape-complex-indic.cc | 1 + + src/hb-ot-shape-complex-myanmar.cc | 2 ++ + src/hb-ot-shape-complex-private.hh | 9 +++++++++ + src/hb-ot-shape-complex-thai.cc | 1 + + src/hb-ot-shape-complex-tibetan.cc | 1 + + src/hb-ot-shape-complex-use.cc | 1 + + src/hb-ot-shape.cc | 9 ++++++--- + 11 files changed, 29 insertions(+), 7 deletions(-) + +commit 6c0ebd02c99e7536975ba7194832a1f33abd7faf +Author: Behdad Esfahbod +Date: Thu Nov 5 11:37:48 2015 -0800 + + [util] If font has color, generate PNG with color + + util/helper-cairo.cc | 33 ++++++++++++++++++++++++++------- + util/helper-cairo.hh | 6 +++++- + util/view-cairo.cc | 7 ++++++- + 3 files changed, 37 insertions(+), 9 deletions(-) + +commit e95eb23a4ee920eab1e2f4eec9cf490bb431452c +Author: Behdad Esfahbod +Date: Wed Nov 4 22:55:11 2015 -0800 + + Don't try zeroing marks by GDEF if there are no non-ASCII + + This one is a hack, but should be ok. + + src/hb-ot-shape.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 7fa54ed75aa30ae1d6ee9136ccb83b630c24fb65 +Author: Behdad Esfahbod +Date: Wed Nov 4 22:54:49 2015 -0800 + + Don't try zeroing mark attachments by Unicode if there's no non-ASCII + + src/hb-ot-shape.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 550bd14d2b21ec2a2b509ff42f4df4341dbf2d46 +Author: Behdad Esfahbod +Date: Wed Nov 4 22:58:58 2015 -0800 + + Actually commit changes for previous commit + + src/hb-buffer-private.hh | 2 ++ + src/hb-ot-layout-gpos-table.hh | 15 ++++++++------- + 2 files changed, 10 insertions(+), 7 deletions(-) + +commit ff31b3c1b8a2a21b57dba37eb5bb5db0579e0640 +Author: Behdad Esfahbod +Date: Wed Nov 4 22:42:41 2015 -0800 + + Skip GPOS cursive / attachment adjustmnent if none happened + + I'm starting to really like how free these new scratch_flags are. + + src/hb-ot-layout-gpos-table.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit 0f407325f6923db11d332585e8250e3646cb74d6 +Author: Behdad Esfahbod +Date: Wed Nov 4 22:28:44 2015 -0800 + + Minor + + src/hb-ot-shape.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 497a6c2071cd0638e4c6af07621d01335fd963a9 +Author: Behdad Esfahbod +Date: Wed Nov 4 22:24:19 2015 -0800 + + Skip forming clusters if text is all ASCII + + src/hb-ot-shape.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 28de104f15b80df4b678267c4488b7d09a42720c +Author: Behdad Esfahbod +Date: Wed Nov 4 22:00:25 2015 -0800 + + Move variable-sized struct member to end + + Hopefully makes clang build happy + + src/hb-font-private.hh | 21 ++++++++++----------- + src/hb-font.cc | 20 ++++++++++++++++++++ + 2 files changed, 30 insertions(+), 11 deletions(-) + +commit 5bc28b5f688ee90d103d052e98bc15d6e0e7e0b1 +Author: Behdad Esfahbod +Date: Wed Nov 4 21:53:16 2015 -0800 + + Optimize positioning for when h_origin is nil + + src/hb-ot-shape.cc | 38 ++++++++++++++++++++------------------ + 1 file changed, 20 insertions(+), 18 deletions(-) + +commit 762770c964f9f0591bf4c44427f73ea3e1c51733 +Author: Behdad Esfahbod +Date: Wed Nov 4 21:42:55 2015 -0800 + + Add font->has_...() to check for individual nil font funcs + + Hopefully this wouldn't break any compiler. There was some magic + moments to getting this to compile... + + src/hb-font-private.hh | 19 +++++++++++++++++-- + src/hb-font.cc | 7 +++++++ + 2 files changed, 24 insertions(+), 2 deletions(-) + +commit 88e9a9bcae61421d9dd65715d25e5f20b2847c03 +Author: Behdad Esfahbod +Date: Wed Nov 4 21:16:26 2015 -0800 + + Minor reshaping of hb_font_funcs_t implementation + + In anticipation of further changes. No functional changes. + + src/hb-font-private.hh | 80 ++++++++++++++++++++++++++------------------------ + src/hb-font.cc | 4 +-- + 2 files changed, 43 insertions(+), 41 deletions(-) + +commit a6a7715bac8b0c8f5473b84bc649c315ad4d2d51 +Author: Behdad Esfahbod +Date: Wed Nov 4 20:51:21 2015 -0800 + + Comments + + src/hb-font-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6c48ec830ffac00a920d047ed77acd1b05549074 +Author: Behdad Esfahbod +Date: Wed Nov 4 20:47:42 2015 -0800 + + [ot] Remove font funcs that do nothing + + src/hb-ot-font.cc | 95 ++++--------------------------------------------------- + 1 file changed, 7 insertions(+), 88 deletions(-) + +commit 75ea2daa1d9bbe235cd4a8570efb1913d58c3c62 +Author: Behdad Esfahbod +Date: Wed Nov 4 20:43:59 2015 -0800 + + [ot] Port ot font funcs to allocated object + + src/hb-ot-font.cc | 47 ++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 38 insertions(+), 9 deletions(-) + +commit 44f82750807475aa5b16099ccccd917d488df703 +Author: Behdad Esfahbod +Date: Wed Nov 4 20:40:05 2015 -0800 + + [ft] Remove font funcs that do nothing + + src/hb-ft.cc | 29 ++++------------------------- + 1 file changed, 4 insertions(+), 25 deletions(-) + +commit 7918c261efd283e0428ce7836e9e42768a6aa05c +Author: Behdad Esfahbod +Date: Wed Nov 4 20:37:49 2015 -0800 + + [ft] Port ft font funcs to allocated object + + src/hb-ft.cc | 45 ++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 36 insertions(+), 9 deletions(-) + +commit da29b43794cfa3f9a602c34b33c5d8a9c36f87b5 +Author: Behdad Esfahbod +Date: Wed Nov 4 20:22:44 2015 -0800 + + Separate nil font-funcs from parent-peeking font-funcs + + API change: all fonts created with hb_font_create() now inherit from + (ie have parent) hb_font_get_empty(). + + src/hb-font.cc | 211 +++++++++++++++++++++++++++++++++++---------------- + test/api/test-font.c | 2 +- + 2 files changed, 145 insertions(+), 68 deletions(-) + +commit bee901b38ef3c26a04f69c299c8d5e028a0090e9 +Author: Behdad Esfahbod +Date: Wed Nov 4 19:28:17 2015 -0800 + + Optimize positioning direction calculations + + It makes the binary smaller AND faster. Yumm! + + src/hb-font-private.hh | 40 +++++++++++++++++++++++++++++++++++++++ + src/hb-ot-shape.cc | 51 +++++++++++++++++++++++++++----------------------- + 2 files changed, 68 insertions(+), 23 deletions(-) + +commit e3e4bb011ae1a2f1ba05e7ea450595b185304bec +Author: Behdad Esfahbod +Date: Wed Nov 4 18:58:02 2015 -0800 + + Don't do fractions if buffer is ASCII-only + + src/hb-buffer-private.hh | 5 +++-- + src/hb-ot-layout-private.hh | 1 + + src/hb-ot-shape.cc | 3 ++- + 3 files changed, 6 insertions(+), 3 deletions(-) + +commit 6986208ba3b395534f4c7bcfa51df6bf9038f717 +Author: Behdad Esfahbod +Date: Wed Nov 4 18:46:22 2015 -0800 + + Optimize runs without Default_Ignorable's + + Now that we have a buffer-wide scratch flags facility, use it to + optimize away a few passes. + + src/hb-buffer-private.hh | 3 ++- + src/hb-ot-layout-private.hh | 4 +++- + src/hb-ot-shape-normalize.cc | 4 ++-- + src/hb-ot-shape.cc | 10 ++++++---- + src/hb-private.hh | 3 +++ + 5 files changed, 16 insertions(+), 8 deletions(-) + +commit 14c2de321826c36037adde859ccca3e2011325a9 +Author: Behdad Esfahbod +Date: Wed Nov 4 18:00:57 2015 -0800 + + Limit max edits during sanitize to 8 + + Used to be 100. If a tabe needs more than one or two edits, it's + probably completely bogus... + + Might help with speeding up fuzzing for + https://github.com/behdad/harfbuzz/issues/157 + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9cbc39aef962a95b0eba32c24ff9c415d1316d56 +Author: Behdad Esfahbod +Date: Wed Nov 4 18:00:53 2015 -0800 + + Minor + + src/hb-ot-shape-normalize.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 52e6c4e15893ed1cb0997795912a07b3e446b65a +Author: Behdad Esfahbod +Date: Wed Nov 4 17:45:06 2015 -0800 + + If font doesn't support U+2011, fall back to U+2010 + + Test passes now. + + src/hb-ot-shape-normalize.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 75483aafa6ad02d6391712d082d093823edcd758 +Author: Behdad Esfahbod +Date: Wed Nov 4 17:43:36 2015 -0800 + + Untangle if/else waterfall + + src/hb-ot-shape-normalize.cc | 40 +++++++++++++++++++++++++++------------- + 1 file changed, 27 insertions(+), 13 deletions(-) + +commit 04fd8517f85ae9aa05b44f25578d2b19abfef7cb +Author: Behdad Esfahbod +Date: Wed Nov 4 17:38:22 2015 -0800 + + Add tests for hyphen fallback + + U+2011 is equivaent of U+2010, so we should do the fallback + for it. Currently fails. + + test/shaping/Makefile.am | 1 + + .../sha1sum/1c04a16f32a39c26c851b7fc014d2e8d298ba2b8.ttf | Bin 0 -> 820 bytes + test/shaping/fonts/sha1sum/MANIFEST | 2 ++ + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/hyphens.tests | 2 ++ + 5 files changed, 6 insertions(+) + +commit 550417117da7e14457a11f49a20145311f58587b +Author: Behdad Esfahbod +Date: Wed Nov 4 17:37:30 2015 -0800 + + [test] Drop hintings when subsetting fonts to record + + test/shaping/record-test.sh | 1 + + 1 file changed, 1 insertion(+) + +commit 49ef630936325b2e56a870fcef9aa8473a8f8526 +Author: Behdad Esfahbod +Date: Wed Nov 4 17:27:07 2015 -0800 + + Adjust the width of various spaces if font does not cover them + + See discussion here: + https://github.com/behdad/harfbuzz/commit/81ef4f407d9c7bd98cf62cef951dc538b13442eb + + There's no way to disable this fallback, but I don't think it would + be needed. Let's hope for the best! + + Fixes https://github.com/behdad/harfbuzz/issues/153 + + src/hb-buffer-private.hh | 7 ++++ + src/hb-buffer.cc | 2 ++ + src/hb-ot-shape-fallback-private.hh | 4 +++ + src/hb-ot-shape-fallback.cc | 67 +++++++++++++++++++++++++++++++++++++ + src/hb-ot-shape-normalize.cc | 1 + + src/hb-ot-shape.cc | 3 ++ + src/hb-unicode-private.hh | 56 +++++++++++++++++-------------- + test/shaping/tests/spaces.tests | 24 ++++++------- + 8 files changed, 126 insertions(+), 38 deletions(-) + +commit aa7044de0ceacd71cab19212d266c3a66c03b41e +Author: Behdad Esfahbod +Date: Wed Nov 4 16:25:57 2015 -0800 + + Generalize flags types + + src/hb-buffer-private.hh | 3 +++ + src/hb-ot-layout-common-private.hh | 5 +++++ + src/hb-ot-layout-private.hh | 8 +++++--- + src/hb-ot-map-private.hh | 16 +--------------- + src/hb-ot-shape.cc | 2 +- + src/hb-private.hh | 14 ++++++++++++++ + 6 files changed, 29 insertions(+), 19 deletions(-) + +commit 7793aad946e09b53523b30d57de85abd1d15f8b6 +Author: Behdad Esfahbod +Date: Wed Nov 4 14:48:46 2015 -0800 + + Normalize various spaces to space if font doesn't support + + This resurrects the space fallback feature, after I disabled + the compatibility decomposition. Now I can release HarfBuzz + again without breaking Pango! + + It also remembers which space character it was, such that later + on we can approximate the width of this particular space + character. That part is not implemented yet. + + We normalize all GC=Zs chars except for U+1680 OGHA SPACE MARK, + which is better left alone. + + src/hb-ot-layout-private.hh | 47 +++------------------ + src/hb-ot-shape-normalize.cc | 12 +++++- + src/hb-unicode-private.hh | 40 ++++++++++++++++++ + test/shaping/Makefile.am | 1 + + .../1c2c3fc37b2d4c3cb2ef726c6cdaaabd4b7f3eb9.ttf | Bin 0 -> 316 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/spaces.tests | 17 ++++++++ + 8 files changed, 76 insertions(+), 43 deletions(-) + +commit 8b3c7f9ede77052225cff8495d660860bf9c7629 +Author: Behdad Esfahbod +Date: Wed Nov 4 15:30:48 2015 -0800 + + [test] Support recording multiple lines of text in record-test.sh + + test/shaping/record-test.sh | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit 85658394809fe0593ab5dfb30fd96118765c7dc5 +Author: Behdad Esfahbod +Date: Wed Nov 4 14:46:52 2015 -0800 + + Protect against possible invalid-memory access after OOM + + src/hb-buffer-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4cc80bed25450af3d84a30ea417fa9275b15e014 +Author: Behdad Esfahbod +Date: Wed Nov 4 14:46:10 2015 -0800 + + Fix typo! + + Ouch! Fortunately that function was unused. + + src/hb-buffer-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9ac4b9656dd78ffd129bc3d560a92e2692bc3058 +Author: Behdad Esfahbod +Date: Wed Nov 4 14:18:39 2015 -0800 + + Add Unicode space category + + Unused so far. + + src/hb-ot-layout-private.hh | 78 +++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 76 insertions(+), 2 deletions(-) + +commit 8249ec3f86510fd24462ce71ed64a6978f0ade17 +Author: Behdad Esfahbod +Date: Wed Nov 4 13:26:17 2015 -0800 + + Make top-byte of unicode_props available to be used differently per-GC + + src/hb-ot-layout-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit cc5d3a33882b52f906ee4346707700f5e846d2ac +Author: Behdad Esfahbod +Date: Wed Nov 4 13:21:25 2015 -0800 + + Towards using top-byte of unicode-props for more things + + src/hb-ot-layout-gsubgpos-private.hh | 1 - + src/hb-ot-layout-private.hh | 3 ++- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 2f38dde5a1ea5459789fabaee661cae9235d204e +Author: Behdad Esfahbod +Date: Wed Nov 4 13:17:33 2015 -0800 + + Add _hb_glyph_info_is_unicode_mark() + + Unused right now. + + src/hb-ot-layout-private.hh | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 90d75f93bb85aeb627c4e6bb9e4cbd75895c99f7 +Author: Behdad Esfahbod +Date: Tue Nov 3 12:58:12 2015 -0800 + + Tighten ccc-setting a bit and document it + + src/hb-ot-layout-private.hh | 12 +++++++++++- + src/hb-unicode-private.hh | 5 +++++ + 2 files changed, 16 insertions(+), 1 deletion(-) + +commit 2f0dfd43cdc2259e6117704f8077ab6951c761e5 +Author: Behdad Esfahbod +Date: Tue Nov 3 12:28:34 2015 -0800 + + Fix test expectation + + test/shaping/tests/fuzzed.tests | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit df698f3299d92867e3305715f675b2621c316acd +Author: Behdad Esfahbod +Date: Tue Nov 3 12:15:12 2015 -0800 + + [ot-font] Fix hmtx table length checking, *again* + + Exactly the same problem that I fixed in + 63ef0b41dc48d6112d1918c1b1de9de8ea90adb5 + + I rewrote the table checking yesterday in + 67f8821fb25d9bd55719f5e29a582ae1af4b02b3 + and introduced the exact same issue again. :( + Good thing we have ongoing fuzzing going now. Was discovered + immediately by libFuzzer. Thanks kcc! + + https://github.com/behdad/harfbuzz/issues/139#issuecomment-153449473 + Fixes https://github.com/behdad/harfbuzz/issues/156 + + src/hb-ot-font.cc | 4 ++-- + .../sha1sum/8240789f6d12d4cfc4b5e8e6f246c3701bcf861f.ttf | Bin 0 -> 633 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/fuzzed.tests | 1 + + 4 files changed, 4 insertions(+), 2 deletions(-) + +commit 3530cc2d7c3b7102902cb0e38b0bf9f46188078d +Author: Behdad Esfahbod +Date: Tue Nov 3 11:34:47 2015 -0800 + + [util] Fix option-parsing leaks + + util/helper-cairo.cc | 7 +++++-- + util/main-font-text.hh | 22 ++++++++++++++++++--- + util/options.cc | 21 ++++++++++---------- + util/options.hh | 53 +++++++++++++++++++++++++++++++++----------------- + 4 files changed, 70 insertions(+), 33 deletions(-) + +commit 642135f3b2d6d6eb800153c76c4718239733c0e6 +Author: Behdad Esfahbod +Date: Tue Nov 3 11:26:34 2015 -0800 + + [util] In --debug mode, duplicate font data + + This has the effect that the font data will end up in a memory + section malloc()ed exactly to its size. This gives us better + valgrind detection of out-of-bounds access. + + Previously, the font data was placed in a mmap()ed section or + GString-allocated area, which didn't have proper protections + at the end when running under valgrind. + + util/options.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit ed2024ef93ac3af214082016e5aa8c14db9d7515 +Author: Behdad Esfahbod +Date: Mon Nov 2 17:58:12 2015 -0800 + + [perf] Micro-optimize + + src/hb-ot-layout-private.hh | 23 ++++++++++++++--------- + 1 file changed, 14 insertions(+), 9 deletions(-) + +commit 76a5310a830c7ae12037b768c5043bef0ff733a0 +Author: Behdad Esfahbod +Date: Mon Nov 2 17:52:45 2015 -0800 + + Remove irrelevant comment + + I tried moving the is_default_ignorable() function to an INTERNAL + function. That made the binary size grow by 5k AND things got a + tad bit slower! + + src/hb-ot-layout-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 8259669fbd1b070fc02287325894caf1bc4d590e +Author: Behdad Esfahbod +Date: Mon Nov 2 17:44:05 2015 -0800 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-shape-complex-thai.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 9382c471eabce8d36d3a73c97499ab60af422716 +Author: Behdad Esfahbod +Date: Mon Nov 2 17:36:51 2015 -0800 + + Combine unicode_props0/1 into a uint16 + + Slightly faster. In prep for more changes. + + src/hb-ot-layout-private.hh | 55 ++++++++++++++++++++++++--------------------- + 1 file changed, 29 insertions(+), 26 deletions(-) + +commit 71277185454482cff9b0c10b85c416eb4d6e0ed9 +Author: Behdad Esfahbod +Date: Mon Nov 2 17:27:48 2015 -0800 + + [perf] Only call combining_class() for marks + + Saves some time. Also preparing for reusing the ccc byte for other stuff. + + src/hb-ot-layout-private.hh | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit 5ba450407b9d9856453e63a815499da8721ff6a7 +Author: Behdad Esfahbod +Date: Mon Nov 2 15:43:08 2015 -0800 + + Make max context-length and max nesting level configurable + + ...at compile time. + + src/hb-ot-layout-common-private.hh | 10 ++++++++-- + src/hb-ot-layout-gsub-table.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 20 ++++++++++---------- + 3 files changed, 20 insertions(+), 14 deletions(-) + +commit 67f8821fb25d9bd55719f5e29a582ae1af4b02b3 +Author: Behdad Esfahbod +Date: Mon Nov 2 15:37:29 2015 -0800 + + [ot] Make bad-hmtx handling match FreeType + + Also route fuzzing-related tests through hb-ot-font, to reduce dependency + on FreeType behavior for badly-broken fonts. Fixes failing test with + FreeType master. + + src/hb-ot-font.cc | 24 ++++++++++++++---------- + test/shaping/tests/fuzzed.tests | 10 +++++----- + 2 files changed, 19 insertions(+), 15 deletions(-) + +commit 672ca3b4e65a75fb3a418ec5d117ad242a98acbb +Author: Behdad Esfahbod +Date: Mon Oct 26 14:05:05 2015 -0700 + + Use templates for making sure expression is constant + + src/hb-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 5c8174eda32c08187bc2ed40eefa1017f5b40668 +Author: Behdad Esfahbod +Date: Wed Oct 21 18:51:40 2015 -0200 + + Update comments for removal of compat decompositions + + src/hb-ot-shape-normalize.cc | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) + +commit f6799700404c49ae0a6018fd51be19551c76768a +Author: Behdad Esfahbod +Date: Wed Oct 21 17:20:55 2015 -0200 + + Disable compatibility decomposition usage during normalization + + Fixes https://github.com/behdad/harfbuzz/issues/152 + + src/hb-ot-shape-normalize.cc | 24 ------------------------ + 1 file changed, 24 deletions(-) + +commit ce889189c1f8ef5b400a17f623dcb8b935d1102b +Author: Behdad Esfahbod +Date: Wed Oct 21 11:23:12 2015 -0200 + + Fix two more -Wshadow warnings + + https://bugzilla.mozilla.org/show_bug.cgi?id=1215894 + + src/hb-open-type-private.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 4a6b1eedbb0044b57505eea65a329d2dc4f9f917 +Author: Behdad Esfahbod +Date: Wed Oct 21 11:20:55 2015 -0200 + + Fix one more -Wshadow warning + + https://bugzilla.mozilla.org/show_bug.cgi?id=1215894 + + src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 6f932bc8f9045b224613a617af2b4f3450c79467 +Author: Behdad Esfahbod +Date: Wed Oct 21 11:16:49 2015 -0200 + + Fix a few more -Wshadow-local warnings + + https://bugzilla.mozilla.org/show_bug.cgi?id=1215894 + + src/hb-ot-shape-complex-indic.cc | 10 +++++----- + src/hb-ot-shape-complex-myanmar.cc | 10 +++++----- + src/hb-ot-shape-complex-use.cc | 10 +++++----- + 3 files changed, 15 insertions(+), 15 deletions(-) + +commit b90cb366d7723c28758c6b75a0770613fbb5456e +Author: Behdad Esfahbod +Date: Wed Oct 21 11:13:21 2015 -0200 + + Fix one -Wshadow-compatible-local warning + + From https://bugzilla.mozilla.org/show_bug.cgi?id=1215894 + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 50e5750bd8670b4cf4463471a2348d4c99c9d054 +Author: Behdad Esfahbod +Date: Wed Oct 21 11:10:10 2015 -0200 + + Avoid unnecessary cast to 64-bit + + Fixes https://github.com/behdad/harfbuzz/issues/146 + + Or I think it should. + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 305d2fbf5a2db51447c8ed894a48a88896930673 +Author: Behdad Esfahbod +Date: Wed Oct 21 11:04:28 2015 -0200 + + Add HB_FALLTHROUGH + + Borrowed from https://bugzilla.mozilla.org/show_bug.cgi?id=1215411 + + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape-fallback.cc | 4 +++- + src/hb-private.hh | 30 ++++++++++++++++++++++++++++++ + 4 files changed, 35 insertions(+), 3 deletions(-) + +commit f35b3e931ddacd075c5d0810e9b17de07b232ee2 +Author: Ebrahim Byagowi +Date: Fri Sep 11 09:48:12 2015 +0430 + + Add a prototype of DirectWrite as a shaping backend + + src/hb-directwrite.cc | 827 ++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-directwrite.h | 34 +++ + src/hb-shaper-list.hh | 3 + + 3 files changed, 864 insertions(+) + +commit 6486e3755482563ecd89aeb3f8348ed190945e26 +Author: Behdad Esfahbod +Date: Tue Oct 20 16:39:41 2015 -0200 + + Fix typo + + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 753ea7b90904c951c199861409458bea182abb37 +Author: Behdad Esfahbod +Date: Tue Oct 20 15:21:18 2015 -0200 + + Add BUILD.md to dist + + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 5d7a30fde09320c2c62c7c73570ce3f2e298eba6 +Merge: 904b0dc3 2fb95a0c +Author: Behdad Esfahbod +Date: Tue Oct 20 15:19:41 2015 -0200 + + Merge pull request #148 from ebraminio/inst + + Add BUILD.md based on harfbuzz.org docs + +commit 904b0dc3811464cf61dc9457664de95ee4f61a86 +Merge: 86cadc2c ba096bcc +Author: Behdad Esfahbod +Date: Mon Oct 19 16:59:43 2015 -0200 + + Merge pull request #147 from ebraminio/dockerci + + [ci] change to docker infrastructure + +commit ba096bcc28ca80e2096e0a15191848fcd175e395 +Author: Ebrahim Byagowi +Date: Mon Oct 19 21:41:01 2015 +0330 + + [ci] change to docker infrastructure + + .travis.yml | 24 ++++++++++++++++-------- + 1 file changed, 16 insertions(+), 8 deletions(-) + +commit 2fb95a0c9d2cb8b03b7c158706d6b0e41283a6df +Author: Ebrahim Byagowi +Date: Mon Oct 19 22:02:12 2015 +0330 + + Add BUILD.md based on harfbuzz.org docs + + BUILD.md | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +commit 86cadc2cd4171050e9d74306b76c42f6ec74b861 +Author: Behdad Esfahbod +Date: Thu Oct 15 20:25:29 2015 -0300 + + 1.0.6 + + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit ca97ea7aa2cb7186f432aaba76f4f151aa90c1d0 +Author: Behdad Esfahbod +Date: Thu Oct 15 20:20:22 2015 -0300 + + [ft] Revert change-of-behavior of hb_ft_font_create() introduced in 1.0.5 + + The default FreeType load flags where changed from FT_LOAD_NO_HINTING + to FT_LOAD_DEFAULT in 2a9627c5641cd000e2adff0e42a0dc687b53ec70. + This is crashing HarfBuzz-enabled FreeType as I suppose it causes + infinite recursion between HB and FT autohinter... + + Revert the behavior change. + + Fixes https://github.com/behdad/harfbuzz/issues/143 + + src/hb-ft.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 338ffec9e4a5819f2be21c3a320a567378c977b1 +Author: Behdad Esfahbod +Date: Thu Oct 15 12:55:57 2015 -0300 + + Add tests for a couple of fixed issues found by libFuzzer + + From: + https://github.com/behdad/harfbuzz/issues/139#issuecomment-147616887 + https://github.com/behdad/harfbuzz/issues/139#issuecomment-148289957 + + .../sha1sum/375d6ae32a3cbe52fbf81a4e5777e3377675d5a3.ttf | Bin 0 -> 1024 bytes + .../sha1sum/641bd9db850193064d17575053ae2bf8ec149ddc.ttf | Bin 0 -> 305 bytes + test/shaping/fonts/sha1sum/MANIFEST | 2 ++ + test/shaping/tests/fuzzed.tests | 2 ++ + 4 files changed, 4 insertions(+) + +commit 63ef0b41dc48d6112d1918c1b1de9de8ea90adb5 +Author: Behdad Esfahbod +Date: Thu Oct 15 12:47:22 2015 -0300 + + [ot-font] Fix hmtx wrong table length check + + Discovered by libFuzzer. Ouch! + + https://github.com/behdad/harfbuzz/issues/139#issuecomment-148289957 + + src/hb-ot-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 613e630617074eb9b62b794cc37c9b42a7fb079b +Author: Behdad Esfahbod +Date: Tue Oct 13 23:33:28 2015 -0300 + + Reduce max nesting level from 8 to 6 + + We probably should implement better system to catch cyclic lookups. + But for now, this speeds up worst case behavior with broken fonts + considerably without compromising legitimate usecases. + + https://github.com/behdad/harfbuzz/issues/139#issuecomment-147788447 + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ab170529246ad80830bef2b3c8b48e9a8d2b7483 +Author: Behdad Esfahbod +Date: Tue Oct 13 10:55:33 2015 -0300 + + 1.0.5 + + NEWS | 24 ++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 25 insertions(+), 1 deletion(-) + +commit ed13e2ce509408f849255be1d3cc3dbd7dbb3ba2 +Author: Behdad Esfahbod +Date: Tue Oct 13 10:32:56 2015 -0300 + + [ot-font] Fix leak + + https://github.com/behdad/harfbuzz/issues/139#issuecomment-147616887 + + src/hb-ot-font.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 55db94be2b754ba9b9121f09abcf8496c798affc +Author: Behdad Esfahbod +Date: Tue Oct 13 00:33:59 2015 -0400 + + Add test for previous commit + + .../sha1sum/0509e80afb379d16560e9e47bdd7d888bebdebc6.ttf | Bin 0 -> 61 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/fuzzed.tests | 1 + + 3 files changed, 2 insertions(+) + +commit f96664974774bfeb237a7274f512f64aaafb201e +Author: Behdad Esfahbod +Date: Tue Oct 13 00:30:50 2015 -0400 + + Fix another memory access issue discovered by libFuzzer + + Fixes https://github.com/behdad/harfbuzz/issues/139#issuecomment-146984679 + + src/hb-ot-layout-gpos-table.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit c1a5dc46c2231f7b62421e06b9766ccfebaf3ef5 +Author: Behdad Esfahbod +Date: Mon Oct 12 17:39:52 2015 -0400 + + [fuzz] Add fuzzing script from kcc@ + + https://github.com/behdad/harfbuzz/issues/139 + + test/fuzzing/hb-fuzzer.cc | 47 +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 47 insertions(+) + +commit cc6ea308d4c99b9dd6d625fa3a9b0ef62fa2614f +Author: Behdad Esfahbod +Date: Mon Oct 12 17:21:52 2015 -0400 + + Extern "C" custom-allocator declerations + + src/hb-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 98c6fccc00062ead7a86892dd059aa13d266b981 +Author: Behdad Esfahbod +Date: Sun Oct 11 21:41:04 2015 -0400 + + Add test for ee9b0b6cb5fdb08671ab064f26c299135f828260 + + .../sha1sum/5a5daf5eb5a4db77a2baa3ad9c7a6ed6e0655fa8.ttf | Bin 0 -> 61 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/fuzzed.tests | 1 + + 3 files changed, 2 insertions(+) + +commit 50f489a0a013fc589626bb532a9f64f50bb41f58 +Author: Behdad Esfahbod +Date: Sun Oct 11 20:59:29 2015 -0400 + + Typo + + src/hb-font-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ee9b0b6cb5fdb08671ab064f26c299135f828260 +Author: Behdad Esfahbod +Date: Fri Oct 9 14:23:15 2015 -0400 + + Fix another sanitize bug + + Also discovered by "libFuzzer". + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 34379b49e6922b86c15ee62f7fe3bf016cdc2514 +Author: Behdad Esfahbod +Date: Fri Oct 9 12:34:02 2015 -0400 + + Add test for previous fix + + test/shaping/Makefile.am | 1 + + .../sha1sum/1a6f1687b7a221f9f2c834b0b360d3c8463b6daf.ttf | Bin 0 -> 64 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/fuzzed.tests | 1 + + 5 files changed, 4 insertions(+) + +commit f396fbb000dc1c8acddbf6a16e193b328c5e551e +Author: Behdad Esfahbod +Date: Fri Oct 9 12:25:55 2015 -0400 + + Fix return value of sanitize when subformat is not readable + + This is a fix on top of the previous issue fixed in + c917965b9e6fe2b21ed6c51559673288fa3af4b7. + + This was caught by "libFuzzer" testing. + + src/hb-open-type-private.hh | 2 ++ + src/hb-ot-layout-gpos-table.hh | 15 +++++++-------- + src/hb-ot-layout-gsub-table.hh | 13 ++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + 4 files changed, 19 insertions(+), 19 deletions(-) + +commit 77a1a2bc18e7b04d4e352a8777ccce345b2f8659 +Author: Behdad Esfahbod +Date: Fri Oct 9 12:20:58 2015 -0400 + + Add hb_dispatch_context_t + + src/hb-open-type-private.hh | 26 ++++++++++++++++++++++---- + src/hb-ot-layout-gsubgpos-private.hh | 36 ++++++++++++------------------------ + src/hb-ot-layout.cc | 8 +++----- + 3 files changed, 37 insertions(+), 33 deletions(-) + +commit 3e905e396bcd745bda88e751998a76556c5cb8c6 +Author: Behdad Esfahbod +Date: Thu Oct 8 12:51:02 2015 -0400 + + Add hb_font_set_parent() + + No reason to not have it. Makes life easier later. + We (hb-ft, hb-ot-font, etc) can use this API to inject new + parent into a font... + + src/hb-font.cc | 26 ++++++++++++++++++++++++++ + src/hb-font.h | 4 ++++ + test/api/test-font.c | 12 ++++++++++++ + 3 files changed, 42 insertions(+) + +commit edeb3dabf4a589d67c3f1da7ba43a74e4d3a9afd +Author: Behdad Esfahbod +Date: Thu Oct 8 12:47:15 2015 -0400 + + [ft] Add version for new API + + src/hb-ft.cc | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit 2a9627c5641cd000e2adff0e42a0dc687b53ec70 +Author: Behdad Esfahbod +Date: Wed Oct 7 17:33:20 2015 -0400 + + [ft] API: Add hb_font_[sg]et_load_flags() API + + This changes the default load_flags of fonts created using + hb_ft_font_create() from NO_HINTING to DEFAULT. Hope that doesn't + break too much client code. + + Code calling hb_ft_font_set_funcs() is unaffected. + + src/hb-ft.cc | 163 +++++++++++++++++++++++++++++++++++++++-------------------- + src/hb-ft.h | 13 +++-- + 2 files changed, 118 insertions(+), 58 deletions(-) + +commit 3224a594dcf2164b5585b4ccba34f244af3f61b9 +Author: Behdad Esfahbod +Date: Wed Oct 7 17:33:02 2015 -0400 + + Minor + + src/hb-ot-font.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 52b418555b62a3b25399f202c1fa72ab7288c224 +Author: Behdad Esfahbod +Date: Sat Oct 3 13:20:55 2015 +0100 + + Allow compiling with custom allocators + + User can define hb_malloc_impl, etc, to name of custom allocator functions + that have the same signature as malloc. + + src/hb-private.hh | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit 88da7bba9fa4665b33f5bfcd45add7443097eaf3 +Author: Behdad Esfahbod +Date: Fri Oct 2 14:38:20 2015 +0100 + + Default font scale to face upem + + Makes for a better default and avoids nasty inheritance issues. + See mailing list thread "Default hb_font_t scale". + + src/hb-font.cc | 2 ++ + test/api/test-font.c | 13 ++++++++----- + 2 files changed, 10 insertions(+), 5 deletions(-) + +commit 1866e17114b41d565eb066e7d9393c2ff3e0a12b +Author: Behdad Esfahbod +Date: Fri Oct 2 14:21:29 2015 +0100 + + Make hb_font_create_sub_font() NOT make parent immutable + + We don't rely on that. However, whenever hb_font_make_immutable() + is called, it makes its parenting chain immutable. + + src/hb-font.cc | 4 +++- + test/api/test-font.c | 21 +++++++++++++++------ + 2 files changed, 18 insertions(+), 7 deletions(-) + +commit 980e25cad2e58c31f5361862b9223d94ec47fc7a +Author: Behdad Esfahbod +Date: Fri Oct 2 08:21:12 2015 +0100 + + Fix hb-ot-shape-normalize with empty buffer + + Part of https://github.com/behdad/harfbuzz/issues/136 + + src/hb-ot-shape-normalize.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit a5efaac4ff61b587f228830b265b39fe8e5e4e47 +Author: Behdad Esfahbod +Date: Fri Oct 2 08:02:29 2015 +0100 + + Replace a couple of malloc()s with calloc() + + src/hb-face.cc | 2 +- + src/hb-shape-plan.cc | 2 +- + src/hb-shaper.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 26ba4d1e1fb8949632fe08e6a7600badfba4f142 +Author: Behdad Esfahbod +Date: Fri Oct 2 07:25:52 2015 +0100 + + Fix segfault with empty buffer in hb_shape_plan_execute() + + Move the empty-buffer check from hb_shape_full() to hb_shape_plan_execute(). + + Reported by Simon Cozens. + + src/hb-shape-plan.cc | 9 +++++++-- + src/hb-shape.cc | 5 ----- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 432ffc47a46d41bea17d839d0d3980e654c6e638 +Author: Behdad Esfahbod +Date: Wed Sep 30 22:51:16 2015 +0100 + + 1.0.4 + + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit b47159011ca518c3b94d782ed16a91ffe9dd2ab2 +Author: Behdad Esfahbod +Date: Tue Sep 29 14:57:02 2015 +0100 + + Define return_trace() + + Not functional change (expected!). + + src/hb-open-file-private.hh | 20 +-- + src/hb-open-type-private.hh | 62 +++---- + src/hb-ot-cmap-table.hh | 56 +++---- + src/hb-ot-glyf-table.hh | 4 +- + src/hb-ot-head-table.hh | 2 +- + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-ot-layout-common-private.hh | 108 ++++++------- + src/hb-ot-layout-gdef-table.hh | 44 ++--- + src/hb-ot-layout-gpos-table.hh | 252 +++++++++++++++-------------- + src/hb-ot-layout-gsub-table.hh | 304 ++++++++++++++++++----------------- + src/hb-ot-layout-gsubgpos-private.hh | 205 +++++++++++------------ + src/hb-ot-layout-jstf-table.hh | 35 ++-- + src/hb-ot-maxp-table.hh | 5 +- + src/hb-ot-name-table.hh | 14 +- + src/hb-private.hh | 6 +- + 16 files changed, 575 insertions(+), 546 deletions(-) + +commit c917965b9e6fe2b21ed6c51559673288fa3af4b7 +Author: Behdad Esfahbod +Date: Tue Sep 29 14:45:35 2015 +0100 + + Add missing returns + + Fixes possible invalid read of two bytes. + + Reported by Behzad Najjarpour Jabbari, Secunia Research. + + src/hb-ot-layout-gpos-table.hh | 14 +++++++------- + src/hb-ot-layout-gsub-table.hh | 12 ++++++------ + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + 3 files changed, 17 insertions(+), 17 deletions(-) + +commit f3159ba5141c2ab0e430e64742972df140f91c43 +Author: Behdad Esfahbod +Date: Tue Sep 29 14:34:56 2015 +0100 + + Micro-optimize hb_language_from_string() + + As measured / improved by Benson Limketkai. + + src/hb-common.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit f2ad935e19338a29113492150f0c5a5fd5befd75 +Author: Sascha Brawer +Date: Sun Jun 28 03:29:47 2015 +0200 + + Handle language tags that indicate phonetic IPA transcription + + The BCP-47 registry defines a variant subtag "fonipa" that can be used + in combination with arbitrary other language tags. For example, + "rm-CH-fonipa-sursilv" indicates the Sursilvan dialect of Romansh + as used in Switzerland, transcribed used the International Phonetic + Alphabet. + + http://www.iana.org/assignments/language-subtag-registry/language-subtag-registry + + src/hb-ot-tag.cc | 15 ++++++++++++++- + test/api/test-ot-tag.c | 7 +++++++ + 2 files changed, 21 insertions(+), 1 deletion(-) + +commit b8811429b6810c4f13be087b593a862c17d9d987 +Author: Behdad Esfahbod +Date: Thu Sep 3 15:53:22 2015 +0430 + + Fix Since tags + + Fixes https://github.com/behdad/harfbuzz/issues/103 + + src/hb-blob.cc | 24 +++++++++---------- + src/hb-buffer-serialize.cc | 10 ++++---- + src/hb-buffer.cc | 58 +++++++++++++++++++++++----------------------- + src/hb-buffer.h | 9 +++++++ + src/hb-common.cc | 24 +++++++++---------- + src/hb-common.h | 3 +++ + src/hb-coretext.cc | 3 +++ + src/hb-font.h | 18 +++++++------- + src/hb-ft.cc | 6 ++--- + src/hb-graphite2.cc | 6 +++++ + src/hb-ot-layout.cc | 2 +- + src/hb-ot-tag.cc | 2 +- + src/hb-set.h | 3 +++ + src/hb-shape.cc | 2 +- + src/hb-unicode.cc | 18 +++++++------- + src/hb-unicode.h | 10 ++++---- + 16 files changed, 111 insertions(+), 87 deletions(-) + +commit 5d74ff02ab01df67808b416af8bb9cefb06f841e +Author: Behdad Esfahbod +Date: Thu Sep 3 14:55:59 2015 +0430 + + Fix Since: version tags on font and face APIs + + A while back we marked every API as version:1.0. We should fix them all + to reflect real version they were introduced. This is a start. + + Patch from Nikolay Sivov. + + src/hb-face.cc | 22 ++++++++--------- + src/hb-font.cc | 76 +++++++++++++++++++++++++++++----------------------------- + 2 files changed, 49 insertions(+), 49 deletions(-) + +commit 7f5405397406a24c5a001b5ef43dcf4d6926415e +Author: Behdad Esfahbod +Date: Tue Sep 1 17:03:50 2015 +0100 + + 1.0.3 + + NEWS | 11 +++++++++++ + configure.ac | 2 +- + 2 files changed, 12 insertions(+), 1 deletion(-) + +commit 5828c45d7a816ccd0a7f10a665ea3cf8cfd63b05 +Author: Behdad Esfahbod +Date: Tue Sep 1 16:26:35 2015 +0100 + + [indic] Add comments to merge_clusters calls + + src/hb-ot-shape-complex-indic.cc | 21 ++++++++++++++++----- + 1 file changed, 16 insertions(+), 5 deletions(-) + +commit bdc8215949a7add742cc800b4fdea6acaa37d152 +Author: Behdad Esfahbod +Date: Tue Sep 1 16:24:54 2015 +0100 + + [thai] Respect cluster-level > 0 + + src/hb-ot-shape-complex-thai.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5b31fe383ead726ec77062501ed3bb24c02842b3 +Author: Behdad Esfahbod +Date: Tue Sep 1 16:24:34 2015 +0100 + + [use] Merge /before/ reordering + + src/hb-ot-shape-complex-use.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0d438f89bd9422c66838c776eb4aa867de0a2ad8 +Author: Behdad Esfahbod +Date: Tue Sep 1 16:24:13 2015 +0100 + + [hangul] Merge /before/ reordering + + src/hb-ot-shape-complex-hangul.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f883de664fc4bfe01e30c89e07e31dc113f906d9 +Author: Behdad Esfahbod +Date: Tue Sep 1 16:23:40 2015 +0100 + + [OT] Merge /before/ reordering + + src/hb-ot-shape.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit c403d6320074455a5e8e48902c0ac4ee9685e33d +Author: Behdad Esfahbod +Date: Tue Sep 1 16:15:25 2015 +0100 + + [myanmar] Use buffer->sort() to sort cluster + + This can possibly produce more granular clusters. + + src/hb-ot-shape-complex-myanmar.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit e995d33c10a4bd9404699d01bddb2b69d811e9ed +Author: Behdad Esfahbod +Date: Tue Sep 1 16:13:32 2015 +0100 + + [OT] Merge clusters when reordering marks for normalization + + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=541608 + and cluster test. + + src/hb-buffer-private.hh | 2 ++ + src/hb-buffer.cc | 21 +++++++++++++++++++++ + src/hb-ot-shape-normalize.cc | 2 +- + 3 files changed, 24 insertions(+), 1 deletion(-) + +commit b6d7d161a87b5dde710924e5c557d39c302f5630 +Author: Behdad Esfahbod +Date: Tue Sep 1 16:12:44 2015 +0100 + + [tests] Add Hebrew test for normalization under cluster-level=1 + + Currently fails. + https://bugzilla.gnome.org/show_bug.cgi?id=541608 + + .../sha1sum/43ef465752be9af900745f72fe29cb853a1401a5.ttf | Bin 0 -> 4272 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/cluster.tests | 1 + + 3 files changed, 2 insertions(+) + +commit 93099748e39740a3f6f003c83d9dec1d21660ce8 +Author: Behdad Esfahbod +Date: Tue Sep 1 16:11:27 2015 +0100 + + Minor + + src/hb-private.hh | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 85846b3de7491b6a07fed6a2c0c6c1b09943b249 +Author: Behdad Esfahbod +Date: Tue Sep 1 15:07:52 2015 +0100 + + Use insertion-sort instead of bubble-sort + + Needed for upcoming merge-clusters fix. + + src/hb-buffer.cc | 4 +-- + src/hb-ot-shape-complex-arabic-fallback.hh | 6 ++-- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape-normalize.cc | 6 ++-- + src/hb-private.hh | 56 +++++++++++++----------------- + 6 files changed, 34 insertions(+), 42 deletions(-) + +commit fad2674874591b4a1df822603144c8864f5364c1 +Author: Behdad Esfahbod +Date: Tue Sep 1 14:45:46 2015 +0100 + + Minor + + test/Makefile.am | 4 ++++ + test/api/Makefile.am | 4 ++++ + test/shaping/Makefile.am | 4 ++++ + 3 files changed, 12 insertions(+) + +commit 23e4fac6de913201f263a73e13d3c1fab31d1bdd +Author: Behdad Esfahbod +Date: Mon Aug 31 19:41:01 2015 +0100 + + Update git.mk from upstream + + git.mk | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +commit 5783e05f81bbf6debf2618c8994d6852630d9847 +Author: Behdad Esfahbod +Date: Mon Aug 31 19:18:10 2015 +0100 + + [docs] Move docs/reference/ contents into docs/ + + configure.ac | 3 +- + docs/Makefile.am | 117 ++++++++++++++++++++++++++- + docs/{reference => }/harfbuzz-docs.xml | 0 + docs/{reference => }/harfbuzz-overrides.txt | 0 + docs/{reference => }/harfbuzz-sections.txt | 0 + docs/reference/Makefile.am | 118 ---------------------------- + docs/{reference => }/usermanual-ch01.xml | 0 + docs/{reference => }/usermanual-ch02.xml | 0 + docs/{reference => }/usermanual-ch03.xml | 0 + docs/{reference => }/usermanual-ch04.xml | 0 + docs/{reference => }/usermanual-ch05.xml | 0 + docs/{reference => }/usermanual-ch06.xml | 0 + docs/{reference => }/version.xml.in | 0 + 13 files changed, 117 insertions(+), 121 deletions(-) + +commit cd5e3a13a6e0b6606d3a421f8cd44cdfb8314907 +Author: Behdad Esfahbod +Date: Mon Aug 31 19:16:41 2015 +0100 + + [docs] Fix out-of-tree build + + docs/reference/Makefile.am | 9 ++++++++- + docs/reference/harfbuzz-docs.xml | 12 ++++++------ + docs/{ => reference}/usermanual-ch01.xml | 0 + docs/{ => reference}/usermanual-ch02.xml | 0 + docs/{ => reference}/usermanual-ch03.xml | 0 + docs/{ => reference}/usermanual-ch04.xml | 0 + docs/{ => reference}/usermanual-ch05.xml | 0 + docs/{ => reference}/usermanual-ch06.xml | 0 + 8 files changed, 14 insertions(+), 7 deletions(-) + +commit 3899795fa3c3e058e3885ec7a6638f0597a752cc +Merge: d2059652 01e16e88 +Author: Behdad Esfahbod +Date: Mon Aug 31 10:46:01 2015 +0100 + + Merge pull request #131 from simoncozens/docs + + Use gtk-doc to build user's manual as well as reference + +commit 01e16e88f50b65b82dcb84773f532f18a351319f +Author: Simon Cozens +Date: Mon Aug 31 10:40:17 2015 +0100 + + Combine user / reference information into gtk-doc generated manual. + + docs/reference/harfbuzz-docs.xml | 91 +++++++++++++++++++++++----------------- + 1 file changed, 52 insertions(+), 39 deletions(-) + +commit 11a07c4729174e1d4af028103ecb0a351e4c2707 +Author: Simon Cozens +Date: Mon Aug 31 10:39:10 2015 +0100 + + Correct tag hierarchy, to allow for table-of-contents entries. + + docs/usermanual-ch01.xml | 12 ++++++------ + docs/usermanual-ch02.xml | 8 ++++---- + docs/usermanual-ch03.xml | 24 ++++++++++++------------ + docs/usermanual-ch04.xml | 16 ++++++++-------- + docs/usermanual-ch05.xml | 12 ++++++------ + 5 files changed, 36 insertions(+), 36 deletions(-) + +commit 387d6af428ddd5d4f211fe5748412011013a3826 +Author: Simon Cozens +Date: Mon Aug 31 10:31:09 2015 +0100 + + Missing tag (oops). + + docs/usermanual-ch02.xml | 1 + + 1 file changed, 1 insertion(+) + +commit d205965286798af4b7ad07e1eafa58288bee4bdb +Author: Behdad Esfahbod +Date: Mon Aug 31 10:12:05 2015 +0100 + + [docs] Fix typo + + docs/usermanual-ch03.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c424b41705b50055c7f92b268cf78a2680af73af +Merge: 31594b98 5470e744 +Author: Behdad Esfahbod +Date: Mon Aug 31 09:53:16 2015 +0100 + + Merge pull request #129 from simoncozens/docs + + First two chapters. More to follow. + +commit 31594b98af0c9181982c77d8d3803753007f8fd4 +Author: Behdad Esfahbod +Date: Sun Aug 30 17:33:04 2015 +0100 + + [test] Fix test-object + + See previous commit. + + test/api/test-object.c | 4 ---- + 1 file changed, 4 deletions(-) + +commit 326b5ebf5748f547e4eb7388d66b79fe23130e2a +Author: Behdad Esfahbod +Date: Sun Aug 30 17:29:21 2015 +0100 + + Poison freed objects such that double-free is detected + + Previously we were setting refcount of freed objects to the inert value, which + was harmful because it caused further destroy()s of the freed object to NOT + call free() and hence hide the bug. Indeed, after eb0bf3ae6688b7 test-object + was double-free'ing objects and this was never caught on Linux. It only was + caught as crashing on Mac. + + Now we poison refcount upon freeing and check that it's valid whenever reading + it. Makes test-object fail now. + + src/hb-object-private.hh | 21 ++++++++++++++++----- + 1 file changed, 16 insertions(+), 5 deletions(-) + +commit 5470e744dd264c2dc33437a68d20bcf7c5ffb905 +Author: Simon Cozens +Date: Sat Aug 29 08:21:18 2015 +0100 + + Current state and skeleton outline + + docs/usermanual-ch03.xml | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ + docs/usermanual-ch04.xml | 18 +++++++++++ + docs/usermanual-ch05.xml | 13 ++++++++ + docs/usermanual-ch06.xml | 8 +++++ + 4 files changed, 116 insertions(+) + +commit 6578575cc8aeb05341f2053039acfcd735707674 +Author: Behdad Esfahbod +Date: Tue Aug 25 20:24:59 2015 +0100 + + [GPOS] Fix cursive connection with mix of RTL and non-RTL lookups + + See thread "Issue with cursive attachment" started by Khaled. + Turned out fixing this wasn't as bad as I had assumed. I like the + new code better; we now have a theoretical model of cursive + connections that is easier to reason about. + + src/hb-ot-layout-gpos-table.hh | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +commit 7368da67244ea53195cd9b95a5c57485df695732 +Author: Behdad Esfahbod +Date: Tue Aug 25 20:28:39 2015 +0100 + + [test] Add test for cursive-positioning with mixed directions + + Fails now. Fix coming. See thread "Issue with cursive attachment" + started by Khaled. Test fonts were made by modifying test font + from Khaled to add more anchors. + + test/shaping/Makefile.am | 1 + + .../sha1sum/298c9e1d955f10f6f72c6915c3c6ff9bf9695cec.ttf | Bin 0 -> 2520 bytes + test/shaping/fonts/sha1sum/MANIFEST | 2 ++ + .../sha1sum/c4e48b0886ef460f532fb49f00047ec92c432ec0.ttf | Bin 0 -> 2512 bytes + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/cursive-positioning.tests | 2 ++ + 6 files changed, 6 insertions(+) + +commit f0807654da160bd7ceb9aff5b8338ec0b643171c +Author: Simon Cozens +Date: Tue Aug 25 19:57:15 2015 +0100 + + First two chapters. More to follow. + + docs/usermanual-ch01.xml | 115 ++++++++++++++++++++++++++++++ + docs/usermanual-ch02.xml | 182 +++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 297 insertions(+) + +commit 58f2a73fb95af42e264a91cdef7bb5a89e965601 +Author: Behdad Esfahbod +Date: Tue Aug 25 18:55:34 2015 +0100 + + [GPOS] Rewrite cursive attachment slightly differently + + In anticipation for upcoming fix for bug reported by + Khaled in thread "Issue with cursive attachment". + + src/hb-ot-layout-gpos-table.hh | 36 ++++++++++++++++++++++++------------ + 1 file changed, 24 insertions(+), 12 deletions(-) + +commit fdd1770e006ca2d2973c049177ceda87a575e07f +Author: Behdad Esfahbod +Date: Mon Aug 24 13:49:55 2015 +0100 + + Add API/cmdline to show glyph extents when serializing buffer + + New API: HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS + + hb-shape now accepts --show-extents. + + Patch from Simon Cozens. + + src/hb-buffer-serialize.cc | 17 +++++++++++++++++ + src/hb-buffer.h | 3 ++- + util/hb-shape.cc | 2 ++ + util/options.cc | 1 + + util/options.hh | 2 ++ + 5 files changed, 24 insertions(+), 1 deletion(-) + +commit 2cee5b68a07b99214ef9428fe5d03e7b378a558f +Author: Behdad Esfahbod +Date: Mon Aug 24 13:45:12 2015 +0100 + + [ot-font] Fix short-offset calculation + + src/hb-ot-font.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b50fcfa82994f93568a54dd1eb7fd327f6db5586 +Author: Behdad Esfahbod +Date: Sun Aug 23 14:42:20 2015 +0100 + + [ot-font] Implement glyph_extents() for TrueType fonts + + This brings ot-fonts into almost-complete shape and mostly in par with + ft font. + + src/Makefile.am | 1 + + src/hb-font.h | 9 +++-- + src/hb-ot-font.cc | 90 +++++++++++++++++++++++++++++++++++++++-- + src/hb-ot-glyf-table.hh | 104 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-head-table.hh | 3 +- + 5 files changed, 198 insertions(+), 9 deletions(-) + +commit 0299b45000b5047c0b9bf0fe51f3b8b68a7982f8 +Author: Behdad Esfahbod +Date: Fri Aug 21 12:44:36 2015 +0100 + + Make BYTE a real type + + src/hb-open-type-private.hh | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +commit ed6962c795ae7c54aaee9ed5667fa65ccf7412bf +Author: Behdad Esfahbod +Date: Thu Aug 20 15:39:53 2015 +0100 + + [coretext] Use i32 instead of u32 as well + + Shouldn't cause *any* functional changes, but is more correct. + + src/hb-coretext.cc | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit 163c435f1807c138da9f74f09d29d913eb9e29e9 +Author: Behdad Esfahbod +Date: Thu Aug 20 15:39:06 2015 +0100 + + [uniscribe] Fix negative offsets + + Ouch! + + src/hb-uniscribe.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 789b89ef7130ffe5f22c571fc3cb4e6d35456654 +Author: Behdad Esfahbod +Date: Wed Aug 19 13:39:57 2015 +0100 + + 1.0.2 + + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit 958c268fa3a520666436e77a2111a3b564a36d96 +Author: Behdad Esfahbod +Date: Wed Aug 19 13:22:12 2015 +0100 + + [coretext] Add TODO item + + src/hb-coretext.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 7c5bee09d9c7c25672c7c77572ebae0b731892d0 +Author: Behdad Esfahbod +Date: Wed Aug 19 13:20:31 2015 +0100 + + [uniscribe] Fix font scale handling + + By default shape at upem (or ppem), and scale results. + Similar to work done in CoreText backend, but using upem as default. + + src/hb-uniscribe.cc | 25 +++++++++++++++++++------ + 1 file changed, 19 insertions(+), 6 deletions(-) + +commit 902e74a098dad8c3b487856284f9fdf99b04f9f1 +Author: Behdad Esfahbod +Date: Tue Aug 18 18:55:03 2015 +0100 + + Commented-out code to print buffer before each lookup + + To be turned into a useful HB_DEBUG_SHAPE infrastructure... + + src/hb-ot-layout.cc | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 75504a50488a6aac0b9789f728fb5b87e641d4c3 +Author: Behdad Esfahbod +Date: Tue Aug 18 18:47:02 2015 +0100 + + Allow serializing buffer with output-buffer being used + + Ie, don't call get_positions() if positions are not + requested for serialization. + + src/hb-buffer-serialize.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit e47b772a56af44a9a4f9ec907ee2091b725b94c1 +Author: Behdad Esfahbod +Date: Tue Aug 18 18:42:47 2015 +0100 + + [ot] Change buffer content type right after we map to glyphs + + Needed for upcoming debug output changes. + + src/hb-ot-shape.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit d104415e4c1e0f9140f794cd8d09c6460c63e966 +Author: Behdad Esfahbod +Date: Tue Aug 18 17:33:34 2015 +0100 + + [Android.mk] Update for SEA removal and USE addition + + Android.mk | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit ddd6bf12f1cabaa298feed820313483b9893528c +Author: Behdad Esfahbod +Date: Tue Aug 18 15:55:09 2015 +0100 + + Don't declare dependency on freetype in harfbuzz.pc + + See comments. + + src/Makefile.am | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 2c8b3b2e5312c9858584f568b1528c57e5bb8a10 +Author: Behdad Esfahbod +Date: Tue Aug 18 14:36:43 2015 +0100 + + [debug] Print lookup index in debug-apply output + + src/hb-ot-layout-gpos-table.hh | 5 ++++- + src/hb-ot-layout-gsub-table.hh | 5 ++++- + src/hb-ot-layout-gsubgpos-private.hh | 7 +++++-- + src/hb-ot-layout.cc | 3 ++- + 4 files changed, 15 insertions(+), 5 deletions(-) + +commit 50ad7788eeb7160caef4ec78e65c7c630e601b06 +Author: Behdad Esfahbod +Date: Tue Aug 18 10:22:16 2015 +0100 + + [coretext] Remove assert that kicks in on Mac OS 10.6 + + http://crbug.com/419769 + + src/hb-coretext.cc | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +commit 2b646fa07f5f9d4d10d563a91d22a2750b5fc771 +Author: Behdad Esfahbod +Date: Mon Aug 17 16:03:28 2015 +0200 + + Remove unused function + + src/hb-ot-shape-complex-use.cc | 8 -------- + 1 file changed, 8 deletions(-) + +commit 23237b0279a04407addf33f599c45faa60f002ca +Author: ThePhD +Date: Fri Aug 14 01:19:08 2015 -0400 + + Last apparent boolean fix! + + src/hb-ot-shape-complex-use.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5c99cf93d6242803bddcac2ca8300fdec7e0f8a7 +Merge: 8ad89f05 539a610e +Author: ThePhD +Date: Fri Aug 14 01:02:00 2015 -0400 + + Merge branch 'master' into vc++-fixes + +commit 539a610e2e72375e598ab29fd390ed9ec93816d5 +Author: Behdad Esfahbod +Date: Tue Aug 11 12:58:49 2015 +0200 + + Add Libs.private and Requires.private to harfbuzz.pc + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=64501 + + configure.ac | 12 +++++++++--- + src/Makefile.am | 15 ++++++++++++--- + src/harfbuzz.pc.in | 2 ++ + 3 files changed, 23 insertions(+), 6 deletions(-) + +commit c7dfe316f8c0fc04b7976fca5e58eb46d91b4821 +Author: jfkthame +Date: Fri Aug 7 17:55:03 2015 +0100 + + Don't rely on .cluster in _hb_ot_shape_normalize() + + Fixes https://github.com/behdad/harfbuzz/pull/124 + + src/hb-ot-shape-normalize.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9099e48e29fe5cfdf8566c8f1ba6ddc8c0799e7e +Author: jfkthame +Date: Fri Aug 7 17:51:28 2015 +0100 + + Don't rely on .cluster field in fallback_position + + Fixes tests/cluster. + + Fixes https://github.com/behdad/harfbuzz/pull/123 + + src/hb-ot-shape-fallback.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit f3792342f670978cdc3f8512fb5e80314ca0678d +Author: Behdad Esfahbod +Date: Sat Aug 8 18:02:18 2015 +0200 + + [tests] Add test for fallback positioning with cluster_level > 0 + + For https://github.com/behdad/harfbuzz/pull/123 + Currently fails. Fix coming. + + test/shaping/Makefile.am | 1 + + .../sha1sum/6466d38c62e73a39202435a4f73bf5d6acbb73c0.ttf | Bin 0 -> 824 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/cluster.tests | 1 + + 5 files changed, 4 insertions(+) + +commit bd22a5cfae24b3b9253bccaeb139e698e74cd0c3 +Author: Behdad Esfahbod +Date: Fri Aug 7 11:13:27 2015 +0200 + + Bug 91559 - HarfBuzz 1.0.1: Inconsistent DLL files specified/created... + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=91559 + + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 02d6439f420d959183dd446abd0b0118ee1ee061 +Merge: 9002c27b 160f6355 +Author: Behdad Esfahbod +Date: Mon Aug 3 22:47:18 2015 +0300 + + Merge pull request #122 from RomainNaour/static-fix + + fix static linking with icu-uc + +commit 160f635523d596f61e292776f638d4eb09673463 +Author: Romain Naour +Date: Wed Jul 22 23:26:23 2015 +0200 + + fix static linking with icu-uc + + When linking test-unicode statically it needs $(ICU_LIBS) + which contains all required flags. + Especially -lstdc++. + + Fixes: + http://autobuild.buildroot.net/results/210/2107f9dfb39eeb6559fb4271c7af8b39aef521ca/ + + Signed-off-by: Romain Naour + + test/api/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9002c27b2f54bb5135db92045c0d770b47317577 +Author: Behdad Esfahbod +Date: Mon Jul 27 12:17:54 2015 +0200 + + 1.0.1 + + NEWS | 9 ++++++++- + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 2 deletions(-) + +commit f1c20e1ba5bf218df7dc3e198bdcf1f449fc9387 +Author: Behdad Esfahbod +Date: Mon Jul 27 12:16:02 2015 +0200 + + [USE] Fix out-of-bounds static array access + + src/hb-ot-shape-complex-use.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 260442346a5756c3538ee8fcbf157d1cddcf6f36 +Author: Behdad Esfahbod +Date: Sun Jul 26 23:39:10 2015 +0200 + + 1.0.0 + + NEWS | 10 ++++++++++ + configure.ac | 4 ++-- + src/Makefile.am | 2 +- + 3 files changed, 13 insertions(+), 3 deletions(-) + +commit df6cb84449a473d540821e41fb5007b59644780f +Merge: 2ed6be66 786ba458 +Author: Behdad Esfahbod +Date: Sun Jul 26 19:40:55 2015 +0200 + + Merge branch 'use' + +commit 2ed6be66703e6cc67f3a3746e197001dad3d9b74 +Author: Behdad Esfahbod +Date: Sun Jul 26 19:29:53 2015 +0200 + + 0.9.42 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit 23e56e088a721863cfdef4f027fb66eecbd77457 +Author: Behdad Esfahbod +Date: Sat Jul 25 17:36:46 2015 +0200 + + Fix broken sentence + + src/hb-set-private.hh | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit 91a2e5d2878a8c0b4d4500e3d52d4fbaaf1ac0d7 +Author: Grigori Goronzy +Date: Wed Jul 8 23:28:11 2015 +0200 + + Update UCDN to upstream commit 8af93f30 + + This adds support for Unicode 8.0 and fixes a bug with wrong properties + for ranges of codepoints. + + src/hb-ucdn.cc | 6 + + src/hb-ucdn/ucdn.h | 6 + + src/hb-ucdn/unicodedata_db.h | 2167 +++++++++++++++++++++--------------------- + 3 files changed, 1118 insertions(+), 1061 deletions(-) + +commit 786ba45847127b9cd4d9c0c01ae0e6c61f3a8e06 +Author: Behdad Esfahbod +Date: Thu Jul 23 13:04:34 2015 +0100 + + [test] Encode Kharoshti text + + Ouch! + + .../in-tree/shaper-use/script-kharoshti/misc.txt | 72 +++++++++++----------- + 1 file changed, 36 insertions(+), 36 deletions(-) + +commit b4231255032e243153a6f32cf8c93c158cb0bf6a +Author: Behdad Esfahbod +Date: Thu Jul 23 13:01:55 2015 +0100 + + [test] Add Batak and Buginese test texts + + test/shaping/texts/in-tree/shaper-use/MANIFEST | 2 + + .../texts/in-tree/shaper-use/script-batak/MANIFEST | 1 + + .../texts/in-tree/shaper-use/script-batak/misc.txt | 9 +++ + .../in-tree/shaper-use/script-buginese/MANIFEST | 1 + + .../in-tree/shaper-use/script-buginese/misc.txt | 70 ++++++++++++++++++++++ + 5 files changed, 83 insertions(+) + +commit b8c159ffccad090974a2b97be0a0140fa09af132 +Author: Behdad Esfahbod +Date: Thu Jul 23 12:59:17 2015 +0100 + + [test] Remove shaper-sea texts under shaper-use + + test/shaping/texts/in-tree/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-sea/MANIFEST | 2 -- + test/shaping/texts/in-tree/shaper-sea/script-cham/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-sea/script-tai-tham/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-use/MANIFEST | 2 ++ + .../{shaper-sea/script-cham/misc => shaper-use/script-cham}/MANIFEST | 0 + .../{shaper-sea/script-cham/misc => shaper-use/script-cham}/misc.txt | 0 + .../script-tai-tham/misc => shaper-use/script-tai-tham}/MANIFEST | 0 + .../script-tai-tham/misc => shaper-use/script-tai-tham}/misc.txt | 0 + .../script-tai-tham/misc => shaper-use/script-tai-tham}/torture.txt | 0 + 10 files changed, 2 insertions(+), 5 deletions(-) + +commit 67ba7320cc5545baeacfcff64cea338223b9bd6d +Author: Behdad Esfahbod +Date: Thu Jul 23 12:58:21 2015 +0100 + + [test] Remove New Tai Lue texts + + New Tai Lue changed encoding to visual, boring, model. + + test/shaping/texts/in-tree/shaper-sea/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-sea/script-new-tai-lue/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-sea/script-new-tai-lue/misc/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-sea/script-new-tai-lue/misc/misc.txt | 1 - + 4 files changed, 4 deletions(-) + +commit c81d957a264539dfe3252f9a94ee066c4a44edf4 +Author: Behdad Esfahbod +Date: Thu Jul 23 12:50:48 2015 +0100 + + [test] Add tests for improved 'vert' feature + + test/shaping/Makefile.am | 1 + + .../sha1sum/191826b9643e3f124d865d617ae609db6a2ce203.ttf | Bin 0 -> 2140 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/vertical.tests | 1 + + 5 files changed, 4 insertions(+) + +commit 8a6a16dbcb1808c7ed50f9ba320384565bbf405a +Author: Behdad Esfahbod +Date: Thu Jul 23 12:49:09 2015 +0100 + + [test] Add recently added test + + Ouch. + + test/shaping/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 895fb31c7f0201f13df5a6866b367476bc4aab2e +Author: Behdad Esfahbod +Date: Thu Jul 23 12:14:03 2015 +0100 + + [test] Support additional options to hb-shape in micro-test suite + + test/shaping/record-test.sh | 47 ++++++++++++++++++---- + test/shaping/run-tests.sh | 9 ++++- + test/shaping/tests/arabic-fallback-shaping.tests | 2 +- + test/shaping/tests/arabic-feature-order.tests | 6 +-- + test/shaping/tests/context-matching.tests | 6 +-- + test/shaping/tests/default-ignorables.tests | 2 +- + test/shaping/tests/hangul-jamo.tests | 4 +- + test/shaping/tests/indic-joiner-candrabindu.tests | 4 +- + test/shaping/tests/indic-old-spec.tests | 4 +- + test/shaping/tests/indic-pref-blocking.tests | 4 +- + .../tests/mongolian-variation-selector.tests | 6 +-- + test/shaping/tests/zero-width-marks.tests | 4 +- + 12 files changed, 67 insertions(+), 31 deletions(-) + +commit 0f98fe88f42471eb8fb28d08d45eca9cd8303f7a +Author: Behdad Esfahbod +Date: Thu Jul 23 11:52:11 2015 +0100 + + [ot] Search globally for 'vert' feature if not found in specified script/lang + + Fixes https://github.com/behdad/harfbuzz/issues/63 + + src/hb-ot-layout-private.hh | 9 +++++++++ + src/hb-ot-layout.cc | 22 ++++++++++++++++++++++ + src/hb-ot-map-private.hh | 7 ++++--- + src/hb-ot-map.cc | 10 ++++++++++ + src/hb-ot-shape.cc | 6 +++++- + 5 files changed, 50 insertions(+), 4 deletions(-) + +commit f327aacfa107bbef0c823ef9c3b7dfc91316040c +Author: Behdad Esfahbod +Date: Thu Jul 23 11:32:59 2015 +0100 + + [ot] Minor + + src/hb-ot-shape.cc | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +commit d78463c8016ff1852233479a1ebde30c3bb6de6e +Author: Behdad Esfahbod +Date: Thu Jul 23 10:11:35 2015 +0100 + + Minor debug output fix + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d99f50bde0e8be0866385ca6886938d2023dbd4f +Author: Behdad Esfahbod +Date: Thu Jul 23 10:08:48 2015 +0100 + + Add missing TRACE_RETURN + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2dc8e3f470d7c0b579f867605b8bf40688bc5722 +Author: Behdad Esfahbod +Date: Thu Jul 23 10:07:21 2015 +0100 + + [ot] Add missing return! + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 582069172c39326c7f94373793c656439a4c2b59 +Author: Behdad Esfahbod +Date: Wed Jul 22 18:44:59 2015 +0100 + + Add test case for deleting default ignorables with positioning + + .../sha1sum/051d92f8bc6ff724511b296c27623f824de256e9.ttf | Bin 0 -> 2028 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/default-ignorables.tests | 1 + + 4 files changed, 3 insertions(+) + +commit 8cfbc304ee563ec96e402beed34b10b6c0950a6a +Author: Behdad Esfahbod +Date: Wed Jul 22 18:41:10 2015 +0100 + + Fix hide-default-ignorables after f0010dfd01ef4a927b0bdc175dd4e343a8637174 + + We can't delete things before hb_ot_layout_position_finish(). So, + just zero the advance before it, and remove later. + + src/hb-ot-shape.cc | 25 +++++++++++++++++++------ + 1 file changed, 19 insertions(+), 6 deletions(-) + +commit 2dbd3d29d6548bd96fd976606ed689fac8ad8817 +Author: Behdad Esfahbod +Date: Wed Jul 22 18:28:39 2015 +0100 + + Fix hide-ignorables if font doesn't have space glyph + + Was broken by 82b521aeb7cc73879b44ca4278d6fa8b4347527f, as we have + positioning data by then and can't use the output buffer. Ouch! + + src/hb-buffer-private.hh | 18 ------------------ + src/hb-ot-shape.cc | 44 +++++++++++++++++++++++++++++++++++--------- + 2 files changed, 35 insertions(+), 27 deletions(-) + +commit 4ba796b26ee62de0d2830a550f3aa3b4aecf6f59 +Author: Behdad Esfahbod +Date: Wed Jul 22 17:41:31 2015 +0100 + + Refactor _hb_glyph_info_is_default_ignorable() + + src/hb-ot-layout-gsubgpos-private.hh | 3 +-- + src/hb-ot-layout-private.hh | 4 +++- + src/hb-ot-shape.cc | 9 +++------ + 3 files changed, 7 insertions(+), 9 deletions(-) + +commit f0010dfd01ef4a927b0bdc175dd4e343a8637174 +Author: Behdad Esfahbod +Date: Wed Jul 22 17:36:23 2015 +0100 + + [ot] Hide default-ignorables before finishing off positioning + + For example, fixes the following sequence with Arial XP: + 628 25cc 651 25cc 64e 3a 20 628 651 34f 64e + 628 25cc 64e 25cc 651 3a 20 628 64e 34f 651 + + Discovered as part of: + https://bugs.freedesktop.org/show_bug.cgi?id=85873 + + src/hb-ot-shape.cc | 125 +++++++++++++++++++++++++++-------------------------- + 1 file changed, 63 insertions(+), 62 deletions(-) + +commit 376d587f36b4ff10342ee6ca3bacd73532ea44c8 +Author: Behdad Esfahbod +Date: Wed Jul 22 16:51:12 2015 +0100 + + Implement more granular cluster-merging + + TODO: Documentation. + + Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=71445 + + NEWS | 8 +++++++ + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 46 ++++++++++++++++++++++++++++++++++----- + src/hb-buffer.h | 12 ++++++++++ + src/hb-ot-shape-complex-hangul.cc | 13 +++++------ + src/hb-ot-shape.cc | 7 ++++++ + util/options.cc | 1 + + util/options.hh | 3 +++ + 8 files changed, 77 insertions(+), 14 deletions(-) + +commit a60e2cfa395718cde48eb81f43adc27b4a92e117 +Author: Behdad Esfahbod +Date: Wed Jul 22 15:49:08 2015 +0100 + + [ot] Don't rely on cluster numbers for ensure_native_direction() + + src/hb-ot-shape.cc | 19 ++++++++++++++++++- + 1 file changed, 18 insertions(+), 1 deletion(-) + +commit 701112dad9f6e690b253f1e64f4e7e549f5ae65f +Author: Behdad Esfahbod +Date: Wed Jul 22 15:42:20 2015 +0100 + + [ot] Simplify form_clusters() + + src/hb-buffer-private.hh | 9 ++++++++- + src/hb-buffer.cc | 7 ++----- + src/hb-ot-shape.cc | 11 +++++++++-- + 3 files changed, 19 insertions(+), 8 deletions(-) + +commit 7b8b63adc5e0389fc4cf2720ef7e5804ab6c29cc +Author: Behdad Esfahbod +Date: Wed Jul 22 15:24:26 2015 +0100 + + [ot] Don't mirror character if font doesn't support mirrored character! + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 97d7c3a100e2673279f066540229d229aaf0df78 +Author: Behdad Esfahbod +Date: Wed Jul 22 14:28:25 2015 +0100 + + [graphite2] Fix bunch of stuff + + Based on patch from Martin Hosken, with review from Jonathan and I. + + src/hb-graphite2.cc | 82 +++++++++++++++++++++++++++++++++++------------------ + 1 file changed, 54 insertions(+), 28 deletions(-) + +commit ea7f8414e34d4b5efc7b98974637c08f75440f0e +Author: Behdad Esfahbod +Date: Wed Jul 22 13:53:45 2015 +0100 + + [graphite2] Enlarge buffer for output glyphs! + + src/hb-graphite2.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 9cd59db1af47ff511edf251949d58b82673cf704 +Author: Behdad Esfahbod +Date: Wed Jul 22 13:27:06 2015 +0100 + + [USE] Implement topographical features for non-Arabic-joining scripts + + This works per-syllable as per the spec, but we think it should be per + spacing/base/??? glyph instead. + + src/hb-ot-shape-complex-use.cc | 87 ++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 80 insertions(+), 7 deletions(-) + +commit ecb0b24ef3f8177e7c789f45a2e858bd67e31be3 +Author: Behdad Esfahbod +Date: Wed Jul 22 12:02:09 2015 +0100 + + Use foreach_cluster in Indic shaper + + src/hb-ot-shape-complex-indic.cc | 90 +++++++++------------------------------- + 1 file changed, 19 insertions(+), 71 deletions(-) + +commit 56f71ff98890fc4fd13e8d9743dc34c4b9407309 +Author: Behdad Esfahbod +Date: Wed Jul 22 11:58:11 2015 +0100 + + Use foreach_syllable in Myanmar shaper + + src/hb-ot-shape-complex-myanmar.cc | 62 ++++++++------------------------------ + 1 file changed, 12 insertions(+), 50 deletions(-) + +commit ac596511a8c9eeaeb455ca16b5b9c5f1b9923b3a +Author: Behdad Esfahbod +Date: Wed Jul 22 11:54:02 2015 +0100 + + Add foreach_syllable + + Use it in USE. + + src/hb-ot-layout-private.hh | 24 ++++++++ + src/hb-ot-shape-complex-use.cc | 129 +++++++++++++---------------------------- + 2 files changed, 64 insertions(+), 89 deletions(-) + +commit 8ba9e689680f7685c04cfe7c6019222bdf0c52b0 +Author: Behdad Esfahbod +Date: Wed Jul 22 11:16:01 2015 +0100 + + [USE] Do Arabic-like shaping + + src/hb-ot-shape-complex-use.cc | 77 ++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 75 insertions(+), 2 deletions(-) + +commit 9daf2dfb6bd5683fd951bdf166c8b87938257e52 +Author: Behdad Esfahbod +Date: Wed Jul 22 10:32:30 2015 +0100 + + Add hb-ot-shape-complex-arabic-private.hh + + src/Makefile.am | 1 + + src/hb-ot-shape-complex-arabic-private.hh | 50 +++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-arabic.cc | 37 +++++++++++++---------- + 3 files changed, 73 insertions(+), 15 deletions(-) + +commit a51a661fe1dcfdd3a274a6be6ad741c68d430c8c +Author: Behdad Esfahbod +Date: Tue Jul 21 18:24:21 2015 +0100 + + [USE] Only reorder the first component of a split left mark + + src/hb-ot-shape-complex-use.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit a08a278b15c7e57a1d0a783f2bc877471b9d8229 +Author: Behdad Esfahbod +Date: Tue Jul 21 18:09:40 2015 +0100 + + [USE] Don't compose split matras + + Same logic as in Indic shaper. + + src/hb-ot-shape-complex-use.cc | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +commit 21cb08a417f1203523191192d6a342e8cd0ea14c +Author: Behdad Esfahbod +Date: Tue Jul 21 17:47:06 2015 +0100 + + Remove unused SEA shaper + + src/Makefile.am | 4 - + src/hb-ot-shape-complex-sea-machine.rl | 102 --------- + src/hb-ot-shape-complex-sea.cc | 380 --------------------------------- + 3 files changed, 486 deletions(-) + +commit db1e9cdd41ff7c97c29b4d9b64b2351ed0ef0403 +Author: Behdad Esfahbod +Date: Tue Jul 21 17:46:06 2015 +0100 + + Retire SEA shaper in favor of USE + + src/hb-ot-shape-complex-private.hh | 25 +++---------------------- + 1 file changed, 3 insertions(+), 22 deletions(-) + +commit 87dde9c64753dea4017f11a7734e7528b8eecac0 +Author: Behdad Esfahbod +Date: Tue Jul 21 17:31:43 2015 +0100 + + [USE] Only use USE shaper if script system is not DFLT + + Same logic as Indic and SEA. + + src/hb-ot-shape-complex-private.hh | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +commit 29832d797ff2f3a96721dd44f2f03a83fb2e8dda +Author: Behdad Esfahbod +Date: Tue Jul 21 17:24:18 2015 +0100 + + Route misc untested scripts through USE shaper instead of Indic + + These were never tested with Indic shaper, and indeed wouldn't work there + because they didn't have their viramas and other config defined. They are + all also supported by MS through USE, so route them there. + + src/hb-ot-shape-complex-private.hh | 91 +++++--------------------------------- + 1 file changed, 11 insertions(+), 80 deletions(-) + +commit 40c4a991c7ea18017273ff8993eecc3953869e69 +Author: Behdad Esfahbod +Date: Tue Jul 21 17:14:54 2015 +0100 + + [USE] Implement dotted-circle + + This makes USE feature-complete as far as the Indic-like features + are concerned. + + src/hb-ot-shape-complex-use-machine.rl | 10 ++++++++++ + src/hb-ot-shape-complex-use.cc | 18 +++++++++++++++--- + 2 files changed, 25 insertions(+), 3 deletions(-) + +commit 7ce03ebe7c525919ce22d9094480847ff1b3c2b2 +Author: Behdad Esfahbod +Date: Tue Jul 21 16:55:26 2015 +0100 + + [USE] Move pref + + src/hb-ot-shape-complex-use-machine.rl | 9 +++++---- + src/hb-ot-shape-complex-use-private.hh | 9 +++++---- + src/hb-ot-shape-complex-use.cc | 24 ++++++++++++++++++++++-- + 3 files changed, 32 insertions(+), 10 deletions(-) + +commit 2d4b62ead931b13f95f5dc0e5b740d997a8d1a8e +Author: Behdad Esfahbod +Date: Tue Jul 21 16:46:37 2015 +0100 + + [USE] Fix-up variation selectors and word joiner in table + + src/gen-use-table.py | 7 ++++++- + src/hb-ot-shape-complex-use-table.cc | 34 +++++++++++++++++++++++----------- + 2 files changed, 29 insertions(+), 12 deletions(-) + +commit ad7178227f16abc17456f122deac1508031cbbc3 +Author: Behdad Esfahbod +Date: Tue Jul 21 16:43:27 2015 +0100 + + [USE] Use a couple warnings + + src/gen-use-table.py | 20 ++++----- + src/hb-ot-shape-complex-use-table.cc | 82 ++++++++++++++++++------------------ + 2 files changed, 51 insertions(+), 51 deletions(-) + +commit a85c4da9b1750c2f994f9f85226a3e755fafe50b +Author: Behdad Esfahbod +Date: Tue Jul 21 16:07:10 2015 +0100 + + [USE] Move rphf + + src/hb-ot-shape-complex-use.cc | 105 ++++++++++++++--------------------------- + 1 file changed, 35 insertions(+), 70 deletions(-) + +commit 5b5617e0664e59770910d04d15175f643a5ffb73 +Author: Behdad Esfahbod +Date: Tue Jul 21 15:52:15 2015 +0100 + + Add FLAG_UNSAFE() + + Unused right now. + + src/hb-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit f8160a495966c790b79134a9f9382b6545f8c733 +Author: Behdad Esfahbod +Date: Tue Jul 21 15:50:02 2015 +0100 + + Add FLAG_SAFE() for values known to be small-enough + + And add check to FLAG() + + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 12 ++++++------ + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-private.hh | 5 +++-- + src/hb-unicode-private.hh | 2 +- + 5 files changed, 12 insertions(+), 11 deletions(-) + +commit 366aeaad006b230481a3c08ab4d239fb6b64fef8 +Author: Behdad Esfahbod +Date: Tue Jul 21 15:45:48 2015 +0100 + + Add note re ASSERT_STATIC_EXPR_ZERO() + + src/hb-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit d6adca9fbbbd6fc7c8906121b50c3930fbe2de8e +Author: Behdad Esfahbod +Date: Tue Jul 21 15:17:27 2015 +0100 + + Remove unused macro ASSERT_STATIC_EXPR() + + src/hb-ot-shape-complex-arabic-win1256.hh | 4 ++-- + src/hb-ot-shape-complex-indic-private.hh | 2 -- + src/hb-private.hh | 1 - + 3 files changed, 2 insertions(+), 5 deletions(-) + +commit 1025e1a9e7785ac67cc90d05b02862e38b3e6026 +Author: Behdad Esfahbod +Date: Tue Jul 21 15:05:35 2015 +0100 + + Use unsigned in FLAG() + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cf59c7589c2b4064f4b9f4936115f830089a8ee7 +Author: Behdad Esfahbod +Date: Tue Jul 21 14:51:45 2015 +0100 + + [USE] Use use_category() for rphf/pref memory + + src/hb-ot-shape-complex-use.cc | 63 +++++++++++++++--------------------------- + 1 file changed, 22 insertions(+), 41 deletions(-) + +commit 595936ec25e9c0924851bd1aa1af5eed3723b54f +Author: Behdad Esfahbod +Date: Tue Jul 21 14:15:35 2015 +0100 + + [USE] Hook of rphf and pref custom processing + + Still no reordering. + + src/hb-ot-layout-private.hh | 8 ++ + src/hb-ot-shape-complex-use.cc | 181 +++++++++++++++++++++++++++++++++++++++-- + 2 files changed, 181 insertions(+), 8 deletions(-) + +commit ba72801325e4bd58f7597938d4409762c9fa530c +Author: Behdad Esfahbod +Date: Tue Jul 21 11:57:23 2015 +0100 + + [USE] Add CGJ to table + + src/gen-use-table.py | 13 ++++++++++--- + src/hb-ot-shape-complex-use-table.cc | 1 + + 2 files changed, 11 insertions(+), 3 deletions(-) + +commit 4febed61edc5367543e5a206ae01d3393841b612 +Author: Behdad Esfahbod +Date: Tue Jul 21 10:24:32 2015 +0100 + + [USE] Set up features + + src/hb-ot-shape-complex-use.cc | 68 +++++++++++++++++++++++------------------- + 1 file changed, 38 insertions(+), 30 deletions(-) + +commit 52a957795697085a5d379921ddd8aa6cf2f1a99d +Author: Behdad Esfahbod +Date: Tue Jul 21 10:02:04 2015 +0100 + + [USE] Hook up new scripts to USE shaper + + Don't reroute scripts that we were routing to other shapers + before (just yet). + + src/hb-ot-shape-complex-private.hh | 71 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 71 insertions(+) + +commit b4c0829bc18b696f140a260fa2e1089d10164519 +Author: Behdad Esfahbod +Date: Tue Jul 21 09:31:19 2015 +0100 + + [USE] Remove unused Unicode data enums from USE C++ side + + src/hb-ot-shape-complex-use-private.hh | 66 +--------------------------------- + src/hb-ot-shape-complex-use.cc | 14 ++------ + 2 files changed, 3 insertions(+), 77 deletions(-) + +commit 44910cef626e6d03baa4d89d8fbe2c088971902d +Author: Behdad Esfahbod +Date: Mon Jul 20 18:01:10 2015 +0100 + + [USE] Finish converting Unicode positional categories to USE + + Even compiles. + + src/gen-use-table.py | 114 +++++- + src/hb-ot-shape-complex-use-table.cc | 702 ++++++++++++++++++----------------- + 2 files changed, 467 insertions(+), 349 deletions(-) + +commit ad725552521273a1f571f04bc96a04221c3e067a +Author: Behdad Esfahbod +Date: Mon Jul 20 17:00:06 2015 +0100 + + [USE] Map from Unicode data to USE syllabic categories + + Positional sub-categories not applied yet. + + src/gen-use-table.py | 128 ++-- + src/hb-ot-shape-complex-use-table.cc | 1062 ++++++++++++---------------------- + 2 files changed, 409 insertions(+), 781 deletions(-) + +commit 20e246e674155d5fb6527722fc3ef3accf2413df +Author: Behdad Esfahbod +Date: Mon Jul 20 15:56:19 2015 +0100 + + [USE] Start moving Unicode-to-USE mapping into Python code + + src/Makefile.am | 2 +- + src/gen-use-table.py | 176 +++++++++++++++++++++++++++++++++-- + src/hb-ot-shape-complex-use-table.cc | 3 +- + 3 files changed, 169 insertions(+), 12 deletions(-) + +commit eb74535cc2c0d0de41e54e75bdc71825ec969523 +Author: Behdad Esfahbod +Date: Mon Jul 20 15:33:25 2015 +0100 + + [USE] Fix Number clusters + + The spec wrongly has "H" where "HN" is meant. + + src/hb-ot-shape-complex-use-machine.rl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a9663958fe861950b6f389b389f146232b2cd909 +Author: Behdad Esfahbod +Date: Mon Jul 20 14:24:55 2015 +0100 + + [USE] Start putting together the shaper body + + src/hb-ot-shape-complex-use-private.hh | 2 +- + src/hb-ot-shape-complex-use.cc | 339 +++++++++++++++++++++++++++++++++ + 2 files changed, 340 insertions(+), 1 deletion(-) + +commit e0eabd7f67462ac34fbfc749d897be478fbd1224 +Author: Behdad Esfahbod +Date: Mon Jul 20 13:30:51 2015 +0100 + + [USE] Put a Ragel machine together + + Grammar from the spec! + + src/hb-ot-shape-complex-use-machine.rl | 169 +++++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-use-private.hh | 160 +++++++++++++++++++++++++++++++ + 2 files changed, 329 insertions(+) + +commit fd74b939b176f47d34d34b3d33e2a09d255c2d9e +Author: Behdad Esfahbod +Date: Mon Jul 20 13:30:45 2015 +0100 + + Minor + + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5e5c8560cca3cb9c6be90c7c18ecb77d5cca0c0f +Author: Behdad Esfahbod +Date: Mon Jul 20 12:01:20 2015 +0100 + + [USE] Minor optimization of USE table + + src/gen-use-table.py | 2 +- + src/hb-ot-shape-complex-use-table.cc | 30 ++++++++++++------------------ + 2 files changed, 13 insertions(+), 19 deletions(-) + +commit 14b12f92a9ef7db57c5252ef0442239319ce4bca +Author: Behdad Esfahbod +Date: Mon Jul 20 11:57:44 2015 +0100 + + [USE] Add Kharoshti test data from Unicode proposal + + test/shaping/texts/in-tree/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-use/MANIFEST | 1 + + .../in-tree/shaper-use/script-kharoshti/MANIFEST | 1 + + .../in-tree/shaper-use/script-kharoshti/misc.txt | 36 ++++++++++++++++++++++ + 4 files changed, 39 insertions(+) + +commit c48ff288522f33dc6c78520de0a0a74306630895 +Author: Behdad Esfahbod +Date: Mon Jul 20 11:46:17 2015 +0100 + + [USE] Build Universal Shaping Engine data table from Unicode 8 files + + src/gen-use-table.py | 35 +- + src/hb-ot-shape-complex-use-table.cc | 1016 ++++++++++++++++++++++++++++++++++ + 2 files changed, 1032 insertions(+), 19 deletions(-) + +commit e2c95116e1423f83a692d6170553d0cc95733d24 +Author: Behdad Esfahbod +Date: Mon Jul 20 11:32:48 2015 +0100 + + [USE] Add Universal Shaping Engine to Makefile + + src/Makefile.am | 23 +++- + src/gen-use-table.py | 237 +++++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-use-machine.rl | 0 + src/hb-ot-shape-complex-use-private.hh | 0 + src/hb-ot-shape-complex-use-table.cc | 0 + src/hb-ot-shape-complex-use.cc | 0 + 6 files changed, 254 insertions(+), 6 deletions(-) + +commit 41a29af8053782e3a9c6a96a394bd76ef6d42099 +Author: Behdad Esfahbod +Date: Wed Jul 15 01:39:57 2015 +0100 + + Update Arabic shaping table for Unicode 8.0 + + src/hb-ot-shape-complex-arabic-table.hh | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit 64a2726e2c6efce4379a7609024ec21eb4b5e4dc +Author: Behdad Esfahbod +Date: Wed Jul 15 01:36:39 2015 +0100 + + Add Unicode 8.0 scripts + + Based on https://bugzilla.mozilla.org/show_bug.cgi?id=1183209 + + src/hb-common.cc | 3 +++ + src/hb-common.h | 7 +++++++ + 2 files changed, 10 insertions(+) + +commit 9ae156b76820d9079bae062e7e38c34a386d9bd2 +Author: Behdad Esfahbod +Date: Sun Jul 5 22:43:17 2015 +0100 + + Fix pragma usage + + https://bugs.freedesktop.org/show_bug.cgi?id=91228 + + Commit cdcdfe61b97a0a48ccf834b6d924d187da9609be changed two `#pragma + message` to `#pragma error` in hb-unicode.cc, however MSVC uses #error, + just like the #else branch. `#pragma error` is an unknown pragma so + MSVC does not fail the build because of it, which I believe was the + intention of that commit. + + If it's meant to be an #error, then the #ifdef for _MSC_VER can be + removed entirely. + + src/hb-unicode.cc | 5 ----- + src/hb-warning.cc | 10 ---------- + 2 files changed, 15 deletions(-) + +commit 8ad89f057d737ccbc6f411e9ebcf11b8130a50bb +Author: ThePhD +Date: Tue Jun 23 09:09:24 2015 -0400 + + Spelling words is not my strong point. + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e0a828ecbd708757d67977f7e92a6f4c1b0b92fd +Author: ThePhD +Date: Tue Jun 23 09:07:17 2015 -0400 + + Back to using regular `strdup`, with an `hb-private.hh` fix that special-cases VC++'s + definition and usage of the words + + src/hb-common.cc | 2 +- + src/hb-private.hh | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 8e545d59610211261e684c10158b9e5df6fae24d +Author: ThePhD +Date: Mon Jun 22 22:29:04 2015 -0400 + + Fix all VC++ warnings and errors in the current commit's builds. + + src/hb-common.cc | 4 ++-- + src/hb-fallback-shape.cc | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-map.cc | 2 +- + src/hb-ot-shape-complex-hangul.cc | 2 +- + src/hb-ot-shape-complex-hebrew.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 4 ++-- + src/hb-ot-shape-normalize.cc | 6 +++--- + src/hb-ot-shape.cc | 2 +- + 9 files changed, 13 insertions(+), 13 deletions(-) + +commit 5f13bbd9d4b0970851626e2ce3cf4ecb3cfde801 +Author: Behdad Esfahbod +Date: Fri Jun 19 13:31:49 2015 -0700 + + When removing default-ignorables, merge clusters + + Fixes test-shape, and: + https://code.google.com/p/chromium/issues/detail?id=497578 + + src/hb-buffer-private.hh | 2 ++ + src/hb-buffer.cc | 36 ++++++++++++++++++++++++++++++++++-- + src/hb-ot-shape.cc | 2 +- + 3 files changed, 37 insertions(+), 3 deletions(-) + +commit 82b521aeb7cc73879b44ca4278d6fa8b4347527f +Author: Behdad Esfahbod +Date: Fri Jun 19 11:57:57 2015 -0700 + + Rewrite hide_default_ignorables + + Separate the loops for the two cases of replacing with space + and deleting. For deleting, use the out-buffer machinery. + + Needed for upcoming cluster merge fix. + + src/hb-buffer-private.hh | 18 ++++++++++++++ + src/hb-ot-shape.cc | 65 +++++++++++++++++++++++++++++------------------- + 2 files changed, 57 insertions(+), 26 deletions(-) + +commit b3a2f6afbac1956b65f29a17b9dc896e86135329 +Author: Behdad Esfahbod +Date: Thu Jun 18 17:15:33 2015 -0700 + + [test] Add test for cluster merging + + Based on test from https://code.google.com/p/chromium/issues/detail?id=497578 + + Currently fails. Basically, if there's a default_ignorable at the + start of text, and font has no space glyph, we remove the default_ignorable, + and that makes the first char in text to correspond to no cluster. + + Fix coming. + + test/api/test-shape.c | 43 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 43 insertions(+) + +commit a6446d44e6d04e1eeea994682e29f9cb6265f7f6 +Author: Behdad Esfahbod +Date: Thu Jun 18 11:14:56 2015 -0700 + + 0.9.41 + + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit cd042fc8c4a3984c3647cd22a27c34f00636f6e8 +Author: Behdad Esfahbod +Date: Thu Jun 18 10:55:13 2015 -0700 + + [util] Disable hb-fc-list for now + + Until I figure out what to do about the API, and finalize + the tool. + + util/Makefile.am | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +commit 351f68f4e01a107f62e4eb3458d7c7ae379939fb +Author: Behdad Esfahbod +Date: Fri Jun 12 17:46:06 2015 -0700 + + [bindings] Fix hb_language_get_default() and hb_ot_tag_to_language() + + Part of https://github.com/behdad/harfbuzz/issues/91 + + src/hb-common.cc | 2 +- + src/hb-ot-tag.cc | 9 +++++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +commit f0c80060763475aa34a18ecbef600b6811855cb6 +Author: Behdad Esfahbod +Date: Fri Jun 12 17:37:41 2015 -0700 + + [TravisCI] Hook up Coverity + + First try... + + .travis.yml | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 8ac446908ca75bea989414a0f551a6da8885bf52 +Author: Behdad Esfahbod +Date: Fri Jun 12 17:29:05 2015 -0700 + + Add Coverity Scan badge + + README | 1 + + 1 file changed, 1 insertion(+) + +commit a5e4f6d6088f6ed37fb1d68d3682b8eb4c9b46fe +Author: Behdad Esfahbod +Date: Wed Jun 10 10:57:46 2015 -0700 + + Fix warnings: "member call on null pointer of type" + + https://bugzilla.mozilla.org/show_bug.cgi?id=1167119 + + src/hb-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 16dac7eccf04bb357e95a8e4c18c8418dcfb4030 +Author: Behdad Esfahbod +Date: Wed Jun 3 12:07:46 2015 -0700 + + Fix build + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8dacb7f8b46c70f22b70c78e0a8efc3309137650 +Author: Behdad Esfahbod +Date: Wed Jun 3 11:53:42 2015 -0700 + + Add include check to hb-ot-font.h + + src/hb-ot-font.h | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 37c8daf724add4a41a06385e571277d137dc2a2f +Merge: f1b44303 01c3a885 +Author: Behdad Esfahbod +Date: Mon Jun 1 13:27:37 2015 -0700 + + Merge pull request #111 from brawer/since + + Fix "Since:" tags + +commit 01c3a88543850c87483fd8671044df53b368c520 +Author: Sascha Brawer +Date: Mon Jun 1 13:22:01 2015 +0200 + + Fix "Since:" tags + + Based on data from http://upstream-tracker.org/versions/harfbuzz.html + Resolves #103 + + src/hb-buffer.cc | 32 +++++++++++++++++------------ + src/hb-common.cc | 4 ++-- + src/hb-face.cc | 12 +++++------ + src/hb-font.cc | 14 ++++++------- + src/hb-font.h | 4 ++-- + src/hb-ft.cc | 4 ++-- + src/hb-glib.cc | 3 +++ + src/hb-gobject-structs.h | 18 +++++++++++++++++ + src/hb-ot-font.cc | 3 +++ + src/hb-ot-layout.cc | 30 ++++++++++++++++++++++++++++ + src/hb-ot-shape.cc | 6 ++++++ + src/hb-set.cc | 52 ++++++++++++++++++++++++------------------------ + src/hb-shape-plan.cc | 18 ++++++++--------- + src/hb-shape.cc | 8 ++++---- + src/hb-unicode.cc | 6 +++--- + src/hb-unicode.h | 31 ++++++++++++++++++++++++++--- + 16 files changed, 168 insertions(+), 77 deletions(-) + +commit f1b44303df0712b433e35e1e1e75115c353b279e +Author: Behdad Esfahbod +Date: Thu May 21 14:00:15 2015 -0700 + + Fix unary minus operator applied to unsigned int + + Applying unary minus operator to unsigned int causes the following + warning on MSVS: + + warning C4146: unary minus operator applied to unsigned type, result still unsigned + + Based on patch from Koji Ishi. + + Fixes https://github.com/behdad/harfbuzz/pull/110 + + src/hb-ot-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1ae6cdb365c15405500d4f50ec98016dde23a26b +Author: Behdad Esfahbod +Date: Tue May 19 17:42:30 2015 -0700 + + [gobject] Remove hb_language_t workarounds for g-i shortcomings + + Using latest gobject-introspection, I don't seem to be having this + problem anymore: + + https://bugzilla.gnome.org/show_bug.cgi?id=707656 + + Removing that kludge makes language_t behave more like the way I expect it + in Python. + + Also fixes: + https://github.com/behdad/harfbuzz/issues/91 + + src/hb-gobject-structs.cc | 1 - + src/hb-gobject-structs.h | 8 -------- + 2 files changed, 9 deletions(-) + +commit ece434fa0fec6754e5164d881c1e967376729eca +Author: Behdad Esfahbod +Date: Tue May 19 17:20:58 2015 -0700 + + [gobject] Macroize value types + + Fixes user_data_t + + src/hb-gobject-structs.cc | 73 +++++++++++------------------------------------ + 1 file changed, 17 insertions(+), 56 deletions(-) + +commit 9df099b4837df722e738675af318efcc9ac39a78 +Author: Behdad Esfahbod +Date: Mon May 18 18:37:06 2015 -0700 + + [ft] Don't set *glyph in get_glyph() if glyph not found + + src/hb-ft.cc | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +commit ff0f210519bcb0e44d4b986f7eef2004383cd344 +Author: Behdad Esfahbod +Date: Mon May 18 14:16:28 2015 -0700 + + [util] Minor + + util/ansi-print.cc | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit fbecde3d5c5c6d5af315140e4966dc850388ad63 +Merge: 58015215 74139f98 +Author: Behdad Esfahbod +Date: Thu May 7 10:46:42 2015 -0700 + + Merge pull request #105 from ebraminio/master + + Fix Travis CI config to pass again + +commit 74139f9839f69ea3e7a1d17627f52fea6c06d58a +Author: Ebrahim Byagowi +Date: Thu May 7 13:09:32 2015 +0000 + + Fix Travis CI config to pass again + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 58015215321a76d68df8e0d51039904a67291108 +Author: Behdad Esfahbod +Date: Wed May 6 00:40:31 2015 -0700 + + Add note re OpenType 1.7 language tags + + src/hb-ot-tag.cc | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +commit f6266ad291d7686d5e110255ace5f2ff9e70bf38 +Author: Roozbeh Pournader +Date: Tue May 5 22:31:19 2015 -0700 + + [minor] Remove comment about Navajo OpenType code. + + Apparently the code is already standardized: + https://www.microsoft.com/typography/otspec/languagetags.htm + + src/hb-ot-tag.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 42b00118eae46a5183e885e89e0856f41361f57e +Merge: c60f3c8e cfeb0562 +Author: Behdad Esfahbod +Date: Tue May 5 14:49:47 2015 -0700 + + Merge pull request #102 from roozbehp/master + + Add OpenType language tag 'NAV ' for Navajo. + +commit c60f3c8e1156fe7328d42851013cca97333c3bf7 +Author: Behdad Esfahbod +Date: Mon May 4 23:10:32 2015 -0700 + + [README.python] Add package name for gobject-introspection on Ubuntu + + README.python | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 82010a4bdb32248deb1337a3357dfae5b203c48d +Author: Behdad Esfahbod +Date: Mon May 4 23:09:51 2015 -0700 + + [travis] Comment out gobject-introspection again + + Apparently the version on Travis is 1.32.0, while we require 1.34.0. + + .travis.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8a254bdd29a99eb91b37e9e540179a1a01f77605 +Author: Behdad Esfahbod +Date: Mon May 4 19:22:11 2015 -0700 + + [travis] Build with introspection enabled + + .travis.yml | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit be66ec5373634234f221ace9cfed45d76b87f20e +Author: Behdad Esfahbod +Date: Thu Apr 30 18:27:13 2015 -0400 + + Use TRUE/FALSE instead of true/false in docs + + src/hb-shape.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit d055e1fc781c123f38d321846937965ef794257e +Author: Khaled Hosny +Date: Wed Jan 8 02:28:55 2014 +0200 + + Some attempt into initial hb-shape documentation + + Very anaemic, needs to descripe the format understood by + hb_feature_from_string() etc., but it is just start. + + src/hb-shape.cc | 70 ++++++++++++++++++++++++++++++++++++++------------------- + src/hb-shape.h | 3 --- + 2 files changed, 47 insertions(+), 26 deletions(-) + +commit 81bedda58cfc15f1987aa1952290cf9d87b4d074 +Author: Behdad Esfahbod +Date: Thu Apr 30 13:04:16 2015 -0400 + + New API: hb_buffer_reverse_range() + + src/hb-buffer.cc | 17 +++++++++++++++++ + src/hb-buffer.h | 4 ++++ + 2 files changed, 21 insertions(+) + +commit cfeb0562ebd8804dad731625153549eafeb78213 +Author: Roozbeh Pournader +Date: Wed Apr 29 09:32:42 2015 -0700 + + Add OpenType language tag 'NAV ' for Navajo. + + The code is not standardized yet, but is used in some Google fonts. + + src/hb-ot-tag.cc | 1 + + 1 file changed, 1 insertion(+) + +commit f724cc351640ee075a9867ef42df32cf5e0ef3b7 +Author: Jonathan Kew +Date: Thu Apr 23 12:45:02 2015 +0100 + + Don't apply Arabic shaping to vertical text. + + src/hb-ot-shape-complex-private.hh | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 97942420bbee1bc6953d5f805621066301fa17ca +Author: Behdad Esfahbod +Date: Thu Apr 23 18:56:24 2015 -0700 + + Update check-libstdc++ for clang + + src/check-libstdc++.sh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 8f0a4d67143ccdef0b5a6ac99fb9b680c3a2f69c +Author: Behdad Esfahbod +Date: Thu Apr 23 14:32:33 2015 -0700 + + [test] Ignor 'n' and 'i' in hb-unicode-encode + + Allows accepting uniXXXX format. + + test/shaping/hb_test_tools.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 39851ce84efd30f6d0570324ff8f3808a01b813b +Author: Behdad Esfahbod +Date: Tue Apr 21 19:23:27 2015 -0700 + + [coretext] Oops; fix issue number for previous commit + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 24f17afeafd40ff77177ed42c9007a0f34fcbb78 +Author: Behdad Esfahbod +Date: Tue Apr 21 19:21:32 2015 -0700 + + [coretext] Fix positioning with trailing whitespace + + Fixes https://code.google.com/p/chromium/issues/detail?id=476913 + + src/hb-coretext.cc | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit dba482fc4458776ffebdeb2d34b970b4223fa8fd +Author: Behdad Esfahbod +Date: Fri Apr 17 13:08:08 2015 -0700 + + [ot-font] Accept MS Symbol cmap if nothing else found + + src/hb-ot-font.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 3029e8b59d1667dc6a53355be89a2b55d7089b88 +Author: Behdad Esfahbod +Date: Tue Apr 14 13:32:22 2015 -0700 + + Revert "Add MSVC pragma for UTF-8 source code" + + This reverts commit 89cbd4d9533011fb5487caa99a0cd58923e7cf59. + + See discussion: + https://bugzilla.gnome.org/show_bug.cgi?id=747772 + + src/hb-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 820505a186ff60e4bae9d717fe4d7ab2390e6fef +Author: Behdad Esfahbod +Date: Mon Apr 13 23:51:45 2015 -0700 + + Whitespace + + util/options.cc | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +commit 76d57331117be8e0c2d4a2aee8341969b62b6888 +Merge: 89cbd4d9 9ee176ee +Author: Behdad Esfahbod +Date: Mon Apr 13 23:40:35 2015 -0700 + + Merge pull request #86 from cpfair/hb-shape-output-help-improvement + + Improve hb-shape/hb-view's help text w.r.t. output options + +commit 89cbd4d9533011fb5487caa99a0cd58923e7cf59 +Author: Behdad Esfahbod +Date: Mon Apr 13 12:27:08 2015 -0700 + + Add MSVC pragma for UTF-8 source code + + Not sure we have any right now; motivated by this: + https://bugzilla.gnome.org/show_bug.cgi?id=747772 + + src/hb-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 713f99ff6138b4149d9fd382f9af3ace01ee0da5 +Merge: 1086f21e 22524a51 +Author: Behdad Esfahbod +Date: Fri Apr 10 14:34:05 2015 -0700 + + Merge pull request #99 from khaledhosny/introspection-fixes2 + + More ntrospection fixes + +commit 22524a514f6609a2bc009b6035f6b5b932c719c7 +Author: Khaled Hosny +Date: Fri Apr 10 18:14:45 2015 +0200 + + [bindings] Fix hb_buffer_get_segment_properties + + Annotate the output parameter. + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1086f21e546e2435d9da6024fd6afa7a36ba3707 +Merge: 125cb083 fe97b65a +Author: Behdad Esfahbod +Date: Fri Apr 10 12:21:04 2015 -0700 + + Merge branch 'hb-fc' + +commit 125cb08345a7f27e565329d37093b1a60a41a403 +Merge: e8fd8393 855a5d7c +Author: Behdad Esfahbod +Date: Fri Apr 10 12:19:57 2015 -0700 + + Merge pull request #98 from KonstantinRitt/WEC2013 + + Fix build on WEC2013 + +commit 04f89e8f7dfdb882e8c98afb613cba3f1d02ed7d +Author: Khaled Hosny +Date: Fri Apr 10 17:49:01 2015 +0200 + + [bindings] Fix ownership of returned hb_language_t + + It should not be freed by the caller. + + src/hb-buffer.cc | 2 +- + src/hb-common.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 855a5d7cb8f585bf66dd18cb480b8c3feef62480 +Author: Konstantin Ritt +Date: Fri Apr 10 17:18:01 2015 +0400 + + Fix build on WEC2013 + + Based on patch from Björn Breitmeyer + + src/hb-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit fe97b65a54a416229e28b1c931e5e01ca19f31d3 +Author: Behdad Esfahbod +Date: Wed Aug 6 16:49:51 2014 -0400 + + [utils] Add hb-fc-list + + This is a tool that lists all fonts that can render a given string. + It uses hb_shape() to do so, and as such is aware of HarfBuzz's + normalizer. + + configure.ac | 19 +++++ + util/Makefile.am | 15 ++++ + util/hb-fc-list.c | 222 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + util/hb-fc.cc | 149 ++++++++++++++++++++++++++++++++++++ + util/hb-fc.h | 46 +++++++++++ + 5 files changed, 451 insertions(+) + +commit eb0bf3ae6688b7e98a706df2ad2714c071d77e22 +Author: Behdad Esfahbod +Date: Wed Aug 6 15:36:41 2014 -0400 + + Relax inert checks + + Previously, when creating an object from inert inputs (eg: + "hb_font_create(hb_face_get_empty())") we returned the inert + empty object. This is not helpful as there are legitimate + usecases to do that. + + We now never return the inert object unless allocation failed. + + Tests are revised to reflect. + + src/hb-face.cc | 4 ++-- + src/hb-font.cc | 4 +--- + src/hb-shape-plan.cc | 7 +++++-- + test/api/test-font.c | 10 +++++----- + test/api/test-object.c | 34 +++++++++++++++++----------------- + 5 files changed, 30 insertions(+), 29 deletions(-) + +commit e8fd83932a75cfbaa4638a757868915ebfac3c1f +Author: Behdad Esfahbod +Date: Thu Apr 9 15:52:26 2015 -0700 + + [util/hb-view] Fix rendering with all combinations of negative scales + + util/view-cairo.cc | 90 ++++++++++++++++++++++++++++-------------------------- + util/view-cairo.hh | 2 -- + 2 files changed, 47 insertions(+), 45 deletions(-) + +commit 69d5af93169ea2d87276b65d43c889a359d5d81e +Author: Behdad Esfahbod +Date: Thu Apr 9 15:17:16 2015 -0700 + + [util] Minor + + util/view-cairo.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit a664810e38b479e05ea32cac263cb5730629f9d8 +Author: Behdad Esfahbod +Date: Thu Apr 9 15:04:42 2015 -0700 + + [util] Accept comma as well as space when separating components of args + + Applies to --font-size and --margin. + + Hopefully the scanf usage here doesn't have compatibility issues + (star being counted in the return value, etc). + + util/options.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9c974360febcfd67247107352425fe8590d9d452 +Author: Behdad Esfahbod +Date: Thu Apr 9 12:04:14 2015 -0700 + + Minor rename + + src/hb-atomic-private.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit f3b170bdd970e31e9dbfed94c07c3cda41269aed +Author: Behdad Esfahbod +Date: Wed Apr 8 16:26:24 2015 -0700 + + Minor + + src/hb-common.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2958f2c147fc6327175b51a4eaca694263e34ac9 +Author: Behdad Esfahbod +Date: Wed Apr 8 16:26:16 2015 -0700 + + Fixup + + src/hb-atomic-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit b931e0b0ceeab0e4819d9c4b838c1a1eb87b52e4 +Author: Behdad Esfahbod +Date: Wed Apr 8 14:39:00 2015 -0700 + + Fix warnings + + Part of https://github.com/behdad/harfbuzz/pull/68 + + src/hb-ot-font.cc | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 22 +++++++++++----------- + 2 files changed, 13 insertions(+), 13 deletions(-) + +commit cdcdfe61b97a0a48ccf834b6d924d187da9609be +Author: Behdad Esfahbod +Date: Wed Apr 8 13:25:04 2015 -0700 + + Err, instead of warn, if mutex / atomic / unicode funcs are missing + + Hopefully this results in fewer badly built HarfBuzz integrations. + + src/hb-unicode.cc | 8 ++++---- + src/hb-warning.cc | 22 ++++++++-------------- + 2 files changed, 12 insertions(+), 18 deletions(-) + +commit fc3c59a1d746c5280f6216a94fdc1be3e826051f +Author: Behdad Esfahbod +Date: Wed Apr 8 13:03:27 2015 -0700 + + Fix unused var warnings + + src/hb-ot-layout-gpos-table.hh | 1 - + src/hb-ot-layout-gsub-table.hh | 1 - + 2 files changed, 2 deletions(-) + +commit 3f174cd020b7762fae96f20ce14fc9e9abec748f +Author: Konstantin Ritt +Date: Sat Mar 28 00:49:33 2015 +0400 + + Minor refactoring to the atomics implementation + + s/atomic_int/atomic_int_impl/ and s/atomic_ptr/atomic_ptr_impl/ + to bring it in par with hb_mutex_impl_t, then re-introduce + hb_atomic_int_t as a wrapper around hb_atomic_int_impl_t. + + In hb_reference_count_t, make it clear the non-atomic get and set + are intentional due to nature of the cases they are used in + (comparison to -1 and the debug output/tracing). + + src/hb-atomic-private.hh | 86 +++++++++++++++++++++++++++++++----------------- + src/hb-mutex-private.hh | 4 ++- + src/hb-object-private.hh | 21 ++++++------ + 3 files changed, 69 insertions(+), 42 deletions(-) + +commit 24930d544ee9e247e4cf6a5f6d5207ba9d7a3ddc +Author: Behdad Esfahbod +Date: Wed Apr 8 12:52:06 2015 -0700 + + Minor + + src/hb-mutex-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 45a8b46f478d4aa63ae5df74b6bb28ebdd7521ac +Author: Behdad Esfahbod +Date: Wed Apr 8 12:49:38 2015 -0700 + + Allow implementing atomic and mutex ops in config + + Motivated by + https://github.com/behdad/harfbuzz/pull/92 + + src/hb-atomic-private.hh | 6 +++++- + src/hb-mutex-private.hh | 7 ++++++- + 2 files changed, 11 insertions(+), 2 deletions(-) + +commit 3fe4e92bc5ff09d84c6763cedf06ce80d15a5fb2 +Author: Behdad Esfahbod +Date: Wed Apr 8 12:49:23 2015 -0700 + + Minor + + src/hb-set-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 9868749abe468130d89c80a2501847a83acb4579 +Author: Behdad Esfahbod +Date: Mon Apr 6 14:51:31 2015 -0700 + + [test] Use /usr/bin/env python instead of /usr/bin/python + + Bug 76494 - #!/usr/bin/python in testsuite + + https://bugs.freedesktop.org/show_bug.cgi?id=76494 + + test/shaping/hb-diff | 2 +- + test/shaping/hb-diff-colorize | 2 +- + test/shaping/hb-diff-filter-failures | 2 +- + test/shaping/hb-diff-ngrams | 2 +- + test/shaping/hb-diff-stat | 2 +- + test/shaping/hb-manifest-read | 2 +- + test/shaping/hb-manifest-update | 2 +- + test/shaping/hb-unicode-decode | 2 +- + test/shaping/hb-unicode-encode | 2 +- + test/shaping/hb-unicode-prettyname | 2 +- + test/shaping/hb_test_tools.py | 2 +- + 11 files changed, 11 insertions(+), 11 deletions(-) + +commit bfcddd32a674dd19fca1bf521e95466a0eec5179 +Merge: ce01ad7c 363ceec3 +Author: Behdad Esfahbod +Date: Mon Apr 6 14:41:32 2015 -0700 + + Merge pull request #93 from ebraminio/archpy3 + + Make hb_test_tools.py compatible with python 3 + +commit ce01ad7c2f5a259030f4dbec746f85522aa9c3f9 +Author: Behdad Esfahbod +Date: Wed Apr 1 11:05:59 2015 -0700 + + MSVC 2015 supports snprintf and not _snprintf + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 560718862f0bd994b62361652d6fd558c4182e2a +Author: Behdad Esfahbod +Date: Wed Apr 1 11:04:33 2015 -0700 + + Move WinCE define to better place + + src/hb-private.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 363ceec3fb0c9566db5a59da31e508f69dea1e92 +Author: Ebrahim Byagowi +Date: Mon Mar 30 03:27:14 2015 +0430 + + Make hb_test_tools.py compatible with python 3 + + On ArchLinux, /usr/bin/python is linked to python 3 so + HarfBuzz `make check` is broken there. + + This makes hb_test_tools.py compatible with python 3 while + no breaking it on python 2. + + test/shaping/hb_test_tools.py | 44 ++++++++++++++++++++++++------------------- + 1 file changed, 25 insertions(+), 19 deletions(-) + +commit aee685086c8fde6f6c4590e483a177c19f222540 +Author: Behdad Esfahbod +Date: Thu Mar 26 14:13:53 2015 -0400 + + Fix VC++ /analyze warnings + + out\debug\hb-buffer-deserialize-text.rl(47) : warning C6001: Using + uninitialized memory 'pos'. + + src/hb-buffer-deserialize-text.rl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8886ab430ca68539cb318e175647e9f6973718b0 +Merge: e3671b8f a394bb66 +Author: Behdad Esfahbod +Date: Sun Mar 22 16:18:57 2015 -0400 + + Merge pull request #90 from khaledhosny/introspection-fixes + + [bindings] Fix *_from_string functions + +commit a394bb66707184c995fe2d08c80e98220e6ec0b0 +Author: Khaled Hosny +Date: Sun Mar 22 20:29:10 2015 +0200 + + [bindings] Fix *_from_string functions + + Without the element-type they will be getting garbage, at least with + Python. + + src/hb-common.cc | 8 ++++---- + src/hb-font.cc | 2 +- + src/hb-shape.cc | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit e3671b8f8bb339e8a563a9da9cd5069073200fec +Author: Behdad Esfahbod +Date: Fri Mar 20 18:03:02 2015 -0400 + + 0.9.40 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 9e401f6890f2bea1d11914bca436c2230f8d0f1b +Author: Behdad Esfahbod +Date: Fri Mar 20 16:08:38 2015 -0400 + + Fix reverse_range() for empty range + + Fixes coretext notdef loop consisting of all default_ignorable glyphs + + https://code.google.com/p/chromium/issues/detail?id=464755 + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7481bd49d56d4e814ab1f85fc2df8bf934d520f4 +Author: Behdad Esfahbod +Date: Wed Mar 4 15:47:25 2015 -0800 + + Fix previous commit + + I misunderstood how which works. + + autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6763e21afb77b250ad4416ff921d46c63ea12443 +Author: Behdad Esfahbod +Date: Wed Mar 4 15:43:05 2015 -0800 + + Accept glibtoolize as libtoolize + + Of course, we don't really run it, autoreconf does. We just + err if neither is available. glibtoolize is the name it is + shipped under on OS X. Reported by Adam. + + autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 02a04e6afb1a76894f3723a467716607970d95d3 +Author: Behdad Esfahbod +Date: Wed Mar 4 12:32:03 2015 -0800 + + 0.9.39 + + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 98e3ea8e34c798ce003e946c9a150bb41be9d09b +Author: Behdad Esfahbod +Date: Wed Mar 4 12:03:39 2015 -0800 + + Fix hb-uniscribe build + + src/hb-ot-name-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8ac345e5c0ed0aad6547592ea0839aabfb4ba980 +Author: Behdad Esfahbod +Date: Mon Mar 2 16:06:55 2015 -0800 + + Fix reverse_range() to only reverse alt array if positions are used + + In hb-coretext, when we were using scratch buffer for book-keeping, + a reverse_range() caused by the notdef-insertion loop could mess up + our log_clusters. Ouch! + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1e03d7ac83f3e17aafed1e37390d9ff8394e36da +Author: Behdad Esfahbod +Date: Thu Feb 26 13:58:32 2015 -0800 + + Better error message if libtool is not installed + + Fixes https://github.com/behdad/harfbuzz/pull/88 + + autogen.sh | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 6c918e2997fb82e89485f2b50bee2bf4fcd70592 +Author: Behdad Esfahbod +Date: Thu Feb 26 13:55:34 2015 -0800 + + Clean up gtk-doc.make + + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 5ec5875acb12cf07447c9ebfb03212601368dfc4 +Author: Behdad Esfahbod +Date: Thu Feb 26 13:53:05 2015 -0800 + + Install git.mk in docs/ + + docs/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit d146678d103425b3da7ef393bc6d66f6ba4c5593 +Author: Behdad Esfahbod +Date: Thu Feb 26 13:52:50 2015 -0800 + + Update git.mk from upstream + + git.mk | 35 ++++++++++++++++++++++++++++------- + 1 file changed, 28 insertions(+), 7 deletions(-) + +commit 5f541f8f7be82f29b77b481827deb212e12d53e4 +Author: Behdad Esfahbod +Date: Sat Feb 21 16:51:17 2015 +0300 + + Minor refactoring + + src/hb-private.hh | 44 ++++++++++++++++++++++++++++---------------- + 1 file changed, 28 insertions(+), 16 deletions(-) + +commit ef79bdf73bbfde1bfaa222834809d105ab7755b3 +Author: Behdad Esfahbod +Date: Sat Feb 21 16:49:15 2015 +0300 + + Minor + + src/hb-ot-layout-common-private.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 68e04afbb1e1073c47474f7a4d6d2cacf7057f6f +Author: Behdad Esfahbod +Date: Sat Feb 21 16:30:28 2015 +0300 + + Typo + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 55553699b38d6481fbfacd0a32fc266e55553b34 +Author: Behdad Esfahbod +Date: Sat Feb 21 16:29:08 2015 +0300 + + Minor + + src/hb-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit 5175300fbaf4ff19b7d38c14c86331bb614b0390 +Author: Behdad Esfahbod +Date: Sat Feb 21 12:50:01 2015 +0300 + + [layout] Fix comparison of GlyphID and hb_codepoint_t + + Before, the IntType::cmp functions providing this and was truncating + the hb_codepoint_t to 16bits before comparison. I have no idea how + this was never discovered, and I'm too lazy to try to reproduce this + with Pango (which uses non-16bit codepoint numbers for missing glyphs). + + src/hb-open-type-private.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 7cce809cb11e0ce65dbdab899779ece3dc337763 +Author: Behdad Esfahbod +Date: Sat Feb 21 12:41:08 2015 +0300 + + Remove unused (and wrong as of a few commits ago) cmp() function + + src/hb-open-type-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 8e3d4bae033bdec649676da26cfc3eb7610832a8 +Author: Behdad Esfahbod +Date: Sat Feb 21 12:31:59 2015 +0300 + + Minor + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f47cf1f12dd1fa3cd3aa84502139caca9d469af8 +Author: Behdad Esfahbod +Date: Sat Feb 21 11:45:22 2015 +0300 + + Minor + + src/hb-ot-layout.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 640b66c6348653bfd7cf88ea9caa2133c0eb949f +Author: Behdad Esfahbod +Date: Thu Feb 19 17:30:05 2015 +0300 + + [layout] If lookup has only one subtable, move the forward loop down to subtable + + I was hoping to see a nice speedup, but it resulted in a very minor one. + + src/hb-ot-layout.cc | 33 ++++++++++++++++++++++++++++++++- + 1 file changed, 32 insertions(+), 1 deletion(-) + +commit e2f50f2a7ebf9882ea89dc3f0c740e7fce964e37 +Author: Behdad Esfahbod +Date: Thu Feb 19 17:15:05 2015 +0300 + + [layout] Add apply_forward / apply_backward + + src/hb-ot-layout.cc | 69 +++++++++++++++++++++++++++++++++++------------------ + 1 file changed, 46 insertions(+), 23 deletions(-) + +commit 1d4a328472f094c0d75a062f6e176c6b1875cfdc +Author: Behdad Esfahbod +Date: Thu Feb 19 11:33:30 2015 +0300 + + [layout] Remove unneeded return value from apply() + + src/hb-ot-layout.cc | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +commit bbdd6fd21cc2e079defff7cb17c3eb8eff3f9e09 +Author: Behdad Esfahbod +Date: Thu Feb 19 17:03:02 2015 +0300 + + Minor simpilfy BEInt + + src/hb-open-type-private.hh | 25 ++----------------------- + 1 file changed, 2 insertions(+), 23 deletions(-) + +commit 88a399acdc0fcb060803da0e7db56de2866981e3 +Author: Behdad Esfahbod +Date: Thu Feb 19 16:57:12 2015 +0300 + + Optimize IntType comparison to avoid branches for 16bit numbers + + src/hb-open-type-private.hh | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 37de2d533126245774417234e3536fcfb24f3a6b +Author: Behdad Esfahbod +Date: Thu Feb 19 16:55:51 2015 +0300 + + Minor simplify IntType + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bd047d3b7f04d551c0a26bc0ce9b9d61481e34e1 +Author: Behdad Esfahbod +Date: Thu Feb 19 10:47:18 2015 +0300 + + [layout] Minor + + src/hb-ot-layout-gpos-table.hh | 6 ++++++ + src/hb-ot-layout-gsub-table.hh | 6 ++++++ + src/hb-ot-layout.cc | 4 ++-- + 3 files changed, 14 insertions(+), 2 deletions(-) + +commit b9d3f60520c022dc952e65a66eb138d1f7cae2e1 +Author: Behdad Esfahbod +Date: Thu Feb 19 10:42:41 2015 +0300 + + [layout] Minor + + src/hb-ot-layout.cc | 15 ++++----------- + 1 file changed, 4 insertions(+), 11 deletions(-) + +commit 1a2322134a5d7bba990da28baf893b35879a5a7a +Author: Behdad Esfahbod +Date: Thu Feb 19 10:40:23 2015 +0300 + + [layout] Don't check glyph props against lookup flags when recursing + + Shouldn't be needed. I have a hard time imagining this breaking any + legitimate use case. + + src/hb-ot-layout-gpos-table.hh | 10 +--------- + src/hb-ot-layout-gsub-table.hh | 10 +--------- + 2 files changed, 2 insertions(+), 18 deletions(-) + +commit 095a1257cc3cc56b044b4cd842a92f0d0f933a50 +Author: Behdad Esfahbod +Date: Thu Feb 19 10:29:41 2015 +0300 + + [layout] Port sanitize() to use dispatch() + + Needed some rework of Extension table. Hopefully I got it right, and + the new template usage doesn't break any compilers... + + src/hb-open-type-private.hh | 5 ++- + src/hb-ot-layout-gpos-table.hh | 82 +---------------------------------- + src/hb-ot-layout-gsub-table.hh | 72 ++----------------------------- + src/hb-ot-layout-gsubgpos-private.hh | 84 ++++++++++++------------------------ + 4 files changed, 37 insertions(+), 206 deletions(-) + +commit 758fb20630f84c3d373cda37974b88f16c02995e +Author: Behdad Esfahbod +Date: Wed Feb 18 13:45:03 2015 +0300 + + Remove unused macro + + src/hb-ot-shape-complex-arabic-win1256.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 40c58923cbf689c465f9b65334c455a9b7f71ab0 +Author: Behdad Esfahbod +Date: Wed Feb 18 13:18:46 2015 +0300 + + [layout] Refactor Lookup::dispatch() + + src/hb-ot-layout-common-private.hh | 20 ++++++++++++++++++++ + src/hb-ot-layout-gpos-table.hh | 12 +----------- + src/hb-ot-layout-gsub-table.hh | 12 +----------- + src/hb-ot-layout-gsubgpos-private.hh | 6 ------ + 4 files changed, 22 insertions(+), 28 deletions(-) + +commit 70366f5d19df2e654f0933474fecf1aa16e27812 +Author: Behdad Esfahbod +Date: Wed Feb 18 13:09:54 2015 +0300 + + [layout] Refactor get_subtable() + + src/hb-ot-layout-common-private.hh | 12 ++++++++++++ + src/hb-ot-layout-gpos-table.hh | 4 ++-- + src/hb-ot-layout-gsub-table.hh | 6 +++--- + 3 files changed, 17 insertions(+), 5 deletions(-) + +commit f72f326aea6d1e93f63040730f7aecd401676c1c +Author: Behdad Esfahbod +Date: Tue Feb 17 19:18:07 2015 +0300 + + Minor + + src/hb-ot-layout-gpos-table.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 8e36ccfd4f076888076ca176c055c18104af03b6 +Author: Behdad Esfahbod +Date: Tue Feb 17 19:15:34 2015 +0300 + + [layout] Use dispatch() for add_coverage() + + src/hb-ot-layout-gpos-table.hh | 12 ++---------- + src/hb-ot-layout-gsub-table.hh | 12 ++---------- + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++++++-- + 3 files changed, 14 insertions(+), 22 deletions(-) + +commit 50b8dc79daffc7ef671dd5eedfea47f8d5e946f4 +Author: Behdad Esfahbod +Date: Tue Feb 17 18:14:17 2015 +0300 + + [layout] Add may_dispatch() + + No functional change right now. + + src/hb-ot-layout-gpos-table.hh | 7 +++++++ + src/hb-ot-layout-gsub-table.hh | 6 ++++++ + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++++++++ + 3 files changed, 25 insertions(+) + +commit de2118ed7a998a1df9b28fd1be96b4af89ed82c3 +Author: Behdad Esfahbod +Date: Tue Feb 17 17:27:44 2015 +0300 + + Make sanitize() a const method + + This makes a lot of code safer. We only try modifying the object in one + place, after making sure it's safe to do so. So, do a const_cast<> in + that one place... + + src/hb-open-file-private.hh | 15 +++-- + src/hb-open-type-private.hh | 51 +++++++++++------ + src/hb-ot-cmap-table.hh | 35 ++++++++---- + src/hb-ot-head-table.hh | 6 +- + src/hb-ot-hhea-table.hh | 3 +- + src/hb-ot-hmtx-table.hh | 3 +- + src/hb-ot-layout-common-private.hh | 58 ++++++++++++------- + src/hb-ot-layout-gdef-table.hh | 30 ++++++---- + src/hb-ot-layout-gpos-table.hh | 108 +++++++++++++++++++++++------------ + src/hb-ot-layout-gsub-table.hh | 58 ++++++++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 65 +++++++++++++-------- + src/hb-ot-layout-jstf-table.hh | 12 ++-- + src/hb-ot-maxp-table.hh | 6 +- + src/hb-ot-name-table.hh | 6 +- + 14 files changed, 296 insertions(+), 160 deletions(-) + +commit 6759ed95a3bec2874826376b68ebff19ba277ef2 +Author: Behdad Esfahbod +Date: Tue Feb 17 16:05:30 2015 +0300 + + Minor + + src/hb-ot-layout-gpos-table.hh | 6 ++---- + src/hb-ot-layout-gsub-table.hh | 6 ++---- + 2 files changed, 4 insertions(+), 8 deletions(-) + +commit 6b599dac1f814a3c900300241d4c492a8f8b66d2 +Author: Behdad Esfahbod +Date: Tue Feb 17 16:04:07 2015 +0300 + + Remove unnecessary check in sanitize + + src/hb-ot-layout-gpos-table.hh | 2 -- + src/hb-ot-layout-gsub-table.hh | 2 -- + 2 files changed, 4 deletions(-) + +commit 365576d246949f9d587e90cf0539dc0381e4d0a3 +Author: Behdad Esfahbod +Date: Thu Jan 29 13:59:42 2015 +0100 + + [layout] Allocate iters in the context + + Can be further optimized, but I think I didn't break anything. + + Saves another 3% off Roboto shaping. + + src/hb-ot-layout-gpos-table.hh | 18 ++++++------------ + src/hb-ot-layout-gsubgpos-private.hh | 21 +++++++++++++-------- + src/hb-ot-shape-fallback.cc | 2 +- + 3 files changed, 20 insertions(+), 21 deletions(-) + +commit 514564f5444b8ad2f210b1e3d7d66378f7275317 +Author: Behdad Esfahbod +Date: Thu Jan 29 13:48:48 2015 +0100 + + [layout] Move skippy_iter setup from constructor into init() + + src/hb-ot-layout-gpos-table.hh | 18 ++++++++++++------ + src/hb-ot-layout-gsubgpos-private.hh | 28 +++++++++++++++------------- + src/hb-ot-shape-fallback.cc | 3 ++- + 3 files changed, 29 insertions(+), 20 deletions(-) + +commit b051be542a8945ec14b0192bbc285f3e1a78c8f1 +Author: Behdad Esfahbod +Date: Thu Jan 29 13:40:39 2015 +0100 + + [lookup] Add skippy_iter.reset() + + Towards reducing the cost of initializing skippy_iter() + + src/hb-ot-layout-gpos-table.hh | 18 ++++++++++++------ + src/hb-ot-layout-gsubgpos-private.hh | 27 ++++++++++++++++++--------- + src/hb-ot-shape-fallback.cc | 3 ++- + 3 files changed, 32 insertions(+), 16 deletions(-) + +commit 2cecc38c7cf49b2cf697efa7e974ceee7055f2c5 +Author: Behdad Esfahbod +Date: Thu Jan 29 13:32:05 2015 +0100 + + [layout] Shuffle code around + + src/hb-ot-layout-gsubgpos-private.hh | 111 ++++++++++++++++++----------------- + 1 file changed, 56 insertions(+), 55 deletions(-) + +commit 696266981df5ef6c62ad0115133dad1d6c1d9acc +Author: Behdad Esfahbod +Date: Thu Jan 29 13:08:41 2015 +0100 + + [layout] Merge forward and backward iterators + + src/hb-ot-layout-gpos-table.hh | 12 +++--- + src/hb-ot-layout-gsubgpos-private.hh | 71 ++++++++---------------------------- + src/hb-ot-shape-fallback.cc | 2 +- + 3 files changed, 23 insertions(+), 62 deletions(-) + +commit 1f038eec3c0dd6331036f795614fe1ddcbf613b0 +Author: Behdad Esfahbod +Date: Thu Jan 29 13:05:25 2015 +0100 + + [layout] Fix backward reject() + + Has no functional effect since reject was never used with + match_glyph_data. + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 37d13acd8d414a4b53fac0152addfadecf755cd4 +Author: Behdad Esfahbod +Date: Thu Jan 29 11:38:01 2015 +0100 + + [layout] Remove some unnecessary checks in skippy + + src/hb-ot-layout-gpos-table.hh | 3 --- + src/hb-ot-layout-gsubgpos-private.hh | 9 ++------- + 2 files changed, 2 insertions(+), 10 deletions(-) + +commit baa14e18148d3f5493f78b4fe9e0c835a01f50f7 +Author: Behdad Esfahbod +Date: Thu Jan 29 11:08:43 2015 +0100 + + [lookup] Don't initialize skippy if coverage match fails + + Currently: + + - Initializing skippy is very expensive, + + - Our lookup accelerator (using set-digests) can be very ineffecite, + + As such, we end up many times initializing skippy but then failing + coverage check. Reordering fixes that. + + When, later, we fix our accelerator to have truly small false-positive + rate (for example by using the frozen-sets), then we might want to + reorder these checks such that we wouldn't calculate coverage number + if skippy is going to fail. + + This shows a 5% speedup with Roboto already. + + src/hb-ot-layout-gpos-table.hh | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +commit 7788993bc19bf122f1e143ab64cc1da2ed1865a3 +Author: Behdad Esfahbod +Date: Wed Jan 28 23:01:12 2015 -0800 + + [layout] Use setter method to set c->lookup_props + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit f4ee48fd7b312550faf9b0be4cd1b2f2849dd08d +Author: Behdad Esfahbod +Date: Wed Jan 28 22:53:54 2015 -0800 + + [layout] Remove unused wrapper method + + src/hb-ot-layout-gsubgpos-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit 7b7129c7a997def599fb4d2ba05fda40d27aed20 +Author: Behdad Esfahbod +Date: Wed Jan 28 21:46:07 2015 -0800 + + Add hb_frozen_set_t + + I experimented with replacing use of hb_set_digest_t with this new + hb_frozen_set_t, hoping to get a huge speedup for busy lookups + (like kern lookup in Roboto), but I only got 6% speendup in Roboto + and 4% in NotoNastaliqUrduDraft :(. + + src/hb-set-private.hh | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 56 insertions(+), 1 deletion(-) + +commit 241eac9559465fa79f396570af4e87f455b7e9d5 +Author: Behdad Esfahbod +Date: Wed Jan 28 20:55:42 2015 -0800 + + Hide internals of lookup accelerators + + src/hb-ot-layout-gsub-table.hh | 5 +++-- + src/hb-ot-layout-private.hh | 5 +++++ + src/hb-ot-layout.cc | 6 +++--- + 3 files changed, 11 insertions(+), 5 deletions(-) + +commit e2d4e8480d85436a3acad8145acac345ed593f5a +Author: Behdad Esfahbod +Date: Wed Jan 28 20:29:48 2015 -0800 + + [util] Add convenience "make lib" target + + util/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +commit faaae64bf28abdcdd15185374bc09a3809794118 +Merge: 7888a6b0 9768e651 +Author: Behdad Esfahbod +Date: Wed Feb 25 15:34:34 2015 -0800 + + Merge pull request #85 from KonstantinRitt/define_inline + + Fix build with MSVC on CE + +commit 9ee176ee978e6668c4faf00028811ce70979122e +Author: Collin Fair +Date: Sat Feb 14 09:59:44 2015 -0500 + + Stop hb-shape docs leaking into hb-view + + util/options.cc | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +commit 952b8dbdf61da9b4814e09ad3c1b9b76483bef5c +Author: Collin Fair +Date: Sat Feb 14 09:44:00 2015 -0500 + + 'All' of the above, not 'each' + + util/options.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9e867b64467c46eea5cc9b1d5a9404a1221bbbfc +Author: Collin Fair +Date: Sat Feb 14 09:32:04 2015 -0500 + + Remove reference to --help-output-content in --help-output (as --help-output-format's options aren't available in hb-view) + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1d55ffeb66381889f11ebb9039ca4ec2ca5efbab +Author: Collin Fair +Date: Sat Feb 14 09:29:35 2015 -0500 + + Add serialization syntax documentation. Clarify naming and wording in --help-output/--help-format + + util/options.cc | 30 ++++++++++++++++-------------- + 1 file changed, 16 insertions(+), 14 deletions(-) + +commit 9768e651be0561f07d6f38c3ed8bc5ee04882990 +Author: Konstantin Ritt +Date: Sat Feb 14 00:58:51 2015 +0400 + + Fix build with MSVC on CE + + This code is C++ only. There isn't a single C++ compiler that fails to + understand the "inline" keyword, since it's required by C++98. Any + compiler older than C++98 is likely to choke on the template usage + further down, so this isn't necessary. + + Moreover, the C++ standard says you cannot define macros. + [lib.macro.names] says "Nor shall such a translation unit define macros + for names lexically identical to keywords." -- technically, it's a + promise that the Standard Library headers won't do it, the wording means + that the entire translation unit won't do it, which implies no source + can do it. + + MSVC complains about it: + fatal error C1189: #error : The C++ Standard Library forbids macroizing + keywords. Enable warning C4005 to find the forbidden macro. + + Author: Thiago Macieira + + src/hb-private.hh | 10 ---------- + 1 file changed, 10 deletions(-) + +commit 7888a6b07a9922cedd3e0d235959058e0011357b +Author: Behdad Esfahbod +Date: Wed Jan 28 12:40:40 2015 -0800 + + [ft] Handle negative scales with vertical writing + + src/hb-ft.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 982d94eaa2a377616f22f39427e5ed9f1ce43263 +Author: Behdad Esfahbod +Date: Wed Jan 28 10:51:33 2015 -0800 + + [coretext] Don't generate notdef glyph for default-ignorables + + As discovered on Chrome Mac: + https://code.google.com/p/chromium/issues/detail?id=452326 + + src/hb-coretext.cc | 2 ++ + src/hb-ot-shape.cc | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit 6917a045fd8d16952cad75fda8b291b11e1d3564 +Author: Behdad Esfahbod +Date: Wed Jan 28 10:43:32 2015 -0800 + + [coretext] Unbreak glyph positioning in presence of notdef runs + + As discovered on Chrome Mac: + https://code.google.com/p/chromium/issues/detail?id=452326 + + This was originally broken in: + + commit 5a0eed3b50629be4826e4e9428f2c3255195395d + Author: Behdad Esfahbod + Date: Mon Aug 11 23:47:16 2014 -0400 + + [coretext] Implement vertical shaping + + src/hb-coretext.cc | 35 +++++++++++++++++++++++++++-------- + 1 file changed, 27 insertions(+), 8 deletions(-) + +commit 1eff4350239b0768e1042b52db9fb1c0d266f96a +Author: Behdad Esfahbod +Date: Tue Jan 27 12:26:04 2015 -0800 + + Minor optimization + + src/hb-ot-shape-normalize.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 675956aca01fc4e005a338af43d1c1f4f938abd1 +Author: Konstantin Ritt +Date: Tue Jan 27 11:23:07 2015 +0400 + + Do not leak hb_language_t on hb_language_item_t destruction + + src/hb-common.cc | 1 + + 1 file changed, 1 insertion(+) + +commit b306f9674a599da50754d24fa5aefcb6bba04420 +Author: Konstantin Ritt +Date: Tue Jan 27 20:08:41 2015 +0400 + + Minor improvement to HB_SHAPER_DATA_DESTROY + + src/hb-shaper-private.hh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 61820bc4ca1f02433db4be7c81f27cf97e2bd519 +Author: Behdad Esfahbod +Date: Mon Jan 26 14:25:52 2015 -0800 + + [API] Add hb_buffer_add_latin1() + + This is by no ways to promote non-Unicode encodings. This is an entry + point that takes Unicode codepoints that happen to all be the first + 256 characters and hence fit in 8bit strings. This is useful eg in Chrome + where strings that can fit in 8bit are implemented that way, and this + avoids copying into UTF-8 or UTF-16. + + Perhaps we should rename this to hb_buffer_add_codepoints8(). I'm also + curious if anyone would be really interested in hb_buffer_add_codepoints16(). + + Please discuss! + + src/hb-buffer.cc | 36 +++++++++++++++++++++++++------- + src/hb-buffer.h | 8 ++++++++ + src/hb-utf-private.hh | 57 ++++++++++++++++++++++++++++++++++++++------------- + 3 files changed, 80 insertions(+), 21 deletions(-) + +commit 78c6e86c04f12154c88b9f9264d0bd50b721699b +Author: Behdad Esfahbod +Date: Mon Jan 26 14:08:36 2015 -0800 + + Fix hb_buffer_add_codepoints to actually NOT validate + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 70c25ee215635db23eb0757641bd372940c0d85d +Merge: 28f5e0b2 f3537b62 +Author: Behdad Esfahbod +Date: Sun Jan 25 13:06:03 2015 -0800 + + Merge pull request #81 from KonstantinRitt/fixes/build/win8phone + + winrt_buildfixes + +commit f3537b620b0a7392ea27f01f465c5ba79459c858 +Author: Konstantin Ritt +Date: Sun Jan 25 09:50:51 2015 +0400 + + Move some code around + + Just to keep Windows specific workarounds in a single place. + + src/hb-private.hh | 25 ++++++++++++------------- + 1 file changed, 12 insertions(+), 13 deletions(-) + +commit afb62d88d78cacb6b881aaf329a654fd32f5ae29 +Author: Konstantin Ritt +Date: Sun Jan 25 08:16:26 2015 +0400 + + Do not define MemoryBarrier on WinCE + + There is a _HBMemoryBarrier() wrapper function that emulates + MemoryBarrier() behavior when it is not defined. + + src/hb-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 7db326a15b173c0d101adc608bf551a628c65dcd +Author: Konstantin Ritt +Date: Sun Jan 25 08:13:24 2015 +0400 + + Fix build on WinRT + + There is no environment (like WinCE) and the basic version + of InitializeCriticalSection is unsupported. + + https://codereview.qt-project.org/#/c/92496/ + + src/hb-mutex-private.hh | 4 ++++ + src/hb-private.hh | 2 ++ + 2 files changed, 6 insertions(+) + +commit 28f5e0b2f41670617bd778660364bbd58b1b68f2 +Author: Behdad Esfahbod +Date: Fri Jan 23 12:45:35 2015 -0800 + + 0.9.38 + + NEWS | 23 +++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 24 insertions(+), 1 deletion(-) + +commit a319d0777b746a2bbe5cd5a206172f1580da3379 +Author: Behdad Esfahbod +Date: Fri Jan 23 12:44:24 2015 -0800 + + [ft] Handle negative x_scale / y_scale + + src/hb-ft.cc | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit b0b38bb892473d9a65e06dd3b4713da39f92bef9 +Author: Behdad Esfahbod +Date: Wed Jan 21 19:19:33 2015 -0800 + + [coretext] Fix positioning of notdef + + src/hb-coretext.cc | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +commit 70622e5089c01ea16fd9deed11cb39d43145c121 +Author: Behdad Esfahbod +Date: Wed Jan 21 18:50:57 2015 -0800 + + [coretext] Fix scaling + + Before we were not accounting for possible differences in x_scale and + y_scale, as well as the signs of those. All should be in good shape + now. + + src/hb-coretext.cc | 26 +++++++++++++++++++------- + 1 file changed, 19 insertions(+), 7 deletions(-) + +commit 221ba02b0816584a02471037edae7cec9c1b8acc +Author: Behdad Esfahbod +Date: Wed Jan 21 16:42:09 2015 -0800 + + [coretext] Use vertical advance for notdef in vertical direction + + src/hb-coretext.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 7988da24c507ee310772f72cc5bcfd3c0a1187a0 +Author: Behdad Esfahbod +Date: Wed Jan 21 18:33:50 2015 -0800 + + Add convenience make target "make lib" in src/ + + src/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +commit 31d48dd919e3b4a0bec5ede384f76db9b44f4d71 +Author: Behdad Esfahbod +Date: Wed Jan 21 01:57:44 2015 -0800 + + Add README.python + + README.python | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +commit ca1c2813dd0b082a8c418bd3edd3f6cba97bd5f0 +Author: Behdad Esfahbod +Date: Wed Jan 21 01:51:48 2015 -0800 + + [bindings] Add README.python + + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit cd4eb96abb90a84b42e9b288e39bad759e4411a0 +Author: Behdad Esfahbod +Date: Tue Jan 20 12:30:45 2015 -0800 + + [util] Add --font-size to hb-shape + + Also makes hb-view to use 8 bits of subpixel precision and shape at + requested size, instead of always shaping at upem and scaling results. + + util/hb-ot-shape-closure.cc | 2 +- + util/hb-shape.cc | 2 +- + util/hb-view.cc | 5 ++++- + util/helper-cairo.cc | 16 ++++++++-------- + util/helper-cairo.hh | 5 ++--- + util/main-font-text.hh | 4 ++-- + util/options.cc | 44 +++++++++++++++++++++++++++++++++++++++++--- + util/options.hh | 16 ++++++++++++---- + util/view-cairo.cc | 2 +- + util/view-cairo.hh | 8 ++++---- + 10 files changed, 76 insertions(+), 28 deletions(-) + +commit 5789ca69d7464bab5fa0c5bdf404f3afaa490faf +Author: Behdad Esfahbod +Date: Fri Jan 9 14:22:01 2015 -0800 + + [util] Minor + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 67dfa8c7c2f2e9040a9c60c680f739ada4a35fb5 +Author: Behdad Esfahbod +Date: Mon Jan 19 17:00:31 2015 -0800 + + When matching second glyph of kerning pairs, use bsearch + + Roboto has glyphs (like 'F') that have 200 kerning pairs. + Add a handcoded bsearch instead of previous linear search. + + This doesn't show much speedup though, apparently we spend the + bulk of the time somewhere before here. + + src/hb-ot-layout-gpos-table.hh | 21 ++++++++++++++++----- + 1 file changed, 16 insertions(+), 5 deletions(-) + +commit e9f5c65be027eb7759ab819e267e24dff3b017b6 +Author: Behdad Esfahbod +Date: Mon Jan 19 14:42:11 2015 -0800 + + [bindings] Minor + + src/sample.py | 2 ++ + 1 file changed, 2 insertions(+) + +commit 3704628d1f124234324b5f2bdd5fdd61c14c7801 +Merge: 1aaa7d67 5eb939dd +Author: Behdad Esfahbod +Date: Mon Jan 19 16:15:00 2015 -0800 + + Merge pull request #77 from roozbehp/master + + Change New Tai Lue shaping engine from SEA to default + +commit 5eb939ddfe9ef217da2e48d7d0f1f4b7501714ad +Author: Roozbeh Pournader +Date: Sun Jan 18 14:30:08 2015 -0800 + + Change New Tai Lue shaping engine from SEA to default + + This is to reflect the UTC decision to change the encoding model of + New Tai Lue from logical to visual to be similar to Thai, Lao, and + Tai Viet: http://www.unicode.org/L2/L2014/14250.htm#141-C26 + + The visual encoding is already the current practice of encoding New + Tai Lue on the web anyway: + http://www.unicode.org/L2/L2014/14195-newtailue.txt + + Fixes behdad/harfbuzz#66. + + src/hb-ot-shape-complex-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1aaa7d6799b42b392dd191d3c12011721ef99e74 +Author: Behdad Esfahbod +Date: Sat Jan 17 20:16:56 2015 -0800 + + [indic] Fix out-of-bounds access + + src/gen-indic-table.py | 2 +- + src/hb-ot-shape-complex-indic-table.cc | 36 +++++++++++++++++----------------- + 2 files changed, 19 insertions(+), 19 deletions(-) + +commit 238d6a38f2ceb7d8dceec9365a823f032b3b9f7d +Author: Behdad Esfahbod +Date: Wed Jan 7 10:51:44 2015 -0800 + + [bindings] Update sample.py + + src/sample.py | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 2cd5323531dcd800549b2cb1cb51d708e72ab2d8 +Author: Behdad Esfahbod +Date: Tue Jan 6 19:16:38 2015 -0800 + + [bindings] Use hb_glib_blob_create() in sample + + hb_blob_create() is considered C-only API. + + src/hb-blob.cc | 8 ++++---- + src/sample.py | 19 +++++++++---------- + 2 files changed, 13 insertions(+), 14 deletions(-) + +commit 0ef179e2dc040c13497af847b8c1cec846dbdbf9 +Author: Behdad Esfahbod +Date: Tue Jan 6 16:58:33 2015 -0800 + + [glib] Add hb_glib_blob_create() that takes GBytes + + src/hb-glib.cc | 11 +++++++++++ + src/hb-glib.h | 3 +++ + 2 files changed, 14 insertions(+) + +commit b91904a40da6287f84bc79de60674fa57232ec09 +Author: Behdad Esfahbod +Date: Tue Jan 6 15:43:14 2015 -0800 + + [bindings] Replace deprecated allow-none with optional and nullable + + src/hb-blob.cc | 4 ++-- + src/hb-shape.cc | 2 +- + src/hb-unicode.cc | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 81a31f3eff44a85bb2160d51156a01a18f0a97df +Author: Behdad Esfahbod +Date: Tue Jan 6 15:37:31 2015 -0800 + + [bindings] Make sample Python 2/3 compatible + + src/sample.py | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +commit b632e7997d9cb6e4782cab6d8c62e8e5edaa4cb0 +Author: Behdad Esfahbod +Date: Tue Jan 6 14:05:26 2015 -0800 + + Fix up gobject-introspection a bit + + Minimal shaping works now! + + src/hb-blob.cc | 6 +++--- + src/hb-buffer.cc | 2 +- + src/sample.py | 34 ++++++++++++++++++++++++++++------ + 3 files changed, 32 insertions(+), 10 deletions(-) + +commit 3d1a666a8629a8502a2bcf23ab943e2b39a0da92 +Author: Behdad Esfahbod +Date: Mon Jan 5 14:43:13 2015 -0800 + + Remove hardcoded ICU include paths. + + ICU exports them using LOCAL_EXPORT_C_INCLUDE_DIRS. + + https://android-review.googlesource.com/#/c/121311/ + + Android.mk | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 8cb41cb9508eb1bb6319e92f900cfe5e8a131be3 +Merge: 365c03fc fb85d618 +Author: Behdad Esfahbod +Date: Sun Jan 4 20:32:18 2015 -0800 + + Merge pull request #76 from cpeterso/cpeterso/Wunused-function + + Add #ifdef HB_USE_ATEXIT to fix -Wunused-function warnings + +commit fb85d618f5883458bacf0ecb0894772291a2d738 +Author: Chris Peterson +Date: Sun Jan 4 19:31:10 2015 -0800 + + Add #ifdef HB_USE_ATEXIT to fix -Wunused-function warnings + + src/hb-common.cc | 2 +- + src/hb-ft.cc | 4 +++- + src/hb-shape.cc | 4 +++- + src/hb-shaper.cc | 4 +++- + 4 files changed, 10 insertions(+), 4 deletions(-) + +commit 365c03fc2bcdb4098314a0e123c46018fb882586 +Merge: c36c4a99 d1897a98 +Author: Behdad Esfahbod +Date: Sat Jan 3 21:55:30 2015 -0800 + + Merge pull request #75 from cpeterso/cpeterso/Wunused-value + + Fix hb_atomic_ptr_cmpexch -Wunused-value warnings + +commit d1897a98d8da40cffb57c07099a9a93cfeaacc36 +Author: Chris Peterson +Date: Sat Jan 3 19:46:19 2015 -0800 + + Fix hb_atomic_ptr_cmpexch -Wunused-value warnings + + src/hb-common.cc | 2 +- + src/hb-icu.cc | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +commit c36c4a9924609df648e62e47fa017b19b844fd98 +Author: Behdad Esfahbod +Date: Fri Jan 2 14:09:23 2015 -0800 + + Add missing va_end() + + Fixes https://github.com/behdad/harfbuzz/pull/74 + + util/options.cc | 1 + + 1 file changed, 1 insertion(+) + +commit f34aaba8687a20794835e2dc878c52d1b53e6f85 +Author: Behdad Esfahbod +Date: Sun Dec 28 18:56:15 2014 -0800 + + [ft] Don't set font ppem + + For discussion see: + + http://lists.freedesktop.org/archives/harfbuzz/2012-April/001905.html + + Over time we have had added NO_HINTING all over the place in hb-ft. Finish it off. + Not setting ppem on hb-font disables get_contour_point() calls which is good anyway. + + See comments in the commit. + + src/hb-ft.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 350f3a02ce225e5d78db8ac96de1351ff9f96dd5 +Author: Behdad Esfahbod +Date: Sun Dec 28 17:44:26 2014 -0800 + + [ft] Add hb_ft_face_create_referenced() and hb_ft_font_create_referenced() + + When I originally wrote hb-ft, FreeType objects did not support reference + counting. As such, hb_ft_face_create() and hb_ft_font_create() had a + "destroy" callback and client was responsible for making sure FT_Face is + kept around as long as the hb-font/face are alive. + + However, since this was not clearly documented, some clienets didn't + correctly did that. In particular, some clients assumed that it's safe + to destroy FT_Face and then hb_face_t. This, indeed, used to work, until + 45fd9424c723f115ca98995b8f8a25185a6fc71d, which make face destroy access + font tables. + + Now, I fixed that issue in 395b35903e052aecc97d0807e4f813c64c0d2b0b since + the access was not needed, but the problem remains that not all clients + handle this correctly. See: + + https://bugs.freedesktop.org/show_bug.cgi?id=86300 + + Fortunately, FT_Reference_Face() was added to FreeType in 2010, and so we + can use it now. Originally I wanted to change hb_ft_face_create() and + hb_ft_font_create() to reference the face if destroy==NULL was passed in. + That would improve pretty much all clients, with little undesired effects. + Except that FreeType itself, when compiled with HarfBuzz support, calls + hb_ft_font_create() with destroy==NULL and saves the resulting hb-font on + the ft-face (why does it not free it immediately?). Making hb-face + reference ft-face causes a cycling reference there. At least, that's my + current understanding. + + At any rate, a cleaner approach, even if it means all clients will need a + change, is to introduce brand new API. Which this commit does. + + Some comments added to hb-ft.h, hoping to make future clients make better + choices. + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=75299 + + configure.ac | 4 ++-- + src/hb-ft.cc | 32 ++++++++++++++++++++++++++++++++ + src/hb-ft.h | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- + 3 files changed, 92 insertions(+), 3 deletions(-) + +commit 9a3b74884b2e41c7040611030f4336f13d18fd3e +Author: Behdad Esfahbod +Date: Sun Dec 28 17:27:39 2014 -0800 + + Remove redundant check for FT_Face_GetCharVariantIndex + + We require FreeType >= 2.8.3. This symbol was introduced earlier + than that. + + configure.ac | 9 +-------- + src/hb-ft.cc | 2 -- + 2 files changed, 1 insertion(+), 10 deletions(-) + +commit 1226b2e930aa456cc05bbe621c96f4286a95cff6 +Author: Behdad Esfahbod +Date: Sun Dec 28 17:04:23 2014 -0800 + + Fix FreeType version check + + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit affacf2f37db767ab8df7f2db6cd9e0e9b0a2b8a +Author: Behdad Esfahbod +Date: Sun Dec 28 16:20:31 2014 -0800 + + [ft] Open blob in READONLY mode + + HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE is deprecated and fairly + useless now. + + src/hb-ft.cc | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit 395b35903e052aecc97d0807e4f813c64c0d2b0b +Author: Behdad Esfahbod +Date: Sun Dec 28 16:03:26 2014 -0800 + + Avoid accessing layout tables at face destruction + + "Fixes" https://bugs.freedesktop.org/show_bug.cgi?id=86300 + + Based on discussion someone else who had a similar issue, most probably + the user is releasing FT_Face before destructing hb_face_t / hb_font_t. + While that's a client bug, and while we can (and should) use FreeType + refcounting to help avoid that, it happens that we were accessing + the table when we didn't really have to. Avoid that. + + src/hb-ot-layout-private.hh | 3 +-- + src/hb-ot-layout.cc | 4 ++-- + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + 3 files changed, 4 insertions(+), 5 deletions(-) + +commit 7d5e7613ced3dd39d05df83ca7e8952cbecd68f6 +Author: Behdad Esfahbod +Date: Thu Dec 18 18:22:21 2014 -0800 + + Fail blob creation if length overflows or is too large + + Fail if blob start plus length overflows; or if blob length + is greater than 2GB. It takes a while for fonts to get to that + size. In the mean time, it protects against bugs like this: + + http://www.icu-project.org/trac/ticket/11450 + + Also avoids some weird issues with 32bit vs 64bit systems + as we accept length as unsigned int. As such, a length of + -1 will cause overflow on 32bit machines, but happily + accepted on a 64bit machine. Avoid that. + + src/hb-blob.cc | 5 ++++- + test/api/test-blob.c | 3 +++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit d5a5052098b0aa79ff55c235e61a9db477c4120f +Author: Behdad Esfahbod +Date: Thu Dec 18 18:09:41 2014 -0800 + + Assert that blob length doesn't overflow address. + + This will crash now, if blob was created with wrong length. + Check for that coming next commit. + + src/hb-open-type-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 66e37409b3bc1eddc86704ae26d9176677ce6aa6 +Author: Behdad Esfahbod +Date: Wed Dec 17 12:09:17 2014 -0800 + + 0.9.37 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 093c520de506aec74f3fb1e195c0ca85813424dd +Author: Behdad Esfahbod +Date: Fri Dec 12 21:07:53 2014 -0800 + + [otlayout] Mark variables that are C arrays as opposed to OT::ArrayOf + + src/hb-ot-layout-gpos-table.hh | 24 +++++++-------- + src/hb-ot-layout-gsubgpos-private.hh | 60 ++++++++++++++++++------------------ + 2 files changed, 42 insertions(+), 42 deletions(-) + +commit 9df0a520306a491f973d42965597bfda6023e508 +Author: Behdad Esfahbod +Date: Fri Dec 12 20:54:28 2014 -0800 + + [otlayout] Avoid invalid access with Context format 3 + + src/hb-ot-layout-gsubgpos-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 295ef1dd5229f47d8e0eb5b4eb48c90a6b470073 +Author: Behdad Esfahbod +Date: Fri Dec 12 20:43:18 2014 -0800 + + [ot] Debug get_coverage + + src/hb-ot-layout-gsubgpos-private.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 00f6a8e334ec4c586e4e633a95b411ccb50306d3 +Author: Behdad Esfahbod +Date: Fri Dec 12 20:36:49 2014 -0800 + + [ot] Print format in dispatch trace + + src/hb-ot-layout-gpos-table.hh | 16 ++++++++-------- + src/hb-ot-layout-gsub-table.hh | 14 +++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + 3 files changed, 19 insertions(+), 19 deletions(-) + +commit 5c7d6f02d71362c2b192a7d96e6181977682921c +Author: Behdad Esfahbod +Date: Fri Dec 12 20:28:49 2014 -0800 + + Minor + + src/hb-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 153beebba9b76901b8b62b90ba0dc69462ae2090 +Author: Behdad Esfahbod +Date: Fri Dec 12 19:46:09 2014 -0800 + + [ot] Make sure all toplevel tables have tableTag + + src/hb-open-file-private.hh | 2 ++ + src/hb-ot-hhea-table.hh | 2 ++ + src/hb-ot-hmtx-table.hh | 2 ++ + 3 files changed, 6 insertions(+) + +commit 282b13f9b4d86b091714de7fbddc94b3e3ff3d91 +Author: Behdad Esfahbod +Date: Fri Dec 12 19:32:46 2014 -0800 + + [sanitize] Improve debug output some more + + src/hb-open-type-private.hh | 30 ++++++++++++++++-------------- + 1 file changed, 16 insertions(+), 14 deletions(-) + +commit 0766ee1f4e6046598a2e8fb1b167c3942b4a87a0 +Author: Behdad Esfahbod +Date: Fri Dec 12 18:23:20 2014 -0800 + + [sanitize] Improve debug output + + src/hb-open-type-private.hh | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit e6f80fa1044243898c402ec6a59d6c1b5420be53 +Author: Behdad Esfahbod +Date: Wed Dec 10 12:05:24 2014 -0800 + + [indic] Allow ZWJ/ZWNJ before SM + + In Oriya, a ZWJ/ZWNJ might be added before candrabindu to encourage + or stop ligation of the candrabindu. This is clearly specified in + the Unicode section on Oriya. Allow it there. Note that Uniscribe + doesn't allow this. + + Micro tests added using Noto Sans Oriya draft. + + No changes in numbers. Currently at: + + BENGALI: 353725 out of 354188 tests passed. 463 failed (0.130722%) + DEVANAGARI: 707307 out of 707394 tests passed. 87 failed (0.0122987%) + GUJARATI: 366349 out of 366457 tests passed. 108 failed (0.0294714%) + GURMUKHI: 60732 out of 60747 tests passed. 15 failed (0.0246926%) + KANNADA: 951190 out of 951913 tests passed. 723 failed (0.0759523%) + KHMER: 299070 out of 299124 tests passed. 54 failed (0.0180527%) + MALAYALAM: 1048147 out of 1048334 tests passed. 187 failed (0.0178378%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271662 out of 271847 tests passed. 185 failed (0.068053%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + test/shaping/Makefile.am | 1 + + .../sha1sum/5028afb650b1bb718ed2131e872fbcce57828fff.ttf | Bin 0 -> 4720 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/indic-joiner-candrabindu.tests | 2 ++ + 6 files changed, 6 insertions(+), 1 deletion(-) + +commit c0e95abc5f3f14121483b71f10837828a3a1d73a +Author: Behdad Esfahbod +Date: Thu Nov 20 14:42:24 2014 -0800 + + 0.9.36 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit fde3e4a423871463c883cb969e99c29cb6f69f6b +Author: Behdad Esfahbod +Date: Wed Oct 29 11:23:08 2014 -0700 + + In hb_ot_collect_glyphs(), don't recurse to a lookup more than once + + Otherwise, we might process a lookup thousands of times, with no + benefit. This pathological case was hit by Noto Nastaliq Urdu Draft + in Firefox's code to determine whether space glyph is involved in + any GSUB/GPOS rules. A test page is at http://behdad.org/urdu + + See: + https://bugzilla.mozilla.org/show_bug.cgi?id=1090869 + + src/hb-ot-layout-gsubgpos-private.hh | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +commit 5a5640d8506ccfc99fd119e89e829170d1fea421 +Author: Behdad Esfahbod +Date: Tue Oct 14 21:26:13 2014 -0700 + + Move code around + + src/hb-open-type-private.hh | 50 ++++++++++++++++++++++----------------------- + 1 file changed, 25 insertions(+), 25 deletions(-) + +commit 666b42f73bd1f516657b206ef738108825bf239f +Author: Behdad Esfahbod +Date: Tue Oct 14 21:24:59 2014 -0700 + + Move macros around + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=84491 + + src/hb-open-type-private.hh | 63 ++++++++++++++++++++++++++++++++++++++------- + src/hb-private.hh | 41 ----------------------------- + src/hb-uniscribe.cc | 6 +++++ + 3 files changed, 60 insertions(+), 50 deletions(-) + +commit 5c87120b8178566ddae99d9825edc24f9b87ea3d +Author: Behdad Esfahbod +Date: Tue Oct 14 20:07:31 2014 -0700 + + Fix misc warnings + + Fixes https://github.com/behdad/harfbuzz/pull/51 + + src/hb-buffer-deserialize-json.rl | 4 ++-- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-private.hh | 6 +++--- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit a1f27ac3c48cfe6d532dc422cf256952fea472ed +Author: Behdad Esfahbod +Date: Thu Oct 2 16:54:33 2014 -0400 + + Update test expectation for previous commit + + test/shaping/tests/arabic-fallback-shaping.tests | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8afaf096870d7895cf2fffb6438b02c0ad1b6c52 +Author: Behdad Esfahbod +Date: Thu Oct 2 16:40:41 2014 -0400 + + [ft] Add NO_HINTING in a couple other places + + src/hb-ft.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7228011411f0e490ad1ba9894dd0d576823903ea +Author: Behdad Esfahbod +Date: Wed Oct 1 18:58:43 2014 -0400 + + [travis] Fix clang again + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 406a020e5228d4a04da6282f5a75165bab7a483e +Author: Behdad Esfahbod +Date: Wed Oct 1 18:54:55 2014 -0400 + + [travis] Fail build if coveralls fails + + .travis.yml | 15 ++------------- + 1 file changed, 2 insertions(+), 13 deletions(-) + +commit a8aa20260dbd9af9cbcc7d545fa8b41b07aae276 +Author: Behdad Esfahbod +Date: Wed Oct 1 18:48:40 2014 -0400 + + [travis] Only run coveralls under gcc + + .travis.yml | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 5de0407337d630117e424b7c715b7cbd432f4ef9 +Author: Behdad Esfahbod +Date: Wed Oct 1 18:18:25 2014 -0400 + + Help clang with gcov + + src/check-defs.sh | 2 +- + src/check-symbols.sh | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit ef40ca8e5e830231539dc61088b58e907a840629 +Author: Behdad Esfahbod +Date: Wed Oct 1 18:07:27 2014 -0400 + + [travis] Try to make coverage work with clang + + .travis.yml | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 52784da17b7278f2587168234878bb15d918c9fe +Author: Behdad Esfahbod +Date: Wed Oct 1 17:57:43 2014 -0400 + + [travis] Minor + + README | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit f2c9005f5123c7f9b227fd9ac9a3438c5fe4cf47 +Author: Behdad Esfahbod +Date: Wed Oct 1 17:45:17 2014 -0400 + + Add README.md symlink to make github happy + + README.md | 1 + + 1 file changed, 1 insertion(+) + +commit 40987e8aaca4155d9cff211549e8d23f24c334e5 +Author: Behdad Esfahbod +Date: Wed Oct 1 17:44:30 2014 -0400 + + [travis] Re-enable clang + + .travis.yml | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +commit 5400ac476e5a5bcc66559fcfb05a683a6b433ea1 +Author: Behdad Esfahbod +Date: Wed Oct 1 17:41:41 2014 -0400 + + Add build and coverage status links + + README | 3 +++ + 1 file changed, 3 insertions(+) + +commit 19360e0a5609c65842a989587b01a4dc7c9eae36 +Author: Behdad Esfahbod +Date: Wed Oct 1 17:35:03 2014 -0400 + + [travis] Report matrix settings to help debugging + + .travis.yml | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 9b89fc52f49b80df1f27ac7de69e0152bdcc94d6 +Author: Behdad Esfahbod +Date: Wed Oct 1 17:20:31 2014 -0400 + + [travis] More coveralls + + .travis.yml | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit a68f2b62c1f24009993911b1dbcb76b821e58c51 +Author: Behdad Esfahbod +Date: Wed Oct 1 17:05:58 2014 -0400 + + [travis] Give coveralls a hand + + .travis.yml | 1 + + 1 file changed, 1 insertion(+) + +commit 5194d647e13aa5ba2cfcdbdcd4a659dc5bd11418 +Author: Behdad Esfahbod +Date: Wed Oct 1 17:03:26 2014 -0400 + + [travis] Disable clang for now + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 715f27f85f97fee13b119f60037db5c139489ee6 +Author: Behdad Esfahbod +Date: Wed Oct 1 16:53:00 2014 -0400 + + [test] Fixup test + + test/shaping/tests/hangul-jamo.tests | 9 --------- + 1 file changed, 9 deletions(-) + +commit 2a508ddae5de3852243725ce22caa3dcffccb83e +Author: Behdad Esfahbod +Date: Wed Oct 1 16:49:22 2014 -0400 + + [travis] Another try at coveralls.io + + .travis.yml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit dfe8078e5be46cab5e67aed977749c1d6725e6a7 +Author: Behdad Esfahbod +Date: Wed Oct 1 16:38:47 2014 -0400 + + [travis] First try to hookup coveralls.io code coverage tracking + + .travis.yml | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 1b387571e4d0eed883f1ae8ec85cf0e818b4a7f9 +Author: Behdad Esfahbod +Date: Wed Oct 1 16:14:59 2014 -0400 + + [travis] Unbreak + + .travis.yml | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +commit e281ed360dfdf803aea87b6078983867d08e07a7 +Author: Behdad Esfahbod +Date: Wed Oct 1 16:09:08 2014 -0400 + + [travis] Minor + + .travis.yml | 23 +++++++++++++++++++++-- + 1 file changed, 21 insertions(+), 2 deletions(-) + +commit c0b82ba32a1987902a3b9c05b46f8be6b121883a +Author: Behdad Esfahbod +Date: Wed Oct 1 14:24:07 2014 -0400 + + Create ragel-generated files in srcdir + + src/Makefile.am | 25 ++++++++++--------------- + 1 file changed, 10 insertions(+), 15 deletions(-) + +commit 79bbb10b0da49ace763a50f259c2ea687143f7ea +Author: Behdad Esfahbod +Date: Wed Oct 1 13:33:21 2014 -0400 + + Clean ragel-generated headers in maintainercleanfiles + + src/Makefile.am | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 8971cac83eb4f06847abfa3eaa15857d27141810 +Author: Behdad Esfahbod +Date: Wed Oct 1 12:41:03 2014 -0400 + + Don't use tmp files in Makefile + + Useful for code-coverage generation of the ragel-generated files + as they will now contain the correct .hh filename in them. + + src/Makefile.am | 27 +++++++++++++-------------- + 1 file changed, 13 insertions(+), 14 deletions(-) + +commit 22723186652224a635f1dad5cda0f753e78c301d +Author: Behdad Esfahbod +Date: Wed Oct 1 11:56:07 2014 -0400 + + check-static-inits: Filter out zero-length sections + + When compiling with -O0, zero-sized constructors were showing up + and confusing the test. + + src/check-static-inits.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b695a3dc2300ed970a4154ad8b997407b3cb4faf +Author: Behdad Esfahbod +Date: Wed Oct 1 11:55:14 2014 -0400 + + check-static-inits: check for static finalizers + + src/check-static-inits.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 250398b1e4f102e4e44eeb9e2aebf0cd2d397344 +Author: Behdad Esfahbod +Date: Wed Oct 1 11:28:01 2014 -0400 + + Hide other bubble-sort + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c1e87442621beff98791ce56cfd1ccee506c4ee6 +Author: Behdad Esfahbod +Date: Wed Oct 1 11:07:08 2014 -0400 + + Hide bubble-sort! + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 80f77282264afb1356351024b1f062b2824bba3b +Author: Behdad Esfahbod +Date: Thu Sep 25 17:59:46 2014 +0300 + + [util] Fix ansi output when surface is empty + + util/helper-cairo-ansi.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 156852991e18e5ac256ee4d6b2916931cc274977 +Author: Behdad Esfahbod +Date: Thu Sep 25 17:45:49 2014 +0300 + + [ot-font] Add hb_ot_face_cmap_accelerator_t + + src/hb-ot-font.cc | 113 +++++++++++++++++++++++++++++++----------------------- + 1 file changed, 66 insertions(+), 47 deletions(-) + +commit d088ccaf11d9475fe0d269ce130b1793b8a1ffbf +Author: Behdad Esfahbod +Date: Thu Sep 25 17:26:56 2014 +0300 + + [ot-font] Minor + + src/hb-ot-font.cc | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +commit d7c160a1530adabbcf33725b105072293115a34c +Author: Behdad Esfahbod +Date: Thu Sep 25 17:15:35 2014 +0300 + + [ot-font] Handle missing vertical metrics tables + + src/hb-ot-font.cc | 26 +++++++++++++++++++------- + 1 file changed, 19 insertions(+), 7 deletions(-) + +commit be1cca270257bfdfee3fbe821175269713acf408 +Author: Behdad Esfahbod +Date: Thu Sep 25 16:53:24 2014 +0300 + + [ot-font] Add metrics_accel_t + + src/hb-ot-font.cc | 111 ++++++++++++++++++++++-------------------------- + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-hmtx-table.hh | 4 +- + 3 files changed, 54 insertions(+), 63 deletions(-) + +commit d41b809e9d21e655129a97c600d28f278fd7e62c +Author: Behdad Esfahbod +Date: Thu Sep 25 13:04:08 2014 +0300 + + [ot-font] Start adding vertical support + + src/hb-ot-font.cc | 57 ++++++++++++++++++++++++++++++++++---------- + src/hb-ot-hhea-table.hh | 63 ++++++++++++++++++++++++++----------------------- + src/hb-ot-hmtx-table.hh | 35 +++++++++++++++++---------- + 3 files changed, 100 insertions(+), 55 deletions(-) + +commit 22f0de5025aeeef4c8b3ca876d291d4c8e558d94 +Author: Behdad Esfahbod +Date: Mon Aug 25 12:54:57 2014 -0400 + + Fix build + + src/hb-ot-shape-complex-arabic-win1256.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit d457e3f0ff9b27616a34e4cc110d3edbf8796841 +Author: Behdad Esfahbod +Date: Mon Aug 25 12:31:19 2014 -0400 + + [arabic] Don't #include __FILE__ + + Fine! + + https://code.google.com/p/chromium/issues/detail?id=406957 + + src/hb-ot-shape-complex-arabic-win1256.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9ceb673d9c35bb28c9b2ed5359bdd8b23fda0019 +Author: Behdad Esfahbod +Date: Mon Aug 25 11:48:12 2014 -0400 + + [arabic] Allow disabling win1256 fallback code + + By defining HB_NO_WIN1256. + + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8a9319502141c09695461c386e54f998250420e9 +Author: Behdad Esfahbod +Date: Fri Aug 22 12:06:57 2014 -0400 + + [ot] Prefer Windows platform cmap tables / accept all Unicode encodingIDs + + Some fonts on the Mac ship with (0,1). + + src/hb-ot-font.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 270971a0fccdf4964fd3e8ab8e5cf53037a3518d +Author: Behdad Esfahbod +Date: Fri Aug 15 14:28:04 2014 -0400 + + [win32] Avoid preprocessor warnings re macros + + src/hb-private.hh | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 8c6bd34d38fb3007c3d660fce0095cc5c7e9962e +Author: Behdad Esfahbod +Date: Thu Aug 14 13:33:37 2014 -0400 + + Fix check-symbols on OS X + + src/check-libstdc++.sh | 14 +++++++------- + src/check-symbols.sh | 8 +++++++- + 2 files changed, 14 insertions(+), 8 deletions(-) + +commit 522b1cc5261c1419166bfb90d2ff634b684be66a +Author: Behdad Esfahbod +Date: Thu Aug 14 13:29:30 2014 -0400 + + [coretext] Hide feature_mappings + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0d2c2f238bf0a847ecd55a70cc0f081f18a053ac +Author: Behdad Esfahbod +Date: Thu Aug 14 13:25:55 2014 -0400 + + Simplify hb-object + + src/hb-object-private.hh | 118 +++++++++++++++-------------------------------- + 1 file changed, 36 insertions(+), 82 deletions(-) + +commit 9d861b81f349188a4507350398786a6e94038095 +Author: Behdad Esfahbod +Date: Thu Aug 14 13:15:21 2014 -0400 + + Really fix clang build this time + + src/hb-object-private.hh | 141 +++++++++++++++++++++++------------------------ + 1 file changed, 68 insertions(+), 73 deletions(-) + +commit 272226f294382b0c6921b36e0e67fc53daa765d3 +Author: Behdad Esfahbod +Date: Thu Aug 14 13:11:33 2014 -0400 + + Revert "Fix build on clang after previous commit" + + This reverts commit 9c80cbc87f23040a334e30c750f64523d9ef10c8. + + src/hb-object-private.hh | 34 +++++++++++++--------------------- + 1 file changed, 13 insertions(+), 21 deletions(-) + +commit 9c80cbc87f23040a334e30c750f64523d9ef10c8 +Author: Behdad Esfahbod +Date: Thu Aug 14 13:09:52 2014 -0400 + + Fix build on clang after previous commit + + src/hb-object-private.hh | 34 +++++++++++++++++++++------------- + 1 file changed, 21 insertions(+), 13 deletions(-) + +commit a5a27073cfff91c4f80209ca8462543130af61dd +Author: Behdad Esfahbod +Date: Thu Aug 14 13:05:36 2014 -0400 + + Rewrite this==NULL checks to avoid undefined behavior + + Fixes https://code.google.com/p/chromium/issues/detail?id=403594 + + src/hb-object-private.hh | 18 ++++++++---------- + 1 file changed, 8 insertions(+), 10 deletions(-) + +commit cc3b2d432b02f9381cdf19e2dd5fbbdd002a750c +Author: Behdad Esfahbod +Date: Thu Aug 14 12:59:16 2014 -0400 + + Remove this==NULL check from face->reference_table() + + Not supposed to happen, and apparently this is undefined in C++. + https://code.google.com/p/chromium/issues/detail?id=403594 + + src/hb-face-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cd7ea4f791dc41d62ad238673e2ea0107883c9e3 +Author: Behdad Esfahbod +Date: Thu Aug 14 12:57:02 2014 -0400 + + Make hb_object_t members private + + In preparation for fixing: + https://code.google.com/p/chromium/issues/detail?id=403594 + + src/hb-object-private.hh | 26 +++++++++++++++++++++----- + src/hb-set-private.hh | 2 +- + 2 files changed, 22 insertions(+), 6 deletions(-) + +commit c4308f895aef93ed884fd54e4ebc65b6d2cfc94a +Author: Behdad Esfahbod +Date: Wed Aug 13 19:42:01 2014 -0400 + + Minor + + test/shaping/hb_test_tools.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cd5a1149d980dc3c17b6bb9d961c761b2671ba1b +Author: Behdad Esfahbod +Date: Wed Aug 13 12:39:34 2014 -0400 + + 0.9.35 + + NEWS | 29 +++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 30 insertions(+), 1 deletion(-) + +commit 20076cc41e673c31305fcb58d37b3b292fd35f83 +Author: Behdad Esfahbod +Date: Tue Aug 12 19:26:35 2014 -0400 + + [coretext] Add version guards for kCTLanguageAttributeName + + src/hb-coretext.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 1b3011c27df531875d432e909ae6b77f115c5017 +Author: Behdad Esfahbod +Date: Tue Aug 12 19:17:19 2014 -0400 + + [coretext] Pass buffer language to CoreText + + src/hb-coretext.cc | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 3eb6a4dbf25b11fce5e0e426e89f7457887aeca0 +Author: Behdad Esfahbod +Date: Tue Aug 12 19:10:33 2014 -0400 + + [coretext] Minor + + src/hb-coretext.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 08acfe0d3a1d8223a9fa0696703fff63d6c2ea8b +Author: Behdad Esfahbod +Date: Tue Aug 12 18:57:08 2014 -0400 + + [hb-coretext] Fix cluster order of notdef runs in RTL text + + src/hb-coretext.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 30eed75de24ac0b6648a72d98d10bb24a563d7ef +Author: Behdad Esfahbod +Date: Tue Aug 12 17:15:09 2014 -0400 + + [shape-plan] Fix typo! + + The only effect is, if shaper_list was not NULL and no shaper was found, + we now don't insert anything into cache and return earlier. + + src/hb-shape-plan.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dc9aba6fc53898acd7281b118cec0355d61b1df2 +Author: Behdad Esfahbod +Date: Tue Aug 12 17:14:36 2014 -0400 + + [shape-plan] Better debug messages + + src/hb-shape-plan.cc | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit e956c65bf724a8403471362288d2361361b6ac58 +Author: Behdad Esfahbod +Date: Tue Aug 12 17:03:27 2014 -0400 + + [shape-plan] Simplify macro + + src/hb-shape-plan.cc | 22 ++++++++-------------- + 1 file changed, 8 insertions(+), 14 deletions(-) + +commit 29e25550ce8fee3fecc42d20a45ce9c212dc59df +Author: Behdad Esfahbod +Date: Tue Aug 12 17:02:59 2014 -0400 + + Fix gcc warning + + src/hb-private.hh | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 8d5eebc0c6ada01128c6ee384340efdbef7ba29d +Author: Behdad Esfahbod +Date: Tue Aug 12 16:50:22 2014 -0400 + + [shape-plan] Fix shape-plan caching with more than one requested shaper + + Wasn't breaking out of loop, ouch! + + http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1246370.html + + src/hb-shape-plan.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit bc3d0dc60104f1cda465a5e8ba5b40ed5bec70b9 +Author: Behdad Esfahbod +Date: Tue Aug 12 16:49:18 2014 -0400 + + [shape-plan] Add debug tracing + + src/hb-shape-plan.cc | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +commit 81b8d9777b9c38c7e6408591763a4cac6de18e4b +Author: Behdad Esfahbod +Date: Tue Aug 12 15:49:47 2014 -0400 + + [coretext] Fix buffer resizing + + Was very broken. Now fixed and tested. + + src/hb-coretext.cc | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +commit c3e924fb9e0e2d4003790817655efd9c5688c7e1 +Author: Behdad Esfahbod +Date: Tue Aug 12 14:25:11 2014 -0400 + + [coretext] Rewind scratch-allocated arrays when not needed anymore + + src/hb-coretext.cc | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit 8fd4d70b1450d7261a35ab3dea1c70baea2e5c99 +Author: Behdad Esfahbod +Date: Tue Aug 12 13:12:31 2014 -0400 + + [wince] Two more Windows CE fixes + + Report has it that it builds (and works) now: + + https://codereview.qt-project.org/#/c/92087/ + + src/hb-mutex-private.hh | 2 +- + src/hb-private.hh | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit fd0001d7dbe6ede99a9f87f96f231ffb53303be8 +Author: Behdad Esfahbod +Date: Tue Aug 12 10:32:41 2014 -0400 + + [coretext] Compare CGFont and PS name, if CTFont didn't match + + See comments. + + Fixes vertical text. CoreText backend is in very good shape now! + + Also see: + 5a0eed3b50629be4826e4e9428f2c3255195395d + 25f4fb9b56bb3f8bec821571c78f8829e40daa54 + + Fixes http://github.com/behdad/harfbuzz/pull/36 + + src/hb-coretext.cc | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 48 insertions(+), 6 deletions(-) + +commit 5a0eed3b50629be4826e4e9428f2c3255195395d +Author: Behdad Esfahbod +Date: Mon Aug 11 23:47:16 2014 -0400 + + [coretext] Implement vertical shaping + + Currently doesn't work though, we detect font fallback. Apparently + matching on ct_font is not safe for this. Looks like commit + 25f4fb9b56bb3f8bec821571c78f8829e40daa54 wasn't enough after all. + + src/hb-coretext.cc | 127 ++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 81 insertions(+), 46 deletions(-) + +commit 1b55077f03758e49f93b8bc1de678e96ea58718c +Author: Behdad Esfahbod +Date: Mon Aug 11 20:45:12 2014 -0400 + + [coretext] Remove unnecessary alt_size + + Wasn't needed after a6b8dc87421de33746b0b14d86d2d1532aec02af. + + src/hb-coretext.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 10b1104d791a0b0103c6bbb083b5819f2b7d328d +Author: Behdad Esfahbod +Date: Mon Aug 11 20:02:45 2014 -0400 + + [coretext] Use CFRunStatus + + Assert that all runs had expected direction, and take hint for + non-monotone clusters. + + src/hb-coretext.cc | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +commit fd1a6aa8d029c701b1532efa59ce901109cfc216 +Author: Behdad Esfahbod +Date: Mon Aug 11 20:01:37 2014 -0400 + + [coretext] Minor + + src/hb-coretext.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 130856c705641aa681307b5b51b5fb84e295f382 +Author: Behdad Esfahbod +Date: Mon Aug 11 19:16:26 2014 -0400 + + [coretext] Remove debug printf! + + src/hb-coretext.cc | 1 - + 1 file changed, 1 deletion(-) + +commit b5fbc3b8f560235d014c62e49220574ffcf89349 +Author: Behdad Esfahbod +Date: Mon Aug 11 18:40:01 2014 -0400 + + API: Do not clear buffer-flags in hb_buffer_clear_contents() + + After 763e5466c0a03a7c27020e1e2598e488612529a7, one doesn't + need to set flags for different pieces of text. The flags now + are something the client sets up once, depending on how it + actually uses the buffer. As such, don't clear it in + clear_contents(). + + Tests updated. + + src/hb-buffer-private.hh | 4 +--- + src/hb-buffer.cc | 4 ++-- + test/api/test-buffer.c | 15 ++++++++++++--- + 3 files changed, 15 insertions(+), 8 deletions(-) + +commit 104484cefeca03d95837bba5f39178693c86ce8a +Author: Behdad Esfahbod +Date: Mon Aug 11 18:23:43 2014 -0400 + + Minor + + src/hb-common.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 4acce77db7dd588ba277779c4997b0256ebe426e +Author: Behdad Esfahbod +Date: Mon Aug 11 17:46:50 2014 -0400 + + [coretext] Pass buffer direction to CoreText + + Have to use a CTTypesetter for this. + + src/hb-coretext.cc | 26 ++++++++++++++++++++++---- + 1 file changed, 22 insertions(+), 4 deletions(-) + +commit 5ec45dd37caa8a87ce2689a66272ba8a343fe6ba +Author: Behdad Esfahbod +Date: Mon Aug 11 17:46:12 2014 -0400 + + [coretext] Minor + + It's hard to handle all possible NULL returns from CoreText. Add one + more... + + src/hb-coretext.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 624a299b829ccf9864dd2f3001b1a49476e96b4a +Author: Behdad Esfahbod +Date: Mon Aug 11 15:29:18 2014 -0400 + + [coretext] Attach marks to base clusters + + Fixes https://githu.com/behdad/harfbuzz/issues/49 + to the extent that it can be fixed. + + src/hb-coretext.cc | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit 3c41ccb5358b0be6cc68d49f436d2cb1792cd5e5 +Author: Behdad Esfahbod +Date: Mon Aug 11 15:11:59 2014 -0400 + + [coretext] Use input clusters + + Before, this shaper was returning UTF-16 cluster indices instead of + returning whatever cluster values the user had had set up in the buffer. + Ouch! + + src/hb-coretext.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit a6b8dc87421de33746b0b14d86d2d1532aec02af +Author: Behdad Esfahbod +Date: Mon Aug 11 15:08:19 2014 -0400 + + [coretext] Fix buffer resize handling + + We can't really resize buffer and continue in this shaper as we are + using the scratch buffer for string_ref and log_cluster. Restructure + shaper to retry from (almost) scratch. + + src/hb-buffer-private.hh | 3 + + src/hb-coretext.cc | 428 ++++++++++++++++++++++++++--------------------- + 2 files changed, 238 insertions(+), 193 deletions(-) + +commit 9b3c60c88b118f01610ae7a608b138f79f2dc7be +Author: Behdad Esfahbod +Date: Mon Aug 11 13:25:43 2014 -0400 + + [coretext] Always compute log_clusters + + To be used soon. + + src/hb-coretext.cc | 24 +++++++++++------------- + 1 file changed, 11 insertions(+), 13 deletions(-) + +commit 15c633dd1f412f9ef839d80a8f7af35e7ea48fbc +Author: Behdad Esfahbod +Date: Mon Aug 11 13:42:42 2014 -0400 + + Minor + + src/hb-graphite2.cc | 4 ++-- + src/hb-uniscribe.cc | 6 ++---- + 2 files changed, 4 insertions(+), 6 deletions(-) + +commit 9ce067c77524a9ffc77ceabcba5e7dab36fd39de +Author: Behdad Esfahbod +Date: Mon Aug 11 02:04:38 2014 -0400 + + [coretext] Simplify cluster mapping + + src/hb-coretext.cc | 41 +++++++++++++++++------------------------ + 1 file changed, 17 insertions(+), 24 deletions(-) + +commit 49f7fb63761e4ca9936990fb90a77fd3600f5ad2 +Author: Behdad Esfahbod +Date: Sun Aug 10 19:19:38 2014 -0400 + + [coretext] Minor + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 25f4fb9b56bb3f8bec821571c78f8829e40daa54 +Author: Behdad Esfahbod +Date: Sun Aug 10 19:05:25 2014 -0400 + + [coretext] Fix fallback detection + + Fixes http://github.com/behdad/harfbuzz/pull/36 + + src/hb-coretext.cc | 29 ++++++++++++++++++++--------- + 1 file changed, 20 insertions(+), 9 deletions(-) + +commit 77a7a53acef7de355116d488e7d64ff1d7e9e9e1 +Author: Behdad Esfahbod +Date: Sun Aug 10 18:59:47 2014 -0400 + + [coretext] Fix last range + + Test with: + + hb-view /Library/Fonts/Zapfino.ttf ZapfinoZapfino --features=-dlig[7:] --shaper=coretext + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c2b151d95262a8dc2d2ce94e19ab0ef5b0c8f98d +Author: Behdad Esfahbod +Date: Sun Aug 10 18:52:07 2014 -0400 + + Fix hb_in_range() for types smaller than int + + As exercised by hb-coretext .notdef code. + + src/hb-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 26a963b9cb4af3119177f277a2d48a5d537458fb +Author: Behdad Esfahbod +Date: Sun Aug 10 18:04:50 2014 -0400 + + [wince] Try to fix some stuff on Windows CE + + Based on errors seen here: + http://testresults.qt-project.org/ci/QtBase_dev_Integration/build_03837/wince70embedded-armv4i-msvc2008_Windows_7/log.txt.gz + + Fully untested. + + src/hb-private.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 92aeee3f040c2c32cbf70b27bd6954535388c870 +Author: Behdad Esfahbod +Date: Sun Aug 10 17:42:19 2014 -0400 + + Minor + + src/hb-coretext.cc | 4 ++-- + src/hb-uniscribe.cc | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit b9993d8d6d332994dfbd29e99ff8043622003417 +Author: Behdad Esfahbod +Date: Sun Aug 10 17:40:24 2014 -0400 + + [coretext] Fix assert on Yosemite + + Apparently those functions documented as sometimes returning NULL + actually exercise that right in OS X 10.10 Yosemite. The scratch + was too small for that. I *think* I fixed it, but haven't tested + as I don't have Yosemite. + + src/hb-coretext.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 087733dd66e17297ef0e53680fafe42c84884104 +Author: Behdad Esfahbod +Date: Fri Apr 18 11:21:08 2014 -0700 + + [coretext] Use CGFont as face_data + + src/hb-coretext.cc | 26 +++++++++----------------- + 1 file changed, 9 insertions(+), 17 deletions(-) + +commit d277c3d7eee1fd4fb41c38255e5c4df539353e89 +Author: Behdad Esfahbod +Date: Thu Aug 7 15:38:52 2014 -0400 + + [arabic] Bug 82306 - Mandaic had errors in its Unicode Joining_Type + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=82306 + + src/hb-ot-shape-complex-arabic-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 38fb30d7420a4b01f99cee31baa8c3990a1d1c5f +Author: Behdad Esfahbod +Date: Wed Aug 6 13:34:49 2014 -0400 + + Use atexit() only if it's safe to call from shared library + + Apparently they are not (advertised as?) safe on BSD systems. + We ignore the case of static libraries. + + Whitelisted on glibc, Android, and MSVC / mingw. + + https://bugs.freedesktop.org/show_bug.cgi?id=82246 + + src/hb-common.cc | 4 ++-- + src/hb-ft.cc | 2 +- + src/hb-private.hh | 25 +++++++++++++++++++++++++ + src/hb-shape.cc | 2 +- + src/hb-shaper.cc | 2 +- + src/hb-uniscribe.cc | 2 +- + 6 files changed, 31 insertions(+), 6 deletions(-) + +commit d5e61470fa8e5046c35a79988e00e012ae4fff0f +Author: Behdad Esfahbod +Date: Tue Aug 5 14:19:01 2014 -0400 + + [arabic] Fix fallback shaping regression + + Was broken in 615d00ea252739da57edbd980ff27e573. + + Fixes https://github.com/behdad/harfbuzz/pull/48 + + Micro-test added. + + src/hb-ot-shape-complex-arabic.cc | 4 ++-- + test/shaping/Makefile.am | 1 + + test/shaping/fonts/sha1sum/MANIFEST | 1 + + .../sha1sum/df768b9c257e0c9c35786c47cae15c46571d56be.ttf | Bin 0 -> 6332 bytes + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/arabic-fallback-shaping.tests | 1 + + 6 files changed, 6 insertions(+), 2 deletions(-) + +commit 91c2c0fd2b0f660d79744b3dfaf39ab86883e96b +Author: Behdad Esfahbod +Date: Sat Aug 2 19:24:55 2014 -0400 + + 0.9.34 + + NEWS | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 54 insertions(+), 1 deletion(-) + +commit d7c850f8037d2701366008eb8c2a527c9d40abde +Author: Behdad Esfahbod +Date: Sat Aug 2 17:46:38 2014 -0400 + + [uniscribe] Minor + + src/hb-uniscribe.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 8f3eebf7ee4005f9a8efaafcb7f4058cc0a3756e +Author: Behdad Esfahbod +Date: Sat Aug 2 17:18:46 2014 -0400 + + Make sure gsubgpos buffer vars are available during fallback_position + + Add buffer var allocation asserts to a few key places. + + src/hb-ot-layout-gpos-table.hh | 4 ++-- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-private.hh | 15 +++++++++++++++ + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + src/hb-ot-shape-fallback.cc | 2 ++ + src/hb-ot-shape-normalize.cc | 2 ++ + src/hb-ot-shape.cc | 3 +++ + 7 files changed, 26 insertions(+), 4 deletions(-) + +commit 2053f369f84676f197ac41ea654a318c48922abd +Author: Behdad Esfahbod +Date: Sat Aug 2 16:31:16 2014 -0400 + + Disable 'liga' for vertical text + + The reason we turned it on is because Kazuraki uses it. But that's + not reason enough. Until the OpenType spec gets its act together re + adding design-direction to lookups, this is better user experience. + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 763e5466c0a03a7c27020e1e2598e488612529a7 +Author: Behdad Esfahbod +Date: Sat Aug 2 16:17:44 2014 -0400 + + Make it easier to use HB_BUFFER_FLAG_BOT/EOT + + Previously, we expected users to provide BOT/EOT flags when the + text *segment* was at paragraph boundaries. This meant that for + clients that provide full paragraph to HarfBuzz (eg. Pango), they + had code like this: + + hb_buffer_set_flags (hb_buffer, + (item_offset == 0 ? HB_BUFFER_FLAG_BOT : 0) | + (item_offset + item_length == paragraph_length ? + HB_BUFFER_FLAG_EOT : 0)); + + hb_buffer_add_utf8 (hb_buffer, + paragraph_text, paragraph_length, + item_offset, item_length); + + After this change such clients can simply say: + + hb_buffer_set_flags (hb_buffer, + HB_BUFFER_FLAG_BOT | HB_BUFFER_FLAG_EOT); + + hb_buffer_add_utf8 (hb_buffer, + paragraph_text, paragraph_length, + item_offset, item_length); + + Ie, HarfBuzz itself checks whether the segment is at the beginning/end + of the paragraph. Clients that only pass item-at-a-time to HarfBuzz + continue not setting any flags whatsoever. + + Another way to put it is: if there's pre-context text in the buffer, + HarfBuzz ignores the BOT flag. If there's post-context, it ignores + EOT flag. + + src/hb-ot-shape-complex-arabic.cc | 40 +++++++++++++++++++-------------------- + src/hb-ot-shape.cc | 1 + + 2 files changed, 20 insertions(+), 21 deletions(-) + +commit 0a5ae9336231c4d189e1682e4fd9c9c4552b8bbf +Merge: ac53443f 6ab6be32 +Author: Behdad Esfahbod +Date: Sat Aug 2 15:00:34 2014 -0400 + + Merge branch 'win1256' + +commit 6ab6be32c5857ce3344021ad2996e80b2a8c8f99 +Author: Behdad Esfahbod +Date: Sat Aug 2 14:58:38 2014 -0400 + + [arabic/win1256] Remove unused MultipleSubst macros + + src/hb-ot-shape-complex-arabic-win1256.hh | 12 ------------ + 1 file changed, 12 deletions(-) + +commit abfa4252cce1c56c472693dcd8400cd97ededd2f +Author: Behdad Esfahbod +Date: Fri Aug 1 19:05:33 2014 -0400 + + [arabic/win1256] Really fix lam-alef this time + + https://bugzilla.mozilla.org/show_bug.cgi?id=1045139#c26 + https://github.com/behdad/harfbuzz/commit/b276e897d17519a2c28f79d024904ac2bdd86bcf#commitcomment-7243499 + + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + src/hb-ot-shape-complex-arabic-win1256.hh | 49 +++++++++--------------------- + 2 files changed, 15 insertions(+), 36 deletions(-) + +commit 55977f2a462b7fa1248eab3787053dc82320d3e5 +Author: Behdad Esfahbod +Date: Fri Aug 1 16:14:33 2014 -0400 + + [arabic/win1256] Hook up lamMedi lookup + + Restructure lookup array to accommodate. + + https://bugzilla.mozilla.org/show_bug.cgi?id=1045139#c18 + + src/hb-ot-shape-complex-arabic-fallback.hh | 26 ++++++++++---------------- + src/hb-ot-shape-complex-arabic-win1256.hh | 1 + + 2 files changed, 11 insertions(+), 16 deletions(-) + +commit e839e2523e64fd0cf21929f6a45e2facd59c7917 +Author: Behdad Esfahbod +Date: Fri Aug 1 16:09:31 2014 -0400 + + [arabic/win1256] Fix TEH MARBUTA final form + + https://bugzilla.mozilla.org/show_bug.cgi?id=1045139#c18 + + src/hb-ot-shape-complex-arabic-win1256.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit a2de193220ee2839125594bd1a60b5b66ab4598e +Author: Behdad Esfahbod +Date: Thu Jul 31 18:21:05 2014 -0400 + + [arabic/win1256] Fix shaping of JEEM, HAH, and KHAH + + https://bugzilla.mozilla.org/show_bug.cgi?id=1045139#c16 + + src/hb-ot-shape-complex-arabic-win1256.hh | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) + +commit 1789ccb1dd56af6117eac00e633eff94860ba252 +Author: Behdad Esfahbod +Date: Thu Jul 31 11:04:00 2014 -0400 + + [arabic/win1256] Remove GCC'ism + + The table can now compile independently too. If we cannot make it work + on MSVC, we can always generate the data and distribute it. + + The code now compiles cleanly with: + + gcc -c -xc -std=c99 -Werror -pedantic hb-ot-shape-complex-arabic-win1256.hh + g++ -c -xc -std=c++1x -Werror -pedantic hb-ot-shape-complex-arabic-win1256.hh + + See: + https://github.com/behdad/harfbuzz/commit/a97f537cec209649302899975d76ca2b2661da7a#commitcomment-7218736 + + src/hb-ot-shape-complex-arabic-fallback.hh | 4 +- + src/hb-ot-shape-complex-arabic-win1256.hh | 123 +++++++++++++++++------------ + 2 files changed, 75 insertions(+), 52 deletions(-) + +commit f28b1c823db2ad56fed356ef864a7508d23048b8 +Author: Behdad Esfahbod +Date: Wed Jul 30 02:15:44 2014 -0400 + + [arabic] Implement Windows-1256 private shaping + + Bug 1045139 - The Arabic text with "MS Sans Serif" font is rendered bad + https://bugzilla.mozilla.org/show_bug.cgi?id=1045139 + + This is only enabled on Windows platforms, and requires support from + Uniscribe to work. But for clients that do hook up to Uniscribe, this + fixes shaping of Windows-1256-encoded bitmap fonts like "MS Sans Serif". + + The code and table together have just less than a 1kb footprint when + enabled. + + UNTESTED. I might even have broken regular Arabic fallback shaping. + + src/Makefile.am | 1 + + src/check-includes.sh | 2 +- + src/hb-ot-shape-complex-arabic-fallback.hh | 125 +++++++++-- + src/hb-ot-shape-complex-arabic-win1256.hh | 328 +++++++++++++++++++++++++++++ + 4 files changed, 442 insertions(+), 14 deletions(-) + +commit ac53443f1cea83ed43a4e41a9fdb91902f7fae7b +Author: Behdad Esfahbod +Date: Thu Jul 31 18:51:37 2014 -0400 + + [hangul] Don't apply 'calt' + + See comments. + + Micro-test added. + + src/hb-ot-shape-complex-hangul.cc | 11 ++++++++++- + test/shaping/Makefile.am | 1 + + .../sha1sum/757ebd573617a24aa9dfbf0b885c54875c6fe06b.ttf | Bin 0 -> 1804 bytes + .../sha1sum/7e14e7883ed152baa158b80e207b66114c823a8b.ttf | Bin 0 -> 1644 bytes + test/shaping/fonts/sha1sum/MANIFEST | 2 ++ + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/hangul-jamo.tests | 11 +++++++++++ + 7 files changed, 25 insertions(+), 1 deletion(-) + +commit 8292f96b2be173ebceb1b54426c271cfeaecd633 +Author: Behdad Esfahbod +Date: Thu Jul 31 18:33:11 2014 -0400 + + [test] Fix record-test.sh + + test/shaping/record-test.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 88911e8cc765c26e502503a3a00ac7f17973f3d9 +Author: Behdad Esfahbod +Date: Tue Jul 29 19:47:26 2014 -0400 + + Minor + + src/hb-ot-shape-complex-arabic-fallback.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 9e834e29e0b657f0555df1ab9cea79ff7abcf08d +Author: Behdad Esfahbod +Date: Sat Jul 26 20:34:01 2014 -0400 + + [hebrew] Zero mark advance by GDEF late + + Seems to be what Uniscribe does. + + At this point I think it's work checking our default... + + Fixes Bug 76767 - Zeroing of advance of 2nd component of multiple + substitution with SBL Hebrew + https://bugs.freedesktop.org/show_bug.cgi?id=76767 + + Micro-test added. + + src/hb-ot-shape-complex-hebrew.cc | 2 +- + .../sha1sum/8454d22037f892e76614e1645d066689a0200e61.ttf | Bin 0 -> 6068 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/zero-width-marks.tests | 1 + + 4 files changed, 3 insertions(+), 1 deletion(-) + +commit 6f2d9ba52a6d1e3fc200da1ef0e85ba020fcd0dc +Author: Behdad Esfahbod +Date: Sat Jul 26 19:17:44 2014 -0400 + + Add old-Myanmar shaper + + Looks like Unsicribe responds to the 'mymr' tag by zeroing marks + GDEF_LATE instead of generic-shaper UNICODE_LATE. Implement that. + + Fixes + Bug 81775 - Incorrect Rendering with harfbuzz-ng myanmar unicode + https://bugs.freedesktop.org/show_bug.cgi?id=81775 + + Micro-test added based on Padauk. + + src/hb-ot-shape-complex-myanmar.cc | 18 ++++++++++++++++++ + src/hb-ot-shape-complex-private.hh | 5 +++-- + test/shaping/Makefile.am | 1 + + test/shaping/fonts/sha1sum/MANIFEST | 1 + + .../bb9473d2403488714043bcfb946c9f78b86ad627.ttf | Bin 0 -> 3440 bytes + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/zero-width-marks.tests | 1 + + 7 files changed, 25 insertions(+), 2 deletions(-) + +commit 595d2b96c37de8147489dc5e0ddcc4ab1ad3eea9 +Author: Behdad Esfahbod +Date: Sat Jul 26 18:44:15 2014 -0400 + + Minor + + src/hb-ot-shape-complex-indic.cc | 1 + + src/hb-ot-shape.cc | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit fe6788bc570d77d5b3aafc68efd51ca6b80499b1 +Author: Behdad Esfahbod +Date: Fri Jul 25 12:40:56 2014 -0400 + + Typo + + src/hb-common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0de25d4184d2d92b1a2ebb6fa054275aaae4c316 +Author: Behdad Esfahbod +Date: Fri Jul 25 12:35:03 2014 -0400 + + [util] Note CSS compatibility in --help-features + + util/options.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 6e69200a2aadbc6bba35ffb4a058c14286b84f46 +Author: Behdad Esfahbod +Date: Fri Jul 25 12:30:47 2014 -0400 + + Fix snprintf() format + + Patch from Maks Naumov. + Fixes https://github.com/behdad/harfbuzz/pull/22 + + src/hb-shape.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 5c5cdbbdf8be231c433e21b050a6c6991d327b61 +Author: Behdad Esfahbod +Date: Fri Jul 25 12:21:49 2014 -0400 + + Make sure broken feature strings are not partially parsed + + If user doesn't check hb_feature_from_string() return value, we + don't want them to end up see the partially-parsed feature. + + src/hb-shape.cc | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +commit a795fe637846e0d9561d2f7cdd84cfafd58b23a7 +Author: Behdad Esfahbod +Date: Fri Jul 25 12:15:33 2014 -0400 + + Allow quotation marks around feature tag in hb_feature_from_string() + + With this, I believe we accept CSS feature strings completely. + + src/hb-shape.cc | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +commit 3f6461847412e78bcddc8eba97200f3afcde869a +Author: Behdad Esfahbod +Date: Fri Jul 25 12:04:27 2014 -0400 + + Allow space at the end of feature string with values, eg 'dlig=1 ' + + src/hb-shape.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit f31f7d2259dd8edffc070af55938cb7aa23514c1 +Author: Behdad Esfahbod +Date: Fri Jul 25 12:03:52 2014 -0400 + + Minor + + src/hb-shape.cc | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 60cb18a5dea2d30793f89e80995bb729c014864a +Author: Behdad Esfahbod +Date: Fri Jul 25 12:01:22 2014 -0400 + + Allow on/off in hb_feature_from_string() + + We now allow things like "dlig on" / "dlig=on". + + src/hb-shape.cc | 26 ++++++++++++++++++++++++-- + 1 file changed, 24 insertions(+), 2 deletions(-) + +commit d9e618eca9e01c2eb6db65504af3f73be370a1e7 +Author: Behdad Esfahbod +Date: Fri Jul 25 11:56:01 2014 -0400 + + Remove duplicate definition of ISALNUM + + It's defined in hb-private.h already. + + src/hb-shape.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 2ee5f665ded86147acedc400153c0b3a90fe07c6 +Author: Behdad Esfahbod +Date: Fri Jul 25 11:53:46 2014 -0400 + + Fix parsing of features like "- liga" (with the space) + + src/hb-shape.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e15fa7a8cffbe6a67b1048d7b87b7df77d8b1686 +Author: Behdad Esfahbod +Date: Fri Jul 25 11:44:35 2014 -0400 + + Do not require the '=' in hb_feature_from_string() + + Towards accepting CSS font-feature-settings strings. + + src/hb-shape.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit f4fe9baefdb7e0ff9946f88b6f4b55738fa30cdf +Author: Behdad Esfahbod +Date: Fri Jul 25 11:39:55 2014 -0400 + + Reject tags longer than 4 chars in hb_feature_from_string() + + src/hb-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7e8c38954649c0bf2e6051d84ca08dce090ec169 +Author: Behdad Esfahbod +Date: Fri Jul 25 11:18:11 2014 -0400 + + Minor warnings fixes + + Some systems insist on -Wmissing-field-initializers. We have too many, + by design. Fix a few easy ones. + + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-private.hh | 2 +- + src/hb-private.hh | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit fc0daafab0336b847ac14682e581a8838f36a0bf +Author: Behdad Esfahbod +Date: Wed Jul 23 16:48:51 2014 -0400 + + [indic] Handle old-spec Malayalam reordering with final Halant + + See comment. + + Micro-tests added. + + src/hb-ot-shape-complex-indic.cc | 28 +++++++++++++++++---- + test/shaping/Makefile.am | 1 + + .../270b89df543a7e48e206a2d830c0e10e5265c630.ttf | Bin 0 -> 3428 bytes + .../57a9d9f83020155cbb1d2be1f43d82388cbecc88.ttf | Bin 0 -> 2272 bytes + test/shaping/fonts/sha1sum/MANIFEST | 2 ++ + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/indic-old-spec.tests | 2 ++ + .../indic/script-malayalam/misc/misc.txt | 1 + + 8 files changed, 30 insertions(+), 5 deletions(-) + +commit d6d349d17898529ecdf8217a54987a3e9f81ce05 +Author: Behdad Esfahbod +Date: Wed Jul 23 11:38:49 2014 -0400 + + Give CC to gir-scanner + + From: + https://github.com/Alexpux/MINGW-packages/blob/master/mingw-w64-harfbuzz/0001-give-cc-to-gir-scanner.all.patch + + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 8c1bdb46facb79cfca5ebfea9a7e467b40337f47 +Author: Behdad Esfahbod +Date: Tue Jul 22 17:56:43 2014 -0400 + + 0.9.33 + + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit d218bdb26b226fbf68331eb586b24460c061313d +Author: Behdad Esfahbod +Date: Tue Jul 22 18:01:46 2014 -0400 + + Fix test runner under Windows + + test/shaping/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3f310dc0cae9015c45ba642b9b83d5695c807aad +Author: Behdad Esfahbod +Date: Tue Jul 22 16:26:27 2014 -0400 + + Disallow changing settings on immutable face + + Ouch! + + src/hb-face.cc | 8 ++++---- + src/hb-font.cc | 4 ++-- + src/hb-unicode.cc | 2 +- + 3 files changed, 7 insertions(+), 7 deletions(-) + +commit 0fc0a1022854324261fea8893678a3e9fd9443eb +Author: Behdad Esfahbod +Date: Mon Jul 21 11:12:54 2014 -0400 + + [win] Fix Cygwin build + + https://github.com/behdad/harfbuzz/commit/db308280488c2ee11ba865a9922eb6a0c1abeef3#commitcomment-7077778 + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1132a7dd0ecf1c425078e39e5471330bace42659 +Author: Behdad Esfahbod +Date: Sun Jul 20 01:17:40 2014 -0400 + + Add HB_TAG_MAX_SIGNED / _HB_SCRIPT_MAX_VALUE_SIGNED + + To make C language police happy. + + src/hb-common.h | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +commit df99976398a53521e0228541055dcaee8f5ba87f +Author: Behdad Esfahbod +Date: Sat Jul 19 17:31:23 2014 -0400 + + [gobject] Skip _HB_SCRIPT_MAX_VALUE + + Fixes https://github.com/behdad/harfbuzz/pull/38 + + src/hb-common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f1a8d50a87edfb8147aa1bec732ed7ccbfef2877 +Author: Behdad Esfahbod +Date: Sat Jul 19 16:52:32 2014 -0400 + + [win] Don't define visibility attribtue under Cygwin + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9c77027d645142794c3ff1590a96bb151c3f2e91 +Author: Behdad Esfahbod +Date: Sat Jul 19 16:37:22 2014 -0400 + + [win] Turn STRICT on for including windows.h + + src/hb-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit db308280488c2ee11ba865a9922eb6a0c1abeef3 +Author: Behdad Esfahbod +Date: Sat Jul 19 16:32:04 2014 -0400 + + [win] Consolidate windows.h include tips and tricks + + src/hb-atomic-private.hh | 4 ---- + src/hb-mutex-private.hh | 1 - + src/hb-private.hh | 12 ++++++++++++ + src/hb-uniscribe.cc | 3 --- + src/hb-uniscribe.h | 3 --- + 5 files changed, 12 insertions(+), 11 deletions(-) + +commit f26d59d4684be3419c976d781b6dbc956248e3bb +Author: Behdad Esfahbod +Date: Sat Jul 19 16:10:21 2014 -0400 + + More fixing MemoryBarrier() on Mingw32 + + Set requested windows header to Vista. See discussion: + + https://github.com/behdad/harfbuzz/commit/fbb2847f541389f40718af71c4945024ae177ab2#commitcomment-7054700 + + src/hb-atomic-private.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit 00a57eb4b50fd894dc68c6525a5bbebf0ebc30e4 +Author: Behdad Esfahbod +Date: Fri Jul 18 14:42:50 2014 -0400 + + [test] Remove unused micro-font + + .../9d64156923a1b9fed1e05f74599c16563eca42d9.ttf | Bin 81968 -> 0 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 - + 2 files changed, 1 deletion(-) + +commit ed29b15f5d0d9e7b40143926ca7d40bf645f67e9 +Author: Behdad Esfahbod +Date: Fri Jul 18 14:37:49 2014 -0400 + + [test] Add more Mongolian variation selector tests + + From + https://code.google.com/p/chromium/issues/detail?id=393896 + + .../9d64156923a1b9fed1e05f74599c16563eca42d9.ttf | Bin 0 -> 81968 bytes + test/shaping/fonts/sha1sum/MANIFEST | 2 ++ + .../bb29ce50df2bdba2d10726427c6b7609bf460e04.ttf | Bin 0 -> 74856 bytes + test/shaping/tests/mongolian-variation-selector.tests | 1 + + .../shaper-arabic/script-mongolian/misc/MANIFEST | 1 + + .../script-mongolian/misc/variation-selectors.txt | 8 ++++++++ + 6 files changed, 12 insertions(+) + +commit 385cf37cf084198e3aedb4354a7b025938a9f11b +Author: Behdad Esfahbod +Date: Thu Jul 17 18:22:07 2014 -0400 + + Fix hb_in_range() unused-var warning on Windows + + src/hb-private.hh | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit e3b42f1af409c073b819bfc696024ccb1f1da63f +Author: Behdad Esfahbod +Date: Thu Jul 17 17:13:54 2014 -0400 + + [arabic] Disable 'cswh' again + + Ouch! + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 66f30915b185727a0041c998641edb550eb8a7fc +Author: Behdad Esfahbod +Date: Thu Jul 17 16:05:47 2014 -0400 + + 0.9.32 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit 82f4d9d53f348f41b14b877c1ac77c0372c49caa +Author: Behdad Esfahbod +Date: Thu Jul 17 15:57:37 2014 -0400 + + [arabic] Add note re disabled 'cswh' + + src/hb-ot-shape-complex-arabic.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 615d00ea252739da57edbd980ff27e573f88ee7e +Author: Behdad Esfahbod +Date: Thu Jul 17 13:36:09 2014 -0400 + + [arabic] Apply init/medi/isol/fini/... in separate stages + + Follows the order of the Arabic/Syriac specs. Also don't stop + between rlig and calt in non-Arabic scripts. + + Micro-tests for Arabic and Mongolian added for the latter. + + src/hb-ot-shape-complex-arabic.cc | 56 +++++++++++++-------- + test/shaping/Makefile.am | 2 + + .../813c2f8e5512187fd982417a7fb4286728e6f4a8.ttf | Bin 0 -> 3428 bytes + .../8a9fea2a7384f2116e5b84a9b31f83be7850ce21.ttf | Bin 0 -> 3428 bytes + test/shaping/fonts/sha1sum/MANIFEST | 3 ++ + .../a919b33197965846f21074b24e30250d67277bce.ttf | Bin 0 -> 12560 bytes + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/arabic-feature-order.tests | 3 ++ + 8 files changed, 43 insertions(+), 22 deletions(-) + +commit d21e997035b16e9807dfb29c3605abb93f92f1ee +Author: Behdad Esfahbod +Date: Thu Jul 17 15:27:46 2014 -0400 + + [test] Make record_test understand cmdline args to hb-shape + + test/shaping/record-test.sh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 7cd33f230441093dbfb1fec48f8c580ee8d9ef71 +Author: Behdad Esfahbod +Date: Thu Jul 17 14:22:11 2014 -0400 + + Micro optimization + + src/hb-fallback-shape.cc | 36 +++++++++++++++++++----------------- + src/hb-ot-shape-complex-arabic.cc | 19 +++++++++++-------- + src/hb-ot-shape-complex-indic.cc | 15 ++++++++++----- + src/hb-ot-shape-complex-myanmar.cc | 7 +++++-- + src/hb-ot-shape-complex-sea.cc | 7 +++++-- + src/hb-ot-shape-fallback.cc | 30 ++++++++++++++++-------------- + src/hb-ot-shape.cc | 18 ++++++++++++------ + 7 files changed, 78 insertions(+), 54 deletions(-) + +commit 164c13d73f67fdddba28e6409d76b4903e8ffab3 +Author: Behdad Esfahbod +Date: Thu Jul 17 14:16:38 2014 -0400 + + Another try to fix Mongolian free variation selectors + + This reverts bf029281 and fixes it properly. That commit + was not enough as it was only inheriting the shaping_action + for prev_action, but not curr_action. + + Micro-test added. + + https://code.google.com/p/chromium/issues/detail?id=393896 + + src/hb-ot-shape-complex-arabic.cc | 24 +++++++++++++++------ + src/hb-unicode-private.hh | 3 ++- + test/shaping/fonts/sha1sum/MANIFEST | 1 + + .../ef86fe710cfea877bbe0dbb6946a1f88d0661031.ttf | Bin 0 -> 2748 bytes + .../tests/mongolian-variation-selector.tests | 1 + + 5 files changed, 22 insertions(+), 7 deletions(-) + +commit 5209c505061130854a2bfea8849928ade3ee92f3 +Author: Behdad Esfahbod +Date: Thu Jul 17 12:23:44 2014 -0400 + + Revert "Show U+FFFD REPLACEMENT CHARACTER for invalid Unicode codepoints" + + We now handle U+FFFD replacement in hb_buffer_add_utf*(). Any other + manipulation can happen in user callbacks. No need for this. + + https://github.com/behdad/harfbuzz/commit/efe74214bbb68eaa3d7621e73869b5d58210107e#commitcomment-7039404 + + This reverts commit efe74214bbb68eaa3d7621e73869b5d58210107e. + + Conflicts: + src/hb-ot-shape-normalize.cc + + src/hb-ot-shape-normalize.cc | 7 ------- + 1 file changed, 7 deletions(-) + +commit 9e7c720100e432b43564ed5ff12f3175ca2ed74a +Author: Dominik Röttsches +Date: Thu Jul 17 14:40:34 2014 +0300 + + Fix CoreText build after a8b89a09f6d3a34 + + src/hb-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit a4d643755a531c82ab91e1e43d6bb0b7bd46453a +Author: Behdad Esfahbod +Date: Wed Jul 16 20:15:45 2014 -0400 + + Minor + + src/hb-utf-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a18897f87ce2c6048c3a0339074924b2232e2b95 +Author: Behdad Esfahbod +Date: Wed Jul 16 16:02:15 2014 -0400 + + 0.9.31 + + NEWS | 29 +++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 30 insertions(+), 1 deletion(-) + +commit 976c8f455221eb599d1c446eafd88d51d7d2aa65 +Author: Behdad Esfahbod +Date: Wed Jul 16 15:34:20 2014 -0400 + + New API: hb_buffer_[sg]et_replacement_codepoint() + + With this change, we now by default replace broken UTF-8/16/32 bits + with U+FFFD. This can be changed by calling new API on the buffer. + Previously the replacement value used to be (hb_codepoint_t)-1. + + Note that hb_buffer_clear_contents() does NOT reset the replacement + character. + + See discussion here: + + https://github.com/behdad/harfbuzz/commit/6f13b6d62daae4989e3cc2fe4b168e5c59650964 + + New API: + + hb_buffer_set_replacement_codepoint() + hb_buffer_get_replacement_codepoint() + + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 45 ++++++++++++++++++++++++++++++++++++++++++--- + src/hb-buffer.h | 15 ++++++++++++++- + src/hb-utf-private.hh | 34 ++++++++++++++++++++-------------- + test/api/test-buffer.c | 26 +++++++++++++++----------- + 5 files changed, 92 insertions(+), 29 deletions(-) + +commit bcba8b45024e1eca8be77ca2657de1dc44dbf8fb +Author: Behdad Esfahbod +Date: Wed Jul 16 14:59:04 2014 -0400 + + New API hb_buffer_add_codepoints() + + Like hb_buffer_add_utf32, but doesn't do any Unicode validation. + This is like what hb_buffer_add_utf32 used to be until a couple + commits ago. + + src/hb-buffer.cc | 32 +++++++++++++++++++++++++++----- + src/hb-buffer.h | 8 ++++++++ + 2 files changed, 35 insertions(+), 5 deletions(-) + +commit 625dbf141a05f1ae81a7b8cbc529996370101284 +Author: Behdad Esfahbod +Date: Wed Jul 16 14:49:55 2014 -0400 + + [buffer] Templatize UTF-* functions + + src/hb-buffer.cc | 10 +- + src/hb-utf-private.hh | 307 ++++++++++++++++++++++++++------------------------ + 2 files changed, 166 insertions(+), 151 deletions(-) + +commit e634fed4285ce440d277345727ed01757df6d779 +Author: Behdad Esfahbod +Date: Wed Jul 16 14:17:26 2014 -0400 + + [buffer] Validate UTF-32 input + + Same as what we do for UTF-8 and UTF-16. + + src/hb-utf-private.hh | 13 +++++++++--- + test/api/test-buffer.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 65 insertions(+), 3 deletions(-) + +commit b98c5db32d15fcfb27ce2f6737203ce1ad124319 +Author: Behdad Esfahbod +Date: Wed Jul 16 13:44:01 2014 -0400 + + Minor refactoring + + src/hb-ot-layout-gsubgpos-private.hh | 25 ++++++------------------- + 1 file changed, 6 insertions(+), 19 deletions(-) + +commit 844f1a487d9c39724ebff20e89f6184c9a59be0b +Author: Behdad Esfahbod +Date: Wed Jul 16 13:32:51 2014 -0400 + + [tests] Add record-test.sh + + test/shaping/Makefile.am | 1 + + test/shaping/record-test.sh | 49 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 50 insertions(+) + +commit 3b861421a772f52eb232ff93bd74b5a8214801ec +Author: Behdad Esfahbod +Date: Wed Jul 16 13:22:05 2014 -0400 + + Fix Mongolian Variation Selectors for fonts without GDEF + + Originally we fixed those in 79d1007a501fd63c0ba4d51038c513e6b8b94740. + However, fonts like MongolianWhite don't have GDEF, but have IgnoreMarks + in their LigatureSubstitute init/etc features. We were synthesizing a + GDEF class of mark for Mongolian Variation Selectors and as such the + ligature lookups where not matching. Uniscribe doesn't do that. + + I tried with more sophisticated fixes, like, if there is no GDEF and + a lookup-flag mismatch happens, instead of rejecting a match, try + skipping that glyph. That surely produces some interesting behavior, + but since we don't want to support fonts missing GDEF more than we have + to, I went for this simpler fix which is to always mark + default-ignorables as base when synthesizing GDEF. + + Micro-test added. + + Fixes rest of https://bugs.freedesktop.org/show_bug.cgi?id=65258 + + src/hb-ot-shape.cc | 13 +++++++++++-- + .../sha1sum/37033cc5cf37bb223d7355153016b6ccece93b28.ttf | Bin 0 -> 2780 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/mongolian-variation-selector.tests | 1 + + 5 files changed, 14 insertions(+), 2 deletions(-) + +commit 878a25375b2fdf64cf0cc30c23fca9fcd58548e8 +Author: Behdad Esfahbod +Date: Wed Jul 16 13:21:26 2014 -0400 + + Minor + + src/hb-ot-shape.cc | 1 + + src/hb-unicode-private.hh | 6 +++--- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit ec181e50140fc65b32d6080e2f7f73bbe0269ba9 +Author: Behdad Esfahbod +Date: Wed Jul 16 13:10:03 2014 -0400 + + Minor moving around + + src/hb-ot-shape.cc | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit e7ce50d9eb6e3678f731b10dfeb308ffc478af8d +Author: Behdad Esfahbod +Date: Wed Jul 16 12:30:39 2014 -0400 + + [indic] Fix access past end of array + + src/hb-ot-shape-complex-indic.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 73e23b0acfd2948d500321769035c56c9e072d77 +Author: Behdad Esfahbod +Date: Tue Jul 15 18:43:49 2014 -0400 + + Whitespace + + src/hb-ot-layout-gsubgpos-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit f27be105afb86b337c7d940badc5a6462f0b58bb +Author: Behdad Esfahbod +Date: Fri Jul 11 18:15:34 2014 -0400 + + [Android.mk] Actually remove static library + + Android.mk | 26 -------------------------- + 1 file changed, 26 deletions(-) + +commit 96b80e9bcc4796eedac09d284dc8cc0439ced6ba +Author: Behdad Esfahbod +Date: Fri Jul 11 17:00:12 2014 -0400 + + [Android.mk] Remove static library, add note re how to build + + Android.mk | 41 +++++++++++++++++++++++++++++++++++++---- + 1 file changed, 37 insertions(+), 4 deletions(-) + +commit b7bc0b671d2d568cb64b647dad2ca866a4e0183b +Author: Behdad Esfahbod +Date: Fri Jul 11 16:20:28 2014 -0400 + + Simplify / speed up UTF-8 code + + src/hb-utf-private.hh | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +commit af2490c0959daa0fe7f32a8b3b3a3699c7fc5f48 +Author: Behdad Esfahbod +Date: Fri Jul 11 16:10:58 2014 -0400 + + Only accept well-formed UTF-8 sequences + + Enable tests that were disabled before, and adjust one test, + and add more tests. + + src/hb-utf-private.hh | 93 +++++++++++++++++++++++++++++++++----------------- + test/api/test-buffer.c | 9 +++-- + 2 files changed, 68 insertions(+), 34 deletions(-) + +commit 7323d385cc758c06671cb38239d240eb517b28bc +Author: Behdad Esfahbod +Date: Fri Jul 11 15:10:05 2014 -0400 + + Simplify hb_utf_prev<16> to call hb_utf_next<16> + + src/hb-utf-private.hh | 23 ++++++++--------------- + 1 file changed, 8 insertions(+), 15 deletions(-) + +commit c09a607a842fdd7b33e2c57e8af96d21ff091acd +Author: Behdad Esfahbod +Date: Fri Jul 11 15:05:36 2014 -0400 + + Use hb_in_range() for arabic and indic tables + + Though, looks like gcc was smart enough to produce the same code + before... + + src/gen-arabic-table.py | 18 +- + src/gen-indic-table.py | 10 +- + src/hb-ot-shape-complex-arabic-table.hh | 420 ++++++++++++++++---------------- + src/hb-ot-shape-complex-indic-table.cc | 88 +++---- + 4 files changed, 268 insertions(+), 268 deletions(-) + +commit 7627100f428ac0ec8509d961d368d2d25d8f0b6e +Author: Behdad Esfahbod +Date: Fri Jul 11 14:54:42 2014 -0400 + + Mark unsigned integer literals with the u suffix + + Simplifies hb_in_range() calls as the type can be inferred. + The rest is obsessiveness, I admit. + + src/hb-buffer-serialize.cc | 2 +- + src/hb-common.cc | 4 +- + src/hb-coretext.cc | 16 +-- + src/hb-open-file-private.hh | 4 +- + src/hb-open-type-private.hh | 2 +- + src/hb-ot-cmap-table.hh | 4 +- + src/hb-ot-head-table.hh | 6 +- + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-layout-common-private.hh | 14 +-- + src/hb-ot-layout-gdef-table.hh | 8 +- + src/hb-ot-layout-gpos-table.hh | 24 ++-- + src/hb-ot-layout-gsub-table.hh | 6 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-layout-jstf-table.hh | 2 +- + src/hb-ot-layout-private.hh | 4 +- + src/hb-ot-layout.h | 6 +- + src/hb-ot-map-private.hh | 8 +- + src/hb-ot-maxp-table.hh | 4 +- + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + src/hb-ot-shape-complex-hangul.cc | 36 +++--- + src/hb-ot-shape-complex-hebrew.cc | 134 ++++++++++----------- + src/hb-ot-shape-complex-indic.cc | 182 ++++++++++++++--------------- + src/hb-ot-shape-complex-myanmar.cc | 56 ++++----- + src/hb-ot-shape-complex-sea.cc | 8 +- + src/hb-ot-shape-complex-thai.cc | 84 ++++++------- + src/hb-ot-shape-fallback.cc | 40 +++---- + src/hb-ot-shape-normalize.cc | 2 +- + src/hb-ot-shape.cc | 6 +- + src/hb-ot-tag.cc | 18 +-- + src/hb-unicode-private.hh | 40 +++---- + src/hb-uniscribe.cc | 14 +-- + src/hb-utf-private.hh | 16 +-- + 32 files changed, 378 insertions(+), 378 deletions(-) + +commit a8b89a09f6d3a3466282aae07fd65e143f9f8f83 +Author: Behdad Esfahbod +Date: Fri Jul 11 14:18:01 2014 -0400 + + Simplify hb_in_range() + + It's both faster and produces smaller code. Now I feel stupid for + not writing it this way before. + + src/hb-private.hh | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +commit db8934faa1854dafaf4c4ce34d1818e12f67ef52 +Author: Behdad Esfahbod +Date: Fri Jul 11 13:58:36 2014 -0400 + + Simplify hb_utf_prev<8> to call hb_utf_next<8> + + src/hb-utf-private.hh | 24 ++++-------------------- + 1 file changed, 4 insertions(+), 20 deletions(-) + +commit efe74214bbb68eaa3d7621e73869b5d58210107e +Author: Behdad Esfahbod +Date: Fri Jul 11 11:59:48 2014 -0400 + + Show U+FFFD REPLACEMENT CHARACTER for invalid Unicode codepoints + + Only if the font doesn't support it. Ie, this gives the user to + use non-Unicode codepoints as private values and return a meaningful + glyph for them. But if it's invalid and font callback doesn't + like it, and if font has U+FFFD, show that instead. + + Font functions that do not want this automatic replacement to + happen should return true from get_glyph() if unicode > 0x10FFFF. + + Replaces https://github.com/behdad/harfbuzz/pull/27 + + src/hb-ot-shape-normalize.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 6f13b6d62daae4989e3cc2fe4b168e5c59650964 +Author: Behdad Esfahbod +Date: Thu Jul 10 19:31:40 2014 -0400 + + When parsing UTF-16, generate invalid codepoint for lonely low surrogate + + Test passes now. + + src/hb-utf-private.hh | 42 ++++++++++++++++++++++++++++-------------- + 1 file changed, 28 insertions(+), 14 deletions(-) + +commit 24b2ba9dfa7c35769cd843a07079ef88fa594bf8 +Author: Behdad Esfahbod +Date: Thu Jul 10 19:31:16 2014 -0400 + + [test-buffer] Add test for lonely low-surrogate + + Currenty fails. Ouch! + + test/api/test-buffer.c | 1 + + 1 file changed, 1 insertion(+) + +commit 6334495ac1ee0a86228e67794b7a41ee91146f3b +Author: Behdad Esfahbod +Date: Thu Jul 10 19:22:07 2014 -0400 + + Use zh-Hans / zh-Hant when converting OT language tag to hb_language_t + + src/hb-ot-tag.cc | 15 +++------------ + test/api/test-ot-tag.c | 6 +++--- + 2 files changed, 6 insertions(+), 15 deletions(-) + +commit f381e320df795a9d73ac81499f8ed8c311bcb2f0 +Author: Behdad Esfahbod +Date: Thu Jul 10 19:20:35 2014 -0400 + + Fix lang matching logic + + Previous code was broken logically, but harmless. + + src/hb-ot-tag.cc | 2 +- + test/api/test-ot-tag.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit ee5350d667f3a9644667202597694581f2cf657d +Author: Behdad Esfahbod +Date: Thu Jul 10 19:06:45 2014 -0400 + + Accept BCP 47 zh-Hans / zh-Hant language tags + + src/hb-ot-tag.cc | 27 ++++++++++++++++++--------- + test/api/test-ot-tag.c | 3 +++ + 2 files changed, 21 insertions(+), 9 deletions(-) + +commit 431540286794e023ec5eafd5eeedc008d4f31b4c +Author: Behdad Esfahbod +Date: Thu Jul 10 17:37:26 2014 -0400 + + [Android.mk] Add note re static library + + Android.mk | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 5b4131eb1c670c20fd9a45a5617c64060a505ef5 +Author: Behdad Esfahbod +Date: Wed Jul 9 19:09:08 2014 -0400 + + [Android.mk] Update for new ICU + + https://android-review.googlesource.com/#/c/100722/1/Android.mk + + Android.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ab28196c9557a63971a56915aa6f98bb5803bd1b +Author: Behdad Esfahbod +Date: Wed Jul 9 18:18:06 2014 -0400 + + [Android.mk] Re-enable ICU unicode funcs + + Android.mk | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit ea001374b86c4f1b24246c08a3d66d2a0e95a827 +Author: Behdad Esfahbod +Date: Wed Jul 9 17:28:43 2014 -0400 + + 0.9.30 + + NEWS | 17 +++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 18 insertions(+), 1 deletion(-) + +commit 8b16ff12590200afb08e8821e3f14d2fdf8efbda +Author: Behdad Esfahbod +Date: Wed Jul 9 17:40:52 2014 -0400 + + [uniscribe] Fix build after recent changes to Offset + + src/hb-ot-name-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 73f7f8919ea1f09b8c5b29f231ac84105cde2145 +Author: Behdad Esfahbod +Date: Wed Jul 9 17:17:18 2014 -0400 + + Define _POSIX_C_SOURCE only if it is not defined + + Fixes https://github.com/behdad/harfbuzz/pull/45 + + src/hb-blob.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 6bd5646f1b865a76304a67e03a6161afcfef293f +Author: Behdad Esfahbod +Date: Wed Jul 9 17:07:06 2014 -0400 + + [tests] Remove bash'ish + + Apparently on travis-ci, bash is linked to dash, which doesn't + understand "let". Failing tests were not being noticed. See eg: + + https://travis-ci.org/behdad/harfbuzz/jobs/29544211 + + Don't rely on bash. + + test/shaping/run-tests.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0afedaa96c81b63774a4a0ef9b4cb4995d24ec9e +Author: Behdad Esfahbod +Date: Wed Jul 9 17:00:48 2014 -0400 + + [util/hb-shape] Fix crash; oops + + util/hb-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0cd94491b99aed438ad79a55cdfced8d1b657179 +Author: Behdad Esfahbod +Date: Wed Jul 9 16:51:38 2014 -0400 + + [ucdn] Update to Unicode 7.0.0 data + + From http://github.com/behdad/ucdn + + src/hb-ucdn.cc | 23 + + src/hb-ucdn/README | 1 + + src/hb-ucdn/ucdn.c | 2 +- + src/hb-ucdn/ucdn.h | 27 + + src/hb-ucdn/unicodedata_db.h | 3711 ++++++++++++++++++++++-------------------- + 5 files changed, 2039 insertions(+), 1725 deletions(-) + +commit 9d4ede3a97fff544a5ec2a671e49a92a79645b61 +Author: Behdad Esfahbod +Date: Wed Jul 9 16:19:55 2014 -0400 + + [Android.mk] Update source list + + Android.mk | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 7e1ab1f6d812a55f75d4844f7981d5604481049c +Author: Behdad Esfahbod +Date: Wed Jul 9 16:13:40 2014 -0400 + + [Android.mk] Whitespace + + Android.mk | 26 ++++++-------------------- + 1 file changed, 6 insertions(+), 20 deletions(-) + +commit 5c6695c42470e0a15e9029ebe8ecbebf3fa4f95b +Author: Behdad Esfahbod +Date: Wed Jul 9 16:07:12 2014 -0400 + + [Android.mk] Remove -lpthread; we build with -DHB_NO_MT + + Android.mk | 3 --- + 1 file changed, 3 deletions(-) + +commit 9109f1e944dd4bd4ae8057b75c8a31e9d31797aa +Author: Behdad Esfahbod +Date: Tue Jul 8 20:02:29 2014 -0400 + + [util/hb-shape] Accept an empty output-format that would skip output + + Useful for benchmarking, to avoid buffer serialization overhead (which + seems to by far dominate shaping!) + + util/hb-shape.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 8656408572c2685f278a3b742ee69c767c29788c +Author: Behdad Esfahbod +Date: Tue Jul 8 18:10:20 2014 -0400 + + [util] Fix hb-view rendering with --font-funcs=ot + + util/helper-cairo.cc | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +commit 8650def73500204b79c651f58b1be3f94a41973d +Author: Behdad Esfahbod +Date: Sat Jul 5 15:50:18 2014 -0400 + + [util] Add option to set font function implementation to use + + Supports ft and ot right now. hb-view currently not rendering with ot. + Will fix after some clean up. + + util/options.cc | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++------- + util/options.hh | 21 ++++++++++++++++ + 2 files changed, 88 insertions(+), 9 deletions(-) + +commit 2306ad46dce1c53b0b1bfabdc04d70e3b99eabb7 +Author: Behdad Esfahbod +Date: Fri Jul 4 18:09:29 2014 -0400 + + [util] Fix memory issue + + util/options.cc | 6 ++---- + util/options.hh | 9 +++++++++ + 2 files changed, 11 insertions(+), 4 deletions(-) + +commit 14a4a9d649798d32c31f79b4045a885626dffc7f +Author: Behdad Esfahbod +Date: Tue Jul 1 15:51:54 2014 -0400 + + Add Roozbeh to AUTHORS + + He's been my shadow for all Indic-related changes in the last + few months. + + AUTHORS | 1 + + 1 file changed, 1 insertion(+) + +commit 68f724484b1663255ee249481624e552d2e2313f +Author: Behdad Esfahbod +Date: Mon Jun 30 15:46:53 2014 -0400 + + [indic] Remove some more now-unused special-cases + + src/hb-ot-shape-complex-indic.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit e79c9489802f99dc7eb8b4c2765c4c71b5f80e60 +Author: Behdad Esfahbod +Date: Mon Jun 30 15:39:39 2014 -0400 + + [indic] Remove special-casing of U+1CF2,1CF3 + + These were introduced in a498565cedf0441ae723c5e5969f637d792a15e7, + but IndicSyllabicCategory has had the correct value already, so the + special code was never needed. + + src/hb-ot-shape-complex-indic.cc | 6 ------ + 1 file changed, 6 deletions(-) + +commit d743ce78e10758b7dbaf0cfd191309e5ef646881 +Author: Behdad Esfahbod +Date: Mon Jun 30 15:24:02 2014 -0400 + + [indic-table] Update to Unicode 7.0 data + + Touch code just enough to preserve previous syllable structure + and functionality as closely as possible. Many further cleanups + coming later. + + src/gen-indic-table.py | 4 + + src/hb-ot-shape-complex-indic-private.hh | 23 +- + src/hb-ot-shape-complex-indic-table.cc | 468 ++++++++++++++++++++++--------- + src/hb-ot-shape-complex-indic.cc | 21 -- + src/hb-ot-shape-complex-myanmar.cc | 2 - + 5 files changed, 355 insertions(+), 163 deletions(-) + +commit 5fa21b3ab7175f55f89cb194b544d5d4bd06a481 +Author: Behdad Esfahbod +Date: Mon Jun 30 14:30:54 2014 -0400 + + [indic-table] Fix category frequency counts in comments + + src/gen-indic-table.py | 2 +- + src/hb-ot-shape-complex-indic-table.cc | 46 +++++++++++++++++----------------- + 2 files changed, 24 insertions(+), 24 deletions(-) + +commit 5c4e3e9a57b6b735e7d72cbd5f4070cf024d7015 +Author: Behdad Esfahbod +Date: Mon Jun 30 14:25:18 2014 -0400 + + Whitespace + + src/hb-ot-shape-complex-indic-private.hh | 76 ++++++++++++++++---------------- + 1 file changed, 38 insertions(+), 38 deletions(-) + +commit af528b6674bccac3efd13f8b33fcdc6aeb178f4c +Author: Behdad Esfahbod +Date: Fri Jun 27 18:07:00 2014 -0400 + + Fix typo; ouch! + + src/hb-ot-cmap-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7d4ada66c96a748ce92f8e8edac149361c3dc829 +Author: Behdad Esfahbod +Date: Fri Jun 27 17:30:59 2014 -0400 + + Mark unsed members with a "Z" suffix + + There may be more. There are members that are by definition + redundant or reserved and not needed, NOT what we *currently* + don't use. + + I'm sure there's more... + + src/hb-open-file-private.hh | 6 +++--- + src/hb-ot-cmap-table.hh | 24 ++++++++++++------------ + src/hb-ot-layout-common-private.hh | 2 +- + 3 files changed, 16 insertions(+), 16 deletions(-) + +commit 23afcff1d14e57f5ce30a4100698d4f2dc530958 +Author: Behdad Esfahbod +Date: Fri Jun 27 17:22:36 2014 -0400 + + [ot-font] Implement Unicode variation selectors + + src/hb-ot-font.cc | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + +commit a5a4736916b6035e6413d4619f9e7287e683d51b +Author: Behdad Esfahbod +Date: Fri Jun 27 17:03:22 2014 -0400 + + [cmap] Implement subtable format 14 + + src/hb-ot-cmap-table.hh | 147 +++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 133 insertions(+), 14 deletions(-) + +commit 586b60622c33878f9ca4826b4ef07369d32bf039 +Author: Behdad Esfahbod +Date: Fri Jun 27 15:39:47 2014 -0400 + + Minor: final bits of cleanup + + src/hb-open-type-private.hh | 1 + + src/hb-ot-layout-common-private.hh | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 51d9ba09bc78188ec87218aef5232e80568c1712 +Author: Behdad Esfahbod +Date: Fri Jun 27 15:27:15 2014 -0400 + + Minor + + src/hb-open-type-private.hh | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 3084767e92483c669f38319f153c498e9a6b92c7 +Author: Behdad Esfahbod +Date: Fri Jun 27 15:24:35 2014 -0400 + + Minor: Remove LongArrayOf + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 4 ---- + 2 files changed, 1 insertion(+), 5 deletions(-) + +commit 41ea59495032e712fa6f801350ee00d5f00b5724 +Author: Behdad Esfahbod +Date: Fri Jun 27 15:23:18 2014 -0400 + + Minor: Remove LongSortedArrayOf + + src/hb-open-type-private.hh | 4 ---- + src/hb-ot-cmap-table.hh | 2 +- + 2 files changed, 1 insertion(+), 5 deletions(-) + +commit bb6ecf2ce5c2679c298741af17836a22e1d68121 +Author: Behdad Esfahbod +Date: Fri Jun 27 15:13:44 2014 -0400 + + Minor: Remove LongOffsetArrayOf and LongOffsetLongArrayOf + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 8 -------- + src/hb-ot-layout-gdef-table.hh | 2 +- + 3 files changed, 2 insertions(+), 10 deletions(-) + +commit 99d281712390fd54e523b2f0580d10445457ec2f +Author: Behdad Esfahbod +Date: Fri Jun 27 15:12:52 2014 -0400 + + Minor: Remove GenericOffset + + src/hb-open-type-private.hh | 13 +++++-------- + src/hb-ot-layout-common-private.hh | 8 ++++---- + 2 files changed, 9 insertions(+), 12 deletions(-) + +commit 9da552dcc5b89b3bbbe5a55fb7c543222382e12a +Author: Behdad Esfahbod +Date: Fri Jun 27 15:09:42 2014 -0400 + + Minor: Remove some GenericXXX templates + + src/hb-open-type-private.hh | 32 +++++++++++--------------------- + src/hb-ot-cmap-table.hh | 4 ++-- + src/hb-ot-layout-common-private.hh | 2 +- + 3 files changed, 14 insertions(+), 24 deletions(-) + +commit 36073ede5b52bd1231622cbacd1bee6b82696d81 +Author: Behdad Esfahbod +Date: Fri Jun 27 14:48:54 2014 -0400 + + Minor: Reorder template parameter order + + src/hb-open-type-private.hh | 14 +++++++------- + src/hb-ot-cmap-table.hh | 2 +- + 2 files changed, 8 insertions(+), 8 deletions(-) + +commit 0394ec1bfbd7806cbe9fc809b34f96f8d12ffbf2 +Author: Behdad Esfahbod +Date: Fri Jun 27 14:40:35 2014 -0400 + + Minor: Introduce GenericOffset + + src/hb-open-type-private.hh | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +commit 0d1b3419a7bbfd18ab8fed1abd3a41dec11e8d97 +Author: Behdad Esfahbod +Date: Thu Jun 26 19:13:34 2014 -0400 + + Minor: Use template parameter default values for OffsetTo + + src/hb-open-type-private.hh | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +commit 546b1adcdce2d3592843938b0b81ff32e67b0b83 +Author: Behdad Esfahbod +Date: Thu Jun 26 19:10:21 2014 -0400 + + Minor: Use template parameter default values for hb_prealloced_array_t + + src/hb-private.hh | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 911ca38645bd51764e7859bc482319e8f6d2f710 +Author: Behdad Esfahbod +Date: Tue Jun 24 10:20:36 2014 -0600 + + Add back API removed recently + + Add hb_ot_layout_language_get_required_feature_index() again, which + is used in Pango. This was removed in + da132937989acb4d8ca9bd41c79f98750e7dda30 in favor of + hb_ot_layout_language_get_required_feature(). + + API changes: + + - Added hb_ot_layout_language_get_required_feature_index back. + + src/hb-ot-layout.cc | 15 +++++++++++++++ + src/hb-ot-layout.h | 7 +++++++ + 2 files changed, 22 insertions(+) + +commit 89e4946929a8cd2359c7d76fa9272d5604243002 +Author: Behdad Esfahbod +Date: Sun Jun 22 11:32:13 2014 -0600 + + Add new IndicSyllabicCategory short forms for Unicode 7.0 + + src/gen-indic-table.py | 4 ++++ + 1 file changed, 4 insertions(+) + +commit dcee838e89c2863c2fda4e8f098e720637e02335 +Author: Behdad Esfahbod +Date: Sun Jun 22 11:29:59 2014 -0600 + + Minor + + src/gen-arabic-table.py | 2 +- + src/gen-indic-table.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit f2ad86e6053fa87ab188c36edc3d98c92324c049 +Author: Behdad Esfahbod +Date: Sat Jun 21 15:31:10 2014 -0600 + + [indic-table-gen] Minor + + src/gen-indic-table.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 2ec62279aab8c2263f17ffbc7c6f74304674f9a8 +Author: Behdad Esfahbod +Date: Sat Jun 21 15:25:59 2014 -0600 + + [indic-table] Update to Unicode 6.3.0 + + Was from 6.2.0. It's a no-op. Committing for the record. + + src/hb-ot-shape-complex-indic-table.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 5d4d7384efa97a30893ad28b9ad9a994722de12c +Author: Behdad Esfahbod +Date: Sat Jun 21 14:53:21 2014 -0600 + + Minor: format + + src/hb-ot-shape-complex-arabic.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 44243ae5902cc420e6bf6ec2fca2584ba93ff2fb +Author: Behdad Esfahbod +Date: Sat Jun 21 14:19:34 2014 -0600 + + [arabic-table] Update to Unicode 7.0 + + Old table was from 6.2. Remove hard-coded Mongolian and Phags-pa data. + This completes support for new scripts Manichian and Psaltar Pahlavi. + + src/hb-ot-shape-complex-arabic-table.hh | 72 ++++++++++++++++++++++++++++----- + src/hb-ot-shape-complex-arabic.cc | 22 ---------- + 2 files changed, 63 insertions(+), 31 deletions(-) + +commit cd86ab9b4f4d7bd4f563be64a83714fc8fb395d7 +Author: Behdad Esfahbod +Date: Sat Jun 21 14:10:38 2014 -0600 + + [arabic-table] Add ZWJ/ZWNJ now that table is segmented + + src/gen-arabic-table.py | 2 -- + src/hb-ot-shape-complex-arabic-table.hh | 12 +++++++++++- + src/hb-ot-shape-complex-arabic.cc | 5 ----- + 3 files changed, 11 insertions(+), 8 deletions(-) + +commit 2390d9b67e1dfeccd3f0850d1304c52b54817ca0 +Author: Behdad Esfahbod +Date: Sat Jun 21 14:07:00 2014 -0600 + + [arabic-table] Further tune + + In anticipation of Unicode 7.0 data coming in the next commit. + + src/gen-arabic-table.py | 10 ++++++--- + src/hb-ot-shape-complex-arabic-table.hh | 38 +++++++++++++++------------------ + 2 files changed, 24 insertions(+), 24 deletions(-) + +commit a133e6067aaebc494c0156b5fac7f4a879e12dbe +Author: Behdad Esfahbod +Date: Fri Jun 20 18:01:34 2014 -0400 + + [indic-table] Minor + + src/gen-indic-table.py | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit b900fa2c8cc088dbcbdbf90bfdf8764f9ee1c96a +Author: Behdad Esfahbod +Date: Fri Jun 20 17:59:43 2014 -0400 + + [arabic-table] Use segmented table + + No functional change. + + src/gen-arabic-table.py | 82 +++++++++++++++++++++++---------- + src/hb-ot-shape-complex-arabic-table.hh | 53 ++++++++++++++------- + src/hb-ot-shape-complex-arabic.cc | 8 ++-- + 3 files changed, 97 insertions(+), 46 deletions(-) + +commit c2e113404640bf9b8bac469d0803ac946e77964f +Author: Behdad Esfahbod +Date: Fri Jun 20 17:57:03 2014 -0400 + + [indic-table] Make output stable + + src/gen-indic-table.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 55abfbd2ac1626af16151298a0837b837d0796df +Author: Behdad Esfahbod +Date: Fri Jun 20 16:47:43 2014 -0400 + + [indic-table] Minor + + No output change. + + src/gen-indic-table.py | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +commit f88670749006991282bcc4e8b6218487295ca670 +Author: Behdad Esfahbod +Date: Fri Jun 20 16:30:10 2014 -0400 + + [arabic-table] Don't write comments + + No functional change. + + src/gen-arabic-table.py | 20 +- + src/hb-ot-shape-complex-arabic-table.hh | 710 ++------------------------------ + 2 files changed, 38 insertions(+), 692 deletions(-) + +commit 200dfe3eb10feda2ad25940338b08011f4757ca4 +Author: Behdad Esfahbod +Date: Fri Jun 20 16:20:59 2014 -0400 + + [arabic-table] Use short names for values + + No functional change. + + src/gen-arabic-table.py | 16 +- + src/hb-ot-shape-complex-arabic-table.hh | 1386 ++++++++++++++++--------------- + 2 files changed, 716 insertions(+), 686 deletions(-) + +commit 3f5327a41efcf50f64d9498ef3dfd6875ef6a5ab +Author: Behdad Esfahbod +Date: Fri Jun 20 16:17:42 2014 -0400 + + [arabic-table] Read Blocks.txt and shuffle code around + + No functional change. + + src/Makefile.am | 2 +- + src/gen-arabic-table.py | 80 +++++++++++++++++++-------------- + src/hb-ot-shape-complex-arabic-table.hh | 30 ++++++++----- + 3 files changed, 67 insertions(+), 45 deletions(-) + +commit 171f970e4f72d9fe1af30eab32b96906ee4a14f5 +Author: Behdad Esfahbod +Date: Fri Jun 20 15:25:30 2014 -0400 + + [indic-table] Black-list Thai, Lao, and Tibetan + + We don't need Indic table for those. + + src/gen-indic-table.py | 3 ++ + src/hb-ot-shape-complex-indic-table.cc | 94 +++++++--------------------------- + 2 files changed, 21 insertions(+), 76 deletions(-) + +commit 65ac2dae4f284f563b2dc476a21e2b5a48124de8 +Author: Behdad Esfahbod +Date: Fri Jun 20 15:12:49 2014 -0400 + + [indic-table] Speed up lookup + + src/gen-indic-table.py | 22 +++++++++--- + src/hb-ot-shape-complex-indic-table.cc | 61 +++++++++++++++++++++++----------- + 2 files changed, 59 insertions(+), 24 deletions(-) + +commit 64442a3f4c5c7be08893454742cad6bfe73cb8d7 +Author: Behdad Esfahbod +Date: Fri Jun 20 14:58:53 2014 -0400 + + [indic-table] Fix compiler warning + + src/gen-indic-table.py | 4 +--- + src/hb-ot-shape-complex-indic-table.cc | 4 +--- + 2 files changed, 2 insertions(+), 6 deletions(-) + +commit 0436e1d50527497ebe5053b51a34ce6590276249 +Author: Behdad Esfahbod +Date: Fri Jun 20 14:56:22 2014 -0400 + + [indic-table] Make table more compact by not covering full blocks + + -#define indic_offset_total 4416 + +#define indic_offset_total 3816 + + -}; /* Table occupancy: 60% */ + +}; /* Table occupancy: 69% */ + + src/gen-indic-table.py | 24 ++++-- + src/hb-ot-shape-complex-indic-table.cc | 150 +++++++++------------------------ + 2 files changed, 57 insertions(+), 117 deletions(-) + +commit 190a251479b3cfc68871ff1daf9a9d1abe3f86e6 +Author: Behdad Esfahbod +Date: Fri Jun 20 14:41:39 2014 -0400 + + [indic-table] Remove block range from data table + + No functional change. + + src/gen-indic-table.py | 4 +- + src/hb-ot-shape-complex-indic-table.cc | 102 ++++++++++++++++----------------- + 2 files changed, 54 insertions(+), 52 deletions(-) + +commit 2b051c6057920c564c13c5d6a3e6dca93446fa12 +Author: Behdad Esfahbod +Date: Fri Jun 20 14:09:57 2014 -0400 + + Rename HB_VERSION_CHECK and hb_version_check to "atleast" + + HB_VERSION_CHECK's comparison was originally written wrongly + by mistake. When API tests were written, they were also written + wrongly to pass given the wrong implementation... Sigh. + + Given the purpose of this API, there's no point in fixing it + without renaming it. As such, rename. + + API changes: + + HB_VERSION_CHECK -> HB_VERSION_ATLEAST + hb_version_check -> hb_version_atleast + + docs/reference/harfbuzz-sections.txt | 4 ++-- + src/hb-common.cc | 10 +++++----- + src/hb-version.h.in | 10 +++++----- + test/api/test-version.c | 29 +++++++++++++++-------------- + 4 files changed, 27 insertions(+), 26 deletions(-) + +commit cabfa538ed4b1355326fa8de05f7209dda1c1c7a +Author: Behdad Esfahbod +Date: Fri Jun 20 13:51:21 2014 -0400 + + Adjust unused doc symbols + + docs/reference/harfbuzz-sections.txt | 19 +++++++++++++++++-- + src/hb-ot-shape.h | 21 ++++++++++----------- + 2 files changed, 27 insertions(+), 13 deletions(-) + +commit da132937989acb4d8ca9bd41c79f98750e7dda30 +Author: Jonathan Kew +Date: Sun Apr 27 14:05:24 2014 +0100 + + Rework handling of requiredFeature to solve problem with rlig in arial.ttf from winxp + + https://bugzilla.mozilla.org/show_bug.cgi?id=986802 + Fixes https://github.com/behdad/harfbuzz/pull/39 + + API Change: + + -hb_ot_layout_language_get_required_feature_index + +hb_ot_layout_language_get_required_feature + + New API takes an extra pointer argument. Pass NULL in to get + behavior of previous API. + + Reworked by behdad + + src/hb-ot-layout-gsubgpos-private.hh | 4 +-- + src/hb-ot-layout.cc | 29 ++++++++++++--------- + src/hb-ot-layout.h | 11 ++++---- + src/hb-ot-map.cc | 50 ++++++++++++++++++++++++++---------- + src/main.cc | 4 +-- + 5 files changed, 64 insertions(+), 34 deletions(-) + +commit df554af99db390e42d378983bb3fcf583477a1d7 +Author: Behdad Esfahbod +Date: Thu Jun 19 15:39:18 2014 -0400 + + Rename search() to bsearch() and lsearch() + + Such that the complexity of the algorithm used is clear at + call site. + + src/hb-open-type-private.hh | 4 ++-- + src/hb-ot-cmap-table.hh | 14 +++++++------- + src/hb-ot-layout-common-private.hh | 9 +++++---- + 3 files changed, 14 insertions(+), 13 deletions(-) + +commit fb8cc86ff99c08064ac58a559bb66cc340693b92 +Author: Behdad Esfahbod +Date: Thu Jun 19 15:30:18 2014 -0400 + + Rename sort() to qsort() + + In an effort to make the algorithm used clear. + + src/hb-coretext.cc | 4 ++-- + src/hb-ot-map.cc | 4 ++-- + src/hb-private.hh | 8 ++++---- + src/hb-uniscribe.cc | 4 ++-- + 4 files changed, 10 insertions(+), 10 deletions(-) + +commit 577ca4814314c374824cac736996b9cdd4f9d11f +Author: Behdad Esfahbod +Date: Wed Jun 18 12:29:23 2014 -0400 + + [unicode7] Update list of Default_Ignorable codepoints + + src/hb-unicode-private.hh | 66 +++++++++++++++++++++-------------------------- + 1 file changed, 30 insertions(+), 36 deletions(-) + +commit 7cfee3827636f0dff7df5c8975a4fadd1b4bfbd5 +Author: Behdad Esfahbod +Date: Mon Apr 28 15:09:30 2014 -0700 + + [unicode7] Route Manichaean and Psalter Pahlavi through Arabic shaper + + Still needs update to joining table to fully work. + + src/hb-ot-shape-complex-private.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit a4a7899cd93fb9d1bc2163a4bbabfa733ee5bd52 +Author: Behdad Esfahbod +Date: Mon Apr 28 15:06:42 2014 -0700 + + [unicode7] Mark right-to-left scripts + + src/hb-common.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 62587bfc5178a447ef66d88eab7412a7efe84692 +Author: Behdad Esfahbod +Date: Mon Apr 28 15:07:21 2014 -0700 + + [unicode7] Declare Unicode 7 scripts + + src/hb-common.h | 21 +++++++++------------ + 1 file changed, 9 insertions(+), 12 deletions(-) + +commit dc61294aa93d36d0c5d187d4a692560a7cb46444 +Author: Behdad Esfahbod +Date: Mon Apr 28 14:58:28 2014 -0700 + + [unicode7] Add missing ISO 15924 tags + + src/hb-common.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 7526373e70bc4c2e2072da36babf9399fcf483b8 +Author: Behdad Esfahbod +Date: Tue Jun 17 11:45:26 2014 -0400 + + [coretext] Remove unused var + + src/hb-coretext.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 798e4185bc71b1a63528e6b0af236d4c964ec607 +Author: Jonathan Kew +Date: Tue Jun 10 13:10:30 2014 +0100 + + When zeroing mark widths for LTR, also adjust offset... + + ...so that they overstrike preceding glyph. + + https://github.com/behdad/harfbuzz/pull/43 + + src/hb-ot-shape.cc | 50 +++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 39 insertions(+), 11 deletions(-) + +commit 80f7405a5208f88b8615aa4ce4c54ffeb16f04f8 +Author: Jonathan Kew +Date: Tue Jun 10 13:10:02 2014 +0100 + + [Thai] set the correct general category on Nikhahit when decomposing Sara-Am. + + src/hb-ot-shape-complex-thai.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 1d634cbb4b0338e1c2841127a72c5fac3a2a5ca1 +Author: Behdad Esfahbod +Date: Fri Jun 6 17:55:02 2014 -0400 + + Fix base-position when 'pref' is NOT formed + + If pre-base reordering Ra is NOT formed (or formed and then + broken up), we should consider that Ra as base. This is + observable when there's a left matra or dotreph that positions + before base. + + Now, it might be that we shouldn't do this if the Ra happend + to form a below form. We can't quite deduce that right now... + + Micro test added. Also at: + + https://code.google.com/a/google.com/p/noto-alpha/issues/detail?id=186#c29 + + src/hb-ot-shape-complex-indic.cc | 28 +++++++++++++++++++-- + test/shaping/fonts/sha1sum/MANIFEST | 5 ++++ + .../e207635780b42f898d58654b65098763e340f5c7.ttf | Bin 0 -> 3000 bytes + test/shaping/tests/indic-pref-blocking.tests | 3 ++- + 4 files changed, 33 insertions(+), 3 deletions(-) + +commit 04dc52fa15f5b7f9eb5f448ea43e7ef1b2269e88 +Author: Behdad Esfahbod +Date: Fri Jun 6 17:28:38 2014 -0400 + + [indic] Recover OT_H undergone ligation and multiplication + + Sometimes font designers form half/pref/etc consonant forms + unconditionally and then undo that conditionally. Try to + recover the OT_H classification in those cases. + + No test number changes expected. + + src/hb-ot-layout-private.hh | 8 ++++++++ + src/hb-ot-shape-complex-indic.cc | 21 +++++++++++++++++++++ + 2 files changed, 29 insertions(+) + +commit 39c8201f8e361e8c0f23f07bf20124ccadc6086c +Author: Behdad Esfahbod +Date: Fri Jun 6 17:19:35 2014 -0400 + + [indic] Improve base re-finding + + No test numbers change. + + src/hb-ot-shape-complex-indic.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit c04d5f0dd24d0ed9560fb9aebb5561ce946743c3 +Author: Behdad Esfahbod +Date: Fri Jun 6 17:02:39 2014 -0400 + + [indic] Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 824d00dce483d0f4030c0cac253f994810e10f32 +Author: Behdad Esfahbod +Date: Mon Jun 9 14:17:33 2014 -0400 + + Fix commit 3f38c1137b6219a646da141b08463ffa922d4e35 + + Previous commit was not compiling with clang. + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3f38c1137b6219a646da141b08463ffa922d4e35 +Author: Behdad Esfahbod +Date: Fri Jun 6 16:03:40 2014 -0400 + + Don't use -mstructure-size-boundary=8 on clang arm + + As in building for Android / iPhone. Only set it if + struct{char} alignment is not 1. + + NOT tested on an actual Arm architecture. Guess we'll know + when this makes it to people's build bots. + + configure.ac | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 0ff74b09d2ccf7a9ea0f0b463d8b6d819c86c837 +Author: Behdad Esfahbod +Date: Thu Jun 5 21:55:23 2014 -0400 + + Add missing test file. Oops + + test/shaping/tests/indic-pref-blocking.tests | 1 + + 1 file changed, 1 insertion(+) + +commit 832a6f99b34f334b1e82b8e3a7ad137e823d203c +Author: Behdad Esfahbod +Date: Wed Jun 4 16:57:42 2014 -0400 + + [indic] Don't reorder reph/pref if ligature was expanded + + Normally if you want to, say, conditionally prevent a 'pref', you + would use blocking contextual matching. Some designers instead + form the 'pref' form, then undo it in context. To detect that + we now also remember glyphs that went through MultipleSubst. + + In the only place that this is used, Uniscribe seems to only care + about the "last" transformation between Ligature and Multiple + substitions. Ie. if you ligate, expand, and ligate again, it + moves the pref, but if you ligate and expand it doesn't. That's + why we clear the MULTIPLIED bit when setting LIGATED. + + Micro-test added. Test: U+0D2F,0D4D,0D30 with font from: + + [1] + https://code.google.com/a/google.com/p/noto-alpha/issues/detail?id=186#c29 + + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 20 ++++++++++++++++---- + src/hb-ot-layout-private.hh | 16 +++++++++++++++- + src/hb-ot-shape-complex-indic.cc | 4 ++-- + test/shaping/Makefile.am | 5 ++++- + .../226bc2deab3846f1a682085f70c67d0421014144.ttf | Bin 0 -> 2828 bytes + test/shaping/tests/MANIFEST | 1 + + 7 files changed, 39 insertions(+), 9 deletions(-) + +commit b5be2317201774c84470167767ad83c8637cad5b +Author: Behdad Esfahbod +Date: Thu Jun 5 19:00:22 2014 -0400 + + [gsub] Adjust single-length ligature subst to act like single subst + + src/hb-ot-layout-gsub-table.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit aae69451dfbf2e3671c555c234f788c194302818 +Author: Behdad Esfahbod +Date: Thu Jun 5 18:54:44 2014 -0400 + + [gsub] Minor shuffling + + src/hb-ot-layout-gsub-table.hh | 29 ++++++++++++++++------------- + 1 file changed, 16 insertions(+), 13 deletions(-) + +commit b6b304f12be917b7449b3ac9409069fcd4a27d95 +Author: Behdad Esfahbod +Date: Thu Jun 5 17:12:54 2014 -0400 + + [ot] Add TODO re zero-len MultipleSubst sequences + + src/hb-ot-layout-gsub-table.hh | 9 +++++++++ + src/hb-ot-layout-gsubgpos-private.hh | 4 +++- + 2 files changed, 12 insertions(+), 1 deletion(-) + +commit f1a72fe7bf863535ec09b559cc0bd878fd0799f2 +Author: Behdad Esfahbod +Date: Wed Jun 4 19:00:29 2014 -0400 + + [ot-font] Fix cmap EncodingRecord cmp order + + src/hb-ot-cmap-table.hh | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit ce34f0b07e5324ed52e6e2c43000c2b09ee010d4 +Author: Behdad Esfahbod +Date: Wed Jun 4 18:57:46 2014 -0400 + + [ot-font] Use binary search for format12 cmap subtable + + src/hb-open-type-private.hh | 4 ++++ + src/hb-ot-cmap-table.hh | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 257d1adfa1b3422c511c55e641840a6e31ec6008 +Author: Behdad Esfahbod +Date: Wed Jun 4 18:47:55 2014 -0400 + + [ot-font] Work around broken cmap subtable format 4 length + + Roboto was hitting this. FreeType also has pretty much the + same code for this, in ttcmap.c:tt_cmap4_validate(): + + /* in certain fonts, the `length' field is invalid and goes */ + /* out of bound. We try to correct this here... */ + if ( table + length > valid->limit ) + { + if ( valid->level >= FT_VALIDATE_TIGHT ) + FT_INVALID_TOO_SHORT; + + length = (FT_UInt)( valid->limit - table ); + } + + src/hb-ot-cmap-table.hh | 22 ++++++++++++++++++---- + 1 file changed, 18 insertions(+), 4 deletions(-) + +commit 51f563579b94e1ee23ced9bbcc7dd3341535ce72 +Author: Behdad Esfahbod +Date: Wed Jun 4 18:42:32 2014 -0400 + + Move try_set to sanitize context + + src/hb-open-type-private.hh | 22 ++++++++++------------ + src/hb-ot-layout-common-private.hh | 2 +- + 2 files changed, 11 insertions(+), 13 deletions(-) + +commit 500737e8e16dce5248aff394899bb3761a9c3bbf +Author: Behdad Esfahbod +Date: Wed Jun 4 18:17:29 2014 -0400 + + [ot-font] Don't select a Null cmap subtable + + Can happen either in broken fonts, or as a result of sanitize(). + + src/hb-ot-cmap-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dac86026a6bae5a8a03cfe885bf93f32e5f48614 +Author: Behdad Esfahbod +Date: Tue Jun 3 17:57:00 2014 -0400 + + Fix some cppcheck warnings + + Bug 77800 - cppcheck reports + + src/hb-common.cc | 4 +++- + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-private.hh | 2 +- + src/hb-shape-plan.cc | 4 ++-- + 4 files changed, 7 insertions(+), 5 deletions(-) + +commit c306410cab368a27c1941a2625d3b475edeaac04 +Author: Behdad Esfahbod +Date: Tue Jun 3 16:59:41 2014 -0400 + + Bug 77732 - Fix unused typedef warning for ASSERT_STATIC with GCC 4.8 + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ae2b854eab7f1c48e56751c987a714c2c18d6eb6 +Author: Behdad Esfahbod +Date: Tue Jun 3 16:59:09 2014 -0400 + + Move code around + + src/hb-private.hh | 134 ++++++++++++++++++++++++++---------------------------- + 1 file changed, 65 insertions(+), 69 deletions(-) + +commit 17c3b809f42aec34d83dba2e6229ad85804bebae +Author: Behdad Esfahbod +Date: Mon Jun 2 15:08:18 2014 -0400 + + [indic] Treat U+A8E0..A8F1 as OT_A instead of OT_VD + + Apparently they can intermix with other OT_A. + + Test: U+0915,A8E2,1CD0 + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6ae13f257c3986517c097fa666ab9f58bdc918b5 +Author: Behdad Esfahbod +Date: Fri May 30 17:38:14 2014 -0400 + + [graphite2] Fix cluster mapping + + Patch from Martin Hosken. I expect this to fix the following bugs: + + https://bugs.freedesktop.org/show_bug.cgi?id=75076 + https://bugzilla.gnome.org/show_bug.cgi?id=723582 + https://bugzilla.redhat.com/show_bug.cgi?id=998812 + + src/hb-graphite2.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 5875ad9c467b39d00ad4d98fd425179c701e6fd0 +Author: Behdad Esfahbod +Date: Thu May 29 15:48:16 2014 -0400 + + 0.9.29 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit 7977ca17aac34b9ab10622928bed8afa2177f16a +Author: Behdad Esfahbod +Date: Thu May 29 15:34:26 2014 -0400 + + [indic] Allow decimal and Brahmi digits as placeholders + + Tests: U+0967,0951 U+0031,093F + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + .../texts/in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt | 2 ++ + 2 files changed, 6 insertions(+) + +commit e8b5d64039614ecce472eda1a7a603736da25d86 +Author: Behdad Esfahbod +Date: Thu May 29 15:18:27 2014 -0400 + + [indic] Do NOT allow reph formation on placeholders + + Only allow it on DOTTED CIRCLE. No effect on test numbers. + + Test: U+0930,094D,00A0 + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + .../in-tree/shaper-indic/indic/script-devanagari/misc/dottedcircle.txt | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 52b562a6a058131c0103aaa5404d053e6465bb23 +Author: Behdad Esfahbod +Date: Tue May 27 18:18:23 2014 -0400 + + [indic] Clean up a bit + + No functional change intended. + + src/hb-ot-shape-complex-indic.cc | 17 +++++------------ + 1 file changed, 5 insertions(+), 12 deletions(-) + +commit 3bf652b90783e8244c153739585d95dc4162efb4 +Author: Behdad Esfahbod +Date: Tue May 27 18:07:26 2014 -0400 + + [indic] Treat U+002D and U+2010..2014 as placeholders + + src/hb-ot-shape-complex-indic.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit e0de95f40244924cb8f9f7abca7f53117044a0eb +Author: Behdad Esfahbod +Date: Tue May 27 17:58:34 2014 -0400 + + [indic] Treat U+00D7 MULTIPLICATION SIGN as placeholder + + src/hb-ot-shape-complex-indic.cc | 1 + + 1 file changed, 1 insertion(+) + +commit cf78dd483cbe1759a8ecb731879e041a53ba9bb3 +Author: Behdad Esfahbod +Date: Tue May 27 17:53:37 2014 -0400 + + [indic/myanmar] Rename OT_NBSP to OT_PLACEHOLDER + + src/hb-ot-shape-complex-indic-machine.rl | 4 ++-- + src/hb-ot-shape-complex-indic-private.hh | 6 +++--- + src/hb-ot-shape-complex-indic.cc | 4 ++-- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + 4 files changed, 8 insertions(+), 8 deletions(-) + +commit 186ece94c8838e95db240d3e7c3ce415da6be81e +Author: Behdad Esfahbod +Date: Tue May 27 17:49:45 2014 -0400 + + [myanmar] Use OT_NBSP instead of OT_DOTTEDCIRCLE for OT_GB + + No functional change. + + src/hb-ot-shape-complex-myanmar-machine.rl | 2 +- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit cf71d28c380819cb0f7f0f22f6ff9e4aa881a2b8 +Author: Behdad Esfahbod +Date: Tue May 27 17:47:43 2014 -0400 + + [indic/myanmar] Refactor a few macros + + src/hb-ot-shape-complex-indic-private.hh | 12 ++++++++++++ + src/hb-ot-shape-complex-indic.cc | 10 ---------- + src/hb-ot-shape-complex-myanmar.cc | 6 ------ + 3 files changed, 12 insertions(+), 16 deletions(-) + +commit 2307268e01d27a999b56a2f573dfcee8b2a7949b +Author: Behdad Esfahbod +Date: Tue May 27 17:39:01 2014 -0400 + + [indic] Treat U+0A72..0A73 like regular consonants + + Unicode 6.x IndicSyllableCategory categorizes them as + placeholders, but they can subjoin. + + src/hb-ot-shape-complex-indic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e9b2a4cfe593bdbe9288571635ba26ac42ede987 +Author: Behdad Esfahbod +Date: Fri May 23 15:49:10 2014 -0400 + + [indic] Support U+1CED + + src/hb-ot-shape-complex-indic.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit d19f8e85702a1e473efe2f02027984dcc127602a +Author: Behdad Esfahbod +Date: Fri May 23 15:45:50 2014 -0400 + + [indic] Support U+A8F2..A8F7,1CE9..1CEC,1CEE..1CF1 + + src/hb-ot-shape-complex-indic.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit ddbdfcbf1c10eed0a7b81b29fee99f1bd22113e5 +Author: Behdad Esfahbod +Date: Fri May 23 15:39:55 2014 -0400 + + [indic] Simplify grammar + + No functional change. + + src/hb-ot-shape-complex-indic-machine.rl | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 4e9b1f662b23966e67c548b86afeff2bec9b0eb7 +Author: Behdad Esfahbod +Date: Fri May 23 15:38:42 2014 -0400 + + [indic] Always start new syllable for Avagraha + + In fact, the previous grammar was ambigious. No functional + change. + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9f9bd9bf31161660214b8b39a78cdafbb79db1be +Author: Behdad Esfahbod +Date: Fri May 23 15:33:13 2014 -0400 + + [indic] Rename avagraha cluster to symbol cluster + + In anticipation of adding more characters to that class of clusters. + + src/hb-ot-shape-complex-indic-machine.rl | 10 +++++----- + src/hb-ot-shape-complex-indic-private.hh | 4 ++-- + src/hb-ot-shape-complex-indic.cc | 14 +++++++------- + 3 files changed, 14 insertions(+), 14 deletions(-) + +commit a498565cedf0441ae723c5e5969f637d792a15e7 +Author: Behdad Esfahbod +Date: Thu May 22 19:39:56 2014 -0400 + + [indic] Support U+1CF2,U+1CF3 + + src/hb-ot-shape-complex-indic.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit ecb98babbaa065940b40ca8954a454f0e2cdcff0 +Author: Behdad Esfahbod +Date: Thu May 22 19:36:21 2014 -0400 + + [indic] Support U+1CE2..U+1CE8 + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 37bf2c9224e32fdc99c20158c6dc0a4602ec1292 +Author: Behdad Esfahbod +Date: Thu May 22 19:35:17 2014 -0400 + + Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 131e17ff9ae792cafa7a500043acb373802ee872 +Author: Behdad Esfahbod +Date: Thu May 22 19:32:51 2014 -0400 + + [indic] Support U+1CF5,1CF6 + + src/hb-ot-shape-complex-indic.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 72ead0cc72dac4d1c985ead065bb820f93f14a1d +Author: Behdad Esfahbod +Date: Thu May 22 19:12:10 2014 -0400 + + [indic] Treat U+1CE1 as a tone-mark too + + It's spacing, but otherwise the same as the other ones. + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e848bfae7c975a6fae434daf8e3db4d69914df9f +Author: Behdad Esfahbod +Date: Thu May 22 18:50:34 2014 -0400 + + [indic] Recategorize U+A8E0..A8F1 as OT_VD + + Up to two of them come after all OT_A characters. + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + src/hb-ot-shape-complex-indic.cc | 10 ++++++---- + 2 files changed, 7 insertions(+), 5 deletions(-) + +commit c519536c34c842304da558dd4a9e3844fc261b20 +Author: Behdad Esfahbod +Date: Thu May 22 18:43:14 2014 -0400 + + [indic] Allow up to three tone marks + + According to Roozbeh, there are valid combinations in Unicode + proposals for up to three. Previously we were allowing up to two. + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c11fc6833980fce6d70c5ae0c6623de97a3eb30a +Author: Behdad Esfahbod +Date: Thu May 22 18:41:49 2014 -0400 + + [indic] Support more extended Devanagari tone marks + + Also adjust U+0953,0954 handling. + + src/hb-ot-shape-complex-indic.cc | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +commit 26c836e53d55a2e2d4c17fd9ea1884eec33ce015 +Author: Behdad Esfahbod +Date: Wed May 21 18:35:48 2014 -0400 + + [indic] Handle "Cantillation marks for the Samaveda" + + src/hb-ot-shape-complex-indic.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 29531128f2f4342d537817746863705df80efe4b +Author: Behdad Esfahbod +Date: Thu May 15 14:04:02 2014 -0600 + + [indic] Improve reph formation of Sinhala and Telugu + + Sinhala and Telugu use "explicit" reph. That is, the reph is formed by + a Ra,H,ZWJ sequence. Previously, upon detecting this sequence, we were + checking checking whether the 'rphf' feature applies to the first two + glyphs of the sequence. This is how the Microsoft fonts are designed. + However, testing with Noto shows that apparently Uniscribe also forms + the reph if the lookup ligates all three glyphs. So, try both + sequences. + + Doesn't affect test results for Sinhala or Telugu. + + https://code.google.com/a/google.com/p/noto-alpha/issues/detail?id=232 + + src/hb-ot-shape-complex-indic.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 8c703f13bf8b4b276093b1c42cd3759e34b6787f +Author: Oleg Oshmyan +Date: Wed May 14 22:10:09 2014 +0100 + + Fix build with --coretext on older OS X + + Fixes https://github.com/behdad/harfbuzz/pull/40 + + src/hb-coretext.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 439b05867c0856a81fa8f9bea3a7465b4b4bdd91 +Author: Behdad Esfahbod +Date: Wed May 14 16:44:39 2014 -0600 + + [myanmar] Allow MedialYa+Asat in the grammar + + The grammar in the OT spec, and the existing Windows implementation + seem to be confused around where to allow Asat around the medial + consonants. + + The previous grammar for medial group was allowing an Asat after + the medial group only if there was a medial Wa or Ha, but not if + there was only a medial Ya. This doesn't make sense to me and + sounds reversed, as both medial Wa and Ha are below marks while + Asat is an above mark. An Asat can come before the medial group + already (in fact, multiple ones can. Why?!). The medial Ya + however is a spacing mark and according to Roozbeh it's valid + to want an Asat on the medial Ya instead of the base, so it looks + to me like we want to allow an Asat after the medial group if + there *was* a Ya but not if there wasn't any. Not wanting to + produce dotted-circle where Windows is not, this commit changes + the grammar to allow one Asat after the medial group no matter + what comes in the group. + + Test: U+1002,103A,103B vs U+1002,103B,103A + + src/hb-ot-shape-complex-myanmar-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0a017ce169d791c9aea56671fe5837961e0a3c09 +Author: Behdad Esfahbod +Date: Wed May 14 16:44:16 2014 -0600 + + Add tests for Myanmar Asat+MedialYa and MedialYa+Asat sequences + + One of them currently produces dotted-circle. Fix and detailed + message coming. + + test/shaping/texts/in-tree/shaper-myanmar/script-myanmar/misc/misc.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit c95587618c88d187be64f923033dae151cf820be +Author: Behdad Esfahbod +Date: Wed May 14 00:42:18 2014 -0400 + + [ot] Minor note re cmap subtable format 2 and 8 + + src/hb-ot-cmap-table.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit b7878cd58ea9a67236e1e0228c35b5b03ec4ff9c +Author: Behdad Esfahbod +Date: Tue May 13 21:47:51 2014 -0400 + + [ot] Implement cmap subtable format 0 + + src/hb-open-type-private.hh | 3 ++- + src/hb-ot-cmap-table.hh | 32 ++++++++++++++++++++++++++++++++ + 2 files changed, 34 insertions(+), 1 deletion(-) + +commit ca7b77431d1e0aaa803722be8be85a368a385f47 +Author: Behdad Esfahbod +Date: Tue May 13 21:26:34 2014 -0400 + + [ot] Factor out code between cmap sutable format 12 and 13 + + src/hb-ot-cmap-table.hh | 43 +++++++++++++------------------------------ + 1 file changed, 13 insertions(+), 30 deletions(-) + +commit 94759e8219ed08392573bae948a8135e16b8e0d0 +Author: Behdad Esfahbod +Date: Tue May 13 21:17:28 2014 -0400 + + [ot] Factor out code between cmap subtable format 6 and 10 + + src/hb-ot-cmap-table.hh | 49 ++++++++++--------------------------------------- + 1 file changed, 10 insertions(+), 39 deletions(-) + +commit 1a8ffc512987c1ff1b4896549f80b145c85454a8 +Author: Behdad Esfahbod +Date: Tue May 13 21:06:39 2014 -0400 + + Minor + + src/hb-blob.h | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 91bbfca87527fa14d6ebec86b087f2a989381872 +Author: Behdad Esfahbod +Date: Mon May 12 18:19:29 2014 -0400 + + [ot] Implement cmap subtable formats 6 and 10 + + src/hb-ot-cmap-table.hh | 77 +++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 74 insertions(+), 3 deletions(-) + +commit d294a2cb165c4f20daa5624969067c51eb9aef58 +Author: Behdad Esfahbod +Date: Mon May 12 17:58:31 2014 -0400 + + [ot] Implement cmap subtable format 13 + + src/hb-ot-cmap-table.hh | 47 +++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 41 insertions(+), 6 deletions(-) + +commit 0d75793fae95ed9f6b8522ae3af4fcdf397d8c36 +Author: Behdad Esfahbod +Date: Mon May 12 17:51:15 2014 -0400 + + [ot] Implement cmap subtable format 12 + + src/hb-ot-cmap-table.hh | 63 +++++++++++++++++++++++++++++++++++++++++++++++-- + src/hb-ot-font.cc | 5 ++++ + 2 files changed, 66 insertions(+), 2 deletions(-) + +commit 3608a6847e7b7eb4206df049158513a085810afd +Author: Behdad Esfahbod +Date: Mon May 12 13:46:29 2014 -0400 + + [ot] Hook up cmap table to hb_ot_font_funcs() + + src/hb-ot-cmap-table.hh | 10 +++++++--- + src/hb-ot-font.cc | 33 +++++++++++++++++++-------------- + 2 files changed, 26 insertions(+), 17 deletions(-) + +commit c8a47452993b9dee6854bfc866aca4a20142696f +Author: Behdad Esfahbod +Date: Fri May 9 19:55:51 2014 -0400 + + [ot] Implement cmap subtable format 4 + + src/hb-ot-cmap-table.hh | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 52 insertions(+) + +commit 4719621f20dfd6a0377c650a7b4df223c18dc143 +Author: Behdad Esfahbod +Date: Fri May 9 16:09:11 2014 -0400 + + Minor + + src/hb-open-type-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 41ca1fbebf61cf26e1e0e4b11f4a5b52fb7d88a9 +Author: Behdad Esfahbod +Date: Fri May 9 15:35:56 2014 -0400 + + [ot] Start implementing cmap table + + src/Makefile.am | 1 + + src/hb-ot-cmap-table.hh | 171 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-font.cc | 1 + + 3 files changed, 173 insertions(+) + +commit c7074b8798048324cb8850c55908ce77fc33d11e +Author: Behdad Esfahbod +Date: Thu May 8 18:24:31 2014 -0400 + + [otlayout] Add GenericArrayOf::search() + + src/hb-open-type-private.hh | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 40a479797add42fa42b78d4267920ef75bfb6b9a +Author: Behdad Esfahbod +Date: Thu May 8 18:21:04 2014 -0400 + + [otlayout] Add GenericSortedArrayOf + + src/hb-open-type-private.hh | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 0ddecabc6de205b121bec31fbf670f37cc9454ef +Author: Behdad Esfahbod +Date: Thu May 1 16:01:40 2014 -0700 + + [main] Minor improvement to output + + src/main.cc | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit 79ecdc3f9525212053d2bc88a5541c41697159da +Author: Behdad Esfahbod +Date: Mon Apr 28 14:24:23 2014 -0700 + + 0.9.28 + + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit 6faff8e4132197ba06f0e685b82efe35b546cf64 +Author: Behdad Esfahbod +Date: Mon Apr 28 14:29:39 2014 -0700 + + Add static storage classifier to inline functions + + Before we were just relying on the compiler inlining them and not + leaving a trace in our public API. Try to fix. Hopefully not + breaking anyone's build. + + src/hb-open-type-private.hh | 22 +++++++++++----------- + src/hb-ot-layout-gpos-table.hh | 4 ++-- + src/hb-ot-layout-gsub-table.hh | 6 +++--- + src/hb-ot-layout-private.hh | 36 ++++++++++++++++++------------------ + src/hb-ot-map-private.hh | 10 +++++----- + src/hb-private.hh | 2 +- + 6 files changed, 40 insertions(+), 40 deletions(-) + +commit 9c9411839bb89d0a1a83120af0982c60e0e393d9 +Author: Behdad Esfahbod +Date: Mon Apr 28 12:38:25 2014 -0700 + + [tibetan] Reorder PADMA sign to occur after other below marks + + Based on suggestion from Andrew Glass. + + Test: U+0F40,0FC6,0F83 + + src/hb-unicode-private.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 659cd3c5b470ff9724ce5e53fedd1fea3e7512c4 +Author: Behdad Esfahbod +Date: Mon Apr 28 12:43:42 2014 -0700 + + [test] Add test case for Tibetan sign PADMA + + Currently fails. + + test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/misc.txt | 1 + + 1 file changed, 1 insertion(+) + +commit ee703bc3ef740c300718fca7a12c050c322dce19 +Author: Behdad Esfahbod +Date: Mon Apr 28 12:43:18 2014 -0700 + + Reshuffle test data + + test/shaping/texts/in-tree/MANIFEST | 3 +++ + test/shaping/texts/in-tree/shaper-default/MANIFEST | 3 --- + .../in-tree/{shaper-default => shaper-hangul}/script-hangul/MANIFEST | 0 + .../{shaper-default => shaper-hangul}/script-hangul/misc/MANIFEST | 0 + .../{shaper-default => shaper-hangul}/script-hangul/misc/misc.txt | 0 + .../in-tree/{shaper-default => shaper-hebrew}/script-hebrew/MANIFEST | 0 + .../{shaper-default => shaper-hebrew}/script-hebrew/misc/MANIFEST | 0 + .../script-hebrew/misc/diacritics.txt | 0 + .../in-tree/{shaper-default => shaper-tibetan}/script-tibetan/MANIFEST | 0 + .../{shaper-default => shaper-tibetan}/script-tibetan/misc/MANIFEST | 0 + .../{shaper-default => shaper-tibetan}/script-tibetan/misc/misc.txt | 0 + 11 files changed, 3 insertions(+), 3 deletions(-) + +commit b082ef373cefb35dd98b5f2f0b677ccc7806f51e +Author: Behdad Esfahbod +Date: Fri Apr 25 11:48:10 2014 -0700 + + Typo + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 828e109c7aac3389cc3b89ea1f13388aefb63804 +Author: Behdad Esfahbod +Date: Fri Apr 18 16:53:34 2014 -0700 + + [indic] Fix-up zero-context matching + + commit b5a0f69e47ace468b06e21cf069a18ddcfcf6064 + Author: Behdad Esfahbod + Date: Thu Oct 17 18:04:23 2013 +0200 + + [indic] Pass zero-context=false to would_substitute for newer scripts + + For scripts without an old/new spec distinction, use zero-context=false. + This changes behavior in Sinhala / Khmer, but doesn't seem to regress. + This will be useful and used in Javanese. + + The *intention* was to change zero-context from true to false for scripts that + don't have old-vs-new specs. However, checking the code, looks like we + essentially change zero-context to always be true; ie. we only changed things + for old-spec, and we broke them. That's what causes this bug: + + https://bugs.freedesktop.org/show_bug.cgi?id=76705 + + The root of the bug is here: + + /* Use zero-context would_substitute() matching for new-spec of the main + * Indic scripts, but not for old-spec or scripts with one spec only. */ + bool zero_context = indic_plan->config->has_old_spec || !indic_plan->is_old_spec; + + Note that is_old_spec itself is: + + indic_plan->is_old_spec = indic_plan->config->has_old_spec && ((plan->map.chosen_script[0] & 0x000000FF) != '2'); + + It's easy to show that zero_context is now always true. What we really meant was: + + bool zero_context = indic_plan->config->has_old_spec && !indic_plan->is_old_spec; + + Ie, "&&" instead of "||". We made this change supposedly to make Javanese + work. But apparently we got it working regardless! So I'm going to fix this + to only change the logic for old-spec and not touch other cases. + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 66c6a48b6ce9dab6375ba1a23d7e450d6974852a +Author: Behdad Esfahbod +Date: Mon Apr 14 15:55:42 2014 -0700 + + Add HB_NO_MERGE_CLUSTERS + + Disables any cluster-merging. Added for testing purposes while + we investigate what kind of API to add for this. + + src/hb-buffer.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 897c7b804d6817470a364ba31b1719555b12f751 +Author: Behdad Esfahbod +Date: Thu Apr 10 16:27:13 2014 -0700 + + Add Khmer test for U+17DD + + .../shaper-indic/south-east-asian/script-khmer/misc/other-marks.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 50a00535ccac538bbf93358fd2d2442e4c12542f +Author: Behdad Esfahbod +Date: Thu Apr 10 16:03:29 2014 -0700 + + Require gobject-introspection 1.34.0 + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=75384 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5fd996c4a4049a75c6d9e964f1a81c00ff191893 +Author: Behdad Esfahbod +Date: Wed Apr 9 16:38:26 2014 -0700 + + Further adjust check-defs and check-symbols for mipsel + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=74491 + + src/check-defs.sh | 2 +- + src/check-symbols.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 75ec6d0bc5ca0170c73e4d1099a898d38d8f85c0 +Author: Behdad Esfahbod +Date: Wed Apr 9 16:33:32 2014 -0700 + + Tighten up check-static-inits.sh check + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=74490 + + src/check-static-inits.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 110ec0714a11b9417eed82f7d25b85c9dc7b6df4 +Author: Behdad Esfahbod +Date: Tue Apr 8 17:32:08 2014 -0700 + + Typo + + src/hb-blob.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0682ddd05c22a400ff5ce97d4ea4b52a18b845ae +Author: Behdad Esfahbod +Date: Tue Apr 8 16:03:35 2014 -0700 + + [indic] Support U+17DD KHMER SIGN ATTHACAN + + As requested by Martin Hosken on the list. + + src/hb-ot-shape-complex-indic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 05870ed62edd8728d6d732f60d6b7e149d45e6f4 +Author: Primiano Tucci +Date: Wed Apr 2 11:35:27 2014 +0100 + + Use __aarch64__ for 64-bit ARM detection, not __arm64__ + + Many GCC versions don't define __arm64__ + + src/hb-atomic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 04d894e89795041b2055dc172744a018644f2bca +Author: Behdad Esfahbod +Date: Tue Mar 25 12:11:32 2014 -0700 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 903648437c180c7b039801cdb0672e0f8e14afd4 +Author: Behdad Esfahbod +Date: Mon Mar 24 14:26:36 2014 -0700 + + Start fleshing out builtin font functions + + src/Makefile.am | 3 +- + src/hb-glib.cc | 2 +- + src/hb-icu.cc | 2 +- + src/hb-ot-font.cc | 260 ++++++++++++++++++++++++++++++++++++ + src/{hb-tt-font.cc => hb-ot-font.h} | 56 ++------ + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-ot.h | 1 + + util/Makefile.am | 4 +- + util/options.cc | 4 + + 10 files changed, 283 insertions(+), 53 deletions(-) + +commit 343a0e4e747d93eeeb724c5d585f5ba036a0df84 +Author: Behdad Esfahbod +Date: Fri Mar 21 14:37:27 2014 -0700 + + Add "make built-sources" + + src/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e9853f33d1f53d4d69ee0fa340ce9225a5ed17ca +Author: Behdad Esfahbod +Date: Fri Mar 21 12:53:08 2014 -0700 + + One more fix for build without gtk-doc + + Fixes https://github.com/behdad/harfbuzz/pull/35 + + autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b96af03c20e46105982b3608b608614403540661 +Author: Konstantin Ritt +Date: Thu Mar 20 16:01:30 2014 +0200 + + Fix build with --coretext on iOS + + On iOS CoreText and CoreGraphics are stand-alone frameworks + + configure.ac | 23 +++++++++++++++++++---- + src/hb-coretext.h | 8 +++++++- + 2 files changed, 26 insertions(+), 5 deletions(-) + +commit ea5e8a02eb83ad19f3009b0008893f77ce113118 +Author: Behdad Esfahbod +Date: Wed Mar 19 15:38:02 2014 -0700 + + [util] Plug minor leak + + util/hb-shape.cc | 6 +++--- + util/helper-cairo.cc | 21 ++++++++++++--------- + util/helper-cairo.hh | 2 +- + util/options.cc | 6 +++++- + util/options.hh | 6 +++--- + 5 files changed, 24 insertions(+), 17 deletions(-) + +commit 09732cc6695b8e41ba6cdcd4058a4f7cad90167a +Author: Behdad Esfahbod +Date: Wed Mar 19 12:00:17 2014 -0700 + + Remove dead warning + + src/hb-unicode.cc | 9 +++++++-- + src/hb-warning.cc | 11 ----------- + 2 files changed, 7 insertions(+), 13 deletions(-) + +commit b934b0f9d1b39fc7a06c812bea3d79ca5424e278 +Author: Behdad Esfahbod +Date: Wed Mar 19 11:52:40 2014 -0700 + + Yet another try to make build without gtk-doc succeed + + autogen.sh | 1 + + docs/reference/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit a7a5be090dd9cc39605853e8994eb417550939d4 +Author: Behdad Esfahbod +Date: Wed Mar 19 11:39:23 2014 -0700 + + Another try to make gtk-doc optional + + docs/reference/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ba8c9d92935ea351970a80d0d3441858ad4cf33f +Author: Dominik Röttsches +Date: Tue Mar 18 14:39:03 2014 +0200 + + 0.9.27 + + NEWS | 16 ++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 17 insertions(+), 1 deletion(-) + +commit a949cd329e49d2c0ad6f1e023f324790d886dafe +Author: Behdad Esfahbod +Date: Sun Mar 16 20:22:42 2014 -0700 + + Don't use "register" storage class specifier + + Fixes warnings. + https://bugzilla.mozilla.org/show_bug.cgi?id=984081 + + src/hb-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 0082dbeae6c25a7859960b7e791a540ad04246d9 +Author: jfkthame +Date: Sun Mar 16 08:25:17 2014 +0000 + + wrap definition of free_langs() with HAVE_ATEXIT + + ...to avoid an unused function warning; see mozilla bug https://bugzilla.mozilla.org/show_bug.cgi?id=984081. + + src/hb-common.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit a9e25e90a4ca05746fda4a598ad698db1d2c5c1a +Author: Behdad Esfahbod +Date: Fri Mar 14 19:55:46 2014 -0700 + + [coretext] Add hb_coretext_face_create() + + Not tested. + + src/hb-coretext.cc | 57 +++++++++++++++++++++++++++++++++++++++++++++--------- + src/hb-coretext.h | 4 ++++ + 2 files changed, 52 insertions(+), 9 deletions(-) + +commit c79865f90f62309dc64c8d3f2f503ec2aa4b7ec1 +Author: Behdad Esfahbod +Date: Fri Mar 14 19:37:55 2014 -0400 + + [coretext] Add coretext_aat shaper + + This is a higher-priority shaper than default shaper ("ot"), but + only picks up fonts that have AAT "morx"/"mort" table. + + Note that for this to work the font face's get_table() implementation + should know how to return the full font blob. + + Based on patch from Konstantin Ritt. + + src/hb-coretext.cc | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-coretext.h | 4 +++ + src/hb-shaper-list.hh | 4 +++ + 3 files changed, 102 insertions(+) + +commit af1aa362cacc652ab8ffda05a5d98a3ff5430439 +Author: Behdad Esfahbod +Date: Fri Mar 14 15:52:47 2014 -0700 + + If HAVE_ICU_BUILTIN is defined, use hb-icu Unicode callbacks + + Useful for Android / Chrome / etc when ICU is built in the same + library as harfbuzz itself. + + src/hb-unicode.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 853daf857f231c9ce0277a78abff1241150ea903 +Author: Behdad Esfahbod +Date: Fri Mar 14 15:49:18 2014 -0700 + + Remove old cruft + + src/hb-shaper-list.hh | 6 ------ + 1 file changed, 6 deletions(-) + +commit 2a473338da1538efa4ff14ae9e4aba8dd50f9b0f +Author: Behdad Esfahbod +Date: Mon Mar 10 15:04:46 2014 -0700 + + Add Myanmar test case from OpenType Myanmar spec + + test/shaping/texts/in-tree/shaper-myanmar/script-myanmar/misc/MANIFEST | 1 + + .../shaping/texts/in-tree/shaper-myanmar/script-myanmar/misc/otspec.txt | 2 ++ + 2 files changed, 3 insertions(+) + +commit 158985908981189a2fd4d15275a641286fc770fe +Author: Behdad Esfahbod +Date: Mon Mar 10 14:57:55 2014 -0700 + + Minor + + test/shaping/texts/in-tree/shaper-myanmar/script-myanmar/misc/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-sea/script-tai-tham/misc/MANIFEST | 1 + + .../script-myanmar => shaper-sea/script-tai-tham}/misc/torture.txt | 0 + 3 files changed, 1 insertion(+), 1 deletion(-) + +commit bb8ffb581b89cf27fb8e0743b81bbda21654233e +Author: Behdad Esfahbod +Date: Tue Mar 4 13:03:51 2014 -0800 + + Use AM_MISSING_PROG for ragel and git + + Makefile.am | 4 ++-- + configure.ac | 2 ++ + src/Makefile.am | 2 +- + 3 files changed, 5 insertions(+), 3 deletions(-) + +commit a82165248cddb720576464b8e59a986491d3f2e9 +Author: Behdad Esfahbod +Date: Tue Feb 18 15:53:56 2014 -0500 + + Only do fallback Hebrew composition if no GPOS 'mark' available + + Apparently some modern fonts have proper GPOS mark positioning + tables, but undesirable precomposed forms! See thread + "Hebrew composition to presentation forms" and: + + http://tex.stackexchange.com/questions/156775/having-trouble-with-vowel-positioning-in-ezra-sil-xelatex + + Test case: U+fb1d,05d9,05b4 + + src/hb-ot-shape-complex-hebrew.cc | 2 +- + src/hb-ot-shape-private.hh | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit b456d42bf68c4374f71f09867e375a51c7f2b3ed +Author: Behdad Esfahbod +Date: Tue Feb 11 17:29:40 2014 -0500 + + Allow bootstrapping without gtk-doc + + Seems like configure.ac is already able to handle it. + + autogen.sh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 1eacde00cc8c57a08fb74276e3530844ef463d67 +Author: Luis de Bethencourt +Date: Thu Feb 6 23:20:47 2014 -0500 + + check hb_set_is_emtpy in test-set.c + + test/api/test-set.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit db068d81cda180a91638e5539984f8139aff49c6 +Author: Werner Lemberg +Date: Mon Feb 10 10:38:56 2014 -0500 + + typo in ucdn's Makefile.am + + src/hb-ucdn/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fbb2847f541389f40718af71c4945024ae177ab2 +Author: Behdad Esfahbod +Date: Wed Feb 5 08:22:06 2014 -0500 + + Improve MemoryBarrier() implementation + + See thread "[HarfBuzz] compilation error of 0.9.26 with MinGW" + started by Werner. + + src/hb-atomic-private.hh | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 189bf23bfc90405d8bdc70bf3d6d3ffec38b470c +Author: Behdad Esfahbod +Date: Thu Jan 30 15:14:58 2014 -0500 + + 0.9.26 + + NEWS | 20 ++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 21 insertions(+), 1 deletion(-) + +commit 7691a154e50f8c8c77bbd94787686262955bf5d4 +Author: Jonathan Kew +Date: Wed Jan 29 14:07:58 2014 +0000 + + Ensure hb_script_t can safely hold any hb_tag_t value it's given. + + Fixes https://github.com/behdad/harfbuzz/pull/21 + + src/hb-common.h | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit c29993a181c2139eaec97b5f6225824040ca3ac9 +Author: Behdad Esfahbod +Date: Tue Jan 28 17:29:42 2014 -0500 + + [coretext] Handle surrogate pairs when generating notdef glyphs + + Fixes github.com/behdad/harfbuzz/pull/19 + + src/hb-coretext.cc | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +commit 748b2782e4898420003a3bbc041dcccbe9e3edc2 +Author: Behdad Esfahbod +Date: Tue Jan 28 17:10:05 2014 -0500 + + [coretext] Minor optimization + + src/hb-coretext.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 24e6b11f12788500182715a64d4771a22c5b7525 +Author: Konstantin Ritt +Date: Tue Jan 28 18:16:01 2014 +0200 + + Fix double destruction in case of OOM + + src/hb-graphite2.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 083225916a19f6d67017523af87386933bd9ecdc +Author: Konstantin Ritt +Date: Wed Jan 22 20:31:30 2014 +0200 + + Micro optimizations + + src/hb-ot-layout-gpos-table.hh | 28 +++++++++++++++++----------- + 1 file changed, 17 insertions(+), 11 deletions(-) + +commit c9522de2335e4ef5fe65a72745c10943827a8da2 +Author: Konstantin Ritt +Date: Wed Jan 22 21:07:13 2014 +0200 + + Make it possible to disable the fallback shaper at configure time + + The OT shaper supersedes the fallback shaper in every case + and the latter become an extra weight for 99.9% of users. + + configure.ac | 6 ++++++ + src/Makefile.am | 5 ++++- + src/hb-shaper-list.hh | 2 ++ + 3 files changed, 12 insertions(+), 1 deletion(-) + +commit 6775da3a7c07db6c032cf429dc199d471948db56 +Author: Behdad Esfahbod +Date: Thu Jan 23 14:18:49 2014 -0500 + + Fix clang warning 'private field 'xxx' is not used + + Fixes https://github.com/behdad/harfbuzz/pull/16 + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 62299826f4905e080b9497bce335e093b287494e +Author: Behdad Esfahbod +Date: Thu Jan 23 14:11:03 2014 -0500 + + Fix typo in _hb_buffer_serialize_glyphs_text() + + Fixes https://github.com/behdad/harfbuzz/pull/17 + + src/hb-buffer-serialize.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ae23c24c32f474a34484ee78bc177ad31fa5e6d0 +Author: Behdad Esfahbod +Date: Wed Jan 22 11:03:02 2014 -0500 + + [arabic] Disable 'cswh' by default + + I believe Windows 8 disables it, and spec update dated + Jan 2014 also clearly says it's disabled by default: + + http://www.microsoft.com/typography/OpenTypeDev/arabic/intro.htm#features + + src/hb-ot-shape-complex-arabic.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 08cf5d75ef0c75095173dec822ccb07defaaa6c2 +Author: Behdad Esfahbod +Date: Wed Jan 22 07:53:55 2014 -0500 + + [ot] Don't try to compose if normalization is off + + src/hb-ot-shape-normalize.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 0596343bfeb80ad6b19d459654edf7dfded6affe +Merge: 62cb28df 83d7e791 +Author: Behdad Esfahbod +Date: Wed Jan 22 04:43:51 2014 -0800 + + Merge pull request #13 from jfkthame/hangul-shaper + + Tone-mark reordering and improved Old Hangul support + +commit 62cb28dfc668cae9cbff826229bde2271e157927 +Author: Jonathan Kew +Date: Mon Jan 20 14:23:08 2014 +0000 + + fixup for 64-bit windows build + + src/hb-uniscribe.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 83d7e7915a5eaa8ff4c7014c319844e7dffd8225 +Author: Jonathan Kew +Date: Mon Jan 20 19:49:47 2014 +0000 + + [hangul] Fix ordering of dotted circle with Hangul tone mark (reported by Dohyun Kim). + + src/hb-ot-shape-complex-hangul.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit deef1862657d55b7ae8d45f4eecbe45c80785c4e +Author: Jonathan Kew +Date: Mon Jan 20 10:38:27 2014 +0000 + + [hangul] Don't force zero-width for marks - this is not wanted for the Jamo Filler glyphs. + + src/hb-ot-shape-complex-hangul.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 391934db0a171aeb2057ebcd4a38ed81621e7393 +Author: Jonathan Kew +Date: Mon Jan 20 10:37:32 2014 +0000 + + [unicode] Exclude the Jamo Filler characters from Default_Ignorable, as some fonts want these to be visible/spacing glyphs. + + src/hb-unicode-private.hh | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +commit 7244b3fc3bf9757dd094709d36bea68682264e20 +Author: Jonathan Kew +Date: Mon Jan 20 10:35:51 2014 +0000 + + [hangul] Reorder Hangul tone mark to beginning of syllable, unless font implements it using a zero-width glyph. + + src/hb-ot-shape-complex-hangul.cc | 59 ++++++++++++++++++++++++++++++++++++++- + 1 file changed, 58 insertions(+), 1 deletion(-) + +commit 103436838df3a77552d3d33fc4bd80f09d9bf079 +Author: Jonathan Kew +Date: Mon Jan 20 10:35:07 2014 +0000 + + [hangul] Apply the appropriate *jmo features to decomposed syllables, including Old Hangul sequences that don't have Unicode compositions. Merge clusters in decomposed syllables. + + src/hb-ot-shape-complex-hangul.cc | 197 +++++++++++++++++++++++++++++++------- + 1 file changed, 165 insertions(+), 32 deletions(-) + +commit 8fc1f7fe74a25bf8549f5edd79c7da6b720eb064 +Author: Behdad Esfahbod +Date: Thu Jan 2 17:04:04 2014 +0800 + + [ot/hangul] Don't decompose Hangul even when combining marks present + + As discussed on + https://github.com/behdad/harfbuzz/pull/10#issuecomment-31442030 + + src/hb-ot-shape-complex-hangul.cc | 2 +- + src/hb-ot-shape-normalize-private.hh | 1 + + src/hb-ot-shape-normalize.cc | 24 +++++++++++++----------- + 3 files changed, 15 insertions(+), 12 deletions(-) + +commit 64426ec73a987bfe1e71a293ee195f268897e8d6 +Author: Behdad Esfahbod +Date: Thu Jan 2 14:33:10 2014 +0800 + + [ot] Simplify composing + + Not tested. Ouch. + + src/hb-ot-shape-normalize.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 8de20b1e8a1c4d2081f64e695045e6e4da7ce144 +Author: Behdad Esfahbod +Date: Thu Jan 2 14:30:45 2014 +0800 + + Add font->has_glyph() + + src/hb-font-private.hh | 6 ++++++ + src/hb-ot-shape-complex-hangul.cc | 14 ++++++-------- + src/hb-ot-shape.cc | 3 +-- + 3 files changed, 13 insertions(+), 10 deletions(-) + +commit f6298e55ae0f0f23f66935226f78afb98320ea78 +Author: Behdad Esfahbod +Date: Thu Jan 2 14:23:56 2014 +0800 + + [fallback] Minor + + src/hb-fallback-shape.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 29ea403d67e29c2d531c1f613ce3d69e60f078f6 +Author: Behdad Esfahbod +Date: Thu Jan 2 14:20:00 2014 +0800 + + [hangul] Fix decomposition logic + + Seems to be working now. + + src/hb-ot-shape-complex-hangul.cc | 19 ++++++++----------- + 1 file changed, 8 insertions(+), 11 deletions(-) + +commit bdb20dafc3f737923da3dca0c832fdf4ab8daabc +Author: Behdad Esfahbod +Date: Thu Jan 2 14:04:30 2014 +0800 + + [hangul] Fix decomposition + + Part of https://github.com/behdad/harfbuzz/pull/10 + + src/hb-ot-shape-complex-hangul.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 32478656ce6e7926c3ad481511f02187ca743af6 +Author: Behdad Esfahbod +Date: Thu Jan 2 14:01:56 2014 +0800 + + [hangul] Tighten up character categories + + I had tried to expand to fill the blocks, but that sounds wrong in + retrospect. + + src/hb-ot-shape-complex-hangul.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f14bb7de631b20e2868fb62e5311cd0d9e24bb49 +Author: Behdad Esfahbod +Date: Tue Dec 31 16:49:15 2013 +0800 + + [ot] Separate out hebrew and tibetan shapers from default + + Now default shaper is truly no-op. + + src/Makefile.am | 2 + + src/hb-ot-shape-complex-default.cc | 161 +--------------------------------- + src/hb-ot-shape-complex-hebrew.cc | 172 +++++++++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-private.hh | 17 +++- + src/hb-ot-shape-complex-tibetan.cc | 61 +++++++++++++ + 5 files changed, 251 insertions(+), 162 deletions(-) + +commit 6300cd72539284ca294ee8286bbbb7f9c72af320 +Author: Behdad Esfahbod +Date: Tue Dec 31 16:38:47 2013 +0800 + + [ot] Define HB_OT_SHAPE_ZERO_WIDTH_MARKS_DEFAULT + + src/hb-ot-shape-complex-default.cc | 2 +- + src/hb-ot-shape-complex-hangul.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 4 +++- + src/hb-ot-shape-complex-thai.cc | 2 +- + 4 files changed, 6 insertions(+), 4 deletions(-) + +commit 3d6ca0d32e5c6597acfcf59301cb1905586ddb52 +Author: Behdad Esfahbod +Date: Tue Dec 31 16:04:35 2013 +0800 + + [ot] Simplify normalization_preference again + + No shaper has more than one behavior re this, so no need for a callback. + + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-default.cc | 8 +------- + src/hb-ot-shape-complex-hangul.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 8 +------- + src/hb-ot-shape-complex-myanmar.cc | 9 +-------- + src/hb-ot-shape-complex-private.hh | 7 +------ + src/hb-ot-shape-complex-sea.cc | 9 +-------- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape-normalize.cc | 4 +--- + 9 files changed, 9 insertions(+), 42 deletions(-) + +commit c98b7183f7dc453d5bac1f2503017cded317a495 +Author: Behdad Esfahbod +Date: Tue Dec 31 15:55:40 2013 +0800 + + [ot] Add Hangul shaper + + Not exhaustively tested, but I think I got the intended logic + right. + + The logic can perhaps be simplified. Maybe we should disabled + normalization with this shaper. Then again, for now focusing on + correctness. + + src/Makefile.am | 1 + + src/hb-ot-shape-complex-default.cc | 13 --- + src/hb-ot-shape-complex-hangul.cc | 232 +++++++++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-private.hh | 10 +- + src/hb-private.hh | 6 + + 5 files changed, 240 insertions(+), 22 deletions(-) + +commit 15f67048e45853ad4069fd4334e132bc3db4d2c4 +Author: Behdad Esfahbod +Date: Fri Dec 27 19:33:28 2013 -0500 + + Reorder Tai Tham SAKOT to ensure it comes after any tone marks + + src/hb-unicode-private.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 3216e44feb7b97f44620b51e197425a80a41cdb7 +Author: Behdad Esfahbod +Date: Mon Dec 23 14:39:23 2013 -0500 + + [uniscribe] Fix scratch-buffer accounting + + src/hb-uniscribe.cc | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +commit beeb12c9af4e0e66378cd36cf3dbb1560763a8e3 +Author: Behdad Esfahbod +Date: Sun Dec 22 22:53:27 2013 -0500 + + Add TODO item + + src/hb-ot-shape.h | 1 + + 1 file changed, 1 insertion(+) + +commit fbd4acc58a4bb501625b482bd318be9764ff8e02 +Author: Luis de Bethencourt +Date: Sun Dec 22 08:02:11 2013 -0500 + + Clean ht-ob headers + + src/Makefile.am | 1 + + src/hb-ot-layout.h | 5 ----- + src/hb-ot-shape.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot.h | 9 +-------- + 4 files changed, 55 insertions(+), 13 deletions(-) + +commit 5497a8a274a7066c0230c850baadef681785c8bb +Author: Behdad Esfahbod +Date: Sun Dec 22 20:48:53 2013 -0500 + + Cache various masks on the shape plan + + src/hb-ot-shape-fallback.cc | 6 ++---- + src/hb-ot-shape-private.hh | 15 +++++++++++++++ + src/hb-ot-shape.cc | 26 +++++++------------------- + 3 files changed, 24 insertions(+), 23 deletions(-) + +commit 02f909664fa24a7ccf7cf73d75d1d3426aaaae7d +Author: Behdad Esfahbod +Date: Sun Dec 22 19:35:27 2013 -0500 + + Minor correction to kern mask checking + + src/hb-ot-shape-fallback.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a7e8bbb080aef318b16750ca1771d0d3af3d0ae9 +Author: Behdad Esfahbod +Date: Sun Dec 22 19:33:35 2013 -0500 + + Minor fraction mask setting improvement + + src/hb-ot-map-private.hh | 2 -- + src/hb-ot-shape.cc | 8 +++++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 76fff252a96b4357b5e71694d5201daef822aa60 +Author: Behdad Esfahbod +Date: Sun Dec 22 17:55:59 2013 -0500 + + Don't form fractions if only one of numr/dnom exist + + src/hb-ot-shape.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 3aeee519f0b82df5263974945ae852badc4dbded +Author: Behdad Esfahbod +Date: Sun Dec 22 16:17:54 2013 -0500 + + Bug 72698 - Automatically support frac / numr / dnom + + When seeing U+2044 FRACTION SLASH in the text, find decimal + digits (Unicode General Category Decimal_Number) around it, + and mark the pre-slash digits with 'numr' feature, the post-slash + digits with 'dnom' feature, and the whole sequence with 'frac' + feature. + + This beautifully renders fractions with major Windows fonts, + and any other font that implements those features (numr/dnom is + enough for most fonts.) + + Not the fastest way to do this, but good enough for a start. + + src/hb-ot-shape.cc | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 51 insertions(+) + +commit 014f369ec98fdbb3e7a2ef68aea2c4e017e7b680 +Author: Behdad Esfahbod +Date: Sun Dec 22 16:15:30 2013 -0500 + + Add XXX note + + src/hb-ot-map-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 739325178aba00ea5526c6a54ce588a79e5d45e2 +Author: Behdad Esfahbod +Date: Sat Dec 21 00:18:18 2013 -0500 + + Initialize masks before mirroring + + We were throwing away the rtlm feature mask set during + mirroring... + + src/hb-ot-shape.cc | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit d507f6b5b7a052f4d0eb9ba4ec88fd2e3d6f64b4 +Author: Luis de Bethencourt +Date: Mon Dec 16 15:48:44 2013 -0500 + + Have Gtk-Doc ignore UCDN files + + docs/reference/Makefile.am | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit d688475ea9cd236bc9b9e0153489fac0025f07f0 +Author: Behdad Esfahbod +Date: Thu Dec 12 13:21:57 2013 -0500 + + Minor + + util/options.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2a8c49ade07a0bd4f2c9543f4bd129da82083ea0 +Author: Behdad Esfahbod +Date: Wed Dec 11 20:22:28 2013 -0500 + + Remove unnecessary includes + + src/hb-blob.cc | 1 - + src/hb-buffer-private.hh | 1 - + src/hb-common.cc | 2 -- + src/hb-face-private.hh | 1 - + src/hb-face.cc | 1 - + src/hb-font-private.hh | 1 - + src/hb-font.cc | 1 - + src/hb-graphite2.cc | 2 -- + src/hb-open-type-private.hh | 2 -- + src/hb-ot-layout-private.hh | 2 -- + src/hb-ot-shape-normalize-private.hh | 2 -- + src/hb-ot-tag.cc | 1 - + src/hb-set-private.hh | 1 - + src/hb-shape-plan-private.hh | 1 - + src/hb-tt-font.cc | 2 -- + src/hb-unicode-private.hh | 2 -- + 16 files changed, 23 deletions(-) + +commit 2646aec1e67cd6e09f5f7859c9d5898917acc2d5 +Author: Behdad Esfahbod +Date: Thu Dec 5 18:19:35 2013 -0500 + + Drop required automake version back to 1.11.3 + + Work around broken automake-1.13 changes. + + configure.ac | 3 ++- + test/shaping/Makefile.am | 7 +++++++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 860fc9aa7b4c49a1d50e64cfdf4d4dffadb7aa8f +Author: Behdad Esfahbod +Date: Wed Dec 4 20:06:59 2013 -0500 + + 0.9.25 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit adb039554de0c98a4121f26423bec8df09a62e61 +Author: Behdad Esfahbod +Date: Wed Dec 4 20:10:02 2013 -0500 + + Minor + + util/view-cairo.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 95d18a7cab480712d8c95a587ac2a8fdcbec5e71 +Author: Behdad Esfahbod +Date: Wed Dec 4 20:01:22 2013 -0500 + + [git.mk] Update + + git.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d913f98d88098fc0f4163dfbc54d8ca9ebe9dd81 +Author: Behdad Esfahbod +Date: Wed Dec 4 19:59:48 2013 -0500 + + Require automake 1.13 + + Fix tests build. + + https://bugs.freedesktop.org/show_bug.cgi?id=71353 + + configure.ac | 2 +- + test/shaping/Makefile.am | 19 ++++++++++++++----- + 2 files changed, 15 insertions(+), 6 deletions(-) + +commit 205bf834d80f81471f0c3da4f400e60ce3a533dc +Author: Behdad Esfahbod +Date: Mon Dec 2 20:41:41 2013 -0500 + + Revert "Karen" language mapping back to what it was before + + https://bugzilla.mozilla.org/show_bug.cgi?id=941470 + + src/hb-ot-tag.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f47b9219546edcfdeb3991ee27f6d9ba455c3e08 +Author: Behdad Esfahbod +Date: Mon Dec 2 05:57:27 2013 -0500 + + Fix unsafe shape_plan->face dependency + + src/hb-ot-shape-private.hh | 2 +- + src/hb-shape-plan-private.hh | 2 +- + src/hb-shape-plan.cc | 12 +++--------- + 3 files changed, 5 insertions(+), 11 deletions(-) + +commit c704a8700e169885f1d9cbab93544d85aa4358e9 +Author: Behdad Esfahbod +Date: Mon Dec 2 05:42:04 2013 -0500 + + [util] Fix uninitialized memory access + + util/view-cairo.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 260a3198f44a4ece60864b6f6caab2ee756ad762 +Author: Behdad Esfahbod +Date: Mon Dec 2 05:39:39 2013 -0500 + + [util] Plug leak + + util/options.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit ca8d96c8ba33ce581684cbc07936a3696b6c83d9 +Author: Jonathan Kew +Date: Mon Dec 2 05:22:00 2013 -0500 + + cache shape plans even if (global) user features are set + + src/hb-shape-plan-private.hh | 3 +++ + src/hb-shape-plan.cc | 59 ++++++++++++++++++++++++++++++++++++++++---- + 2 files changed, 57 insertions(+), 5 deletions(-) + +commit 8ffa528f28a24ae85952ad1c1b0206e736bcfeab +Author: Behdad Esfahbod +Date: Mon Dec 2 05:17:14 2013 -0500 + + Add note about unsafe shape_plan->face + + Will fix by removing shape_plan->face completely. + + src/hb-shape-plan.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit aec468f01e866c99e65a8f764a792c74c96840d7 +Author: Behdad Esfahbod +Date: Fri Nov 29 19:21:58 2013 -0500 + + [coretext] Add TODO + + src/hb-coretext.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 58cc233e8b5fdc9dce603acc1b968540a2dea3e1 +Author: Behdad Esfahbod +Date: Fri Nov 29 19:17:42 2013 -0500 + + [coretext] Cleanup + + src/hb-coretext.cc | 27 ++++++++++++++++----------- + 1 file changed, 16 insertions(+), 11 deletions(-) + +commit c8213c6198abff97822e29a6d565722cfbb43832 +Author: Khaled Hosny +Date: Fri Nov 29 19:01:56 2013 -0500 + + [coretext] Avoid font fallback with CoreText shaper + + CoreText does automatic font fallback (AKA "cascading") for characters + not supported by the requested font, and provides no way to turn it off, + so detect if the returned run uses a font other than the requested one + and fill in the buffer with .notdef glyphs instead of random indices + glyph from a different font. + + src/hb-coretext.cc | 35 +++++++++++++++++++++++++++++++++++ + 1 file changed, 35 insertions(+) + +commit 63bae73aefb0e5988ef6975f1ed38e040e50e91d +Author: Behdad Esfahbod +Date: Tue Nov 26 22:57:24 2013 -0500 + + [fallback] Add TODO note + + src/hb-fallback-shape.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit e1ebf01d0cf3df55bb9137136e2d0c9630e7bd78 +Author: Behdad Esfahbod +Date: Tue Nov 26 18:00:35 2013 -0500 + + Minor + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a182dbc9e4e51fa7990c4aea3eaa425a061b29c7 +Author: Behdad Esfahbod +Date: Tue Nov 26 17:53:41 2013 -0500 + + Minor + + src/hb-ot-layout-common-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 9174a9db5c4e01284143ed8bd318ce9454535987 +Author: Behdad Esfahbod +Date: Mon Nov 25 18:10:38 2013 -0500 + + [myanmar] Allow punctuation clusters + + The spec and Uniscribe don't allow these, but UTN#11 + specifically says the sequence U+104B,U+1038 is valid. + As such, allow all "P V" sequences. There's about + eight sequences that match that structure, but Roozbeh + thinks it's fine to allow all of them. + + Test case: U+104B, U+1038 + + https://bugs.freedesktop.org/show_bug.cgi?id=71947 + + src/hb-ot-shape-complex-myanmar-machine.rl | 3 +++ + src/hb-ot-shape-complex-myanmar.cc | 19 ++++++++++++++++++- + 2 files changed, 21 insertions(+), 1 deletion(-) + +commit 096b71e8ef0c1443f3f86069d5416b887af6e9e7 +Author: Behdad Esfahbod +Date: Mon Nov 25 18:03:34 2013 -0500 + + [myanmar] Mark U+104E MYANMAR SYMBOL AFOREMENTIONED as Consonant + + The spec and Uniscribe treat it as consonant in the grammar, but + it's not in IndicSyllableCategory.txt, so fix up. + + Test sequence: U+1004,U+103A,U+1039,U+104E + + https://bugs.freedesktop.org/show_bug.cgi?id=71948 + + src/hb-ot-shape-complex-myanmar.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit d2da5e0b4b4ffc1722403ffb90b8777cfa1cd174 +Author: Behdad Esfahbod +Date: Mon Nov 25 17:50:07 2013 -0500 + + [myanmar] Relax pwo-tone group a bit + + This is broken sequence according to OpenType spec, Uniscribe, + and current HarfBuzz implementation. But Roozbeh says this + is a valid sequence, so allow it. There are multiple + "(DB As?)?" constructs in the grammar, but Roozbeh thinks only + this one needs changing. + + Test case: 1014,1063,103A + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=71949 + + src/hb-ot-shape-complex-myanmar-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9af91ca8ffee4a8d2804eff5d380b4f9749414d1 +Author: Behdad Esfahbod +Date: Mon Nov 25 17:47:19 2013 -0500 + + Add more Myanmar test cases + + All three are broken right now according to Roozbeh. + + https://bugs.freedesktop.org/show_bug.cgi?id=71947 + https://bugs.freedesktop.org/show_bug.cgi?id=71948 + https://bugs.freedesktop.org/show_bug.cgi?id=71949 + + .../shaping/texts/in-tree/shaper-myanmar/script-myanmar/misc/misc.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 08c2d27d35093e07142168665139274ac99395e8 +Author: Roozbeh Pournader +Date: Sat Nov 23 21:39:31 2013 -0800 + + Added support for several new languages + + Based on research into latest SIL and Windows fonts, pulling in + the latest OpenType language tag proposal from Microsoft, and updating + to latest language tags and names from ISO 639. + + src/hb-ot-tag.cc | 314 +++++++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 247 insertions(+), 67 deletions(-) + +commit 05511acd198d0c2157cdb41e1d36eac0b8075357 +Author: Roozbeh Pournader +Date: Sat Nov 23 15:19:07 2013 -0800 + + Added language tags for S'gaw Karen and Khamti + + Tags based on support in Windows 8.1's 'Myanmar Text' font. + + src/hb-ot-tag.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 0bb31e4497523442fbb26bbd55b194ab70205ca4 +Author: Behdad Esfahbod +Date: Wed Nov 20 14:21:07 2013 -0500 + + Bug 71845 - Use 64-bit cmpexch on ARM64 iOS + + src/hb-atomic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 02c6c8cd6e8c93b63c75b25de6bf76bb45755bb4 +Author: Behdad Esfahbod +Date: Fri Nov 15 13:05:38 2013 -0500 + + Set buffer content type to INVALID in hb_buffer_set_length(0) + + Previously we were only setting this in hb_buffer_clear_contents(), + but set_length(0) is a valid way to reinitialize buffer to use with + new text. + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 6300694f6e531593e7e932000f9540b0367940b8 +Author: Behdad Esfahbod +Date: Wed Nov 13 14:54:07 2013 -0500 + + 0.9.24 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 061cb4649342b005fb1de93abae25e889cc560bd +Author: Behdad Esfahbod +Date: Wed Nov 13 14:50:25 2013 -0500 + + Use long alignment for scratch buffer + + Fixes last of scratch alignment warnings in hb-coretext. + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 68c372ed2eac76a6d347811293fe2ba2fd6a1eed +Author: Behdad Esfahbod +Date: Wed Nov 13 14:44:01 2013 -0500 + + More scratch-buffer cleanup + + src/hb-buffer-private.hh | 3 ++- + src/hb-buffer.cc | 10 +++++----- + src/hb-coretext.cc | 5 ++--- + src/hb-graphite2.cc | 2 +- + src/hb-uniscribe.cc | 30 ++++++++++++++---------------- + 5 files changed, 24 insertions(+), 26 deletions(-) + +commit 8fcadb9cf9418345610e3f4e38c28c12b768b589 +Author: Behdad Esfahbod +Date: Wed Nov 13 14:33:57 2013 -0500 + + [coretext] More scratch buffer fixes + + src/hb-coretext.cc | 25 +++++++++++++------------ + 1 file changed, 13 insertions(+), 12 deletions(-) + +commit 16f175cb2e081e605fe7f9cd01bbe8c24380278a +Author: Behdad Esfahbod +Date: Tue Nov 12 17:22:49 2013 -0500 + + Fix scratch-buffer alignment warnings + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 9 +++++---- + src/hb-coretext.cc | 17 ++++++++++------- + src/hb-graphite2.cc | 28 +++++++++++++++++----------- + src/hb-private.hh | 3 +++ + src/hb-uniscribe.cc | 29 +++++++++++++++++------------ + 6 files changed, 53 insertions(+), 35 deletions(-) + +commit c7c4ccf8a1e784b6f8798388a219dda9a26fbd93 +Author: Behdad Esfahbod +Date: Tue Nov 12 15:41:22 2013 -0500 + + [travis] Enable graphite2 + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 83408cf804a6908873c41b70bb7c43448e66ddd2 +Author: Behdad Esfahbod +Date: Wed Nov 6 14:46:04 2013 -0500 + + Fix llvm warnings on Mac + + Patch from Scott Fleischman. Warnings were: + + harfbuzz/src/hb-font-private.hh:121:42: Implicit conversion loses + integer precision: 'long long' to 'hb_position_t' (aka 'int') + harfbuzz/src/hb-font-private.hh:126:42: Implicit conversion loses + integer precision: 'long long' to 'hb_position_t' (aka 'int') + harfbuzz/src/hb-font-private.hh:400:85: Implicit conversion loses + integer precision: 'long long' to 'hb_position_t' (aka 'int') + harfbuzz/src/hb-ot-layout-common-private.hh:1115:37: Implicit conversion + loses integer precision: 'long long' to 'int' + harfbuzz/src/hb-ft.cc:421:97: Implicit conversion loses integer + precision: 'unsigned long long' to 'int' + harfbuzz/src/hb-ft.cc:422:97: Implicit conversion loses integer + precision: 'unsigned long long' to 'int' + + src/hb-font-private.hh | 6 +++--- + src/hb-ft.cc | 4 ++-- + src/hb-ot-layout-common-private.hh | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit 333cc6e2d11831bcd2370723456e678574d570ec +Author: Behdad Esfahbod +Date: Wed Oct 30 17:30:11 2013 +0000 + + [otlayout] Remove unused is_inplace() + + Patch from Jonathan Kew. + + src/hb-ot-layout-gpos-table.hh | 6 -- + src/hb-ot-layout-gsub-table.hh | 56 ------------ + src/hb-ot-layout-gsubgpos-private.hh | 159 ----------------------------------- + 3 files changed, 221 deletions(-) + +commit 176fd17d02ac183af32a0e710ec32d25c9322021 +Author: Behdad Esfahbod +Date: Wed Oct 30 17:27:24 2013 +0000 + + Bug 70971 - Signed/unsigned compiler warnings on windows + + Patch from Emil Eklund. + + src/hb-buffer-serialize.cc | 8 ++++---- + src/hb-ot-map.cc | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 3d436d325edccc0f3dd820e06e3d529cc8f3eca4 +Author: Behdad Esfahbod +Date: Mon Oct 28 21:00:37 2013 +0100 + + [otlayout] Reset ccc when marking glyph as letter + + src/hb-ot-layout-gsubgpos-private.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit b9d0077ac1a8e8a62ee15c64ad302f7976e23bdd +Author: Behdad Esfahbod +Date: Mon Oct 28 20:44:03 2013 +0100 + + Fix win32 testing + + test/shaping/Makefile.am | 1 + + test/shaping/run-tests.sh | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit dce79c2bd747d398bdf2f4b171b0ba9b5b951f72 +Author: Behdad Esfahbod +Date: Mon Oct 28 20:26:40 2013 +0100 + + 0.9.23 + + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 2e990a3d722c10d1eefdc4c5ccbdaa384625c3fd +Author: Behdad Esfahbod +Date: Mon Oct 28 20:23:07 2013 +0100 + + Make "make distcheck" happy + + configure.ac | 2 +- + test/shaping/Makefile.am | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 6ffc007b61402c9d1d4de368deed4971a10ed00b +Author: Behdad Esfahbod +Date: Mon Oct 28 19:26:02 2013 +0100 + + [otlayout] Optimize inplace + + See thread started by Jonathan with subject "an optimization for complex + fonts". + + src/hb-ot-layout.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 71b4c999a511bf018acaf48a45e070470c0daf12 +Author: Behdad Esfahbod +Date: Mon Oct 28 00:20:59 2013 +0100 + + Revert "Zero marks by GDEF for Tibetan" + + This reverts commit d5bd0590ae2fbc7b0dee86385a565aef00ffb835. + + The reasoning behind that logic was flawed and made under + a misunderstanding of the original problem, and caused + regressions as reported by Jonathan Kew in thread titled + "tibetan marks" in Oct 2013. Apparently I have had fixed + the original problem with this commit: + + 7e08f1258da229dfaf7e1c4b5c41e5bb83906cb0 + + So, revert the faulty commit and everything seems to be in good + shape. + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + src/hb-ot-shape-complex-arabic.cc | 10 +++------- + src/hb-ot-shape-complex-default.cc | 17 +---------------- + src/hb-ot-shape-complex-indic.cc | 8 +------- + src/hb-ot-shape-complex-myanmar.cc | 15 +++++---------- + src/hb-ot-shape-complex-private.hh | 8 ++------ + src/hb-ot-shape-complex-sea.cc | 14 ++++---------- + src/hb-ot-shape-complex-thai.cc | 9 +-------- + src/hb-ot-shape.cc | 4 ++-- + 9 files changed, 21 insertions(+), 68 deletions(-) + +commit 9596b2bf569dae6fbe268803e3cb248001f10954 +Author: Behdad Esfahbod +Date: Mon Oct 28 00:09:05 2013 +0100 + + Pass CPPFLAGS=-Werror to Travis-CI + + We want default gcc / clang warnings to fail the CI build. + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c77d1ade6898cea161f0709c5c5a912e14aff951 +Author: Behdad Esfahbod +Date: Sun Oct 27 23:52:26 2013 +0100 + + Fix warnings + + test/api/test-blob.c | 2 +- + util/helper-cairo-ansi.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit c2bc818706df56022c8bb922df2b741cb120f7e4 +Author: Behdad Esfahbod +Date: Sun Oct 27 23:36:35 2013 +0100 + + Work with old and new glib + + Avoids "deprecated" warnings. + + src/test-buffer-serialize.cc | 7 +++++-- + src/test-size-params.cc | 7 +++++-- + src/test-would-substitute.cc | 7 +++++-- + src/test.cc | 7 +++++-- + util/options.cc | 4 ++-- + util/options.hh | 4 ++++ + util/view-cairo.hh | 4 ++++ + 7 files changed, 30 insertions(+), 10 deletions(-) + +commit 46a863d91dbcc9a4c796e3715ea3828939f4d941 +Author: Behdad Esfahbod +Date: Sun Oct 27 23:24:50 2013 +0100 + + [indic] Adjust pref reordering logic + + For Javanese (pref_len == 1) only reorder if it didn't ligate. That's + sensible, and what the spec says. For other Indic (pref_len > 1) + only reorder if ligated. + + Doesn't change any test numbers. + + src/hb-ot-shape-complex-indic.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 6b03e3c724ec6cd255f4a323bf4aa7d8c93a056e +Author: Behdad Esfahbod +Date: Sun Oct 27 21:04:55 2013 +0100 + + Optimize fallback kerning + + Patch from Jonathan Kew. "These changes seem to yield a small but + just-about-measurable improvement with old fonts that lack GPOS + kerning." + + src/hb-ot-shape-fallback.cc | 47 ++++++++++++++++++++++++++++----------------- + 1 file changed, 29 insertions(+), 18 deletions(-) + +commit 133eeba6a32769ec1a7520e7c8a0d2eb1ad986f8 +Author: Behdad Esfahbod +Date: Sun Oct 27 00:24:59 2013 +0200 + + Minor + + See: + https://github.com/prezi/harfbuzz-js/pull/1/files#r7032397 + + src/hb-common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a74f0de225c403998212e2618dcf9452bc5b590d +Author: Behdad Esfahbod +Date: Thu Oct 24 11:46:33 2013 +0200 + + [indic] Fix CM2, really + + Followup from 6e613f3365bf4e9fd778758c53e7de00c64beca1. + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6e613f3365bf4e9fd778758c53e7de00c64beca1 +Author: Behdad Esfahbod +Date: Wed Oct 23 23:34:13 2013 +0200 + + Fix "shift count >= width of type" issue + + src/hb-ot-shape-complex-indic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ac8cd511911c7dca6222d14fa758bff75d601567 +Author: Behdad Esfahbod +Date: Fri Oct 18 19:33:09 2013 +0200 + + Refactor + + src/hb-ot-layout-gpos-table.hh | 120 ++++++++++++++++++++++------------------- + src/hb-ot-layout.cc | 31 +++++------ + src/hb-ot-shape-normalize.cc | 29 +++++----- + src/hb-ot-shape.cc | 82 ++++++++++++++++------------ + 4 files changed, 145 insertions(+), 117 deletions(-) + +commit 0f3fe37fccfb540437adf13dd580f2c5164a0b1f +Author: Behdad Esfahbod +Date: Fri Oct 18 19:14:22 2013 +0200 + + Comment + + src/hb-ot-layout-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit ddce2d8df6fed9c033f1f13e235666680c5beb67 +Author: Behdad Esfahbod +Date: Fri Oct 18 18:07:11 2013 +0200 + + [indic] Improve positioning of post-base bells and whistles + + Bug 58714 - Kannada u+0cb0 u+200d u+0ccd u+0c95 u+0cbe does not provide + same results as Windows8 + https://bugs.freedesktop.org/show_bug.cgi?id=58714 + + Test with U+0CB0,U+200D,U+0CCD,U+0C95,U+0CBF and tunga.ttf. + + Improves some scripts. Improves Bengali too, but numbers + are up because we produce better results than Uniscribe for some + sequences now. + + New numbers: + BENGALI: 353724 out of 354188 tests passed. 464 failed (0.131004%) + DEVANAGARI: 707307 out of 707394 tests passed. 87 failed (0.0122987%) + GUJARATI: 366349 out of 366457 tests passed. 108 failed (0.0294714%) + GURMUKHI: 60732 out of 60747 tests passed. 15 failed (0.0246926%) + KANNADA: 951190 out of 951913 tests passed. 723 failed (0.0759523%) + KHMER: 299070 out of 299124 tests passed. 54 failed (0.0180527%) + MALAYALAM: 1048140 out of 1048334 tests passed. 194 failed (0.0185056%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271662 out of 271847 tests passed. 185 failed (0.068053%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + + src/hb-ot-shape-complex-indic.cc | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +commit d5bd0590ae2fbc7b0dee86385a565aef00ffb835 +Author: Behdad Esfahbod +Date: Fri Oct 18 16:44:54 2013 +0200 + + Zero marks by GDEF for Tibetan + + See: + http://lists.freedesktop.org/archives/harfbuzz/2013-April/003101.html + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + src/hb-ot-shape-complex-arabic.cc | 10 +++++++--- + src/hb-ot-shape-complex-default.cc | 17 ++++++++++++++++- + src/hb-ot-shape-complex-indic.cc | 8 +++++++- + src/hb-ot-shape-complex-myanmar.cc | 15 ++++++++++----- + src/hb-ot-shape-complex-private.hh | 8 ++++++-- + src/hb-ot-shape-complex-sea.cc | 14 ++++++++++---- + src/hb-ot-shape-complex-thai.cc | 9 ++++++++- + src/hb-ot-shape.cc | 4 ++-- + 9 files changed, 68 insertions(+), 21 deletions(-) + +commit bf029281b1b0f854f671969ab40eac3046a111bd +Author: Behdad Esfahbod +Date: Fri Oct 18 16:20:13 2013 +0200 + + Bug 65258 - [...] Mongolian with free variation selector + + src/hb-ot-shape-complex-arabic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 0193649ce4ca78b8e2835a50bd51ee594cffe34e +Author: Behdad Esfahbod +Date: Fri Oct 18 16:08:53 2013 +0200 + + [otfallback] Don't shift down above-marks too much + + This seems to generate much better, almost-perfect, positioning for + Arabic as well as Latin above marks. + + src/hb-ot-shape-fallback.cc | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit dba9580237da788275b1ab5fe6be75c8a3f359b9 +Author: Behdad Esfahbod +Date: Fri Oct 18 15:57:36 2013 +0200 + + [otfallback] Never fallback-position a below-mark upwards + + Test with WinXP times.ttf and U+05D9,U+05B5. + + src/hb-ot-shape-fallback.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 8177da29ad07d8fa444ce07003fa65cd31a2776b +Author: Behdad Esfahbod +Date: Fri Oct 18 15:50:29 2013 +0200 + + Minor + + src/hb-ot-shape-fallback.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c16012e9019ec59c2200a3cc29b8a37ea70eda70 +Author: Behdad Esfahbod +Date: Fri Oct 18 02:27:00 2013 +0200 + + [indic] Add Javanese support! + + Seems to be working just fine! + + src/hb-ot-shape-complex-indic-machine.rl | 14 ++++++------ + src/hb-ot-shape-complex-indic-private.hh | 37 ++++++++++++++++---------------- + src/hb-ot-shape-complex-indic.cc | 9 ++++++-- + 3 files changed, 34 insertions(+), 26 deletions(-) + +commit 755b44cce6dc23376a3cf0212893609231fa4967 +Author: Behdad Esfahbod +Date: Fri Oct 18 11:17:42 2013 +0200 + + [ft] Round metrics instead of truncate + + Lohit-Punjabi has a upem of 769! We were losing one unit in our + code, and FreeType is losing another one... Test with U+0A06. + Has an advance of 854 in the font. We were producing 852. + Now we do 853, which is what FreeType is telling us. + + src/hb-ft.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 9a49351cc2625de16a73e0e153d3097ef6c7cc0f +Author: Behdad Esfahbod +Date: Fri Oct 18 02:14:53 2013 +0200 + + [indic] Swith pref logic to use _hb_glyph_info_substituted() + + See comments from caveat! Seems to work fine. + + This is useful for Javanese which has an atomically encoded pre-base + reordering Ra which should only be reordered if it was substituted + by the pref feature. + + src/hb-ot-shape-complex-indic.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit f175aa33c5e94397c60648ac0697c80f5fe0dcb7 +Author: Behdad Esfahbod +Date: Fri Oct 18 02:07:44 2013 +0200 + + [indic] Fix compiler warnings + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 857027341423f15fd6084c7563cc355b06e7cbdd +Author: Behdad Esfahbod +Date: Fri Oct 18 01:11:05 2013 +0200 + + [otlayout] Add _hb_glyph_info_substituted() + + Currently unused. + + src/hb-ot-layout-private.hh | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit a1f7b2856184959e965c9c2b80363f9f46d486a7 +Author: Behdad Esfahbod +Date: Fri Oct 18 01:09:08 2013 +0200 + + [otlayout] Switch over from old is_a_ligature() to IS_LIGATED + + Impact should be minimal and positive. + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-layout-private.hh | 12 +++++++++--- + src/hb-ot-shape-complex-indic.cc | 4 ++-- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape.cc | 2 +- + 5 files changed, 14 insertions(+), 8 deletions(-) + +commit 09675a8115b9d77261c33940401aa919cede8662 +Author: Behdad Esfahbod +Date: Fri Oct 18 01:05:58 2013 +0200 + + [otlayout] Add HB_OT_LAYOUT_GLYPH_PROPS_LIGATED + + Currently unused. + + src/hb-ot-layout-gsubgpos-private.hh | 15 ++++++++++----- + src/hb-ot-layout-private.hh | 5 ++++- + 2 files changed, 14 insertions(+), 6 deletions(-) + +commit 05ad6b50ac0a1b9a8da10d2ee2238068b7811e7d +Author: Behdad Esfahbod +Date: Fri Oct 18 00:45:59 2013 +0200 + + [otlayout] Add HB_OT_LAYOUT_GLYPH_PROPS_SUBSTITUTED + + Currently unused. + + src/hb-ot-layout-gsubgpos-private.hh | 5 +++-- + src/hb-ot-layout-private.hh | 10 ++++++---- + 2 files changed, 9 insertions(+), 6 deletions(-) + +commit 101303dbf7cf15d044bf2518f14b3aec65970fea +Author: Behdad Esfahbod +Date: Fri Oct 18 00:42:39 2013 +0200 + + [otlayout] More shuffling around + + src/hb-ot-layout-gpos-table.hh | 16 +++---- + src/hb-ot-layout-gsub-table.hh | 13 +++-- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++-- + src/hb-ot-layout-private.hh | 92 ++++++++++++++++++++++++++++++++---- + src/hb-ot-shape.cc | 8 ++-- + 5 files changed, 102 insertions(+), 35 deletions(-) + +commit 91689de2603e4151e2a2d3a3852c61667f0c6264 +Author: Behdad Esfahbod +Date: Fri Oct 18 00:21:59 2013 +0200 + + [otlayout] Add _hb_glyph_info_set_glyph_props() + + No functional change. + + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + src/hb-ot-layout-private.hh | 9 +++++++++ + src/hb-ot-shape.cc | 8 +++++--- + 4 files changed, 17 insertions(+), 6 deletions(-) + +commit a0161746589934e93c3b115814bbd81f56ab962f +Author: Behdad Esfahbod +Date: Fri Oct 18 00:06:30 2013 +0200 + + [otlayout] Simplify set_class() usage + + src/hb-ot-layout-gsubgpos-private.hh | 31 ++++++++++++++++++------------- + 1 file changed, 18 insertions(+), 13 deletions(-) + +commit 3ddf892b5328b74afb6e7d9da727d8771ca5d288 +Author: Behdad Esfahbod +Date: Fri Oct 18 00:02:43 2013 +0200 + + [otlayout] Renaming + + src/hb-ot-layout-gpos-table.hh | 18 +++++++------- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 36 +++++++++++++-------------- + src/hb-ot-layout-private.hh | 48 +++++++++++++++++++++--------------- + src/hb-ot-shape-complex-indic.cc | 5 ++-- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape-fallback.cc | 8 +++--- + src/hb-ot-shape.cc | 2 +- + 8 files changed, 65 insertions(+), 56 deletions(-) + +commit 2e96d2c6ee34142375373be07217c9953e7822cc +Author: Behdad Esfahbod +Date: Thu Oct 17 21:16:20 2013 +0200 + + [otlayout] More shuffling + + src/hb-ot-layout-private.hh | 252 +++++++++++++++++++++++--------------------- + 1 file changed, 130 insertions(+), 122 deletions(-) + +commit 469524692bd0a258b28e63294c984e677a9c2477 +Author: Behdad Esfahbod +Date: Thu Oct 17 21:01:57 2013 +0200 + + [otlayout] Code shuffling + + src/hb-ot-layout-private.hh | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 11fb16cb849285a178d9e80991b1d60a960326ee +Author: Behdad Esfahbod +Date: Thu Oct 17 20:57:57 2013 +0200 + + Use unsigned enums for mask types + + src/hb-buffer.h | 16 ++++++++-------- + src/hb-ot-layout-private.hh | 8 ++++---- + 2 files changed, 12 insertions(+), 12 deletions(-) + +commit 03058c3d1e8c18858c1e0b0c738ce9d299f2787a +Author: Behdad Esfahbod +Date: Thu Oct 17 20:55:34 2013 +0200 + + [otlayout] Remove two unused HB_OT_LAYOUT_GLYPH_PROPS_* values + + src/hb-ot-layout-gdef-table.hh | 1 - + src/hb-ot-layout-gsub-table.hh | 3 ++- + src/hb-ot-layout-private.hh | 7 +++++-- + 3 files changed, 7 insertions(+), 4 deletions(-) + +commit 941b6992042e7b73b3a2aab1448383adf33bef28 +Author: Behdad Esfahbod +Date: Thu Oct 17 20:47:33 2013 +0200 + + [otlayout] Remove unused HB_OT_LAYOUT_GLYPH_PROPS_UNCLASSIFIED + + src/hb-ot-layout-gdef-table.hh | 7 +++++-- + src/hb-ot-layout-private.hh | 10 ++++------ + 2 files changed, 9 insertions(+), 8 deletions(-) + +commit 8f9ec92dfce5c469fb85ad301296b5dde1b2ab0a +Author: Behdad Esfahbod +Date: Thu Oct 17 19:52:47 2013 +0200 + + [indic] Adjust Javanese base algorithm + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 49901862e36e1c153835877a9f1183729333bbbe +Author: Behdad Esfahbod +Date: Thu Oct 17 19:48:51 2013 +0200 + + [otlayout] Guard against use of ReverseChain through Context + + src/hb-ot-layout-gsub-table.hh | 4 +++- + src/hb-ot-layout.cc | 4 ++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit 74f4bbf0560a5fd2d295e100e96f0c6c7033e852 +Author: Behdad Esfahbod +Date: Thu Oct 17 19:07:53 2013 +0200 + + [indic] Towards supporting atomicly-encoded prebase-reorderings + + src/hb-ot-shape-complex-indic.cc | 65 ++++++++++++++++++++++++---------------- + 1 file changed, 40 insertions(+), 25 deletions(-) + +commit efed40b975110d78c9c505441e7e17a8c13e85c8 +Author: Behdad Esfahbod +Date: Thu Oct 17 18:50:11 2013 +0200 + + [indic] Minor refactoring of reph handling + + src/hb-ot-shape-complex-indic.cc | 14 ++++++++------ + src/hb-ot-shape-complex-sea.cc | 2 +- + 2 files changed, 9 insertions(+), 7 deletions(-) + +commit 684fe59ff858a0ecba71b3ed80378afb0b8bbb48 +Author: Behdad Esfahbod +Date: Thu Oct 17 18:30:06 2013 +0200 + + [indic] Minor refactoring of would_substitute() + + src/hb-ot-shape-complex-indic.cc | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +commit 321df83fb4f0b8a5310888129cb70bfda8ae0c96 +Author: Behdad Esfahbod +Date: Thu Oct 17 18:16:14 2013 +0200 + + Route Buginese through the SEA shaper + + Both Indic and SEA seem to do it just fine, but SEA is much + simpler. + + src/hb-ot-shape-complex-private.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit b5a0f69e47ace468b06e21cf069a18ddcfcf6064 +Author: Behdad Esfahbod +Date: Thu Oct 17 18:04:23 2013 +0200 + + [indic] Pass zero-context=false to would_substitute for newer scripts + + For scripts without an old/new spec distinction, use zero-context=false. + This changes behavior in Sinhala / Khmer, but doesn't seem to regress. + This will be useful and used in Javanese. + + src/hb-ot-shape-complex-indic.cc | 35 +++++++++++++++++++---------------- + 1 file changed, 19 insertions(+), 16 deletions(-) + +commit c4e71ff36d1f86a6ea56539728a964d97217e2b6 +Author: Behdad Esfahbod +Date: Thu Oct 17 17:04:47 2013 +0200 + + [indic] Clean up Khmer and Sinhala base finding algorithm + + src/hb-ot-shape-complex-indic.cc | 24 +++++++++++------------- + 1 file changed, 11 insertions(+), 13 deletions(-) + +commit e10453e6fb2544724ccd7ddfdbb9de90ef9274ce +Author: Behdad Esfahbod +Date: Thu Oct 17 16:49:06 2013 +0200 + + [indic] Add BASE_POS_LAST_SINHALA + + Previously we planted this into the mode used for Khmer. There's not + really much in common between the two, so separate again. + + src/hb-ot-shape-complex-indic.cc | 21 +++++++++++++++++++-- + 1 file changed, 19 insertions(+), 2 deletions(-) + +commit 9ac6b01e0cd8e2d66dfc727157f45b615bc77109 +Author: Behdad Esfahbod +Date: Thu Oct 17 16:27:38 2013 +0200 + + [indic] Adjust Sinhala cluster merging under uniscribe + + Similar to 190c8f2b60af0851bf692f653c1604cfbf0561a5 but for + Sinhala. + + src/hb-ot-shape-complex-indic.cc | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +commit 3c3df9cba13fec2c35e0e7ae587d9699ac0c37f5 +Author: Behdad Esfahbod +Date: Thu Oct 17 13:58:31 2013 +0200 + + [otlayout] Minor + + src/hb-ot-layout-gsubgpos-private.hh | 62 +++++++++++++++++++----------------- + 1 file changed, 33 insertions(+), 29 deletions(-) + +commit 6cc136f7531a45e71ea08a7dc8a2187172cb813d +Author: Behdad Esfahbod +Date: Thu Oct 17 13:55:48 2013 +0200 + + [otlayout] Minor + + src/hb-ot-layout-gsubgpos-private.hh | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +commit ba6ddc421e5e440231c2ece2db1363f8e6d2ecbf +Author: Behdad Esfahbod +Date: Thu Oct 17 13:52:51 2013 +0200 + + [otlayout] Increase MAX_CONTEXT_LENGTH + + It's cheap. + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e714fe6d6a2633494cb1fa7170a32ca2638cbb51 +Author: Behdad Esfahbod +Date: Thu Oct 17 13:49:51 2013 +0200 + + [otlayout] Simplify ligate_input() + + Shouldn't change behavior at all, but is faster / more robust. + + src/hb-ot-layout-gsub-table.hh | 16 +++++++--------- + src/hb-ot-layout-gsubgpos-private.hh | 17 +++++++---------- + 2 files changed, 14 insertions(+), 19 deletions(-) + +commit 6b2abdcd203204131f3017ca85c91de9d43959cd +Author: Behdad Esfahbod +Date: Thu Oct 17 13:15:43 2013 +0200 + + [indic] Improve clusters in presence of reph + + src/hb-ot-shape-complex-indic.cc | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit 42d0f55cbc68285e22d713df7062e520af708c82 +Author: Behdad Esfahbod +Date: Thu Oct 17 13:05:05 2013 +0200 + + [indic] Apply calt,clig in the same stage as presentation features + + Whic means these twp are applied per-syllable now. Apparently + in some Khmer fonts the clig interacts with presentation features. + + Test case: U+1781,U+17D2,U+1789,U+17BB,U+17C6 with Mondulkiri-R.ttf + should produce one big ligature. + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit ae9a5834df477006686421d494b55a1569789327 +Author: Behdad Esfahbod +Date: Thu Oct 17 12:24:55 2013 +0200 + + [indic] Fix pref vs blwf interaction + + If a glyph can be both blwf and pref, we were wrongly sorting it + in the post position instead of below position. + + src/hb-ot-shape-complex-indic.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit c7dacac02cfe8526eaf131ce6c5e7b6df7ca2ccd +Author: Behdad Esfahbod +Date: Thu Oct 17 12:20:24 2013 +0200 + + [indic] Don't apply blwf before base under old-spec mode + + Test case: U+09AC,U+09CD,U+09A6 with Lohit-Bengali 2.5.3. + + src/hb-ot-shape-complex-indic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit da72042c52ed3cc0ee19d3eabb8db7c7dd34d3ed +Author: Behdad Esfahbod +Date: Thu Oct 17 12:01:50 2013 +0200 + + [otlayout] Fix up recent Context matching change + + Commit 6b65a76b40522a4f57a6fedcbdfc5a4d736f1d3c. "end" was becoming + negative. Was trigerred by Lohit-Kannada 2.5.3 and the sequence: + U+0CB0,U+200D,U+0CBE,U+0CB7,U+0CCD,U+0C9F,U+0CCD,U+0CB0,U+0C97,U+0CB3 + Two glyphs were being duplicated. + + src/hb-buffer.cc | 7 ++++++- + src/hb-ot-layout-gsubgpos-private.hh | 3 ++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +commit 1a7de1ba9876b0554c758acbc6459366d9d98a5d +Author: Behdad Esfahbod +Date: Wed Oct 16 19:55:06 2013 +0200 + + [indic] Improve Avagraha support in machine + + src/hb-ot-shape-complex-indic-machine.rl | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 3756efaf4e14ec3b5b1def700a1b5985f162372b +Author: Behdad Esfahbod +Date: Wed Oct 16 19:06:29 2013 +0200 + + [indic] Misc harmless fixes! + + First, we were abusing OT_VD instead of OT_A. Fix that + but moving OT_A in the grammar where it belongs (which + is different from what the spec says). + + Also, only allow medial consonants after all other + consonants. This doesn't affect any current character. + + Finally, fix Halant attachment in presence of medial + consonants. Again, this currently doesn't affect any + sequence. + + I lied. There's Gurmukhi U+0A75 which is Consonant_Medial. + Uniscribe allows one of those in each of these positions: + before matras, after matras and before syllable modifiers, + and after syllable modifiers! We currently just allow + unlimited numbers of it, before matras. + + src/hb-ot-shape-complex-indic-machine.rl | 8 ++++---- + src/hb-ot-shape-complex-indic-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 11 ++++++----- + 3 files changed, 11 insertions(+), 10 deletions(-) + +commit c52ddab72e025d1bee8274c8f3416208b12f68f1 +Author: Behdad Esfahbod +Date: Wed Oct 16 13:42:38 2013 +0200 + + [arabic] Make ZWJ prevent ligatures instead of facilitating it + + Unicode 6.2.0 Section 16.2 / Figure 16.3 says: + + "For backward compatibility, between Arabic characters a ZWJ acts just + like the sequence , preventing a ligature from forming + instead of requesting the use of a ligature that would not normally be + used. As a result, there is no plain text mechanism for requesting the + use of a ligature in Arabic text." + + As such, we flip internal zwj to zwnj flags for GSUB matching, which + means it will block ligation in all features, unless the font + explicitly matches U+200D glyph. This doesn't affect joining behavior. + + src/hb-ot-layout-private.hh | 6 ++++++ + src/hb-ot-shape-complex-arabic.cc | 18 ++++++++++++++++++ + 2 files changed, 24 insertions(+) + +commit 1a31f9f820c4538015ddaf4ca2b790649c5997ed +Author: Behdad Esfahbod +Date: Wed Oct 16 13:42:18 2013 +0200 + + [otlayout] Minor + + src/hb-ot-layout-private.hh | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) + +commit 28d5daec948e1a24f13e492ce301aeb9abff37c8 +Author: Behdad Esfahbod +Date: Wed Oct 16 12:32:12 2013 +0200 + + [indic] More granular post-base cluster merging! + + src/hb-ot-shape-complex-indic.cc | 45 ++++++++++++++++++++++++++++++++++------ + 1 file changed, 39 insertions(+), 6 deletions(-) + +commit 9cb59d460e80d769087045535a8d54ec9ed7985c +Author: Behdad Esfahbod +Date: Wed Oct 16 11:34:07 2013 +0200 + + [indic] Fix cluster merging of left matras + + The merge_clusters there was totally broken. + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 190c8f2b60af0851bf692f653c1604cfbf0561a5 +Author: Behdad Esfahbod +Date: Wed Oct 16 11:33:18 2013 +0200 + + [indic] Adjust cluster merging under uniscribe mode for Tamil + + Apparently Uniscribe Tamil shaper doesn't ship chubby clusters + for Tamil. Adjust to that. + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5c558877da5db8c734ba072f01e5e4797876619c +Author: Behdad Esfahbod +Date: Wed Oct 16 11:14:15 2013 +0200 + + [indic] Allow up to two syllable modifiers + + Bug 70509 - Candrabindu+Visarga doesn't work in Devanagari + https://bugs.freedesktop.org/show_bug.cgi?id=70509 + + We categorize both bindus and visarga as syllable-modifiers. + OT spec doesn't actually say what characters go in the syllable + modifier category, and allows one. We just allow up to two now. + + Test case: U+0930,U+0941,U+0901,U+0903 + + Uniscribe currently doesn't support that and produces a + dotted circle. + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + .../texts/in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit f5299eff5c0065d6329cd536c0ac339abea085b0 +Author: Behdad Esfahbod +Date: Tue Oct 15 18:13:07 2013 +0200 + + [indic] Simplify reph logic + + *Shouldn't* break anything. + + src/hb-ot-shape-complex-indic.cc | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +commit 65a929b1c033e91919c931b495a775f76b6dcbb3 +Author: Behdad Esfahbod +Date: Tue Oct 15 18:08:05 2013 +0200 + + [indic] If Malayalam dot-reph formed a ligature, don't move it + + Rachana-0.6 implements dot-reph by ligation, so we shouldn't move it. + Uniscribe doesn't either. Test case: + + U+0D4E,U+0D1A,U+0D4D,U+0D1A,U+0D4D + + src/hb-ot-shape-complex-indic.cc | 23 ++++++++++++++++------ + .../indic/script-malayalam/misc/dot-reph.txt | 3 +++ + 2 files changed, 20 insertions(+), 6 deletions(-) + +commit a01cbf6cbe0021722302cfb58fb638a0a2427b26 +Author: Behdad Esfahbod +Date: Tue Oct 15 16:37:53 2013 +0200 + + [indic] Harmless reordering of Khmer features! + + src/hb-ot-shape-complex-indic.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit c46f406973024051877e867b93614942ff80c107 +Author: Behdad Esfahbod +Date: Tue Oct 15 16:24:21 2013 +0200 + + [tests] Remove Myanmar micro-font and test + + .../sha1sum/ceadd106a8205214fbe7337ef9de32a862b59762.ttf | Bin 3040 -> 0 bytes + test/shaping/tests/context-matching.tests | 1 - + 2 files changed, 1 deletion(-) + +commit eb10233b267909dee0245f126000e117f3b21c35 +Author: Behdad Esfahbod +Date: Tue Oct 15 15:26:44 2013 +0200 + + [indic] Apply 'kern' for all scripts except for Khmer in Uniscribe mode + + Seems to better match Uniscribe. + + Note: NotoSansTelugu-Regular has kern feature, so this fixes most of the + positioning failures there, except for the kern pairs blocked by a + (non-)joiner, in which case we (correctly) kern, but Uniscribe doesn't. + + src/hb-ot-shape-complex-indic.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 30145272a7d428bc62a903388bd7be43f4da7fc3 +Author: Behdad Esfahbod +Date: Tue Oct 15 13:47:27 2013 +0200 + + [indic] Don't apply presentation features across syllables + + More like Uniscribe... We still allow user-defined features to + work across syllables, but not pres,blws,abs,psts,etc. + + This "regressed" Sinhala numbers by 11. These are cases were + there's Consonant followed by Ra,Halant,ZWJ at the of text. + The Ra,Halant,ZWJ ends up forming reph, which is wrong... + But before we were also ligating that reph with the previous + consonant. That's even more wrong. That's also what Uniscribe + does. + + Current numbers: + + BENGALI: 353732 out of 354188 tests passed. 456 failed (0.128745%) + DEVANAGARI: 707307 out of 707394 tests passed. 87 failed (0.0122987%) + GUJARATI: 366349 out of 366457 tests passed. 108 failed (0.0294714%) + GURMUKHI: 60732 out of 60747 tests passed. 15 failed (0.0246926%) + KANNADA: 951030 out of 951913 tests passed. 883 failed (0.0927606%) + KHMER: 299070 out of 299124 tests passed. 54 failed (0.0180527%) + MALAYALAM: 1048140 out of 1048334 tests passed. 194 failed (0.0185056%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271655 out of 271847 tests passed. 192 failed (0.070628%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + + src/hb-ot-shape-complex-indic.cc | 21 +++++++++++++++++---- + .../shaper-indic/indic/script-sinhala/misc/misc.txt | 1 + + 2 files changed, 18 insertions(+), 4 deletions(-) + +commit 3c7b3641cfb00f2c4dcc0768b9854e4f4410d15f +Author: Behdad Esfahbod +Date: Tue Oct 15 11:21:01 2013 +0200 + + [indic] Handle Avagraha + + It can come either at the end(ish!) of the syllable, or independently. + When independent, it accepts a few bits and pieces. + + src/hb-ot-shape-complex-indic-machine.rl | 5 ++++- + src/hb-ot-shape-complex-indic-private.hh | 5 +++-- + src/hb-ot-shape-complex-indic.cc | 14 +++++++++++++- + .../shaper-indic/indic/script-devanagari/misc/misc.txt | 1 + + .../in-tree/shaper-indic/indic/script-telugu/misc/misc.txt | 1 + + 5 files changed, 22 insertions(+), 4 deletions(-) + +commit 5e7432b8172473aa4dda3d51a79add9e97c2d2c1 +Author: Behdad Esfahbod +Date: Tue Oct 15 12:28:23 2013 +0200 + + [myanmar] Apply abvm/blwm + + src/hb-ot-shape-complex-myanmar.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 8acbb6be271817c12d2ee0066b355e2fb0f9a934 +Author: Behdad Esfahbod +Date: Tue Oct 15 12:15:49 2013 +0200 + + [indic] Some scripts like blwf applied to pre-base characters + + ...while some don't! + + Improved Bengali, Devanagari, Gurmukhi, Malayalam. + + Updated numbers: + + BENGALI: 353732 out of 354188 tests passed. 456 failed (0.128745%) + DEVANAGARI: 707307 out of 707394 tests passed. 87 failed (0.0122987%) + GUJARATI: 366349 out of 366457 tests passed. 108 failed (0.0294714%) + GURMUKHI: 60732 out of 60747 tests passed. 15 failed (0.0246926%) + KANNADA: 951030 out of 951913 tests passed. 883 failed (0.0927606%) + KHMER: 299070 out of 299124 tests passed. 54 failed (0.0180527%) + MALAYALAM: 1048134 out of 1048334 tests passed. 200 failed (0.0190779%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271666 out of 271847 tests passed. 181 failed (0.0665816%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + + src/hb-ot-shape-complex-indic.cc | 33 ++++++++++++++++++++------------- + 1 file changed, 20 insertions(+), 13 deletions(-) + +commit 2c85a3df0983f28aed77a0ea3bf2417ef65d4b84 +Author: Behdad Esfahbod +Date: Mon Oct 14 19:41:52 2013 +0200 + + Fix issue with automake + + test/shaping/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6b65a76b40522a4f57a6fedcbdfc5a4d736f1d3c +Author: Behdad Esfahbod +Date: Mon Oct 14 18:51:39 2013 +0200 + + [otlayout] Fix (Chain)Context recursion! + + Previously we only supported recursive sublookups with + ascending indices. We were also not correctly handling + non-1-to-1 recursed lookups. + + Fix all that! + + Fixes the three tests in test/shaping/tests/context-matching.tests, + which were derived from NotoSansBengali and NotoSansDevanagari + among others. + + src/hb-buffer-private.hh | 4 + + src/hb-buffer.cc | 46 ++++++++++ + src/hb-ot-layout-common-private.hh | 1 + + src/hb-ot-layout-gsub-table.hh | 1 + + src/hb-ot-layout-gsubgpos-private.hh | 157 +++++++++++++++++------------------ + 5 files changed, 127 insertions(+), 82 deletions(-) + +commit 841e20d083aec8d814cd8d90aa6ab60127c0d1f2 +Author: Behdad Esfahbod +Date: Mon Oct 14 18:47:51 2013 +0200 + + Add test suite for shaping results + + The new test suite runs tests included under + hb/test/shaping/tests/*.tests, which themselves reference + font files stored by sha1sum under hb/test/shaping/fonts/sha1sum. + The fonts are produced using a subsetter to only include glyphs + needed to run the test. + + Four initial tests are added for (Chain)Context matching, + of which three currently fail. + + test/shaping/Makefile.am | 10 +++++- + .../4cce528e99f600ed9c25a2b69e32eb94a03b4ae8.ttf | Bin 0 -> 1320 bytes + .../ceadd106a8205214fbe7337ef9de32a862b59762.ttf | Bin 0 -> 3040 bytes + .../d629e7fedc0b350222d7987345fe61613fa3929a.ttf | Bin 0 -> 1768 bytes + .../f499fbc23865022234775c43503bba2e63978fe1.ttf | Bin 0 -> 3564 bytes + test/shaping/run-tests.sh | 34 +++++++++++++++++++++ + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/context-matching.tests | 4 +++ + 8 files changed, 48 insertions(+), 1 deletion(-) + +commit e2dab69291a5d86fc90a8c273c458c16574eafb5 +Author: Behdad Esfahbod +Date: Mon Oct 14 16:44:44 2013 +0200 + + Minor + + test/shaping/hb_test_tools.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4e6e53db5da0a5da87ae732c3f9d01babf4ae6c2 +Author: Behdad Esfahbod +Date: Mon Oct 14 13:06:36 2013 +0200 + + [otlayout] "Minor" + + src/hb-ot-layout.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 9326d48e4309901e7e0b0e15230936a21ee3df72 +Author: Behdad Esfahbod +Date: Thu Oct 10 20:04:42 2013 +0200 + + Don't use g_mapped_file_unref() + + Was introduced in glib 2.22. + + src/test-buffer-serialize.cc | 2 +- + src/test-size-params.cc | 2 +- + src/test-would-substitute.cc | 2 +- + src/test.cc | 2 +- + util/options.cc | 4 ++-- + 5 files changed, 6 insertions(+), 6 deletions(-) + +commit e152d1a27891bd1d9d46a9c028c026843bad384a +Author: Behdad Esfahbod +Date: Thu Oct 3 15:09:37 2013 -0400 + + 0.9.22 + + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit 27674b4bb351e501373bd9994e4ba6546e465cf7 +Author: Behdad Esfahbod +Date: Thu Oct 3 14:54:50 2013 -0400 + + [OTLayout] Protect against out-of-range lookup indices + + Filter them out when compiling map. + + src/hb-ot-layout.cc | 17 +++++++++++++++++ + src/hb-ot-layout.h | 5 +++++ + src/hb-ot-map.cc | 8 +++++++- + 3 files changed, 29 insertions(+), 1 deletion(-) + +commit 6b4fdded94b7efb96c6e41cca4350878ed859ff1 +Author: Behdad Esfahbod +Date: Mon Sep 30 13:48:19 2013 -0400 + + Update git.mk + + git.mk | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) + +commit 2a2b5b89ef3a606ba2996bc89fd1c577a6c98f40 +Author: M1cha +Date: Mon Sep 30 08:55:52 2013 +0000 + + Cleanup Android.mk + - use common src files for both static and shared libs + - remove empty LOCAL_SHARED_LIBRARIES + + Android.mk | 58 +++++++++++++++++----------------------------------------- + 1 file changed, 17 insertions(+), 41 deletions(-) + +commit 622bc3d829cab84c3a4148b88f2c91fee491ef39 +Merge: 3d2c4f0c d583df1e +Author: Behdad Esfahbod +Date: Sun Sep 29 13:31:58 2013 -0700 + + Merge pull request #4 from amarullz/master + + Add build static library on Android.mk + +commit 3d2c4f0c2ff8fab4262988aad65b170e5b479b20 +Author: Behdad Esfahbod +Date: Fri Sep 27 17:06:29 2013 -0400 + + Fix hiding of default_ignorables if font doesn't have space glyph + + Based on patch from Jonathan Kew. See discussion on the list. + + src/hb-ot-shape.cc | 40 ++++++++++++++++++++++++++++++---------- + 1 file changed, 30 insertions(+), 10 deletions(-) + +commit d583df1e78003f8f1039ad72331bf877b13d1ae5 +Author: Ahmad Amarullah +Date: Fri Sep 27 19:04:32 2013 +0700 + + Add build static library on Android.mk + + Use UCDN instead ICU + HAVE Freetype + + Android.mk | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 50 insertions(+) + +commit 078de49ca10285f6cd1452abd40f831a17af5d1a +Author: Behdad Esfahbod +Date: Thu Sep 26 18:26:43 2013 -0400 + + [util] Don't use g_array_unref() + + Was introduced in glib 2.22. + + util/view-cairo.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 48360ec03b225dfec5f90bc5cb93122203d2dd6b +Author: Behdad Esfahbod +Date: Thu Sep 26 16:48:42 2013 -0400 + + Bug 68990 - test-common fails on i686-linux + + Fix use-after-end-of-scope. + + src/hb-common.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit b61f97d544ce43d85f5fe93e682c324e042c0770 +Author: Behdad Esfahbod +Date: Mon Sep 16 22:07:22 2013 -0400 + + 0.9.21 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit 2af826296315d89f3a433952903c5968e56044ea +Author: Behdad Esfahbod +Date: Mon Sep 16 21:49:56 2013 -0400 + + Improve library checks + + src/Makefile.am | 1 + + src/check-defs.sh | 44 ++++++++++++++++++++++++++++++++++++++++++++ + src/check-symbols.sh | 37 ++++++++++++------------------------- + 3 files changed, 57 insertions(+), 25 deletions(-) + +commit 882edce48e507a1c76c908ec2db04aac218b67d6 +Author: Behdad Esfahbod +Date: Fri Sep 13 20:36:43 2013 -0400 + + [graphite2] Fix include + + src/hb-graphite2.cc | 5 ++--- + src/hb-graphite2.h | 2 ++ + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit ace5c7eb4c2302a6a7eb3576e6dbc3bc026e569c +Author: Behdad Esfahbod +Date: Fri Sep 13 20:34:42 2013 -0400 + + [introspection] hb-ft annotations + + src/hb-face.cc | 2 +- + src/hb-ft.cc | 30 +++++++++++++++++++++++++++++- + 2 files changed, 30 insertions(+), 2 deletions(-) + +commit a8949df48780e680e03b9afbbafb3628a0acef52 +Author: Behdad Esfahbod +Date: Fri Sep 13 20:23:51 2013 -0400 + + [introspection] Annotate Unicode / font callbacks + + Should move these out of the public header... + + We're "clean" of introspection warnings now. Remaining ones are about + graphite2 / freetype types not being introspectable. + + src/hb-blob.cc | 4 +- + src/hb-face.cc | 2 +- + src/hb-font.cc | 4 +- + src/hb-font.h | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- + src/hb-unicode.h | 106 ++++++++++++++++++++++++++++++++++++++++---- + 5 files changed, 231 insertions(+), 17 deletions(-) + +commit 4b011094d5e90cf93df2891e47aeab1bffad5bbf +Author: Behdad Esfahbod +Date: Fri Sep 13 20:17:42 2013 -0400 + + Move code around + + I believe I didn't break anything... + + src/hb-ot-shape.cc | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit 4878db218202ed804c9f76edb7e4aa220de8a8d8 +Author: Behdad Esfahbod +Date: Thu Sep 12 20:56:32 2013 -0400 + + Remove contrib/ Python hand-coded binding stuff + + gobject-introspection coming together. + + contrib/README | 2 - + contrib/python/README | 10 -- + contrib/python/lib/fontconfig.pyx | 47 --------- + contrib/python/lib/harfbuzz.pyx | 213 -------------------------------------- + contrib/python/scripts/hbtestfont | 116 --------------------- + contrib/python/setup.py | 39 ------- + 6 files changed, 427 deletions(-) + +commit e478ebe4d3f74dc271ffe88680fd29f6b1924c93 +Author: Behdad Esfahbod +Date: Thu Sep 12 20:53:07 2013 -0400 + + [introspection] Add sample.py + + src/sample.py | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit dfdbe7f932daffcf73911ff4e4a36f749164d960 +Author: Behdad Esfahbod +Date: Thu Sep 12 20:52:20 2013 -0400 + + [introspection] Make hb_blob_create() introspectable + + src/Makefile.am | 2 ++ + src/hb-blob.cc | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit 085d4291a9f253a4b8e2eec8003ac11d02a9394f +Author: Behdad Esfahbod +Date: Thu Sep 12 17:14:33 2013 -0400 + + [introspection] Disable constructors for now + + Since our types are not associated with their methods, marking + constructors makes them inaccessible from bindings. Undo for now. + + src/hb-blob.cc | 2 +- + src/hb-buffer.cc | 2 +- + src/hb-face.cc | 2 +- + src/hb-font.cc | 4 ++-- + src/hb-set.cc | 2 +- + src/hb-shape-plan.cc | 2 +- + src/hb-unicode.cc | 2 +- + 7 files changed, 8 insertions(+), 8 deletions(-) + +commit 6c48f20eea22c6e686416ab4ec8388be3e8cd0b5 +Author: Behdad Esfahbod +Date: Mon Sep 9 15:43:10 2013 -0400 + + [otlayout] Add structs for JSTF table + + src/Makefile.am | 1 + + src/hb-ot-head-table.hh | 2 +- + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-jstf-table.hh | 229 +++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout.cc | 1 + + src/hb-ot-layout.h | 1 + + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-name-table.hh | 2 +- + src/main.cc | 2 +- + 13 files changed, 241 insertions(+), 9 deletions(-) + +commit 70303cf23b22647bf641be22c8650310128322a9 +Author: Behdad Esfahbod +Date: Fri Sep 6 17:35:57 2013 -0400 + + [docs/introspection] Some more annotations + + src/hb-common.cc | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++-- + src/hb-font.cc | 16 +++--- + src/hb-version.h.in | 19 ------- + 3 files changed, 155 insertions(+), 31 deletions(-) + +commit 288f2899979bcc9e68f8115cb76e3271ed0e17bc +Author: Behdad Esfahbod +Date: Fri Sep 6 15:40:22 2013 -0400 + + [docs/introspection] More annotations + + src/hb-blob.cc | 63 +++--- + src/hb-buffer-serialize.cc | 63 ++++++ + src/hb-buffer.cc | 307 ++++++++++++++++++++++++++- + src/hb-face.cc | 171 +++++++++++++++ + src/hb-font-private.hh | 4 +- + src/hb-font.cc | 504 ++++++++++++++++++++++++++++++++++++++++++++- + src/hb-set.cc | 2 +- + src/hb-shape-plan.cc | 104 ++++++++++ + src/hb-shape.cc | 56 +++++ + src/hb-unicode.cc | 128 ++++++++++++ + 10 files changed, 1355 insertions(+), 47 deletions(-) + +commit 17905c54f1bab9e6dfe13f59f5ec208de12832f7 +Author: Behdad Esfahbod +Date: Fri Sep 6 16:57:01 2013 -0400 + + [introspection] Work around g-i limitation with hb_language_t + + src/hb-gobject-structs.cc | 15 +++++++++++---- + src/hb-gobject-structs.h | 8 ++++++++ + 2 files changed, 19 insertions(+), 4 deletions(-) + +commit cd361c3cbe4a288e3019b9a029f44e4c5f24436c +Author: Behdad Esfahbod +Date: Fri Sep 6 16:20:21 2013 -0400 + + Minor change to hb_language_t + + Let me know if this breaks anyone's anything. + + src/hb-common.cc | 2 +- + src/hb-common.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 20cbc1f8eb0811e6cefa3be3550e80df9c372782 +Author: Behdad Esfahbod +Date: Fri Sep 6 15:29:22 2013 -0400 + + Annotate hb-set a bit; add HB_SET_VALUE_INVALID + + src/hb-set-private.hh | 20 +++-- + src/hb-set.cc | 244 ++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-set.h | 2 + + src/hb-version.h.in | 6 +- + test/api/test-set.c | 26 +++--- + 5 files changed, 276 insertions(+), 22 deletions(-) + +commit c44b81833d5bfb9a926d348a76463314c3ec2018 +Author: Behdad Esfahbod +Date: Fri Sep 6 15:13:16 2013 -0400 + + Whitespace + + src/hb-buffer.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit ae9dc717d37d58efdd3fabbe4a9c3c2bf9dc3568 +Author: Behdad Esfahbod +Date: Thu Sep 5 16:40:37 2013 -0400 + + [gtk-doc] Pass source files to gtk-doc + + docs/reference/Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 5f512017ba615ba6ac8e5da2ea0c57a72db2c26b +Author: Behdad Esfahbod +Date: Wed Sep 4 18:28:39 2013 -0400 + + [docs] Document a few symbols + + src/hb-blob.cc | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++- + src/hb-buffer.cc | 78 ++++++++++++++++++++++++- + src/hb-version.h.in | 17 ++++++ + 3 files changed, 251 insertions(+), 4 deletions(-) + +commit e0dbf99b4497be305d689a528282fd37214e7f1c +Author: Behdad Esfahbod +Date: Thu Sep 5 16:00:47 2013 -0400 + + [introspection] Pass source files to scanner + + src/Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 5a5350b39b81e0128d36ebc81307a6d698a4dc50 +Author: Behdad Esfahbod +Date: Tue Sep 3 20:11:01 2013 -0400 + + Revert "Round when scaling values" + + This reverts commit 10f964623f003c70f6bdd33423420abda3820ce0. + + See discussion with Khaled Hosny on mailing list. In short, since + integers here can be negative, and int division is "round towards + zero", proper rounding should take sign into account. Just skip + doing it again, has been serving us well before. + + TODO | 2 ++ + src/hb-font-private.hh | 6 +----- + 2 files changed, 3 insertions(+), 5 deletions(-) + +commit 74ff41c3a573bdf74b60623065eb92a49f055893 +Author: Behdad Esfahbod +Date: Tue Sep 3 20:09:14 2013 -0400 + + Minor + + Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit 63dd4b0ac2076fe9cc3dfe5d31ef3616d4ed01e5 +Author: Behdad Esfahbod +Date: Tue Sep 3 20:01:40 2013 -0400 + + [gtk-doc] Remove hack for deleting tmpl/ + + This was introduced in 029f46bde7e39094d3decb46525e91a97c5cc02c + and was in fact a bug in gtk-doc master: + + https://bugzilla.gnome.org/show_bug.cgi?id=707426 + + docs/reference/Makefile.am | 5 ----- + 1 file changed, 5 deletions(-) + +commit 213001aa99003422199245e96878f9fe348c55b4 +Author: Behdad Esfahbod +Date: Tue Sep 3 20:00:16 2013 -0400 + + [build] Fix EXTRA_DIST + + I was under the impression that EXTRA_DISTs will happen regardless of + automake conditionals. Apparently I was wrong. + + src/Makefile.am | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 1e994a8fcc94dfea42a6cbfe23a401142d79a1a6 +Author: Behdad Esfahbod +Date: Tue Sep 3 18:11:47 2013 -0400 + + [gtk-doc] Copy makefile + + autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 81a007ffad683e53f12093a0c9e30112106f415d +Author: Behdad Esfahbod +Date: Fri Aug 30 19:45:13 2013 -0400 + + [TODO] Update + + TODO | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit a2a28235e8131a1e1d4b8c3d0933df5cf056bbc6 +Author: Behdad Esfahbod +Date: Fri Aug 30 19:38:47 2013 -0400 + + [gtk-doc] Generate version.xml from configure + + Even though this is not what autoconf recommends, it reduces doc + rebuilds when version doesn't change but configure changes. + + configure.ac | 1 + + docs/reference/Makefile.am | 11 +++-------- + docs/reference/version.xml.in | 1 + + 3 files changed, 5 insertions(+), 8 deletions(-) + +commit ac1b723917d9b8f247a350f8d3e1bc5d1e472073 +Author: Behdad Esfahbod +Date: Fri Aug 30 19:32:10 2013 -0400 + + Remove hb-old and hb-icu-le test shapers + + They've been disabled for a while and no one cared. We're past + the point to need them for testing, and if we ever need to + resurrect them again, well, they're in git graveyard somewhere. + + configure.ac | 23 +- + src/Makefile.am | 28 +- + src/hb-icu-le.cc | 265 -- + src/hb-icu-le/COPYING | 2 - + src/hb-icu-le/FontTableCache.cpp | 91 - + src/hb-icu-le/FontTableCache.h | 48 - + src/hb-icu-le/Makefile.am | 25 - + src/hb-icu-le/PortableFontInstance.cpp | 275 -- + src/hb-icu-le/PortableFontInstance.h | 119 - + src/hb-icu-le/README | 3 - + src/hb-icu-le/cmaps.cpp | 200 -- + src/hb-icu-le/cmaps.h | 87 - + src/hb-icu-le/letest.h | 63 - + src/hb-icu-le/license.html | 51 - + src/hb-icu-le/sfnt.h | 453 --- + src/hb-old.cc | 410 --- + src/hb-old/COPYING | 24 - + src/hb-old/Makefile.am | 56 - + src/hb-old/README | 7 - + src/hb-old/harfbuzz-arabic.c | 1150 ------ + src/hb-old/harfbuzz-buffer-private.h | 107 - + src/hb-old/harfbuzz-buffer.c | 383 -- + src/hb-old/harfbuzz-buffer.h | 102 - + src/hb-old/harfbuzz-external.h | 106 - + src/hb-old/harfbuzz-gdef-private.h | 135 - + src/hb-old/harfbuzz-gdef.c | 1163 ------ + src/hb-old/harfbuzz-gdef.h | 140 - + src/hb-old/harfbuzz-global.h | 125 - + src/hb-old/harfbuzz-gpos-private.h | 729 ---- + src/hb-old/harfbuzz-gpos.c | 6094 -------------------------------- + src/hb-old/harfbuzz-gpos.h | 155 - + src/hb-old/harfbuzz-greek.c | 447 --- + src/hb-old/harfbuzz-gsub-private.h | 483 --- + src/hb-old/harfbuzz-gsub.c | 4329 ----------------------- + src/hb-old/harfbuzz-gsub.h | 148 - + src/hb-old/harfbuzz-hangul.c | 268 -- + src/hb-old/harfbuzz-hebrew.c | 187 - + src/hb-old/harfbuzz-impl.c | 84 - + src/hb-old/harfbuzz-impl.h | 135 - + src/hb-old/harfbuzz-indic.cpp | 1868 ---------- + src/hb-old/harfbuzz-khmer.c | 642 ---- + src/hb-old/harfbuzz-myanmar.c | 511 --- + src/hb-old/harfbuzz-open-private.h | 102 - + src/hb-old/harfbuzz-open.c | 1433 -------- + src/hb-old/harfbuzz-open.h | 288 -- + src/hb-old/harfbuzz-shaper-all.cpp | 37 - + src/hb-old/harfbuzz-shaper-private.h | 159 - + src/hb-old/harfbuzz-shaper.cpp | 996 ------ + src/hb-old/harfbuzz-shaper.h | 265 -- + src/hb-old/harfbuzz-stream-private.h | 81 - + src/hb-old/harfbuzz-stream.c | 114 - + src/hb-old/harfbuzz-stream.h | 51 - + src/hb-old/harfbuzz-tibetan.c | 249 -- + src/hb-old/harfbuzz.h | 38 - + 54 files changed, 2 insertions(+), 25532 deletions(-) + +commit b94243d6a9457864ad8ef3ad47ad01985b138862 +Author: Behdad Esfahbod +Date: Fri Aug 30 18:41:33 2013 -0400 + + [g-i] Rename library from harfbuzz to HarfBuzz + + src/Makefile.am | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit f730b5d1e2369762952481f1a2d3db26a2b48015 +Author: Behdad Esfahbod +Date: Thu Aug 29 15:53:33 2013 -0400 + + 0.9.20 + + NEWS | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 49 insertions(+), 1 deletion(-) + +commit b0e03508bad04d7dcf2c50ac81f6261425b34c5f +Author: Behdad Esfahbod +Date: Thu Aug 29 15:56:32 2013 -0400 + + Dist with gobject and introspection enabled + + Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit e4ce6745e15eab33ed693874e7a56981f4d6f79a +Author: Behdad Esfahbod +Date: Thu Aug 29 15:56:16 2013 -0400 + + [gtk-doc] Fix build without gobject + + docs/reference/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 263372f15ffdf4c0e4386133f64ff389ba73de33 +Author: Behdad Esfahbod +Date: Wed Aug 28 13:43:54 2013 -0400 + + Remove gtk-doc.make + + It's copied by gtk-docize. + + gtk-doc.make | 302 ----------------------------------------------------------- + 1 file changed, 302 deletions(-) + +commit 79d754efeef89543d51775b110e8bd49cf7e699b +Author: Behdad Esfahbod +Date: Wed Aug 28 13:43:35 2013 -0400 + + Fix build + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 71ef22b04d466803076af1da6763fecab95ce5bb +Author: Behdad Esfahbod +Date: Wed Aug 28 12:52:55 2013 -0400 + + Turn hb-gobject, and introspection off by default + + Also enable bootstrapping without them. + + configure.ac | 39 ++++++++++++++++++++++++++++++++++----- + src/Makefile.am | 5 +++-- + 2 files changed, 37 insertions(+), 7 deletions(-) + +commit d8f507099b9ae5f0c643fb8dddbb069df6f62a94 +Author: Behdad Esfahbod +Date: Mon Aug 26 21:26:24 2013 -0400 + + Hookup harfbuzz-gobject to introspection + + src/Makefile.am | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +commit 71439a8c7ae9df25193bc3ad0f203117d2884a19 +Author: Behdad Esfahbod +Date: Mon Aug 26 20:56:58 2013 -0400 + + [gobject] Flesh out hb-gobject + + Move it to new harfbuzz-gobject library. Implement enums and + boxed types for object-types. Still have to do boxed types for + value types. + + configure.ac | 12 ++++- + docs/reference/Makefile.am | 12 ++++- + docs/reference/harfbuzz-docs.xml | 3 ++ + docs/reference/harfbuzz-sections.txt | 48 +++++++++++++++++++- + src/Makefile.am | 48 +++++++++++++------- + src/harfbuzz-gobject.pc.in | 12 +++++ + src/hb-gobject-enums.cc.tmpl | 11 +++-- + src/hb-gobject-enums.h.tmpl | 55 +++++++++++++++++++++++ + src/hb-gobject-structs.cc | 84 +++++++++++++++++++++++++++------- + src/hb-gobject-structs.h | 87 ++++++++++++++++++++++++++++++++++++ + src/hb-gobject.h | 38 ++-------------- + 11 files changed, 333 insertions(+), 77 deletions(-) + +commit 23027f7611b53b594e4b4008e916e42b5154f6ac +Author: Behdad Esfahbod +Date: Thu Aug 22 19:03:21 2013 -0400 + + [introspection] Enable gobject-introspection again + + configure.ac | 7 ++++--- + src/Makefile.am | 49 ++++++++++++++++++++++++++++--------------------- + 2 files changed, 32 insertions(+), 24 deletions(-) + +commit 757a7a9018577dcc399be03dc45a59589585d2fb +Author: Behdad Esfahbod +Date: Wed Aug 28 12:35:13 2013 -0400 + + [uniscribe] Fixed build with wide chars + + https://github.com/blinkseb/harfbuzz/commit/f65dafa4138e1fb4395bf646fa33bb01a86a7e9a + + src/hb-uniscribe.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4dc798de19c767b91fd3025c85593fa6809d1340 +Author: Behdad Esfahbod +Date: Mon Aug 26 20:39:00 2013 -0400 + + Add hb-deprecated.h, and rename a couple enum values + + Add deprecated alias for old name. + + src/Makefile.am | 1 + + src/hb-buffer.cc | 4 ++-- + src/hb-buffer.h | 8 +++---- + src/hb-common.h | 5 ----- + src/hb-deprecated.h | 51 ++++++++++++++++++++++++++++++++++++++++++++ + src/hb.h | 1 + + src/test-buffer-serialize.cc | 2 +- + test/api/test-buffer.c | 2 +- + util/Makefile.am | 1 + + util/hb-shape.cc | 2 +- + util/options.hh | 2 +- + 11 files changed, 64 insertions(+), 15 deletions(-) + +commit 2e3a07abdf97b0ad2105c3a52f3ff0e0b60b29c4 +Author: Behdad Esfahbod +Date: Mon Aug 26 18:49:07 2013 -0400 + + Separate face source code from font + + Makes documentation / introspection easier. + + Android.mk | 1 + + docs/reference/harfbuzz-docs.xml | 1 + + docs/reference/harfbuzz-sections.txt | 6 +- + src/Makefile.am | 3 + + src/hb-face-private.hh | 108 ++++++++++++ + src/hb-face.cc | 311 +++++++++++++++++++++++++++++++++++ + src/hb-face.h | 117 +++++++++++++ + src/hb-font-private.hh | 67 +------- + src/hb-font.cc | 269 ------------------------------ + src/hb-font.h | 75 +-------- + src/hb.h | 1 + + 11 files changed, 549 insertions(+), 410 deletions(-) + +commit d3490761e11ae308fbd8aaf02059653f579035c5 +Author: Behdad Esfahbod +Date: Mon Aug 26 21:15:29 2013 -0400 + + Improve check-includes.sh + + src/check-includes.sh | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 381f2fb5e664715d67ffc9a234b0fd8aa540fada +Author: Behdad Esfahbod +Date: Mon Aug 26 19:20:38 2013 -0400 + + Minor + + docs/reference/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ac1f09b53e2c5d14c874e4d9f1b25b03ea1d1c44 +Author: Behdad Esfahbod +Date: Mon Aug 26 18:50:12 2013 -0400 + + [gtk-doc] Fix maintainer-clean rule + + docs/reference/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 38b8b40526a85f33521542e24d1e0c82588efc85 +Author: Behdad Esfahbod +Date: Tue Aug 27 11:44:09 2013 -0400 + + Fix possible snprintf OOM + + https://bugzilla.redhat.com/show_bug.cgi?id=1001645 + + src/hb-buffer-serialize.cc | 14 +++++++------- + src/hb-font-private.hh | 3 ++- + src/hb-shape.cc | 6 +++--- + 3 files changed, 12 insertions(+), 11 deletions(-) + +commit d22548c0e362cc9447557440af9ecbb11badfa78 +Author: Behdad Esfahbod +Date: Mon Aug 26 18:46:21 2013 -0400 + + [check-*] Minor + + src/check-c-linkage-decls.sh | 4 ++-- + src/check-header-guards.sh | 4 ++-- + src/check-includes.sh | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit 029f46bde7e39094d3decb46525e91a97c5cc02c +Author: Behdad Esfahbod +Date: Mon Aug 26 18:11:07 2013 -0400 + + [gtk-doc] Remove tmpl in make maintainer-clean + + docs/reference/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +commit dddf990c3687a47297eafc82b54fa96842e68003 +Author: Behdad Esfahbod +Date: Mon Aug 26 17:58:25 2013 -0400 + + [git.mk] Update + + git.mk | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +commit 700a15fe4b80da9c67befd85ae10a166f5b65962 +Author: Behdad Esfahbod +Date: Mon Aug 26 17:49:36 2013 -0400 + + Add HB_DISABLE_DEPRECATED + + That moment that you have to accept that you made API mistakes... + + docs/reference/Makefile.am | 2 +- + docs/reference/harfbuzz-sections.txt | 8 +++++--- + src/hb-common.h | 4 +++- + 3 files changed, 9 insertions(+), 5 deletions(-) + +commit ddc456a519a9a59e96f9d7fcad988369e0a8842b +Author: Behdad Esfahbod +Date: Mon Aug 26 17:34:18 2013 -0400 + + [travis] Add graphite2 + + .travis.yml | 1 + + 1 file changed, 1 insertion(+) + +commit f7c72b42efb8d42859023659fd2e3d589523436d +Author: Anthony Carrico +Date: Sun Feb 24 13:00:33 2013 -0500 + + [gtk-doc] Initial setup + + Initial setup of gtk-doc. Straight forward setup following the gtk-doc + instructions. Ignore some troublesome types in src/hb-gobject.h. To + build use "./autogen.sh --enable-gtk-doc" then "make". Docs are in + harfbuzz/docs/reference/html/index.html. + + .travis.yml | 10 +- + Makefile.am | 7 +- + autogen.sh | 7 + + configure.ac | 7 +- + docs/Makefile.am | 1 + + docs/reference/Makefile.am | 109 +++++++++ + docs/reference/harfbuzz-docs.xml | 61 +++++ + docs/reference/harfbuzz-overrides.txt | 0 + docs/reference/harfbuzz-sections.txt | 431 ++++++++++++++++++++++++++++++++++ + gtk-doc.make | 302 ++++++++++++++++++++++++ + src/Makefile.am | 2 +- + src/hb-gobject.h | 3 +- + 12 files changed, 931 insertions(+), 9 deletions(-) + +commit 3409fb1c767118067cf7edfb97068936b6f4b717 +Author: Behdad Esfahbod +Date: Wed Aug 21 17:22:21 2013 -0400 + + [uniscribe] Ask Uniscribe to return shaping results in logical order + + See discussion on the list in the thread "Arabic presentation forms + and the uniscribe backend". + + Based on patch from Jonathan Kew. + + src/hb-uniscribe.cc | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit 1d05fdd09fa271b641f30a2138171e6fafcd8db7 +Author: Behdad Esfahbod +Date: Tue Aug 20 13:22:21 2013 -0400 + + [uniscribe] Print run info + + src/hb-uniscribe.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 3613696b57225111507a3f4263f5fa6937d0bc72 +Author: Behdad Esfahbod +Date: Mon Aug 12 00:33:28 2013 -0400 + + [coretext] Fully support user features + + Based on patch from Jonathan Kew and data from Apple. + + It's not working correctly though, and I suspect I'm hitting a bug in + CoreText. When I do this: + + hb-shape /Library/Fonts/Zapfino.ttf ZapfinoZapfino --shaper coretext \ + --features=-liga + + I expect both ligatures to turn off, but only the second one does: + + [Z_a_p_f_i_n_o=0+2333|Z=7+395|a=8+285|p_f=9+433|i=11+181|n=12+261|o=13+250] + + whereas if I disable 'dlig' instead of 'liga', both are turned off. + Smells... + + Doesn't resolve conflicting feature settings. + + src/hb-coretext.cc | 446 +++++++++++++++++++++++++++++++++++++++++++++++----- + src/hb-uniscribe.cc | 2 +- + 2 files changed, 404 insertions(+), 44 deletions(-) + +commit 54e6f6c588a164f7de62ff88b3eff4f25adb8f17 +Author: Behdad Esfahbod +Date: Fri Aug 9 14:34:54 2013 -0400 + + Clean up list of Unicode scripts + + Rename HB_SCRIPT_CANADIAN_ABORIGINAL to HB_SCRIPT_CANADIAN_SYLLABICS + and a macro for the old name. + + src/hb-common.h | 277 ++++++++++++++++++++----------------- + src/hb-glib.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 2 + + src/hb-ucdn.cc | 2 +- + test/api/test-unicode.c | 2 +- + 5 files changed, 153 insertions(+), 132 deletions(-) + +commit 7cd4a715848c44be9aec6b6b622cfc2a60b1a5a9 +Author: Behdad Esfahbod +Date: Fri Aug 9 09:41:48 2013 -0400 + + Update TODO + + TODO | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 515a0ac81e531c95b1bb7f1a3c5df73a9e64b14f +Author: Behdad Esfahbod +Date: Fri Aug 9 09:40:59 2013 -0400 + + Fix compiler warning + + src/hb-ot-layout-common-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 10f964623f003c70f6bdd33423420abda3820ce0 +Author: Behdad Esfahbod +Date: Fri Aug 9 09:40:01 2013 -0400 + + Round when scaling values + + Doesn't matter for most users since they should be working in a + fixed sub-pixel scale anyway (ie. 22.10, 26.6, 16.16, etc). + + TODO | 2 -- + src/hb-font-private.hh | 6 +++++- + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit df8f70ae5de6181d56efa3f076f14e4d52119a5e +Author: Behdad Esfahbod +Date: Fri Aug 9 09:35:10 2013 -0400 + + Minor + + src/hb-font-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ce8badf1808f9fbdd9a22e9215c7475d3afde5ed +Author: Behdad Esfahbod +Date: Fri Aug 9 09:31:06 2013 -0400 + + Minor + + src/hb-font-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d71c0df2d17f4590d5611239577a6cb532c26528 +Author: Behdad Esfahbod +Date: Fri Aug 9 09:28:32 2013 -0400 + + Remove vrt2, vkrn, vpal, and valt from default vertical features + + See thread by John Dagget on the list. + + TODO | 2 -- + src/hb-ot-shape.cc | 9 --------- + 2 files changed, 11 deletions(-) + +commit a782a5e9a37c8733ac2830410a514d38635b543a +Author: Behdad Esfahbod +Date: Wed Aug 7 21:08:54 2013 -0400 + + [coretext] Start adding support for features + + Unlike AAT, looks like with CoreText very few OT features can be mapped. + :( + + src/hb-coretext.cc | 65 +++++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 54 insertions(+), 11 deletions(-) + +commit bdd8873fd8ae5c794018f6edac242b0a8b62ff31 +Author: Behdad Esfahbod +Date: Wed Aug 7 17:58:25 2013 -0400 + + Revert "[Indic] don't apply 'calt' by default in Indic shaper" + + This reverts commit 952121007c6f6f374e4cf1734ebcfe2d2d71c71c. + + In light of discussion on the mailing list... + + src/hb-ot-shape-complex-indic.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit 9a175914d72187d0c3f50ddad50c9569649c3072 +Author: Behdad Esfahbod +Date: Wed Aug 7 17:26:13 2013 -0400 + + [uniscribe] Support feature ranges + + As Khaled pointed out, right now setting any features, turns kern + and possibly other features off. + + src/hb-uniscribe.cc | 232 ++++++++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 199 insertions(+), 33 deletions(-) + +commit 627af695e48ef10b6e634c34b723f7e7013467f6 +Author: Behdad Esfahbod +Date: Tue Aug 6 16:53:56 2013 -0400 + + More git.mk updates + + git.mk | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 722252743d59e4cd53cb71720d823ea00b708ad8 +Author: Behdad Esfahbod +Date: Tue Aug 6 15:19:23 2013 -0400 + + Update git.mk + + git.mk | 37 +++++++++++++++++++++++-------------- + 1 file changed, 23 insertions(+), 14 deletions(-) + +commit 38d5c58d23fce38221689cda98cea1c3e42ed615 +Author: Behdad Esfahbod +Date: Tue Aug 6 14:45:36 2013 -0400 + + [uniscribe] Half-support user features + + Turning features on globally works now. + + src/hb-uniscribe.cc | 54 ++++++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 43 insertions(+), 11 deletions(-) + +commit 639afdc690c681a302080239a1967ce735ba5be5 +Author: Behdad Esfahbod +Date: Tue Aug 6 14:28:12 2013 -0400 + + Minor + + src/hb-private.hh | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +commit 952121007c6f6f374e4cf1734ebcfe2d2d71c71c +Author: Jonathan Kew +Date: Tue Aug 6 10:36:14 2013 -0400 + + [Indic] don't apply 'calt' by default in Indic shaper + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 625678436c29100eef82d87e635b251030a18f60 +Author: Behdad Esfahbod +Date: Mon Aug 5 22:44:18 2013 -0400 + + Fix glyph closure with class==0 + + As reported by cibu. Untested. + + src/hb-ot-layout-common-private.hh | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + +commit 580d5eb93af5bbbc64994b626d5e011e2c256d74 +Author: Behdad Esfahbod +Date: Sun Aug 4 16:55:21 2013 -0400 + + Don't apply 'dlig' by default + + Windows 8 doesn't, and the spec will be fixed. + + src/hb-ot-shape-complex-arabic.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 48382e2f41499a91181bea0acc5792989d2485bb +Author: Behdad Esfahbod +Date: Tue Jul 30 18:25:39 2013 -0400 + + Minor + + src/hb-ot-layout-common-private.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit c461371419d186811d4bfc768e26535f48a807f4 +Author: Behdad Esfahbod +Date: Tue Jul 30 14:48:23 2013 -0400 + + [CoreText] Don't leak the CTLine object (and everything that hangs off it) + + Patch from Jonathan Kew. + + src/hb-coretext.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5fbc952524ac8840f007dc0136823a4ab6e25f70 +Author: Behdad Esfahbod +Date: Mon Jul 29 14:34:40 2013 -0400 + + Fix glyph name printing in hb-ot-shape-closure + + util/hb-ot-shape-closure.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6fadd9dd7cc220f131c29946285831635afc8044 +Author: Behdad Esfahbod +Date: Fri Jul 26 10:33:06 2013 -0400 + + Apply 'mark' to Myanmar + + According to Andrew Glass: "The issue with Myanmar feature was + fixed via a servicing patch as soon as Windows 8 became available." + + src/hb-ot-shape-complex-myanmar.cc | 11 ----------- + 1 file changed, 11 deletions(-) + +commit 86522e493d071f395b5abf64289232bf8867ac29 +Author: Behdad Esfahbod +Date: Mon Jul 22 19:07:53 2013 -0400 + + Fix glyph closure recursion! + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 74439d0aa10184451adc6c6469f5119be352ecbb +Author: Behdad Esfahbod +Date: Mon Jul 22 19:02:29 2013 -0400 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8b427c78efa988ed27a2a394146d73f59688707b +Author: Behdad Esfahbod +Date: Mon Jul 22 10:57:05 2013 -0400 + + [uniscribe] Sanitize font file + + src/hb-uniscribe.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 12ff69df21ac91ae21860db7000d9f9973d3da1a +Author: Behdad Esfahbod +Date: Mon Jul 22 10:52:12 2013 -0400 + + [uniscribe] Handle TTC when renaming font + + src/hb-uniscribe.cc | 31 ++++++++++++++++++------------- + 1 file changed, 18 insertions(+), 13 deletions(-) + +commit 05bad3b8c25a89bc0f20f99f9215e492f48f03fe +Author: Behdad Esfahbod +Date: Sun Jul 21 17:05:02 2013 -0400 + + [uniscribe] Use OT::* types + + src/hb-open-type-private.hh | 10 ++++- + src/hb-ot-name-table.hh | 4 +- + src/hb-uniscribe.cc | 107 +++++++++++++++++++++++--------------------- + 3 files changed, 66 insertions(+), 55 deletions(-) + +commit bdeea605fe597bff4430eaae3317189bb81ec76e +Author: Behdad Esfahbod +Date: Sun Jul 21 16:22:10 2013 -0400 + + [uniscribe] Move name generation into separate function + + src/hb-uniscribe.cc | 34 ++++++++++++++++++++++------------ + 1 file changed, 22 insertions(+), 12 deletions(-) + +commit 73f947e2a7bc5b29d731da2e9d1fafe958be839e +Author: Behdad Esfahbod +Date: Sun Jul 21 16:16:35 2013 -0400 + + [uniscribe] Use blob to pass data around + + src/hb-uniscribe.cc | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +commit 8ac2e88deff3d069c19fd59d0fbbfb88a762b113 +Author: Behdad Esfahbod +Date: Sun Jul 21 16:06:49 2013 -0400 + + [uniscribe] Use unique font name + + When installing per-process fonts using AddFontMemResourceEx(), + if a font with the same family name is already installed, sometimes + that one gets used. Which is problematic for us. As such, we + now mangle the font to install a new 'name' table with a unique + name, which we then use to choose the font. + + Patch from Jonathan Kew. + + configure.ac | 2 +- + src/hb-uniscribe.cc | 136 ++++++++++++++++++++++++++++++++++++++++++++-------- + 2 files changed, 116 insertions(+), 22 deletions(-) + +commit 8751de50831338ce550601c34c17d152ad89c1fd +Author: Behdad Esfahbod +Date: Thu Jul 18 16:29:50 2013 -0400 + + Followup fix for 3f9e2dced298c3d00f31b2dfc38685bb071a3a22 + + During GSUB, if a ligation happens, subsequence context input matching + matches the new indexing. During GPOS however, the indices never + change. So just go one by one. + + Fixes 'dist' positioning with mmrtext.ttf and the following sequence: + + U+1014,U+1039,U+1011,U+1014,U+1039,U+1011,U+1014,U+1039,U+1011 + + Reported by Jonathan Kew. + + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 2b78d67e9f38f77086fbd9c3fd6f1c8c73927a51 +Author: Behdad Esfahbod +Date: Tue Jul 16 16:06:27 2013 -0400 + + 0.9.19 + + NEWS | 11 +++++++++++ + configure.ac | 2 +- + 2 files changed, 12 insertions(+), 1 deletion(-) + +commit e509d35cf1160f1449bc736b9445cdf61ab81d06 +Author: Behdad Esfahbod +Date: Thu Jul 11 14:56:45 2013 -0400 + + [ft] hb_ft_get_glyph_from_name fails for the name of glyph id 0 + + Based on patch from Jonathan Kew, as reported on the mailing list. + + src/hb-ft.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 29b596ac67806c44441e65f3ece227df0fe2bb63 +Author: Behdad Esfahbod +Date: Mon Jul 8 08:37:15 2013 -0600 + + [uniscribe] Fix buffer allocation + + Email from Jonathan Kew: + + My cygwin build kept aborting on certain test words when run with the + uniscribe backend. Turned out this was caused by a bug in the allocation + of scratch buffers in hb-uniscribe.cc. + + Commit 2a17f9568d9724e045d2c1d660e007f3acd747d9 introduced a new line + + ALLOCATE_ARRAY (SCRIPT_VISATTR, vis_attr, glyphs_size); + + but it failed to account for this in the computation of glyphs_size + (the number of glyphs for which scratch buffer space is available), + with the result that the vis_clusters array ends up overrunning the + end of the scratch buffer and clobbering the beginning of the buffer's + info[]. + + AFAICS, the vis_attr array is not actually used, so the simple fix is + to remove the line that allocates it. (If/when we -do- need to use + vis_attr for something, we'll need to add another term to the earlier + calculation of glyphs_size.) + + With this patch, the uniscribe backend runs reliably again. + + JK + + src/hb-uniscribe.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 9245e98742667dfffe06523e8051beda1bc04811 +Author: Behdad Esfahbod +Date: Wed Jun 26 20:57:58 2013 -0400 + + [Indic] Add Javanese config + + We should add for other scripts too, send me the virama codepoint + and script name... + + src/hb-ot-shape-complex-indic.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 5f85c80a07dd2d18348824866bf4e984ac711a24 +Author: Behdad Esfahbod +Date: Wed Jun 26 20:14:18 2013 -0400 + + [OT] Collect requiredFeature only if features are not provided + + As per Werner's report on the list. + + src/hb-ot-layout.cc | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit 3f9e2dced298c3d00f31b2dfc38685bb071a3a22 +Author: Behdad Esfahbod +Date: Wed Jun 26 19:46:55 2013 -0400 + + Fix contextual lookup recursion indexing + + See email thread "Skipping Control for Attaching Marks using OpenType" + from earlier this month. + + src/hb-ot-layout-gsubgpos-private.hh | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +commit f5da11e0fa5adf8f782883dc5c30d8faaafc9c27 +Merge: 79d1007a 89312b74 +Author: Behdad Esfahbod +Date: Sat Jun 22 08:04:05 2013 -0700 + + Merge pull request #3 from LogosBible/master + + Destroy lookups before blobs. + +commit 89312b7417c0198a0635ca6b7e8ea11f6af2a4f8 +Author: Bradley Grainger +Date: Fri Jun 21 15:02:18 2013 -0700 + + Destroy lookups before blobs. + + 'layout->gsub' may depend on data owned by 'layout->gsub_blob', so it must + be deinitialized before the blob is destroyed. + + src/hb-ot-layout.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 79d1007a501fd63c0ba4d51038c513e6b8b94740 +Author: Behdad Esfahbod +Date: Thu Jun 13 19:01:07 2013 -0400 + + If variation selector is not consumed by cmap, pass it on to GSUB + + This changes the semantics of get_glyph() callback and expect that + callbacks return false if the requested variant is not available, and + then we will call them back with variation_selector=0 and will retain + the glyph for the selector in the glyph stream. + + Apparently most Mongolian fonts implement the Mongolian Variation + Selectors using GSUB, not cmap. + + https://bugs.freedesktop.org/show_bug.cgi?id=65258 + + Note that this doesn't fix the Mongolian shaping yet, because the way + that's implemented is that the, say, 'init' feature ligates the letter + and the variation-selector. However, since currently the variation + selector doesn't have the 'init' mask on, it will not be matched... + + src/hb-ft.cc | 3 +-- + src/hb-ot-shape-normalize.cc | 14 ++++++++++++-- + 2 files changed, 13 insertions(+), 4 deletions(-) + +commit c7a84917208528040aaf9ad0a9a0b26aabeabc9c +Author: Behdad Esfahbod +Date: Thu Jun 6 20:17:32 2013 -0400 + + Skip over multiple variation selectors in a row + + src/hb-ot-shape-normalize.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 7235f33f9e5e031622a00a84f4b2e98f16803579 +Author: Behdad Esfahbod +Date: Mon Jun 10 14:39:51 2013 -0400 + + Fix misc warnings reported by cppcheck + + https://bugs.freedesktop.org/show_bug.cgi?id=65544 + + src/hb-common.cc | 2 +- + src/hb-coretext.cc | 3 --- + src/hb-font-private.hh | 17 +++++++++++------ + src/hb-private.hh | 2 +- + src/hb-shape.cc | 2 +- + test/api/test-font.c | 1 - + util/ansi-print.cc | 1 + + util/hb-ot-shape-closure.cc | 5 +++-- + util/hb-shape.cc | 5 ++++- + util/shape-consumer.hh | 6 ++++-- + util/view-cairo.hh | 6 ++++-- + 11 files changed, 30 insertions(+), 20 deletions(-) + +commit 570bcccd3f41b9aecd51765a401299833a6d8ebd +Author: Behdad Esfahbod +Date: Mon Jun 10 13:56:51 2013 -0400 + + Fix PKG_CHECK_MODULES usage + + Oops. + + Bug 65246 - Fix build without graphite2 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 270cfd7a9c01dfb1b1789929f020943ad63aca99 +Author: Behdad Esfahbod +Date: Thu Jun 6 18:57:15 2013 -0400 + + Fix PKG_CHECK_MODULES usage + + Bug 65246 - Fix build without graphite2 + + If we don't provide ACTION-IF-NOT-FOUND, configure aborts if it can't + find the libraries. We handle that ourselves so we don't want the + macro to abort. + + configure.ac | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 2fd0e02706857bcaf61bf5151657eac96cfa73b9 +Author: Behdad Esfahbod +Date: Thu Jun 6 17:16:01 2013 -0400 + + Minor + + src/Makefile.am | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit b4c5c52944a44ba863a22a53035ff561af7318ca +Author: Chun-wei Fan +Date: Mon Jun 3 17:55:29 2013 +0800 + + util/ansi-print.cc: Use fallback implementation for lround on MSVC + + Unfortuately Visual Studio (still) does not support the C99 function + lround, so provide a fallback implementation for it. + + util/ansi-print.cc | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit a4446b10bfe0a9e7236bf941fa69a96697939e11 +Author: Behdad Esfahbod +Date: Mon Jun 3 18:39:14 2013 -0400 + + Fix build for C89 compilers + + test/api/test-buffer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4ddf937242048c4a044ada4559e26664a0c09b48 +Author: Behdad Esfahbod +Date: Mon Jun 3 18:36:26 2013 -0400 + + Remove unnecessary stdint.h include + + src/hb-ucdn/ucdn.c | 1 - + 1 file changed, 1 deletion(-) + +commit 93a04b8b5e6d8067cb925fdf532aadc24c1d4861 +Author: Chun-wei Fan +Date: Mon Jun 3 17:49:37 2013 +0800 + + hb-uniscribe.cc: Re-enable build under Visual Studio + + -Declare hinstLib at the top of block + -Fix the definitions of the typedefs of ScriptItemizeOpenType, + ScriptShapeOpenType and ScriptPlaceOpenType + + src/hb-uniscribe.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 280e52ae95df0cbee0bb305f5354381bc1d563f4 +Author: Behdad Esfahbod +Date: Thu May 30 18:04:24 2013 -0400 + + Fix ChangeLog regen + + Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit c1824daefa1253507636e4bfdf46374f835f10b3 +Author: Behdad Esfahbod +Date: Wed May 29 15:30:54 2013 -0400 + + Update TODO + + TODO | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 2966d3603259430800cb5880491d28a1c5ea2314 +Author: Behdad Esfahbod +Date: Tue May 28 17:34:37 2013 -0400 + + Fix test build + + test/api/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 6873f6cc42aa1405e71be903bd0f39a7a15320ce +Author: Behdad Esfahbod +Date: Tue May 28 17:33:16 2013 -0400 + + Minor + + TODO | 2 -- + 1 file changed, 2 deletions(-) + +commit 4014aa4e53bddb29d939a168bd733942d3683732 +Author: Behdad Esfahbod +Date: Tue May 28 17:28:59 2013 -0400 + + 0.9.18 + + NEWS | 28 ++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 29 insertions(+), 1 deletion(-) + +commit d70be29831bb99e34fe18744129088f45d5b2023 +Author: Behdad Esfahbod +Date: Tue May 28 17:23:56 2013 -0400 + + Fix dist + + src/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 22ce0961742df0a213f2cc86ca3d5a72453c00b1 +Author: Behdad Esfahbod +Date: Tue May 28 17:18:30 2013 -0400 + + Generate harfbuzz-icu.pc + + Currently it only works with ICU that has .pc files. I'll + wait till someone complains before fixing it for icu-config + systems. + + Makefile.am | 3 --- + configure.ac | 5 ++--- + harfbuzz.pc.in | 11 ----------- + src/Makefile.am | 13 +++++++++++++ + src/harfbuzz-icu.pc.in | 13 +++++++++++++ + src/harfbuzz.pc.in | 11 +++++++++++ + 6 files changed, 39 insertions(+), 17 deletions(-) + +commit d9afa111330771461b6182ada9f4edd68bcfce77 +Author: Behdad Esfahbod +Date: Tue May 28 15:27:40 2013 -0400 + + Build hb-icu into libharfbuzz-icu.so + + src/Makefile.am | 29 +++++++++++++++-------------- + src/hb-unicode.cc | 2 +- + test/api/Makefile.am | 1 + + 3 files changed, 17 insertions(+), 15 deletions(-) + +commit 7d395c2a255a44fd0d65365ea9b525dba70c062c +Author: Behdad Esfahbod +Date: Tue May 28 15:25:06 2013 -0400 + + Minor + + test/api/test-c.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 2a17f9568d9724e045d2c1d660e007f3acd747d9 +Author: Behdad Esfahbod +Date: Tue May 28 13:10:51 2013 -0400 + + Bug 55494 - ScriptItemizeOpenType doesn't exists under Windows XP + + Fallback to older API if OpenType variants are not available. + + configure.ac | 14 +-- + src/hb-uniscribe.cc | 322 +++++++++++++++++++++++++++++++++++++++++++--------- + 2 files changed, 271 insertions(+), 65 deletions(-) + +commit f8087ffbadc83a15d59367ba82976eae675736a7 +Author: Behdad Esfahbod +Date: Mon May 27 19:43:48 2013 -0400 + + Add --with-cairo + + configure.ac | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +commit 82eddfe5d658ef791d6ef6a566401c50601dfb1c +Author: Behdad Esfahbod +Date: Mon May 27 19:33:36 2013 -0400 + + Add --with-freetype + + Defaults to auto. + + configure.ac | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit 5e25eb77a49e7f95b6a6d540b26d60d430f89d4c +Author: Behdad Esfahbod +Date: Mon May 27 19:30:48 2013 -0400 + + Default glib to auto again + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit eb63e786f37468867c81707504128cf8a4016e5b +Author: Behdad Esfahbod +Date: Mon May 27 19:29:09 2013 -0400 + + Add --with-coretext + + Defaults to no. + + configure.ac | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit ab2af17bc6faa8394656e6e82948dc3e9f437626 +Author: Behdad Esfahbod +Date: Mon May 27 19:27:43 2013 -0400 + + Add --with-uniscribe + + Defaults to no. + + configure.ac | 55 +++++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 39 insertions(+), 16 deletions(-) + +commit 58db2c2542717858acbdf480b3f19a8aef4918cd +Author: Behdad Esfahbod +Date: Mon May 27 19:10:33 2013 -0400 + + Disable UCDN if glib is available + + We only want UCDN if we don't have any other Unicode provider. + I'm going to remove ICU from the list of default Unicode providers + as part of moving hb-icu into its own library. As such, the only + providers will be UCDN and glib. + + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +commit ca65326cbd49b48792c4e3125af6c5006364f194 +Author: Behdad Esfahbod +Date: Mon May 27 19:09:50 2013 -0400 + + Minor + + configure.ac | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 7ae14973ecb4614a83769d2bbd01f33d8474ffc0 +Author: Behdad Esfahbod +Date: Mon May 27 19:06:50 2013 -0400 + + Disable icu_le shaper + + Will add a way to enable it later. + + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7e6ebf76236cc5ea69302e68186bdf8166d04a98 +Author: Behdad Esfahbod +Date: Mon May 27 19:05:23 2013 -0400 + + Remove icu-config fallback for icu_le shaper + + Bug 64878 - compile error with ICU but not ICU + + configure.ac | 18 ------------------ + 1 file changed, 18 deletions(-) + +commit 932b7471479c639244051b4dbae678e7d47ae99f +Author: Behdad Esfahbod +Date: Mon May 27 19:04:40 2013 -0400 + + Bug 65053 - Add configure option to enable/disable ICU support + + configure.ac | 46 ++++++++++++++++++++++++++++------------------ + 1 file changed, 28 insertions(+), 18 deletions(-) + +commit cf2c1c7eb81b54a344ed5cf36d5fbd3cd297eed1 +Author: Behdad Esfahbod +Date: Mon May 27 18:54:30 2013 -0400 + + Disable hb-old shaper + + Will add proper way to enable it later. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5a78d23f255a649353044af8e5df315f62907b7f +Author: Behdad Esfahbod +Date: Mon May 27 18:47:58 2013 -0400 + + Bug 65054 - Add configure option to enable/disable Graphite2 + + Add --with-graphite2. Defaults to off. + + configure.ac | 20 +++++++++++++++----- + 1 file changed, 15 insertions(+), 5 deletions(-) + +commit 61e7775fa75c7c1bdc29a6992c8c215897364600 +Author: Behdad Esfahbod +Date: Mon May 27 18:24:56 2013 -0400 + + Remove hb-icu dependency from hb-icu-le shaper + + src/hb-icu-le.cc | 33 +++++++++++++++++++++++++++++---- + 1 file changed, 29 insertions(+), 4 deletions(-) + +commit 7e08f1258da229dfaf7e1c4b5c41e5bb83906cb0 +Author: Behdad Esfahbod +Date: Mon May 27 14:48:34 2013 -0400 + + Don't zero advance of mark-non-mark ligatures + + If there's a mark ligating forward with non-mark, they were + inheriting the GC of the mark and later get advance-zeroed. + Don't do that if there's any non-mark glyph in the ligature. + + Sample test: U+1780,U+17D2,U+179F with Kh-Metal-Chrieng.ttf + + Also: + Bug 58922 - Issue with mark advance zeroing in generic shaper + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++++ + src/hb-ot-layout-private.hh | 6 ++++++ + 2 files changed, 10 insertions(+) + +commit cf059ac69d10d9eb09f0d2a29b1bd989647bd800 +Author: Behdad Esfahbod +Date: Fri May 24 15:28:11 2013 -0400 + + [icu_le] Support non-BMP text + + src/hb-icu-le.cc | 35 ++++++++++++++++++++++++++++------- + 1 file changed, 28 insertions(+), 7 deletions(-) + +commit a447c528e68cabc9ca6e24e2c436f3d605ef9aaa +Author: Behdad Esfahbod +Date: Thu May 23 17:05:39 2013 -0400 + + [icu_le] A bit better scaling + + src/hb-icu-le.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit fb502a22787f4110472771ef771619342e64577a +Merge: b9408d24 9d9e72e9 +Author: Behdad Esfahbod +Date: Thu May 23 15:54:52 2013 -0400 + + Merge commit '9d9e72e94e7914f82ce62a304e7242f79c13edaf' + +commit b9408d24f3029f5287b17779235b1c750ff5158a +Author: Behdad Esfahbod +Date: Thu May 23 15:43:02 2013 -0400 + + [icu_le] Fix scaling + + Seems to work... + + src/hb-icu-le.cc | 2 ++ + src/hb-icu-le/PortableFontInstance.cpp | 23 +++++++++++++++-------- + src/hb-icu-le/PortableFontInstance.h | 9 ++++++++- + 3 files changed, 25 insertions(+), 9 deletions(-) + +commit 601526392dec5d8432f147c91658ba50ed6a4322 +Author: Behdad Esfahbod +Date: Tue May 21 17:22:13 2013 -0400 + + Copy stdint.h boilerplate to ucdn + + src/hb-ucdn/ucdn.h | 24 +++++++++++++++++++++++- + 1 file changed, 23 insertions(+), 1 deletion(-) + +commit f1b02f4f3c0db9fbfa6747188429df828b000010 +Author: Behdad Esfahbod +Date: Mon May 20 09:23:58 2013 -0400 + + 0.9.17 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit d785fa0c45f7f25f5e5f352b933a5f6fa29be5c0 +Author: Behdad Esfahbod +Date: Mon May 20 09:18:52 2013 -0400 + + Minor refactoring + + src/hb-ot-shape.cc | 54 ++++++++++++++++++++++++++++-------------------------- + 1 file changed, 28 insertions(+), 26 deletions(-) + +commit 127daf15e0b2f509ebd29a104236c8b38884efb0 +Author: Behdad Esfahbod +Date: Mon May 20 09:11:35 2013 -0400 + + Arabic mark width-zeroing regression + + Mozilla Bug 873902 - Display Arabic text with diacritics is bad + https://bugzilla.mozilla.org/show_bug.cgi?id=873902 + + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-default.cc | 2 +- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 6 ++++-- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape.cc | 36 ++++++++++++++++++++++++++++-------- + 6 files changed, 36 insertions(+), 14 deletions(-) + +commit fa3d0a0ce60a9fcf2b7f906dec916463b1319eda +Author: Behdad Esfahbod +Date: Tue May 14 15:30:55 2013 -0400 + + Bug 64476 - Typo in hb_set_t.get_min() + + Fixes previous commit's test. + + src/hb-set-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dfbd115e6c1a86a5f1b8d15200672f1e9410b5de +Author: Behdad Esfahbod +Date: Tue May 14 15:30:17 2013 -0400 + + [test] Add test for hb_set_get_min() bug + + Failing now. + + Bug 64476 - Typo in hb_set_t.get_min() + + test/api/test-set.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 9d9e72e94e7914f82ce62a304e7242f79c13edaf +Author: Behdad Esfahbod +Date: Fri May 3 18:10:10 2013 -0400 + + [OTLayout] Use is_inplace() when flipping buffers + + src/hb-ot-layout.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 45f3d980c9503bd94e64f6e3f67f97688347d00c +Author: Behdad Esfahbod +Date: Fri May 3 17:49:44 2013 -0400 + + [OTLayout] Merge / templateize apply_string() + + src/hb-ot-layout-gpos-table.hh | 25 --------------- + src/hb-ot-layout-gsub-table.hh | 48 ---------------------------- + src/hb-ot-layout.cc | 72 ++++++++++++++++++++++++++++++++++++++++-- + 3 files changed, 69 insertions(+), 76 deletions(-) + +commit e015b8f2187d1102b9c34d1a63504e7b05ee20ee +Author: Behdad Esfahbod +Date: Fri May 3 17:34:29 2013 -0400 + + [OTLayout] Minor + + src/hb-ot-layout-gpos-table.hh | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 780cd930a974165d76dbf7a87701d11b7f15db06 +Author: Behdad Esfahbod +Date: Fri May 3 17:33:16 2013 -0400 + + [OTLayout] Minor + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout.cc | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 2e0c44f4bedd3e24c731c0e9e23358e9a4891a35 +Author: Behdad Esfahbod +Date: Wed Apr 24 16:42:05 2013 -0400 + + [OTLayout] Add is_inplace() method to GSUB + + src/hb-ot-layout-gpos-table.hh | 8 +- + src/hb-ot-layout-gsub-table.hh | 58 ++++++++++++- + src/hb-ot-layout-gsubgpos-private.hh | 158 +++++++++++++++++++++++++++++++++++ + 3 files changed, 222 insertions(+), 2 deletions(-) + +commit bac1dd6a0ff4d4fae4254506d38ae662b7e9dda7 +Author: Behdad Esfahbod +Date: Thu May 2 18:52:24 2013 -0400 + + [OTLayout] Refactor a bit more + + src/hb-ot-layout-gsubgpos-private.hh | 10 +-- + src/hb-ot-layout-private.hh | 26 ++++---- + src/hb-ot-layout.cc | 100 ++++++++++++++--------------- + src/hb-ot-map-private.hh | 7 +- + src/hb-ot-shape-complex-arabic-fallback.hh | 7 +- + src/hb-ot-shape-fallback.cc | 3 +- + 6 files changed, 78 insertions(+), 75 deletions(-) + +commit d2c96819de9a7428b65ef0adf794416224221f36 +Author: Behdad Esfahbod +Date: Thu May 2 18:18:24 2013 -0400 + + Move code around + + src/hb-ot-layout.cc | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-map.cc | 43 ------------------------------------------- + 2 files changed, 52 insertions(+), 43 deletions(-) + +commit 45fd9424c723f115ca98995b8f8a25185a6fc71d +Author: Behdad Esfahbod +Date: Thu May 2 18:06:51 2013 -0400 + + [OTLayout] Add hb_ot_layout_lookup_accelerator_t + + src/hb-ot-layout-private.hh | 21 +++++++++++++++++-- + src/hb-ot-layout.cc | 33 +++++++++++++++--------------- + src/hb-ot-shape-complex-arabic-fallback.hh | 10 +++++---- + 3 files changed, 41 insertions(+), 23 deletions(-) + +commit 76ea563673d24ae1673a5aa3a21da6014479d433 +Author: Behdad Esfahbod +Date: Sat May 4 16:01:20 2013 -0400 + + [OTLayout] Add note about collect_glyphs() and recursive lookups + + src/hb-ot-layout-gsubgpos-private.hh | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit a8bf0e91f18341e1e20f4e3341fc7dcdd0c990e1 +Author: Behdad Esfahbod +Date: Fri May 3 14:45:04 2013 -0400 + + Add U+061C ARABIC LETTER MARK to Default_Ignorable + + src/hb-unicode-private.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 5d59f999204aedfc433ab4989664d875f96b0364 +Author: Behdad Esfahbod +Date: Thu May 2 14:44:45 2013 -0400 + + [OTLayout] Make MultipleSubst in-place for sequences of len=1 + + src/hb-ot-layout-gsub-table.hh | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +commit 54f84a6b8571ac7aaaa66f3eff562d23d69d7552 +Author: Behdad Esfahbod +Date: Thu May 2 15:27:53 2013 -0400 + + [OTLayout] Whitespace + + src/hb-ot-layout-gsub-table.hh | 56 +++++++++++++++++++++--------------------- + 1 file changed, 28 insertions(+), 28 deletions(-) + +commit 3276c354daaff3acabecff11f8e4b5c54d53fc25 +Author: Behdad Esfahbod +Date: Thu May 2 15:16:59 2013 -0400 + + [OTLayout] Minor refactoring + + src/hb-ot-map-private.hh | 4 ++++ + src/hb-ot-map.cc | 46 +++++++++++++++++++++++++--------------------- + 2 files changed, 29 insertions(+), 21 deletions(-) + +commit ea86efa486a5076e9bf844239bccf86d67577f88 +Author: Behdad Esfahbod +Date: Thu May 2 14:41:39 2013 -0400 + + Minor + + src/hb-ot-map-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 8b63efb6f80b2e9b2de5ec6ab24d6e15826565cb +Author: Behdad Esfahbod +Date: Thu May 2 14:29:32 2013 -0400 + + Minor + + src/hb-buffer-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2265be0a620bc76ab65f12fedde67791beb51314 +Author: Behdad Esfahbod +Date: Thu May 2 14:25:09 2013 -0400 + + Minor + + src/hb-ot-map-private.hh | 17 ++++++++++------- + src/hb-ot-map.cc | 2 ++ + src/hb-ot-shape-private.hh | 3 +-- + 3 files changed, 13 insertions(+), 9 deletions(-) + +commit e6f19af08717a6a63ad0b5bf4bf368778edc63f0 +Author: Behdad Esfahbod +Date: Thu May 2 13:59:46 2013 -0400 + + Minor + + src/hb-set-private.hh | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +commit 6c15ddfe2b45383824b64058ae69939d002183a6 +Author: Behdad Esfahbod +Date: Tue Apr 30 11:34:00 2013 -0400 + + Renamed DEBUG to something else + + Some infrastructures use DEBUG as a generic symbol. + + src/hb-buffer.cc | 6 +++--- + src/hb-private.hh | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 00b93f6610f36d8d14ca65fb99864be6d5bdb1ea +Author: Behdad Esfahbod +Date: Mon Apr 29 13:48:49 2013 -0400 + + Fix icu linking by requesting the library searchpath from icu-config + + This is not ideal as we don't like -L/usr/lib in our linker line. + But this is only relevant to environments that don't have pkgconfig + files for ICU... + + https://github.com/behdad/harfbuzz/pull/2 + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 03adf38b22a37216dffac50d075ea9c881f1a22d +Author: Behdad Esfahbod +Date: Mon Apr 29 13:40:52 2013 -0400 + + Make both old autoconf and new automake happy + + Sigh.. + + Bug 64039 - undefined macro AM_PROG_AR + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ed79dff517bacfc87279079d5d42d079c21a0373 +Author: Behdad Esfahbod +Date: Sun Apr 21 15:39:25 2013 -0400 + + Minor + + src/hb-ot-layout-gpos-table.hh | 5 ----- + 1 file changed, 5 deletions(-) + +commit 893f57b32f01da3411b5596d59170bc340e9fa39 +Author: Behdad Esfahbod +Date: Sun Apr 21 15:21:49 2013 -0400 + + Minor renaming + + src/hb-ot-map-private.hh | 10 +++++----- + src/hb-ot-map.cc | 22 +++++++++++----------- + 2 files changed, 16 insertions(+), 16 deletions(-) + +commit 8ac3c9c0b6b8e76bce282825b9bb706c0c78c2a6 +Author: Behdad Esfahbod +Date: Sun Apr 21 15:19:38 2013 -0400 + + Rename "pause" to "stage" + + The compile() function is starting to become illegible... + + src/hb-ot-map-private.hh | 24 ++++++++++++------------ + src/hb-ot-map.cc | 38 +++++++++++++++++++------------------- + 2 files changed, 31 insertions(+), 31 deletions(-) + +commit dd0641a432691f9b6186b081c38053858c8bc5c1 +Author: Behdad Esfahbod +Date: Sun Apr 21 15:13:57 2013 -0400 + + Minor + + src/hb-ot-map.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 06a44e859328f5f1e2f6034e711b474116d22e22 +Author: Behdad Esfahbod +Date: Sun Apr 21 15:13:08 2013 -0400 + + Remove unneeded code + + We always push a pause at the end such that each lookup falls in exactly + one pause_map_t. Now, only if I can find a better name for that... + + src/hb-ot-map-private.hh | 2 +- + src/hb-ot-map.cc | 12 +----------- + 2 files changed, 2 insertions(+), 12 deletions(-) + +commit a408d2375aa2ad96b58e56aef18e5000daf2516b +Author: Behdad Esfahbod +Date: Fri Apr 19 16:32:06 2013 -0400 + + 0.9.16 + + NEWS | 13 ++++++++++++- + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 2 deletions(-) + +commit 8659c636087e433f56da458351e8b4d85fdb347c +Author: Behdad Esfahbod +Date: Fri Apr 19 14:33:17 2013 -0400 + + Hand-code bsearch in the hot inner loop. + + Saves another 3 / 4 percent with Amiri. + + src/hb-open-type-private.hh | 29 +++++++++++++++-------------- + 1 file changed, 15 insertions(+), 14 deletions(-) + +commit 797d76d07f80d796a825d850772087104e5a2575 +Author: Behdad Esfahbod +Date: Thu Apr 18 19:04:12 2013 -0400 + + Minor + + src/hb-ot-layout-common-private.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit e4046080c5d785c8dbf9ec9e3478ab9acc83e479 +Author: Behdad Esfahbod +Date: Wed Apr 17 23:49:54 2013 -0400 + + [util] Unbreak --show-text / --show-unicode + + util/shape-consumer.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0dc3a4e0349d28f387a3b4c60a2f51962742738e +Author: Behdad Esfahbod +Date: Wed Apr 17 23:04:03 2013 -0400 + + Obssesive optimization + + Not measurable by any means, but conceptually this is faster since + the mask matches more often than the digest. + + src/hb-ot-layout-gpos-table.hh | 4 ++-- + src/hb-ot-layout-gsub-table.hh | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit f9a611026785a80baa4cbff31ad0847beb70ca9a +Author: Behdad Esfahbod +Date: Wed Apr 17 19:01:49 2013 -0400 + + Remove HB_DEBUG_SET_DIGESTS + + Wasn't correct with the new combiner. I should add it back somehow, + but for now the digests seem to be working very well... + + src/hb-set-private.hh | 16 +--------------- + src/hb-set.cc | 14 -------------- + 2 files changed, 1 insertion(+), 29 deletions(-) + +commit f7466ee76f2bd3812209426e2c39fe517227406d +Author: Behdad Esfahbod +Date: Wed Apr 17 18:20:44 2013 -0400 + + Remove hb_set_digest_common_bits_t + + Was unused. + + src/hb-set-private.hh | 38 -------------------------------------- + 1 file changed, 38 deletions(-) + +commit 0d5798a137b52d9be7ef88c79e59f9bf01d54f3b +Author: Behdad Esfahbod +Date: Wed Apr 17 18:19:21 2013 -0400 + + Improve hb_set_digest_t + + Make Amiri rendering faster a whopping 45% again! Speends up pretty + much anything I tested. + + src/hb-set-private.hh | 28 +++++++++++++++++++++++----- + 1 file changed, 23 insertions(+), 5 deletions(-) + +commit c7851efcd3a1e5317ab4ea57535cb755bace0848 +Author: Behdad Esfahbod +Date: Wed Apr 17 17:45:39 2013 -0400 + + Templatize hb_set_digest_lowest_bits_t filter + + src/hb-set-private.hh | 21 +++++++++++++++++---- + 1 file changed, 17 insertions(+), 4 deletions(-) + +commit 0edd0fd255790471118fae1fd7a1309a2b77cf62 +Author: Behdad Esfahbod +Date: Wed Apr 17 17:26:56 2013 -0400 + + Add comment + + src/hb-set-private.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit b40f2c0372acbc51b13be5cda7dd013e74e3e11a +Author: Behdad Esfahbod +Date: Tue Apr 16 23:21:38 2013 -0400 + + Add hb_set_digest_combiner_t + + src/hb-set-private.hh | 33 ++++++++++++++++++++------------- + 1 file changed, 20 insertions(+), 13 deletions(-) + +commit 02e5e583688999c4dc04f11b3924da65f99af7e3 +Author: Behdad Esfahbod +Date: Tue Apr 16 23:13:10 2013 -0400 + + Speed up Speed up hb_set_digest_common_bits_t calcs + + Correctly this time. + + src/hb-set-private.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 893991fc9d2d3a57c4c148f3a9c3b98263cf3aed +Author: Behdad Esfahbod +Date: Tue Apr 16 21:50:33 2013 -0400 + + Initialize set digests + + We were not initializing the digests properly and as a result they were + being initialized to zero, making digest1 to never do any useful work. + + Speeds up Amiri shaping significantly. + + src/hb-ot-layout.cc | 6 ++++++ + src/hb-ot-shape-complex-arabic-fallback.hh | 4 +++- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 4d2813d3e980c8e6150caafa604a78cc44bf62a2 +Author: Behdad Esfahbod +Date: Tue Apr 16 21:57:21 2013 -0400 + + Print set-digest hit ratio with HB_DEBUG_SET_DIGESTS + + src/hb-set-private.hh | 13 +++++++++++++ + src/hb-set.cc | 13 +++++++++++++ + 2 files changed, 26 insertions(+) + +commit 1357c2dd120d005ceecfa83ed328d05dc634d7bc +Author: Behdad Esfahbod +Date: Tue Apr 16 21:47:40 2013 -0400 + + Revert "Speed up hb_set_digest_common_bits_t calcs" + + This reverts commit 3d1b66a35e1ab3be19335705f310b278d76d66d2. + + The calculations were buggy. It's not worth optimizing right now. + + src/hb-set-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 2b712bba3f7c459653737dfa2f7d26f17f3b9f64 +Author: Behdad Esfahbod +Date: Tue Apr 16 16:11:09 2013 -0400 + + Fix typo in unused macro + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 50067e280f381918b8e90b26df9e7bf20f98f0bd +Author: Behdad Esfahbod +Date: Thu Apr 11 16:31:01 2013 -0400 + + [util] Add --num-iterations + + Useful for profiling shapers. + + util/options.cc | 1 + + util/options.hh | 2 ++ + util/shape-consumer.hh | 15 +++++++++------ + 3 files changed, 12 insertions(+), 6 deletions(-) + +commit 08677c250767bfc2c0dd1fc934dea92984741291 +Author: Behdad Esfahbod +Date: Thu Apr 11 14:45:58 2013 -0400 + + [old] Speed up Unicode properties access in hb-old shaper + + Just to be sure it's not punishing the old shaper performance + numbers. Doesn't seem to have a measurable effect. + + src/hb-old/harfbuzz-arabic.c | 44 +++++++++++++++++++++--------------------- + src/hb-old/harfbuzz-external.h | 18 ++++++++--------- + src/hb-old/harfbuzz-greek.c | 2 +- + src/hb-old/harfbuzz-hebrew.c | 2 +- + src/hb-old/harfbuzz-indic.cpp | 10 +++++----- + src/hb-old/harfbuzz-shaper.cpp | 6 ++++-- + src/hb-old/harfbuzz-shaper.h | 1 + + 7 files changed, 43 insertions(+), 40 deletions(-) + +commit 36a661c0a03d958b95c9ea64a435b55bcd99c3d6 +Author: Behdad Esfahbod +Date: Thu Apr 11 13:38:37 2013 -0400 + + [git.mk] Update + + git.mk | 33 ++++++++++++++++++++------------- + 1 file changed, 20 insertions(+), 13 deletions(-) + +commit ef9e02eddfc9a37d50723e96839635d79191d849 +Author: Behdad Esfahbod +Date: Tue Apr 9 14:06:54 2013 -0400 + + Minor + + src/test.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 22e47456154ca0b8173268486e56ef3a0e1e7150 +Author: Behdad Esfahbod +Date: Fri Apr 5 18:02:43 2013 -0400 + + 0.9.15 + + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 4d4fc920496c95621d5bb4800282ea8c028cdde3 +Author: Behdad Esfahbod +Date: Fri Apr 5 17:58:25 2013 -0400 + + [git.mk] Ignore ar-lib + + git.mk | 1 + + 1 file changed, 1 insertion(+) + +commit 587e5753e088b4d0b82c74ddbde790a8369a7517 +Author: Behdad Esfahbod +Date: Fri Apr 5 12:38:58 2013 -0400 + + Add note re Hangul shaping + + src/hb-ot-shape-complex-private.hh | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit 269de14dda7a86a20917fa9ea6a5864929c41364 +Author: Behdad Esfahbod +Date: Thu Apr 4 23:06:54 2013 -0400 + + Don't compose Hangul jamo + + See thread "an issue regarding discrepancy between Korean and Unicode + standards" on the mailing list for the rationale. In short: Uniscribe + doesn't, so fonts are designed to work without it. + + src/hb-ot-shape-complex-default.cc | 6 ------ + src/hb-ot-shape-normalize-private.hh | 1 - + src/hb-ot-shape-normalize.cc | 11 +++++------ + 3 files changed, 5 insertions(+), 13 deletions(-) + +commit 1f970609850bb4999b94e1e11b764ab4279cbd38 +Author: Behdad Esfahbod +Date: Thu Apr 4 15:02:03 2013 -0400 + + Put back MemoryBarrier fallback implementation on MINGW32 + + This almost reverts 2761e8a632c14353f286708898be8df6ebad7407, + but only if under MINGW32, so it doesn't affect MSVC. + + src/hb-atomic-private.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit f368ba4a9edec4e297616698097546e8e6c89e53 +Author: Behdad Esfahbod +Date: Thu Apr 4 14:25:36 2013 -0400 + + [Arabic] Zero marks by GDEF, not Unicode category + + Testing shows that this is closer to what Uniscribe does. + + Reported by Khaled Hosny: + + """ + commit 568000274c8edb5f41bc4f876ce21fcc8bdaeed8 + ... + This commit is causing a regression with Amiri, the string “هَٰذ” with + Uniscribe and HarfBuzz before this commit, gives: + + [uni0630.fina=3+965|uni0670.medi=0+600|uni064E=0@-256,0+0|uni0647.init=0+926] + + But now it gives: + + [uni0630.fina=3+965|uni0670.medi=0+0|uni064E=0@-256,0+0|uni0647.init=0+926] + + i.e. uni0670.medi is zeroed though it has a base glyph GDEF class. + """ + + The test case is U+0647,U+064E,U+0670,U+0630 with Amiri. + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3b80674c50b8c3133848a4034f7106b2b9bfe224 +Author: Behdad Esfahbod +Date: Thu Apr 4 12:06:46 2013 -0400 + + Bug 63107 - FTBFS on ppc64: symbols marked with 'D' on powerpc64 instead + + src/check-symbols.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7148dc1a978610af25b4f490691a62d709c8c463 +Author: Behdad Esfahbod +Date: Tue Apr 2 14:08:53 2013 -0400 + + [graphite2] Don't crash if language is not set + + https://bugs.webkit.org/show_bug.cgi?id=113796 + + src/hb-graphite2.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a88a62f70f87563725d47b9b6824565e5d6b78ab +Author: Behdad Esfahbod +Date: Thu Mar 21 21:02:16 2013 -0400 + + Minor + + src/hb-ot-shape-normalize.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 0a2b2a505b647f6b4802750c87cd9c5f0baaadef +Author: Behdad Esfahbod +Date: Thu Mar 21 16:26:39 2013 -0400 + + Remove gthread leftovers + + We don't use gthread anymore, remove leftovers. + + configure.ac | 6 ------ + test/api/Makefile.am | 4 ++-- + test/api/hb-test.h | 3 --- + 3 files changed, 2 insertions(+), 11 deletions(-) + +commit b93de1ea085bfc0661ce3ad0e21fb5eba722c951 +Author: Behdad Esfahbod +Date: Thu Mar 21 16:25:20 2013 -0400 + + Minor + + configure.ac | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit f872a17462a75a3493623747bf3a3fbe54556c7b +Author: Behdad Esfahbod +Date: Thu Mar 21 13:38:06 2013 -0400 + + 0.9.14 + + NEWS | 14 ++++++++++++++ + configure.ac | 2 +- + 2 files changed, 15 insertions(+), 1 deletion(-) + +commit cc50bf5b13bfe88137fa7a42782872c40fb9aefb +Author: Behdad Esfahbod +Date: Tue Mar 19 06:59:40 2013 -0400 + + Remove Hangul filler characters from Default_Ignorable chars + + See discussion on mailing list. + + src/hb-unicode-private.hh | 10 +++++++--- + .../texts/in-tree/shaper-default/script-hangul/misc/misc.txt | 1 + + 2 files changed, 8 insertions(+), 3 deletions(-) + +commit a8cf7b43fa795150ae3d42d64424bb6e0373d0b2 +Author: Behdad Esfahbod +Date: Tue Mar 19 05:53:26 2013 -0400 + + [Indic] Futher adjust ZWJ handling in Indic-like shapers + + After the Ngapi hackfest work, we were assuming that fonts + won't use presentation features to choose specific forms + (eg. conjuncts). As such, we were using auto-joiner behavior + for such features. It proved to be troublesome as many fonts + used presentation forms ('pres') for example to form conjuncts, + which need to be disabled when a ZWJ is inserted. + + Two examples: + + U+0D2F,U+200D,U+0D4D,U+0D2F with kartika.ttf + U+0995,U+09CD,U+200D,U+09B7 with vrinda.ttf + + What we do now is to never do magic to ZWJ during GSUB's main input + match for Indic-style shapers. Note that backtrack/lookahead are still + matched liberally, as is GPOS. This seems to be an acceptable + compromise. + + As to the bug that initially started this work, that one needs to + be fixed differently: + + Bug 58714 - Kannada u+0cb0 u+200d u+0ccd u+0c95 u+0cbe does not + provide same results as Windows8 + https://bugs.freedesktop.org/show_bug.cgi?id=58714 + + New numbers: + + BENGALI: 353689 out of 354188 tests passed. 499 failed (0.140886%) + DEVANAGARI: 707305 out of 707394 tests passed. 89 failed (0.0125814%) + GUJARATI: 366349 out of 366457 tests passed. 108 failed (0.0294714%) + GURMUKHI: 60706 out of 60747 tests passed. 41 failed (0.067493%) + KANNADA: 951030 out of 951913 tests passed. 883 failed (0.0927606%) + KHMER: 299070 out of 299124 tests passed. 54 failed (0.0180527%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1048102 out of 1048334 tests passed. 232 failed (0.0221304%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271666 out of 271847 tests passed. 181 failed (0.0665816%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-layout-gsubgpos-private.hh | 30 ++++++++-------------- + src/hb-ot-layout-private.hh | 4 +-- + src/hb-ot-layout.cc | 8 +++--- + src/hb-ot-map-private.hh | 8 +++--- + src/hb-ot-map.cc | 18 ++++++------- + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 30 +++++++++++----------- + src/hb-ot-shape-complex-myanmar.cc | 4 +-- + src/hb-ot-shape-complex-sea.cc | 4 +-- + src/hb-ot-shape-fallback.cc | 2 +- + .../indic/script-bengali/misc/misc.txt | 1 + + .../indic/script-malayalam/misc/misc.txt | 1 + + 12 files changed, 53 insertions(+), 59 deletions(-) + +commit 8226fb56f131362db877dc4be6857c684b8fd022 +Author: Behdad Esfahbod +Date: Tue Mar 19 05:22:27 2013 -0400 + + Allow disabling ICU by using a fake icu-config script + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a1f3e8ccbfad0d1148b905ae008ba63a26090cb9 +Author: Behdad Esfahbod +Date: Mon Mar 11 20:18:49 2013 -0400 + + [travis] Install libicu + + .travis.yml | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 14cfab52daa8d22b843110f32ca09af5bbc855a6 +Author: Behdad Esfahbod +Date: Mon Mar 11 19:53:44 2013 -0400 + + Add build system fallback to icu-config + + Ubuntu doesn't (or didn't until recently?) ship icu pkg-config + files. That's quite unfortunate. Work around it. + + Bug 57608 - ICU Detection fallback for non-pkgconfig systems + + configure.ac | 37 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 37 insertions(+) + +commit 190e19e6842875c7a487c66235300ee6b42fb5da +Author: Behdad Esfahbod +Date: Sat Mar 9 20:30:22 2013 -0500 + + [ft] Remove TODO items that I'm not going to fix + + src/hb-ft.cc | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +commit 392ee97431b368ee74e1b521fd539b69d2efadfb +Author: Behdad Esfahbod +Date: Sat Mar 9 20:27:55 2013 -0500 + + [ft] Remove TODO item re FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH + + That flag is redundant, deprecated, and ignored since April 2011. + From FreeType git log: + + commit 8c82ec5b17d0cfc9b0876a2d848acc207a62a25a + Author: Behdad Esfahbod + Date: Thu Apr 21 08:21:37 2011 +0200 + + Always ignore global advance. + + This makes FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH redundant, + deprecated, and ignored. The new behavior is what every major user + of FreeType has been requesting. Global advance is broken in many + CJK fonts. Just ignoring it by default makes most sense. + + * src/truetype/ttdriver.c (tt_get_advances), + src/truetype/ttgload.c (TT_Get_HMetrics, TT_Get_VMetrics, + tt_get_metrics, compute_glyph_metrics, TT_Load_Glyph), + src/truetype/ttgload.h: Implement it. + + * docs/CHANGES: Updated. + + src/hb-ft.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit c5d91f39802078fc6f6de71940739ec4d04eca07 +Author: Behdad Esfahbod +Date: Sat Mar 9 04:34:21 2013 -0500 + + Add hb_auto_array_t + + src/hb-private.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit ee5464d17fa4c59f5adaaa13dde70dd5264dbc64 +Author: Behdad Esfahbod +Date: Sat Mar 9 01:59:30 2013 -0500 + + [OTLayout] Move code around + + src/hb-ot-layout-gpos-table.hh | 33 ++++++------ + src/hb-ot-layout-gsub-table.hh | 115 +++++++++++++++++++++-------------------- + 2 files changed, 75 insertions(+), 73 deletions(-) + +commit 9c5a9ee967120c8a968a1160c420e03620d46c24 +Author: Behdad Esfahbod +Date: Sat Mar 9 01:55:04 2013 -0500 + + [OTLayout] Rename process() to dispatch() + + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 80 ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-table.hh | 78 +++++++++++++++++------------------ + src/hb-ot-layout-gsubgpos-private.hh | 36 ++++++++-------- + 4 files changed, 98 insertions(+), 98 deletions(-) + +commit 2761e8a632c14353f286708898be8df6ebad7407 +Author: Behdad Esfahbod +Date: Thu Mar 7 20:51:30 2013 -0500 + + [win32] Remove MemoryBarrier() fallback implementation + + I added these because the older mingw32 toolchain didn't have + MemoryBarrier(). The newer mingw-w64 toolchain however has. + As reported by John Emmas this was causing build failure with + MSVC (on glib) because of inline issues. But that reminded me + that we may be taking this path even if the system implements + MemoryBarrier as a function, which is a waste. So, just remove + it. + + src/hb-atomic-private.hh | 14 +------------- + 1 file changed, 1 insertion(+), 13 deletions(-) + +commit ea11abfc5de8bc5cf651b37c9570593eed6a8f9b +Author: Behdad Esfahbod +Date: Wed Mar 6 20:21:11 2013 -0500 + + [build] Port to newer automake recommended syntax + + test/api/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c39def9bc71559d59325a2c3282c1cec4286b2ae +Author: Behdad Esfahbod +Date: Wed Mar 6 20:20:45 2013 -0500 + + Move valgrind suppressions to the correct directory + + test/{ => api}/.valgrind-suppressions | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit a8ac1d33c731f6200ee472ab6c37a80b72770564 +Author: Behdad Esfahbod +Date: Wed Mar 6 20:05:34 2013 -0500 + + [build] Add AM_PROG_AR + + Newer automake / libtools warns otherwise. + + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +commit 5594c2d112c295147ee69215a2ce9dfd99984aa0 +Author: Behdad Esfahbod +Date: Wed Mar 6 19:37:31 2013 -0500 + + [FT] Just return if glyph name not found + + The fallback happens in higher level already. No need to do here. + + src/hb-ft.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit fb7c182bf92142540bff1ad7fb82de0d115fb2b5 +Author: Behdad Esfahbod +Date: Wed Mar 6 00:53:24 2013 -0500 + + [Indic] Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8144936d072f94104242edf9e7aaa31d315b4094 +Author: Behdad Esfahbod +Date: Tue Mar 5 20:08:59 2013 -0500 + + [Indic] Work around fonts with broken new-spec tables + + See comments, and this thread: + + http://lists.freedesktop.org/archives/harfbuzz/2013-March/002990.html + + Originally reported here: + + https://code.google.com/p/chromium/issues/detail?id=96143 + + Doesn't change test suite numbers. + + src/hb-ot-shape-complex-indic.cc | 42 +++++++++++++++++++++++++++------------- + 1 file changed, 29 insertions(+), 13 deletions(-) + +commit dfb799f57572e8123035a42a30f93c7fc4d37692 +Author: Behdad Esfahbod +Date: Tue Mar 5 17:23:33 2013 -0500 + + [travis] Oops. Run make check, not make test! + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8bdce1cac1be9e79344c1f9a9811d98ed2e5c5fd +Author: Behdad Esfahbod +Date: Tue Mar 5 02:35:31 2013 -0500 + + Run autogen.sh, not configure, in travis-ci + + .travis.yml | 1 + + 1 file changed, 1 insertion(+) + +commit 5f705b437cb116275a8c20366e694d740bce715c +Author: Behdad Esfahbod +Date: Tue Mar 5 01:37:44 2013 -0500 + + Add .travis.yml for continuous building with travis-ci.org + + Notifications sent to IRC channel and mailing list. + + .travis.yml | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit cd54d505d1a2467a67e5ff96fe0eb101b953b265 +Author: Behdad Esfahbod +Date: Mon Mar 4 21:29:38 2013 -0500 + + Fix distcheck + + src/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit 22c625a490bbaac52ead2cd29ee49b170e6e9845 +Author: Behdad Esfahbod +Date: Mon Mar 4 20:56:15 2013 -0500 + + [git.mk] Update to commit efc928222179576270c5910416d8055dd7a97896 + + Move reusable list of files into variable definitions modules can + reuse + + Makefile.am | 22 ++++------------------ + git.mk | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 60 insertions(+), 21 deletions(-) + +commit 66f7b3509a121b8f3289ad4c4aed2b5b10a6de2e +Author: Behdad Esfahbod +Date: Mon Mar 4 18:52:12 2013 -0500 + + Add libtool m4 macros to MAINTAINERCLEANFILES + + Makefile.am | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 41732f1fe3ce856d8bb95850635034537b6ba047 +Author: Behdad Esfahbod +Date: Wed Feb 27 20:40:54 2013 -0500 + + [Indic] Help compiler put indic_features table in .rodata + + The overridden "or" operator was preventing the flag expression from + being const, and putting the table in .data instead or .rodata. + + src/hb-ot-map-private.hh | 2 ++ + src/hb-ot-shape-complex-indic.cc | 24 ++++++++++++------------ + 2 files changed, 14 insertions(+), 12 deletions(-) + +commit 778d7f844cb330289830c95431269db06ba1c969 +Author: Behdad Esfahbod +Date: Wed Feb 27 18:47:26 2013 -0500 + + [buffer] Better parse glyph names + + src/hb-buffer-deserialize-json.rl | 9 ++++++--- + src/hb-buffer-deserialize-text.rl | 5 ++++- + 2 files changed, 10 insertions(+), 4 deletions(-) + +commit 20b817ac21147e0a8edbf23ef071c2f4ce6c2b95 +Author: Behdad Esfahbod +Date: Wed Feb 27 18:39:37 2013 -0500 + + [buffer] Implement buffer deserialization for format=json + + Using a ragel machine. + + src/Makefile.am | 2 + + src/hb-buffer-deserialize-json.rl | 129 ++++++++++++++++++++++++++++++++++++++ + src/hb-buffer-deserialize-text.rl | 52 +-------------- + src/hb-buffer-serialize.cc | 45 +++++++++++-- + src/hb-private.hh | 6 +- + src/hb-shape.cc | 2 - + src/test-buffer-serialize.cc | 4 +- + 7 files changed, 179 insertions(+), 61 deletions(-) + +commit 847794e929831750e97525137ab5e285ccd1064e +Author: Behdad Esfahbod +Date: Wed Feb 27 17:59:28 2013 -0500 + + [buffer] Implement buffer deserialization for format=text + + Using a ragel machine. + + src/Makefile.am | 2 + + src/hb-buffer-deserialize-text.rl | 169 ++++++++++++++++++++++++++++++++++++++ + src/hb-buffer-private.hh | 3 +- + src/hb-buffer-serialize.cc | 36 +++----- + src/hb-buffer.cc | 13 ++- + src/hb-buffer.h | 2 +- + src/hb-private.hh | 5 +- + src/hb-shape.cc | 9 +- + src/test-buffer-serialize.cc | 16 +++- + 9 files changed, 221 insertions(+), 34 deletions(-) + +commit 4ee803b42a3baae4b0f295a07cb7ad591a538e4c +Author: Behdad Esfahbod +Date: Wed Feb 27 16:09:55 2013 -0500 + + [buffer] Fix serializing of buffer with invalid direction + + src/hb-buffer-serialize.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e54dd26300f50eb19907a9d39269a363279b3e07 +Author: Behdad Esfahbod +Date: Wed Feb 27 13:01:02 2013 -0500 + + [buffer] Start implementing buffer deserialization + + src/Makefile.am | 12 ++++- + src/hb-buffer-serialize.cc | 64 ++++++++++++++++++++++-- + src/hb-buffer.h | 2 +- + src/test-buffer-serialize.cc | 114 +++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 187 insertions(+), 5 deletions(-) + +commit bcc8f32b4c46cd73f591924c64a6f63df6eaf9e7 +Author: Behdad Esfahbod +Date: Wed Feb 27 12:02:42 2013 -0500 + + [buffer] Minor + + src/hb-buffer-serialize.cc | 10 +++++++--- + src/hb-buffer.h | 4 ++-- + 2 files changed, 9 insertions(+), 5 deletions(-) + +commit d3e14aafff60e1314d0ef66e42cdde6bf949bb66 +Author: Behdad Esfahbod +Date: Wed Feb 27 11:06:36 2013 -0500 + + [buffer] Move buffer serialization code to a new file + + Android.mk | 1 + + src/Makefile.am | 1 + + src/hb-buffer-serialize.cc | 251 +++++++++++++++++++++++++++++++++++++++++++++ + src/hb-buffer.cc | 228 ---------------------------------------- + 4 files changed, 253 insertions(+), 228 deletions(-) + +commit 8da51112696ec8641d7dd9184b7ab1dd48458813 +Author: Behdad Esfahbod +Date: Wed Feb 27 17:48:31 2013 -0500 + + Minor + + src/hb-shape.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 94789fd6012125acc8426dd88df97f03b0948ea5 +Author: Behdad Esfahbod +Date: Tue Feb 26 21:22:37 2013 -0500 + + [Indic] Sort pre-base reordering consonants with post-forms + + Before, we were marking them as below-form for initial reordering. + However, there is a rule that says "post consonants should follow + below consonsnts" for base determination purposes. Malayalam has + port-form YA/VA, and RA is pre-base. As such, for a sequence like + YA,Virama,YA,Virama,RA, the correct base is at index 0. But + because the code was seeing RA as a below-base, it was stopping at + the second YA as base, instead of jumping it as a post-base. + + By treating prebase-reordering consonants like post-forms, this + is fixed. + + MALAYALAM went down from 351 to 265. Other numbers didn't change: + + BENGALI: 353686 out of 354188 tests passed. 502 failed (0.141733%) + DEVANAGARI: 707305 out of 707394 tests passed. 89 failed (0.0125814%) + GUJARATI: 366262 out of 366457 tests passed. 195 failed (0.0532122%) + GURMUKHI: 60706 out of 60747 tests passed. 41 failed (0.067493%) + KANNADA: 950680 out of 951913 tests passed. 1233 failed (0.129529%) + KHMER: 299074 out of 299124 tests passed. 50 failed (0.0167155%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1048069 out of 1048334 tests passed. 265 failed (0.0252782%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271539 out of 271847 tests passed. 308 failed (0.113299%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6d69a2cec158061ef097c488d08813c9503824b8 +Author: Behdad Esfahbod +Date: Tue Feb 26 19:35:50 2013 -0500 + + [tests] Add Malayalam tests frim cibu + + .../indic/script-malayalam/misc/MANIFEST | 1 + + .../indic/script-malayalam/misc/cibu.txt | 188 +++++++++++++++++++++ + 2 files changed, 189 insertions(+) + +commit 1edc6b97b67363d55cfb5914c991ae54d42a6440 +Author: Behdad Esfahbod +Date: Tue Feb 26 15:01:45 2013 -0500 + + Update Android.mk + + Android.mk | 3 +++ + 1 file changed, 3 insertions(+) + +commit 05d5d3cd63ba2fadfdb62190dd24ef80ee3df40c +Author: Behdad Esfahbod +Date: Mon Feb 25 23:57:51 2013 -0500 + + Fix "comparison between signed and unsigned" warnings + + Patch from Jonathan Kew. + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 07a52b62115f10caea5c2d174a4272eb9ddb2284 +Author: Behdad Esfahbod +Date: Mon Feb 25 19:09:57 2013 -0500 + + Give up sanitizing after 100 edit requests + + Such fonts are *definitely* really broken. Give up. + Limits time spent in sanitize for extremely / deliberately broken + fonts. For example, two fonts with these md5sum / names: + + 9343f0a1b8c84b8123e7d201cae62ffd.ttf + eb8c978547f09d368fc204194fb34688.ttf + + were spending over a second in sanitize! Not anymore. + + src/hb-open-type-private.hh | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 29ff25481584e20a2fa39195f295c8eb4bf3bad0 +Author: Behdad Esfahbod +Date: Mon Feb 25 19:04:56 2013 -0500 + + Add HB_DEBUG_VERBOSE + + Only affects the verbosity of function name printing right now. + + src/hb-private.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 05686b5f697ed40dd21b330d044c3c286461fb26 +Author: Behdad Esfahbod +Date: Mon Feb 25 18:19:20 2013 -0500 + + 0.9.13 + + NEWS | 29 +++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 30 insertions(+), 1 deletion(-) + +commit 9e5ac7b8c02c86a4f28c79173a5237503eaa7115 +Author: Behdad Esfahbod +Date: Mon Feb 25 17:54:10 2013 -0500 + + Fix blob test to match c3ba49b6fa1865e8318926eaa6c0f2063d1053bb + + test/api/test-blob.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 51 insertions(+), 6 deletions(-) + +commit c3ba49b6fa1865e8318926eaa6c0f2063d1053bb +Author: Behdad Esfahbod +Date: Mon Feb 25 17:06:35 2013 -0500 + + Always create sub-blobs in MEMORY_MODE_READONLY + + This fixes a design bug with sanitize and sub-blobs that can + cause crashes. Jonathan and I found and debugged this issue + when we tested a corrupt font with the md5sum / filename: + ea395483d37af0cb933f40689ff7b60a. Two hours of intense + debugging we found out that the font has overlapping GSUB/GPOS + tables, and as such, sanitizing the second table can modify + the first one, which can cause all kinds of undefined behavior. + + The correct way to fix this is to make sure sub-blobs are + always created readonly, since we consider the parent blob + to be a shared resource and can't modify it, even if it *is* + writable. + + This essentially makes the READONLY_MAY_MAKE_WRITABLE mode + unused... Maybe we should simply remove / deprecate it. + + src/hb-blob.cc | 2 +- + src/hb-blob.h | 26 ++++++++++++++++++++++++++ + 2 files changed, 27 insertions(+), 1 deletion(-) + +commit 57542d7f411c71d9b8110ce6f64090b2c0f6a925 +Author: Behdad Esfahbod +Date: Thu Feb 21 15:54:05 2013 -0500 + + Minor + + src/hb-ot-layout-private.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit d46606e119b48dcca375d6313abd0f93ba5d09c3 +Author: Behdad Esfahbod +Date: Thu Feb 21 15:39:57 2013 -0500 + + Port TrueType-kerning to use skippy iterator + + It skips joiners and default ignorables now. Skips marks too, but only + if there is proper GDEF classes for marks. + + src/hb-ot-shape-fallback.cc | 50 +++++++++++++++++++++++++-------------------- + 1 file changed, 28 insertions(+), 22 deletions(-) + +commit 722e8b857eafc52e07dee5d9b253b88ed5c5c8ed +Author: Behdad Esfahbod +Date: Thu Feb 21 15:37:51 2013 -0500 + + Fixup previous commit + + Was not decreasing num_items. Ouch! + + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit ba87b8fc89bf745068ccd19264a2631ea0904846 +Author: Behdad Esfahbod +Date: Thu Feb 21 15:23:39 2013 -0500 + + Move code around + + src/hb-ot-shape-fallback-private.hh | 5 +++++ + src/hb-ot-shape-fallback.cc | 40 +++++++++++++++++++++++++++++++++++++ + src/hb-ot-shape.cc | 38 +---------------------------------- + 3 files changed, 46 insertions(+), 37 deletions(-) + +commit 2b2a6e8944144755ab641f2842e36d9a847719f3 +Author: Behdad Esfahbod +Date: Thu Feb 21 15:07:03 2013 -0500 + + [OTLayout] Correctly skip Default_Ignorable when match_func not set + + When a match_func was not set on the matcher_t object (ie. from GPOS), + then the Default_Ignorables (including joiners) were never skipped. + This meant that they were not skipped as they should during GPOS + matching. Fix that. + + A few Indic numbers have "regressed": BENGALI and DEVANAGARI went + up from 290 and 58 respectively, but in both cases new results are + superior to Uniscribe, as they apply GPOS when we weren't (and + Uniscribe isn't) before. + BENGALI: 353686 out of 354188 tests passed. 502 failed (0.141733%) + DEVANAGARI: 707305 out of 707394 tests passed. 89 failed (0.0125814%) + GUJARATI: 366262 out of 366457 tests passed. 195 failed (0.0532122%) + GURMUKHI: 60706 out of 60747 tests passed. 41 failed (0.067493%) + KANNADA: 950680 out of 951913 tests passed. 1233 failed (0.129529%) + KHMER: 299074 out of 299124 tests passed. 50 failed (0.0167155%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1047983 out of 1048334 tests passed. 351 failed (0.0334817%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271539 out of 271847 tests passed. 308 failed (0.113299%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-layout-gsubgpos-private.hh | 32 ++++++++++++++++++++++---------- + 1 file changed, 22 insertions(+), 10 deletions(-) + +commit ff93ac8cb24cbc3d9dc1a2bfb0faa88950f4a507 +Author: Behdad Esfahbod +Date: Thu Feb 21 14:51:40 2013 -0500 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit e0486fc1affd3796fb8f664e2e7fc208f1d2106c +Author: Behdad Esfahbod +Date: Tue Feb 19 00:58:10 2013 -0500 + + [tests] Add Myanmar torture tests from Martin Hosken + + .../shaper-myanmar/script-myanmar/misc/MANIFEST | 1 + + .../shaper-myanmar/script-myanmar/misc/torture.txt | 23 ++++++++++++++++++++++ + 2 files changed, 24 insertions(+) + +commit a3df9a7bf87aeba7a3d6110cd5e01a65bd0b16d0 +Author: Behdad Esfahbod +Date: Tue Feb 19 00:50:46 2013 -0500 + + Minor + + Moving files around + + test/shaping/texts/in-tree/MANIFEST | 2 -- + test/shaping/texts/in-tree/shaper-default/MANIFEST | 2 ++ + .../in-tree/{script-default => shaper-default/script-hangul}/MANIFEST | 0 + .../{script-default => shaper-default/script-hangul}/misc/MANIFEST | 0 + .../{shaper-hangul => shaper-default}/script-hangul/misc/misc.txt | 0 + .../script-hangul => shaper-default/script-tibetan}/MANIFEST | 0 + .../script-hangul => shaper-default/script-tibetan}/misc/MANIFEST | 0 + .../{script-default => shaper-default/script-tibetan}/misc/misc.txt | 0 + test/shaping/texts/in-tree/shaper-hangul/MANIFEST | 1 - + 9 files changed, 2 insertions(+), 3 deletions(-) + +commit b1f440759161cb5a54e1b1b910f3a8383b8e8472 +Author: Behdad Esfahbod +Date: Sun Feb 17 12:12:37 2013 -0500 + + [SEA] Fix order of pre-base reordering Ra and left matras + + The code was confused because it was expecting left matra to have + POS_PRE_M, like we do in the Myanmar shaper, but that is not what + we were doing in this shaper. Rewrite to rely on category only. + + Test case: U+AA06,U+AA34,U+AA2F + + src/hb-ot-shape-complex-sea.cc | 13 +++++++------ + .../texts/in-tree/shaper-sea/script-cham/misc/misc.txt | 1 + + 2 files changed, 8 insertions(+), 6 deletions(-) + +commit 99fa9ea020f26ed2697f38a7690ee1e1b5d946c4 +Author: Behdad Esfahbod +Date: Fri Feb 15 11:47:24 2013 -0500 + + Minor + + src/hb-ot-layout-gsub-table.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 27589620ba2dcf356fd7fa21cd80221a07803202 +Author: Behdad Esfahbod +Date: Fri Feb 15 11:47:09 2013 -0500 + + [OTLayout] Remove unused code + + src/hb-open-type-private.hh | 5 ----- + 1 file changed, 5 deletions(-) + +commit ebb77b9c5e357ff7c9badb0f4bf1c3a965c3e91d +Author: Behdad Esfahbod +Date: Fri Feb 15 09:33:10 2013 -0500 + + Remove TODO items that don't make sense + + The spec says those features need to be disabled by default. + + TODO | 2 -- + 1 file changed, 2 deletions(-) + +commit c2a1cdc4c4cc51f4680ebc4ec2c462cb660f9492 +Author: Behdad Esfahbod +Date: Fri Feb 15 09:27:02 2013 -0500 + + [Arabic] Fix shaping of left-joining 'Phags-Pa U+A872 + + This is the first character in Unicode to have Arabic left-joining + behavior. Update the machine to recognize that. + + Test case: U+A840,U+A872,U+A840. + + src/hb-ot-shape-complex-arabic.cc | 40 +++++++++++++++++++-------------------- + 1 file changed, 19 insertions(+), 21 deletions(-) + +commit 05ac87813d17d9ebbfa315eee3f80f25b53135c5 +Author: Behdad Esfahbod +Date: Fri Feb 15 09:26:41 2013 -0500 + + [tests] Add Syriac Alaph shaping test cases + + .../shaper-arabic/script-syriac/misc/MANIFEST | 1 + + .../shaper-arabic/script-syriac/misc/alaph.txt | 98 ++++++++++++++++++++++ + 2 files changed, 99 insertions(+) + +commit c462b32dcb883a7aca066af24c4d28c7a2b7fa28 +Author: Behdad Esfahbod +Date: Fri Feb 15 07:51:47 2013 -0500 + + Disable automatic segment properties guessing + + Before, if one called hb_shape() without setting script, language, and + direction on the buffer, hb_shape() was calling + hb_buffer_guess_segment_properties() on the user's behalf to guess + these. + + This is very dangerous, since any serious user of HarfBuzz must set + these properly (specially important is direction). So now, we don't + guess properties by default. People not setting direction will get + an abort() now. If the old behavior is desired (fragile, good for + simple testing only), users can call + hb_buffer_guess_segment_properties() on the buffer just before calling + hb_shape(). + + src/hb-fallback-shape.cc | 1 - + src/hb-ot-shape.cc | 2 -- + src/hb-shape.cc | 2 -- + util/options.hh | 1 + + 4 files changed, 1 insertion(+), 5 deletions(-) + +commit 7abddbb47a489aaac8e76ac6e700cd815739b1d2 +Author: Behdad Esfahbod +Date: Fri Feb 15 07:46:57 2013 -0500 + + Add assertions for a couple programmer errors + + src/hb-shape-plan.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 038c98f6866fe1177b04bd2ae3bb461b2f0fd1ed +Author: Behdad Esfahbod +Date: Fri Feb 15 07:41:07 2013 -0500 + + Allow disabling of TrueType kerning + + Responds to the same feature tag that GPOS kerning does: + 'kern' for horizontal and 'vkrn' for vertical. + + TODO | 2 -- + src/hb-ot-shape.cc | 55 ++++++++++++++++++++++++++++++++++-------------------- + 2 files changed, 35 insertions(+), 22 deletions(-) + +commit 398238a2526d322eb79e255c24634a275473920f +Author: Behdad Esfahbod +Date: Fri Feb 15 07:40:10 2013 -0500 + + Fix partial disabling of default-on features + + Surprisingly, if user ever tried to turn a default feature off partially + (say, disable liga for a range), the feature was being turned off + globally! Fixed now. + + src/hb-ot-map.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit cb90b1bbe6d27ca6968b70d2dbfea7ab7fb73293 +Author: Behdad Esfahbod +Date: Fri Feb 15 07:02:08 2013 -0500 + + [OTLayout] Respect syllable boundaries for backtrack/lookahead matching + + Originally we meant to match backtrack/lookahead across syllable + boundaries. But a bug in the code meant that this was NOT done for + backtrack. We "fixed" that in 2c7d0b6b80d412de3fddd443ed1a485ea1cbb03c, + but that broke Myanmar shaping. + + We now believe that for Indic-like shapers (which is where syllables are + used), all basic shaping forms should be fully contained within their + syllables, so now we limit backtrack/lookahead matching to the syllable + too. Unbreaks Myanmar. + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ee9c3a17d0bf263c5eee479fd778db97cff8e189 +Author: Behdad Esfahbod +Date: Fri Feb 15 06:22:26 2013 -0500 + + Minor refactoring + + src/hb-ot-shape-complex-myanmar.cc | 36 ++++++++++-------------------------- + src/hb-ot-shape-complex-sea.cc | 37 ++++++++++--------------------------- + src/hb-ot-shape.cc | 17 ++++++----------- + 3 files changed, 26 insertions(+), 64 deletions(-) + +commit cfc507c5432e6327e8484b07b9e091212653bc92 +Author: Behdad Esfahbod +Date: Thu Feb 14 10:40:12 2013 -0500 + + [Indic-like] Disable automatic joiner handling for basic shaping features + + Not for Arabic, but for Indic-like scripts. ZWJ/ZWNJ have special + meanings in those scripts, so let font lookups take full control. + + This undoes the regression caused by automatic-joiners handling + introduced two commits ago. + + We only disable automatic joiner handling for the "basic shaping + features" of Indic, Myanmar, and SEAsian shapers. The "presentation + forms" and other features are still applied with automatic-joiner + handling. + + This change also changes the test suite failure statistics, such that + a few scripts show more "failures". The most affected is Kannada. + However, upon inspection, we believe that in most, if not all, of the + new failures, we are producing results superior to Uniscribe. Hard to + count those! + + Here's an example of what is fixed by the recent joiner-handling + changes: + + https://bugs.freedesktop.org/show_bug.cgi?id=58714 + + New numbers, for future reference: + + BENGALI: 353892 out of 354188 tests passed. 296 failed (0.0835714%) + DEVANAGARI: 707336 out of 707394 tests passed. 58 failed (0.00819911%) + GUJARATI: 366262 out of 366457 tests passed. 195 failed (0.0532122%) + GURMUKHI: 60706 out of 60747 tests passed. 41 failed (0.067493%) + KANNADA: 950680 out of 951913 tests passed. 1233 failed (0.129529%) + KHMER: 299074 out of 299124 tests passed. 50 failed (0.0167155%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1047983 out of 1048334 tests passed. 351 failed (0.0334817%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271539 out of 271847 tests passed. 308 failed (0.113299%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-layout-gsubgpos-private.hh | 35 +++++++++++++++++++----------- + src/hb-ot-layout-private.hh | 6 +++-- + src/hb-ot-layout.cc | 10 +++++---- + src/hb-ot-map-private.hh | 12 ++++++---- + src/hb-ot-map.cc | 32 +++++++++++++++++++++------ + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 29 +++++++++++++------------ + src/hb-ot-shape-complex-myanmar.cc | 4 ++-- + src/hb-ot-shape-complex-sea.cc | 4 ++-- + 9 files changed, 85 insertions(+), 49 deletions(-) + +commit 0b45479198d61d5135dad771e9c68408eb13f930 +Author: Behdad Esfahbod +Date: Thu Feb 14 10:46:52 2013 -0500 + + [OTLayout] Add fine-grained control over ZWJ matching + + Not used yet. Next commit... + + src/hb-ot-layout-gsubgpos-private.hh | 10 ++++++++-- + src/hb-ot-layout-private.hh | 11 +++++++++-- + 2 files changed, 17 insertions(+), 4 deletions(-) + +commit 607feb7cff0e50f8738d2e49ca463fc9d7d494de +Author: Behdad Esfahbod +Date: Thu Feb 14 07:43:13 2013 -0500 + + [OTLayout] Ignore default-ignorables when matching GSUB/GPOS + + When matching lookups, be smart about default-ignorable characters. + In particular: + + Do nothing specific about ZWNJ, but for the other default-ignorables: + + If the lookup in question uses the ignorable character in a sequence, + then match it as we used to do. However, if the sequence match will + fail because the default-ignorable blocked it, try skipping the + ignorable character and continue. + + The most immediate thing it means is that if Lam-Alef forms a ligature, + then Lam-ZWJ-Alef will do to. Finally! + + One exception: when matching for GPOS, or for backtrack/lookahead of + GSUB, we ignore ZWNJ too. That's the right thing to do. + + It certainly is possible to build fonts that this feature will result + in undesirable glyphs, but it's hard to think of a real-world case + that that would happen. + + This *does* break Indic shaping right now, since Indic Unicode has + specific rules for what ZWJ/ZWNJ mean, and skipping ZWJ is breaking + those rules. That will be fixed in upcoming commits. + + src/hb-ot-layout-gpos-table.hh | 1 + + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 279 ++++++++++++++++++++++++----------- + src/hb-ot-layout-private.hh | 45 ++++++ + src/hb-ot-shape-private.hh | 44 ------ + 5 files changed, 237 insertions(+), 134 deletions(-) + +commit ec5448667b30ad662401c2b4f5fc0da524c013fd +Author: Behdad Esfahbod +Date: Thu Feb 14 11:25:10 2013 -0500 + + Add hb_ot_map_feature_flags_t + + Code cleanup. No (intended) functional change. + + src/hb-ot-map-private.hh | 29 +++++++++++++++++--- + src/hb-ot-map.cc | 24 ++++++++--------- + src/hb-ot-shape-complex-arabic.cc | 4 +-- + src/hb-ot-shape-complex-indic.cc | 55 +++++++++++++++++++------------------- + src/hb-ot-shape-complex-myanmar.cc | 4 +-- + src/hb-ot-shape-complex-sea.cc | 2 +- + src/hb-ot-shape.cc | 6 +++-- + 7 files changed, 74 insertions(+), 50 deletions(-) + +commit e7ffcfafb1108801ac504f18f820e497226bf07f +Author: Behdad Esfahbod +Date: Thu Feb 14 11:05:56 2013 -0500 + + Clean-up add_bool_feature + + src/hb-ot-map-private.hh | 4 ++-- + src/hb-ot-shape-complex-arabic.cc | 16 ++++++++-------- + src/hb-ot-shape-complex-default.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 8 ++++---- + src/hb-ot-shape-complex-myanmar.cc | 8 ++++---- + src/hb-ot-shape-complex-sea.cc | 8 ++++---- + src/hb-ot-shape.cc | 10 +++++----- + 7 files changed, 28 insertions(+), 28 deletions(-) + +commit e7562f53fe6a506d2c6d59d6688e4fa468bba462 +Author: Behdad Esfahbod +Date: Thu Feb 14 11:05:36 2013 -0500 + + Fix compile warnings for ragel-generated machines + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + src/hb-ot-shape-complex-myanmar-machine.rl | 2 +- + src/hb-ot-shape-complex-sea-machine.rl | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 4e51df73a337f7232a7dfa85df78a4f19b24771b +Author: Behdad Esfahbod +Date: Thu Feb 14 07:42:42 2013 -0500 + + [OTLayout] Remove unused function + + src/hb-ot-layout-gsubgpos-private.hh | 5 ----- + 1 file changed, 5 deletions(-) + +commit 8820bb235b1f63e4d93c8a2f5c08b44d89e06b78 +Author: Behdad Esfahbod +Date: Thu Feb 14 07:41:03 2013 -0500 + + [OTLayout] Port apply_lookup to skippy_iter + + src/hb-ot-layout-gsubgpos-private.hh | 50 +++++++++++++++++++++++++----------- + 1 file changed, 35 insertions(+), 15 deletions(-) + +commit dfca269f069dae2f99990dac24da15d316eccb9f +Author: Behdad Esfahbod +Date: Thu Feb 14 07:20:52 2013 -0500 + + [OTLayout] Port ligate_input to skippy_iter + + src/hb-ot-layout-gsubgpos-private.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 7e53415c2d8859e8b5948a2edb38c39a8f78b825 +Author: Behdad Esfahbod +Date: Thu Feb 14 06:24:30 2013 -0500 + + [OTLayout] Minor fix for apply_lookup() + + Should NOT change behavior, since first glyph is a match. + + src/hb-ot-layout-gsubgpos-private.hh | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +commit 6880f7e19d44c50e45ecb86d26381aad956d9acb +Author: Behdad Esfahbod +Date: Wed Feb 13 12:17:25 2013 -0500 + + [OTLayout] Make table type known to apply context + + src/hb-ot-layout-gsubgpos-private.hh | 5 ++++- + src/hb-ot-layout.cc | 4 ++-- + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + 3 files changed, 7 insertions(+), 4 deletions(-) + +commit 2c7d0b6b80d412de3fddd443ed1a485ea1cbb03c +Author: Behdad Esfahbod +Date: Wed Feb 13 12:10:08 2013 -0500 + + [OTLayou] Unbreak backtrack matching + + Was introduced by 28b9d502bb69a8045818d5f6113ded9c59a56bd7. + + src/hb-ot-layout-gsubgpos-private.hh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit c074ebc466dcc9bcc0d8a5dd7e942dea974ff718 +Author: Behdad Esfahbod +Date: Wed Feb 13 11:22:42 2013 -0500 + + [OTLayout] Minor refactoring + + src/hb-ot-layout-gpos-table.hh | 9 ++++++--- + src/hb-ot-layout-gsubgpos-private.hh | 30 +++++++++++++++++------------- + 2 files changed, 23 insertions(+), 16 deletions(-) + +commit 407fc12466ef460d0edf11b89f0d04c4d724875f +Author: Behdad Esfahbod +Date: Wed Feb 13 11:13:06 2013 -0500 + + [OTLayout] Remove bogus caching of glyph property + + src/hb-ot-layout-gpos-table.hh | 21 ++++++++----------- + src/hb-ot-layout-gsub-table.hh | 7 +++---- + src/hb-ot-layout-gsubgpos-private.hh | 40 ++++++++++++++---------------------- + 3 files changed, 26 insertions(+), 42 deletions(-) + +commit 6b1e3502e23c110dd810f854ba021f83baab1548 +Author: Behdad Esfahbod +Date: Wed Feb 13 11:02:54 2013 -0500 + + Remember ZWNJ + + To be used in upcoming changes. + + src/hb-ot-shape-private.hh | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 1f91c39677f840a1f630696d16d083060069abf5 +Author: Behdad Esfahbod +Date: Wed Feb 13 09:38:40 2013 -0500 + + Indent + + src/hb-ot-shape-complex-indic.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit a0cb9f33ee064628debe8e848094dfd661334640 +Author: Behdad Esfahbod +Date: Wed Feb 13 09:26:55 2013 -0500 + + [Indic] Improve base finding in final_reordering + + Fixes 5 Malayalam failures! + + MALAYALAM: 1048016 out of 1048334 tests passed. 318 failed (0.0303338%) + + src/hb-ot-shape-complex-indic.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 126f39cd16cea87b2696f66467c83a585bd4c2cf +Author: Behdad Esfahbod +Date: Wed Feb 13 08:29:21 2013 -0500 + + Add more dot-reph tests + + .../shaper-indic/indic/script-malayalam/misc/dot-reph.txt | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit f22b7e77783fa2f44365e0fe6413c4474c07048d +Author: Behdad Esfahbod +Date: Wed Feb 13 07:32:46 2013 -0500 + + [Indic] Track base position when reordering things + + Ouch, how did things ever work without this?! The added test that has a + dot-reph as well as a pre-base reordering Ra perfectly demonstrates the + bug (tested with Nirmala font from Win8 for example). Testing suggests + that Win8 shaper has the *exact* same bug / behavior that we used to + have. Odd. + + src/hb-ot-shape-complex-indic.cc | 6 ++++++ + .../in-tree/shaper-indic/indic/script-malayalam/misc/dot-reph.txt | 1 + + 2 files changed, 7 insertions(+) + +commit bc11de144c0a7a95fa0945aa7f053d8117af282a +Author: Behdad Esfahbod +Date: Wed Feb 13 05:59:06 2013 -0500 + + [SEA] Don't zero any mark advances + + Keep the logic simple, easier to explain to font developers. + + src/hb-ot-shape-complex-sea.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0291a6528685f1f593707655943fb2360579cb9e +Author: Behdad Esfahbod +Date: Wed Feb 13 05:57:24 2013 -0500 + + Further adjust mark advance zeroing + + This is a followup to 568000274c8edb5f41bc4f876ce21fcc8bdaeed8. + Looks like in the Latin shaper, Uniscribe zeroes all Unicode NSM + advances *after* GPOS, not before. Match that. + + Can be tested using DejaVu Sans Mono, since that font has GPOS + rules to zero the mark advances on its own. + + src/hb-ot-shape.cc | 33 +++++++++++++++++++++++---------- + 1 file changed, 23 insertions(+), 10 deletions(-) + +commit 85c51ec2e1d518019e32801ae38659c74fc20d80 +Author: Behdad Esfahbod +Date: Tue Feb 12 18:17:39 2013 -0500 + + [Indic] Fix Eyelash Ra with old Devanagari spec + + src/hb-ot-shape-complex-indic.cc | 32 ++++++++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + +commit cc5f24cde079b451799562b3af7ce06d932cbe6b +Author: Behdad Esfahbod +Date: Tue Feb 12 18:17:12 2013 -0500 + + [tests] Add tests for Devanagary Eyelash Ra + + Currently broken with Sanskrit 2003 font. + + .../texts/in-tree/shaper-indic/indic/script-devanagari/misc/MANIFEST | 1 + + .../in-tree/shaper-indic/indic/script-devanagari/misc/eyelash.txt | 3 +++ + 2 files changed, 4 insertions(+) + +commit 63e48bc33b68f940c351af623a55a4cf650db102 +Author: Behdad Esfahbod +Date: Tue Feb 12 17:57:49 2013 -0500 + + [Indic] Apply 'blwf' before 'half' + + This reverts 167b625d988b74572d6b2f646c285b666b650d49. It didn't + matter before, but that's going to change with next commit. + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 70d656571194d2bd32671244530edbe159722cec +Author: Behdad Esfahbod +Date: Tue Feb 12 18:01:21 2013 -0500 + + [Indic] Apply 'vatu' before 'cjct' + + This essentially reverts 1d6846db9ebf84561bb30a4e48c6c43184914099, + but that commit is from way back when. We should be better + following the spec order now again. + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 64bb2ae857cfda35dd71c7f1e962722069674ec6 +Author: Behdad Esfahbod +Date: Tue Feb 12 16:29:25 2013 -0500 + + Didn't mean to push this out + + Ouch! + + test/shaping/hb_test_tools.py | 1 - + 1 file changed, 1 deletion(-) + +commit f9b660534c269d2257d6b5e8ec2173ee71668f2f +Author: Behdad Esfahbod +Date: Tue Feb 12 16:13:56 2013 -0500 + + [Myanmar] Use master Indic table for syllable data + + src/hb-ot-shape-complex-myanmar.cc | 144 +++++++++---------------------------- + test/shaping/hb_test_tools.py | 1 + + 2 files changed, 35 insertions(+), 110 deletions(-) + +commit f60793e854393c32337a483c5d1700bf17d767fd +Author: Behdad Esfahbod +Date: Tue Feb 12 15:45:59 2013 -0500 + + [tests] Add Cham sample + + test/shaping/texts/in-tree/shaper-sea/script-cham/misc/misc.txt | 1 + + 1 file changed, 1 insertion(+) + +commit e2aab4b5db88c368c11cee81368b9ad41399e585 +Author: Behdad Esfahbod +Date: Tue Feb 12 15:35:32 2013 -0500 + + Improve checks for setmode() + + As reported by Jonathan, OS X has setmode() that is something other + than what setmode() is on Win32. So, limit invocation to Windows + platforms only. + + configure.ac | 4 ++-- + util/options.cc | 4 ++-- + util/options.hh | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit a6c1e040e594faeefd61b456ef995c7886cdea78 +Author: Behdad Esfahbod +Date: Tue Feb 12 15:31:58 2013 -0500 + + Improve check for Windows platforms + + Instead of checking for compiler, check for platform. + + src/hb-atomic-private.hh | 2 +- + src/hb-mutex-private.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 9e1f80ab3eea4a74cdaa6a390e4925a479ece1c5 +Author: Behdad Esfahbod +Date: Tue Feb 12 15:28:21 2013 -0500 + + [SEA] Treat Consonant_Final like Consonant_Medial + + src/hb-ot-shape-complex-indic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bab02d339f39ed5168daaef9461227f78e596a2f +Author: Behdad Esfahbod +Date: Tue Feb 12 15:26:45 2013 -0500 + + Rename HB_OT_INDIC_OPTIONS env var to HB_OPTIONS + + The Myanmar shaper now respects the uniscribe-bug-compatibility + option too. + + src/hb-common.cc | 20 ++++++++++++-- + src/hb-ot-shape-complex-indic.cc | 53 ++++---------------------------------- + src/hb-ot-shape-complex-myanmar.cc | 7 ++--- + src/hb-private.hh | 29 +++++++++++++++++++++ + 4 files changed, 54 insertions(+), 55 deletions(-) + +commit 3a83d33ec0b1be6f5992816ff5ebb0f43c8dff00 +Author: Behdad Esfahbod +Date: Tue Feb 12 12:14:10 2013 -0500 + + Add South-East Asian shaper + + Handles Tai Tham, Cham, and New Tai Lue for now. + + src/Makefile.am | 12 +- + src/gen-indic-table.py | 9 +- + src/hb-ot-shape-complex-indic-private.hh | 241 +------------ + ...table.hh => hb-ot-shape-complex-indic-table.cc} | 9 +- + src/hb-ot-shape-complex-indic.cc | 239 ++++++++++++ + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 28 +- + src/hb-ot-shape-complex-sea-machine.rl | 102 ++++++ + src/hb-ot-shape-complex-sea.cc | 400 +++++++++++++++++++++ + test/shaping/texts/in-tree/MANIFEST | 1 + + .../in-tree/shaper-indic/south-east-asian/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-myanmar/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-sea/MANIFEST | 3 + + .../script-cham}/MANIFEST | 0 + .../script-cham}/misc/MANIFEST | 0 + .../in-tree/shaper-sea/script-cham/misc/misc.txt | 1 + + .../in-tree/shaper-sea/script-new-tai-lue/MANIFEST | 1 + + .../shaper-sea/script-new-tai-lue/misc/MANIFEST | 1 + + .../script-new-tai-lue/misc/misc.txt | 0 + .../in-tree/shaper-sea/script-tai-tham/MANIFEST | 1 + + .../shaper-sea/script-tai-tham/misc/MANIFEST | 1 + + .../shaper-sea/script-tai-tham/misc/misc.txt | 2 + + 22 files changed, 792 insertions(+), 263 deletions(-) + +commit fb960212063016656dfaba83f072c81d1efc3202 +Author: Behdad Esfahbod +Date: Tue Feb 12 10:33:58 2013 -0500 + + Minor test reshufflings + + test/shaping/texts/in-tree/MANIFEST | 1 + + .../{shaper-indic/south-asian/script-tibetan => script-default}/MANIFEST | 0 + .../south-asian/script-tibetan => script-default}/misc/MANIFEST | 0 + .../south-asian/script-tibetan => script-default}/misc/misc.txt | 0 + test/shaping/texts/in-tree/shaper-indic/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-indic/south-asian/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-indic/south-east-asian/MANIFEST | 1 - + .../texts/in-tree/shaper-indic/south-east-asian/script-thai/MANIFEST | 1 - + .../in-tree/shaper-indic/south-east-asian/script-thai/misc/MANIFEST | 0 + 9 files changed, 1 insertion(+), 4 deletions(-) + +commit 5676d5d52784e16068ae483103d59111a8081854 +Author: Behdad Esfahbod +Date: Tue Feb 12 10:31:14 2013 -0500 + + [Indic] Make sure New Tai Lue works! + + src/hb-ot-shape-complex-private.hh | 12 ++++++++---- + .../texts/in-tree/shaper-indic/south-east-asian/MANIFEST | 1 + + .../south-east-asian/script-new-tai-lue/MANIFEST | 1 + + .../south-east-asian/script-new-tai-lue/misc/MANIFEST | 1 + + .../south-east-asian/script-new-tai-lue/misc/misc.txt | 1 + + 5 files changed, 12 insertions(+), 4 deletions(-) + +commit 568000274c8edb5f41bc4f876ce21fcc8bdaeed8 +Author: Behdad Esfahbod +Date: Tue Feb 12 09:44:57 2013 -0500 + + Adjust mark advance-width zeroing logic for Myanmar + + Before, we were zeroing advance width of attached marks for + non-Indic scripts, and not doing it for Indic. + + We have now three different behaviors, which seem to better + reflect what Uniscribe is doing: + + - For Indic, no explicit zeroing happens whatsoever, which + is the same as before, + + - For Myanmar, zero advance width of glyphs marked as marks + *in GDEF*, and do that *before* applying GPOS. This seems + to be what the new Win8 Myanmar shaper does, + + - For everything else, zero advance width of glyphs that are + from General_Category=Mn Unicode characters, and do so + before applying GPOS. This seems to be what Uniscribe does + for Latin at least. + + With these changes, positioning of all tests matches for Myanmar, + except for the glitch in Uniscribe not applying 'mark'. See preivous + commit. + + src/hb-ot-layout-gpos-table.hh | 12 ++++-------- + src/hb-ot-layout-private.hh | 3 +-- + src/hb-ot-layout.cc | 4 ++-- + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-default.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 9 ++++++++- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape.cc | 31 +++++++++++++++++++++++++++++-- + 10 files changed, 49 insertions(+), 20 deletions(-) + +commit 99749ca8e0c4c8dbea4620f07c4d0e6d1515cc65 +Author: Behdad Esfahbod +Date: Tue Feb 12 09:44:35 2013 -0500 + + [Myanmar] Add note re Uniscribe NOT applying 'mark' + + src/hb-ot-shape-complex-myanmar.cc | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit b8427801381180da9611b2e3e0f0b3514274de81 +Author: Behdad Esfahbod +Date: Mon Feb 11 17:02:17 2013 -0500 + + Minor + + src/hb-atomic-private.hh | 2 +- + src/hb-mutex-private.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 419c933ed1b5d97c7561546536ef5810a7b0ebd0 +Author: Behdad Esfahbod +Date: Mon Feb 11 16:16:16 2013 -0500 + + [Myanmar] Fix handling of Punctuation and Symbol types + + Testing with "clusters" now on par with testing without them. 15 + failures both. + + src/hb-ot-shape-complex-myanmar.cc | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 0572c1410a9cb0ac5dd5dc84a8034698cc5c4892 +Author: Behdad Esfahbod +Date: Mon Feb 11 16:06:02 2013 -0500 + + [Myanmar] Fixup handling of joiners and GB characters + + src/hb-ot-shape-complex-myanmar-machine.rl | 6 ++---- + src/hb-ot-shape-complex-myanmar.cc | 19 +++++++++++++++++-- + 2 files changed, 19 insertions(+), 6 deletions(-) + +commit 1c8654ead41ca746d577549c92d2a41c594ab639 +Author: Behdad Esfahbod +Date: Mon Feb 11 14:27:02 2013 -0500 + + [Myanmar] Prevent reordering between Asat and Dot below + + Implemented as a hack for now. Myanmar failures down from 23 to 15. + + MYANMAR: 1123868 out of 1123883 tests passed. 15 failed (0.00133466%) + + The remaining 15 cases are all where the syllable is wrong according to + the OpenType spec. We insert dottedcircle. Uniscribe fails to do that, + but it also fails to reorder the prebase-reordering medial-Ra. So it + gets it wrong. + + src/hb-unicode-private.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit bed687f886b8def06642ad986648e9149a935add +Author: Behdad Esfahbod +Date: Mon Feb 11 14:24:03 2013 -0500 + + Shuffle test data around + + test/shaping/texts/in-tree/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-indic/south-east-asian/MANIFEST | 1 - + .../in-tree/shaper-indic/south-east-asian/script-thai/misc/MANIFEST | 1 - + .../south-east-asian => shaper-myanmar}/script-myanmar/MANIFEST | 0 + .../south-east-asian => shaper-myanmar}/script-myanmar/misc/MANIFEST | 0 + .../south-east-asian => shaper-myanmar}/script-myanmar/misc/misc.txt | 0 + .../south-east-asian => shaper-myanmar}/script-myanmar/misc/utn11.txt | 0 + test/shaping/texts/in-tree/shaper-thai/script-thai/misc/MANIFEST | 1 + + .../south-east-asian => shaper-thai}/script-thai/misc/misc.txt | 0 + 9 files changed, 2 insertions(+), 2 deletions(-) + +commit 98628cac9f733f2674d6409954cddb7d0634c233 +Author: Behdad Esfahbod +Date: Mon Feb 11 13:36:23 2013 -0500 + + Add Win8-style Myanmar shaper + + Myanmar failures down from 51% to 0.00204648%! + + MYANMAR: 1123860 out of 1123883 tests passed. 23 failed (0.00204648%) + + src/Makefile.am | 14 +- + src/hb-ot-shape-complex-indic.cc | 2 - + src/hb-ot-shape-complex-myanmar-machine.rl | 127 ++++++ + src/hb-ot-shape-complex-myanmar.cc | 599 +++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-private.hh | 5 +- + 5 files changed, 740 insertions(+), 7 deletions(-) + +commit 1df56449586bd32275a6fa69dcadd5fb77a84f82 +Author: Behdad Esfahbod +Date: Mon Feb 11 14:17:54 2013 -0500 + + Minor + + src/hb-ot-shape-complex-indic.cc | 3 --- + 1 file changed, 3 deletions(-) + +commit 54f7b4d9ec13f8454aa298534da318c023fa3c63 +Author: Behdad Esfahbod +Date: Mon Feb 11 13:27:17 2013 -0500 + + [OTLayout] Respect lookup-flags skipping over non-mark glyphs + + Before, when matching ligatures, we never skipping over base / liga + glyphs even if that was what the LookupFlags asked for. + + Fixed now. We carefully reviewed all instances of this, and tested with + Amiri as well as some Indic scripts, and are confident that this should + NOT break anyone's fonts. It's also how Uniscribe does it, from what + we can tell. + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 25 ++++++++++--------------- + 2 files changed, 11 insertions(+), 16 deletions(-) + +commit 9082efc4aacb34de8574d6a4a3c037987df58bd8 +Author: Behdad Esfahbod +Date: Mon Feb 11 13:14:15 2013 -0500 + + [OTLayout] s/mark_skipping/skipping/ + + In aticipation of upcoming changes. + + src/hb-ot-layout-gpos-table.hh | 12 ++++++------ + src/hb-ot-layout-gsubgpos-private.hh | 28 ++++++++++++++-------------- + 2 files changed, 20 insertions(+), 20 deletions(-) + +commit 9621e0ba294c9cc6d458bbf632e63e92fda71e10 +Author: Behdad Esfahbod +Date: Mon Feb 11 06:58:27 2013 -0500 + + [Indic] Fix bug introduced in 8b217f5ac54aa0dcbba2dd6d59aa89dde33e56c2 + + Was breaking reph formation logic when the Ra is the only consonant. + Devanagari regression fixed. Down to 57 failures again. Ouch. + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6e74c64211b6aaac48bae8c87f9420d8dc03fd93 +Author: Behdad Esfahbod +Date: Mon Feb 11 06:50:17 2013 -0500 + + Improve normalization heuristic + + Before, for most scripts, we were not trying to recompose two characters + if the second one had ccc=0. That fails for Myanmar where U+1026 + decomposes to U+1025,U+102E, both of which have ccc=0. However, we do + want to try to recompose those. We now check whether the second is a + mark, using general category instead. + + At the same time, remove optimization that was conflicting with this. + + [Let the Ngapi hackfest begin!] + + src/hb-ot-shape-normalize.cc | 39 +++++++++++++-------------------------- + 1 file changed, 13 insertions(+), 26 deletions(-) + +commit 614242efb043f2ed78916377138d456279a20a54 +Author: Behdad Esfahbod +Date: Wed Feb 6 23:45:27 2013 -0500 + + Revert "Include config.h.in in tree" + + This reverts commit 01013a0f5c58d5d54a37e5b4d6692e0bbd4baf80. + + Conflicts: + config.h.in + + Same argument as previous commit. + + Makefile.am | 1 + + config.h.in | 153 ------------------------------------------------------------ + 2 files changed, 1 insertion(+), 153 deletions(-) + +commit adff3778155facb7b149ce66ab7d573368e048de +Author: Behdad Esfahbod +Date: Wed Feb 6 23:43:27 2013 -0500 + + Revert "[Indic] Import ragel-generated Indic machine in git" + + This reverts commit fab7a71f110ed646745d54b23284537c50058c21. + + Conflicts: + src/hb-ot-shape-complex-indic-machine.hh + + Keeping that generated file in-tree causes problems with processes like + tinderbox that automatically fetch and build harfbuzz. It's harder to + bootstrap harfbuzz now (as was previously), but I'm willing to give this + another chance and see how it goes. + + autogen.sh | 6 + + src/Makefile.am | 1 + + src/hb-ot-shape-complex-indic-machine.hh | 1443 ------------------------------ + 3 files changed, 7 insertions(+), 1443 deletions(-) + +commit 5898fa94d12b19686f649104bd6efe8daa1ba0c9 +Author: Behdad Esfahbod +Date: Wed Feb 6 15:29:07 2013 -0500 + + Don't use $(ENV) + + As reported by Peter Breitenlohner: + + I think this is a very bad idea because ENV is used to specify a startup + file to be read by some/all shells. + + test/api/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 52d66c26a2102bd1a49463b8e8f04612598f8ac1 +Author: Behdad Esfahbod +Date: Mon Feb 4 23:31:24 2013 -0500 + + Add color-tests automake option + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9de5f98f363d96f308adc33f1c2286e5c33117de +Author: Behdad Esfahbod +Date: Mon Feb 4 23:28:22 2013 -0500 + + Bug 60035 - intermittent make install failure on hb-version.h + + src/Makefile.am | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit 6c1e8b614cfd6ed016fba6bf20af1e422e79eb71 +Author: Behdad Esfahbod +Date: Mon Feb 4 23:24:16 2013 -0500 + + Bug 59637 - check-exported-symbols.sh & check-internal-symbols.sh fail on mips/mipsel + + src/check-symbols.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bafdf3d983dcc277d6e7e322277c0bb25b41a173 +Author: Behdad Esfahbod +Date: Mon Feb 4 23:06:50 2013 -0500 + + Merge check-internal-symbols.sh and check-exported-symbols.sh + + src/Makefile.am | 3 +- + src/check-internal-symbols.sh | 34 ---------------------- + ...{check-exported-symbols.sh => check-symbols.sh} | 16 ++++++++-- + 3 files changed, 14 insertions(+), 39 deletions(-) + +commit ceeae30f47b9d628484ae398bc38f3f60ee8eab4 +Author: Behdad Esfahbod +Date: Thu Jan 31 19:27:36 2013 -0500 + + Really fix setmode this time + + Thanks to Khaled for spotting it. + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7cba8a673b4b436a737fc4ffe85dc84ddd2bf41f +Author: Behdad Esfahbod +Date: Thu Jan 31 18:37:10 2013 -0500 + + Fixup previous commit + + Now, it looks like this breaks Cygwin again. Have to figure out what's + going on. + + util/options.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bc76449f51f20491a4540b4f240f5a3e0dcb20fe +Author: Behdad Esfahbod +Date: Thu Jan 31 18:18:05 2013 -0500 + + Use setmode() instead of _setmode() + + Looks like Cygwin / MSVC declare it that way, and it still works on + MinGW32 cross. + + config.h.in | 6 +++--- + configure.ac | 2 +- + util/options.cc | 2 +- + util/options.hh | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) + +commit e9171af55cc6a402eb20db4ea74c86a0b1e70e85 +Author: Behdad Esfahbod +Date: Tue Jan 29 22:45:00 2013 -0500 + + Bug 60053 - hb-common.cc:181:6: warning: ‘void free_langs()’ defined but not used + + src/hb-common.cc | 2 +- + src/hb-ft.cc | 2 +- + src/hb-shape.cc | 2 +- + src/hb-shaper.cc | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 09b5393874e56fcfd63a92d28e6c1c2ddeee0942 +Author: Behdad Esfahbod +Date: Fri Jan 18 17:10:47 2013 -0600 + + 0.9.12 + + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit eb45c0a2fbaeeb34e77a2935934e8d1302728ec8 +Author: Behdad Esfahbod +Date: Wed Jan 16 22:07:50 2013 -0600 + + Minor + + src/hb-ot-layout.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 52c8d1226f3509276b11a1fadbd29e5363c0ecd7 +Author: Behdad Esfahbod +Date: Mon Jan 14 13:51:46 2013 -0600 + + Minor + + src/hb-blob.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f88d3bd7e407d332bb04688344c54756d24128c9 +Author: Behdad Esfahbod +Date: Mon Jan 14 00:33:58 2013 -0600 + + Fix build with Sun compiler + + src/hb-blob.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 08b29c08094097f1c23ec53b10084bc390cea833 +Author: Behdad Esfahbod +Date: Mon Jan 14 00:32:12 2013 -0600 + + Revert "Minor" + + This reverts commit 0a492357016bc9a614d2a726f2006c10af68ca58. + + Enables code on more compilers. + + src/hb-warning.cc | 33 ++++++++++++++++++++++++++++++--- + 1 file changed, 30 insertions(+), 3 deletions(-) + +commit e78463211e7d85f237bd55afab7e8e5dae42346c +Author: Behdad Esfahbod +Date: Mon Jan 14 00:27:21 2013 -0600 + + Fix linking with non-gcc compilers + + configure.ac | 2 ++ + src/Makefile.am | 6 +++++- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit de649f07f1f8fdeb998a0b049759f4f7363e25d2 +Author: Behdad Esfahbod +Date: Mon Jan 14 00:26:43 2013 -0600 + + Fix residuals from fontconfig changes + + src/hb-atomic-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit cf81fb3624466b9df2250b58b27a92187c5b5b5c +Author: Behdad Esfahbod +Date: Thu Jan 10 09:06:34 2013 -0600 + + 0.9.11 + + NEWS | 14 ++++++++++++++ + configure.ac | 2 +- + 2 files changed, 15 insertions(+), 1 deletion(-) + +commit 2dcb333f52492018816f0d5d67a47634a612e49c +Author: Behdad Esfahbod +Date: Thu Jan 10 01:17:59 2013 -0600 + + Add atomic ops for Solaris + + Based on fontconfig patch from Raimund Steger. + + config.h.in | 5 ++++- + configure.ac | 27 +++++++++++++++++++++++++-- + src/hb-atomic-private.hh | 12 ++++++++++++ + 3 files changed, 41 insertions(+), 3 deletions(-) + +commit 69fd6e157c7ec83a5d5d8731fc14675ce4509b09 +Author: Behdad Esfahbod +Date: Thu Jan 10 00:03:36 2013 -0600 + + Fix crasher during multi-thread shaper data creation + + Sample crash: + + 0 _hb_graphite2_shaper_face_data_destroy (data=0xffffffffffffffff) + at ../../src/hb-graphite2.cc:129 + 1 0x00007ffff4271d7d in hb_graphite2_shaper_face_data_ensure ( + face=) at ../../src/hb-shaper-list.hh:35 + 2 hb_shape_plan_plan (shaper_list=, num_user_features=0, + user_features=0x0, shape_plan=0xf7b490) at ../../src/hb-shaper-list.hh:35 + 3 hb_shape_plan_create (face=, props=, + user_features=0x0, num_user_features=0, shaper_list=) + at ../../src/hb-shape-plan.cc:108 + 4 0x00007ffff4272c93 in hb_shape_plan_create_cached (face=0x10cf2b0, + props=0x11980d8, user_features=0x0, num_user_features=, + shaper_list=0x0) at ../../src/hb-shape-plan.cc:283 + + src/hb-shaper-private.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit ecd454b3cd75050e0c95e1d2aa55744559338ec8 +Author: Behdad Esfahbod +Date: Tue Jan 8 18:09:46 2013 -0600 + + [Indic] In old-spec shaping, don't move viramas around if seq ends with one + + For example: u0c9a u0ccd u0c9a u0ccd with Lohit. See: + + https://bugs.freedesktop.org/show_bug.cgi?id=59118 + + src/hb-ot-shape-complex-indic.cc | 7 ++++--- + .../texts/in-tree/shaper-indic/indic/script-kannada/misc/misc.txt | 1 + + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit e95e031b5682809488cc965883e15404cb9cfb6a +Author: Behdad Esfahbod +Date: Tue Jan 8 16:15:46 2013 -0600 + + [GPOS] If an Anchor offset is NULL, return false + + If in a MarkPos table, a base has no anchor for a particular mark class, + return NULL such that the subsequent subtables get a chance at it. + + Test case: + hb-shape ./EBGaramond12-Regular.otf ἂ --features="ss20","smcp" + + src/hb-open-type-private.hh | 14 ++++++++++++-- + src/hb-ot-layout-gpos-table.hh | 10 ++++++++-- + 2 files changed, 20 insertions(+), 4 deletions(-) + +commit e5dbf39900fa63051f64cc447a6742665cbee339 +Author: Behdad Esfahbod +Date: Mon Jan 7 17:34:24 2013 -0600 + + Bug 58638 - Building fails with ICU due to not passing required flags + + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +commit 1172dc736280566426eb6dade1a886b2a0ca9aa4 +Author: Behdad Esfahbod +Date: Mon Jan 7 16:46:37 2013 -0600 + + Rename hb_buffer_clear() to hb_buffer_clear_contents() + + The previous name was clashing with harfbuzz.old. There are systems + that need to link both... + + Clash-free now again. + + src/hb-buffer.cc | 2 +- + src/hb-buffer.h | 2 +- + test/api/test-buffer.c | 2 +- + util/options.hh | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 7b912c1936c3e8a7df27a30782ca127d0a83822d +Author: Behdad Esfahbod +Date: Fri Jan 4 01:25:27 2013 -0600 + + Remove a few unnecessary const's + + Apparently helps with MSVC compilation. + + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 34e6c3e3e452bdf6f93df565a70453a6e74d4c6e +Author: Behdad Esfahbod +Date: Thu Jan 3 00:14:24 2013 -0600 + + 0.9.10 + + NEWS | 24 ++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 25 insertions(+), 1 deletion(-) + +commit f0c82410dbe800cb6429ba4aa7cfd9f5a11cc70c +Author: Behdad Esfahbod +Date: Thu Jan 3 00:07:16 2013 -0600 + + [OTLayout] Always collect default language system in collect_lookups + + Not sure if this is the most desired behavior. It's the most easily + defined though. + + src/hb-ot-layout.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 15e9e4e1ddaad655988144e7a56a765e8adf8782 +Author: Behdad Esfahbod +Date: Thu Jan 3 00:04:40 2013 -0600 + + [OTLayout] Fix feature iteration in collect_lookups + + Previous logic was just wrong. + + src/hb-ot-layout.cc | 46 ++++++++++++++++++++++++++++++++-------------- + 1 file changed, 32 insertions(+), 14 deletions(-) + +commit 733e8c0d7bf0765884f2cc953c8edcd7ab7fb49b +Author: Behdad Esfahbod +Date: Thu Jan 3 00:00:23 2013 -0600 + + [OTLayout] Whitespace + + src/hb-ot-layout.cc | 82 ++++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 68 insertions(+), 14 deletions(-) + +commit d37ae38047bee12639741af9bb083b857fab950d +Author: Behdad Esfahbod +Date: Wed Jan 2 23:57:36 2013 -0600 + + [OTLayout] Handle required_feature_index in collect_lookups + + src/hb-ot-layout.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 11fba79ee9383eb995ddf7eb924dd64c67e2df63 +Author: Behdad Esfahbod +Date: Wed Jan 2 23:36:37 2013 -0600 + + [OTLayout] Fix various introspection issues with ClassDef's + + As reported by Jonathan Kew. + + src/hb-ot-layout-gsubgpos-private.hh | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + +commit e81aff9ef785be28751aab1fcd484af550656181 +Author: Behdad Esfahbod +Date: Wed Jan 2 23:22:54 2013 -0600 + + [tests] Finish test-set.c + + All passing now. + + test/api/test-set.c | 373 +++++++++++++++++++++------------------------------- + 1 file changed, 149 insertions(+), 224 deletions(-) + +commit 7b1b720a8da69b68b775ce17104a40d55401b7ef +Author: Behdad Esfahbod +Date: Wed Jan 2 23:02:59 2013 -0600 + + Protect sets in-error from further modication + + Fixes test-set.c + + src/hb-set-private.hh | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 8165f2765b93e99577ecc79b7956ae38c614bc78 +Author: Behdad Esfahbod +Date: Wed Jan 2 22:50:36 2013 -0600 + + [tests] Start adding tests for hb-set.h + + Fails now. Fixing. + + TODO | 2 - + src/hb-set-private.hh | 6 + + src/hb-set.cc | 9 +- + src/hb-set.h | 3 + + test/api/Makefile.am | 1 + + test/api/test-set.c | 312 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 330 insertions(+), 3 deletions(-) + +commit b9d28f696c433b94c5ffbad8d7c87cf3acff4056 +Author: Behdad Esfahbod +Date: Wed Jan 2 22:49:58 2013 -0600 + + [tests] Add set object to test-object.c + + test/api/test-object.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 11d2956553f0d4a0086166a04ffc352fcfacf56e +Author: Behdad Esfahbod +Date: Wed Jan 2 17:41:27 2013 -0600 + + Minor + + src/hb-atomic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 596740db04e7c1dadae0d8be6e401089fcaffc2d +Author: Behdad Esfahbod +Date: Fri Dec 21 19:41:04 2012 -0500 + + [Indic] Insert dottedcircle after a lone Malayalam dot-reph + + src/hb-ot-shape-complex-indic-machine.hh | 1617 ++++++++++++++++-------------- + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + src/hb-ot-shape-complex-indic.cc | 13 +- + 3 files changed, 881 insertions(+), 751 deletions(-) + +commit 3cdce6497b2b9aeb2841bf077daa9dd9b196429d +Author: Behdad Esfahbod +Date: Fri Dec 21 16:54:22 2012 -0500 + + Remove TODO that I don't intend to fix + + TODO | 1 - + 1 file changed, 1 deletion(-) + +commit 6f69fa283e0a488da811df78bc83c41ed248b688 +Author: Behdad Esfahbod +Date: Fri Dec 21 16:51:15 2012 -0500 + + Minor + + src/hb-shape.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f4abcbfc628718bb276363746440df06e7658f6e +Author: Behdad Esfahbod +Date: Fri Dec 21 16:48:51 2012 -0500 + + Minor + + src/hb-buffer.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4a765f092d71bb4adeb468c004987a9121d39db5 +Author: Behdad Esfahbod +Date: Fri Dec 21 16:48:47 2012 -0500 + + Minor + + util/hb-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9815a88111072aa51e78e258c5f660993b47d4df +Author: Behdad Esfahbod +Date: Fri Dec 21 16:46:53 2012 -0500 + + [util] List supported output formats in --help output + + util/hb-shape.cc | 6 +++--- + util/helper-cairo.cc | 2 +- + util/helper-cairo.hh | 1 + + util/options.cc | 9 ++++++++- + util/options.hh | 5 ++++- + util/view-cairo.hh | 2 +- + 6 files changed, 18 insertions(+), 7 deletions(-) + +commit f95a87b7b813f588c7910ad4785ee68bb452e864 +Author: Behdad Esfahbod +Date: Fri Dec 21 16:35:28 2012 -0500 + + [util] List supported output formats in hb-view + + TODO | 1 - + util/helper-cairo.cc | 30 +++++++++++++++++++++++++++++- + 2 files changed, 29 insertions(+), 2 deletions(-) + +commit 6bad092aa87bc3e6bbf0b9faf07693e6ebbe55f2 +Author: Behdad Esfahbod +Date: Fri Dec 21 16:01:52 2012 -0500 + + [util] Default to "text" output format in hb-shape + + If you say: + + hb-shape font.ttf text --output-file out.txt + + This was previously failing: + + Unknown output format `txt'; supported formats are: TEXT / JSON + + Now we simply fallback to TEXT if no explicit format was requested. + + util/hb-shape.cc | 11 ++++++++--- + util/options.hh | 5 +++++ + 2 files changed, 13 insertions(+), 3 deletions(-) + +commit 8b217f5ac54aa0dcbba2dd6d59aa89dde33e56c2 +Author: Behdad Esfahbod +Date: Fri Dec 21 15:48:32 2012 -0500 + + [Indic] Reorder Malayalam dot-reph to after base + + Test sequence is simple: U+0D4E,U+0D15. The doth-reph should be + reordered to after the Ka. + + https://bugzilla.redhat.com/show_bug.cgi?id=799565 + + src/hb-ot-shape-complex-indic.cc | 13 ++++++++++--- + .../shaper-indic/indic/script-malayalam/misc/MANIFEST | 1 + + .../shaper-indic/indic/script-malayalam/misc/dot-reph.txt | 1 + + 3 files changed, 12 insertions(+), 3 deletions(-) + +commit 742c4ee97e1311e000ebcdf9f33361c4dc6400a4 +Author: Behdad Esfahbod +Date: Fri Dec 21 15:35:03 2012 -0500 + + Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 94afeb6ebe27534fc80d7173cc6f67375c3aaca6 +Author: Behdad Esfahbod +Date: Fri Dec 21 11:54:50 2012 -0500 + + Add Android.mk + + Android.mk | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + Makefile.am | 1 + + 2 files changed, 75 insertions(+) + +commit d16ddbcbbee39b07a028776995c635119fe3cd98 +Author: Behdad Esfahbod +Date: Thu Dec 20 01:02:36 2012 -0500 + + Add build confirmation notice to configure + + configure.ac | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +commit e24d8dab749a1a796e7484e18572da5f7a733bd4 +Author: Behdad Esfahbod +Date: Wed Dec 19 15:23:02 2012 -0500 + + [TODO] Remove done items + + TODO | 7 ------- + 1 file changed, 7 deletions(-) + +commit 044d38527664d933c18c751c38fcf6fb4b5f888e +Author: Behdad Esfahbod +Date: Wed Dec 19 13:00:16 2012 -0500 + + Bug 58498 - Tests fail with gold linker on ARM + + src/check-exported-symbols.sh | 2 +- + src/check-internal-symbols.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b68b86daf1a8478b86aeae44a8c39a606ed873cb +Author: Behdad Esfahbod +Date: Tue Dec 18 20:39:40 2012 -0500 + + Use C++ linker if ICU is disabled + + Bug 54948 - Undefined symbols: "operator delete(void*)" "operator + new(unsigned long)" "___cxa_pure_virtual" + + src/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 1ffd23cb47a61465d52a7aeebb9c1b676e7c9a7e +Author: Behdad Esfahbod +Date: Mon Dec 17 23:29:15 2012 -0500 + + [OTLayout] Limit alternate-location FeatureParams to 'size' feature + + src/hb-ot-layout-common-private.hh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit efe252e6000558f78075adadb2a3dba25ab67c04 +Author: Behdad Esfahbod +Date: Mon Dec 17 23:21:05 2012 -0500 + + [OTLayout] Fix 'size' featureParams implementation + + Looks at alternate location now. + + src/hb-ot-layout-common-private.hh | 133 ++++++++++++++++++++++++++++--------- + src/hb-ot-layout.cc | 93 ++++---------------------- + 2 files changed, 117 insertions(+), 109 deletions(-) + +commit e77b4425746ac9eb407ca4e742d962f1955971b4 +Author: Behdad Esfahbod +Date: Mon Dec 17 18:42:59 2012 -0500 + + [OTLayout] Fix tracing + + src/hb-open-type-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 9b54562d63f1a9e0e5b33d71c32bd1588759ebf1 +Author: Behdad Esfahbod +Date: Mon Dec 17 13:55:36 2012 -0500 + + [OTLayout] Towards correct FeatureParams handling + + src/hb-open-type-private.hh | 8 +++++++- + src/hb-ot-layout-common-private.hh | 25 +++++++++++++++++++++++-- + 2 files changed, 30 insertions(+), 3 deletions(-) + +commit 87e43b7f2be25840748f920ca33ff553833da45f +Author: Behdad Esfahbod +Date: Fri Dec 14 17:48:23 2012 -0500 + + [OTLayout] Wire tag and list start all the way to Feature + + To fix FeatureParam issues. No actual fix yet, just plumbing. + + src/hb-ot-layout-common-private.hh | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +commit 85bc44b90a19c6a669ed567a9cd8513448600afe +Author: Behdad Esfahbod +Date: Wed Dec 12 11:38:49 2012 -0500 + + [OTLayout] More 'size' feature sanity checking + + We still don't look for the old incorrect place of the featureParams. + I'll wait till someone actually complains about it... + + src/hb-ot-layout.cc | 99 ++++++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 79 insertions(+), 20 deletions(-) + +commit 0bae50a36f3022f9bb6b2c001c191eeaaa4ef954 +Author: Behdad Esfahbod +Date: Tue Dec 11 16:01:31 2012 -0500 + + [OTLayout] Add FeatureParamsCharacterVariants struct + + No API yet. + + src/hb-ot-layout-common-private.hh | 52 +++++++++++++++++++++++++++++++++++--- + 1 file changed, 49 insertions(+), 3 deletions(-) + +commit bd61bc13ea8ff350ada5449b2cfeb612e66ecafa +Author: Behdad Esfahbod +Date: Tue Dec 11 16:00:43 2012 -0500 + + [OTLayout] Add UINT24 type + + src/hb-open-type-private.hh | 33 ++++++++++++++++++++++----------- + src/hb-private.hh | 4 ++++ + 2 files changed, 26 insertions(+), 11 deletions(-) + +commit 9cf7f9d4f61741932570afbefdee5edf61f79ae4 +Author: Behdad Esfahbod +Date: Tue Dec 11 14:31:13 2012 -0500 + + Make test-size-params write size in points + + src/test-size-params.cc | 18 ++++-------------- + 1 file changed, 4 insertions(+), 14 deletions(-) + +commit 372fe2b67b1757e809bf33e1e9055a00c5bed304 +Author: Behdad Esfahbod +Date: Tue Dec 11 14:30:57 2012 -0500 + + [OTLayout] Make hb_ot_layout_get_size_params() do some checks + + src/hb-ot-layout.cc | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit 875a5cbc9c37f4264241c43b80afad2628eab749 +Author: Behdad Esfahbod +Date: Tue Dec 11 14:17:01 2012 -0500 + + [OTLayout] Change hb_ot_layout_get_params() API + + And add implementation for StylisticSet UINameID. No API yet. + + src/hb-ot-layout-common-private.hh | 85 ++++++++++++++++++++++++++++++++++++-- + src/hb-ot-layout.cc | 28 +++++++++---- + src/hb-ot-layout.h | 8 +++- + src/test-size-params.cc | 9 +++- + 4 files changed, 115 insertions(+), 15 deletions(-) + +commit 5e7e52ddf2b0c4fbc9d933d24336100368d39a5c +Author: Behdad Esfahbod +Date: Mon Dec 10 17:44:22 2012 -0500 + + [uniscribe] Enable Uniscribe backend only if it has ScriptShapeOpenType() + + Bug 55494 - ScriptItemizeOpenType doesn't exists under Windows XP + + config.h.in | 6 ------ + configure.ac | 14 +++++++++++++- + 2 files changed, 13 insertions(+), 7 deletions(-) + +commit d41c0c955b8ad9b52191ca47e1f3b1bfe606deb1 +Author: Behdad Esfahbod +Date: Mon Dec 10 16:41:20 2012 -0500 + + Update config template + + config.h.in | 4 ---- + 1 file changed, 4 deletions(-) + +commit c48a04e5ea899b82465a0f3f2cfdcffb3bf38f61 +Author: John Ralls +Date: Mon Dec 10 16:24:24 2012 -0500 + + [coretext] Better test for CoreText + + Instead of checking for ApplicationServices.h, which is present in all + versions of MacOSX, check for CTFontRef, a CoreText basic type. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0e9f0f3e5f16a45951423a1229af42dc2fd798c3 +Author: Behdad Esfahbod +Date: Mon Dec 10 15:25:21 2012 -0500 + + Fix atomic ops on iOS + + Patch from John Ralls. + + src/hb-atomic-private.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 5f9569c1391c65d7addff363ad6e5ec9b087f01a +Author: Behdad Esfahbod +Date: Mon Dec 10 13:38:42 2012 -0500 + + Make older MSVC happy + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 071d5b831e6de5f3b24160dc77b139cb040ab886 +Author: Behdad Esfahbod +Date: Mon Dec 10 00:57:00 2012 -0500 + + Work around missing OSAtomicCompareAndSwapPtrBarrier() on OS X 10.4 + + Not sure how to handle iOS. + + src/hb-atomic-private.hh | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit e923e6487b25ab86f6f629af480b291e8e5407b5 +Author: Behdad Esfahbod +Date: Sun Dec 9 19:39:40 2012 -0500 + + [coretext] Fixed typo + + Oops. Thanks Khaled for catching this. + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9a8395824bf51c2ff2cfe0887ecad52b3d2c02e2 +Author: Behdad Esfahbod +Date: Sun Dec 9 18:47:36 2012 -0500 + + [coretext] Add hb_coretext_face_get_cg_font() + + Not sure if it's useful, but it was missing. + + src/hb-coretext.cc | 20 ++++++++++++++------ + src/hb-coretext.h | 3 +++ + 2 files changed, 17 insertions(+), 6 deletions(-) + +commit 86112356885fde32163882b6c9dd19a494304f7a +Author: Behdad Esfahbod +Date: Sun Dec 9 18:47:09 2012 -0500 + + [coretext] Remove hack around GlyphID + + We not namespace our types, so the hack is not needed anymore. + + src/hb-coretext.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit 8e58459aeb949591bb5bca340ef9bdd5cfd54e47 +Author: Behdad Esfahbod +Date: Sun Dec 9 18:45:47 2012 -0500 + + [graphite2] "Update to new API" + + Part of patch from Martin Hosken. I believe he knows what he's doing + :). + + src/hb-graphite2.cc | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +commit a5a4ab3846ef06769784e6469d76eace35e68805 +Author: Behdad Esfahbod +Date: Sun Dec 9 18:44:41 2012 -0500 + + [graphite2] Add hb_graphite2_face_get_gr_face and hb_graphite2_font_get_gr_font + + Based on patch from Martin Hosken. I believe it returns NULL if the + font doesn't have graphite tables, but have not tested. + + src/hb-graphite2.cc | 14 ++++++++++++++ + src/hb-graphite2.h | 8 +++++++- + 2 files changed, 21 insertions(+), 1 deletion(-) + +commit 737ba156442f723d126c7c58c73729786b67c17a +Author: Behdad Esfahbod +Date: Sun Dec 9 18:43:03 2012 -0500 + + [graphite2] Preload all tables + + Part of patch from Martin Hosken. + + src/hb-graphite2.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0ae6dbf1b4de8a0326b8a2f201597427cecfb6db +Author: Behdad Esfahbod +Date: Sun Dec 9 18:37:38 2012 -0500 + + Minor + + src/hb-uniscribe.cc | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +commit 3fe5c159d3532f8ce8a85d217a00681225dd8ed1 +Author: Behdad Esfahbod +Date: Sun Dec 9 18:20:19 2012 -0500 + + Remove excess return + + Oops! + + src/hb-uniscribe.cc | 1 - + 1 file changed, 1 deletion(-) + +commit ba2d543004573e8e4e56df70b7fe2a66a42bc83f +Author: Behdad Esfahbod +Date: Sat Dec 8 19:28:41 2012 -0500 + + Update OT language tags + + Patch from Roozbeh Pournader. + + src/hb-ot-tag.cc | 212 +++++++++++++++++++++++++++++-------------------------- + 1 file changed, 110 insertions(+), 102 deletions(-) + +commit aba38173c6b464c2884b73ef6cd4577d4efcebbc +Author: Behdad Esfahbod +Date: Wed Dec 5 19:54:48 2012 -0500 + + Minor + + src/hb-ot-tag.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 61865745e35eb60aeb59968e7826e37059090780 +Author: Behdad Esfahbod +Date: Wed Dec 5 19:42:10 2012 -0500 + + Fix test with gold linker + + Bug 57633 - Symbol tests should ignore __bss_start, _edata, _end + + src/check-exported-symbols.sh | 2 +- + src/check-internal-symbols.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b71b0bd9ee64feadd7289e195bc58f6361ce707a +Author: Behdad Esfahbod +Date: Wed Dec 5 19:20:31 2012 -0500 + + [Indic] Add link to Sinhala split matra section of the Sinhala spec + + src/hb-ot-shape-complex-indic.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 9a34a50daac3563464e0031f377e85f0c704f2d6 +Author: Behdad Esfahbod +Date: Wed Dec 5 19:18:18 2012 -0500 + + Fix build with C++11 + + util/options.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 0beb66e3a61ae8bb1fa66e54b1ff1abb2f8711e9 +Author: Behdad Esfahbod +Date: Wed Dec 5 18:46:04 2012 -0500 + + Fix warnings + + src/hb-fallback-shape.cc | 10 +++++----- + src/hb-glib.cc | 2 +- + src/hb-icu-le.cc | 6 +++--- + src/hb-old.cc | 14 +++++++------- + src/hb-open-type-private.hh | 4 +--- + src/hb-ot-layout-gsubgpos-private.hh | 24 ++++++++++++------------ + src/hb-ot-shape-complex-arabic-fallback.hh | 4 ++-- + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-indic-machine.hh | 2 +- + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + src/hb-ot-shape-complex-indic.cc | 6 +++--- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape-fallback.cc | 4 ++-- + src/hb-private.hh | 8 ++++---- + src/hb-ucdn.cc | 27 +++++++++++++++------------ + src/hb-utf-private.hh | 4 ++-- + 16 files changed, 61 insertions(+), 60 deletions(-) + +commit c6408a1009d2370fbdcfa694898819d99d53c3df +Author: Behdad Esfahbod +Date: Wed Dec 5 17:36:52 2012 -0500 + + 0.9.9 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 130bb3f6144afe5c88bb5b4e4c98e7cba03b1e26 +Author: Behdad Esfahbod +Date: Wed Dec 5 16:49:47 2012 -0500 + + Rename VOID and void_t to have HarfBuzz prefix + + Fixes build on Windows. Ouch! + + src/hb-ot-layout-gsubgpos-private.hh | 22 +++++++++++----------- + src/hb-private.hh | 12 ++++++------ + 2 files changed, 17 insertions(+), 17 deletions(-) + +commit 4a350d0eb25db60d95638664c892d4c8dacf050b +Author: Behdad Esfahbod +Date: Tue Dec 4 17:13:09 2012 -0500 + + [OTLayout] Reuse context in collect_glyphs() recursion + + src/hb-ot-layout-gsubgpos-private.hh | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + +commit 8303593ba1db06e402eab52df47f21f13049112d +Author: Behdad Esfahbod +Date: Tue Dec 4 17:08:41 2012 -0500 + + Minor + + Use pointers instead of references, in preparation for upcoming change. + + src/hb-ot-layout-gpos-table.hh | 28 +++++++++++++------------- + src/hb-ot-layout-gsub-table.hh | 30 ++++++++++++++-------------- + src/hb-ot-layout-gsubgpos-private.hh | 38 ++++++++++++++++++------------------ + 3 files changed, 48 insertions(+), 48 deletions(-) + +commit 1bcfa06d1173f219809542a7380ce77f1c907bec +Author: Behdad Esfahbod +Date: Tue Dec 4 16:58:09 2012 -0500 + + [OTLayout] Don't recurse in collect_glyphs() for GPOS + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit b5e04c7dc6b78e311d1a14f1f808fac76a64c889 +Author: Behdad Esfahbod +Date: Tue Dec 4 15:57:02 2012 -0500 + + [ucdn] Match upstream changes + + src/hb-ucdn/ucdn.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit a52f51b21635c626f6e5ccdba505c4df19bcff2c +Author: Behdad Esfahbod +Date: Tue Dec 4 15:43:38 2012 -0500 + + 0.9.8 + + NEWS | 16 ++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 17 insertions(+), 1 deletion(-) + +commit 7babfe5a7904c26060c5b8441ca1bf23e1444f35 +Author: Behdad Esfahbod +Date: Tue Dec 4 00:35:54 2012 +0200 + + Move object mutext into the user-data array + + We are not using it for anything lse it seems. + + src/hb-common.cc | 12 ++---------- + src/hb-object-private.hh | 24 ++++++++++-------------- + 2 files changed, 12 insertions(+), 24 deletions(-) + +commit a1900114770952778563dd6f3bc79334b0ca8df5 +Author: Behdad Esfahbod +Date: Tue Dec 4 00:29:35 2012 +0200 + + Remove unused functions + + src/hb-object-private.hh | 20 -------------------- + 1 file changed, 20 deletions(-) + +commit 88b7564183ae1cf59500b13c7e48756fe200c7cd +Author: Behdad Esfahbod +Date: Sun Dec 2 19:14:29 2012 +0200 + + "Update" to Unicode 6.2.0 tables + + Nothing changed... + + src/hb-ot-shape-complex-arabic-table.hh | 4 ++-- + src/hb-ot-shape-complex-indic-table.hh | 12 ++++++------ + 2 files changed, 8 insertions(+), 8 deletions(-) + +commit 4ab99fb8c363cfc6a4f5952e69a19757f0cab344 +Author: Behdad Esfahbod +Date: Fri Nov 30 15:02:04 2012 +0200 + + Minor + + src/hb-ot-layout.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6748b96d27477b35dd69129e55d861259d66bf9f +Author: Behdad Esfahbod +Date: Fri Nov 30 12:02:21 2012 +0200 + + Minor + + src/hb-ot-layout.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 624933f67642997ee0a46d5acea285362e837142 +Author: Behdad Esfahbod +Date: Fri Nov 30 11:46:35 2012 +0200 + + Add Persian test cases from Mehran Mehr + + test/shaping/texts/in-tree/shaper-arabic/script-arabic/MANIFEST | 1 + + .../in-tree/shaper-arabic/script-arabic/language-persian/MANIFEST | 1 + + .../shaper-arabic/script-arabic/language-persian/mehran.txt | 8 ++++++++ + 3 files changed, 10 insertions(+) + +commit 0f3f5299047e3cfc4d1202fee83d484b871279ad +Author: Behdad Esfahbod +Date: Fri Nov 30 09:06:59 2012 +0200 + + Add test-size-params + + Eventually this will become part of a yet-to-be-written hb-ot cmdline + tool. + + src/Makefile.am | 10 ++++- + src/test-size-params.cc | 98 +++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 107 insertions(+), 1 deletion(-) + +commit 8465a05a89742295d4b009a9b4442eb0a899fd80 +Author: Behdad Esfahbod +Date: Fri Nov 30 08:46:43 2012 +0200 + + Fix hb_buffer_guess_segment_properties() for empty buffer + + Was causing assertion failure in shape_plan(). + + src/hb-buffer.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e75943de803f571b7ad2cf2f777119753a209656 +Author: Behdad Esfahbod +Date: Fri Nov 30 08:38:24 2012 +0200 + + [OTLayout] Fix collect_glyphs() recursion in ContextFormat3 + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3038ae6adbb61e55d6c665dea0c5271e0c9f0ed8 +Author: Behdad Esfahbod +Date: Fri Nov 30 08:24:13 2012 +0200 + + [OTLayout] Minor + + src/hb-ot-layout-gpos-table.hh | 4 ---- + src/hb-ot-layout-gsub-table.hh | 4 ---- + src/hb-ot-layout.cc | 4 ++-- + 3 files changed, 2 insertions(+), 10 deletions(-) + +commit 0dff11f6bfbda444a153ca75ff2b947f94e9b3c5 +Author: Behdad Esfahbod +Date: Fri Nov 30 08:14:20 2012 +0200 + + [OTLayout] Look for any 'size' feature, not only in DFLT script + + The old code doesn't work with all fonts, as Khaled has reported. + + src/hb-ot-layout.cc | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +commit e9ad71dee845407da74ccacfbb53ad7ededf07fd +Author: Behdad Esfahbod +Date: Fri Nov 30 08:10:26 2012 +0200 + + [OTLayout] Rename hb_ot_layout_position_get_size() to hb_ot_layout_get_size_params() + + src/hb-ot-layout.cc | 4 ++-- + src/hb-ot-layout.h | 7 ++++--- + 2 files changed, 6 insertions(+), 5 deletions(-) + +commit f18ff5a84d9fe859c40a7a0c9a207cb40df0e84a +Author: Behdad Esfahbod +Date: Fri Nov 30 08:07:06 2012 +0200 + + [OTLayout] Return correct value from recursion + + Commit 4c4e8f0e754b79ac6190d21878eaaf0b790c7579 broke contextual lookups + by making the recurse() function always return false. + + Reported by Khaled. Test case: لا in Amiri. + + src/hb-ot-layout-gsubgpos-private.hh | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit f54cce3c6a0432268ce159dbe6c5c6b7f583b87a +Author: Behdad Esfahbod +Date: Mon Nov 26 14:02:31 2012 +0200 + + [OTLayout] Implement 'size' feature + + src/hb-ot-layout-common-private.hh | 36 ++++++++++++++++++++++++++++++++++-- + src/hb-ot-layout.cc | 31 +++++++++++++++++++++++++++++++ + src/hb-ot-layout.h | 5 +++++ + 3 files changed, 70 insertions(+), 2 deletions(-) + +commit 2dc1141d7d0a9f5818862b09d6b9cfe0a27f1fc1 +Author: Behdad Esfahbod +Date: Sat Nov 24 19:16:34 2012 -0500 + + [OTLayout] Remove operator() from ClassDef + + src/hb-ot-layout-common-private.hh | 2 -- + src/hb-ot-layout-gpos-table.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + 3 files changed, 6 insertions(+), 8 deletions(-) + +commit b67881b171a7cf865af58df146da52fc1e27b160 +Author: Behdad Esfahbod +Date: Sat Nov 24 19:13:55 2012 -0500 + + [OTLayout] Remove operator() from Coverage + + src/hb-ot-layout-common-private.hh | 2 -- + src/hb-ot-layout-gdef-table.hh | 4 ++-- + src/hb-ot-layout-gpos-table.hh | 24 ++++++++++++------------ + src/hb-ot-layout-gsub-table.hh | 24 ++++++++++++------------ + src/hb-ot-layout-gsubgpos-private.hh | 16 ++++++++-------- + 5 files changed, 34 insertions(+), 36 deletions(-) + +commit a88e7160217b9f44e4e5b4b814d0ca98c457ee40 +Author: Behdad Esfahbod +Date: Sat Nov 24 02:31:02 2012 -0500 + + [OTLayout] Implement hb_ot_layout_collect_lookups() + + Untested. + + src/hb-ot-layout.cc | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout.h | 4 +-- + 2 files changed, 98 insertions(+), 3 deletions(-) + +commit 1ea375da446bf68f705a70ce4a480db9fb9d13f3 +Author: Behdad Esfahbod +Date: Sat Nov 24 02:05:52 2012 -0500 + + [OTLayout] Only collect output glyphs during recursion in collect_glyphs() + + src/hb-ot-layout-gsubgpos-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit f1b12781d279a73b5754afee31e930b5cd87aac6 +Author: Behdad Esfahbod +Date: Sat Nov 24 01:55:34 2012 -0500 + + [OTLayout] Implement ChainContext collect_glyphs() + + All of collect_glyphs() complete and untested now. + + src/hb-ot-layout-gsubgpos-private.hh | 103 ++++++++++++++++++++++++++++++++--- + 1 file changed, 96 insertions(+), 7 deletions(-) + +commit cdd756b9f40665a201f5c4e65a87b9a27c390601 +Author: Behdad Esfahbod +Date: Sat Nov 24 01:38:41 2012 -0500 + + [OTLayout] Implement GPOS collect_glyphs() + + src/hb-ot-layout-gpos-table.hh | 95 +++++++++++++++++++++++++++++++++++++++++- + src/hb-ot-layout.cc | 9 ++-- + 2 files changed, 99 insertions(+), 5 deletions(-) + +commit 4c4e8f0e754b79ac6190d21878eaaf0b790c7579 +Author: Behdad Esfahbod +Date: Sat Nov 24 01:13:20 2012 -0500 + + [OTLayout] Reuse apply context for recursion + + src/hb-ot-layout-gpos-table.hh | 7 ++++++- + src/hb-ot-layout-gsub-table.hh | 7 ++++++- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + 3 files changed, 16 insertions(+), 6 deletions(-) + +commit 53a69f49e58ef4c4226958e0496fc22455ee6c87 +Author: Behdad Esfahbod +Date: Sat Nov 24 01:03:05 2012 -0500 + + [OTLayout] Remove unused members + + src/hb-ot-layout-gsubgpos-private.hh | 3 --- + 1 file changed, 3 deletions(-) + +commit d0a5233785eb327c4080432f597fe470a1046af3 +Author: Behdad Esfahbod +Date: Fri Nov 23 18:54:59 2012 -0500 + + [OTLayout] Implement Context::collect_glyphs() + + src/hb-ot-layout-gsubgpos-private.hh | 122 +++++++++++++++++++++++++++++++---- + 1 file changed, 111 insertions(+), 11 deletions(-) + +commit 26514d51b6669f092d9ccb7523443a5ece74169a +Author: Behdad Esfahbod +Date: Fri Nov 23 18:13:48 2012 -0500 + + [OTLayout] More collect_glyphs() + + src/hb-ot-layout-gpos-table.hh | 6 ++--- + src/hb-ot-layout-gsub-table.hh | 32 +++++++++++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 51 ++++++++++++++++++++++++++++++++---- + 3 files changed, 71 insertions(+), 18 deletions(-) + +commit c6fb843f2a1c26322c6f4c85d1589f01a9e7a2ef +Author: Behdad Esfahbod +Date: Fri Nov 23 18:04:08 2012 -0500 + + [OTLayout] Templatize process_recurse_func + + src/hb-ot-layout-gpos-table.hh | 10 ++++++++++ + src/hb-ot-layout-gsub-table.hh | 8 +++++--- + 2 files changed, 15 insertions(+), 3 deletions(-) + +commit 9b34677f362fb0ef5a7cb8a284a9e06d1a4cc03b +Author: Behdad Esfahbod +Date: Fri Nov 23 17:55:40 2012 -0500 + + [OTLayout] Clean up closure() a bit + + src/hb-ot-layout-gsub-table.hh | 29 ++++++++++++++--------------- + src/hb-ot-layout-gsubgpos-private.hh | 7 ++++--- + src/hb-ot-layout.cc | 6 +++++- + 3 files changed, 23 insertions(+), 19 deletions(-) + +commit adf7758a27a11fb1a8a14a2673867589437d22a3 +Author: Behdad Esfahbod +Date: Fri Nov 23 17:32:00 2012 -0500 + + Improve debug log format in presence of templates + + src/hb-private.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 2c53bd3c3ec4f81eff126c5bf84b7f2ddf2f0fef +Author: Behdad Esfahbod +Date: Fri Nov 23 17:29:05 2012 -0500 + + [OTLayout] Start porting sanitize() to process() + + src/hb-open-type-private.hh | 12 +++++++++++- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + 2 files changed, 15 insertions(+), 5 deletions(-) + +commit f48ec0e83432c038b50d9715a38ba1469e82e1e4 +Author: Behdad Esfahbod +Date: Fri Nov 23 17:23:41 2012 -0500 + + [OTLayout] Add process() tracing + + src/hb-ot-layout-gpos-table.hh | 60 ++++++++++++++++++++---------------- + src/hb-ot-layout-gsub-table.hh | 51 +++++++++++++++++------------- + src/hb-ot-layout-gsubgpos-private.hh | 17 +++++----- + 3 files changed, 72 insertions(+), 56 deletions(-) + +commit ed2e13594479c6ed7909401509962ea2f03f9a6e +Author: Behdad Esfahbod +Date: Fri Nov 23 17:10:40 2012 -0500 + + [OTLayout] More Extension templatizing + + src/hb-ot-layout-gpos-table.hh | 11 ----------- + src/hb-ot-layout-gsub-table.hh | 11 ----------- + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++++++-- + 3 files changed, 10 insertions(+), 24 deletions(-) + +commit 7dddd4e72bc35be962d93dc1b76c7e26c63aaa6d +Author: Behdad Esfahbod +Date: Fri Nov 23 17:04:55 2012 -0500 + + [OTLayout] More templatizing Extension + + src/hb-ot-layout-gpos-table.hh | 7 +------ + src/hb-ot-layout-gsub-table.hh | 9 ++------- + src/hb-ot-layout-gsubgpos-private.hh | 10 +++++++++- + 3 files changed, 12 insertions(+), 14 deletions(-) + +commit 653eeb26450053b731b46346606931f5ae88db72 +Author: Behdad Esfahbod +Date: Fri Nov 23 16:57:36 2012 -0500 + + Make Extension a template + + src/hb-ot-layout-gpos-table.hh | 11 +---------- + src/hb-ot-layout-gsub-table.hh | 11 +---------- + src/hb-ot-layout-gsubgpos-private.hh | 7 +++++++ + 3 files changed, 9 insertions(+), 20 deletions(-) + +commit 08f1eede1bbc01ece2adf89847614a0670e50443 +Author: Behdad Esfahbod +Date: Fri Nov 23 16:51:43 2012 -0500 + + Minor + + src/hb-ot-layout-gpos-table.hh | 19 ++----------------- + src/hb-ot-layout-gsub-table.hh | 19 ++----------------- + 2 files changed, 4 insertions(+), 34 deletions(-) + +commit 2c9d6485a1f89c11f84e720d3c7978dc11a5039a +Author: Behdad Esfahbod +Date: Fri Nov 23 16:49:19 2012 -0500 + + More tracing fixup + + src/hb-private.hh | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit a1733db1c6ff40aae71fa142a12b1fea7b53dd37 +Author: Behdad Esfahbod +Date: Fri Nov 23 16:40:04 2012 -0500 + + [OTLayout] Start adding process() tracing + + src/hb-ot-layout-gsubgpos-private.hh | 44 +++++++++++++++++++++++++++--------- + src/hb-private.hh | 6 +++-- + 2 files changed, 37 insertions(+), 13 deletions(-) + +commit 73c18ae1b982a4e65086afe5177afa79e721e2c0 +Author: Behdad Esfahbod +Date: Fri Nov 23 15:34:11 2012 -0500 + + Cleanup + + src/hb-ot-layout-gsubgpos-private.hh | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +commit be218c688cbb037a99c8c64bb835f3c980040c0b +Author: Behdad Esfahbod +Date: Fri Nov 23 15:32:14 2012 -0500 + + Pass this object to trace macros + + src/hb-open-file-private.hh | 10 +-- + src/hb-open-type-private.hh | 34 +++++----- + src/hb-ot-head-table.hh | 2 +- + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-ot-layout-common-private.hh | 36 +++++------ + src/hb-ot-layout-gdef-table.hh | 20 +++--- + src/hb-ot-layout-gpos-table.hh | 80 +++++++++++------------ + src/hb-ot-layout-gsub-table.hh | 122 +++++++++++++++++------------------ + src/hb-ot-layout-gsubgpos-private.hh | 100 ++++++++++++++-------------- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-name-table.hh | 6 +- + 12 files changed, 208 insertions(+), 208 deletions(-) + +commit 902cc8aca0b3ff25eeee50b3a84d729e31731ef3 +Author: Behdad Esfahbod +Date: Fri Nov 23 15:06:59 2012 -0500 + + [OTLayout] Start unbreaking tracing + + src/hb-open-type-private.hh | 37 +++++++++++++++++++++--------------- + src/hb-ot-layout-gsubgpos-private.hh | 37 +++++++++++++++++++++++++----------- + src/hb-private.hh | 30 +++++++++++++++++++---------- + 3 files changed, 68 insertions(+), 36 deletions(-) + +commit dabe698fcbeb02911128b17aa8e3b2d864795960 +Author: Behdad Esfahbod +Date: Fri Nov 23 14:21:35 2012 -0500 + + Minor + + src/hb-open-type-private.hh | 5 ----- + src/hb-ot-layout-gsubgpos-private.hh | 10 ++++------ + src/hb-private.hh | 27 +++++++++++++++++++++++++-- + 3 files changed, 29 insertions(+), 13 deletions(-) + +commit c779d82b2fc801eec0d349a106c0e860448fcf4e +Author: Behdad Esfahbod +Date: Fri Nov 23 14:07:24 2012 -0500 + + Fix warnings + + src/hb-ot-layout-gpos-table.hh | 2 -- + src/hb-ot-layout-gsub-table.hh | 8 +++----- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-private.hh | 2 +- + 4 files changed, 5 insertions(+), 9 deletions(-) + +commit 81822528efc63d867cb2343a8ff7af64fac1c70d +Author: Behdad Esfahbod +Date: Fri Nov 23 13:27:16 2012 -0500 + + Minor + + src/hb-open-type-private.hh | 6 ++++++ + src/hb-ot-layout-gsubgpos-private.hh | 3 --- + 2 files changed, 6 insertions(+), 3 deletions(-) + +commit 1d67ef980f35ae30d4f8975f65ee07b8cc5deeea +Author: Behdad Esfahbod +Date: Thu Nov 22 16:47:53 2012 -0500 + + Move code around + + src/hb-ot-layout-gsubgpos-private.hh | 44 ++++++++++++++++++------------------ + 1 file changed, 22 insertions(+), 22 deletions(-) + +commit ec35a72a44301934b8f123ab2833f59d8c875a09 +Author: Behdad Esfahbod +Date: Thu Nov 22 16:05:59 2012 -0500 + + [OTLayout] Port apply() operator to process() template + + src/hb-ot-layout-gpos-table.hh | 117 ++++------------------------------- + src/hb-ot-layout-gsub-table.hh | 108 +++----------------------------- + src/hb-ot-layout-gsubgpos-private.hh | 99 +++++++++++++---------------- + src/hb-ot-layout.cc | 2 +- + 4 files changed, 65 insertions(+), 261 deletions(-) + +commit 2005fa5340fc528c32dc2af945ad2431964a47d2 +Author: Behdad Esfahbod +Date: Thu Nov 22 14:38:10 2012 -0500 + + [OTLayout] Port would_apply() and get_coverage() to process() templates + + src/hb-ot-layout-gpos-table.hh | 175 +++++++++++-------------------- + src/hb-ot-layout-gsub-table.hh | 198 ++++++++++++----------------------- + src/hb-ot-layout-gsubgpos-private.hh | 76 +++++--------- + 3 files changed, 156 insertions(+), 293 deletions(-) + +commit 44fc237b53ebfbaf8a539de16ad735d2c6afc52b +Author: Behdad Esfahbod +Date: Wed Nov 21 23:33:13 2012 -0500 + + [OTLayout] Port closure() to process() template + + src/hb-ot-layout-gsub-table.hh | 297 ++++++++--------------------------- + src/hb-ot-layout-gsubgpos-private.hh | 209 ++++++++++++------------ + src/hb-ot-layout.cc | 10 +- + 3 files changed, 171 insertions(+), 345 deletions(-) + +commit 5be86b1bb4fbb37b50a1e2798df0c9a3a528b6b2 +Author: Behdad Esfahbod +Date: Thu Nov 22 16:26:22 2012 -0500 + + [ucdn] Make data tables const! + + src/hb-ucdn/ucdn.c | 16 ++++++++-------- + src/hb-ucdn/unicodedata_db.h | 28 ++++++++++++++-------------- + 2 files changed, 22 insertions(+), 22 deletions(-) + +commit 7c5b7fe686c9163afe2f31fbeac6f8c8512f5516 +Author: Behdad Esfahbod +Date: Thu Nov 22 14:15:08 2012 -0500 + + Fix hb_shape_plan_get_shaper() + + src/hb-shape-plan.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 4c8963576573483269b327c6465f6ec99f489e05 +Author: Behdad Esfahbod +Date: Wed Nov 21 01:20:56 2012 -0500 + + 0.9.7 + + NEWS | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 87 insertions(+), 1 deletion(-) + +commit ac064a2db2b7a010d99527e183145286215aea81 +Author: Behdad Esfahbod +Date: Wed Nov 21 01:14:19 2012 -0500 + + Rename hb_set_population() to hb_set_get_population() + + src/hb-set.cc | 2 +- + src/hb-set.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 16c914c2a6efeb6999054333985b1f711e33cf94 +Author: Behdad Esfahbod +Date: Wed Nov 21 01:04:15 2012 -0500 + + [Indic] One more try at unbreaking Khmer fonts + + See comments and discussion on the list. + + src/hb-ot-shape-complex-private.hh | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +commit e8cfdd7fa8d0fb66e0a261f3547e5824897e5131 +Author: Behdad Esfahbod +Date: Fri Nov 16 19:07:06 2012 -0800 + + Start implementing collect_glyphs() operation + + Not functional yet. + + src/hb-ot-layout-gsub-table.hh | 185 +++++++++++++++++++++++++++++++++++ + src/hb-ot-layout-gsubgpos-private.hh | 57 +++++++++++ + src/hb-ot-layout.cc | 29 ++++++ + src/hb-ot-layout.h | 4 +- + 4 files changed, 272 insertions(+), 3 deletions(-) + +commit 7d52e6601f0e695690cd168a288466746cf25300 +Author: Behdad Esfahbod +Date: Fri Nov 16 18:49:54 2012 -0800 + + Whitespace + + src/hb-coretext.cc | 32 +++++----- + src/hb-icu-le.cc | 2 +- + src/hb-old.cc | 10 ++-- + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 2 +- + src/hb-ot-head-table.hh | 2 +- + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-name-table.hh | 2 +- + src/hb-ot-shape-complex-default.cc | 109 ++++++++++++++++++----------------- + src/hb-tt-font.cc | 2 +- + 17 files changed, 87 insertions(+), 92 deletions(-) + +commit 51bb498b7b07bff4a447405b72f09b68d07a3e95 +Author: Behdad Esfahbod +Date: Fri Nov 16 14:08:05 2012 -0800 + + Minor + + src/hb-ot-shape.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 89ca8eeb83fedde06727d386369a0a39d410f12b +Author: Behdad Esfahbod +Date: Fri Nov 16 13:53:40 2012 -0800 + + Implement hb_ot_layout_get_glyphs_in_class() + + src/hb-ot-layout-common-private.hh | 24 ++++++++++++++++++++++++ + src/hb-ot-layout-gdef-table.hh | 2 ++ + src/hb-ot-layout.cc | 8 ++++++++ + src/hb-ot-layout.h | 5 ++--- + 4 files changed, 36 insertions(+), 3 deletions(-) + +commit 5a08ecf9200a6ac9b4ebb7ec5c13dcb42d8820ce +Author: Behdad Esfahbod +Date: Fri Nov 16 13:34:29 2012 -0800 + + Implement hb_ot_layout_get_glyph_class() + + src/hb-ot-layout-gdef-table.hh | 10 +++++----- + src/hb-ot-layout-gpos-table.hh | 8 ++++---- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 10 +++++----- + src/hb-ot-layout-private.hh | 10 +++++++++- + src/hb-ot-layout.cc | 6 ++++++ + src/hb-ot-layout.h | 14 ++++++-------- + src/hb-ot-shape.cc | 4 ++-- + 8 files changed, 38 insertions(+), 26 deletions(-) + +commit f9edd5d56bd219625f5b16b23eac53b4c4a8b194 +Author: Behdad Esfahbod +Date: Fri Nov 16 13:23:37 2012 -0800 + + Implement hb_shape_plan_get_shaper() + + Untested. + + src/hb-shape-plan-private.hh | 1 + + src/hb-shape-plan.cc | 7 +++++++ + src/hb-shape-plan.h | 4 +--- + 3 files changed, 9 insertions(+), 3 deletions(-) + +commit 43b653150081a2f9dc6b7481229ac4cd952575dc +Author: Behdad Esfahbod +Date: Fri Nov 16 13:12:35 2012 -0800 + + [Indic] Another try to unbreak Sinhala split matras + + Just read the comments... + + src/hb-ot-shape-complex-indic.cc | 43 ++++++++++++++++++---- + .../indic/script-sinhala/misc/MANIFEST | 1 + + .../indic/script-sinhala/misc/split-matras.txt | 4 ++ + 3 files changed, 40 insertions(+), 8 deletions(-) + +commit 977f1740ace730dcdff8221a17f2a592c2ec7c74 +Author: Behdad Esfahbod +Date: Fri Nov 16 13:10:07 2012 -0800 + + Unbreak tests + + src/hb-ot-layout.h | 14 +++++++------- + src/hb-shape-plan.h | 2 +- + 2 files changed, 8 insertions(+), 8 deletions(-) + +commit eba312c8d1b2bbe8cb9b6414e843e78d2c521aa4 +Author: Behdad Esfahbod +Date: Fri Nov 16 12:39:23 2012 -0800 + + Plumbing to get shape plan and font into complex decompose function + + So we can handle Sinhala split matras smartly... Coming soon. + + src/hb-ot-shape-complex-default.cc | 6 ++-- + src/hb-ot-shape-complex-indic.cc | 14 ++++----- + src/hb-ot-shape-complex-private.hh | 16 +++++------ + src/hb-ot-shape-normalize-private.hh | 22 ++++++++++++-- + src/hb-ot-shape-normalize.cc | 56 ++++++++++++++---------------------- + src/hb-ot-shape.cc | 2 +- + 6 files changed, 61 insertions(+), 55 deletions(-) + +commit 3f82f8ff07a9d16a7c047129658c1bbedfdb5436 +Author: Behdad Esfahbod +Date: Thu Nov 15 18:45:31 2012 -0800 + + Rename hb_buffer_guess_properties() to hb_buffer_guess_segment_properties() + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 6 +++--- + src/hb-buffer.h | 2 +- + src/hb-fallback-shape.cc | 2 +- + src/hb-ot-shape.cc | 2 +- + src/hb-shape.cc | 2 +- + 6 files changed, 8 insertions(+), 8 deletions(-) + +commit f30641038ba96e83950729b1bd9d86d2e98e46c5 +Author: Behdad Esfahbod +Date: Thu Nov 15 18:39:46 2012 -0800 + + Bunch of independent changes (ouch) + + API additions: + + hb_segment_properties_t + HB_SEGMENT_PROPERTIES_DEFAULT + hb_segment_properties_equal() + hb_segment_properties_hash() + + hb_buffer_set_segment_properties() + hb_buffer_get_segment_properties() + + hb_ot_layout_glyph_class_t + + hb_shape_plan_t + hb_shape_plan_create() + hb_shape_plan_create_cached() + hb_shape_plan_get_empty() + hb_shape_plan_reference() + hb_shape_plan_destroy() + hb_shape_plan_set_user_data() + hb_shape_plan_get_user_data() + hb_shape_plan_execute() + + hb_ot_shape_plan_collect_lookups() + + API changes: + + Rename hb_ot_layout_feature_get_lookup_indexes() to + hb_ot_layout_feature_get_lookups(). + + New header file: + + hb-shape-plan.h + + And a bunch of prototyped but not implemented stuff. Coming soon. + (Tests fail because of the prototypes right now.) + + src/Makefile.am | 2 +- + src/hb-buffer-private.hh | 37 --------------- + src/hb-buffer.cc | 45 +++++++++++++++++- + src/hb-buffer.h | 47 +++++++++++++++++-- + src/hb-ot-layout-private.hh | 8 ---- + src/hb-ot-layout.cc | 12 ++--- + src/hb-ot-layout.h | 108 ++++++++++++++++++++++++++++++++++++++++--- + src/hb-ot-map-private.hh | 2 +- + src/hb-ot-map.cc | 15 +++--- + src/hb-ot-shape-private.hh | 11 ++++- + src/hb-ot-shape.cc | 52 ++++++++++++++------- + src/hb-ot.h | 1 + + src/hb-shape-plan-private.hh | 3 +- + src/hb-shape-plan.cc | 23 +++++++-- + src/hb-shape-plan.h | 50 +++++++++++++------- + src/hb-shaper-private.hh | 2 - + src/hb-shaper.cc | 2 +- + src/hb.h | 1 + + 18 files changed, 304 insertions(+), 117 deletions(-) + +commit 75da37dcb17aacc0be6bb006683a84aa31155938 +Author: Behdad Esfahbod +Date: Thu Nov 15 18:39:23 2012 -0800 + + Minor + + util/hb-ot-shape-closure.cc | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit e05a999495e6575f7cebd7f35db087d964f11ef6 +Author: Behdad Esfahbod +Date: Thu Nov 15 16:23:21 2012 -0800 + + Add hb_face_[sg]et_glyph_count() + + src/hb-font-private.hh | 9 +++++++++ + src/hb-font.cc | 29 ++++++++++++++++++++++++++++- + src/hb-font.h | 7 +++++++ + 3 files changed, 44 insertions(+), 1 deletion(-) + +commit aec89de5641fbe1c3031d63dd5f40ec99bf2a538 +Author: Behdad Esfahbod +Date: Thu Nov 15 16:15:42 2012 -0800 + + Add / modify set API a bit + + src/hb-ot-shape.cc | 2 +- + src/hb-set-private.hh | 35 ++++++++++++++++-- + src/hb-set.cc | 86 ++++++++++++++++++++++++++++++--------------- + src/hb-set.h | 55 +++++++++++++++++++---------- + util/hb-ot-shape-closure.cc | 2 +- + 5 files changed, 128 insertions(+), 52 deletions(-) + +commit c54599ad269380c7aa28d885fcfd660fc2c10a7b +Author: Behdad Esfahbod +Date: Thu Nov 15 16:14:23 2012 -0800 + + Minor + + src/hb-buffer.cc | 2 +- + src/hb-buffer.h | 8 +++----- + 2 files changed, 4 insertions(+), 6 deletions(-) + +commit d1aa143ca434fe272de21d2002768c83387b583b +Author: Behdad Esfahbod +Date: Thu Nov 15 15:38:08 2012 -0800 + + [Thai] Remove U+0E2C from "AC" consonants + + WinXP doesn't include it. + + src/hb-ot-shape-complex-thai.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 362a990b2246f5448ecb9d600761f710aea7d42d +Author: Behdad Esfahbod +Date: Thu Nov 15 14:57:31 2012 -0800 + + Rename hb_ot_layout_would_substitute_lookup() and hb_ot_layout_substitute_closure_lookup() + + To match upcoming API. + + src/hb-ot-layout-private.hh | 2 +- + src/hb-ot-layout.cc | 8 ++++---- + src/hb-ot-layout.h | 4 ++-- + src/hb-ot-map.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/test-would-substitute.cc | 2 +- + 6 files changed, 10 insertions(+), 10 deletions(-) + +commit a4bef84e375b090c1bc7e4221b8e0ee435dfcbba +Author: Behdad Esfahbod +Date: Thu Nov 15 13:29:51 2012 -0800 + + [util] Make hb-shape err if output-format is not understood + + And list supported formats. + + util/hb-shape.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 3cec819d39e45470d03085bb6fa132882cc85943 +Author: Behdad Esfahbod +Date: Thu Nov 15 13:15:39 2012 -0800 + + Make the OT shaper default, even if CoreText or Uniscribe is enabled + + src/hb-shaper-list.hh | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +commit 072ae7a982bf640804eee0b41525e7c328806bf5 +Author: Behdad Esfahbod +Date: Thu Nov 15 13:14:12 2012 -0800 + + Add hb_buffer_serialize_list_formats() + + src/hb-buffer.cc | 6 ++++++ + src/hb-buffer.h | 3 +++ + 2 files changed, 9 insertions(+) + +commit f9edf1672511c3bcc3796cc79578ffea43b2bda1 +Author: Behdad Esfahbod +Date: Thu Nov 15 12:14:09 2012 -0800 + + Add buffer serialization / deserialization API + + Two output formats for now: TEXT, and JSON. For example: + + hb-shape --output-format=json + + Deserialization API is added, but not implemented yet. + + src/hb-buffer.cc | 222 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-buffer.h | 42 +++++++++++ + util/hb-shape.cc | 21 +++++- + util/options.cc | 57 +++++--------- + util/options.hh | 7 +- + 5 files changed, 304 insertions(+), 45 deletions(-) + +commit fd0de881f4fc004da6f36d50a91d0e62f8eb4d8c +Author: Behdad Esfahbod +Date: Thu Nov 15 10:47:14 2012 -0800 + + Avoid C++ undefined behavior + + https://bugzilla.mozilla.org/show_bug.cgi?id=810823 + + src/hb-open-type-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f41dc2d35b23220d59d38990bb66f1cbd66a55b3 +Author: Behdad Esfahbod +Date: Thu Nov 15 10:36:43 2012 -0800 + + Fix undefined behavior in Indic dottedcircle + + Chromium Issue 158998: Conditional jump in harfbuzz-ng + http://code.google.com/p/chromium/issues/detail?id=158998 + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1eb3e94fe99a072ce422e60ac4d4d89ef489b08a +Author: Behdad Esfahbod +Date: Wed Nov 14 17:25:03 2012 -0800 + + [Thai] Implement PUA-based fallback shaping + + As explained here: + + http://linux.thai.net/~thep/th-otf/shaping.html + + Our output now matches Uniscribe for old fonts (eg. XP Tahoma) with no + Thai GSUB table. + + src/hb-ot-shape-complex-thai.cc | 217 ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 217 insertions(+) + +commit 851784f8372004e0a40b698c0cdc2d7db8629aa2 +Author: Behdad Esfahbod +Date: Wed Nov 14 16:24:05 2012 -0800 + + Improve shaper selection + + src/hb-ot-map-private.hh | 8 ++++---- + src/hb-ot-map.cc | 6 ++++-- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 13 ++++++++----- + src/hb-ot-shape-complex-thai.cc | 24 ++++++++++++++++++++++-- + 5 files changed, 39 insertions(+), 14 deletions(-) + +commit f3584d3a3a627e38dfd7769975a670db340d2a48 +Author: Behdad Esfahbod +Date: Wed Nov 14 15:55:17 2012 -0800 + + Add test cases for Thai PUA shaping + + .../texts/in-tree/shaper-thai/script-thai/misc/MANIFEST | 1 + + .../in-tree/shaper-thai/script-thai/misc/pua-shaping.txt | 11 +++++++++++ + 2 files changed, 12 insertions(+) + +commit 43f04a7456419153cb03e610a825056a47824780 +Author: Behdad Esfahbod +Date: Wed Nov 14 15:51:54 2012 -0800 + + Move Thai shaper into a separate file + + src/Makefile.am | 3 +- + ...plex-misc.cc => hb-ot-shape-complex-default.cc} | 114 ----------------- + src/hb-ot-shape-complex-thai.cc | 141 +++++++++++++++++++++ + 3 files changed, 143 insertions(+), 115 deletions(-) + +commit ba82325b7a6311b787ae47f41a56964e2f2cba9f +Author: Behdad Esfahbod +Date: Wed Nov 14 15:36:53 2012 -0800 + + Add note re 'Phags-pa letter U+A872, which is Joining_Type=L + + src/hb-ot-shape-complex-arabic.cc | 1 + + 1 file changed, 1 insertion(+) + +commit d469fadce8290c7dda559c5927dd19df65f91c1a +Author: Behdad Esfahbod +Date: Wed Nov 14 15:07:36 2012 -0800 + + [Indic] Exchange abort() for assert() + + src/hb-ot-shape-complex-indic.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 0f80a89de99293ddbf0b8b815fe360677d057e38 +Author: Behdad Esfahbod +Date: Wed Nov 14 15:05:19 2012 -0800 + + Don't route Kharoshthi through the Indic shaper + + It's a simple, right-to-left, script. + + src/hb-ot-shape-complex-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e67072bb179a5c17db04075de74215597fb43c82 +Author: Behdad Esfahbod +Date: Wed Nov 14 15:00:53 2012 -0800 + + [Indic] Handle overstruck matra position + + src/hb-ot-shape-complex-indic-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 7e99e4f0740e47efda5882604954cb7d12700a4b +Author: Behdad Esfahbod +Date: Wed Nov 14 14:09:46 2012 -0800 + + Reposition Lao marks + + Lao marks are center-aligned, unlike Thai ones. + + src/hb-ot-shape-fallback.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 865745b5b87236651f5663cae3461db9cb505eed +Author: Behdad Esfahbod +Date: Wed Nov 14 13:48:26 2012 -0800 + + Don't do fallback positioning for Indic and Thai shapers + + src/hb-ot-shape-complex-arabic.cc | 1 + + src/hb-ot-shape-complex-indic.cc | 1 + + src/hb-ot-shape-complex-misc.cc | 2 ++ + src/hb-ot-shape-complex-private.hh | 1 + + src/hb-ot-shape.cc | 20 +++++--------------- + 5 files changed, 10 insertions(+), 15 deletions(-) + +commit 981748cb2e9b48b77177b19ec1f972cab7afda89 +Author: Behdad Esfahbod +Date: Wed Nov 14 13:38:16 2012 -0800 + + [Indic] If Khmer fonts have a 'liga' feature, use generic shaper + + Seems to produce more coherent results than trying the Indic shaper on + them. I'm looking at you, Kh-* fonts... + + src/hb-ot-shape-complex-private.hh | 21 +++++++++++++++++---- + 1 file changed, 17 insertions(+), 4 deletions(-) + +commit 6b19fa48621dbf36d471d5005f6ae20df350954f +Author: Behdad Esfahbod +Date: Wed Nov 14 11:38:50 2012 -0800 + + Adjust diff rule for the new hb-shape output format + + test/shaping/hb_test_tools.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dde5506fd963e3cec27c3389bb1fc092f86d1e06 +Author: Behdad Esfahbod +Date: Wed Nov 14 11:37:04 2012 -0800 + + [Indic] Don't move virama with left matra + + This is important for the Sinhala U+0DDA split matra since it decomposes + to U+0DD9,U+0DCA where U+0DD9 is a left matra and U+0DCA is the virama. + We don't want to move the virama with the left matra. + TEST: U+0D9A,U+0DDA + + Note that we were already doing this in the Uniscribe bug compatibility + mode. We now do it all the time. + + src/hb-ot-shape-complex-indic.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 82c4d9880a2cd321f6426888511c5f0318f96ad5 +Author: Behdad Esfahbod +Date: Wed Nov 14 10:56:02 2012 -0800 + + Add Sinhala test case for split matra U+0DDA + + .../texts/in-tree/shaper-indic/indic/script-sinhala/misc/misc.txt | 1 + + 1 file changed, 1 insertion(+) + +commit d04b12853167d756a8cccaf4154f0fd894bce6de +Author: Behdad Esfahbod +Date: Wed Nov 14 10:53:10 2012 -0800 + + Fix test + + test/api/test-buffer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 92f9bfed42f720c1fd78e795845542661aaf4f8a +Author: Behdad Esfahbod +Date: Tue Nov 13 16:50:45 2012 -0800 + + Minor + + src/hb-buffer.h | 26 ++++++++++++++------------ + 1 file changed, 14 insertions(+), 12 deletions(-) + +commit 66ac2ff32e24f0d5658ca172147613081a133847 +Author: Behdad Esfahbod +Date: Tue Nov 13 16:26:32 2012 -0800 + + API change: Remove "mask" from hb_buffer_add() + + I don't expect anybody using hb_buffer_add(), so this shouldn't break + anyone's code. + + src/hb-buffer-private.hh | 1 - + src/hb-buffer.cc | 8 +++----- + src/hb-buffer.h | 1 - + 3 files changed, 3 insertions(+), 7 deletions(-) + +commit 407f80d62589774f845ef1a6a0a7d841b09d57c6 +Author: Behdad Esfahbod +Date: Tue Nov 13 15:33:27 2012 -0800 + + [util] Add --bot / --eot / --preserve-default-ignorables + + util/options.cc | 3 +++ + util/options.hh | 12 ++++++++++++ + 2 files changed, 15 insertions(+) + +commit 78d41d8d69142ae95928b51215c0c0c5e3f5b3f0 +Author: Behdad Esfahbod +Date: Tue Nov 13 15:15:09 2012 -0800 + + Minor + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 321f73c16efa0730c96e001d65268f4927a0f735 +Author: Behdad Esfahbod +Date: Tue Nov 13 15:12:24 2012 -0800 + + [util] Add --text-before and --text-after to hb-shape / hb-view + + Use with Arabic, for example, to see the effect on joining. + + util/hb-ot-shape-closure.cc | 4 +++- + util/main-font-text.hh | 2 +- + util/options.cc | 2 ++ + util/options.hh | 18 ++++++++++++++++-- + util/shape-consumer.hh | 6 ++++-- + 5 files changed, 26 insertions(+), 6 deletions(-) + +commit e13f8d280bafc6a6b6e31e2eee587660b8333c56 +Author: Behdad Esfahbod +Date: Tue Nov 13 15:12:06 2012 -0800 + + Fix UTF-8 backward iteration + + Ouch! + + src/hb-utf-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5669a6cf418f3a8b9281c36e9d662d843be80433 +Author: Behdad Esfahbod +Date: Tue Nov 13 15:11:51 2012 -0800 + + [Arabic] Fix post-context handling + + Ouch! + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0c7df2222862122ebbdc8665a21d6771ef5e0252 +Author: Behdad Esfahbod +Date: Tue Nov 13 14:42:35 2012 -0800 + + Add buffer flags + + New API: + + hb_buffer_flags_t + + HB_BUFFER_FLAGS_DEFAULT + HB_BUFFER_FLAG_BOT + HB_BUFFER_FLAG_EOT + HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES + + hb_buffer_set_flags() + hb_buffer_get_flags() + + We use the BOT flag to decide whether to insert dottedcircle if the + first char in the buffer is a combining mark. + + The PRESERVE_DEFAULT_IGNORABLES flag prevents removal of characters like + ZWNJ/ZWJ/... + + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 18 ++++++++++++++++++ + src/hb-buffer.h | 13 +++++++++++++ + src/hb-ot-shape-complex-arabic.cc | 40 ++++++++++++++++++++------------------- + src/hb-ot-shape.cc | 9 ++++++--- + test/api/test-buffer.c | 9 +++++++++ + 6 files changed, 68 insertions(+), 22 deletions(-) + +commit 1c7e55511a870f2689680ca8f977e00879f3b3e3 +Author: Behdad Esfahbod +Date: Tue Nov 13 14:42:22 2012 -0800 + + Minor fix + + Ouch + + src/hb-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c8d4f8b0fe56ce909e3ca07f8a30cb4fb940868b +Author: Behdad Esfahbod +Date: Tue Nov 13 14:10:19 2012 -0800 + + Minor + + test/api/test-object.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 82ecaff736e245e117d70b6ec1497508c6eb08d2 +Author: Behdad Esfahbod +Date: Tue Nov 13 13:57:52 2012 -0800 + + Add hb_buffer_clear() + + Which is like _reset(), but does NOT clear unicode-funcs. + + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 15 +++++++++++++++ + src/hb-buffer.h | 4 ++++ + test/api/test-buffer.c | 22 +++++++++++++++++++++- + 4 files changed, 41 insertions(+), 1 deletion(-) + +commit da43a92b04929e93356ae393803ef101154d2267 +Author: Behdad Esfahbod +Date: Tue Nov 13 13:48:26 2012 -0800 + + 0.9.6 + + NEWS | 28 ++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 29 insertions(+), 1 deletion(-) + +commit 0736915b8ed789a209205fec762997af3a8af89c +Author: Behdad Esfahbod +Date: Tue Nov 13 12:35:35 2012 -0800 + + [Indic] Decompose Sinhala split matras the way old HarfBuzz / Pango did + + Had to do some refactoring to make this happen... + + Under uniscribe bug compatibility mode, we still plit them + Uniscrie-style, but Jonathan and I convinced ourselves that there is no + harm doing this the Unicode way. This change makes that happen, and + unbreaks free Sinhala fonts. + + src/hb-ot-shape-complex-arabic.cc | 2 + + src/hb-ot-shape-complex-indic.cc | 74 +++++++++- + src/hb-ot-shape-complex-misc.cc | 133 ++++++++++++++++- + src/hb-ot-shape-complex-private.hh | 28 +++- + src/hb-ot-shape-normalize-private.hh | 6 +- + src/hb-ot-shape-normalize.cc | 278 ++++++++++------------------------- + src/hb-ot-shape.cc | 5 +- + 7 files changed, 312 insertions(+), 214 deletions(-) + +commit c8149ca85ed97112778590bc9f090f3ee0254100 +Author: Behdad Esfahbod +Date: Tue Nov 13 11:07:20 2012 -0800 + + [hb-shape] Adjust postioning output format + + 1. If there is any offset (x or y), print out both x and y offsets. + + 2. Always print out the advance in the major direction of the buffer. + Ie. even for zero-advance glyphs, print a "+0". This is more intuitive. + + util/options.cc | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit 6fd5335622087e87739684f581aa9f88635ff970 +Author: Behdad Esfahbod +Date: Mon Nov 12 18:42:18 2012 -0800 + + [Indic] Update auto-generated Indic machine to reflect previous commit + + src/hb-ot-shape-complex-indic-machine.hh | 1126 +++++++++++++++--------------- + 1 file changed, 567 insertions(+), 559 deletions(-) + +commit 9cac1338c4bc3e9034cbfa104291ed0329debefe +Author: Behdad Esfahbod +Date: Mon Nov 12 18:41:22 2012 -0800 + + [Indic] Allow Consonant_Medial's after Consonant's + + Mostly affects Myanmar, but also Tai Tham, Javanese, and Cham. The + latter three are untested (no fonts!). + + src/hb-ot-shape-complex-indic-machine.rl | 3 ++- + src/hb-ot-shape-complex-indic-private.hh | 7 ++++--- + 2 files changed, 6 insertions(+), 4 deletions(-) + +commit d187099cbab8e75f870a2bc9c23b6a1cf226905e +Author: Behdad Esfahbod +Date: Mon Nov 12 18:38:06 2012 -0800 + + [Indic] Categorize Myanmar "tone marks" as nuktas + + src/hb-ot-shape-complex-indic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8173f23f3f16972c2e8e0a120724533100acfda2 +Author: Behdad Esfahbod +Date: Mon Nov 12 18:37:20 2012 -0800 + + [Indic] Add config for Myanmar + + src/hb-ot-shape-complex-indic.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 9e92978c8aa3d3cdab4d20c81698c56adbb3dbdd +Author: Behdad Esfahbod +Date: Mon Nov 12 18:36:10 2012 -0800 + + [Indic] Route "new" Myanmar tag through the Indic shaper + + Windows 8 adds a Myanmar shaper using the 'mym2' tag. Route that + through the Indic shaper. It's still very broken, but at least this + does NOT break old-style Myanmar shaping using the generic shaper. + + src/hb-ot-shape-complex-private.hh | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 5ab3855f8106158ee7e68797e8c35e63e9216e5d +Author: Behdad Esfahbod +Date: Mon Nov 12 18:27:42 2012 -0800 + + Choose shaper based on chosen OT script tag + + For Arabic and Indic shapers, if the font doesn't have a script system + for the script, use default shaper. + + Make an exception for Arabic script since we have fallback logic for + that one. + + src/hb-ot-map-private.hh | 4 ++++ + src/hb-ot-shape-complex-private.hh | 11 +++++++++-- + 2 files changed, 13 insertions(+), 2 deletions(-) + +commit 9b37b4c5800b158f61602d2aba8a01349e24d251 +Author: Behdad Esfahbod +Date: Mon Nov 12 18:23:38 2012 -0800 + + Make planner available to complex shaper choosing logic + + src/hb-ot-shape-complex-private.hh | 4 ++-- + src/hb-ot-shape.cc | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 6fddf2d7397411bba8a23ac535e8b851495d3105 +Author: Behdad Esfahbod +Date: Mon Nov 12 17:57:24 2012 -0800 + + Refactoring ot-map building to make chosen script available earlier + + src/hb-ot-map-private.hh | 13 ++++++++---- + src/hb-ot-map.cc | 51 ++++++++++++++++++++++++++-------------------- + src/hb-ot-shape-private.hh | 4 ++-- + 3 files changed, 40 insertions(+), 28 deletions(-) + +commit f17ed8116e7b6429af3fa60bb43d5f4fac66eae3 +Author: Behdad Esfahbod +Date: Mon Nov 12 17:48:26 2012 -0800 + + Minor TODO + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit de796a6fb98f4deda276caa82266b7c830978e0b +Author: Behdad Esfahbod +Date: Mon Nov 12 17:27:51 2012 -0800 + + Add "new" Myanmar OT Script tag + + Windows 8 added support for Myanmar shaping using the "mym2" script tag, + even though Windows never supported the old "mymr" tag. + + src/hb-ot-tag.cc | 2 ++ + test/api/test-ot-tag.c | 1 + + 2 files changed, 3 insertions(+) + +commit 27f52dc3f6bbb97594a44f27b180aed73d9e5608 +Author: Behdad Esfahbod +Date: Mon Nov 12 16:54:03 2012 -0800 + + Add Myanmar tests from UTN#11 + + .../south-east-asian/script-myanmar/misc/MANIFEST | 1 + + .../south-east-asian/script-myanmar/misc/utn11.txt | 34 ++++++++++++++++++++++ + 2 files changed, 35 insertions(+) + +commit e9334ce97bb7f1de87fb211bb5a8168033629b14 +Author: Behdad Esfahbod +Date: Mon Nov 12 14:57:02 2012 -0800 + + Break build when ragel is needed and missing + + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dba186711e3f5e723f917b7104e849c4c525d3b8 +Author: Behdad Esfahbod +Date: Mon Nov 12 14:48:33 2012 -0800 + + [Indic] Make more room in the table + + To be used in upcoming commits. + + src/hb-ot-shape-complex-indic-private.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit c4be9917438c45b972ec76dc68409014110f0837 +Author: Behdad Esfahbod +Date: Mon Nov 12 14:27:33 2012 -0800 + + Typo + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 56be677781736bbedc80df6f6aaa2b5f0bc4041c +Author: Behdad Esfahbod +Date: Mon Nov 12 14:09:40 2012 -0800 + + [Indic] Port 'pref' logic to look into font tables + + ...instead of using a hardcoded list of Ra characters. + + src/hb-ot-shape-complex-indic.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit f2c0f59043c93c225274fc0c8177077d16c89d61 +Author: Behdad Esfahbod +Date: Mon Nov 12 14:02:02 2012 -0800 + + [Indic] Port reph handling logic to look into font features + + ...instead of using a hardcoded list of Ra characters. + + src/hb-ot-shape-complex-indic.cc | 48 +++++++++++++++++++++++++--------------- + 1 file changed, 30 insertions(+), 18 deletions(-) + +commit 43149afbc0007ea075a7017c0e56056c3c0f3614 +Author: Behdad Esfahbod +Date: Mon Nov 12 13:34:17 2012 -0800 + + Route MEETEI_MAYEK through the Indic shaper + + Since it has a couple of left-"matras". + + src/hb-ot-shape-complex-private.hh | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit d0905c3400085f9c0901c558ba1b81b5039510e4 +Author: Behdad Esfahbod +Date: Mon Nov 12 13:02:20 2012 -0800 + + Minor + + src/hb-ot-head-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 365f27ab5ba025bf1be6a882ed213c695cbfed7e +Author: Behdad Esfahbod +Date: Mon Nov 12 11:16:57 2012 -0800 + + Work around older compilers + + As reported on the list: + + I am seeing a similar problem building harfbuzz 0.9.5 with Apple gcc + 4.0.1 on OS X 10.5 Leopard: + + hb-ot-layout-common-private.hh:406: error: 'struct + OT::CoverageFormat1::Iter' is private + hb-ot-layout-common-private.hh:646: error: within this context + hb-ot-layout-common-private.hh:500: error: 'struct + OT::CoverageFormat2::Iter' is private + hb-ot-layout-common-private.hh:647: error: within this context + make[4]: *** [libharfbuzz_la-hb-ot-layout.lo] Error 1 + + Also reported as happening with MSVC 2005. + + src/hb-ot-layout-common-private.hh | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 6b389ddc3623d042ded4731f4d62dc354002fdd0 +Author: Behdad Esfahbod +Date: Mon Nov 12 11:02:56 2012 -0800 + + [Indic] Don't apply 'liga' + + Uniscribe doesn't. And some fonts abuse this feature to get Indic + shaping working in non-complex applications like Adobe's apps. + + No change in numbers: + + BENGALI: 353897 out of 354188 tests passed. 291 failed (0.0821598%) + DEVANAGARI: 707337 out of 707394 tests passed. 57 failed (0.00805774%) + GUJARATI: 366440 out of 366457 tests passed. 17 failed (0.00463902%) + GURMUKHI: 60704 out of 60747 tests passed. 43 failed (0.0707854%) + KANNADA: 951046 out of 951913 tests passed. 867 failed (0.0910798%) + KHMER: 299074 out of 299124 tests passed. 50 failed (0.0167155%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1048011 out of 1048334 tests passed. 323 failed (0.0308108%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271666 out of 271847 tests passed. 181 failed (0.0665816%) + TAMIL: 1091754 out of 1091754 tests passed. 0 failed (0%) + TELUGU: 970557 out of 970573 tests passed. 16 failed (0.00164851%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-shape-complex-indic.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit d05ac7dc3f2949e85f1fe996315b31b7aae370fe +Author: Behdad Esfahbod +Date: Mon Nov 12 10:26:50 2012 -0800 + + Fix hb-ft glyph name for broken fonts that return empty glyph names + + src/hb-ft.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3bc22eb7b843c77706bb13fc332009097f247813 +Author: Behdad Esfahbod +Date: Mon Nov 12 10:07:28 2012 -0800 + + Minor + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4899801155cc0fef7a8aa58c33ac2d30ba34bcc3 +Author: Behdad Esfahbod +Date: Thu Nov 8 15:08:26 2012 -0800 + + U+A872 PHAGS-PA SUPERFIXED LETTER RA is "Right"-Joining + + src/hb-ot-shape-complex-arabic.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 22a685836a59d1c02914761c02d3852810b83ec5 +Author: Behdad Esfahbod +Date: Mon Nov 5 15:20:10 2012 -0800 + + Adjust Mongolian shaping + + For U+1880..U+1886 Uniscribe thinks they are non-joining. + For U+1887 Uniscribe thinks it's joining, but looks wrong to me. + For now, match Uniscribe. + + src/hb-ot-shape-complex-arabic.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit e6b86c8519f894bf7fe18d5c143276521fcacece +Author: Behdad Esfahbod +Date: Mon Nov 5 15:18:49 2012 -0800 + + Add test for non-joining Mongolian letters + + For U+1880..U+1886 Uniscribe thinks they are non-joining. + For U+1887 Uniscribe thinks it's joining, but looks wrong to me. + + .../texts/in-tree/shaper-arabic/script-mongolian/misc/MANIFEST | 1 + + .../in-tree/shaper-arabic/script-mongolian/misc/non-joining.txt | 8 ++++++++ + 2 files changed, 9 insertions(+) + +commit c26a52fbe62e5ba4d0e1e2ba13bfb6ceb3f773dc +Author: Behdad Esfahbod +Date: Sun Nov 4 16:48:45 2012 -0800 + + Minor + + src/hb-ot-shape-fallback.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f60d3ed35d94f1adcfd73ca05d03d7e81fb5de03 +Author: Behdad Esfahbod +Date: Sun Nov 4 16:44:47 2012 -0800 + + Minor + + src/hb-set-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f5e55754f962184d2fb7dcab837cdba56e8c7731 +Author: Behdad Esfahbod +Date: Fri Nov 2 13:53:18 2012 -0700 + + Add Tifinagh test data + + test/shaping/texts/in-tree/shaper-default/MANIFEST | 2 ++ + .../texts/in-tree/shaper-default/script-tifinagh/MANIFEST | 1 + + .../in-tree/shaper-default/script-tifinagh/misc/MANIFEST | 1 + + .../in-tree/shaper-default/script-tifinagh/misc/misc.txt | 11 +++++++++++ + 4 files changed, 15 insertions(+) + +commit 10a33296e674ee84b9ed2df25cf373de7d020b8d +Author: Behdad Esfahbod +Date: Fri Nov 2 13:38:55 2012 -0700 + + Minor + + src/hb-ot-tag.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit c21498afd857e78230f761ee5c9e73adece89dd0 +Author: Behdad Esfahbod +Date: Fri Nov 2 10:21:26 2012 -0700 + + Add Mongolian and 'Phags-pa joining test cases + + test/shaping/texts/in-tree/shaper-arabic/MANIFEST | 1 + + .../in-tree/shaper-arabic/script-mongolian/misc/misc.txt | 3 +++ + .../texts/in-tree/shaper-arabic/script-phags-pa/MANIFEST | 1 + + .../in-tree/shaper-arabic/script-phags-pa/misc/MANIFEST | 1 + + .../in-tree/shaper-arabic/script-phags-pa/misc/misc.txt | 14 ++++++++++++++ + 5 files changed, 20 insertions(+) + +commit 3ba7bc14ea652d27639f34109e51a497a678a54a +Author: Behdad Esfahbod +Date: Thu Nov 1 20:05:04 2012 -0700 + + Implement 'Phags-pa shaping + + Through the Arabic shaper. It's similar to Mongolian. + + src/hb-ot-shape-complex-arabic.cc | 15 ++++++++++++--- + src/hb-ot-shape-complex-private.hh | 4 +--- + 2 files changed, 13 insertions(+), 6 deletions(-) + +commit 431bef2e16c7888ca3960f5797432d3a20903550 +Author: Behdad Esfahbod +Date: Thu Nov 1 16:26:01 2012 -0700 + + Minor build fix + + test/api/Makefile.am | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit da70111ab234e8b740ce6fb1789a1809fbec0c44 +Author: Behdad Esfahbod +Date: Wed Oct 31 13:45:30 2012 -0700 + + Don't clear buffer pre-context if no new context is being provided + + Patch from Jonathan Kew. + + Part of fixing: + + Mozilla Bug 801410 - avoid inserting dotted-circle for run-initial + Unicode combining characters in "simple" scripts such as Latin + + https://bugzilla.mozilla.org/show_bug.cgi?id=801410 + + src/hb-buffer.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 0bc7a38463bfb37f12efeb1b8cb2024cf4a347bc +Author: Behdad Esfahbod +Date: Mon Oct 29 22:02:45 2012 -0700 + + [OT] Fix ReverseChainingSubst + + We should make it clear that we don't want output buffer in this case, + otherwise buffer->backtrack_len() would be wrong. + + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 13 +++++++++++++ + src/hb-ot-layout-gsub-table.hh | 1 + + 3 files changed, 15 insertions(+) + +commit 2616689d159024d2b1cb1e68f9936b2129bf9be6 +Author: Behdad Esfahbod +Date: Mon Oct 29 21:51:56 2012 -0700 + + More tracing fixups + + src/hb-ot-layout-gsubgpos-private.hh | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit 937f8d3871863b8b1ed1d8900cf41999d92ba30f +Author: Behdad Esfahbod +Date: Mon Oct 29 21:49:33 2012 -0700 + + [Arabic] Enable dlig and mset for Arabic + + That's what the spec says, and what Uniscribe does. + + src/hb-ot-shape-complex-arabic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 911ed096980630fd4a37bf2024036daae13a6056 +Author: Behdad Esfahbod +Date: Mon Oct 29 19:42:19 2012 -0700 + + Ignore gid0 in test results + + test/shaping/hb_test_tools.py | 1 + + 1 file changed, 1 insertion(+) + +commit bc513add7999baf32f126ceebbd318105ee66985 +Author: Behdad Esfahbod +Date: Mon Oct 29 19:03:55 2012 -0700 + + Add missing TRACE_RETURN + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 10b88d89ef1efcfddbbfabd3669399b472c8a900 +Author: Behdad Esfahbod +Date: Mon Oct 29 18:18:24 2012 -0700 + + Add Ethiopic test case + + This sequence: U+120B,U+135F,U+120B with the Nyala font from Win7 + exposes a GPOS bug in Uniscribe, in that the positioned mark is wrongly + moved as a result a following kern. + + This is the one "failure" in the Ethiopic test suite :-). + + ETHIOPIC: 118900 out of 118901 tests passed. 1 failed (0.000841036%) + + test/shaping/texts/in-tree/shaper-default/script-ethiopic/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-default/script-ethiopic/misc/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-default/script-ethiopic/misc/misc.txt | 1 + + 3 files changed, 3 insertions(+) + +commit 88d3c98e309e14c3115825d1d8d40d0b3eec2d97 +Author: Behdad Esfahbod +Date: Mon Oct 29 16:27:02 2012 -0700 + + [Indic] Position pre-base reordering Ra after Chillus in Malayalam + + The logic for pre-base reordering follows the left matra logic. + We had an exception for Malayalam/Tamil in the left matra repositioning + which was not reflected in pre-base reordering. + + Malayalam failures down from 337 to 323. + + BENGALI: 353996 out of 354285 tests passed. 289 failed (0.0815727%) + DEVANAGARI: 707339 out of 707394 tests passed. 55 failed (0.00777502%) + GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) + GURMUKHI: 60769 out of 60809 tests passed. 40 failed (0.0657797%) + KANNADA: 951086 out of 951913 tests passed. 827 failed (0.0868777%) + KHMER: 299106 out of 299124 tests passed. 18 failed (0.00601757%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1048011 out of 1048334 tests passed. 323 failed (0.0308108%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271726 out of 271847 tests passed. 121 failed (0.0445103%) + TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) + TELUGU: 970558 out of 970573 tests passed. 15 failed (0.00154548%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-shape-complex-indic.cc | 35 +++++++++++++++++++++-------------- + 1 file changed, 21 insertions(+), 14 deletions(-) + +commit 21bf796954678d02f136709cade43adef6f8f42b +Author: Behdad Esfahbod +Date: Mon Oct 29 14:21:09 2012 -0700 + + Add missed file + + src/hb-ucdn/COPYING | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 01013a0f5c58d5d54a37e5b4d6692e0bbd4baf80 +Author: Behdad Esfahbod +Date: Mon Oct 29 10:56:04 2012 -0700 + + Include config.h.in in tree + + I typically don't like including generating files in tree. But like to + make an exception for this, since this forms the canonical list of + options one would need to go through when building with alternative + build systems. + + Makefile.am | 1 - + config.h.in | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 160 insertions(+), 1 deletion(-) + +commit 02ed52169ad3bb48f4989f721b0c6572e064a712 +Author: Behdad Esfahbod +Date: Sun Oct 28 21:26:19 2012 -0700 + + Improve license information + + COPYING | 2 ++ + src/hb-icu-le/COPYING | 2 ++ + src/hb-icu-le/Makefile.am | 2 +- + src/hb-ucdn/Makefile.am | 2 +- + src/hb-ucdn/README | 7 +++++++ + 5 files changed, 13 insertions(+), 2 deletions(-) + +commit 4c1d9244617e472464722e64d2cdbc1f9e8827f6 +Author: Behdad Esfahbod +Date: Sun Oct 28 20:27:25 2012 -0700 + + Minor + + src/hb-icu-le.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 38b015e57ffa75d3b078a368c23685beb7c3f946 +Author: Behdad Esfahbod +Date: Sun Oct 28 20:11:47 2012 -0700 + + Fix hb_buffer_set_length(buffer, 0) + + Was causing invalid realloc()s. + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b7115b63be72e109b51f538ba581aed1017b2d55 +Author: Behdad Esfahbod +Date: Sun Oct 28 20:11:42 2012 -0700 + + Add XXX + + src/hb-icu-le.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 71ee1f24503cd066ffc1a36cc5dd9a3c1d1a6dfd +Author: Behdad Esfahbod +Date: Sun Oct 28 19:18:11 2012 -0700 + + Port to ICU LayoutEngine C API + + Incidentally, this makes it not crash with icu-le-hb anymore... + I'm not smart / stupid enough to spend two more days debugging C++ + linking issues, and this is ABI-stable at least. + + src/hb-icu-le.cc | 31 ++++++++++++++++--------------- + 1 file changed, 16 insertions(+), 15 deletions(-) + +commit 0144f05e57088b30ac894cdae8b04b265d4dfbe7 +Author: Behdad Esfahbod +Date: Fri Oct 26 13:48:06 2012 -0700 + + Remove unused members + + src/hb-icu-le/PortableFontInstance.h | 3 --- + 1 file changed, 3 deletions(-) + +commit cf3afd8979b1db76d437f428cbd51cb363e0d18e +Author: Behdad Esfahbod +Date: Thu Oct 25 16:32:54 2012 -0700 + + Rename and revamp is_zero_width() to be is_default_ignorable() + + That's really the logic desired. Except that MONGOLIAN VOWEL SEPARATOR + is not default_ignorable but it really should be. Reported to Unicode. + + Based on suggestion from Konstantin Ritt. + + src/hb-fallback-shape.cc | 2 +- + src/hb-ot-shape-private.hh | 4 +-- + src/hb-ot-shape.cc | 2 +- + src/hb-unicode-private.hh | 90 +++++++++++++++++++++++++++++----------------- + 4 files changed, 62 insertions(+), 36 deletions(-) + +commit a724139e641bf1592b1ff786a75a9de2ea8163cf +Author: Behdad Esfahbod +Date: Wed Oct 24 14:02:15 2012 -0700 + + Update TODO + + TODO | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit 13c058472913b7b6d689f9022226079da65420b0 +Author: Behdad Esfahbod +Date: Sun Oct 14 18:37:09 2012 -0500 + + 0.9.5 + + NEWS | 23 +++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 24 insertions(+), 1 deletion(-) + +commit fecdfa95daf4916695f23e7dab89ab363be11b89 +Author: Behdad Esfahbod +Date: Sun Oct 7 17:19:58 2012 -0400 + + Fixup hb_ot_shape_closure() + + Broke it when merged cmap mapping and normalizer. Ouch! + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2d1dcb3ce3354c2d5e2b4d1d291beb8d23cdea22 +Author: Behdad Esfahbod +Date: Sun Oct 7 17:13:46 2012 -0400 + + Mark debug message functions static + + src/hb-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 9947bd6daffb5ec76b67536575e7617ba4f10b1e +Author: Behdad Esfahbod +Date: Tue Oct 2 20:44:43 2012 -0400 + + Update UCDN to upstream commit 3f159c87824230b59af56e40e2db32caf6afa51a + + - Unicode 6.2.0 goodness, + - Unassigned codepoints now have correct properties. Passes test suite. + + src/hb-ucdn/unicodedata_db.h | 1966 ++++++++++++++++++++++-------------------- + 1 file changed, 1036 insertions(+), 930 deletions(-) + +commit 32dbfcf763d1ae497d3c95de986a83441331678f +Author: Behdad Esfahbod +Date: Tue Oct 2 17:42:13 2012 -0400 + + Fix visibility of UCDN symbols + + src/hb-ucdn.cc | 2 -- + src/hb-ucdn/ucdn.h | 19 +++++++++++++++++++ + 2 files changed, 19 insertions(+), 2 deletions(-) + +commit 3f33f0d1f2603f22e86adffe3c3836136ba5e5fd +Author: Behdad Esfahbod +Date: Tue Oct 2 16:03:18 2012 -0400 + + Import UCDN into source tree + + https://github.com/grigorig/ucdn + + configure.ac | 11 +- + src/Makefile.am | 7 + + src/hb-ucdn.cc | 207 ++ + src/hb-ucdn/Makefile.am | 18 + + src/hb-ucdn/README | 33 + + src/hb-ucdn/ucdn.c | 282 +++ + src/hb-ucdn/ucdn.h | 290 +++ + src/hb-ucdn/unicodedata_db.h | 4648 ++++++++++++++++++++++++++++++++++++++++++ + src/hb-unicode.cc | 3 + + 9 files changed, 5498 insertions(+), 1 deletion(-) + +commit 0e292eb2a2abbac152eeea2060e58b7a66449745 +Author: Behdad Esfahbod +Date: Tue Oct 2 14:59:00 2012 -0400 + + Remove Glib thread-safety support + + Now that we have pthread detection in configure, we don't need Glib + anymore. Glib will only be a Unicode data provider. + + configure.ac | 8 ++++---- + src/hb-atomic-private.hh | 13 ------------- + src/hb-mutex-private.hh | 20 -------------------- + 3 files changed, 4 insertions(+), 37 deletions(-) + +commit 66efe896483c58f3ef9bd218c02bb7ea604f68ee +Author: Behdad Esfahbod +Date: Tue Oct 2 14:55:32 2012 -0400 + + Check for pthreads + + configure.ac | 7 +++++++ + src/Makefile.am | 5 +++++ + 2 files changed, 12 insertions(+) + +commit 10a8162dddb8b39ae130fe5bb7d1819471fa7e06 +Author: Behdad Esfahbod +Date: Tue Oct 2 14:46:34 2012 -0400 + + Add ax_pthread.m4 + + m4/ax_pthread.m4 | 309 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 309 insertions(+) + +commit 8ac34bc6ff1d0646503a45659b1846d8cf9c0603 +Author: Behdad Esfahbod +Date: Tue Oct 2 14:46:04 2012 -0400 + + Add pkg.m4 to git repo + + m4/pkg.m4 | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 157 insertions(+) + +commit c7afac0aa6e51e6a49ebf13f72537398698c9e49 +Author: Behdad Esfahbod +Date: Tue Oct 2 14:44:47 2012 -0400 + + Add AC_CONFIG_MACRODIR + + Makefile.am | 2 ++ + configure.ac | 2 ++ + 2 files changed, 4 insertions(+) + +commit f2eb3fa9dca8d21fae20c9b9dddad3245df74a05 +Author: Behdad Esfahbod +Date: Tue Sep 25 21:35:35 2012 -0400 + + [OT] Only insert dottedcircle if at the beginning of paragraph + + If the first char in the run is a combining mark, but there is text + before the run, don't insert dottedcircle. + + Part of addressing: + https://bugzilla.redhat.com/show_bug.cgi?id=858736 + + src/hb-ot-shape.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit bdc2fc8294da7f374701aafe9f5a82d60633946f +Author: Behdad Esfahbod +Date: Tue Sep 25 21:32:35 2012 -0400 + + [Arabic] Respect Arabic joining from neighboring context + + Now we respect Arabic joining across runs. + + src/hb-ot-shape-complex-arabic.cc | 31 +++++++++++++++++++++++++++++-- + 1 file changed, 29 insertions(+), 2 deletions(-) + +commit 05207a79e0ae1769c5feaebe3fd99bdf9cfcf834 +Author: Behdad Esfahbod +Date: Tue Sep 25 17:44:53 2012 -0400 + + [buffer] Save pre/post textual context + + To be used for a variety of purposes. We save up to five characters + in each direction. No public API changes, everything is taken care + of already. All clients need to do is to call hb_buffer_add_utf* with + the full text + segment info (or at least some context) instead of + just passing in the segment. + + Various operations (hb_buffer_reset, hb_buffer_set_length, + hb_buffer_add*) automatically reset the relevant contexts. + + src/hb-buffer-private.hh | 13 ++++++++++++- + src/hb-buffer.cc | 44 ++++++++++++++++++++++++++++++++++++++++---- + src/hb-buffer.h | 2 +- + 3 files changed, 53 insertions(+), 6 deletions(-) + +commit 89ac39dbbe028e6379f64392f2e590e3f1fdd847 +Author: Behdad Esfahbod +Date: Tue Sep 25 13:59:24 2012 -0400 + + Add hb_utf_prev() + + src/hb-utf-private.hh | 71 +++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 69 insertions(+), 2 deletions(-) + +commit 70ea4ac6887c7057113d714a98e55738b6196562 +Author: Behdad Esfahbod +Date: Tue Sep 25 12:30:16 2012 -0400 + + Slightly optimize UTF-8 parsing + + src/hb-utf-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4445e5e2ecc257a5d0fa2f2715bb7181a47346da +Author: Behdad Esfahbod +Date: Tue Sep 25 12:26:12 2012 -0400 + + [buffer] Cleanup / optimize UTF-16 parsing a bit + + src/hb-utf-private.hh | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit 1f66c3c1a0eb869c0d85a015235313177e0cec62 +Author: Behdad Esfahbod +Date: Tue Sep 25 11:42:16 2012 -0400 + + Add hb_utf_strlen() + + Speeds up UTF-8 parsing by calling strlen(). + + src/hb-buffer.cc | 13 ++----------- + src/hb-utf-private.hh | 22 ++++++++++++++++++++++ + 2 files changed, 24 insertions(+), 11 deletions(-) + +commit 7f19ae7b9f806a2e35206b2ad41651c5f80b2537 +Author: Behdad Esfahbod +Date: Tue Sep 25 11:22:28 2012 -0400 + + [buffer] Templatize UTF handling + + Also move UTF routines into a separate file, to be reused from shapers + that need it. + + src/Makefile.am | 1 + + src/hb-buffer.cc | 157 +++++++++++++------------------------------------- + src/hb-utf-private.hh | 113 ++++++++++++++++++++++++++++++++++++ + 3 files changed, 155 insertions(+), 116 deletions(-) + +commit 0e0a4da9b7677a09e00d27313236e1f333864dd6 +Author: Behdad Esfahbod +Date: Tue Sep 25 11:09:04 2012 -0400 + + [buffer] Towards template'izing different UTF adders + + src/hb-buffer.cc | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit 7d37280600c157f3c4eae8746e99511702a58e8f +Author: Behdad Esfahbod +Date: Tue Sep 25 11:04:41 2012 -0400 + + Minor + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 54d5da4ee9d902ff36473cec558137eef8f23825 +Author: Behdad Esfahbod +Date: Tue Sep 25 10:50:41 2012 -0400 + + Remove unused indic.cc + + src/Makefile.am | 6 +----- + src/indic.cc | 51 --------------------------------------------------- + 2 files changed, 1 insertion(+), 56 deletions(-) + +commit fab7a71f110ed646745d54b23284537c50058c21 +Author: Behdad Esfahbod +Date: Mon Sep 24 21:51:13 2012 -0400 + + [Indic] Import ragel-generated Indic machine in git + + I don't expect ragel to be creating too much noise in its generated + output, and including this in-tree helps users right now. We can + revisit this later if it proved to be too much trouble. + + autogen.sh | 6 - + src/Makefile.am | 1 - + src/hb-ot-shape-complex-indic-machine.hh | 1314 ++++++++++++++++++++++++++++++ + 3 files changed, 1314 insertions(+), 7 deletions(-) + +commit 20a840c7cd08069720050782b4533cde505df09a +Author: Behdad Esfahbod +Date: Mon Sep 24 20:23:00 2012 -0400 + + Use a C++ linker on Windows + + On Windows we don't care whether or not we link to libstdc++. + Seems to fix build with mingw32 on msys, as reported by Werner. + + src/Makefile.am | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit eb7669a38072b66eef3bd905a93c4815bef3f0e5 +Author: Behdad Esfahbod +Date: Tue Sep 18 19:42:06 2012 -0400 + + Better autofoo + + src/Makefile.am | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit d00f7d83750258eff915a3826700c4819e63e481 +Author: Behdad Esfahbod +Date: Mon Sep 17 20:59:09 2012 -0400 + + Fix dependencies + + src/Makefile.am | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 811eefe225d20b20f1de20c6e62a0ebd6d89102a +Author: Behdad Esfahbod +Date: Mon Sep 10 09:56:27 2012 -0400 + + Return NULL, not false + + Oh well... + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 166b5cf7ec2d37fb54a909c437ccdec1edaf37aa +Author: Behdad Esfahbod +Date: Fri Sep 7 14:55:07 2012 -0400 + + [Indic] Find syllables before any features are applied + + With FreeSerif, it seems that the 'ccmp' feature does ligature + substituttions. That was then causing syllable match failures. We now + find syllables before any features have been applied. + + Test sequence: U+0D9A,U+0DCA,U+200D,U+0DBB,U+0DCF + + src/hb-ot-shape-complex-indic-machine.rl | 4 +- + src/hb-ot-shape-complex-indic.cc | 56 +++++++++++++++------- + .../indic/script-sinhala/misc/misc.txt | 1 + + 3 files changed, 43 insertions(+), 18 deletions(-) + +commit 96fdc04e5c6daafce3d45e7508418e4db94df44c +Author: Behdad Esfahbod +Date: Thu Sep 6 22:26:16 2012 -0400 + + Add hb_buffer_[sg]et_content_type + + And hb_buffer_content_type_t and enum values. + + TODO | 1 + + src/hb-buffer-private.hh | 2 ++ + src/hb-buffer.cc | 34 ++++++++++++++++++++++++++++++++++ + src/hb-buffer.h | 14 ++++++++++++++ + src/hb-shape.cc | 5 +++++ + 5 files changed, 56 insertions(+) + +commit e30ebd2794b37bd8ec716a258d5cb017fb1dfadc +Author: Behdad Esfahbod +Date: Thu Sep 6 22:09:06 2012 -0400 + + Add hb_feature_to/from_string() + + TODO | 4 +- + src/hb-common.cc | 9 +++ + src/hb-common.h | 6 +- + src/hb-shape.cc | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-shape.h | 13 +++++ + util/options.cc | 132 ++----------------------------------------- + 6 files changed, 201 insertions(+), 131 deletions(-) + +commit f67917161bbe317a33d6407fbc62ebffcafe7154 +Author: Behdad Esfahbod +Date: Thu Sep 6 17:22:31 2012 -0400 + + [OT] Do per-ligature-component fallback mark positioning + + With this in place, you can remove GDEF/GSUB/GPOS tables from Arabic + fonts and still get per-component marks positioned on + oh-yeah-fallback-formed LAM-ALEF ligatures with marks in between the LAM + and ALEF. + + Now *that*'s pretty cool, if a bit anachronistic... + + src/hb-ot-shape-fallback.cc | 43 ++++++++++++++++++++++++++++++++++++------- + 1 file changed, 36 insertions(+), 7 deletions(-) + +commit 525c6855783a018d52867b9ece2ee90868ff1f91 +Author: Behdad Esfahbod +Date: Thu Sep 6 16:02:07 2012 -0400 + + [OT] Make fallback mark positioning more robust + + ...with clusters spanning multiple base characters. + + src/hb-ot-shape-fallback.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 5d502443f5a07cbd0aa860dd71a0fa4ea8b6ff9f +Author: Behdad Esfahbod +Date: Thu Sep 6 15:29:29 2012 -0400 + + [old] Clear offset array + + src/hb-old.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 9433c218b4853442dd9ad53d0588a837a33dbf1e +Author: Behdad Esfahbod +Date: Thu Sep 6 14:27:15 2012 -0400 + + [OT] Simplify fallback positioning condition + + src/hb-ot-shape-fallback.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 028a1706f898bfcee0d14acfba47ebe1de09f0c4 +Author: Behdad Esfahbod +Date: Thu Sep 6 14:25:48 2012 -0400 + + Refactor common macro + + src/hb-ot-shape-fallback.cc | 5 +---- + src/hb-ot-shape-normalize.cc | 5 +---- + src/hb-ot-shape.cc | 5 +---- + src/hb-unicode-private.hh | 9 +++++++++ + 4 files changed, 12 insertions(+), 12 deletions(-) + +commit 07cfbe21b511056d5c3c75cbfe84e4e982c3e8fb +Author: Behdad Esfahbod +Date: Thu Sep 6 01:16:39 2012 -0400 + + [OT] Streamline Arabic fallback shaping table + + src/gen-arabic-table.py | 6 +- + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + src/hb-ot-shape-complex-arabic-table.hh | 266 ++++++++++++++--------------- + 3 files changed, 137 insertions(+), 137 deletions(-) + +commit 82f6b6f388b801a1483854cb56a2cadbb94e0f2b +Author: Behdad Esfahbod +Date: Thu Sep 6 01:12:50 2012 -0400 + + Minor + + src/hb-ot-shape-complex-arabic-fallback.hh | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit fabd3113a98c5f4114f48920fa7ea38bd65a8d32 +Author: Behdad Esfahbod +Date: Wed Sep 5 22:19:28 2012 -0400 + + [OT] Port Arabic fallback shaping to synthetic GSUB + + All of init/medi/fina/isol and rlig implemented. + + Let there be dragons... ⻯ + + src/Makefile.am | 1 + + src/hb-open-type-private.hh | 69 +++++--- + src/hb-ot-layout-common-private.hh | 9 +- + src/hb-ot-layout-gsub-table.hh | 11 +- + src/hb-ot-map-private.hh | 6 + + src/hb-ot-map.cc | 1 + + src/hb-ot-shape-complex-arabic-fallback.hh | 252 +++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-arabic.cc | 158 ++++++------------ + src/hb-ot-shape.cc | 7 +- + src/hb-private.hh | 11 +- + 10 files changed, 369 insertions(+), 156 deletions(-) + +commit f0b8ed1b6dd9f1d2b9084c101a6fc5dee0cc22a8 +Author: Behdad Esfahbod +Date: Wed Sep 5 17:32:57 2012 -0400 + + [Indic] Allow "H,ZWJ,M" + + Uniscribe accepts a Halant,ZWJ before matras. Allow that. + + BENGALI down from 295 to 291 + DEVANAGARI down from 69 to 57 + GUJARATI down from 19 to 17 + KANNADA down from 871 to 867 + MALAYALAM down from 340 to 337 + TELUGU down from 20 to 16 + + Currently at: + + BENGALI: 353897 out of 354188 tests passed. 291 failed (0.0821598%) + DEVANAGARI: 707337 out of 707394 tests passed. 57 failed (0.00805774%) + GUJARATI: 366440 out of 366457 tests passed. 17 failed (0.00463902%) + GURMUKHI: 60704 out of 60747 tests passed. 43 failed (0.0707854%) + KANNADA: 951046 out of 951913 tests passed. 867 failed (0.0910798%) + KHMER: 299077 out of 299124 tests passed. 47 failed (0.0157125%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1047997 out of 1048334 tests passed. 337 failed (0.0321462%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271666 out of 271847 tests passed. 181 failed (0.0665816%) + TAMIL: 1091754 out of 1091754 tests passed. 0 failed (0%) + TELUGU: 970557 out of 970573 tests passed. 16 failed (0.00164851%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4ed717ef61813fa16cf74f2874848e9feb81568f +Author: Behdad Esfahbod +Date: Wed Sep 5 17:21:17 2012 -0400 + + [Indic] Relax grammar + + Now that we insert dotted-circle, tests break more easily when our indic + machine breaks. + + In particular, a few Devanagari tests were having sequences like + "C,H,ZWJ,N", and because of the ZWJ the Nukta does NOT get reordered to + before the Halant as the grammar used to expect... Fixup. + + Another case is as simple as "C,ZWJ,SM". + + Fixes 10 out of 79 failures: + + DEVANAGARI: 707325 out of 707394 tests passed. 69 failed (0.00975411%) + + src/hb-ot-shape-complex-indic-machine.rl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit aa7141efe49991a1160489106984e95163fe2ab8 +Author: Behdad Esfahbod +Date: Wed Sep 5 15:54:21 2012 -0400 + + [Indic] Fix Khmer syllable-final coeng-consonant + + Brings down Khmer failures from 162 to 47. + + KHMER: 299077 out of 299124 tests passed. 47 failed (0.0157125%) + + Also rebaselined some of the test files that had only-inherited lines. + Removing those, the stats are: + + BENGALI: 353893 out of 354188 tests passed. 295 failed (0.0832891%) + DEVANAGARI: 707315 out of 707394 tests passed. 79 failed (0.0111678%) + GUJARATI: 366438 out of 366457 tests passed. 19 failed (0.00518478%) + GURMUKHI: 60704 out of 60747 tests passed. 43 failed (0.0707854%) + KANNADA: 951042 out of 951913 tests passed. 871 failed (0.0915%) + KHMER: 299077 out of 299124 tests passed. 47 failed (0.0157125%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1047994 out of 1048334 tests passed. 340 failed (0.0324324%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271666 out of 271847 tests passed. 181 failed (0.0665816%) + TAMIL: 1091754 out of 1091754 tests passed. 0 failed (0%) + TELUGU: 970553 out of 970573 tests passed. 20 failed (0.00206064%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + Still some regressions, but some of the more egregious cases are + addressed. + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit efb8d3eb713bca7cbfca41380a012bdb4d380e5c +Author: Behdad Esfahbod +Date: Wed Sep 5 15:50:47 2012 -0400 + + Fixup test failure reporting + + After we implemented dotted-circle, we were still ignoring any tests + that had dottedcircle in it for any of the shapers. That meant that if + we wrongly outputted dottedcircle, the test was being ignored. Ouch! + + Fixing that shows regressions across the board. Most are Uniscribe + bugs: NOT inserting dotted-circle when it should. Some are arou + machine bugs. This is in fact a nice way to catch Indic-machine + deficiencies and when I fix the regressions, our clusters should be + much closer to Uniscribe. For now, we regressed from: + + BENGALI: 353997 out of 354285 tests passed. 288 failed (0.0812905%) + DEVANAGARI: 707339 out of 707394 tests passed. 55 failed (0.00777502%) + GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) + GURMUKHI: 60769 out of 60809 tests passed. 40 failed (0.0657797%) + KANNADA: 951086 out of 951913 tests passed. 827 failed (0.0868777%) + KHMER: 299106 out of 299124 tests passed. 18 failed (0.00601757%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1048104 out of 1048416 tests passed. 312 failed (0.0297592%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271747 out of 271847 tests passed. 100 failed (0.0367854%) + TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) + TELUGU: 970558 out of 970573 tests passed. 15 failed (0.00154548%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + To: + + BENGALI: 353990 out of 354285 tests passed. 295 failed (0.0832663%) + DEVANAGARI: 707315 out of 707394 tests passed. 79 failed (0.0111678%) + GUJARATI: 366447 out of 366506 tests passed. 59 failed (0.016098%) + GURMUKHI: 60707 out of 60809 tests passed. 102 failed (0.167738%) + KANNADA: 951042 out of 951913 tests passed. 871 failed (0.0915%) + KHMER: 298962 out of 299124 tests passed. 162 failed (0.0541581%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1048074 out of 1048416 tests passed. 342 failed (0.0326206%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271666 out of 271847 tests passed. 181 failed (0.0665816%) + TAMIL: 1091835 out of 1091837 tests passed. 2 failed (0.000183178%) + TELUGU: 970553 out of 970573 tests passed. 20 failed (0.00206064%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + Investigating. + + test/shaping/hb_test_tools.py | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 27bd55bd2ca599d501f10c2fae81861137517e46 +Author: Behdad Esfahbod +Date: Wed Sep 5 15:11:14 2012 -0400 + + [Indic] Tamil does not have half-forms either + + The Win7 Tamil font does not realy on this behavior, but the WinXP + version does. Handle Tamil like Malayalam: Matras always move to + before base. + + WinXP Tamil failures went down from 168964 (15.4752%) to 167 + (0.0152953%) (two orders of magnitude reduction!). + + Included in this is a minor fixup that actually fixed a few tests + with non-Tamil too. Numbers at: + + BENGALI: 353997 out of 354285 tests passed. 288 failed (0.0812905%) + DEVANAGARI: 707339 out of 707394 tests passed. 55 failed (0.00777502%) + GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) + GURMUKHI: 60769 out of 60809 tests passed. 40 failed (0.0657797%) + KANNADA: 951086 out of 951913 tests passed. 827 failed (0.0868777%) + KHMER: 299106 out of 299124 tests passed. 18 failed (0.00601757%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1048104 out of 1048416 tests passed. 312 failed (0.0297592%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271747 out of 271847 tests passed. 100 failed (0.0367854%) + TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) + TELUGU: 970558 out of 970573 tests passed. 15 failed (0.00154548%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-shape-complex-indic.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 87b75d0a4aa03fe7a03e3bf7baf8ece131aec1bb +Author: Behdad Esfahbod +Date: Tue Sep 4 23:06:38 2012 -0400 + + [OT] Allow adding features with fallback implementation + + src/hb-ot-map-private.hh | 7 ++++--- + src/hb-ot-map.cc | 6 ++++-- + 2 files changed, 8 insertions(+), 5 deletions(-) + +commit 1d3947a6bda6986c9c7d993589053051c119cc81 +Author: Behdad Esfahbod +Date: Tue Sep 4 22:42:17 2012 -0400 + + Minor + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b3b89b66586897a69b410ef02e7434691de84ae6 +Author: Behdad Esfahbod +Date: Tue Sep 4 21:13:17 2012 -0400 + + [OT] Add SubstLookup serialize API + + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 65 +++++++++++++++++++++++++++++++++++++- + 2 files changed, 65 insertions(+), 2 deletions(-) + +commit 715e03bc21d6adaa8e1f647235843839dc47dad1 +Author: Behdad Esfahbod +Date: Tue Sep 4 20:10:17 2012 -0400 + + Minor + + src/hb-open-type-private.hh | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +commit 652d1e0d64e47313ead2fc8318d1236f0e0d80ca +Author: Behdad Esfahbod +Date: Tue Sep 4 20:00:44 2012 -0400 + + [OT] Start adding Lookup-level serialize API + + src/hb-ot-layout-common-private.hh | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + +commit a930c68e9c50aade78c1eb0eef075c9c117e4ef6 +Author: Behdad Esfahbod +Date: Tue Sep 4 18:17:57 2012 -0400 + + [OT] More serialize. Implements all basic GSUB subtables + + src/hb-open-type-private.hh | 53 +++++++++++++++- + src/hb-ot-layout-common-private.hh | 8 ++- + src/hb-ot-layout-gsub-table.hh | 125 +++++++++++++++++++++++++++++-------- + 3 files changed, 156 insertions(+), 30 deletions(-) + +commit 1b38b4e817d871b9549be65af6030bd0eea7f775 +Author: Behdad Esfahbod +Date: Tue Sep 4 18:17:21 2012 -0400 + + Minor + + src/hb-ot-layout-gsub-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f7e81ce0b882aa942ae33c787e741c5e8e5a0173 +Author: Behdad Esfahbod +Date: Tue Sep 4 15:32:37 2012 -0400 + + 0.9.4 + + NEWS | 18 ++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 19 insertions(+), 1 deletion(-) + +commit 2bd9fe359839a653f7caae534bf768af1735f155 +Author: Behdad Esfahbod +Date: Tue Sep 4 15:15:19 2012 -0400 + + Refactor + + src/hb-ot-layout-gpos-table.hh | 7 ++----- + src/hb-ot-layout-gsub-table.hh | 16 +++++----------- + src/hb-ot-layout-gsubgpos-private.hh | 13 +++---------- + src/hb-ot-layout.cc | 23 +++++++++++++++++------ + src/hb-ot-shape-complex-arabic.cc | 4 +--- + 5 files changed, 28 insertions(+), 35 deletions(-) + +commit a5ddd9e31cd7906c4b559aa5b2fafdae4b9c8935 +Author: Behdad Esfahbod +Date: Tue Sep 4 14:55:00 2012 -0400 + + [OT] Really fix possible NULL dereference this time + + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + src/hb-ot-layout.cc | 6 +++--- + src/hb-ot-shape-complex-arabic.cc | 4 +++- + 3 files changed, 10 insertions(+), 8 deletions(-) + +commit 29416833584d7831ece84aaeada6f5ebba7828c0 +Author: Behdad Esfahbod +Date: Mon Sep 3 23:31:14 2012 -0400 + + [OT] Implement serialize() for AlternateSubst + + src/hb-ot-layout-gsub-table.hh | 33 +++++++++++++++++++++++++++++++++ + 1 file changed, 33 insertions(+) + +commit 1f07e3382a1608b054cbf88b89fef74f6c485434 +Author: Behdad Esfahbod +Date: Mon Sep 3 23:28:34 2012 -0400 + + [OT] Implement serialize() for MultiSubst + + src/hb-open-type-private.hh | 10 ++++++++++ + src/hb-ot-layout-gsub-table.hh | 43 ++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 53 insertions(+) + +commit 4912030dfba740c822e200d33cbb5c6dbbeaf79e +Author: Behdad Esfahbod +Date: Mon Sep 3 20:58:03 2012 -0400 + + Minor + + src/hb-open-type-private.hh | 4 ++-- + src/hb-ot-layout-gsub-table.hh | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit f8fa2b5cf67b02d74514dec7885d03de73ec7349 +Author: Behdad Esfahbod +Date: Mon Sep 3 20:19:46 2012 -0400 + + Fix possible NULL dereference + + As reported by Kenichi Ishibashi. + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4b312fb288faa383a2c5bd3be0428f0e58e02699 +Author: Behdad Esfahbod +Date: Sat Sep 1 21:56:06 2012 -0400 + + [OT] Remove serialize alignment + + Will reintroduce in a different way when we actually need it. + + src/hb-open-type-private.hh | 24 +++++++++++------------- + 1 file changed, 11 insertions(+), 13 deletions(-) + +commit c61be03d6df122f18eebda3b29e42c9e768d45b9 +Author: Behdad Esfahbod +Date: Sat Sep 1 21:43:38 2012 -0400 + + [OT] A bit more serialize + + src/hb-open-type-private.hh | 14 +++++++++++++ + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 43 ++++++++++++++++++++++++++++++++++++-- + 3 files changed, 56 insertions(+), 3 deletions(-) + +commit abcc5ac1fde1c493e4055dd2f27b8aade7713156 +Author: Behdad Esfahbod +Date: Sat Sep 1 21:30:17 2012 -0400 + + [OT] Improve serialize syntax + + For some definition of improvement... + + src/hb-open-type-private.hh | 6 ++++-- + src/hb-ot-layout-gsub-table.hh | 3 +-- + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit bc5be24014371ceb811b9ffd37062ede63d87bb1 +Author: Behdad Esfahbod +Date: Sat Sep 1 20:48:22 2012 -0400 + + [OT] Restart work on serialize() + + src/hb-open-type-private.hh | 39 ++++++++++++++++++------ + src/hb-ot-layout-common-private.hh | 61 +++++++++++++++++++------------------- + src/hb-ot-layout-gsub-table.hh | 13 ++++++++ + 3 files changed, 73 insertions(+), 40 deletions(-) + +commit 6912e476dd92639c3ddf07ca51c8d4a262c8b3a5 +Author: Behdad Esfahbod +Date: Sat Sep 1 20:38:45 2012 -0400 + + [OT] Insert dotted-circle for run-initial marks + + Unfortunately if the font has GPOS and 'mark' feature does + not position mark on dotted-circle, our inserted dotted-circle + will not get the mark repositioned to itself. Uniscribe cheats + here. + + If there is no GPOS however, the fallback positioning kicks in + and sorts this out. + + I'm not willing to address the first case. + + src/hb-ot-shape.cc | 32 ++++++++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + +commit 1d581ec384bc1780995e32e1c44103af57596eda +Author: Behdad Esfahbod +Date: Sat Sep 1 20:06:26 2012 -0400 + + [OT] Fallback-position ccc=0 Thai / Lao marks + + Not perfect, but so is fallback positioning in 2012... + + src/hb-ot-shape-fallback.cc | 56 +++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 46 insertions(+), 10 deletions(-) + +commit 3992b5ec4cb43d114d87ff7ee2b992bcf819c9cd +Author: Behdad Esfahbod +Date: Sat Sep 1 19:20:41 2012 -0400 + + Move code around + + src/hb-ot-shape-fallback-private.hh | 5 ++++ + src/hb-ot-shape-fallback.cc | 46 +++++++++++++++++++++++++------------ + src/hb-ot-shape-private.hh | 6 +++++ + src/hb-ot-shape.cc | 4 ++++ + 4 files changed, 46 insertions(+), 15 deletions(-) + +commit b85800f9de8976a7418ef9df467d3080c6ab0199 +Author: Behdad Esfahbod +Date: Fri Aug 31 18:12:01 2012 -0400 + + [Indic] Implement dotted-circle insertion for broken clusters + + No panic, we reeally insert dotted circle when it's absolutely broken. + + Fixes most of the dotted-circle cases against Uniscribe. (for Devanagari + fixes 80% of them, for Khmer 70%; the rest look like Uniscribe being + really bogus...) + + I had to make a decision. Apparently Uniscribe adds one dotted circle + to each broken character. I tried that, but that goes wrong easily with + split matras. So I made it add only one dotted circle to an entire + broken syllable tail. As in: "if there was a dotted circle here, this + would have formed a correct cluster." That works better for split + stuff, and I like it more. + + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 10 +++++ + src/hb-ot-shape-complex-indic-machine.rl | 4 +- + src/hb-ot-shape-complex-indic-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 67 +++++++++++++++++++++++++++++--- + src/hb-ot-shape-normalize-private.hh | 1 + + src/hb-ot-shape-normalize.cc | 11 +++--- + 7 files changed, 83 insertions(+), 13 deletions(-) + +commit 327d14ef188396006d54af976506ab6f8bb2869a +Author: Behdad Esfahbod +Date: Fri Aug 31 16:49:34 2012 -0400 + + [Indic] Start adding dotted-circle instrastructure + + src/hb-ot-shape-complex-indic-machine.rl | 19 +++++++------ + src/hb-ot-shape-complex-indic.cc | 46 +++++++++++++++++++++++++++++--- + 2 files changed, 51 insertions(+), 14 deletions(-) + +commit 1be368e96fb7de8c77bf992874e0d5bd6b272ebe +Author: Behdad Esfahbod +Date: Fri Aug 31 16:29:17 2012 -0400 + + Minor + + src/hb-buffer-private.hh | 16 +++++++++++++++- + src/hb-buffer.cc | 15 --------------- + 2 files changed, 15 insertions(+), 16 deletions(-) + +commit 784f29d061a2939562eca0c4943feb01174aee00 +Author: Behdad Esfahbod +Date: Fri Aug 31 14:06:26 2012 -0400 + + Minor + + src/hb-ot-shape.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 5a7f18767a87a3f07269d0814f984a98f86ab852 +Author: Behdad Esfahbod +Date: Thu Aug 30 22:53:29 2012 -0400 + + [OT] Better fallback-position Thai / Lao ccc!=0 marks + + src/hb-ot-shape-fallback.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 9f2348de58f0f85593027378169bc03c4dd64e59 +Author: Behdad Esfahbod +Date: Wed Aug 29 21:08:59 2012 -0400 + + [OT] Add serialize() for Coverage + + src/hb-open-type-private.hh | 34 +++++++++++++++++---- + src/hb-ot-layout-common-private.hh | 62 ++++++++++++++++++++++++++++++++++++++ + 2 files changed, 90 insertions(+), 6 deletions(-) + +commit e901b954c6ec44ac3ae7fb3c326e6e7a40718e4b +Author: Behdad Esfahbod +Date: Wed Aug 29 20:26:08 2012 -0400 + + [OT] Start adding serialize() API + + src/hb-open-type-private.hh | 77 +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 77 insertions(+) + +commit 965c280de09b49d711cb78d629da321c802084de +Author: Behdad Esfahbod +Date: Wed Aug 29 13:59:16 2012 -0400 + + Add HB_BUFFER_ASSERT_VAR + + To be used in places we access buffer vars... + + src/hb-buffer-private.hh | 3 +++ + src/hb-buffer.cc | 16 ++++++++++++++++ + 2 files changed, 19 insertions(+) + +commit 0ccf9b64736559a230425fd131c9eb8aa3048221 +Author: Behdad Esfahbod +Date: Wed Aug 29 11:53:26 2012 -0400 + + Move code around + + src/hb-ot-shape.cc | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) + +commit 2fcbbdb41a322f54b61d9ce983ab54434504c5ed +Author: Behdad Esfahbod +Date: Wed Aug 29 11:11:54 2012 -0400 + + Port Arabic fallback ligating to share code with GSUB + + This will eventually allow us to skip marks, as well as (fallback) + attach marks to ligature components of fallback-shaped Arabic. + That would be pretty cool. I kludged GDEF props in, so mark-skipping + works, but the produced ligature id/components will be cleared later + by substitute_start() et al. + + Perhaps using a synthetic table for Arabic fallback shaping was a better + idea. The current approach has way too many layering violations... + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++ + src/hb-ot-shape-complex-arabic.cc | 72 ++++++++++++++++++++++++------------ + src/hb-ot-shape.cc | 4 +- + 3 files changed, 56 insertions(+), 24 deletions(-) + +commit 5e399a8a45bddb49e06e2ca39df1ed04398c0aff +Author: Behdad Esfahbod +Date: Wed Aug 29 10:40:49 2012 -0400 + + Minor + + src/hb-ot-layout-gsub-table.hh | 1 - + src/hb-ot-layout-gsubgpos-private.hh | 1 - + 2 files changed, 2 deletions(-) + +commit a177d027d1d0ad9539e30ed75d8652e0e8da20ff +Author: Behdad Esfahbod +Date: Tue Aug 28 23:18:22 2012 -0400 + + [GSUB] Move ligation logic over + + src/hb-ot-layout-gsub-table.hh | 78 ++++------------------------------- + src/hb-ot-layout-gsubgpos-private.hh | 80 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 89 insertions(+), 69 deletions(-) + +commit 191fa885d9e0a2dce92dd8727cddd18495e62409 +Author: Behdad Esfahbod +Date: Tue Aug 28 22:58:55 2012 -0400 + + [GSUB] Merge Ligature and context input matching + + Looks better now... + + TODO | 4 -- + src/hb-ot-layout-gsub-table.hh | 71 +++++++----------------------------- + src/hb-ot-layout-gsubgpos-private.hh | 29 ++++++++++++++- + 3 files changed, 40 insertions(+), 64 deletions(-) + +commit 93814ca7dc2a7251f861c1c47ba155ba6e6bdf19 +Author: Behdad Esfahbod +Date: Tue Aug 28 22:24:51 2012 -0400 + + Start converging Ligature and match_input + + src/hb-ot-layout-gsub-table.hh | 58 +++++++++++++++++---------------- + src/hb-ot-layout-gsubgpos-private.hh | 62 ++++++++++++++++++++++++++++-------- + 2 files changed, 78 insertions(+), 42 deletions(-) + +commit 2eef71737ea29ffadbb5a2be4a898b44f53f66ac +Author: Behdad Esfahbod +Date: Tue Aug 28 19:16:38 2012 -0400 + + [hb-icu-le] Add visbility + + src/hb-icu-le/FontTableCache.h | 6 +++++- + src/hb-icu-le/PortableFontInstance.cpp | 39 ---------------------------------- + src/hb-icu-le/PortableFontInstance.h | 7 ++++-- + src/hb-icu-le/cmaps.cpp | 2 +- + src/hb-icu-le/cmaps.h | 5 ++++- + src/hb-icu-le/letest.h | 14 ++++++++++++ + src/hb-icu-le/sfnt.h | 6 +++++- + 7 files changed, 34 insertions(+), 45 deletions(-) + +commit d59e28e49204ed609d8a1bf3c0f21ab5fc178337 +Author: Behdad Esfahbod +Date: Tue Aug 28 19:08:36 2012 -0400 + + Minor + + src/Makefile.am | 6 +++++- + src/check-libstdc++.sh | 2 +- + src/check-static-inits.sh | 4 ++-- + 3 files changed, 8 insertions(+), 4 deletions(-) + +commit af169d2813ff8075288cd4a7811f0715e4fea3da +Author: Behdad Esfahbod +Date: Tue Aug 28 19:08:22 2012 -0400 + + Minor + + src/hb-icu-le/PortableFontInstance.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 52ff2681d88886e2165ced397966ba29c2073583 +Author: Behdad Esfahbod +Date: Tue Aug 28 18:03:35 2012 -0400 + + Use VisualStudio-style atomic intrinsics on mingw32 + + src/hb-atomic-private.hh | 25 ++++++++++++++++++------- + 1 file changed, 18 insertions(+), 7 deletions(-) + +commit 7c8e844d92aa604fc4b396343721ea90eb83adb8 +Author: Behdad Esfahbod +Date: Tue Aug 28 17:57:49 2012 -0400 + + Use namespace for OpenType tables + + Avoids USHORT, SHORT, ULONG, LONG clashes with Windows API. + + src/hb-font.cc | 12 ++--- + src/hb-open-file-private.hh | 4 ++ + src/hb-open-type-private.hh | 9 ++-- + src/hb-ot-head-table.hh | 4 ++ + src/hb-ot-hhea-table.hh | 5 ++ + src/hb-ot-hmtx-table.hh | 6 +++ + src/hb-ot-layout-common-private.hh | 5 ++ + src/hb-ot-layout-gdef-table.hh | 4 ++ + src/hb-ot-layout-gpos-table.hh | 4 ++ + src/hb-ot-layout-gsub-table.hh | 4 ++ + src/hb-ot-layout-gsubgpos-private.hh | 4 ++ + src/hb-ot-layout-private.hh | 12 +++-- + src/hb-ot-layout.cc | 91 ++++++++++++++++++------------------ + src/hb-ot-maxp-table.hh | 4 ++ + src/hb-ot-name-table.hh | 4 ++ + src/hb-uniscribe.cc | 8 ++-- + src/main.cc | 2 + + 17 files changed, 117 insertions(+), 65 deletions(-) + +commit dc5df5af6b349c3d9e4ab876864d9dec8096401f +Author: Behdad Esfahbod +Date: Tue Aug 28 16:31:23 2012 -0400 + + Revert "Minor" + + This reverts commit 3e0a03978b91994bb7fa7922593cbdfc50878dfc. + + I know remember why that line is there :). + + src/hb-ot-shape-complex-arabic.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 3e0a03978b91994bb7fa7922593cbdfc50878dfc +Author: Behdad Esfahbod +Date: Mon Aug 27 17:10:02 2012 -0400 + + Minor + + src/hb-ot-shape-complex-arabic.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 667218a5b134728863a318c73070f4e323590bbd +Author: Behdad Esfahbod +Date: Mon Aug 27 17:00:44 2012 -0400 + + Minor + + src/hb-ot-shape-fallback.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 30dd62251fcd04c2cbaa9b979d47ddbf62c6d460 +Author: Behdad Esfahbod +Date: Mon Aug 27 16:54:34 2012 -0400 + + Only fallback-position glyphs if we have the ccc + + Previously, ccc=0 Thai / Lao marks were being + mispositioned. Don't touch them. + + src/hb-ot-shape-fallback.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e1ba62811a61afb046d349e578cd141363c7fb34 +Author: Behdad Esfahbod +Date: Mon Aug 27 16:28:05 2012 -0400 + + Center unknown marks horizontally + + src/hb-ot-shape-fallback.cc | 1 + + 1 file changed, 1 insertion(+) + +commit a4e75e4128751bb902117abc1a59dce4f2147672 +Author: Behdad Esfahbod +Date: Mon Aug 27 15:54:15 2012 -0400 + + Minor + + test/shaping/hb_test_tools.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 23b0e9d7dc801e11640979af3c2b00649a519bb1 +Author: Behdad Esfahbod +Date: Sun Aug 26 14:30:18 2012 -0400 + + [Indic] Fix switch + + D'oh. Was working by pure chance :)). + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ae4d4e1de6b4512576080e95896383887b30982f +Author: Behdad Esfahbod +Date: Sun Aug 26 14:27:44 2012 -0400 + + Bug 53815 - CoreText backend doesn't link + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ec0e46376a2afec4ff7606f95582b0ec49c2a44a +Author: Behdad Esfahbod +Date: Fri Aug 24 00:44:53 2012 -0400 + + Remove TODO items + + TODO | 4 ---- + 1 file changed, 4 deletions(-) + +commit 56e878ab875ff06d74702145e380e198be967bd6 +Author: Behdad Esfahbod +Date: Fri Aug 24 00:41:51 2012 -0400 + + [graphite2] Cleanup scratch buffer allocation + + src/hb-graphite2.cc | 77 ++++++++++++++++++++++++++++++----------------------- + 1 file changed, 44 insertions(+), 33 deletions(-) + +commit 2f7586c6229096143ca0a96712a27416ee0d3c85 +Author: Behdad Esfahbod +Date: Thu Aug 23 23:59:55 2012 -0400 + + [icu-le] Implement icu layout engine shaper + + configure.ac | 2 +- + src/hb-icu-le.cc | 113 +++++++++++++++++++++++++++++++++++++++++++++----- + src/hb-icu-le/cmaps.h | 1 - + src/hb-shaper-list.hh | 4 ++ + 4 files changed, 108 insertions(+), 12 deletions(-) + +commit ba7f6c3797e5b440557bacd9b666bf09713dca76 +Author: Behdad Esfahbod +Date: Thu Aug 23 21:52:44 2012 -0400 + + [icu-le] Hook up to hb_face_t + + src/hb-icu-le.cc | 17 +++- + src/hb-icu-le/FontTableCache.cpp | 34 ++++---- + src/hb-icu-le/FontTableCache.h | 9 ++- + src/hb-icu-le/PortableFontInstance.cpp | 144 +++------------------------------ + src/hb-icu-le/PortableFontInstance.h | 21 ++--- + src/hb-icu-le/README | 1 + + 6 files changed, 57 insertions(+), 169 deletions(-) + +commit e96bb36995b2a5321b4d32bb11906e1701aaf115 +Author: Behdad Esfahbod +Date: Thu Aug 23 21:37:51 2012 -0400 + + [icu-le] Actually use the FontTableCache + + src/hb-icu-le/PortableFontInstance.cpp | 25 ++++++++----------------- + 1 file changed, 8 insertions(+), 17 deletions(-) + +commit 7d242364ea647f655a7092bda25f9a10774c57f5 +Author: Behdad Esfahbod +Date: Thu Aug 23 21:23:41 2012 -0400 + + [icu-le] Start adding a icu-layout-engine backend + + Import PortableFontInstance and add shaper stub. + + configure.ac | 9 + + src/Makefile.am | 8 + + src/hb-icu-le.cc | 111 ++++++++ + src/hb-icu-le/FontTableCache.cpp | 91 +++++++ + src/hb-icu-le/FontTableCache.h | 41 +++ + src/hb-icu-le/Makefile.am | 25 ++ + src/hb-icu-le/PortableFontInstance.cpp | 436 ++++++++++++++++++++++++++++++++ + src/hb-icu-le/PortableFontInstance.h | 117 +++++++++ + src/hb-icu-le/README | 2 + + src/hb-icu-le/cmaps.cpp | 200 +++++++++++++++ + src/hb-icu-le/cmaps.h | 85 +++++++ + src/hb-icu-le/letest.h | 49 ++++ + src/hb-icu-le/license.html | 51 ++++ + src/hb-icu-le/sfnt.h | 449 +++++++++++++++++++++++++++++++++ + 14 files changed, 1674 insertions(+) + +commit b5584ee4be46b47e1678acf28426970a6d670b4f +Author: Behdad Esfahbod +Date: Thu Aug 23 16:26:07 2012 -0400 + + [Indic] For old-spec, match non-zero context + + Fixes consonant-position with old-spec Malayalam. Uniscribe seem to be + doing this. Fixes below-base La (eg. Pa,H,La) with AnjaliNewLipi.ttf. + Doesn't regress new-spec or other scripts. + + src/hb-ot-shape-complex-indic.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit d9b204d3d24cde165167714728bf380267903d6a +Author: Behdad Esfahbod +Date: Thu Aug 23 16:22:28 2012 -0400 + + [GSUB] Allow non-zero-context matching in would_apply() + + To be used in the next patch. + + src/hb-ot-layout-gsubgpos-private.hh | 6 ++++-- + src/hb-ot-layout-private.hh | 3 ++- + src/hb-ot-layout.cc | 14 ++++++++------ + src/hb-ot-layout.h | 7 ++++--- + src/hb-ot-map.cc | 12 ++---------- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/test-would-substitute.cc | 2 +- + 7 files changed, 22 insertions(+), 24 deletions(-) + +commit 1f2bb172fe9a173ecfd61054f1fdd850943ef059 +Author: Behdad Esfahbod +Date: Thu Aug 23 16:10:37 2012 -0400 + + Revert "[Indic/GSUB] Ignore context when matching would_apply()" + + This reverts commit 24dd4e56743c6ce5e01cb710ca9e01b3e527af58. + + Oops. My bad. The change _regressed_ Malayalam test suite, not + improved it. I'll redo it, differentiating between old-spec and + new-spec cases. + + src/hb-ot-layout-gsubgpos-private.hh | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +commit 24dd4e56743c6ce5e01cb710ca9e01b3e527af58 +Author: Behdad Esfahbod +Date: Thu Aug 23 15:47:10 2012 -0400 + + [Indic/GSUB] Ignore context when matching would_apply() + + The MS Indic specs say "...all classifications are determined ... using + context-free substitutions." However, testing shows that MS's Malayalam + shapers (both old and new), "match" even if there is no zero-context rule. + We follow. + + Fixes below-base La (eg. Pa,H,La) with AnjaliNewLipi.ttf (old spec). + Moreover, test suite Malayalam failures are down to 312 from 875! No + change in other scripts. + + Current numbers: + + BENGALI: 353996 out of 354285 tests passed. 289 failed (0.0815727%) + DEVANAGARI: 707339 out of 707394 tests passed. 55 failed (0.00777502%) + GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) + GURMUKHI: 60769 out of 60809 tests passed. 40 failed (0.0657797%) + KANNADA: 951086 out of 951913 tests passed. 827 failed (0.0868777%) + KHMER: 299106 out of 299124 tests passed. 18 failed (0.00601757%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1047541 out of 1048416 tests passed. 875 failed (0.0834592%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271726 out of 271847 tests passed. 121 failed (0.0445103%) + TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) + TELUGU: 970558 out of 970573 tests passed. 15 failed (0.00154548%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-layout-gsubgpos-private.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 6732d62e78b13842ead9549c97bede25c73976cb +Author: Behdad Esfahbod +Date: Thu Aug 23 15:19:45 2012 -0400 + + [Indic] Implement pre-base reordering Ra for old-spec Malayalam + + Fixes Pa,H,Ra sequence with AnjaliNewLipi.ttf. + + src/hb-ot-shape-complex-indic.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 80cd92326f8a3f48a7821e720e8ecb2072e73286 +Author: Behdad Esfahbod +Date: Thu Aug 23 12:06:14 2012 -0400 + + [Indic] Only apply basic features per-syllable + + Free up syllables and let features work across syllables for the + presentation forms features and GPOS. + + Fixed: + - 1 GURMUKHI test (remains 40) + - 12 KHMER tests (remains 18) + - 11 SINHALA tests (remains 121) + + Regresses: + - 5 MALAYALAM tests (up to 312) + + Current numbers: + + BENGALI: 353996 out of 354285 tests passed. 289 failed (0.0815727%) + DEVANAGARI: 707339 out of 707394 tests passed. 55 failed (0.00777502%) + GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) + GURMUKHI: 60769 out of 60809 tests passed. 40 failed (0.0657797%) + KANNADA: 951086 out of 951913 tests passed. 827 failed (0.0868777%) + KHMER: 299106 out of 299124 tests passed. 18 failed (0.00601757%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1048104 out of 1048416 tests passed. 312 failed (0.0297592%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271726 out of 271847 tests passed. 121 failed (0.0445103%) + TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) + TELUGU: 970558 out of 970573 tests passed. 15 failed (0.00154548%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit df5d5c68f3a5cab17bf4a429802a1a1a834c3456 +Author: Behdad Esfahbod +Date: Thu Aug 23 09:33:30 2012 -0400 + + Whitespace + + src/hb-ot-layout-gpos-table.hh | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit 7fe00d15da20193ca94a8ead9aee60df24074a9e +Author: Behdad Esfahbod +Date: Sat Aug 18 13:59:46 2012 -0400 + + Release 0.9.3 + + NEWS | 16 ++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 17 insertions(+), 1 deletion(-) + +commit 7068e534c4ef7ed2eb7ef8e1370fd4a449556ce8 +Author: Behdad Esfahbod +Date: Sat Aug 18 13:56:10 2012 -0400 + + Fix ChangeLog generation rule + + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2f1747ed7d28148807ad07eb8e22db3ab5c54966 +Author: Behdad Esfahbod +Date: Thu Aug 16 11:46:46 2012 -0400 + + Add comment + + src/hb-ot-shape-complex-arabic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit bd08d5d126aa878d1dbf7bfd4b1a764c170cd9ad +Author: Behdad Esfahbod +Date: Thu Aug 16 11:35:50 2012 -0400 + + [OT] Fix Arabic shaper OOB access + + https://bugzilla.mozilla.org/show_bug.cgi?id=782908 + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b161bfc4f6f2db0edea780b95b798ff7b559cf33 +Author: Behdad Esfahbod +Date: Thu Aug 16 08:09:44 2012 -0400 + + [configure] Cleanup check for ICU + + Check for upstream-provided 'icu-uc' pkgconfig package. + + configure.ac | 21 +-------------------- + 1 file changed, 1 insertion(+), 20 deletions(-) + +commit daf0731865f91da960446928667d4095bde471ea +Author: Behdad Esfahbod +Date: Thu Aug 16 07:32:59 2012 -0400 + + [ICU] Fix includes + + As reported by Steven Loomis, including uversion.h works everywhere. + + src/hb-icu.cc | 6 ------ + 1 file changed, 6 deletions(-) + +commit a67ba9c0fe6798a3500af9f4acee8d678f5144ee +Author: Behdad Esfahbod +Date: Wed Aug 15 18:52:17 2012 -0400 + + Whitespace + + src/hb-old/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9fe76051f7003d6b6a10486c5595bf1a4dbf5fe6 +Author: Behdad Esfahbod +Date: Wed Aug 15 17:24:28 2012 -0400 + + [NEWS] Fix date + + Oops! + + NEWS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 45c1383cc7315f89c23c0ed388b99e87224884e7 +Author: Behdad Esfahbod +Date: Tue Aug 14 09:33:18 2012 -0400 + + Minor + + src/hb-coretext.cc | 8 ++++---- + src/hb-fallback-shape.cc | 8 ++++---- + src/hb-graphite2.cc | 8 ++++---- + src/hb-uniscribe.cc | 8 ++++---- + 4 files changed, 16 insertions(+), 16 deletions(-) + +commit 4ac4c6f2e12ddc8bf5e750671321458218b6e0c8 +Author: Behdad Esfahbod +Date: Mon Aug 13 10:52:52 2012 -0400 + + Fix ICU build with older ICUs + + src/hb-icu.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 883cbf5ed79d2b60191f803a5ee3f3e4496f3441 +Author: Behdad Esfahbod +Date: Sun Aug 12 17:11:27 2012 -0400 + + Minor + + contrib/README | 2 ++ + 1 file changed, 2 insertions(+) + +commit b7a4d37d0b162f2222b65d09b9271b8c636086f8 +Author: Behdad Esfahbod +Date: Sat Aug 11 21:32:23 2012 -0400 + + minor + + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +commit d5045a5f4017631a4660f985fe451c5a64c42ca0 +Author: Behdad Esfahbod +Date: Sat Aug 11 21:26:25 2012 -0400 + + [ICU] Use new normalizer2 compose/decompose API + + It's considerably faster than the fallback implementation we had + previously! + + src/hb-buffer.cc | 9 +++--- + src/hb-glib.cc | 26 +++++++--------- + src/hb-icu.cc | 75 +++++++++++++++++++++++++++++++++++++---------- + src/hb-unicode-private.hh | 13 ++------ + src/hb-unicode.cc | 35 ++++++++++++++++++++-- + src/hb-warning.cc | 8 ----- + 6 files changed, 110 insertions(+), 56 deletions(-) + +commit 2b73a1f112c489c2553743c08dc03cd89f60cb2d +Author: Behdad Esfahbod +Date: Sat Aug 11 19:17:54 2012 -0400 + + Add TODO + + TODO | 1 + + 1 file changed, 1 insertion(+) + +commit 9f9f04c2229227bb0712166e824157bbbf5cef80 +Author: Behdad Esfahbod +Date: Sat Aug 11 18:34:13 2012 -0400 + + [OT] Unbreak Thai shaping and fallback Arabic shaping + + The merger of normalizer and glyph-mapping broke shapers that + modified text stream. Unbreak them by adding a new preprocess_text + shaping stage that happens before normalizing/cmap and disallow + setup_mask modification of actual text. + + src/hb-ot-shape-complex-arabic.cc | 42 ++++++++++++++++++++++++++++---------- + src/hb-ot-shape-complex-indic.cc | 1 + + src/hb-ot-shape-complex-misc.cc | 12 ++++++----- + src/hb-ot-shape-complex-private.hh | 15 +++++++++++--- + src/hb-ot-shape.cc | 3 +++ + 5 files changed, 54 insertions(+), 19 deletions(-) + +commit e9f28a38f54b98fa59f9159ccaaa3be6027e1378 +Author: Behdad Esfahbod +Date: Sat Aug 11 18:20:28 2012 -0400 + + [OT] Add shape_plan to Arabic shaper + + src/hb-ot-shape-complex-arabic.cc | 82 +++++++++++++++++++++++++-------------- + 1 file changed, 53 insertions(+), 29 deletions(-) + +commit 344cc56698a8c84c4c1a05a71d829e5171aa3a60 +Author: Behdad Esfahbod +Date: Sat Aug 11 17:36:23 2012 -0400 + + Add TODO + + TODO | 4 ++++ + 1 file changed, 4 insertions(+) + +commit daf13afb0801740dcc7900c4af190e24b80a05c0 +Author: Behdad Esfahbod +Date: Fri Aug 10 16:38:44 2012 -0400 + + [OT] Implement fallback mark positioning for "double" combining marks + + src/hb-ot-shape-fallback.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit d345313104d9e3c8a8533ccdebd74e0648d0bee3 +Author: Behdad Esfahbod +Date: Fri Aug 10 16:34:04 2012 -0400 + + [OT] Fix fallback mark positioning with left-to-right text + + Ouch! + + src/hb-ot-shape-fallback.cc | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +commit e297ee4acd6f9d950f8542fc6ad71fd580b69284 +Author: Behdad Esfahbod +Date: Fri Aug 10 14:49:37 2012 -0400 + + Bump version to 0.9.2 + + A *real* release this time, with NEWS, ChangeLog, etc. + + AUTHORS | 8 ++++ + COPYING | 9 ++-- + Makefile.am | 13 +++--- + NEWS | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + THANKS | 7 +++ + configure.ac | 4 +- + 6 files changed, 165 insertions(+), 12 deletions(-) + +commit 6efe1200b97cefe019857b0b5951a4a87deeb02b +Author: Behdad Esfahbod +Date: Fri Aug 10 13:49:32 2012 -0400 + + Bump version to 0.9.1 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 206ab6057303273590a3d005660e075bdcee0f5f +Author: Behdad Esfahbod +Date: Fri Aug 10 09:06:30 2012 -0400 + + [test] Move around + + test/shaping/texts/in-tree/shaper-arabic/script-arabic/MANIFEST | 2 +- + .../texts/in-tree/shaper-arabic/script-arabic/language-urdu/MANIFEST | 1 + + .../shaper-arabic/script-arabic/{ => language-urdu}/crulp/MANIFEST | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/2grams.txt | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/3grams.txt | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/4grams.txt | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/5grams.txt | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/6grams.txt | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/7grams.txt | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/8grams.txt | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/LICENSE | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/MANIFEST | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/README | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/SOURCES | 0 + 14 files changed, 2 insertions(+), 1 deletion(-) + +commit 7a484c601e0958533eb85a6902296733c39537fe +Author: Behdad Esfahbod +Date: Fri Aug 10 09:05:29 2012 -0400 + + [test] Add Urdu ligature sequences from CRULP + + .../in-tree/shaper-arabic/script-arabic/MANIFEST | 1 + + .../shaper-arabic/script-arabic/crulp/MANIFEST | 1 + + .../script-arabic/crulp/ligatures/2grams.txt | 601 ++ + .../script-arabic/crulp/ligatures/3grams.txt | 3415 +++++++++++ + .../script-arabic/crulp/ligatures/4grams.txt | 6316 ++++++++++++++++++++ + .../script-arabic/crulp/ligatures/5grams.txt | 5029 ++++++++++++++++ + .../script-arabic/crulp/ligatures/6grams.txt | 1542 +++++ + .../script-arabic/crulp/ligatures/7grams.txt | 354 ++ + .../script-arabic/crulp/ligatures/8grams.txt | 26 + + .../script-arabic/crulp/ligatures/LICENSE | 3 + + .../script-arabic/crulp/ligatures/MANIFEST | 7 + + .../script-arabic/crulp/ligatures/README | 16 + + .../script-arabic/crulp/ligatures/SOURCES | 4 + + 13 files changed, 17315 insertions(+) + +commit f4cb4762986a28634fa7de9b706f9d37859b881e +Author: Behdad Esfahbod +Date: Fri Aug 10 03:51:44 2012 -0400 + + [OT] Slightly adjust normalizer + + The change is very subtle. If we have a single-char cluster that + decomposes to three or more characters, then try recomposition, in + case the farther mark may compose with the base. + + src/hb-ot-shape-normalize.cc | 81 +++++++++++++++++++++++++++++--------------- + 1 file changed, 54 insertions(+), 27 deletions(-) + +commit 07d682806349aee81f53114778ce0beb23909ed7 +Author: Behdad Esfahbod +Date: Fri Aug 10 03:28:50 2012 -0400 + + Minor + + src/hb-ot-shape-normalize.cc | 25 ++++++++----------------- + src/hb-ot-shape.cc | 2 +- + 2 files changed, 9 insertions(+), 18 deletions(-) + +commit b00321ea78793d9b3592b5173a9800e6322424fe +Author: Behdad Esfahbod +Date: Thu Aug 9 22:33:32 2012 -0400 + + [OT] Avoid calling get_glyph() twice + + Essentially move the glyph mapping to normalization process. + The effect on Devanagari is small (but observable). Should be more + observable in simple text, like ASCII. + + src/hb-ot-shape-normalize-private.hh | 2 + + src/hb-ot-shape-normalize.cc | 76 +++++++++++++++++++++++++----------- + src/hb-ot-shape.cc | 44 ++++++++++----------- + 3 files changed, 77 insertions(+), 45 deletions(-) + +commit 12c0875eafa4bd92db650e5acca046d99594d1e6 +Author: Behdad Esfahbod +Date: Thu Aug 9 22:00:53 2012 -0400 + + [OT] Remove redundant check + + src/hb-ot-shape.cc | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit 5c60b70c89b4e0a6512d9fd1ab5394dd76feb742 +Author: Behdad Esfahbod +Date: Thu Aug 9 21:58:07 2012 -0400 + + [OT] More code shuffling around + + Preparing for merging map_glyphs() and normalize(). + + src/hb-ot-shape.cc | 167 +++++++++++++++++++++++++++-------------------------- + 1 file changed, 86 insertions(+), 81 deletions(-) + +commit cd0c6e148f6d078b364370cb2f808b793b921be2 +Author: Behdad Esfahbod +Date: Thu Aug 9 21:48:55 2012 -0400 + + Shuffle buffer variable allocations around + + To room for more allocations, coming. + + src/hb-ot-layout-private.hh | 6 +++--- + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-indic-private.hh | 4 ++-- + src/hb-ot-shape-complex-private.hh | 5 ++--- + src/hb-ot-shape-private.hh | 4 ++-- + 5 files changed, 10 insertions(+), 11 deletions(-) + +commit 8d1eef3f32fb539de2a72804fa3834acc18daab5 +Author: Behdad Esfahbod +Date: Thu Aug 9 21:31:52 2012 -0400 + + Minor + + src/hb-ot-shape-normalize.cc | 50 +++++++++++++++++++++++++++----------------- + 1 file changed, 31 insertions(+), 19 deletions(-) + +commit 56c9e7c004e802ddcb8c704346026f1d7a812f9f +Author: Behdad Esfahbod +Date: Thu Aug 9 21:12:30 2012 -0400 + + Fill out combining class resetting for fallback shaping Thai/Lao/Tibetan + + src/hb-ot-shape-fallback.cc | 38 +++++++++++++++++++++++++++++++++++++- + src/hb-unicode-private.hh | 7 ++++--- + src/hb-unicode.cc | 2 +- + 3 files changed, 42 insertions(+), 5 deletions(-) + +commit a321e1d51e0e7fa02738410e8d6e77c841bc6b13 +Author: Behdad Esfahbod +Date: Thu Aug 9 18:30:34 2012 -0400 + + Revert "Reject lookups with no subTable" + + This reverts commit 30ec9002d84e8b49290e782e6192069821ffa942. + + See previous commit. + + src/hb-ot-layout-common-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 2eaf482b371034ce6ebfaedee98049b036fd3493 +Author: Behdad Esfahbod +Date: Thu Aug 9 18:30:05 2012 -0400 + + Revert "[GSUB/GPOS] Reject Context/ChainContext lookups with zero input" + + This reverts commit 0981068b75710397f08e0d2d776a0a2ea68d7117. + + I was confused. Even if we access coverage[0] unconditionally, we don't + need bound checks since the array machinary already handles that. + + src/hb-ot-layout-gsubgpos-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit a02d86484be870615297abfc7be9f94645434762 +Author: Behdad Esfahbod +Date: Wed Aug 8 18:04:29 2012 -0400 + + Add check-exported-symbols.sh + + And misc linking fixes. + + src/Makefile.am | 1 + + src/check-exported-symbols.sh | 40 ++++++++++++++++++++++++++++++++++++++++ + src/check-internal-symbols.sh | 2 +- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape.cc | 6 +++--- + 5 files changed, 46 insertions(+), 5 deletions(-) + +commit 4c8ac4f47e95d2b266b2f64e75c55af8233b6b91 +Author: Behdad Esfahbod +Date: Wed Aug 8 17:44:19 2012 -0400 + + Misc minor fixes + + src/check-internal-symbols.sh | 10 +-- + src/hb-font-private.hh | 29 +++++++- + src/hb-font.cc | 63 +++++++--------- + src/hb-font.h | 2 +- + src/hb-graphite2.cc | 4 +- + src/hb-old.cc | 2 +- + src/hb-ot-layout.cc | 6 +- + src/hb-ot-shape-fallback.cc | 10 +-- + src/hb-ot-shape.cc | 2 +- + src/hb-shape-plan.cc | 2 +- + src/hb-shape-plan.h | 2 +- + src/hb-tt-font.cc | 166 +----------------------------------------- + 12 files changed, 72 insertions(+), 226 deletions(-) + +commit 560d68af8168d1baff607b9616a3590af70fe9ec +Author: Behdad Esfahbod +Date: Wed Aug 8 17:16:01 2012 -0400 + + Use a export-file for Windows builds + + Apparently even that doesn't make check-internal-symbols.sh happy with + mingw32. Going to disable that for DLLs again, but hopefully the + export-file is doing *something*. + + configure.ac | 14 +++++++++++++- + src/Makefile.am | 22 +++++++++++++++++++++- + src/hb-buffer.h | 4 ++-- + 3 files changed, 36 insertions(+), 4 deletions(-) + +commit f8751cf8e0a16125d63a88da65fdbfa76a19453f +Author: Behdad Esfahbod +Date: Wed Aug 8 17:15:44 2012 -0400 + + [hb-old] speed-up build + + src/hb-old/harfbuzz-external.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 5f4c52867ce67faa15f5d26b59c18c8d068e9261 +Author: Behdad Esfahbod +Date: Wed Aug 8 16:53:37 2012 -0400 + + Minor + + src/hb-ot-layout.h | 1 - + 1 file changed, 1 deletion(-) + +commit fe2b8a7777ab1c84980424ede713cb0d6701f987 +Author: Behdad Esfahbod +Date: Wed Aug 8 15:27:14 2012 -0400 + + Minor + + TODO | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7e7d245b332306949a19c628bacd920717434769 +Author: Behdad Esfahbod +Date: Wed Aug 8 15:23:48 2012 -0400 + + Make default_language threadsafe + + src/hb-common.cc | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +commit 06b192c458010c847362d809673209c87ea29949 +Author: Behdad Esfahbod +Date: Wed Aug 8 15:23:45 2012 -0400 + + Minor + + src/hb-common.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 37191ede7583fdb864db32a8f4d90956657926c7 +Author: Behdad Esfahbod +Date: Wed Aug 8 14:59:09 2012 -0400 + + Minor + + src/hb-common.h | 4 ++-- + src/hb-icu.h | 1 - + 2 files changed, 2 insertions(+), 3 deletions(-) + +commit 6d9a329a8a0f11f4b175e407de59c55924de1ef6 +Author: Behdad Esfahbod +Date: Wed Aug 8 14:48:41 2012 -0400 + + Adjust a couple source checks + + src/check-internal-symbols.sh | 4 ++-- + src/check-static-inits.sh | 10 ++++++++-- + 2 files changed, 10 insertions(+), 4 deletions(-) + +commit 9c929abdcfef44c0193a2917b20981df37ade21c +Author: Behdad Esfahbod +Date: Wed Aug 8 14:33:37 2012 -0400 + + Minor renaming + + src/Makefile.am | 4 ++-- + ...sition-fallback-private.hh => hb-ot-shape-fallback-private.hh} | 8 ++++---- + src/{hb-ot-shape-position-fallback.cc => hb-ot-shape-fallback.cc} | 4 ++-- + src/hb-ot-shape.cc | 4 ++-- + 4 files changed, 10 insertions(+), 10 deletions(-) + +commit 801298b590effd768607bb532dc83c73ba65d16b +Author: Behdad Esfahbod +Date: Wed Aug 8 14:26:36 2012 -0400 + + Fix cast + + https://bugs.freedesktop.org/show_bug.cgi?id=53233 + + src/hb-buffer-private.hh | 10 ++++++---- + src/hb-shape-plan.cc | 4 ++-- + 2 files changed, 8 insertions(+), 6 deletions(-) + +commit 21756934a15e31dc243e2b6d80adec5752477652 +Author: Behdad Esfahbod +Date: Wed Aug 8 01:20:45 2012 -0400 + + [OT] Implement fallback positioning + + Implemented for Arabic, Hebrew, and generic marks. + Activated if no GPOS table present. + + src/hb-font.h | 3 +- + src/hb-ft.cc | 3 +- + src/hb-old.cc | 2 +- + src/hb-ot-shape-position-fallback.cc | 237 ++++++++++++++++++++++++++++++++++- + src/hb-unicode-private.hh | 81 ++++++++++++ + src/hb-unicode.cc | 107 ++++++---------- + 6 files changed, 356 insertions(+), 77 deletions(-) + +commit fb56e7628362a73e20f7f0b49fe31e802dc01f4f +Author: Behdad Esfahbod +Date: Tue Aug 7 23:44:47 2012 -0400 + + [hb-old] Fix warnings + + src/hb-old/harfbuzz-shaper.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +commit affaf8a0e5aa38e5820455f789eebf916e02eb7b +Author: Behdad Esfahbod +Date: Tue Aug 7 22:41:38 2012 -0400 + + [OT] Start adding fallback positioning + + Used when there is no GPOS. + + src/Makefile.am | 2 ++ + src/hb-ot-shape-position-fallback-private.hh | 39 +++++++++++++++++++++++ + src/hb-ot-shape-position-fallback.cc | 47 ++++++++++++++++++++++++++++ + src/hb-ot-shape.cc | 23 +++----------- + 4 files changed, 93 insertions(+), 18 deletions(-) + +commit 7e4920fd1577987bf6804f67765e22a84983e057 +Author: Behdad Esfahbod +Date: Tue Aug 7 22:32:23 2012 -0400 + + Minor + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 472f229a63f0d1bb21b02179ef430b7698df8f12 +Author: Behdad Esfahbod +Date: Tue Aug 7 22:25:24 2012 -0400 + + [GSUB] Generalize would_apply() + + Fixes logic also, where before we were always matching if glyphs_len==1 + and a ligature started with the glyph. + + src/hb-ot-layout-gsub-table.hh | 26 ++++++++++++++++++++----- + src/hb-ot-layout-gsubgpos-private.hh | 37 ++++++++++++++++++------------------ + src/hb-ot-layout.cc | 3 +-- + 3 files changed, 40 insertions(+), 26 deletions(-) + +commit 6f3a300138f659020c21c3e08b7981c78df5f332 +Author: Behdad Esfahbod +Date: Tue Aug 7 22:13:25 2012 -0400 + + Add hb_font_glyph_from/to_string + + src/hb-font-private.hh | 43 +++++++++++++++++++++++++++++++++++++++++++ + src/hb-font.cc | 24 ++++++++++++++++++++---- + src/hb-font.h | 11 +++++++++++ + src/hb-private.hh | 16 ++++++++++++++++ + src/test-would-substitute.cc | 11 ++++++++++- + util/options.cc | 2 +- + 6 files changed, 101 insertions(+), 6 deletions(-) + +commit eb56f6ae96260c5b4bcd4e1dfb7ab733a230f3a8 +Author: Behdad Esfahbod +Date: Tue Aug 7 21:44:25 2012 -0400 + + Minor + + src/hb-mutex-private.hh | 1 + + src/hb-uniscribe.cc | 1 + + src/hb-uniscribe.h | 2 ++ + 3 files changed, 4 insertions(+) + +commit f4e48adcdd4315ce09e755f87a0f801d88194f42 +Author: Behdad Esfahbod +Date: Tue Aug 7 21:12:49 2012 -0400 + + [OT] Apply 'rclt' feature in horizontal mode + + 'rclt' is "Required Contextual Forms" being proposed by Microsoft. + It's like 'calt', but supposedly always on. We apply 'calt' anyway, + and now apply this too. + + src/hb-ot-shape.cc | 1 + + 1 file changed, 1 insertion(+) + +commit b1914b8bd08ecdea79930dda7e3bb2ae9e6134a1 +Author: Behdad Esfahbod +Date: Tue Aug 7 16:57:48 2012 -0400 + + Fix warnings + + src/hb-icu.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 0f8881d6bbf6cd59938315eeff9b71cfc736aa4e +Author: Behdad Esfahbod +Date: Tue Aug 7 16:57:02 2012 -0400 + + More refactoring + + src/hb-ot-shape-normalize.cc | 161 +++++++++++++++++++++++++++++++++++++++++- + src/hb-unicode-private.hh | 164 +------------------------------------------ + 2 files changed, 162 insertions(+), 163 deletions(-) + +commit 428dfcab6634ff264570a0a5d715efb8048c3db5 +Author: Behdad Esfahbod +Date: Tue Aug 7 16:51:48 2012 -0400 + + Minor refactoring + + src/hb-ot-shape-normalize.cc | 27 +++++++++++++++++++++++---- + 1 file changed, 23 insertions(+), 4 deletions(-) + +commit 61f41849af6ff9edf8b55cf9610066d1bfb4a8df +Author: Behdad Esfahbod +Date: Tue Aug 7 16:45:27 2012 -0400 + + Add Hebrew presentation forms shaping + + Lifted from https://bugzilla.mozilla.org/show_bug.cgi?id=728866 + + src/hb-unicode-private.hh | 121 +++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 120 insertions(+), 1 deletion(-) + +commit 32d71dc13317b322e2c5de00d767b2cb15fddd8b +Author: Behdad Esfahbod +Date: Tue Aug 7 14:11:16 2012 -0400 + + [Graphite] Minor + + src/hb-graphite2.cc | 60 +++++++++++++++++++++++++---------------------------- + 1 file changed, 28 insertions(+), 32 deletions(-) + +commit 030ac5022e8a43b9329c26e72527bafc582ef44b +Author: Behdad Esfahbod +Date: Tue Aug 7 13:01:12 2012 -0400 + + Remove enum trailing comma + + ...again. + + src/hb-ot-shape-normalize-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 368b4e7649f9bc8c6bebf7c7ff03c9b9ec425a25 +Author: Behdad Esfahbod +Date: Mon Aug 6 23:06:04 2012 -0400 + + Minor + + src/hb-font.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit ade7459ea7c75b4f33f7cfa43dd5bdfa0c18d6d5 +Author: Behdad Esfahbod +Date: Mon Aug 6 19:42:47 2012 -0700 + + [util] Fix leaks + + src/hb-graphite2.cc | 18 ++++++++++++++---- + util/options.cc | 2 +- + util/options.hh | 2 +- + 3 files changed, 16 insertions(+), 6 deletions(-) + +commit 2fef993460dcfd94c92ab35413bdde18ad2b0ceb +Author: Behdad Esfahbod +Date: Mon Aug 6 19:35:04 2012 -0700 + + [Graphite] Fix graphite2 backend with RTL text + + Patch from Martin Hosken. + + src/hb-graphite2.cc | 33 ++++++++++++++++++--------------- + 1 file changed, 18 insertions(+), 15 deletions(-) + +commit e4992e13e19877a73ea05fc1d31005a262c685ad +Author: Behdad Esfahbod +Date: Mon Aug 6 19:25:39 2012 -0700 + + [Graphite] Port graphite2 backend to new shaper infrastructure + + src/hb-graphite2.cc | 234 +++++++++++++++++++++++--------------------------- + src/hb-graphite2.h | 2 +- + src/hb-shaper-list.hh | 2 +- + 3 files changed, 109 insertions(+), 129 deletions(-) + +commit 66591ececfba9791de06c814f5f30131e95e5fd2 +Author: Behdad Esfahbod +Date: Mon Aug 6 17:07:19 2012 -0700 + + Remove unnecessary lifecycle bits + + We already set recount to INVALID when destroying. + This block was not necessary. + + src/hb-font.cc | 3 --- + 1 file changed, 3 deletions(-) + +commit e3320ecc1b5a7eaccc7c9370b2d1b76850f054be +Author: Behdad Esfahbod +Date: Mon Aug 6 11:44:10 2012 -0700 + + Fix compiler warnings + + configure.ac | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit 167b625d988b74572d6b2f646c285b666b650d49 +Author: Behdad Esfahbod +Date: Sun Aug 5 21:16:26 2012 -0700 + + [Indic] Minor, move 'blwf' after 'half' + + We don't apply them together anyway. Should not make any difference + right now. + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 048e3b596fb7fccd3fb5f48de98b6b67788f774a +Author: Behdad Esfahbod +Date: Sat Aug 4 18:04:57 2012 -0700 + + Speed up hb_set_digest_lowest_bits_t calcs + + src/hb-set-private.hh | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 3d1b66a35e1ab3be19335705f310b278d76d66d2 +Author: Behdad Esfahbod +Date: Sat Aug 4 17:42:28 2012 -0700 + + Speed up hb_set_digest_common_bits_t calcs + + src/hb-set-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit bdc48a879a1900138d8caaa8d90fb9fe1e768d1d +Author: Behdad Esfahbod +Date: Sat Aug 4 17:08:38 2012 -0700 + + Enlarge glyph_name buffer + + Lohit Devanagari has a glyph named: + u0924_u094D.half_u0930_u094D.blwf.vatu + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 25326c2359b0a3e25222b94acd142bc36eff78a4 +Author: Behdad Esfahbod +Date: Sat Aug 4 16:43:18 2012 -0700 + + Rewrite ARRAY_LENGTH as a template function + + Such it wouldn't apply to pointers accidentally. + + src/hb-ot-shape-complex-arabic-table.hh | 4 ++-- + src/hb-private.hh | 9 ++++++--- + 2 files changed, 8 insertions(+), 5 deletions(-) + +commit 8ba8042821e4581fe4e87419e58c823520441205 +Author: Behdad Esfahbod +Date: Fri Aug 3 18:54:54 2012 -0700 + + [Indic] Fix consonant position font lookup logic + + Oops. I broken this badly and the test suite did not notice. That + worries me. Have to investigate. + + src/hb-ot-shape-complex-indic.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit abd0c05f1f7f0546593bb2f1c4d59db12cb32e46 +Author: Behdad Esfahbod +Date: Fri Aug 3 18:45:05 2012 -0700 + + Minor + + src/test-would-substitute.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 46ee108ef80f5d4675899862698a8c34d8fcfab5 +Author: Behdad Esfahbod +Date: Fri Aug 3 18:21:13 2012 -0700 + + Fix leak + + src/hb-shape-plan.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 71baea0062da4d7f143d62da38492a0813814e49 +Author: Behdad Esfahbod +Date: Fri Aug 3 17:40:07 2012 -0700 + + [OT] Use general-category, not GDEF class, to decide to zero mark advances + + At this point, the GDEF glyph synthesis looks pointless. Not that I + have many fonts without GDEF lying around. + + As for mark advance zeroing when GPOS not available, that also is being + replaced by proper fallback mark positioning soon. + + src/hb-ot-shape.cc | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +commit 3a7e137a68ec8f723dc3afa89c918ca2df7ff6bf +Author: Behdad Esfahbod +Date: Fri Aug 3 17:23:40 2012 -0700 + + Dn't use gint + + src/hb-glib.cc | 4 ++-- + src/hb-icu.cc | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 11b0e20ba42bf0b17133c3e1087732802bb4f230 +Author: Behdad Esfahbod +Date: Thu Aug 2 14:21:40 2012 -0400 + + [Indic] Add per-script configuration tables + + This concludes the Indic shape_plan work. May do for Arabic also... + + src/hb-ot-shape-complex-indic-private.hh | 16 +- + src/hb-ot-shape-complex-indic.cc | 309 +++++++++++++++---------------- + 2 files changed, 159 insertions(+), 166 deletions(-) + +commit 85fc6c483f6d734febbe39270e84701a651f01f1 +Author: Behdad Esfahbod +Date: Thu Aug 2 12:21:44 2012 -0400 + + [Indic] Move more stuff to the shape_plan + + Almost done. Need to add per-script static tables. + + src/hb-ot-shape-complex-indic-machine.rl | 4 +- + src/hb-ot-shape-complex-indic.cc | 216 ++++++++++++++++--------------- + 2 files changed, 116 insertions(+), 104 deletions(-) + +commit 914ffaa40fcca020f65bacdd709421e9047afd83 +Author: Behdad Esfahbod +Date: Thu Aug 2 11:03:39 2012 -0400 + + [Indic] Move more repeated work into shape_plan + + src/hb-ot-shape-complex-indic.cc | 63 ++++++++++++++++++++++++++-------------- + 1 file changed, 42 insertions(+), 21 deletions(-) + +commit a8c6da90f4c6e8d27a3a1b758a55476776d9f750 +Author: Behdad Esfahbod +Date: Thu Aug 2 10:46:34 2012 -0400 + + [OT] Add per-complex-shaper shape_plan data + + Hookup some Indic data to it. More to come. + + src/hb-ot-shape-complex-arabic.cc | 2 + + src/hb-ot-shape-complex-indic.cc | 128 ++++++++++++++++++++++--------------- + src/hb-ot-shape-complex-misc.cc | 4 ++ + src/hb-ot-shape-complex-private.hh | 16 ++++- + src/hb-ot-shape-private.hh | 1 + + src/hb-ot-shape.cc | 23 +++++-- + 6 files changed, 113 insertions(+), 61 deletions(-) + +commit 8bb5deba9630d35878eb6edb4643ecfabf99f15f +Author: Behdad Esfahbod +Date: Thu Aug 2 10:07:58 2012 -0400 + + [OT] Pipe shape_plan down to pause_callbacks + + src/hb-ot-map-private.hh | 8 ++--- + src/hb-ot-map.cc | 11 ++++--- + src/hb-ot-shape-complex-indic-machine.rl | 4 +-- + src/hb-ot-shape-complex-indic.cc | 50 +++++++++++++++----------------- + src/hb-ot-shape-private.hh | 6 ++++ + src/hb-ot-shape.cc | 28 ++++++++++-------- + 6 files changed, 57 insertions(+), 50 deletions(-) + +commit 3e38c0f2886c38d2f0a9d80a97a36edf2479d2c7 +Author: Behdad Esfahbod +Date: Thu Aug 2 09:44:18 2012 -0400 + + More massaging + + src/hb-ot-map-private.hh | 20 ++++++++------------ + src/hb-ot-map.cc | 17 ++++++++--------- + src/hb-ot-shape-complex-arabic.cc | 8 ++++---- + src/hb-ot-shape-complex-indic.cc | 18 +++++++----------- + 4 files changed, 27 insertions(+), 36 deletions(-) + +commit 16c6a27b4bffc19026944c7bea9cf0a3a8ff1d8f +Author: Behdad Esfahbod +Date: Thu Aug 2 09:38:28 2012 -0400 + + [OT] Port complex_shaper to planner/plan + + src/hb-ot-shape-complex-arabic.cc | 17 ++++++++--------- + src/hb-ot-shape-complex-indic.cc | 19 ++++++++----------- + src/hb-ot-shape-complex-misc.cc | 20 ++++++++------------ + src/hb-ot-shape-complex-private.hh | 32 +++++++++++--------------------- + src/hb-ot-shape-private.hh | 14 +++++++++++--- + src/hb-ot-shape.cc | 9 +++++---- + 6 files changed, 51 insertions(+), 60 deletions(-) + +commit 5393e3a62ba09fd7bcf3767b36225c8f49badb9d +Author: Behdad Esfahbod +Date: Thu Aug 2 09:24:35 2012 -0400 + + [OT] Minor refactoring + + src/hb-ot-map.cc | 4 ---- + src/hb-ot-shape-private.hh | 26 ++++++++++++++++++++++++++ + src/hb-ot-shape.cc | 26 ++------------------------ + src/hb-shape-plan.cc | 2 ++ + src/hb-shape.cc | 2 -- + 5 files changed, 30 insertions(+), 30 deletions(-) + +commit 24eacf17c801c66a2d466e8ae02b73f501a26b25 +Author: Behdad Esfahbod +Date: Thu Aug 2 08:42:11 2012 -0400 + + [Indic] Move consonant-position-setting into initial_reordering() + + src/hb-ot-shape-complex-indic.cc | 65 +++++++++++++++++++++------------------- + 1 file changed, 35 insertions(+), 30 deletions(-) + +commit afbcc24be01a64bdb5c05c63880269145fa1d3c8 +Author: Behdad Esfahbod +Date: Thu Aug 2 08:36:40 2012 -0400 + + [GSUB] Wire the font, not just the face, down to substitute() + + We need the font for glyph lookup during GSUB pauses in Indic shaper. + Could perhaps be avoided, but at this point, we don't mean to support + separate substitute()/position() entry points (anymore), so there is + no point in not providing the font to GSUB. + + src/hb-ot-layout-gsub-table.hh | 13 +++++-------- + src/hb-ot-layout-gsubgpos-private.hh | 7 ++----- + src/hb-ot-layout-private.hh | 6 +++--- + src/hb-ot-layout.cc | 18 +++++++++--------- + src/hb-ot-map-private.hh | 15 ++++++--------- + src/hb-ot-map.cc | 8 ++++---- + src/hb-ot-shape-complex-indic.cc | 8 ++++---- + src/hb-ot-shape.cc | 6 +++--- + 8 files changed, 36 insertions(+), 45 deletions(-) + +commit b0e6a26a10ccca70ebc88a9e158a89ccfab0add5 +Author: Behdad Esfahbod +Date: Thu Aug 2 08:11:14 2012 -0400 + + [OT] Hide some API + + It was impossible to meaningfully use them from the outside these days. + + src/hb-ot-layout-private.hh | 40 ++++++++++++++++++++++++++++++++-------- + src/hb-ot-layout.cc | 20 -------------------- + src/hb-ot-layout.h | 34 ---------------------------------- + src/hb-ot-map.cc | 8 ++++---- + 4 files changed, 36 insertions(+), 66 deletions(-) + +commit 305246744ed178f116e01498b7f9d1af6950ca30 +Author: Behdad Esfahbod +Date: Thu Aug 2 08:08:04 2012 -0400 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8ef3d53255ae9fbb0e46c22909e50009d1e7eeb0 +Author: Behdad Esfahbod +Date: Thu Aug 2 07:53:18 2012 -0400 + + [Indic] More refactoring of consonant position peeking in the font + + To be moved to initial_reordering next... + + src/hb-ot-shape-complex-indic.cc | 59 ++++++++++++++++++++++++++++------------ + 1 file changed, 41 insertions(+), 18 deletions(-) + +commit 3eb6f81fd3f1e56679eec10d08f5e2303121753f +Author: Behdad Esfahbod +Date: Thu Aug 2 07:37:46 2012 -0400 + + [Indic] Refactor + + Move all the logic that needs to eventually move into the indic table + into hb-ot-shape-complex-indic-private.hh. + + src/hb-ot-shape-complex-indic-private.hh | 210 ++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-indic.cc | 227 ++----------------------------- + 2 files changed, 218 insertions(+), 219 deletions(-) + +commit 3614ba242fc7d338761acdda365a134706035b6d +Author: Behdad Esfahbod +Date: Thu Aug 2 07:13:55 2012 -0400 + + [Indic] Rename + + src/hb-ot-shape-complex-indic.cc | 40 +++++++++++++++++++++------------------- + 1 file changed, 21 insertions(+), 19 deletions(-) + +commit 610e5e8f713bb2a68939b72cb2b801a7aaede4f9 +Author: Behdad Esfahbod +Date: Thu Aug 2 05:27:46 2012 -0400 + + [Indic] Streamline feature would_apply() + + Comes with some 10% speedup for Devanagari even! + + src/hb-ot-map-private.hh | 85 +++++++++++++++++++++++++--------------- + src/hb-ot-map.cc | 18 ++++----- + src/hb-ot-shape-complex-indic.cc | 85 +++++++++++++++++++++++----------------- + 3 files changed, 110 insertions(+), 78 deletions(-) + +commit 1d002048d5afcd45abbb09fdf0419f13b2e2265c +Author: Behdad Esfahbod +Date: Thu Aug 2 05:01:11 2012 -0400 + + [Indic] Minor + + src/hb-ot-shape-complex-indic-private.hh | 16 -------- + src/hb-ot-shape-complex-indic.cc | 64 +++++++++++++++++++++----------- + 2 files changed, 43 insertions(+), 37 deletions(-) + +commit 6f7611375521c6d285a9aa763f2ea5cb44cd0d39 +Author: Behdad Esfahbod +Date: Thu Aug 2 04:00:31 2012 -0400 + + [GSUB/GPOS] Check array size before accessing digests + + src/hb-ot-layout-private.hh | 3 +++ + src/hb-ot-layout.cc | 32 ++++++++++++++++---------------- + 2 files changed, 19 insertions(+), 16 deletions(-) + +commit 22148b8c4af3ed296d96e969cdd47bac97b32307 +Author: Behdad Esfahbod +Date: Thu Aug 2 03:51:51 2012 -0400 + + Use Coverage digests in would_apply + + src/hb-ot-layout-gsub-table.hh | 1 + + src/hb-ot-layout-gsubgpos-private.hh | 6 +++++- + src/hb-ot-layout.cc | 4 ++-- + 3 files changed, 8 insertions(+), 3 deletions(-) + +commit 6c459c8fef85bc44f45d7b58c28a34abfb2c33fc +Author: Behdad Esfahbod +Date: Thu Aug 2 03:45:53 2012 -0400 + + Minor + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit e2b8d75fa6e847ecf5c040f4e1e16a565c5d8aaf +Author: Behdad Esfahbod +Date: Wed Aug 1 22:17:48 2012 -0400 + + Use wider set digests on 64-bit archs + + src/hb-set-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 0120ce9679aab3ac936aeb18f6709529eef000a4 +Author: Behdad Esfahbod +Date: Wed Aug 1 21:56:35 2012 -0400 + + [GSUB/GPOS] Remove unused get_coverage() methods + + src/hb-ot-layout-gpos-table.hh | 11 ----------- + src/hb-ot-layout-gsub-table.hh | 11 ----------- + 2 files changed, 22 deletions(-) + +commit 1336ecdf8e4e9879b96b26ecfbf5c9ba6c49e2b9 +Author: Behdad Esfahbod +Date: Wed Aug 1 21:46:36 2012 -0400 + + [GSUB/GPOS] Use Coverage digests as gatekeeper + + Gives me a good 10% speedup for the Devanagari test case. Less so + for less lookup-intensive tests. + + For the Devanagari test case, the false positive rate of the GSUB digest + is 4%. + + src/hb-ot-layout-gpos-table.hh | 30 +++++++++--------------------- + src/hb-ot-layout-gsub-table.hh | 35 ++++++++++++----------------------- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++++-- + src/hb-ot-layout-private.hh | 4 ++++ + src/hb-ot-layout.cc | 29 +++++++++++++++++++++++++---- + 5 files changed, 56 insertions(+), 50 deletions(-) + +commit a878c58a8fc1500986d713b2bcedfeb90a0087b0 +Author: Behdad Esfahbod +Date: Wed Aug 1 21:18:54 2012 -0400 + + [GSUB/GPOS] Add add_coverage() + + src/hb-ot-layout-gpos-table.hh | 18 ++++++++++++++++++ + src/hb-ot-layout-gsub-table.hh | 18 ++++++++++++++++++ + 2 files changed, 36 insertions(+) + +commit 60a3035ac5ec8227e4cc0e6708732bb139c9e0b8 +Author: Behdad Esfahbod +Date: Wed Aug 1 21:06:27 2012 -0400 + + Add hb_set_digest_t + + Implement two set digests, and one that combines the two. + + src/hb-set-private.hh | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 95 insertions(+) + +commit c8accf1dd2d92cc4f714393eb0ea46f69bb182a6 +Author: Behdad Esfahbod +Date: Wed Aug 1 21:05:57 2012 -0400 + + [OT] Templatize Coverage::add_coverage() + + src/hb-ot-layout-common-private.hh | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 8fbfda920e0b3bb4ab7afb732826026964b79be9 +Author: Behdad Esfahbod +Date: Wed Aug 1 19:03:46 2012 -0400 + + Inline font getters + + src/hb-fallback-shape.cc | 21 ++-- + src/hb-font-private.hh | 204 ++++++++++++++++++++++++++++++++++++++ + src/hb-font.cc | 129 ++++-------------------- + src/hb-graphite2.cc | 6 +- + src/hb-old.cc | 10 +- + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-shape-complex-arabic.cc | 4 +- + src/hb-ot-shape-complex-indic.cc | 6 +- + src/hb-ot-shape-normalize.cc | 12 +-- + src/hb-ot-shape.cc | 47 +++++---- + 11 files changed, 277 insertions(+), 166 deletions(-) + +commit 6adf417bc15d4524e280b284e3accd1ae647662e +Author: Behdad Esfahbod +Date: Wed Aug 1 18:07:42 2012 -0400 + + Use a lookup table for modified_combining_class + + src/hb-unicode-private.hh | 10 ++- + src/hb-unicode.cc | 213 +++++++++++++++++++++++++++++++--------------- + src/hb-unicode.h | 4 + + 3 files changed, 157 insertions(+), 70 deletions(-) + +commit 208f70f0553d73d2908b21b9552298029482a8b9 +Author: Behdad Esfahbod +Date: Wed Aug 1 17:13:10 2012 -0400 + + Inline Unicode callbacks internally + + src/hb-buffer.cc | 2 +- + src/hb-fallback-shape.cc | 2 +- + src/hb-old.cc | 2 +- + src/hb-ot-shape-complex-misc.cc | 2 +- + src/hb-ot-shape-normalize.cc | 13 +++-- + src/hb-ot-shape-private.hh | 6 +-- + src/hb-ot-shape.cc | 4 +- + src/hb-unicode-private.hh | 112 ++++++++++++++++++++-------------------- + src/hb-unicode.cc | 5 +- + 9 files changed, 73 insertions(+), 75 deletions(-) + +commit 7470315a3e782aa6192bbe64f7a3944266fb1521 +Author: Behdad Esfahbod +Date: Wed Aug 1 17:01:59 2012 -0400 + + Move unicode accessors around + + src/hb-unicode-private.hh | 73 ++++++++++++++++++++++++++++++++++++++++++++++- + src/hb-unicode.cc | 65 ++++------------------------------------- + 2 files changed, 78 insertions(+), 60 deletions(-) + +commit 21fdcee00125b6e1c09f0bed3064d16ccd3a7a5d +Author: Behdad Esfahbod +Date: Wed Aug 1 16:23:44 2012 -0400 + + Add hb_unicode_combining_class_t + + src/hb-common.h | 38 +------------- + src/hb-glib.cc | 4 +- + src/hb-icu.cc | 4 +- + src/hb-unicode-private.hh | 2 +- + src/hb-unicode.cc | 11 ++-- + src/hb-unicode.h | 124 +++++++++++++++++++++++++++++++++++++++++++++- + 6 files changed, 134 insertions(+), 49 deletions(-) + +commit 84186a64004e5dcd2ce98b564d0e0a09aa5d68b2 +Author: Behdad Esfahbod +Date: Wed Aug 1 13:32:39 2012 -0400 + + Add commentary on the compatibility decomposition in the normalizer + + src/hb-ot-shape-normalize.cc | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + +commit 0834d952017a04c6f4599e574cb75ecf3ca27d3b +Author: Behdad Esfahbod +Date: Wed Aug 1 00:21:09 2012 -0400 + + [hb-old] Adjust mark positioning parameters + + Fallback mark positioning works now... With hb-ft and hb-view / + hb-shape at least. + + src/hb-old.cc | 10 +++++----- + src/hb-old/harfbuzz-shaper.cpp | 1 + + 2 files changed, 6 insertions(+), 5 deletions(-) + +commit 4ca743dfb8e09f9fa525061c7f1144d55f72effb +Author: Behdad Esfahbod +Date: Wed Aug 1 00:03:41 2012 -0400 + + [old] Implement fontMetrics + + src/hb-old.cc | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit 1e7d860613032e40a3f90e2caa2ee5ac44ab8c8c +Author: Behdad Esfahbod +Date: Tue Jul 31 23:41:06 2012 -0400 + + [GPOS] Adjust mark advance-width zeroing logic + + If there is no GPOS, zero mark advances. + + If there *is* GPOS and the shaper requests so, zero mark advances for + attached marks. + + Fixes regression with Tibetan, where the font has GPOS, and marks a + glyph as mark where it shouldn't get zero advance. + + src/hb-ot-layout-gpos-table.hh | 14 ++++++++------ + src/hb-ot-layout.cc | 4 ++-- + src/hb-ot-layout.h | 3 ++- + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-misc.cc | 4 ++-- + src/hb-ot-shape-complex-private.hh | 2 +- + src/hb-ot-shape.cc | 6 ++---- + 8 files changed, 19 insertions(+), 18 deletions(-) + +commit a8842e4a448efb30f3f2f3c628d6dc4824829726 +Author: Behdad Esfahbod +Date: Tue Jul 31 23:10:11 2012 -0400 + + Remove some TODO items + + TODO | 27 --------------------------- + src/hb-shape.cc | 2 ++ + 2 files changed, 2 insertions(+), 27 deletions(-) + +commit 2bc3b9a616cedbc56ff4a915f9e3439ff3a6bf13 +Author: Behdad Esfahbod +Date: Tue Jul 31 23:08:25 2012 -0400 + + [OT] Zero mark advances if the shaper desires so + + Enabled for all shapers except for Indic. + + src/hb-ot-shape-complex-arabic.cc | 1 + + src/hb-ot-shape-complex-indic.cc | 1 + + src/hb-ot-shape-complex-misc.cc | 2 ++ + src/hb-ot-shape-complex-private.hh | 2 ++ + src/hb-ot-shape.cc | 15 +++++++++++++++ + 5 files changed, 21 insertions(+) + +commit 5fecd8b0355894ceda14b3d3c654f20c3d5e77f4 +Author: Behdad Esfahbod +Date: Tue Jul 31 22:48:38 2012 -0400 + + [OT] Synthesize glyph classes + + TODO | 2 -- + src/hb-ot-shape.cc | 20 ++++++++++++++++++-- + 2 files changed, 18 insertions(+), 4 deletions(-) + +commit 03b09214c073ce37eeb8af5218942c85b2d393df +Author: Behdad Esfahbod +Date: Tue Jul 31 22:43:58 2012 -0400 + + [GSUB] Minor + + src/hb-ot-layout-gsub-table.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit f0fc1df8fc949739b68d55948741016081b69c3a +Author: Behdad Esfahbod +Date: Tue Jul 31 22:43:32 2012 -0400 + + [hb-old] Implement getGlyphMetrics() + + Still working on it. + + src/hb-old.cc | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +commit 378d279bbf692195c4654e312dae854ab3be04cf +Author: Behdad Esfahbod +Date: Tue Jul 31 21:36:16 2012 -0400 + + Implement Unicode compatibility decompositions + + Based on patch from Philip Withnall. + https://bugs.freedesktop.org/show_bug.cgi?id=41095 + + src/hb-glib.cc | 30 +++++++++++++++++++++++++ + src/hb-icu.cc | 36 +++++++++++++++++++++++++++++- + src/hb-ot-shape-normalize.cc | 53 +++++++++++++++++++++++++++++--------------- + src/hb-unicode-private.hh | 1 + + src/hb-unicode.cc | 27 +++++++++++++++++++++- + src/hb-unicode.h | 37 ++++++++++++++++++++++++++++++- + test/api/hb-test.h | 1 + + test/api/test-unicode.c | 50 +++++++++++++++++++++++++++++++++++++++++ + 8 files changed, 214 insertions(+), 21 deletions(-) + +commit 321ec29cc270e7e66a529696b70b2caac553c95f +Author: Behdad Esfahbod +Date: Tue Jul 31 21:10:16 2012 -0400 + + Remove unused function + + src/hb-ot-shape-complex-indic.cc | 7 ------- + 1 file changed, 7 deletions(-) + +commit 69cc492dc120847ed00cae65ec958593ebf550c5 +Author: Behdad Esfahbod +Date: Tue Jul 31 14:51:36 2012 -0400 + + [buffer] Minor + + src/hb-buffer-private.hh | 3 ++- + src/hb-buffer.cc | 24 ++++++++++++------------ + 2 files changed, 14 insertions(+), 13 deletions(-) + +commit 693918ef8541014a5ef7dfb91c6ea0ae36d9c368 +Author: Behdad Esfahbod +Date: Mon Jul 30 21:08:51 2012 -0400 + + [OT] Streamline complex shaper enumeration + + Add a shaper class struct. + + src/hb-ot-shape-complex-arabic.cc | 37 ++++---- + src/hb-ot-shape-complex-indic.cc | 47 ++++++--- + src/hb-ot-shape-complex-misc.cc | 67 ++++++------- + src/hb-ot-shape-complex-private.hh | 179 ++++++++++------------------------- + src/hb-ot-shape-normalize-private.hh | 4 +- + src/hb-ot-shape-private.hh | 2 +- + src/hb-ot-shape.cc | 16 ++-- + 7 files changed, 143 insertions(+), 209 deletions(-) + +commit c2e42c3db691515f3a458eb4c71fe1e6439d5620 +Author: Behdad Esfahbod +Date: Mon Jul 30 19:54:50 2012 -0400 + + Minor + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + src/hb-ot-layout-private.hh | 4 ++-- + 4 files changed, 9 insertions(+), 9 deletions(-) + +commit 03f67bc012f42131b36083a23efc78e1b04b828c +Author: Behdad Esfahbod +Date: Mon Jul 30 19:47:53 2012 -0400 + + More refactoring glyph class access + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 154 +++++++++++++++++------------------ + 3 files changed, 76 insertions(+), 82 deletions(-) + +commit 300c7307eb7943ba7416b672345506be1e27c6ba +Author: Behdad Esfahbod +Date: Mon Jul 30 19:37:44 2012 -0400 + + [OT] Don't crash if no GDEF available + + src/hb-ot-layout-gsubgpos-private.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 3dcbdc2125c04c173f29f04922fc031929893f4e +Author: Behdad Esfahbod +Date: Mon Jul 30 19:31:17 2012 -0400 + + Minor + + src/hb-ot-layout.cc | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +commit 05bd1b63426e07d1df7a1b40bf845dc94ab995a8 +Author: Behdad Esfahbod +Date: Mon Jul 30 19:30:01 2012 -0400 + + [GSUB/GPOS] Move glyph props matching around + + src/hb-ot-layout-gpos-table.hh | 11 ++-- + src/hb-ot-layout-gsub-table.hh | 18 +++--- + src/hb-ot-layout-gsubgpos-private.hh | 99 +++++++++++++++++++++++++++++---- + src/hb-ot-layout-private.hh | 12 ---- + src/hb-ot-layout.cc | 104 +++-------------------------------- + src/hb-ot-layout.h | 12 ++-- + src/hb-ot-shape.cc | 10 ++-- + 7 files changed, 127 insertions(+), 139 deletions(-) + +commit 2fca1426ca06cabbe8f027f2dc9dee9c27560c76 +Author: Behdad Esfahbod +Date: Mon Jul 30 18:46:41 2012 -0400 + + [GSUB] Don't erase glyph classes if GDEF does not have glyph classes + + src/hb-ot-layout-gsubgpos-private.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit fd42257f8c45ff8e036e1c3eb1a788a101be7ead +Author: Behdad Esfahbod +Date: Mon Jul 30 18:40:27 2012 -0400 + + Minor + + src/hb-ot-layout.cc | 29 +++++------------------------ + 1 file changed, 5 insertions(+), 24 deletions(-) + +commit 7fbbf86efe675e4c038dfc5985c24bbc544620cd +Author: Behdad Esfahbod +Date: Mon Jul 30 18:36:42 2012 -0400 + + [GSUB] Minor + + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 6 ++++++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit 713914d3203109a8e9213f5a1d3b384730703ce9 +Author: Behdad Esfahbod +Date: Mon Jul 30 17:54:38 2012 -0400 + + [Uniscribe] Clean up a bit + + src/hb-uniscribe.cc | 17 +++++------------ + 1 file changed, 5 insertions(+), 12 deletions(-) + +commit 301168dae77a63ee25adfb26ce2b54a708f83791 +Author: Behdad Esfahbod +Date: Mon Jul 30 17:48:04 2012 -0400 + + [CoreText] Port to shape_plan infrastructure + + src/hb-coretext.cc | 161 ++++++++++++++++++++++++++--------------------------- + 1 file changed, 80 insertions(+), 81 deletions(-) + +commit 6cdfd14bb19d60ac3d6b20ff611408432254f273 +Author: Behdad Esfahbod +Date: Mon Jul 30 17:22:17 2012 -0400 + + Fix build on Mac + + src/hb-ot-layout-gsub-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7e34601dededd521bcef15111e39293df3d0d13d +Author: Behdad Esfahbod +Date: Mon Jul 30 14:53:41 2012 -0400 + + Unbreak Hangul jamo composition + + When we removed the separate Hangul shaper, the specific normalization + preference of Hangul was lost. Fix that. Also, the Thai shaper was + copied from Hangul, so had the fully-composed normalization behavior, + which was unnecessary. So, fix that too. + + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 4 +--- + src/hb-ot-shape-complex-misc.cc | 12 +++++++++--- + src/hb-ot-shape-complex-private.hh | 9 ++++----- + src/hb-ot-shape.cc | 4 +++- + 5 files changed, 18 insertions(+), 13 deletions(-) + +commit 7afb14407e59dfeaa79c33aca1ffa60e7982e349 +Author: Behdad Esfahbod +Date: Mon Jul 30 13:54:46 2012 -0400 + + [Indic] Recategorize Telugu length marks + + Fixes 8 more Telugu tests. Failures at 15 (0.00154548%). + + src/hb-unicode.cc | 8 ++++++++ + src/indic.cc | 11 ++++++++--- + 2 files changed, 16 insertions(+), 3 deletions(-) + +commit 70b3dc327232b20051b36397aa2b196ab8c62397 +Author: Behdad Esfahbod +Date: Mon Jul 30 12:40:18 2012 -0400 + + Add Hebrew test + + .../texts/in-tree/shaper-default/script-hebrew/misc/diacritics.txt | 1 + + 1 file changed, 1 insertion(+) + +commit f2377155e35c15919af4d7db21b6edc6783146b6 +Author: Behdad Esfahbod +Date: Mon Jul 30 10:50:57 2012 -0400 + + [hb-old] Fix misc leaks + + Backport (forward-port?!) from upstream: + + commit 3ab7b37bdebf0f8773493a1fee910b151c4de30f + Author: Behdad Esfahbod + Date: Mon Jul 30 10:50:22 2012 -0400 + + Fix misc leaks + + https://bugs.freedesktop.org/show_bug.cgi?id=31992 + https://bugs.freedesktop.org/show_bug.cgi?id=31993 + https://bugs.freedesktop.org/show_bug.cgi?id=31994 + https://bugs.freedesktop.org/show_bug.cgi?id=31995 + + src/hb-old/harfbuzz-arabic.c | 12 +++++++++--- + src/hb-old/harfbuzz-gpos.c | 6 +++--- + src/hb-old/harfbuzz-gsub.c | 6 +++--- + src/hb-old/harfbuzz-tibetan.c | 1 + + 4 files changed, 16 insertions(+), 9 deletions(-) + +commit 3f4764bb56bb7e42ba8859f1905810bd2f998838 +Author: Behdad Esfahbod +Date: Mon Jul 30 10:06:42 2012 -0400 + + Don't lock user_data set during destruction if empty + + src/hb-private.hh | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 4ba647eecf0f70917ac4229af1f2dd3c62fcb7d5 +Author: Behdad Esfahbod +Date: Mon Jul 30 09:53:06 2012 -0400 + + Fix leak + + src/hb-ot-shape.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit f860366456d9e59b139a940da6d89c3c4fb9e96e +Author: Behdad Esfahbod +Date: Mon Jul 30 02:38:39 2012 -0400 + + [OT] Gain back some lost speed + + src/hb-ot-layout-private.hh | 27 +++++++++++++++- + src/hb-ot-layout.cc | 63 ++++++++++++++++++++++++++++++++++---- + src/hb-ot-map-private.hh | 26 +++------------- + src/hb-ot-map.cc | 35 +++++++++++++++------ + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 5 --- + 6 files changed, 114 insertions(+), 44 deletions(-) + +commit 11f4c87d01924cac43bf40044f67838440e19e42 +Author: Behdad Esfahbod +Date: Mon Jul 30 02:36:46 2012 -0400 + + [OT] Remove hb_ot_layout_ensure() + + I didn't like it from the beginning. + + src/hb-ot-layout.cc | 9 +++++---- + src/hb-ot-layout.h | 5 ----- + 2 files changed, 5 insertions(+), 9 deletions(-) + +commit 578e42182b9b9cf15b4c5426fae36e224160cbd7 +Author: Behdad Esfahbod +Date: Mon Jul 30 02:35:07 2012 -0400 + + Minor + + src/hb-ot-layout-private.hh | 2 -- + src/hb-ot-layout.cc | 1 - + 2 files changed, 3 deletions(-) + +commit a973b5ce86051e8ef0d20df362db1a50488842ab +Author: Behdad Esfahbod +Date: Mon Jul 30 01:46:34 2012 -0400 + + [GSUB] Further adjustments to mark-attachment vs ligation interaction + + The d1d69ec52e75a78575b620a1c456d528b6078170 change broke Kannada badly, + since it was ligating consonants, pushing matra out, and then ligating + with the matra. Adjust for that. See comments. + + src/hb-ot-layout-gsub-table.hh | 11 ++++++++--- + .../in-tree/shaper-indic/indic/script-kannada/misc/misc.txt | 1 + + 2 files changed, 9 insertions(+), 3 deletions(-) + +commit 0aef425e25e2c58445157057f17ef18f695c5240 +Author: Behdad Esfahbod +Date: Mon Jul 30 00:55:15 2012 -0400 + + [GSUB] Minor + + src/hb-ot-layout-gpos-table.hh | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +commit d1d69ec52e75a78575b620a1c456d528b6078170 +Author: Behdad Esfahbod +Date: Mon Jul 30 00:51:47 2012 -0400 + + [GSUB] Don't ligate glyphs attached to different components of ligatures + + This concludes the mark-attachment vs ligating interaction fixes (for now). + + src/hb-ot-layout-gsub-table.hh | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +commit 4751dec8be05883483fd5f6b474ebd22583ae566 +Author: Behdad Esfahbod +Date: Mon Jul 30 00:42:07 2012 -0400 + + Minor + + src/hb-ot-layout-private.hh | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit f24bcfbed1f3b4f4f6311246bd870f73ad6ba750 +Author: Behdad Esfahbod +Date: Mon Jul 30 00:39:00 2012 -0400 + + Minor + + src/hb-ot-layout-gsub-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fe20c0f84f5ff518dc471bf22ac5a83ef079eb69 +Author: Behdad Esfahbod +Date: Mon Jul 30 00:00:59 2012 -0400 + + [GSUB] Fix mark component stuff when ligatures form ligatures! + + See comments. + + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=437633 + + src/hb-ot-layout-gsub-table.hh | 117 +++++++++++++++++++++++------------ + src/hb-ot-layout-gsubgpos-private.hh | 8 --- + src/hb-ot-layout-private.hh | 8 +-- + 3 files changed, 79 insertions(+), 54 deletions(-) + +commit 2ec3ba46a3c24469096e901750e38f6ee555479a +Author: Behdad Esfahbod +Date: Sun Jul 29 22:02:24 2012 -0400 + + [GSUB/GPOS] Minor + + Start squeezing more out of lig_id/lig_comp. + + src/hb-ot-layout-gsub-table.hh | 6 +++--- + src/hb-ot-layout-private.hh | 35 +++++++++++++++++++++++++++++++---- + 2 files changed, 34 insertions(+), 7 deletions(-) + +commit ef6e9cec3399e4f63f4b662abd77cf6d4683e8a3 +Author: Behdad Esfahbod +Date: Sun Jul 29 21:35:22 2012 -0400 + + Fixup bb0e4ba3e9c5a407fc5d73c914e429d24d336380 + + src/hb-shape-plan.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cb3d34063154bf164c61eeba41c6166b0bd304fb +Author: Behdad Esfahbod +Date: Sun Jul 29 20:37:38 2012 -0400 + + [GSUB] Don't set new lig_id on mark ligatures + + If two marks form a ligature, retain their previous lig_id, such that + the mark ligature can attach to ligature components... + + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=676343 + + In fact, I noticed that we should not let ligatures form between glyphs + coming from different components of a previous ligature. For example, + if the sequence is: LAM,SHADDA,LAM,FATHA,HEH, the LAM,LAM,HEH form a + ligature, putting SHADDA and FATHA next to eachother. However, it would + be wrong to ligate them. Uniscribe has this bug also. + + src/hb-ot-layout-gsub-table.hh | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +commit 97a201becf936f62046914b568e5763e27ee936e +Author: Behdad Esfahbod +Date: Sun Jul 29 20:31:36 2012 -0400 + + Add Arabic tests for mark ligature component attachments + + .../script-arabic/misc/diacritics/MANIFEST | 1 + + .../misc/diacritics/ligature-components.txt | 18 ++++++++++++++++++ + 2 files changed, 19 insertions(+) + +commit a15b70a81a609f024083cb04f9819483f4d5cab7 +Author: Behdad Esfahbod +Date: Sun Jul 29 20:09:22 2012 -0400 + + [hb-old] Fix cluster formation in RTL + + Unlike Uniscribe, hb-old returns glyphs in logical order, so the logic + does not need to duplicated for RTL. + + src/hb-old.cc | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +commit 8a7e70ef65952fc16b8c1d5f1126c94d9d81e755 +Author: Behdad Esfahbod +Date: Sun Jul 29 19:56:54 2012 -0400 + + [Minor] + + src/test.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bb0e4ba3e9c5a407fc5d73c914e429d24d336380 +Author: Behdad Esfahbod +Date: Sun Jul 29 17:34:14 2012 -0400 + + Minor + + src/hb-shape-plan.cc | 2 +- + src/test-would-substitute.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit a00ad60bc0fe74bf0e11d73da563239f3392f351 +Author: Behdad Esfahbod +Date: Sat Jul 28 21:16:08 2012 -0400 + + [Uniscribe] Remove hb_uniscribe_font_ensure() + + Wasn't a huge fan of putting the burden on the user. Just remove it and + do what we've got to do transparently. + + src/hb-uniscribe.cc | 6 +++++- + src/hb-uniscribe.h | 4 ---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 5d874d566fe5d2cc4cfaf02c79b663d8a626ca1e +Author: Behdad Esfahbod +Date: Sat Jul 28 21:05:25 2012 -0400 + + [GPOS] Fix mark-to-mark positioning when one of the marks is a ligature + + This commit: a3313e54008167e415b72c780ca7b9cda958d07e broke MarkMarkPos + when one of the marks itself is a ligature. That regressed 26 Tibetan + tests (up from zero!). Fix that. Tibetan back to zero. + + src/hb-ot-layout-gpos-table.hh | 27 ++++++++++++++++------ + src/hb-ot-layout-private.hh | 5 ++-- + test/shaping/texts/in-tree/shaper-indic/MANIFEST | 1 + + .../indic/script-sinhala/misc/MANIFEST | 1 + + .../in-tree/shaper-indic/south-asian/MANIFEST | 1 + + .../south-asian/script-tibetan/MANIFEST | 1 + + .../south-asian/script-tibetan/misc/MANIFEST | 1 + + .../south-asian/script-tibetan/misc/misc.txt | 1 + + 8 files changed, 29 insertions(+), 9 deletions(-) + +commit 338fe662b50f9309bf0050dd99becb644874195b +Author: Behdad Esfahbod +Date: Sat Jul 28 18:53:01 2012 -0400 + + [GSUB] Minor + + src/hb-ot-layout-gsub-table.hh | 33 ++++++++++++++++----------------- + 1 file changed, 16 insertions(+), 17 deletions(-) + +commit e6f7479fe34fb4a7cada61d84c2ed70d1fd565c8 +Author: Behdad Esfahbod +Date: Sat Jul 28 18:34:58 2012 -0400 + + [GSUB] Simplify would-apply + + src/hb-ot-layout-gsub-table.hh | 71 +++--------------------------------- + src/hb-ot-layout-gsubgpos-private.hh | 24 +++--------- + 2 files changed, 11 insertions(+), 84 deletions(-) + +commit dadede012e4841f9fcb70d514fdc752f3ea4663d +Author: Behdad Esfahbod +Date: Sat Jul 28 18:03:20 2012 -0400 + + Minor + + src/hb-ot-layout-common-private.hh | 7 +++---- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + 3 files changed, 5 insertions(+), 6 deletions(-) + +commit 0b99429ead05ae32b3c210cb499af401b02770a9 +Author: Behdad Esfahbod +Date: Sat Jul 28 17:31:01 2012 -0400 + + [GSUB/GPOS] Add get_coverage() and use it to speed up main loop + + And use it to speed up the hotspot by checking coverage directly in + the main loop, not 10 functions deep in. + + Gives me a solid 20% boost with Indic test suite. Less so for less + lookup-intensive scenarios. + + Remove the "fast_path" hack from before. + + src/hb-ot-layout-gpos-table.hh | 179 ++++++++++++++++++++++++++++++----- + src/hb-ot-layout-gsub-table.hh | 166 ++++++++++++++++++++++++++------ + src/hb-ot-layout-gsubgpos-private.hh | 26 +++++ + 3 files changed, 321 insertions(+), 50 deletions(-) + +commit 30ec9002d84e8b49290e782e6192069821ffa942 +Author: Behdad Esfahbod +Date: Sat Jul 28 17:25:20 2012 -0400 + + Reject lookups with no subTable + + src/hb-ot-layout-common-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 0981068b75710397f08e0d2d776a0a2ea68d7117 +Author: Behdad Esfahbod +Date: Sat Jul 28 17:01:59 2012 -0400 + + [GSUB/GPOS] Reject Context/ChainContext lookups with zero input + + src/hb-ot-layout-gsubgpos-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2f87cebe1062c7007021ebd05c1664e60da80825 +Author: Behdad Esfahbod +Date: Fri Jul 27 04:02:38 2012 -0400 + + Implement shape_plan caching + + Should give us some performance boost. + + TODO | 4 ++ + src/hb-buffer-private.hh | 30 ++++++++++++++ + src/hb-font-private.hh | 6 +++ + src/hb-font.cc | 15 ++++++- + src/hb-shape-plan.cc | 100 +++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-shape-plan.h | 7 ++++ + src/hb-shape.cc | 2 +- + 7 files changed, 162 insertions(+), 2 deletions(-) + +commit e9eb9503e97044222f843daacfa47e26e51312b7 +Author: Behdad Esfahbod +Date: Fri Jul 27 03:16:22 2012 -0400 + + Add default_shaper_list to shape_plan + + src/hb-shape-plan-private.hh | 1 + + src/hb-shape-plan.cc | 2 ++ + 2 files changed, 3 insertions(+) + +commit 3b7c4e270694ed962e2a2839e44f2a59c26b326c +Author: Behdad Esfahbod +Date: Fri Jul 27 03:12:23 2012 -0400 + + Don't fail choosing shaper on planning failure + + Shapers have a chance to reject a font in face shaper_data creation. + No need to allow failing during planning. + + src/hb-shape-plan.cc | 17 ++++++----------- + 1 file changed, 6 insertions(+), 11 deletions(-) + +commit cfe9882610489e1b917e09a74dfbf6bbba2e4a57 +Author: Behdad Esfahbod +Date: Fri Jul 27 03:06:30 2012 -0400 + + Add hb_ot_layout_ensure() and hb_uniscribe_font_ensure() + + src/hb-ot-layout.cc | 7 +++++++ + src/hb-ot-layout.h | 6 ++++++ + src/hb-shape-plan.cc | 22 ++-------------------- + src/hb-shaper-private.hh | 18 ++++++++++++++++++ + src/hb-uniscribe.cc | 11 +++++++++++ + src/hb-uniscribe.h | 4 ++++ + 6 files changed, 48 insertions(+), 20 deletions(-) + +commit c5b668fb9239c912d2448280a7176e331ebc9181 +Author: Behdad Esfahbod +Date: Fri Jul 27 02:49:39 2012 -0400 + + Choose one shaper per plan + + src/hb-shape-plan-private.hh | 2 +- + src/hb-shape-plan.cc | 19 +++++++++---------- + 2 files changed, 10 insertions(+), 11 deletions(-) + +commit e82061e8db922f0ddbefd5a184ee2f9f967b9a05 +Author: Behdad Esfahbod +Date: Fri Jul 27 02:29:32 2012 -0400 + + Move ot shaper completely to shape_plan + + src/hb-ot-shape-private.hh | 6 -- + src/hb-ot-shape.cc | 181 +++++++++++++++++++++------------------------ + src/hb-uniscribe.cc | 2 +- + 3 files changed, 84 insertions(+), 105 deletions(-) + +commit ea278d3895fe0c92801d692cd71d8d9f1de7c048 +Author: Behdad Esfahbod +Date: Fri Jul 27 02:12:28 2012 -0400 + + Partially switch ot shaper to shape_plan + + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 1 - + src/hb-font-private.hh | 2 -- + src/hb-font.cc | 22 ++++++++++++++-------- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 4 ++-- + src/hb-ot-layout-private.hh | 1 + + src/hb-ot-layout.cc | 9 ++++++--- + src/hb-ot-shape.cc | 3 ++- + src/hb-shape-plan.cc | 11 +++++++++++ + src/hb-shaper-private.hh | 3 ++- + 11 files changed, 40 insertions(+), 19 deletions(-) + +commit b6b7ba1313bf686e6ed567183466104c90504a67 +Author: Behdad Esfahbod +Date: Fri Jul 27 01:26:11 2012 -0400 + + Switch old and uniscribe backends to shape_plan + + src/hb-old.cc | 80 ++------------------------ + src/hb-shape.cc | 5 ++ + src/hb-shaper-impl-private.hh | 3 +- + src/hb-shaper-private.hh | 4 -- + src/hb-uniscribe.cc | 130 ++++++++++++------------------------------ + 5 files changed, 48 insertions(+), 174 deletions(-) + +commit c32c096a429da3e64896cf42ff5ab8c775d3c2ec +Author: Behdad Esfahbod +Date: Fri Jul 27 01:13:53 2012 -0400 + + Switch to shape_plan + + Not optimized yet. Eats babies. And no shaper uses the shape_plan. + + src/hb-shape-plan.cc | 37 +++++++++++++++++++++++++++++++++++-- + src/hb-shape-plan.h | 8 ++++++++ + src/hb-shape.cc | 27 ++++----------------------- + 3 files changed, 47 insertions(+), 25 deletions(-) + +commit 5b95c148cc485f79fd7018bc4520b4cb5f728a18 +Author: Behdad Esfahbod +Date: Thu Jul 26 23:46:53 2012 -0400 + + Start implementing shape_plan + + src/hb-fallback-shape.cc | 4 ++- + src/hb-font-private.hh | 4 +++ + src/hb-old.cc | 4 ++- + src/hb-ot-shape.cc | 4 ++- + src/hb-shape-plan-private.hh | 7 ++++ + src/hb-shape-plan.cc | 76 ++++++++++++++++++++++++++++++++++++++++++-- + src/hb-shape.cc | 4 +++ + src/hb-shaper-private.hh | 4 +-- + src/hb-uniscribe.cc | 4 ++- + 9 files changed, 103 insertions(+), 8 deletions(-) + +commit bd26b4d21f59312805d294f46f15182adbcc47da +Author: Behdad Esfahbod +Date: Thu Jul 26 22:05:39 2012 -0400 + + Minor + + src/Makefile.am | 1 + + src/hb-fallback-shape.cc | 3 +- + src/hb-old.cc | 3 +- + src/hb-ot-shape.cc | 3 +- + src/hb-shape-plan-private.hh | 2 +- + src/hb-shape-plan.cc | 2 + + src/hb-shape.cc | 98 ++++---------------------------------- + src/hb-shaper-private.hh | 16 ++++++- + src/hb-shaper.cc | 109 +++++++++++++++++++++++++++++++++++++++++++ + src/hb-uniscribe.cc | 3 +- + 10 files changed, 145 insertions(+), 95 deletions(-) + +commit 027857d0412477fb4427dcb8a8c45287c272e143 +Author: Behdad Esfahbod +Date: Thu Jul 26 17:34:25 2012 -0400 + + Start adding a unified shaper access infrastructure + + Add global shape_plan. Unused so far. + + src/Makefile.am | 15 +- + src/hb-coretext-private.hh | 42 ----- + src/hb-coretext.cc | 6 +- + src/hb-fallback-shape.cc | 62 ++++++- + src/hb-font-private.hh | 12 ++ + src/hb-font.cc | 15 +- + src/hb-old.cc | 109 +++++++++--- + src/hb-ot-shape-private.hh | 8 - + src/hb-ot-shape.cc | 60 ++++++- + ...aphite2-private.hh => hb-shape-plan-private.hh} | 28 +++- + src/hb-shape-plan.cc | 85 ++++++++++ + ...b-fallback-shape-private.hh => hb-shape-plan.h} | 39 +++-- + src/hb-shape.cc | 48 +----- + ...scribe-private.hh => hb-shaper-impl-private.hh} | 20 ++- + src/{hb-old-private.hh => hb-shaper-list.hh} | 30 ++-- + src/hb-shaper-private.hh | 81 +++++++++ + src/hb-uniscribe.cc | 186 +++++++++++++-------- + 17 files changed, 608 insertions(+), 238 deletions(-) + +commit fa2dfcd560444d8c54b6349ee106134d3536f79b +Author: Behdad Esfahbod +Date: Thu Jul 26 16:06:16 2012 -0400 + + Fix visibility warnings with MinGW32 + + src/hb-old/harfbuzz-global.h | 17 +++++++++++------ + src/hb-old/harfbuzz-impl.h | 6 +++++- + 2 files changed, 16 insertions(+), 7 deletions(-) + +commit ac2085d4b391b0a72473ecac3dd6c22efe66833f +Author: Jonathan Kew +Date: Thu Jul 26 15:58:45 2012 -0400 + + [CoreText] Ensure cluster indices in output buffer are non-decreasing. + + Does not provide Uniscribe-compatible results, but should at least avoid + breaking hb-view due to out-of-order cluster values. + + For RTL runs, ensure cluster values are non-increasing (instead of + non-decreasing). + + src/hb-coretext.cc | 37 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 37 insertions(+) + +commit 441d3bb7de311d54b9f0a5210344f9a96e97e153 +Author: Behdad Esfahbod +Date: Thu Jul 26 12:01:12 2012 -0400 + + Minor + + src/hb-coretext.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2e7f223054d310695bdb3498b2b2b5d17b6cce78 +Author: Behdad Esfahbod +Date: Wed Jul 25 19:30:15 2012 -0400 + + [hb-old] Fix Arabic cursive positioning + + Backporting from upstream: + + commit b847f24ce855d24f6822bcd9c0006905e81b94d8 + Author: Behdad Esfahbod + Date: Wed Jul 25 19:29:16 2012 -0400 + + [arabic] Fix Arabic cursive positioning + + This was clearly broken in testing. Who knows... Fixes for me. + Test with a Nastaleeq font, or with Arabic Typesetting. + + Backporting from Chromium. + + src/hb-old/harfbuzz-shaper.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9550a8c4e8b4e28be60d38c27d59253846ff9569 +Author: Behdad Esfahbod +Date: Wed Jul 25 19:22:57 2012 -0400 + + [hb-old] Fixup not-enough-space handling + + src/hb-old.cc | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +commit 91e721ea8693205f4f738bca97a5055ee75cf463 +Author: Behdad Esfahbod +Date: Wed Jul 25 19:20:34 2012 -0400 + + [hb-old] Fix clusters + + Unlike its "documentation", hb-old's log_clusters are, well, indeed + logical, not visual. Fixup. Adapted / copied from hb-uniscribe. + + src/hb-old.cc | 51 ++++++++++++++++++++++++++++++++++---------- + src/hb-old/harfbuzz-shaper.h | 1 + + src/hb-uniscribe.cc | 5 +++-- + 3 files changed, 44 insertions(+), 13 deletions(-) + +commit a3313e54008167e415b72c780ca7b9cda958d07e +Author: Behdad Esfahbod +Date: Wed Jul 25 18:37:51 2012 -0400 + + [GPOS] Fix MarkMarkPos applied to results of MultipleSubst + + This was broken as a result of 7b84c536c10ab90ed96a033d88e9ad232d46c5b8. + As Khaled reported, MarkMark positioning was broken with glyphs + resulting from a MultipleSubst. Fixed. Test with the ALLAH character + in Amiri. + + src/hb-ot-layout-gpos-table.hh | 10 +++++----- + src/hb-ot-layout-private.hh | 23 +++++++++++++++++++++-- + 2 files changed, 26 insertions(+), 7 deletions(-) + +commit 35bdab3cf1f0836807160e3ce93766c321b32e8c +Author: Behdad Esfahbod +Date: Wed Jul 25 11:59:52 2012 -0400 + + Minor + + src/hb-unicode-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8fe4c7405b922cf0f936a46a9baedf4885b05254 +Author: Behdad Esfahbod +Date: Tue Jul 24 21:05:12 2012 -0400 + + [hb-old] Add HarfBuzz.old shaper + + Choose using shaper name "old". + + configure.ac | 8 + + src/Makefile.am | 14 +- + src/hb-old-private.hh | 40 +++ + src/hb-old.cc | 369 ++++++++++++++++++++++++ + src/hb-old/.gitignore | 7 - + src/hb-old/Makefile.am | 2 + + src/hb-old/Makefile.in | 762 ------------------------------------------------- + src/hb-shape.cc | 8 +- + 8 files changed, 436 insertions(+), 774 deletions(-) + +commit 5e1987005eb1b9af7a4d3d9f90c5768d8cc80015 +Author: Behdad Esfahbod +Date: Tue Jul 24 19:53:55 2012 -0400 + + [hb-old] Define Unicode funcs in terms of new HarfBuzz + + src/hb-old/Makefile.am | 4 + + src/hb-old/Makefile.in | 182 ++++++++++++++++++++++++++++++++++++----- + src/hb-old/harfbuzz-external.h | 100 +++++++++++++--------- + 3 files changed, 224 insertions(+), 62 deletions(-) + +commit 4a31166b2853c1ec052844140e114158f47c2355 +Author: Behdad Esfahbod +Date: Tue Jul 24 19:49:48 2012 -0400 + + [hb-old] Shovel out the line-breaking / word-segmentation stuff + + src/hb-old/Makefile.am | 10 +- + src/hb-old/Makefile.in | 13 +- + src/hb-old/harfbuzz-external.h | 66 ------ + src/hb-old/harfbuzz-indic.cpp | 26 --- + src/hb-old/harfbuzz-khmer.c | 25 --- + src/hb-old/harfbuzz-myanmar.c | 28 --- + src/hb-old/harfbuzz-shaper-private.h | 12 -- + src/hb-old/harfbuzz-shaper.cpp | 403 +++-------------------------------- + src/hb-old/harfbuzz-shaper.h | 31 --- + src/hb-old/harfbuzz-thai.c | 111 ---------- + src/hb-old/harfbuzz-tibetan.c | 26 --- + src/hb-old/harfbuzz.c | 32 --- + 12 files changed, 33 insertions(+), 750 deletions(-) + +commit 0bcbe88cf313117f739b98a11dbe698b75784e9d +Author: Behdad Esfahbod +Date: Tue Jul 24 19:38:24 2012 -0400 + + [hb-old] Add visibility attributes + + src/hb-old/harfbuzz-global.h | 10 ++++++---- + src/hb-old/harfbuzz-impl.h | 2 +- + 2 files changed, 7 insertions(+), 5 deletions(-) + +commit 6a9d43c3178c920672a84382ca3797e3c478b2b0 +Author: Behdad Esfahbod +Date: Tue Jul 24 19:21:22 2012 -0400 + + [hb-old] Remove unused header file + + src/hb-old/harfbuzz-shape.h | 199 -------------------------------------------- + 1 file changed, 199 deletions(-) + +commit fb47209c5b3aa992faf18d1a3f78b9d7682cf62f +Author: Behdad Esfahbod +Date: Tue Jul 24 19:20:19 2012 -0400 + + [hb-old] Rename hb_buffer_* to HB_Buffer_* + + src/hb-old/harfbuzz-buffer.c | 22 +++++++++++----------- + src/hb-old/harfbuzz-buffer.h | 8 ++++---- + src/hb-old/harfbuzz-shaper.cpp | 8 ++++---- + 3 files changed, 19 insertions(+), 19 deletions(-) + +commit 1512a7357513b72e2a07dda706a176bb23d694e9 +Author: Behdad Esfahbod +Date: Tue Jul 24 19:16:56 2012 -0400 + + [hb-old] Start adding HarfBuzz-old as a new backend + + configure.ac | 1 + + src/Makefile.am | 5 + + src/hb-old/.gitignore | 7 + + src/hb-old/COPYING | 24 + + src/hb-old/Makefile.am | 56 + + src/hb-old/Makefile.in | 631 ++++ + src/hb-old/README | 7 + + src/hb-old/harfbuzz-arabic.c | 1144 +++++++ + src/hb-old/harfbuzz-buffer-private.h | 107 + + src/hb-old/harfbuzz-buffer.c | 383 +++ + src/hb-old/harfbuzz-buffer.h | 102 + + src/hb-old/harfbuzz-external.h | 151 + + src/hb-old/harfbuzz-gdef-private.h | 135 + + src/hb-old/harfbuzz-gdef.c | 1163 +++++++ + src/hb-old/harfbuzz-gdef.h | 140 + + src/hb-old/harfbuzz-global.h | 118 + + src/hb-old/harfbuzz-gpos-private.h | 729 ++++ + src/hb-old/harfbuzz-gpos.c | 6094 ++++++++++++++++++++++++++++++++++ + src/hb-old/harfbuzz-gpos.h | 155 + + src/hb-old/harfbuzz-greek.c | 447 +++ + src/hb-old/harfbuzz-gsub-private.h | 483 +++ + src/hb-old/harfbuzz-gsub.c | 4329 ++++++++++++++++++++++++ + src/hb-old/harfbuzz-gsub.h | 148 + + src/hb-old/harfbuzz-hangul.c | 268 ++ + src/hb-old/harfbuzz-hebrew.c | 187 ++ + src/hb-old/harfbuzz-impl.c | 84 + + src/hb-old/harfbuzz-impl.h | 131 + + src/hb-old/harfbuzz-indic.cpp | 1894 +++++++++++ + src/hb-old/harfbuzz-khmer.c | 667 ++++ + src/hb-old/harfbuzz-myanmar.c | 539 +++ + src/hb-old/harfbuzz-open-private.h | 102 + + src/hb-old/harfbuzz-open.c | 1433 ++++++++ + src/hb-old/harfbuzz-open.h | 288 ++ + src/hb-old/harfbuzz-shape.h | 199 ++ + src/hb-old/harfbuzz-shaper-all.cpp | 37 + + src/hb-old/harfbuzz-shaper-private.h | 171 + + src/hb-old/harfbuzz-shaper.cpp | 1338 ++++++++ + src/hb-old/harfbuzz-shaper.h | 294 ++ + src/hb-old/harfbuzz-stream-private.h | 81 + + src/hb-old/harfbuzz-stream.c | 114 + + src/hb-old/harfbuzz-stream.h | 51 + + src/hb-old/harfbuzz-thai.c | 111 + + src/hb-old/harfbuzz-tibetan.c | 274 ++ + src/hb-old/harfbuzz.c | 32 + + src/hb-old/harfbuzz.h | 38 + + 45 files changed, 24892 insertions(+) + +commit 478fd0529b868b22905a9dedf331ac7cc9721723 +Author: Behdad Esfahbod +Date: Tue Jul 24 17:09:01 2012 -0400 + + Minor + + src/hb-unicode-private.hh | 27 ++++++++++++++------------- + 1 file changed, 14 insertions(+), 13 deletions(-) + +commit 8979a7f6f2b44ade4c0198a31ae08561b35ce009 +Author: Behdad Esfahbod +Date: Tue Jul 24 17:03:55 2012 -0400 + + [Mongolian] Remove Mongolian Vowel Separator at the end of shaping + + Results match Uniscribe now. + + src/hb-unicode-private.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit aa6d849838d5231465ae1a25a4dd5ea1e9380ff9 +Author: Jonathan Kew +Date: Tue Jul 24 15:52:32 2012 -0400 + + [CoreText] Add basic Core Text backend for comparison with our native shaping + + Does not attempt to handle clusters in a Uniscribe- or HarfBuzz-compatible way; + just returns the original string indexes that CT maintains. These may even be + out-of-order in the case of reordrant glyphs. + + configure.ac | 12 ++ + src/Makefile.am | 7 + + src/hb-coretext-private.hh | 42 ++++++ + src/hb-coretext.cc | 323 +++++++++++++++++++++++++++++++++++++++++++++ + src/hb-coretext.h | 43 ++++++ + src/hb-shape.cc | 6 + + 6 files changed, 433 insertions(+) + +commit ec8d2494694275dfbbac2dd0d33ca2894b0463d6 +Author: Behdad Esfahbod +Date: Tue Jul 24 15:40:37 2012 -0400 + + Make data members of various OpenType structs protected instead of private + + Should fix warnings generated when building with -Wunused-private-field. + Based on patch from Jonathan Kew. + + src/hb-open-file-private.hh | 8 +++--- + src/hb-ot-head-table.hh | 2 +- + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-ot-layout-common-private.hh | 14 ++++++----- + src/hb-ot-layout-gdef-table.hh | 20 +++++++-------- + src/hb-ot-layout-gpos-table.hh | 48 ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-table.hh | 30 +++++++++++----------- + src/hb-ot-layout-gsubgpos-private.hh | 32 ++++++++++++------------ + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-name-table.hh | 2 +- + 11 files changed, 82 insertions(+), 80 deletions(-) + +commit 97aa0b738a33b73a3f9763dd2950f2dd39f596ed +Author: Behdad Esfahbod +Date: Tue Jul 24 15:02:34 2012 -0400 + + Minor const correctness shuffling + + src/hb-shape.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 6411e74caf23af7b0545f1fe54d19a1c8da895e8 +Author: Behdad Esfahbod +Date: Tue Jul 24 13:48:49 2012 -0400 + + [Indic] Reposition Gurmukhi top matras to after post + + The font is forming a post-base consonant in some samples, and Uniscribe + positions top matra on the post-base. Do the same. + + Gurmukhi failures down from 59 to 41 (0.0674242%). + + src/hb-ot-shape-complex-indic.cc | 2 +- + .../texts/in-tree/shaper-indic/indic/script-gurmukhi/misc/misc.txt | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit c3f769ba09df319fa69d04f68c57444f95eceee6 +Author: Behdad Esfahbod +Date: Tue Jul 24 13:26:32 2012 -0400 + + [Indic] Ignore Uniscribe output containing two zero-width space glyphs + + Uniscribe is buggy and sometimes /eats/ a mark next to a non-joiner. + Most of Malayalam failures where actually hitting this bug. + + Ignore test output with two zero-width space glyphs. This is a hack + until we build up the test suite infrastructure better. + + Bengali went down by 9, Devanagari by 2, Kannada by 130, Malayalm down + from 1197 to 307, Sinhala down by 16, Telugu down by 26. New stats: + + BENGALI: 353996 out of 354285 tests passed. 289 failed (0.0815727%) + DEVANAGARI: 693573 out of 693628 tests passed. 55 failed (0.00792932%) + GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) + GURMUKHI: 60750 out of 60809 tests passed. 59 failed (0.0970251%) + KANNADA: 951086 out of 951913 tests passed. 827 failed (0.0868777%) + KHMER: 299094 out of 299124 tests passed. 30 failed (0.0100293%) + MALAYALAM: 1048109 out of 1048416 tests passed. 307 failed (0.0292823%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271715 out of 271847 tests passed. 132 failed (0.0485567%) + TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) + TELUGU: 970550 out of 970573 tests passed. 23 failed (0.00236973%) + + test/shaping/hb_test_tools.py | 1 + + .../texts/in-tree/shaper-indic/indic/script-malayalam/misc/misc.txt | 2 ++ + 2 files changed, 3 insertions(+) + +commit 65c43accdc4d2082282d5cedba8514b8df0c18a2 +Author: Behdad Esfahbod +Date: Tue Jul 24 03:36:47 2012 -0400 + + [Indic] Better position left-matra in Malayalam + + Just put it before base, which is what's expected. + + Malayalam failures down from 1559 to 1197 (0.114172%). + + BENGALI: 353988 out of 354285 tests passed. 297 failed (0.0838308%) + DEVANAGARI: 693571 out of 693628 tests passed. 57 failed (0.00821766%) + GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) + GURMUKHI: 60750 out of 60809 tests passed. 59 failed (0.0970251%) + KANNADA: 950956 out of 951913 tests passed. 957 failed (0.100534%) + KHMER: 299094 out of 299124 tests passed. 30 failed (0.0100293%) + MALAYALAM: 1047219 out of 1048416 tests passed. 1197 failed (0.114172%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271699 out of 271847 tests passed. 148 failed (0.0544424%) + TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) + TELUGU: 970524 out of 970573 tests passed. 49 failed (0.00504856%) + + src/hb-ot-shape-complex-indic.cc | 41 +++++++++++++++------- + .../indic/script-malayalam/misc/misc.txt | 1 + + 2 files changed, 29 insertions(+), 13 deletions(-) + +commit 88f413b56f2858d149e2fc067685aeecaea779ca +Author: Behdad Esfahbod +Date: Tue Jul 24 03:04:36 2012 -0400 + + [Indic] Implement Reph+Ya-Phalaa interaction + + The sequence Ra,H,Ya in Bengali is ambigious and Unicode encoded that to + get Ya-Phalaa, one would place ZWJ before Halant. Ie. a ZWJ,H sequence + requests subjoining, while a H,ZWJ requests Half form. Implement that. + + Bengali failures go down from 377 to 297 (0.0838308%). + Gujarati is down by 4 to 17 (0.0046384%). + Kannada is down by 226 to 957 (0.100534%). + + Current status: + + BENGALI: 353988 out of 354285 tests passed. 297 failed (0.0838308%) + DEVANAGARI: 693571 out of 693628 tests passed. 57 failed (0.00821766%) + GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) + GURMUKHI: 60750 out of 60809 tests passed. 59 failed (0.0970251%) + KANNADA: 950956 out of 951913 tests passed. 957 failed (0.100534%) + KHMER: 299094 out of 299124 tests passed. 30 failed (0.0100293%) + MALAYALAM: 1046857 out of 1048416 tests passed. 1559 failed (0.148701%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271699 out of 271847 tests passed. 148 failed (0.0544424%) + TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) + TELUGU: 970524 out of 970573 tests passed. 49 failed (0.00504856%) + + src/hb-ot-shape-complex-indic.cc | 10 ++++++++-- + .../in-tree/shaper-indic/indic/script-bengali/misc/reph.txt | 4 ++++ + 2 files changed, 12 insertions(+), 2 deletions(-) + +commit dff0ece11d61978c04e839501f179a5c3077f340 +Author: Behdad Esfahbod +Date: Tue Jul 24 02:30:38 2012 -0400 + + [Indic] Limit matras to 4 per syllable + + Also limit joiners. + + This limits our syllable length to a constant, and is + closer to what Uniscribe does anyway. + + Two Devanagari tests regressed, but who cares about tests with 20 + joiners in a row?! Devanagari at 57 (0.00821766%) now. + + src/hb-ot-shape-complex-indic-machine.rl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 330b329c8905a37ca88c556dea82c70d74c77458 +Author: Behdad Esfahbod +Date: Tue Jul 24 02:25:26 2012 -0400 + + [Indic] Unmark U+17D1 KHMER SIGN VIRIAM to NOT be a Virama + + Fixes another 1 Khmer failure. Down to 30 (0.0100293%) now. + + src/hb-ot-shape-complex-indic.cc | 2 ++ + .../in-tree/shaper-indic/south-east-asian/script-khmer/misc/misc.txt | 1 + + 2 files changed, 3 insertions(+) + +commit 6824a7194e01b77eddb95bd95a9b32e219140912 +Author: Behdad Esfahbod +Date: Tue Jul 24 02:22:18 2012 -0400 + + [Indic] Recategorize Khmer various signs as top matras + + Khmer failures down from 39 to 31 (0.0103636%). + + src/hb-ot-shape-complex-indic.cc | 23 ++++++++++------------- + 1 file changed, 10 insertions(+), 13 deletions(-) + +commit d90b8e841e0068a601c96ab184d18b0f48eec9d1 +Author: Behdad Esfahbod +Date: Tue Jul 24 02:10:20 2012 -0400 + + [Indic] Reposition Khmer prebase-reordering Ra around split matras + + In Khmer coeng model, a V,Ra can go *after* matras. If it goes after a + split matra, it should be reordered to *before* the left part of such matra. + + Khmer failures down from 136 to 39 (0.0130381%). + + src/hb-ot-shape-complex-indic.cc | 13 +++++++++++++ + .../south-east-asian/script-khmer/misc/misc.txt | 4 ++++ + 2 files changed, 17 insertions(+) + +commit 0afb84c12567ac35adac657bf8be29999b8c5a50 +Author: Behdad Esfahbod +Date: Tue Jul 24 01:44:47 2012 -0400 + + [Indic] Fix minor bug in pre-base Ra positioning + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7573799126e812a047daa5f64121ec959866b3c8 +Author: Behdad Esfahbod +Date: Tue Jul 24 01:32:07 2012 -0400 + + [Indic] Position Khmer U+17CE + + Fixes another 6 Khmer failures. Now at 136 (0.0454661%). + + src/hb-ot-shape-complex-indic.cc | 6 ++++++ + .../shaper-indic/south-east-asian/script-khmer/misc/misc.txt | 1 + + 2 files changed, 7 insertions(+) + +commit 8d00e8d0e7d10f823e6975fecaffb9d557b1a99a +Author: Behdad Esfahbod +Date: Tue Jul 24 01:04:18 2012 -0400 + + [Indic] Don't reposition Khmer Bindu + + Khmer Bindu doesn't like to move to syllable end. Leave it where it + was. + + Brings down Khmer failures from 510 to 142 (0.047572%). + + src/hb-ot-shape-complex-indic.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2278eefcdb3dd0d492b9d07176fbecc1f0516bb7 +Author: Behdad Esfahbod +Date: Tue Jul 24 00:26:43 2012 -0400 + + [Indic] In Sinhala, form forced Reph even if no other consonant found + + Fixes another 10 Sinhala failures. Down to 148 (0.0544424%). + + src/hb-ot-shape-complex-indic.cc | 10 +++++----- + .../in-tree/shaper-indic/indic/script-sinhala/misc/misc.txt | 1 + + 2 files changed, 6 insertions(+), 5 deletions(-) + +commit 71fd5e80ad06c8e85a1112cc89e129d6cd03f82c +Author: Behdad Esfahbod +Date: Tue Jul 24 00:21:16 2012 -0400 + + [Indic] Further adjust base algorithm for Sinhala + + Apparently if there is C,V,ZWJ,C, the first C will be base, but if + it's C,ZWJ,V,C, the second one will be. + + Note that Uniscribe implements this differently, by breaking syllable in + the case of C,ZWJ,V,C and putting the first consonant in one syllable + and the rest in the next syllable. + + Sinhala failures down from 208 to 158 (0.0581209%). No changes to + Khmer. + + src/hb-ot-shape-complex-indic.cc | 11 +++++++---- + .../in-tree/shaper-indic/indic/script-sinhala/misc/misc.txt | 3 +++ + 2 files changed, 10 insertions(+), 4 deletions(-) + +commit 73d71cc527d28fd5519c5d965c272ea1fb149a0e +Author: Behdad Esfahbod +Date: Tue Jul 24 00:09:12 2012 -0400 + + [Indic] End Vowel-based syllable at ZWJ + + One Devanagari test regressed, plus 10 Malayalam (at 1545 now). + + Fixed 120 Sinhala failures. Now at 208 (0.0765136%). + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + .../texts/in-tree/shaper-indic/indic/script-sinhala/misc/misc.txt | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 34c215036f5fcdc7599b1ab0591b56dbb3811902 +Author: Behdad Esfahbod +Date: Mon Jul 23 23:51:29 2012 -0400 + + [Indic] Improve Sinhala base algorithm and reph positioning + + Sinhala does not have half forms. And most (all?) consonants can be + base, except when preceded by ZWJ, which would request a subjoined form. + Hence switch the base algorithm to categorize with Khmer, start search + at start, and stop at a ZWJ. + + Also, mark all pos=base consonants after base to be subjoined. Mark + base itself to have pos=base. + + Finally, adjust Sinhala's reph position to after-main. + + Brings down Sinhala failures from 455 to 328 (0.120656%). + + src/hb-ot-shape-complex-indic.cc | 18 +++++++++++++++++- + .../shaper-indic/indic/script-sinhala/misc/misc.txt | 1 + + 2 files changed, 18 insertions(+), 1 deletion(-) + +commit 2ec934c6c25423e7af20d909a9c698a149808ea9 +Author: Behdad Esfahbod +Date: Mon Jul 23 23:49:04 2012 -0400 + + [Indic] Change "unknown" position to end of syllable + + src/hb-ot-shape-complex-indic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b70021f7c81a0ed08475b14b07291f662cd9f905 +Author: Behdad Esfahbod +Date: Mon Jul 23 20:18:17 2012 -0400 + + When removing zero-width marks, don't remove ligatures + + If a mark ligated, it probably should NOT be removed. + + src/hb-ot-shape.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 49c5ec51444f27f33e1eb6aa1959c61b08fa89c0 +Author: Behdad Esfahbod +Date: Mon Jul 23 20:14:13 2012 -0400 + + Minor refactoring + + src/hb-ot-layout-gsubgpos-private.hh | 32 -------------------------------- + src/hb-ot-layout-private.hh | 35 +++++++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-indic.cc | 2 +- + 3 files changed, 36 insertions(+), 33 deletions(-) + +commit c3e6fdc3791168cf2b4c9412e751f187d58faa42 +Author: Behdad Esfahbod +Date: Mon Jul 23 20:11:42 2012 -0400 + + [Indic] Improve check on ligatures + + Only skip actual ligatures, not marks in-between ligature components. + + src/hb-ot-layout-gsubgpos-private.hh | 5 +++++ + src/hb-ot-shape-complex-indic.cc | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 771a8f50289e8fa458cfc3cd84f73a380ce98077 +Author: Behdad Esfahbod +Date: Mon Jul 23 20:07:50 2012 -0400 + + [Indic] exclude ligatures when matching on Indic category + + If, say, a H,ZWJ,C ligature was formed, we don't want the code to detec + that as a Halant. So, ignore ligatures when matching category in + final_reordering. + + Sinhala failures down from 514 to 455 (0.167374%). + + src/hb-ot-shape-complex-indic.cc | 41 ++++++++++++---------- + .../indic/script-sinhala/misc/misc.txt | 1 + + 2 files changed, 23 insertions(+), 19 deletions(-) + +commit d1af9e82e5309158ed334ab8e21f3a3b64b9540f +Author: Behdad Esfahbod +Date: Mon Jul 23 19:55:35 2012 -0400 + + [GSUB/GPOS] Const correctness + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit baacd090df97610e3f6d1b2a110dc67b6c6f9f5c +Author: Behdad Esfahbod +Date: Mon Jul 23 19:51:48 2012 -0400 + + [Indic] Minor refactoring + + src/hb-ot-shape-complex-indic.cc | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit c7c4de2fb9bba216e37875d79815eef55c0acc01 +Author: Behdad Esfahbod +Date: Mon Jul 23 18:25:02 2012 -0400 + + [Indic] Remove syllable length check before sorting + + We now limit syllable lengths in the machine. No need to match here. + + src/hb-ot-shape-complex-indic.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 9fa052733eb93a3ce1205f63ff8f74cb295cbe99 +Author: Behdad Esfahbod +Date: Mon Jul 23 18:19:17 2012 -0400 + + [Indic] Limit syllables to at most five consonants + + Seems to be about what Uniscribe does. Not exactly. But close enough. + More consonants will start a new cluster. + + A few scripts went way down in failures. In particular: + + - Devanagari failures went down from 490 to 56. + - Telugu went down from 113 to 49. + + Other scripts went down slightly or didn't change. New numbers: + + BENGALI: 353908 out of 354285 tests passed. 377 failed (0.106412%) + DEVANAGARI: 693572 out of 693628 tests passed. 56 failed (0.00807349%) + GUJARATI: 366485 out of 366506 tests passed. 21 failed (0.00572978%) + GURMUKHI: 60750 out of 60809 tests passed. 59 failed (0.0970251%) + KANNADA: 950730 out of 951913 tests passed. 1183 failed (0.124276%) + KHMER: 298613 out of 299124 tests passed. 511 failed (0.170832%) + MALAYALAM: 1046881 out of 1048416 tests passed. 1535 failed (0.146411%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271333 out of 271847 tests passed. 514 failed (0.189077%) + TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) + TELUGU: 970524 out of 970573 tests passed. 49 failed (0.00504856%) + + Some of the remaining Telugu and Devanagari issues seem to be Uniscribe + eating Anusvara when placed before a non-joiner. Ouch! + + src/hb-ot-shape-complex-indic-machine.rl | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 093cd583263a5d427e3377b31585043fb55d2557 +Author: Behdad Esfahbod +Date: Mon Jul 23 14:04:42 2012 -0400 + + [Thai] Fix SARA AM handling + + Oops, thinko. + + src/hb-ot-shape-complex-misc.cc | 6 +++--- + src/hb-private.hh | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 42848453bf260b456b46a07f066e31b8c3aac2f1 +Author: Behdad Esfahbod +Date: Mon Jul 23 13:52:07 2012 -0400 + + [Thai] Reorder U+0E3A THAI VOWEL SIGN PHINTHU + + Uniscribe reorders U+0E3A to be after U+0E38 and U+0E39. We do that by + modifying the ccc for U+0E3A. + + Fixes the two remaining Thai failures (see previous commit). + + src/hb-ot-shape-complex-misc.cc | 7 +++++++ + src/hb-unicode.cc | 6 ++++++ + .../texts/in-tree/shaper-thai/script-thai/misc/MANIFEST | 1 + + .../in-tree/shaper-thai/script-thai/misc/phinthu.txt | 16 ++++++++++++++++ + 4 files changed, 30 insertions(+) + +commit 4a7f4f3e56f8f7640ae7337aa1b3324f31e0d4ab +Author: Behdad Esfahbod +Date: Mon Jul 23 13:15:33 2012 -0400 + + [Thai] Adjust SARA AM reordering to match Uniscribe + + Adjust the list of marks before SARA AM that get the reordering + treatment. Also adjust cluster formation to match Uniscribe. + + With Wikipedia test data, now I see: + + - For Thai, with the Angsana New font from Win7, I see 54 failures out + of over 4M tests (0.00129107%). Of the 54, two are legitimate + reordering issues (fix coming soon), and the other 52 are simply + Uniscribe using a zero-width space char instead of an unknown + character for missing glyphs. No idea why. The missing-glyph + sequences include one that is a Thai character followed by an Arabic + Sokun. Someone confused it with Nikhahit I assume! + + - For Lao, with the Dokchampa font from Win7, 33 tests fail out of + 54k (0.0615167%). All seem to be insignificant mark positioning + with two marks on a base. Have to investigate. + + src/hb-ot-shape-complex-misc.cc | 42 +++++++++++++--------- + src/hb-private.hh | 6 ++++ + test/shaping/texts/in-tree/shaper-thai/MANIFEST | 1 + + .../texts/in-tree/shaper-thai/script-lao/MANIFEST | 1 + + .../in-tree/shaper-thai/script-lao/misc/MANIFEST | 1 + + .../shaper-thai/script-lao/misc/sara-am.txt | 20 +++++++++++ + .../shaper-thai/script-thai/misc/sara-am.txt | 18 +++++++++- + 7 files changed, 72 insertions(+), 17 deletions(-) + +commit 2cc933aff97916e5d0fe42883f40f0879f848e25 +Author: Behdad Esfahbod +Date: Mon Jul 23 08:22:55 2012 -0400 + + [Indic] Fix cluster formation with left-matras and conjunct forms + + Test case was: . + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e6b01a878cd2e63cb675e7e0c6ac4d83a8c10f37 +Author: Behdad Esfahbod +Date: Mon Jul 23 00:11:26 2012 -0400 + + [Indic] Further streamline cluster formation + + This should address all possible cluster misformations that I had in + mind. + + src/hb-ot-shape-complex-indic.cc | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) + +commit 7b2a7dadd6c616bbfe1d8358700cab9cee88e584 +Author: Behdad Esfahbod +Date: Sun Jul 22 23:58:55 2012 -0400 + + [Indic] Merge clusters before sorting + + This should fix any instabilities in cluster formation that we were + speculating may happen with surrounding syllables. Or most of it + perhaps. + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit abb3239ef92cc5dccb4638806d7ae9868b9ac9b3 +Author: Behdad Esfahbod +Date: Sun Jul 22 23:55:19 2012 -0400 + + [Indic] Update clusters for left-matra even if matra didn't move + + Fixes crashes reported with left matra under + non-uniscribe-bug-compatibilty mode. + + src/hb-ot-shape-complex-indic.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 60554f14d8dca208721f0da8b69d84b92819c54f +Author: Behdad Esfahbod +Date: Sun Jul 22 23:23:56 2012 -0400 + + [Indic] Merge in Malayalam tests + + From: + http://silpa.org.in/pub/tests/hb/ml/ml-harfbuzz-testdata.txt + + .../indic/script-malayalam/misc/misc.txt | 94 +++++++++++----------- + 1 file changed, 46 insertions(+), 48 deletions(-) + +commit 5c7081770c7a611bbe79b451b7b86dec4fa6395d +Author: Behdad Esfahbod +Date: Sun Jul 22 23:20:27 2012 -0400 + + [Indic] Add extensive Sinhala tests + + Generated by: + http://git.savannah.gnu.org/cgit/sinhala.git/plain/utils/gen-unicode-sinhala.py + + .../indic/script-sinhala/misc/extensive.txt | 4390 ++++++++++++++++++++ + 1 file changed, 4390 insertions(+) + +commit 2efe4707b1b449962f6e161716477d9775456c46 +Author: Behdad Esfahbod +Date: Sun Jul 22 23:17:59 2012 -0400 + + [Indic] Add Sinhala tests + + Merge tests from: + http://git.savannah.gnu.org/cgit/sinhala.git/plain/patches/icu-sinhala-rendering.txt + + .../indic/script-sinhala/misc/misc.txt | 26 ++++++++++++++++++++-- + 1 file changed, 24 insertions(+), 2 deletions(-) + +commit 3d4c111b7a13700b2f7a0b087eb3992283295f21 +Author: Behdad Esfahbod +Date: Fri Jul 20 19:34:39 2012 -0400 + + Add a test case + + .../texts/in-tree/shaper-indic/indic/script-bengali/misc/misc.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 92a1ad7bef9efb456ab87bd63818cfbed7da3f6f +Author: Behdad Esfahbod +Date: Fri Jul 20 18:38:27 2012 -0400 + + [Indic] Stop searching for base if a post form is found before below form + + Improves Bengali and Gurmukhi. Malayalam regressed a bit. We will deal + with that later. + + src/hb-ot-shape-complex-indic.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 4c450c703f8e4618c587bcd7ef46dcc1f2c7947b +Author: Behdad Esfahbod +Date: Fri Jul 20 18:13:04 2012 -0400 + + [Indic] Recompose Bengali Ya,Nukta + + This is a bunch of hacks for now. + + Improves Bengali a bit. + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + src/hb-unicode.cc | 8 ++++++++ + 2 files changed, 10 insertions(+), 2 deletions(-) + +commit e9c0f152a38cb2e76650a3e43f7fdcda266af696 +Author: Behdad Esfahbod +Date: Fri Jul 20 17:05:46 2012 -0400 + + [Uniscribe] Fix script fallback + + Gurmukhi failures half now. Others changed slightly. + + src/hb-uniscribe.cc | 34 ++++++++++++++-------------------- + 1 file changed, 14 insertions(+), 20 deletions(-) + +commit 5791f329159c9863317e2b507514c29321be31a7 +Author: Behdad Esfahbod +Date: Fri Jul 20 16:26:55 2012 -0400 + + [Indic] Allow a ZWNJ after SM's + + Malayalam failures go way down. Other scripts benefitted slightly too. + Sinhala had one or two test regressions, but... + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 34ae336f3fae93ef9372881d545c817bce383041 +Author: Behdad Esfahbod +Date: Fri Jul 20 16:17:28 2012 -0400 + + [Indic] Improve Reph AfterMain positioning + + Fixes 20 out of 48 failing Oriya tests. Failure rate down to 0.066% now. + + src/hb-ot-shape-complex-indic.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit bdd080431a40bc941ece3230f338b94a46bd12a2 +Author: Behdad Esfahbod +Date: Fri Jul 20 16:03:09 2012 -0400 + + [Indic] Reposition Oriya Candrabindu + + Oriya failures down from 0.65% to 0.20%. + + src/hb-ot-shape-complex-indic.cc | 1 + + .../shaping/texts/in-tree/shaper-indic/indic/script-oriya/misc/MANIFEST | 1 + + .../texts/in-tree/shaper-indic/indic/script-oriya/misc/bindu.txt | 2 ++ + 3 files changed, 4 insertions(+) + +commit 5f0eaaad129ff04d56b8756bebf19fbc242718c9 +Author: Behdad Esfahbod +Date: Fri Jul 20 15:47:24 2012 -0400 + + [Indic] Fix base search in final_reordering + + Fixes most Malayalam failures. Down from 1.6% to 0.38% now. Fixes a + few more in other scripts too. + + src/hb-ot-shape-complex-indic.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 81202bd860e4034c18d9f80c5a4f33d9f48463a3 +Author: Behdad Esfahbod +Date: Fri Jul 20 15:10:02 2012 -0400 + + [Indic] Don't attach SM/VD to other characters + + src/hb-ot-shape-complex-indic-private.hh | 3 +++ + src/hb-ot-shape-complex-indic.cc | 38 ++++++++++++++++++-------------- + 2 files changed, 24 insertions(+), 17 deletions(-) + +commit efb4ad735691837a52447bedc1a66a87d0d9af51 +Author: Behdad Esfahbod +Date: Fri Jul 20 14:27:38 2012 -0400 + + Fix compiler warnings + + If x is not constant, we cannot ASSERT_STATIC on it. + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f31d97e44eeb6fb141f3de928e27e033fc7b1f47 +Author: Behdad Esfahbod +Date: Fri Jul 20 14:13:35 2012 -0400 + + [Indic] Form Telugu Reph out of Ra,Virama,ZWJ + + Apparently this was approved in Feb 2012. No font yet. + + src/hb-ot-shape-complex-indic-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 2e193b240ec85cab0d4e2f8a375c5a7f0ef99985 +Author: Behdad Esfahbod +Date: Fri Jul 20 14:02:35 2012 -0400 + + [Indic] Don't split U+0AC9 + + Althought IndicMatraCategory.txt classifies it as Top_And_Right matra, + it does not have Unicode decomposition, and Uniscribe does not do + anything special about it either. + + Gujarati failures down from 0.672% to 0.0130966%. + + src/hb-unicode.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 30c3d5e9fc61b49c2c6ad4e744300edd6f3e0261 +Author: Behdad Esfahbod +Date: Fri Jul 20 13:56:32 2012 -0400 + + [Indic] Simplify Uniscribe cluster emulation + + Now that we break syllables on Halant,ZWNJ, this code can be simplified. + + src/hb-ot-shape-complex-indic.cc | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +commit decf6ffca475fe01ff3151b7641f629f031137d2 +Author: Behdad Esfahbod +Date: Fri Jul 20 13:51:31 2012 -0400 + + [Indic] Minor! + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9e4f94a72cea6d65a6a7ba5a47db92e00dbfbb91 +Author: Behdad Esfahbod +Date: Fri Jul 20 13:48:03 2012 -0400 + + [Indic] Break syllables at Halant,ZWNJ + + That's really what Uniscribe does, and explains a lot of pecularities of + Halant,ZWNJ before the base. + + Sent Telugu from 1% failures to 0.03%. Improved Kannada and Malayalam + slightly. Fixed half of Bengali, and did NOT break anything! + + src/hb-ot-shape-complex-indic-machine.rl | 5 +++-- + src/hb-ot-shape-complex-indic.cc | 5 ++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 2c372b80f6befad69e216e3f218b38640b8cc044 +Author: Behdad Esfahbod +Date: Fri Jul 20 13:37:48 2012 -0400 + + [Indic] Better check for applying 'init' + + Specifically, don't apply 'init' if previous char is a joiner. + + Fixes some more of Bengali. + + src/hb-ot-shape-complex-indic.cc | 9 +-------- + src/hb-private.hh | 3 ++- + 2 files changed, 3 insertions(+), 9 deletions(-) + +commit 34a7440b7c6c6e53394ddbdbedaad57b23f85105 +Author: Behdad Esfahbod +Date: Fri Jul 20 12:32:59 2012 -0400 + + [GPOS] Don't zero mark advances + + Fixes more of Telugu, Kannada, and Oriya. + + May break things (outside Indic...), but we cannot think of any font relying + on this immediately. + + src/hb-ot-layout-gpos-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8ed248de77e5d2ed978e55c0ce1a11727bc9e34c +Author: Behdad Esfahbod +Date: Fri Jul 20 11:42:24 2012 -0400 + + [Indic] Minor + + src/hb-ot-shape-complex-indic.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit d0e68dbd0b9fc9a42c4280d01c8ffd9c5015d550 +Author: Behdad Esfahbod +Date: Fri Jul 20 11:25:41 2012 -0400 + + [Indic] Implement reph positioning step 5 + + Not tuned, just copied from step 2. Fixes another 0.5% of Kannada + failures. 1% to go. + + src/hb-ot-shape-complex-indic.cc | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit a9e45c32e4a0d6da33c52f8427aa694e57f52eb9 +Author: Behdad Esfahbod +Date: Fri Jul 20 11:04:15 2012 -0400 + + [Indic] Don't let ZWNJ at the end of syllable affect base search + + Fixes a few Devanagari, half of remaining Kannada failures, quarter for + Telugu, and others slightly improved or unchanged. + + src/hb-ot-shape-complex-indic.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 20b68e699f73e6ce046c0ec143d40b3d6d48e06b +Author: Behdad Esfahbod +Date: Fri Jul 20 10:47:46 2012 -0400 + + [Indic] Apply 'cjct' globally + + Fixes 5 Devanagari failures, and no regressions. + + src/hb-ot-shape-complex-indic.cc | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +commit 51e764de441072e7c9f67de23e8ed717b9b8957d +Author: Behdad Esfahbod +Date: Fri Jul 20 10:30:24 2012 -0400 + + [Indic] Unbreak old scriptures + + Brings down failures with Lohit-Telugu from 57% to 1.40%. + + src/hb-ot-shape-complex-indic.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 900cf3d449bf36d4f8b1474590cae925fef48fc8 +Author: Behdad Esfahbod +Date: Fri Jul 20 10:18:23 2012 -0400 + + Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 87cd63266e73af316b250573ef57388a0bcc9133 +Author: Behdad Esfahbod +Date: Thu Jul 19 21:17:48 2012 -0400 + + [Indic] Recategorize some Kannada right matras + + Kannada failures down from 3.5% to 2.93%. + + src/hb-ot-shape-complex-indic.cc | 2 +- + .../texts/in-tree/shaper-indic/indic/script-kannada/misc/MANIFEST | 1 + + .../shaper-indic/indic/script-kannada/misc/right-matras.txt | 7 +++++++ + 3 files changed, 9 insertions(+), 1 deletion(-) + +commit 3604d64ced909ade91998d294a7b4b2ee14d47aa +Author: Behdad Esfahbod +Date: Thu Jul 19 21:13:04 2012 -0400 + + [Indic] Recategorize GURMUKHI ADDAK + + It's not in IndicSyllabicCategory.txt. Fixes most of Gurmukhi failures. + Failures down from 7.7% to 0.222%! + + src/hb-ot-shape-complex-indic.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 89328581236a53ec16508b95db54c7e5315b178f +Author: Behdad Esfahbod +Date: Thu Jul 19 21:02:38 2012 -0400 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 47ef931f13778b894090139a64238a5ab9ac1154 +Author: Behdad Esfahbod +Date: Thu Jul 19 20:52:44 2012 -0400 + + [buffer] Make sure out_info = info during GPOS + + src/hb-buffer.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit ae63cf206291befe3920adfe015e6cd0961580e5 +Author: Behdad Esfahbod +Date: Thu Jul 19 20:45:41 2012 -0400 + + Print line number during return when tracing + + src/hb-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 5249f3aee108b0f41770d137e63a625f594418e7 +Author: Behdad Esfahbod +Date: Thu Jul 19 20:30:22 2012 -0400 + + [Indic] Unbreak Khmer + + For Khmer, all consonants are subjoining. No need to look in the font. + We were looking in the wrong order anyway. + + src/hb-ot-shape-complex-indic.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit e0475345d5d7db8dbc8b554beedfa2435c5d7fd1 +Author: Behdad Esfahbod +Date: Thu Jul 19 20:24:14 2012 -0400 + + [Indic] Apply 'akhn' globally + + Fixes 1.5% more failures for Telugu, 2% for Kannada. + Breaks one test in Devanagari. + + src/hb-ot-shape-complex-indic.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit c87bcddb10752b407c0471ee5ac4de6f1b00b711 +Author: Behdad Esfahbod +Date: Thu Jul 19 20:03:25 2012 -0400 + + [Indic] Add failing test for Kannada + + .../texts/in-tree/shaper-indic/indic/script-kannada/misc/misc.txt | 1 + + 1 file changed, 1 insertion(+) + +commit fa247ebe524f92fa95d344ba912f704262879c13 +Author: Behdad Esfahbod +Date: Thu Jul 19 19:52:19 2012 -0400 + + [Indic] Better position U+0CD5 + + Fixes another 5% of Kannada failures. + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f055442716ec7543ed156d4789955b19c11a5255 +Author: Behdad Esfahbod +Date: Thu Jul 19 16:20:21 2012 -0400 + + [Indic] Lookup consonant position in the font + + Fixes most failures of Oriya, and improves others a bit. + + src/hb-ot-map-private.hh | 13 ++-- + src/hb-ot-shape-complex-indic-private.hh | 105 ------------------------------- + src/hb-ot-shape-complex-indic.cc | 63 +++++++++++++------ + 3 files changed, 54 insertions(+), 127 deletions(-) + +commit 74d1d88781e91866a52e27f391e34df03b313442 +Author: Behdad Esfahbod +Date: Thu Jul 19 16:14:23 2012 -0400 + + [GSUB] Fix would_apply() for LigatureSubst + + src/hb-ot-layout-gsub-table.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 787f7d1e9ba9ad038f24e5a1063d12c7d169ad37 +Author: Behdad Esfahbod +Date: Thu Jul 19 15:29:13 2012 -0400 + + [TODO] Minor + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit be73a5f9368136ecbdb211b96516ad0c554c8201 +Author: Behdad Esfahbod +Date: Thu Jul 19 14:59:15 2012 -0400 + + Add src/test-would-substitute tool + + src/Makefile.am | 6 +- + src/test-would-substitute.cc | 94 ++++++++++++++++++++++++++++++ + src/test.cc | 132 +++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 231 insertions(+), 1 deletion(-) + +commit e72b360ac6381b549249b8836fa3e70b909d3437 +Author: Behdad Esfahbod +Date: Thu Jul 19 14:35:23 2012 -0400 + + Refactor / finish would_apply() operation + + Untested. + + src/hb-ot-layout-gpos-table.hh | 6 +- + src/hb-ot-layout-gsub-table.hh | 126 +++++++++---------- + src/hb-ot-layout-gsubgpos-private.hh | 233 ++++++++++++++++++++++++++++++++++- + src/hb-ot-layout.cc | 11 ++ + src/hb-ot-layout.h | 7 ++ + 5 files changed, 308 insertions(+), 75 deletions(-) + +commit 8c973ebf0f59abb5ee920edd5d64e23d8e47ad75 +Author: Behdad Esfahbod +Date: Thu Jul 19 13:25:08 2012 -0400 + + [Indic] Implement per-script matra positioning + + Following what the spec says. + + Brings down Telugu failures from 40% to 3.75%, and Kannada failures from + 44% to 10%. Does NOT affect other scripts' test results. + + src/hb-ot-shape-complex-indic-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 40 +++++++++++++++++++++++++++++--- + src/hb-unicode.cc | 2 +- + 3 files changed, 39 insertions(+), 5 deletions(-) + +commit 8bb32458f95f13f66688e0811cc91f1bfffb867d +Author: Behdad Esfahbod +Date: Thu Jul 19 12:59:06 2012 -0400 + + [Indic] More refactoring + + src/hb-ot-shape-complex-indic-private.hh | 9 ++--- + src/hb-ot-shape-complex-indic.cc | 65 ++++++++++++++++++++++++-------- + 2 files changed, 54 insertions(+), 20 deletions(-) + +commit 9ccc6382ba43760167c134c18c1c4ada4b8c3f22 +Author: Behdad Esfahbod +Date: Thu Jul 19 12:32:16 2012 -0400 + + [Indic] Minor refactoring + + src/hb-ot-shape-complex-indic.cc | 127 ++++++++++++++++++++++----------------- + 1 file changed, 71 insertions(+), 56 deletions(-) + +commit f83aaa3133de5d807be267a100d6a200e8db9017 +Author: Behdad Esfahbod +Date: Thu Jul 19 12:23:23 2012 -0400 + + [Indic] Minor + + src/hb-ot-shape-complex-indic-private.hh | 42 ++++++++++++++++++++------------ + 1 file changed, 26 insertions(+), 16 deletions(-) + +commit be8b9f5f715f6fb36b98bd33c3303f79cc068f8a +Author: Behdad Esfahbod +Date: Thu Jul 19 12:11:12 2012 -0400 + + [Indic] Start refactoring different matra positions per script + + src/hb-ot-shape-complex-indic-private.hh | 36 +++++++++++++++++++------------- + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 2 files changed, 24 insertions(+), 16 deletions(-) + +commit deeb540a74f8d394db273145b17bf385d14d01bb +Author: Behdad Esfahbod +Date: Thu Jul 19 11:30:48 2012 -0400 + + [test] Ignore tests with DOTTED CIRCLE in the output + + test/shaping/hb_test_tools.py | 4 ++++ + 1 file changed, 4 insertions(+) + +commit b01d9b3d90e892341ee4463f2eda4600850b97d8 +Author: Behdad Esfahbod +Date: Thu Jul 19 11:25:49 2012 -0400 + + [Indic] Disallow decomposition of a couple characters + + This is a hack for now. Will be fixed when we do complex-shaper-driven + normalization properly. + + The results with or without decomposition are the same, but Uniscribe + does not normalize, so this matches better. + + src/hb-unicode.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 422ecd2d3c198a36d07d409341cb82ea57c7ad6b +Author: Behdad Esfahbod +Date: Wed Jul 18 23:25:58 2012 -0400 + + [Indic] Accept a forced Rakar sequence at the end of syllable + + In Sinhala, Rakar is formed by Al-Lakuna,ZWJ,Ra. If you put that at the + end of a Consonant,Matra syllable, you get a dotted-circle from + Uniscribe. Apparently adding a ZWJ before the Al-Lakuna "fixes" that. + And people have been encoding that sequence... So, allow a forced + "ZWJ,Virama,ZWJ,Ra" sequence at the of syllables. + + Fixes some 100 or more of Sinhala failures. Now at 622 only (0.23%). + + src/hb-ot-shape-complex-indic-machine.rl | 3 ++- + .../texts/in-tree/shaper-indic/indic/script-sinhala/misc/misc.txt | 2 ++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 6fc1732003d71cf90d37247482772c3da884687f +Author: Behdad Esfahbod +Date: Wed Jul 18 17:49:19 2012 -0400 + + [Indic] Allow joiners on both sides of Halant at the same time + + The sequence is used in Sinhala to explicitly ask + for Rakar. Fixes two-thousand Sinhala tests. Not many left. + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 10cdc94eee2225f14c198c015256a5a0063eecad +Author: Behdad Esfahbod +Date: Wed Jul 18 17:42:34 2012 -0400 + + [Indic] In final reordering, find base, even if it disappeared + + POS_BASE can disappear if base ligated backward. Define base as last + with position not after base. + + Fixes a few hundred of Sinhala failures with Iskoola Pota. + + src/hb-ot-shape-complex-indic.cc | 7 ++----- + .../texts/in-tree/shaper-indic/indic/script-sinhala/misc/misc.txt | 1 + + 2 files changed, 3 insertions(+), 5 deletions(-) + +commit 9c4d24a3a677a58ec59c7fb0f8b70b8aad30a032 +Author: Behdad Esfahbod +Date: Wed Jul 18 17:29:10 2012 -0400 + + [Indic] Minor + + src/hb-ot-shape-complex-indic.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 3285e107c9a83aeb552e67f9460680ff6d167d88 +Author: Behdad Esfahbod +Date: Wed Jul 18 17:22:14 2012 -0400 + + [Indic] Implement Sinhala "Al Lakuna" Reph behavior + + In Sinhala, Reph is formed only explicitly, by the presence of a ZWJ. + + src/hb-ot-shape-complex-indic-private.hh | 2 ++ + src/hb-ot-shape-complex-indic.cc | 7 ++++++- + .../texts/in-tree/shaper-indic/indic/script-sinhala/misc/MANIFEST | 1 + + .../texts/in-tree/shaper-indic/indic/script-sinhala/misc/reph.txt | 3 +++ + 4 files changed, 12 insertions(+), 1 deletion(-) + +commit 91cade755534c42bb826a6aefcbca8a543d94387 +Author: Behdad Esfahbod +Date: Wed Jul 18 16:50:41 2012 -0400 + + [Indic/Unicode] Decompose Sinhala split matras the way Uniscribe likes + + Makes no visual difference. + + Fixes most of the failures. Down from 15% to 1.3%! + + src/hb-unicode.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit d8942dcbb4e3249a2d78a6455c119294ed4390bc +Author: Behdad Esfahbod +Date: Wed Jul 18 16:34:10 2012 -0400 + + Apply Tibetan (global) features. + + Fixes all Tibetan failures. All 180k of them! + + Merges back Hangul into the default shaper. + + src/hb-ot-shape-complex-misc.cc | 82 +++++++++++++++++--------------------- + src/hb-ot-shape-complex-private.hh | 7 ---- + 2 files changed, 37 insertions(+), 52 deletions(-) + +commit 552d19b7a11f7dff888587fce4d56d9f8e47e819 +Author: Behdad Esfahbod +Date: Wed Jul 18 16:00:49 2012 -0400 + + [Indic] Treat Register Shifters like Nukta + + Really this time. + + Fixes another 18 Khmer tests. + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + src/hb-ot-shape-complex-indic.cc | 2 -- + .../in-tree/shaper-indic/south-east-asian/script-khmer/misc/misc.txt | 1 + + 3 files changed, 2 insertions(+), 3 deletions(-) + +commit e8cd81f76d159f3ecf808952dab24bc07782497a +Author: Behdad Esfahbod +Date: Wed Jul 18 16:00:20 2012 -0400 + + [Indic] Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 69f26bf39c824d6bf5b1c0d410380cc5462ad5ca +Author: Behdad Esfahbod +Date: Wed Jul 18 15:45:43 2012 -0400 + + [Indic] Fix Matra reordering when base is at end of syllable + + For example: U+915,U+200c,U+93f + + Fixes last Tamil failure! + + src/hb-ot-shape-complex-indic.cc | 2 +- + .../texts/in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit d16ccc4ae7aa8be460881042413fa2637929fede +Author: Behdad Esfahbod +Date: Wed Jul 18 15:43:55 2012 -0400 + + Leave one extra item at the end of buffer allocation + + Just in case, for the times we do out-of-bounds access. + + jk + + src/hb-buffer-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 075d671f1093d2e3c58f7f45568696030f1b3efd +Author: Behdad Esfahbod +Date: Wed Jul 18 15:41:53 2012 -0400 + + [Indic] Fix out-of-bounds array access + + src/hb-ot-shape-complex-indic.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit dcb527242b1eca4db1e190a7802f9cd132aaf46e +Author: Behdad Esfahbod +Date: Wed Jul 18 15:28:25 2012 -0400 + + [Indic] Allow joiners before matras + + Fixes 1 more Devanagari test! + + src/hb-ot-shape-complex-indic-machine.rl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 391cc0331749e263bdfe83a8f5f6d76f2360ee7a +Author: Behdad Esfahbod +Date: Wed Jul 18 15:10:05 2012 -0400 + + [Indic] Allow halant group in Vowel and placeholder syllables + + Fixes 2 out of 560 Devanagari failures. AND: + Fixes 1 out of 2 Tamil failures. + + src/hb-ot-shape-complex-indic-machine.rl | 7 ++++--- + .../in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt | 1 + + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit ca4e3d3eab7b738c2b8e2a81696a28bca1b81495 +Author: Behdad Esfahbod +Date: Wed Jul 18 15:05:40 2012 -0400 + + [Indic] Streamline halant/joiner in grammar + + src/hb-ot-shape-complex-indic-machine.rl | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 418d00dffddd95a1f27e9be15752d494c627d45e +Author: Behdad Esfahbod +Date: Wed Jul 18 14:57:28 2012 -0400 + + [Indic] Minor + + src/hb-ot-shape-complex-indic-machine.rl | 3 ++- + .../texts/in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt | 3 +++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 4c3691d2a32ca7e54a54f7c08098fd96fa7af39e +Author: Behdad Esfahbod +Date: Wed Jul 18 14:23:55 2012 -0400 + + [Indic] Hopefully minor! + + Refactoring Indic machin. No semantic change. + + src/hb-ot-shape-complex-indic-machine.rl | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit e092c556fb1cf38be3cea1f4b75a0d879372dfa2 +Author: Behdad Esfahbod +Date: Wed Jul 18 14:09:25 2012 -0400 + + [Indic] Minor + + src/hb-ot-shape-complex-indic-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 14dbdd9e39d3a869fd1521000c889c347433d22b +Author: Behdad Esfahbod +Date: Wed Jul 18 13:13:03 2012 -0400 + + [Indic] Unbreak Tamil + + Tamil has only about 150 failures now! + + src/hb-ot-shape-complex-indic.cc | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +commit db8981f1e0e8625714568c6d0f11f0b317b11d0a +Author: Behdad Esfahbod +Date: Tue Jul 17 18:17:30 2012 -0400 + + [Indic] Position Khmer Robat + + It's a visual Repha. + + Still not positioning logical Repha as occurs in Malayalam. + + Another 200 Khmer failures fixed. 547 to go. That's better than + Devanagari! + + src/hb-ot-shape-complex-indic-machine.rl | 36 +++++++++++++++++--------------- + src/hb-ot-shape-complex-indic-private.hh | 7 ++++--- + src/hb-ot-shape-complex-indic.cc | 13 ++++++++++++ + 3 files changed, 36 insertions(+), 20 deletions(-) + +commit 25bc489498ef7d0beb8fe9ab663e3f0b2f52c9c2 +Author: Behdad Esfahbod +Date: Tue Jul 17 17:53:03 2012 -0400 + + [Indic] Better categorize Register Shifters and Khmer Various signs + + Down another 500 or so Khmer failures! + + src/hb-ot-shape-complex-indic-machine.rl | 14 +++++++------- + src/hb-ot-shape-complex-indic-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 8 ++++---- + .../south-east-asian/script-khmer/misc/MANIFEST | 2 ++ + .../script-khmer/misc/other-marks-invalid.txt | 4 ++++ + .../south-east-asian/script-khmer/misc/other-marks.txt | 6 ++++++ + 6 files changed, 24 insertions(+), 12 deletions(-) + +commit 39b17837b4064d59c18cebb49c1c0b5b8cc0c117 +Author: Behdad Esfahbod +Date: Tue Jul 17 17:09:29 2012 -0400 + + Add hb_buffer_normalize_glyphs() and hb-shape --normalize-glyphs + + This reorders glyphs within the cluster to a nominal order. This should + have no visible effect on the output, but helps with testing, for + getting the same hb-shape output for visually-equal glyphs for each + cluster. + + src/hb-buffer.cc | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-buffer.h | 13 ++++++++++ + src/hb-private.hh | 29 ++++++++++++++++----- + util/options.cc | 1 + + util/options.hh | 7 ++++- + 5 files changed, 118 insertions(+), 8 deletions(-) + +commit 25e302da9a712e6f1d63b0d243a8df0d326ddba3 +Author: Behdad Esfahbod +Date: Tue Jul 17 14:25:14 2012 -0400 + + [Indic] Minor + + src/hb-ot-shape-complex-indic.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 5d32690a3428fa86eb26fe5fcec943a10aa95881 +Author: Behdad Esfahbod +Date: Tue Jul 17 14:23:28 2012 -0400 + + [Indic] For scripts without Half forms, always choose first consonant as base + + In such scripts (ie. Khmer), a ZWJ/ZWNJ shouldn't stop the search for + base. So, instead just choose the first consonant as base directly. + + Test sequence: + U+1798,200c,U+17C9,U+17D2,U+179B,U+17C1,U+17C7 + + src/hb-ot-shape-complex-indic.cc | 59 ++++++++++++++++++++++++---------------- + 1 file changed, 35 insertions(+), 24 deletions(-) + +commit 34b57149065d96f7528aaccaa7654e956ce27e93 +Author: Behdad Esfahbod +Date: Tue Jul 17 14:09:32 2012 -0400 + + [Indic] Treat Khmer Register Shifters more like Nuktas + + Except that there may be a ZWNJ before a Register Shifter. + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + .../in-tree/shaper-indic/south-east-asian/script-khmer/misc/misc.txt | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit 11e2a601b19861b05dbb2051d2d078c3cfd75b29 +Author: Behdad Esfahbod +Date: Tue Jul 17 14:02:28 2012 -0400 + + [Indic] Minor + + src/hb-ot-shape-complex-indic-machine.rl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0201e0a4649ad5b607e50bcb9605e7a5b7143812 +Author: Behdad Esfahbod +Date: Tue Jul 17 13:55:10 2012 -0400 + + [Indic] Apply 'cfar' for Khmer + + Mark stuff after a pre-base reordering Ro 'cfar'. Used in Khmer. + This allows distinguishing the following cases with MS Khmer fonts: + + U+1784,U+17D2,U+179A,U+17D2,U+1782 + U+1784,U+17D2,U+1782,U+17D2,U+179A + + src/hb-ot-shape-complex-indic.cc | 16 ++++++++++++++-- + .../south-east-asian/script-khmer/misc/misc.txt | 2 ++ + 2 files changed, 16 insertions(+), 2 deletions(-) + +commit 55f70ebfb95083f515d9b0044a2a65ab11484bb5 +Author: Behdad Esfahbod +Date: Tue Jul 17 12:50:13 2012 -0400 + + [Indic] Position final subjoined consonants (and vowels) after matras + + In Khmer, a final subjoined consonant or independent vowel can occur + after matras. This final subjoined thing should NOT be reordered to + before the matra even though it's subjoined. + + Fixes another 1k of the Khmer failures. Not much left really. + + src/hb-ot-shape-complex-indic-private.hh | 1 + + src/hb-ot-shape-complex-indic.cc | 13 +++++++++++++ + .../south-east-asian/script-khmer/misc/misc.txt | 2 ++ + 3 files changed, 16 insertions(+) + +commit c50ed71e9a3df1844f564de66d54b46a696c1356 +Author: Behdad Esfahbod +Date: Tue Jul 17 11:54:28 2012 -0400 + + [Indic] Recategorize Khmer coeng sign as a separate category OT_Coeng + + Amend the syllable structure to allow a final subscripted consonant + (Coeng+C) and a final subscripted independent vowel (Coeng+V). + Fixes another 2k of Khmer failures. + + src/hb-ot-shape-complex-indic-machine.rl | 7 ++++--- + src/hb-ot-shape-complex-indic.cc | 6 +++++- + .../shaper-indic/south-east-asian/script-khmer/misc/misc.txt | 1 + + 3 files changed, 10 insertions(+), 4 deletions(-) + +commit deb521dee4fdca8c2124cfb39a205e6269d4a70d +Author: Behdad Esfahbod +Date: Tue Jul 17 11:37:32 2012 -0400 + + [Indic] Add a separate Coeng class + + No characters recategorized yet. No semantic change. + + src/hb-ot-shape-complex-indic-machine.rl | 1 + + src/hb-ot-shape-complex-indic-private.hh | 3 ++- + src/hb-ot-shape-complex-indic.cc | 26 ++++++++++++++++---------- + 3 files changed, 19 insertions(+), 11 deletions(-) + +commit 74ccc6a1322f8c48c5f2a05f04821783c4b87a14 +Author: Behdad Esfahbod +Date: Tue Jul 17 11:16:19 2012 -0400 + + [Indic] Move Halant with after-base consonants + + Normally, we attach the Halant to the previous character and move it + with it. For after-base consonants however, the Halant "belongs" to the + consonant after, so attach it so. + + This fixes Bengali sequences involving post-base consonant Ya, which + should ligate with the Halant to form Ya Phala, but previously a + reordered matras was blocking the ligation. + + src/hb-ot-shape-complex-indic.cc | 11 +++++++++++ + .../in-tree/shaper-indic/indic/script-bengali/misc/misc.txt | 1 + + 2 files changed, 12 insertions(+) + +commit d5c4edcdd6df32f2f23aca44f14838b4baab4d7a +Author: Behdad Esfahbod +Date: Tue Jul 17 10:40:59 2012 -0400 + + [Indic] Apply presentation-forms features all at once + + Seems like this is what Uniscribe is doing, and does not break any fonts + we tested (with Devanagari, Malayalam, Khmer, and Bengali), while fixing + some Ra Phala sequences for Bengali with Vrinda. Fixes another 2% of + Bengali failures (a couple more to go). + + src/hb-ot-shape-complex-indic.cc | 6 +++--- + .../texts/in-tree/shaper-indic/indic/script-bengali/misc/misc.txt | 1 + + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit 559f70667891a3ceeffb36f40de38a4f85868945 +Author: Behdad Esfahbod +Date: Mon Jul 16 22:43:17 2012 -0400 + + Fix MarkAttachmentType matching + + Fixes issue reported by Khaled Hosny with his Hussaini Nastaleeq font + and sequences like those added in the previous commit. + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6de103547e4a7fb34c833861713ea373cd912261 +Author: Behdad Esfahbod +Date: Mon Jul 16 22:46:06 2012 -0400 + + [test/arabic] Add Arabic tests for mark skipping + + Expose a bug with Khaled's Hussaini Nastaleeq font. + + .../shaper-arabic/script-arabic/misc/diacritics/MANIFEST | 1 + + .../script-arabic/misc/diacritics/mark-skipping.txt | 10 ++++++++++ + 2 files changed, 11 insertions(+) + +commit ad4494759fa8bfd2497800c24fa414075ed1aa61 +Author: Behdad Esfahbod +Date: Mon Jul 16 22:40:21 2012 -0400 + + Minor + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit af92b4cc90e4184d5bdd8037c551ed482700114f +Author: Behdad Esfahbod +Date: Mon Jul 16 20:31:24 2012 -0400 + + [Indic] Disable 'kern' in Uniscribe bug compatibility mode + + Uniscribe does not apply 'kern' in the Indic module. Some of the Khmer + fonts they ship have small adjustments in the 'kern' table. Disable + 'kern' in the Indic module under Uniscribe bug compatibility mode. + + Fixes some 10% of the Khmer failures. Remains under 3% (excluding + dotted-circle ones). + + src/hb-ot-shape-complex-indic.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit d96838ef951ce6170eb2dc576ebcba2262cf7008 +Author: Behdad Esfahbod +Date: Mon Jul 16 20:26:57 2012 -0400 + + Allow complex shapers overriding common features + + In a new callback... Currently unused by all complex shapers. + + src/hb-ot-shape-complex-arabic.cc | 6 ++++++ + src/hb-ot-shape-complex-indic.cc | 6 ++++++ + src/hb-ot-shape-complex-misc.cc | 18 ++++++++++++++++++ + src/hb-ot-shape-complex-private.hh | 30 ++++++++++++++++++++++++++++++ + src/hb-ot-shape.cc | 2 ++ + 5 files changed, 62 insertions(+) + +commit df50b8474094f0563ccfdae12c4425a51b72add6 +Author: Behdad Esfahbod +Date: Mon Jul 16 19:56:29 2012 -0400 + + [Indic] Categorize other Khmer marks + + Mark them the same as the Register Shifters for now. Need to rename + that category to something more sensible after all is settled. + + Fixes another percent of Khmer failures. Down to under 3%! + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 8e7b5882fb4c1921c9d030d354a9b998115cdb8c +Author: Behdad Esfahbod +Date: Mon Jul 16 17:04:46 2012 -0400 + + [Indic] Recognize pre-base reordering Ra anywhere in the syllable + + We were doing that only immediately after base. + + Fixes another percent in the Khmer failures. About three more to go... + + src/hb-ot-shape-complex-indic.cc | 84 ++++++++++++++++++++++------------------ + 1 file changed, 46 insertions(+), 38 deletions(-) + +commit 7d09c98a1fff97127e48eae48d380dc9fcff288e +Author: Behdad Esfahbod +Date: Mon Jul 16 16:45:22 2012 -0400 + + [Indic] Recognizer Register Shifter marks + + Fixes another 6% of the Khmer failures. + + src/hb-ot-shape-complex-indic-machine.rl | 3 ++- + src/hb-ot-shape-complex-indic-private.hh | 5 +++-- + src/hb-ot-shape-complex-indic.cc | 2 ++ + 3 files changed, 7 insertions(+), 3 deletions(-) + +commit 60da763dfac96a7931d6e6bdef8b9973bd5209ab +Author: Behdad Esfahbod +Date: Mon Jul 16 16:13:32 2012 -0400 + + [GSUB/GDEF] Guess glyph classes after substitution only if no GDEF + + Brings down Khmer failures with Daun Penh font from 36% to 20%. + + src/hb-ot-layout-gsubgpos-private.hh | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) + +commit fcdc5f1c8849a7f38d9f34f64d60c6d95d7501f7 +Author: Behdad Esfahbod +Date: Mon Jul 16 15:52:54 2012 -0400 + + [Indic] Categorize Khmer Ro + + Khmer failures down from 58% to 36%. + + src/hb-ot-shape-complex-indic-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 78818124b17691ec2c647142fdb9ae743aa03dee +Author: Behdad Esfahbod +Date: Mon Jul 16 15:49:08 2012 -0400 + + [Indic] Reoder pre-base reordering Ra + + Brings down Malayalam failures from 14% down to 3%. + + src/hb-ot-shape-complex-indic.cc | 42 +++++++++++++++++++++++++++------------- + 1 file changed, 29 insertions(+), 13 deletions(-) + +commit 1a1dbe9a2787f226f3e43063da8eb6633438b0a0 +Author: Behdad Esfahbod +Date: Mon Jul 16 15:40:33 2012 -0400 + + [Indic] Rename + + src/hb-ot-shape-complex-indic.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 46e645ec4b59f0a278347be11f40c7df700d5bb6 +Author: Behdad Esfahbod +Date: Mon Jul 16 15:30:05 2012 -0400 + + [Indic] Start implementing pre-base reordering + + src/hb-ot-shape-complex-indic.cc | 33 ++++++++++++++++++--------------- + 1 file changed, 18 insertions(+), 15 deletions(-) + +commit 921ce5b17daf06af8e17989a3e335b9f5df20483 +Author: Behdad Esfahbod +Date: Mon Jul 16 15:26:56 2012 -0400 + + [Indic] Rename + + No semantic change. + + src/hb-ot-shape-complex-indic.cc | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit b504e060f008e95b1ba36c06600c9fea4f5d4808 +Author: Behdad Esfahbod +Date: Mon Jul 16 15:21:12 2012 -0400 + + [Indic] Implement After-Main Reph positioning + + Almost... + + src/hb-ot-shape-complex-indic.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 17d7de91d76406d3e92db37d9eef2fc615f06e68 +Author: Behdad Esfahbod +Date: Mon Jul 16 15:20:15 2012 -0400 + + [Indic] Apply 'pref' to pre-base reodering Ra + + No reordering yet. + + src/hb-ot-shape-complex-indic.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 362d3db8d3527d0fef260a17d2466e92a4a25425 +Author: Behdad Esfahbod +Date: Mon Jul 16 15:15:28 2012 -0400 + + [Indic] Minor + + Should not be any semantic change. In preparation for implementing + pre-base reordering Ra. + + src/hb-ot-shape-complex-indic.cc | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +commit 70fe77bb9a25922bd34f206826d8731d901fb451 +Author: Behdad Esfahbod +Date: Mon Jul 16 14:52:18 2012 -0400 + + Minor + + src/hb-ot-shape-complex-indic.cc | 44 ++++++++++++++++++++-------------------- + 1 file changed, 22 insertions(+), 22 deletions(-) + +commit 2f903215c5da2330a37abe489a3f45f7c3fd5a09 +Author: Behdad Esfahbod +Date: Mon Jul 16 13:54:43 2012 -0400 + + Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a3e04bee2c2fa648759a87e460db6b4f1b685586 +Author: Behdad Esfahbod +Date: Mon Jul 16 13:47:19 2012 -0400 + + [Indic] Reorder virama only for old Indic spec + + src/hb-ot-shape-complex-indic.cc | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit 0de771b72da6b342b015e3556190821547a4011d +Author: Behdad Esfahbod +Date: Mon Jul 16 13:39:36 2012 -0400 + + [Indic] Categorize Khmer consonants + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit d487fff266258eb1af056e9704cfb09d04251ddc +Author: Behdad Esfahbod +Date: Mon Jul 16 13:25:17 2012 -0400 + + Split matras without a Unicode decomposition + + This is a hack for now, to get us going with Khmer. This will be + refactored properly later to move the complex logic into complex + shapers. + + src/hb-unicode.cc | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +commit 8aa801a6fd1a737fa20b851edf7528bdd6635b8b +Author: Behdad Esfahbod +Date: Mon Jul 16 13:24:26 2012 -0400 + + [Indic] Adjust position for split matras + + We are going to split matras without a Unicode decompositions in a way + that the second half takes the codepoint of the whole matra. So, + position them where the second half is supposed to end up. + + src/hb-ot-shape-complex-indic-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 1feb8345a5fd92297eb6796e6dce633bafa0c76e +Author: Behdad Esfahbod +Date: Mon Jul 16 13:23:40 2012 -0400 + + [GSUB] Allow 1-to-1 ligature substitutions! + + Apparently Uniscribe allows these, and they are used in some Khmer fonts + shipped with Windows, namely, Daun Penh. + + src/hb-ot-layout-gsub-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 29f106d7fba25e1464debd3a4831a7380d75c4c9 +Author: Behdad Esfahbod +Date: Mon Jul 16 12:05:35 2012 -0400 + + [Indic] Apply Above Forms + + src/hb-ot-shape-complex-indic.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit fa2bd9fb63d83b657373764d4b657084d8327fc9 +Author: Behdad Esfahbod +Date: Sat Jul 14 12:15:54 2012 -0400 + + Further simplify atomic ops on Visual Studio + + src/hb-atomic-private.hh | 5 ----- + 1 file changed, 5 deletions(-) + +commit 0a492357016bc9a614d2a726f2006c10af68ca58 +Author: Behdad Esfahbod +Date: Fri Jul 13 13:20:49 2012 -0400 + + Minor + + src/hb-warning.cc | 29 +++++------------------------ + 1 file changed, 5 insertions(+), 24 deletions(-) + +commit 11c4ad439ef2b39a840f397a693b1ba643f52c21 +Author: Behdad Esfahbod +Date: Fri Jul 13 11:29:31 2012 -0400 + + Add -Wcast-align + + configure.ac | 3 +++ + src/Makefile.am | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit a98d0ab18624501ee60551304f2715361ac643da +Author: Behdad Esfahbod +Date: Fri Jul 13 10:19:10 2012 -0400 + + Make sure HB_BEGIN_DECLS / HB_END_DECLS is only used in public headers + + So we can use them to switch default visibility to internal if desired, + and use these to make only declared symbols public. + + src/check-c-linkage-decls.sh | 10 +++++++++- + src/hb-fallback-shape-private.hh | 6 ------ + src/hb-ot-shape-complex-indic-machine.rl | 4 ---- + 3 files changed, 9 insertions(+), 11 deletions(-) + +commit 5c5bc96216c9ad58243eb3ed27b253e237f08ebe +Author: Behdad Esfahbod +Date: Fri Jul 13 10:15:37 2012 -0400 + + Allow overriding HB_BEGIN_DECLS / HB_END_DECLS + + src/hb-common.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit ec5f5f0f8a1d5b3ff98452175bb4450a59897620 +Author: Behdad Esfahbod +Date: Fri Jul 13 10:00:42 2012 -0400 + + Don't export inline methods + + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +commit 50a4e78b530563917eb606ff3b96dcc9eed5b3ee +Author: Behdad Esfahbod +Date: Fri Jul 13 09:48:39 2012 -0400 + + Check for exported weak symbols + + Ouch, all our C++ inline functions are being exported (weakly) already. + Fix coming. + + src/check-internal-symbols.sh | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit b5aeb95afeb13a66177caada9f5d5ad4cddbd35f +Author: Behdad Esfahbod +Date: Fri Jul 13 09:45:54 2012 -0400 + + Make hb_in_range() static + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 271c8f89075607c689938b4f5e60323d9a1acd70 +Author: Behdad Esfahbod +Date: Fri Jul 13 09:32:30 2012 -0400 + + Minor + + src/hb-ft.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 391f1ff5d894b60bfe0f606be436ffe7e43f7455 +Author: Behdad Esfahbod +Date: Fri Jul 13 09:04:07 2012 -0400 + + Fix _InterlockedCompareExchangePointer on x86 + + src/hb-atomic-private.hh | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 2023e2b54d91924dddfd228ffdbb46021135b068 +Author: Behdad Esfahbod +Date: Wed Jul 11 19:00:30 2012 -0400 + + [ft] Disable ppem setting + + The calculations were wrong. + + FreeType makes it really hard to set size and ppem independently. + For now, disable it. Need to come up with a fix later. + + src/hb-ft.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit cdf7444505a7ae49d20f9ba6776dea92c1fde2a6 +Author: Behdad Esfahbod +Date: Wed Jul 11 18:52:39 2012 -0400 + + [ft] Use unfitted kerning if x_ppem is zero + + src/hb-ft.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 6d08c7f1b3601095f9a12630045331dd0fe75380 +Author: Behdad Esfahbod +Date: Wed Jul 11 18:01:27 2012 -0400 + + Revert "Towards templatizing common Lookup types" + + This reverts commit 727135f3a9938c1ebd5b9f5015a46c7ccc8573c5. + + This is work-in-progress. Didn't mean to push it out just yet. + + src/hb-ot-layout-gpos-table.hh | 16 ++++++---------- + src/hb-ot-layout-gsub-table.hh | 24 ++++++++++-------------- + src/hb-ot-layout-gsubgpos-private.hh | 33 ++------------------------------- + 3 files changed, 18 insertions(+), 55 deletions(-) + +commit 552bf3a9f9651311084b7979805dbdc18c0335ca +Author: Behdad Esfahbod +Date: Wed Jul 11 16:44:51 2012 -0400 + + Bump WINNT version requested from 500 to 600 + + Since we use the OpenType versions of Uniscribe functions, we are + relying on that version of the WINNT API. Otherwise, usp10.h will hide + those symbols. + + src/hb-uniscribe.cc | 2 +- + src/hb-uniscribe.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 9a5b421a64db1bb23d5c6ebbc3bf3f3a5513dc36 +Author: Behdad Esfahbod +Date: Wed Jul 11 16:35:04 2012 -0400 + + Fix build with no Unicode funcs implementations provided + + src/hb-unicode-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 6efe1eca660135096f05987ac0ef9b635de6cdfd +Author: Behdad Esfahbod +Date: Wed Jul 11 15:30:08 2012 -0400 + + Update git.mk to upstream + + git.mk | 58 ++++++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 38 insertions(+), 20 deletions(-) + +commit 727135f3a9938c1ebd5b9f5015a46c7ccc8573c5 +Author: Behdad Esfahbod +Date: Tue Jul 3 22:15:35 2012 -0400 + + Towards templatizing common Lookup types + + src/hb-ot-layout-gpos-table.hh | 16 ++++++++++------ + src/hb-ot-layout-gsub-table.hh | 24 ++++++++++++++---------- + src/hb-ot-layout-gsubgpos-private.hh | 33 +++++++++++++++++++++++++++++++-- + 3 files changed, 55 insertions(+), 18 deletions(-) + +commit 1167c7bfc9e61f145e11da4881968293a4d3c0a9 +Author: Behdad Esfahbod +Date: Tue Jul 3 11:38:46 2012 -0400 + + Minor + + test/shaping/texts/in-tree/shaper-thai/MANIFEST | 2 +- + test/shaping/texts/in-tree/shaper-thai/misc/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-thai/script-thai/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-thai/script-thai/misc/MANIFEST | 1 + + .../shaper-thai/{misc/misc.txt => script-thai/misc/sara-am.txt} | 6 ++---- + 5 files changed, 5 insertions(+), 6 deletions(-) + +commit aa116582e69d18777448e7993078e5d6335ddfed +Author: Behdad Esfahbod +Date: Fri Jun 29 10:50:12 2012 -0400 + + Minor + + .../texts/in-tree/shaper-indic/indic/script-malayalam/misc/misc.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 1f13c7185f02ea18d4fadd2ea8ad444bea863c39 +Author: Behdad Esfahbod +Date: Wed Jun 27 10:07:27 2012 -0400 + + Add TODO item + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 12f5c0a222a2f0aebe63c0d367937a0ff985474a +Author: Behdad Esfahbod +Date: Tue Jun 26 11:16:13 2012 -0400 + + Fix check for Intel atomic ops + + configure.ac | 9 +++++---- + src/hb-atomic-private.hh | 2 +- + 2 files changed, 6 insertions(+), 5 deletions(-) + +commit 6932a41fb61ffc2901c260587b1e98ed9c2a7ea1 +Author: Behdad Esfahbod +Date: Tue Jun 26 10:46:31 2012 -0400 + + Use octal-escaped UTF-8 characters instead of plain text + + https://bugs.freedesktop.org/show_bug.cgi?id=50970 + + src/hb-private.hh | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +commit 8c0ea7bcb4409aaf8c96ad641f2db30003228ad0 +Author: Behdad Esfahbod +Date: Sun Jun 24 13:20:56 2012 -0400 + + Disable introspection again + + Until I figure out the build issues. Sigh... + + configure.ac | 2 +- + src/Makefile.am | 42 +++++++++++++++++++++--------------------- + 2 files changed, 22 insertions(+), 22 deletions(-) + +commit 8c5f5e6f5ec2b6a219fbdfc955f6299325a0adde +Author: Behdad Esfahbod +Date: Sun Jun 17 14:58:59 2012 -0400 + + Minor + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 49f8e0cd9a5493ae26857c43bac0711cdf47c80d +Author: Behdad Esfahbod +Date: Sat Jun 16 15:40:03 2012 -0400 + + GStaticMutex is deprecated + + src/hb-mutex-private.hh | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 5e113a4b7921ced6af2d53460a7a2f1d0185c02a +Author: Behdad Esfahbod +Date: Sat Jun 16 15:26:13 2012 -0400 + + g_thread_init() is deprecated + + test/api/hb-test.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit 1bc1cb3603167f5da309336f7018c8b0608ac104 +Author: Behdad Esfahbod +Date: Sat Jun 16 15:21:55 2012 -0400 + + Make source more digestable for gobject-introspection + + src/hb-blob.cc | 2 +- + src/hb-blob.h | 2 +- + src/hb-buffer-private.hh | 4 ++-- + src/hb-buffer.h | 6 +++--- + src/hb-common.cc | 2 +- + src/hb-common.h | 4 ++-- + src/hb-font-private.hh | 6 +++--- + src/hb-font.cc | 2 +- + src/hb-font.h | 8 ++++---- + src/hb-set-private.hh | 2 +- + src/hb-set.h | 2 +- + src/hb-shape.h | 2 +- + src/hb-unicode-private.hh | 2 +- + src/hb-unicode.h | 2 +- + 14 files changed, 23 insertions(+), 23 deletions(-) + +commit 84d781e54cc75c81a06ba43fd7b1a74b8c7d9591 +Author: Behdad Esfahbod +Date: Sat Jun 16 15:21:41 2012 -0400 + + Flesh out gobject-introspection stuff a bit + + configure.ac | 1 + + src/Makefile.am | 23 +++++++++++++++++++++-- + 2 files changed, 22 insertions(+), 2 deletions(-) + +commit 49ee12ccd00870d4976339dc546c74eaf08a8fc0 +Author: Behdad Esfahbod +Date: Sat Jun 16 14:53:51 2012 -0400 + + Add TODO item + + TODO | 1 + + 1 file changed, 1 insertion(+) + +commit d3c8115d1ad09404b8970b98e6b5ab74510a35f6 +Author: Behdad Esfahbod +Date: Tue Jun 12 09:52:57 2012 -0400 + + Minor + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2cf301968cb8c1150cead0ab909457cdd3ee2d01 +Author: Behdad Esfahbod +Date: Sat Jun 9 14:58:01 2012 -0400 + + Add hb_object_lock/unlock() + + src/hb-object-private.hh | 32 ++++++++++++++++++++++++++------ + 1 file changed, 26 insertions(+), 6 deletions(-) + +commit 6a5661f1e69c937083e8d976cb12429b99180d54 +Author: Behdad Esfahbod +Date: Sat Jun 9 03:26:16 2012 -0400 + + Ugh + + util/shape-consumer.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit f211d5c291b4c947cfd732e873627567173057e4 +Author: Behdad Esfahbod +Date: Sat Jun 9 03:11:22 2012 -0400 + + More Oops! Fix fast-path with sub-type==0 + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + util/shape-consumer.hh | 2 ++ + 3 files changed, 4 insertions(+), 2 deletions(-) + +commit b1de6aa1f33b228afe231c8209aef90a5fa1ee5d +Author: Behdad Esfahbod +Date: Sat Jun 9 03:07:59 2012 -0400 + + Oops! + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b12e2549cbcd4f1ef46e66c75533686ee560f59b +Author: Behdad Esfahbod +Date: Sat Jun 9 03:05:20 2012 -0400 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit faf0f20253d954cc4cfa4c967ece7573a5ddae3b +Author: Behdad Esfahbod +Date: Sat Jun 9 03:02:36 2012 -0400 + + Add sanitize() logic for fast-paths + + src/hb-ot-layout-gpos-table.hh | 15 ++++++++++++--- + src/hb-ot-layout-gsub-table.hh | 20 ++++++++++++++------ + 2 files changed, 26 insertions(+), 9 deletions(-) + +commit 4e766ff28d1fb831ded20666799787478129c07c +Author: Behdad Esfahbod +Date: Sat Jun 9 02:53:57 2012 -0400 + + Add fast-path for GPOS too + + Shaves another 3% for DejaVu Sans long Latin strings. + + src/hb-ot-layout-gpos-table.hh | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +commit 993c51915f503f74ee00eee646b67bf2e3f73596 +Author: Behdad Esfahbod +Date: Sat Jun 9 02:48:16 2012 -0400 + + Add fast-path to GSUB to check coverage + + Shaves a good 10% off DejaVu Sans with simple Latin text for me. + Now, DejaVu is very ChainContext-intensive, but it's also a very + popular font! + + src/hb-ot-layout-gsub-table.hh | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +commit f19e0b0099ec73b8fedccacff4902403f5eabc42 +Author: Behdad Esfahbod +Date: Sat Jun 9 02:26:57 2012 -0400 + + Match input before backtrack + + Makes more sense, optimization-wise. + + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 67bb9e8cea49a44be6996515e1c7d8cdc95a77e6 +Author: Behdad Esfahbod +Date: Sat Jun 9 02:02:46 2012 -0400 + + Add set add_coverage() to Coverage() + + src/hb-ot-layout-common-private.hh | 24 ++++++++++++++++++++++++ + src/hb-set-private.hh | 5 +++++ + 2 files changed, 29 insertions(+) + +commit 4952f0aa5b2f4368d9e3418252e0a1b9294cd5ee +Author: Behdad Esfahbod +Date: Sat Jun 9 01:39:11 2012 -0400 + + Minor + + src/hb-ot-layout-gsub-table.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit ad6a6f22401d6256e34521d0f52e91348c5ed4c9 +Author: Behdad Esfahbod +Date: Sat Jun 9 01:21:02 2012 -0400 + + Minor + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 46617a42133fbab151de4111a74dcbdc4e769c74 +Author: Behdad Esfahbod +Date: Sat Jun 9 01:18:58 2012 -0400 + + Fix cache implementation + + src/hb-cache-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit ce47613889aa3ff9b0067d3e51ba63cfdb139adb +Author: Behdad Esfahbod +Date: Sat Jun 9 01:10:26 2012 -0400 + + Micro-optimize + + I know... + + src/hb-ot-layout-gsubgpos-private.hh | 3 ++- + src/hb-ot-layout.cc | 46 ++++++++++++++++++++++-------------- + 2 files changed, 30 insertions(+), 19 deletions(-) + +commit 70416de298b811ab6be53a1c67f0d2531d99cd46 +Author: Behdad Esfahbod +Date: Sat Jun 9 00:56:41 2012 -0400 + + Minor + + src/hb-open-type-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit 99159e52a3c9d5ae6c0fbdec64e7ed684fa70b61 +Author: Behdad Esfahbod +Date: Sat Jun 9 00:50:40 2012 -0400 + + Use linear search for small counts + + I see about 8% speedup with long strings with DejaVu Sans. + + src/hb-open-type-private.hh | 19 ++++++++++++++----- + 1 file changed, 14 insertions(+), 5 deletions(-) + +commit caf0412690542e58e23246dccc4b2fb83bd652ec +Author: Behdad Esfahbod +Date: Sat Jun 9 00:26:32 2012 -0400 + + Minor + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0f8fea71a66b1e01ee4398967db464393f478d42 +Author: Behdad Esfahbod +Date: Sat Jun 9 00:24:38 2012 -0400 + + Minor. Hide _hb_ot_layout_get_glyph_property() + + src/hb-ot-layout-private.hh | 4 ---- + src/hb-ot-layout.cc | 2 +- + 2 files changed, 1 insertion(+), 5 deletions(-) + +commit 44b8ee0c90d7b1dd91e5848114141e3186534a0f +Author: Behdad Esfahbod +Date: Sat Jun 9 00:23:24 2012 -0400 + + Minor + + src/hb-ot-layout-gpos-table.hh | 3 ++- + src/hb-ot-layout.cc | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 7b84c536c10ab90ed96a033d88e9ad232d46c5b8 +Author: Behdad Esfahbod +Date: Fri Jun 8 22:04:23 2012 -0400 + + In MarkBase attachment, only attach to first of a MultipleSubst sequence + + This is apparently what Uniscribe does. Test case is: + + SEEN FATHA TEH ALEF + + with Arabic Typesetting. Originally reported by Khaled Hosny. + + src/hb-ot-layout-gpos-table.hh | 7 ++++++- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++++++ + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit ec57e0c5655ced5109c4638bf802772d336448fd +Author: Behdad Esfahbod +Date: Fri Jun 8 21:47:23 2012 -0400 + + Set lig_comp for MultipleSubst components + + To be used for correct mark attachment to first component of a + MultipleSubst output. That's what Uniscribe does. + + src/hb-ot-layout-gsub-table.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit e085fcf7ca302eb7802a032197c022819e7e7074 +Author: Behdad Esfahbod +Date: Fri Jun 8 21:45:00 2012 -0400 + + Remove unused buffer->replace_glyphs_be16 + + src/hb-buffer-private.hh | 3 --- + src/hb-buffer.cc | 23 ----------------------- + src/hb-ot-layout-gsubgpos-private.hh | 8 -------- + 3 files changed, 34 deletions(-) + +commit 3ec77d6ae0510dc2c0ec64382c4948bc6e109844 +Author: Behdad Esfahbod +Date: Fri Jun 8 21:44:06 2012 -0400 + + Don't use replace_glyphs_be for MultipleSubst + + src/hb-ot-layout-gsub-table.hh | 5 ++++- + src/hb-ot-layout-gsubgpos-private.hh | 7 ++++++- + 2 files changed, 10 insertions(+), 2 deletions(-) + +commit 4b7192125ffd295091d6b3a0bdfca7011947c2ca +Author: Behdad Esfahbod +Date: Fri Jun 8 21:41:46 2012 -0400 + + Minor + + src/hb-ot-layout-gsub-table.hh | 3 ++- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +commit 4508789f4b5e0ece5620d35598aeeb7ecbe3e3aa +Author: Behdad Esfahbod +Date: Fri Jun 8 21:32:43 2012 -0400 + + Add test for static initializers and other C++ stuff + + src/Makefile.am | 3 ++- + src/check-static-inits.sh | 33 +++++++++++++++++++++++++++++++++ + 2 files changed, 35 insertions(+), 1 deletion(-) + +commit 56bd259b9ac22dd98913c8ca2e2cf7b30b632373 +Author: Behdad Esfahbod +Date: Fri Jun 8 21:29:18 2012 -0400 + + Minor + + src/check-internal-symbols.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4538b47bf08e73e7f5cce6337df5fe154233c168 +Author: Behdad Esfahbod +Date: Fri Jun 8 21:01:45 2012 -0400 + + Remove done TODO items + + TODO | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +commit bc8357ea7b4c0d7c715aae353176434fb9460205 +Author: Behdad Esfahbod +Date: Fri Jun 8 21:01:20 2012 -0400 + + Merge clusters during normalization + + src/hb-ot-shape-normalize.cc | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit fe3dabc08df7501010564f8844bd4d11771cc6a4 +Author: Behdad Esfahbod +Date: Fri Jun 8 20:56:05 2012 -0400 + + Minor + + src/hb-buffer.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e88e14421a33ca5bdfd76bc0b2f801fcb6e78911 +Author: Behdad Esfahbod +Date: Fri Jun 8 20:55:21 2012 -0400 + + Use merge_clusters instead of open-coding + + src/hb-buffer.cc | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +commit 330a2af3ff0e12c01b3b451357b8bdc83b2e9b47 +Author: Behdad Esfahbod +Date: Fri Jun 8 20:40:02 2012 -0400 + + Use merge_clusters when forming Unicode clusters + + src/hb-ot-shape.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit bd300df9adf955c1e69b3783c1c061876940fb8b +Author: Behdad Esfahbod +Date: Fri Jun 8 20:35:18 2012 -0400 + + Minor + + src/hb-object-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e51d2b6ed1c794ac28c5610bfd01dbc9fb383633 +Author: Behdad Esfahbod +Date: Fri Jun 8 20:33:27 2012 -0400 + + Extend into main buffer if extension hit end of out-buffer merging clusters + + src/hb-buffer.cc | 5 +++++ + src/hb-ot-shape-complex-misc.cc | 9 --------- + 2 files changed, 5 insertions(+), 9 deletions(-) + +commit 5ced012d9f58c51d557a835593c3277e35fe3b35 +Author: Behdad Esfahbod +Date: Fri Jun 8 20:31:32 2012 -0400 + + Extend end when merging clusters in out-buffer + + src/hb-buffer.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 72c0a1878313e7232d554bc226f4c6dc01418a95 +Author: Behdad Esfahbod +Date: Fri Jun 8 20:30:03 2012 -0400 + + Extend clusters backward in out-buffer + + src/hb-buffer.cc | 8 ++++++++ + src/hb-ot-shape-complex-misc.cc | 2 -- + 2 files changed, 8 insertions(+), 2 deletions(-) + +commit cd5891493df06fdb92e1ae526d29dee8df250235 +Author: Behdad Esfahbod +Date: Fri Jun 8 20:27:53 2012 -0400 + + Extend clusters backwards, into the out-buffer too + + src/hb-buffer.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 77471e037122548bfc08cacea6fbb472831c34f3 +Author: Behdad Esfahbod +Date: Fri Jun 8 20:21:02 2012 -0400 + + Clear output buffer before calling GSUB pause functions + + src/hb-ot-map.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit cafa6f372721fd6b0a7c0da68b9421d3e94931bc +Author: Behdad Esfahbod +Date: Fri Jun 8 20:17:10 2012 -0400 + + When merging clusters, extend the end + + src/hb-buffer.cc | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +commit 28ce5fa454b54f728044ee12a9dbe7d016783d4a +Author: Behdad Esfahbod +Date: Fri Jun 8 20:13:56 2012 -0400 + + Merge clusters when ligating + + src/hb-ot-layout-gsub-table.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 2bb1761ccb7d300744ced6427165f4ea75ddf96c +Author: Behdad Esfahbod +Date: Fri Jun 8 19:29:44 2012 -0400 + + Minor, use next_glyph() + + src/hb-ot-layout-gsub-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5f68f8675e5ccaee91f5a90d86bc3b022b9a54e4 +Author: Behdad Esfahbod +Date: Fri Jun 8 19:23:43 2012 -0400 + + Minor + + src/hb-ot-shape.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 872969126756456a69bf958f3df6e56a26e57b0a +Author: Behdad Esfahbod +Date: Fri Jun 8 14:18:30 2012 -0400 + + Increase Uniscribe MAX_ITEMS + + src/hb-uniscribe.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dbffa4c83d29c689ee4cd8a1c53e84521028c711 +Author: Behdad Esfahbod +Date: Fri Jun 8 14:08:32 2012 -0400 + + Fix Uniscribe charset matching + + Previously was failing to match fonts that didn't support CHARSET_ANSI. + + There still remains a problem with the Uniscribe backend, in that if a + font with the same family name is installed, and is newer, the native + one is preferred over the font we provide. Fixing it requires rewriting + the name table with a unique family name... + + src/hb-uniscribe.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 82e8bd8628aeb37835fb019a71b6bdac87824b97 +Author: Behdad Esfahbod +Date: Fri Jun 8 11:48:29 2012 -0400 + + Remove unused code + + src/hb-uniscribe.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 6da9dbff21b47fb10794b8d6cb747393c9eab7dd +Author: Behdad Esfahbod +Date: Fri Jun 8 10:53:35 2012 -0400 + + Remove zero-width chars in the fallback shaper too + + src/hb-fallback-shape.cc | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +commit 68b76121f83fc9b87dc84f03e8bef38d4332734d +Author: Behdad Esfahbod +Date: Fri Jun 8 10:43:49 2012 -0400 + + Fix regressions introduced by sed. Ouch! + + Introduced in 99c2695759a6af855d565f4994bbdf220570bb48. + Broken mark-mark and mark-ligature stuff. + + src/hb-ot-layout-gpos-table.hh | 6 +++--- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 0dd86f9f6849d82d60a99e66b6928795cfb2a3c7 +Author: Behdad Esfahbod +Date: Fri Jun 8 10:23:03 2012 -0400 + + Whitespace + + src/hb-uniscribe.cc | 144 ++++++++++++++++++++++++++-------------------------- + 1 file changed, 72 insertions(+), 72 deletions(-) + +commit 8e7beba7c3b3dea3cb3b7e280c5aab4f13b92d31 +Author: Behdad Esfahbod +Date: Fri Jun 8 10:22:06 2012 -0400 + + Fix Uniscribe clusters with direction-overriden Arabic + + src/hb-uniscribe.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b069c3c31bfbbf160eb897c7474be9ea90ed4fc1 +Author: Behdad Esfahbod +Date: Fri Jun 8 10:10:29 2012 -0400 + + Really fix override-direction in Uniscribe + + src/hb-uniscribe.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit fcd6f5326166e993b8f5222efbaffe916da98f0a +Author: Behdad Esfahbod +Date: Fri Jun 8 09:59:43 2012 -0400 + + Unbreak Uniscribe + + Oops. hb_tag_t and OPENTYPE_TAG have different endianness. Perhaps + something to add API for in hb-uniscribe.h + + src/hb-private.hh | 12 +++++++++++- + src/hb-uniscribe.cc | 8 ++++---- + 2 files changed, 15 insertions(+), 5 deletions(-) + +commit 29eac8f591fdb86f1c4fdc0a6ab63910ff286b84 +Author: Behdad Esfahbod +Date: Fri Jun 8 09:26:17 2012 -0400 + + Override direction in Uniscribe backend + + Matches OT backend now. + + src/hb-uniscribe.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1c1233e57686d77d89fe3ac1dc53de9ee60798c1 +Author: Behdad Esfahbod +Date: Fri Jun 8 09:20:53 2012 -0400 + + Make Uniscribe backend respect selected script + + src/hb-uniscribe.cc | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit 0bb0f5d41976ae27c5c7a51cbb82144b48315a4b +Author: Behdad Esfahbod +Date: Thu Jun 7 17:42:48 2012 -0400 + + Add note re _NullPool + + src/hb-open-type-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 2a3d911fe0ff5d6442659d3381d5b08c30ee2896 +Author: Behdad Esfahbod +Date: Thu Jun 7 17:31:46 2012 -0400 + + Fix alignment-requirement missmatch + + Detected by clang and lots of cmdline options. + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 5 +++-- + src/hb-ot-layout-gsub-table.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 4 files changed, 7 insertions(+), 6 deletions(-) + +commit 6095de1635441af16340c7b2c5a6b4c531ec242f +Author: Behdad Esfahbod +Date: Thu Jun 7 15:48:18 2012 -0400 + + Fix clang warning with NO_MT path + + src/hb-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a18280a8ce9128fc9d75f8a367ae8ce0886a9599 +Author: Behdad Esfahbod +Date: Thu Jun 7 15:44:12 2012 -0400 + + Fix warnings produced by clang analyzer + + src/hb-icu.cc | 6 ++++-- + test/api/test-blob.c | 2 +- + test/api/test-buffer.c | 4 ++-- + util/helper-cairo.cc | 2 +- + 4 files changed, 8 insertions(+), 6 deletions(-) + +commit 7ec83051c05777c0e6e2eea6ef6c71effede9527 +Author: Behdad Esfahbod +Date: Thu Jun 7 13:32:57 2012 -0400 + + Fix warnings + + util/ansi-print.cc | 30 +++++++++++++----------------- + 1 file changed, 13 insertions(+), 17 deletions(-) + +commit 73cb02de2dd28b09d4aa76230132248215cfe83d +Author: Behdad Esfahbod +Date: Wed Jun 6 11:29:25 2012 -0400 + + Minor + + src/hb-private.hh | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit 79e2b4791fe95ede9a1e6b1c71ccc6e36c4fc0e5 +Author: Behdad Esfahbod +Date: Wed Jun 6 11:27:17 2012 -0400 + + Fix ASSERT_POD on clang + + As reported by bashi. Not tested. + + src/hb-private.hh | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 4282d2f3771d6510c27b62e54cc1254d6f2389b3 +Author: Behdad Esfahbod +Date: Wed Jun 6 03:42:36 2012 -0400 + + Enabled ICU again + + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +commit 6220e5fc0dad728e67a92e838d3ac275d032f2c7 +Author: Behdad Esfahbod +Date: Wed Jun 6 03:30:09 2012 -0400 + + Add ASSERT_POD for most objects + + src/hb-blob.cc | 1 + + src/hb-buffer-private.hh | 2 ++ + src/hb-font-private.hh | 3 +++ + src/hb-object-private.hh | 2 ++ + src/hb-private.hh | 2 +- + src/hb-set-private.hh | 4 +++- + src/hb-unicode-private.hh | 1 + + 7 files changed, 13 insertions(+), 2 deletions(-) + +commit a00a63b5ef503fafa87e26b517732b2214e01719 +Author: Behdad Esfahbod +Date: Wed Jun 6 03:07:01 2012 -0400 + + Add macros to check that types are POD + + configure.ac | 1 + + src/hb-open-type-private.hh | 32 ++++++++++++++++++++------------ + src/hb-private.hh | 24 ++++++++++++++++++++++++ + 3 files changed, 45 insertions(+), 12 deletions(-) + +commit 61eb60c129e865e92f6a5767a88c44a391f4d413 +Author: Behdad Esfahbod +Date: Tue Jun 5 21:14:04 2012 -0400 + + Don't link to libstdc++ + + New try. + + src/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 81a4b9fd4eb8995c5930db1df3669db93661eb52 +Author: Behdad Esfahbod +Date: Tue Jun 5 20:49:51 2012 -0400 + + Remove unused hb_static_mutex_t + + src/hb-mutex-private.hh | 11 ----------- + 1 file changed, 11 deletions(-) + +commit 4a3a9897b3698dd09c3e880b3ddd4db24c6fb460 +Author: Behdad Esfahbod +Date: Tue Jun 5 20:39:07 2012 -0400 + + Disable Intel atomic ops on mingw32 + + Apparently the configure test is not enough... + + src/hb-atomic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0594a2448440208efa0acac9a5d8d52d43108289 +Author: Behdad Esfahbod +Date: Tue Jun 5 20:35:40 2012 -0400 + + Cleanup TRUE/FALSE vs true/false + + src/hb-atomic-private.hh | 4 +-- + src/hb-blob.cc | 28 +++++++++--------- + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 38 ++++++++++++------------- + src/hb-buffer.h | 4 +-- + src/hb-fallback-shape.cc | 2 +- + src/hb-font.cc | 22 +++++++-------- + src/hb-ft.cc | 22 +++++++-------- + src/hb-glib.cc | 16 +++++------ + src/hb-graphite2.cc | 8 +++--- + src/hb-icu.cc | 30 ++++++++++---------- + src/hb-ot-layout.cc | 28 +++++++++--------- + src/hb-ot-shape-complex-private.hh | 2 +- + src/hb-ot-shape-normalize.cc | 16 +++++------ + src/hb-ot-shape.cc | 4 +-- + src/hb-private.hh | 18 ++++-------- + src/hb-set.cc | 2 +- + src/hb-set.h | 2 +- + src/hb-shape.cc | 6 ++-- + src/hb-tt-font.cc | 12 ++++---- + src/hb-unicode.cc | 8 +++--- + src/hb-uniscribe.cc | 18 ++++++------ + src/main.cc | 2 +- + util/hb-shape.cc | 2 +- + util/helper-cairo.cc | 16 +++++------ + util/main-font-text.hh | 2 +- + util/options.cc | 58 +++++++++++++++++++------------------- + util/options.hh | 2 +- + util/view-cairo.hh | 2 +- + 29 files changed, 185 insertions(+), 191 deletions(-) + +commit e1ac38f8dd04c29d2d4140f5a492cdaf25d72901 +Author: Behdad Esfahbod +Date: Tue Jun 5 20:31:49 2012 -0400 + + Fix inert buffer set_length() with zero + + Oops! + + src/hb-buffer.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 04bc1eebe7a304c0e6f86ab6814c65889f152602 +Author: Behdad Esfahbod +Date: Tue Jun 5 20:16:56 2012 -0400 + + Add configure tests for Intel atomic intrinsics + + configure.ac | 17 +++++++++++++++++ + src/hb-atomic-private.hh | 12 ++++++------ + src/hb-mutex-private.hh | 2 +- + 3 files changed, 24 insertions(+), 7 deletions(-) + +commit 68c75b46977beb57e35082db26be712b3cd65678 +Author: Behdad Esfahbod +Date: Tue Jun 5 19:55:46 2012 -0400 + + Shuffle + + configure.ac | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit f64b2ebf82c5f355cd95806478cd30c00b1a2731 +Author: Behdad Esfahbod +Date: Tue Jun 5 19:23:29 2012 -0400 + + Remove last static initializer + + We're free! Lazy or immediate... + + src/hb-ft.cc | 2 + + src/hb-shape.cc | 150 ++++++++++++++++++++++++++++++++++++++++---------------- + 2 files changed, 110 insertions(+), 42 deletions(-) + +commit 4a8a529068fc380298bb05b9d878bede3e9f4da1 +Author: Behdad Esfahbod +Date: Tue Jun 5 19:17:02 2012 -0400 + + Make hb-view err if all shapers failed + + util/view-cairo.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 04aed572f112b96a6033cd6c3df7bdba5e29e93c +Author: Behdad Esfahbod +Date: Tue Jun 5 18:30:19 2012 -0400 + + Make hb-ft static-initializer free + + src/hb-common.cc | 5 ++--- + src/hb-ft.cc | 38 +++++++++++++++++++++++++++----------- + 2 files changed, 29 insertions(+), 14 deletions(-) + +commit be4560a3b5e8599cbe2b29a01a60c21c9e2b194f +Author: Behdad Esfahbod +Date: Tue Jun 5 18:14:03 2012 -0400 + + Undo default unicode-funcs to avoid static initializer again + + src/hb-buffer.cc | 2 +- + src/hb-glib.cc | 23 ++++++++++++----------- + src/hb-icu.cc | 24 +++++++++++++----------- + src/hb-unicode-private.hh | 10 +++++----- + src/hb-unicode.cc | 26 ++++++++++++++------------ + 5 files changed, 45 insertions(+), 40 deletions(-) + +commit 093171cceca63e48e735bbf05a2c11b1b7e95ef1 +Author: Behdad Esfahbod +Date: Tue Jun 5 18:00:45 2012 -0400 + + Implement lock-free hb_language_t + + Another static-initialization down. One more to go. + + src/hb-common.cc | 66 +++++++++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 54 insertions(+), 12 deletions(-) + +commit 6843ce01be0df501ef3149a2c1c54cdfb693195d +Author: Behdad Esfahbod +Date: Tue Jun 5 17:27:20 2012 -0400 + + Add atomic-pointer functions + + Gonig to use these for lock-free linked-lists, to be used for + hb_language_t among other things. + + src/hb-atomic-private.hh | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit cdafe3a7d8483ac586e2c16487e2a09164e0f65c +Author: Behdad Esfahbod +Date: Tue Jun 5 16:34:49 2012 -0400 + + Add gcc intrinsics implementations for atomic and mutex + + configure.ac | 4 ++-- + src/hb-atomic-private.hh | 11 +++++++++-- + src/hb-mutex-private.hh | 51 +++++++++++++++++++++++++++++++++++++++++------- + src/hb-object-private.hh | 4 +++- + src/hb-warning.cc | 14 ++++++------- + 5 files changed, 65 insertions(+), 19 deletions(-) + +commit d970d2899b36a2fbd002b224b8bd37b0906fdd5f +Author: Behdad Esfahbod +Date: Tue Jun 5 16:06:28 2012 -0400 + + Add gcc implementation for atomic ops + + src/hb-atomic-private.hh | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 0e253e97af71e2a7ead153589f61fd579a247502 +Author: Behdad Esfahbod +Date: Tue Jun 5 15:37:19 2012 -0400 + + Add a mutex to object header + + Removes one more static-initialization. A few more to go. + + src/hb-common.cc | 24 +++++++++--------------- + src/hb-mutex-private.hh | 19 +++++++------------ + src/hb-object-private.hh | 36 ++++++++++++++++++++++-------------- + src/hb-private.hh | 11 +++++------ + 4 files changed, 43 insertions(+), 47 deletions(-) + +commit a2b471df821b32625d127f83b2f90e6d6a967e7e +Author: Behdad Esfahbod +Date: Tue Jun 5 15:17:44 2012 -0400 + + Remove static initializers from indic + + src/hb-ot-shape-complex-indic.cc | 50 +++++++++++++++++++++++++++++++--------- + 1 file changed, 39 insertions(+), 11 deletions(-) + +commit f06ab8a4262c759b4723614fd28f55ee77aa8466 +Author: Behdad Esfahbod +Date: Tue Jun 5 12:31:51 2012 -0400 + + Better hide nil objects and make them const + + src/hb-blob.cc | 34 +++++++++++------------ + src/hb-buffer.cc | 39 +++++++++++++------------- + src/hb-font.cc | 70 +++++++++++++++++++++++------------------------ + src/hb-ft.cc | 49 +++++++++++++++------------------ + src/hb-glib.cc | 25 ++++++++--------- + src/hb-icu.cc | 25 ++++++++--------- + src/hb-set.cc | 16 +++++------ + src/hb-unicode-private.hh | 11 ++++---- + src/hb-unicode.cc | 34 +++++++++++------------ + 9 files changed, 146 insertions(+), 157 deletions(-) + +commit bf93b636c4963cbc32d5fba7ace1053db6719192 +Author: Behdad Esfahbod +Date: Tue Jun 5 14:17:32 2012 -0400 + + Remove constructor from hb_prealloced_array_t + + This was causing all object types to be non-POD and have static + initializers. We don't need that! + + Now, most nil objects just moved from .bss to .data. Fixing for that + coming soon. + + src/hb-object-private.hh | 3 +++ + src/hb-private.hh | 4 +++- + src/hb-set-private.hh | 1 + + 3 files changed, 7 insertions(+), 1 deletion(-) + +commit 7037291aacb858f8090fd7d9028c196cc1a21703 +Author: Behdad Esfahbod +Date: Tue Jun 5 13:30:11 2012 -0400 + + Check for atexit() + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f1971a217424bd6db5c7072ba5cf197f318d4e47 +Author: Behdad Esfahbod +Date: Tue Jun 5 13:04:20 2012 -0400 + + Fix warnings + + src/indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b0a6e58bb3dda72dcce37d54d987591630a3db6c +Author: Behdad Esfahbod +Date: Mon Jun 4 10:21:22 2012 -0400 + + s/script-punjabi/script-gurmukhi/ + + test/shaping/texts/in-tree/shaper-indic/indic/MANIFEST | 2 +- + .../shaper-indic/indic/{script-punjabi => script-gurmukhi}/MANIFEST | 0 + .../indic/{script-punjabi => script-gurmukhi}/misc/MANIFEST | 0 + .../indic/{script-punjabi => script-gurmukhi}/misc/misc.txt | 0 + .../indic/{script-punjabi => script-gurmukhi}/utrrs/LICENSE | 0 + .../indic/{script-punjabi => script-gurmukhi}/utrrs/MANIFEST | 0 + .../shaper-indic/indic/{script-punjabi => script-gurmukhi}/utrrs/README | 0 + .../indic/{script-punjabi => script-gurmukhi}/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-GurmukhiSpecific.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../indic/{script-punjabi => script-gurmukhi}/utrrs/codepoint/MANIFEST | 0 + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../indic/{script-punjabi => script-gurmukhi}/utrrs/gpos/MANIFEST | 0 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../indic/{script-punjabi => script-gurmukhi}/utrrs/gsub/MANIFEST | 0 + 21 files changed, 1 insertion(+), 1 deletion(-) + +commit c1885483120d4b686b2fe95b217dce7248e040b1 +Author: Behdad Esfahbod +Date: Mon Jun 4 08:56:00 2012 -0400 + + Add --verbose to hb-shape + + Just turns all --show-* options on. + + util/options.cc | 11 +++++++++++ + util/options.hh | 1 - + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 9fc7a11469113d31d8095757c4fc038c3427d44a +Author: Behdad Esfahbod +Date: Mon Jun 4 08:28:19 2012 -0400 + + Remove comma at the end of enum + + As reported by Jonathan Kew on the list. + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3b8fd9c48f4bde368bf2d465c148b9743a9216ee +Author: Behdad Esfahbod +Date: Sun Jun 3 15:54:19 2012 -0400 + + Remove const from ref_count.ref_count + + According to Tom Hacohen this was breaking build with some compilers. + + In file included from hb-buffer-private.hh:35:0, + from hb-ot-map-private.hh:32, + from hb-ot-shape-private.hh:32, + from hb-ot-shape.cc:29: + hb-object-private.hh: In constructor '_hb_object_header_t::_hb_object_header_t()': + hb-object-private.hh:97:8: error: uninitialized const member in 'struct hb_reference_count_t' + hb-object-private.hh:51:25: note: 'hb_reference_count_t::ref_count' should be initialized + In file included from hb-ot-shape.cc:33:0: + hb-set-private.hh: In constructor '_hb_set_t::_hb_set_t()': + hb-set-private.hh:37:8: note: synthesized method '_hb_object_header_t::_hb_object_header_t()' first required here + hb-ot-shape.cc: In function 'void hb_ot_shape_glyphs_closure(hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int, hb_set_t*)': + hb-ot-shape.cc:521:12: note: synthesized method '_hb_set_t::_hb_set_t()' first required here + + src/hb-object-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 70600dbf626808a30fb0fd8b7ae860e64d9ffe87 +Author: Behdad Esfahbod +Date: Sun Jun 3 15:52:51 2012 -0400 + + Minor + + src/hb-object-private.hh | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit ae62166519291057316a9d15cea3f1570fcb5eaf +Author: Behdad Esfahbod +Date: Sat Jun 2 12:21:19 2012 -0400 + + [util] Minor + + util/options.cc | 4 +--- + util/options.hh | 26 ++++++++++++++------------ + util/shape-consumer.hh | 4 +++- + 3 files changed, 18 insertions(+), 16 deletions(-) + +commit 5db0683a822f70c914468430cda6487cee740ae3 +Author: Behdad Esfahbod +Date: Sat Jun 2 12:13:08 2012 -0400 + + [util] Make hb-shape continue shaping other lines if shapers failed + + util/hb-ot-shape-closure.cc | 3 +++ + util/hb-shape.cc | 36 +++++++++++++++++++++++++------ + util/main-font-text.hh | 2 +- + util/options.cc | 34 ++++++++++++++++++++++------- + util/options.hh | 33 ++++++++++++++-------------- + util/shape-consumer.hh | 17 ++++++++++++--- + util/view-cairo.cc | 47 +++++++--------------------------------- + util/view-cairo.hh | 52 +++++++++++++++++++++++++++++++++++++++------ + 8 files changed, 143 insertions(+), 81 deletions(-) + +commit 96a9ef0c9fca8d58d8dc6baf6b262d96587abee0 +Author: Behdad Esfahbod +Date: Fri Jun 1 13:46:26 2012 -0400 + + Remove tab character like other "zero-width" characters + + Uniscribe does that, this make comparing results to Uniscribe + easier. + + src/hb-unicode-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit cd6a5493411fea30a04466128e1a37b4d89c6a72 +Author: Behdad Esfahbod +Date: Fri Jun 1 13:45:25 2012 -0400 + + Remove unused variable + + util/hb-ot-shape-closure.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 0558d55bac7fb9279aac859b465e7c0e3ad97492 +Author: Behdad Esfahbod +Date: Mon May 28 10:46:47 2012 -0400 + + Remove hb_atomic_int_set/get() + + We never use them in fact... + + I'm just adjusting these as I better understand the requirements of + the code and the guarantees of each operation. + + src/hb-atomic-private.hh | 8 -------- + src/hb-object-private.hh | 12 +++++------- + 2 files changed, 5 insertions(+), 15 deletions(-) + +commit 4efdffec095e19ceeb4b319d60201e84ece30fd9 +Author: Behdad Esfahbod +Date: Sun May 27 22:39:48 2012 -0400 + + Minor Malayalam test case + + From https://bugs.freedesktop.org/show_bug.cgi?id=45166 + + .../texts/in-tree/shaper-indic/indic/script-malayalam/misc/misc.txt | 1 + + 1 file changed, 1 insertion(+) + +commit dfff5b3021016d3a472c100272fd8e2f52307860 +Author: Behdad Esfahbod +Date: Sun May 27 22:07:04 2012 -0400 + + Add Myanmar test case + + test/shaping/texts/in-tree/shaper-indic/south-east-asian/MANIFEST | 1 + + .../texts/in-tree/shaper-indic/south-east-asian/script-myanmar/MANIFEST | 1 + + .../in-tree/shaper-indic/south-east-asian/script-myanmar/misc/MANIFEST | 1 + + .../in-tree/shaper-indic/south-east-asian/script-myanmar/misc/misc.txt | 1 + + 4 files changed, 4 insertions(+) + +commit bce095524b3e69a47f8e88a2fb02d6ab537f9b0a +Author: Behdad Esfahbod +Date: Sun May 27 11:29:21 2012 -0400 + + Add hb_font_get_glyph_name() and hb_font_get_glyph_from_name() + + TODO | 1 + + src/hb-font-private.hh | 2 ++ + src/hb-font.cc | 80 +++++++++++++++++++++++++++++++++++---------- + src/hb-font.h | 28 ++++++++++++++++ + src/hb-ft.cc | 52 ++++++++++++++++++++++++----- + util/hb-ot-shape-closure.cc | 9 ++--- + util/options.cc | 10 ++---- + 7 files changed, 142 insertions(+), 40 deletions(-) + +commit bc145658bdaeaeea0cdbd719e2756f09a2dbfb48 +Author: Behdad Esfahbod +Date: Sun May 27 10:45:57 2012 -0400 + + Warn if no Unicode functions implementation is found + + src/hb-unicode-private.hh | 1 + + src/hb-warning.cc | 13 +++++++++++++ + 2 files changed, 14 insertions(+) + +commit a3547330fa88e30a138f6f17e60d9c7d1e316622 +Author: Behdad Esfahbod +Date: Sun May 27 10:20:47 2012 -0400 + + Cleanup atomic ops on OS X + + src/hb-atomic-private.hh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit e4b6d503c5575ddbf49249e3fef693d75ae75170 +Author: Behdad Esfahbod +Date: Sun May 27 10:11:13 2012 -0400 + + Don't use atomic ops in hb_cache_t + + We don't care about linearizability, so unprotected int read/write + are enough, no need for expensive memory barriers. It's a cache, + that's all. + + src/hb-cache-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 819faa05307aa192015f4b43d8103a35e87d6cc7 +Author: Behdad Esfahbod +Date: Sun May 27 10:09:18 2012 -0400 + + Minor + + src/hb-atomic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 303d5850ec0516e198db241456b0cfc4899ef9c0 +Author: Behdad Esfahbod +Date: Sun May 27 10:01:13 2012 -0400 + + Fix Windows atomic get/set + + According to: + http://msdn.microsoft.com/en-us/library/65tt87y8.aspx + + MemoryBarrier() is the right macro to protect these, not _ReadBarrier() + and/or _WriteBarrier(). + + src/hb-atomic-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8f8956a55fff95e5ad529d2f124c9528d1f4f81d +Author: Behdad Esfahbod +Date: Fri May 25 14:30:24 2012 -0400 + + [util] Add hidden --shaper that is equivalent of --shapers + + util/helper-cairo.cc | 2 +- + util/options.cc | 6 +++++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit 29ce446d3161b7ea5874352e5f8eb33cd59338c3 +Author: Behdad Esfahbod +Date: Fri May 25 14:17:54 2012 -0400 + + Add set iterator + + src/hb-set-private.hh | 26 +++++++++++++++++++++++--- + src/hb-set.cc | 7 +++++++ + src/hb-set.h | 11 +++++++++-- + util/hb-ot-shape-closure.cc | 8 +++++--- + 4 files changed, 44 insertions(+), 8 deletions(-) + +commit 62c3e111fce0ad34960871134c2eb6da572df303 +Author: Behdad Esfahbod +Date: Fri May 25 13:48:00 2012 -0400 + + Add set symmetric difference + + src/hb-set-private.hh | 5 +++++ + src/hb-set.cc | 7 +++++++ + src/hb-set.h | 6 ++++++ + 3 files changed, 18 insertions(+) + +commit 27aba594c90b4444c35273a38f5fedc8e09d9a88 +Author: Behdad Esfahbod +Date: Thu May 24 15:00:01 2012 -0400 + + Minor + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + src/hb-ot-shape-complex-indic.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit cde1c0114ba66a45d907e81a49bf625e0dc946b0 +Author: Behdad Esfahbod +Date: Thu May 24 10:46:39 2012 -0400 + + Fix hb_atomic_int_set() implementation for HB_NO_MT + + As pointed out by Jonathan Kew. + + src/hb-atomic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3b9b7133bea787f787170beea073f185e36d2327 +Author: Behdad Esfahbod +Date: Wed May 23 22:00:25 2012 -0400 + + Update TODO + + TODO | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +commit ff3524c21aabf5d0d6014d1ce1b3e12ca5f0990f +Author: Behdad Esfahbod +Date: Wed May 23 21:50:43 2012 -0400 + + Add Arabic diacritics tests + + .../shaper-arabic/script-arabic/misc/MANIFEST | 2 +- + .../script-arabic/misc/diacritics/MANIFEST | 5 + + .../script-arabic/misc/diacritics/lam-alef.txt | 28 + + .../misc/diacritics/language-arabic.txt | 695 +++++++++++++++++++++ + .../misc/diacritics/language-persian.txt | 48 ++ + .../misc/diacritics/language-urdu.txt | 188 ++++++ + .../misc/{ => diacritics}/ligature-diacritics.txt | 0 + 7 files changed, 965 insertions(+), 1 deletion(-) + +commit ed2f1363a391add41f10cff18792003583a10257 +Author: Behdad Esfahbod +Date: Tue May 22 22:12:22 2012 -0400 + + Fix substitution glyph class propagation + + The old code was doing nothing. + + Still got to find an example font+string that makes this matter, but + need this for fixing synthetic GDEF anyway. + + src/hb-ot-layout-gsub-table.hh | 10 ++++------ + src/hb-ot-layout-gsubgpos-private.hh | 23 ++++++----------------- + 2 files changed, 10 insertions(+), 23 deletions(-) + +commit a6de53664df9549a5dc93752647ea1d3bb336f7b +Author: Behdad Esfahbod +Date: Fri May 18 15:04:35 2012 -0400 + + Add CJK Compatibility Ideographs tests + + From: + http://people.mozilla.org/~jdaggett/tests/cjkcompat.html + + test/shaping/texts/in-tree/shaper-default/MANIFEST | 3 ++- + .../in-tree/shaper-default/{script-japanese => script-han}/MANIFEST | 0 + test/shaping/texts/in-tree/shaper-default/script-han/misc/MANIFEST | 1 + + .../texts/in-tree/shaper-default/script-han/misc/cjk-compat.txt | 3 +++ + test/shaping/texts/in-tree/shaper-default/script-hiragana/MANIFEST | 1 + + .../shaper-default/{script-japanese => script-hiragana}/misc/MANIFEST | 0 + .../{script-japanese => script-hiragana}/misc/kazuraki-liga-lines.txt | 0 + .../{script-japanese => script-hiragana}/misc/kazuraki-liga.txt | 0 + 8 files changed, 7 insertions(+), 1 deletion(-) + +commit 20fdb0f41d81b226e076a4830d4b0d03da31fc19 +Author: Behdad Esfahbod +Date: Thu May 17 22:04:45 2012 -0400 + + Add a lock-free cache type for int->int functions + + To be used for cmap and advance caching if desired. + + TODO | 2 ++ + src/Makefile.am | 1 + + src/hb-cache-private.hh | 72 +++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-font.cc | 2 ++ + 4 files changed, 77 insertions(+) + +commit bd908b4f102b5ae18a3ad4a8b137994cf74b86ce +Author: Behdad Esfahbod +Date: Thu May 17 22:02:08 2012 -0400 + + Implement hb_atomic_int_set() for OS X + + src/hb-atomic-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 022a05ae90f30bcddff413022e0cd801809b5390 +Author: Behdad Esfahbod +Date: Thu May 17 21:53:24 2012 -0400 + + Minor + + src/hb-atomic-private.hh | 4 +++- + src/hb-mutex-private.hh | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit 22afd66a30d01b6771405e76777306f600807bea +Author: Behdad Esfahbod +Date: Thu May 17 21:23:49 2012 -0400 + + Add hb_atomic_int_set() again + + src/hb-atomic-private.hh | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 4aa7258cb16176a89e1547fee8f86571fdd98307 +Author: Behdad Esfahbod +Date: Thu May 17 21:01:04 2012 -0400 + + Fix type conflicts on Windows without glib + + src/hb-tt-font.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit f039e79d5438a8fc4a3ec11a387bbfc0f6b83024 +Author: Behdad Esfahbod +Date: Thu May 17 20:55:12 2012 -0400 + + Don't use min/max as function names + + They can be macros on some systems. Eg. mingw32. + + src/hb-set-private.hh | 4 ++-- + src/hb-set.cc | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 34961e3198e27fa37fd4cfdad12ef86a2e9e51c2 +Author: Behdad Esfahbod +Date: Thu May 17 20:50:38 2012 -0400 + + Prefer native atomic/mutex ops to glib's + + src/hb-atomic-private.hh | 29 ++++++++++++++++------------- + src/hb-mutex-private.hh | 24 ++++++++++++++---------- + 2 files changed, 30 insertions(+), 23 deletions(-) + +commit ec3ba4b96fc4f262db1ff9f906628c32f26c9b7d +Author: Behdad Esfahbod +Date: Thu May 17 20:30:46 2012 -0400 + + Move atomic ops into their own header + + src/Makefile.am | 1 + + src/hb-atomic-private.hh | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-mutex-private.hh | 1 - + src/hb-object-private.hh | 52 ++------------------------------ + src/hb-warning.cc | 2 +- + 5 files changed, 82 insertions(+), 52 deletions(-) + +commit de0878395be5c72d7058faac8f64715bdd42eb3b +Author: Behdad Esfahbod +Date: Thu May 17 20:15:49 2012 -0400 + + Update TODO + + TODO | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit c87b317f0eb118e67134e8e419a6d65e0fa40d30 +Author: Behdad Esfahbod +Date: Tue May 15 23:53:18 2012 -0400 + + [util] Add hb-ot-shape-closure tool + + Computes all the glyphs that may be generated given a font and + set of Unicode characters. + + The order of the Unicode characters is irrelevant. + + Sample output: + + behdad:util 0$ ./hb-ot-shape-closure Doulos\ SIL\ Regular.ttf f + f f_f + + behdad:util 0$ ./hb-ot-shape-closure Doulos\ SIL\ Regular.ttf i + i + + behdad:util 0$ ./hb-ot-shape-closure Doulos\ SIL\ Regular.ttf fi + f f_i f_f_i f_f i + + behdad:util 0$ ./hb-ot-shape-closure DroidNaskh-Regular.ttf ب + uni0628 uni0628.init uni0628.medi uni0628.fina + + behdad:util 0$ ./hb-ot-shape-closure DroidNaskh-Regular.ttf ا + uni0627 uni0627.fina + + behdad:util 0$ ./hb-ot-shape-closure DroidNaskh-Regular.ttf با + uni0627 uni0627.fina uni0628 uni0628.init uni0628.medi uni0628.fina + + behdad:util 0$ ./hb-ot-shape-closure DroidNaskh-Regular.ttf با --no-glyph-names + 5 6 133 134 135 136 + + configure.ac | 2 +- + util/Makefile.am | 22 ++++++--- + util/hb-ot-shape-closure.cc | 112 ++++++++++++++++++++++++++++++++++++++++++++ + util/options.hh | 12 +++++ + 4 files changed, 140 insertions(+), 8 deletions(-) + +commit 45675e589e6ef9f81b2a4199cf33e3e7778433a8 +Author: Behdad Esfahbod +Date: Tue May 15 23:10:39 2012 -0400 + + [util] Refactor to accommodate for upcoming new tool + + util/Makefile.am | 10 +++-- + util/hb-shape.cc | 70 +++++++++++++++------------------- + util/hb-view.cc | 8 ++-- + util/{hb-view.hh => main-font-text.hh} | 48 +++++++++++------------ + util/shape-consumer.hh | 69 +++++++++++++++++++++++++++++++++ + 5 files changed, 135 insertions(+), 70 deletions(-) + +commit 1d6846db9ebf84561bb30a4e48c6c43184914099 +Author: Behdad Esfahbod +Date: Sun May 13 18:09:29 2012 +0200 + + [Indic] Apply vatu feature after cjct + + Testing with old Deva spec this reduces failures. + Test sequence: U+0915,U+094D,U+0930. + + src/hb-ot-shape-complex-indic.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 8caf5dcd66550351c6038b9ae7ecc5254eed64ff +Author: Behdad Esfahbod +Date: Sun May 13 17:10:18 2012 +0200 + + Minor + + util/ansi-print.cc | 67 +++++++++++++++++++++++++++--------------------------- + 1 file changed, 33 insertions(+), 34 deletions(-) + +commit 617f4ac46f1084859d2034c08760e31e52d3bec3 +Author: Behdad Esfahbod +Date: Sun May 13 16:48:03 2012 +0200 + + Refactor + + src/hb-ot-shape-complex-indic.cc | 44 +++++++++++++++++++++------------------- + 1 file changed, 23 insertions(+), 21 deletions(-) + +commit 5e4e21fce4b548b0b8a5951bc8f35a9f27428192 +Author: Behdad Esfahbod +Date: Sun May 13 16:46:08 2012 +0200 + + Revert "[Indic] Refactoring" + + This reverts commit 0831061efb78983b9c6e1e72574c977e56383c08. + + src/hb-ot-shape-complex-indic.cc | 28 ++++++++-------------------- + 1 file changed, 8 insertions(+), 20 deletions(-) + +commit 3f18236a03880c0960f5990dc90685f6146951a6 +Author: Behdad Esfahbod +Date: Sun May 13 16:20:10 2012 +0200 + + Fix more warnings + + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 8 ++++---- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit 9f377ed3210fe7d9f15e0c4f82020556f9a8f6f0 +Author: Behdad Esfahbod +Date: Sun May 13 16:13:44 2012 +0200 + + Fix more unused-var warnings + + src/hb-ot-shape-complex-arabic.cc | 7 +++++-- + src/hb-ot-shape-complex-indic.cc | 25 ++++++++++++++++++------- + src/hb-ot-shape-complex-misc.cc | 21 +++++++++++++++------ + src/hb-ot-shape-normalize.cc | 13 ++++++------- + src/hb-set.cc | 2 +- + 5 files changed, 45 insertions(+), 23 deletions(-) + +commit d993e72331c6c4c783b803e01e4d4a02c8e3eb77 +Author: Behdad Esfahbod +Date: Sun May 13 16:04:36 2012 +0200 + + Fix hb_face_set_index() + + src/hb-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 93345edcbea49bdf0e22f26b5b74a23e601dfab4 +Author: Behdad Esfahbod +Date: Sun May 13 16:01:08 2012 +0200 + + Fix warnings + + src/hb-fallback-shape.cc | 4 ++-- + src/hb-private.hh | 54 ++++++++++++++++++++++++------------------------ + 2 files changed, 29 insertions(+), 29 deletions(-) + +commit eace47b173807d94b29a6490d0bc3c9f8f6168d1 +Author: Behdad Esfahbod +Date: Sun May 13 15:54:43 2012 +0200 + + Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 99c2695759a6af855d565f4994bbdf220570bb48 +Author: Behdad Esfahbod +Date: Sun May 13 15:45:18 2012 +0200 + + Add accessort to buffer for current info, current pos, and prev info + + src/hb-buffer-private.hh | 9 ++++++++ + src/hb-ot-layout-gpos-table.hh | 44 ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-table.hh | 28 +++++++++++------------ + src/hb-ot-layout-gsubgpos-private.hh | 28 +++++++++++------------ + src/hb-ot-shape-complex-arabic.cc | 4 ++-- + src/hb-ot-shape-complex-misc.cc | 5 ++-- + src/hb-ot-shape-normalize.cc | 16 ++++++------- + src/hb-ot-shape.cc | 8 +++---- + 8 files changed, 76 insertions(+), 66 deletions(-) + +commit 6736f3c5b09af6a71935afc04248b033e171a9b2 +Author: Behdad Esfahbod +Date: Sun May 13 15:21:06 2012 +0200 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 5df809b655bb1318115651fd87d4555cdd9b41cb +Author: Behdad Esfahbod +Date: Sun May 13 15:17:51 2012 +0200 + + [GSUB/GPOS] Remove context_length + + The spec doesn't say contextual matching should be done this way, + and AOTS doesn't do it either. It was inherited from old HarfBuzz. + Remove it. + + src/hb-ot-layout-common-private.hh | 1 - + src/hb-ot-layout-gpos-table.hh | 3 --- + src/hb-ot-layout-gsub-table.hh | 6 ++---- + src/hb-ot-layout-gsubgpos-private.hh | 32 +++++++++++--------------------- + 4 files changed, 13 insertions(+), 29 deletions(-) + +commit 28b9d502bb69a8045818d5f6113ded9c59a56bd7 +Author: Behdad Esfahbod +Date: Sun May 13 15:04:00 2012 +0200 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit 50f630c17ced1bd59b4da4f27728dcfbb876400a +Author: Behdad Esfahbod +Date: Sun May 13 13:03:44 2012 +0200 + + Remove ioctl checks + + Ended up not using terminal size after all. + + configure.ac | 2 +- + util/ansi-print.cc | 11 ----------- + 2 files changed, 1 insertion(+), 12 deletions(-) + +commit db0de7cd616e1e9d6fde6659e52a541477fb0148 +Author: Behdad Esfahbod +Date: Sun May 13 13:02:38 2012 +0200 + + [util] Set ansi color only on color change + + util/ansi-print.cc | 28 +++++++++++++++++++++++----- + 1 file changed, 23 insertions(+), 5 deletions(-) + +commit 912c5ff80a255edb8145b9db69e2ed828f8eab5c +Author: Behdad Esfahbod +Date: Sun May 13 12:51:02 2012 +0200 + + Reduce default margin + + util/options.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 52e7b1424a3613122e9ca30879298df42733acda +Author: Behdad Esfahbod +Date: Sun May 13 02:02:58 2012 +0200 + + [util] Make hb-view print out Unicode art if stdout is a terminal + + configure.ac | 4 +- + util/Makefile.am | 4 + + util/ansi-print.cc | 411 ++++++++++++++++++++++++++++++++++++++++++++++ + util/ansi-print.hh | 39 +++++ + util/helper-cairo-ansi.cc | 102 ++++++++++++ + util/helper-cairo-ansi.hh | 39 +++++ + util/helper-cairo.cc | 70 +++++++- + util/options.hh | 3 + + 8 files changed, 668 insertions(+), 4 deletions(-) + +commit 8b2753ce2bea8a21ea757186d86dc4a55d8c8b0c +Author: Behdad Esfahbod +Date: Sun May 13 00:54:07 2012 +0200 + + Minor + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 30874b4819a99cc84fa39e794266685e1b8735d2 +Author: Behdad Esfahbod +Date: Sat May 12 15:54:27 2012 +0200 + + [util] Make tools default to stdin if no text is provided + + One less argument to type in typical testing workflow! + + util/hb-view.hh | 4 +++- + util/options.cc | 12 +++++------- + util/options.hh | 2 +- + 3 files changed, 9 insertions(+), 9 deletions(-) + +commit 2097951110e33fe091ed9515ae77e2683c46c889 +Author: Behdad Esfahbod +Date: Sat May 12 15:41:48 2012 +0200 + + [util] Change default font size of hb-view to 256 + + Most common usecase of hb-view is to test rendering of short words for + testing / inspection. Not having to type "--font-size 150" each time + isn't such a bad idea... + + util/options.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 737dded2e08fcc19935db51c05201a987184d337 +Author: Behdad Esfahbod +Date: Sat May 12 15:40:11 2012 +0200 + + Fix compiler warnings + + src/hb-ot-shape-complex-indic.cc | 5 ----- + 1 file changed, 5 deletions(-) + +commit f538fcb538f1decb4100ba89457eb83f2350d64b +Author: Behdad Esfahbod +Date: Sat May 12 15:34:40 2012 +0200 + + [test] Make tool usage easier by not requiring "--stdin" + + Just default to it. Added "--help" instead to get usage. + + test/shaping/hb_test_tools.py | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit a3273e30bb7ffd727ffc18af5716dfef705d3d94 +Author: Behdad Esfahbod +Date: Sat May 12 13:34:18 2012 +0200 + + [Indic] Add more Malayalam tests + + .../indic/script-malayalam/misc/misc.txt | 38 ++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +commit 7f852b644b8143492a02edfc853114aaa23446bd +Author: Behdad Esfahbod +Date: Fri May 11 23:10:31 2012 +0200 + + Fix compiler warnings + + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit f7e8dcfd4fc377e3d786b097beb656284240456d +Author: Behdad Esfahbod +Date: Fri May 11 22:00:06 2012 +0200 + + [Indic] Unbreak Devanagari + + And this, concludes the HarfBuzz Massala Hackfest. + + I like to specially thank Jonathan Kew for doing all the decription and + letting me get commit points. + + configure.ac | 2 +- + src/hb-ot-shape-complex-indic-private.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 6a091df9b403b147ef78f3974610dedf4ce1e08a +Author: Behdad Esfahbod +Date: Fri May 11 21:42:27 2012 +0200 + + [Indic] Disambiguate sub vs post vs above matras + + Bengali is at *just* above 5% now. + + src/hb-ot-shape-complex-indic-private.hh | 31 +++++++++++++++---------------- + src/hb-ot-shape-complex-indic.cc | 12 ++++++------ + 2 files changed, 21 insertions(+), 22 deletions(-) + +commit 9d0d319a4a7e85d922e58fade0f40caae1c9f109 +Author: Behdad Esfahbod +Date: Fri May 11 21:36:32 2012 +0200 + + [Indic] Position Bengali Reph before matras + + src/hb-ot-shape-complex-indic.cc | 62 +++++++++++++++++++++++----------------- + 1 file changed, 36 insertions(+), 26 deletions(-) + +commit f89367251109af235f4f0446c13c261a5a4a6f72 +Author: Behdad Esfahbod +Date: Fri May 11 21:10:03 2012 +0200 + + [Indic] Start categorizing Reph per script + + src/hb-ot-shape-complex-indic.cc | 41 ++++++++++++++++++++++++++++++++++------ + 1 file changed, 35 insertions(+), 6 deletions(-) + +commit a913b024d84973556094fd64ce5f0b7106fcc3b5 +Author: Behdad Esfahbod +Date: Fri May 11 20:59:26 2012 +0200 + + [Indic] Apply 'init' feature for Bengali + + Error down from 20% to 7%. + + src/hb-ot-shape-complex-indic.cc | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit eed903b1644e087178438959664a6a57bebc398b +Author: Behdad Esfahbod +Date: Fri May 11 20:50:53 2012 +0200 + + [Indic] Refactor for the arrival of 'init' feature + + Yep, on Bengali now! + + src/hb-ot-shape-complex-indic.cc | 52 +++++++++++++++++++++++++++------------- + 1 file changed, 36 insertions(+), 16 deletions(-) + +commit 18c06e189bd078affbb84c3bb5bb80687a227c5e +Author: Behdad Esfahbod +Date: Fri May 11 20:02:14 2012 +0200 + + [Indic] Add Uniscribe bug feature for dotted circle + + For dotted-circle independent clusters, Uniscribe does no Reph shaping + for the exact sequence Ra+Halant+25CC. Which also is the only possible + sequence with 25CC at the end. + + src/hb-ot-shape-complex-indic-machine.rl | 4 +++- + src/hb-ot-shape-complex-indic-private.hh | 3 ++- + src/hb-ot-shape-complex-indic.cc | 20 ++++++++++++++++---- + 3 files changed, 21 insertions(+), 6 deletions(-) + +commit 5b16de97bcc4b24da4c77ca6c1a42e814d8cdbd1 +Author: Behdad Esfahbod +Date: Fri May 11 19:55:42 2012 +0200 + + [Indic] Add tests for dottedcircle + + .../in-tree/shaper-indic/indic/script-devanagari/misc/MANIFEST | 1 + + .../shaper-indic/indic/script-devanagari/misc/dottedcircle.txt | 7 +++++++ + 2 files changed, 8 insertions(+) + +commit 0831061efb78983b9c6e1e72574c977e56383c08 +Author: Behdad Esfahbod +Date: Fri May 11 19:07:58 2012 +0200 + + [Indic] Refactoring + + src/hb-ot-shape-complex-indic.cc | 26 ++++++++++++++++++-------- + 1 file changed, 18 insertions(+), 8 deletions(-) + +commit 7ea58db311bfb0d8f804d1e9f4a1f004bd45075a +Author: Behdad Esfahbod +Date: Fri May 11 18:58:57 2012 +0200 + + Minor + + src/hb-ot-shape-complex-indic.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 9c09928989316e2befe00d52ed66e055637ccd36 +Author: Behdad Esfahbod +Date: Fri May 11 18:46:35 2012 +0200 + + [Indic] Allow multiple Consonants in Vowel/NBSP syllables + + Uniscribe allows multiple Halant+Consonant after a Vowel. + Tests: + ↦ * U+0905,U+094D,U+092B,U+094D,930,94d,930 + + src/hb-ot-shape-complex-indic-machine.rl | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 8c0aa486f31e9b6cbb31ce295573b53b0a214124 +Author: Behdad Esfahbod +Date: Fri May 11 18:13:42 2012 +0200 + + [Indic] Allow two Nuktas per consonant + + Uniscribe allows up to two nuktas per consonant and one per matra. It does so + indepent of whether the consonant already has a nukta in it. Tests: + + * U+0916,U+093C,U+0941 + * U+0959,U+093C,U+0941 + * U+0916,U+093C,U+093C,U+0941 + * U+0959,U+093C,U+093C,U+0941 + * U+0916,U+093C,U+093C,U+093C,U+0941 + * U+0959,U+093C,U+093C,U+093C,U+0941 + * 915,93c,93c,,94d,U+0916,U+093C,U+093C,U+093e,93c,93c + + src/hb-ot-shape-complex-indic-machine.rl | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 3399a06e7033651ee926448737bdb18e553c1796 +Author: Behdad Esfahbod +Date: Fri May 11 17:54:26 2012 +0200 + + [Indic] Fix U+0952 and similar classification to match Uniscribe + + See comments. + + src/hb-ot-shape-complex-indic-machine.rl | 1 + + src/hb-ot-shape-complex-indic.cc | 16 +++++++++++----- + 2 files changed, 12 insertions(+), 5 deletions(-) + +commit 11aa3ef18dbc6ac9561bd119f5ca2c1aa1209c3a +Author: Behdad Esfahbod +Date: Fri May 11 17:30:48 2012 +0200 + + [Indic] Treat U+0951..U+0954 all similar to U+0952 + + src/hb-ot-shape-complex-indic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 5f131d3226131df440d7f36655e57f6effcae204 +Author: Behdad Esfahbod +Date: Fri May 11 17:29:40 2012 +0200 + + [GSUB/GPOS/Indic] Apply GSUB/GPOS within syllables only + + This does not apply to the context matchings. + + This regresses tests right now. And we are not sure whether this is + the right thing to do for GPOS. But we'll figure out. + + src/hb-ot-layout-gsubgpos-private.hh | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +commit 8fd83aaf6e50c2c25002c51fee26d82847a61769 +Author: Behdad Esfahbod +Date: Fri May 11 17:18:37 2012 +0200 + + [GSUB/GPOS] Fix wrong buffer access in backward skippy mask matching + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ff24d1081af08a887895975285d7e38f5d07bc37 +Author: Behdad Esfahbod +Date: Fri May 11 17:07:08 2012 +0200 + + [Indic] Don't use syllable serial value 0 + + src/hb-ot-shape-complex-indic-machine.rl | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 892eb7878238d810a2a70f9dadbf958207bfeaa1 +Author: Behdad Esfahbod +Date: Fri May 11 16:54:40 2012 +0200 + + [Indic] Implement Uniscribe Reph+Matra+Halant bug feature + + src/hb-ot-shape-complex-indic.cc | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit 67ea29af49bb08ee679914076808327992cf6676 +Author: Behdad Esfahbod +Date: Fri May 11 16:51:23 2012 +0200 + + [Indic] Add example of different Uniscribe behavior + + src/hb-ot-shape-complex-indic.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit ebe29733d44fe0fa9fb30f946ab0dd7a40336a24 +Author: Behdad Esfahbod +Date: Fri May 11 16:43:12 2012 +0200 + + [Indic] Add runtime Uniscribe bug compatibility mode! + + Enable by setting envvar: + + HB_OT_INDIC_OPTIONS=uniscribe-bug-compatible + + Plus, LeftMatra+Halant "feature". + + src/hb-ot-shape-complex-indic.cc | 44 ++++++++++++++++++++++++++++++---------- + 1 file changed, 33 insertions(+), 11 deletions(-) + +commit 616e692e2950d326b6c46aba5b5bead3cc29d315 +Author: Behdad Esfahbod +Date: Fri May 11 16:25:02 2012 +0200 + + [Indic] Add #define UNISCRIBE_BUG_COMPATIBLE 1 + + src/hb-ot-shape-complex-indic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 6782bdae3be0357da1dadc7b806a43ceefa67a90 +Author: Behdad Esfahbod +Date: Fri May 11 16:23:43 2012 +0200 + + [Indic] Fix Left Matra + Halant reordering + + As can be seen in: U+092B,U+093F,U+094D + + src/hb-ot-shape-complex-indic.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 3c2ea9481b1028e927e615a5434ebf8edcb5f891 +Author: Behdad Esfahbod +Date: Fri May 11 16:23:38 2012 +0200 + + Minor + + src/hb-ot-shape-complex-indic.cc | 73 ++++++++++++++++++++-------------------- + 1 file changed, 37 insertions(+), 36 deletions(-) + +commit c071b99f150a9344a2056dfeba8c613f8a5602db +Author: Behdad Esfahbod +Date: Fri May 11 16:22:46 2012 +0200 + + [Indic] Add test for Left Matra with Halant + + Uniscribe doesn't move the Halant, we do. And do a broken job of it now. + + .../shaper-indic/indic/script-devanagari/misc/tricky-reordering.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 203d71069c45048b6dd8fa22b61fd8f2c844b4f6 +Author: Behdad Esfahbod +Date: Fri May 11 16:01:44 2012 +0200 + + [GSUB/GPOS] Check all glyph masks when matching input + + src/hb-ot-layout-gsubgpos-private.hh | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +commit 668c6046c1b3af3bd316bda0cc8636f2a5e8df42 +Author: Behdad Esfahbod +Date: Fri May 11 15:34:13 2012 +0200 + + [Indic] Apply Reph mask to all POS_REPH glyphs + + Needed for upcoming changes to GSUB/GPOS mask matching. + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4be46bade26faf13f7b4d447e9cc608e183955dc +Author: Behdad Esfahbod +Date: Fri May 11 14:39:01 2012 +0200 + + [Indic] Fix state machine to backtrack + + src/hb-ot-shape-complex-indic-machine.rl | 42 +++++++++++++++----------------- + src/hb-private.hh | 2 ++ + 2 files changed, 21 insertions(+), 23 deletions(-) + +commit cee7187447b76b22e1bb6136d137b35ac49c3a5d +Author: Behdad Esfahbod +Date: Fri May 11 11:41:39 2012 +0200 + + [Indic] Move syllable tracking from Indic to generic layer + + This is to incorporate it into GSUB/GPOS processing. + + src/hb-ot-layout-gpos-table.hh | 1 + + src/hb-ot-layout-gsub-table.hh | 3 ++- + src/hb-ot-layout-gsubgpos-private.hh | 3 --- + src/hb-ot-layout-private.hh | 4 +--- + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + src/hb-ot-shape-complex-indic-private.hh | 1 - + src/hb-ot-shape-complex-indic.cc | 8 +++----- + src/hb-ot-shape-complex-private.hh | 13 ++++++++----- + 8 files changed, 16 insertions(+), 19 deletions(-) + +commit 3bf27a9f0e92aa31b464bd3b9fdea5933c9ae8b1 +Author: Behdad Esfahbod +Date: Fri May 11 11:17:23 2012 +0200 + + [Indic] Disable conjuncts when a ZWJ happens + + Not that the code makes any difference since the presence of ZWJ itself + causes the ligature to fail to match anyway. + + src/hb-ot-shape-complex-indic.cc | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +commit c6d904d67db589dd6209928e56504f04f6a07756 +Author: Behdad Esfahbod +Date: Fri May 11 11:07:40 2012 +0200 + + [Indic] Fix bitops typo! + + Another 1000 down! + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 55fe2cf79b11d9a63ea33b3ee76bd0ebca345157 +Author: Behdad Esfahbod +Date: Fri May 11 03:45:28 2012 +0200 + + Make APPLY debug output print current index and codepoint + + Yay! + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7bd2b04fea5649d77d796d58b7f4918fe0378ee5 +Author: Behdad Esfahbod +Date: Fri May 11 03:40:58 2012 +0200 + + Minor + + src/hb-object-private.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit cf26510dbbd8d38486e6ba423800db6427ade332 +Author: Behdad Esfahbod +Date: Fri May 11 03:35:08 2012 +0200 + + Some more... + + Done. I promise. + + src/hb-object-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 9659523ca32b0e254d0e5fe387d817208d9cb6bf +Author: Behdad Esfahbod +Date: Fri May 11 03:33:36 2012 +0200 + + More beauty in debug output! + + src/hb-private.hh | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit cf26e88a5ab477295479f5b9450c2019b6430eaa +Author: Behdad Esfahbod +Date: Fri May 11 03:16:57 2012 +0200 + + Finish off debug output beautification + + src/hb-open-type-private.hh | 58 ++++++++++++++++++++------------------------- + 1 file changed, 26 insertions(+), 32 deletions(-) + +commit d7bba01a353efc7432c474dd8755a02db4abd2ae +Author: Behdad Esfahbod +Date: Fri May 11 02:46:26 2012 +0200 + + Only print class name in debug output if there's one available + + src/hb-private.hh | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit 85f73fa8da1fbb864aef0f3a592b1d65e24d593d +Author: Behdad Esfahbod +Date: Fri May 11 02:40:42 2012 +0200 + + Only printout class name in tracing, if one is available + + Makes debug output much more pleasant. + + src/hb-private.hh | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 98619ce4fa650c593b030d06d2f89fec83a10015 +Author: Behdad Esfahbod +Date: Fri May 11 02:34:06 2012 +0200 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit acea183e986dd378c6f95120fe0feb0586a8ef36 +Author: Behdad Esfahbod +Date: Fri May 11 02:33:11 2012 +0200 + + Add return annotation for APPLY + + src/hb-ot-layout-gpos-table.hh | 163 +++++++++++++++-------------------- + src/hb-ot-layout-gsub-table.hh | 114 +++++++++++------------- + src/hb-ot-layout-gsubgpos-private.hh | 83 ++++++++---------- + 3 files changed, 151 insertions(+), 209 deletions(-) + +commit 5ccfe8e2154ad0b58dabcc236bbe9478c17b02ab +Author: Behdad Esfahbod +Date: Fri May 11 02:19:41 2012 +0200 + + /Minor/ + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0ab8c8621712d33e1e91dfdb4ad0b335e3d2a3fb +Author: Behdad Esfahbod +Date: Fri May 11 01:25:34 2012 +0200 + + Annotate SANITIZE return values + + More to come, for APPLY, CLOSURE, etc. + + src/hb-open-file-private.hh | 23 ++--- + src/hb-open-type-private.hh | 49 +++++----- + src/hb-ot-head-table.hh | 4 +- + src/hb-ot-hhea-table.hh | 4 +- + src/hb-ot-hmtx-table.hh | 4 +- + src/hb-ot-layout-common-private.hh | 51 +++++----- + src/hb-ot-layout-gdef-table.hh | 48 +++++----- + src/hb-ot-layout-gpos-table.hh | 180 ++++++++++++++++------------------- + src/hb-ot-layout-gsub-table.hh | 101 +++++++++----------- + src/hb-ot-layout-gsubgpos-private.hh | 88 ++++++++--------- + src/hb-ot-maxp-table.hh | 7 +- + src/hb-ot-name-table.hh | 17 ++-- + src/hb-private.hh | 39 ++++++-- + 13 files changed, 299 insertions(+), 316 deletions(-) + +commit 829e814ff358c5e700ba4df54932696801aa9f65 +Author: Behdad Esfahbod +Date: Fri May 11 00:52:16 2012 +0200 + + Minor + + src/hb-private.hh | 32 ++++++++++---------------------- + 1 file changed, 10 insertions(+), 22 deletions(-) + +commit 6eec6f406d2cc13dbca422e88492d3d498af02bf +Author: Behdad Esfahbod +Date: Fri May 11 00:50:38 2012 +0200 + + Code reshuffling + + src/hb-private.hh | 36 +++++++++++++++++++++++++----------- + 1 file changed, 25 insertions(+), 11 deletions(-) + +commit 1e08830b4fac3a60ae52349cab6e101d389d30cd +Author: Behdad Esfahbod +Date: Fri May 11 00:16:40 2012 +0200 + + Beautify debug output + + src/hb-open-type-private.hh | 20 ++++++------ + src/hb-private.hh | 74 +++++++++++++++++++++++++++------------------ + 2 files changed, 55 insertions(+), 39 deletions(-) + +commit 6f4553801729a06e506ffdde7b27c72780d4bb80 +Author: Behdad Esfahbod +Date: Thu May 10 23:24:43 2012 +0200 + + More massaging trace messaging + + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + src/hb-private.hh | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit b5fa37cb694b01a7df3a656710391c40dd3fcc04 +Author: Behdad Esfahbod +Date: Thu May 10 23:09:48 2012 +0200 + + Minor + + src/hb-set-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 208109703c929428c684ddcf9310b8ba780c4c31 +Author: Behdad Esfahbod +Date: Thu May 10 23:06:58 2012 +0200 + + Better trace message support infrastructure + + We have varargs in the trace interface now. To be used soon... + + src/hb-open-type-private.hh | 17 ++++------ + src/hb-ot-layout-gsubgpos-private.hh | 4 +-- + src/hb-private.hh | 64 ++++++++++++++++++++++++++---------- + 3 files changed, 56 insertions(+), 29 deletions(-) + +commit 02b2922fbf098c8282eb23dc2c54d5829cf67024 +Author: Behdad Esfahbod +Date: Thu May 10 21:44:50 2012 +0200 + + [Indic] Towards better Reph positioning + + Fixed for Deva cases with two full-form consonants. Failures **way** down. + Not much left to go :-). + + src/hb-ot-shape-complex-indic.cc | 111 ++++++++++++++++++++++++++++----------- + 1 file changed, 80 insertions(+), 31 deletions(-) + +commit 74e54cf446bb979e488685e8c09eeed6b9d03c24 +Author: Behdad Esfahbod +Date: Thu May 10 21:20:37 2012 +0200 + + [Indic] Add Ra back for scripts without Reph + + We now check that the 'rphp' table exists before forming Reph, so + we don't need to comment out Ra for those scripts. + + src/hb-ot-shape-complex-indic-private.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 2b70df5cc008617453b12bafeaac50e6d61b3224 +Author: Behdad Esfahbod +Date: Thu May 10 18:38:22 2012 +0200 + + [Indic] Add note re Uniscribe clusters + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 21d2803133c2c424ed37a9f3d17c7fc4963e5a60 +Author: Behdad Esfahbod +Date: Thu May 10 18:34:34 2012 +0200 + + [Indic] Do clustering like Uniscribe does + + Hindi Wikipedia failures down to 6639 (0.938381%)! + + src/hb-ot-shape-complex-indic.cc | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +commit b20c9ebaf5176101fdfcffbe4714a2e619dd94b6 +Author: Behdad Esfahbod +Date: Thu May 10 18:31:17 2012 +0200 + + [Indic] Add test for matra group + + The spec says: "[{M}+[N]+[H]]", and that's what Uniscribe implements. + We instead do: "{M+[N]+[H]}", which means we allow Nukta and Halant + after all Matras, not just the last one. It makes more sense. + + .../texts/in-tree/shaper-indic/indic/script-devanagari/misc/MANIFEST | 1 + + .../shaper-indic/indic/script-devanagari/misc/spec-deviations.txt | 1 + + 2 files changed, 2 insertions(+) + +commit 8df5636968389ac7bf8620ccd091fd4872b0bbee +Author: Behdad Esfahbod +Date: Thu May 10 15:41:04 2012 +0200 + + [Indic] Reorder Reph to before the Halant after Matras + + Uniscribe doesn't do it, but we want to do as it gives the Reph the + opportunity to interact with the Matras. Test with mangal for example. + Sequence: <0930,094d,0915,094b,094d> + In test suite already. + + src/hb-ot-shape-complex-indic.cc | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit daf3234bdc82c669302599a76d2b14f5e69989db +Author: Behdad Esfahbod +Date: Thu May 10 15:28:27 2012 +0200 + + [Indic] Don't clear the mask for Reph + + This was removing the mandatory global 1 bit in the mask and hence + disabling GPOS for Reph! + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7708ee23cbcc8c8edce13e73b6e549b77bd8c2d0 +Author: Behdad Esfahbod +Date: Thu May 10 14:48:25 2012 +0200 + + [Indic] Improve Left Matra repositioning + + Move its dependents too. + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 61a58e26a5bda16851669404fc8206896e124740 +Author: Behdad Esfahbod +Date: Thu May 10 14:43:53 2012 +0200 + + [Indic] Add tricky reordering test cases + + In the case of Consonant,LeftMatra,Halant, Uniscribe leaves the Halant + where it is, but we want to move it with the Matra as that makes more + logical sense. + + .../texts/in-tree/shaper-indic/indic/script-devanagari/misc/MANIFEST | 1 + + .../shaper-indic/indic/script-devanagari/misc/tricky-reordering.txt | 4 ++++ + 2 files changed, 5 insertions(+) + +commit dbb105883c6e9b83e78dc8b10766cd56b98cd7e1 +Author: Behdad Esfahbod +Date: Thu May 10 13:45:52 2012 +0200 + + [Indic] Do Reph repositioning in final reordering like the spec says + + This introduced a failure, which we tracked down to a test case like this: + + U+092E,U+094B,U+094D,U+0930 + + The final character is a Ra that should be put in a syllable of it's + own. And we do. But it will interact with the Halant before it. So + now we finally are convinced that we have to limit features to syllable + boundaries. That's coming after lunch! + + src/hb-ot-shape-complex-indic-private.hh | 2 - + src/hb-ot-shape-complex-indic.cc | 103 +++++++++++++++++++------------ + 2 files changed, 64 insertions(+), 41 deletions(-) + +commit 4705a7026900e51f6430f03a73c87f2df035df92 +Author: Behdad Esfahbod +Date: Thu May 10 13:09:08 2012 +0200 + + Minor + + src/hb-ot-shape-complex-indic.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 4ac9e98d9d2ea973dd612dc4063cf78496c643a0 +Author: Behdad Esfahbod +Date: Thu May 10 12:53:53 2012 +0200 + + [Indic] Reorder left matras to be closer to base + + src/hb-ot-shape-complex-indic-private.hh | 4 --- + src/hb-ot-shape-complex-indic.cc | 50 +++++++++++++++++++++++++++++--- + 2 files changed, 46 insertions(+), 8 deletions(-) + +commit 1a1fa8c655a082fc1439608457ba717306cc83ca +Author: Behdad Esfahbod +Date: Thu May 10 12:20:21 2012 +0200 + + [Indic] Treat the standalone cluster case reusing the consonant logic + + src/hb-ot-shape-complex-indic.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 190eb31a16178269aecaf5d2ecc9012f956749f4 +Author: Behdad Esfahbod +Date: Thu May 10 12:17:16 2012 +0200 + + [Indic] Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c5306b6861cfaa50af40e8ceb058791fa06d7981 +Author: Behdad Esfahbod +Date: Thu May 10 12:07:33 2012 +0200 + + [Indic] Handle Vowel syllables + + Reusing the consonant logic! + + src/hb-ot-shape-complex-indic-private.hh | 3 +-- + src/hb-ot-shape-complex-indic.cc | 11 ++++++----- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 6d8e0cb74c02f6bc09cd4abe9e4bc82062e1b517 +Author: Behdad Esfahbod +Date: Thu May 10 11:41:51 2012 +0200 + + [Indic] Simplify Reph logic + + src/hb-ot-shape-complex-indic.cc | 24 +++++------------------- + 1 file changed, 5 insertions(+), 19 deletions(-) + +commit 3d25079f8d6be81b9b4b91d3a97016b8a572f571 +Author: Behdad Esfahbod +Date: Thu May 10 11:37:42 2012 +0200 + + [Indic] Don't form Reph is Ra is the only consonant in the syllable + + src/hb-ot-shape-complex-indic-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 10 ++++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit b99d63ae114fb58f129562b293a8a66543d499ad +Author: Behdad Esfahbod +Date: Thu May 10 11:32:52 2012 +0200 + + [Indic] Increase max syllable length + + 20 was way too low, one could hit a syllable with 7ish consonants with it. + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a391ff50b9a7b6ac3e58d199ea726b20ee6839bb +Author: Behdad Esfahbod +Date: Thu May 10 11:31:20 2012 +0200 + + [Indic] Adjust base after sorting + + src/hb-ot-shape-complex-indic.cc | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit d3637edb248162970e202e9d0671540274192844 +Author: Behdad Esfahbod +Date: Thu May 10 10:51:38 2012 +0200 + + [Indic] Don't return for long syllables. Just not sort. + + src/hb-ot-shape-complex-indic.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit dfa0cade7fce3791e47eaa7edcd23da76c7a0ed0 +Author: Behdad Esfahbod +Date: Wed May 9 19:10:07 2012 +0200 + + Fix Uniscribe clusters with multiple items + + src/hb-uniscribe.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 86e5dd386a7989701da476db89be268e4ac1e219 +Author: Behdad Esfahbod +Date: Wed May 9 18:57:37 2012 +0200 + + [Indic] Don't give up syllable parsing upon junk + + src/hb-ot-shape-complex-indic-machine.rl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ef24cc8c8e2478a6352c340f4611a617646de4cc +Author: Behdad Esfahbod +Date: Wed May 9 17:56:03 2012 +0200 + + [Indic] Towards multi-cluster syllables and final reordering + + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-indic-machine.rl | 21 ++++++++++----- + src/hb-ot-shape-complex-indic-private.hh | 1 + + src/hb-ot-shape-complex-indic.cc | 45 +++++++++++++++++++++++--------- + src/hb-ot-shape-complex-private.hh | 5 ++-- + 5 files changed, 51 insertions(+), 23 deletions(-) + +commit a9844d41c6cb30d8a2d733130a0e72f51b6c81c1 +Author: Behdad Esfahbod +Date: Wed May 9 17:53:13 2012 +0200 + + Combine lig_id and lig_comp into one byte, to free up one for Indic + + src/hb-ot-layout-gpos-table.hh | 14 ++++++++------ + src/hb-ot-layout-gsub-table.hh | 11 ++++------- + src/hb-ot-layout-gsubgpos-private.hh | 26 ++++++++++++++++++++++---- + 3 files changed, 34 insertions(+), 17 deletions(-) + +commit 92332e5116271a5d96e532005fe750e7552a6cbb +Author: Behdad Esfahbod +Date: Wed May 9 17:40:00 2012 +0200 + + Minor + + src/hb-ot-shape-complex-indic.cc | 41 ++++++++++++++++++++-------------------- + 1 file changed, 21 insertions(+), 20 deletions(-) + +commit dbccf87eef0d26838fa4bb3ae26410f6c4818836 +Author: Behdad Esfahbod +Date: Wed May 9 17:24:39 2012 +0200 + + [Indic] Make room for more reordering positions + + src/hb-ot-shape-complex-indic-private.hh | 213 ++++++++++++++++--------------- + src/hb-ot-shape-complex-indic.cc | 12 +- + 2 files changed, 115 insertions(+), 110 deletions(-) + +commit d4480ace7fdbe48aeaf77278c032b8b2ef2ebe8e +Author: Behdad Esfahbod +Date: Wed May 9 15:56:35 2012 +0200 + + [Indic] Improve matra vs consonant ordering + + Another 1.5% down. + + src/hb-ot-shape-complex-indic-private.hh | 32 ++++++++++++++++++++------------ + src/hb-ot-shape-complex-indic.cc | 6 +++--- + src/indic.cc | 2 +- + 3 files changed, 24 insertions(+), 16 deletions(-) + +commit 33c92e769563ec2a6c1249b57d8cac742eea6f88 +Author: Behdad Esfahbod +Date: Wed May 9 15:41:51 2012 +0200 + + [Indic] Categorize Anudatta + + src/hb-ot-shape-complex-indic.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 3943293a9942201d8fc8d59212fcc8cca5132e3d +Author: Behdad Esfahbod +Date: Wed May 9 15:27:56 2012 +0200 + + [Indic] Add joiner test cases for Devanagari + + .../indic/script-devanagari/misc/MANIFEST | 1 + + .../indic/script-devanagari/misc/joiners.txt | 19 +++++++++++++++++++ + 2 files changed, 20 insertions(+) + +commit 19d984edaa4f86c842345a9d4150597e045e1887 +Author: Behdad Esfahbod +Date: Wed May 9 15:21:13 2012 +0200 + + [Indic] Make sure Reph jumps over all matras to the right + + Another 12 thousand failures gone! (78 to go) + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9034641333d7bfb41a0784cce72e43591faea083 +Author: Behdad Esfahbod +Date: Wed May 9 15:04:58 2012 +0200 + + [Indic] Keep Vedic signs at the right too + + src/hb-ot-shape-complex-indic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit d1deaa2f5bd028e8076265cba92cffa4fa2834ac +Author: Behdad Esfahbod +Date: Wed May 9 15:04:13 2012 +0200 + + Replace zerowidth invisible chars with a zero-advance space glyph + + Like Uniscribe does. + + src/hb-ot-shape-complex-arabic.cc | 3 ++- + src/hb-ot-shape-complex-indic.cc | 20 ------------------- + src/hb-ot-shape-complex-private.hh | 4 ++-- + src/hb-ot-shape-normalize.cc | 25 +++++++++-------------- + src/hb-ot-shape-private.hh | 27 +++++++++++++++++++++++++ + src/hb-ot-shape.cc | 41 +++++++++++++++++++++++++------------- + src/hb-unicode-private.hh | 38 +++++++++++++++++++++++++++++++++++ + 7 files changed, 105 insertions(+), 53 deletions(-) + +commit 49e5da1591b8d28f01e7ff9caac9d9ac53668bba +Author: Behdad Esfahbod +Date: Wed May 9 13:23:27 2012 +0200 + + [indic] Keep the syllable modifier marks to the right + + Shaping failures on Hindi Wikipedia go down from 25% to 14%! + + src/hb-ot-shape-complex-indic.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5b1260909350bffa3e3d06da346f9f86ce651dbb +Author: Behdad Esfahbod +Date: Wed May 9 12:37:27 2012 +0200 + + Minor + + src/hb-ot-shape-complex-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9ce939232bbce8f51e235195e3854d1e8bb961f8 +Author: Behdad Esfahbod +Date: Wed May 9 12:03:09 2012 +0200 + + Minor + + src/hb-ot-shape-complex-indic-private.hh | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 76b3409de6887c1cdd5c679939497b1b56f4554b +Author: Behdad Esfahbod +Date: Wed May 9 11:43:43 2012 +0200 + + [indic] Better Reph matching + + src/hb-ot-shape-complex-indic.cc | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +commit df6d45c693c417bf311e6fa49f18a8558542e525 +Author: Behdad Esfahbod +Date: Wed May 9 11:38:31 2012 +0200 + + Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 412b91889d9a1ae477e8b6907d0b9a76e78a6c91 +Author: Behdad Esfahbod +Date: Wed May 9 11:07:18 2012 +0200 + + [indic] Apply Indic features in order + + src/hb-ot-shape-complex-indic.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 1ac075b227090a9ad930dcc1670236c176b27067 +Author: Behdad Esfahbod +Date: Wed May 9 11:06:47 2012 +0200 + + [indic] Apply rakaar forms + + Fixes 10% of the failures against all of Hindi Wikipedia! + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2214a03900d32710573a1b05c7665195b3129761 +Author: Behdad Esfahbod +Date: Wed May 9 09:54:54 2012 +0200 + + Add hb-diff-ngrams + + test/shaping/Makefile.am | 1 + + test/shaping/hb-diff-ngrams | 5 +++ + test/shaping/hb_test_tools.py | 71 ++++++++++++++++++++++++++++++++++++++++--- + 3 files changed, 72 insertions(+), 5 deletions(-) + +commit 178e6dce01ad28c8708bad62ce0fb79c46e836dc +Author: Behdad Esfahbod +Date: Wed May 9 08:57:29 2012 +0200 + + Add N-gram generator + + test/shaping/hb_test_tools.py | 72 +++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 70 insertions(+), 2 deletions(-) + +commit 98669ceb77657d60435f2cb2e3fc18272c0a2c6a +Author: Behdad Esfahbod +Date: Wed May 9 08:16:15 2012 +0200 + + Use groupby() + + test/shaping/hb_test_tools.py | 26 ++++++++------------------ + 1 file changed, 8 insertions(+), 18 deletions(-) + +commit c438a14b62433db488b5c90854a4a3934adf3305 +Author: Behdad Esfahbod +Date: Wed May 9 07:45:17 2012 +0200 + + Add hb-diff-stat + + test/shaping/Makefile.am | 1 + + test/shaping/hb-diff-stat | 5 +++++ + test/shaping/hb_test_tools.py | 22 ++++++++++++++++++++-- + 3 files changed, 26 insertions(+), 2 deletions(-) + +commit 1058d031e2046eb80331b0950eaff75c2bf608dc +Author: Behdad Esfahbod +Date: Wed May 9 07:30:07 2012 +0200 + + Make hb-diff-filter-failtures retain all test info for failed tests + + test/shaping/hb_test_tools.py | 33 ++++++++++++++++++++++++++------- + 1 file changed, 26 insertions(+), 7 deletions(-) + +commit f1eb008cc727370e1bd0dc32fdf301f62d9ff981 +Author: Behdad Esfahbod +Date: Tue May 8 23:41:41 2012 +0200 + + Add hb-diff-colorize + + Accepts --format=html now. + + test/shaping/Makefile.am | 1 + + test/shaping/hb-diff | 4 +- + test/shaping/hb-diff-colorize | 7 ++ + test/shaping/hb_test_tools.py | 158 +++++++++++++++++++++++++----------------- + 4 files changed, 106 insertions(+), 64 deletions(-) + +commit 9155e4ffe00c96a2c14e14a300004b1038ca3a9c +Author: Behdad Esfahbod +Date: Tue May 8 22:44:21 2012 +0200 + + Cleanup diff + + Doesn't do --color anymore. That will go into a new hb-diff-colorize + tool. + + test/shaping/hb-diff | 10 +++------- + test/shaping/hb_test_tools.py | 32 ++++++++++++++++++-------------- + 2 files changed, 21 insertions(+), 21 deletions(-) + +commit 7d22135b4c3f8fb70552302bf8239df9976dddda +Author: Behdad Esfahbod +Date: Tue May 8 19:38:49 2012 +0200 + + Make hb-diff faster + + test/shaping/hb_test_tools.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit a93e238e05a2f70a6e664e5d04ba25bbd54493dc +Author: Behdad Esfahbod +Date: Tue May 8 18:55:29 2012 +0200 + + More tests + + .../texts/in-tree/shaper-arabic/script-mongolian/misc/MANIFEST | 1 + + .../texts/in-tree/shaper-arabic/script-mongolian/misc/poem.txt | 4 ++++ + .../in-tree/shaper-indic/indic/script-bengali/misc/MANIFEST | 1 + + .../in-tree/shaper-indic/indic/script-bengali/misc/reph.txt | 10 ++++++++++ + 4 files changed, 16 insertions(+) + +commit 1a2a4a0078dda834443edd421037a4bcbad18c5e +Author: Behdad Esfahbod +Date: Sat May 5 22:38:20 2012 +0200 + + Fix warning and build issues + + As reported by Jonathan Kew on the list. + + src/hb-set-private.hh | 2 +- + src/main.cc | 9 +++++---- + 2 files changed, 6 insertions(+), 5 deletions(-) + +commit a5e39fed85e069ba1afbf90408349ad99ceb0e1d +Author: Behdad Esfahbod +Date: Wed Apr 25 00:14:46 2012 -0400 + + Minor + + src/hb-set-private.hh | 2 ++ + src/hb-set.cc | 2 ++ + 2 files changed, 4 insertions(+) + +commit 1827dc208c867e433a95237d1ed3fc7a73d1d9a7 +Author: Behdad Esfahbod +Date: Tue Apr 24 16:56:37 2012 -0400 + + Add hb_ot_shape_glyphs_closure() + + Experimental API for now. + + src/hb-ot-map-private.hh | 7 ++++--- + src/hb-ot-shape.cc | 35 +++++++++++++++++++++++++++++++++++ + src/hb-ot.h | 8 ++++++++ + src/hb-set-private.hh | 3 +++ + 4 files changed, 50 insertions(+), 3 deletions(-) + +commit bb09f0ec10216b11189b5e8584856adf0f14d1fc +Author: Behdad Esfahbod +Date: Tue Apr 24 16:02:12 2012 -0400 + + Minor + + src/hb-unicode.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 29a7e306e30e894f7a38daf73eca9fc772c58158 +Author: Behdad Esfahbod +Date: Tue Apr 24 16:01:30 2012 -0400 + + Minor + + src/hb-ot-shape-normalize.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 585b107cdee7305920dacc83c9ee1f8eeff7afd1 +Author: Behdad Esfahbod +Date: Tue Apr 24 16:00:50 2012 -0400 + + Add test caes for a minority language using Bengali + + U+0985 BENGALI LETTER A followed by U+09D7 BENGALI AU LENGTH MARK. + According to Bobby de Vos on the mailing list, this results in a dotted + circle with most shaping engines, but is a legitimate sequence in this + minority language. + + We reached the consensus on the list to NOT implement dotted-circle + in HarfBuzz. + + .../texts/in-tree/shaper-indic/indic/script-bengali/misc/misc.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 6c6ccaf575392f6e6bb9a15534026e4ea462705b +Author: Behdad Esfahbod +Date: Tue Apr 24 14:21:15 2012 -0400 + + Add a few more set operations + + TODO: Tests for hb_set_t. + + src/hb-set-private.hh | 54 +++++++++++++++++++++++++++++++++++++++++++++++++- + src/hb-set.cc | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-set.h | 34 ++++++++++++++++++++++++++++--- + 3 files changed, 139 insertions(+), 4 deletions(-) + +commit 5caece67ab9eee322bdcdf6f4b607eadde297e56 +Author: Behdad Esfahbod +Date: Mon Apr 23 23:03:12 2012 -0400 + + Make closure() return void + + src/hb-ot-layout-gsub-table.hh | 142 +++++++++++++----------------- + src/hb-ot-layout-gsubgpos-private.hh | 165 ++++++++++++++++++----------------- + src/hb-ot-layout.cc | 10 +-- + src/hb-ot-layout.h | 8 +- + src/hb-set-private.hh | 20 ++--- + 5 files changed, 157 insertions(+), 188 deletions(-) + +commit 0b08adb3539f2ec29682456b89c69e89ff5e9c03 +Author: Behdad Esfahbod +Date: Mon Apr 23 22:41:09 2012 -0400 + + Add hb_set_t + + TODO | 2 + + src/Makefile.am | 3 + + src/hb-ot-layout-common-private.hh | 1 + + src/hb-ot-layout-private.hh | 47 --------------- + src/hb-ot-layout.h | 2 - + src/hb-set-private.hh | 95 +++++++++++++++++++++++++++++ + src/hb-set.cc | 120 +++++++++++++++++++++++++++++++++++++ + src/hb-set.h | 91 ++++++++++++++++++++++++++++ + src/hb.h | 1 + + 9 files changed, 313 insertions(+), 49 deletions(-) + +commit 5b93e8d94fb4c2474816304ae3f52e1c704882de +Author: Behdad Esfahbod +Date: Mon Apr 23 22:26:13 2012 -0400 + + Update copyright headers + + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 6a9be5bd3524dc3eb1e88d1063bde2e4d8b57011 +Author: Behdad Esfahbod +Date: Mon Apr 23 22:23:17 2012 -0400 + + Rename hb_glyph_map_t to hb_set_t + + src/hb-ot-layout-common-private.hh | 16 ++++++++-------- + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++------ + src/hb-ot-layout-private.hh | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-layout.h | 4 ++-- + src/hb-ot-map-private.hh | 2 +- + src/hb-ot-map.cc | 2 +- + 7 files changed, 20 insertions(+), 20 deletions(-) + +commit a4385f0b0a6949e2ce49e6a147ad4beaa724f6c3 +Author: Behdad Esfahbod +Date: Mon Apr 23 22:20:14 2012 -0400 + + Improve clustering + + src/hb-ot-shape.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 8e3715f8a16b315c1c7dd4b256e7f68a36c53e7c +Author: Behdad Esfahbod +Date: Mon Apr 23 22:18:54 2012 -0400 + + Minor + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 2 +- + src/hb-graphite2.cc | 5 ++--- + src/hb-ot-shape-complex-arabic.cc | 4 ++-- + src/hb-ot-shape-complex-misc.cc | 4 ++-- + 5 files changed, 8 insertions(+), 9 deletions(-) + +commit d2984a241e4819474d827b1dd5d4b6d76596b3a5 +Author: Behdad Esfahbod +Date: Mon Apr 23 17:21:14 2012 -0400 + + Add map->substitute_closure() + + src/hb-ot-map-private.hh | 3 +++ + src/hb-ot-map.cc | 15 +++++++++++++++ + 2 files changed, 18 insertions(+) + +commit 31081f7390e5130df72f89acc609ccab5dc77a48 +Author: Behdad Esfahbod +Date: Mon Apr 23 16:54:58 2012 -0400 + + Implement closure() for Context and ChainContext lookups + + src/hb-ot-layout-common-private.hh | 54 ++++++ + src/hb-ot-layout-gsubgpos-private.hh | 347 ++++++++++++++++++++++++++++------- + src/hb-ot-layout-private.hh | 23 ++- + 3 files changed, 351 insertions(+), 73 deletions(-) + +commit c64ddab3c34897cd520d4d73a054866e649e8793 +Author: Behdad Esfahbod +Date: Mon Apr 23 15:28:35 2012 -0400 + + Flesh out closure() for GSUB + + The GSUBGPOS part still missing. + + src/hb-ot-layout-common-private.hh | 61 ++++++++++++++------ + src/hb-ot-layout-gsub-table.hh | 112 ++++++++++++++++++++++++++++--------- + src/hb-ot-layout-private.hh | 34 +++++++++++ + src/hb-ot-layout.h | 2 +- + 4 files changed, 165 insertions(+), 44 deletions(-) + +commit 0da132bde4d576a03095d6738507954f7f85103d +Author: Behdad Esfahbod +Date: Mon Apr 23 14:21:33 2012 -0400 + + Fix Coverage iters + + src/hb-ot-layout-common-private.hh | 30 +++++++++++++++++++++--------- + 1 file changed, 21 insertions(+), 9 deletions(-) + +commit 3e32cd9570fd8b09901fb790b80365ae425f681a +Author: Behdad Esfahbod +Date: Mon Apr 23 13:20:52 2012 -0400 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 1 - + src/hb-ot-layout.cc | 6 +++--- + src/hb-ot-layout.h | 8 ++++++++ + src/hb-private.hh | 4 +++- + 4 files changed, 14 insertions(+), 5 deletions(-) + +commit 650ac00da3d2f988197393f34d40f0ba1a0fa093 +Author: Behdad Esfahbod +Date: Mon Apr 23 13:17:09 2012 -0400 + + Minor refactoring + + src/hb-ot-layout-gpos-table.hh | 27 +++++++++++-------------- + src/hb-ot-layout-gsub-table.hh | 39 +++++++++++++++++------------------- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++------ + src/hb-ot-layout.cc | 6 ++++-- + 4 files changed, 36 insertions(+), 44 deletions(-) + +commit f94b0aa64609654497ced9c00312c9643eb69053 +Author: Behdad Esfahbod +Date: Mon Apr 23 13:04:38 2012 -0400 + + Add "closure" operation stubs to GSUB + + Filling in. + + src/hb-ot-layout-gsub-table.hh | 179 +++++++++++++++++++++++++++++++++++ + src/hb-ot-layout-gsubgpos-private.hh | 110 ++++++++++++++++++++- + src/hb-ot-layout.cc | 8 ++ + 3 files changed, 293 insertions(+), 4 deletions(-) + +commit 7d50d502635d7c95e6bd091e7d4cc993f0853f76 +Author: Behdad Esfahbod +Date: Mon Apr 23 13:02:14 2012 -0400 + + Add Coverage iterators + + src/hb-ot-layout-common-private.hh | 59 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 59 insertions(+) + +commit 3ed4634ec349fa9e943ad23718c04be4dd4bba62 +Author: Behdad Esfahbod +Date: Thu Apr 19 22:34:06 2012 -0400 + + Add Indic inspection tool + + src/Makefile.am | 7 +- + src/hb-ot-shape-complex-indic-private.hh | 264 +++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-indic.cc | 229 +-------------------------- + src/indic.cc | 46 ++++++ + 4 files changed, 317 insertions(+), 229 deletions(-) + +commit a06411ecf93c7e5256e363eef3ef69554896dd55 +Author: Behdad Esfahbod +Date: Thu Apr 19 22:28:25 2012 -0400 + + Minor matra renumbering + + Should have no visible effect. + + src/hb-ot-shape-complex-indic.cc | 30 +++++++++++++++++------------- + 1 file changed, 17 insertions(+), 13 deletions(-) + +commit 36608941f3cc530fea57282fa175e4cc3b4c66c6 +Author: Behdad Esfahbod +Date: Thu Apr 19 22:21:38 2012 -0400 + + Add GSUB "would_apply" API + + To be used in the Indic shaper later. Unused for now. + + src/hb-ot-layout-gsub-table.hh | 140 ++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 138 insertions(+), 2 deletions(-) + +commit a0d4caeb91fa5e5f2090db4efc35c64ff9a64789 +Author: Behdad Esfahbod +Date: Tue Apr 17 13:42:30 2012 -0400 + + Minor + + TODO | 3 +++ + 1 file changed, 3 insertions(+) + +commit a5e40542ab9508f0ba6f822f1262d93fccb71f45 +Author: Behdad Esfahbod +Date: Tue Apr 17 12:37:19 2012 -0400 + + Make font immutable in hb_shape() + + src/hb-shape.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 3cde23664fbbe9cd2ac1b8fd5eb2ea288309cc9c +Author: Behdad Esfahbod +Date: Tue Apr 17 11:44:49 2012 -0400 + + Minor note re Graphite + + src/hb-graphite2.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 4dc2449d92308f8dd366142831c0b85bd30ea5a9 +Author: Behdad Esfahbod +Date: Tue Apr 17 11:39:48 2012 -0400 + + Fix leak in graphite + + src/hb-graphite2.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 0290bbf8611aa881daed907f22256a431250c90a +Author: Behdad Esfahbod +Date: Tue Apr 17 10:28:21 2012 -0400 + + Add another Thai test + + test/shaping/texts/in-tree/shaper-thai/misc/misc.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 9ceca3aeb14cc096f5f87660cf7351bc35073084 +Author: Behdad Esfahbod +Date: Mon Apr 16 21:05:51 2012 -0400 + + Fix ragel regexp in vowel-based syllable + + As reported by datao zhang on the mailing list. + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b870afcd1b436614af95db6dc297e54c8f03f0cd +Author: Behdad Esfahbod +Date: Mon Apr 16 21:05:11 2012 -0400 + + Rewrite ragel expression to better match the one on MS spec + + https://www.microsoft.com/typography/otfntdev/devanot/shaping.aspx + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 95cefdf96efe43a44133aa8a186155cf4e63e2b7 +Author: Behdad Esfahbod +Date: Mon Apr 16 18:08:20 2012 -0400 + + Add --utf8-clusters + + Also fix cairo cluster generation. + + util/hb-shape.cc | 8 +++++--- + util/hb-view.hh | 2 +- + util/helper-cairo.cc | 22 +++++++++++++++++----- + util/helper-cairo.hh | 3 ++- + util/options.cc | 19 ++++++++++++++----- + util/options.hh | 26 ++++++++++++++++---------- + util/view-cairo.cc | 5 +++-- + util/view-cairo.hh | 3 ++- + 8 files changed, 60 insertions(+), 28 deletions(-) + +commit effb42e5c520128bdc2e29398ed801730c5c0f52 +Author: Behdad Esfahbod +Date: Mon Apr 16 16:04:07 2012 -0400 + + Always use cairo_show_text_glyphs() + + Better catches cluster errors. + + util/view-cairo.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 799cfdd15ab369580b2283200c3aca6866214b59 +Author: Behdad Esfahbod +Date: Mon Apr 16 16:00:36 2012 -0400 + + Make page progression be right to left for vertical text + + util/view-cairo.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit a5f1834f57ea3fb254f5c7d372747de316fcc8f1 +Author: Behdad Esfahbod +Date: Mon Apr 16 15:55:13 2012 -0400 + + Apply 'liga' for vertical writing mode too + + Apparently that's what Kazuraki uses to form vertical ligatures, + which suggests that it's what Adobe does. + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4d85252bda25cddd1fbdd744687e449888f0b5fa +Author: Behdad Esfahbod +Date: Mon Apr 16 15:54:26 2012 -0400 + + Add Japanese test data from Adobe's Kazuraki font ligatures + + test/shaping/texts/in-tree/shaper-default/MANIFEST | 1 + + .../shaper-default/script-japanese/MANIFEST | 1 + + .../shaper-default/script-japanese/misc/MANIFEST | 2 + + .../script-japanese/misc/kazuraki-liga-lines.txt | 8 ++++ + .../script-japanese/misc/kazuraki-liga.txt | 53 ++++++++++++++++++++++ + 5 files changed, 65 insertions(+) + +commit e74616b8898b5f18d9bf82b9e81aefad056c1e36 +Author: Behdad Esfahbod +Date: Sun Apr 15 14:12:13 2012 -0400 + + Add comment + + src/hb-private.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 683b503f30bba29d57a93d7e8ac7138c2e7f49f1 +Author: Behdad Esfahbod +Date: Sat Apr 14 20:47:14 2012 -0400 + + Minor + + src/hb-ot-shape-normalize.cc | 11 +++++++++-- + src/hb-ot-shape-private.hh | 9 --------- + src/hb-ot-shape.cc | 9 ++++++++- + 3 files changed, 17 insertions(+), 12 deletions(-) + +commit b9f199c8e38cc5ed0d73845568630f3bcbdd4374 +Author: Behdad Esfahbod +Date: Sat Apr 14 20:23:58 2012 -0400 + + Move code around + + src/hb-ot-shape-private.hh | 40 ---------------------------------------- + src/hb-ot-shape.cc | 45 +++++++++++++++++++++++++++++++++++++++++---- + 2 files changed, 41 insertions(+), 44 deletions(-) + +commit 38a83019e6a7f4aa47662fd557344f62ae001abe +Author: Behdad Esfahbod +Date: Sat Apr 14 19:40:18 2012 -0400 + + Minor + + src/hb-common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d4adade217a61007dd2da5cd9eccf889f79a019a +Author: Behdad Esfahbod +Date: Sat Apr 14 19:23:17 2012 -0400 + + Add assert + + src/hb-ot-shape.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit fe28b997fbbeb2cfeab62ac453993ccffe3e6719 +Author: Behdad Esfahbod +Date: Sat Apr 14 19:19:26 2012 -0400 + + Add HB_DIRECTION_IS_VALID + + src/hb-common.h | 1 + + test/api/test-common.c | 7 +++++++ + 2 files changed, 8 insertions(+) + +commit 5e88aa66822ba64324b4428c9ffbe06a43b4f310 +Author: Behdad Esfahbod +Date: Sat Apr 14 18:51:50 2012 -0400 + + Remove public enum names again + + As was reported to me, glib-mkenum does not understand named enums, + so remove for now. + + src/hb-blob.h | 2 +- + src/hb-common.h | 6 +++--- + src/hb-ot-layout-private.hh | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit 08569c0eaab026c7122c0dc29922cf44011c4d10 +Author: Behdad Esfahbod +Date: Sat Apr 14 18:47:07 2012 -0400 + + Minor + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 4bf90f648313e35d21b427a956aa1fe762bae757 +Author: Behdad Esfahbod +Date: Thu Apr 12 17:38:23 2012 -0400 + + Make HB_DIRECTION_INVALID be zero + + This changes all the HB_DIRECTION_* enum member values, but is + nicer, in preparation for making hb_segment_properties_t public. + + src/hb-common.cc | 7 ++++--- + src/hb-common.h | 20 ++++++++++---------- + test/api/test-common.c | 9 +++++++-- + 3 files changed, 21 insertions(+), 15 deletions(-) + +commit d01402da9c756f90a84bfb1f964fd56caf2b35c3 +Author: Behdad Esfahbod +Date: Thu Apr 12 17:38:02 2012 -0400 + + Minor + + TODO | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 69b84a8f6c789726815261c2e86692de7a65d6e8 +Author: Behdad Esfahbod +Date: Thu Apr 12 15:50:40 2012 -0400 + + Fix hb-view surface size calc for vertical text + + For some reason it doesn't quite work with IranianNastaliq, but + that looks like a font issue. + + util/helper-cairo.hh | 5 +++-- + util/options.hh | 7 +++++++ + util/view-cairo.cc | 31 +++++++++++++++++++++---------- + util/view-cairo.hh | 1 + + 4 files changed, 32 insertions(+), 12 deletions(-) + +commit 6bd9b479b8b2befbb0847282e93beade197c8038 +Author: Behdad Esfahbod +Date: Thu Apr 12 14:53:53 2012 -0400 + + Hide backend-specific shape functions + + Also remove shaper_options argument to hb_shape_full(). That was + unused and for "future". Let it go. + + More shaper API coming in preparation for plan/planned API. + + configure.ac | 6 ++-- + src/Makefile.am | 11 +++---- + src/hb-fallback-shape-private.hh | 9 +++--- + src/hb-fallback-shape.cc | 9 +++--- + src/{hb-ot-shape.h => hb-graphite2-private.hh} | 30 ++++++++---------- + src/hb-graphite2.cc | 5 ++- + src/hb-graphite2.h | 7 ----- + src/hb-ot-shape-private.hh | 8 +++-- + src/hb-ot-shape.cc | 11 +++---- + src/hb-ot.h | 1 - + src/hb-shape.cc | 24 ++++++--------- + src/hb-shape.h | 1 - + src/hb-uniscribe-private.hh | 42 ++++++++++++++++++++++++++ + src/hb-uniscribe.cc | 9 +++--- + src/hb-uniscribe.h | 7 ----- + util/options.hh | 2 +- + 16 files changed, 96 insertions(+), 86 deletions(-) + +commit c6035cf802c60f0526f421f39a55886061df94ee +Author: Behdad Esfahbod +Date: Thu Apr 12 13:23:59 2012 -0400 + + Add names to enums + + gdb was showing instead of useful stuff, so name + all our enums. + + src/hb-blob.h | 2 +- + src/hb-common.h | 6 +++--- + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 5 ++--- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-private.hh | 2 +- + 7 files changed, 10 insertions(+), 11 deletions(-) + +commit d1c9eb458c843215da8df84b596bfae51fee135b +Author: Behdad Esfahbod +Date: Thu Apr 12 13:17:44 2012 -0400 + + Make it an error to include non-top-level headers + + Users should #include (or hb-ft.h, hb-glib.h, etc), but + never things like hb-shape.h directly. This makes it easier to + refactor headers later on without breaking compatibility. + + src/hb-blob.h | 4 ++++ + src/hb-buffer.h | 4 ++++ + src/hb-common.h | 4 ++++ + src/hb-font.h | 4 ++++ + src/hb-ft.h | 2 -- + src/hb-glib.h | 1 + + src/hb-gobject.h | 1 + + src/hb-graphite2.h | 5 +++-- + src/hb-icu.h | 1 + + src/hb-ot-layout.h | 8 +++++--- + src/hb-ot-shape.h | 9 +++++---- + src/hb-ot-tag.h | 6 +++++- + src/hb-ot.h | 2 ++ + src/hb-private.hh | 5 ++++- + src/hb-shape.h | 4 ++++ + src/hb-unicode.h | 4 ++++ + src/hb-uniscribe.h | 3 +-- + src/hb-version.h.in | 4 ++++ + src/hb.h | 2 ++ + 19 files changed, 58 insertions(+), 15 deletions(-) + +commit 323190c27b80cddc9b3c42d19f1f243e2acb2411 +Author: Behdad Esfahbod +Date: Thu Apr 12 12:29:10 2012 -0400 + + Minor + + src/hb-ft.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 0e3361464b00b76aa7375515163e0710a691db0c +Author: Behdad Esfahbod +Date: Thu Apr 12 10:06:52 2012 -0400 + + Fix bug with not setting Unicode props of the first character + + Fixes Mongolian shaping issue: + https://bugs.freedesktop.org/show_bug.cgi?id=45695 + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f9746b600a6e14dbe48aabfc17df8f12a5b46b11 +Author: Behdad Esfahbod +Date: Thu Apr 12 09:59:26 2012 -0400 + + Minor + + test/shaping/texts/in-tree/shaper-arabic/script-mongolian/misc/misc.txt | 1 - + 1 file changed, 1 deletion(-) + +commit 7470b0ff805e4ff59d23d7a1808888fafdf550eb +Author: Behdad Esfahbod +Date: Thu Apr 12 09:44:27 2012 -0400 + + Add Mongolian test case + + test/shaping/texts/in-tree/MANIFEST | 1 + + .../texts/in-tree/shaper-arabic/script-mongolian/misc/MANIFEST | 1 + + .../texts/in-tree/shaper-arabic/script-mongolian/misc/misc.txt | 4 ++++ + test/shaping/texts/in-tree/shaper-thai/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-thai/misc/MANIFEST | 1 + + 5 files changed, 8 insertions(+) + +commit c65662b71e6160f5adfb6226d97589ca457d98b9 +Author: Behdad Esfahbod +Date: Thu Apr 12 09:31:55 2012 -0400 + + Fix left-matra positioning in Indic + + Fixes 200 failures out of previous 4290 cases in the OO.o Indic + dictionary (of ~16000 entries). + + src/hb-ot-shape-complex-indic.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 6d16403bfaa4d710d80c93298eca7211ecaa419f +Author: Behdad Esfahbod +Date: Wed Apr 11 22:04:42 2012 -0400 + + Adjust TODO + + TODO | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 029a82d81d8ffa1b6771d19018d592fec1dbc934 +Author: Behdad Esfahbod +Date: Wed Apr 11 22:00:46 2012 -0400 + + [hangul] Apply *jmo features to all Hangul chars + + This is what old HB does. Morever, fixes rendering with Win8 malgun + font. The Win7 version doesn't compose with either Uniscribe nor HB, + but Win8 version works as expected, like Uniscribe, with this change. + + Lets call Hangul done for now. + + src/hb-ot-shape-complex-misc.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 3baae2440de69577d330209edb708e7d2bb2231d +Author: Behdad Esfahbod +Date: Wed Apr 11 21:54:37 2012 -0400 + + Update TODO + + TODO | 28 +++++++++++++++------------- + 1 file changed, 15 insertions(+), 13 deletions(-) + +commit a4976447cd1a1feffdecd0d501a2690716b1cf4b +Author: Behdad Esfahbod +Date: Wed Apr 11 17:48:40 2012 -0400 + + Add Hangul test + + test/shaping/texts/in-tree/shaper-hangul/script-hangul/misc/misc.txt | 1 + + 1 file changed, 1 insertion(+) + +commit e95d912b3b0af027c4384553f95236db822e5acc +Author: Behdad Esfahbod +Date: Wed Apr 11 17:33:02 2012 -0400 + + Fix diff tool + + test/shaping/hb_test_tools.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 41ae674f6871f43d0a6e4ca67a747074d63ae576 +Author: Behdad Esfahbod +Date: Wed Apr 11 17:11:05 2012 -0400 + + Don't create hb_apply_context_t per glyph! + + I couldn't measure significant performance gains out of this; maybe + about 5% (with one million Malayalam strings). Still, not bad. + But reminds me that optimizing this codebase without profiling first + is simply not going to work. Oh well... + + src/hb-ot-layout-gpos-table.hh | 24 ++++++------------------ + src/hb-ot-layout-gsub-table.hh | 26 +++++++------------------- + src/hb-ot-layout-gsubgpos-private.hh | 22 ++++++++++++++++++++++ + 3 files changed, 35 insertions(+), 37 deletions(-) + +commit 4a1e02ef7979d58fe0c726ee7c665b2420c42ddd +Author: Behdad Esfahbod +Date: Wed Apr 11 14:37:53 2012 -0400 + + Fix shape to presentation forms font check + + As reported by Jonathan Kew on the list. + + src/hb-ot-shape-complex-arabic.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 6062f5f01436b4044be729890ed00b9b62737824 +Author: Behdad Esfahbod +Date: Wed Apr 11 14:19:55 2012 -0400 + + Fix build with some compilers + + As reported by Jonathan Kew on the list. + + src/hb-ot-shape-complex-misc.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit acd88e659fdb2fa1cbf7171f0a1c7fbc81b9f298 +Author: Behdad Esfahbod +Date: Tue Apr 10 18:02:20 2012 -0400 + + In Arabic fallback shaping, check that the font has glyph for new char + + src/hb-ot-shape-complex-arabic.cc | 12 +++++++----- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-misc.cc | 6 +++--- + src/hb-ot-shape-complex-private.hh | 7 ++++--- + src/hb-ot-shape.cc | 2 +- + 5 files changed, 16 insertions(+), 13 deletions(-) + +commit 7752aa73e72301a46c64c533c1e423ff5987cc05 +Author: Behdad Esfahbod +Date: Tue Apr 10 17:22:14 2012 -0400 + + Minor + + src/hb-ot-shape-private.hh | 1 - + src/hb-ot-shape.cc | 10 ---------- + 2 files changed, 11 deletions(-) + +commit 939c010211b063f78874a3b72b032c1ed9a13b87 +Author: Behdad Esfahbod +Date: Tue Apr 10 17:20:05 2012 -0400 + + Implement Arabic fallback shaping mandatory ligatures + + src/gen-arabic-table.py | 32 ++++++++++++++++++++++---------- + src/hb-ot-shape-complex-arabic-table.hh | 28 +++++++++++++++++++--------- + src/hb-ot-shape-complex-arabic.cc | 31 +++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-misc.cc | 4 ++-- + 4 files changed, 74 insertions(+), 21 deletions(-) + +commit b7d04eb606800100faa11100d2adf559e297a4ee +Author: Behdad Esfahbod +Date: Tue Apr 10 16:44:38 2012 -0400 + + Do Arabic fallback shaping + + src/hb-ot-shape-complex-arabic.cc | 38 +++++++++++++++++++++++++++++++++----- + 1 file changed, 33 insertions(+), 5 deletions(-) + +commit ae4a2b9365051c23c9a299cf76f3ab7e661999b1 +Author: Behdad Esfahbod +Date: Tue Apr 10 16:25:08 2012 -0400 + + Generate fallback Arabic shaping table + + Not hooked up yet. + + src/Makefile.am | 6 +- + src/gen-arabic-table.py | 220 +++++++++++++++++++++++--------- + src/gen-indic-table.py | 4 +- + src/hb-ot-shape-complex-arabic-table.hh | 205 ++++++++++++++++++++++++++++- + 4 files changed, 367 insertions(+), 68 deletions(-) + +commit 3b26f96ebe859570d14c6902afc23462bca40712 +Author: Behdad Esfahbod +Date: Tue Apr 10 10:52:07 2012 -0400 + + Add Thai shaper that does SARA AM decomposition / reordering + + That's not in the OpenType spec, but it's what MS and Adobe do. + + src/hb-buffer.cc | 1 + + src/hb-ot-shape-complex-misc.cc | 104 ++++++++++++++++++++++++++++++++++++- + src/hb-ot-shape-complex-private.hh | 8 +++ + 3 files changed, 112 insertions(+), 1 deletion(-) + +commit 0b6d2ac6a1d04877ae4542fc2a3b920185547053 +Author: Behdad Esfahbod +Date: Tue Apr 10 10:52:03 2012 -0400 + + Minor + + TODO | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +commit e099dd6592b4ea887696330f4718efb572494d93 +Author: Behdad Esfahbod +Date: Tue Apr 10 10:47:33 2012 -0400 + + Add Thai test case for SARA AM decomposition + + test/shaping/texts/in-tree/shaper-hangul/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-thai/misc/misc.txt | 5 +++++ + 2 files changed, 6 insertions(+) + +commit 4450dc9354b18cd68980b0891b24ea8efa4f38b6 +Author: Behdad Esfahbod +Date: Sat Apr 7 22:07:23 2012 -0400 + + Move around + + test/shaping/texts/in-tree/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-default/MANIFEST | 1 - + .../in-tree/{shaper-default => shaper-hangul}/script-hangul/MANIFEST | 0 + .../{shaper-default => shaper-hangul}/script-hangul/misc/MANIFEST | 0 + .../{shaper-default => shaper-hangul}/script-hangul/misc/misc.txt | 0 + 5 files changed, 1 insertion(+), 1 deletion(-) + +commit d4cc44716c1e098f8abbc0e495404598026ef242 +Author: Behdad Esfahbod +Date: Sat Apr 7 21:52:28 2012 -0400 + + Move code around, in prep for Thai/Lao shaper + + src/hb-buffer-private.hh | 5 +++++ + src/hb-buffer.cc | 23 +++++++++++++++++++++++ + src/hb-ot-shape-complex-indic-machine.rl | 14 +------------- + 3 files changed, 29 insertions(+), 13 deletions(-) + +commit c9a841f4452921c5361b8f5697bbff7736ce60cd +Author: Behdad Esfahbod +Date: Sat Apr 7 15:06:55 2012 -0400 + + Add simple Hangul shaper that recomposes Jamo when feasible + + Previously, we were NOT actually recomposing Hangul Jamo. We do now. + The two lines in: + + test/shaping/texts/in-tree/shaper-default/script-hangul/misc/misc.txt + + Now render the same with the UnDotum.ttf font. Previously the second + linle was rendering boxes. + + We can also start applying OpenType Jamo features later. At this time, + I have no idea how the 'ljmo', 'vjmo', 'tjmo' features are supposed to + work. Maybe someone can explain them to me? + + src/hb-ot-shape-complex-misc.cc | 16 ++++++++++++++++ + src/hb-ot-shape-complex-private.hh | 15 +++++++++++++-- + 2 files changed, 29 insertions(+), 2 deletions(-) + +commit 968318455304804dc53045e8ba0cd4d76800c02d +Author: Behdad Esfahbod +Date: Sat Apr 7 14:57:21 2012 -0400 + + Implement normalization mode HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_FULL + + In this mode we try composing CCC=0 with CCC=0 characters. Useful for + Hangul. + + src/hb-ot-shape-normalize.cc | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +commit bec2ac4fde1ba0dd6dba02adbb836ce569a5cf6f +Author: Behdad Esfahbod +Date: Sat Apr 7 14:51:17 2012 -0400 + + Bring normalization algorithm closer to the spec + + No logical difference so far. + + src/hb-ot-shape-normalize.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e02d9257863b49e33ab5942971266349d3c548f6 +Author: Behdad Esfahbod +Date: Sat Apr 7 14:49:13 2012 -0400 + + Flip logic around + + src/hb-ot-shape-normalize.cc | 38 +++++++++++++------------------------- + 1 file changed, 13 insertions(+), 25 deletions(-) + +commit aaa25d5f458127f53f4b5ecdeb986ae91fabbad3 +Author: Behdad Esfahbod +Date: Thu Apr 5 17:27:23 2012 -0400 + + Add Hangul test case + + Composed, and decomposed, of the same text. + + test/shaping/texts/in-tree/shaper-default/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-default/script-hangul/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-default/script-hangul/misc/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-default/script-hangul/misc/misc.txt | 2 ++ + 4 files changed, 5 insertions(+) + +commit 11138ccff71f442da1fcf64faa0e1d22e083e775 +Author: Behdad Esfahbod +Date: Thu Apr 5 17:25:19 2012 -0400 + + Add normalize mode + + In preparation for Hangul shaper. + + src/Makefile.am | 1 + + src/hb-ot-layout-common-private.hh | 1 - + src/hb-ot-shape-complex-arabic.cc | 6 +-- + src/hb-ot-shape-complex-indic.cc | 6 +-- + src/hb-ot-shape-complex-misc.cc | 8 ++-- + src/hb-ot-shape-complex-private.hh | 13 ++++--- + src/hb-ot-shape-normalize-private.hh | 46 +++++++++++++++++++++++ + src/hb-ot-shape-normalize.cc | 73 +++++++++++++++++------------------- + src/hb-ot-shape-private.hh | 7 +--- + src/hb-ot-shape.cc | 2 +- + 10 files changed, 102 insertions(+), 61 deletions(-) + +commit 6769f21d579a354e32577ec57348e97d2cb1b438 +Author: Behdad Esfahbod +Date: Thu Apr 5 16:46:46 2012 -0400 + + More moving code around + + src/hb-ot-shape-normalize.cc | 2 +- + src/hb-ot-shape-private.hh | 8 -------- + src/hb-ot-shape.cc | 2 +- + src/hb-unicode-private.hh | 8 ++++++++ + 4 files changed, 10 insertions(+), 10 deletions(-) + +commit 2db2a566826ed4763ce69629194ec656bd48b0bd +Author: Behdad Esfahbod +Date: Thu Apr 5 16:40:37 2012 -0400 + + Move code around + + src/hb-ot-shape-private.hh | 53 -------------------------------------------- + src/hb-unicode-private.hh | 3 +++ + src/hb-unicode.cc | 55 ++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 58 insertions(+), 53 deletions(-) + +commit cad3821f3d5b68d490b0728bd37bd57428ec809c +Author: Behdad Esfahbod +Date: Wed Mar 7 17:13:25 2012 -0500 + + More sorting by Unicode version + + This is the most convenient way to browse scripts. + + src/hb-common.cc | 2 +- + src/hb-common.h | 2 +- + src/hb-ot-shape-complex-private.hh | 94 ++++++++++++++++++++++++++++---------- + 3 files changed, 72 insertions(+), 26 deletions(-) + +commit 317b9504d7a4faa70dcf21e5c2aff4792dbd201a +Author: Behdad Esfahbod +Date: Wed Mar 7 16:51:29 2012 -0500 + + Minor + + src/hb-ot-shape-complex-private.hh | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit fa2673c1ee954ddbbfbfca7cced7b839d7776fc0 +Author: Behdad Esfahbod +Date: Wed Mar 7 15:52:02 2012 -0500 + + More Unicode script age annotation, and a couple more RTL scripts + + Cross-checked with Mark Davis's spreadsheet at http://goo.gl/x9ilM + + src/hb-common.cc | 8 ++++++++ + src/hb-common.h | 52 +++++++++++++++++++++++++++++----------------------- + 2 files changed, 37 insertions(+), 23 deletions(-) + +commit 6d4016f1ba48d409800dc3281b93e5cd58c99d9f +Author: Behdad Esfahbod +Date: Wed Mar 7 15:33:14 2012 -0500 + + Make src tests pass again + + src/gen-arabic-table.py | 11 ++++++----- + src/gen-indic-table.py | 9 +++++---- + src/hb-ot-shape-complex-arabic-table.hh | 6 ++++++ + src/hb-ot-shape-complex-indic-table.hh | 4 ++++ + 4 files changed, 21 insertions(+), 9 deletions(-) + +commit 7da435f08cc406080a5ee9b1ab5351db6a93acae +Author: Behdad Esfahbod +Date: Wed Mar 7 15:20:20 2012 -0500 + + Separate Unicode 3.1 and Unicode 3.2 additions + + src/hb-common.h | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit f91136cb528e298651c4a8a8a1d6dc54136e09ce +Author: Behdad Esfahbod +Date: Wed Mar 7 12:56:22 2012 -0500 + + Route three Unicode 6.1 scripts through Indic shaper + + src/hb-ot-shape-complex-private.hh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit f32c0012ad794cd2df669dfc7b0438fafbe38b2d +Author: Behdad Esfahbod +Date: Wed Mar 7 12:53:34 2012 -0500 + + Add Unicode 6.1.0 scripts + + src/hb-common.h | 9 +++++++++ + src/hb-glib.cc | 11 ++++++++++- + 2 files changed, 19 insertions(+), 1 deletion(-) + +commit 50e810cd0e55c25fddb0a2fd0861c51fbf65700e +Author: Behdad Esfahbod +Date: Wed Mar 7 12:49:08 2012 -0500 + + Lydian and Kharoshthi are right-to-left + + src/hb-common.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit a52835635e4a2a12715aff2febb561515a10cd5a +Author: Behdad Esfahbod +Date: Wed Mar 7 12:38:39 2012 -0500 + + Whitespace + + src/hb-common.h | 194 ++++++++++++++++++++++++++++---------------------------- + 1 file changed, 97 insertions(+), 97 deletions(-) + +commit 183224684a45d7dcd7d28510d4383a7a7cb3dff3 +Author: Behdad Esfahbod +Date: Wed Mar 7 12:21:28 2012 -0500 + + Use generic shaper for Buhid + + As requested by Jonathan Kew. + + We need to devise a better mechanism to choose which scripts to + pass through the Indic shaper. Moreover, currently we are storing + data for some scripts in the Indic shaper that are not even going + through that shaper. Need to find a better way... + + src/hb-ot-shape-complex-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cdc8b491a8e7cec5082ca2ad0346c1f41fdd5c92 +Author: Behdad Esfahbod +Date: Wed Mar 7 12:08:33 2012 -0500 + + Update Indic table to Unicode 6.1 data + + src/Makefile.am | 15 +++ + src/gen-indic-table.py | 20 ++-- + src/hb-ot-shape-complex-arabic-table.hh | 35 ------- + src/hb-ot-shape-complex-indic-table.hh | 178 +++++++++++++++++++------------- + 4 files changed, 134 insertions(+), 114 deletions(-) + +commit e3b2e077f549b04779c08a9fedb1f35b9f11075c +Author: Behdad Esfahbod +Date: Wed Mar 7 10:21:24 2012 -0500 + + Typo + + src/hb-ot-shape-normalize.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c346671b6b9b05fa51b95c16212eb29ac69510fa +Author: Behdad Esfahbod +Date: Tue Mar 6 20:47:50 2012 -0500 + + Minor doc fixes + + src/hb-ot-shape-normalize.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 406044986a68676f3050f9350ccc448c615fc685 +Author: Behdad Esfahbod +Date: Tue Mar 6 20:24:31 2012 -0500 + + Add Hebrew diacritics test cases + + From: + https://bugzilla.mozilla.org/show_bug.cgi?id=662055 + + test/shaping/texts/in-tree/shaper-default/MANIFEST | 1 + + .../texts/in-tree/shaper-default/script-hebrew/MANIFEST | 1 + + .../in-tree/shaper-default/script-hebrew/misc/MANIFEST | 1 + + .../shaper-default/script-hebrew/misc/diacritics.txt | 15 +++++++++++++++ + 4 files changed, 18 insertions(+) + +commit 461b9b6347e4f58589f5be82c40a2df61da2c715 +Author: Behdad Esfahbod +Date: Thu Mar 1 18:11:19 2012 -0800 + + Fix cluster formation in Indic + + Makes number of failures against Uniscribe with hi_IN dictionary from + OO.o to go down from 6334 to 4290. Not bad for a one-line change! + + Mozilla Bug 729626 - ASAN: heap-buffer-overflow HTML + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bc71ad4973842f25216b48842a46d6c9cbce6aa3 +Author: Behdad Esfahbod +Date: Thu Mar 1 17:30:29 2012 -0800 + + Fix atomic-int op on Apple + + The OSAtomicAdd32Barrier operator returns the new value, we want the + old value. + + src/hb-blob.cc | 2 +- + src/hb-object-private.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit a1970d9afc15b2c6b7513b923019bb223bd95154 +Author: Behdad Esfahbod +Date: Fri Feb 24 13:51:09 2012 -0500 + + Add support for atomic int and mutex on Apple systems + + So, apparently there's no atomic int 'get' method on Apple. You have to + add(0) to get. And that's not const-friendly. So switch inert-object + checking to a non-atomic get. This, however, is safe, and a negligible + performance boost too. + + src/hb-mutex-private.hh | 14 +++++++++----- + src/hb-object-private.hh | 15 ++++++++++----- + 2 files changed, 19 insertions(+), 10 deletions(-) + +commit 8004429102d7d3a8c42e1cbfe231835de4d3d782 +Author: Behdad Esfahbod +Date: Thu Feb 23 18:47:17 2012 -0500 + + Remove unused hb_atomic_int_set() + + Apparently it can't be implemented on OS X. We weren't using it anyway. + + src/hb-object-private.hh | 4 ---- + 1 file changed, 4 deletions(-) + +commit 45227c10e416894ba7f84fdf72d849cecdb9b898 +Author: Behdad Esfahbod +Date: Thu Feb 23 19:47:43 2012 -0500 + + Add hb-warning.cc. Oops! + + src/hb-warning.cc | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 53 insertions(+) + +commit bd7ff1dec5b92ee59fa060e793f88499adcd8c11 +Author: Behdad Esfahbod +Date: Thu Feb 23 15:06:16 2012 -0500 + + Allow disabling multi-threaded support + + By defining HB_NO_MT. + + Also, only warn once per missing MT feature support. + + Mozilla Bug 666661 - gfx/harfbuzz/src/hb-prive.h - compiler warnings on mac + + src/Makefile.am | 1 + + src/hb-mutex-private.hh | 6 +++--- + src/hb-object-private.hh | 11 +++-------- + 3 files changed, 7 insertions(+), 11 deletions(-) + +commit 634c9e3423a9c23793400d1f56e98070e00b6056 +Author: Behdad Esfahbod +Date: Wed Feb 22 16:43:21 2012 -0500 + + Minor + + src/hb-ot-shape-private.hh | 69 ++++++++++++++++++++++++++-------------------- + 1 file changed, 39 insertions(+), 30 deletions(-) + +commit 514b6f88668da4eab85103c536dabe24b7bc457b +Author: Behdad Esfahbod +Date: Wed Feb 22 16:34:37 2012 -0500 + + Followup: Reorder Hebrew combining classes for better rendering + + Patch from Jonathan Kew. + + Bug 662055 - advanced Hebrew diacritics are shown correctly only in + particular order. + + src/hb-ot-shape-private.hh | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit 6e78607ea71e3e5306f88f227ddba76133d16ed0 +Author: Behdad Esfahbod +Date: Wed Feb 22 16:31:15 2012 -0500 + + Reorder Hebrew combining classes for better rendering + + Patch from Jonathan Kew. + + Bug 662055 - advanced Hebrew diacritics are shown correctly only in particular order + + src/hb-ot-shape-private.hh | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +commit 7a70ca78e06c676befe1ae17199fff1f000f8188 +Author: Behdad Esfahbod +Date: Tue Feb 21 11:31:47 2012 -0500 + + Add test case from https://bugzilla.mozilla.org/show_bug.cgi?id=714067 + + test/shaping/texts/in-tree/shaper-arabic/script-arabic/misc/MANIFEST | 1 + + .../in-tree/shaper-arabic/script-arabic/misc/ligature-diacritics.txt | 1 + + 2 files changed, 2 insertions(+) + +commit f51e167436a51b890ffe3f7f7920498fa287acd9 +Author: Behdad Esfahbod +Date: Mon Jan 30 09:48:33 2012 -0500 + + Minor error handling + + util/options.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit bee74efbdebc4e46ce57daa8a88bcf06b13411fe +Author: Behdad Esfahbod +Date: Fri Jan 27 02:14:08 2012 -0500 + + Update git.mk to new upstream + + git.mk | 44 +++++++++++++++++++++++++++++++++----------- + 1 file changed, 33 insertions(+), 11 deletions(-) + +commit 134aa7bc7e3f9b9de76c9de2ed4b7344a7b323f9 +Author: Behdad Esfahbod +Date: Fri Jan 27 02:09:40 2012 -0500 + + Make checks more OS X friendly + + src/check-internal-symbols.sh | 21 +++++++++++++-------- + src/check-libstdc++.sh | 21 +++++++++++++-------- + 2 files changed, 26 insertions(+), 16 deletions(-) + +commit 6152199368399bf98368ea3c794fa760b49756ba +Author: Behdad Esfahbod +Date: Fri Jan 27 01:57:59 2012 -0500 + + Fix check-header-guards on OS X + + src/check-header-guards.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c62e41b6aad1fc56225d0e53d6d4abd0f005fe3b +Author: Behdad Esfahbod +Date: Fri Jan 27 02:20:58 2012 -0500 + + Minor + + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 1a5a91dc0d8bf4b72a2f22dc6300b06ad7000b79 +Author: Behdad Esfahbod +Date: Sun Jan 22 19:57:00 2012 -0500 + + Add a few more tests + + .../in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt | 3 +++ + .../shaper-indic/south-east-asian/script-thai/misc/misc.txt | 9 +++++++++ + 2 files changed, 12 insertions(+) + +commit 1795f3a222a85cdf80c78a0e9181d23dd1673876 +Author: Behdad Esfahbod +Date: Sun Jan 22 19:29:45 2012 -0500 + + Add a couple Thai test cases from Thep + + test/shaping/texts/in-tree/shaper-indic/south-east-asian/MANIFEST | 1 + + .../texts/in-tree/shaper-indic/south-east-asian/script-thai/MANIFEST | 1 + + .../in-tree/shaper-indic/south-east-asian/script-thai/misc/MANIFEST | 1 + + .../in-tree/shaper-indic/south-east-asian/script-thai/misc/misc.txt | 2 ++ + 4 files changed, 5 insertions(+) + +commit ec3f506682fc6e2d7d7455e49d6c82ac9dd0c660 +Author: Behdad Esfahbod +Date: Sun Jan 22 19:10:55 2012 -0500 + + Add Devanagari test from Tom Hacohen + + .../texts/in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 71be4ca3dd5eaaca31957e34fef11f6aeb4aebdf +Author: Behdad Esfahbod +Date: Sun Jan 22 16:26:49 2012 -0500 + + Also ignore "ChangeLog" in manifests + + test/shaping/hb_test_tools.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3c9a39ecd65990f2c7b29bb741c6a538fa425531 +Author: Behdad Esfahbod +Date: Sun Jan 22 16:21:19 2012 -0500 + + Remove newline + + test/shaping/hb_test_tools.py | 2 ++ + 1 file changed, 2 insertions(+) + +commit e4ccbfe276db5ed098ddcf78a7bb8f2da4263128 +Author: Behdad Esfahbod +Date: Sun Jan 22 16:07:32 2012 -0500 + + Allow --color=html in hb-diff + + Not that useful right now as we don't escape < and >. Perhaps + another tool can be added to convert the ANSI output to HTML. + + test/shaping/hb-diff | 2 +- + test/shaping/hb_test_tools.py | 22 +++++++++++++++++----- + 2 files changed, 18 insertions(+), 6 deletions(-) + +commit 71632c96daa4ba15e13f4d9e7f2c121d0162614e +Author: Behdad Esfahbod +Date: Sun Jan 22 15:31:44 2012 -0500 + + Fallback to Latin script if the font has no other usable scripts + + Patch and description from Jonathan Kew: + + It turns out that some legacy Thai fonts provide OpenType substitution + features to implement mark positioning, but (incorrectly) put those + features/lookups under the 'latn' script tag instead of using 'thai' (or + possibly 'DFLT'). See + https://bugzilla.mozilla.org/show_bug.cgi?id=719366 for an example and + more detailed description. + + Although this is really a font bug, I suggest that we could improve the + rendering of such fonts by looking for the 'latn' as a fallback if + neither the requested script nor "default" is found in + hb_ot_layout_table_choose_script. Suggested patch against harfbuzz + master is attached. + + This does _not_ affect the other kind of legacy Thai font, where custom + code to support vendor-specific PUA codepoints would be needed. I'm not + keen to go down that path; IMO, such fonts should be ruthlessly stamped + out in favour of standards-based solutions. :) + + JK + + src/hb-ot-layout.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 8f80f93491be73f05eba908591c856339acda51e +Author: Behdad Esfahbod +Date: Sat Jan 21 20:03:25 2012 -0500 + + More shoveling around + + test/shaping/hb-diff-filter-failures | 2 +- + test/shaping/hb-manifest-read | 2 +- + test/shaping/hb_test_tools.py | 27 ++++++++++++++++----------- + 3 files changed, 18 insertions(+), 13 deletions(-) + +commit c78c6e9844a23144ce7fa29afbf57b74587bfcd0 +Author: Behdad Esfahbod +Date: Sat Jan 21 19:55:16 2012 -0500 + + Cleanup + + test/shaping/hb-manifest-read | 2 +- + test/shaping/hb_test_tools.py | 13 ++++++++----- + 2 files changed, 9 insertions(+), 6 deletions(-) + +commit ab94a9c542f7ec9143335b73493ccb75d4586a3a +Author: Behdad Esfahbod +Date: Sat Jan 21 19:43:58 2012 -0500 + + Distribute testing tools + + test/shaping/Makefile.am | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +commit 3e86feb54c94e46b60168fd2a4773183eb1354b4 +Author: Behdad Esfahbod +Date: Sat Jan 21 19:40:30 2012 -0500 + + Speed up colorless diff + + test/shaping/hb_test_tools.py | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 1e58df603457cb4b57da78b5d4a8df66aa7d7be4 +Author: Behdad Esfahbod +Date: Sat Jan 21 19:37:31 2012 -0500 + + Cleanup manifest code + + test/shaping/hb_test_tools.py | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +commit 956d552e108eeb50bb3ad21588830af7a2f3862a +Author: Behdad Esfahbod +Date: Sat Jan 21 19:31:51 2012 -0500 + + Port hb-manifest-update to Python + + test/shaping/hb-manifest-update | 23 +++-------------------- + test/shaping/hb_test_tools.py | 38 ++++++++++++++++++++++++++++++-------- + 2 files changed, 33 insertions(+), 28 deletions(-) + +commit 3a34e9e351ed0ee3eb27f9c0f154bc227f1226bf +Author: Behdad Esfahbod +Date: Sat Jan 21 19:15:41 2012 -0500 + + Ignore Broken Pipe errors + + test/shaping/hb_test_tools.py | 76 +++++++++++++++++++++++++++---------------- + 1 file changed, 48 insertions(+), 28 deletions(-) + +commit d5300241680844f5625f32792f7dd7181ed05f9b +Author: Behdad Esfahbod +Date: Sat Jan 21 19:07:22 2012 -0500 + + [util] Make clusters work with char offset instead of UTF-8 offset + + This means the --features indices also refer to char position + instead of byte position now. Same for cluster values reported + by hb-shape. + + Will add an option for byte indices later. + + util/options.cc | 7 +++++-- + util/options.hh | 12 ++++++++++++ + 2 files changed, 17 insertions(+), 2 deletions(-) + +commit 0f68f4a0b5ee78cbdb2a89a9a1a9125afe72ed2f +Author: Behdad Esfahbod +Date: Sat Jan 21 18:59:48 2012 -0500 + + Correctly print out Unicode strings + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f22089ac24f43ff048c2a0f1c1f604ae3a96be8b +Author: Behdad Esfahbod +Date: Fri Jan 20 21:21:47 2012 -0500 + + Misc fixes + + test/shaping/hb-diff | 8 ++++---- + test/shaping/hb_test_tools.py | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 96968bfae5ce61a0a098bf0e6acd2210a309a499 +Author: Behdad Esfahbod +Date: Fri Jan 20 21:16:34 2012 -0500 + + Port hb-manifest-read to Python + + test/shaping/hb-diff-filter-failures | 2 +- + test/shaping/hb-manifest-read | 37 +++------------------------ + test/shaping/hb_test_tools.py | 49 ++++++++++++++++++++++++++++++++---- + 3 files changed, 48 insertions(+), 40 deletions(-) + +commit a59ed46fa4f7b76605f8ce6e75783ead406468f5 +Author: Behdad Esfahbod +Date: Fri Jan 20 20:56:32 2012 -0500 + + Add final residues from test-shape-complex + + .../shaping/texts/in-tree/shaper-arabic/script-nko/misc/MANIFEST | 1 + + .../shaping/texts/in-tree/shaper-arabic/script-nko/misc/misc.txt | 5 +++++ + test/shaping/texts/in-tree/shaper-default/MANIFEST | 1 + + .../texts/in-tree/shaper-default/script-linear-b/MANIFEST | 1 + + .../texts/in-tree/shaper-default/script-linear-b/misc/MANIFEST | 1 + + .../texts/in-tree/shaper-default/script-linear-b/misc/misc.txt | 1 + + test/shaping/texts/in-tree/shaper-indic/MANIFEST | 1 + + .../shaping/texts/in-tree/shaper-indic/south-east-asian/MANIFEST | 1 + + .../in-tree/shaper-indic/south-east-asian/script-khmer/MANIFEST | 1 + + .../shaper-indic/south-east-asian/script-khmer/misc/MANIFEST | 1 + + .../shaper-indic/south-east-asian/script-khmer/misc/misc.txt | 9 +++++++++ + 11 files changed, 23 insertions(+) + +commit 820e0ed318d9b187a131baa9491d5d390ec33ef4 +Author: Behdad Esfahbod +Date: Fri Jan 20 20:51:52 2012 -0500 + + Add Punjabi tests from test-shape-complex also + + .../texts/in-tree/shaper-indic/indic/script-punjabi/misc/MANIFEST | 1 + + .../texts/in-tree/shaper-indic/indic/script-punjabi/misc/misc.txt | 1 + + 2 files changed, 2 insertions(+) + +commit a7d71c105772fb612871b4cae59bdae47bbc8751 +Author: Behdad Esfahbod +Date: Fri Jan 20 20:50:09 2012 -0500 + + Add Tamil test data from Muguntharaj Subramanian + + .../shaper-indic/indic/script-tamil/misc/MANIFEST | 1 + + .../shaper-indic/indic/script-tamil/misc/misc.txt | 43 ++++++++++++++++++++++ + 2 files changed, 44 insertions(+) + +commit 5992a9941e7f19181df1e34e79e514ccedc3d284 +Author: Behdad Esfahbod +Date: Fri Jan 20 20:48:14 2012 -0500 + + Import test data from late test-shape-complex + + .../in-tree/shaper-arabic/script-arabic/MANIFEST | 1 + + .../shaper-arabic/script-arabic/misc/MANIFEST | 0 + .../in-tree/shaper-arabic/script-mandaic/MANIFEST | 1 + + .../shaper-arabic/script-mandaic/misc/MANIFEST | 0 + .../shaper-arabic/script-mongolian/MANIFEST | 1 + + .../shaper-arabic/script-mongolian/misc/MANIFEST | 0 + .../in-tree/shaper-arabic/script-nko/MANIFEST | 1 + + .../in-tree/shaper-arabic/script-nko/misc/MANIFEST | 0 + .../in-tree/shaper-arabic/script-syriac/MANIFEST | 1 + + .../shaper-arabic/script-syriac/misc/MANIFEST | 0 + .../shaper-indic/indic/script-assamese/MANIFEST | 1 + + .../indic/script-assamese/misc/MANIFEST | 0 + .../shaper-indic/indic/script-bengali/MANIFEST | 1 + + .../indic/script-bengali/misc/MANIFEST | 1 + + .../indic/script-bengali/misc/misc.txt | 48 ++++++++++++++++++++++ + .../shaper-indic/indic/script-devanagari/MANIFEST | 1 + + .../indic/script-devanagari/misc/MANIFEST | 1 + + .../indic/script-devanagari/misc/misc.txt | 23 +++++++++++ + .../shaper-indic/indic/script-gujarati/MANIFEST | 1 + + .../indic/script-gujarati/misc/MANIFEST | 0 + .../shaper-indic/indic/script-kannada/MANIFEST | 1 + + .../indic/script-kannada/misc/MANIFEST | 1 + + .../indic/script-kannada/misc/misc.txt | 17 ++++++++ + .../shaper-indic/indic/script-malayalam/MANIFEST | 1 + + .../indic/script-malayalam/misc/MANIFEST | 1 + + .../indic/script-malayalam/misc/misc.txt | 22 ++++++++++ + .../shaper-indic/indic/script-oriya/MANIFEST | 1 + + .../shaper-indic/indic/script-oriya/misc/MANIFEST | 1 + + .../shaper-indic/indic/script-oriya/misc/misc.txt | 28 +++++++++++++ + .../shaper-indic/indic/script-punjabi/MANIFEST | 1 + + .../indic/script-punjabi/misc/MANIFEST | 0 + .../shaper-indic/indic/script-sinhala/MANIFEST | 1 + + .../indic/script-sinhala/misc/MANIFEST | 1 + + .../indic/script-sinhala/misc/misc.txt | 6 +++ + .../shaper-indic/indic/script-tamil/MANIFEST | 1 + + .../shaper-indic/indic/script-tamil/misc/MANIFEST | 0 + .../shaper-indic/indic/script-telugu/MANIFEST | 1 + + .../shaper-indic/indic/script-telugu/misc/MANIFEST | 1 + + .../shaper-indic/indic/script-telugu/misc/misc.txt | 11 +++++ + 39 files changed, 178 insertions(+) + +commit 46ac45647760984c6220f04ba4521038e628b169 +Author: Behdad Esfahbod +Date: Fri Jan 20 19:32:17 2012 -0500 + + Fix Unicode encoding issue + + test/shaping/hb_test_tools.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit ad34e39a4a320310b1edd9fc4d7e740373510c69 +Author: Behdad Esfahbod +Date: Fri Jan 20 18:39:27 2012 -0500 + + Make test tools interactive + + By bypassing readlines() buffering. + + test/shaping/hb_test_tools.py | 33 +++++++++++++++++++++++++++------ + 1 file changed, 27 insertions(+), 6 deletions(-) + +commit 91540a7d97051a3d6e97fdcd1e98af23e0780cdd +Author: Behdad Esfahbod +Date: Fri Jan 20 18:27:52 2012 -0500 + + Move most testing logic into hb_test_tools.py + + The actual utils are one-liners now. + + test/shaping/hb-diff | 77 ++------------- + test/shaping/hb-diff-filter-failures | 27 +----- + test/shaping/hb-unicode-decode | 18 +--- + test/shaping/hb-unicode-encode | 21 +--- + test/shaping/hb-unicode-prettyname | 53 +---------- + test/shaping/hb_test_tools.py | 180 +++++++++++++++++++++++++++++++++++ + 6 files changed, 197 insertions(+), 179 deletions(-) + +commit 66aa080033dcff07b8bb5e7b1f0e3511f067d6c1 +Author: Behdad Esfahbod +Date: Fri Jan 20 17:36:10 2012 -0500 + + Remove test-shape-complex + + New shaping testsuite and framework coming. + + test/api/Makefile.am | 6 - + test/api/test-shape-complex.c | 1237 ------------------------------------ + test/shaping/hb-unicode-prettyname | 1 + + 3 files changed, 1 insertion(+), 1243 deletions(-) + +commit ed459bfb63c58b59fc0dbe25021c396e8ef8683c +Author: Behdad Esfahbod +Date: Fri Jan 20 17:24:05 2012 -0500 + + Add hb-unicode-encode + + test/shaping/hb-unicode-encode | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +commit d8134bc017ca3383e0978ddee57070eb3aab8964 +Author: Behdad Esfahbod +Date: Fri Jan 20 17:18:59 2012 -0500 + + [hb-shape] Add parantheses around --show-text output + + util/options.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit b12c4d43614199f8910a06507603f6c431d9df67 +Author: Behdad Esfahbod +Date: Fri Jan 20 17:17:44 2012 -0500 + + Add hb-diff-filter-failures + + test/shaping/hb-diff-filter-failures | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +commit d4bffbc55bf4c23ab5c7f46af613aeecc79ac515 +Author: Behdad Esfahbod +Date: Fri Jan 20 17:16:35 2012 -0500 + + Move + + test/shaping/texts/MANIFEST | 4 +--- + test/shaping/texts/in-tree/MANIFEST | 3 +++ + test/shaping/texts/{ => in-tree}/shaper-arabic/MANIFEST | 0 + test/shaping/texts/{ => in-tree}/shaper-arabic/script-arabic/MANIFEST | 0 + .../shaping/texts/{ => in-tree}/shaper-arabic/script-mandaic/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-arabic/script-mongolian/MANIFEST | 0 + test/shaping/texts/{ => in-tree}/shaper-arabic/script-nko/MANIFEST | 0 + test/shaping/texts/{ => in-tree}/shaper-arabic/script-syriac/MANIFEST | 0 + test/shaping/texts/{ => in-tree}/shaper-default/MANIFEST | 0 + test/shaping/texts/{ => in-tree}/shaper-indic/MANIFEST | 0 + test/shaping/texts/{ => in-tree}/shaper-indic/indic/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-assamese/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-assamese/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-assamese/utrrs/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-assamese/utrrs/README | 0 + .../{ => in-tree}/shaper-indic/indic/script-assamese/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-assamese/utrrs/codepoint/MANIFEST | 0 + .../script-assamese/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../script-assamese/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../shaper-indic/indic/script-assamese/utrrs/gpos/MANIFEST | 0 + .../indic/script-assamese/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-assamese/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-bengali/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-bengali/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-bengali/utrrs/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-bengali/utrrs/README | 0 + .../{ => in-tree}/shaper-indic/indic/script-bengali/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-bengali/utrrs/codepoint/MANIFEST | 0 + .../script-bengali/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../script-bengali/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../shaper-indic/indic/script-bengali/utrrs/gpos/MANIFEST | 0 + .../indic/script-bengali/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-bengali/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-devanagari/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-devanagari/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-devanagari/utrrs/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-devanagari/utrrs/README | 0 + .../{ => in-tree}/shaper-indic/indic/script-devanagari/utrrs/SOURCES | 0 + .../codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../codepoint/IndicFontFeatureCodepoint-DevnagariSpecificAddition.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-GenericPunctuation.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-devanagari/utrrs/codepoint/MANIFEST | 0 + .../script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../shaper-indic/indic/script-devanagari/utrrs/gpos/MANIFEST | 0 + .../indic/script-devanagari/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-devanagari/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-gujarati/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-gujarati/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-gujarati/utrrs/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-gujarati/utrrs/README | 0 + .../{ => in-tree}/shaper-indic/indic/script-gujarati/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-gujarati/utrrs/codepoint/MANIFEST | 0 + .../script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../shaper-indic/indic/script-gujarati/utrrs/gpos/MANIFEST | 0 + .../indic/script-gujarati/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-gujarati/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-kannada/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-kannada/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-kannada/utrrs/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-kannada/utrrs/README | 0 + .../{ => in-tree}/shaper-indic/indic/script-kannada/utrrs/SOURCES | 0 + .../codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-kannada/utrrs/codepoint/MANIFEST | 0 + .../script-kannada/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../shaper-indic/indic/script-kannada/utrrs/gpos/MANIFEST | 0 + .../indic/script-kannada/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-kannada/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-malayalam/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-malayalam/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-malayalam/utrrs/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-malayalam/utrrs/README | 0 + .../{ => in-tree}/shaper-indic/indic/script-malayalam/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-malayalam/utrrs/codepoint/MANIFEST | 0 + .../indic/script-malayalam/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-malayalam/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-oriya/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-oriya/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-oriya/utrrs/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-oriya/utrrs/README | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-oriya/utrrs/SOURCES | 0 + .../codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-OriyaSpecific.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-oriya/utrrs/codepoint/MANIFEST | 0 + .../indic/script-oriya/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../{ => in-tree}/shaper-indic/indic/script-oriya/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-punjabi/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-punjabi/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-punjabi/utrrs/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-punjabi/utrrs/README | 0 + .../{ => in-tree}/shaper-indic/indic/script-punjabi/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-GurmukhiSpecific.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-punjabi/utrrs/codepoint/MANIFEST | 0 + .../script-punjabi/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../script-punjabi/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../shaper-indic/indic/script-punjabi/utrrs/gpos/MANIFEST | 0 + .../indic/script-punjabi/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-punjabi/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-sinhala/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-sinhala/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-sinhala/utrrs/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-sinhala/utrrs/README | 0 + .../{ => in-tree}/shaper-indic/indic/script-sinhala/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Punctuation.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-sinhala/utrrs/codepoint/MANIFEST | 0 + .../indic/script-sinhala/utrrs/gpos/IndicFontFeatureGPOS.txt | 0 + .../shaper-indic/indic/script-sinhala/utrrs/gpos/MANIFEST | 0 + .../indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Conjunct.txt | 0 + .../script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Rakaaraansaya.txt | 0 + .../indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Repaya.txt | 0 + .../script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Special-Cases.txt | 0 + .../utrrs/gsub/IndicFontFeatureGSUB-TouchingLetters.txt | 0 + .../indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Yansaya.txt | 0 + .../indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-sinhala/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-tamil/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-tamil/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-tamil/utrrs/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-tamil/utrrs/README | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-tamil/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-CurrencySymbols.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Numerics.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Symbols.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-TamilSymbol.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-tamil/utrrs/codepoint/MANIFEST | 0 + .../indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../{ => in-tree}/shaper-indic/indic/script-tamil/utrrs/gpos/MANIFEST | 0 + .../indic/script-tamil/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../{ => in-tree}/shaper-indic/indic/script-tamil/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-telugu/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-telugu/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-telugu/utrrs/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-telugu/utrrs/README | 0 + .../{ => in-tree}/shaper-indic/indic/script-telugu/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-telugu/utrrs/codepoint/MANIFEST | 0 + .../indic/script-telugu/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../shaper-indic/indic/script-telugu/utrrs/gpos/MANIFEST | 0 + .../indic/script-telugu/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-telugu/utrrs/gsub/MANIFEST | 0 + 212 files changed, 4 insertions(+), 3 deletions(-) + +commit 45f640c98d752161e51eda63061d70fad9ab9f68 +Author: Behdad Esfahbod +Date: Fri Jan 20 14:24:21 2012 -0500 + + Minor + + test/shaping/hb-diff | 35 ++++++++++++++++++++--------------- + 1 file changed, 20 insertions(+), 15 deletions(-) + +commit 47ca766a9cbdfb304f60e23a4dee0a155075a277 +Author: Behdad Esfahbod +Date: Fri Jan 20 14:21:53 2012 -0500 + + Minor + + test/shaping/hb-unicode-decode | 2 +- + test/shaping/hb-unicode-prettyname | 5 ++--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +commit 8f1db07894674b02c36ca9352e666b4618ee8832 +Author: Behdad Esfahbod +Date: Fri Jan 20 13:57:57 2012 -0500 + + [test/shaping] Add some Indic test data for the new test suite + + Imported from UTRRS. + + test/shaping/texts/shaper-indic/indic/MANIFEST | 2 +- + .../shaper-indic/indic/script-assamese/MANIFEST | 1 + + .../indic/script-assamese/utrrs/LICENSE | 19 + + .../indic/script-assamese/utrrs/MANIFEST | 3 + + .../indic/script-assamese/utrrs/README | 13 + + .../indic/script-assamese/utrrs/SOURCES | 2 + + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 4 + + .../IndicFontFeatureCodepoint-Consonants.txt | 40 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 10 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 11 + + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 + + .../indic/script-assamese/utrrs/codepoint/MANIFEST | 7 + + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 59 + + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 131 ++ + .../indic/script-assamese/utrrs/gpos/MANIFEST | 2 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 139 ++ + .../indic/script-assamese/utrrs/gsub/MANIFEST | 1 + + .../shaper-indic/indic/script-bengali/MANIFEST | 1 + + .../indic/script-bengali/utrrs/LICENSE | 19 + + .../indic/script-bengali/utrrs/MANIFEST | 3 + + .../shaper-indic/indic/script-bengali/utrrs/README | 13 + + .../indic/script-bengali/utrrs/SOURCES | 2 + + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 1 + + .../IndicFontFeatureCodepoint-Consonants.txt | 36 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 10 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 12 + + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 + + .../indic/script-bengali/utrrs/codepoint/MANIFEST | 7 + + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 58 + + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 119 ++ + .../indic/script-bengali/utrrs/gpos/MANIFEST | 2 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 215 +++ + .../indic/script-bengali/utrrs/gsub/MANIFEST | 1 + + .../shaper-indic/indic/script-devanagari/MANIFEST | 1 + + .../indic/script-devanagari/utrrs/LICENSE | 19 + + .../indic/script-devanagari/utrrs/MANIFEST | 3 + + .../indic/script-devanagari/utrrs/README | 13 + + .../indic/script-devanagari/utrrs/SOURCES | 2 + + ...icFontFeatureCodepoint-AdditionalConsonants.txt | 8 + + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 4 + + .../IndicFontFeatureCodepoint-Consonants.txt | 45 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 14 + + ...tFeatureCodepoint-DevnagariSpecificAddition.txt | 1 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + ...ndicFontFeatureCodepoint-GenericPunctuation.txt | 2 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 16 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 10 + + .../script-devanagari/utrrs/codepoint/MANIFEST | 9 + + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 185 +++ + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 185 +++ + .../indic/script-devanagari/utrrs/gpos/MANIFEST | 2 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 1367 ++++++++++++++++++++ + .../indic/script-devanagari/utrrs/gsub/MANIFEST | 1 + + .../shaper-indic/indic/script-gujarati/MANIFEST | 1 + + .../indic/script-gujarati/utrrs/LICENSE | 19 + + .../indic/script-gujarati/utrrs/MANIFEST | 3 + + .../indic/script-gujarati/utrrs/README | 13 + + .../indic/script-gujarati/utrrs/SOURCES | 2 + + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 1 + + .../IndicFontFeatureCodepoint-Consonants.txt | 34 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 12 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 13 + + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 7 + + .../indic/script-gujarati/utrrs/codepoint/MANIFEST | 7 + + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 170 +++ + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 170 +++ + .../indic/script-gujarati/utrrs/gpos/MANIFEST | 2 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 1156 +++++++++++++++++ + .../indic/script-gujarati/utrrs/gsub/MANIFEST | 1 + + .../shaper-indic/indic/script-kannada/MANIFEST | 1 + + .../indic/script-kannada/utrrs/LICENSE | 19 + + .../indic/script-kannada/utrrs/MANIFEST | 3 + + .../shaper-indic/indic/script-kannada/utrrs/README | 13 + + .../indic/script-kannada/utrrs/SOURCES | 2 + + ...icFontFeatureCodepoint-AdditionalConsonants.txt | 1 + + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 4 + + .../IndicFontFeatureCodepoint-Consonants.txt | 40 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 13 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 14 + + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 9 + + .../indic/script-kannada/utrrs/codepoint/MANIFEST | 8 + + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 188 +++ + .../indic/script-kannada/utrrs/gpos/MANIFEST | 1 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 306 +++++ + .../indic/script-kannada/utrrs/gsub/MANIFEST | 1 + + .../shaper-indic/indic/script-malayalam/MANIFEST | 1 + + .../indic/script-malayalam/utrrs/LICENSE | 19 + + .../indic/script-malayalam/utrrs/MANIFEST | 2 + + .../indic/script-malayalam/utrrs/README | 13 + + .../indic/script-malayalam/utrrs/SOURCES | 2 + + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 2 + + .../IndicFontFeatureCodepoint-Consonants.txt | 36 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 12 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 14 + + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 4 + + .../script-malayalam/utrrs/codepoint/MANIFEST | 7 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 254 ++++ + .../indic/script-malayalam/utrrs/gsub/MANIFEST | 1 + + .../texts/shaper-indic/indic/script-oriya/MANIFEST | 1 + + .../shaper-indic/indic/script-oriya/utrrs/LICENSE | 19 + + .../shaper-indic/indic/script-oriya/utrrs/MANIFEST | 2 + + .../shaper-indic/indic/script-oriya/utrrs/README | 13 + + .../shaper-indic/indic/script-oriya/utrrs/SOURCES | 2 + + ...icFontFeatureCodepoint-AdditionalConsonants.txt | 3 + + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 2 + + .../IndicFontFeatureCodepoint-Consonants.txt | 34 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 12 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 12 + + .../IndicFontFeatureCodepoint-OriyaSpecific.txt | 2 + + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 8 + + .../indic/script-oriya/utrrs/codepoint/MANIFEST | 9 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 170 +++ + .../indic/script-oriya/utrrs/gsub/MANIFEST | 1 + + .../shaper-indic/indic/script-punjabi/MANIFEST | 1 + + .../indic/script-punjabi/utrrs/LICENSE | 19 + + .../indic/script-punjabi/utrrs/MANIFEST | 3 + + .../shaper-indic/indic/script-punjabi/utrrs/README | 13 + + .../indic/script-punjabi/utrrs/SOURCES | 2 + + .../IndicFontFeatureCodepoint-Consonants.txt | 38 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 9 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + .../IndicFontFeatureCodepoint-GurmukhiSpecific.txt | 6 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 10 + + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 + + .../indic/script-punjabi/utrrs/codepoint/MANIFEST | 7 + + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 22 + + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 2 + + .../indic/script-punjabi/utrrs/gpos/MANIFEST | 2 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 152 +++ + .../indic/script-punjabi/utrrs/gsub/MANIFEST | 1 + + .../shaper-indic/indic/script-sinhala/MANIFEST | 1 + + .../indic/script-sinhala/utrrs/LICENSE | 19 + + .../indic/script-sinhala/utrrs/MANIFEST | 3 + + .../shaper-indic/indic/script-sinhala/utrrs/README | 13 + + .../indic/script-sinhala/utrrs/SOURCES | 2 + + .../IndicFontFeatureCodepoint-Consonants.txt | 41 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 17 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 18 + + .../IndicFontFeatureCodepoint-Punctuation.txt | 1 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 3 + + .../indic/script-sinhala/utrrs/codepoint/MANIFEST | 5 + + .../utrrs/gpos/IndicFontFeatureGPOS.txt | 162 +++ + .../indic/script-sinhala/utrrs/gpos/MANIFEST | 1 + + .../utrrs/gsub/IndicFontFeatureGSUB-Conjunct.txt | 1 + + .../gsub/IndicFontFeatureGSUB-Rakaaraansaya.txt | 41 + + .../utrrs/gsub/IndicFontFeatureGSUB-Repaya.txt | 42 + + .../gsub/IndicFontFeatureGSUB-Special-Cases.txt | 2 + + .../gsub/IndicFontFeatureGSUB-TouchingLetters.txt | 1 + + .../utrrs/gsub/IndicFontFeatureGSUB-Yansaya.txt | 41 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 1 + + .../indic/script-sinhala/utrrs/gsub/MANIFEST | 7 + + .../texts/shaper-indic/indic/script-tamil/MANIFEST | 1 + + .../shaper-indic/indic/script-tamil/utrrs/LICENSE | 19 + + .../shaper-indic/indic/script-tamil/utrrs/MANIFEST | 3 + + .../shaper-indic/indic/script-tamil/utrrs/README | 13 + + .../shaper-indic/indic/script-tamil/utrrs/SOURCES | 2 + + .../IndicFontFeatureCodepoint-Consonants.txt | 23 + + .../IndicFontFeatureCodepoint-CurrencySymbols.txt | 1 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 11 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 12 + + .../IndicFontFeatureCodepoint-Numerics.txt | 3 + + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + + .../IndicFontFeatureCodepoint-Symbols.txt | 6 + + .../IndicFontFeatureCodepoint-TamilSymbol.txt | 1 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 4 + + .../indic/script-tamil/utrrs/codepoint/MANIFEST | 10 + + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 64 + + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 44 + + .../indic/script-tamil/utrrs/gpos/MANIFEST | 2 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 4 + + .../indic/script-tamil/utrrs/gsub/MANIFEST | 1 + + .../shaper-indic/indic/script-telugu/MANIFEST | 1 + + .../shaper-indic/indic/script-telugu/utrrs/LICENSE | 19 + + .../indic/script-telugu/utrrs/MANIFEST | 3 + + .../shaper-indic/indic/script-telugu/utrrs/README | 13 + + .../shaper-indic/indic/script-telugu/utrrs/SOURCES | 2 + + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 2 + + .../IndicFontFeatureCodepoint-Consonants.txt | 38 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 13 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 14 + + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 + + .../indic/script-telugu/utrrs/codepoint/MANIFEST | 7 + + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 385 ++++++ + .../indic/script-telugu/utrrs/gpos/MANIFEST | 1 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 287 ++++ + .../indic/script-telugu/utrrs/gsub/MANIFEST | 1 + + 202 files changed, 7581 insertions(+), 1 deletion(-) + +commit 11267aef364b1cc5683ce65aaf544b7f2a127fb3 +Author: Behdad Esfahbod +Date: Fri Jan 20 13:57:14 2012 -0500 + + Fix + + test/shaping/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4e84ce48d5d41cf1bad2fb8774e5c66745b0e75e +Author: Behdad Esfahbod +Date: Fri Jan 20 13:50:55 2012 -0500 + + Move hb-diff to test/shaping/ + + {util => test/shaping}/hb-diff | 0 + util/Makefile.am | 2 -- + 2 files changed, 2 deletions(-) + +commit f868e1b84d2f73688d4d6558d44610b1ac75ec13 +Author: Behdad Esfahbod +Date: Fri Jan 20 13:50:05 2012 -0500 + + Add hb-unicode-decode + + test/shaping/{hb-read-manifest => hb-manifest-read} | 0 + .../{hb-update-manifests => hb-manifest-update} | 0 + test/shaping/hb-unicode-decode | 19 +++++++++++++++++++ + 3 files changed, 19 insertions(+) + +commit 9ab23ef4749b51e60464b9ef2a92739cdc2b36ba +Author: Behdad Esfahbod +Date: Fri Jan 20 13:49:56 2012 -0500 + + Minor + + test/shaping/hb-unicode-prettyname | 5 +++++ + 1 file changed, 5 insertions(+) + +commit c8d81db03335192f20f08ab8fabe9869fd7350a2 +Author: Behdad Esfahbod +Date: Fri Jan 20 13:39:27 2012 -0500 + + Recognize more characters + + test/shaping/hb-unicode-prettyname | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 0016d4662d486fa32c2191df801a2792f44b273c +Author: Behdad Esfahbod +Date: Fri Jan 20 13:31:59 2012 -0500 + + [test] Make hb-unicode-prettyname take a --stdin option + + test/shaping/hb-unicode-prettyname | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +commit ad8c6446f2e0d21d065203924467f6a2c418401e +Author: Behdad Esfahbod +Date: Thu Jan 19 20:28:31 2012 -0500 + + [test/shaping] Add hb-unicode-prettyname + + test/shaping/hb-unicode-prettyname | 38 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +commit e900869b0f373d25b72d966338beb6cbc53e6446 +Author: Behdad Esfahbod +Date: Thu Jan 19 20:28:15 2012 -0500 + + [test/shaping] Add hb-read-manifest + + test/shaping/hb-read-manifest | 36 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 36 insertions(+) + +commit a211cd3ffce3aa100e92d837384bbaa9decf6b09 +Author: Behdad Esfahbod +Date: Thu Jan 19 20:27:53 2012 -0500 + + Ignore AUTHORS also + + test/shaping/hb-update-manifests | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c91c4fa47140c0d6191241a832fc534b1c1514ce +Author: Behdad Esfahbod +Date: Thu Jan 19 17:51:57 2012 -0500 + + [hb-shape] Change glyphstring brackets from to [/] + + Sorry for the disruption but I need this to differentiate from the + Unicode string. + + util/options.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 36fe87d1b4bf8317074a597501d1ee52c0bec38d +Author: Behdad Esfahbod +Date: Thu Jan 19 16:55:26 2012 -0500 + + More Indic tests from Pravin + + test/api/test-shape-complex.c | 48 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+) + +commit a33e46cf7d9862856fd7ecb04e047cc58a9785c8 +Author: Behdad Esfahbod +Date: Thu Jan 19 15:43:48 2012 -0500 + + [test/shaping] Add hb-update-manifests + + test/shaping/Makefile.am | 6 ++---- + test/shaping/hb-update-manifests | 22 ++++++++++++++++++++++ + test/shaping/texts/shaper-indic/indic/MANIFEST | 1 + + 3 files changed, 25 insertions(+), 4 deletions(-) + +commit d4de562adf691425b15e3e9c0eec035feaa60413 +Author: Behdad Esfahbod +Date: Thu Jan 19 15:21:04 2012 -0500 + + Start adding new shaping test suite together + + configure.ac | 1 + + test/Makefile.am | 2 +- + test/shaping/Makefile.am | 10 ++++++++++ + test/shaping/texts/MANIFEST | 3 +++ + test/shaping/texts/shaper-arabic/MANIFEST | 5 +++++ + test/shaping/texts/shaper-arabic/script-arabic/MANIFEST | 0 + test/shaping/texts/shaper-arabic/script-mandaic/MANIFEST | 0 + test/shaping/texts/shaper-arabic/script-mongolian/MANIFEST | 0 + test/shaping/texts/shaper-arabic/script-nko/MANIFEST | 0 + test/shaping/texts/shaper-arabic/script-syriac/MANIFEST | 0 + test/shaping/texts/shaper-default/MANIFEST | 0 + test/shaping/texts/shaper-indic/MANIFEST | 1 + + test/shaping/texts/shaper-indic/indic/MANIFEST | 10 ++++++++++ + test/shaping/texts/shaper-indic/indic/script-assamese/MANIFEST | 0 + test/shaping/texts/shaper-indic/indic/script-bengali/MANIFEST | 0 + .../texts/shaper-indic/indic/script-devanagari/MANIFEST | 0 + test/shaping/texts/shaper-indic/indic/script-gujarati/MANIFEST | 0 + test/shaping/texts/shaper-indic/indic/script-kannada/MANIFEST | 0 + .../shaping/texts/shaper-indic/indic/script-malayalam/MANIFEST | 0 + test/shaping/texts/shaper-indic/indic/script-oriya/MANIFEST | 0 + test/shaping/texts/shaper-indic/indic/script-punjabi/MANIFEST | 0 + test/shaping/texts/shaper-indic/indic/script-tamil/MANIFEST | 0 + test/shaping/texts/shaper-indic/indic/script-telugu/MANIFEST | 0 + 23 files changed, 31 insertions(+), 1 deletion(-) + +commit 7a4a848db27d1605195f677c9c8632cde558aa05 +Author: Behdad Esfahbod +Date: Thu Jan 19 15:15:21 2012 -0500 + + Minor + + src/hb-ot-shape-complex-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 4d6dafd47f4271549e528d2e8047d50562aef399 +Author: Behdad Esfahbod +Date: Thu Jan 19 14:52:02 2012 -0500 + + Rename test/ to test/api/ + + configure.ac | 1 + + test/Makefile.am | 128 +---------------------------------- + test/api/Makefile.am | 131 ++++++++++++++++++++++++++++++++++++ + test/{ => api}/hb-test.h | 0 + test/{ => api}/test-blob.c | 0 + test/{ => api}/test-buffer.c | 0 + test/{ => api}/test-c.c | 0 + test/{ => api}/test-common.c | 0 + test/{ => api}/test-cplusplus.cc | 0 + test/{ => api}/test-font.c | 0 + test/{ => api}/test-object.c | 0 + test/{ => api}/test-ot-tag.c | 0 + test/{ => api}/test-shape-complex.c | 0 + test/{ => api}/test-shape.c | 0 + test/{ => api}/test-unicode.c | 0 + test/{ => api}/test-version.c | 0 + 16 files changed, 133 insertions(+), 127 deletions(-) + +commit 3b5c22c39b87155f315853fb0c40edcf14e99b54 +Author: Behdad Esfahbod +Date: Thu Jan 19 14:28:11 2012 -0500 + + Remove src/test.cc + + Not really useful. + + src/Makefile.am | 6 +-- + src/test.cc | 132 -------------------------------------------------------- + 2 files changed, 1 insertion(+), 137 deletions(-) + +commit 4983feebbbb25e79201bf34035e4d58e61218758 +Author: Behdad Esfahbod +Date: Thu Jan 19 13:54:52 2012 -0500 + + [hb-diff] Clean up + + util/hb-diff | 41 ++++++++++++++++++++++++++--------------- + 1 file changed, 26 insertions(+), 15 deletions(-) + +commit cdc673d97c5ffedb386865a81f54a5cedcbad27c +Author: Behdad Esfahbod +Date: Thu Jan 19 12:46:18 2012 -0500 + + [hb-shape] Add --show-line-num + + Ok, much more useful as a test suite driver now. + + util/hb-shape.cc | 24 +++++------------------- + util/options.cc | 34 ++++++++++++++++++++++++++++++++++ + util/options.hh | 25 ++++++++++++++++++++----- + 3 files changed, 59 insertions(+), 24 deletions(-) + +commit cc4d9810d6318ca2e4de3b8d62f03b51cc21ee05 +Author: Behdad Esfahbod +Date: Thu Jan 19 12:32:20 2012 -0500 + + [hb-shape] Add --show-text and --show-unicode options + + util/hb-shape.cc | 19 ++++++++++++++++++- + util/options.cc | 26 +++++++++++++++++++++++--- + util/options.hh | 12 +++++++++--- + 3 files changed, 50 insertions(+), 7 deletions(-) + +commit 27c36af411c7c4d75dd25d79fc76dd92c6bb9643 +Author: Behdad Esfahbod +Date: Thu Jan 19 12:30:43 2012 -0500 + + Fix OOB in hb-shape + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8d2781d69274672303e30522e222bd01c6b5e781 +Author: Behdad Esfahbod +Date: Thu Jan 19 11:36:39 2012 -0500 + + [test] Add two Indic test cases from Bernard Massot + + test/test-shape-complex.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit 8750abaf8410005facbea8c886c592bead7f959b +Author: Behdad Esfahbod +Date: Wed Jan 18 22:47:44 2012 -0500 + + [util] Add --help-features + + Patch from Khaled Hosny. + + util/options.cc | 42 +++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 41 insertions(+), 1 deletion(-) + +commit 889caa52fa1bef61013ec1d127f84d7d5907ef1e +Author: Behdad Esfahbod +Date: Wed Jan 18 22:32:52 2012 -0500 + + [icu] Use U_FAILURE + + src/hb-icu.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 36a4f4a482456ee816dcb59befa0b0538ba487df +Author: Behdad Esfahbod +Date: Wed Jan 18 22:16:49 2012 -0500 + + Replace u_strlen() with u_countChar32() + + The latter is what I meant. + + src/hb-icu.cc | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +commit 055fb24d03ae518fa0aa6c2860a03f3cb6a5ef0d +Author: Behdad Esfahbod +Date: Wed Jan 18 21:58:34 2012 -0500 + + Add test for bug in ICU decompose + + As reported by Kenichi Ishibashi on 2011-10-28. + + test/test-unicode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c521e793bd6c1dafacb94253a45b9c70ab38525e +Author: Behdad Esfahbod +Date: Wed Jan 18 21:51:05 2012 -0500 + + Fix OOB in replace_glyph() + + Patch from Kenichi Ishibashi. + + src/hb-buffer.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 03408ce73d003ed4e58e3f8472f9445e72b86bee +Author: Behdad Esfahbod +Date: Wed Jan 18 21:28:34 2012 -0500 + + Fix more possible buffer overruns + + I have this function, but can't clean up it to my satisfaction. + + src/hb-ot-layout-gsubgpos-private.hh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 7d479900cd11bc88148cd601ee43bc5492ce5843 +Author: Behdad Esfahbod +Date: Wed Jan 18 21:19:32 2012 -0500 + + Refactor the two remaining uses of _hb_ot_layout_skip_mark() + + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 7 +++++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +commit 506ffeb8e77a668fa305139582d215c32e46bb03 +Author: Behdad Esfahbod +Date: Wed Jan 18 16:07:53 2012 -0500 + + Further mark skippy fixes from Jonathan Kew + + We should be in good shape now. + + src/hb-ot-layout-gsubgpos-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit a4a48fe6d4f884a37e720430347d10dbe3562a79 +Author: Behdad Esfahbod +Date: Tue Jan 17 18:08:41 2012 -0500 + + Fix mark skipping regression + + Ouch! + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4ab97311541225906f6b737a2b47de252224cc09 +Author: Behdad Esfahbod +Date: Mon Jan 16 22:05:08 2012 -0500 + + Refactor mark skipping + + src/hb-ot-layout-gpos-table.hh | 95 ++++++++++---------------- + src/hb-ot-layout-gsub-table.hh | 21 +++--- + src/hb-ot-layout-gsubgpos-private.hh | 125 +++++++++++++++++++++++++++-------- + 3 files changed, 143 insertions(+), 98 deletions(-) + +commit 370f03e9c69d98d735eafb7e72b13b17f42cbaa9 +Author: Behdad Esfahbod +Date: Mon Jan 16 17:03:55 2012 -0500 + + Minor + + src/hb-ot-layout-gsub-table.hh | 5 ++--- + src/hb-ot-layout-gsubgpos-private.hh | 6 ++---- + 2 files changed, 4 insertions(+), 7 deletions(-) + +commit 4d3aeb8cb2bc1ca7cdd03ba28ba8c334f12d4c03 +Author: Behdad Esfahbod +Date: Mon Jan 16 16:43:26 2012 -0500 + + [GSUB/GPOS] Fix mark skip indexing issues + + Mozilla bug 701637 and 714067 combined. + + Patch from Jonathan Kew. + + src/hb-ot-layout-gpos-table.hh | 42 ++++++++++++++++----------------- + src/hb-ot-layout-gsub-table.hh | 21 +++++++++-------- + src/hb-ot-layout-gsubgpos-private.hh | 45 ++++++++++++++++++------------------ + 3 files changed, 54 insertions(+), 54 deletions(-) + +commit e8eedf2687f05372bf5476e84139d01ba67c9f73 +Author: Behdad Esfahbod +Date: Mon Jan 16 16:39:40 2012 -0500 + + Avoid enum trailing commas + + Based on patch from Jonathan Kew. + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + src/hb-ot-shape-complex-private.hh | 2 ++ + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit 3d0ddd12801689b4093ffca97da4dd9ca669b64a +Author: Behdad Esfahbod +Date: Sun Jan 15 15:55:52 2012 -0500 + + Require glib >= 2.16 for the gobject option + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 95ab82a992ab916046c2e6205db7cadeec88d206 +Author: Behdad Esfahbod +Date: Sun Jan 15 14:56:56 2012 -0500 + + Disable gtk-doc macro + + We don't have any docs yet. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 299ae0c3a367c84a835eadbd1276ca284d2720c0 +Author: Behdad Esfahbod +Date: Sat Jan 14 21:29:45 2012 -0500 + + [icu] Remove glib-ism + + src/hb-icu.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a097043f9a81e6c20caf69a5dabdf9e00438d79b +Author: Behdad Esfahbod +Date: Sat Jan 14 17:55:51 2012 -0500 + + Allow space in one more place when parsing features + + util/options.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit af92135424b994062648f4fb7e26af0bd970a4b1 +Author: Behdad Esfahbod +Date: Fri Oct 21 09:18:43 2011 -0700 + + Minor + + src/hb-object-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 89d89646e8163b6c0874b9a3c14d4da974ea8219 +Author: Behdad Esfahbod +Date: Mon Oct 17 11:50:54 2011 -0700 + + Fix intrin.h b0rkage with older MSVC + + Reported by Jonathan Kew. + + src/hb-object-private.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit af913c5788e600e36d29f44fe4e77db84cf8c442 +Author: Behdad Esfahbod +Date: Mon Oct 17 11:39:28 2011 -0700 + + Fix infinite loop in normalization code with variation selectors + + Reported by Jonathan Kew. + + src/hb-ot-shape-normalize.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit fd528c17b7b5ac912f1ac980e1d9981f561c3b46 +Author: Behdad Esfahbod +Date: Wed Oct 12 15:03:58 2011 -0400 + + [util] Add --list-shapers to hb-view and hb-shape + + util/options.cc | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +commit a17554bfd51dc8a37b1674d1ede63e616618e0a6 +Author: Behdad Esfahbod +Date: Wed Sep 28 16:57:34 2011 -0400 + + Make test-c.c actually use hb + + This will make sure we test that C code can actually link to the + library. + + test/test-c.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 55deff7595ef357d000fef83559c74c9f8acad00 +Author: Behdad Esfahbod +Date: Wed Sep 28 16:20:09 2011 -0400 + + Add comments + + src/hb-ot-shape-normalize.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit a240d5a0a3ccc71902e7a341b6d531995319999d +Author: Behdad Esfahbod +Date: Tue Sep 27 13:50:45 2011 -0400 + + Add TODO item + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 52ebdff49d13f239efc886de935d47be9860f6e5 +Author: Behdad Esfahbod +Date: Tue Sep 27 12:38:16 2011 -0400 + + Fix GSUB lookuptype 1 subtype 1 delta wrapping + + src/hb-ot-layout-gsub-table.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 5857720cd35078d1c3906c8b2db3190b5166b66f +Author: Behdad Esfahbod +Date: Tue Sep 27 12:36:26 2011 -0400 + + [util] s/%d/%u/ when printing glyph ids and clusters + + util/options.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit b95324cdd217f44c40c5fd44898e659500f19511 +Author: Behdad Esfahbod +Date: Wed Sep 21 16:50:39 2011 -0400 + + Minor + + src/hb-blob.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0cd33592ab4bb486ffc438ba0efdac2fa7a1bb7f +Author: Behdad Esfahbod +Date: Wed Sep 21 16:49:33 2011 -0400 + + Fix possible leaks + + src/hb-font.cc | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +commit d3f3690b485e1d240fec4f204aef54e07853a244 +Author: Behdad Esfahbod +Date: Wed Sep 21 16:41:43 2011 -0400 + + hb-shape: In --no-glyph-names, output glyph number directly + + Ie. write "86" instead of "gid86". + + util/options.cc | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit 088c1e27c0fc0cdef999cf1f567e4d5eb2cfb2e4 +Author: Behdad Esfahbod +Date: Tue Sep 20 14:43:55 2011 -0400 + + [util] Fix option parsing + + Wow, who knew bool is one byte and I was using it as a 4byte int?! + + C++ auto casts fails you in mysterious ways... + + util/helper-cairo.cc | 2 +- + util/options.cc | 3 ++- + util/options.hh | 14 +++++++------- + 3 files changed, 10 insertions(+), 9 deletions(-) + +commit d606daa4cca323c8977b2e52e6863dc0f1b72fa9 +Author: Behdad Esfahbod +Date: Tue Sep 20 14:34:06 2011 -0400 + + Whitespace + + src/gen-arabic-table.py | 2 +- + src/gen-indic-table.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit e700bce1189465a159a7c3c179f231be224f31cc +Author: Behdad Esfahbod +Date: Tue Sep 20 11:20:53 2011 -0400 + + [util] Add hb-diff + + A diff program written in Python that is more suitable for comparing + hb-shape output from different backends. Main differences with stock + diff: + + 1. It outputs one line's comparison at a time, as opposed to batching + '+' lines and '-' lines. + + 2. It colors the part of the line that changed, taking word boundaries + into consideration. + + You can pipe the colored output to 'less -r'. + + util/Makefile.am | 2 ++ + util/hb-diff | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 61 insertions(+) + +commit 880c1f0e4ede65890592d28dfb38bb06f5b57500 +Author: Behdad Esfahbod +Date: Mon Sep 19 23:10:22 2011 -0400 + + Rewrite ICU detection code with in-house macros + + At least works for cross-compiling now... + + configure.ac | 26 +++++++++++++++----------- + 1 file changed, 15 insertions(+), 11 deletions(-) + +commit f83f0f4836691b04306c2ef80979f2e1d76a2f28 +Author: Behdad Esfahbod +Date: Mon Sep 19 18:51:48 2011 -0400 + + [graphite] Add note about graphite shaker brokenness + + src/hb-graphite2.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 422558142aabb996d8ad1848df7ea4d5a8ade98a +Author: Behdad Esfahbod +Date: Mon Sep 19 17:57:02 2011 -0400 + + [util] Account for line-space in surface size + + util/options.cc | 2 +- + util/options.hh | 1 - + util/view-cairo.cc | 2 +- + 3 files changed, 2 insertions(+), 3 deletions(-) + +commit b5afd8f78e6b372f1bbed469329c1554adb20eea +Author: Behdad Esfahbod +Date: Mon Sep 19 16:56:21 2011 -0400 + + [util] Rename --output to --output_file, and --format to --output-format + + util/options.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0a965eee880428a43ad7f9d1317c344666247dd7 +Author: Behdad Esfahbod +Date: Mon Sep 19 16:53:47 2011 -0400 + + Minor + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 466393c2f04fb5b3dcb3e81ea9609905fa8c9648 +Author: Behdad Esfahbod +Date: Mon Sep 19 16:50:18 2011 -0400 + + Really fix build this time + + util/hb-view.hh | 1 - + 1 file changed, 1 deletion(-) + +commit fe1605db4f28ed75d5debe0db45a19aa77f0585f +Author: Behdad Esfahbod +Date: Mon Sep 19 16:49:03 2011 -0400 + + Fix dist + + util/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit 8b8b19056decaf09e4e0ccd9412ee1aeb30f4de7 +Author: Behdad Esfahbod +Date: Mon Sep 19 16:41:17 2011 -0400 + + [util] Add hb-shape utility + + Like hb-view, but prints out buffer contents. + + The output format is kinda cryptic. Suggestions welcome. + + configure.ac | 6 - + util/Makefile.am | 44 +++-- + util/{common.cc => hb-shape.cc} | 57 ++++-- + util/hb-view.cc | 44 +---- + util/hb-view.hh | 79 ++++++++ + util/helper-cairo.cc | 375 +++++++++++++++++++++++++++++++++++ + util/{common.hh => helper-cairo.hh} | 64 ++++-- + util/options.cc | 79 ++++++++ + util/options.hh | 53 ++++- + util/view-cairo.cc | 381 ++---------------------------------- + util/view-cairo.hh | 8 +- + 11 files changed, 717 insertions(+), 473 deletions(-) + +commit eb2d8be7a8ede0c0f5e346cf06516792f83f36f7 +Author: Behdad Esfahbod +Date: Mon Sep 19 16:15:22 2011 -0400 + + Minor + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit f6496663c2f6849a944e41afcf9511f378477532 +Author: Behdad Esfahbod +Date: Mon Sep 19 15:45:52 2011 -0400 + + [util] If no text is provided, simply call cairo_show_glyphs() + + util/view-cairo.cc | 92 ++++++++++++++++++++++++++++++------------------------ + 1 file changed, 51 insertions(+), 41 deletions(-) + +commit 5c299343118d1eaff32ffb2a5dac077cfff67dee +Author: Behdad Esfahbod +Date: Mon Sep 19 14:53:26 2011 -0400 + + [uniscribe] Various improvements + + src/hb-uniscribe.cc | 30 +++++++++++++++++++----------- + 1 file changed, 19 insertions(+), 11 deletions(-) + +commit 11e51993ab562d4c7460eb7c43d0e97404e628e7 +Author: Behdad Esfahbod +Date: Mon Sep 19 09:58:55 2011 -0400 + + [util] Move font-size into view-options + + util/options.cc | 2 +- + util/options.hh | 7 +++---- + util/view-cairo.cc | 4 ++-- + 3 files changed, 6 insertions(+), 7 deletions(-) + +commit 0fe296019746689551d224a5f6fb7e0ebe1b91dc +Author: Behdad Esfahbod +Date: Sat Sep 17 09:59:58 2011 -0400 + + Fix Linux build when io.h is available + + Bug 40953 - fail compile git: make[2]: *** [hb_view-options.o] Error 1 + + configure.ac | 2 +- + util/options.cc | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit d2b3ab9ecebbf46cb9dac1f09c17379c50ea4575 +Author: Behdad Esfahbod +Date: Fri Sep 16 16:59:17 2011 -0400 + + Fix "[util] Fix hb-view crash with bogus font." + + util/view-cairo.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit da4a2a1426ee3aa9d9678ec12c9ba4dfcba0bcf8 +Author: Behdad Esfahbod +Date: Fri Sep 16 16:56:34 2011 -0400 + + Cosmetic + + util/view-cairo.cc | 31 +++++++++++++++++++++++-------- + 1 file changed, 23 insertions(+), 8 deletions(-) + +commit 4274ed7ab6fb03fbf8eaaa43ab06647dc0beed79 +Author: Behdad Esfahbod +Date: Fri Sep 16 16:52:26 2011 -0400 + + [util] Fix hb-view crash with bogus font + + util/view-cairo.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 5ddd9cc499f2470eca239ae357a5c8a3626c0809 +Author: Behdad Esfahbod +Date: Fri Sep 16 16:40:44 2011 -0400 + + Minor + + src/hb-private.hh | 2 +- + src/hb-unicode-private.hh | 4 ++-- + src/test.cc | 4 ++-- + util/common.hh | 2 +- + util/options.cc | 8 ++++---- + 5 files changed, 10 insertions(+), 10 deletions(-) + +commit 652d64aa8d32d914bf3ee2f2c451de103fea8fa9 +Author: Behdad Esfahbod +Date: Fri Sep 16 16:34:39 2011 -0400 + + TODO items + + TODO | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 947c9a778c0d4b428b58806f98c34ede59b7439c +Author: Behdad Esfahbod +Date: Fri Sep 16 16:33:18 2011 -0400 + + Minor + + src/hb-ot-shape-normalize.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d5476a30a10da5e54783c8dbf04340225a9a00d7 +Author: Behdad Esfahbod +Date: Fri Sep 16 12:30:50 2011 -0400 + + Minor + + src/hb-object-private.hh | 26 +++++++++++++++----------- + 1 file changed, 15 insertions(+), 11 deletions(-) + +commit 55aeb0490454cc1ba93a42f307ed1230f59dee4b +Author: Behdad Esfahbod +Date: Fri Sep 16 02:08:36 2011 -0400 + + Fix reading text from stdin + + util/options.cc | 76 +++++++++++++++++++++++++++++++++++------------------- + util/options.hh | 16 +++++++----- + util/view-cairo.cc | 6 +++-- + 3 files changed, 64 insertions(+), 34 deletions(-) + +commit a75c1b125159f6cfb6b652a9ec40803f7c7e3f71 +Author: Behdad Esfahbod +Date: Fri Sep 16 01:16:41 2011 -0400 + + Move code around + + util/options.cc | 27 +++++++++++++++++++++++++-- + util/options.hh | 20 +------------------- + 2 files changed, 26 insertions(+), 21 deletions(-) + +commit 7bf6ecd3bfb1ccf5d9ac6fe274efa74b46885fea +Author: Behdad Esfahbod +Date: Fri Sep 16 01:11:30 2011 -0400 + + Always shape at size=upem + + Fixes bug with uniscribe not handling GIGANTIC sizes. + + util/options.cc | 2 +- + util/view-cairo.cc | 8 ++++---- + util/view-cairo.hh | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit 674ee58d9bc9f825d769220d77f58513edae4558 +Author: Behdad Esfahbod +Date: Fri Sep 16 00:54:05 2011 -0400 + + Minor + + util/options.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 4451168e5d1ea26560899e9a9733b3a3f1853050 +Author: Behdad Esfahbod +Date: Fri Sep 16 00:38:19 2011 -0400 + + Fix binary stdin/stdout io in Windows + + Make --font-file accept "-" to mean stdin, and have it work + in Windows too! + + configure.ac | 2 +- + util/common.hh | 5 +++++ + util/options.cc | 64 +++++++++++++++++++++++++++++++++++++++++++++++---------- + util/options.hh | 10 +++++++-- + 4 files changed, 67 insertions(+), 14 deletions(-) + +commit 639b5957d9c7b6d8bef6784e3467ccc055ddeea4 +Author: Behdad Esfahbod +Date: Thu Sep 15 18:09:49 2011 -0400 + + Minor + + util/options.cc | 5 +++-- + util/options.hh | 4 ++-- + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit f7e2ef74f856ee13d6fd6cf3f1e04bc162203bc2 +Author: Behdad Esfahbod +Date: Thu Sep 15 17:52:00 2011 -0400 + + [hb-view] Make print to stdout work in Windows + + Apparently there's no equivalent to "/dev/stdout", so write using + stdio to be able to output to stdout. + + util/common.hh | 1 + + util/options.hh | 31 ++++++++++++++++----- + util/view-cairo.cc | 79 ++++++++++++++++++++++++++++++++++++------------------ + 3 files changed, 78 insertions(+), 33 deletions(-) + +commit 36b10f58cc70ce9570d17b30616f9cb27423e03b +Author: Behdad Esfahbod +Date: Thu Sep 15 16:29:51 2011 -0400 + + Minor + + src/hb-ot-shape-normalize.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit c4611cb66f8e3a133ec00e3ace62ef19d9b95b28 +Author: Behdad Esfahbod +Date: Tue Sep 13 13:33:11 2011 -0400 + + Fix test + + src/hb-graphite2.h | 1 + + src/hb-ot-shape.h | 1 + + src/hb-uniscribe.h | 1 + + 3 files changed, 3 insertions(+) + +commit b9b10ad78b1f977494a3a42b58f8040fe16505a3 +Author: Behdad Esfahbod +Date: Tue Sep 13 13:30:39 2011 -0400 + + [util] Refactor hb-view completely + + Now we can use the same code to do other utils... + + configure.ac | 2 + + util/Makefile.am | 2 + + util/common.cc | 7 +- + util/common.hh | 2 +- + util/hb-view.cc | 244 ++++------------------------- + util/options.cc | 321 ++++++++++++++++++++++++++------------ + util/options.hh | 179 +++++++++++++++++++--- + util/view-cairo.cc | 440 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + util/view-cairo.hh | 63 ++++++++ + 9 files changed, 927 insertions(+), 333 deletions(-) + +commit bc4b07b05ea9e39eb9f966eb2c3e1c737efa77ff +Author: Behdad Esfahbod +Date: Thu Sep 8 17:08:32 2011 -0400 + + More reshuffling + + util/hb-view.cc | 4 ++-- + util/options.cc | 64 ++++++++++++++++++++++++++++++--------------------------- + util/options.hh | 13 ++++++------ + 3 files changed, 43 insertions(+), 38 deletions(-) + +commit 516857eb51bbb79ff4adf44e3fefbf460f9ee8f8 +Author: Behdad Esfahbod +Date: Thu Sep 8 16:50:24 2011 -0400 + + [util] Simplify more + + util/options.hh | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +commit 4f4b114a5592c2f5d128ee795f159b438ad97829 +Author: Behdad Esfahbod +Date: Thu Sep 8 16:49:02 2011 -0400 + + [util] Move code around + + util/hb-view.cc | 8 +------- + util/options.hh | 14 ++++++++++++++ + 2 files changed, 15 insertions(+), 7 deletions(-) + +commit 46d86a73a103b061144018c3fe947b57548fc58f +Author: Behdad Esfahbod +Date: Thu Sep 8 16:43:15 2011 -0400 + + Minor + + We now support using -1 for NUL-terminated strings. + + util/hb-view.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 90e312cb85df7a6dc350cb62138ab950790e3d15 +Author: Behdad Esfahbod +Date: Thu Sep 8 16:42:37 2011 -0400 + + [util] Move code around + + util/hb-view.cc | 5 ----- + util/options.hh | 4 ++++ + 2 files changed, 4 insertions(+), 5 deletions(-) + +commit 109cb382898f491eed733dba4ef5ba12de94aaf6 +Author: Behdad Esfahbod +Date: Thu Sep 8 16:00:04 2011 -0400 + + [util] Further refactor option parsing + + util/options.cc | 80 +++++++++++++++++++++++++++++++++++++++++++++++---------- + util/options.hh | 20 ++++++++++++--- + 2 files changed, 83 insertions(+), 17 deletions(-) + +commit bc187e5ac7433f5561b0e97e8c62172c73883f3f +Author: Behdad Esfahbod +Date: Thu Sep 8 13:35:17 2011 -0400 + + Refine Indic scripts, following Martin Hosken's recommendation + + src/hb-ot-shape-complex-private.hh | 56 +++++++++++++++++++++++--------------- + 1 file changed, 34 insertions(+), 22 deletions(-) + +commit 738d096a06822e63b3894bd817ecb90e5fb94f73 +Author: Behdad Esfahbod +Date: Fri Sep 2 13:31:19 2011 -0400 + + Pass through unknown ISO 639-3 language tags to OpenType engine + + In hb_ot_tag_from_language(), if first component of an unknown + language is three letters long, use it directly as OpenType language + tag (after case conversion and padding). + + src/hb-ot-tag.cc | 8 ++++++++ + test/test-ot-tag.c | 5 +++++ + 2 files changed, 13 insertions(+) + +commit ea02cbf03c084b3ead6e9e4c9af07b3b47608d5b +Author: Behdad Esfahbod +Date: Fri Sep 2 12:39:20 2011 -0400 + + [graphite] Don't preload glyphs + + Doesn't seem to be slower. + + src/hb-graphite2.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 210a06f3d7bd2df55ebd1743da74f327c5a7a967 +Author: Behdad Esfahbod +Date: Fri Aug 26 13:39:49 2011 +0200 + + Minor + + src/hb-graphite2.h | 12 ++++++------ + src/hb-ot-shape.h | 1 - + src/hb-uniscribe.h | 1 - + 3 files changed, 6 insertions(+), 8 deletions(-) + +commit 4a8d2e379a34b19bccc72bc3e2d9ace3fdd27733 +Author: Behdad Esfahbod +Date: Fri Aug 26 09:40:54 2011 +0200 + + [graphite2] Chop a few more lines + + src/hb-graphite2.cc | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) + +commit 81ec289da799bd2f50da9382507c606d2c779ab9 +Author: Behdad Esfahbod +Date: Fri Aug 26 09:33:06 2011 +0200 + + Minor + + src/hb-graphite2.cc | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit 3380de5abbaff535e1cf57ea7e5c2a7c4fdcfe66 +Author: Behdad Esfahbod +Date: Fri Aug 26 09:30:49 2011 +0200 + + [graphite] Use buffer->replace_glyphs() + + src/hb-graphite2.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 9ebe8c0286856d46430ae184ba7303bd34485883 +Author: Behdad Esfahbod +Date: Fri Aug 26 09:29:42 2011 +0200 + + Add buffer->replace_glyphs() + + src/hb-buffer-private.hh | 3 +++ + src/hb-buffer.cc | 26 ++++++++++++++++++++++++++ + 2 files changed, 29 insertions(+) + +commit a5edb1031c204464da4f852ba3d90e8cc20cd20e +Author: Behdad Esfahbod +Date: Fri Aug 26 09:27:13 2011 +0200 + + Minor + + src/hb-graphite2.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 290e3ee51727df75d136ccfff79831b94d1583b6 +Author: Behdad Esfahbod +Date: Fri Aug 26 09:25:04 2011 +0200 + + [graphite] Only pass the first part language tag to graphite + + Still not sure about: + + 1) Case. We pass lowercase for now. Would be nice if graphite was + uppercase 3letter like OpenType, + + 2) Padding. IMO, tag padding is always with spaces, but Martin was + talking about NUL bytes. + + src/hb-graphite2.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 4c9fe88d30036340fe592bcbc375049b84602b8b +Author: Behdad Esfahbod +Date: Fri Aug 26 09:18:53 2011 +0200 + + [API] Make all _from_string() functions take a len parameter + + Can be -1 for NUL-terminated string. This is useful for passing parts + of a larger string to a function without having to copy or modify the + string first. + + Affected functions: + + hb_tag_t hb_tag_from_string() + hb_direction_from_string() + hb_language_from_string() + hb_script_from_string() + + src/hb-common.cc | 29 +++++++++++++------- + src/hb-common.h | 12 +++++--- + src/hb-graphite2.cc | 2 +- + src/hb-icu.cc | 2 +- + src/hb-ot-tag.cc | 8 +++--- + test/test-buffer.c | 4 +-- + test/test-common.c | 79 +++++++++++++++++++++++++++++++---------------------- + test/test-ot-tag.c | 22 +++++++-------- + util/hb-view.cc | 6 ++-- + util/options.cc | 5 +--- + 10 files changed, 96 insertions(+), 73 deletions(-) + +commit a499bdea5cc5097dec62eeafdef58d08ba534be0 +Author: Behdad Esfahbod +Date: Thu Aug 25 22:46:21 2011 +0200 + + [graphite2] Bail if grface is NULL + + src/hb-graphite2.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 3007ffa9e53e6100a761c2363f50a2b19a0764fc +Author: Behdad Esfahbod +Date: Thu Aug 25 09:08:53 2011 +0200 + + Reorder combining-class to better suit Arabic shadda mark-mark positioning + + As reported by Khaled on the list: + + "After the introduction of canonical reordering of combining marks + (commit 34c22f8), I'm no longer able to do mark/mark substitution or + positioning for mark sequences that involve shadda as a first mark (or + most interesting sequences at least). + + "After some digging, it turned out that shadda have a ccc=33 while most + Arabic marks that combine with it have a lower ccc value, which results + in the shadda being reordered after the other mark which, + unsurprisingly, breaks my contextual substitution and mkmk anchors." + + See: + + http://unicode.org/faq/normalization.html#8 + http://unicode.org/faq/normalization.html#9 + + src/hb-ot-shape-private.hh | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +commit 74ef81a0b0f9adddfb42c3cb87f08f8156054519 +Author: Behdad Esfahbod +Date: Wed Aug 24 19:16:13 2011 +0200 + + Fix make distcheck + + src/Makefile.am | 15 ++++++++------- + src/hb-gobject-enums.cc.tmpl | 2 +- + 2 files changed, 9 insertions(+), 8 deletions(-) + +commit 24bcdbcc0639ca9e9c0fde1a71cbbf1c3d2ef98d +Author: Behdad Esfahbod +Date: Wed Aug 24 19:13:15 2011 +0200 + + Add hb-ot-hmtx-table.hh + + Oops! + + src/hb-ot-hmtx-table.hh | 86 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 86 insertions(+) + +commit a3bd8a0e1862212a2d4141b973039bd000a3054f +Author: Behdad Esfahbod +Date: Wed Aug 24 03:22:49 2011 +0200 + + [graphite] Rewrite properly + + src/hb-graphite2.cc | 633 ++++++++++++++++++++++------------------------------ + src/hb-uniscribe.cc | 2 + + 2 files changed, 273 insertions(+), 362 deletions(-) + +commit 5072934c35bddc23d6bcb07a41010da51eb1b090 +Author: Behdad Esfahbod +Date: Wed Aug 24 02:24:27 2011 +0200 + + Minor + + src/hb-uniscribe.cc | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 46377396accf6b43792ffba553dcd9847608aa86 +Author: Behdad Esfahbod +Date: Wed Aug 24 02:12:05 2011 +0200 + + [configure] Fix graphite bits + + configure.ac | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 71388b3ee71c7d3b79f842db7588bd683691797c +Author: Behdad Esfahbod +Date: Wed Aug 24 02:09:04 2011 +0200 + + [uniscribe] Minor + + src/hb-uniscribe.cc | 19 +++++++++---------- + 1 file changed, 9 insertions(+), 10 deletions(-) + +commit cd2b901027bd154e31aa509c0cb2d86633e36398 +Author: Behdad Esfahbod +Date: Wed Aug 24 01:47:25 2011 +0200 + + [graphite] Minor + + src/hb-graphite2.cc | 10 ++++------ + src/hb-shape.cc | 1 - + 2 files changed, 4 insertions(+), 7 deletions(-) + +commit 834af3b48a1aca3e53811d1eb4ca09b582b8e598 +Author: Behdad Esfahbod +Date: Wed Aug 24 01:45:47 2011 +0200 + + [graphite] Remove hb_graphite2_feature_check() + + I don't see how this function can be useful. + + src/hb-graphite2.cc | 10 ---------- + src/hb-graphite2.h | 2 -- + 2 files changed, 12 deletions(-) + +commit 1f49cf32c96cb45a4d8ba2c210aeb7a8076b4762 +Author: Behdad Esfahbod +Date: Wed Aug 24 01:29:25 2011 +0200 + + Add graphite2 integration from Martin Hosken + + To be modified, a lot. + + configure.ac | 9 +- + contrib/python/lib/harfbuzz.pyx | 20 +- + contrib/python/runpy | 2 - + contrib/python/scripts/hbtestfont | 4 +- + contrib/python/setup.py | 18 +- + src/Makefile.am | 7 + + src/hb-graphite2.cc | 446 ++++++++++++++++++++++++++++++++++++++ + src/hb-graphite2.h | 47 ++++ + src/hb-shape.cc | 7 + + 9 files changed, 542 insertions(+), 18 deletions(-) + +commit 0e6d36d8a3f9f533cb6eb04408af62bfd1ad83da +Author: Behdad Esfahbod +Date: Wed Aug 24 01:31:29 2011 +0200 + + Minor + + src/Makefile.am | 2 +- + src/{hb-uniscribe-shape.cc => hb-uniscribe.cc} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit efde8113258b117ec0a7fbffe6d681442d045c41 +Author: Behdad Esfahbod +Date: Tue Aug 23 00:04:57 2011 +0200 + + Add a constructor for hb_prealloced_array_t + + Fixes build with MSVC. + + src/hb-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit d75333f166d21e9b9f2341c3bc8a9ef8a886f4b3 +Author: Behdad Esfahbod +Date: Fri Aug 19 19:59:24 2011 +0200 + + Add gobject enum support, but disabled for now + + need to figure out the naming. The generated code doesn't have the + right name. + + configure.ac | 2 + + src/Makefile.am | 13 +++-- + src/hb-gobject-enums.cc.tmpl | 74 ++++++++++++++++++++++++++++ + src/{hb-gobject.cc => hb-gobject-structs.cc} | 0 + 4 files changed, 86 insertions(+), 3 deletions(-) + +commit 7d235d272f4c9213f54c9c807fb8fba5068c45b0 +Author: Behdad Esfahbod +Date: Wed Aug 17 23:55:29 2011 +0200 + + Flesh out tt funcs a bit + + src/hb-tt-font.cc | 36 +++++++++++++++++++++++++++++++++++- + 1 file changed, 35 insertions(+), 1 deletion(-) + +commit b9415e76d7b41da203b9ae85e38b6dc777481184 +Author: Behdad Esfahbod +Date: Wed Aug 17 19:21:44 2011 +0200 + + [API] Add hb_font_set_funcs_data() + + src/hb-font.cc | 15 +++++++++++++++ + src/hb-font.h | 6 ++++++ + 2 files changed, 21 insertions(+) + +commit e6c09cdf43201ff1b7f38e411ae1f9977e4f9271 +Author: Behdad Esfahbod +Date: Wed Aug 17 19:07:59 2011 +0200 + + Remove the pre_allocate argument from hb_buffer_create() + + For two reasons: + + 1. User can always call hb_buffer_pre_allocate() themselves, and + + 2. Now we do a pre_alloc in add_utfX anyway, so the total number of + reallocs is limited to a small number (~3) anyway. This just makes the + API cleaner. + + src/hb-buffer.cc | 7 +------ + src/hb-buffer.h | 2 +- + src/test.cc | 2 +- + test/test-buffer.c | 9 ++++----- + test/test-object.c | 4 ++-- + test/test-shape-complex.c | 2 +- + test/test-shape.c | 2 +- + util/hb-view.cc | 2 +- + 8 files changed, 12 insertions(+), 18 deletions(-) + +commit 187bdeaa6c82fcb95fdd546da9c78b843e1dea0e +Author: Behdad Esfahbod +Date: Wed Aug 17 19:03:06 2011 +0200 + + Do (nothing for) hmtx sanitize + + src/hb-ot-hhea-table.hh | 1 - + src/hb-tt-font.cc | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit d6016e49108be183ab2dc9c226447d1db3a09b90 +Author: Behdad Esfahbod +Date: Wed Aug 17 14:47:41 2011 +0200 + + Fix name-table sanitize + + src/hb-ot-name-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ae9877dea6a1aed3566d9b87a75ede84259deaca +Author: Behdad Esfahbod +Date: Wed Aug 17 14:43:45 2011 +0200 + + Add hhea-table support + + src/Makefile.am | 1 + + src/hb-open-type-private.hh | 6 ++ + src/hb-ot-head-table.hh | 2 +- + src/hb-ot-hhea-table.hh | 93 ++++++++++++++++++ + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-name-table.hh | 3 +- + src/hb-tt-font.cc | 207 +++++++++++++++++++++++++++++++++++++++++ + 10 files changed, 314 insertions(+), 6 deletions(-) + +commit 7a750ac33ec482e2c4856c19ea607f3563741c24 +Author: Behdad Esfahbod +Date: Wed Aug 17 14:19:59 2011 +0200 + + Rename table files from eg maxp-private.hh to maxp-table.hh + + src/Makefile.am | 12 ++++++------ + src/hb-font.cc | 2 +- + src/{hb-ot-head-private.hh => hb-ot-head-table.hh} | 6 +++--- + ...-ot-layout-gdef-private.hh => hb-ot-layout-gdef-table.hh} | 6 +++--- + ...-ot-layout-gpos-private.hh => hb-ot-layout-gpos-table.hh} | 6 +++--- + ...-ot-layout-gsub-private.hh => hb-ot-layout-gsub-table.hh} | 6 +++--- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-layout.cc | 8 ++++---- + src/{hb-ot-maxp-private.hh => hb-ot-maxp-table.hh} | 6 +++--- + src/{hb-ot-name-private.hh => hb-ot-name-table.hh} | 6 +++--- + src/hb-uniscribe-shape.cc | 2 +- + src/main.cc | 2 +- + 12 files changed, 32 insertions(+), 32 deletions(-) + +commit 0b7e4d9f20b3ed947d0c441ca59b43c4097cdb0e +Author: Behdad Esfahbod +Date: Mon Aug 15 20:41:59 2011 +0200 + + [ft] FT_Get_Advance() for advance-width callbacks + + Using graphite2's comparerenderer suggests that this makes hb-ft 15 + times faster. No caching layer needed anymore. + + configure.ac | 2 +- + src/hb-ft.cc | 19 +++++++++++++------ + util/common.hh | 4 +++- + 3 files changed, 17 insertions(+), 8 deletions(-) + +commit 97796453aab56873809a15b5e316cba8acea7449 +Author: Behdad Esfahbod +Date: Mon Aug 15 19:03:43 2011 +0200 + + Fix falloffs of the GOption conversion + + util/options.cc | 8 ++++---- + util/options.hh | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 4e9ff1dd6ee3ea63fd91a76a91d9725a10a294a0 +Author: Behdad Esfahbod +Date: Mon Aug 15 16:21:22 2011 +0200 + + Pre-allocate buffers when adding string + + We do a conservative estimate of the number of characters, but still, + this limits the number of buffer reallocs to a small constant. + + src/hb-buffer.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 553bc3de82cfda8d83db26a93205e0d39440cbd1 +Author: Behdad Esfahbod +Date: Mon Aug 15 16:21:06 2011 +0200 + + Minor + + src/hb-ft.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 254142bb67a5c520a304142301479eb5292592d1 +Author: Behdad Esfahbod +Date: Mon Aug 15 16:15:44 2011 +0200 + + [ft] FT_Select_Charmap() when we create face + + src/hb-ft.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit a4cbd03dd17990783d8fd4c6be0c9c0d3d9cae5b +Author: Behdad Esfahbod +Date: Mon Aug 15 09:52:05 2011 +0200 + + Apply 'locl' with 'ccmp' in Arabic shaper + + According to Peter Constable this is indeed what Uniscribe has been + doing for years. + + Mozilla Bug 667166 - wrong shape of letter when it comes at the end of + word in the arabic version of Firefox 5.0 + + src/hb-ot-shape-complex-arabic.cc | 1 + + 1 file changed, 1 insertion(+) + +commit c214cff55ce539d004d069a484dac3988953cb11 +Author: Behdad Esfahbod +Date: Sun Aug 14 15:17:16 2011 +0200 + + Start adding gobject-introspection support + + configure.ac | 13 ++++++++++- + src/Makefile.am | 43 ++++++++++++++++------------------- + src/hb-common.h | 1 + + src/hb-glib.cc | 3 --- + src/hb-gobject.cc | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-gobject.h | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 163 insertions(+), 28 deletions(-) + +commit 9527fb200ffbbd839334e99b51d9671752d393db +Author: Behdad Esfahbod +Date: Sat Aug 13 19:03:48 2011 +0200 + + Fix missing return + + src/hb-ft.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 77a328769545f6b2970d8491fe77fe98781961cf +Author: Behdad Esfahbod +Date: Sat Aug 13 17:16:45 2011 +0200 + + Minor + + src/hb-common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3bb300ee78a40f9ded21ab19283863b733aeb677 +Author: Behdad Esfahbod +Date: Thu Aug 11 11:54:31 2011 +0200 + + Refactor hb-view code + + util/Makefile.am | 26 +++- + util/common.cc | 40 ++++++ + util/common.hh | 49 +++++++ + util/hb-view.cc | 387 ++++--------------------------------------------------- + util/options.cc | 318 +++++++++++++++++++++++++++++++++++++++++++++ + util/options.hh | 86 +++++++++++++ + 6 files changed, 541 insertions(+), 365 deletions(-) + +commit d6660356dd81358033743f72d8a5fbf2fc70eaf7 +Author: Behdad Esfahbod +Date: Wed Aug 10 22:08:36 2011 +0200 + + Add uniscribe font getters + + src/hb-uniscribe-shape.cc | 24 +++++++++++++++++++++--- + src/hb-uniscribe.h | 8 ++++++++ + 2 files changed, 29 insertions(+), 3 deletions(-) + +commit 01ec13a1d9ae380305b593e1c52cebb0e8327cb6 +Author: Behdad Esfahbod +Date: Wed Aug 10 22:00:35 2011 +0200 + + Implement hb_ft_font_get_face + + src/hb-ft.cc | 15 ++++++++++++++- + src/hb-ft.h | 2 ++ + 2 files changed, 16 insertions(+), 1 deletion(-) + +commit 36a4fe037df201f85b7a544eb30d75dc3585a1b6 +Author: Behdad Esfahbod +Date: Wed Aug 10 21:54:22 2011 +0200 + + Fix charset conversion + + util/hb-view.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 25c4830593064f023e296aa795b72ddcaa1c9322 +Author: Behdad Esfahbod +Date: Wed Aug 10 16:28:38 2011 +0200 + + [util] Add hb-shape --shapers + + If the specified shapers fail, hb-shape will fail immediately + + util/hb-view.cc | 57 +++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 33 insertions(+), 24 deletions(-) + +commit 0501573deda3a8dcdfcea491392f554f21ed0154 +Author: Behdad Esfahbod +Date: Wed Aug 10 16:25:56 2011 +0200 + + Fix const correctness in the API + + src/hb-fallback-shape-private.hh | 2 +- + src/hb-fallback-shape.cc | 2 +- + src/hb-ot-shape.cc | 2 +- + src/hb-ot-shape.h | 2 +- + src/hb-shape.cc | 14 +++++++------- + src/hb-shape.h | 12 ++++++------ + src/hb-uniscribe-shape.cc | 2 +- + src/hb-uniscribe.h | 2 +- + 8 files changed, 19 insertions(+), 19 deletions(-) + +commit a21add6c0da067173d51792d716d6e38379f138f +Author: Behdad Esfahbod +Date: Wed Aug 10 16:07:49 2011 +0200 + + Reformat + + util/hb-view.cc | 49 ++++++++++++++++++------------------------------- + 1 file changed, 18 insertions(+), 31 deletions(-) + +commit 8df90c81187db58eee6b90426cd16c32feef6be3 +Author: Behdad Esfahbod +Date: Wed Aug 10 15:26:41 2011 +0200 + + [util] Port hb-view to GOption + + util/hb-view.cc | 267 +++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 156 insertions(+), 111 deletions(-) + +commit 511a136f0c092880b19250a5df53bcf9f4b043ca +Author: Behdad Esfahbod +Date: Tue Aug 9 15:03:00 2011 +0200 + + Move hb-view into util/ + + Makefile.am | 3 +-- + configure.ac | 1 + + src/Makefile.am | 13 ------------- + util/Makefile.am | 24 ++++++++++++++++++++++++ + {src => util}/hb-view.cc | 0 + 5 files changed, 26 insertions(+), 15 deletions(-) + +commit d753ac78da5619a0a545cdaf7a8e65787e996570 +Author: Behdad Esfahbod +Date: Tue Aug 9 14:03:12 2011 +0200 + + [uniscribe] Remove zerowidth glyphs from output + + src/hb-uniscribe-shape.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 217cc81cd9c3de30b2ef226983ec43c0f78b5c7d +Author: Behdad Esfahbod +Date: Tue Aug 9 14:00:44 2011 +0200 + + [test/shape-complex] Print cluster and position info in --verbose + + test/test-shape-complex.c | 20 +++++++++++++++++--- + 1 file changed, 17 insertions(+), 3 deletions(-) + +commit 708403e7f3e4a5cf9b0d2bd764fb74b148af7adb +Author: Behdad Esfahbod +Date: Tue Aug 9 13:52:36 2011 +0200 + + Fix warnings with old glib + + test/hb-test.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit ddd247b0c528cdb8bdf5f8063180abe884afa305 +Author: Behdad Esfahbod +Date: Tue Aug 9 11:44:42 2011 +0200 + + Minor + + src/test.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 1b8196c98638ba05ae0ebcb8ba7aa99ed9c08e0a +Author: Behdad Esfahbod +Date: Tue Aug 9 11:37:46 2011 +0200 + + Add fallback shaper + + src/hb-fallback-shape.cc | 23 +++++++++++++++++++++-- + 1 file changed, 21 insertions(+), 2 deletions(-) + +commit 13a601fe99f237b08b7166448e386eaea0b77294 +Author: Behdad Esfahbod +Date: Tue Aug 9 11:36:54 2011 +0200 + + [FT] Don't make font immutable + + src/hb-ft.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 38b2118724600521c6ad1e49df0667dcdf863634 +Author: Behdad Esfahbod +Date: Tue Aug 9 10:51:24 2011 +0200 + + [API] Add hb_ft_font_set_funcs(), remove hb_ft_get_font_funcs() + + Remove hb_ft_get_font_funcs() as it cannot be used by the user anyway. + + Add hb_ft_font_set_funcs(). Which will make the font internally use + FreeType. That is, no need for the font to have created using the + hb-ft API. Just create using hb_face_create()/hb_font_create() and + then call this on the font (after having set font scale). This + internally creates an FT_Face and attached to the font. + + src/Makefile.am | 4 +-- + src/hb-ft.cc | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++--- + src/hb-ft.h | 10 ++++--- + src/test.cc | 7 +++++ + test/Makefile.am | 8 ------ + test/test-object.c | 9 ------- + 6 files changed, 89 insertions(+), 25 deletions(-) + +commit 255f176fdcd42ab94f9c3c54e2bffb55d0b1a8f5 +Author: Behdad Esfahbod +Date: Tue Aug 9 08:35:07 2011 +0200 + + Minor + + src/hb-uniscribe-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a9057eb3f38018faa1ece53c4aaeeba798b41fd1 +Author: Behdad Esfahbod +Date: Tue Aug 9 00:47:55 2011 +0200 + + [uniscribe] Unbreak + + src/hb-uniscribe-shape.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c0975e12315b7167b92411584d2f00a751bbc204 +Author: Behdad Esfahbod +Date: Tue Aug 9 00:46:18 2011 +0200 + + Fix build again + + test/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +commit 33ccc77902660ed4b49184e5ec99f4fd0ef63175 +Author: Behdad Esfahbod +Date: Tue Aug 9 00:43:24 2011 +0200 + + [API] Make set_user_data() functions take a replace parameter + + We need this to set data on objects safely without worrying that some + other thread unsets it by setting it at the same time. + + src/hb-blob.cc | 5 +++-- + src/hb-blob.h | 3 ++- + src/hb-buffer.cc | 5 +++-- + src/hb-buffer.h | 3 ++- + src/hb-common.cc | 13 ++++++++----- + src/hb-font.cc | 15 +++++++++------ + src/hb-font.h | 9 ++++++--- + src/hb-object-private.hh | 13 ++++++++----- + src/hb-private.hh | 16 +++++++++++----- + src/hb-shape.cc | 2 +- + src/hb-unicode.cc | 5 +++-- + src/hb-unicode.h | 3 ++- + src/hb-uniscribe-shape.cc | 18 ++++++++++++++---- + test/test-object.c | 33 +++++++++++++++++---------------- + 14 files changed, 89 insertions(+), 54 deletions(-) + +commit 944b2ba1ce076385f985212bbdf2df96a8a995f0 +Author: Behdad Esfahbod +Date: Tue Aug 9 00:23:58 2011 +0200 + + [buffer] Make API take signed int length + + Since we already switched to accepting -1 as 'zero-terminated'. + + src/hb-buffer.cc | 12 ++++++------ + src/hb-buffer.h | 12 ++++++------ + src/hb-ot-layout.cc | 2 -- + src/main.cc | 1 - + 4 files changed, 12 insertions(+), 15 deletions(-) + +commit de1e1cf9bccfd116d495804e230dc2e12b733a2d +Author: Behdad Esfahbod +Date: Tue Aug 9 00:19:38 2011 +0200 + + [FT] Adapt to new face API + + src/hb-ft.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 458c89a85695220d43b69dbae36fc93e3fe78d89 +Author: Behdad Esfahbod +Date: Tue Aug 9 00:19:19 2011 +0200 + + Minor + + test/test-c.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit bf3eef540f81fdeba1c36263d7d5b2ec4c5f07b1 +Author: Behdad Esfahbod +Date: Tue Aug 9 00:13:24 2011 +0200 + + [uniscribe] Cleanup backend + + TODO | 2 + + src/hb-uniscribe-shape.cc | 161 ++++++++++++++++++++++++++++++++++------------ + 2 files changed, 123 insertions(+), 40 deletions(-) + +commit f1f848e2e46ac54ff08aca7cd83390af31c7c9ef +Author: Behdad Esfahbod +Date: Mon Aug 8 23:41:06 2011 +0200 + + Fix build + + test/Makefile.am | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 3897335c7620c37e9a0224b0c42ade0dfdce4053 +Author: Behdad Esfahbod +Date: Mon Aug 8 23:37:41 2011 +0200 + + [API] Sort out get_blob API + + hb_face_get_blob() renamed to hb_face_reference_blob(), returns a + reference now. + + hb_face_[sg]et_index() added. + + hb_face_set_upem() added. + + src/hb-font-private.hh | 3 +- + src/hb-font.cc | 67 +++++++++++++++++++++++++++++++++++---------- + src/hb-font.h | 17 ++++++++++-- + src/hb-ft.cc | 3 +- + src/hb-ot-layout-private.hh | 9 ------ + src/hb-ot-layout.cc | 21 -------------- + src/hb-uniscribe-shape.cc | 3 +- + 7 files changed, 72 insertions(+), 51 deletions(-) + +commit e715784be35f0846c0e084b7c53c7556ce933a45 +Author: Behdad Esfahbod +Date: Mon Aug 8 21:42:02 2011 +0200 + + Rename get_table to reference_table in all API + + src/hb-font-private.hh | 6 +++--- + src/hb-font.cc | 20 ++++++++++---------- + src/hb-font.h | 8 ++++---- + src/hb-ft.cc | 4 ++-- + 4 files changed, 19 insertions(+), 19 deletions(-) + +commit 670c873499f7f03fdfc07b8a0567b041628c6ab0 +Author: Behdad Esfahbod +Date: Mon Aug 8 21:36:24 2011 +0200 + + Fix shaper ordering logic + + src/hb-shape.cc | 80 ++++++++++++++++++++++++--------------------------------- + 1 file changed, 34 insertions(+), 46 deletions(-) + +commit cc797e0d5368b2f5732d77eb3e3882283bd87cf7 +Author: Behdad Esfahbod +Date: Mon Aug 8 03:49:30 2011 +0200 + + Minor + + TODO | 2 -- + src/hb-shape.cc | 2 ++ + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 826e22732dd8697600a1392f48af21b7b3ce6271 +Author: Behdad Esfahbod +Date: Sun Aug 7 03:53:42 2011 -0400 + + [uniscribe] Fix blob lifecycles + + src/hb-uniscribe-shape.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit ff199ba356f0eb5bc6252203eea18a1d1fd28934 +Author: Behdad Esfahbod +Date: Sun Aug 7 03:43:46 2011 -0400 + + Fix shaper_list manipulation, aaaaaaaaaaaaargh + + src/hb-shape.cc | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +commit 206e32934592b915b1f3052aecf014c6ced729e1 +Author: Behdad Esfahbod +Date: Sun Aug 7 01:10:55 2011 -0400 + + [test] test-object is not FreeType-specific, move it to the right place + + test/Makefile.am | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +commit 577326b86af80cc137eea81f4cc1e30adf9232b1 +Author: Behdad Esfahbod +Date: Sun Aug 7 01:04:40 2011 -0400 + + [uniscribe] Fix cluster calculation + + src/hb-uniscribe-shape.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit f6d83b2dcf120f9d6f0a28c6f5de2da7addf9089 +Author: Behdad Esfahbod +Date: Sun Aug 7 00:59:58 2011 -0400 + + Minor + + src/test.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2eb474afb4a09f4da8f14b444bd6066769010224 +Author: Behdad Esfahbod +Date: Sun Aug 7 00:59:38 2011 -0400 + + [uniscribe] Fix shaper + + It's kinda working finally! + + src/hb-uniscribe-shape.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit f22e661147691ebc9d531aa28a850988e6503f9b +Author: Behdad Esfahbod +Date: Sun Aug 7 00:59:12 2011 -0400 + + [glib] Protect against invalid characters + + src/hb-glib.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 144cd49a0eb3ccc749325d0ee14b3ebf4367c971 +Author: Behdad Esfahbod +Date: Sun Aug 7 00:51:50 2011 -0400 + + [buffer] Accept -1 for text_length and item_length + + A -1 text_length means: zero-terminated string. + A -1 item_length means: to the end of string. + + src/hb-buffer.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit e9c71fab30fd1d5b163c8a072f9e2d3eb8ba3a92 +Author: Behdad Esfahbod +Date: Sun Aug 7 00:00:27 2011 -0400 + + Fix name-table lookup + + Oops! + + src/hb-ot-name-private.hh | 2 +- + src/hb-uniscribe-shape.cc | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit 3fd2b5bece28c81e3e379352f09eee39d19ac372 +Author: Behdad Esfahbod +Date: Sat Aug 6 22:59:54 2011 -0400 + + [uniscribe] Use font size directly + + src/hb-uniscribe-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 892eb2e462b40451b8f73879eab66310d884386a +Author: Behdad Esfahbod +Date: Sat Aug 6 22:06:52 2011 -0400 + + [uniscribe] Make font selection work + + Not tested yet. + + src/hb-ot-name-private.hh | 37 +++++++++++++++++++++++++++++++++++++ + src/hb-uniscribe-shape.cc | 30 +++++++++++++++++++++++------- + src/test.cc | 1 - + 3 files changed, 60 insertions(+), 8 deletions(-) + +commit b492299eb3c398701557e452f6c2c9bd370fbbf3 +Author: Behdad Esfahbod +Date: Fri Aug 5 20:34:50 2011 -0400 + + Start implementing the 'name' table + + src/Makefile.am | 3 +- + src/hb-ot-name-private.hh | 91 +++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-uniscribe-shape.cc | 12 ++++--- + 3 files changed, 100 insertions(+), 6 deletions(-) + +commit 4538efacca84329a60ff69851de70027d9b4f567 +Author: Behdad Esfahbod +Date: Fri Aug 5 20:11:06 2011 -0400 + + Skip tests by returning 77 + + automake test runner understands this. + + src/check-internal-symbols.sh | 3 ++- + src/check-libstdc++.sh | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit 54eb65538da0a6ab0389d09944c90e12a913157d +Author: Behdad Esfahbod +Date: Fri Aug 5 20:09:25 2011 -0400 + + Fix check on OS X sh + + src/check-header-guards.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9da554504e30a326fc57b28cdb0e57108bfa9555 +Author: Behdad Esfahbod +Date: Fri Aug 5 19:48:49 2011 -0400 + + Add hb_shape_list_shapers() + + src/hb-shape.cc | 22 ++++++++++++++++++---- + src/hb-shape.h | 3 +++ + test/Makefile.am | 2 ++ + test/test-c.c | 8 ++++++++ + test/test-shape.c | 15 +++++++++++++++ + 5 files changed, 46 insertions(+), 4 deletions(-) + +commit d7bf473ef222ab420456ff155ffaa09bacb3a394 +Author: Behdad Esfahbod +Date: Fri Aug 5 18:18:21 2011 -0400 + + Minor + + src/check-header-guards.sh | 1 - + src/hb-open-type-private.hh | 10 +++++----- + 2 files changed, 5 insertions(+), 6 deletions(-) + +commit c62a8f10f3b9a4ac3ac6b686464ac734ebfa2f7f +Author: Behdad Esfahbod +Date: Fri Aug 5 18:02:30 2011 -0400 + + Free all static memory upon exit + + src/hb-common.cc | 8 +++++--- + src/hb-shape.cc | 4 ++-- + 2 files changed, 7 insertions(+), 5 deletions(-) + +commit c4d63ef744f79701458ab7af2055afb87ffe8de3 +Author: Behdad Esfahbod +Date: Fri Aug 5 17:54:25 2011 -0400 + + Fix env parsing code + + Also changed the separator to comma instead of colon. + + src/hb-shape.cc | 34 +++++++++++++++++++++++++--------- + 1 file changed, 25 insertions(+), 9 deletions(-) + +commit 3931837bebd79c5eb1bd5b24ff12e2c8e7d3f24c +Author: Behdad Esfahbod +Date: Fri Aug 5 17:22:19 2011 -0400 + + Change hb_shape() API back to what it was, add hb_shape_full() + + I disliked changing hb_shape() API, and disliked the fact that it was + returning a bool now. So, reverted. Added new API for the extra + functionality. + + src/hb-view.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3ca6c4ecc299295b6682fa2b6b9f83b213223bad +Author: Behdad Esfahbod +Date: Fri Aug 5 17:22:19 2011 -0400 + + Change hb_shape() API back to what it was, add hb_shape_full() + + I disliked changing hb_shape() API, and disliked the fact that it was + returning a bool now. So, reverted. Added new API for the extra + functionality. + + src/hb-shape.cc | 21 +++++++++++++++------ + src/hb-shape.h | 14 ++++++++++---- + src/test.cc | 2 +- + test/test-shape.c | 2 +- + 4 files changed, 27 insertions(+), 12 deletions(-) + +commit 02aeca985b570763342c35e99af90025bfa088d5 +Author: Behdad Esfahbod +Date: Thu Aug 4 22:31:05 2011 -0400 + + [API] Changes to main shape API + + hb_shape() now accepts a shaper_options and a shaper_list argument. + Both can be set to NULL to emulate previous API. And in most situations + they are expected to be set to NULL. + + hb_shape() also returns a boolean for now. If shaper_list is NULL, the + return value can be ignored. + + shaper_options is ignored for now, but otherwise it should be a + NULL-terminated list of strings. + + shaper_list is a NULL-terminated list of strings. Currently recognized + strings are "ot" for native OpenType Layout implementation, "uniscribe" + for the Uniscribe backend, and "fallback" for the non-complex backend + (that will be implemented shortly). The fallback backend never fails. + + The env var HB_SHAPER_LIST is also parsed and honored. It's a + colon-separated list of shaper names. The fallback shaper is invoked if + none of the env-listed shapers succeed. + + New API hb_buffer_guess_properties() added. + + TODO | 2 - + configure.ac | 9 +++ + src/Makefile.am | 14 ++-- + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 35 ++++++++++ + src/hb-buffer.h | 3 + + src/hb-fallback-shape-private.hh | 48 ++++++++++++++ + src/hb-fallback-shape.cc | 43 +++++++++++++ + src/hb-ot-shape.cc | 9 ++- + src/hb-ot-shape.h | 5 +- + src/hb-shape.cc | 135 +++++++++++++++++++++++---------------- + src/hb-shape.h | 13 ++-- + src/hb-uniscribe-shape.cc | 52 ++++++--------- + src/hb-uniscribe.h | 5 +- + src/hb-view.cc | 2 +- + src/test.cc | 3 +- + test/test-shape.c | 2 +- + 17 files changed, 274 insertions(+), 107 deletions(-) + +commit 57692adf1294a6db4627d0de7c671e4aa01d2a8f +Author: Behdad Esfahbod +Date: Thu Aug 4 20:49:16 2011 -0400 + + Make test.cc do something more useful + + Hardcoded to the uniscribe backend for now. Will fix soon. + + src/test.cc | 38 ++++++++++++++++++++++++++++++++++---- + 1 file changed, 34 insertions(+), 4 deletions(-) + +commit c605bbbb6d4b2a98b1f40ca818760088d991f7d1 +Author: Behdad Esfahbod +Date: Thu Aug 4 20:00:53 2011 -0400 + + Remove C++ guards from source files + + Where causing issues for people with MSVC. + + src/check-c-linkage-decls.sh | 3 +-- + src/hb-blob.cc | 2 -- + src/hb-buffer-private.hh | 2 -- + src/hb-buffer.cc | 2 -- + src/hb-common.cc | 2 -- + src/hb-font-private.hh | 2 -- + src/hb-font.cc | 2 -- + src/hb-ft.cc | 2 -- + src/hb-glib.cc | 2 -- + src/hb-icu.cc | 2 -- + src/hb-mutex-private.hh | 2 -- + src/hb-object-private.hh | 4 ---- + src/hb-open-file-private.hh | 2 -- + src/hb-open-type-private.hh | 4 ---- + src/hb-ot-head-private.hh | 2 -- + src/hb-ot-layout-common-private.hh | 4 ---- + src/hb-ot-layout-gdef-private.hh | 2 -- + src/hb-ot-layout-gpos-private.hh | 4 ---- + src/hb-ot-layout-gsub-private.hh | 4 ---- + src/hb-ot-layout-gsubgpos-private.hh | 6 ------ + src/hb-ot-layout-private.hh | 2 -- + src/hb-ot-layout.cc | 2 -- + src/hb-ot-map-private.hh | 2 -- + src/hb-ot-map.cc | 2 -- + src/hb-ot-maxp-private.hh | 2 -- + src/hb-ot-shape-complex-arabic-table.hh | 2 -- + src/hb-ot-shape-complex-arabic.cc | 2 -- + src/hb-ot-shape-complex-indic-table.hh | 2 -- + src/hb-ot-shape-complex-indic.cc | 2 -- + src/hb-ot-shape-complex-misc.cc | 2 -- + src/hb-ot-shape-complex-private.hh | 2 -- + src/hb-ot-shape-normalize.cc | 2 -- + src/hb-ot-shape-private.hh | 2 -- + src/hb-ot-shape.cc | 2 -- + src/hb-ot-tag.cc | 2 -- + src/hb-private.hh | 8 -------- + src/hb-shape.cc | 2 -- + src/hb-unicode-private.hh | 2 -- + src/hb-unicode.cc | 2 -- + src/hb-uniscribe-shape.cc | 2 -- + src/hb-view.cc | 2 -- + src/main.cc | 2 -- + src/test.cc | 2 -- + 43 files changed, 1 insertion(+), 106 deletions(-) + +commit 8336186a52813b53e90b4399dc462d55750e2d37 +Author: Behdad Esfahbod +Date: Thu Aug 4 19:49:05 2011 -0400 + + Zero map objects + + src/hb-ot-map-private.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit ecd3b6e4ad253cf9d0dae1ed2da8ba6caed16b85 +Author: Behdad Esfahbod +Date: Thu Aug 4 01:57:40 2011 -0400 + + More build fixes + + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +commit c747f509bcc4e6a34ced04e9e79ed414a44437b1 +Author: Behdad Esfahbod +Date: Thu Aug 4 01:51:30 2011 -0400 + + More out-of-tree build fixes + + src/check-c-linkage-decls.sh | 3 +-- + src/check-header-guards.sh | 8 ++++---- + 2 files changed, 5 insertions(+), 6 deletions(-) + +commit 0530ca9a180edc330ab801c535907cefa4a0c298 +Author: Behdad Esfahbod +Date: Thu Aug 4 01:42:59 2011 -0400 + + Fix out-of-tree build + + test/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ddbf4edc5d09a645351b1bd1722b068aba6a6dec +Author: Behdad Esfahbod +Date: Thu Aug 4 01:38:37 2011 -0400 + + Minor + + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +commit 20dde6101662fd9ebe5f613631ea468f4c0a995f +Author: Behdad Esfahbod +Date: Thu Aug 4 01:07:33 2011 -0400 + + Minor + + src/hb-uniscribe.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 44b4f50d05fd51d8056a78e359fbb00fbcac43a0 +Author: Behdad Esfahbod +Date: Thu Aug 4 00:52:20 2011 -0400 + + Fix typo + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0fbb2dc83132a89201ad8b56c6909610437d2da0 +Author: Behdad Esfahbod +Date: Wed Aug 3 19:55:04 2011 -0400 + + Add draft experimental Uniscribe backend + + Not complete yet, font selection doesn't work. But hey it shapes! + + This is not supposed to be a production backend, more like a testing + backend. + + configure.ac | 9 ++ + src/Makefile.am | 11 ++ + src/hb-private.hh | 4 +- + src/hb-uniscribe-shape.cc | 325 ++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-uniscribe.h | 46 +++++++ + 5 files changed, 394 insertions(+), 1 deletion(-) + +commit 0d7d4824b2edc7aeeb995077655a9a89b5c360a9 +Author: Behdad Esfahbod +Date: Wed Aug 3 17:39:24 2011 -0400 + + Minor + + configure.ac | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit e62df43649e31b7815c272f01808b3f726c7d07d +Author: Behdad Esfahbod +Date: Wed Aug 3 17:38:54 2011 -0400 + + Add internal hb_buffer_t::get_scratch_buffer() + + src/hb-buffer-private.hh | 2 ++ + src/hb-buffer.cc | 10 ++++++++++ + 2 files changed, 12 insertions(+) + +commit 71e7936fcadfd375a8bdc47987ef8b1b2b542df5 +Author: Behdad Esfahbod +Date: Wed Aug 3 17:38:34 2011 -0400 + + Minor + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit bf8c57ba745c02370c38198adfdcd8075ba38b13 +Author: Behdad Esfahbod +Date: Wed Aug 3 17:38:04 2011 -0400 + + [API] Add hb_face_get_blob() + + Need to think more about it. + + src/hb-font.cc | 10 ++++++++++ + src/hb-font.h | 3 +++ + 2 files changed, 13 insertions(+) + +commit 2118fdb9f584e6735e904638e48bae48314372fa +Author: Behdad Esfahbod +Date: Tue Aug 2 14:06:51 2011 -0400 + + Fix fallback shaping + + Broke it a few commits ago. + + src/hb-ot-shape.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 199abbd0f15bd295c3a56845c71b38dd20af1332 +Author: Behdad Esfahbod +Date: Tue Aug 2 13:59:47 2011 -0400 + + Minor + + test/test-unicode.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 4f052b93c0b17d92b9f0adddf64ef77518bf2ac4 +Author: Behdad Esfahbod +Date: Tue Aug 2 13:44:24 2011 -0400 + + Fix build with glib but not freetype + + test/Makefile.am | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit c21be799daa85d5edb2d831ac985d3e43c8755ec +Author: Behdad Esfahbod +Date: Tue Aug 2 12:05:49 2011 -0400 + + Minor + + test/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e9c2341b1384c161bbab9871411af0bc9f6c3cf4 +Author: Behdad Esfahbod +Date: Tue Aug 2 11:40:44 2011 -0400 + + Don't use icu-config when cross-compiling + + configure.ac | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +commit 390dab49b6cf34f263b67d20a13f0752ada57bcc +Author: Behdad Esfahbod +Date: Tue Aug 2 11:29:55 2011 -0400 + + Unbreak icu-config results a bit + + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +commit b301478a69d961c724a4875b839a81fb458d1153 +Author: Behdad Esfahbod +Date: Tue Aug 2 11:25:13 2011 -0400 + + Bug 39763 - autogen.sh should check pkg-config availability + + (and revert change have_icu change I mistakenly pushed out) + + autogen.sh | 10 ++++++++-- + configure.ac | 1 - + 2 files changed, 8 insertions(+), 3 deletions(-) + +commit f60271c0c2b0101e7b2725f9a9ad950c277a616c +Author: Behdad Esfahbod +Date: Tue Aug 2 09:56:30 2011 -0400 + + Add mingw32 support + + With these changes, on Ubuntu I can do: + + ./configure --host=i586-mingw32msvc && make + + configure.ac | 1 + + src/hb-mutex-private.hh | 4 ++-- + src/hb-open-type-private.hh | 5 +++++ + src/hb-private.hh | 6 +++++- + src/main.cc | 1 + + 5 files changed, 14 insertions(+), 3 deletions(-) + +commit 1264b23e4a4ae1c9831a3009e1c7ab8e65a5b434 +Author: Behdad Esfahbod +Date: Mon Aug 1 16:39:32 2011 -0400 + + Bug 39702 - configure check for ragel + + autogen.sh | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +commit f5414cf0a220d6e6f3d4b6e8221cd583b4684187 +Author: Behdad Esfahbod +Date: Mon Aug 1 16:34:16 2011 -0400 + + Use missing script for calling ragel + + src/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit a91c58bf98258a34e5f7c1ad39a38db58fadc4b9 +Author: Behdad Esfahbod +Date: Mon Aug 1 16:30:11 2011 -0400 + + [Indic] Disable CJCT-disabling logic + + Read comment. + + src/hb-ot-shape-complex-indic.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 5e72071062c015237b79fbd0521341a63166a204 +Author: Behdad Esfahbod +Date: Sun Jul 31 17:51:50 2011 -0400 + + [Indic] Stop looking for base upon seeing joiners + + Not sure where this is documented, but I remember this being the desired + behavior. + + test-shape-complex failures are down from 48 to 46. Meh. + + src/hb-ot-shape-complex-indic.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 281683995a46ed37aeeb84061249758c59822457 +Author: Behdad Esfahbod +Date: Sun Jul 31 16:00:35 2011 -0400 + + Cosmetic + + src/hb-ot-shape-complex-indic.cc | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) + +commit 6b37bc80843e38ca7b62500f95fd70c08af68d62 +Author: Behdad Esfahbod +Date: Sun Jul 31 15:57:00 2011 -0400 + + [Indic] Fix ZWJ/ZWNJ application + + Not quite working just yet. False alarm re 10 failures. It was + crashing. Ouch! Back to 48 failures. + + src/hb-ot-shape-complex-indic.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit e7be05702447ae270d797398132c1930cd3a9b86 +Author: Behdad Esfahbod +Date: Sun Jul 31 15:18:57 2011 -0400 + + [Indic] Add Final Reordering rules into comments + + Not applied yet. + + src/hb-ot-shape-complex-indic.cc | 86 ++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 83 insertions(+), 3 deletions(-) + +commit cfd4382ec1af91640129551697de36fd42c0849a +Author: Behdad Esfahbod +Date: Sun Jul 31 15:07:11 2011 -0400 + + [Indic] Handle Reph when determining base consonant + + src/hb-ot-shape-complex-indic.cc | 24 +++++++++++++++--------- + 1 file changed, 15 insertions(+), 9 deletions(-) + +commit 97158392a5899ddb739afaac925128f33f699bd7 +Author: Behdad Esfahbod +Date: Sun Jul 31 15:01:28 2011 -0400 + + [Indic] Ra is a consonant too + + src/hb-ot-shape-complex-indic.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 0d8f8a177c4bfd4dc642a353bab8d03674e839ac +Author: Behdad Esfahbod +Date: Sun Jul 31 14:57:59 2011 -0400 + + [Indic] Fix reph inhibition logic + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9da0487cd452d780673e24329ce03e174a4ef83b +Author: Behdad Esfahbod +Date: Sun Jul 31 13:46:44 2011 -0400 + + [Indic] Support ZWJ/ZWNJ + + Brings test-shape-complex failures down from 52 to 10! + + I hereby declare harfbuzz-ng supporting Indic! + + src/hb-ot-shape-complex-indic.cc | 57 +++++++++++++++++++++++++++++++++------- + 1 file changed, 48 insertions(+), 9 deletions(-) + +commit 9ee27a928a989c71923cef82a9e9828f8e9ca051 +Author: Behdad Esfahbod +Date: Sun Jul 31 11:10:14 2011 -0400 + + [Indic] Suppress reph formation upon joiners + + src/hb-ot-shape-complex-indic.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 8354e004e553856d7d743e0f0b4de4668484026a +Author: Behdad Esfahbod +Date: Sun Jul 31 02:24:51 2011 -0400 + + Un-Ra U+09F1. According to the test suite this is correct. + + But I'm not sure... Down from 54 failures to 52. + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 07cedd81f48907b2e372cd2e963716bbded9ce29 +Author: Behdad Esfahbod +Date: Sat Jul 30 21:16:51 2011 -0400 + + Minor + + test/test-shape-complex.c | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) + +commit ba7e85c104e68b4685c1b3b5c9a260fe0f6879df +Author: Behdad Esfahbod +Date: Sat Jul 30 21:11:53 2011 -0400 + + Cosmetic + + src/hb-ot-shape-complex-indic.cc | 1 + + 1 file changed, 1 insertion(+) + +commit f5bc2725cb892264ba223e0a49f7fd2c622a0730 +Author: Behdad Esfahbod +Date: Sat Jul 30 21:08:10 2011 -0400 + + [Indic] For old-style Indic tables, move Halant around + + In old-style Indic OT standards, the post-base Halants are moved after + their base. Emulate that by moving first post-base Halant to + post-last-consonant. + + Brings test-shape-complex failures down from 88 to 54. Getting there! + + src/hb-ot-map-private.hh | 3 +++ + src/hb-ot-shape-complex-indic.cc | 20 ++++++++++++++++++++ + 2 files changed, 23 insertions(+) + +commit c47a31fb4793b825f4be57e9cb1b10db352b9512 +Author: Behdad Esfahbod +Date: Sat Jul 30 20:57:01 2011 -0400 + + [OT] Save chosen script tag + + src/hb-ot-layout.cc | 20 ++++++++++++++++---- + src/hb-ot-layout.h | 3 ++- + src/hb-ot-map-private.hh | 1 + + src/hb-ot-map.cc | 2 +- + 4 files changed, 20 insertions(+), 6 deletions(-) + +commit 3a9b14dfdfc278b432890e1537672a4ca141a3b0 +Author: Behdad Esfahbod +Date: Sat Jul 30 20:23:55 2011 -0400 + + Minor + + test/test-shape-complex.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 8613193bbf28fe8951c900b68c4418a6fb929626 +Author: Behdad Esfahbod +Date: Sat Jul 30 20:21:40 2011 -0400 + + [test] Fix problem with N'ko test direction + + Old HarfBuzz test suite always shaped as left-to-right and hence had wrong + 0x14db, direction expected glyphstring for N'ko. Doh! + + Failures down from 92 to 88. + + test/test-shape-complex.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit fd06bf56110e73826b3d5c73ac964e2609450d46 +Author: Behdad Esfahbod +Date: Sat Jul 30 20:14:44 2011 -0400 + + [Indic] Handle initial Ra+Halant in scripts that support Reph + + Brings test-shape-complex failures down from 104 to 92. Way to go! + + src/hb-ot-shape-complex-indic.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit ee58f3bc75d2d071a71b94063bf12205a5871acb +Author: Behdad Esfahbod +Date: Sat Jul 30 19:15:53 2011 -0400 + + Minor + + src/hb-ot-shape-complex-indic.cc | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +commit 352372ae5ea0998e40cf9fe43c22b6b610a5764e +Author: Behdad Esfahbod +Date: Sat Jul 30 19:04:02 2011 -0400 + + [Indic] Categorize Ra in scripts that have Reph + + Is the categorization correct? I don't know. + + src/hb-ot-shape-complex-indic.cc | 31 ++++++++++++++++++++++++++++++- + 1 file changed, 30 insertions(+), 1 deletion(-) + +commit 45d6f29f15f1d2323bcaa2498aed23ff0c8a1567 +Author: Behdad Esfahbod +Date: Sat Jul 30 14:44:30 2011 -0400 + + [Indic] Reorder matras + + Number of failing shape-complex tests goes from 125 down to 94. + + Next: Add Ra handling and it's fair to say we kinda support Indic :). + + src/hb-ot-shape-complex-indic.cc | 29 +++++++++++++++++++++++++++-- + src/hb-ot-shape-normalize.cc | 26 ++++++++++---------------- + src/hb-private.hh | 36 ++++++++++++++++++++++++++++++------ + 3 files changed, 67 insertions(+), 24 deletions(-) + +commit 911bf32acad7f1cd161f666cb659990ade0925ad +Author: Behdad Esfahbod +Date: Sat Jul 30 11:16:00 2011 -0400 + + Bug 39686 - Add '-no-undefined' to libharfbuzz LDFLAGS + + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8f0b64fb6988f9502d2c5e39768a9af133d9a83f +Author: Behdad Esfahbod +Date: Fri Jul 29 17:02:48 2011 -0400 + + Minor + + src/hb-ot-shape-complex-arabic.cc | 6 +++--- + src/hb-private.hh | 8 ++++++-- + 2 files changed, 9 insertions(+), 5 deletions(-) + +commit 743807a3ce1b2229e5307a8aea074a7544623d8d +Author: Behdad Esfahbod +Date: Fri Jul 29 16:37:02 2011 -0400 + + [Indic] Apply Indic features + + Find the base consonant and apply basic Indic features accordingly. + Nothing complete, but does something for now. Specifically: + no Ra handling right now, and no ZWJ/ZWNJ. + + Number of failing shape-complex tests goes from 174 down to 125. + + Next: reorder matras. + + src/hb-ot-shape-complex-indic-machine.rl | 35 ++++-- + src/hb-ot-shape-complex-indic.cc | 209 ++++++++++++++++++++++++++++--- + 2 files changed, 212 insertions(+), 32 deletions(-) + +commit 1a1b5013159369b343d0c32df02c9c419277aead +Author: Behdad Esfahbod +Date: Fri Jul 29 16:36:46 2011 -0400 + + Minor + + test/test-shape-complex.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit dd5546de15e63c0320b7db2bf42b0f15271f7915 +Author: Behdad Esfahbod +Date: Fri Jul 29 16:27:31 2011 -0400 + + Minor + + test/test-shape-complex.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9f9bcceca6321d5a5812f878de1de39901349a78 +Author: Behdad Esfahbod +Date: Thu Jul 28 17:06:46 2011 -0400 + + Register buffer vars in Indic shaper + + src/hb-ot-shape-complex-indic.cc | 6 ++++++ + src/hb-ot-shape.cc | 2 ++ + 2 files changed, 8 insertions(+) + +commit be09bf6b799cafc2ff54a28915b307ffe99661b6 +Author: Behdad Esfahbod +Date: Thu Jul 28 17:03:43 2011 -0400 + + Oops. This should have gone into the previous commit + + src/hb-ot-layout-gsub-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b65c06025d2b54a44f716e030d4b10072c65bea8 +Author: Behdad Esfahbod +Date: Thu Jul 28 16:48:43 2011 -0400 + + Formalize buffer var allocations + + src/hb-buffer-private.hh | 25 ++++++---------- + src/hb-buffer.cc | 15 +++++----- + src/hb-ot-layout-gpos-private.hh | 14 +++++---- + src/hb-ot-layout-gsub-private.hh | 5 +++- + src/hb-ot-shape-complex-arabic.cc | 6 +++- + src/hb-ot-shape-complex-indic.cc | 4 +-- + src/hb-ot-shape-complex-private.hh | 10 ++++++- + src/hb-ot-shape.cc | 60 +++++++++++++++++++++++--------------- + src/hb-private.hh | 1 + + 9 files changed, 83 insertions(+), 57 deletions(-) + +commit a9ad3d3460ba863a8d8f3766ccbeab288c3c6822 +Author: Behdad Esfahbod +Date: Thu Jul 28 15:42:18 2011 -0400 + + Move more code around + + Buffer var allocation coming into shape + + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 35 +++++++++++++++++++++++++++++++++++ + src/hb-ot-layout-gpos-private.hh | 7 +++++++ + src/hb-ot-layout-gsub-private.hh | 18 ++++++++++++++++++ + src/hb-ot-layout.cc | 8 +++----- + 5 files changed, 64 insertions(+), 5 deletions(-) + +commit cc06c243d8be3ebb1190281653d2dba504c16c0f +Author: Behdad Esfahbod +Date: Mon Jul 25 20:25:44 2011 -0400 + + Streamline debugging infrastructure even more + + src/hb-blob.cc | 26 ++++----- + src/hb-object-private.hh | 8 +-- + src/hb-open-type-private.hh | 64 ++++++-------------- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-private.hh | 109 +++++++++++++++++++++++++++++++---- + 5 files changed, 136 insertions(+), 73 deletions(-) + +commit 43ff203d8ea3e1b09e316e3aae1a4e5ec15bfdd2 +Author: Behdad Esfahbod +Date: Mon Jul 25 17:35:24 2011 -0400 + + Use variadic macros for debugging + + Looks *so* much nicer! + + src/hb-blob.cc | 26 ++++++++-------- + src/hb-object-private.hh | 8 ++--- + src/hb-open-type-private.hh | 75 ++++++++++++++++++++------------------------- + src/hb-private.hh | 7 +++-- + 4 files changed, 56 insertions(+), 60 deletions(-) + +commit decd4e3e16424dc311e9fb5b663170414a11556a +Author: Behdad Esfahbod +Date: Mon Jul 25 16:47:02 2011 -0400 + + Add sugar syntax for debug messages + + Buffer debugging coming soon. + + src/hb-blob.cc | 35 +++++++++++++---------------------- + src/hb-object-private.hh | 9 ++++----- + src/hb-open-type-private.hh | 44 ++++++++++++++++++++++---------------------- + src/hb-private.hh | 7 +++++-- + 4 files changed, 44 insertions(+), 51 deletions(-) + +commit 3a81b1db89beba91fb91791918b9fdd9f8fc9fa0 +Author: Behdad Esfahbod +Date: Mon Jul 25 16:30:32 2011 -0400 + + Minor, fix leak from my previous refactorings + + src/hb-buffer.cc | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit f4a579bc42fb811ff5c391a0e97b7d8656ef59b1 +Author: Behdad Esfahbod +Date: Mon Jul 25 16:20:16 2011 -0400 + + Add internal API for buffer var allocation + + src/hb-buffer-private.hh | 25 +++++++++++++++++++++++-- + src/hb-buffer.cc | 22 ++++++++++++++++++++++ + 2 files changed, 45 insertions(+), 2 deletions(-) + +commit 651e8dd79ec8eaca5ab75a61e8ce961ff7bd26eb +Author: Behdad Esfahbod +Date: Mon Jul 25 14:54:08 2011 -0400 + + Start cleaning up buffer var allocation + + I've messed up a lot of stuff recently, different parts of the + shaping process are stumbling on eachother's toes because + manually tracking what's in which buffer var is hard. I'm + going to add some internal API to track those such that mistakes + are discovered as soon as they are introduced. + + src/hb-ot-layout-gsubgpos-private.hh | 1 - + src/hb-ot-layout.cc | 1 + + src/hb-ot-shape.cc | 10 ---------- + 3 files changed, 1 insertion(+), 11 deletions(-) + +commit c86f932015bdf5803572b0904d343d3bc033e009 +Author: Behdad Esfahbod +Date: Mon Jul 25 00:44:50 2011 -0400 + + Move code around + + src/hb-ot-shape.cc | 85 +++++++++++++++++++++++++++--------------------------- + 1 file changed, 42 insertions(+), 43 deletions(-) + +commit 18c42850c9327ab4479ff150660a76d4ff6f3e9c +Author: Behdad Esfahbod +Date: Mon Jul 25 00:36:58 2011 -0400 + + Shrink space used for ligature ids + + This frees 16bits in the glyph_info struct during the ot_layout process. + We can use the freed space in the shapers now. + + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit d8787493c9aa420544096cef07c29a591a0c1a99 +Author: Behdad Esfahbod +Date: Mon Jul 25 00:36:01 2011 -0400 + + Minor + + src/hb-ot-layout-gsub-private.hh | 6 ------ + src/hb-ot-layout-gsubgpos-private.hh | 7 +++++++ + 2 files changed, 7 insertions(+), 6 deletions(-) + +commit c311d852080b50ffc85e80168de62abb05a6be59 +Author: Behdad Esfahbod +Date: Sat Jul 23 23:43:54 2011 -0400 + + Keep Unicode props updated as we go so we avoid a scan later + + src/hb-ot-shape-normalize.cc | 54 +++++++++++++++++++++----------------------- + 1 file changed, 26 insertions(+), 28 deletions(-) + +commit 5389ff4dbc46c76c9483e3c95f22524b60e21166 +Author: Behdad Esfahbod +Date: Fri Jul 22 20:22:49 2011 -0400 + + Implement the Unicode Canonical Composition algorithm + + Fallback normalization is complete and working now! + + src/hb-ot-shape-normalize.cc | 49 +++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 46 insertions(+), 3 deletions(-) + +commit dcdc51cdc0ba9d9fb75f84dd5fa7a49aa0b24ea0 +Author: Behdad Esfahbod +Date: Fri Jul 22 17:14:46 2011 -0400 + + Handle singleton decompositions + + src/hb-ot-shape-normalize.cc | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit 34c22f816808d061a980cffca12de03beb437fa0 +Author: Behdad Esfahbod +Date: Fri Jul 22 17:04:20 2011 -0400 + + Implement Unicode Canonical Reordering Algorithm + + src/hb-ot-shape-normalize.cc | 80 +++++++++++++++++++++++++++++++++++++------- + src/hb-ot-shape-private.hh | 2 ++ + src/hb-ot-shape.cc | 6 ++-- + 3 files changed, 73 insertions(+), 15 deletions(-) + +commit 4ff0d2d9dfc4f7e4880a4e964ca9872624508ea0 +Author: Behdad Esfahbod +Date: Fri Jul 22 16:15:32 2011 -0400 + + Decomposition works now! + + src/hb-ot-shape-normalize.cc | 109 +++++++++++++++++++++++++++---------------- + src/hb-ot-shape.cc | 3 +- + 2 files changed, 70 insertions(+), 42 deletions(-) + +commit 468e9cb25c9bc14781b7013e447d763f93bf76a3 +Author: Behdad Esfahbod +Date: Fri Jul 22 11:28:07 2011 -0400 + + Move buffer methods into the object + + src/hb-buffer-private.hh | 110 +++---- + src/hb-buffer.cc | 605 +++++++++++++++++------------------ + src/hb-ot-layout-gpos-private.hh | 88 ++--- + src/hb-ot-layout-gsub-private.hh | 58 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 50 +-- + src/hb-ot-shape-normalize.cc | 16 +- + src/hb-ot-shape.cc | 14 +- + 7 files changed, 456 insertions(+), 485 deletions(-) + +commit 45412523dc295cb5ee12e096bfacb282cc925843 +Author: Behdad Esfahbod +Date: Fri Jul 22 11:07:05 2011 -0400 + + More normalization kick + + src/hb-ot-shape-normalize.cc | 54 +++++++++++++++++++++++++++++--------------- + src/hb-ot-shape-private.hh | 8 ++++++- + src/hb-ot-shape.cc | 13 +++-------- + 3 files changed, 46 insertions(+), 29 deletions(-) + +commit 63c0ef4a0763e579c9c80887bbfbd2651de05067 +Author: Behdad Esfahbod +Date: Thu Jul 21 20:58:42 2011 -0400 + + Fix decompose() implementations to work with non-starter non-composables + + Add tests. + + src/hb-glib.cc | 10 +++++----- + src/hb-icu.cc | 20 +++++++++++++------- + test/test-unicode.c | 11 ++++++++--- + 3 files changed, 26 insertions(+), 15 deletions(-) + +commit 5d90a342e319068716429bf7af76c3896b61a0e5 +Author: Behdad Esfahbod +Date: Thu Jul 21 15:25:01 2011 -0400 + + Document normalization design + + src/hb-ot-shape-normalize.cc | 78 +++++++++++++++++++++++++++++++++++--------- + src/hb-ot-shape-private.hh | 2 +- + src/hb-ot-shape.cc | 6 ++-- + 3 files changed, 67 insertions(+), 19 deletions(-) + +commit 02cdf743c2ec345a44d4fcf865594b6ac13fccd0 +Author: Behdad Esfahbod +Date: Thu Jul 21 12:23:12 2011 -0400 + + Add prefer_decomposed() complex-shaper callback + + This allows the Indic shaper to request decomposed characters. This will + handle split matra for free. Other shapers prefer precomposed + characters. + + src/hb-ot-shape-complex-arabic.cc | 6 ++++++ + src/hb-ot-shape-complex-indic.cc | 7 +++++++ + src/hb-ot-shape-complex-misc.cc | 6 ++++++ + src/hb-ot-shape-complex-private.hh | 31 +++++++++++++++++++++++++++++-- + 4 files changed, 48 insertions(+), 2 deletions(-) + +commit d6b9c6d20041b4f4fa11befc179aee757c41904d +Author: Behdad Esfahbod +Date: Thu Jul 21 12:16:45 2011 -0400 + + More kicking + + src/hb-ot-shape-normalize.cc | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +commit 192445aef2e50087049243ce54ce7059ec441ffa +Author: Behdad Esfahbod +Date: Thu Jul 21 12:13:04 2011 -0400 + + Remove intermittent_glyph() + + Lets not worry about performance for now... + + src/hb-ot-shape-normalize.cc | 3 ++- + src/hb-ot-shape-private.hh | 2 -- + 2 files changed, 2 insertions(+), 3 deletions(-) + +commit d63adfc7d09b26764d9166da97372b21257e7611 +Author: Behdad Esfahbod +Date: Thu Jul 21 11:48:57 2011 -0400 + + No need to handle variation-selectors seperately, they are GC=Mn + + src/hb-ot-shape.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit aa7264123a088936f2043b45d4d41ca7413fabe5 +Author: Behdad Esfahbod +Date: Thu Jul 21 11:34:59 2011 -0400 + + Only form clusters if we are reversing + + This produces more accurate cluster mappings. Cluster mappings are + minimal now. Combining marks get their own cluster value most of + the time. + + src/hb-ot-shape.cc | 45 ++++++++++++++++++++++----------------------- + 1 file changed, 22 insertions(+), 23 deletions(-) + +commit 5c6f5982d78e2d7fadc2fbb8b4f3a4be9420c59a +Author: Behdad Esfahbod +Date: Thu Jul 21 11:31:08 2011 -0400 + + Towards normalization + + src/hb-ot-shape-normalize.cc | 33 ++++++++++++++++++++++----------- + src/hb-ot-shape-private.hh | 3 ++- + src/hb-ot-shape.cc | 4 +++- + 3 files changed, 27 insertions(+), 13 deletions(-) + +commit ad903e66b1cc4ec1b8160f93b3ab2b5e636f8d62 +Author: Behdad Esfahbod +Date: Thu Jul 21 10:17:22 2011 -0400 + + s/COMBINING_MARK/SPACING_MARK/ here too. Oops! + + test/test-unicode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cf7f43ec3382cac2af11f5637c840500daabf889 +Author: Behdad Esfahbod +Date: Thu Jul 21 01:12:26 2011 -0400 + + Remove stale comment + + src/hb-ot-shape.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 54d1a0d2b2c4ffe15494967122c6422ecb1fc80b +Author: Behdad Esfahbod +Date: Thu Jul 21 01:11:09 2011 -0400 + + Form clusters before ensuring native direciton + + This is essential as ensure_native_direction uses cluster info that + is set by form_clusters(). + + src/hb-ot-shape.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9111b21ef99d5e53348176f683261b0101eb427f +Author: Behdad Esfahbod +Date: Thu Jul 21 00:58:29 2011 -0400 + + Add _hb_buffer_output_glyph() and _hb_buffer_skip_glyph() + + src/hb-buffer-private.hh | 10 ++++++++++ + src/hb-buffer.cc | 19 ++++++++++++++++--- + src/hb-ot-shape.cc | 2 +- + 3 files changed, 27 insertions(+), 4 deletions(-) + +commit 655586fe5e1fadf2a2ef7826e61ee9a445ffa37a +Author: Behdad Esfahbod +Date: Thu Jul 21 00:51:18 2011 -0400 + + Towards normalization + + src/Makefile.am | 1 + + src/hb-ot-shape-normalize.cc | 71 ++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-shape-private.hh | 12 ++++++++ + src/hb-ot-shape.cc | 10 ++----- + 4 files changed, 86 insertions(+), 8 deletions(-) + +commit 49741c86334d12fa08a5bfa2110ff3b9adcba1c7 +Author: Behdad Esfahbod +Date: Thu Jul 21 00:35:37 2011 -0400 + + Include variation-selectors in cluster calculation + + src/hb-ot-shape.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit dd89d958c139d85efb776fffaf314eead3952c78 +Author: Behdad Esfahbod +Date: Thu Jul 21 00:28:57 2011 -0400 + + Fix cluster calculation for non-LTR text + + TODO | 6 ------ + src/hb-buffer.cc | 5 +++++ + 2 files changed, 5 insertions(+), 6 deletions(-) + +commit 4a68684654e645882095c1189477146287ce9437 +Author: Behdad Esfahbod +Date: Thu Jul 21 00:14:01 2011 -0400 + + When forming clusters, participate all mark types + + src/hb-ot-shape.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 5157e12a55f943b7fc5be7dce0b2ee1bcacca6ec +Author: Behdad Esfahbod +Date: Thu Jul 21 00:12:33 2011 -0400 + + Rename HB_UNICODE_GENERAL_CATEGORY_COMBINING_MARK to HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK + + Spacing_Mark is the current Unicode long-name for this property value. + The previous name was wrongly carried from glib. + + src/hb-common.h | 2 +- + src/hb-icu.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 7b08b0a7f2057937dfc3ab2ec191656bf2386463 +Author: Behdad Esfahbod +Date: Wed Jul 20 23:59:07 2011 -0400 + + Minor + + src/hb-ot-shape-complex-arabic.cc | 8 ++++---- + src/hb-private.hh | 19 +++++++++++++++++++ + 2 files changed, 23 insertions(+), 4 deletions(-) + +commit 498e1a9be673bb02c00aac3f12bb4c6993a85910 +Author: Behdad Esfahbod +Date: Wed Jul 20 23:19:49 2011 -0400 + + [icu] Implement compose()/decompose() + + src/hb-icu.cc | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++-- + test/test-unicode.c | 1 + + 2 files changed, 86 insertions(+), 2 deletions(-) + +commit ffd4a436f7baccb68a0c3602f94ea0246e32844f +Author: Behdad Esfahbod +Date: Wed Jul 20 22:30:29 2011 -0400 + + Add tests for compose()/decompose() + + Adjust glib fallback implementation. + + The tests are not hooked up for ICU yet. + + src/hb-glib.cc | 17 ++++++++++++-- + src/hb-unicode.cc | 2 +- + test/test-unicode.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 82 insertions(+), 3 deletions(-) + +commit fca0923b04aeff9369849da97d247a647611f346 +Author: Behdad Esfahbod +Date: Wed Jul 20 22:16:13 2011 -0400 + + Minor + + src/hb-icu.cc | 62 ++++++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 38 insertions(+), 24 deletions(-) + +commit 26b6024962b254b624d4f22088b6c87745074743 +Author: Behdad Esfahbod +Date: Wed Jul 20 21:58:14 2011 -0400 + + [glib] Use g_unicode_script_to/from_iso15924() if available + + src/hb-glib.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 22fdc66712464bdb02e45eed49e4be57e79b442f +Author: Behdad Esfahbod +Date: Wed Jul 20 21:51:37 2011 -0400 + + [glib] Add compose() and decompose() implementations with fallback + + src/hb-glib.cc | 126 +++++++++++++++++++++++++++++++++++++++++++----------- + src/hb-unicode.cc | 6 ++- + 2 files changed, 106 insertions(+), 26 deletions(-) + +commit a54a5505a35eef5315a8e2e7a79502901e3eff5f +Author: Behdad Esfahbod +Date: Wed Jul 20 16:42:10 2011 -0400 + + Minor + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 23db8d5c92c96a34c716b68e1aa6819c5a20477a +Author: Behdad Esfahbod +Date: Tue Jul 12 12:02:26 2011 -0400 + + [test] Work around glib <= 2.30 API + + test/hb-test.h | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 22989c5ffc8cce1ea05d729cdf33661c35a52334 +Author: Behdad Esfahbod +Date: Tue Jul 12 11:54:58 2011 -0400 + + Distribute hb-ot-shape-complex-indic-machine.rl + + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit f6fd3780e12b23ff7ed3743497c8996e71dcb064 +Author: Behdad Esfahbod +Date: Fri Jul 8 00:22:40 2011 -0400 + + Let shapers decide when to apply ccmp and locl + + Instead of always applying those two features before the complex shaper, + let the complex shaper decide whether they should be applied first. + + Also add stub for Indic's final_reordering(). + + src/hb-ot-shape-complex-arabic.cc | 2 ++ + src/hb-ot-shape-complex-indic.cc | 16 ++++++++++++++++ + src/hb-ot-shape.cc | 7 +------ + 3 files changed, 19 insertions(+), 6 deletions(-) + +commit c4641723fbf6532b2e80a662e15573b31276bc73 +Author: Behdad Esfahbod +Date: Thu Jul 7 23:47:19 2011 -0400 + + [API] Add compose() and decompose() unicode funcs, rename other ones + + Add compose() and decompose() unicode funcs. These implement + pair-wise canonical composition/decomposition. + + The glib/icu implementations are lacking for now. We are adding + API for this to glib, but I cannot find any useful API in ICU. + May end of implementing these in-house. + + Changed all unicode_funcs callback names to remove the "_get" part. + Eg, hb_unicode_get_script_func_t is now hb_unicode_script_func_t, + and hb_unicode_get_script() is hb_unicode_script() now. + + TODO | 4 ++- + src/hb-glib.cc | 6 +++- + src/hb-icu.cc | 6 +++- + src/hb-ot-shape.cc | 6 ++-- + src/hb-shape.cc | 2 +- + src/hb-unicode-private.hh | 8 +++-- + src/hb-unicode.cc | 85 ++++++++++++++++++++++++++++++++++------------- + src/hb-unicode.h | 70 +++++++++++++++++++++++++++----------- + test/test-unicode.c | 21 +++++++----- + 9 files changed, 146 insertions(+), 62 deletions(-) + +commit d05dded1676924e8894c90f7a7c3527b492bcdff +Author: Behdad Esfahbod +Date: Thu Jul 7 23:42:40 2011 -0400 + + More code generation through preprocessor + + src/hb-ot-shape-complex-private.hh | 46 ++++++++++++++++++++++++-------------- + 1 file changed, 29 insertions(+), 17 deletions(-) + +commit 891c4755baae6cd59fad59d27fd8933e5f548a74 +Author: Behdad Esfahbod +Date: Thu Jul 7 23:19:27 2011 -0400 + + Humm, undo some shuffling + + In preparation for adding more advanced unicode funcs. + + src/hb-ot-shape.cc | 6 ++--- + src/hb-shape.cc | 2 +- + src/hb-unicode-private.hh | 36 +++++++++++++------------- + src/hb-unicode.cc | 65 ++++++++++++++++++++++++++++++++++------------- + 4 files changed, 70 insertions(+), 39 deletions(-) + +commit 4b6317c4f426cfaf21e509dbf6ee6d4e0422cdac +Author: Behdad Esfahbod +Date: Thu Jul 7 23:14:42 2011 -0400 + + More code shuffling + + src/hb-font-private.hh | 16 +++--- + src/hb-font.cc | 3 +- + src/hb-unicode-private.hh | 42 +++++++------- + src/hb-unicode.cc | 140 +++++++++++++++++----------------------------- + 4 files changed, 82 insertions(+), 119 deletions(-) + +commit 3361c9a323575309d9fd55fe076697a3e22073c0 +Author: Behdad Esfahbod +Date: Thu Jul 7 22:35:17 2011 -0400 + + Minor + + src/Makefile.am | 1 + + src/hb-ot-shape-complex-misc.cc | 51 ++++++++++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-private.hh | 12 ++++++--- + 3 files changed, 60 insertions(+), 4 deletions(-) + +commit 76f76812ac7cca8ac6935952a2360d5e151480fa +Author: Behdad Esfahbod +Date: Thu Jul 7 22:25:25 2011 -0400 + + Shuffle code around, remove shape_plan from complex shapers + + src/hb-ot-shape-complex-arabic.cc | 36 +++++++++++++------------- + src/hb-ot-shape-complex-indic-machine.rl | 12 ++++----- + src/hb-ot-shape-complex-indic.cc | 25 +++++++++--------- + src/hb-ot-shape-complex-private.hh | 44 +++++++++++++++++++++----------- + src/hb-ot-shape-private.hh | 13 ++-------- + src/hb-ot-shape.cc | 4 +-- + 6 files changed, 69 insertions(+), 65 deletions(-) + +commit e88bff9b4d77dc86c04832163081effbff752216 +Author: Behdad Esfahbod +Date: Thu Jul 7 22:03:02 2011 -0400 + + Minor, use function typedefs + + src/hb-ot-shape-complex-private.hh | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 359dcaa0d33271025ca42a5f54ecbac7ae3b56d3 +Author: Behdad Esfahbod +Date: Thu Jul 7 21:55:05 2011 -0400 + + Update copyright headers + + src/hb-ot-map-private.hh | 2 +- + src/hb-ot-map.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 2 +- + src/hb-ot-shape.cc | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit d8d0c480c85246a74d47dd5297019c7e39391ab0 +Author: Behdad Esfahbod +Date: Thu Jul 7 21:22:08 2011 -0400 + + Refactor some code common to GSUB and GPOS + + src/hb-ot-map-private.hh | 29 ++++++++++++++++++-------- + src/hb-ot-map.cc | 54 +++++++++--------------------------------------- + 2 files changed, 30 insertions(+), 53 deletions(-) + +commit b70c96dbe41d6512b80fe3d966a1942e1ef64a4b +Author: Behdad Esfahbod +Date: Thu Jul 7 21:07:41 2011 -0400 + + Enable applying GSUB/GPOS features in multiple segments + + Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=644184 + among others. + + Shapers now can request segmented feature application by calling + add_gsub_pause() or add_gpos_pause(). They can also provide a + callback to be called at the pause. Currently the Arabic shaper + uses pauses to enforce certain feature application. The Indic + shaper can use the same facility to pause and do reordering in the + callback. + + src/hb-ot-map-private.hh | 50 +++++++++++---- + src/hb-ot-map.cc | 132 +++++++++++++++++++++++++++++++++----- + src/hb-ot-shape-complex-arabic.cc | 24 ++++++- + src/hb-private.hh | 5 ++ + 4 files changed, 181 insertions(+), 30 deletions(-) + +commit f6d7a9bb4c19e605f1f16d9ca40adefba138c37e +Author: Behdad Esfahbod +Date: Thu Jul 7 16:20:35 2011 -0400 + + Shuffle code around + + src/hb-ot-map-private.hh | 68 ++++++++++++++++++++++++------------------------ + 1 file changed, 34 insertions(+), 34 deletions(-) + +commit fc551edbf236d71a522ae7c2c9461aa71c5f7d66 +Author: Behdad Esfahbod +Date: Thu Jul 7 16:09:38 2011 -0400 + + Add todo + + I'm too lazy to fix the tests now. + + test/test-shape.c | 1 + + 1 file changed, 1 insertion(+) + +commit 2e18c6dbdfbbfdec0490260bb7cb5213551b2188 +Author: Behdad Esfahbod +Date: Wed Jul 6 16:05:45 2011 -0400 + + Fix reverse_range() position loop + + Mozilla Bug 669175 - Slow rendering of text sometimes in this case, + using direction: rtl + + src/hb-buffer.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit fa2befa46f215d8c33a54dfc57889928a628164c +Author: Behdad Esfahbod +Date: Mon Jul 4 17:18:57 2011 -0400 + + Minor + + src/hb-view.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d69d5ceaa0ad30e8d4b9783507c59c6d4221de4f +Author: Behdad Esfahbod +Date: Mon Jul 4 12:56:38 2011 -0400 + + [Indic] Well, at least finding syllables works now :) + + Still not much there. + + src/hb-ot-shape-complex-indic-machine.rl | 4 +++- + src/hb-ot-shape-complex-indic.cc | 9 ++++++++- + 2 files changed, 11 insertions(+), 2 deletions(-) + +commit 253a57fb5ab211f67140e6139d183e49483a9074 +Author: Behdad Esfahbod +Date: Tue Jun 28 17:26:03 2011 -0400 + + [test-shape-complex] Remove the greek tests + + They are outdated with respect to the DejaVu Sans I'm using. + We need to add font version checking to the tests. + + test/test-shape-complex.c | 17 ----------------- + 1 file changed, 17 deletions(-) + +commit afa74bf90405fb121d3132982b87762c1686d80c +Author: Behdad Esfahbod +Date: Tue Jun 28 17:25:17 2011 -0400 + + [test-shape-complex] Print out expected and actual glyphstrings upon failure + + One has to run the test with --verbose to see that right now. + + test/test-shape-complex.c | 25 ++++++++++++++++++++++--- + 1 file changed, 22 insertions(+), 3 deletions(-) + +commit 42d453b0236f67239342df2003b7abce6e2c51ea +Author: Behdad Esfahbod +Date: Tue Jun 28 16:59:16 2011 -0400 + + [test] Name tests after their input string + + test/Makefile.am | 2 +- + test/test-shape-complex.c | 150 ++++++++++++++++++++++++++++++---------------- + 2 files changed, 100 insertions(+), 52 deletions(-) + +commit 27413169782fdf79e278dd6552c8e194b3bc4eaa +Author: Behdad Esfahbod +Date: Tue Jun 28 16:21:31 2011 -0400 + + Minor + + Towards a better test runner. + + test/test-shape-complex.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit cc674cbf7fb9972975dc0499974e5e7fb4ae3c81 +Author: Behdad Esfahbod +Date: Tue Jun 28 16:17:16 2011 -0400 + + Minor + + test/test-shape-complex.c | 2 -- + 1 file changed, 2 deletions(-) + +commit 20d8a3982ae320035edd6a04b402cefc9a5e5779 +Author: Behdad Esfahbod +Date: Tue Jun 28 16:16:21 2011 -0400 + + [test] Remove disabled code + + We'd add normalization and decomposition tests later. + + test/test-shape-complex.c | 92 ----------------------------------------------- + 1 file changed, 92 deletions(-) + +commit 9704f0ca6c2defed52640da77506c80bc67b4f56 +Author: Behdad Esfahbod +Date: Tue Jun 28 16:15:46 2011 -0400 + + [test] Restructure shape test data a bit + + test/test-shape-complex.c | 75 +++++++++++++++++++++++++++-------------------- + 1 file changed, 43 insertions(+), 32 deletions(-) + +commit 4ec30aec3014be6effc09cbbc88dcd075f3826df +Author: Behdad Esfahbod +Date: Tue Jun 28 14:13:38 2011 -0400 + + [Indic] Optimize Indic table storage + + src/hb-ot-shape-complex-indic.cc | 8 +++++--- + src/hb-private.hh | 1 + + 2 files changed, 6 insertions(+), 3 deletions(-) + +commit c4a59de6d8c1e581b5c155319232be9e805e5cba +Author: Behdad Esfahbod +Date: Tue Jun 28 14:03:29 2011 -0400 + + [Indic] Generate a single data table instead of multiple ones + + src/gen-indic-table.py | 30 +++++++++------- + src/hb-ot-shape-complex-indic-table.hh | 62 ++++++++++++++++------------------ + 2 files changed, 48 insertions(+), 44 deletions(-) + +commit a346e923a99f920bbebc25b335db51fdfb1429ea +Author: Behdad Esfahbod +Date: Tue Jun 28 12:49:18 2011 -0400 + + [test] Add Indic tests from harfbuzz.old + + Needs fonts to be put in test/fonts. Tests are skipped otherwise. + Run with --verbose for details. Working on improving the test runner + to make it easier to make sense of what's going on. + + test/Makefile.am | 11 +- + test/hb-test.h | 21 + + test/test-shape-complex.c | 1179 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 1209 insertions(+), 2 deletions(-) + +commit 8fdba506f0f1c66b50f8f4b114d624cb956d03b7 +Author: Behdad Esfahbod +Date: Fri Jun 24 20:45:55 2011 -0400 + + [Indic] Define indic_position_t + + src/hb-ot-shape-complex-indic.cc | 239 ++++++++++++++++++++------------------- + 1 file changed, 122 insertions(+), 117 deletions(-) + +commit 65988a145b4a52c37fd53c1473034f9e701f61d9 +Author: Behdad Esfahbod +Date: Fri Jun 24 19:05:52 2011 -0400 + + [Indic] Add a table of consonant positions + + Copied form HarfBuzz.old Indic data. These are below and post + consonants. This is temporary. Read the comment in the patch. + + src/hb-ot-shape-complex-indic.cc | 106 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 106 insertions(+) + +commit c7fe56a1d5d3e969b6ec51cd9ecd471706a19568 +Author: Behdad Esfahbod +Date: Fri Jun 24 19:05:34 2011 -0400 + + [Indic] Some of the basic features are global; Mark them so + + src/hb-ot-shape-complex-indic-machine.rl | 1 + + src/hb-ot-shape-complex-indic.cc | 48 ++++++++++++++++++++++---------- + 2 files changed, 35 insertions(+), 14 deletions(-) + +commit 867361c3ad39629a8d5b7dc48d558a1c19e37d43 +Author: Behdad Esfahbod +Date: Fri Jun 17 18:35:46 2011 -0400 + + [indic] Add syllable recognition state machine + + Using an incredible tool called Ragel. + + src/Makefile.am | 5 ++ + src/hb-ot-shape-complex-indic-machine.rl | 105 +++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-indic.cc | 21 +++++-- + 3 files changed, 125 insertions(+), 6 deletions(-) + +commit 422e08dbb8e2c0c5664f1bdc7e159a673cfea8c5 +Author: Behdad Esfahbod +Date: Wed Jun 15 17:22:48 2011 -0400 + + Better categorize Indic character classes + + Matches OT types now. + + src/hb-ot-shape-complex-indic.cc | 51 +++++++++++++++++++++++++--------------- + 1 file changed, 32 insertions(+), 19 deletions(-) + +commit 31f18abecb149f8888a72510f2660328dd6de16d +Author: Behdad Esfahbod +Date: Wed Jun 15 09:49:58 2011 -0400 + + Minor compiler warning fixes + + src/hb-buffer-private.hh | 8 ++++---- + src/hb-object-private.hh | 4 ++-- + src/hb-open-type-private.hh | 6 +++--- + src/hb-ot-layout-common-private.hh | 8 ++++---- + src/hb-ot-map.cc | 28 +++++++++++++++------------- + src/hb-ot-shape-complex-arabic.cc | 3 +-- + src/hb-view.cc | 11 ++++++----- + test/test-object.c | 22 +++++++++++----------- + test/test-unicode.c | 4 ++-- + 9 files changed, 48 insertions(+), 46 deletions(-) + +commit e3693b72f0651985d4f619cde668611639dca885 +Author: Behdad Esfahbod +Date: Wed Jun 15 09:33:52 2011 -0400 + + Change a couple strstr() to strchr() + + src/hb-ot-tag.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b9452bfc1696457e156e79037c863903da5454fc +Author: Behdad Esfahbod +Date: Tue Jun 14 14:47:07 2011 -0400 + + Fix compiler warnings with -pedantic + + src/hb-blob.cc | 18 +++++++++--------- + src/hb-glib.cc | 20 ++++++++++---------- + src/hb-icu.cc | 20 ++++++++++---------- + src/hb-object-private.hh | 2 +- + src/hb-open-type-private.hh | 14 +++++++------- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-map-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 8 ++++---- + src/hb-ot-shape-private.hh | 2 +- + src/hb-ot-shape.cc | 2 +- + 11 files changed, 46 insertions(+), 46 deletions(-) + +commit 970e092dc23cbeb7897d4c7bb58c042209f518fb +Author: Behdad Esfahbod +Date: Tue Jun 14 14:35:44 2011 -0400 + + Remove extra semicolon + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 81426808020e2b88f008480bd63519aa68c579a7 +Author: Behdad Esfahbod +Date: Mon Jun 13 16:02:18 2011 -0400 + + Cosmetic + + src/gen-indic-table.py | 9 +- + src/hb-ot-shape-complex-indic-table.hh | 1038 ++++++++++++++++---------------- + 2 files changed, 524 insertions(+), 523 deletions(-) + +commit 902ab866f2d2edc3a71c1203065e6ddf49e5b431 +Author: Behdad Esfahbod +Date: Fri Jun 10 23:08:54 2011 -0400 + + GNOME Bug 652227 - Unconditional use of stdint.h + + src/hb-common.h | 33 ++++++++++++++++++++++----------- + 1 file changed, 22 insertions(+), 11 deletions(-) + +commit 20503ccd578c9983162857954e3236413469ed35 +Author: Behdad Esfahbod +Date: Tue Jun 7 17:02:48 2011 -0400 + + More Indic data shuffling + + src/hb-ot-shape-complex-indic.cc | 74 +++++++++++++++++++++++++++------------- + 1 file changed, 50 insertions(+), 24 deletions(-) + +commit 63b177e45c2405272da3fa6c26fe11ae37950bd0 +Author: Behdad Esfahbod +Date: Tue Jun 7 15:51:40 2011 -0400 + + Minor + + src/hb-ot-shape.cc | 1 + + 1 file changed, 1 insertion(+) + +commit b9ddbd55930228422e82b34a141ad1b6093f5376 +Author: Behdad Esfahbod +Date: Thu Jun 2 17:43:12 2011 -0400 + + [Indic] Start an Indic shaper + + Nothing functional in there yet. + + So far, we're parsing IndicSyllabicCategory.txt and IndicMatraCategory.txt + fils from Unicode Character Database and store them in an array to be used + by the shaper. Also hooked up the shaper, but it does not do anything + right now. + + src/Makefile.am | 3 + + src/gen-indic-table.py | 201 ++++++++ + src/hb-ot-shape-complex-arabic.cc | 4 +- + src/hb-ot-shape-complex-indic-table.hh | 834 +++++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-indic.cc | 141 ++++++ + src/hb-ot-shape-complex-private.hh | 58 ++- + src/hb-ot-shape-private.hh | 3 +- + 7 files changed, 1237 insertions(+), 7 deletions(-) + +commit 697a65c5f5cda53bc68720886a253a019e8212a8 +Author: Behdad Esfahbod +Date: Wed Jun 1 20:52:00 2011 -0400 + + Minor + + src/gen-arabic-table.py | 21 +++++++++++++-------- + src/hb-ot-shape-complex-arabic-table.hh | 9 ++++----- + 2 files changed, 17 insertions(+), 13 deletions(-) + +commit 9de1481f2bbbf2a174280b849628612f36a2f701 +Author: Behdad Esfahbod +Date: Wed Jun 1 20:45:14 2011 -0400 + + Update to ArabicShaping-6.1.0d2.txt + + src/hb-ot-shape-complex-arabic-table.hh | 307 ++++++++++++++++++++------------ + 1 file changed, 197 insertions(+), 110 deletions(-) + +commit 9d49433efba2217852f4e44f056465b451961c49 +Author: Behdad Esfahbod +Date: Wed Jun 1 18:10:10 2011 -0400 + + Minor rename + + src/Makefile.am | 2 +- + src/{gen-arabic-joining-table.py => gen-arabic-table.py} | 2 +- + src/hb-ot-shape-complex-arabic-table.hh | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 0eafce56eed4c5166ee5b97b121a452ffd292a7a +Author: Behdad Esfahbod +Date: Wed Jun 1 12:44:30 2011 -0400 + + [TODO] New items + + TODO | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 89a2bc9ba674e7e57fec1fd8ce7648a44f3aab63 +Author: Behdad Esfahbod +Date: Tue May 31 15:18:13 2011 -0400 + + [Vertical] Apply vertical features + + We apply all of vert, vrt2, vkrn, valt, and vpal. + + TODO | 7 ------- + src/hb-ot-shape.cc | 50 +++++++++++++++++++++++++++++++++++++++++--------- + 2 files changed, 41 insertions(+), 16 deletions(-) + +commit 0c6a9767c812c00f2a6a02d9f43f4694e1f43815 +Author: Behdad Esfahbod +Date: Tue May 31 12:59:17 2011 -0400 + + [hb-view] Add --face-index to choose a face in a TrueType Collection + + src/hb-view.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 4f28fbdd804fabeec57a98fe267d892ab58b3a6d +Author: Behdad Esfahbod +Date: Tue May 31 12:33:11 2011 -0400 + + Fix TTC header handling + + Also change the Version type to avoid similar bugs in the future. + + Reported by Grigori Goronzy. + + src/hb-open-file-private.hh | 6 +++--- + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-gdef-private.hh | 6 +++--- + 3 files changed, 7 insertions(+), 7 deletions(-) + +commit 21deab2bdc58d8e9f1a3ba1f9c61c30a79e288a1 +Author: Behdad Esfahbod +Date: Mon May 30 11:08:40 2011 -0400 + + Fixed inifinite loop introduced in 7403e055cd1463f + + k is the index, not j. + + Reported by Tom Hacohen. + + src/hb-ot-layout-gpos-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 51881a61ca96c3328e2d92927a5a61e60997a429 +Author: Behdad Esfahbod +Date: Fri May 27 18:15:56 2011 -0400 + + Shrink code size + + src/hb-ot-map-private.hh | 11 +---------- + src/hb-ot-map.cc | 11 +++++++++++ + 2 files changed, 12 insertions(+), 10 deletions(-) + +commit 90645fb24bcbb78183576d3641a99560d87e49f2 +Author: Behdad Esfahbod +Date: Fri May 27 18:13:31 2011 -0400 + + [OT] Separate map_builder from the actual map + + Respectively, separate planner from the actual plan. + + src/hb-ot-map-private.hh | 121 ++++++++++++++++++++----------------- + src/hb-ot-map.cc | 33 +++++----- + src/hb-ot-shape-complex-arabic.cc | 6 +- + src/hb-ot-shape-complex-private.hh | 8 +-- + src/hb-ot-shape-private.hh | 22 +++++++ + src/hb-ot-shape.cc | 28 +++++---- + 6 files changed, 127 insertions(+), 91 deletions(-) + +commit 5560a19e2b3901437d8ee2e5905b4ac77073bfbe +Author: Behdad Esfahbod +Date: Fri May 27 17:49:16 2011 -0400 + + Minor + + src/hb-view.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1587c26fe94087040b4a5d682ec196f568e4a1a2 +Author: Behdad Esfahbod +Date: Fri May 27 16:05:01 2011 -0400 + + [TODO] Add item + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5c9f14932d59e306fbc72f7daecb384a16da73d9 +Author: Behdad Esfahbod +Date: Fri May 27 15:59:33 2011 -0400 + + Minor + + Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5bc18195d55570ef01e4b24dd248f222f081b0a2 +Author: Behdad Esfahbod +Date: Fri May 27 15:58:54 2011 -0400 + + Add check-includes.sh + + src/Makefile.am | 7 +++++++ + src/check-c-linkage-decls.sh | 6 +++++- + src/check-header-guards.sh | 8 +++++++- + src/check-includes.sh | 42 ++++++++++++++++++++++++++++++++++++++++++ + src/check-internal-symbols.sh | 8 ++++---- + src/check-libstdc++.sh | 7 ++++--- + src/hb-ot-shape.h | 1 + + 7 files changed, 70 insertions(+), 9 deletions(-) + +commit 3f12c434e20261f6d5c600e56575b7dfdd5b1470 +Author: Behdad Esfahbod +Date: Fri May 27 04:58:11 2011 -0400 + + [configure] Generate sha256sum and GPG-sign it + + Makefile.am | 29 ++++++++++++++++++++++++++++- + 1 file changed, 28 insertions(+), 1 deletion(-) + +commit 75ba4073ca6f72c135927d9314197a605281b789 +Author: Behdad Esfahbod +Date: Fri May 27 03:58:17 2011 -0400 + + [test] Rename valgrind-log to log-vaglring.txt + + test/Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit e3b0ba8e292e6a90666cfbbab6faf11ae11f9ddb +Author: Behdad Esfahbod +Date: Fri May 27 03:56:37 2011 -0400 + + Minor + + harfbuzz.doap | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 595dc63eee926a0e0fee26f8225b5fbe00610fcb +Author: Behdad Esfahbod +Date: Fri May 27 04:14:12 2011 -0400 + + Bump version to 0.7.0 to open up for development + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f24557604281356131618546332d7ee3a0c8abef +Author: Behdad Esfahbod +Date: Wed May 25 16:08:06 2011 -0400 + + Release 0.6.0. First official tarball release! + + There are no API guarantees just yet, but I *expect* that no + incompatible API changes to happen before 1.0.0. + + Update NEWS. + + NEWS | 262 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 263 insertions(+), 1 deletion(-) + +commit 654f88fbc9bcb54f9bd2d5586236234e03424044 +Author: Behdad Esfahbod +Date: Fri May 27 03:38:46 2011 -0400 + + [test-common] Test hb_direction_to_string() + + Caught by "make check-symbols". + + test/test-common.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 18bced134fc3379c9124ba029e22ff3f6434ca0f +Author: Behdad Esfahbod +Date: Fri May 27 03:38:30 2011 -0400 + + [test] Rename test-symbols to check-symbols + + Shows undocumented symbols. + + test/Makefile.am | 37 +++++++++++++++++++++---------------- + 1 file changed, 21 insertions(+), 16 deletions(-) + +commit 376dafa6ed414e368e9dc1d5a2e0bfc8e55f410d +Author: Behdad Esfahbod +Date: Fri May 27 03:35:58 2011 -0400 + + Hide internal symbols + + src/hb-ot-shape.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0e482ec6ba30b613f2d7ee97c61be458c5aebcd6 +Author: Behdad Esfahbod +Date: Fri May 27 02:46:28 2011 -0400 + + [test/unicode] Fix double-free + + Caught by "make check-valgrind". + + test/Makefile.am | 2 +- + test/test-unicode.c | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) + +commit 28b1bac5415774cf892c9cc0afcac1324c2093f5 +Author: Behdad Esfahbod +Date: Fri May 27 02:44:29 2011 -0400 + + [test] Switch to automake-based test-runner + + Adds check-valgrind among other modes. We do not run under gtester by + default anymore. + + Makefile.am | 2 + + test/.valgrind-suppressions | 0 + test/Makefile.am | 48 ++++++++++++++++++++++-- + test/Makefile.decl | 90 --------------------------------------------- + 4 files changed, 47 insertions(+), 93 deletions(-) + +commit adbc97ddde27cf609d95d3249f3ea8060a6e1d20 +Author: Behdad Esfahbod +Date: Fri May 27 01:33:18 2011 -0400 + + [test] Add test-symbols that checks API symbol text coverage + + We're not at 100% coverage yet, so do not enable the test by default. + + test/Makefile.am | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit 9313b9aa66a82fd3fa60d8417c22a5350e5a8791 +Author: Behdad Esfahbod +Date: Fri May 27 01:00:55 2011 -0400 + + [test/version] Test hb-version.h + + test/Makefile.am | 1 + + test/test-version.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 81 insertions(+) + +commit 329c15714be90d3fc2d9054f80cb14fa325dc959 +Author: Behdad Esfahbod +Date: Wed May 25 16:07:07 2011 -0400 + + Add libtool versioning + + The versioning is automatic. For now, soname-major is 0. With + the 1.0.0 release it will jump to 1 and stay there forever. + + configure.ac | 26 +++++++++++++++++++++----- + src/Makefile.am | 1 + + 2 files changed, 22 insertions(+), 5 deletions(-) + +commit 5b21eff8c4a00962d4315a47a65a143abe323299 +Author: Behdad Esfahbod +Date: Wed May 25 14:49:35 2011 -0400 + + Update README, etc + + COPYING | 1 + + README | 8 +++----- + configure.ac | 2 +- + 3 files changed, 5 insertions(+), 6 deletions(-) + +commit 5bf56ea056b30fba8e07e82ec818c430cab8cafd +Author: Behdad Esfahbod +Date: Wed May 25 14:43:10 2011 -0400 + + [TODO] Add item + + TODO | 2 ++ + test/test-shape.c | 2 ++ + 2 files changed, 4 insertions(+) + +commit 2d8ebcb9d089c2cfbefac71ca6350e2703ab13e3 +Author: Behdad Esfahbod +Date: Wed May 25 11:27:33 2011 -0400 + + [API] One last font-funcs API change + + Now that vertical text works correctly, I'm doing a last round + modification of the font-funcs API to simplify. Expect no more + changes around here. + + src/hb-font.cc | 107 ++++++++++++++++++------------------------------------ + src/hb-font.h | 50 +++++++++++-------------- + src/hb-ft.cc | 26 ++++++------- + test/test-font.c | 27 +++++++------- + test/test-shape.c | 21 +++++------ + 5 files changed, 91 insertions(+), 140 deletions(-) + +commit d31691296f7d3051fcd345bf1325d17835484b50 +Author: Behdad Esfahbod +Date: Wed May 25 11:01:32 2011 -0400 + + [test] Update to API changes + + test/test-font.c | 72 ++++++++++++++++++++++--------------------------------- + test/test-shape.c | 35 +++++++++++++-------------- + 2 files changed, 44 insertions(+), 63 deletions(-) + +commit 7403e055cd1463f38215ad9faedd61c3e1b66ac5 +Author: Behdad Esfahbod +Date: Tue May 24 21:04:15 2011 -0400 + + [Vertical] fix vertical gpos + + Wow, it took me a few days to find the right fix! + + We now set the advance for attached marks to zero, but we + do this in the _finish() state of gpos, so it shouldn't + regress with fonts like DejaVuSansMono that explicitly + decrease the mark advance width to set it to zero. + + src/hb-ot-layout-gpos-private.hh | 167 +++++++++++++++++++++++---------------- + src/hb-ot-shape.cc | 9 ++- + 2 files changed, 103 insertions(+), 73 deletions(-) + +commit ff7cbd0219a7c260612c53b3bed343747d79ec4e +Author: Behdad Esfahbod +Date: Wed May 25 09:56:06 2011 -0400 + + [TODO] Update + + TODO | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +commit 3b0bb855e011099f1a4c77ffc5214c658e280b2d +Author: Behdad Esfahbod +Date: Fri May 20 15:59:59 2011 -0400 + + [Vertical] GPOS x/y advance adjustments only apply in hori/vert respectively + + src/hb-ot-layout-gpos-private.hh | 31 +++++++++++++++++++++---------- + 1 file changed, 21 insertions(+), 10 deletions(-) + +commit cc2086d67ce559878a5ce2b41d89a37eabac90b8 +Author: Behdad Esfahbod +Date: Thu May 19 19:19:50 2011 -0400 + + [Vertical] Fix GPOS y-advance direction + + src/hb-ot-layout-gpos-private.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 67d51ff96154c8909734046601e439dd8f6a86df +Author: Behdad Esfahbod +Date: Thu May 19 19:08:57 2011 -0400 + + [Vertical] Do fallback origin calculation + + src/hb-font.cc | 32 +++++++++++++++++++++++++++----- + 1 file changed, 27 insertions(+), 5 deletions(-) + +commit 60fbb36096e344e9af79409ce8cfe3f1f7b0d321 +Author: Behdad Esfahbod +Date: Thu May 19 18:46:15 2011 -0400 + + [Vertical] GPOS is always done with horizontal origin + + src/hb-font-private.hh | 4 +- + src/hb-font.cc | 187 ++++++++++++++++++--------------------- + src/hb-font.h | 53 ++++++----- + src/hb-ft.cc | 47 ++++------ + src/hb-ot-layout-gdef-private.hh | 18 ++-- + src/hb-ot-layout-gpos-private.hh | 23 ++--- + src/hb-ot-layout.h | 2 +- + src/hb-ot-shape.cc | 15 ++++ + 8 files changed, 166 insertions(+), 183 deletions(-) + +commit 8b38faeede41e64eb0f6ac2e12ce51dd7138d50a +Author: Behdad Esfahbod +Date: Thu May 19 13:08:00 2011 -0400 + + More vertical + + Starting to get there, but not without yet another round of changes. + + I think I know wheere to go now. + + src/hb-font.cc | 44 ++++++++++++++++++++++++++++++++------------ + src/hb-font.h | 10 ++++++++++ + src/hb-ft.cc | 14 ++++++++++++-- + src/hb-ot-shape.cc | 4 ++++ + 4 files changed, 58 insertions(+), 14 deletions(-) + +commit e609aeb1e24da6b7c812396cddb93ee3c95ef87a +Author: Behdad Esfahbod +Date: Wed May 18 10:17:02 2011 -0400 + + [hb-view] Add --annotate + + Currently it only marks glyph origins. + + src/hb-view.cc | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + +commit b8d76dd74e50d295918cc015e9d2a55e2bf6a461 +Author: Behdad Esfahbod +Date: Tue May 17 23:31:00 2011 -0400 + + Vertical: Adjust origin in glyph_extents() and glyph_contour_point() + + The base for vertical is almost ready now. + + src/hb-font.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 190981851fe2bb6479b5c72451279f66fe4f6e23 +Author: Behdad Esfahbod +Date: Tue May 17 23:27:22 2011 -0400 + + Cosmetic + + src/hb-font.cc | 114 ++++++++++++++++++++++++++++----------------------------- + src/hb-ft.cc | 36 +++++++++--------- + 2 files changed, 74 insertions(+), 76 deletions(-) + +commit 2c3f51a11c176aa3fc12a9522325efaef2c79d35 +Author: Behdad Esfahbod +Date: Tue May 17 23:23:27 2011 -0400 + + Minor + + src/hb-font.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7e2c85de305be59e1a6afa7d2061e4b7dd00acf7 +Author: Behdad Esfahbod +Date: Tue May 17 17:55:03 2011 -0400 + + [API] Vertical support, take 2 + + I like this API *much* better. Implementation still incomplete, but + horizontal works. + + src/hb-font-private.hh | 7 +- + src/hb-font.cc | 185 +++++++++++++++++++++++---------------- + src/hb-font.h | 109 ++++++++++++----------- + src/hb-ft.cc | 66 ++++++++------ + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-shape.cc | 8 +- + 7 files changed, 218 insertions(+), 161 deletions(-) + +commit 744970af4d884cc87ffa645804578fec8df674a9 +Author: Behdad Esfahbod +Date: Mon May 16 18:15:37 2011 -0400 + + [API] Add support for vertical text + + Design not final yet, and in fact I'm going to change it immediately, + but this is an standalone change for itself. + + src/hb-font-private.hh | 35 ++-- + src/hb-font.cc | 387 +++++++++++++++++++++++++---------- + src/hb-font.h | 164 +++++++++++---- + src/hb-ft.cc | 227 +++++++++++++------- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 35 ++-- + src/hb-ot-layout-gsub-private.hh | 1 + + src/hb-ot-layout-gsubgpos-private.hh | 1 + + src/hb-ot-shape.cc | 14 +- + src/hb-ot-tag.cc | 2 +- + test/test-font.c | 61 +++--- + test/test-shape.c | 17 +- + 12 files changed, 650 insertions(+), 296 deletions(-) + +commit 80dce8b7c8202766d52cc7666355446bbf5b0565 +Author: Behdad Esfahbod +Date: Tue May 17 17:08:36 2011 -0400 + + Minor + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5be7d047f6bf54cc577e311b5426c463d2b9b131 +Author: Behdad Esfahbod +Date: Tue May 17 15:05:34 2011 -0400 + + Check for mmap() + + Apparently there exist systems with mprotect(), but not mmap()? + + configure.ac | 2 +- + test/test-blob.c | 6 ++++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit 4053f3f788353448b41e541ee617aafbe1cac366 +Author: Behdad Esfahbod +Date: Mon May 16 16:20:48 2011 -0400 + + Cosmetic + + src/hb-font.h | 8 ++++---- + test/test-shape.c | 6 +++--- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 56d12e0356bee5a95b870dfbc2100b8caeb5d593 +Author: Behdad Esfahbod +Date: Mon May 16 16:01:58 2011 -0400 + + Remove unnecessary TODO item + + src/hb-ft.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 1883af3796459cafe2d194064403b6b1152c584d +Author: Behdad Esfahbod +Date: Mon May 16 15:18:16 2011 -0400 + + [hb-view] Start work on vertical support + + src/hb-view.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 9aa6f96af5e5940ba5c9596c6ae377fea23c0ec0 +Author: Behdad Esfahbod +Date: Mon May 16 15:08:31 2011 -0400 + + [hb-view] No need to allocate an extra glyph item at the end + + src/hb-view.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit a0359485c9997e3a211f7c00d40c09074d906c4f +Author: Behdad Esfahbod +Date: Mon May 16 15:07:48 2011 -0400 + + Minor + + test/test-shape.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 92de53ea450eaee077eb1730e6d7a487b20ac721 +Author: Behdad Esfahbod +Date: Mon May 16 12:24:56 2011 -0400 + + [test/buffer] Add more tests for nil buffer + + test/test-buffer.c | 38 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +commit 065fb38c9a338ddb095f2ec9e034fcc5a02167bd +Author: Behdad Esfahbod +Date: Fri May 13 23:04:46 2011 -0400 + + [test/ot-tag] More tests + + test/test-ot-tag.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 1a64f6e19a4b483e278c85e4941107be2f71b0a4 +Author: Behdad Esfahbod +Date: Fri May 13 22:55:32 2011 -0400 + + [API] Add HB_LANGUAGE_INVALID + + src/hb-common.cc | 5 +++-- + src/hb-common.h | 2 ++ + src/hb-ot-tag.cc | 2 +- + src/hb-shape.cc | 2 +- + test/test-common.c | 9 ++++++--- + 5 files changed, 13 insertions(+), 7 deletions(-) + +commit 40b5c2e86c633441040196d158e965ad95d6ad37 +Author: Behdad Esfahbod +Date: Fri May 13 22:46:36 2011 -0400 + + [test/test-ot-tag] Test hb-ot-tag.h, fix many bugs + + I'm in awe with how many bugs this test revealed. All fixed. + + src/hb-ot-tag.cc | 153 +++++++++++++++++++++--------------- + test/Makefile.am | 3 + + test/test-ot-tag.c | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 320 insertions(+), 63 deletions(-) + +commit 1368018b475c2a6dd5f625af99695ae2fcba1f05 +Author: Behdad Esfahbod +Date: Fri May 13 20:25:38 2011 -0400 + + [TODO] Add items + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 7fc5a30cb4fbe9a4633ab842b0a8cbbcc6f6bd1b +Author: Behdad Esfahbod +Date: Thu May 12 17:48:20 2011 -0400 + + [API] Add hb_face_make/is_immutable() + + src/hb-font-private.hh | 2 ++ + src/hb-font.cc | 18 ++++++++++++++++++ + src/hb-font.h | 6 ++++++ + test/test-font.c | 2 ++ + test/test-object.c | 2 +- + 5 files changed, 29 insertions(+), 1 deletion(-) + +commit 20c8b908ddf50a9814dfdd9fca595f258273cd4f +Author: Behdad Esfahbod +Date: Thu May 12 15:19:33 2011 -0400 + + Finish off previous change + + src/hb-font.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 0fd8c2f1be693616f19f2f1526369874763d6cf6 +Author: Behdad Esfahbod +Date: Thu May 12 15:14:13 2011 -0400 + + [API] Make get_glyph() callback return a boolean + + We need to know whether the glyph exists, so we can fallback to + composing / decomposing. Assuming that glyph==0 means "doesn't exist" + wouldn't work for applications like Pango that want to use different + "doesn't exist" glyph codes for different characters. An explicit + return value fixes that. + + src/hb-font.cc | 15 +++++++++------ + src/hb-font.h | 12 +++++++----- + src/hb-ft.cc | 12 +++++++----- + src/hb-ot-shape.cc | 13 +++++++++---- + test/test-font.c | 5 ++++- + test/test-shape.c | 12 +++++++----- + 6 files changed, 43 insertions(+), 26 deletions(-) + +commit 8e07f93ab4a3ef9adc7942727ef21f2f9a141d10 +Author: Behdad Esfahbod +Date: Thu May 12 14:27:44 2011 -0400 + + [test/shape] Check shape output + + test/test-shape.c | 23 +++++++++++++++++++---- + 1 file changed, 19 insertions(+), 4 deletions(-) + +commit 805af72405a2f653f08de392d7172291ffe8e902 +Author: Behdad Esfahbod +Date: Thu May 12 12:39:40 2011 -0400 + + Rename get_kernings() arguments from first/second_glyph to left/right_glyph + + Makes it clear that kerning is in visual order. + + src/hb-font.cc | 10 +++++----- + src/hb-font.h | 4 ++-- + src/hb-ft.cc | 6 +++--- + 3 files changed, 10 insertions(+), 10 deletions(-) + +commit 23d2432219a91c6328efa9e041b1ecf137752ac3 +Author: Behdad Esfahbod +Date: Thu May 12 10:53:57 2011 -0400 + + [test] Add test-shape.c. Oops + + test/test-shape.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 125 insertions(+) + +commit c098c3acc8c48b4b6883c50c9a87e81dbe98ba24 +Author: Behdad Esfahbod +Date: Thu May 12 10:49:30 2011 -0400 + + [test/blob] Use MAP_ANON instead of MAP_ANONYMOUS + + More portable. + + test/test-blob.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8329eb7c6ca39e162228733a2210e643b1a1019d +Author: Behdad Esfahbod +Date: Thu May 12 01:39:17 2011 -0400 + + [test/shape] Add simplest test for hb_shape() + + test/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit df077fadd7828b609bdfe4dbcad52ef2448525c7 +Author: Behdad Esfahbod +Date: Thu May 12 01:19:39 2011 -0400 + + [object] Make object inert during destruction + + Such that user_data and other finalizers cannot resurrect object + + src/hb-object-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit ee8dd83bb4e0b1c2ca5928391e35e8bd1fca6121 +Author: Behdad Esfahbod +Date: Thu May 12 01:02:03 2011 -0400 + + [TODO] Update + + TODO | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 52df150efeff4cf003cee65f8c91618f1a980bc8 +Author: Behdad Esfahbod +Date: Thu May 12 00:46:57 2011 -0400 + + Fix font subclass chainup + + Test passing now. + + src/hb-font.cc | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit f2c1dd4f746c36a44cf33d0257a3cd800107c286 +Author: Behdad Esfahbod +Date: Thu May 12 00:35:12 2011 -0400 + + [test/font] Test font_funcs subclassing + + test/test-font.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 155 insertions(+), 3 deletions(-) + +commit 14f1e81b77971204e9325e2a8b6f8b690fac20a7 +Author: Behdad Esfahbod +Date: Thu May 12 00:18:28 2011 -0400 + + [test/font] Test empty funcs + + test/test-font.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 73 insertions(+), 2 deletions(-) + +commit 2ca0b5ae1e65d3f43df3a4a2144a1451d8b485c4 +Author: Behdad Esfahbod +Date: Wed May 11 23:57:36 2011 -0400 + + [test/font] Test more + + test/test-font.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 54 insertions(+), 9 deletions(-) + +commit 7033518f756490e9cf00b96387fee6f2f7fae785 +Author: Behdad Esfahbod +Date: Wed May 11 23:31:15 2011 -0400 + + [API] Pass face to get_table() + + src/hb-font.cc | 4 ++-- + src/hb-font.h | 2 +- + src/hb-ft.cc | 2 +- + test/test-font.c | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +commit b46782780690e26a8221e2d63dd224159aebe413 +Author: Behdad Esfahbod +Date: Wed May 11 23:25:28 2011 -0400 + + [API] Remove const from font user_data + + src/hb-font.cc | 20 ++++++++++---------- + src/hb-font.h | 20 ++++++++++---------- + src/hb-ft.cc | 20 ++++++++++---------- + 3 files changed, 30 insertions(+), 30 deletions(-) + +commit ea93e7b27ca04a1655d62bd1d18a32805994af44 +Author: Behdad Esfahbod +Date: Wed May 11 23:22:55 2011 -0400 + + [test/font] More tests + + test/test-font.c | 36 +++++++++++++++++++++++++++++++++--- + 1 file changed, 33 insertions(+), 3 deletions(-) + +commit cdb153175f8a1521cde112c65b173f548ca6ee5c +Author: Behdad Esfahbod +Date: Wed May 11 23:12:58 2011 -0400 + + [test/font] More tests + + test/test-font.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 44 insertions(+) + +commit 74d9fa3d9ac226ed72702884e721ef94ecc48e22 +Author: Behdad Esfahbod +Date: Wed May 11 23:07:47 2011 -0400 + + [test/font] More get_empty() tests + + test/test-font.c | 5 +++++ + 1 file changed, 5 insertions(+) + +commit db9f4eb4e004fadae9d540522d1d21c3bbe659b0 +Author: Behdad Esfahbod +Date: Wed May 11 23:06:02 2011 -0400 + + [test/font] Test get_face() / get_parent() + + test/test-font.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 606923bb4304d5b9cf164745d657cba58949a80a +Author: Behdad Esfahbod +Date: Wed May 11 23:05:02 2011 -0400 + + [test/font] Add test_font_properties() + + test/test-font.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 85 insertions(+) + +commit da603e80386b41b360acb070a862b6ed87da57b8 +Author: Behdad Esfahbod +Date: Wed May 11 22:52:35 2011 -0400 + + [test/font] Start adding tests for hb-font.h + + test/Makefile.am | 1 + + test/test-buffer.c | 2 +- + test/test-font.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + test/test-unicode.c | 1 + + 4 files changed, 72 insertions(+), 1 deletion(-) + +commit 9a14688e40e926b9453fcb75891f27bff1e45c49 +Author: Behdad Esfahbod +Date: Wed May 11 22:49:29 2011 -0400 + + [API] Rename hb_face_create_for_data() to hb_face_create() + + src/hb-font.cc | 4 ++-- + src/hb-font.h | 4 ++-- + src/hb-ft.cc | 2 +- + src/test.cc | 2 +- + test/test-object.c | 4 ++-- + 5 files changed, 8 insertions(+), 8 deletions(-) + +commit 46d6a21cc8613519e6ce27b1925e29285cccb71d +Author: Behdad Esfahbod +Date: Wed May 11 22:33:13 2011 -0400 + + [API] Add hb_ot_layout_substitute_start/finish() + + src/hb-ot-layout.cc | 13 +++++++++++++ + src/hb-ot-layout.h | 8 ++++++++ + 2 files changed, 21 insertions(+) + +commit c84d15f52e1183164502d45b476b54f8fe812e0f +Author: Behdad Esfahbod +Date: Wed May 11 22:23:15 2011 -0400 + + Remove unused hb_set_t + + src/hb-private.hh | 48 ------------------------------------------------ + 1 file changed, 48 deletions(-) + +commit 389a7c9e67549b1a9f7c538965e4647077f8e6ec +Author: Behdad Esfahbod +Date: Wed May 11 22:21:38 2011 -0400 + + Remove hb_static_threadsafe_set_t + + src/hb-common.cc | 5 +++-- + src/hb-mutex-private.hh | 42 ------------------------------------------ + 2 files changed, 3 insertions(+), 44 deletions(-) + +commit e06d4eda7bbdb3a1be1f1ce8d98b059a0730f14d +Author: Behdad Esfahbod +Date: Wed May 11 22:18:31 2011 -0400 + + Use constructor/destructor for hb_ot_shape_plan_t + + src/hb-ot-shape-private.hh | 6 +++++- + src/hb-ot-shape.cc | 4 +--- + 2 files changed, 6 insertions(+), 4 deletions(-) + +commit a5e4e109460ea23fa5e64926a1676c6a02ab6ba2 +Author: Behdad Esfahbod +Date: Wed May 11 22:00:56 2011 -0400 + + Minor + + TODO | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit daa446f184fa27c9764ff7f8a2444d47cf34d986 +Author: Behdad Esfahbod +Date: Wed May 11 21:31:25 2011 -0400 + + Fix compile with no mutex available + + src/hb-mutex-private.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 1e56c476c10577fe319fe553c5ced000bd740940 +Author: Behdad Esfahbod +Date: Wed May 11 21:28:01 2011 -0400 + + Free static mutex'es + + src/hb-mutex-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 831886a9b4073cfe27f7e1db0e957cbd5913fd31 +Author: Behdad Esfahbod +Date: Wed May 11 21:27:52 2011 -0400 + + Streamline mutex stuff + + src/hb-mutex-private.hh | 61 ++++++++++++++++++++++++++++++------------------- + src/hb-private.hh | 8 +++++++ + 2 files changed, 46 insertions(+), 23 deletions(-) + +commit 438c4eee353ddf0de66171d84c6ef9b21cbdf8f6 +Author: Behdad Esfahbod +Date: Wed May 11 21:14:34 2011 -0400 + + Remove unused hb_mutex_trylock() + + src/hb-mutex-private.hh | 3 --- + 1 file changed, 3 deletions(-) + +commit b8477e1da2785708f3232f8f2577f602a5d320d1 +Author: Behdad Esfahbod +Date: Wed May 11 21:12:44 2011 -0400 + + [test] Add tests for _get_empty() funcs + + test/test-blob.c | 1 + + test/test-buffer.c | 7 +++++++ + test/test-unicode.c | 10 ++++++++++ + 3 files changed, 18 insertions(+) + +commit 3994be3ded40e5a3da0e187ad421b19a78865e02 +Author: Behdad Esfahbod +Date: Wed May 11 21:08:31 2011 -0400 + + [TODO] Update + + TODO | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 80a6833b032bc63b4e8c3da6489d3767af1168f3 +Author: Behdad Esfahbod +Date: Wed May 11 18:14:44 2011 -0400 + + [API] Add hb_*_get_empty() for all objects + + src/hb-buffer.cc | 6 ++++++ + src/hb-buffer.h | 3 +++ + src/hb-font.cc | 18 ++++++++++++++++++ + src/hb-font.h | 9 +++++++++ + src/hb-unicode.cc | 6 ++++++ + src/hb-unicode.h | 3 +++ + test/test-object.c | 36 +++++++++++++++++++++++++++++++++--- + 7 files changed, 78 insertions(+), 3 deletions(-) + +commit d3b30be378c1dec0259a626d9a408bb9ca1b71ac +Author: Behdad Esfahbod +Date: Wed May 11 18:06:12 2011 -0400 + + [API] Add HB_UNTAG() + + Useful in C API only. + + src/hb-common.h | 1 + + 1 file changed, 1 insertion(+) + +commit 3cc6e9dcb42551761c3a1a9d3c25b1f1bcdc2419 +Author: Behdad Esfahbod +Date: Wed May 11 18:02:48 2011 -0400 + + Minor + + src/test.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 4101ca7dbbdf1438fa116fb8cad935501ac7cca8 +Author: Behdad Esfahbod +Date: Wed May 11 14:30:56 2011 -0400 + + Plug more leaks + + All good now. + + src/hb-blob.cc | 2 +- + src/hb-open-type-private.hh | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 6a7ac79e26e85f6781186cf708a12825c0857324 +Author: Behdad Esfahbod +Date: Wed May 11 14:19:18 2011 -0400 + + Plug leaks + + src/hb-ot-map-private.hh | 7 +++++++ + src/hb-ot-shape-private.hh | 2 ++ + src/hb-ot-shape.cc | 2 ++ + src/hb-private.hh | 10 +++++++++- + 4 files changed, 20 insertions(+), 1 deletion(-) + +commit 7aa12ebdff11a4ffbd04bf9b164586eb0c172e37 +Author: Behdad Esfahbod +Date: Wed May 11 11:55:11 2011 -0400 + + [unicode] Simplify method setting + + src/hb-unicode.cc | 6 +----- + test/test-unicode.c | 6 +++++- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit d5bfd0272130a315d3b5e6cdcf9b7e6395879204 +Author: Behdad Esfahbod +Date: Wed May 11 11:48:28 2011 -0400 + + Minor + + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6a4e7e1372ef9fde81b84ecc9c4d1f23d97396c1 +Author: Behdad Esfahbod +Date: Wed May 11 10:31:33 2011 -0400 + + Add maxp table + + Not used for anything right now. Will use to get num_glyphs in the future. + + src/Makefile.am | 1 + + src/hb-ot-head-private.hh | 1 - + src/hb-ot-layout.cc | 1 + + src/hb-ot-maxp-private.hh | 68 +++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 70 insertions(+), 1 deletion(-) + +commit e0b0710ae52bcc8c6fbd87dfae83818faa5d5f5f +Author: Behdad Esfahbod +Date: Wed May 11 08:58:21 2011 -0400 + + Minor + + TODO | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit a513dbcf73ab1cc39a7c9653034904d0c6cd9fe9 +Author: Behdad Esfahbod +Date: Wed May 11 00:24:34 2011 -0400 + + [API] Change signature of get_contour_point and get_kerning ffuncs + + get_contour_point now takes glyph id before point_index. + + get_kerning now takes a vector to fill-in. + + src/hb-font.cc | 56 +++++++++++++++++++++------------------- + src/hb-font.h | 16 +++++++----- + src/hb-ft.cc | 11 +++++--- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-shape.cc | 15 ++++++++--- + 6 files changed, 59 insertions(+), 43 deletions(-) + +commit 63d646fb2933c2765ce526d321a498d0f7fae2f5 +Author: Behdad Esfahbod +Date: Wed May 11 00:15:37 2011 -0400 + + [font] Do user-space conversion when chaining up to parent font + + src/hb-font-private.hh | 28 ++++++++++++++++++++++++++++ + src/hb-font.cc | 23 +++++++++++++++++------ + 2 files changed, 45 insertions(+), 6 deletions(-) + +commit b6f902a1a9c8b72b5d6a241a14a7bacfaea3a56a +Author: Behdad Esfahbod +Date: Wed May 11 00:04:15 2011 -0400 + + Minor + + src/hb-font-private.hh | 6 +++--- + src/hb-ot-layout-gdef-private.hh | 6 +++--- + src/hb-ot-layout-gpos-private.hh | 20 ++++++++++---------- + 3 files changed, 16 insertions(+), 16 deletions(-) + +commit abcfe9b59b4475eb02dd679aac4bc59616713b28 +Author: Behdad Esfahbod +Date: Wed May 11 00:02:02 2011 -0400 + + Remove hb_ot_layout_context_t, simplify code + + src/hb-font-private.hh | 12 +++- + src/hb-font.cc | 6 +- + src/hb-ot-layout-common-private.hh | 8 +-- + src/hb-ot-layout-gdef-private.hh | 34 +++++----- + src/hb-ot-layout-gpos-private.hh | 121 ++++++++++++++++++----------------- + src/hb-ot-layout-gsub-private.hh | 24 +++---- + src/hb-ot-layout-gsubgpos-private.hh | 11 ++-- + src/hb-ot-layout-private.hh | 13 ---- + src/hb-ot-layout.cc | 15 +---- + 9 files changed, 118 insertions(+), 126 deletions(-) + +commit 1ded6d8bbf93b7dabf2b1f620c07bd3236e7a60f +Author: Behdad Esfahbod +Date: Tue May 10 20:49:02 2011 -0400 + + Make default font-funcs chain-up to the parent + + src/hb-font.cc | 44 +++++++++++++++++++++++++++++++++++++++----- + src/hb-font.h | 41 +++++++++++++++++++++-------------------- + 2 files changed, 60 insertions(+), 25 deletions(-) + +commit b9d975b931d6310f25fab5ac280f523cdc27bf94 +Author: Behdad Esfahbod +Date: Tue May 10 20:41:13 2011 -0400 + + [API] Pass down closure user_data to font funcs + + src/hb-font-private.hh | 30 ++++++-- + src/hb-font.cc | 184 +++++++++++++++++++++++++------------------------ + src/hb-font.h | 42 ++++++----- + src/hb-ft.cc | 103 ++++++++++++++------------- + 4 files changed, 198 insertions(+), 161 deletions(-) + +commit 446df9cdb1fddb51819b731436fca54146d0bb23 +Author: Behdad Esfahbod +Date: Tue May 10 20:14:44 2011 -0400 + + Whitespace + + src/hb-unicode.h | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +commit 686c2d165dfb284b74b78f6b902d04b585dcaef3 +Author: Behdad Esfahbod +Date: Tue May 10 20:04:26 2011 -0400 + + [API] Remove font_funcs func getter functions + + src/hb-font.cc | 32 -------------------------------- + src/hb-font.h | 18 ------------------ + 2 files changed, 50 deletions(-) + +commit defc45be6d75aba4a67fa7814b91b73bad953fe6 +Author: Behdad Esfahbod +Date: Tue May 10 20:02:49 2011 -0400 + + [API] Add hb_font_create_sub_font() and hb_font_get_parent() + + Not quite useful just yet. + + src/hb-font-private.hh | 1 + + src/hb-font.cc | 41 ++++++++++++++++++++++++++++++++++++++--- + src/hb-font.h | 5 +++++ + src/hb-unicode.h | 2 +- + 4 files changed, 45 insertions(+), 4 deletions(-) + +commit 11bb8fe7b3925bc9b019ad0c0218a231e581f152 +Author: Behdad Esfahbod +Date: Tue May 10 19:57:00 2011 -0400 + + [font] Fix internal sign of x/y_scale + + Should have been done as part of da975419884a535281745f30f4b32fee0bc8a7a1 + + src/hb-font-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 85e6218e3306165d69ef44277459511d5b54b9ff +Author: Behdad Esfahbod +Date: Tue May 10 19:40:44 2011 -0400 + + [API] Remove broken-by-design hb_font_unset_funcs() + + src/hb-font.cc | 22 ---------------------- + src/hb-font.h | 16 ---------------- + 2 files changed, 38 deletions(-) + +commit 74f1d896f2479500d65649cf3ec86dd201f0663a +Author: Behdad Esfahbod +Date: Tue May 10 19:39:32 2011 -0400 + + Add hb_font_make/is_immutable() + + src/hb-font-private.hh | 2 ++ + src/hb-font.cc | 26 +++++++++++++++++++++++--- + src/hb-font.h | 6 ++++++ + test/test-object.c | 2 +- + 4 files changed, 32 insertions(+), 4 deletions(-) + +commit 8c7a100a4d0f3a257fb7563cb08ed4356c3af669 +Author: Behdad Esfahbod +Date: Tue May 10 19:21:07 2011 -0400 + + Fix build without mutex + + src/hb-mutex-private.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 19d3035c40e73923bcad709dc5eefe31cb34d681 +Author: Behdad Esfahbod +Date: Tue May 10 19:18:12 2011 -0400 + + Remove duplicate atomic_int implementation + + src/hb-mutex-private.hh | 17 ----------------- + 1 file changed, 17 deletions(-) + +commit 45bfa99034512e886d75b1d45a5a649647f4711f +Author: Behdad Esfahbod +Date: Tue May 10 19:12:49 2011 -0400 + + Fix set implementation to be truly threadsafe even with destroy() callbacks + + The test/object test is passing again, instead of deadlocking. + + src/hb-common.cc | 26 +++++------ + src/hb-mutex-private.hh | 47 +++++++------------ + src/hb-object-private.hh | 6 ++- + src/hb-private.hh | 117 ++++++++++++++++++++++++++++++++++++++--------- + 4 files changed, 128 insertions(+), 68 deletions(-) + +commit 0c2ec1d78bfa0166ffd4afc204c2668d4f456ed9 +Author: Behdad Esfahbod +Date: Tue May 10 19:11:27 2011 -0400 + + [test] Always initialize gthread such that our mutex() stuff is tested + + Now the test/object test deadlocks as expected. Fix coming. + + configure.ac | 1 + + test/Makefile.am | 4 ++-- + test/hb-test.h | 1 + + 3 files changed, 4 insertions(+), 2 deletions(-) + +commit 6a9093cc486c1899197cd7cc9a3eb907c2e756f7 +Author: Behdad Esfahbod +Date: Tue May 10 19:00:07 2011 -0400 + + [test/object] Test user_data with destroy() callback that calls user_data + + Exposes the non-atomicity of user_data opertaions at this time because + we call finish() while still locked and modifying the object. In fact, + I'm surprised that it doesn't deadlock. It should. + + test/test-object.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +commit abe636b8761e47ea60b193c7e72a044de224d172 +Author: Behdad Esfahbod +Date: Tue May 10 17:55:40 2011 -0400 + + Add DOAP file + + Makefile.am | 6 +++++- + harfbuzz.doap | 24 ++++++++++++++++++++++++ + 2 files changed, 29 insertions(+), 1 deletion(-) + +commit f82c18630471216a04e4e3ad42396da4e6d74cba +Author: Behdad Esfahbod +Date: Tue May 10 17:48:34 2011 -0400 + + [test/blob] Fix bug in test + + test/test-blob.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 785d23acd0ce72d399f9c5021bebc854872648af +Author: Behdad Esfahbod +Date: Tue May 10 17:41:44 2011 -0400 + + [test/blob] Add create_sub_blob() + + test/test-blob.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit 0617b1558234673d3924f37541be01b04d36f05a +Author: Behdad Esfahbod +Date: Tue May 10 17:37:08 2011 -0400 + + [test] Test blob API + + test/Makefile.am | 1 + + test/test-blob.c | 280 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + test/test-buffer.c | 149 ++++++++++++++-------------- + 3 files changed, 359 insertions(+), 71 deletions(-) + +commit 1c9f8717eb12c37c219333cbb0d123e1d2da4896 +Author: Behdad Esfahbod +Date: Fri May 6 22:28:26 2011 -0400 + + [API] Simplify blob API, remove lock + + TODO | 2 - + src/hb-blob.cc | 206 ++++++++++++++++++-------------------------- + src/hb-blob.h | 19 ++-- + src/hb-font.cc | 2 - + src/hb-open-type-private.hh | 32 ++++--- + src/hb-ot-layout.cc | 7 +- + test/test-object.c | 2 +- + 7 files changed, 118 insertions(+), 152 deletions(-) + +commit 71cef14ac3de07e4fed0a2903b1f0f639406ec6c +Author: Behdad Esfahbod +Date: Fri May 6 19:30:59 2011 -0400 + + Add -Bsymbolic-functions to linker flags + + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +commit ab428aeab724ca40341318b66640f992cd72d2fc +Author: Behdad Esfahbod +Date: Fri May 6 19:30:46 2011 -0400 + + [TODO] Update + + TODO | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a0f337a1cce1788dbf3147b459e7f615acbfe81b +Author: Behdad Esfahbod +Date: Fri May 6 19:20:52 2011 -0400 + + Remove unused hb_blob_try_writable_inplace() + + src/hb-blob.cc | 20 -------------------- + src/hb-blob.h | 3 --- + 2 files changed, 23 deletions(-) + +commit 08611d5194144bbf5d96a1110aeb812db06e0901 +Author: Behdad Esfahbod +Date: Fri May 6 16:28:10 2011 -0400 + + Add note re deadlocks + + src/hb-common.cc | 1 + + src/hb-mutex-private.hh | 4 ++++ + 2 files changed, 5 insertions(+) + +commit 34fb5521a5fbb6b95ceff4bbac42a62628bc9f31 +Author: Behdad Esfahbod +Date: Fri May 6 00:04:28 2011 -0400 + + [API] Add hb_language_get_default() + + It uses locale information to detect default language. It's used by + hb_shape() whenever language is not set on the buffer. + + Not sure how to properly test it in the test suite. Tested by observing + that with DejaVu Sans we select the proper local glyph version for U+431 + under Serbian locale. See http://www.pango.org/ScriptGallery + + src/hb-common.cc | 21 +++++++++++++++++++++ + src/hb-common.h | 3 +++ + src/hb-shape.cc | 2 +- + test/test-common.c | 5 +++++ + 4 files changed, 30 insertions(+), 1 deletion(-) + +commit c78f4485587cc1dee07e772c164a13fde9d2859f +Author: Behdad Esfahbod +Date: Thu May 5 21:31:04 2011 -0400 + + [API] Add version macros and functions + + Step version up to 0.5.0. + + Also, fix to pass "make distcheck" + + configure.ac | 24 ++++++++++++----- + src/Makefile.am | 9 +++++++ + src/check-c-linkage-decls.sh | 2 +- + src/hb-common.cc | 29 +++++++++++++++++++++ + src/hb-version.h.in | 62 ++++++++++++++++++++++++++++++++++++++++++++ + src/hb.h | 1 + + test/Makefile.am | 2 ++ + 7 files changed, 122 insertions(+), 7 deletions(-) + +commit 9ff819f6571fd0d570f271162d7a30d97ee64148 +Author: Behdad Esfahbod +Date: Thu May 5 19:47:59 2011 -0400 + + Add disable-static libtool flag + + No one who builds harfbuzz static uses the autotools build system to do it. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7ca7571ef91754274f6c84bbf988962d74a74098 +Author: Behdad Esfahbod +Date: Thu May 5 19:47:12 2011 -0400 + + Remove win32-dll libtool flag + + Since we're not win32-dll clean the way libtool docs define it. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 174e3fe89b72729c9c34c647544a2dc1bf63cd84 +Author: Behdad Esfahbod +Date: Thu May 5 19:37:53 2011 -0400 + + Add AC_CANONICAL_HOST + + configure.ac | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit e6a5b88c01420366a70e0c9ae1775fb3c930cb8b +Author: Behdad Esfahbod +Date: Thu May 5 16:24:42 2011 -0400 + + Fix build with older glib + + configure.ac | 2 +- + test/hb-test.h | 55 +++++++++++++++++++++++++++++++++---------------------- + 2 files changed, 34 insertions(+), 23 deletions(-) + +commit 3935af1c0d0f53a5fd6054e1ee219f3adda42dca +Author: Behdad Esfahbod +Date: Thu May 5 16:09:45 2011 -0400 + + [buffer] Remove wrong optimization + + While the cluster fields of the glyph string are usually sorted, they + wouldn't be in special cases (for example for non-native direction). + Blindly using bsearch is plain wrong. If we want to reintroduce this + optimization we have to make sure we know the buffer clusters are + monotonic and in which direction. Not sure it's worth it though. + + src/hb-buffer.cc | 16 +++------------- + 1 file changed, 3 insertions(+), 13 deletions(-) + +commit 46df6828513d56cd60467e36cbe45aa06648f488 +Author: Behdad Esfahbod +Date: Thu May 5 15:33:19 2011 -0400 + + Make user_data access threadsafe + + For now, by taking a global user_data mutex. + + src/hb-common.cc | 25 +++++++++++++++++++++++-- + src/hb-object-private.hh | 2 -- + 2 files changed, 23 insertions(+), 4 deletions(-) + +commit 218e67b9eefa26e2e4fe43f99a84d082b185b1b0 +Author: Behdad Esfahbod +Date: Thu May 5 15:28:37 2011 -0400 + + Shrink code + + src/hb-common.cc | 26 ++++++++++++++++++++++++++ + src/hb-object-private.hh | 21 ++++----------------- + 2 files changed, 30 insertions(+), 17 deletions(-) + +commit b8d6183ebc4697a434776cf2aec7857d63a7d881 +Author: Behdad Esfahbod +Date: Thu May 5 15:14:04 2011 -0400 + + Use threadsafe set implementation for hb_language lookups + + Note that the static variable has to be a global static, as gcc + implements local statics differently and that would require linking + to libstdc++, which we don't want. + + src/hb-common.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit d37486d87b65c5abaaa2998fa5c9e48eedde0933 +Author: Behdad Esfahbod +Date: Thu May 5 15:07:54 2011 -0400 + + Add hb_threadsafe_set_t + + src/hb-mutex-private.hh | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-private.hh | 3 +-- + 2 files changed, 55 insertions(+), 2 deletions(-) + +commit b45f32ee4e599c515ce93e44315283d236b073bb +Author: Behdad Esfahbod +Date: Thu May 5 15:00:43 2011 -0400 + + Use hb_array_t for hb_language_t mapping + + src/hb-common.cc | 48 ++++++++++++++++++++++-------------------------- + src/hb-object-private.hh | 4 ++-- + src/hb-private.hh | 19 +++++++++++++++---- + 3 files changed, 39 insertions(+), 32 deletions(-) + +commit 21d2c92fdf7307c7117f8948021f0dd7d5a5d2a3 +Author: Behdad Esfahbod +Date: Thu May 5 14:47:53 2011 -0400 + + Move code around + + src/hb-object-private.hh | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +commit 448ea9bf63104d39f87fff66219034222fa632b8 +Author: Behdad Esfahbod +Date: Thu May 5 14:39:24 2011 -0400 + + [TODO] Remove done items + + TODO | 9 --------- + 1 file changed, 9 deletions(-) + +commit 265ac614ea6d26041c7d64739098b76a82bbc4f4 +Author: Behdad Esfahbod +Date: Thu May 5 14:38:16 2011 -0400 + + Replace fixed-size lookup_maps array with hb_array_t + + src/hb-ot-map-private.hh | 13 +++++-------- + src/hb-ot-map.cc | 47 +++++++++++++++++++++++++---------------------- + src/hb-private.hh | 6 ++---- + 3 files changed, 32 insertions(+), 34 deletions(-) + +commit 6843569d2c70c1771ce964e3d1a4cf91e14e7687 +Author: Behdad Esfahbod +Date: Thu May 5 14:12:37 2011 -0400 + + Replace fixed-size feature_maps array with hb_array_t + + src/hb-ot-map-private.hh | 10 +++------- + src/hb-ot-map.cc | 12 ++++++------ + src/hb-ot-shape.cc | 2 +- + src/hb-private.hh | 42 +++++++++++++++++++++++++++++------------- + 4 files changed, 39 insertions(+), 27 deletions(-) + +commit 44b0a4d2fc62689fc56ef57f412b4bb1e439a614 +Author: Behdad Esfahbod +Date: Thu May 5 13:42:19 2011 -0400 + + Replace fixed-size feature_infos array with hb_array_t + + src/hb-ot-map-private.hh | 9 +++++---- + src/hb-ot-map.cc | 9 +++++---- + src/hb-private.hh | 12 ++++++++++++ + 3 files changed, 22 insertions(+), 8 deletions(-) + +commit b214ec3ac0ce6568e9226fd09661d52de11dca96 +Author: Behdad Esfahbod +Date: Thu May 5 13:24:07 2011 -0400 + + Minor + + src/hb-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 811482bd650fb5652a9835471ae8ecf0fb185611 +Author: Behdad Esfahbod +Date: Thu May 5 13:21:04 2011 -0400 + + Replace hb_map_t with hb_set_t which is more intuitive and flexible + + src/hb-object-private.hh | 24 ++++++++++++++---------- + src/hb-private.hh | 44 +++++++++++++++++--------------------------- + test/test-object.c | 4 ++++ + 3 files changed, 35 insertions(+), 37 deletions(-) + +commit 478a42536ff7ab777a7774fbfdb9c5e51334a14e +Author: Behdad Esfahbod +Date: Thu May 5 12:39:51 2011 -0400 + + Make array/map implementation more generic + + src/hb-object-private.hh | 2 ++ + src/hb-private.hh | 13 +++++++------ + 2 files changed, 9 insertions(+), 6 deletions(-) + +commit b81bd42951e1ce1569b29168015d3c5a2dacf773 +Author: Behdad Esfahbod +Date: Thu May 5 00:21:16 2011 -0400 + + Make hb_mutex_*() macros take a pointer + + More intuitive. + + src/hb-blob.cc | 28 ++++++++++++++-------------- + src/hb-mutex-private.hh | 32 ++++++++++++++++---------------- + 2 files changed, 30 insertions(+), 30 deletions(-) + +commit a4b1900913c91aa9db74c4fdfa7c691a5cdf02a8 +Author: Behdad Esfahbod +Date: Thu May 5 00:17:43 2011 -0400 + + Add hb_static_mutex_t + + src/hb-mutex-private.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 56eb5ad6f94c32189ad219438db9a18683ca6846 +Author: Behdad Esfahbod +Date: Wed May 4 19:27:37 2011 -0400 + + Move code around + + Mutex (and Windows.h by extension) are fairly isolated now. + + src/Makefile.am | 8 ++-- + src/hb-blob-private.hh | 60 --------------------------- + src/hb-blob.cc | 24 ++++++++++- + src/hb-font-private.hh | 3 -- + src/hb-font.cc | 12 +++--- + src/hb-mutex-private.hh | 105 +++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-object-private.hh | 33 ++------------- + src/hb-unicode.cc | 1 - + 8 files changed, 141 insertions(+), 105 deletions(-) + +commit d292885893395dcb345dce1010e5c8628a715ef4 +Author: Behdad Esfahbod +Date: Tue May 3 01:03:53 2011 -0400 + + [ft] Fix font->face handling + + Don't use _cached() + + src/hb-ft.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 2000179487b49e0d504ec127450dc6fcb5568cec +Author: Behdad Esfahbod +Date: Tue May 3 00:49:06 2011 -0400 + + Move Win32 thread-safety stuff to hb-object-private.h + + The Win32 definitions for LONG, ULONG, etc conflicts with + hb-open-type.h. Avoid that by making sure hb-object-private.h + and hb-open-type.h are not included in the same compilation unit. + + src/hb-common.cc | 54 --------------------------------------- + src/hb-object-private.hh | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-private.hh | 66 ------------------------------------------------ + 3 files changed, 66 insertions(+), 120 deletions(-) + +commit 266b34418c9bbe23ccaf29cb354b58c465fa3b22 +Author: Behdad Esfahbod +Date: Tue May 3 00:35:53 2011 -0400 + + Refactor to keep hb-object-private.h and hb-open-type.h separate + + Needed to be able to include from hb-object-private.h. + + src/hb-font.cc | 19 ++++---------- + src/hb-ot-layout-private.hh | 60 +++++++++++++++++++++++++-------------------- + src/hb-ot-layout.cc | 28 ++++++++++++++++++--- + 3 files changed, 63 insertions(+), 44 deletions(-) + +commit d4141a44b97377a65e6d2a3e03b3709307af38c1 +Author: Behdad Esfahbod +Date: Tue May 3 00:19:18 2011 -0400 + + [blob] Implement sub_blob() in terms of create() + + Fixes problem with uninitialized sub_blob->mutex among other things. + + Reported by Bradley Grainger. + + src/hb-blob.cc | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +commit fc52e9e44c2fe84d63f18dc0098720830f0b467d +Author: Behdad Esfahbod +Date: Tue May 3 00:09:16 2011 -0400 + + Implement win32 thread-safety stuff + + Patch from Bradley Grainger. + + src/hb-common.cc | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-private.hh | 30 +++++++++++++++++++++++++----- + 2 files changed, 79 insertions(+), 5 deletions(-) + +commit f55272ecde857c116f97a3195f3abd1df3be4b86 +Author: Behdad Esfahbod +Date: Mon May 2 20:57:28 2011 -0400 + + Add hb_mutex_free() and use it + + Based on patch by Bradley Grainger. + + src/hb-blob.cc | 1 + + src/hb-private.hh | 16 +++++++++------- + 2 files changed, 10 insertions(+), 7 deletions(-) + +commit 8d5186484b28b5f629b523e067d7d5166eec557a +Author: Behdad Esfahbod +Date: Mon May 2 20:52:21 2011 -0400 + + Cosmetic + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 72657e4ce757dcb055a8db7291b68f96f0d34bfb +Author: Behdad Esfahbod +Date: Mon May 2 20:46:32 2011 -0400 + + [API] Make hb_font_create() take a face and reference it + + src/hb-font-private.hh | 2 ++ + src/hb-font.cc | 42 +++++++++++++++++++++++++--------------- + src/hb-font.h | 26 ++++++++++++++----------- + src/hb-ft.cc | 7 +------ + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout.cc | 10 ++++------ + src/hb-ot-layout.h | 2 -- + src/hb-ot-map-private.hh | 2 +- + src/hb-ot-shape.cc | 23 +++++++++++----------- + src/hb-ot-shape.h | 1 - + src/hb-shape.cc | 18 ++--------------- + src/hb-shape.h | 1 - + src/hb-view.cc | 4 +--- + test/test-object.c | 7 +++++-- + 15 files changed, 70 insertions(+), 79 deletions(-) + +commit cec6611c5ce84d69d910bf7e9ec1fdd594398f9f +Author: Behdad Esfahbod +Date: Mon May 2 20:18:58 2011 -0400 + + Protect NULL in a couple places + + src/hb-font.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 5a5030366e40baa8d96ca67b47a52ad5af143157 +Author: Behdad Esfahbod +Date: Mon May 2 19:54:29 2011 -0400 + + Fix bug in array growth implementation + + With this, test/object is now passing. Yay! + + src/hb-private.hh | 24 +++++++++++------------- + 1 file changed, 11 insertions(+), 13 deletions(-) + +commit 16123e10700436df18d14e37371bb621b31ea5d1 +Author: Behdad Esfahbod +Date: Mon May 2 19:54:17 2011 -0400 + + Fix bug in map implementation + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1cd5969f253528b1fc05a06c7a9f222baa29f68d +Author: Behdad Esfahbod +Date: Mon May 2 19:53:39 2011 -0400 + + [object] Fix bug in get_user_data() implementation + + src/hb-object-private.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit db99589529a22a2113bcef1680ab6d9b934f382e +Author: Behdad Esfahbod +Date: Mon May 2 19:52:47 2011 -0400 + + [test/object] Add test for object lifecycle stuff + + Revealed many bugs in the (untested and known buggy) user_data + support. + + test/Makefile.am | 4 + + test/test-object.c | 316 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 320 insertions(+) + +commit f74d6c81f14f117b3cecfb65f0d5df22849c9a07 +Author: Behdad Esfahbod +Date: Mon May 2 19:52:32 2011 -0400 + + Cosmetic + + test/test-unicode.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 4911062d5be0d937ee8f1a70cc93e05d162f45b3 +Author: Behdad Esfahbod +Date: Mon May 2 19:36:39 2011 -0400 + + [API] Rename hb_blob_create_empty() to hb_blob_get_empty() + + src/hb-blob.cc | 2 +- + src/hb-blob.h | 2 +- + src/hb-font.cc | 2 +- + src/hb-open-type-private.hh | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 1ab1d3e38cdf8e7331efdbc4ef0c02ee9d5c8c04 +Author: Behdad Esfahbod +Date: Mon May 2 19:35:53 2011 -0400 + + [face] Return nil face if blob is inert + + src/hb-font.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit e87867cb88280e3f3a38d829e359cb686168b2cb +Author: Behdad Esfahbod +Date: Mon May 2 19:35:05 2011 -0400 + + [buffer] Fail in _create() if we cannot pre-allocate the requested size + + src/hb-buffer.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit cd361ec9a1b2bfc271e5490dbfc0a870fd5c439a +Author: Behdad Esfahbod +Date: Mon May 2 16:54:05 2011 -0400 + + Cosmetic + + test/test-unicode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c784c67a28f5b92d396eaa9529d57ef91a5cb9ac +Author: Behdad Esfahbod +Date: Mon May 2 15:59:57 2011 -0400 + + [unicode] Make _get_parent() return _nil object instead of NULL + + src/hb-unicode.cc | 29 ++++++++++++----------------- + test/test-unicode.c | 2 +- + 2 files changed, 13 insertions(+), 18 deletions(-) + +commit 07e22779abd089d5921bf2d19d4a3bf1bd0173c6 +Author: Behdad Esfahbod +Date: Mon May 2 14:58:04 2011 -0400 + + [test/unicode] Add script roundtrip tests for glib and ICU + + test/test-unicode.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 64 insertions(+), 6 deletions(-) + +commit 7cda65935c73c277550f6ac12f6730e96d4852a7 +Author: Behdad Esfahbod +Date: Mon May 2 14:33:53 2011 -0400 + + [test/unicode] Better test chainup + + test/test-unicode.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 49 insertions(+), 5 deletions(-) + +commit 250c59225ead28449deb11522dee3819480a19b4 +Author: Behdad Esfahbod +Date: Mon May 2 14:21:30 2011 -0400 + + [test/unicode] Port the _custom test to test all property setters + + test/test-unicode.c | 186 +++++++++++++++++++++++++++++----------------------- + 1 file changed, 104 insertions(+), 82 deletions(-) + +commit e74b5b339ab0af53d893ec84a0955d5aa508fed3 +Author: Behdad Esfahbod +Date: Mon May 2 14:03:55 2011 -0400 + + [test/unicode] Test Unicode 5.2+ but don't fail + + test/test-unicode.c | 21 +++++++++++++++++++-- + 1 file changed, 19 insertions(+), 2 deletions(-) + +commit c763aa42b46eaee95359806cab56fa632ff3ad58 +Author: Behdad Esfahbod +Date: Mon May 2 13:52:17 2011 -0400 + + [test/buffer] Clean up testing + + Getting the hang of how to cleanly use gtest. + + test/test-buffer.c | 154 +++++++++++++++++++++++++++++------------------------ + 1 file changed, 85 insertions(+), 69 deletions(-) + +commit 819e9d9e5310e67e8dcce9fa885f8a086a9b9ee8 +Author: Behdad Esfahbod +Date: Mon May 2 12:38:54 2011 -0400 + + Minor + + test/test-unicode.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 03034acb8a9fdd33135bc3775a1f932da9ebdd42 +Author: Behdad Esfahbod +Date: Mon May 2 12:37:45 2011 -0400 + + [icu] Make sure we return script UNKNOWN instead of INVALID + + src/hb-icu.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit d02985ec5a24c659a0a133cc6bc103f1d76bcb29 +Author: Behdad Esfahbod +Date: Mon May 2 12:35:14 2011 -0400 + + ISO 15924 fixes + + Update to http://unicode.org/iso15924 + + Fixes some of the test failures in test-unicode with ICU. Still + one more to fix before the test passes. + + src/hb-common.cc | 10 ++++++++-- + src/hb-common.h | 5 +++-- + src/hb-ot-tag.cc | 2 -- + 3 files changed, 11 insertions(+), 6 deletions(-) + +commit e8e29c725a72c2e991cd1c4422a020457e1684e9 +Author: Behdad Esfahbod +Date: Mon May 2 12:06:18 2011 -0400 + + [test/unicode] Add log messages + + Use with --verbose to see what's failing + + test/test-unicode.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 208c2c31501f6eb2b81b6bf80fcf39f4646eb38b +Author: Behdad Esfahbod +Date: Sun May 1 20:04:01 2011 -0400 + + Minor + + test/test-unicode.c | 478 ++++++++++++++++++++++++++-------------------------- + 1 file changed, 243 insertions(+), 235 deletions(-) + +commit 60833efaf1310c3f18e150b61daaeb0074ae3d91 +Author: Behdad Esfahbod +Date: Fri Apr 29 16:49:57 2011 -0400 + + [test/unicode] Add testing of all unicode properties + + ICU fails for now. + + test/hb-test.h | 4 +- + test/test-unicode.c | 432 +++++++++++++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 416 insertions(+), 20 deletions(-) + +commit da96ee072fa3544c3d36cf0b82ada11806789d70 +Author: Behdad Esfahbod +Date: Fri Apr 29 12:17:09 2011 -0400 + + [test/unicode] Test is/make_immutable() + + test/test-unicode.c | 46 ++++++++++++++++++++++++++++++---------------- + 1 file changed, 30 insertions(+), 16 deletions(-) + +commit 6af9cff5e17e82100b435c8d21aed0765296d58d +Author: Behdad Esfahbod +Date: Fri Apr 29 12:00:38 2011 -0400 + + [test/unicode] Use text fixture instead of static variables + + src/hb-unicode-private.hh | 2 +- + src/hb-unicode.h | 2 +- + test/test-buffer.c | 2 +- + test/test-c.c | 1 + + test/test-common.c | 3 +- + test/test-cplusplus.cc | 1 + + test/test-unicode.c | 112 +++++++++++++++++++++++++++------------------- + 7 files changed, 74 insertions(+), 49 deletions(-) + +commit 13db3d40bfc09c68f9761a71435b1840b9d34099 +Author: Behdad Esfahbod +Date: Thu Apr 28 19:44:45 2011 -0400 + + [test/buffer] Add UTF-16 tests + + test/test-buffer.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 46 insertions(+), 2 deletions(-) + +commit 243673d601588a6f704ceafbff5dd5cdf66c47b7 +Author: Behdad Esfahbod +Date: Thu Apr 28 19:37:51 2011 -0400 + + [test/buffer] Add more extensive UTF-8 test data from glib + + src/hb-buffer.cc | 2 +- + test/test-buffer.c | 317 ++++++++++++++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 303 insertions(+), 16 deletions(-) + +commit dfec67f958482e5c3bb01e06b08694cd4ded6f66 +Author: Behdad Esfahbod +Date: Thu Apr 28 18:34:42 2011 -0400 + + [test/buffer] Add initial utf-8 tests + + test/hb-test.h | 25 ++++++++++++++++++++++++- + test/test-buffer.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 69 insertions(+), 2 deletions(-) + +commit aafe395ab550d3ba2fabc69155662e87d45e74a8 +Author: Behdad Esfahbod +Date: Thu Apr 28 17:10:44 2011 -0400 + + Add test suite infrastructure + + Wraps around glib for convenience and ease of use. + + test/Makefile.am | 1 + + test/hb-test.h | 132 ++++++++++++++++++++++++++++++++++++++++++++++++---- + test/test-buffer.c | 29 ++++++------ + test/test-common.c | 14 +++--- + test/test-unicode.c | 32 ++++++------- + 5 files changed, 160 insertions(+), 48 deletions(-) + +commit c7ffe2ad5f6e97e26d14e2cc0d4098af8f5f36d0 +Author: Behdad Esfahbod +Date: Thu Apr 28 16:03:29 2011 -0400 + + [API Remove hb_font_funcs_copy() + + Will be adding font_funcs subclassing instead. + + src/hb-font.cc | 13 ------------- + src/hb-font.h | 3 --- + 2 files changed, 16 deletions(-) + +commit 30f34d08d445722320db711c3ddf41e66225752c +Author: Behdad Esfahbod +Date: Thu Apr 28 16:02:40 2011 -0400 + + [TODO] Remove finished items + + TODO | 2 -- + src/hb-font.h | 10 ---------- + 2 files changed, 12 deletions(-) + +commit 080a0eb7d82d7195be72c16ece6e0a3ffed636b6 +Author: Behdad Esfahbod +Date: Thu Apr 28 16:01:01 2011 -0400 + + Add _hb_unsigned_int_mul_overflows + + src/hb-buffer.cc | 7 ++----- + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-private.hh | 9 ++++++++- + 4 files changed, 12 insertions(+), 8 deletions(-) + +commit 1d39d6e42b3d7628512d675a84a831a0f58624eb +Author: Behdad Esfahbod +Date: Thu Apr 28 15:54:16 2011 -0400 + + Desable possibly lethal test on 64-bit machines + + test/test-buffer.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 3264042873fd639f3ef8ff0acfad777a0a9f3355 +Author: Behdad Esfahbod +Date: Thu Apr 28 14:24:16 2011 -0400 + + [test/buffer] Test pre_allocate() and allocation_successful() + + src/hb-buffer.cc | 3 ++- + test/test-buffer.c | 26 +++++++++++++++++++++++++- + 2 files changed, 27 insertions(+), 2 deletions(-) + +commit 123aa04f7b3241d6e43de2d472c4a1cbdb250ac7 +Author: Behdad Esfahbod +Date: Thu Apr 28 12:58:28 2011 -0400 + + Fix possible but improbable overflow in hb_array_t + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e0db4b868f9fdd8e680890f87dd4e13a1c27b7a1 +Author: Behdad Esfahbod +Date: Thu Apr 28 12:56:49 2011 -0400 + + [buffer] More error handling + + Should be all set now. + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 60 +++++++++++++++++++++++++++++++++--------------- + 2 files changed, 43 insertions(+), 19 deletions(-) + +commit 15c57e04bf05026ef424f8ae912d2f379301bf93 +Author: Behdad Esfahbod +Date: Thu Apr 28 12:28:54 2011 -0400 + + [test/buffer] Add test pre_alloc(); hangs in the buffer code right now + + Because the following loop overflows: + + while (size > new_allocated) + new_allocated += (new_allocated >> 1) + 32; + + test/test-buffer.c | 33 ++++++++++++++++++++++++++------- + 1 file changed, 26 insertions(+), 7 deletions(-) + +commit 1e5527e2d60ed3b4a5adf62b258415ec3aef41fb +Author: Behdad Esfahbod +Date: Thu Apr 28 12:15:24 2011 -0400 + + [test/buffer] Test reset(), set_length(), and set/get_unicode_data() + + test/test-buffer.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 59 insertions(+), 7 deletions(-) + +commit db126b5448ec802285cf2b6f0e7da412d02dfb28 +Author: Behdad Esfahbod +Date: Thu Apr 28 11:56:29 2011 -0400 + + [test/buffer] Test reverse() and reverse_clusters() + + test/test-buffer.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 57 insertions(+), 4 deletions(-) + +commit 5fa849b77d49da2212825ebb1bea9145713b8449 +Author: Behdad Esfahbod +Date: Wed Apr 27 21:46:01 2011 -0400 + + [API] Add _set/get_user_data() for all objects + + src/hb-blob.cc | 17 +++++++++++++++++ + src/hb-blob.h | 12 ++++++++++++ + src/hb-buffer.cc | 16 ++++++++++++++++ + src/hb-buffer.h | 10 ++++++++++ + src/hb-font.cc | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-font.h | 36 ++++++++++++++++++++++++++++++++++++ + src/hb-unicode.cc | 17 +++++++++++++++++ + src/hb-unicode.h | 12 ++++++++++++ + 8 files changed, 171 insertions(+) + +commit 852e08ec8fbfbce1d50e571d0bb0b52ef4d4cc58 +Author: Behdad Esfahbod +Date: Wed Apr 27 21:45:51 2011 -0400 + + Move code around + + src/hb-object-private.hh | 153 ++++++++++------------------------------------- + src/hb-private.hh | 136 +++++++++++++++++++++++++++++++++++++---- + 2 files changed, 157 insertions(+), 132 deletions(-) + +commit 29c67d3f70b081766a6c01353980f457f38aeb12 +Author: Behdad Esfahbod +Date: Wed Apr 27 21:22:32 2011 -0400 + + Add initial implementation of user_data to objects + + src/hb-common.h | 11 ++- + src/hb-object-private.hh | 186 ++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 193 insertions(+), 4 deletions(-) + +commit 47e71d9661946a4ffb96026bf1d697d788414ab5 +Author: Behdad Esfahbod +Date: Wed Apr 27 16:38:03 2011 -0400 + + [object] Remove unnecessary use of macros + + TODO | 2 -- + src/hb-blob.cc | 18 +++++++++--------- + src/hb-buffer.cc | 6 +++--- + src/hb-font.cc | 30 +++++++++++++++--------------- + src/hb-object-private.hh | 9 --------- + src/hb-unicode.cc | 8 ++++---- + 6 files changed, 31 insertions(+), 42 deletions(-) + +commit 8be1420f8fd0e5c53282245d6830efbee5c7409d +Author: Behdad Esfahbod +Date: Wed Apr 27 16:14:04 2011 -0400 + + [blob] Use HB_FUNC instead of __FUNCTION__ + + src/hb-blob.cc | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit ae008b90cfc2028e878100f78b21d70f923a6044 +Author: Behdad Esfahbod +Date: Wed Apr 27 16:12:12 2011 -0400 + + [object] Add tracing support back in + + src/hb-object-private.hh | 38 ++++++++++++++++++++++++++------------ + 1 file changed, 26 insertions(+), 12 deletions(-) + +commit 5b7f38979fa90117861fe327477de1707f117a8c +Author: Behdad Esfahbod +Date: Wed Apr 27 15:10:12 2011 -0400 + + GNOME Bug 612402 - (hb-arm) HarfBuzz compilation fix for arm + + With gcc on arm, request 8-bit structure alignment. + + configure.ac | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit 39a840ae65327b173e6eb1bb291e235a8305d7a1 +Author: Behdad Esfahbod +Date: Wed Apr 27 14:48:19 2011 -0400 + + [API] Add hb_direction_from/to_string() + + And hb-view --direction argument. + + TODO | 1 - + src/hb-common.cc | 36 ++++++++++++++++++++++++++++++++++++ + src/hb-common.h | 6 ++++++ + src/hb-view.cc | 13 ++++++++++--- + test/test-common.c | 21 ++++++++++++++++++++- + 5 files changed, 72 insertions(+), 5 deletions(-) + +commit f1425a549fef360c3750532de23604cd318999d8 +Author: Behdad Esfahbod +Date: Wed Apr 27 12:15:06 2011 -0400 + + Rename hb-view.c and test.c to .cc files + + src/Makefile.am | 4 ++-- + src/{hb-view.c => hb-view.cc} | 2 +- + src/{test.c => test.cc} | 5 ++++- + 3 files changed, 7 insertions(+), 4 deletions(-) + +commit eb5796f58897ecfb9d76fd99915bf1a30669a0fa +Author: Behdad Esfahbod +Date: Wed Apr 27 12:14:53 2011 -0400 + + [TODO] Add hb-view items + + TODO | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 65e0063eae2f3adb25315b8bd7b0e7757aa960f3 +Author: Behdad Esfahbod +Date: Wed Apr 27 09:33:58 2011 -0400 + + Make buffer size growth start from 32 instead of 8 + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d4bee9f813bb299b1c4aab7c33d588be2a7d354b +Author: Behdad Esfahbod +Date: Wed Apr 27 09:24:37 2011 -0400 + + [API] Add hb_unicode_funcs_get_default() + + src/hb-buffer.cc | 4 ++-- + src/hb-glib.cc | 5 +++-- + src/hb-icu.cc | 5 +++-- + src/hb-unicode-private.hh | 11 +++++++++++ + src/hb-unicode.cc | 7 +++++++ + src/hb-unicode.h | 8 ++++++++ + src/hb-view.c | 13 ++++++------- + test/test-unicode.c | 11 ++++++++++- + 8 files changed, 50 insertions(+), 14 deletions(-) + +commit 153142dac8dd9abaf164bb88af07c600c17fc3a1 +Author: Behdad Esfahbod +Date: Wed Apr 27 01:49:03 2011 -0400 + + Replace simple macros with inline functions for better type safety + + Now that we use C++ for all source code, lets benefit from it! + + The hb_be_int16/32_get/put/eq() macros grow code size if replaced with + inline functions, so leave them as is. + + src/hb-open-type-private.hh | 4 ++-- + src/hb-private.hh | 30 +++++++++++++++++++++--------- + 2 files changed, 23 insertions(+), 11 deletions(-) + +commit 40a9b8154f929947f4693bf90c64301afa407c3f +Author: Behdad Esfahbod +Date: Wed Apr 27 01:48:56 2011 -0400 + + Add TODO item + + src/hb-object-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit ebdc83467c31574daa118fc18cd2ef2dc819b503 +Author: Behdad Esfahbod +Date: Wed Apr 27 01:41:24 2011 -0400 + + Don't return in void function + + Would have been nice if gcc had warned... + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ec6f9c2fd03a49d1e91cbaefa5bdbbfb35dff92e +Author: Behdad Esfahbod +Date: Thu Apr 21 18:35:58 2011 -0400 + + Further simplify object handling + + src/hb-object-private.hh | 53 ++++++++++++++++++++++++------------------------ + 1 file changed, 27 insertions(+), 26 deletions(-) + +commit fca368c4682624346a0aaee690e1ad6ed4c0b337 +Author: Behdad Esfahbod +Date: Thu Apr 21 18:24:02 2011 -0400 + + Add hb_object_header_t which is the common part of all objects + + Makes way for adding arbitrary user_data support. + + src/hb-blob-private.hh | 3 +- + src/hb-blob.cc | 2 +- + src/hb-buffer-private.hh | 9 +++-- + src/hb-buffer.cc | 2 +- + src/hb-font-private.hh | 7 ++-- + src/hb-font.cc | 7 ++-- + src/hb-ft.cc | 3 +- + src/hb-glib.cc | 3 +- + src/hb-icu.cc | 3 +- + src/hb-object-private.hh | 95 ++++++++++++++++++++++++++--------------------- + src/hb-private.hh | 5 +-- + src/hb-unicode-private.hh | 6 ++- + src/hb-unicode.cc | 3 +- + 13 files changed, 82 insertions(+), 66 deletions(-) + +commit a9f24c802956d57180d71b83e96a0fb81197df4a +Author: Behdad Esfahbod +Date: Thu Apr 21 17:18:22 2011 -0400 + + Move hb_reference_count_t to hb-private.h + + src/hb-object-private.hh | 17 ----------------- + src/hb-private.hh | 20 ++++++++++++++++++++ + 2 files changed, 20 insertions(+), 17 deletions(-) + +commit 2409d5f8d7dd8b535ce5ea29e933f7db27d33793 +Author: Behdad Esfahbod +Date: Thu Apr 21 17:14:28 2011 -0400 + + Update Copyright headers + + COPYING | 15 ++++++++------- + src/hb-blob-private.hh | 2 +- + src/hb-blob.cc | 2 +- + src/hb-blob.h | 2 +- + src/hb-buffer-private.hh | 4 ++-- + src/hb-buffer.cc | 6 +++--- + src/hb-buffer.h | 6 +++--- + src/hb-common.cc | 4 +++- + src/hb-common.h | 4 +++- + src/hb-font-private.hh | 4 +++- + src/hb-font.cc | 2 +- + src/hb-font.h | 2 +- + src/hb-ft.cc | 4 ++-- + src/hb-ft.h | 2 +- + src/hb-glib.cc | 4 +++- + src/hb-glib.h | 4 +++- + src/hb-icu.cc | 6 ++++-- + src/hb-icu.h | 4 +++- + src/hb-object-private.hh | 6 ++++-- + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 2 +- + src/hb-ot-head-private.hh | 2 +- + src/hb-ot-layout-common-private.hh | 4 ++-- + src/hb-ot-layout-gdef-private.hh | 4 ++-- + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + src/hb-ot-layout-private.hh | 2 +- + src/hb-ot-layout.cc | 6 +++--- + src/hb-ot-layout.h | 2 +- + src/hb-ot-map-private.hh | 4 ++-- + src/hb-ot-map.cc | 4 ++-- + src/hb-ot-shape-complex-arabic-table.hh | 2 +- + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 2 +- + src/hb-ot-shape-private.hh | 2 +- + src/hb-ot-shape.cc | 4 ++-- + src/hb-ot-shape.h | 2 +- + src/hb-ot-tag.cc | 4 +++- + src/hb-ot-tag.h | 2 +- + src/hb-ot.h | 2 +- + src/hb-private.hh | 4 +++- + src/hb-shape.cc | 2 +- + src/hb-shape.h | 2 +- + src/hb-unicode-private.hh | 4 ++-- + src/hb-unicode.cc | 4 ++-- + src/hb-unicode.h | 4 +++- + src/hb-view.c | 4 ++-- + src/hb.h | 2 +- + src/main.cc | 2 +- + src/test.c | 2 +- + test/hb-test.h | 17 ++++++++++++++++- + test/test-buffer.c | 2 +- + test/test-c.c | 2 +- + test/test-common.c | 2 +- + test/test-cplusplus.cc | 2 +- + test/test-unicode.c | 2 +- + 57 files changed, 122 insertions(+), 84 deletions(-) + +commit 08da7a3841ca7dfcb627314cae1c3a668b9c7236 +Author: Behdad Esfahbod +Date: Thu Apr 21 16:59:10 2011 -0400 + + [hb-view] Accept numbers in feature tag name + + Reported by Adam Twardoch. + + src/hb-view.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 24229eb13268a422efffbcb28a094b726824c7f0 +Author: Behdad Esfahbod +Date: Thu Apr 21 16:55:17 2011 -0400 + + Remove obsolete comment + + Talking to Ryan Lortie, he thinks my comment doesn't make sense. + + So I'm making the getter const. Note that g_atomic_int_get() + casts that away itself, so we don't need to worry about that + (which kinda makes me uncomfortable actually). + + src/hb-object-private.hh | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) + +commit dcb7026f33cbcdf60e9b7fcdd44c64cc08702c74 +Author: Behdad Esfahbod +Date: Thu Apr 21 16:34:22 2011 -0400 + + Add ASSERT_STATIC_EXPR macro + + Unused right now. + + src/hb-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 3e8bdbf9414291da5cf61213d5f4275c1ae23ae5 +Author: Behdad Esfahbod +Date: Thu Apr 21 16:16:21 2011 -0400 + + Cleanup hb_refrence_count_t + + src/hb-object-private.hh | 23 ++++++++++++++++++----- + src/hb-private.hh | 6 +++--- + 2 files changed, 21 insertions(+), 8 deletions(-) + +commit 783a7d69696bf0b1502ec9c1495e482e491c78e0 +Author: Behdad Esfahbod +Date: Thu Apr 21 16:03:59 2011 -0400 + + [TODO] Remove finished items + + TODO | 6 +----- + src/hb-ft.cc | 1 - + 2 files changed, 1 insertion(+), 6 deletions(-) + +commit da975419884a535281745f30f4b32fee0bc8a7a1 +Author: Behdad Esfahbod +Date: Thu Apr 21 15:08:01 2011 -0400 + + [API] Allow negative font x_scale/y_scale + + I was reconsidering whether y should grow down, since all three/four + times I've used this API I was tricked and got that wrong in my use. + So I was very inclined to make y grow down instead of up. However, + considering that the font space has y up and it would be very confusing + for callbacks to work against that, I decided that what I really want + is for the user to be able to set y_scale to a negative number to imply + that user-space y grows down. + + Changing x_scale/y_scale from unsigned int to int allows that, and I've + made pango to use that instead of negating glyph y_offset later. hb-ft + however still has y group up. I *guess* that's how FreeType works? + I'm not sure, FreeType docs don't make this clear... + + I'm happy with the resolution :-). + + src/hb-font.cc | 8 ++++---- + src/hb-font.h | 8 ++++---- + src/hb-ot-layout-common-private.hh | 6 +----- + src/hb-ot-layout-private.hh | 2 +- + 4 files changed, 10 insertions(+), 14 deletions(-) + +commit 4d559cddbb3b3a5c12c5167eba69598618a9f283 +Author: Behdad Esfahbod +Date: Thu Apr 21 14:58:23 2011 -0400 + + [icu] Remove big script switch(), rely on reverse-lookup + + src/hb-icu.cc | 137 ++++------------------------------------------------------ + 1 file changed, 9 insertions(+), 128 deletions(-) + +commit d18431b4cd8c1b14523733cd60a62b862f5b471f +Author: Behdad Esfahbod +Date: Wed Apr 20 18:59:10 2011 -0400 + + Move hb_reference_count_t from macros to inline methods + + src/hb-object-private.hh | 25 +++++++++++-------------- + 1 file changed, 11 insertions(+), 14 deletions(-) + +commit c57d454accff66e5f2c58006e8fb40bc020b6182 +Author: Behdad Esfahbod +Date: Wed Apr 20 18:50:27 2011 -0400 + + Rename all private sources and headers to C++ files + + So we can liberally use the simple features of C++ that parts of the + codebase is already using. + + src/Makefile.am | 17 +++++++++-------- + src/{hb-blob-private.h => hb-blob-private.hh} | 8 ++++---- + src/hb-blob.cc | 4 ++-- + src/hb-buffer-private.hh | 2 +- + src/{hb-common.c => hb-common.cc} | 8 ++++---- + src/{hb-font-private.h => hb-font-private.hh} | 8 ++++---- + src/hb-font.cc | 6 +++--- + src/{hb-ft.c => hb-ft.cc} | 4 ++-- + src/hb-glib.cc | 2 +- + src/hb-icu.cc | 2 +- + src/{hb-object-private.h => hb-object-private.hh} | 10 ++++------ + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-private.hh | 4 ++-- + ...abic-table.h => hb-ot-shape-complex-arabic-table.hh} | 8 ++++---- + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 2 +- + src/hb-ot-shape-private.hh | 2 +- + src/{hb-ot-tag.c => hb-ot-tag.cc} | 8 ++++---- + src/{hb-private.h => hb-private.hh} | 8 ++++---- + src/hb-shape.cc | 2 +- + src/hb-unicode-private.hh | 2 +- + src/hb-unicode.cc | 2 +- + src/hb-view.c | 6 ++++++ + 24 files changed, 63 insertions(+), 58 deletions(-) + +commit f19f4f9b0965ad7473a0f3a1ffcdbf16930e35d4 +Author: Behdad Esfahbod +Date: Wed Apr 20 18:25:56 2011 -0400 + + Rename hb-blob.c to hb-blob.cc in preparation of more changes + + src/Makefile.am | 2 +- + src/{hb-blob.c => hb-blob.cc} | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 04744e73bad22d679986173b5f0d84dbbf49dd57 +Author: Behdad Esfahbod +Date: Wed Apr 20 17:24:03 2011 -0400 + + [TODO] Remove done items + + TODO | 6 ------ + 1 file changed, 6 deletions(-) + +commit 9417c1c0d2b005eadf0c087ca695121a6200d0f7 +Author: Behdad Esfahbod +Date: Wed Apr 20 17:21:23 2011 -0400 + + [API] Make hb_face_reference_table() return empty blob instead of NULL + + The idea here is that: + + - Like pretty much all other API in harfbuzz, user does not have to + check for NULL. + + - In any caller code, the case of missing table should be handled + exactly the same way that a too-short table is handled. Turning + a non-existent talbe into a table of size 0 makes the user code + safer. + + src/hb-font.cc | 2 ++ + src/hb-open-type-private.hh | 3 --- + 2 files changed, 2 insertions(+), 3 deletions(-) + +commit c035812feb0d385a9e8c334631738e4915912c71 +Author: Behdad Esfahbod +Date: Wed Apr 20 17:03:00 2011 -0400 + + [API] Rename hb_face_get_table() to hb_face_reference_table() + + That correctly reflects the reference ownership transfer happening. + + src/hb-font.cc | 4 ++-- + src/hb-font.h | 7 ++----- + src/hb-ot-layout.cc | 6 +++--- + src/hb-shape.cc | 2 +- + 4 files changed, 8 insertions(+), 11 deletions(-) + +commit 2d7b61a4b0ed212ca414b3281c2eae3e3db19c13 +Author: Behdad Esfahbod +Date: Wed Apr 20 16:40:56 2011 -0400 + + [TODO] Remove done items + + TODO | 10 ++-------- + src/hb-ft.h | 2 +- + 2 files changed, 3 insertions(+), 9 deletions(-) + +commit af02933739e03a156b9f7761fd7a63e2a02d0df1 +Author: Behdad Esfahbod +Date: Wed Apr 20 15:49:31 2011 -0400 + + [API] Remove hb_*_get_reference_count() + + This was a bizzare piece of API that I inherited from cairo. It has + been wrong adding them to cairo in the first place. Remove them before + someone uses them! + + src/hb-blob.c | 6 ------ + src/hb-blob.h | 3 --- + src/hb-buffer.cc | 6 ------ + src/hb-buffer.h | 3 --- + src/hb-font.cc | 18 ------------------ + src/hb-font.h | 9 --------- + src/hb-object-private.h | 7 ------- + src/hb-unicode.cc | 6 ------ + src/hb-unicode.h | 3 --- + test/test-unicode.c | 24 ------------------------ + 10 files changed, 85 deletions(-) + +commit 440a76b630a36a7336c93e8b05d988c6407b085e +Author: Behdad Esfahbod +Date: Wed Apr 20 14:20:00 2011 -0400 + + [OT] Fix script to ot-script-tag conversion + + src/hb-ot-tag.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a3036a3e97b14c8eb1df208aed944207f9b6cc0b +Author: Behdad Esfahbod +Date: Wed Apr 20 14:13:23 2011 -0400 + + Minor + + src/hb-view.c | 1 - + 1 file changed, 1 deletion(-) + +commit fb6291d9c9224bedf207bf0077ad9f0a2690f867 +Author: Behdad Esfahbod +Date: Wed Apr 20 03:15:31 2011 -0400 + + [test] Add test for headers included from C and C++ + + test/Makefile.am | 17 +++++++++++++++++ + test/test-c.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ + test/test-cplusplus.cc | 29 +++++++++++++++++++++++++++++ + 3 files changed, 95 insertions(+) + +commit 107a50581ccab7df7c390d5b927fdab1bbe8e713 +Author: Behdad Esfahbod +Date: Wed Apr 20 03:04:56 2011 -0400 + + [test] Add todo items + + test/test-unicode.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit 5668189c12c264e8d2caf0d12dac918363ef6f80 +Author: Behdad Esfahbod +Date: Wed Apr 20 03:03:32 2011 -0400 + + [API] font: move user_data before destroy() + + This is the common convention for language binding tools. + + src/hb-font-private.h | 4 ++-- + src/hb-font.cc | 30 +++++++++++++++--------------- + src/hb-font.h | 12 ++++++------ + src/hb-ft.c | 8 ++++---- + 4 files changed, 27 insertions(+), 27 deletions(-) + +commit e5847f75fb7bd25c5db6061d8e20d61fa469f9fe +Author: Behdad Esfahbod +Date: Wed Apr 20 02:59:28 2011 -0400 + + [API] blob: move user_data before destroy() + + This is the common convention for language binding tools. + + src/hb-blob-private.h | 2 +- + src/hb-blob.c | 16 ++++++++-------- + src/hb-blob.h | 4 ++-- + 3 files changed, 11 insertions(+), 11 deletions(-) + +commit 1fd73b594d611624ccb73f614c61298debf48994 +Author: Behdad Esfahbod +Date: Wed Apr 20 02:56:39 2011 -0400 + + [test] Rename test-types to test-common + + test/Makefile.am | 2 +- + test/{test-types.c => test-common.c} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit f144a8ea840c6452c1fece2fd988b42a8ea7c5a6 +Author: Behdad Esfahbod +Date: Wed Apr 20 02:54:42 2011 -0400 + + [icu] Add two-way script conversion functions + + Also optimizes the common-direction script lookup. + + src/hb-common.c | 5 +- + src/hb-icu.cc | 205 +++++++++++++++++++++++++++++------------------------- + src/hb-icu.h | 9 +++ + test/test-types.c | 2 +- + 4 files changed, 124 insertions(+), 97 deletions(-) + +commit 0809aadd4bbd5d0f256407def7cc10b79772a824 +Author: Behdad Esfahbod +Date: Wed Apr 20 02:44:29 2011 -0400 + + [glib] Add two-way script conversion functions + + Also optimizes the common-direction script lookup to be an array lookup. + + src/hb-glib.cc | 270 ++++++++++++++++++++++++++++++--------------------------- + src/hb-glib.h | 8 ++ + 2 files changed, 148 insertions(+), 130 deletions(-) + +commit 5c8c1b680c4fa23c8574b9aebd21113e276f57a3 +Author: Behdad Esfahbod +Date: Wed Apr 20 02:29:22 2011 -0400 + + Remove verbose comments + + src/hb-glib.cc | 194 ++++++++++++++++++++--------------------- + src/hb-icu.cc | 266 ++++++++++++++++++++++++++++----------------------------- + 2 files changed, 230 insertions(+), 230 deletions(-) + +commit fb194b8794898f51eb596fa4092c26606889d376 +Author: Behdad Esfahbod +Date: Wed Apr 20 02:00:47 2011 -0400 + + unicode: Cleanup implementation + + src/Makefile.am | 8 +- + src/hb-buffer-private.hh | 2 +- + src/{hb-glib.c => hb-glib.cc} | 65 +++---- + src/{hb-icu.c => hb-icu.cc} | 30 +-- + src/hb-ot-shape.cc | 14 +- + src/hb-shape.cc | 4 +- + ...{hb-unicode-private.h => hb-unicode-private.hh} | 65 ++++--- + src/{hb-unicode.c => hb-unicode.cc} | 213 +++++++++------------ + src/hb-unicode.h | 57 +++--- + test/test-unicode.c | 23 ++- + 10 files changed, 237 insertions(+), 244 deletions(-) + +commit ecfb773829a5d98a4f5456a992f3e5ecd6731435 +Author: Behdad Esfahbod +Date: Wed Apr 20 01:34:51 2011 -0400 + + Cosmetic + + src/hb-unicode.h | 22 +++++++++------------- + 1 file changed, 9 insertions(+), 13 deletions(-) + +commit 2fd0c577e322ccbf762927bc4600b3ea31db4c80 +Author: Ryan Lortie +Date: Wed Apr 20 00:19:20 2011 -0400 + + [API] unicode: rework virtual functions for subclassing + + Unicode data providers can now be subclassed, including support for + chain-up. The interface should now be nicely bindable, as well. + + Also fix glib unicode funcs that where broken after hb_script_t + changes. Nicely caught by the test-unicode.c added in this commit. + + src/hb-glib.c | 186 ++++++++++++++++++++++++++++++++++++-- + src/hb-icu.c | 45 +++++++-- + src/hb-ot-shape.cc | 9 +- + src/hb-shape.cc | 2 +- + src/hb-unicode-private.h | 17 ++++ + src/hb-unicode.c | 231 +++++++++++++++++++++++++---------------------- + src/hb-unicode.h | 68 +++++++------- + test/Makefile.am | 1 + + test/test-unicode.c | 215 +++++++++++++++++++++++++++++++++++++++++++ + 9 files changed, 610 insertions(+), 164 deletions(-) + +commit f85faee9b3cb841ea977403945e2c877ab32b97a +Author: Behdad Esfahbod +Date: Tue Apr 19 00:38:01 2011 -0400 + + [API] Rename hb_buffer_add_glyph() to hb_buffer_add() + + src/hb-buffer.cc | 10 +++++----- + src/hb-buffer.h | 8 ++++---- + test/test-buffer.c | 2 +- + 3 files changed, 10 insertions(+), 10 deletions(-) + +commit aab0de50e23727b69fa8c3d4e05c50c114c62835 +Author: Behdad Esfahbod +Date: Tue Apr 19 00:32:19 2011 -0400 + + [API] Add hb_buffer_allocation_successful() + + Returns the error status of the buffer. + + src/hb-buffer.cc | 6 ++++++ + src/hb-buffer.h | 6 ++++++ + test/test-buffer.c | 2 +- + 3 files changed, 13 insertions(+), 1 deletion(-) + +commit 02a534b23f2d1e7475109563b9f61221ed020e8b +Author: Ryan Lortie +Date: Fri Apr 15 18:34:45 2011 -0400 + + [API] Rename hb_buffer_ensure() to hb_buffer_pre_allocate() + + The new name is self-documenting. + + src/hb-buffer.cc | 4 ++-- + src/hb-buffer.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 70566befc59cfa8b9c43ac682749c40ea783b1dd +Author: Ryan Lortie +Date: Fri Apr 15 18:32:36 2011 -0400 + + [API} hb_buffer_get_glyph_{infos,positions}: Add length out parameter + + Return the length, whenever we return an array. Makes it easier on the + language bindings. + + src/hb-buffer.cc | 12 ++++++++++-- + src/hb-buffer.h | 6 ++++-- + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-view.c | 4 ++-- + test/test-buffer.c | 7 ++----- + 5 files changed, 20 insertions(+), 13 deletions(-) + +commit 62879eebd9965179af8602ba29ac0a64a739b757 +Author: Behdad Esfahbod +Date: Mon Apr 18 23:40:21 2011 -0400 + + [API] Use ISO 15924 tags for hb_script_t + + This simplifies the code, reduces static data, and makes the design + more extensible to future additions of new scripts. + + src/hb-common.c | 411 ++++--------------------------------- + src/hb-common.h | 199 +++++++++--------- + src/hb-ot-map.cc | 4 +- + src/hb-ot-shape-complex-private.hh | 3 +- + src/hb-ot-tag.c | 228 +++++++++----------- + src/hb-ot-tag.h | 6 +- + src/hb-shape.cc | 4 +- + test/test-types.c | 2 +- + 8 files changed, 252 insertions(+), 605 deletions(-) + +commit c0af193c8e25c4f11d23b8893e9ce1c2d2615bb2 +Author: Behdad Esfahbod +Date: Fri Apr 15 19:26:24 2011 -0400 + + Change buffer default properties to invalid + + This includes HB_DIRECTION_INVALID and HB_SCRIPT_INVALID. + + The INVALID will cause a "guess whatever from the text" in hb_shape(). + While it's not ideal, it works better than the previous defaults at + least (HB_DIRECTION_LTR and HB_SCRIPT_COMMON). + + src/hb-buffer-private.hh | 9 +++------ + src/hb-buffer.cc | 24 ++++++++++++++++-------- + src/hb-view.c | 6 ++---- + test/test-buffer.c | 4 ++-- + 4 files changed, 23 insertions(+), 20 deletions(-) + +commit 00bec2c969555e76c3f84650a1d3c45308e585ad +Author: Behdad Esfahbod +Date: Fri Apr 15 19:16:54 2011 -0400 + + Move enum types to hb-common.h + + src/hb-common.c | 406 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-common.h | 170 +++++++++++++++++++++++ + src/hb-unicode.c | 406 ------------------------------------------------------- + src/hb-unicode.h | 166 ----------------------- + 4 files changed, 576 insertions(+), 572 deletions(-) + +commit 5dd4609f4da5674966a0169d9fa533ac5bc9f464 +Author: Behdad Esfahbod +Date: Fri Apr 15 19:16:34 2011 -0400 + + [TODO] Add new item + + TODO | 1 + + 1 file changed, 1 insertion(+) + +commit b54cd07b2623b68171e00179a9dc3ecbea7aa6a1 +Author: Behdad Esfahbod +Date: Fri Apr 15 19:12:01 2011 -0400 + + Mark internal buffer variables private + + src/hb-buffer.h | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 0e8d35c0932ddc20ebf430f2fd82c087da698954 +Author: Behdad Esfahbod +Date: Fri Apr 15 19:07:10 2011 -0400 + + Add hb_script_from_string() + + src/hb-unicode.c | 6 ++++++ + src/hb-unicode.h | 4 ++++ + src/hb-view.c | 2 +- + 3 files changed, 11 insertions(+), 1 deletion(-) + +commit 8f0d7e0c3fd4b05c43ac449be4f374dc2dc56127 +Author: Behdad Esfahbod +Date: Fri Apr 15 18:59:56 2011 -0400 + + Remove hb_buffer_clear_positions(), add hb_ot_layout_position_start() + + src/hb-buffer-private.hh | 6 +++++- + src/hb-buffer.cc | 24 ++++++++++++------------ + src/hb-buffer.h | 5 +---- + src/hb-ot-layout.cc | 6 ++++++ + src/hb-ot-layout.h | 4 ++++ + src/hb-ot-shape.cc | 2 +- + 6 files changed, 29 insertions(+), 18 deletions(-) + +commit 2fc56edff6d64f190271454ccb1b5fd347d4f172 +Author: Behdad Esfahbod +Date: Fri Apr 15 18:35:08 2011 -0400 + + [API] Remove hb_buffer_clear() + + One should use hb_buffer_reset() really. + + src/hb-buffer.cc | 16 +++++----------- + src/hb-buffer.h | 4 ---- + test/test-buffer.c | 4 ---- + 3 files changed, 5 insertions(+), 19 deletions(-) + +commit 7f5bdc80541cdc90aa1acafba5e9e0bd2df53ff4 +Author: Behdad Esfahbod +Date: Fri Apr 15 18:34:55 2011 -0400 + + [TODO] Remove done items + + TODO | 4 ---- + 1 file changed, 4 deletions(-) + +commit 5814dfa3f5aa41bc3df06b78980d57d7bea0ba58 +Author: Behdad Esfahbod +Date: Fri Apr 15 14:41:04 2011 -0400 + + Cosmetic + + src/hb-ot-shape.cc | 14 +++++++------- + src/hb-ot-shape.h | 4 ++-- + src/hb-shape.cc | 20 ++++++++++---------- + src/hb-shape.h | 10 +++++----- + 4 files changed, 24 insertions(+), 24 deletions(-) + +commit cfbfeb88a6ec059ea97a6624e63cfacc642b685a +Author: Behdad Esfahbod +Date: Fri Apr 15 12:40:40 2011 -0400 + + [TODO] Remove done items + + TODO | 4 ---- + 1 file changed, 4 deletions(-) + +commit 3cbdf70e0a92f1c24e16c0d4dcfbec4ac59a77a3 +Author: Behdad Esfahbod +Date: Fri Apr 15 12:32:06 2011 -0400 + + Make hb_language_t typesafe + + src/hb-common.c | 18 +++++++++++------- + src/hb-common.h | 2 +- + 2 files changed, 12 insertions(+), 8 deletions(-) + +commit 2f2f448af35c232d18888c0e57cb21c9796ba7a8 +Author: Behdad Esfahbod +Date: Fri Apr 15 11:45:14 2011 -0400 + + [test] Add more TODO items + + test/test-buffer.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit c910bec863215f918c659f58debbc7fe5264d7b6 +Author: Behdad Esfahbod +Date: Wed Apr 13 15:49:06 2011 -0400 + + Add hb_buffer_reset() and hb_buffer_set_length() + + src/hb-buffer.cc | 31 +++++++++++++++++++++++++++++++ + src/hb-buffer.h | 15 ++++++++++++++- + 2 files changed, 45 insertions(+), 1 deletion(-) + +commit 69ea23cb5d47dd1cfd3129f68375021ef79bf63b +Author: Behdad Esfahbod +Date: Wed Apr 13 15:02:40 2011 -0400 + + Minor + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7dea908cd582c8c25555015940065c69c1e7e65b +Author: Behdad Esfahbod +Date: Wed Apr 13 01:35:58 2011 -0400 + + [test] Add todo items + + test/test-buffer.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 07cbaac07d7f43437b171e9275430b5fb3097716 +Author: Behdad Esfahbod +Date: Wed Apr 13 01:11:19 2011 -0400 + + [TODO] Add item re script iso15924 functions + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit d0f53fdbead15d9003b521b8ed47d02fd29a4c64 +Author: Behdad Esfahbod +Date: Wed Apr 13 01:09:09 2011 -0400 + + [test] Test hb-buffer.h + + test/Makefile.am | 8 ++- + test/test-buffer.c | 195 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 202 insertions(+), 1 deletion(-) + +commit 72d89404c2837d578f5305456c817130b6a15c73 +Author: Behdad Esfahbod +Date: Wed Apr 13 01:07:42 2011 -0400 + + [TODO] Add item re hb_buffer_reset() + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5015c12dfb4de8525325178ae6def9e80fd83669 +Author: Behdad Esfahbod +Date: Wed Apr 13 01:06:02 2011 -0400 + + [TODO] Add item re hb_buffer_resize() + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 9329ec92078d0e2d7bb04f683e0c6a582aab92f7 +Author: Behdad Esfahbod +Date: Wed Apr 13 00:06:23 2011 -0400 + + [TODO] Add API item + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 4744379efc6063d94e15ff99381a7ab8b88ee567 +Author: Behdad Esfahbod +Date: Mon Apr 11 19:47:33 2011 -0400 + + Minor + + test/test-types.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9385caa8a693df0f06a511a71de9aa407637097c +Author: Behdad Esfahbod +Date: Mon Apr 11 19:43:51 2011 -0400 + + [test] Actually hook up hb_script_t tests + + I really shall find a way to automate the test enumeration. Otherwise + it's too easy to add a test and wrongly hook it up. Did it twice today. + + test/test-types.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8e4bb3cacc269ed32187aaaeaa166c64f41a0418 +Author: Behdad Esfahbod +Date: Mon Apr 11 17:55:58 2011 -0400 + + Fold hb-language.[ch] into hb-common.[ch] + + src/Makefile.am | 2 - + src/hb-buffer.h | 1 - + src/hb-common.c | 92 ++++++++++++++++++++++++++++++++++++++++- + src/hb-common.h | 42 +++++++++++++------ + src/hb-language.c | 120 ------------------------------------------------------ + src/hb-language.h | 46 --------------------- + src/hb-ot-tag.h | 1 - + src/hb.h | 1 - + 8 files changed, 120 insertions(+), 185 deletions(-) + +commit 09125576ca745b3393f3dc49071df891400bbdc9 +Author: Behdad Esfahbod +Date: Mon Apr 11 17:49:33 2011 -0400 + + [test] Test hb_language_t + + test/test-types.c | 26 +++++++++++++++++++++++++- + 1 file changed, 25 insertions(+), 1 deletion(-) + +commit 316b7a1afb84a5dfeaed886a585669b4d549c9b7 +Author: Behdad Esfahbod +Date: Mon Apr 11 17:49:10 2011 -0400 + + Make hb_language_from_string("") return NULL language + + src/hb-language.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit db60c96f20426111ffa71e9802ef6e248f8b28d0 +Author: Behdad Esfahbod +Date: Mon Apr 11 16:17:02 2011 -0400 + + [teset] Test hb_script_t + + test/hb-test.h | 8 ++++++++ + test/test-types.c | 35 ++++++++++++++++++++++++++++++++++- + 2 files changed, 42 insertions(+), 1 deletion(-) + +commit 99b74760a4cddc798ab44b5ca897486bbb9c76d6 +Author: Behdad Esfahbod +Date: Mon Apr 11 15:47:40 2011 -0400 + + Rename hb_category_t to hb_unicode_general_category_t + + src/hb-glib.c | 2 +- + src/hb-icu.c | 64 ++++++++++++++++++------------------- + src/hb-ot-shape-complex-arabic.cc | 8 ++--- + src/hb-ot-shape-private.hh | 2 +- + src/hb-ot-shape.cc | 2 +- + src/hb-unicode.c | 4 +-- + src/hb-unicode.h | 66 +++++++++++++++++++-------------------- + 7 files changed, 74 insertions(+), 74 deletions(-) + +commit 4188096a7722f09ffa9319986c0286071da10a27 +Author: Behdad Esfahbod +Date: Mon Apr 11 14:58:28 2011 -0400 + + Make HB_TAG_CHAR4 private + + It's just sugar. + + src/hb-common.h | 5 +---- + src/hb-private.h | 7 ++++++- + test/test-types.c | 2 -- + 3 files changed, 7 insertions(+), 7 deletions(-) + +commit 7ff7401c9237cda661869c1cb196d685706ac4e9 +Author: Behdad Esfahbod +Date: Mon Apr 11 13:27:30 2011 -0400 + + Make hb_tag_from_string(NULL) return HB_TAG_NONE + + src/hb-common.c | 3 +++ + test/test-types.c | 3 +++ + 2 files changed, 6 insertions(+) + +commit 02f6e62d6cabc7808c188daef26a1fe7ac626b1f +Author: Behdad Esfahbod +Date: Mon Apr 11 13:27:21 2011 -0400 + + Build fix + + test/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit db5227c40e5c35fe2ffb750f32b639cb44424a1d +Author: Behdad Esfahbod +Date: Mon Apr 11 13:16:08 2011 -0400 + + Move macros around + + src/hb-ot-tag.c | 6 ++---- + src/hb-private.h | 7 +++++++ + 2 files changed, 9 insertions(+), 4 deletions(-) + +commit 07233581c9d953708d3c020907c42b8b89472b89 +Author: Behdad Esfahbod +Date: Mon Apr 11 13:12:37 2011 -0400 + + Rename HB_TAG_STR() to HB_TAG_CHAR4() + + The problem with HB_TAG_STR() was that it expected a string of size 4 + exactly, and unlike hb_tag_from_string() it doesn't pad the tag with + space characters. So, the new name is more appropriate. + + src/hb-common.c | 2 +- + src/hb-common.h | 8 ++++---- + src/hb-ot-tag.c | 2 +- + test/test-types.c | 2 +- + 4 files changed, 7 insertions(+), 7 deletions(-) + +commit 9faa980067f802f712c2adf8263152ed40c98088 +Author: Behdad Esfahbod +Date: Mon Apr 11 12:46:49 2011 -0400 + + Add an in-tree test suite + + Uses the glib testing framework. Wrote unit tests for hb-common.h + types. + + Makefile.am | 2 +- + test/Makefile.am | 18 +++++++++ + test/Makefile.decl | 90 ++++++++++++++++++++++++++++++++++++++++++++ + test/hb-test.h | 67 +++++++++++++++++++++++++++++++++ + test/test-types.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 284 insertions(+), 1 deletion(-) + +commit d77b76200efbaa0611691920f9f2018b1e8be340 +Author: Behdad Esfahbod +Date: Mon Apr 11 12:29:52 2011 -0400 + + Add few more paratheses to the HB_TAG macro + + Never hurts. + + src/hb-common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b13640de6992de9ee9d07e3581c33b8181b70ff9 +Author: Behdad Esfahbod +Date: Mon Apr 11 12:29:31 2011 -0400 + + A few more ASSERTs + + src/hb-private.h | 3 +++ + 1 file changed, 3 insertions(+) + +commit ae9eeaff9300f3bb7bed588c5478e8e5461b3df0 +Author: Behdad Esfahbod +Date: Mon Apr 11 11:49:08 2011 -0400 + + Remove warning message from public header file + + Since we now assert thos in hb-private.h, the int types cannot be wrong. + (Except for when someone else includes hb-common.h in a very broken + configuration, but that's not our problem!) + + Plus, we don't use inline in the public headers, so remove that too. + + src/hb-common.h | 7 ------- + src/hb-private.h | 4 ++++ + 2 files changed, 4 insertions(+), 7 deletions(-) + +commit 6fd5364bdc3a2b459175377e9e16c86cff054232 +Author: Behdad Esfahbod +Date: Mon Apr 11 11:47:14 2011 -0400 + + Assert int types + + src/hb-private.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit bbdeff59646e5502b9fc53ab1761b3f014ee276c +Author: Behdad Esfahbod +Date: Thu Apr 7 16:05:07 2011 -0400 + + Add test directory + + configure.ac | 1 + + test/Makefile.am | 0 + 2 files changed, 1 insertion(+) + +commit 4accc92afc702177ea53280d977cec839af3c12c +Author: Behdad Esfahbod +Date: Thu Apr 7 15:53:26 2011 -0400 + + Update TODO items + + TODO | 31 ++++++++++++++++++++----------- + 1 file changed, 20 insertions(+), 11 deletions(-) + +commit a71b9c8579d73aea4549f12524bbc2e89f43b5c5 +Author: Behdad Esfahbod +Date: Wed Apr 6 14:04:56 2011 -0400 + + Disable 'cswh' by default except for Arabic shaper + + That better matches OpenType spec. Note that we enable it for all + Arabic-shaper scripts. Ie. we enable it by default for Syriac too, + but the SyriacOT spec does not require it. I think this is a more + useful compromise than special-casing for Arabic script alone. + + src/hb-ot-shape-complex-arabic.cc | 3 +++ + src/hb-ot-shape.cc | 1 - + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit cab6f65bba560ac1651d9152f1ecf12eb88eca74 +Author: Behdad Esfahbod +Date: Mon Apr 4 15:36:51 2011 -0400 + + [hb-view] setlocale (LC_ALL, "") + + For now we don't use anything from the locale, but we should default + to using $LANG, etc, if --language is not specified. Right? + + src/hb-view.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit fb9ca1bfabde7da0c274e7a1bd12bffaf7949c18 +Author: Behdad Esfahbod +Date: Mon Apr 4 14:50:09 2011 -0400 + + [hb-view] Rewrite --features parsing, with range support + + The --features parsing handles errors now. More importantly, it + allos limiting individual features to specific byte ranges. The + format is Python-esque. Here is how it all works: + + Syntax: Value: Start: End: + + Setting value: + "kern" 1 0 ∞ # Turn feature on + "+kern" 1 0 ∞ # Turn feature off + "-kern" 0 0 ∞ # Turn feature off + "kern=0" 0 0 ∞ # Turn feature off + "kern=1" 1 0 ∞ # Turn feature on + "kern=2" 2 0 ∞ # Choose 2nd alternate + + Setting index: + "kern[]" 1 0 ∞ # Turn feature on + "kern[:]" 1 0 ∞ # Turn feature on + "kern[5:]" 1 5 ∞ # Turn feature on, partial + "kern[:5]" 1 0 5 # Turn feature on, partial + "kern[3:5]" 1 3 5 # Turn feature on, range + "kern[3]" 1 3 3+1 # Turn feature on, single char + + Mixing it all: + + "kern[3:5]=0" 1 3 5 # Turn feature off for range + + src/hb-view.c | 169 +++++++++++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 132 insertions(+), 37 deletions(-) + +commit ccc6745afaa68ce7497a6cd02ce85986d3c863d0 +Author: Behdad Esfahbod +Date: Mon Apr 4 14:49:50 2011 -0400 + + [hb-view] Use cached hb-ft face creation + + Avoids recreating the face the second time we call draw(). + + src/hb-view.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1b4a2cc095d165dc573e0235f00fbbf2a5d3c2c5 +Author: Behdad Esfahbod +Date: Mon Apr 4 14:45:28 2011 -0400 + + [hb-view] Add --debug + + Frees all allocated memory before exiting. Useful for valgrind run. + + src/hb-view.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit b2da26d1e32a012f7feaad7c7cced61e4fb269f1 +Author: Behdad Esfahbod +Date: Fri Apr 1 15:48:43 2011 -0400 + + [hb-view] Support --features + + Accepts values like: + + --features="-mkmk,aalt=2,calt=1,+cswh" + + A minus sign means "=0", a plus sign means "=1". Default is "=1". + A minus sign overrides an explicit value. + + src/hb-view.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 68 insertions(+), 2 deletions(-) + +commit f48ff19b629070d13cee3c0eeeb06c98992f93c6 +Author: Behdad Esfahbod +Date: Fri Apr 1 14:19:10 2011 -0400 + + Sort options for clarity + + src/hb-view.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 5d91c3d547f78163b36aa7436d4388a836cca94a +Author: Behdad Esfahbod +Date: Wed Mar 16 17:36:32 2011 -0300 + + Add script to/from ISO 15924 tag support + + Also adds --script support to hb-view. + + If a script tag is not known to us, we pass the ISO 15924 tag around. + Right now, the OT layer ignores that, but we can fix it to blindly + convert that to an OT script tag. + + src/hb-ot-tag.c | 4 + + src/hb-unicode.c | 273 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-unicode.h | 8 +- + src/hb-view.c | 10 +- + 4 files changed, 293 insertions(+), 2 deletions(-) + +commit 3286fc0e9adc3f2874c9409e7fdb09e4d2b7dda1 +Author: Behdad Esfahbod +Date: Wed Mar 16 14:53:32 2011 -0300 + + Let hb_shape() guess script and direction... + + - Rename HB_SCRIPT_INVALID_CODE to HB_SCRIPT_INVALID + + - Add HB_DIRECTION_INVALID + + - Make hb_script_get_horizontal_direction() public + + - Make hb_shape() guess script from buffer text (first non-common + non-inherit script) if buffer script is set to HB_SCRIPT_INVALID (this + is NOT the default.) + + - Make hb_shape() guess direction from buffer script if buffer direction + is set to HB_DIRECTION_INVALID (this is NOT the default.) + + - Make hb-view.c set INVALID script and direction on the buffer. + + The above changes are meant to make hb-view fairly useful for uni-script + uni-direction text. The guessing behavior however is NOT the default of + hb_shape() and must be asked for explicitly. This is intended, because + the guess is not a suitable substitute to full-fledged bidi and script + segmentation. It's just a testing tool. + + src/hb-common.h | 3 ++- + src/hb-icu.c | 2 +- + src/hb-ot-shape.cc | 3 ++- + src/hb-shape.cc | 52 ++++++++++++++++++++++++++++++++++++++++++------ + src/hb-unicode-private.h | 4 ---- + src/hb-unicode.c | 2 +- + src/hb-unicode.h | 8 +++++++- + src/hb-view.c | 4 ++-- + 8 files changed, 61 insertions(+), 17 deletions(-) + +commit b7b29684df67af7280b74ca4cf18f02ad6521bdc +Author: Behdad Esfahbod +Date: Wed Mar 2 01:01:03 2011 -0500 + + [hb-view] Handle write_to_png errors + + src/hb-view.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit c2cb98c8185c5560cfd04de7ee7c64c9496b986c +Author: Behdad Esfahbod +Date: Tue Mar 1 23:18:09 2011 -0500 + + [hb-view] Link with -lm + + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b5dd44e24669cd35affcd92788d39ff56cac94db +Author: Behdad Esfahbod +Date: Mon Feb 28 10:13:52 2011 -0800 + + Fix possible overflow + + src/hb-buffer.cc | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit a4b781e93a0bee0549611e129b3564d9804d9090 +Author: Behdad Esfahbod +Date: Wed Feb 23 12:47:56 2011 -0500 + + Default background color shall either be white or transparent + + Definitely not black! + + src/hb-view.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5353bf439c150492708ef9337078cfd73b83627b +Author: Behdad Esfahbod +Date: Tue Feb 22 18:06:19 2011 -0500 + + Add initial hb-view tool + + Currently doesn't handle script or direction. + + configure.ac | 18 +++ + src/Makefile.am | 14 +++ + src/hb-view.c | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 374 insertions(+) + +commit 82438c6ad5f60b6afc75c48cef72e18bef532468 +Author: Bradley Grainger +Date: Tue Feb 15 18:37:29 2011 -0500 + + Fix #pragma message for MSVC. + + __LOC__ was renamed to _HB__LOC__ in cd7555 but the corresponding + change wasn't made in hb-private.h. + + src/hb-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ba9ab8d6d9c863662c4b44ace4a4d89e29e592f2 +Author: Behdad Esfahbod +Date: Mon Jan 10 07:45:41 2011 -0500 + + Fix language extension matching + + src/hb-ot-tag.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a07874300a669ec0ea09a67df2a3ee8b0612d6b9 +Author: Behdad Esfahbod +Date: Mon Jan 10 02:27:49 2011 -0500 + + Don't use the m4/ dir + + We just require people to have libtool, pkg-config, etc installed + when running autogen.sh + + Makefile.am | 2 -- + configure.ac | 1 - + 2 files changed, 3 deletions(-) + +commit 7bbe14bed8a886ea5b293c927c4bf937cbfc6f51 +Author: Behdad Esfahbod +Date: Sun Jan 9 22:29:14 2011 -0500 + + Fix 'make distcheck' + + src/Makefile.am | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 2abe1264a580858bf7803af1701117a462375fb4 +Author: Javier Jardón +Date: Sun Jan 9 22:18:53 2011 -0500 + + Bug 31174 - Update autotools configuration + + Makefile.am | 2 + + autogen.sh | 188 ++++------------------------------------------------------- + configure.ac | 22 +++++-- + 3 files changed, 29 insertions(+), 183 deletions(-) + +commit cc1a8a938b4c13e76b58825a9e1951c4134e634a +Author: Behdad Esfahbod +Date: Thu Jan 6 14:58:52 2011 -0500 + + Fix ChanContext backtrack matching with GPOS + + Reported on mailing list by Keith Stribley and Khaled Hosny. + + src/hb-buffer-private.hh | 5 +++-- + src/hb-buffer.cc | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- + 3 files changed, 7 insertions(+), 6 deletions(-) + +commit 1c3183027fe823cd673866ba29d169b69f8efba1 +Author: Behdad Esfahbod +Date: Thu Jan 6 14:44:14 2011 -0500 + + Remove unused realloc + + We always allocate and grow str and pos together. + + src/hb-buffer.cc | 6 ------ + 1 file changed, 6 deletions(-) + +commit 76691f0240d6de230e9b42280b54e91639464635 +Author: Behdad Esfahbod +Date: Thu Jan 6 14:16:59 2011 -0500 + + Fix ICU detection + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 756f794a1fce701092345a3f9afae039583fb55b +Author: Behdad Esfahbod +Date: Sun Dec 26 20:52:40 2010 -0500 + + Remove Graphite backend + + It was unmaintained and the code has to be replaced to use the new + grphite-ng code base. + + configure.ac | 6 -- + src/Makefile.am | 14 --- + src/hb-graphite.cc | 310 ----------------------------------------------------- + src/hb-graphite.h | 47 -------- + 4 files changed, 377 deletions(-) + +commit f3d9d9879364609502d9d3a3a9f4647adb167d78 +Author: Behdad Esfahbod +Date: Wed Dec 22 01:39:29 2010 -0500 + + Docs + + src/hb-unicode.h | 60 ++++++++++++++++++++++++++++---------------------------- + 1 file changed, 30 insertions(+), 30 deletions(-) + +commit d86a5b3c5752abcc791724035ba4115958e6b5e2 +Author: Behdad Esfahbod +Date: Tue Dec 21 18:36:25 2010 -0500 + + Bug 32274 - classic mongolian shaper + + Add support for classic Mongolian script to the Arabic shaper. + + Still work to be done around U+180E MONGOLIAN VOWEL SEPARATOR as it + should not be included in the final glyph stream the same way that + ZWNJ, etc should not appear in the final glyph stream. + + But the joining part should be done. + + There remains the question of how should the U+18A9 MONGOLIAN LETTER ALI + GALI DAGALGA be handled as it has General Category NSM but a letter + nonetheless. For now, our generic logic makes this a joining T instead + of joining D as other Mongolian letters are. + + src/hb-ot-shape-complex-arabic.cc | 8 ++++++++ + src/hb-ot-shape-complex-private.hh | 1 + + 2 files changed, 9 insertions(+) + +commit b0e7378fa9a4fc6fc74d9b3c27d927602eaacc5b +Author: Behdad Esfahbod +Date: Tue Dec 21 14:19:32 2010 -0500 + + Reroute Mandaic shaping through the Arabic shaper + + We added Mandaic joining data to the Arabic shaper a while ago, but + were not actually using the Arabic shaper for Mandaic. Fixed. + + src/hb-ot-shape-complex-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 88e7f37488e4e8590619d815b975232a0c9d2ea0 +Author: Behdad Esfahbod +Date: Tue Dec 21 14:18:24 2010 -0500 + + Annotate the Arabic joining table with block information + + src/gen-arabic-joining-table.py | 93 +++++++++++++++++++++------------- + src/hb-ot-shape-complex-arabic-table.h | 24 +++++++-- + 2 files changed, 80 insertions(+), 37 deletions(-) + +commit 1482a39e56cd4151874e5c073540274349240a87 +Author: Behdad Esfahbod +Date: Fri Dec 17 20:15:05 2010 -0500 + + Rename remaining metrics uses to extents + + src/hb-font.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 22c537657cee1f47a4056a21e2cddfcbe6ab1c01 +Author: Behdad Esfahbod +Date: Tue Dec 14 23:51:29 2010 -0500 + + Rename TableDirectory to TableRecord as per OpenType 1.6 + + src/hb-open-file-private.hh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 33e8b86197239e667a887709104357bdc6566b7c +Author: Behdad Esfahbod +Date: Mon Dec 13 15:54:56 2010 -0500 + + Update 'head' table to OpenType 1.6 + + src/hb-ot-head-private.hh | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit b7683335146bfe3a74d9419db92cd7a8019a9c10 +Author: Behdad Esfahbod +Date: Mon Dec 13 14:22:35 2010 -0500 + + Disallow ligature substitutions replacing one glyph + + src/hb-ot-layout-gsub-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7eb875118dc31e9fb0e23c45985396a8bfe977e3 +Author: Behdad Esfahbod +Date: Mon Dec 13 14:13:35 2010 -0500 + + Mozilla Bug 618592 - freeze on typekit + + Fix apply_lookup() for zero-input broken fonts. + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bbbbe80ec9bc45c5b685bc09c8f993e98496555c +Author: Behdad Esfahbod +Date: Tue Dec 7 16:22:02 2010 -0500 + + Rename original_direction to target_direction + + src/hb-ot-shape-private.hh | 2 +- + src/hb-ot-shape.cc | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit ee8aaf976a6eb42be49b63b4c51c7a0a338e0298 +Author: Behdad Esfahbod +Date: Tue Dec 7 16:20:42 2010 -0500 + + Fix arabic shaping of LTR text + + We should ensure-direction before doing any complex work. The only + exception is mirroring that needs to see the original / final direction, + not the native. Handle that. + + src/hb-ot-shape.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit d1f1707adc03317760b0f75e04d0f3dd425e547f +Author: Behdad Esfahbod +Date: Tue Nov 30 00:57:15 2010 -0500 + + Bug 31965 - some GNU/Linux distributions lack icu.pc but have icu-config + + Patch from suzuki toshiya. + + configure.ac | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit 3c48982be6b2286088541ee55cac78b0f2b6e771 +Author: Behdad Esfahbod +Date: Sun Nov 28 19:39:47 2010 -0500 + + Adjust pyx files to reflect change from int to hb_var_int_t + + Patch from Thomas Hunger. + + contrib/python/lib/harfbuzz.pyx | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 4f9e4a40bc248aeb1364ed6f4aa7f392aa364497 +Author: Behdad Esfahbod +Date: Mon Nov 22 11:30:32 2010 -0500 + + Fix failing checks + + src/hb-ot-shape-complex-arabic-table.h | 37 ++++++++++++++++++++++++++++++++++ + 1 file changed, 37 insertions(+) + +commit 9da26d6669e7f3b91ba37e71f6f8a6e2ea806688 +Author: Behdad Esfahbod +Date: Mon Nov 22 11:03:18 2010 -0500 + + Remove email address from Copyright headers + + COPYING | 2 +- + src/hb-ft.c | 2 +- + src/hb-icu.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit a45f00019242734fca742adeb2ed507305baeda6 +Author: Behdad Esfahbod +Date: Thu Nov 18 13:58:32 2010 -0500 + + Clarify copyright notice + + COPYING | 12 ++++++++++++ + README | 4 ++-- + src/hb-graphite.cc | 4 ++-- + src/hb-object-private.h | 2 +- + 4 files changed, 17 insertions(+), 5 deletions(-) + +commit 0884a8d9cd576f116400b3f7c8815e747c315d5e +Author: Behdad Esfahbod +Date: Wed Nov 17 16:58:21 2010 -0500 + + Move generated table to its own file + + src/Makefile.am | 1 + + src/hb-ot-shape-complex-arabic-table.h | 619 ++++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-arabic.cc | 621 +-------------------------------- + 3 files changed, 621 insertions(+), 620 deletions(-) + +commit 14d784116b08685425e4ddcb1c1f813dbe2b2986 +Author: Behdad Esfahbod +Date: Wed Nov 17 16:52:58 2010 -0500 + + Update Arabic joining table to include Mandaic + + Mandaic was added to Unicode 6.0, but the joining data was not updated. + Draft ArabicShaping.txt from 6.1 includes the joining data for Mandaic. + Use that. + + src/gen-arabic-joining-table.py | 45 ++++++++++---- + src/hb-ot-shape-complex-arabic.cc | 123 ++++++++++++++++++++++++++++++++------ + 2 files changed, 137 insertions(+), 31 deletions(-) + +commit 43bf2f7f1ec427c431e2ee2fd1a9345e7d5c9718 +Author: Behdad Esfahbod +Date: Wed Nov 17 14:49:40 2010 -0500 + + Add OpenType script tags for Unicode 5.2 and Unicode 6.0 scripts + + Based on tags proposed by Microsoft for inclusion in OpenType. + + src/hb-ot-tag.c | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +commit afab01cf7caca79cf6dfabe6827d1703be1a74f7 +Author: Behdad Esfahbod +Date: Wed Nov 17 14:35:34 2010 -0500 + + Add Unicode 6.0 scripts + + src/hb-icu.c | 6 ++++++ + src/hb-ot-tag.c | 7 ++++++- + src/hb-unicode.c | 7 ++++++- + src/hb-unicode.h | 7 ++++++- + 4 files changed, 24 insertions(+), 3 deletions(-) + +commit f234b68d18d956f7e4eb4bf58d6dc408d9e5146e +Author: Behdad Esfahbod +Date: Wed Nov 17 14:25:44 2010 -0500 + + Change HB_SCRIPT_MEITEI_MAYEK to HB_SCRIPT_MEETEI_MAYEK + + The new name matches the Unicode name. Reported by Jonathan Kew. + + src/hb-icu.c | 2 +- + src/hb-ot-tag.c | 2 +- + src/hb-unicode.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 3ca9a6d1cffe950b325e1d522b20d4a645ae448e +Author: Behdad Esfahbod +Date: Wed Nov 17 13:08:47 2010 -0500 + + Add TODO item + + TODO | 3 +++ + 1 file changed, 3 insertions(+) + +commit 300cb41417d40473268e3b4089bed24e9e77a753 +Author: Behdad Esfahbod +Date: Wed Nov 17 12:57:23 2010 -0500 + + Add XXX marks + + src/hb-ot-layout-gsubgpos-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit ea00aee9f94ae8c6cf03d620254817d5e1f51d64 +Author: Behdad Esfahbod +Date: Fri Nov 5 10:51:37 2010 -0400 + + Add TODO item + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 3a852ae7fe6edfaadd75625d27515a3689503395 +Author: Behdad Esfahbod +Date: Wed Nov 3 16:37:24 2010 -0400 + + Save general category and combining class in the buffer for reuse + + src/hb-ot-layout-private.hh | 3 ++- + src/hb-ot-shape-complex-arabic.cc | 16 ++++++++++------ + src/hb-ot-shape-private.hh | 6 ++++++ + src/hb-ot-shape.cc | 26 +++++++++++++++++++++----- + 4 files changed, 39 insertions(+), 12 deletions(-) + +commit a5ab682b9ba8224fc132624f93e6fef9973a68ca +Author: Behdad Esfahbod +Date: Wed Nov 3 15:50:36 2010 -0400 + + More "unreached code" warning fixes + + Ugly :(. + + src/hb-blob.c | 48 ++++++++++++++++++++++++------------------------ + 1 file changed, 24 insertions(+), 24 deletions(-) + +commit 4e22c7e94102c9f00c32b8cb6aaa832f83909149 +Author: Behdad Esfahbod +Date: Wed Nov 3 15:47:12 2010 -0400 + + Add comment + + src/hb-ot-layout-common-private.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit 0342034d1cb577d34b42f7204da7fb930c12a464 +Author: Behdad Esfahbod +Date: Wed Nov 3 15:40:07 2010 -0400 + + Pedantic + + src/hb-ot-layout-gpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4a2d844c2f12dc1b858ab4ddd737ded7c0852221 +Author: Behdad Esfahbod +Date: Wed Nov 3 15:28:56 2010 -0400 + + Minor code shuffling + + src/hb-ot-layout-private.hh | 21 +++------------- + src/hb-ot-layout.cc | 61 +++++++++++++++++++++++++++++++++------------ + 2 files changed, 48 insertions(+), 34 deletions(-) + +commit 11e3ec444a85fc72541823c2e98cc92c4ceb19af +Author: Behdad Esfahbod +Date: Wed Nov 3 15:11:04 2010 -0400 + + Fix a few more "unreachable code" warnings + + src/hb-blob.c | 2 +- + src/hb-object-private.h | 12 +++--- + src/hb-open-type-private.hh | 84 +++++++++++++++++------------------- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-private.h | 3 +- + 5 files changed, 49 insertions(+), 54 deletions(-) + +commit 2304856340782c72cb30873f7907191dc359e921 +Author: Behdad Esfahbod +Date: Wed Nov 3 12:46:58 2010 -0400 + + Remove another couple lines of dead code + + src/hb-ot-layout-gsubgpos-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit b8783c85ac5dd9ea8f5a66eacb92dfcfbf649a6d +Author: Behdad Esfahbod +Date: Wed Nov 3 11:50:21 2010 -0400 + + Fix unreachable-code warning + + src/hb-ot-layout-gpos-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit c2709119c8c610a0d4d71884a7d4fdba7cb65b72 +Author: Behdad Esfahbod +Date: Wed Oct 27 23:18:51 2010 -0400 + + Move things around some more + + src/hb-ot-layout-gpos-private.hh | 8 ++++---- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 9 +++++++-- + src/hb-ot-layout-private.hh | 7 +++---- + src/hb-ot-layout.cc | 6 +++--- + 5 files changed, 19 insertions(+), 15 deletions(-) + +commit 194d4566ec054db03fa31d369a9f1c6cf4941e74 +Author: Behdad Esfahbod +Date: Wed Oct 27 23:09:10 2010 -0400 + + Move buffer var allocation local + + src/hb-ot-layout-gpos-private.hh | 19 ++++++++++++++----- + src/hb-ot-layout-private.hh | 2 -- + 2 files changed, 14 insertions(+), 7 deletions(-) + +commit 1e7c1fcbc33599faefc32d4a28e5d8506d2c56fa +Author: Behdad Esfahbod +Date: Wed Oct 27 22:48:31 2010 -0400 + + Move code around + + src/hb-ot-layout-gpos-private.hh | 59 ++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout.cc | 59 ++-------------------------------------- + src/hb-ot-layout.h | 4 +-- + src/hb-ot-shape.cc | 2 +- + 4 files changed, 63 insertions(+), 61 deletions(-) + +commit bf94b3ad22b2fe4730d4e64d673c63154fc5b5fe +Author: Behdad Esfahbod +Date: Wed Oct 27 22:37:59 2010 -0400 + + Move some more code around + + src/hb-ot-layout-gdef-private.hh | 21 +++++++++++++++ + src/hb-ot-layout-private.hh | 27 ++++++++++++++++--- + src/hb-ot-layout.cc | 56 ++++++---------------------------------- + 3 files changed, 52 insertions(+), 52 deletions(-) + +commit 6334658fe79d6acfb46a2a147721b78f92510ebb +Author: Behdad Esfahbod +Date: Wed Oct 27 22:11:32 2010 -0400 + + Simplify mark skipping logic + + src/hb-ot-layout.cc | 17 +++-------------- + 1 file changed, 3 insertions(+), 14 deletions(-) + +commit 8c69e65abed961002d90024c92e18538c6516262 +Author: Behdad Esfahbod +Date: Wed Oct 27 22:07:49 2010 -0400 + + Rename lookup_flags to lookup_props since it's more than just flags + + src/hb-ot-layout-common-private.hh | 6 +++++- + src/hb-ot-layout-gpos-private.hh | 14 +++++++------- + src/hb-ot-layout-gsub-private.hh | 8 ++++---- + src/hb-ot-layout-gsubgpos-private.hh | 10 +++++----- + src/hb-ot-layout-private.hh | 4 ++-- + src/hb-ot-layout.cc | 36 ++++++++++++++++++------------------ + src/main.cc | 4 ++-- + 7 files changed, 43 insertions(+), 39 deletions(-) + +commit 98370e89d1bff248737b482d129c2a4deb8bfd95 +Author: Behdad Esfahbod +Date: Wed Oct 27 17:39:01 2010 -0400 + + WIP removing external synthesized GDEF support and implementing it internally + + TODO | 2 - + src/hb-buffer-private.hh | 4 - + src/hb-buffer.cc | 3 - + src/hb-ot-layout-common-private.hh | 8 +- + src/hb-ot-layout-gdef-private.hh | 6 +- + src/hb-ot-layout-gpos-private.hh | 4 +- + src/hb-ot-layout-gsub-private.hh | 66 ++++++----------- + src/hb-ot-layout-gsubgpos-private.hh | 29 +++++++- + src/hb-ot-layout-private.hh | 29 +++----- + src/hb-ot-layout.cc | 138 +++++------------------------------ + src/hb-ot-layout.h | 26 ------- + src/hb-ot-shape.cc | 10 +++ + 12 files changed, 98 insertions(+), 227 deletions(-) + +commit 870e2d6eac01d004c72a925ea93e6823251d5fa2 +Author: Behdad Esfahbod +Date: Wed Oct 27 17:37:20 2010 -0400 + + Remove unused function + + src/hb-buffer-private.hh | 10 ---------- + src/hb-buffer.cc | 27 --------------------------- + 2 files changed, 37 deletions(-) + +commit 1115890b90709fa5329a55d22f543020f3df9f6f +Author: Behdad Esfahbod +Date: Wed Oct 27 17:07:04 2010 -0400 + + More cleanup + + src/hb-buffer-private.hh | 5 +---- + src/hb-ot-layout-private.hh | 6 ++++++ + 2 files changed, 7 insertions(+), 4 deletions(-) + +commit dbf56b1d94910f04823e53e39ace1e5145bddc04 +Author: Behdad Esfahbod +Date: Wed Oct 27 17:06:12 2010 -0400 + + More lig-id cleanup + + src/hb-buffer-private.hh | 4 ++-- + src/hb-buffer.cc | 2 +- + src/hb-ot-layout-gsub-private.hh | 8 +++++++- + 3 files changed, 10 insertions(+), 4 deletions(-) + +commit f6a23a0b9171958f76c1d0473b09fc08d2b3a0d0 +Author: Behdad Esfahbod +Date: Wed Oct 27 17:01:03 2010 -0400 + + More removal of lig-id code from buffer + + src/hb-buffer.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit dd2ffd282c059194fd87fb1664e2e0cdb56a87a0 +Author: Behdad Esfahbod +Date: Wed Oct 27 16:57:01 2010 -0400 + + Minor renaming + + src/hb-buffer-private.hh | 41 ++++++++++++++++++++-------------------- + src/hb-buffer.cc | 20 ++++++++++---------- + src/hb-ot-layout-gsub-private.hh | 8 ++++---- + src/hb-ot-shape.cc | 6 +++--- + 4 files changed, 37 insertions(+), 38 deletions(-) + +commit fe263272a2b26204bc39829a94d90ab537517f3f +Author: Behdad Esfahbod +Date: Wed Oct 27 16:51:02 2010 -0400 + + Move setting lig_id/component out of buffer and to the gsub code + + src/hb-buffer-private.hh | 30 +++++++---------------- + src/hb-buffer.cc | 52 +++++++--------------------------------- + src/hb-ot-layout-gsub-private.hh | 27 ++++++++++++--------- + 3 files changed, 34 insertions(+), 75 deletions(-) + +commit 2e2b2480c01c788ea702d78ca830c2bb659654a8 +Author: Behdad Esfahbod +Date: Wed Oct 27 16:25:28 2010 -0400 + + Always allocate new ligature id + + No practical point in reusing ligature ids. + + src/hb-ot-layout-gsub-private.hh | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit bf07d5a29c61baf6fd683289c7764f487ad7e413 +Author: Behdad Esfahbod +Date: Wed Oct 27 16:19:13 2010 -0400 + + Set component=0 for ligature glyph + + src/hb-ot-layout-gsub-private.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 37ab877149582c7ce7416425bb402340e3f948a2 +Author: Behdad Esfahbod +Date: Wed Oct 27 15:38:06 2010 -0400 + + Remove comment + + src/hb-buffer.cc | 20 -------------------- + 1 file changed, 20 deletions(-) + +commit 88474c6fdaf35c56368694a5b164f4988a004d49 +Author: Behdad Esfahbod +Date: Wed Oct 27 14:42:15 2010 -0400 + + Get rid of the OpenType-specific internal buffer representation + + Add variant integers to buffer item types. More cleanup coming. + + TODO | 2 -- + src/hb-buffer-private.hh | 35 ++++++---------------- + src/hb-buffer.cc | 62 +++++++++++++++++++-------------------- + src/hb-buffer.h | 2 +- + src/hb-ot-layout-gpos-private.hh | 24 +++++++-------- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-private.hh | 4 +-- + src/hb-ot-layout.cc | 39 ++++++++++++------------ + src/hb-ot-shape-complex-arabic.cc | 8 ++--- + 9 files changed, 79 insertions(+), 99 deletions(-) + +commit 6cb8c3493019e1497921666fc268cb81943f9f1f +Author: Behdad Esfahbod +Date: Wed Oct 27 14:27:03 2010 -0400 + + Add hb_var_int_t + + src/hb-buffer.h | 6 +++--- + src/hb-common.h | 10 ++++++++++ + 2 files changed, 13 insertions(+), 3 deletions(-) + +commit f22802431a983bd4bc60a7653b1103973c3475cb +Author: Behdad Esfahbod +Date: Tue Nov 2 19:12:37 2010 -0400 + + Remove trailing comma + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 13528d0c78cadb1f67267c9a692558caef9fdaa6 +Author: Behdad Esfahbod +Date: Wed Oct 27 14:09:27 2010 -0400 + + Supposedly implement vertical support in GPOS + + Not tested at all. + + src/hb-ot-layout-gpos-private.hh | 27 ++++++++++++++++++++------- + src/hb-ot-layout.cc | 39 ++++++++++++++++++++++++--------------- + 2 files changed, 44 insertions(+), 22 deletions(-) + +commit 9624de5b496846cd89ee4f7b07d38029aca70ce1 +Author: Behdad Esfahbod +Date: Wed Oct 27 13:44:59 2010 -0400 + + Clarify cursive_chain (and change its sign) + + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout.cc | 13 +++++++------ + 2 files changed, 9 insertions(+), 8 deletions(-) + +commit d6c9eadb88240c40b3cb9a33f067e575cbc2f729 +Author: Behdad Esfahbod +Date: Wed Oct 27 12:34:50 2010 -0400 + + Remove more pointless LONGTERMTODO items + + src/hb-ot-layout-common-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit e204674fe340a57c48a9fe7e1ed02a9a08f4aca4 +Author: Behdad Esfahbod +Date: Wed Oct 27 12:32:02 2010 -0400 + + Rename hb_ot_layout_get_lig_carets() to hb_ot_layout_get_ligature_carets() + + src/hb-ot-layout.cc | 14 +++++++------- + src/hb-ot-layout.h | 14 +++++++------- + 2 files changed, 14 insertions(+), 14 deletions(-) + +commit 3357d145f81cb7b746c910018fe3a0dfab00972c +Author: Behdad Esfahbod +Date: Wed Oct 27 12:30:46 2010 -0400 + + Implement vertical support in get_lig_carets() + + src/hb-ot-layout-gdef-private.hh | 34 ++++++++++++++++++---------------- + src/hb-ot-layout.cc | 3 ++- + src/hb-ot-layout.h | 1 + + 3 files changed, 21 insertions(+), 17 deletions(-) + +commit 8eeed7eddc789151cbffe62ed6bfd77612266bf1 +Author: Behdad Esfahbod +Date: Wed Oct 27 12:07:49 2010 -0400 + + Remove LONGTERMTODO item that I'll never fix + + src/hb-ot-layout-gsubgpos-private.hh | 6 ------ + 1 file changed, 6 deletions(-) + +commit 184a5279c64f37bc2ceefbe2191bb64ca87f88d8 +Author: Behdad Esfahbod +Date: Wed Oct 27 12:00:49 2010 -0400 + + Remove unused macro + + src/hb-ot-layout-gpos-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit af5d02a269d55331300df1e382241893928d64e0 +Author: Behdad Esfahbod +Date: Wed Oct 27 11:54:26 2010 -0400 + + Rewrite Cursive joining to act more like other pair lookups + + Look forward for next character instead of joining to the last character. + + src/hb-ot-layout-gpos-private.hh | 71 ++++++++++++++++++---------------------- + src/hb-ot-layout-private.hh | 10 ------ + 2 files changed, 31 insertions(+), 50 deletions(-) + +commit ea22c749c7371cf66ca44f0bfe7030aef1926edd +Author: Behdad Esfahbod +Date: Wed Oct 27 11:09:48 2010 -0400 + + Fix Cursive positioning + + Test case: "مرا" rendered using IranNastaliq. + + src/hb-ot-layout-gpos-private.hh | 124 +-------------------------------------- + 1 file changed, 3 insertions(+), 121 deletions(-) + +commit aefdb64689aab19df76590a36c4a04052a8bffdb +Author: Behdad Esfahbod +Date: Wed Oct 27 10:40:39 2010 -0400 + + Fix segfault with Arabic combining marks + + src/hb-ot-shape-complex-arabic.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 12b2d09a87adc1e1aac089cd2e09a68fb7129829 +Author: Behdad Esfahbod +Date: Wed Oct 27 01:28:28 2010 -0400 + + Remove obsolete TODO item + + We don't cache any metrics internally, so the correct way to add more + glyph metrics items is to add new callbacks for them. We already have + separeate callbacks for advance vs extents. + + TODO | 2 -- + 1 file changed, 2 deletions(-) + +commit 248e3c2ba47889c247959e44166644872aed59ba +Author: Behdad Esfahbod +Date: Wed Oct 27 01:23:14 2010 -0400 + + Oops, remove extra mask setting that broke complex shaping + + src/hb-ot-shape.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 502f4cba3e0bcd625d31f8fd295b8b18e2d02a5a +Author: Behdad Esfahbod +Date: Wed Oct 27 01:13:56 2010 -0400 + + Divide get_metrics into get_advance and get_extents + + Graphite module not updated. + Bump version to 0.3. + + configure.ac | 2 +- + src/hb-font-private.h | 3 +- + src/hb-font.cc | 96 +++++++++++++++++++++++++++++++++++---------------- + src/hb-font.h | 61 ++++++++++++++++++++------------ + src/hb-ft.c | 72 +++++++++++++++++++++++--------------- + src/hb-ot-shape.cc | 7 ++-- + 6 files changed, 154 insertions(+), 87 deletions(-) + +commit ec6c0e54d322d58cbc835feb58dcec7ede6ab744 +Author: Behdad Esfahbod +Date: Tue Oct 26 11:28:14 2010 -0400 + + Fix blob leak + + src/hb-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bd7378b2ef9793de4e7f57b920f29f48ac9d0c25 +Author: Behdad Esfahbod +Date: Wed Oct 13 18:33:16 2010 -0400 + + Massage mask setting a bit more + + Still finding the exact correct way the masks should be set. + + src/hb-buffer-private.hh | 19 ++++++++++++++++--- + src/hb-buffer.cc | 9 +++++++++ + src/hb-ot-shape.cc | 6 ++++-- + 3 files changed, 29 insertions(+), 5 deletions(-) + +commit 961f9baa7bc3556f1e4e7135859cebe1351f73a4 +Author: Behdad Esfahbod +Date: Wed Oct 13 17:17:00 2010 -0400 + + Oops, actually set global mask + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 39dede9ffffe732f78cbd092ccb3b48d77ddd66d +Author: Behdad Esfahbod +Date: Wed Oct 13 15:54:06 2010 -0400 + + Make sure boolean features always use value=1 + + Previously boolean features turned on the entire feature mask. This is + wrong if feature is Alternate and user has provided values bigger than one. + Though, I don't think other engines support such corner cases. + + src/hb-ot-map-private.hh | 10 ++++++++-- + src/hb-ot-map.cc | 3 ++- + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape.cc | 2 +- + 4 files changed, 12 insertions(+), 5 deletions(-) + +commit 3506b2e78db27e7835bd2c09c053a9807c9cac40 +Author: Behdad Esfahbod +Date: Wed Oct 13 15:38:52 2010 -0400 + + Return early if mask is 0 + + src/hb-buffer.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 5c1c8c9c50ddbe66ea595afb245a208b7775b27c +Author: Behdad Esfahbod +Date: Wed Oct 13 15:36:38 2010 -0400 + + Make sure feature values don't leak out of their mask + + src/hb-buffer.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 852912fc2db06b6183a2dc87c45ec1b563063572 +Author: Behdad Esfahbod +Date: Wed Oct 13 15:34:50 2010 -0400 + + Fix applying default-value for features + + Previously if a default global feature was overrided by a non-global + user feature, we were not setting any default mask for the feature, + essentially disabling the feature by default. Fix that. + + TODO | 2 -- + src/hb-ot-map-private.hh | 10 ++++++---- + src/hb-ot-map.cc | 13 +++++++------ + 3 files changed, 13 insertions(+), 12 deletions(-) + +commit 2989be4919242670c94825bded96db20a7b2035b +Author: Behdad Esfahbod +Date: Wed Oct 13 15:18:29 2010 -0400 + + Set user masks after complex masks + + src/hb-ot-shape.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a7820b7b15a809b4a1a4077147ceed7bea528483 +Author: Behdad Esfahbod +Date: Wed Oct 13 14:20:48 2010 -0400 + + Add TODO item + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 04a3023a66203d94b77f2d7a8d6bcdedf067e155 +Author: Behdad Esfahbod +Date: Wed Oct 13 10:57:27 2010 -0400 + + Cleanup TODO + + Looks like a roadmap now. + + TODO | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 59 insertions(+), 13 deletions(-) + +commit 3111b8a0d5b38da57c0f6285aec2b92eb690188f +Author: Behdad Esfahbod +Date: Wed Oct 13 10:41:53 2010 -0400 + + Fix stupid bug, oops + + src/hb-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3703f88b74707113e782eb6ca9a77603561760d0 +Author: Behdad Esfahbod +Date: Tue Oct 12 18:34:20 2010 -0400 + + Step the version up to 0.2 now that Arabic shaper is in + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 758f68b860b44b5a04eb3dde5cb40b1b04cf634a +Author: Behdad Esfahbod +Date: Tue Oct 12 17:37:44 2010 -0400 + + Fix Arabic shaper + + It's tested now. It works! + + src/hb-ot-shape-complex-arabic.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 13403bc67a01e0d4908fb964093fd02ddd11c580 +Author: Behdad Esfahbod +Date: Tue Oct 12 17:23:54 2010 -0400 + + Hookup Arabic shaper! + + Not tested yet. + + src/hb-ot-shape-complex-arabic.cc | 6 +++--- + src/hb-ot-shape-complex-private.hh | 37 ++++++++++++++++++++++--------------- + src/hb-ot-shape-private.hh | 14 +++++++++++++- + src/hb-ot-shape.cc | 3 ++- + 4 files changed, 40 insertions(+), 20 deletions(-) + +commit 57ac0ecb7843533b2e6e6d6c8a12b2a44437cc1c +Author: Behdad Esfahbod +Date: Tue Oct 12 17:07:02 2010 -0400 + + Merge clearing masks and setting global masks + + src/hb-buffer-private.hh | 11 ++++++----- + src/hb-buffer.cc | 5 +++-- + src/hb-ot-map.cc | 2 +- + src/hb-ot-shape.cc | 7 ++----- + 4 files changed, 12 insertions(+), 13 deletions(-) + +commit fc96596b7c1c4e62491e951a3c256fb00dcde550 +Author: Behdad Esfahbod +Date: Tue Oct 12 17:00:25 2010 -0400 + + Form clusters before setting masks + + src/hb-ot-shape.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1e80782244cdb1dedae9d1e61079d0508e57ca72 +Author: Behdad Esfahbod +Date: Tue Oct 12 17:00:07 2010 -0400 + + Clear masks before setting them up, not after! + + src/hb-ot-shape.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit fd3d32d31cb6d74a9994b6850d539fd0b707d941 +Author: Behdad Esfahbod +Date: Tue Oct 12 16:57:47 2010 -0400 + + Add hb_ot_shape_execute() + + Not public yet. + + src/hb-ot-shape-private.hh | 5 ++--- + src/hb-ot-shape.cc | 19 ++++++++++++++----- + 2 files changed, 16 insertions(+), 8 deletions(-) + +commit 49baa1f69efb0e3c62e45bd59dd88459a84bf390 +Author: Behdad Esfahbod +Date: Tue Oct 12 16:50:36 2010 -0400 + + Add hb_ot_complex_shaper_t stuff and start hooking Arabic shaper up + + src/Makefile.am | 3 +- + src/hb-ot-map-private.hh | 2 +- + src/hb-ot-map.cc | 2 +- + ...ape-arabic.cc => hb-ot-shape-complex-arabic.cc} | 9 +++ + src/hb-ot-shape-complex-private.hh | 88 ++++++++++++++++++++++ + src/hb-ot-shape-private.hh | 12 +-- + src/hb-ot-shape.cc | 8 +- + 7 files changed, 107 insertions(+), 17 deletions(-) + +commit 605ed468f380f86d642031f6451447d270cb6de1 +Author: Behdad Esfahbod +Date: Tue Oct 12 16:19:29 2010 -0400 + + Add hb_ot_shape_plan_t + + This is the object that a separate plan/execute shaping API will use in + between the two stages. + + src/hb-ot-shape-private.hh | 12 ++++++++++-- + src/hb-ot-shape.cc | 38 ++++++++++++++++++-------------------- + 2 files changed, 28 insertions(+), 22 deletions(-) + +commit 895fb5d364e7ae5d9d2e34b9f68b8651804369ef +Author: Behdad Esfahbod +Date: Tue Oct 12 16:00:21 2010 -0400 + + Refactor, in a different direction + + src/hb-ot-map-private.hh | 15 ++++++++------- + src/hb-ot-map.cc | 23 ++++++++++++----------- + src/hb-ot-shape-private.hh | 13 +------------ + src/hb-ot-shape.cc | 33 +++++++++++++++++---------------- + 4 files changed, 38 insertions(+), 46 deletions(-) + +commit d2ba016ca1ba7489537768b619980d5159b5870c +Author: Behdad Esfahbod +Date: Tue Oct 12 15:35:45 2010 -0400 + + More refactoring + + src/hb-ot-map-private.hh | 32 +++++--------------------------- + src/hb-ot-map.cc | 32 +++++++++++++++++++++++++++++--- + src/hb-ot-shape-private.hh | 16 ++++++++++++++-- + src/hb-ot-shape.cc | 43 ++++++++++++++++++++++++++++--------------- + src/hb-ot-shape.h | 10 +++++----- + 5 files changed, 81 insertions(+), 52 deletions(-) + +commit 66e487dfbfdccd0c4be8cd11661d412ca27c3425 +Author: Behdad Esfahbod +Date: Tue Oct 12 13:51:19 2010 -0400 + + Update Arabic shaping table to Unicode 6.0.0. + + src/hb-ot-shape-arabic.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit f4792d99eee0e8cd72b7cb01c96a09f16e2a72ce +Author: Behdad Esfahbod +Date: Tue Oct 12 12:32:18 2010 -0400 + + Fix infinite loop! + + Untested code is indeed buggy code. + + Mozilla bug #603352. + + src/hb-ot-tag.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 993d1e786a32612b796dae8309ce402a4121bec7 +Author: Behdad Esfahbod +Date: Tue Oct 12 11:17:30 2010 -0400 + + Fix missing negation in unreachable code! + + Mozilla bug #603346 + + src/hb-open-type-private.hh | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 52601275d5e4000dada4f925fb78723eeeee7bd4 +Author: Behdad Esfahbod +Date: Fri Oct 8 20:38:46 2010 -0400 + + More separation + + src/hb-ot-shape.cc | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +commit 6b7e6758626268ba1c7c266128e618ec73ae2c0f +Author: Behdad Esfahbod +Date: Fri Oct 8 20:30:04 2010 -0400 + + Minor + + src/hb-ot-shape.cc | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit aa9c450bb2d7c3c9e36ea32e3558250391a0582d +Author: Behdad Esfahbod +Date: Fri Oct 8 20:27:38 2010 -0400 + + Enable 'rtlm' mirroring + + src/hb-ot-map-private.hh | 9 +++++---- + src/hb-ot-shape.cc | 30 +++++++++++++++--------------- + 2 files changed, 20 insertions(+), 19 deletions(-) + +commit 36925f695d349a53d52ecc3a58f18240a6977463 +Author: Behdad Esfahbod +Date: Fri Oct 8 20:20:32 2010 -0400 + + Rename hb_mask_allocator_t to hb_ot_map_t + + hb_ot_plan_t may be a better name, donno. + + src/hb-ot-map-private.hh | 4 ++-- + src/hb-ot-map.cc | 2 +- + src/hb-ot-shape-private.hh | 4 ++-- + src/hb-ot-shape.cc | 49 +++++++++++++++++++++------------------------- + 4 files changed, 27 insertions(+), 32 deletions(-) + +commit f5dd3be46b5c77a2c5b97b82a0b67ac9e851b898 +Author: Behdad Esfahbod +Date: Fri Oct 8 20:16:23 2010 -0400 + + Improve checks + + src/check-c-linkage-decls.sh | 2 +- + src/check-header-guards.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 5a2b0b3878cd9c62121bb4fd6344e102a9ee1825 +Author: Behdad Esfahbod +Date: Fri Oct 8 20:14:57 2010 -0400 + + Add hb-ot-map.cc + + src/Makefile.am | 1 + + src/hb-ot-map-private.hh | 129 +----------------------------------- + src/hb-ot-map.cc | 165 +++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 168 insertions(+), 127 deletions(-) + +commit ecc4550ed7bc900a61081edfbcd0ad09cbf29b36 +Author: Behdad Esfahbod +Date: Fri Oct 8 20:05:29 2010 -0400 + + Fix feature overriding + + src/hb-ot-map-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8f08c3275040870a645ef034a38d30c05c619f21 +Author: Behdad Esfahbod +Date: Fri Oct 8 19:43:48 2010 -0400 + + Minor cleanup + + src/hb-open-type-private.hh | 8 ++---- + src/hb-ot-map-private.hh | 61 +++++++++++++-------------------------------- + src/hb-ot-tag.c | 11 ++++---- + src/hb-private.h | 4 +++ + 4 files changed, 28 insertions(+), 56 deletions(-) + +commit a806762a314e83154793d96ee665e6668d6b56de +Author: Behdad Esfahbod +Date: Fri Oct 8 19:18:40 2010 -0400 + + Add hb-ot-shape-private.hh + + src/Makefile.am | 1 + + src/hb-ot-shape-arabic.cc | 2 +- + src/hb-ot-shape-private.hh | 60 ++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 62 insertions(+), 1 deletion(-) + +commit 4924affe0f0adf75f2a0e2137a71206b0576d63f +Author: Behdad Esfahbod +Date: Fri Oct 8 19:18:16 2010 -0400 + + Add hb-ot-map-private.hh + + src/Makefile.am | 1 + + src/hb-ot-map-private.hh | 307 +++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-shape.cc | 274 ++---------------------------------------- + 3 files changed, 315 insertions(+), 267 deletions(-) + +commit a7c5046d6b676a32298b97403a49235f7f255161 +Author: Behdad Esfahbod +Date: Fri Oct 8 18:47:47 2010 -0400 + + Add private hb_segment_properties_t + + src/hb-buffer-private.hh | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit b897c607d91d569f4eaa681d1f5b3d9f3d2bb093 +Author: Behdad Esfahbod +Date: Fri Oct 8 18:41:57 2010 -0400 + + Flip the OT bit-allocation vs gsub/gpos inside-out + + We now build our entire attack plan before jumping in. + + src/hb-ot-shape.cc | 333 ++++++++++++++++++++++++++++------------------------- + 1 file changed, 176 insertions(+), 157 deletions(-) + +commit e89b7d2a61b7f58e6c7cec00d5ce2246dee1e8a1 +Author: Behdad Esfahbod +Date: Fri Oct 8 12:29:59 2010 -0400 + + Logically separate feature collection + + src/hb-ot-shape.cc | 29 ++++++++++++++++++----------- + 1 file changed, 18 insertions(+), 11 deletions(-) + +commit 5b88908f12ad1d828dd6075fb8fc0036c2d6af3a +Author: Behdad Esfahbod +Date: Fri Oct 8 12:23:01 2010 -0400 + + Minor + + src/hb-ot-shape.cc | 18 ++++++------------ + 1 file changed, 6 insertions(+), 12 deletions(-) + +commit 5360ce0c5c33f921b3f9ad3f42529a19df5ad0fe +Author: Behdad Esfahbod +Date: Thu Oct 7 21:21:11 2010 -0400 + + Move some more code around + + src/hb-ot-shape.cc | 27 +++++++++++++-------------- + 1 file changed, 13 insertions(+), 14 deletions(-) + +commit d9c726078828d50db62e05407a3f38f2e7607533 +Author: Behdad Esfahbod +Date: Thu Oct 7 21:19:54 2010 -0400 + + Minor + + src/hb-ot-shape.cc | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit efe0d682e860ffd23a1d17c68c8273f17d51c1c9 +Author: Behdad Esfahbod +Date: Thu Oct 7 21:12:46 2010 -0400 + + Simplify compiling lookups + + src/hb-ot-shape.cc | 66 ++++++++++++++++++++++-------------------------------- + 1 file changed, 27 insertions(+), 39 deletions(-) + +commit 476c94218b4f5b8e119e82b0e10b641e0c10bf56 +Author: Behdad Esfahbod +Date: Thu Oct 7 17:47:33 2010 -0400 + + Rename + + src/hb-ot-shape.cc | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +commit 34db6f031d7ac009f554386ef990bad44886b9ee +Author: Behdad Esfahbod +Date: Thu Oct 7 01:21:19 2010 -0400 + + Add XXX note + + src/hb-buffer.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 98aa3f65446496dc250d9b01d98cacfdf1157e06 +Author: Behdad Esfahbod +Date: Wed Oct 6 00:23:36 2010 -0400 + + Call hb_ot_shape_setup_lookups_complex() + + src/hb-ot-shape.cc | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit f1d07885dc358e79c237e824c94b3320c0a9c17d +Author: Behdad Esfahbod +Date: Wed Oct 6 00:21:37 2010 -0400 + + Rename setup_lookups() + + src/hb-ot-shape.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit affc5abac7bdae51df85856a5478d34d96fda4fe +Author: Behdad Esfahbod +Date: Wed Oct 6 00:18:16 2010 -0400 + + Move table_tag to hb_ot_shape_context_t + + src/hb-ot-shape.cc | 31 +++++++++++++++++-------------- + 1 file changed, 17 insertions(+), 14 deletions(-) + +commit 967240dd8b96802345ef273e75427066e91ea8fb +Author: Behdad Esfahbod +Date: Tue Oct 5 23:00:05 2010 -0400 + + Add internal hb_ot_shape_context_t + + src/hb-ot-shape-arabic.cc | 26 ++--- + src/hb-ot-shape.cc | 237 +++++++++++++++++++--------------------------- + 2 files changed, 108 insertions(+), 155 deletions(-) + +commit 3eb936f1539475098f39be78654b9c39b86f0799 +Author: Behdad Esfahbod +Date: Tue Oct 5 18:36:58 2010 -0400 + + Add Arabic/Syriac/N'ko shaping logic + + Not hooked up just yet. + + src/Makefile.am | 9 + + src/gen-arabic-joining-table.py | 39 +++ + src/hb-ot-shape-arabic.cc | 716 ++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 764 insertions(+) + +commit 0109816b50064a314389333ff64aaf22cb4b1e56 +Author: Behdad Esfahbod +Date: Tue Oct 5 18:36:45 2010 -0400 + + Update build system + + autogen.sh | 3 --- + configure.ac | 1 + + 2 files changed, 1 insertion(+), 3 deletions(-) + +commit e81d7afe6e0e9dd26025f3243a11cf0b408a8046 +Author: Behdad Esfahbod +Date: Mon Oct 4 18:18:48 2010 -0400 + + Add hb_face_get_upem() + + src/hb-font.cc | 6 ++++++ + src/hb-font.h | 3 +++ + 2 files changed, 9 insertions(+) + +commit d47f79db92fa45d51cd5f7845db8a206f5ec122b +Author: Behdad Esfahbod +Date: Mon Oct 4 18:13:30 2010 -0400 + + Add TODO item + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit bd361945a89ea31e6c4525aa030e18744ea81fb3 +Author: Behdad Esfahbod +Date: Mon Oct 4 17:22:57 2010 -0400 + + Add API comments + + src/hb-font.h | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +commit 645f6f265b5f6fb85b3c0f59ea874d58c86e3917 +Author: Behdad Esfahbod +Date: Mon Oct 4 17:01:01 2010 -0400 + + Add is_mutable() functions + + Correspond to the make_mutable() ones. + + src/hb-font.cc | 6 ++++++ + src/hb-font.h | 2 ++ + src/hb-unicode.c | 6 ++++++ + src/hb-unicode.h | 2 ++ + 4 files changed, 16 insertions(+) + +commit 19c0eab8cf96d00e168c4b11ec435019c1ed44f7 +Author: Behdad Esfahbod +Date: Mon Oct 4 16:45:21 2010 -0400 + + Add getters for all setter APIs + + One in particular is not a straight getter: hb_font_unset_funcs() is + special because of the specific needs of the lifecycle management of + the user_data object. + + src/hb-font.cc | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-font.h | 40 +++++++++++++++++++++++++++++++++++ + src/hb-unicode.c | 32 ++++++++++++++++++++++++++++ + src/hb-unicode.h | 31 ++++++++++++++++++++++++++- + 4 files changed, 166 insertions(+), 1 deletion(-) + +commit f0feb084b0fd1510474b25404d1dcc5686ee0538 +Author: Behdad Esfahbod +Date: Sun Oct 3 19:09:39 2010 -0400 + + Minor + + src/hb-ot-layout-private.hh | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit ac0c1663fa6e93a5a94c88fc7497bc11ca17f0a1 +Author: Behdad Esfahbod +Date: Fri Oct 1 19:09:23 2010 -0400 + + Avoid div-by-zero, validate upem + + src/hb-ot-head-private.hh | 7 +++++++ + src/hb-ot-layout-private.hh | 6 +++--- + 2 files changed, 10 insertions(+), 3 deletions(-) + +commit 7f97d2cd904ea999c099c73c52187c5d65aeec67 +Author: Behdad Esfahbod +Date: Fri Oct 1 18:58:50 2010 -0400 + + Pedantic + + src/hb-open-type-private.hh | 12 ++++++------ + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gdef-private.hh | 10 +++++----- + src/hb-ot-layout-gpos-private.hh | 6 +++--- + 4 files changed, 15 insertions(+), 15 deletions(-) + +commit 2841436926d6a406bd1f4a35c66a0e3c2fdbeca7 +Author: Behdad Esfahbod +Date: Wed Sep 29 12:20:36 2010 -0400 + + Don't zero glyph advances in MarkToBase and similar lookups + + See email thread "Should MarkToBase attachment zero the mark advance?" + started by Jonathan Kew on 23 August 2010 for details. + + src/hb-ot-layout-gpos-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit 36b3862009c00ad922d68810173a69ac59723365 +Author: Behdad Esfahbod +Date: Wed Sep 29 12:10:24 2010 -0400 + + One fewer cmp() implementation... + + src/hb-ot-layout-common-private.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 4e573715ae5f5ed486ad66382bb44c47a86591ff +Author: Behdad Esfahbod +Date: Tue Sep 28 16:23:58 2010 -0400 + + Improve cmp function parameter namings and casts + + No semantic change. + + src/hb-open-type-private.hh | 6 +++--- + src/hb-ot-layout-common-private.hh | 6 +++--- + src/hb-ot-shape.cc | 8 ++++---- + 3 files changed, 10 insertions(+), 10 deletions(-) + +commit dca8aff24652c83c53efbb9d06e5e1c7ef1c2fa5 +Author: Behdad Esfahbod +Date: Tue Sep 28 16:25:23 2010 -0400 + + Add comment re DejaVu Sans Mono having 'dflt' script + + src/hb-ot-layout.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 9dc45401c07cb40114067cafbe286c63a9598f3b +Author: Behdad Esfahbod +Date: Tue Sep 28 16:23:28 2010 -0400 + + Fix stupid bug in bsearch cmp function! + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6fca4c18c42bdcbc67ee8855499c51c7d6311eb2 +Author: Behdad Esfahbod +Date: Thu Sep 23 10:28:51 2010 -0400 + + Add TODO iteam + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit f2a30bd605a57b99fce4b78e288c2ca62f7191ad +Author: Behdad Esfahbod +Date: Thu Sep 23 10:27:08 2010 -0400 + + Remove unimplemented method hb_font_get_funcs() + + Got to add a suitable replacement. + + src/hb-font.h | 3 --- + 1 file changed, 3 deletions(-) + +commit 7b9a38a112aa2421d97187a9b30619360edeabbe +Author: Behdad Esfahbod +Date: Wed Sep 22 17:42:59 2010 -0400 + + Add test.c using public API + + src/Makefile.am | 6 +++- + src/test.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 99 insertions(+), 1 deletion(-) + +commit 9ea7368fce3fa373d8d2925961ad211f5cf6ce70 +Author: Behdad Esfahbod +Date: Wed Sep 22 17:38:44 2010 -0400 + + Fix hb_ot_layout leak + + src/hb-ot-layout.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 8e577acae2e605547b6a1b9b3a941cb9e3c56a4c +Author: Behdad Esfahbod +Date: Wed Sep 22 17:37:02 2010 -0400 + + Fix blob refcounting with insane SFNT table directories + + src/hb-font.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 75371bea4fbf50b8604d2698b4935c011648a6b6 +Author: Behdad Esfahbod +Date: Wed Sep 22 17:12:10 2010 -0400 + + Add TODO item + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5bd1e95236320aed60fb29ca1e93b9595d4aeeec +Author: Behdad Esfahbod +Date: Wed Sep 22 16:46:18 2010 -0400 + + Speedup Device table delta computation for common cases + + src/hb-ot-layout-common-private.hh | 25 +++++++++++++++++++++---- + 1 file changed, 21 insertions(+), 4 deletions(-) + +commit ed4acbde9c5e3323cc95037b500d1bf2878ed3ee +Author: Behdad Esfahbod +Date: Mon Aug 16 14:36:27 2010 -0400 + + Fix NULL dereference + + Reported by Jonathan Kew. Face table handling needs to be redone + anyway, but fix this for now. + + src/hb-ot-layout.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 258305c2a5dd47bd2d83f12eaf9caa5b19ae5efb +Author: Behdad Esfahbod +Date: Fri Aug 13 14:10:02 2010 -0400 + + [GPOS] Fix div-by-zero + + Patch by Jonathan Kew. Mozilla bug #465728. + + src/hb-ot-layout-gpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2422c4b96d32037a5cdaef4c427ed1d25db5f647 +Author: Behdad Esfahbod +Date: Fri Aug 13 14:00:34 2010 -0400 + + Add TODO + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 27f0b092a13344e8791c496c77a3c1e5de4f887c +Author: Behdad Esfahbod +Date: Fri Jul 23 17:35:54 2010 -0400 + + Logically separate feature allocation from application + + src/hb-ot-shape.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 6cf63132dc771e1bcd5627720daf4bd2ea0800a5 +Author: Behdad Esfahbod +Date: Fri Jul 23 17:32:26 2010 -0400 + + Minor + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4e4ef24e46f273ad2bdda2f718223e05b37dd50f +Author: Behdad Esfahbod +Date: Fri Jul 23 17:22:11 2010 -0400 + + Towards separating bit allocation from shaping + + src/hb-buffer-private.hh | 9 ++++++--- + src/hb-buffer.cc | 12 ++++++------ + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-shape.cc | 41 ++++++++++++++++------------------------ + 5 files changed, 30 insertions(+), 36 deletions(-) + +commit da6cff3864d2ef4a061a29e5918359bafcd51f4c +Author: Behdad Esfahbod +Date: Fri Jul 23 15:40:58 2010 -0400 + + Add TODO items + + TODO | 3 +++ + 1 file changed, 3 insertions(+) + +commit acdba3f90b232fc12fcb200dca2584481b339118 +Author: Behdad Esfahbod +Date: Fri Jul 23 15:11:18 2010 -0400 + + Prefer C linkage + + src/Makefile.am | 1 + + src/check-c-linkage-decls.sh | 18 ++++++++++++++++++ + src/hb-blob-private.h | 2 ++ + src/hb-blob.c | 18 ++++++++++++------ + src/hb-blob.h | 2 ++ + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 7 ++++++- + src/hb-buffer.h | 1 + + src/hb-common.c | 6 ++++++ + src/hb-common.h | 21 +++++++++++++-------- + src/hb-font-private.h | 1 + + src/hb-font.cc | 4 ++++ + src/hb-font.h | 1 + + src/hb-ft.c | 10 ++++++++-- + src/hb-ft.h | 2 ++ + src/hb-glib.c | 6 ++++++ + src/hb-glib.h | 2 ++ + src/hb-graphite.cc | 6 ++++++ + src/hb-graphite.h | 3 ++- + src/hb-icu.c | 6 ++++++ + src/hb-icu.h | 2 ++ + src/hb-language.c | 5 +++++ + src/hb-language.h | 2 ++ + src/hb-object-private.h | 2 ++ + src/hb-open-file-private.hh | 4 ++++ + src/hb-open-type-private.hh | 5 +++++ + src/hb-ot-head-private.hh | 5 +++++ + src/hb-ot-layout-common-private.hh | 6 ++++++ + src/hb-ot-layout-gdef-private.hh | 4 ++++ + src/hb-ot-layout-gpos-private.hh | 6 ++++++ + src/hb-ot-layout-gsub-private.hh | 7 ++++++- + src/hb-ot-layout-gsubgpos-private.hh | 13 +++++++++++++ + src/hb-ot-layout-private.hh | 3 ++- + src/hb-ot-layout.cc | 5 +++++ + src/hb-ot-layout.h | 1 + + src/hb-ot-shape.cc | 6 ++++++ + src/hb-ot-shape.h | 2 ++ + src/hb-ot-tag.c | 5 +++++ + src/hb-ot-tag.h | 2 ++ + src/hb-ot.h | 3 +++ + src/hb-private.h | 5 +++++ + src/hb-shape.cc | 5 +++++ + src/hb-shape.h | 1 + + src/hb-unicode-private.h | 1 + + src/hb-unicode.c | 6 ++++++ + src/hb-unicode.h | 1 + + src/hb.h | 3 +++ + src/main.cc | 6 ++++++ + 48 files changed, 214 insertions(+), 20 deletions(-) + +commit cc6d52279d10a2edcf0d86c3a18a79ff4f6d3858 +Author: Behdad Esfahbod +Date: Fri Jul 23 15:00:13 2010 -0400 + + De-C++ where possible + + Helps with avoiding many "extern C" declarations in source files. + + src/Makefile.am | 4 ++-- + src/check-header-guards.sh | 2 +- + src/{hb-font-private.hh => hb-font-private.h} | 6 +++--- + src/hb-font.cc | 2 +- + src/{hb-ft.cc => hb-ft.c} | 2 +- + src/hb-graphite.cc | 2 +- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-private.hh | 2 +- + 8 files changed, 11 insertions(+), 11 deletions(-) + +commit 0dd200d28f51bf4062d8a377432c8977c80cb210 +Author: Behdad Esfahbod +Date: Fri Jul 23 14:56:29 2010 -0400 + + Header dep cleanup + + src/hb-font-private.hh | 2 -- + src/hb-ot-layout-private.hh | 1 + + 2 files changed, 1 insertion(+), 2 deletions(-) + +commit fb0d25246267851a1fc200ead28c56359a40047e +Author: Behdad Esfahbod +Date: Fri Jul 23 14:54:22 2010 -0400 + + dos2unix + + src/hb-ot-head-private.hh | 256 +++++++++++++++++++++++----------------------- + 1 file changed, 128 insertions(+), 128 deletions(-) + +commit 81408cd51ce575891e79e6483be187130f864c28 +Author: Behdad Esfahbod +Date: Fri Jul 23 14:46:57 2010 -0400 + + Don't use "operator =" + + Some compilers don't like operator = defined on members of union members + either. Reported by Ginn Chen for Sun Studio compilers. + + src/hb-open-type-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 39fe34d4c356516f0a92f42b13a168572829d24e +Author: Behdad Esfahbod +Date: Thu Jul 22 18:12:38 2010 -0400 + + Add TODO option + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 243a96f41482edb83e4798358064bd3329dd278c +Author: Behdad Esfahbod +Date: Wed Jul 21 17:21:12 2010 -0400 + + Add arm build fix to TODO + + TODO | 1 + + 1 file changed, 1 insertion(+) + +commit c407f05f99f9225916d3d0ae06eac8fbc8b55b97 +Author: Behdad Esfahbod +Date: Wed Jul 21 17:20:44 2010 -0400 + + Remove fixed TODO item + + TODO | 1 - + 1 file changed, 1 deletion(-) + +commit 4f801bd6586defdbf70162e0c7f8968d2b476df2 +Author: Behdad Esfahbod +Date: Wed Jul 21 16:37:01 2010 -0400 + + Mozilla bug 580233 - check for zero-length record in hb sanitizer. + + Patch / report by Jonathan Kew. + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 17e9ff938b638fd1cb80c990ba13bd47562116b8 +Author: Behdad Esfahbod +Date: Thu Jul 15 11:21:34 2010 -0700 + + Fix 64bit issues with debug prints + + src/hb-blob.c | 10 +++++----- + src/hb-open-type-private.hh | 5 +++-- + 2 files changed, 8 insertions(+), 7 deletions(-) + +commit fd56ae49637b978ea3b36fab5b48f1a3cc99e90e +Author: Behdad Esfahbod +Date: Thu Jul 8 00:53:40 2010 -0400 + + Don't bother sorting, it's a safe font error if the array is not sorted + + src/hb-open-type-private.hh | 29 ----------------------------- + src/hb-ot-layout-common-private.hh | 7 ------- + 2 files changed, 36 deletions(-) + +commit cc8a4abea68f2dba26feb5785f9e518e6853c744 +Author: Behdad Esfahbod +Date: Thu Jul 8 00:40:04 2010 -0400 + + Use bsearch where applicable + + src/hb-open-type-private.hh | 49 +++++++++++++ + src/hb-ot-layout-common-private.hh | 145 +++++++++++++------------------------ + 2 files changed, 100 insertions(+), 94 deletions(-) + +commit 2f418f5709b2b8b3ef2f6056b9d8c13b66f0b74a +Author: Behdad Esfahbod +Date: Wed Jul 7 22:07:40 2010 -0400 + + Remove useless TODO + + src/hb-open-file-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit da8edbb62204dc39f93d500ef85929e234e0bd19 +Author: Behdad Esfahbod +Date: Wed Jun 9 07:15:39 2010 -0400 + + Fix header + + src/hb-buffer-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit d05d13df02fbe76814694fe49cc01bbb41c3d0e7 +Author: Behdad Esfahbod +Date: Wed Jun 9 07:15:03 2010 -0400 + + Add a test for header preprocessor guards + + src/Makefile.am | 4 +++- + src/check-header-guards.sh | 20 ++++++++++++++++++++ + src/check-libstdc++.sh | 1 - + 3 files changed, 23 insertions(+), 2 deletions(-) + +commit 0f0cd9d361f1bb614aa3fd4616160d027062370e +Author: Behdad Esfahbod +Date: Wed Jun 9 06:32:56 2010 -0400 + + Fix header tags + + src/hb-font-private.hh | 6 +++--- + src/hb-object-private.h | 6 +++--- + src/hb-open-type-private.hh | 4 ++-- + src/hb-ot-layout-private.hh | 6 +++--- + src/hb-ot-shape.h | 2 +- + 5 files changed, 12 insertions(+), 12 deletions(-) + +commit f2a1b411b1d48c3dfac0df8e78c848d9aa3bb047 +Author: Behdad Esfahbod +Date: Thu Jun 3 11:37:51 2010 -0400 + + Followup fix for variation-selectors + + Patch from Jonathan Kew + + src/hb-ot-shape.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit a224b4d502d026fa642ee4098bf7bc0b4ba7ce27 +Author: Behdad Esfahbod +Date: Wed Jun 2 22:24:54 2010 -0400 + + Fix skipping variation-selectors + + src/hb-ot-shape.cc | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit 81a77b115db401f69e869690f24b9047370bdfde +Author: Behdad Esfahbod +Date: Tue Jun 1 23:03:54 2010 -0400 + + Make feature sorting stable + + src/hb-ot-shape.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit fdc322a82047c4bda9fa3dab4338a0eac1c1bde7 +Author: Behdad Esfahbod +Date: Fri May 28 20:55:52 2010 -0400 + + Minor + + src/hb-ot-shape.cc | 38 +++++++++++++++++++++----------------- + 1 file changed, 21 insertions(+), 17 deletions(-) + +commit f062ec6bb24b1c21d37b12adc7e944a5fe53526a +Author: Behdad Esfahbod +Date: Fri May 28 20:54:43 2010 -0400 + + Further simplify mask allocator + + src/hb-ot-shape.cc | 23 +++++++---------------- + 1 file changed, 7 insertions(+), 16 deletions(-) + +commit 8af45fda475d075c5a285002463a00a0423d3926 +Author: Behdad Esfahbod +Date: Fri May 28 20:41:20 2010 -0400 + + Fix global feature handling + + src/hb-ot-shape.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit e04685ee7be01695ec437fab50f919f1b7423c57 +Author: Behdad Esfahbod +Date: Fri May 28 20:37:06 2010 -0400 + + Simplify mask allocation + + src/hb-ot-shape.cc | 48 ++++++++++++++++++++---------------------------- + 1 file changed, 20 insertions(+), 28 deletions(-) + +commit 0e235d0fc9bdeeaffa7215c21abc5d40767a10c7 +Author: Behdad Esfahbod +Date: Fri May 28 20:21:47 2010 -0400 + + Towards a mask allocator + + src/hb-ot-shape.cc | 291 ++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 186 insertions(+), 105 deletions(-) + +commit 81c5e8724b740c6e42ed3a45e0574c7c5f3ad8e6 +Author: Behdad Esfahbod +Date: Fri May 28 18:31:16 2010 -0400 + + Allow disabling default features + + Patch from Jonathan Kew + + src/hb-buffer-private.hh | 18 +++-- + src/hb-buffer.cc | 15 ++-- + src/hb-ot-shape.cc | 196 ++++++++++++++++++++++++++++++++--------------- + 3 files changed, 153 insertions(+), 76 deletions(-) + +commit 2163afbf35044f59dbf449254e65b8c9feb6cdeb +Author: Behdad Esfahbod +Date: Thu May 27 14:04:15 2010 -0400 + + Add note about UTF-8 decoder + + src/hb-buffer.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 226faa58f4e23eb655bebb0eff7206a3024c8d55 +Author: Behdad Esfahbod +Date: Thu May 27 11:42:34 2010 -0400 + + Fix loop + + src/hb-ot-tag.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 56bef5680cc76a67d16ca14ac69f0dda1a691968 +Author: Martin Hosken +Date: Thu May 27 10:09:04 2010 +0100 + + Fixes to Python and Graphite from Martin + + contrib/python/README | 10 ++++ + contrib/python/lib/fontconfig.pyx | 47 +++++++++++++++++ + contrib/python/lib/harfbuzz.pyx | 104 ++------------------------------------ + contrib/python/scripts/hbtestfont | 103 +++++++++++++++++++++++++++++++++---- + contrib/python/setup.py | 3 +- + src/hb-graphite.cc | 8 +-- + 6 files changed, 159 insertions(+), 116 deletions(-) + +commit b485da0b719cb03cc33da57802c5151301664c2f +Author: Behdad Esfahbod +Date: Thu May 27 11:39:19 2010 -0400 + + Disable Graphite as it crashes all over the place... + + src/hb-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 93ac709b1f6b015371c29bf244a9ece62baedff0 +Author: Behdad Esfahbod +Date: Wed May 26 16:22:00 2010 -0400 + + Cypriot is RTL + + src/hb-unicode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 15c7379c16dbb9ee8ed1c0333ca7492532ce8423 +Author: Behdad Esfahbod +Date: Wed May 26 10:48:10 2010 -0400 + + Revert "Merge remote branch 'martin/master'" + + This reverts commit 80af2812fb3b231ddcb4608ec13c6038a681c818, reversing + changes made to c442672ec2fb83ed41f3994b3aa4f92a097664ab. + + contrib/python/README | 10 ---- + contrib/python/lib/fontconfig.pyx | 47 ----------------- + contrib/python/lib/harfbuzz.pyx | 104 ++++++++++++++++++++++++++++++++++++-- + contrib/python/scripts/hbtestfont | 98 ++++------------------------------- + contrib/python/setup.py | 3 +- + src/Makefile.am | 2 +- + src/hb-graphite.cc | 8 +-- + src/hb-ot-shape.cc | 2 +- + src/hb-ot-tag.c | 1 - + src/hb-ot.h | 2 +- + src/hb-shape.cc | 2 +- + 11 files changed, 119 insertions(+), 160 deletions(-) + +commit 80af2812fb3b231ddcb4608ec13c6038a681c818 +Merge: c442672e 3109a86a +Author: Behdad Esfahbod +Date: Mon May 24 18:14:24 2010 +0100 + + Merge remote branch 'martin/master' + +commit c442672ec2fb83ed41f3994b3aa4f92a097664ab +Author: Behdad Esfahbod +Date: Mon May 24 18:02:32 2010 +0100 + + Fix struct initializers + + src/hb-ft.cc | 12 ++++++------ + src/hb-glib.c | 14 +++++++------- + src/hb-icu.c | 14 +++++++------- + 3 files changed, 20 insertions(+), 20 deletions(-) + +commit f5ac9de259773a5f86809892e58166a485d70a3d +Author: Behdad Esfahbod +Date: Mon May 24 18:01:09 2010 +0100 + + Minor + + src/hb-object-private.h | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +commit f97bf4f81257c97a46dff51be31b2ec214d6c270 +Author: Behdad Esfahbod +Date: Mon May 24 17:50:19 2010 +0100 + + Make sure we initialize all callbacks upon creation + + Also fixes issue with unicode callbacks never being set really. + + src/hb-font.cc | 18 +++++++----------- + src/hb-unicode.c | 9 ++------- + 2 files changed, 9 insertions(+), 18 deletions(-) + +commit bf36a1074ab23abeab0a7a6c47db26770dc1ab0a +Author: Behdad Esfahbod +Date: Mon May 24 17:46:21 2010 +0100 + + Move all callback functions in a vtable structs + + src/hb-font-private.hh | 10 ++++++---- + src/hb-font.cc | 28 +++++++++++++++------------- + src/hb-ot-shape.cc | 4 ++-- + src/hb-unicode-private.h | 12 +++++++----- + src/hb-unicode.c | 32 +++++++++++++++++--------------- + 5 files changed, 47 insertions(+), 39 deletions(-) + +commit 3109a86add936ae4cc77541fc026c4fe2db4e328 +Author: Martin Hosken +Date: Mon May 24 13:25:37 2010 +0100 + + hb-graphite now no longer has -ve advances within clusters. Fix infinite loop in tag_to_script(). python fixed to use tag_to_script and allow hbtestfont to be passed font files, where fontconfig knows about them. + + contrib/python/lib/harfbuzz.pyx | 4 ++-- + contrib/python/scripts/hbtestfont | 6 +++++- + src/hb-graphite.cc | 4 ++-- + src/hb-ot-tag.c | 1 + + 4 files changed, 10 insertions(+), 5 deletions(-) + +commit e5bed0a37fe1b0576d08435179e455cb28eadcdb +Author: Martin Hosken +Date: Sat May 22 20:19:00 2010 +0100 + + Tidy up hbtestfont and add README + + contrib/python/README | 10 +++ + contrib/python/scripts/hbtestfont | 134 +++++++++++++++++++------------------- + 2 files changed, 77 insertions(+), 67 deletions(-) + +commit 70ae332fe66510500d303b6fcc79537833b42f05 +Author: Martin Hosken +Date: Sat May 22 19:58:00 2010 +0100 + + Add fontconfig to hbtestfont + + contrib/python/lib/fontconfig.pyx | 47 ++++++++++++++++++++++++++++ + contrib/python/scripts/hbtestfont | 64 ++++++++++++++++++++++++--------------- + contrib/python/setup.py | 3 +- + 3 files changed, 88 insertions(+), 26 deletions(-) + +commit 72631c9d06b131d82080f212908e7d0b0266b841 +Merge: 1432ab15 1094a294 +Author: Martin Hosken +Date: Sat May 22 09:38:02 2010 +0100 + + Merge branch 'master' of git://git.freedesktop.org/~behdad/harfbuzz-ng + +commit 1432ab15c163eb0b5be3de66a4cb3df15ad73500 +Author: Martin Hosken +Date: Sat May 22 00:56:40 2010 +0100 + + Add graphical output to hbtestfont + + contrib/python/lib/harfbuzz.pyx | 100 +------------------------------------- + contrib/python/scripts/hbtestfont | 62 ++++++++++++++++++++++- + src/Makefile.am | 2 +- + src/hb-ot-shape.cc | 2 +- + src/hb-ot.h | 2 +- + src/hb-shape.cc | 2 +- + 6 files changed, 67 insertions(+), 103 deletions(-) + +commit bbc7a99d01298f9be1ebaaceacbc9bc961e247e5 +Author: Behdad Esfahbod +Date: Fri May 21 18:24:34 2010 +0100 + + Move mirroring around a bit + + src/hb-ot-shape.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit bd0987386b3a4dddf208ccf1a70ebfff6242ba73 +Author: Behdad Esfahbod +Date: Fri May 21 18:06:35 2010 +0100 + + Add a few more standard features + + src/hb-ot-shape.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 75f3469ca6d626b08eb411984a2ba7fd48ca5b5f +Author: Behdad Esfahbod +Date: Fri May 21 17:59:04 2010 +0100 + + Add note + + src/hb-ot-shape.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 1094a294f6a44c47fc75867983f2b135a6442bab +Author: Behdad Esfahbod +Date: Fri May 21 17:58:20 2010 +0100 + + Add rtlm + + src/hb-ot-shape.cc | 26 +++++++++++++++++++++----- + 1 file changed, 21 insertions(+), 5 deletions(-) + +commit 074ea787493a37ae8f68d17be7820f13fff57520 +Author: Behdad Esfahbod +Date: Fri May 21 17:53:10 2010 +0100 + + Add ltra, ltrm, and rtla features + + src/hb-ot-shape.cc | 60 +++++++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 48 insertions(+), 12 deletions(-) + +commit 1ce7b87c4d8d1ab3ec1d5198351d71b7199f7c64 +Author: Behdad Esfahbod +Date: Fri May 21 17:31:45 2010 +0100 + + Cleanup bitmask allocation + + src/hb-buffer-private.hh | 16 +++++++++++++ + src/hb-buffer.cc | 36 +++++++++++++++++++++++++++++ + src/hb-ot-shape.cc | 60 +++++++++++++++++++++--------------------------- + 3 files changed, 78 insertions(+), 34 deletions(-) + +commit dd22a8f7bfd424a69286e90f79d2a23af6e89ec1 +Author: Behdad Esfahbod +Date: Fri May 21 16:43:17 2010 +0100 + + Add note + + src/hb-ot-layout-gsub-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit cbd1d6a63a5d696b7d6a5aba9ee7305ea228416a +Author: Martin Hosken +Date: Fri May 21 15:16:43 2010 +0100 + + Rename Grxxx to HbGrxxx + + src/hb-graphite.cc | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit 0375bdd2027767ee7bebef1ed289b33dc64f430e +Author: Martin Hosken +Date: Fri May 21 15:01:37 2010 +0100 + + Rename classes from Grxxx to HbGrxxx + + src/hb-graphite.cc | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit a5a72e004bb7123445c2c3a94352d358fc80d904 +Author: Behdad Esfahbod +Date: Fri May 21 15:12:52 2010 +0100 + + Add hb-ot-shape.h, oops. + + src/hb-ot-shape.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 44 insertions(+) + +commit aa62a402a72bdecad2a955dbfaf6e24cd2c00e55 +Author: Behdad Esfahbod +Date: Fri May 21 14:42:11 2010 +0100 + + Fix Makefile to install hb-ot-shape.h + + src/Makefile.am | 2 +- + src/hb-ot.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 9722b8f005a10fd16e841df4da3ccd80be66e296 +Author: Behdad Esfahbod +Date: Fri May 21 14:37:47 2010 +0100 + + Simple renames + + src/hb-ot-shape.cc | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +commit 02f28550d785671cf92fd4239c5f913f7e71585f +Author: Behdad Esfahbod +Date: Fri May 21 14:37:28 2010 +0100 + + Graphite also forces us to link to libstdc++ currently + + src/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +commit ca663bb23c16f6a1f04efa6e10dad0e3e7c260a3 +Author: Behdad Esfahbod +Date: Fri May 21 14:34:23 2010 +0100 + + Move main shaper code into hb_ot_shape() + + src/hb-ot-shape-private.hh | 53 ----------- + src/hb-ot-shape.cc | 225 ++++++++++++++++++++++++++++++++++++++++++--- + src/hb-shape.cc | 209 +---------------------------------------- + 3 files changed, 214 insertions(+), 273 deletions(-) + +commit 7acd232d36c2b2ed03823e6aa6bb2b814bf673b3 +Author: Behdad Esfahbod +Date: Fri May 21 14:20:48 2010 +0100 + + Fix test failing + + src/hb-graphite.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dd47924d88d86b83e7f3ab040de6e7136ac0ca09 +Author: Behdad Esfahbod +Date: Fri May 21 14:18:08 2010 +0100 + + Fix warnings + + src/hb-graphite.cc | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +commit 305ba8671553cd955c20a54db622666c0bb02532 +Author: Behdad Esfahbod +Date: Fri May 21 14:02:20 2010 +0100 + + Import Graphite shaping backend by Martin Hosken + + configure.ac | 6 ++ + src/Makefile.am | 11 ++ + src/hb-graphite.cc | 308 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-graphite.h | 46 ++++++++ + src/hb-shape.cc | 15 +++ + 5 files changed, 386 insertions(+) + +commit 3ba6818ba9be950e46902f0239f2451ec0e65d44 +Author: Behdad Esfahbod +Date: Fri May 21 13:51:29 2010 +0100 + + Update the Python module + + contrib/python/lib/harfbuzz.pyx | 40 +++++++++++++++++++++------------------- + 1 file changed, 21 insertions(+), 19 deletions(-) + +commit 83f34677bcbc6bb194940407b0fcb23575650e3d +Author: Behdad Esfahbod +Date: Fri May 21 13:43:49 2010 +0100 + + Add hb_tag_from_string() + + src/Makefile.am | 1 + + src/hb-common.c | 41 +++++++++++++++++++++++++++++++++++++++++ + src/hb-common.h | 3 +++ + 3 files changed, 45 insertions(+) + +commit 4a9a5c0b06e8aa5d15327242609a7c766d3e0e94 +Author: Behdad Esfahbod +Date: Fri May 21 13:33:46 2010 +0100 + + Don't allocate bits for features not available + + src/hb-ot-shape.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit e53d77142ac4ecbe38ab3235491fa93cb7ff16ab +Author: Behdad Esfahbod +Date: Fri May 21 13:32:38 2010 +0100 + + Speed up feature mask setting + + Patch from Jonathan Kew. + + src/hb-ot-shape.cc | 31 +++++++++++++++++++++++++------ + 1 file changed, 25 insertions(+), 6 deletions(-) + +commit 4fa67f34ecc65056ce60a572213fbdae66e0423b +Author: Behdad Esfahbod +Date: Fri May 21 13:29:12 2010 +0100 + + Add Unicode 5.2 scripts + + src/hb-icu.c | 29 ++++++++++++++++++++++++++++- + src/hb-ot-tag.c | 21 +++++++++++++++++++-- + src/hb-unicode.c | 19 ++++++++++++++++++- + src/hb-unicode.h | 19 ++++++++++++++++++- + 4 files changed, 83 insertions(+), 5 deletions(-) + +commit ee1b322100a6bd575b999904592abbd9fed5587f +Author: Behdad Esfahbod +Date: Fri May 21 12:55:57 2010 +0100 + + Fix feature mask setting + + src/hb-ot-shape.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit b490fa343322f1b5abaf880abc073287c1f34132 +Author: Behdad Esfahbod +Date: Fri May 21 11:15:07 2010 +0100 + + Add hb_ot_tag_to_script() + + src/hb-ot-tag.c | 14 ++++++++++++++ + src/hb-ot-tag.h | 3 +++ + 2 files changed, 17 insertions(+) + +commit 50355309047765558ef8f5d60aefed42a7f954cc +Author: Behdad Esfahbod +Date: Fri May 21 10:33:23 2010 +0100 + + Add Python wrapper from Martin Hosken + + contrib/python/lib/harfbuzz.pyx | 306 ++++++++++++++++++++++++++++++++++++++ + contrib/python/runpy | 2 + + contrib/python/scripts/hbtestfont | 35 +++++ + contrib/python/setup.py | 24 +++ + 4 files changed, 367 insertions(+) + +commit 280af1bddb958ff97cf7ce12fe7ec2b6352e61d0 +Author: Behdad Esfahbod +Date: Thu May 20 18:33:35 2010 +0100 + + Let hb_face_get_table() return NULL if table not found + + src/hb-font.cc | 2 +- + src/hb-font.h | 1 + + src/hb-open-type-private.hh | 3 +++ + 3 files changed, 5 insertions(+), 1 deletion(-) + +commit 1cdbfd944eecb58587461f57f037e47a44f39990 +Author: Behdad Esfahbod +Date: Thu May 20 17:47:28 2010 +0100 + + Fix alternate, again + + src/hb-ot-layout-gsub-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit fdca3d51603bd6bef6a4b0ee4a560f7dcd2f1d37 +Author: Behdad Esfahbod +Date: Thu May 20 17:46:20 2010 +0100 + + Fix alternate off-by-one + + src/hb-ot-layout-gsub-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b634beb39e0a4fef7167a8af646f6b2d8cafe69b +Author: Behdad Esfahbod +Date: Thu May 20 17:44:52 2010 +0100 + + Fix delta scale, again... + + src/hb-ot-layout-common-private.hh | 8 ++++++++ + src/hb-ot-layout-gdef-private.hh | 3 +-- + src/hb-ot-layout-gpos-private.hh | 12 ++++++------ + src/hb-ot-layout-private.hh | 2 +- + 4 files changed, 16 insertions(+), 9 deletions(-) + +commit 40335d4533ac2b08121c9dc6003f3ebc5b44a67b +Author: Behdad Esfahbod +Date: Thu May 20 17:35:14 2010 +0100 + + Remove unused operator + + src/hb-ot-layout-common-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit f7acd8df5146155b51d6f50aeb04f54f3030c1c3 +Author: Behdad Esfahbod +Date: Thu May 20 17:26:35 2010 +0100 + + Do alternate glyph selection! + + Kinda hand-wavy right now. Not tested. + + src/hb-ot-layout-gpos-private.hh | 12 +++++++----- + src/hb-ot-layout-gsub-private.hh | 20 +++++++++----------- + src/hb-ot-layout-gsubgpos-private.hh | 1 + + src/hb-private.h | 19 ++++++++++++++++++- + 4 files changed, 35 insertions(+), 17 deletions(-) + +commit 750a2294553d252e28875b605fe61fd9d6696e0f +Author: Behdad Esfahbod +Date: Thu May 20 16:23:27 2010 +0100 + + get_table() is allowed to return NULL. Use that to simplify code + + src/hb-font.cc | 2 +- + src/hb-ft.cc | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 99d9ef785f108df76f80a307eaa2784685ea86ba +Author: Behdad Esfahbod +Date: Thu May 20 15:47:49 2010 +0100 + + Write hb_face_create_for_data() in terms of hb_face_create_for_tables() + + Fixes lack of head_table initialization in create_for_tables() also. + + src/hb-font.cc | 35 ++++++++++++----------------------- + 1 file changed, 12 insertions(+), 23 deletions(-) + +commit 6774463883978b00b4d8c719ed75edfc4537c77f +Author: Behdad Esfahbod +Date: Thu May 20 15:40:12 2010 +0100 + + Apply user features to ranges! + + src/hb-ot-shape.cc | 23 ++++++++++++++++++++++- + 1 file changed, 22 insertions(+), 1 deletion(-) + +commit 9b6023338530a2dbb8214eb4391ef3e8372f3892 +Author: Behdad Esfahbod +Date: Thu May 20 15:31:12 2010 +0100 + + Add _hb_bit_storage() + + src/hb-private.h | 35 ++++++++++++++++++++++------------- + 1 file changed, 22 insertions(+), 13 deletions(-) + +commit 6b1b957f6d2955cbe4fa97e2659e033b3eaaf4d2 +Author: Behdad Esfahbod +Date: Thu May 20 15:14:44 2010 +0100 + + Add lookup_map + + src/hb-ot-shape.cc | 48 +++++++++++++++++++++++++++++++++--------------- + 1 file changed, 33 insertions(+), 15 deletions(-) + +commit 60010a0c4d8efae5c61a0c9cf10cfe2c1860f41e +Author: Behdad Esfahbod +Date: Thu May 20 14:05:02 2010 +0100 + + Update always-apply mask from 0xFFFF to 1 + + We plan to use the first bit to be always on. + + src/hb-ot-shape.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 009aad567863c05ee2ec4a3ee76fe0ee79c767bb +Author: Behdad Esfahbod +Date: Thu May 20 14:00:57 2010 +0100 + + Invert the mask logic + + Before, the mask in the buffer was inverted. That is, a 0 bit meant + feature should be applied and 1 meant not applied, whereas in the + lookups, the logic was positive. + + Now both are in sync. When calling hb_buffer_add_glyph() manually, + the mask should be 1 instead of 0. + + src/hb-buffer.cc | 2 +- + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 7f411dbfd9f8d5360c948531ff9f6c3998d1d897 +Author: Behdad Esfahbod +Date: Thu May 20 13:40:18 2010 +0100 + + Apply user features + + No ranges yet + + src/hb-ot-shape.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 0db299ccad346d9ea5573ea8408b78d9997bd379 +Author: Behdad Esfahbod +Date: Thu May 20 13:30:09 2010 +0100 + + Change hb_feature_t to keep tag/int instead of string + + src/hb-shape.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0a4399ca228d244e646abdb3487da0f13b228889 +Author: Behdad Esfahbod +Date: Wed May 19 15:45:06 2010 -0400 + + Fix scale issues + + hb_font_set_scale() now sets the value to be used to represent a unit + pixel. For example, if rendering a 10px font with a 26.6 representation, + you would set scale to (10 << 6). For 10px in 16.16 you would set it to + (10 << 16). This space should be the same space that the get_glyph_metrics + and get_kerning callbacks work in. + + src/hb-common.h | 1 - + src/hb-font-private.hh | 8 +++----- + src/hb-font.cc | 12 ++++++------ + src/hb-font.h | 12 +++--------- + src/hb-ft.cc | 4 ++-- + src/hb-ot-layout-gdef-private.hh | 6 +++--- + src/hb-ot-layout-gpos-private.hh | 37 +++++++++++++++++-------------------- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-private.hh | 20 +++++++++++--------- + src/hb-ot-layout.cc | 31 +++++++++++++++---------------- + src/hb-private.h | 4 ---- + 11 files changed, 61 insertions(+), 76 deletions(-) + +commit cf5585cfa6cac6fdf627a99941299e76af5ae0f7 +Author: Behdad Esfahbod +Date: Wed May 19 12:03:35 2010 -0400 + + Add 'head' table + + src/Makefile.am | 1 + + src/hb-font-private.hh | 5 ++ + src/hb-font.cc | 9 ++++ + src/hb-open-type-private.hh | 2 +- + src/hb-ot-head-private.hh | 128 ++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 144 insertions(+), 1 deletion(-) + +commit e29caf3f943b2b6f4997f469f7274252c82f465e +Author: Behdad Esfahbod +Date: Wed May 19 11:47:17 2010 -0400 + + Add LONGDATETIME + + src/hb-open-type-private.hh | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit f415755fdf011d3fa3b9aad04c38f2255dd7acf8 +Author: Behdad Esfahbod +Date: Mon May 17 15:14:14 2010 -0400 + + Minor + + src/hb-ot-layout.cc | 52 +++++++++++++++++++++++++++------------------------- + 1 file changed, 27 insertions(+), 25 deletions(-) + +commit 73af7756dc6d3961f176854246e5722baff101fb +Author: Behdad Esfahbod +Date: Fri May 14 23:38:08 2010 -0400 + + Indent + + src/hb-ot-layout-gsub-private.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 3567b87cce541dfb0af7caf024ec67c9d3c09214 +Author: Behdad Esfahbod +Date: Fri May 14 23:28:44 2010 -0400 + + Add an inline version of hb_buffer_ensure() + + src/hb-buffer.cc | 117 ++++++++++++++++++++++++++++++------------------------- + 1 file changed, 63 insertions(+), 54 deletions(-) + +commit a6a79df5fe2ed2cd307e7a991346faee164e70d9 +Author: Behdad Esfahbod +Date: Fri May 14 23:20:16 2010 -0400 + + Handle malloc failture in the buffer + + src/hb-buffer-private.hh | 5 ++-- + src/hb-buffer.cc | 71 +++++++++++++++++++++++++++++------------------- + src/hb-buffer.h | 2 +- + 3 files changed, 47 insertions(+), 31 deletions(-) + +commit ca54a12658510f9aa0b2db82f20a8fac230d6bb6 +Author: Behdad Esfahbod +Date: Fri May 14 22:25:42 2010 -0400 + + Minor + + src/hb-shape.cc | 60 +++++++++++++++++++++++++-------------------------------- + 1 file changed, 26 insertions(+), 34 deletions(-) + +commit 910a33fe8457a8e13f7eb77fc92fa59c31f5e8fd +Author: Behdad Esfahbod +Date: Fri May 14 22:13:38 2010 -0400 + + Update buffer docs + + src/hb-buffer-private.hh | 13 +++++++------ + src/hb-buffer.cc | 16 ++++++++-------- + 2 files changed, 15 insertions(+), 14 deletions(-) + +commit 36b73c80df91e96492357c6da945e081e9046a93 +Author: Behdad Esfahbod +Date: Fri May 14 22:10:39 2010 -0400 + + Shortening buffer accessors: rename buffer->in_pos to buffer->i + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 52 ++++++++++---------- + src/hb-ot-layout-gpos-private.hh | 94 ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 48 +++++++++--------- + src/hb-ot-layout-gsubgpos-private.hh | 46 +++++++++--------- + src/hb-shape.cc | 40 +++++++-------- + 6 files changed, 141 insertions(+), 141 deletions(-) + +commit 29427c5c51ac70aca53ed523fa5ddb3de4355fb0 +Author: Behdad Esfahbod +Date: Fri May 14 22:08:22 2010 -0400 + + Shortening buffer accessors: rename buffer->out_length to buffer->out_len + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 52 ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 6 ++--- + 4 files changed, 31 insertions(+), 31 deletions(-) + +commit 6960350be97f24e97140391025b56369c393a3df +Author: Behdad Esfahbod +Date: Fri May 14 22:07:46 2010 -0400 + + Shortening buffer accessors: rename buffer->in_length to buffer->len + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 26 +++++++++++++------------- + src/hb-ot-layout-gpos-private.hh | 8 ++++---- + src/hb-ot-layout-gsub-private.hh | 8 ++++---- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + src/hb-shape.cc | 12 ++++++------ + 6 files changed, 32 insertions(+), 32 deletions(-) + +commit 1b621823f3e31b48c80cc8b0691dfa873ba086cd +Author: Behdad Esfahbod +Date: Fri May 14 22:05:53 2010 -0400 + + Shortening buffer accessors: rename buffer->positions to buffer->pos + + src/hb-buffer-private.hh | 4 ++-- + src/hb-buffer.cc | 32 ++++++++++++++++---------------- + src/hb-ot-layout-gpos-private.hh | 26 +++++++++++++------------- + src/hb-shape.cc | 10 +++++----- + 4 files changed, 36 insertions(+), 36 deletions(-) + +commit 9d5e26df0877aa5b187764ba09bd7bf221e92968 +Author: Behdad Esfahbod +Date: Fri May 14 22:03:11 2010 -0400 + + Shortening buffer accessors: rename buffer->out_string to buffer->out_info + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 56 ++++++++++++++++++------------------ + src/hb-ot-layout-gsubgpos-private.hh | 4 +-- + 3 files changed, 31 insertions(+), 31 deletions(-) + +commit 7e7007a1c9bf2c07a8369752126ece8fa6164248 +Author: Behdad Esfahbod +Date: Fri May 14 22:02:37 2010 -0400 + + Shortening buffer accessors: rename buffer->in_string to buffer->info + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 82 ++++++++++++++++++------------------ + src/hb-ot-layout-gpos-private.hh | 58 ++++++++++++------------- + src/hb-ot-layout-gsub-private.hh | 30 ++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 26 ++++++------ + src/hb-shape.cc | 18 ++++---- + 6 files changed, 108 insertions(+), 108 deletions(-) + +commit 8e6b6bb2932946ebc7b01c3abf575b654c741e20 +Author: Behdad Esfahbod +Date: Fri May 14 21:58:22 2010 -0400 + + Merge buffer->out_pos and buffer->out_length + + src/hb-buffer-private.hh | 1 - + src/hb-buffer.cc | 48 +++++++++++++++--------------------- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 6 ++--- + 4 files changed, 24 insertions(+), 33 deletions(-) + +commit 22f668eb9ad5f62d9fcd2e0c826ea78977687e5c +Author: Behdad Esfahbod +Date: Fri May 14 21:41:04 2010 -0400 + + Remove the unused BUFFER macro + + src/hb-buffer-private.hh | 6 ------ + src/hb-ot-layout-gpos-private.hh | 6 ------ + src/hb-ot-layout-gsub-private.hh | 6 ------ + src/hb-ot-layout-gsubgpos-private.hh | 5 ----- + 4 files changed, 23 deletions(-) + +commit 7e53ebe478597778c25c197ff9f0cb379f1d0043 +Author: Behdad Esfahbod +Date: Fri May 14 21:38:13 2010 -0400 + + Remove the IN_CURGLYPH() macro + + src/hb-buffer-private.hh | 3 --- + src/hb-ot-layout-gpos-private.hh | 24 ++++++++++++------------ + src/hb-ot-layout-gsub-private.hh | 16 ++++++++-------- + src/hb-ot-layout-gsubgpos-private.hh | 16 ++++++++-------- + src/hb-shape.cc | 14 +++++++------- + 5 files changed, 35 insertions(+), 38 deletions(-) + +commit d784da1923ff2ca093f8b0210449731d376b7513 +Author: Behdad Esfahbod +Date: Fri May 14 21:37:18 2010 -0400 + + Remove the IN_CURINFO() macro + + src/hb-buffer-private.hh | 1 - + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 4 files changed, 4 insertions(+), 5 deletions(-) + +commit 281f59b4fb16f7c73767eb042a91f70f4c109b3a +Author: Behdad Esfahbod +Date: Fri May 14 21:34:22 2010 -0400 + + Remove IN_INFO() and IN_NEXTGLYPH() macros + + src/hb-buffer-private.hh | 2 -- + src/hb-ot-layout-gpos-private.hh | 10 +++++----- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + src/hb-shape.cc | 4 ++-- + 5 files changed, 10 insertions(+), 12 deletions(-) + +commit 6e489cdf7623ac627d06d59a80ecea03ca97dc1b +Author: Behdad Esfahbod +Date: Fri May 14 21:07:35 2010 -0400 + + Remove the IN_GLYPH() macro + + src/hb-buffer-private.hh | 1 - + src/hb-ot-layout-gpos-private.hh | 12 ++++++------ + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + src/hb-shape.cc | 2 +- + 5 files changed, 10 insertions(+), 11 deletions(-) + +commit 01feb74c78a3a302fa3472a0be7b2a1d52fd1ba3 +Author: Behdad Esfahbod +Date: Fri May 14 21:00:08 2010 -0400 + + Remove the IN_CLUSTER() macro + + src/hb-buffer-private.hh | 1 - + src/hb-shape.cc | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +commit d63a1e089acad9ab9f80addd936d36b6d38fb46a +Author: Behdad Esfahbod +Date: Fri May 14 20:30:07 2010 -0400 + + Remove the IN_MASK() macro + + src/hb-buffer-private.hh | 1 - + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + 3 files changed, 3 insertions(+), 4 deletions(-) + +commit 89e2834dabd2d17f2823c51fe3a7fcadeaba7a59 +Author: Behdad Esfahbod +Date: Fri May 14 20:25:55 2010 -0400 + + Remove the IN_LIGID() macro + + src/hb-buffer-private.hh | 1 - + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 2 +- + 3 files changed, 3 insertions(+), 4 deletions(-) + +commit 4a871041f4718834afa312ed17cdd157603468b7 +Author: Behdad Esfahbod +Date: Fri May 14 20:25:04 2010 -0400 + + Remove IN_COMPONENT() macro + + src/hb-buffer-private.hh | 1 - + src/hb-ot-layout-gpos-private.hh | 8 ++++---- + src/hb-ot-layout-gsub-private.hh | 2 +- + 3 files changed, 5 insertions(+), 6 deletions(-) + +commit 27da6dd89a359f7ef340c646c4cb79373782261d +Author: Behdad Esfahbod +Date: Fri May 14 20:17:50 2010 -0400 + + Remove OUT_GLYPH() and OUT_INFO() macros + + src/hb-buffer-private.hh | 2 -- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +commit cc6ae7ff91eeb93bef153f331ed02b500062f90e +Author: Behdad Esfahbod +Date: Fri May 14 20:09:48 2010 -0400 + + Fix lookahead matching. Oops! + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3109375b849f340b4807724218010c53dea58082 +Author: Behdad Esfahbod +Date: Fri May 14 19:55:27 2010 -0400 + + Remove POSITION() and CURPOSITION() macros + + src/hb-buffer-private.hh | 2 -- + src/hb-ot-layout-gpos-private.hh | 54 ++++++++++++++++++++-------------------- + src/hb-shape.cc | 10 ++++---- + 3 files changed, 32 insertions(+), 34 deletions(-) + +commit d7cfb3b2d1dd2e9fdae2b3e540bbe313660895e8 +Author: Behdad Esfahbod +Date: Thu May 13 14:18:49 2010 -0400 + + s/\/c/g + + src/hb-open-file-private.hh | 28 +-- + src/hb-open-type-private.hh | 100 ++++---- + src/hb-ot-layout-common-private.hh | 84 +++---- + src/hb-ot-layout-gdef-private.hh | 98 ++++---- + src/hb-ot-layout-gpos-private.hh | 460 +++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 306 +++++++++++------------ + src/hb-ot-layout-gsubgpos-private.hh | 258 ++++++++++---------- + src/hb-ot-layout.cc | 24 +- + 8 files changed, 679 insertions(+), 679 deletions(-) + +commit f679635893eebc13402c5ee51a6f106eed0c76be +Author: Behdad Esfahbod +Date: Thu May 13 13:34:17 2010 -0400 + + Don't use variable-length-arrays + + src/hb-open-type-private.hh | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 72071a8afaba2952fe42be093024ae9dbd37f233 +Author: Behdad Esfahbod +Date: Thu May 13 13:22:24 2010 -0400 + + Add a few more buffer convenience methods + + src/hb-buffer-private.hh | 12 ++++++++++++ + src/hb-ot-layout-gsub-private.hh | 20 ++++++++++---------- + 2 files changed, 22 insertions(+), 10 deletions(-) + +commit 11a81612e51c598e857507c268312206423cbfca +Author: Behdad Esfahbod +Date: Thu May 13 00:01:40 2010 -0400 + + Minor + + src/hb-unicode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3f93518a634cb1852bf050877db23b9b9203ad03 +Author: Behdad Esfahbod +Date: Wed May 12 23:48:40 2010 -0400 + + Improve check for internal symbols + + src/check-internal-symbols.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 357d0f29c431b842179ee4b56c21bcc402178ce7 +Author: Behdad Esfahbod +Date: Wed May 12 23:46:16 2010 -0400 + + Make HB_PRIVATE more useful + + So we can apply it to class methods also. Not sure if that works! + + src/hb-blob-private.h | 2 +- + src/hb-font-private.hh | 4 ++-- + src/hb-private.h | 2 +- + src/hb-unicode-private.h | 3 +-- + 4 files changed, 5 insertions(+), 6 deletions(-) + +commit 1d5e78013696b10751d8a35027619e81978e1312 +Author: Behdad Esfahbod +Date: Wed May 12 23:43:00 2010 -0400 + + Add a few other buffer methods + + src/hb-buffer-private.hh | 11 +++++++---- + src/hb-buffer.cc | 7 ------- + src/hb-ot-layout-gsub-private.hh | 10 +++++----- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 4 files changed, 14 insertions(+), 18 deletions(-) + +commit d0316a81f59a4e814b0af78797d915d7ce04d119 +Author: Behdad Esfahbod +Date: Wed May 12 23:34:52 2010 -0400 + + Add buffer->swap() + + src/hb-buffer-private.hh | 68 ++++++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 2 +- + 2 files changed, 38 insertions(+), 32 deletions(-) + +commit 3b649a38b5772dd7aba7f07ff7698a7f427f421f +Author: Behdad Esfahbod +Date: Wed May 12 23:28:38 2010 -0400 + + Add check for internal symbols + + src/Makefile.am | 3 ++- + src/check-internal-symbols.sh | 28 ++++++++++++++++++++++++++++ + 2 files changed, 30 insertions(+), 1 deletion(-) + +commit eee8598d75d3af692d9ececf7e8ac458e892ba9e +Author: Behdad Esfahbod +Date: Wed May 12 23:22:55 2010 -0400 + + Hide internal symbols + + src/hb-ot-layout-private.hh | 4 ++-- + src/hb-private.h | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 8951fc2c82f2db4865da6d9e303fce419b6363bb +Author: Behdad Esfahbod +Date: Wed May 12 23:13:39 2010 -0400 + + Add buffer->allocate_lig_id() + + src/hb-buffer-private.hh | 5 ++--- + src/hb-buffer.cc | 6 ------ + src/hb-ot-layout-gsub-private.hh | 4 ++-- + 3 files changed, 4 insertions(+), 11 deletions(-) + +commit 1ce4dc95dbb28842085342aea4f9d12cbe9671a9 +Author: Behdad Esfahbod +Date: Wed May 12 18:29:25 2010 -0400 + + Use bit tricks for HB_DIRECTION_IS_* + + We already depend on the exact values of the direction enum + in HB_DIRECTION_REVERSE(), so we may as well use that. + + src/hb-common.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 22da7fd94d6318c52df69d70470a85464ffc533d +Author: Behdad Esfahbod +Date: Wed May 12 18:23:21 2010 -0400 + + Rename a few files to be C++ sources + + In anticipation for buffer revamp coming. + + src/Makefile.am | 16 ++++++++-------- + src/{hb-buffer-private.h => hb-buffer-private.hh} | 2 +- + src/{hb-buffer.c => hb-buffer.cc} | 14 +++++++------- + src/hb-common.h | 1 + + src/{hb-font-private.h => hb-font-private.hh} | 2 +- + src/hb-font.cc | 4 ++-- + src/{hb-ft.c => hb-ft.cc} | 8 ++++---- + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/{hb-ot-layout-private.h => hb-ot-layout-private.hh} | 2 +- + src/hb-ot-layout.cc | 2 +- + src/{hb-ot-shape-private.h => hb-ot-shape-private.hh} | 0 + src/{hb-ot-shape.c => hb-ot-shape.cc} | 4 ++-- + src/{hb-shape.c => hb-shape.cc} | 6 +++--- + 15 files changed, 34 insertions(+), 33 deletions(-) + +commit c3df649f258b334e93c7626a43cd8ebfbd5a610e +Author: Behdad Esfahbod +Date: Tue May 11 13:54:12 2010 -0400 + + Fix comment + + src/hb-buffer-private.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 281f08954a1d96d7807153c25073b8eb7630703b +Author: Behdad Esfahbod +Date: Tue May 11 11:37:58 2010 -0400 + + Remove obsolete friend + + src/hb-ot-layout-gpos-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 70c9bfd5646a4a55a7f43c0cf0b5ac5993615d5b +Author: Behdad Esfahbod +Date: Tue May 11 00:23:50 2010 -0400 + + Simplify PairSet + + src/hb-ot-layout-gpos-private.hh | 101 +++++++++++++++++++++------------------ + 1 file changed, 54 insertions(+), 47 deletions(-) + +commit 97e7f8f305c47caf2968a9da3b8407825547286d +Author: Behdad Esfahbod +Date: Tue May 11 00:11:36 2010 -0400 + + Add CONST_FUNC annotation + + src/hb-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 494d28ad988e505c1c45cc35a7ec6b880cfec5fc +Author: Behdad Esfahbod +Date: Mon May 10 23:50:07 2010 -0400 + + Simplify likely() implementation + + Shrinks .text by 1%! + + src/hb-private.h | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +commit 75651b20871047d3ec17f4221794b8ef5d60e14b +Author: Behdad Esfahbod +Date: Mon May 10 23:44:51 2010 -0400 + + Fix warnings + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4c20d8c057738b66150a88472714690e137884f8 +Author: Behdad Esfahbod +Date: Mon May 10 23:27:54 2010 -0400 + + Sprinkle a few strategic likely()'s + + Shrinks the code size by some 2% even. + + src/hb-open-file-private.hh | 4 ++-- + src/hb-open-type-private.hh | 20 ++++++++++---------- + 2 files changed, 12 insertions(+), 12 deletions(-) + +commit 69cb28bc13d236a01acf40da62e345c7e83ccba7 +Author: Behdad Esfahbod +Date: Mon May 10 23:13:08 2010 -0400 + + Remove a few likely()'s + + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 24552ecf92982fe561dc47d5102fcf1a7b337c70 +Author: Behdad Esfahbod +Date: Mon May 10 23:08:41 2010 -0400 + + Remove excess sub_format sanitize + + src/hb-ot-layout-gpos-private.hh | 1 - + src/hb-ot-layout-gsub-private.hh | 1 - + 2 files changed, 2 deletions(-) + +commit f7adc5e9be352ac31ad3ab847abb6fceb239aa12 +Author: Behdad Esfahbod +Date: Mon May 10 22:41:50 2010 -0400 + + Shrink NullPool now that we have accurate size tracking + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3d44fb6f15177dc6518166e435597936b044acc1 +Author: Behdad Esfahbod +Date: Mon May 10 22:22:54 2010 -0400 + + Fix warning + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b5db4f1e4eefa266a71a28b5496f47ff9d1a81e8 +Author: Behdad Esfahbod +Date: Mon May 10 22:22:22 2010 -0400 + + Clean up NO_INDEX + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 10 ++++++---- + src/hb-ot-layout-common-private.hh | 17 ++++------------- + src/hb-ot-layout.cc | 8 ++++---- + src/main.cc | 2 +- + 5 files changed, 16 insertions(+), 23 deletions(-) + +commit fe9bc070e1d545b0df2ea548eebf5a1fc4c92ddc +Author: Behdad Esfahbod +Date: Mon May 10 21:39:24 2010 -0400 + + Fix awful confusion between lookup format and subtable format + + As reported by John Daggett. + + src/hb-ot-layout-gpos-private.hh | 14 +++++++------- + src/hb-ot-layout-gsub-private.hh | 14 +++++++------- + 2 files changed, 14 insertions(+), 14 deletions(-) + +commit 458ecbb60bb7e8e32aca62a562586d921d5396aa +Author: Behdad Esfahbod +Date: Mon May 10 21:11:35 2010 -0400 + + Fix tracing order + + src/hb-open-type-private.hh | 14 +++++--------- + src/hb-ot-layout-gsubgpos-private.hh | 3 +-- + 2 files changed, 6 insertions(+), 11 deletions(-) + +commit 48146e5612f6d272d6962f6829c6d64a31edef89 +Author: Behdad Esfahbod +Date: Mon May 10 20:07:56 2010 -0400 + + Don't fail sanitize on NULL data + + src/hb-open-type-private.hh | 5 +++++ + 1 file changed, 5 insertions(+) + +commit d2c2ca8faf62fc380d4717d286556139a62d2356 +Author: Behdad Esfahbod +Date: Mon May 10 19:58:25 2010 -0400 + + Fix comment + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b435ab7e29c388e3b100f729957319931625a3a8 +Author: Behdad Esfahbod +Date: Mon May 10 19:51:57 2010 -0400 + + Fix accessing tables from NULL pointer + + src/hb-font.cc | 2 +- + src/hb-open-type-private.hh | 5 +++++ + src/hb-ot-layout.cc | 6 +++--- + 3 files changed, 9 insertions(+), 4 deletions(-) + +commit dacebcadae36b35531d635d81df2afb937677b7a +Author: Behdad Esfahbod +Date: Mon May 10 19:45:41 2010 -0400 + + Simplify unions + + src/hb-open-file-private.hh | 24 +++---- + src/hb-ot-layout-common-private.hh | 24 +++---- + src/hb-ot-layout-gdef-private.hh | 24 +++---- + src/hb-ot-layout-gpos-private.hh | 120 +++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 88 ++++++++++++------------- + src/hb-ot-layout-gsubgpos-private.hh | 44 ++++++------- + 6 files changed, 163 insertions(+), 161 deletions(-) + +commit fd671e02433bcbc1fd07901fa2d6065020f41ba8 +Author: Behdad Esfahbod +Date: Mon May 10 19:02:32 2010 -0400 + + Remove unused macro + + src/hb-open-type-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 0eb9fc6e37935707dba2bf4b3705de2161a08cb7 +Author: Behdad Esfahbod +Date: Mon May 10 19:01:17 2010 -0400 + + Change DEFINE_SIZE_VAR to DEFINE_SIZE_ARRAY + + src/hb-open-file-private.hh | 4 ++-- + src/hb-open-type-private.hh | 10 +++++----- + src/hb-ot-layout-common-private.hh | 27 +++++++++++++++------------ + src/hb-ot-layout-gdef-private.hh | 10 +++++----- + src/hb-ot-layout-gpos-private.hh | 25 ++++++++++++------------- + src/hb-ot-layout-gsub-private.hh | 14 +++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 16 ++++++++-------- + 7 files changed, 54 insertions(+), 52 deletions(-) + +commit 596e471aa5053d955fb5d5b5923088c8814469b1 +Author: Behdad Esfahbod +Date: Mon May 10 18:47:48 2010 -0400 + + Cleanup DEFINE_SIZE_VAR2 + + src/hb-open-type-private.hh | 18 +++++++++++------- + src/hb-ot-layout-common-private.hh | 6 +++--- + src/hb-ot-layout-gdef-private.hh | 4 ++-- + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 6 files changed, 21 insertions(+), 17 deletions(-) + +commit 33afa4e2dc352f08cc094703e3f01d3ecd83b354 +Author: Behdad Esfahbod +Date: Mon May 10 18:35:02 2010 -0400 + + Minor + + src/hb-open-type-private.hh | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit b961518b9611471ff7060e97686e5625974847eb +Author: Behdad Esfahbod +Date: Mon May 10 18:20:54 2010 -0400 + + Simplify array access + + src/hb-open-type-private.hh | 29 ++++++++++------------------- + src/hb-ot-layout-common-private.hh | 8 ++++---- + src/hb-ot-layout-gsub-private.hh | 6 +++--- + src/hb-ot-layout-gsubgpos-private.hh | 16 ++++++++-------- + 4 files changed, 25 insertions(+), 34 deletions(-) + +commit 54842374c2b291ef208c51ae1d853ec0403ccf84 +Author: Behdad Esfahbod +Date: Mon May 10 18:13:32 2010 -0400 + + Fix check_struct to check min_size instead of sizeof + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ed07422c33bbb52ff4d79e65986171e3f07697d8 +Author: Behdad Esfahbod +Date: Mon May 10 18:08:46 2010 -0400 + + Further cleanup of sizeof + + src/hb-open-type-private.hh | 7 +++++-- + src/hb-ot-layout-common-private.hh | 4 ++++ + src/hb-ot-layout-gdef-private.hh | 4 ++++ + src/hb-ot-layout-gpos-private.hh | 10 +++++++--- + src/hb-ot-layout-gsub-private.hh | 4 +++- + src/hb-ot-layout-gsubgpos-private.hh | 2 ++ + 6 files changed, 25 insertions(+), 6 deletions(-) + +commit a82ef7a893b773a17f7548375de9f588dfc83aba +Author: Behdad Esfahbod +Date: Mon May 10 17:55:03 2010 -0400 + + Remove CastP completely + + src/hb-open-type-private.hh | 39 +++++++++++++++++---------------------- + 1 file changed, 17 insertions(+), 22 deletions(-) + +commit 40cbefe858192531ed64dd51d402f7ca7b8153a3 +Author: Behdad Esfahbod +Date: Mon May 10 17:47:22 2010 -0400 + + Remove unnecessary casts + + src/hb-open-type-private.hh | 12 ++++++------ + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 34 +++++++++++++++++----------------- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 34 +++++++++++++++++----------------- + 5 files changed, 43 insertions(+), 43 deletions(-) + +commit 09766b1ec5ec55a61edbcd7a89ed3613cc92d4cb +Author: Behdad Esfahbod +Date: Mon May 10 17:36:03 2010 -0400 + + Make StructAtOffset take a pointer + + Is safer. + + src/hb-open-type-private.hh | 26 +++++++++++++------------- + src/hb-ot-layout-gpos-private.hh | 6 +++--- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + 3 files changed, 18 insertions(+), 18 deletions(-) + +commit bea34c7cbb583cf7660776e95cab3171590b8427 +Author: Behdad Esfahbod +Date: Mon May 10 17:28:16 2010 -0400 + + Further cleanup of DEFINE_SIZE + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 10 +++++----- + src/hb-ot-layout-common-private.hh | 16 ++++++++-------- + src/hb-ot-layout-gdef-private.hh | 8 ++++---- + src/hb-ot-layout-gpos-private.hh | 16 +++++----------- + src/hb-ot-layout-gsub-private.hh | 14 +++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 14 +++++++------- + 7 files changed, 37 insertions(+), 43 deletions(-) + +commit 0abcc3b48cfd51a22695c9e988938b2f45cb19d8 +Author: Behdad Esfahbod +Date: Mon May 10 17:04:20 2010 -0400 + + Cleanup + + src/hb-open-type-private.hh | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +commit b3651231bf80bb7009214547a75ed90e21815c68 +Author: Behdad Esfahbod +Date: Mon May 10 16:57:29 2010 -0400 + + Remove ASSERT_SIZE in favor of the safer DEFINE_SIZE_STATIC + + src/hb-open-file-private.hh | 3 ++- + src/hb-open-type-private.hh | 20 +++++++++++++--- + src/hb-ot-layout-common-private.hh | 24 ++++++++++++-------- + src/hb-ot-layout-gdef-private.hh | 22 +++++++++++------- + src/hb-ot-layout-gpos-private.hh | 44 ++++++++++++++++++++---------------- + src/hb-ot-layout-gsub-private.hh | 32 ++++++++++++++++---------- + src/hb-ot-layout-gsubgpos-private.hh | 27 ++++++++++++++-------- + src/hb-private.h | 2 -- + 8 files changed, 109 insertions(+), 65 deletions(-) + +commit 569da92bc6956f42d9b2d65c784e184fb6380efe +Author: Behdad Esfahbod +Date: Mon May 10 16:38:32 2010 -0400 + + Cleanup ASSERT_SIZE_VAR + + src/hb-open-file-private.hh | 9 ++++++--- + src/hb-open-type-private.hh | 6 ++++-- + src/hb-ot-layout-common-private.hh | 22 ++++++++++++---------- + src/hb-ot-layout-gdef-private.hh | 3 ++- + src/hb-ot-layout-gpos-private.hh | 30 +++++++++++++++++++----------- + src/hb-ot-layout-gsubgpos-private.hh | 10 ++++++---- + src/hb-private.h | 8 -------- + 7 files changed, 49 insertions(+), 39 deletions(-) + +commit 99bf03459ff2f00cf3fb7fa3c8b8336ec9fcca56 +Author: Behdad Esfahbod +Date: Thu May 6 19:37:32 2010 -0400 + + Whitespace + + src/hb-ot-layout-gpos-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 65f46b00333e20ab8a52a4b350747507541ec1db +Author: Behdad Esfahbod +Date: Thu May 6 19:35:19 2010 -0400 + + Simplify DEFINE_NULL_DATA + + Using ::min_size. + + src/hb-open-type-private.hh | 6 +++--- + src/hb-ot-layout-common-private.hh | 9 +++++---- + 2 files changed, 8 insertions(+), 7 deletions(-) + +commit e45d3f86f9a5f3d29ca35a282de7f98e702878f9 +Author: Behdad Esfahbod +Date: Thu May 6 19:33:31 2010 -0400 + + Start cleaning up get_size() + + So we know when the size is static and when dynamic. + + src/hb-open-file-private.hh | 7 +++--- + src/hb-open-type-private.hh | 42 +++++++++++++++++++++++++----------- + src/hb-ot-layout-common-private.hh | 14 ++++++------ + src/hb-ot-layout-gpos-private.hh | 17 ++++++--------- + src/hb-ot-layout-gsubgpos-private.hh | 19 ++++++++-------- + 5 files changed, 55 insertions(+), 44 deletions(-) + +commit b157617644d1e38f680163889d1dc2e2f64d9ba3 +Author: Behdad Esfahbod +Date: Thu May 6 14:48:27 2010 -0400 + + Remove the last of SANITIZE macros: SANITIZE_SELF + + src/hb-open-file-private.hh | 4 ++-- + src/hb-open-type-private.hh | 21 ++++++++++++--------- + src/hb-ot-layout-common-private.hh | 16 ++++++++-------- + src/hb-ot-layout-gdef-private.hh | 6 +++--- + src/hb-ot-layout-gpos-private.hh | 26 +++++++++++++------------- + src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- + 6 files changed, 41 insertions(+), 38 deletions(-) + +commit 4f252fedc7136c66a9d7fbcb2978581986da6227 +Author: Behdad Esfahbod +Date: Thu May 6 13:30:23 2010 -0400 + + Remove SANITIZE macro + + src/hb-open-file-private.hh | 4 ++-- + src/hb-open-type-private.hh | 6 ++---- + src/hb-ot-layout-common-private.hh | 18 +++++++++--------- + src/hb-ot-layout-gdef-private.hh | 6 +++--- + src/hb-ot-layout-gpos-private.hh | 18 +++++++++--------- + src/hb-ot-layout-gsub-private.hh | 26 +++++++++++++------------- + src/hb-ot-layout-gsubgpos-private.hh | 22 +++++++++++----------- + 7 files changed, 49 insertions(+), 51 deletions(-) + +commit c2ddfd2d268385257c77c09a9abeacf4230d5377 +Author: Behdad Esfahbod +Date: Thu May 6 13:06:15 2010 -0400 + + Cleanup Value casts + + src/hb-ot-layout-gpos-private.hh | 34 +++++++++++++++++++++------------- + 1 file changed, 21 insertions(+), 13 deletions(-) + +commit 41a93d2c1ff175ef06328a99983577459c2d34b0 +Author: Behdad Esfahbod +Date: Thu May 6 12:55:14 2010 -0400 + + Remove SANITIZE_WITH_BASE + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 2 - + src/hb-ot-layout-common-private.hh | 6 +-- + src/hb-ot-layout-gdef-private.hh | 24 +++++----- + src/hb-ot-layout-gpos-private.hh | 90 ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 31 ++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 44 +++++++++--------- + 7 files changed, 98 insertions(+), 101 deletions(-) + +commit f5fab0c71837371cce32dc3e9edca1ccb8d44e29 +Author: Behdad Esfahbod +Date: Thu May 6 10:26:52 2010 -0400 + + Remove SANITIZE_MEM + + src/hb-open-type-private.hh | 4 +--- + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- + 4 files changed, 6 insertions(+), 8 deletions(-) + +commit 4ad2cc5dec6b0639da2b1846282bdd99d06d5ff1 +Author: Behdad Esfahbod +Date: Thu May 6 09:24:24 2010 -0400 + + Rename check to check_range + + src/hb-open-type-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 1cd1e117d060d38e314618b627d7663cb01ed584 +Author: Behdad Esfahbod +Date: Wed May 5 20:15:14 2010 -0400 + + Remove SANITIZE_ARRAY + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 16 +++++++--------- + src/hb-ot-layout-gpos-private.hh | 8 ++++---- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 4 files changed, 14 insertions(+), 16 deletions(-) + +commit 583d7f9586ce69754f1354aa3895e6d732a0c2ce +Author: Behdad Esfahbod +Date: Wed May 5 01:49:22 2010 -0400 + + Cosmetic + + src/hb-open-file-private.hh | 3 ++- + src/hb-open-type-private.hh | 6 ++++-- + src/hb-ot-layout-common-private.hh | 15 ++++++++++----- + src/hb-ot-layout-gpos-private.hh | 5 ++--- + src/hb-ot-layout-gsub-private.hh | 3 ++- + src/hb-ot-layout-gsubgpos-private.hh | 9 +++++---- + 6 files changed, 25 insertions(+), 16 deletions(-) + +commit 705e215268aa95c2bc6af8af9b48b72b690ec1f7 +Author: Behdad Esfahbod +Date: Wed May 5 01:40:25 2010 -0400 + + Minor + + src/hb-open-type-private.hh | 4 ++-- + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +commit b18eafd0f62f854d15276c78f99843aecd47acad +Author: Behdad Esfahbod +Date: Wed May 5 01:39:26 2010 -0400 + + Minor + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4169710911450e0f9bc045fe279bfc8ba9e8457c +Author: Behdad Esfahbod +Date: Wed May 5 01:37:58 2010 -0400 + + Simplify chaining + + src/hb-ot-layout-gsubgpos-private.hh | 61 +++++++++++++++--------------------- + 1 file changed, 25 insertions(+), 36 deletions(-) + +commit 1911b9d21b2b7b6b8219ce6c888540e3a60aa9c3 +Author: Behdad Esfahbod +Date: Wed May 5 01:32:04 2010 -0400 + + Remove APPLY_ARG_DEF and APPLY_ARG + + src/hb-ot-layout-gpos-private.hh | 92 ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 88 +++++++++++++++++----------------- + src/hb-ot-layout-gsubgpos-private.hh | 89 ++++++++++++++++------------------ + 3 files changed, 132 insertions(+), 137 deletions(-) + +commit 6c42cddfe53a1c664081862bb9a3e1c38d05a823 +Author: Behdad Esfahbod +Date: Wed May 5 01:30:48 2010 -0400 + + Port apply to use hb_trace_t + + src/hb-ot-layout-gpos-private.hh | 9 ++++----- + src/hb-ot-layout-gsub-private.hh | 11 +++++------ + src/hb-ot-layout-gsubgpos-private.hh | 13 +++++-------- + 3 files changed, 14 insertions(+), 19 deletions(-) + +commit 969c9705ae0c64577c3f69f5300fec975f952e1f +Author: Behdad Esfahbod +Date: Wed May 5 01:23:44 2010 -0400 + + Move context_length into apply_context + + src/hb-ot-layout-gpos-private.hh | 9 ++--- + src/hb-ot-layout-gsub-private.hh | 9 ++--- + src/hb-ot-layout-gsubgpos-private.hh | 70 ++++++++++++++++++++---------------- + 3 files changed, 50 insertions(+), 38 deletions(-) + +commit 94a23aaeca39c662614037ef887412249bdc8d49 +Author: Behdad Esfahbod +Date: Wed May 5 01:13:09 2010 -0400 + + Move buffer into apply_context + + src/hb-buffer-private.h | 30 +++++++++-------- + src/hb-ot-layout-gpos-private.hh | 64 ++++++++++++++++++++---------------- + src/hb-ot-layout-gsub-private.hh | 45 ++++++++++++++----------- + src/hb-ot-layout-gsubgpos-private.hh | 49 ++++++++++++++------------- + 4 files changed, 106 insertions(+), 82 deletions(-) + +commit 63493f956dca519df49da0a6badc3cb0a1b92779 +Author: Behdad Esfahbod +Date: Wed May 5 01:01:05 2010 -0400 + + Move layout_context into apply_context + + src/hb-ot-layout-gpos-private.hh | 105 ++++++++++++++++++----------------- + src/hb-ot-layout-gsub-private.hh | 47 ++++++++-------- + src/hb-ot-layout-gsubgpos-private.hh | 11 ++-- + 3 files changed, 82 insertions(+), 81 deletions(-) + +commit fff9aa263d1daf7c5117cf383fafa5043d5eb5af +Author: Behdad Esfahbod +Date: Wed May 5 00:32:21 2010 -0400 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 27e302dc8e794ff6bf878bc76e17d336d510849e +Author: Behdad Esfahbod +Date: Wed May 5 00:26:16 2010 -0400 + + I keep changing my mind about this + + src/hb-open-type-private.hh | 30 ++++++++++-------------------- + 1 file changed, 10 insertions(+), 20 deletions(-) + +commit 39840474afd2cda9ff576c08aff9c87095496c27 +Author: Behdad Esfahbod +Date: Wed May 5 00:23:19 2010 -0400 + + Remove SANITIZE_ARG_DEF and SANITIZE_ARG + + src/hb-open-file-private.hh | 16 ++--- + src/hb-open-type-private.hh | 59 +++++++-------- + src/hb-ot-layout-common-private.hh | 42 +++++------ + src/hb-ot-layout-gdef-private.hh | 28 ++++---- + src/hb-ot-layout-gpos-private.hh | 136 +++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 72 +++++++++---------- + src/hb-ot-layout-gsubgpos-private.hh | 46 ++++++------ + 7 files changed, 197 insertions(+), 202 deletions(-) + +commit b261e2ad5c5a065599ce1dbc4ba437caa2cee1e9 +Author: Behdad Esfahbod +Date: Wed May 5 00:20:16 2010 -0400 + + Remove trace from sanitize_shallow() + + src/hb-open-type-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit dfc8cbe85479dde1ffdc6b2e73f4907331d77a19 +Author: Behdad Esfahbod +Date: Wed May 5 00:19:46 2010 -0400 + + Add hb_trace_t + + src/hb-open-type-private.hh | 33 +++++++++++++++++++-------------- + 1 file changed, 19 insertions(+), 14 deletions(-) + +commit 20e3dd5d292b65f70d2eae63b8d8713a1c889d47 +Author: Behdad Esfahbod +Date: Tue May 4 23:21:57 2010 -0400 + + Make sanitize_depth variable automatic and not passed through function args + + src/hb-open-type-private.hh | 72 +++++++++++++++++++++++++++------------------ + 1 file changed, 43 insertions(+), 29 deletions(-) + +commit 4a446ac35136eff23d55f47bdd7b40095ad707ab +Author: Behdad Esfahbod +Date: Tue May 4 22:46:21 2010 -0400 + + Use function template for pass-thru argument + + src/hb-open-type-private.hh | 26 ++++++-------------------- + src/hb-ot-layout-gpos-private.hh | 6 +++--- + 2 files changed, 9 insertions(+), 23 deletions(-) + +commit 98daaf183d6dbf2b68959da608cd9876ba55d7aa +Author: Behdad Esfahbod +Date: Tue May 4 22:42:49 2010 -0400 + + Make _hb_sanitize_*() methods of the context object + + src/hb-open-type-private.hh | 190 +++++++++++++++++++++++--------------------- + 1 file changed, 98 insertions(+), 92 deletions(-) + +commit bb029af943faa9905e652d58856998687e60c31d +Author: Behdad Esfahbod +Date: Tue May 4 15:28:52 2010 -0400 + + Remove SANITIZE_THIS + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 3 +- + src/hb-ot-layout-common-private.hh | 4 +-- + src/hb-ot-layout-gdef-private.hh | 25 ++++++++-------- + src/hb-ot-layout-gpos-private.hh | 55 ++++++++++++++++++++---------------- + src/hb-ot-layout-gsub-private.hh | 29 ++++++++++--------- + src/hb-ot-layout-gsubgpos-private.hh | 42 +++++++++++++-------------- + 7 files changed, 85 insertions(+), 75 deletions(-) + +commit 2226fc93d1427b8830bfb892fe1b25b488ea36dc +Author: Behdad Esfahbod +Date: Tue May 4 15:12:17 2010 -0400 + + Rename SANITIZE_BASE to SANITIZE_WITH_BASE + + src/hb-open-type-private.hh | 11 +++++++---- + src/hb-ot-layout-common-private.hh | 3 ++- + src/hb-ot-layout-gpos-private.hh | 15 ++++++++------- + 3 files changed, 17 insertions(+), 12 deletions(-) + +commit 89da1346ec3a8dec8a368df46d61ca75356e22fa +Author: Behdad Esfahbod +Date: Tue May 4 15:01:45 2010 -0400 + + Remove SANITIZE_OBJ + + src/hb-open-type-private.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 4d4cce96266b777a01cec03e8766dc8c0b159351 +Author: Behdad Esfahbod +Date: Tue May 4 14:57:55 2010 -0400 + + Remove SANITIZE_THIS2 + + src/hb-open-type-private.hh | 2 -- + src/hb-ot-layout-common-private.hh | 3 ++- + src/hb-ot-layout-gdef-private.hh | 10 ++++++---- + src/hb-ot-layout-gpos-private.hh | 9 ++++++--- + src/hb-ot-layout-gsub-private.hh | 11 +++++++---- + src/hb-ot-layout-gsubgpos-private.hh | 14 +++++++++----- + 6 files changed, 30 insertions(+), 19 deletions(-) + +commit 26bfcb64e473c40e439d6efbe974781dada28eca +Author: Behdad Esfahbod +Date: Tue May 4 14:49:45 2010 -0400 + + Cosmetic + + src/hb-ot-layout-gdef-private.hh | 5 ++--- + src/hb-ot-layout-gsubgpos-private.hh | 7 +++---- + 2 files changed, 5 insertions(+), 7 deletions(-) + +commit be74284673a1944e0f1884e861c3fe8f9855172c +Author: Behdad Esfahbod +Date: Tue May 4 14:47:05 2010 -0400 + + Remove SANITIZE_THIS3 + + src/hb-open-type-private.hh | 1 - + src/hb-ot-layout-gpos-private.hh | 21 +++++++++++++++------ + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++++-- + 3 files changed, 21 insertions(+), 9 deletions(-) + +commit fbab9f9bd8ba59e7e5811f33c1dda198f95cf05a +Author: Behdad Esfahbod +Date: Tue May 4 14:42:10 2010 -0400 + + Remove SANITIZE_BASE2 + + src/hb-open-type-private.hh | 1 - + src/hb-ot-layout-gpos-private.hh | 3 ++- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 73c7dbf7f5433c0cdd467ef32402f52867e9798e +Author: Behdad Esfahbod +Date: Tue May 4 14:40:55 2010 -0400 + + Remove SANITIZE2 + + src/hb-open-type-private.hh | 1 - + src/hb-ot-layout-gsub-private.hh | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +commit c9f14687a30866181feb57ee2736a147ec9f25a1 +Author: Behdad Esfahbod +Date: Tue May 4 14:38:08 2010 -0400 + + Remove the NEUTER macro, move code to a method + + src/hb-open-type-private.hh | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +commit 30fa2821c277df99a14089749313dfe2b541e2d0 +Author: Behdad Esfahbod +Date: Tue May 4 14:28:18 2010 -0400 + + Make internal method private + + src/hb-open-type-private.hh | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit ce5694c79671bf75990923c1da17bb611e4e7d15 +Author: Behdad Esfahbod +Date: Tue May 4 14:10:18 2010 -0400 + + [main] Recognize Apple SFNTs + + src/hb-open-file-private.hh | 4 ++-- + src/main.cc | 6 ++++++ + 2 files changed, 8 insertions(+), 2 deletions(-) + +commit 710500a93ecc2a0c595045602aa367073485ff91 +Author: Behdad Esfahbod +Date: Mon May 3 23:11:16 2010 -0400 + + Comment new SFNT tags + + src/hb-open-file-private.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 64d3fc8d0dada673245cc8c0b1c12cd849b30997 +Author: Behdad Esfahbod +Date: Mon May 3 22:51:19 2010 -0400 + + Cosmetic: Rename HB_LIKELY/HB_UNLIKELY to likely/unlikely + + src/hb-buffer.c | 14 ++++---- + src/hb-font.cc | 6 ++-- + src/hb-ft.c | 14 ++++---- + src/hb-language.c | 2 +- + src/hb-object-private.h | 10 +++--- + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 38 ++++++++++----------- + src/hb-ot-layout-common-private.hh | 16 ++++----- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 64 ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 52 ++++++++++++++--------------- + src/hb-ot-layout-gsubgpos-private.hh | 40 +++++++++++----------- + src/hb-ot-layout.cc | 12 +++---- + src/hb-ot-tag.c | 2 +- + src/hb-private.h | 8 ++--- + src/hb-shape.c | 10 +++--- + src/hb-unicode.c | 2 +- + 17 files changed, 147 insertions(+), 147 deletions(-) + +commit fa3b3d58443a7c22eca3f86243993ba2d4bd9f4a +Author: Behdad Esfahbod +Date: Mon May 3 22:47:22 2010 -0400 + + Mark a couple functions as inline + + src/hb-open-type-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6b84198f9d471defb6f55d44d4f5423df70b2a10 +Merge: 631d10b7 eaf29edb +Author: Behdad Esfahbod +Date: Mon May 3 22:46:52 2010 -0400 + + Merge remote branch 'jrmuizel/master' + +commit eaf29edb8fa49390e5f48b78105dfd173aff445b +Author: Jeff Muizelaar +Date: Mon May 3 22:27:56 2010 -0400 + + HB_UNUSED is unneeded on static inline functions + + src/hb-object-private.h | 2 +- + src/hb-open-type-private.hh | 6 +++--- + src/hb-private.h | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit 4ce578ed369f1526c91deedcf9e72537b3e4328f +Author: Jeff Muizelaar +Date: Mon May 3 15:03:53 2010 -0400 + + Include the tags from the Apple specification for TrueType fonts + + src/hb-open-file-private.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 631d10b728d9e1a02c7dddf505d4fae5e244c6e8 +Author: Behdad Esfahbod +Date: Sun May 2 21:14:21 2010 -0400 + + Remove unused method + + src/hb-open-file-private.hh | 5 ----- + 1 file changed, 5 deletions(-) + +commit f0abcd69408a3af65207cdf8847575ade4579bd4 +Author: Behdad Esfahbod +Date: Sun May 2 18:14:25 2010 -0400 + + Whitespace + + src/hb-open-type-private.hh | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit a8d960bd26883ee937b04ca2a3c16a3644870356 +Author: Behdad Esfahbod +Date: Thu Apr 29 14:31:56 2010 -0400 + + [GPOS] Speedup apply_value() + + src/hb-ot-layout-gpos-private.hh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 2cd1ea4411d0808559a942ff3fa4e637f9c9a9c8 +Author: Behdad Esfahbod +Date: Thu Apr 29 14:15:32 2010 -0400 + + [ft] Disallow getting the entire font data with tag=0 + + src/hb-ft.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit 33d13fdda99acaeffa9600737e8870278d053ebe +Author: Behdad Esfahbod +Date: Thu Apr 29 13:56:44 2010 -0400 + + Rename HB_GNUC_UNUSED -> HB_UNUSED + + src/hb-buffer.c | 6 ++--- + src/hb-font.cc | 44 ++++++++++++++++++------------------ + src/hb-ft.c | 16 ++++++------- + src/hb-object-private.h | 2 +- + src/hb-open-type-private.hh | 18 +++++++-------- + src/hb-ot-layout-gdef-private.hh | 4 ++-- + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 6 ++--- + src/hb-ot-layout.cc | 4 ++-- + src/hb-ot-shape.c | 2 +- + src/hb-private.h | 16 ++++++------- + src/hb-shape.c | 32 +++++++++++++------------- + src/hb-unicode.c | 8 +++---- + 13 files changed, 81 insertions(+), 81 deletions(-) + +commit 7d3a126334f8e6f6441561c1bb592bd3fa7a2c5c +Author: Behdad Esfahbod +Date: Thu Apr 29 13:54:01 2010 -0400 + + Define HB_FUNC for portability to non-gcc + + src/hb-open-type-private.hh | 12 ++++++------ + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-private.h | 9 +++++++++ + 3 files changed, 16 insertions(+), 7 deletions(-) + +commit fa030175ca998b00cc42cbced6e98de323ec01ec +Author: Behdad Esfahbod +Date: Thu Apr 29 13:48:26 2010 -0400 + + [sanitize] Make debug code always available to the compiler + + Such that we don't break debug build all the time. + + src/hb-open-type-private.hh | 71 ++++++++++++++++++++------------------------- + 1 file changed, 31 insertions(+), 40 deletions(-) + +commit fde6f5bd682f5ad0cc5e2ec69fc831b0192bf90b +Author: Behdad Esfahbod +Date: Thu Apr 29 04:41:41 2010 -0400 + + Convert to uppercase in hb_ot_tag_from_language() + + src/hb-ot-tag.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 6f729b45b04243c42ad7201b67cda9d5e5c363f1 +Author: Behdad Esfahbod +Date: Thu Apr 29 03:59:06 2010 -0400 + + More contour point use + + src/hb-font.cc | 1 + + src/hb-ot-layout-gdef-private.hh | 8 +++++--- + src/hb-ot-layout-gpos-private.hh | 13 +++++++++---- + 3 files changed, 15 insertions(+), 7 deletions(-) + +commit 3840b6b50503ba2c9a99f774284e0077baffa8a0 +Author: Behdad Esfahbod +Date: Thu Apr 29 03:48:27 2010 -0400 + + [gdef] Fix delta scale + + src/hb-ot-layout-gdef-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4ac6cc284b2c1eb670c2a3659ec385ed729acac4 +Author: Behdad Esfahbod +Date: Thu Apr 29 03:48:11 2010 -0400 + + [gdef] Fix rounding + + src/hb-ot-layout-gdef-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b52fbb1bab608bda76efb936f08344afaec600a1 +Author: Behdad Esfahbod +Date: Thu Apr 29 03:47:00 2010 -0400 + + [gdef] Implement getting contour point + + src/hb-ot-layout-gdef-private.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 4c5fbae011a33b9efef5aedd61c357fc0ded1113 +Author: Behdad Esfahbod +Date: Thu Apr 29 03:39:39 2010 -0400 + + Make sure mirroring is done in original direction + + Reported by Jonathan Kew. + + src/hb-shape.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit ce23c9234b87513d6460fb89bad178fb8537e161 +Author: Behdad Esfahbod +Date: Thu Apr 29 03:31:03 2010 -0400 + + Use BCP47 private-use tags for OpenType tag language string mapping + + src/hb-ot-tag.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit eaf1d9a46c4a320f3b0026c0a610f95a620d566f +Author: Behdad Esfahbod +Date: Thu Apr 29 03:11:32 2010 -0400 + + Minor + + src/hb-ot-tag.c | 1 + + 1 file changed, 1 insertion(+) + +commit 3a4784fe88a0f14147ccdd3633952c9c0f3ae8f3 +Author: Behdad Esfahbod +Date: Thu Apr 29 02:58:38 2010 -0400 + + Fix bug in hb_language_from_string() + + Reported by Jonathan Kew. + + src/hb-language.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit 602e4f8d5512cdf48c696ad64ad62ff97f6dbdcc +Author: Behdad Esfahbod +Date: Thu Apr 29 02:28:54 2010 -0400 + + Use const_cast + + src/hb-open-type-private.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit abff3580a5b229641086e0da097efee11d22ff81 +Author: Behdad Esfahbod +Date: Thu Apr 29 02:27:20 2010 -0400 + + Add const + + src/hb-object-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6617eada95928457a25e29f793f1a93c6b3edaec +Author: Behdad Esfahbod +Date: Thu Apr 29 02:25:30 2010 -0400 + + Rename apply_context -> context + + src/hb-ot-layout-gpos-private.hh | 22 +++++++++++----------- + src/hb-ot-layout-gsub-private.hh | 26 +++++++++++++------------- + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++------ + 3 files changed, 30 insertions(+), 30 deletions(-) + +commit b4c7fab762935b9c182b3e2ac3415f29fc6a5558 +Author: Behdad Esfahbod +Date: Thu Apr 29 02:24:25 2010 -0400 + + Rename + + src/hb-ot-layout-gpos-private.hh | 98 ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 46 ++++++++--------- + src/hb-ot-layout-gsubgpos-private.hh | 12 ++--- + 3 files changed, 78 insertions(+), 78 deletions(-) + +commit 1376fb7bf9ef07970f0ba13dc64d6a8ab8252762 +Author: Behdad Esfahbod +Date: Thu Apr 29 02:19:21 2010 -0400 + + [apply] Use a context object to reduce number of parameters passed around + + src/hb-open-type-private.hh | 5 ++--- + src/hb-ot-layout-gpos-private.hh | 26 ++++++++++++++----------- + src/hb-ot-layout-gsub-private.hh | 37 +++++++++++++++++++----------------- + src/hb-ot-layout-gsubgpos-private.hh | 29 +++++++++++++++------------- + 4 files changed, 53 insertions(+), 44 deletions(-) + +commit 173fde7087c0db3e99409f1119530477c14072f5 +Author: Behdad Esfahbod +Date: Thu Apr 29 01:47:30 2010 -0400 + + Further simplify tracing + + src/hb-open-type-private.hh | 31 +++++++++++++++---------------- + src/hb-ot-layout-gpos-private.hh | 9 +++++---- + src/hb-ot-layout-gsub-private.hh | 11 ++++++----- + src/hb-ot-layout-gsubgpos-private.hh | 8 -------- + 4 files changed, 26 insertions(+), 33 deletions(-) + +commit bc200457430c083914a64bf4b056153506749610 +Author: Behdad Esfahbod +Date: Thu Apr 29 01:40:26 2010 -0400 + + Simplify trace code + + src/hb-open-type-private.hh | 41 +++++++++--------------------- + src/hb-ot-layout-gsubgpos-private.hh | 25 +++++-------------- + src/hb-private.h | 48 +++++++++++++++++++++++++----------- + 3 files changed, 51 insertions(+), 63 deletions(-) + +commit 807c5b03a2251a3c29a520852639421783101b55 +Author: Behdad Esfahbod +Date: Wed Apr 28 20:25:22 2010 -0400 + + [sanitize] Make debug code always available to the compiler + + Such that we don't break debug build all the time. + + src/hb-open-type-private.hh | 31 ++++++++++++++++++++----------- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 2 files changed, 21 insertions(+), 12 deletions(-) + +commit 74e313c016704e1d9157c2763691c4151f049dfc +Author: Behdad Esfahbod +Date: Wed Apr 28 15:15:09 2010 -0400 + + [gsubgpos] Make debug code always available to the compiler + + Such that we don't break debug build all the time. + + src/hb-ot-layout-gsubgpos-private.hh | 52 ++++++++++++++++++------------------ + 1 file changed, 26 insertions(+), 26 deletions(-) + +commit 41011a6ed7c4891b20c0eddbb6d4ad9c820cfddb +Author: Behdad Esfahbod +Date: Wed Apr 28 13:33:09 2010 -0400 + + Fix compiler warning about value unused + + src/hb-object-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 863df68e894b7644dcd12da88aa22f73edf829dc +Author: Behdad Esfahbod +Date: Wed Apr 28 13:29:55 2010 -0400 + + [object] Make debug code always available to the compiler + + Such that we don't break debug build all the time. + + src/hb-object-private.h | 42 +++++++++++++++++++++++++++--------------- + 1 file changed, 27 insertions(+), 15 deletions(-) + +commit 1d52151a19ed8ec776276aac5cc6ce3769e0d947 +Author: Behdad Esfahbod +Date: Wed Apr 28 13:18:41 2010 -0400 + + Minor + + src/hb-private.h | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 444fffb1ab378cb3022e2a8e9f90d20a00c82f6a +Author: Behdad Esfahbod +Date: Wed Apr 28 13:16:38 2010 -0400 + + [blob] Make debug code always available to the compiler + + Such that we don't break debug build all the time. + + src/hb-blob.c | 78 ++++++++++++++++++++++++----------------------------------- + 1 file changed, 32 insertions(+), 46 deletions(-) + +commit ba51b25c7ba568aeced17f016eceba987569c5d9 +Author: Behdad Esfahbod +Date: Wed Apr 28 13:10:36 2010 -0400 + + Fix build. Ouch! + + src/hb-object-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a92f0fda7fee9d60b399b8865541bf73e6e30141 +Author: Behdad Esfahbod +Date: Wed Apr 28 13:09:40 2010 -0400 + + Fix debug build + + src/hb-open-type-private.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit c165f25410f817d248ad5d07e1827d33efd1b0a0 +Author: Behdad Esfahbod +Date: Tue Apr 27 23:28:10 2010 -0400 + + [object] Actually handle malloc() failure + + Caught by John Daggett. + + src/hb-object-private.h | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit caff7db93d205e32a535d49e51a3cad70f91dfdd +Author: Behdad Esfahbod +Date: Mon Apr 26 10:07:35 2010 -0400 + + Fix Device::get_size() calculation + + src/hb-ot-layout-common-private.hh | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 66d6eb30eb0b8d61e00f86ea0c7829abaddb52fa +Author: Behdad Esfahbod +Date: Sun Apr 25 23:01:45 2010 -0400 + + Rename Var to Obj + + src/hb-open-type-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 690b9194619589c32ffc0c092e45262ae7776e79 +Author: Behdad Esfahbod +Date: Sun Apr 25 22:51:05 2010 -0400 + + Remove use of flexible arrays + + Also remove wrong ASSERT_SIZE that would trigger only when not using + flexible arrays (which was the case on win32, but not with gcc). + + configure.ac | 2 -- + src/hb-open-file-private.hh | 1 - + src/hb-private.h | 4 ---- + 3 files changed, 7 deletions(-) + +commit 1cebfbb0636b13dc5dc6a4b8b7acbb7da28129d2 +Author: Behdad Esfahbod +Date: Fri Apr 23 20:49:18 2010 -0400 + + Cleanup hb_face_create_for_data() + + src/Makefile.am | 1 + + src/hb-blob-private.h | 57 +++++++++++++++++++++++++++++++ + src/hb-blob.c | 20 ++--------- + src/hb-font-private.h | 3 -- + src/hb-font.cc | 92 +++++++++++++++++++++++++++++++++++---------------- + 5 files changed, 123 insertions(+), 50 deletions(-) + +commit d6b3c83a90f60bedb4049750ffb351161710980d +Author: Behdad Esfahbod +Date: Fri Apr 23 19:59:53 2010 -0400 + + Allow get_table() to return NULL + + src/hb-font.cc | 6 +++++- + src/hb-ft.c | 2 +- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit ad3653751b1e4a03f7058200cb83f64db46722d5 +Author: Behdad Esfahbod +Date: Fri Apr 23 19:43:40 2010 -0400 + + Typo + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 990443e5f282ad61de00dcf1ebff9cf1d5bc2d70 +Author: Behdad Esfahbod +Date: Fri Apr 23 17:53:32 2010 -0400 + + Remove lock_instance() + + src/hb-font.cc | 2 +- + src/hb-open-type-private.hh | 4 ---- + src/hb-ot-layout.cc | 6 +++--- + 3 files changed, 4 insertions(+), 8 deletions(-) + +commit 187454c595559ce48d072fee6bccb51f3de283d4 +Author: Behdad Esfahbod +Date: Fri Apr 23 16:35:01 2010 -0400 + + Add different casts from pointer and ref to avoid bugs + + src/hb-open-type-private.hh | 22 +++++++++++++++------- + src/hb-ot-layout-gpos-private.hh | 8 ++++---- + src/hb-ot-layout-gsub-private.hh | 12 ++++++------ + src/main.cc | 6 +++--- + 4 files changed, 28 insertions(+), 20 deletions(-) + +commit efb324a46ff64adb4ec8612b4089e8daff1e6d8e +Author: Behdad Esfahbod +Date: Fri Apr 23 16:22:54 2010 -0400 + + Remove GET_FOR_DATA macros + + The major-version check is now handled by sanitize. If major + doesn't match, we reject and fall back to the Null object. + + src/hb-open-file-private.hh | 4 ---- + src/hb-open-type-private.hh | 23 ++--------------------- + src/hb-ot-layout-gdef-private.hh | 2 -- + src/hb-ot-layout-gpos-private.hh | 3 --- + src/hb-ot-layout-gsub-private.hh | 3 --- + src/hb-ot-layout-gsubgpos-private.hh | 2 -- + src/main.cc | 6 +++--- + 7 files changed, 5 insertions(+), 38 deletions(-) + +commit f1aaa2a43654c28405ffd393de2cb127437c99a5 +Author: Behdad Esfahbod +Date: Fri Apr 23 15:19:50 2010 -0400 + + Add TODO + + src/hb-ft.c | 2 -- + src/hb-ft.h | 1 + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 2 ++ + src/hb-ot-layout-common-private.hh | 12 ++++++------ + 5 files changed, 10 insertions(+), 9 deletions(-) + +commit 33d4d4325e15e332105ea8f361bab79ee542f0f8 +Author: Behdad Esfahbod +Date: Fri Apr 23 14:56:55 2010 -0400 + + Zero glyph metrics before calling user callback + + src/hb-font.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 4206e9511a222c0c50cc9b4fe72ec421983bba2c +Author: Behdad Esfahbod +Date: Fri Apr 23 14:44:55 2010 -0400 + + More warning fixes + + src/hb-ot-layout.cc | 4 ++-- + src/hb-ot-shape.c | 9 ++++----- + src/hb-shape.c | 32 ++++++++++++++++---------------- + 3 files changed, 22 insertions(+), 23 deletions(-) + +commit ef66ebeabc6c234004bd9e9bb67eb5c9711f4a1e +Author: Behdad Esfahbod +Date: Fri Apr 23 14:40:36 2010 -0400 + + Remove unused parameter + + src/hb-open-file-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 1d720192b193f48b44be0385eda3c2c5d5cd28ad +Author: Behdad Esfahbod +Date: Fri Apr 23 14:39:10 2010 -0400 + + Fix compile warnings (HB_GNUC_UNUSED) + + src/hb-buffer.c | 6 +++--- + src/hb-font.cc | 31 ++++++++++++++++++++++--------- + src/hb-ft.c | 29 +++++++++++++++++++++-------- + src/hb-open-type-private.hh | 2 +- + src/hb-unicode.c | 8 ++++---- + 5 files changed, 51 insertions(+), 25 deletions(-) + +commit 8dfdca599c0a3ba5255131002910bca3b381acac +Author: Behdad Esfahbod +Date: Fri Apr 23 14:07:34 2010 -0400 + + No need to keep blob in sanitize context + + src/hb-open-type-private.hh | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +commit 254933c397f1ce9796f59689a25f9fc2e58df4ea +Author: Behdad Esfahbod +Date: Fri Apr 23 13:57:10 2010 -0400 + + When sanitizing, delay making writable + + Before, as soon as we needed to make an edit, we tried to make the blob + writable inplace. That grows code unnecessarily though. We can simply + fail, make writable, then start again. That's indeed what the fallback + was doing anyway. + + src/hb-open-type-private.hh | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit 71e735e915c85536ee4d3035576f7426e8cd19dd +Author: Behdad Esfahbod +Date: Fri Apr 23 13:48:06 2010 -0400 + + [blob] Fallback to copying if mprotect() fails + + src/hb-blob.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 1aa4666b914da7747fc58a8f6f2d913c94e3b8da +Author: Behdad Esfahbod +Date: Fri Apr 23 13:32:03 2010 -0400 + + Cleanup OpenTypeFontFile + + src/hb-open-file-private.hh | 44 ++++++++++++++++++++++++++------------------ + src/main.cc | 2 +- + 2 files changed, 27 insertions(+), 19 deletions(-) + +commit ae4190cafe927649f8ff8be6a0082478d1298fda +Author: Behdad Esfahbod +Date: Fri Apr 23 12:33:02 2010 -0400 + + Properly define separate structs for TTCHeader and TTCHeaderVersion1 + + src/hb-open-file-private.hh | 71 +++++++++++++++++++++++++++++++++++---------- + 1 file changed, 55 insertions(+), 16 deletions(-) + +commit a065f471b3bc23d33ef75217308efeaed4ffd033 +Author: Behdad Esfahbod +Date: Thu Apr 22 20:15:11 2010 -0400 + + Cleanup Extension lookups + + Two things: + + 1. Allow nested Extension lookups. The offset is always positive, so + it can't loop circularly. + + 2. Move the check for all Extension subtables having the same lookup + type to the correct place. Before it wasn't really working. + + src/hb-ot-layout-gpos-private.hh | 29 +------------------- + src/hb-ot-layout-gsub-private.hh | 57 ++++++++++++++++++++++------------------ + 2 files changed, 33 insertions(+), 53 deletions(-) + +commit a0bb49c5830f8a7f25d573ec57b79df2620ddba7 +Author: Behdad Esfahbod +Date: Thu Apr 22 18:47:03 2010 -0400 + + Add comment re bsearch effect on sanitize + + src/hb-open-file-private.hh | 2 +- + src/hb-ot-layout-common-private.hh | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit d632ec4000b3079150e6424e88a3ab7509f7445c +Author: Behdad Esfahbod +Date: Thu Apr 22 18:33:12 2010 -0400 + + Cosmetic + + src/hb-open-type-private.hh | 6 +++--- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit a3263aa773ad7a914496792466c69047048b093c +Author: Behdad Esfahbod +Date: Thu Apr 22 18:29:09 2010 -0400 + + Convert the last set of cast macros to templates + + src/hb-open-file-private.hh | 4 +-- + src/hb-open-type-private.hh | 53 +++++++++++++++++++++++------------- + src/hb-ot-layout-gpos-private.hh | 16 +++++------ + src/hb-ot-layout-gsub-private.hh | 14 +++++----- + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++---- + 5 files changed, 57 insertions(+), 42 deletions(-) + +commit c38188a1912f72d9ef90ae1bcbdbba7ecce63371 +Author: Behdad Esfahbod +Date: Thu Apr 22 16:52:09 2010 -0400 + + Remove unused macro + + src/hb-open-type-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 3b2c2df41b90f2a1d9e33b3dc15a92cff58a689a +Author: Behdad Esfahbod +Date: Thu Apr 22 16:51:42 2010 -0400 + + Cleanup Extension sanitize() + + src/hb-ot-layout-common-private.hh | 20 +++----------------- + src/hb-ot-layout-gpos-private.hh | 20 +++++++++++++------- + src/hb-ot-layout-gsub-private.hh | 20 +++++++++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 13 ++++--------- + 4 files changed, 33 insertions(+), 40 deletions(-) + +commit 1856184b93760a1a54fb1a3c54281bb252df7ce6 +Author: Behdad Esfahbod +Date: Thu Apr 22 14:15:11 2010 -0400 + + Fail sanitize on major version mismatch + + We handle major-version differences via get_for_data(), so sanitize + should never see a major version mismatch. + + src/hb-open-file-private.hh | 4 ++-- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit df3f505dcfeefc8cd395900b116767d22549f756 +Author: Behdad Esfahbod +Date: Thu Apr 22 14:11:33 2010 -0400 + + More sanitize cleanup + + src/hb-open-file-private.hh | 24 ++---------------------- + src/main.cc | 4 ++-- + 2 files changed, 4 insertions(+), 24 deletions(-) + +commit 278a91f0cd802ac817c2603429bae1fa4a350ea0 +Author: Behdad Esfahbod +Date: Thu Apr 22 13:59:39 2010 -0400 + + Minor cleanup of sanitize + + Done with an audit of all sanitize() + + src/hb-ot-layout-gpos-private.hh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 9ac7dc73bc24b6dafb94df5de9cbf8fa0c82d5bc +Author: Behdad Esfahbod +Date: Thu Apr 22 13:50:22 2010 -0400 + + Check for (impossible) overflow + + src/hb-ot-layout-gpos-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 9fc8684fd85ef6ec82b3b54323761bbdd4c3d891 +Author: Behdad Esfahbod +Date: Thu Apr 22 13:37:58 2010 -0400 + + Cleanup ContextFormat3 sanitize + + src/hb-ot-layout-gsubgpos-private.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit e77302c61f1f1620d1f438a997575fa6ee5c172e +Author: Behdad Esfahbod +Date: Thu Apr 22 13:34:00 2010 -0400 + + Add comment + + src/hb-ot-layout-common-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 7c469c3ca4ed4e45c50eff70df59b1a4780bae5b +Author: Behdad Esfahbod +Date: Thu Apr 22 13:26:21 2010 -0400 + + Minor + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dc228048a813e43356373505168d3822deea5d72 +Author: Behdad Esfahbod +Date: Thu Apr 22 13:22:41 2010 -0400 + + Remove integrity check in Tag sanitize + + Serves no useful purpose. + + src/hb-open-type-private.hh | 9 --------- + src/hb-ot-layout-common-private.hh | 2 +- + 2 files changed, 1 insertion(+), 10 deletions(-) + +commit 8015a8c762dc7be36998d529b7a3af59e3d14d87 +Author: Behdad Esfahbod +Date: Thu Apr 22 11:06:30 2010 -0400 + + Don't sanitize raw table data + + That part is performed by individual table sanitize. + + src/hb-open-file-private.hh | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +commit c293581e962b7982622e7d607fa3909b40da718e +Author: Behdad Esfahbod +Date: Thu Apr 22 11:15:46 2010 -0400 + + Add coment + + src/hb-open-type-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 1faa76c6e848c6b0e360d9ddcf567533b87f8f31 +Author: Behdad Esfahbod +Date: Thu Apr 22 10:54:26 2010 -0400 + + Remove unnecessary casts + + src/hb-open-type-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 079dc40112d3908ff7b7028ea3019bfe82bf606d +Author: Behdad Esfahbod +Date: Thu Apr 22 10:47:12 2010 -0400 + + Avoid overflow in TableDirectory sanitize + + src/hb-open-file-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fb5904ec935d925a423401bc975ffaa22022ce1b +Author: Behdad Esfahbod +Date: Thu Apr 22 10:43:30 2010 -0400 + + Make casts more explicit + + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 565c80bd2960366ace2d10dd71beaaf2a80213c8 +Author: Behdad Esfahbod +Date: Thu Apr 22 10:26:35 2010 -0400 + + Make sure semicolon is expected after DEFINE_NULL_DATA() + + src/hb-open-type-private.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit bb1e16335e537231246f44740f73cc23c0707364 +Author: Behdad Esfahbod +Date: Thu Apr 22 01:01:35 2010 -0400 + + Improve Subst/Pos SubTable access and sanitize + + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 81f2af40f9afd5bb9695018e6baddcd4aa3361c1 +Author: Behdad Esfahbod +Date: Thu Apr 22 00:58:49 2010 -0400 + + Simplify Extension offset now that our int types have no alignment + + src/hb-ot-layout-gsubgpos-private.hh | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +commit 19828ad42d8117563412aae3c70887aa117805a9 +Author: Behdad Esfahbod +Date: Thu Apr 22 00:49:16 2010 -0400 + + Sanitize shallow in Lookup since the generic SubLookup has no methods + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e5546a4352c54311ac4a9ef138b187378155ebe1 +Author: Behdad Esfahbod +Date: Thu Apr 22 00:45:42 2010 -0400 + + Watch for overflow in Array sanitize + + src/hb-open-type-private.hh | 21 +++++++++++++++------ + src/hb-ot-layout-common-private.hh | 2 +- + 2 files changed, 16 insertions(+), 7 deletions(-) + +commit 4f5f1c34dda1e0629bfa6d7b0ffa2e1ce003b7c7 +Author: Behdad Esfahbod +Date: Thu Apr 22 00:27:39 2010 -0400 + + Rename const_sub_array to sub_array since all consts are implicit now + + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-common-private.hh | 4 ++-- + src/hb-ot-layout-gdef-private.hh | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit 0795b784dd1009976c185482a376df250167e73b +Author: Behdad Esfahbod +Date: Thu Apr 22 00:23:14 2010 -0400 + + Cosmetic + + src/hb-ot-layout-common-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 2d98d3bbaa0ddadcb08b5a8f437b18c211c50768 +Author: Behdad Esfahbod +Date: Thu Apr 22 00:19:30 2010 -0400 + + Simplify Lookup sanitize + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c755cb3e3ac55156d0d2ec05adea7a650b97cc41 +Author: Behdad Esfahbod +Date: Thu Apr 22 00:11:43 2010 -0400 + + Change header comment + + README | 2 +- + src/hb-blob.c | 2 +- + src/hb-blob.h | 2 +- + src/hb-buffer-private.h | 2 +- + src/hb-buffer.c | 2 +- + src/hb-buffer.h | 2 +- + src/hb-common.h | 2 +- + src/hb-font-private.h | 2 +- + src/hb-font.cc | 2 +- + src/hb-font.h | 2 +- + src/hb-ft.c | 2 +- + src/hb-ft.h | 2 +- + src/hb-glib.c | 2 +- + src/hb-glib.h | 2 +- + src/hb-icu.c | 2 +- + src/hb-icu.h | 2 +- + src/hb-language.c | 2 +- + src/hb-language.h | 2 +- + src/hb-object-private.h | 2 +- + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-layout-private.h | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-layout.h | 2 +- + src/hb-ot-shape-private.h | 2 +- + src/hb-ot-shape.c | 2 +- + src/hb-ot-tag.c | 2 +- + src/hb-ot-tag.h | 2 +- + src/hb-ot.h | 2 +- + src/hb-private.h | 2 +- + src/hb-shape.c | 2 +- + src/hb-shape.h | 2 +- + src/hb-unicode-private.h | 2 +- + src/hb-unicode.c | 2 +- + src/hb-unicode.h | 2 +- + src/hb.h | 2 +- + src/main.cc | 2 +- + 42 files changed, 42 insertions(+), 42 deletions(-) + +commit 243d20e011e251462a07947275e0e98cc19c7e9b +Author: Behdad Esfahbod +Date: Wed Apr 21 23:57:01 2010 -0400 + + More cast simplification + + src/hb-open-type-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 0dfcc13a4668cdd2c2ebdd5f4a7540a51222cf2f +Author: Behdad Esfahbod +Date: Wed Apr 21 23:41:26 2010 -0400 + + Rename ConstCharP to CharP (overloaded now) + + src/hb-open-file-private.hh | 10 +++++----- + src/hb-open-type-private.hh | 24 ++++++++++++------------ + src/hb-ot-layout-gpos-private.hh | 12 ++++++------ + src/hb-ot-layout-gsub-private.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 14 +++++++------- + 5 files changed, 32 insertions(+), 32 deletions(-) + +commit 62c0fd75737a69721dbf29e773405a4c529f8b6d +Author: Behdad Esfahbod +Date: Wed Apr 21 23:30:48 2010 -0400 + + Cleanup de-const-casting during sanitize + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 29 ++++++++++++++--------------- + src/hb-ot-layout-common-private.hh | 4 ++-- + src/hb-ot-layout-gpos-private.hh | 12 ++++++------ + 4 files changed, 23 insertions(+), 24 deletions(-) + +commit dd155870567cfb9647b2e71593ace8b2705d7cff +Author: Behdad Esfahbod +Date: Wed Apr 21 23:13:33 2010 -0400 + + Add more comments + + src/hb-open-type-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit c85c3620675f38ffdca59134aeec2641485f40ca +Author: Behdad Esfahbod +Date: Wed Apr 21 23:12:54 2010 -0400 + + Add comment + + src/hb-open-type-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 2467c669c2aee4de2a6621a9d06cba0262376d41 +Author: Behdad Esfahbod +Date: Wed Apr 21 23:11:45 2010 -0400 + + Add comment + + src/hb-open-type-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 29c3f5e1b6212c775a7b911becd44ba093b7b0eb +Author: Behdad Esfahbod +Date: Wed Apr 21 23:01:00 2010 -0400 + + Improve comment + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 01c01618e98283611628cd54d5ba4bf122f24cd9 +Author: Behdad Esfahbod +Date: Wed Apr 21 22:49:56 2010 -0400 + + Further simplify IntType struct defs + + src/hb-open-type-private.hh | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +commit 2cb08458f674301cde9d962c13911035a251f7c5 +Author: Behdad Esfahbod +Date: Wed Apr 21 22:37:31 2010 -0400 + + Rename const_array() to array() (overloaded) + + src/hb-open-type-private.hh | 12 ++++++------ + src/hb-ot-layout-common-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 6 +++--- + src/hb-ot-layout-gsubgpos-private.hh | 16 ++++++++-------- + 4 files changed, 19 insertions(+), 19 deletions(-) + +commit 2e2f43edf2f49f4047e28b1ce2ea95938536de9c +Author: Behdad Esfahbod +Date: Wed Apr 21 22:30:36 2010 -0400 + + Remove ArrayAfter, use StructAfter in place + + src/hb-open-type-private.hh | 21 ++++++--------------- + 1 file changed, 6 insertions(+), 15 deletions(-) + +commit e961c86c579fd98ee604342a9c70c4e7f8d4f220 +Author: Behdad Esfahbod +Date: Wed Apr 21 15:56:11 2010 -0400 + + Convert NEXT() and ARRAY_AFTER() macros to templates + + src/hb-open-type-private.hh | 40 ++++++++++++++++++++++++++---------- + src/hb-ot-layout-common-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 8 ++++---- + src/hb-ot-layout-gsubgpos-private.hh | 24 +++++++++++----------- + 4 files changed, 47 insertions(+), 29 deletions(-) + +commit 198facdc55756cb48cdfb8ba7fa50916fac54ec3 +Author: Behdad Esfahbod +Date: Wed Apr 21 13:35:36 2010 -0400 + + Use templates for const char * casts + + src/hb-open-file-private.hh | 12 ++++----- + src/hb-open-type-private.hh | 48 ++++++++++++++++++------------------ + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 32 ++++++++++++------------ + src/hb-ot-layout-gsub-private.hh | 4 +-- + src/hb-ot-layout-gsubgpos-private.hh | 14 +++++------ + 6 files changed, 56 insertions(+), 56 deletions(-) + +commit 1922ffe7013c46014803a9f18c42e193a25b1968 +Author: Behdad Esfahbod +Date: Wed Apr 21 04:19:51 2010 -0400 + + Const correctness + + src/hb-ot-layout-gsub-private.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 30 +++++++++++++++--------------- + 2 files changed, 17 insertions(+), 17 deletions(-) + +commit e032ed9f75d4a0f365649a25706871bbb5ae6651 +Author: Behdad Esfahbod +Date: Wed Apr 21 03:11:46 2010 -0400 + + Use templates for defining int typess + + src/hb-open-type-private.hh | 66 ++++++++++++++++++++++++++++++--------------- + src/hb-private.h | 10 ++----- + 2 files changed, 46 insertions(+), 30 deletions(-) + +commit 2c9fd2adce5a6a9dcd62c874bd64613ea68d8d9b +Author: Behdad Esfahbod +Date: Wed Apr 21 02:15:39 2010 -0400 + + Remove unused macro + + src/hb-open-type-private.hh | 15 --------------- + 1 file changed, 15 deletions(-) + +commit 7a52f281178867379adb6e6c6fb0022102f75d17 +Author: Behdad Esfahbod +Date: Wed Apr 21 02:14:44 2010 -0400 + + Rename macros + + src/hb-open-type-private.hh | 6 +++--- + src/hb-private.h | 30 +++++++++++++++--------------- + 2 files changed, 18 insertions(+), 18 deletions(-) + +commit ffff7dc44cb2a35a60f92831165e9d3c3a61ce19 +Author: Behdad Esfahbod +Date: Wed Apr 21 02:13:55 2010 -0400 + + Minor + + src/hb-private.h | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit f60f2166c48d07f556ff83f04e95181946eb03df +Author: Behdad Esfahbod +Date: Wed Apr 21 02:12:45 2010 -0400 + + Move macros around + + src/hb-private.h | 122 ++++++++++++++++++++++++++++--------------------------- + 1 file changed, 62 insertions(+), 60 deletions(-) + +commit 649a4344ca363da3d44cdd908350449ec40ed0f9 +Author: Behdad Esfahbod +Date: Wed Apr 21 02:11:59 2010 -0400 + + Remove unused macros + + src/hb-private.h | 7 ------- + 1 file changed, 7 deletions(-) + +commit eba8b4f644701cc6b78b0fcb4e932dce15561598 +Author: Behdad Esfahbod +Date: Mon Mar 29 00:04:12 2010 -0400 + + GNOME Bug 613015 - [HB] Does not sanitize Device tables referenced from ValueRecords + + src/hb-ot-layout-gpos-private.hh | 47 ++++++++++++++++++++++++++++++---------- + 1 file changed, 36 insertions(+), 11 deletions(-) + +commit 673a4efcbc72a62105a24d9b0b54047417160f7d +Author: Behdad Esfahbod +Date: Wed Apr 21 02:02:57 2010 -0400 + + WIP + + src/hb-ot-layout-gpos-private.hh | 102 +++++++++++++++++++++++++++++++-------- + 1 file changed, 81 insertions(+), 21 deletions(-) + +commit 40d73bc68dd828cf68f90fde0f9499a6ce9fbb19 +Author: Behdad Esfahbod +Date: Wed Apr 21 00:49:40 2010 -0400 + + Improve comments + + src/hb-open-type-private.hh | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) + +commit 394bad41a76f90e441e327cef76efb99997e9ae0 +Author: Behdad Esfahbod +Date: Wed Apr 21 00:40:50 2010 -0400 + + Remove stale TODO item + + src/hb-open-type-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 9d3677899f90abdc7fb3e3d854db654a8707a84b +Author: Behdad Esfahbod +Date: Wed Apr 21 00:32:47 2010 -0400 + + Use a function template instead of struct template for Null + + src/hb-open-type-private.hh | 24 ++++++++++-------------- + 1 file changed, 10 insertions(+), 14 deletions(-) + +commit ffd321afd91429c5de7ab03d71ef1030044f53cb +Author: Behdad Esfahbod +Date: Wed Apr 21 00:14:12 2010 -0400 + + Simplify Tag struct + + src/hb-open-file-private.hh | 3 ++- + src/hb-open-type-private.hh | 6 +----- + src/hb-ot-layout-common-private.hh | 3 ++- + 3 files changed, 5 insertions(+), 7 deletions(-) + +commit 00e23fcc6fd0eee5c582251bf3de6a2703fbbd3e +Author: Behdad Esfahbod +Date: Tue Apr 20 23:50:45 2010 -0400 + + Cosmetic + + src/hb-open-type-private.hh | 8 ++++---- + src/hb-ot-layout-common-private.hh | 6 +++--- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit a87072db5d41e25b2e31191545298bca4838c65c +Author: Behdad Esfahbod +Date: Tue Apr 20 15:52:47 2010 -0400 + + Fix Class operator return type + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f9b37727985191c9b4aedb0e9835736027e59260 +Author: Behdad Esfahbod +Date: Tue Apr 20 15:51:53 2010 -0400 + + Add couple consts to operators + + src/hb-open-type-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 53d237ec6352d7c6fab3b2805b48154a25506beb +Author: Behdad Esfahbod +Date: Tue Apr 20 15:25:27 2010 -0400 + + Remove ASSERT_SIZE_DATA + + src/hb-open-type-private.hh | 4 ---- + src/hb-ot-layout-common-private.hh | 9 ++++++--- + 2 files changed, 6 insertions(+), 7 deletions(-) + +commit 06558d2a745b8f3af11a8d6dce956ae52187a7e5 +Author: Behdad Esfahbod +Date: Mon Apr 19 02:34:10 2010 -0400 + + Round instead of trunc + + src/hb-ot-layout-gpos-private.hh | 20 ++++++++++---------- + src/hb-private.h | 2 +- + 2 files changed, 11 insertions(+), 11 deletions(-) + +commit 0e206de98621ed8a55824b42e9e6bf320f4c6cc8 +Author: Behdad Esfahbod +Date: Mon Apr 19 02:29:04 2010 -0400 + + Fix warnings + + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- + 4 files changed, 7 insertions(+), 7 deletions(-) + +commit d5943407a4251cb947fbfc130c0facb2f6216bd6 +Author: Behdad Esfahbod +Date: Mon Apr 19 02:27:56 2010 -0400 + + Fix debug build + + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 12b27ed91de0192deee4e9feffcaf4aca4c78113 +Author: Behdad Esfahbod +Date: Sat Mar 27 17:00:19 2010 -0400 + + Fix leak when duplicating blob + + src/hb-blob.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 4b8487d83e0c10076a6c573cb3487790ce366607 +Author: Behdad Esfahbod +Date: Tue Mar 16 03:46:17 2010 -0400 + + Fix the mystery bug! + + A couple bugs joined forces to exhibit the mystery behavior of + crashes / infinite loops on OS X / wrong kerning / invalid memory + access. Pooh! + + The bugs were involved: + + - Wrong pointer math with ValueRecord in PairPosFormat1 + + - Fallout from avoiding flex arrays, code not correctly updated + to remove sizeof() usage. + + We strictly never use sizeof() directly now. And the PairPos code + is cleaned up. Should fix them all. Bugs are: + + Bug 605655 - Pango 1.26.2 introduces kerning bug + Bug 611229 - Pango reads from uninitialized memory + Bug 593240 - (pangoosx) Crash / infinite loop with Mac OS X + + We were also doing wrong math converting Device adjustments to + hb_position_t. Fallout from FreeType days. Should shift 16, not + 6. Fixed that too. + + There's still another bug: we don't sanitize Device records + referenced from value records. Fixing that also. + + src/hb-open-file-private.hh | 4 +++- + src/hb-open-type-private.hh | 11 ++++++----- + src/hb-ot-layout-common-private.hh | 10 ++++++++-- + src/hb-ot-layout-gpos-private.hh | 37 ++++++++++++++++++++---------------- + src/hb-ot-layout-gsubgpos-private.hh | 15 ++++++++------- + 5 files changed, 46 insertions(+), 31 deletions(-) + +commit 9b39755d104603d1163738f77637cc1923d4055b +Author: Behdad Esfahbod +Date: Thu Apr 15 14:00:25 2010 -0400 + + Typo + + src/hb-open-type-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f85ec1c7da36d2c2c9b1c94a988563697dcc79c9 +Author: Behdad Esfahbod +Date: Wed Mar 10 04:14:40 2010 -0500 + + Cosmetic + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e48ed72230a83499dabbd02af2ac63340220a353 +Author: Behdad Esfahbod +Date: Mon Mar 1 22:33:45 2010 -0500 + + [ft] Check stream->read instead of stream->base + + The former is more robust. See discussion on freetype-devel. + + src/hb-ft.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 917c227500305aee543981ad24a39f868c5ca0b7 +Author: Behdad Esfahbod +Date: Tue Feb 23 16:47:51 2010 -0500 + + Make blob unlocking 64bit-safe + + GNOME Bug 604128 - Applications crash when displaying Hebrew characters + + src/hb-blob.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit ecd2e996d2137fef30011a41dd57ea45f9a796de +Author: Behdad Esfahbod +Date: Tue Feb 23 02:42:00 2010 -0500 + + Improve the alignment for NullPool + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bc7830e4259755ce7549025c6f5bf750e78c2ff1 +Author: Behdad Esfahbod +Date: Wed Feb 17 15:14:57 2010 -0500 + + Use __attribute__((unused)) only with gcc 4 and later + + See discussion at: + https://bugzilla.gnome.org/show_bug.cgi?id=610183 + + src/hb-private.h | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 555d11273ee4c30e84eda3a78ffadb3ee7da65d0 +Author: Behdad Esfahbod +Date: Tue Jan 26 12:58:59 2010 -0500 + + [GDEF] Fix bug in building synthetic GDEF + + src/hb-ot-layout.cc | 5 +++-- + src/hb-ot-layout.h | 1 - + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 70834d89c30a56fcd78825fbc28fc9c6bec31124 +Author: Behdad Esfahbod +Date: Tue Jan 26 12:17:37 2010 -0500 + + [TODO] Add kern/GPOS interaction + + TODO | 3 +++ + 1 file changed, 3 insertions(+) + +commit cd11a98fa1426e9dbc4b61e702913b23a4794ae2 +Author: Behdad Esfahbod +Date: Sun Dec 20 23:05:02 2009 +0100 + + Fix compile with older FreeType + + configure.ac | 7 +++++++ + src/hb-ft.c | 2 ++ + 2 files changed, 9 insertions(+) + +commit 7f7448a354c43650348b4e91b4e40ecf18718d66 +Author: Behdad Esfahbod +Date: Sun Dec 20 21:42:14 2009 +0100 + + Indent + + src/hb-ot-layout-gpos-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e70f45eb522bcb41388cc218b79bbd6aaecf8050 +Author: Behdad Esfahbod +Date: Sun Dec 20 21:26:24 2009 +0100 + + Revert "Fallback to 'kern' if no GPOS applied" + + This reverts commit d740c8f78bcbe80a8bcd8a9468830a406da37cc0. + + The change is wrong. If there is a GPOS table, we should not use 'kern'. + + src/hb-ot-shape.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d740c8f78bcbe80a8bcd8a9468830a406da37cc0 +Author: Behdad Esfahbod +Date: Sun Dec 20 21:23:56 2009 +0100 + + Fallback to 'kern' if no GPOS applied + + src/hb-ot-shape.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2f78c17197892b2bdc2f64caeb1c1c806ef44545 +Author: Behdad Esfahbod +Date: Sun Dec 20 21:03:11 2009 +0100 + + Remove glibism! + + src/hb-ot-shape-private.h | 4 ++-- + src/hb-ot-shape.c | 4 ++-- + src/hb-shape.c | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit 907e67da13b5ed719362702138703fe2f90e790d +Author: Behdad Esfahbod +Date: Sun Dec 20 20:59:51 2009 +0100 + + Oops, add file. + + src/hb-ot-shape-private.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 53 insertions(+) + +commit 2014b8d110231b13e524008282ece7451f1ae9e7 +Author: Behdad Esfahbod +Date: Sun Dec 20 20:58:26 2009 +0100 + + Hook OpenType shaping up + + Default features only for now. + + src/Makefile.am | 2 + + src/hb-ot-layout.cc | 28 +++++++++ + src/hb-ot-layout.h | 7 +++ + src/hb-ot-shape.c | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-shape.c | 8 +-- + 5 files changed, 206 insertions(+), 4 deletions(-) + +commit 196610ba4c7071c2b802d0fc921a63cbc0753114 +Author: Behdad Esfahbod +Date: Sun Dec 20 19:01:14 2009 +0100 + + Pass features down + + src/hb-shape.c | 49 +++++++++++++++++++++++++++++++++---------------- + 1 file changed, 33 insertions(+), 16 deletions(-) + +commit 51f141a7f38a73f671b23f58cadf97a72c43b625 +Author: Behdad Esfahbod +Date: Sun Dec 20 18:22:28 2009 +0100 + + Avoid overflow + + src/hb-shape.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit 26d7a75752631b2596a5bcb7e645b34cc3d139ab +Author: Behdad Esfahbod +Date: Sun Dec 20 17:58:25 2009 +0100 + + Refactor hb_shape a bit + + src/hb-shape.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 74 insertions(+), 13 deletions(-) + +commit 001fc2d2aa22f14302739fe4ca45f7535855e0fb +Author: Behdad Esfahbod +Date: Sun Dec 20 17:24:05 2009 +0100 + + Add TrueType kern support + + src/hb-shape.c | 74 +++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 48 insertions(+), 26 deletions(-) + +commit 2c1b85cf66e5ecb7521b6018b76f0e161fb68967 +Author: Behdad Esfahbod +Date: Sun Dec 20 16:29:17 2009 +0100 + + Direct unicode->get_mirroring directly + + src/hb-shape.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6a2ef5aa5459def232708af30ef8a484906b868b +Author: Behdad Esfahbod +Date: Sun Dec 20 16:28:01 2009 +0100 + + Do mirroring + + src/hb-shape.c | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +commit 0465e69832393cc1ed36508ec5d597fbab64877a +Author: Behdad Esfahbod +Date: Sun Dec 20 16:25:18 2009 +0100 + + Protect against NULL funcs + + src/hb-buffer.c | 3 +++ + src/hb-font.cc | 3 +++ + 2 files changed, 6 insertions(+) + +commit 5ceefa1d8dbd310570ea8d1c47107fe8d3dc96d9 +Author: Behdad Esfahbod +Date: Sun Dec 20 15:29:16 2009 +0100 + + Add hb_unicode_get_*() functions + + src/hb-unicode.c | 37 +++++++++++++++++++++++++++++++++++++ + src/hb-unicode.h | 21 +++++++++++++++++++++ + 2 files changed, 58 insertions(+) + +commit b8a53e44ce05911ce98b7cff34dee165e19d87ba +Author: Behdad Esfahbod +Date: Sun Dec 20 14:56:25 2009 +0100 + + We'll have to link to libstdc++ if linking to ICU, so disable test for now + + We have to get rid of the ICU in main lib. Still thinking about best way + to do it. + + src/Makefile.am | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 314905d7548d5be58354546d660754b807b6efb2 +Author: Behdad Esfahbod +Date: Sun Dec 20 14:50:42 2009 +0100 + + Explicitly track whether the buffer has positions + + src/hb-buffer-private.h | 3 ++- + src/hb-buffer.c | 27 ++++++++++++++------------- + 2 files changed, 16 insertions(+), 14 deletions(-) + +commit 314b460d8a02ed4b2789ff527cf6c9bc19769114 +Author: Behdad Esfahbod +Date: Sun Dec 20 13:58:50 2009 +0100 + + Add HB_DIRECTION_IS_FORWARD/BACKWARD + + src/hb-common.h | 2 ++ + src/hb-shape.c | 3 +-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit bdd0ff5290bae4db65c3fdf95c5728031f13ca84 +Author: Behdad Esfahbod +Date: Tue Dec 15 04:07:40 2009 -0500 + + Make main.cc compile without glib + + src/main.cc | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +commit 8a7d16808200f4fa02d6d12a8b8492bdedeb2c24 +Author: Behdad Esfahbod +Date: Tue Dec 15 03:53:45 2009 -0500 + + Distribute autogen.sh + + Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +commit 807b8aa486753474e05e09f4fcca8ac94021b97c +Author: Behdad Esfahbod +Date: Thu Nov 19 20:28:03 2009 -0500 + + Another C++ strictness fix + + Pango Bug 602408 - Invalid C++ code breaks compile with Sun C++ Compiler + (Error: A union member cannot have a user-defined assignment operator) + + According to the bug: + + C++ Programming Language by Bjarne Stroustrup: Chapter 10.4.12 forbids + explicitly using of union members with constructors, destructors or assignment + operations. + + So we use a set() method instead of the assignment operator. Ugly, but hey, + that's life. + + src/hb-open-type-private.hh | 8 ++++---- + src/hb-ot-layout-common-private.hh | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 8b9b866d3e495c186f0530fcf4e00ffcdc170d3f +Author: Behdad Esfahbod +Date: Thu Nov 19 20:27:57 2009 -0500 + + Fix warning + + src/hb-ot-layout-gdef-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c65b26acf28bd1a5b346fd8f6f28bec1f7d17a2a +Author: Behdad Esfahbod +Date: Wed Nov 18 11:27:33 2009 -0500 + + Use autoconf FLEXIBLE_ARRAY_MEMBER when available + + configure.ac | 2 ++ + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-private.h | 13 ++++++++++--- + 3 files changed, 14 insertions(+), 5 deletions(-) + +commit d33f674cb793af40f1612df3660b138383f2de95 +Author: Behdad Esfahbod +Date: Wed Nov 18 09:47:44 2009 -0500 + + Add Mongolian variation selectors + + src/hb-shape.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit d6387757de2c27867d6f57c4ee7c4ef436b3a74f +Author: Behdad Esfahbod +Date: Wed Nov 11 17:15:03 2009 -0500 + + Fix sanitize + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 636f017e387d46d4083c9f9ee57647a94dc5dc6d +Author: Behdad Esfahbod +Date: Tue Nov 10 12:56:35 2009 -0500 + + Remove obsolete TODO item + + src/hb-open-file-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit bf2b25dd8591e92f3944c763641b613a70c379a7 +Author: Behdad Esfahbod +Date: Fri Nov 6 19:52:47 2009 -0500 + + Remove done item + + src/hb-shape.c | 1 - + 1 file changed, 1 deletion(-) + +commit 4a8605315901e0ff1e6e09437a92dd5ac39164cc +Author: Behdad Esfahbod +Date: Fri Nov 6 19:52:01 2009 -0500 + + Reverse buffer at the end if RTL + + src/hb-shape.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit ff44f88df2c46920f3ec2384ef321a4c7bb0f6ef +Author: Behdad Esfahbod +Date: Fri Nov 6 19:48:16 2009 -0500 + + Handle shaping in non-native direction + + src/hb-buffer-private.h | 1 + + src/hb-buffer.c | 42 +++++++++++++++++-- + src/hb-buffer.h | 10 ++--- + src/hb-common.h | 11 +++++ + src/hb-shape.c | 38 +++++++++++++++-- + src/hb-unicode-private.h | 5 +++ + src/hb-unicode.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++ + 7 files changed, 196 insertions(+), 14 deletions(-) + +commit b4b4272c8d19ba3e0cb8f12b3b7d1590349e3d14 +Author: Behdad Esfahbod +Date: Fri Nov 6 17:46:33 2009 -0500 + + Oops, wrong change + + src/hb-ot-layout.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 52ea47767c7c35650ebddfba6ddc8203a3e33d3a +Author: Behdad Esfahbod +Date: Fri Nov 6 17:45:38 2009 -0500 + + Change order of font and face for API consistency + + src/hb-ot-layout.cc | 14 +++++++------- + src/hb-ot-layout.h | 14 +++++++------- + 2 files changed, 14 insertions(+), 14 deletions(-) + +commit f4f1fc970b3e37d9903cbf5e05bbd38be4df3047 +Author: Behdad Esfahbod +Date: Fri Nov 6 17:42:38 2009 -0500 + + Remove debug info that crept in + + src/hb-ot-layout.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit aa196d6026b496ec70be3d3588cc8cd2b8ccdb36 +Author: Behdad Esfahbod +Date: Fri Nov 6 17:23:31 2009 -0500 + + [GSUB] More ligature/component fixing + + We can only reuse the ligid if it belongs to a previous ligature, not a + component! + + src/hb-ot-layout-gsub-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 25e7ef704633447f109b148620336c42d6fb310e +Author: Behdad Esfahbod +Date: Fri Nov 6 17:21:01 2009 -0500 + + Add _hb_buffer_add_output_glyphs() that takes codepoint_t* + + src/hb-buffer-private.h | 10 ++++++++- + src/hb-buffer.c | 45 ++++++++++++++++++++++++++++++++++++++-- + src/hb-ot-layout-gsub-private.hh | 16 +++++++------- + 3 files changed, 60 insertions(+), 11 deletions(-) + +commit 9db8ad75317d589807e7725455f49cafece58d5d +Author: Behdad Esfahbod +Date: Fri Nov 6 16:47:31 2009 -0500 + + Add hb_ot_layout_position_finish() + + We expect buffer to be setup with default positions before GPOS. + + src/hb-buffer-private.h | 6 +---- + src/hb-buffer.h | 11 +-------- + src/hb-ot-layout-gpos-private.hh | 8 +++---- + src/hb-ot-layout.cc | 52 ++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout.h | 16 +++++++++---- + 5 files changed, 69 insertions(+), 24 deletions(-) + +commit edb54e9aeca25f4120a69ed3d5562cbb68fdb348 +Author: Behdad Esfahbod +Date: Fri Nov 6 15:19:22 2009 -0500 + + Fix FT_Face finalizer call + + src/hb-ft.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3d14528b8b2e7da425a9df7057fc9fb326d8298c +Author: Behdad Esfahbod +Date: Fri Nov 6 15:13:17 2009 -0500 + + Rename hb_buffer_get_len() to hb_buffer_get_length() + + src/hb-buffer.c | 2 +- + src/hb-buffer.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 1ff7775051559a8ca442be3938450c7ed3817806 +Author: Behdad Esfahbod +Date: Fri Nov 6 13:52:57 2009 -0500 + + Minor. + + src/hb-shape.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 3648bdf5b221adfe01ad99714de420b49964921e +Author: Behdad Esfahbod +Date: Thu Nov 5 20:17:53 2009 -0500 + + Fix FT_Face generic finalizer + + src/hb-ft.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 5a11c875d8c95d480e6f32b57e969ee34ca1940d +Author: Behdad Esfahbod +Date: Thu Nov 5 20:08:17 2009 -0500 + + Cosmetic + + src/hb-blob.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 44533e773f75b9a1171d884fcbe91a2f3879e2d8 +Author: Behdad Esfahbod +Date: Thu Nov 5 19:58:02 2009 -0500 + + Fix warning + + src/hb-object-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bcc0406a525ca3fe597aec5f2a97e5c50965d49c +Author: Behdad Esfahbod +Date: Thu Nov 5 19:54:23 2009 -0500 + + include errno.h + + src/hb-blob.c | 1 + + 1 file changed, 1 insertion(+) + +commit 799b3c375ad0e1293fd37a0e3a0d422a3166dcd8 +Author: Behdad Esfahbod +Date: Thu Nov 5 19:37:58 2009 -0500 + + Add debugging to object lifecycle + + src/hb-object-private.h | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit 25edb940ab050545f47a06648e73c192fa213548 +Author: Behdad Esfahbod +Date: Thu Nov 5 19:20:06 2009 -0500 + + Cosmetic + + src/hb-ft.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 850dc5bb551409bb9bf6113ec2199bb3fb905e43 +Author: Behdad Esfahbod +Date: Thu Nov 5 18:26:52 2009 -0500 + + Return 0 from get_glyph_nil + + src/hb-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 85555a953376ee68a8fcc64485e74d44a353577b +Author: Behdad Esfahbod +Date: Thu Nov 5 18:25:56 2009 -0500 + + Initialize font->klass + + src/hb-font.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit bcd26bd7b1c96057bf154d7d50a61018d40f0d29 +Author: Behdad Esfahbod +Date: Thu Nov 5 18:03:26 2009 -0500 + + Add TODO item + + src/hb-ft.c | 1 + + 1 file changed, 1 insertion(+) + +commit f4281e0a92a40746fa630fb15b877adaf3ff15b1 +Author: Behdad Esfahbod +Date: Thu Nov 5 17:58:41 2009 -0500 + + Fix ref counting + + src/hb-ft.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 6358ff45ae8cfc0b58b4976619319e3dde43add2 +Author: Behdad Esfahbod +Date: Thu Nov 5 17:39:16 2009 -0500 + + Add hb_ft_face_create_cached + + src/hb-ft.c | 16 ++++++++++++++++ + src/hb-ft.h | 3 +++ + 2 files changed, 19 insertions(+) + +commit 2027f74b286cabe3c60c275170c4f4b437a30f55 +Author: Behdad Esfahbod +Date: Thu Nov 5 16:34:47 2009 -0500 + + Add default positioning to hb-shape + + src/hb-shape.c | 28 ++++++++++++++++++++++++---- + 1 file changed, 24 insertions(+), 4 deletions(-) + +commit c3f9f7e59d865f8664862b7ca99d9a3a9221e456 +Author: Behdad Esfahbod +Date: Thu Nov 5 16:16:14 2009 -0500 + + Fix MarkMark issue with ligid and components + + src/hb-ot-layout-gpos-private.hh | 11 ++++++----- + src/hb-ot-layout-gsub-private.hh | 6 +----- + 2 files changed, 7 insertions(+), 10 deletions(-) + +commit d0351314cd29fbdf0efb5c7f89a569648f7a7fc7 +Author: Behdad Esfahbod +Date: Thu Nov 5 16:16:06 2009 -0500 + + Include stdio.h if debugging + + src/hb-blob.c | 4 ++++ + src/hb-open-type-private.hh | 1 + + src/hb-ot-layout-gsubgpos-private.hh | 1 + + 3 files changed, 6 insertions(+) + +commit 2e336692913405976392bf505028481a5caa53b4 +Author: Behdad Esfahbod +Date: Thu Nov 5 13:55:41 2009 -0500 + + Add hb_font_get_* + + src/hb-font.cc | 35 +++++++++++++++++++++++++++++++++++ + src/hb-font.h | 18 ++++++++++++++++++ + src/hb-shape.c | 2 +- + 3 files changed, 54 insertions(+), 1 deletion(-) + +commit 9bef3611f07b45ba8199a4a339c72f49d266216a +Author: Behdad Esfahbod +Date: Thu Nov 5 12:20:11 2009 -0500 + + Rename [xy]_pos to [xy]_offset since we don't accumulate positions + + src/hb-buffer-private.h | 4 ++-- + src/hb-buffer.h | 4 ++-- + src/hb-font.h | 4 ++-- + src/hb-ft.c | 10 +++++----- + src/hb-ot-layout-gpos-private.hh | 40 ++++++++++++---------------------------- + src/hb-shape.c | 14 +++++++------- + src/hb-shape.h | 4 ++-- + 7 files changed, 32 insertions(+), 48 deletions(-) + +commit 2daa47e9cdbfb027f76765301b3a78950e92eb09 +Author: Behdad Esfahbod +Date: Thu Nov 5 12:08:34 2009 -0500 + + Cosmetic + + src/hb-shape.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2f50d873680ce0a43b6ec79df1ac946b91f31e63 +Author: Behdad Esfahbod +Date: Wed Nov 4 21:07:03 2009 -0500 + + Start filling hb_shape() in + + src/hb-buffer-private.h | 1 + + src/hb-shape.c | 40 +++++++++++++++++++++++++++++++++++++++- + 2 files changed, 40 insertions(+), 1 deletion(-) + +commit ae070b7d39d03bd8bc1244f687b24db505f4af3f +Author: Behdad Esfahbod +Date: Wed Nov 4 20:29:54 2009 -0500 + + Add script and language to buffer + + TODO | 1 - + src/hb-buffer-private.h | 6 +++--- + src/hb-buffer.c | 26 ++++++++++++++++++++++++++ + src/hb-buffer.h | 15 ++++++++++++++- + 4 files changed, 43 insertions(+), 5 deletions(-) + +commit 8a3511ac6c795226699c2b36e03401ecdf88f5f8 +Author: Behdad Esfahbod +Date: Wed Nov 4 19:45:39 2009 -0500 + + Add hb_language_t as well as language/script conversion to OT tags + + src/Makefile.am | 4 + + src/hb-language.c | 113 +++++++++ + src/hb-language.h | 44 ++++ + src/hb-ot-layout.cc | 6 +- + src/hb-ot-layout.h | 4 +- + src/hb-ot-tag.c | 662 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-tag.h | 49 ++++ + src/hb-ot.h | 1 + + src/hb-private.h | 3 + + src/hb.h | 1 + + 10 files changed, 882 insertions(+), 5 deletions(-) + +commit 4591753ad4b5ec0224e3f1befdfe4fc5f6075562 +Author: Behdad Esfahbod +Date: Wed Nov 4 18:15:59 2009 -0500 + + Define ARRAY_LENGTH + + src/hb-private.h | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +commit 214ac7c1ff51b397d227832526f882e824cb9ea3 +Author: Behdad Esfahbod +Date: Wed Nov 4 18:12:32 2009 -0500 + + Another one + + src/hb-unicode.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1e91434569a9e9535ef021ca52b60b2e2af75d19 +Author: Behdad Esfahbod +Date: Wed Nov 4 18:12:09 2009 -0500 + + Minor + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 48de3730cdf91b9f6473509e22260a902ccec992 +Author: Behdad Esfahbod +Date: Wed Nov 4 16:59:50 2009 -0500 + + Fix previous commit, ouch! + + src/hb-open-type-private.hh | 12 ++++++++++++ + src/hb-ot-layout-common-private.hh | 12 ++++-------- + src/hb-ot-layout-gdef-private.hh | 12 ++++-------- + 3 files changed, 20 insertions(+), 16 deletions(-) + +commit e21899bc3593aa0d3adf64cee21c5de2ea219783 +Author: Behdad Esfahbod +Date: Wed Nov 4 16:36:14 2009 -0500 + + Fix array query API + + The array query APIs now all do: + + - Return the total number of items + - Take a start_offset, such that individual items can be fetched + - The _count IN/OUT variable always has number of items written + into the array upon return of the function + + TODO | 1 - + src/hb-ot-layout-common-private.hh | 59 ++++++++++++++----------- + src/hb-ot-layout-gdef-private.hh | 84 +++++++++++++++++++++--------------- + src/hb-ot-layout-gsubgpos-private.hh | 14 +++--- + src/hb-ot-layout.cc | 40 ++++++++++------- + src/hb-ot-layout.h | 24 +++++++---- + 6 files changed, 131 insertions(+), 91 deletions(-) + +commit 3b59306b858d31d97be0ea8c64461de1d0d03572 +Author: Behdad Esfahbod +Date: Wed Nov 4 15:48:32 2009 -0500 + + Finish FT glue. Rough and untested + + src/hb-font.cc | 2 +- + src/hb-font.h | 2 +- + src/hb-ft.c | 114 ++++++++++++++++++++++++++++++--------------------------- + 3 files changed, 63 insertions(+), 55 deletions(-) + +commit f8be443aecd54b479470e6559b1dfbc8f33c5f55 +Author: Behdad Esfahbod +Date: Tue Nov 3 20:28:27 2009 -0500 + + Add TODO item + + TODO | 1 + + 1 file changed, 1 insertion(+) + +commit 7951279b4a52b48f13631e7838dbc180c7249ea4 +Author: Behdad Esfahbod +Date: Tue Nov 3 20:27:05 2009 -0500 + + Implement nil font functions + + TODO | 1 + + src/hb-font-private.h | 8 ++--- + src/hb-font.cc | 72 +++++++++++++++++++++++++++++++++++++--- + src/hb-font.h | 9 +++-- + src/hb-ot-layout-gpos-private.hh | 7 ++-- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-private.h | 18 +++++----- + 7 files changed, 91 insertions(+), 26 deletions(-) + +commit 8fb3d1aa4e613cdf965a83bd650c668884c58ad8 +Author: Behdad Esfahbod +Date: Tue Nov 3 18:34:20 2009 -0500 + + Start ft glue + + TODO | 3 - + src/Makefile.am | 16 ++++- + src/hb-font-private.h | 4 +- + src/hb-font.cc | 17 ++++- + src/hb-font.h | 6 +- + src/hb-ft.c | 192 ++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ft.h | 52 ++++++++++++++ + src/hb-glib.h | 2 - + src/hb-icu.h | 2 - + src/hb.h | 4 +- + 10 files changed, 281 insertions(+), 17 deletions(-) + +commit d94647e2cd187bf4a4c8fb1c0c15c3d23c1293ac +Author: Behdad Esfahbod +Date: Tue Nov 3 16:35:10 2009 -0500 + + Add ICU glue + + configure.ac | 8 +- + src/Makefile.am | 23 +++++- + src/hb-icu.c | 221 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-icu.h | 41 +++++++++++ + 4 files changed, 288 insertions(+), 5 deletions(-) + +commit b7dd4b945b4ec384526439b365a25739bf9cd2df +Author: Behdad Esfahbod +Date: Tue Nov 3 15:21:15 2009 -0500 + + Fix hb_be_uint16() + + src/hb-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cd7555eef27cb18857c0c06d2afdaf3a354a3c15 +Author: Behdad Esfahbod +Date: Tue Nov 3 15:16:10 2009 -0500 + + Namespace MSVC defines in public header + + src/hb-common.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 5ebabecef382c3e8b0a2a5657b2c01f7ff37d796 +Author: Behdad Esfahbod +Date: Tue Nov 3 15:15:07 2009 -0500 + + Move unicode_funcs to buffer + + TODO | 1 - + src/hb-buffer-private.h | 12 +++++++++++- + src/hb-buffer.c | 47 ++++++++++++++++++++++++++++++++++++++--------- + src/hb-buffer.h | 10 ++++++++++ + src/hb-font-private.h | 3 --- + src/hb-font.cc | 17 ----------------- + src/hb-font.h | 9 ++++----- + 7 files changed, 63 insertions(+), 36 deletions(-) + +commit d5a8e46099e363d928b54de104126b1b34ba401c +Author: Behdad Esfahbod +Date: Tue Nov 3 15:14:40 2009 -0500 + + [Makefile] Install hb-unicode.h + + Separate OT headers also. + + src/Makefile.am | 27 ++++++++++++++++----------- + 1 file changed, 16 insertions(+), 11 deletions(-) + +commit 63d7a41dd0704a7e89bd2872ad096f470f51866a +Author: Behdad Esfahbod +Date: Tue Nov 3 15:14:08 2009 -0500 + + [TODO] Add item for fixing buffer error handling + + TODO | 1 + + 1 file changed, 1 insertion(+) + +commit 21d0fce3d5364c91e5582bd530210f03e054d1a4 +Author: Behdad Esfahbod +Date: Tue Nov 3 14:28:32 2009 -0500 + + Add check for not linking to libstdc++ + + TODO | 3 +-- + src/Makefile.am | 4 ++++ + src/check-libstdc++.sh | 28 ++++++++++++++++++++++++++++ + 3 files changed, 33 insertions(+), 2 deletions(-) + +commit ca95ce460adf2ca6901595d4a6107fd000d90151 +Author: Behdad Esfahbod +Date: Tue Nov 3 14:18:33 2009 -0500 + + Use the C linker, not C++ linker + + Such that we don't link to libstdc++. + + src/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit eb4ebda2d10637b966f42a4ed5cfaec46082a050 +Author: Behdad Esfahbod +Date: Tue Nov 3 14:09:32 2009 -0500 + + [configure] Fix check for FreeType + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cb0e99a5a76136c128faba1c27d7e7eac2f219ee +Author: Behdad Esfahbod +Date: Tue Nov 3 14:09:10 2009 -0500 + + [TODO] Remove obsolete item + + TODO | 2 -- + 1 file changed, 2 deletions(-) + +commit 3a59ec37c5576b711c7c36dcfa2a63f6c00a3f5c +Author: Behdad Esfahbod +Date: Tue Nov 3 11:36:06 2009 -0500 + + Add bunch of TODO items + + TODO | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +commit ffbe0a853d5e7defa85d0eef53814c22d1ecb412 +Author: Behdad Esfahbod +Date: Tue Nov 3 10:52:45 2009 -0500 + + More MSVC fixes from Jonathan Kew + + src/hb-common.h | 7 ++++++- + src/hb-private.h | 5 +++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit d3480ba37fbb5d4be75b094060f5b2f1ce98fb53 +Author: Behdad Esfahbod +Date: Tue Nov 3 10:47:29 2009 -0500 + + Don't use zero-sized arrays + + It's not part of the standard and MSVC doesn't like it. It makes the code + a lot less elegant than it used to be, but I think it should work now. + + src/hb-open-file-private.hh | 4 +- + src/hb-open-type-private.hh | 36 +++++++++++------ + src/hb-ot-layout-common-private.hh | 33 ++++++++-------- + src/hb-ot-layout-gdef-private.hh | 14 +++---- + src/hb-ot-layout-gpos-private.hh | 76 ++++++++++++++---------------------- + src/hb-ot-layout-gsub-private.hh | 44 ++++++++------------- + src/hb-ot-layout-gsubgpos-private.hh | 47 +++++++++++----------- + src/hb-private.h | 5 +++ + 8 files changed, 122 insertions(+), 137 deletions(-) + +commit 6bec81aa3a58b8be255568b2ea63b7854e1b0ea7 +Author: Behdad Esfahbod +Date: Mon Nov 2 19:17:36 2009 -0500 + + Cosmetic + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f94cf6b969281cf8a7f701ff26ea4f134ff9746e +Author: Behdad Esfahbod +Date: Mon Nov 2 18:55:19 2009 -0500 + + Another try at build without glib + + configure.ac | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 2f3e69f3cb7e571cc62b0840d0b3f2072b29345a +Author: Behdad Esfahbod +Date: Mon Nov 2 18:53:15 2009 -0500 + + Fix build without glib, again + + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d03f81865914b40e941bf680557c0d8f98e30ad5 +Author: Behdad Esfahbod +Date: Mon Nov 2 18:52:21 2009 -0500 + + Disable configure cache + + autogen.sh | 1 - + 1 file changed, 1 deletion(-) + +commit a6451aa626fa5850d7c3b716bd52126995154e27 +Author: Behdad Esfahbod +Date: Mon Nov 2 18:35:12 2009 -0500 + + We don't really use gthread directly + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 63a792a811e0ad69d05e8805d4f347bd533db4c3 +Author: Behdad Esfahbod +Date: Mon Nov 2 18:33:52 2009 -0500 + + Update Makefile to build without glib + + src/Makefile.am | 12 +++++++++--- + src/hb-glib.c | 2 ++ + 2 files changed, 11 insertions(+), 3 deletions(-) + +commit 68a2c771e2b923461a552bf3673e9e8245e1bfea +Author: Behdad Esfahbod +Date: Mon Nov 2 18:31:53 2009 -0500 + + Build without glib + + Thready-safety disabled in that case, until we add support for pthread, etc. + Fun... + + src/hb-private.h | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) + +commit cc4c096a7e08ae96b3030fe27f871ce5b797f370 +Author: Behdad Esfahbod +Date: Mon Nov 2 18:13:17 2009 -0500 + + MSVC has no stdint.h + + src/hb-common.h | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 9a204c7ab57ca0a866c72e1431c54a8883b15605 +Author: Behdad Esfahbod +Date: Mon Nov 2 18:11:55 2009 -0500 + + Remove use of GINT16_FROM_BE + + src/hb-private.h | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +commit 1f0ceeb8cf2fad0a0dfd338ce1472470a81789d4 +Author: Behdad Esfahbod +Date: Mon Nov 2 16:28:39 2009 -0500 + + Install library + + autogen.sh | 2 +- + src/Makefile.am | 5 ++--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +commit 5932f8f7c3b73ade3752020351fa8b6a9a3bf500 +Author: Behdad Esfahbod +Date: Mon Nov 2 16:38:41 2009 -0500 + + Generate ChangeLog + + Makefile.am | 39 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 39 insertions(+) + +commit 29aa40018301a4f138cd5e73463079c7704bf3ac +Author: Behdad Esfahbod +Date: Mon Nov 2 16:28:39 2009 -0500 + + Add build system + + AUTHORS | 0 + src/COPYING => COPYING | 0 + Makefile.am | 3 + + NEWS | 0 + src/README => README | 0 + src/TODO => TODO | 0 + autogen.sh | 189 +++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 40 +++++++++++ + git.mk | 184 +++++++++++++++++++++++++++++++++++++++++++++++ + harfbuzz.pc.in | 11 +++ + src/.gitignore | 1 - + src/Makefile.ng | 11 --- + 12 files changed, 427 insertions(+), 12 deletions(-) + +commit c09ed9801ead002d6f8e507ce664b83707b202e9 +Author: Behdad Esfahbod +Date: Thu Oct 29 03:08:42 2009 -0400 + + [HB] Add glyph_metrics typedef + + src/hb-font.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 91b1e03e0312be2a7a165308239b40449e3ab360 +Author: Behdad Esfahbod +Date: Thu Oct 29 03:05:18 2009 -0400 + + [HB] Add point_index to get_contour_point() + + Pointed out by Keith Stribley on HarfBuzz list. + + src/hb-font.h | 1 + + 1 file changed, 1 insertion(+) + +commit aa87d951739f6beacb66daa235cd033fdcfcadd7 +Author: Behdad Esfahbod +Date: Thu Oct 29 03:00:44 2009 -0400 + + [HB] Fix lookup_flag ignoring + + Reported by Keith Stribley on HarfBuzz list. + + src/hb-ot-layout-common-private.hh | 1 + + src/hb-ot-layout.cc | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 52e9a71d578c5171bbb0f4bfc1b70841c3270328 +Author: Behdad Esfahbod +Date: Mon Sep 21 13:58:56 2009 -0400 + + [HB] Add comment + + src/hb-ot-layout-gsubgpos-private.hh | 5 +++++ + 1 file changed, 5 insertions(+) + +commit f9c0a2dad09cd168fb28cdee09b4303f307ea56d +Author: Behdad Esfahbod +Date: Mon Sep 21 13:43:54 2009 -0400 + + [HB] Fix apply_lookup() loop + + Part of Bug 595539 - Regressions in rendering certain Thai sequences with + OpenType font + + src/hb-ot-layout-gsubgpos-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit c0ab43c05833e8fc06d770a89370bec58a627e74 +Author: Behdad Esfahbod +Date: Mon Sep 21 13:40:38 2009 -0400 + + [HB] Fix bug in chain_context_lookup() invocations + + Part of Bug 595539 - Regressions in rendering certain Thai sequences with + OpenType font + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e6bd4e93bd5722249ab977dfa98bdc8eb765318c +Author: Behdad Esfahbod +Date: Sun Aug 30 21:02:28 2009 -0400 + + [HB] Add TODO item + + src/TODO | 1 + + 1 file changed, 1 insertion(+) + +commit 3e2401f6c53d2b047954d75c37aef5e5e7cdc51a +Author: Behdad Esfahbod +Date: Fri Aug 28 17:17:11 2009 -0400 + + [HB] Rename DEBUG to TRACE where appropriate + + src/hb-open-file-private.hh | 8 ++-- + src/hb-open-type-private.hh | 50 ++++++++++---------- + src/hb-ot-layout-common-private.hh | 32 ++++++------- + src/hb-ot-layout-gdef-private.hh | 20 ++++---- + src/hb-ot-layout-gpos-private.hh | 92 ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 72 ++++++++++++++-------------- + src/hb-ot-layout-gsubgpos-private.hh | 78 +++++++++++++++--------------- + 7 files changed, 176 insertions(+), 176 deletions(-) + +commit 0535b50f436f3dac85e6df1761957f86c2bd7213 +Author: Behdad Esfahbod +Date: Fri Aug 28 17:14:33 2009 -0400 + + [HB] Add GSUB/GPOS tracing + + src/hb-ot-layout-gpos-private.hh | 29 ++++++++++++++++++--- + src/hb-ot-layout-gsub-private.hh | 28 ++++++++++++++++++--- + src/hb-ot-layout-gsubgpos-private.hh | 49 ++++++++++++++++++++++++++++++++++-- + 3 files changed, 98 insertions(+), 8 deletions(-) + +commit 95e202403ffa543c817f45cca21fbc116eb8e807 +Author: Behdad Esfahbod +Date: Fri Aug 28 16:31:20 2009 -0400 + + [HB] Allow enabling different debug facilities individually + + src/hb-blob.c | 28 ++++++++++++++++------------ + src/hb-open-type-private.hh | 32 ++++++++++++++++++-------------- + 2 files changed, 34 insertions(+), 26 deletions(-) + +commit 37006bd1bd107ac1a1c1b131579e9c494ba3a20f +Author: Behdad Esfahbod +Date: Fri Aug 28 09:46:14 2009 -0400 + + Fix stupid array growing bug + + src/hb-ot-layout.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 9897749113f76dc26a83bfae8de62e55d384fcad +Author: Behdad Esfahbod +Date: Thu Aug 27 01:32:17 2009 -0400 + + [HB] Simplify counting + + src/hb-ot-layout.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 81a5c4df94e7c6066314d5fe75bbaf24483bc022 +Author: Behdad Esfahbod +Date: Thu Aug 27 00:21:04 2009 -0400 + + [HB] Indent + + src/hb-blob.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c91facd83b5dc3b9aed75617c7c35585ff18889f +Author: Behdad Esfahbod +Date: Wed Aug 26 18:53:43 2009 -0400 + + [HB] Bug 593231 - < c99 compiler dislikes ValueRecord + + src/hb-ot-layout-gpos-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit f0c7540c4e217a7354072365a7301453d1e25b80 +Author: Behdad Esfahbod +Date: Thu Aug 20 14:01:37 2009 -0400 + + Bug 592484 - invalid write in HB + + Fix off-by-one. + + src/hb-ot-layout.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b614b004723ead60849dd37e7ba2faee67cebd93 +Author: Behdad Esfahbod +Date: Thu Aug 20 13:07:50 2009 -0400 + + [HB][glib] Make glib unicode funcs static + + src/hb-glib.c | 36 +++++++++++++++++------------------- + 1 file changed, 17 insertions(+), 19 deletions(-) + +commit 8b5346130425c7c101f6ff2432874ba2fd372edc +Author: Behdad Esfahbod +Date: Wed Aug 19 18:16:50 2009 -0400 + + [HB] Fix more casts + + src/hb-open-type-private.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 9d2e02db74deb3b3b92beab96f112cc387c8bd88 +Author: Behdad Esfahbod +Date: Wed Aug 19 18:07:36 2009 -0400 + + [HB] Rename CAIRO_ in macro prefix to HB_ + + Hiss! + + src/hb-private.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 388ad037ff399c23c5e24bbcede27e0e35bed07e +Author: Behdad Esfahbod +Date: Wed Aug 19 16:45:41 2009 -0400 + + [HB] Remove HB_MEMORY_MODE_READONLY_NEVER_DUPLICATE + + Unlike the rest of the memory-mode enum, this one didn't only + describe the access mode of the input memory region. Remove it. + + If someone wants to inhibit duplicating, they can lock the blob + and throw away the key. + + Based on mailing list discussion with Carl Worth. + + src/hb-blob.c | 51 +++++++++++++++++++++++++-------------------------- + src/hb-blob.h | 1 - + 2 files changed, 25 insertions(+), 27 deletions(-) + +commit 977eeb714454630bd045bb11f58ff6397f10b143 +Author: Behdad Esfahbod +Date: Wed Aug 19 16:17:24 2009 -0400 + + [HB] s/writeable/writable/g + + src/hb-blob.c | 38 +++++++++++++++++++------------------- + src/hb-blob.h | 10 +++++----- + src/hb-open-type-private.hh | 6 +++--- + 3 files changed, 27 insertions(+), 27 deletions(-) + +commit 2f5931e404cb56e31d24b2eb7ff0a849fb077b55 +Author: Behdad Esfahbod +Date: Wed Aug 19 16:07:40 2009 -0400 + + [HB] Hide lig_id and component members of hb_glyph_info_t + + src/hb-buffer.h | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 6b600dd6199104cff01b3fa43d2abb52ae4319ea +Author: Behdad Esfahbod +Date: Wed Aug 19 14:45:24 2009 -0400 + + [HB] Fix typo + + src/hb-font.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 32c65a5ca3bde673bf2aa8fca911dd32914d3122 +Author: Behdad Esfahbod +Date: Tue Aug 18 18:37:36 2009 -0400 + + [HB] Add font funcs prototypes + + src/hb-font-private.h | 2 -- + src/hb-font.cc | 14 ++++++-------- + src/hb-font.h | 23 ++++++++++++++++------- + 3 files changed, 22 insertions(+), 17 deletions(-) + +commit 8f034d5849627ee95a5889fa34c9ba294fff13ca +Author: Behdad Esfahbod +Date: Tue Aug 18 16:41:59 2009 -0400 + + Fix a few other pedantic warnings + + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +commit 864e2560b627f1e73be3b0635e02f00844cb67c3 +Author: Behdad Esfahbod +Date: Tue Aug 18 16:38:48 2009 -0400 + + [HB] Fix pedantic warnings + + src/hb-blob.h | 2 +- + src/hb-buffer-private.h | 18 +++++++++--------- + src/hb-buffer.h | 6 +++--- + 3 files changed, 13 insertions(+), 13 deletions(-) + +commit 3e09722214d9bbcc9014409342072c79d0c4447f +Author: Behdad Esfahbod +Date: Tue Aug 18 16:32:31 2009 -0400 + + [HB] Fix more wrong method signatures + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 822e99fe9ae920df41a0bd3f1125495c2ea96b45 +Author: Behdad Esfahbod +Date: Tue Aug 18 16:27:48 2009 -0400 + + [HB] Fix wrong method signature + + src/hb-ot-layout-common-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4ff2a58952f010c6252f06e5f404d6840d257250 +Author: Behdad Esfahbod +Date: Tue Aug 18 15:49:23 2009 -0400 + + Bug 592194 - Fix missing _SC_PAGE_SIZE macro + + Autoconfiscate a simple call to mprotect() even more. + + src/hb-blob.c | 94 ++++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 60 insertions(+), 34 deletions(-) + +commit 3c69bd46e27069fac0bfdefdecf5492c17eb01df +Author: Behdad Esfahbod +Date: Mon Aug 17 16:48:13 2009 -0400 + + [HB] Avoid int overflow in GPOS + + Bug 592036 - integer overflow bug causes misrendering of Nepali characters + + src/hb-ot-layout-gpos-private.hh | 20 ++++++++++---------- + src/hb-private.h | 3 +++ + 2 files changed, 13 insertions(+), 10 deletions(-) + +commit b2b18ef43c5bac6a5bb8412da7c9a37f815d4deb +Author: Behdad Esfahbod +Date: Fri Aug 14 19:37:18 2009 -0400 + + [HB] Simplify loop + + src/hb-ot-layout-gpos-private.hh | 31 ++++++++++++++----------------- + 1 file changed, 14 insertions(+), 17 deletions(-) + +commit b41f210d12d8df48e645823463343f7e14b0ddd0 +Author: Behdad Esfahbod +Date: Fri Aug 14 19:33:24 2009 -0400 + + [HB] Merge mark positionin code between three types of lookups + + src/hb-ot-layout-gpos-private.hh | 95 ++++++++++++---------------------------- + 1 file changed, 29 insertions(+), 66 deletions(-) + +commit cd33cb9ed84308da72bd7c64b9355dc2410c63ec +Author: Behdad Esfahbod +Date: Fri Aug 14 18:42:42 2009 -0400 + + [HB] More minor shuffling + + src/hb-open-type-private.hh | 3 --- + src/hb-ot-layout-common-private.hh | 5 +++++ + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit 80e2aa2e1bfa2c8ecedcfa4cce8cadeb15792ac3 +Author: Behdad Esfahbod +Date: Fri Aug 14 18:40:56 2009 -0400 + + [HB] Move code around + + src/hb-open-type-private.hh | 21 +++++++++++++++++++++ + src/hb-ot-layout-common-private.hh | 19 ------------------- + 2 files changed, 21 insertions(+), 19 deletions(-) + +commit 3564ee5216004d45d30b0ded61184cf8dde5dd89 +Author: Behdad Esfahbod +Date: Fri Aug 14 18:32:56 2009 -0400 + + [HB] Correctly sanitize LigatureAttach + + src/hb-open-type-private.hh | 14 ++++++++++---- + src/hb-ot-layout-common-private.hh | 4 ++++ + src/hb-ot-layout-gdef-private.hh | 4 ++-- + src/hb-ot-layout-gpos-private.hh | 6 +++--- + 4 files changed, 19 insertions(+), 9 deletions(-) + +commit cb71a2fb76c6ddee050f775eb299ee44230c3ac9 +Author: Behdad Esfahbod +Date: Fri Aug 14 18:14:03 2009 -0400 + + [HB] Simplify MarkBase and MarkLig too + + src/hb-ot-layout-gpos-private.hh | 127 +++++++++++++++------------------------ + 1 file changed, 48 insertions(+), 79 deletions(-) + +commit dfa54f4440960c39d37ef02fff4c0d9eb315d4b4 +Author: Behdad Esfahbod +Date: Fri Aug 14 17:53:31 2009 -0400 + + [HB] Simplify MarkMark + + src/hb-ot-layout-gpos-private.hh | 29 ++++++++++++++++------------- + 1 file changed, 16 insertions(+), 13 deletions(-) + +commit 815a73e4202ca17677f12e862b70ca8724cf2f57 +Author: Behdad Esfahbod +Date: Fri Aug 14 17:31:16 2009 -0400 + + [HB] Fix possible int overflows during sanitize + + src/TODO | 1 - + src/hb-open-type-private.hh | 22 ++++++++++++++++++++++ + src/hb-ot-layout-gpos-private.hh | 15 ++++++++------- + 3 files changed, 30 insertions(+), 8 deletions(-) + +commit ae728e51e94d18d731b7c8dc524da1a4f427d63b +Author: Behdad Esfahbod +Date: Fri Aug 14 16:41:00 2009 -0400 + + [HB] Debug output for SANITIZE_MEM() + + src/hb-open-type-private.hh | 34 +++++++++++++++++++++++----------- + 1 file changed, 23 insertions(+), 11 deletions(-) + +commit 41895506cb6a41b1a833866f8822261ea449ea0b +Author: Behdad Esfahbod +Date: Fri Aug 14 16:25:33 2009 -0400 + + [HB] Use inline function for SANITIZE_MEM() + + src/hb-open-type-private.hh | 33 ++++++++++++++++++++------------- + 1 file changed, 20 insertions(+), 13 deletions(-) + +commit 95528131b5ab9fc9e265ace715832135ebd457a4 +Author: Behdad Esfahbod +Date: Fri Aug 14 16:17:32 2009 -0400 + + [HB] Use SANITIZE_THIS() when applicable + + src/hb-open-type-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 5769538abfe153c503da4801649493e57a9854c2 +Author: Behdad Esfahbod +Date: Fri Aug 14 16:12:22 2009 -0400 + + [HB] Add note about auditing sanitize code for overflows + + src/TODO | 1 + + src/hb-ot-layout-gpos-private.hh | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 15232e26f4a89dab1b6de35ad9d3d16e75bf93d0 +Author: Behdad Esfahbod +Date: Thu Aug 13 17:13:25 2009 -0400 + + [HB] Add empty hb_shape() API + + src/Makefile.am | 2 ++ + src/hb-shape.c | 40 ++++++++++++++++++++++++++++++++++++++++ + src/hb-shape.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 95 insertions(+) + +commit 2866d2974b6768e93cc7d473d14c5a8abae5f7fd +Author: Behdad Esfahbod +Date: Thu Aug 13 11:47:08 2009 -0400 + + [HB] Bitfield packing *is* very delicate + + Fix the second instance. + + src/hb-buffer.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ec90ee23b29aab187c3fa209970aa97434c84b1b +Author: Behdad Esfahbod +Date: Thu Aug 13 05:25:23 2009 -0400 + + Bug 591511 – hh-blob.c does not compile using mingw on windows + + Check for sys/mman.h, not mprotect(). + + src/hb-blob.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 12eae6d55d468ff2fbe2bc12bec188d313c671f9 +Author: Behdad Esfahbod +Date: Thu Aug 13 05:20:46 2009 -0400 + + [HB] Fix buffer sizing issue with mingw gcc + + Bit field packing is a delicate field. Issue reported in comment 3 here: + http://bugzilla.gnome.org/show_bug.cgi?id=591511 + + src/hb-buffer-private.h | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 6936706cd77f96961a1239d0c9dc8ede64d7f06d +Author: Behdad Esfahbod +Date: Wed Aug 12 19:45:50 2009 -0400 + + Bug 591413 – needs to link with libstdc++ + + Enforce -fno-exceptions better. + + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c486ea9c3582710474c1085c21c1dc5e2700adc3 +Author: Behdad Esfahbod +Date: Wed Aug 12 19:36:29 2009 -0400 + + Bug 591511 – hb-blob.c does not compile using mingw on windows + + Only call mprotect() when available. For optimal performance, a win32 + way to make memory writeable needs to be added. + + src/hb-blob.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit a579584594f1ca4781f1c5b92ad78513c0b37480 +Author: Behdad Esfahbod +Date: Wed Aug 12 19:23:16 2009 -0400 + + [HB] Add comment + + src/hb-buffer-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b6e66ee102eb5b64d945e5a73ab63fe8cac5edcb +Author: Behdad Esfahbod +Date: Wed Aug 12 16:50:28 2009 -0400 + + [HB] Always clear positions if dirty, before returning to user + + src/hb-buffer.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e4679d9fae43f3219c476c5b9e411d1f5d0d5bae +Author: Behdad Esfahbod +Date: Wed Aug 12 16:47:27 2009 -0400 + + [HB] Fix _hb_buffer_next() when positioning + + We were copying glyphs to output. This should not happen when in + GPOS. Back then it was fine, then some optimizations broke then + assumption. + + src/hb-buffer-private.h | 1 + + src/hb-buffer.c | 12 ++++++++++++ + 2 files changed, 13 insertions(+) + +commit 5ccf1ba339d6ffb4469f1c4f20d8d8d00012c857 +Author: Behdad Esfahbod +Date: Wed Aug 12 15:55:23 2009 -0400 + + [HB] Fixed signedness warnings + + src/hb-open-type-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f71329147bd3087588cfeafd6feff45f29d1ca7a +Author: Behdad Esfahbod +Date: Wed Aug 12 15:48:44 2009 -0400 + + [HB] Ouch. Fix compilation. + + src/hb-ot-layout-gpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0532ed160c678b5404b20594fd2ca9a640bf6a0a +Author: Behdad Esfahbod +Date: Wed Aug 12 15:40:04 2009 -0400 + + [HB] Fix invalid access / overflow on x86-64 + + Bug 591557 – [HB] crash scrolling the evolution message list + Bug 591576 – crashed with SIGSEGV at pango + + src/hb-ot-layout-gpos-private.hh | 21 ++++++++++++--------- + src/hb-ot-layout-gsub-private.hh | 2 -- + 2 files changed, 12 insertions(+), 11 deletions(-) + +commit 8d70312c7b899131c3aafa7a43527ef3ced33bfe +Author: Behdad Esfahbod +Date: Mon Aug 10 23:50:51 2009 -0400 + + [HB] Add hb_font_funcs_make_immutable() + + src/hb-font-private.h | 4 ++++ + src/hb-font.cc | 17 +++++++++++++++-- + src/hb-font.h | 3 +++ + 3 files changed, 22 insertions(+), 2 deletions(-) + +commit 3284d05da27c338d94f0da99df66d924cd9d6717 +Author: Behdad Esfahbod +Date: Mon Aug 10 23:45:57 2009 -0400 + + [HB] Add missing initializer + + src/hb-font.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 081819ea8b98c0a4b4dffe8d4aca3512f9798719 +Author: Behdad Esfahbod +Date: Mon Aug 10 23:40:28 2009 -0400 + + [OT] Hookup glib unicode funcs + + src/hb-buffer.c | 14 +++++++------- + src/hb-glib.c | 4 +++- + src/hb-glib.h | 4 ++-- + src/hb-ot-layout.cc | 10 +++++----- + src/hb-private.h | 2 +- + 5 files changed, 18 insertions(+), 16 deletions(-) + +commit 49f261df2aa753e8b09e97f7835e6a827f92970a +Author: Behdad Esfahbod +Date: Mon Aug 10 23:35:05 2009 -0400 + + [HB] Add hb-glib + + src/Makefile.am | 4 +++- + src/hb-glib.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-glib.h | 41 +++++++++++++++++++++++++++++++++++ + src/hb-unicode-private.h | 2 +- + src/hb-unicode.c | 10 ++++----- + src/hb-unicode.h | 6 +++--- + 6 files changed, 109 insertions(+), 10 deletions(-) + +commit eb27ec0cef0d92740875ab5035b53acc639e5fae +Author: Behdad Esfahbod +Date: Mon Aug 10 23:25:28 2009 -0400 + + [HB] Add hb_unicode_funcs_make_immutable() + + src/hb-unicode-private.h | 2 ++ + src/hb-unicode.c | 22 +++++++++++++++++----- + src/hb-unicode.h | 2 ++ + 3 files changed, 21 insertions(+), 5 deletions(-) + +commit af9e104028b7cdc1fbba0eb1d86cfa4d5258657f +Author: Behdad Esfahbod +Date: Mon Aug 10 23:21:33 2009 -0400 + + [HB] Use nil unicode funcs in nil face + + src/hb-font.cc | 7 ++++--- + src/hb-unicode-private.h | 3 +++ + src/hb-unicode.c | 2 +- + 3 files changed, 8 insertions(+), 4 deletions(-) + +commit 48910f8f0034c54b4e11cef3d08aa40e52c06b28 +Author: Behdad Esfahbod +Date: Mon Aug 10 23:05:05 2009 -0400 + + [HB] Initialize unicode funcs to nil getters + + src/hb-unicode.c | 29 +++++++++++++++++++---------- + 1 file changed, 19 insertions(+), 10 deletions(-) + +commit 04cc0a29ee1472c318c36efcd19b9c1a6657d9ea +Author: Behdad Esfahbod +Date: Mon Aug 10 22:58:56 2009 -0400 + + [HB] Flesh out Unicode funcs + + src/hb-object-private.h | 2 +- + src/hb-unicode-private.h | 12 ++++----- + src/hb-unicode.c | 67 ++++++++++++++++++++++++++++++++++++++++++------ + src/hb-unicode.h | 3 --- + 4 files changed, 65 insertions(+), 19 deletions(-) + +commit 299f08961ffcea27e8def4f0743d0c86ef8dadf1 +Author: Behdad Esfahbod +Date: Mon Aug 10 22:47:57 2009 -0400 + + [HB] Implement buffer UTF-X input + + src/hb-buffer.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-buffer.h | 12 +++---- + 2 files changed, 116 insertions(+), 6 deletions(-) + +commit 1b7b97f28ac192006ca5b6d1cc9fbc80fa2bdb55 +Author: Behdad Esfahbod +Date: Mon Aug 10 21:10:37 2009 -0400 + + [HB] Add buffer UTF-X API + + src/hb-buffer.h | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit fbaf8ffa098bd2b6fb4f4bc2d04b360a319c4af5 +Author: Behdad Esfahbod +Date: Mon Aug 10 20:59:25 2009 -0400 + + [HB] Add hb_buffer_reverse() + + src/hb-buffer.c | 32 +++++++++++++++++++++++++++++--- + src/hb-buffer.h | 7 +++++++ + 2 files changed, 36 insertions(+), 3 deletions(-) + +commit cbe5a4e08e6c2ccfdf98e630d48ec9da69374516 +Author: Behdad Esfahbod +Date: Mon Aug 10 20:24:49 2009 -0400 + + [HB] Reuse the positions array as alt string array + + src/hb-buffer-private.h | 1 - + src/hb-buffer.c | 28 +++++++++------------------- + 2 files changed, 9 insertions(+), 20 deletions(-) + +commit 5c44188455ca1b696aa24b20c3a83877dfae2fb2 +Author: Behdad Esfahbod +Date: Mon Aug 10 20:05:16 2009 -0400 + + [HB] Start adding Unicode funcs + + src/Makefile.am | 3 + + src/hb-font-private.h | 29 ++----- + src/hb-font.cc | 163 ++++++++++------------------------- + src/hb-font.h | 140 ++++++++++-------------------- + src/hb-unicode-private.h | 54 ++++++++++++ + src/hb-unicode.c | 89 +++++++++++++++++++ + src/hb-unicode.h | 220 +++++++++++++++++++++++++++++++++++++++++++++++ + 7 files changed, 463 insertions(+), 235 deletions(-) + +commit 20b035dad41247076815a2bbb0346d63058b322f +Author: Behdad Esfahbod +Date: Mon Aug 10 19:00:36 2009 -0400 + + [HB] Put C++ inline's back + + Apparetly in C++, inline means a totally different thing. + + src/hb-open-file-private.hh | 14 +++++++------- + src/hb-open-type-private.hh | 16 ++++++++-------- + src/hb-ot-layout-common-private.hh | 12 ++++++------ + src/hb-ot-layout-gdef-private.hh | 4 ++-- + src/hb-ot-layout-gpos-private.hh | 12 ++++++------ + src/hb-ot-layout-gsub-private.hh | 12 ++++++------ + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++------ + 7 files changed, 41 insertions(+), 41 deletions(-) + +commit a62f776d8e7e3e57d28ee71b34abab0a5b8471eb +Author: Behdad Esfahbod +Date: Mon Aug 10 13:57:02 2009 -0400 + + [HB] Don't override CXX compiler + + Just add couple of options to it (still assuming gcc) + + src/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 6bdab706ecb41c1305e85d041a586e86c54d0ab7 +Author: Behdad Esfahbod +Date: Mon Aug 10 09:35:11 2009 -0400 + + [HB] Indent + + src/hb-ot-layout.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 797724904a3ab294f8390d4ff80c299d8213a5c6 +Author: Behdad Esfahbod +Date: Sun Aug 9 22:25:17 2009 -0400 + + [HB] Remove unused code + + src/hb-ot-layout-gdef-private.hh | 10 ---------- + 1 file changed, 10 deletions(-) + +commit 284899ccbe79fda7405ab09d3092fc25fd89e810 +Author: Behdad Esfahbod +Date: Sun Aug 9 22:10:39 2009 -0400 + + [HB] Add a NEXT() macro + + src/hb-open-type-private.hh | 2 ++ + src/hb-ot-layout-common-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 8 ++++---- + src/hb-ot-layout-gsubgpos-private.hh | 24 ++++++++++++------------ + 4 files changed, 20 insertions(+), 18 deletions(-) + +commit 918572fc870dfd7596155ce700247a5bb024fb1a +Author: Behdad Esfahbod +Date: Sun Aug 9 18:31:47 2009 -0400 + + [HB] Remove done TODO item + + src/TODO | 1 - + 1 file changed, 1 deletion(-) + +commit 67cb8111f209de26b3afa46e9fb7e4d01c9ecad4 +Author: Behdad Esfahbod +Date: Sun Aug 9 13:05:08 2009 -0400 + + [HB] Print mark sets in main.cc + + src/main.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 17878255fa88e76cd503461fc1ade2ed365cebd2 +Author: Behdad Esfahbod +Date: Sat Aug 8 16:57:27 2009 -0400 + + [HB] Remove hb_ot_layout_table_find_feature() + + That function doesn't make much sense as multiple features in the table may + have the same tag. + + src/hb-ot-layout.cc | 16 ---------------- + src/hb-ot-layout.h | 6 ------ + 2 files changed, 22 deletions(-) + +commit 468769b8f5332940278244e744ec2bd5a5dc5ee9 +Author: Behdad Esfahbod +Date: Sat Aug 8 16:53:23 2009 -0400 + + [HB] Rename hb_ot_layout_feature_mask_t to hb_mask_t + + src/TODO | 1 - + src/hb-buffer-private.h | 4 ++-- + src/hb-buffer.c | 12 ++++++------ + src/hb-buffer.h | 4 ++-- + src/hb-common.h | 1 + + src/hb-ot-layout-gpos-private.hh | 12 ++++++------ + src/hb-ot-layout-gsub-private.hh | 14 +++++++------- + src/hb-ot-layout.cc | 18 +++++++++--------- + src/hb-ot-layout.h | 34 +++++++++------------------------- + 9 files changed, 42 insertions(+), 58 deletions(-) + +commit 7f96b39a9d5a81ba77e0c3dea8fe2cdb9957c4c7 +Author: Behdad Esfahbod +Date: Sat Aug 8 16:37:22 2009 -0400 + + [HB] Fix bug introduced recently + + src/hb-open-type-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bff3c0fde5da04a70d1f7aeeb9fa2a75fe5c07f6 +Author: Behdad Esfahbod +Date: Fri Aug 7 19:46:30 2009 -0400 + + [HB] Remove clumsy macros and improve API + + src/TODO | 2 - + src/hb-open-file-private.hh | 41 ++++++++-- + src/hb-open-type-private.hh | 104 +------------------------ + src/hb-ot-layout-common-private.hh | 103 ++++++++++++++++++------ + src/hb-ot-layout-gsubgpos-private.hh | 35 +++++++-- + src/hb-ot-layout.cc | 146 ++++++++++++----------------------- + src/hb-ot-layout.h | 101 ++++++++++-------------- + 7 files changed, 240 insertions(+), 292 deletions(-) + +commit d0b657379bbe63602953412d6bc944b2a0f430eb +Author: Behdad Esfahbod +Date: Thu Aug 6 18:34:47 2009 -0400 + + [HB] Fix various XXX issues + + src/hb-open-type-private.hh | 13 ++++++++++--- + src/hb-ot-layout-gdef-private.hh | 5 ++--- + 2 files changed, 12 insertions(+), 6 deletions(-) + +commit 82199868fb036b63799af761762225d45d36f575 +Author: Behdad Esfahbod +Date: Thu Aug 6 18:28:45 2009 -0400 + + [HB] Remove unused var + + src/hb-ot-layout-private.h | 2 -- + 1 file changed, 2 deletions(-) + +commit 07e69226cbd4167741fd868a3125487bbabb99dc +Author: Behdad Esfahbod +Date: Thu Aug 6 18:28:00 2009 -0400 + + [HB] Remove another stale XXX + + src/hb-ot-layout.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit e605c367c5627e7ab05af9cb59247a89290e598a +Author: Behdad Esfahbod +Date: Thu Aug 6 18:27:28 2009 -0400 + + [HB] Rebrand XXX as TODO + + src/hb-open-file-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c5a13048e21fcfcfd3b74f800e8d521e6245b451 +Author: Behdad Esfahbod +Date: Thu Aug 6 18:26:38 2009 -0400 + + [HB] Remove stale XXX + + src/hb-blob.c | 2 -- + 1 file changed, 2 deletions(-) + +commit 9e826ea2832f0444bcef9075b445d481a58a09c2 +Author: Behdad Esfahbod +Date: Thu Aug 6 18:24:55 2009 -0400 + + [HB] Fix unaligned access + + src/hb-open-type-private.hh | 20 +++++++++++++++++--- + src/hb-private.h | 22 ++++++++++++++++++++++ + 2 files changed, 39 insertions(+), 3 deletions(-) + +commit 71a8344a5eeaa34e31d53138cf3bbe30b819f83c +Author: Behdad Esfahbod +Date: Thu Aug 6 14:28:18 2009 -0400 + + [HB] Remove a few 'inline's, though the compiler mostly ignores them + + src/hb-open-file-private.hh | 1 - + src/hb-open-type-private.hh | 16 ++++++++-------- + src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- + 3 files changed, 11 insertions(+), 12 deletions(-) + +commit 7f3d5c8166e5205e9d9bf8b4b2f31d44387a8006 +Author: Behdad Esfahbod +Date: Thu Aug 6 13:33:51 2009 -0400 + + [HB] Fix blob to use a actual mutex + + src/hb-blob.c | 125 +++++++++++++++++++++++++++++++++++------------- + src/hb-object-private.h | 4 +- + src/hb-private.h | 20 +++++--- + 3 files changed, 106 insertions(+), 43 deletions(-) + +commit a794ebf4be9896393f4badf02905a4007981a588 +Author: Behdad Esfahbod +Date: Thu Aug 6 12:32:35 2009 -0400 + + [HB] Use glib again + + src/Makefile.am | 5 +++-- + src/hb-blob.c | 4 ++-- + src/hb-object-private.h | 19 ++++++------------- + src/hb-private.h | 45 ++++++++++++++++++++++++++------------------- + 4 files changed, 37 insertions(+), 36 deletions(-) + +commit 9b76a290a94f2603f3cb9498ae976125347cf54b +Author: Behdad Esfahbod +Date: Thu Aug 6 10:27:38 2009 -0400 + + [HB] Improve debug output + + src/hb-open-type-private.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 9faee63034d3965735bd6362c0beeca1613bd771 +Author: Behdad Esfahbod +Date: Thu Aug 6 10:24:49 2009 -0400 + + [HB] Minor + + src/hb-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f72059ee6946d9b4812b794f662ee83c7e25fe53 +Author: Behdad Esfahbod +Date: Wed Aug 5 15:35:02 2009 -0400 + + [HB] Add a few TODO items + + src/TODO | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 0d77ab8a73f57c9fca4c6f9301dae394d79526e3 +Author: Behdad Esfahbod +Date: Wed Aug 5 15:27:42 2009 -0400 + + [HB] Improve debug output + + src/hb-open-type-private.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 268cac4c9ef8cb592cfb8507273332165b8d3ad3 +Author: Behdad Esfahbod +Date: Wed Aug 5 15:21:48 2009 -0400 + + [HB] Fix blob unlock + + src/hb-blob.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7acb389569cf99c6bae9db31a8ed7c7007fbb566 +Author: Behdad Esfahbod +Date: Wed Aug 5 15:20:34 2009 -0400 + + [HB] Improve debug output and fix mprotect bug + + src/hb-blob.c | 57 ++++++++++++++++++++++++++++++++++++++------- + src/hb-open-type-private.hh | 30 +++++++++++------------- + src/hb-private.h | 3 ++- + 3 files changed, 65 insertions(+), 25 deletions(-) + +commit ec9f8db0d3cad146801b7dc5c59e517de3b6fa34 +Author: Behdad Esfahbod +Date: Wed Aug 5 14:52:03 2009 -0400 + + [HB] Minor + + src/hb-private.h | 3 +++ + 1 file changed, 3 insertions(+) + +commit d341881d9a0f835f691b121480046081ad162918 +Author: Behdad Esfahbod +Date: Wed Aug 5 14:49:25 2009 -0400 + + [HB] Fix build of main.cc + + src/Makefile.am | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 8f3be25e7ec88ea451ee8097bf32e5f729f4fef9 +Author: Behdad Esfahbod +Date: Tue Aug 4 23:43:40 2009 -0400 + + [HB] turn debugging off + + src/hb-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 62ed5850d9e0e0d0231889470d58e815420c21e5 +Author: Behdad Esfahbod +Date: Tue Aug 4 23:30:32 2009 -0400 + + [HB] Fix another sanitize() bug; hopefully it's the last one + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 90482b68178b687c0f0a3f82cd6a36b2c0bb9384 +Author: Behdad Esfahbod +Date: Tue Aug 4 23:24:35 2009 -0400 + + [HB] Fix a couple other sanitize() bugs + + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 4f3ad9115a4161fc23fa559c26082440196217ec +Author: Behdad Esfahbod +Date: Tue Aug 4 23:01:23 2009 -0400 + + [HB] More debugging output + + src/hb-open-type-private.hh | 45 ++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 40 insertions(+), 5 deletions(-) + +commit 8cd6fa28d1b77100491519b8dedb2e113508bf59 +Author: Behdad Esfahbod +Date: Tue Aug 4 22:55:44 2009 -0400 + + [HB] Fix fatal Sanitizer bug + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2870ac5e5d5d87646a4b273a9805fb3fcf280f97 +Author: Behdad Esfahbod +Date: Tue Aug 4 22:43:47 2009 -0400 + + [HB] Add missing sanitize + + src/hb-open-file-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit b28815c1f6e46d38471cacbc31248ca6fda8c4d1 +Author: Behdad Esfahbod +Date: Tue Aug 4 22:35:36 2009 -0400 + + [HB] Add sanitize debugging facilities + + src/hb-open-file-private.hh | 4 ++++ + src/hb-open-type-private.hh | 43 +++++++++++++++++++++++++++++++----- + src/hb-ot-layout-common-private.hh | 17 ++++++++++++++ + src/hb-ot-layout-gdef-private.hh | 10 +++++++++ + src/hb-ot-layout-gpos-private.hh | 28 +++++++++++++++++++++++ + src/hb-ot-layout-gsub-private.hh | 18 +++++++++++++++ + src/hb-ot-layout-gsubgpos-private.hh | 16 ++++++++++++++ + src/hb-private.h | 6 ++++- + 8 files changed, 136 insertions(+), 6 deletions(-) + +commit 7edb430f9182723b7b720708c56088cec1200a70 +Author: Behdad Esfahbod +Date: Tue Aug 4 22:06:57 2009 -0400 + + [HB] Rename open-types to open-type; beauty + + src/Makefile.am | 2 +- + src/hb-open-file-private.hh | 2 +- + src/{hb-open-types-private.hh => hb-open-type-private.hh} | 0 + src/hb-ot-layout-common-private.hh | 2 +- + 4 files changed, 3 insertions(+), 3 deletions(-) + +commit f4b58d3fc2956a9d1b6178588d809c781f7a5c0c +Author: Behdad Esfahbod +Date: Tue Aug 4 21:47:29 2009 -0400 + + [HB] Save edit even if not writeable + + src/hb-open-types-private.hh | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 9bd629ccd064e739789e504c41ad875eed93abba +Author: Behdad Esfahbod +Date: Tue Aug 4 21:42:23 2009 -0400 + + [HB] Fix warnings + + src/hb-open-file-private.hh | 1 + + src/hb-open-types-private.hh | 5 +++++ + src/hb-ot-layout-gsub-private.hh | 3 +-- + 3 files changed, 7 insertions(+), 2 deletions(-) + +commit 5ff4e13143c227fa57854c987b5a98e610f89361 +Author: Behdad Esfahbod +Date: Tue Aug 4 21:35:32 2009 -0400 + + [HB] Avoid infinite recusion in Extension sanitize() + + src/hb-ot-layout-gpos-private.hh | 1 + + src/hb-ot-layout-gsub-private.hh | 1 + + 2 files changed, 2 insertions(+) + +commit d60bb8ca2ae6edf29b2227b56c57f0d16879370b +Author: Behdad Esfahbod +Date: Tue Aug 4 21:32:57 2009 -0400 + + [HB] Hook Sanitizer up. Hell's breaking loose right now + + src/hb-font.cc | 7 ++----- + src/hb-open-types-private.hh | 2 +- + src/hb-ot-layout.cc | 12 ++++++------ + 3 files changed, 9 insertions(+), 12 deletions(-) + +commit 679f41fe61242aa8d7f45b64bdb66395aa530fe2 +Author: Behdad Esfahbod +Date: Tue Aug 4 21:32:06 2009 -0400 + + [HB] Fix leak + + src/hb-ot-layout.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 4e8a0602bb0b3cbf7f26cc38790e37cdec7b0b37 +Author: Behdad Esfahbod +Date: Tue Aug 4 20:52:47 2009 -0400 + + [HB] Add Sanitizer + + src/hb-open-types-private.hh | 58 ++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 53 insertions(+), 5 deletions(-) + +commit 2765d333e523a13dbd932fa33f3b39a5cf83f0f7 +Author: Behdad Esfahbod +Date: Tue Aug 4 20:50:18 2009 -0400 + + [HB] Add XXX + + src/hb-open-file-private.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit a328d66e6a8122f7d4d71941449d4d0136203e08 +Author: Behdad Esfahbod +Date: Tue Aug 4 20:27:05 2009 -0400 + + [HB] Minor cleanup + + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 4 files changed, 5 insertions(+), 5 deletions(-) + +commit 577c1116493d785d3455626612f97dabb383abf0 +Author: Behdad Esfahbod +Date: Tue Aug 4 19:31:02 2009 -0400 + + [HB] Shuffle code around + + src/hb-open-types-private.hh | 127 ++++++++++++++++++++++--------------------- + 1 file changed, 65 insertions(+), 62 deletions(-) + +commit b1e187fc6365f5355c652a61494a5e9f6acf51b4 +Author: Behdad Esfahbod +Date: Tue Aug 4 15:28:49 2009 -0400 + + [HB] More sanitize infrastructure + + src/hb-open-types-private.hh | 29 ++++++++++++++++++++++++++++- + 1 file changed, 28 insertions(+), 1 deletion(-) + +commit b508e5ccd528f3f0f49f545bd5f30a525d5abd5a +Author: Behdad Esfahbod +Date: Tue Aug 4 15:07:24 2009 -0400 + + [HB] open-file sanitize() + + src/hb-open-file-private.hh | 46 ++++++++++++++++++++++++++++++++++++++++---- + src/hb-open-types-private.hh | 13 +++++++++++++ + 2 files changed, 55 insertions(+), 4 deletions(-) + +commit 738c54d9caa3affc4b434e56bfb810ff6dc9b0b3 +Author: Behdad Esfahbod +Date: Tue Aug 4 14:42:46 2009 -0400 + + [HB] Tag sanitize() + + src/hb-open-types-private.hh | 8 ++++++++ + src/hb-ot-layout-common-private.hh | 6 +----- + 2 files changed, 9 insertions(+), 5 deletions(-) + +commit e49a84c9e37c08808880e74e94c8160731ababa1 +Author: Behdad Esfahbod +Date: Tue Aug 4 14:33:23 2009 -0400 + + [HB] GDEF sanitize() + + src/hb-ot-layout-gdef-private.hh | 54 ++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 4 files changed, 57 insertions(+), 3 deletions(-) + +commit 18939487d04dba86880b0af8e89cf2cc44a431f5 +Author: Behdad Esfahbod +Date: Tue Aug 4 14:27:56 2009 -0400 + + [HB] Fix Extension sanitize() + + src/hb-ot-layout-gpos-private.hh | 3 ++- + src/hb-ot-layout-gsub-private.hh | 3 ++- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 3 files changed, 5 insertions(+), 3 deletions(-) + +commit f2be750981be58a723831e69b1670275851d4be9 +Author: Behdad Esfahbod +Date: Tue Aug 4 14:12:46 2009 -0400 + + [HB] Remove stale TODO + + src/hb-ot-layout.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit ac26e2a838d1266bb5f39c43245eb2a52c5e072d +Author: Behdad Esfahbod +Date: Tue Aug 4 14:10:39 2009 -0400 + + [HB] Hookup NEUTER() + + src/hb-open-types-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 15164d9258a74122a4db748d35532bd72c47cec2 +Author: Behdad Esfahbod +Date: Tue Aug 4 13:57:41 2009 -0400 + + [HB] Fix mix warnings + + src/Makefile.am | 2 +- + src/hb-font.cc | 15 +++------------ + src/hb-open-types-private.hh | 2 +- + src/hb-ot-layout-common-private.hh | 6 +++--- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 9 ++++----- + src/hb-ot-layout.cc | 2 +- + src/main.cc | 4 +--- + 8 files changed, 15 insertions(+), 27 deletions(-) + +commit 42b778f89e0818fe06910ce04e2203485823da09 +Author: Behdad Esfahbod +Date: Tue Aug 4 13:30:49 2009 -0400 + + [HB] GPOS sanitize() + + src/hb-open-types-private.hh | 22 ++++- + src/hb-ot-layout-gpos-private.hh | 195 ++++++++++++++++++++++++++++++++++++++- + src/hb-ot-layout-gsub-private.hh | 2 - + 3 files changed, 213 insertions(+), 6 deletions(-) + +commit dc9c4d93cd0f3ac991f32df08c1c17fc389054c0 +Author: Behdad Esfahbod +Date: Tue Aug 4 12:26:26 2009 -0400 + + [HB] Sanitize DeviceTable + + src/hb-open-types-private.hh | 8 ++++---- + src/hb-ot-layout-common-private.hh | 17 ++++++++++++++--- + src/hb-ot-layout-gsub-private.hh | 2 +- + 3 files changed, 19 insertions(+), 8 deletions(-) + +commit ad3a3cd4955661c591b20af1f2c493432f0bebf0 +Author: Behdad Esfahbod +Date: Tue Aug 4 12:13:52 2009 -0400 + + [HB] More casts + + src/hb-ot-layout-gsub-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 95639fccc1ef18eadeb737e8b611d1d1f1315fc2 +Author: Behdad Esfahbod +Date: Tue Aug 4 12:05:24 2009 -0400 + + [HB] Fix couple of bugs + + src/hb-open-types-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 2b5a59c277f4c5bf7aac9a9005054763e322e02d +Author: Behdad Esfahbod +Date: Tue Aug 4 11:38:50 2009 -0400 + + [HB] More cast cleanup + + src/hb-open-types-private.hh | 23 ++++++++----- + src/hb-ot-layout-common-private.hh | 7 ++-- + src/hb-ot-layout-gsub-private.hh | 27 ++++++--------- + src/hb-ot-layout-gsubgpos-private.hh | 64 +++++++++++++----------------------- + 4 files changed, 50 insertions(+), 71 deletions(-) + +commit 196598bbccff08415ff5192314cba044df258cad +Author: Behdad Esfahbod +Date: Tue Aug 4 11:04:32 2009 -0400 + + [Hb] Use reinterpret casts instead of direct casts to char * + + src/hb-open-file-private.hh | 4 ++-- + src/hb-open-types-private.hh | 19 +++++++++++----- + src/hb-ot-layout-common-private.hh | 8 +++---- + src/hb-ot-layout-gpos-private.hh | 12 +++++----- + src/hb-ot-layout-gsub-private.hh | 20 ++++++++-------- + src/hb-ot-layout-gsubgpos-private.hh | 44 ++++++++++++++++++------------------ + 6 files changed, 57 insertions(+), 50 deletions(-) + +commit 92b5dd8e71e1bdeaa6e86a53f167683a3f5f4289 +Author: Behdad Esfahbod +Date: Tue Aug 4 10:41:32 2009 -0400 + + [HB] Merge more templates + + src/hb-open-types-private.hh | 167 ++++++++++++++----------------------------- + 1 file changed, 55 insertions(+), 112 deletions(-) + +commit e6ab2c59ba2d37942ac5fcbfe61d38b7e359ac8c +Author: Behdad Esfahbod +Date: Tue Aug 4 10:23:01 2009 -0400 + + [HB] Simplify indirect sanitize() + + src/hb-open-types-private.hh | 52 ++++++++++++++++++-------------------- + src/hb-ot-layout-common-private.hh | 11 +------- + 2 files changed, 26 insertions(+), 37 deletions(-) + +commit 29d8644a315ebe6976f15db2fe96069376d9b8cd +Author: Behdad Esfahbod +Date: Tue Aug 4 02:27:37 2009 -0400 + + [HB] Finish GSUB sanitize() + + src/hb-ot-layout-gsub-private.hh | 21 ++++++++++++++++++++- + 1 file changed, 20 insertions(+), 1 deletion(-) + +commit cf086adca1b7b5a361a248808f9a847e513d3630 +Author: Behdad Esfahbod +Date: Tue Aug 4 02:14:24 2009 -0400 + + [HB] Add comment + + src/hb-ot-layout-common-private.hh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit a97ce570ab693190350886e4e80942851c4d5727 +Author: Behdad Esfahbod +Date: Tue Aug 4 02:10:48 2009 -0400 + + [HB] Optimize sanitize() + + src/hb-open-types-private.hh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit cd3827ee567612c5500206b62840702fc956e0f5 +Author: Behdad Esfahbod +Date: Tue Aug 4 02:09:34 2009 -0400 + + [HB] More sanitize() + + src/hb-open-file-private.hh | 2 +- + src/hb-open-types-private.hh | 12 ++++--- + src/hb-ot-layout-common-private.hh | 64 +++++++++++++++++++++++++++++++----- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 15 +++++++-- + 5 files changed, 79 insertions(+), 16 deletions(-) + +commit 70de50c11ed7037b20eb6814ff60f6e32a9944e4 +Author: Behdad Esfahbod +Date: Tue Aug 4 00:58:28 2009 -0400 + + [HB] Start sanitize() + + src/hb-open-types-private.hh | 105 ++++++++++++++++++++++++++++- + src/hb-ot-layout-common-private.hh | 48 +++++++++++++- + src/hb-ot-layout-gsub-private.hh | 125 ++++++++++++++++++++++++++++++++++- + src/hb-ot-layout-gsubgpos-private.hh | 104 +++++++++++++++++++++++++++++ + 4 files changed, 376 insertions(+), 6 deletions(-) + +commit 5fc22e647c8a2bf6d3cb59185e351ac625e7e322 +Author: Behdad Esfahbod +Date: Mon Aug 3 22:43:02 2009 -0400 + + [HB] Remove use of typeof() + + src/hb-blob.c | 4 ++-- + src/hb-buffer.c | 2 +- + src/hb-font.cc | 14 +++++++------- + src/hb-object-private.h | 4 ++-- + 4 files changed, 12 insertions(+), 12 deletions(-) + +commit 70e0f2a75ec1559f2f70ada837ce4bc4baca49e3 +Author: Behdad Esfahbod +Date: Mon Aug 3 22:01:47 2009 -0400 + + [HB] Make it all work again + + src/hb-font.cc | 23 ++++++++++++--------- + src/hb-ot-layout-private.h | 9 +++++--- + src/hb-ot-layout.cc | 51 +++++++++++++++++++++++----------------------- + 3 files changed, 44 insertions(+), 39 deletions(-) + +commit 23c86aa0009324433e78fcd0c47f2c0ff14b1949 +Author: Behdad Esfahbod +Date: Mon Aug 3 21:40:20 2009 -0400 + + [HB] Use face_t directly instead of ot_layout_t + + src/TODO | 1 + + src/hb-font-private.h | 4 + + src/hb-font.cc | 74 +++++++++--- + src/hb-font.h | 3 + + src/hb-object-private.h | 36 +++--- + src/hb-ot-layout-gdef-private.hh | 2 + + src/hb-ot-layout-gpos-private.hh | 14 +-- + src/hb-ot-layout-gsub-private.hh | 32 ++--- + src/hb-ot-layout-gsubgpos-private.hh | 8 +- + src/hb-ot-layout-private.h | 40 ++++--- + src/hb-ot-layout.cc | 220 +++++++++++++++-------------------- + 11 files changed, 237 insertions(+), 197 deletions(-) + +commit fc6c94002dd5478cf9fbdaff12d8374a786c85e1 +Author: Behdad Esfahbod +Date: Mon Aug 3 21:27:08 2009 -0400 + + [HB] Simplify sub-blob support + + src/hb-blob.c | 172 ++++++++++++++++++++++------------------------------------ + src/hb-blob.h | 14 +++-- + 2 files changed, 74 insertions(+), 112 deletions(-) + +commit a26442437ae9f11674e0d68cd5cbf395ade7695d +Author: Behdad Esfahbod +Date: Mon Aug 3 17:53:29 2009 -0400 + + [HB] Add sub-blobs + + src/hb-blob.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++++--------- + src/hb-blob.h | 12 ++++- + 2 files changed, 147 insertions(+), 27 deletions(-) + +commit b28e21b90c4105a0c2e17009b748777294614664 +Author: Behdad Esfahbod +Date: Sun Aug 2 20:06:48 2009 -0400 + + [HB] Rename hb-font.c to hb-font.cc + + src/Makefile.am | 2 +- + src/{hb-font.c => hb-font.cc} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit 5f5b24f99f52bbc922e238b65c06061ba07c8548 +Author: Behdad Esfahbod +Date: Sun Aug 2 20:03:12 2009 -0400 + + [OT] Rename C++ header files from *.h to *.hh + + src/Makefile.am | 14 +++++++------- + src/{hb-open-file-private.h => hb-open-file-private.hh} | 8 ++++---- + src/{hb-open-types-private.h => hb-open-types-private.hh} | 6 +++--- + ...out-common-private.h => hb-ot-layout-common-private.hh} | 8 ++++---- + ...-layout-gdef-private.h => hb-ot-layout-gdef-private.hh} | 8 ++++---- + ...-layout-gpos-private.h => hb-ot-layout-gpos-private.hh} | 8 ++++---- + ...-layout-gsub-private.h => hb-ot-layout-gsub-private.hh} | 8 ++++---- + ...gsubgpos-private.h => hb-ot-layout-gsubgpos-private.hh} | 8 ++++---- + src/hb-ot-layout.cc | 8 ++++---- + src/main.cc | 6 +++--- + 10 files changed, 41 insertions(+), 41 deletions(-) + +commit 2098a021a826e76ee27d5db74e32738d7d1c3d30 +Author: Behdad Esfahbod +Date: Sun Aug 2 19:57:00 2009 -0400 + + [HB] Move OT file handling out of ot-layout + + src/Makefile.am | 3 +- + src/hb-open-file-private.h | 145 +++++++++++++++++++++ + ...yout-open-private.h => hb-open-types-private.h} | 117 +---------------- + src/hb-ot-layout-common-private.h | 4 +- + src/hb-ot-layout.cc | 2 +- + src/main.cc | 4 +- + 6 files changed, 157 insertions(+), 118 deletions(-) + +commit 0ead481a5a8623103565fd7d924666e7342278dd +Author: Behdad Esfahbod +Date: Sun Aug 2 17:41:36 2009 -0400 + + [HB] Port ot-layout to new public API + + src/TODO | 1 + + src/hb-common.h | 1 + + src/hb-font.c | 9 + + src/hb-font.h | 3 + + src/hb-ot-layout-gdef-private.h | 32 ++-- + src/hb-ot-layout-gpos-private.h | 106 ++++++------ + src/hb-ot-layout-gsub-private.h | 50 +++--- + src/hb-ot-layout-gsubgpos-private.h | 12 +- + src/hb-ot-layout-private.h | 36 +++- + src/hb-ot-layout.cc | 334 ++++++++++++++++++++---------------- + src/hb-ot-layout.h | 207 ++++++++++------------ + 11 files changed, 415 insertions(+), 376 deletions(-) + +commit 678bed433371d90536976a2d57195c1e1867f766 +Author: Behdad Esfahbod +Date: Sun Aug 2 15:35:31 2009 -0400 + + [HB] Add top-level header files + + src/Makefile.am | 2 ++ + src/hb-ot.h | 34 ++++++++++++++++++++++++++++++++++ + src/hb.h | 35 +++++++++++++++++++++++++++++++++++ + 3 files changed, 71 insertions(+) + +commit 2c80296aa5991ad67483889147f5c84fefe54af2 +Author: Behdad Esfahbod +Date: Sun Aug 2 15:20:22 2009 -0400 + + [HB] Add XXX marks + + src/hb-ot-layout-private.h | 2 ++ + src/hb-ot-layout.cc | 7 ++----- + 2 files changed, 4 insertions(+), 5 deletions(-) + +commit c46f8efd6ddd981b5724b2600ac98a80193385be +Author: Behdad Esfahbod +Date: Sat Aug 1 23:06:27 2009 -0400 + + [HB] Rename _duplicate to _copy + + To be in line with cairo + + src/hb-font.c | 4 ++-- + src/hb-font.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit f1ebe44985e2192844cf1747a4e36ed81e715ce6 +Author: Behdad Esfahbod +Date: Sat Aug 1 22:55:11 2009 -0400 + + [HB] Cleanup TODO + + src/TODO | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +commit f1322e52d557726baa010be8d35a594748e8fa1a +Author: Behdad Esfahbod +Date: Sat Aug 1 22:53:04 2009 -0400 + + [HB] Cleanup public buffer structs + + src/hb-buffer-private.h | 46 +++++++++++++++++++++++++++++++------- + src/hb-buffer.c | 49 +++++++++++++++++++++-------------------- + src/hb-buffer.h | 35 ++++++++++++++--------------- + src/hb-ot-layout-gpos-private.h | 8 +++---- + src/hb-ot-layout-private.h | 5 +++-- + src/hb-ot-layout.cc | 20 ++++++++--------- + 6 files changed, 97 insertions(+), 66 deletions(-) + +commit 6d5bb18e93d2a53350b342869a3ec8f25f0396c2 +Author: Behdad Esfahbod +Date: Sat Aug 1 22:25:04 2009 -0400 + + [OT] Match struct with HB's + + src/hb-buffer.c | 6 +++--- + src/hb-buffer.h | 2 +- + src/hb-ot-layout.cc | 12 ++++++------ + 3 files changed, 10 insertions(+), 10 deletions(-) + +commit 11fbb5487d9900a019440ef8235f35c9f525decb +Author: Behdad Esfahbod +Date: Sat Aug 1 22:19:06 2009 -0400 + + [HB] Port buffert to new object API + + src/hb-buffer-private.h | 24 +++++++++++++++--- + src/hb-buffer.c | 65 +++++++++++++++++++++++++++++++++++++------------ + src/hb-buffer.h | 53 +++++++++++++++++++++++++--------------- + 3 files changed, 104 insertions(+), 38 deletions(-) + +commit 0cc7bc59ea6e8f38bf1e196c558cca9862ac3302 +Author: Behdad Esfahbod +Date: Sat Aug 1 21:38:39 2009 -0400 + + [HB] Move typedef's around + + src/hb-blob.h | 2 ++ + src/hb-common.h | 9 --------- + src/hb-font.h | 10 ++++++++++ + 3 files changed, 12 insertions(+), 9 deletions(-) + +commit a12dd324a3859496a95602d426aee34ce6c5c8a6 +Author: Behdad Esfahbod +Date: Sat Aug 1 21:36:15 2009 -0400 + + [HB] Add get_reference_count() + + src/hb-blob.c | 6 ++++++ + src/hb-blob.h | 3 +++ + src/hb-font.c | 24 ++++++++++++++++++++++++ + src/hb-font.h | 12 ++++++++++++ + src/hb-object-private.h | 7 +++++++ + 5 files changed, 52 insertions(+) + +commit baec684fde2303edb16341bfcf1022cd72acf129 +Author: Behdad Esfahbod +Date: Sat Aug 1 21:06:11 2009 -0400 + + [HB] Remove glib dependency + + src/Makefile.am | 7 ++----- + src/hb-buffer.c | 2 +- + src/hb-private.h | 30 ++++++++++++++++++------------ + src/main.cc | 1 + + 4 files changed, 22 insertions(+), 18 deletions(-) + +commit df66028781a7609a515980e64396e6f1044d764a +Author: Behdad Esfahbod +Date: Sat Aug 1 20:46:02 2009 -0400 + + [HB] Assorted compiler macros + + src/hb-ot-layout-open-private.h | 4 +- + src/hb-private.h | 88 +++++++++++++++++++++++++++++++---------- + 2 files changed, 70 insertions(+), 22 deletions(-) + +commit ba8d94ce3360bfaf2c530d01f2af69237018a531 +Author: Behdad Esfahbod +Date: Sat Aug 1 20:29:22 2009 -0400 + + [HB] Simplify object creation + + src/Makefile.am | 2 +- + src/hb-blob.c | 6 +--- + src/hb-font-private.h | 1 - + src/hb-font.c | 37 +++++++--------------- + src/{hb-refcount-private.h => hb-object-private.h} | 14 ++++++-- + src/hb-private.h | 2 ++ + 6 files changed, 27 insertions(+), 35 deletions(-) + +commit c62b503770325819f249885dfc9d4683a69c9efd +Author: Behdad Esfahbod +Date: Sat Aug 1 19:54:49 2009 -0400 + + [HB] Add abstract font and face API + + Not used yet. + + src/Makefile.am | 3 + + src/hb-blob.c | 6 +- + src/hb-font-private.h | 108 +++++++++++++++ + src/hb-font.c | 331 ++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-font.h | 182 +++++++++++++++++++++++++ + src/hb-refcount-private.h | 14 +- + 6 files changed, 636 insertions(+), 8 deletions(-) + +commit 35a7383c6138fd705560f0d4bb30659cbd1ab64c +Author: Behdad Esfahbod +Date: Sat Aug 1 19:30:31 2009 -0400 + + [HB] Simplify refcounting functions + + src/hb-blob.c | 32 ++++++++++---------------------- + src/hb-common.h | 2 ++ + src/hb-private.h | 2 ++ + src/hb-refcount-private.h | 31 ++++++++++++++++++++++++++++++- + 4 files changed, 44 insertions(+), 23 deletions(-) + +commit 23af767a4475fecc1fe9fe9108f12c05c89bc8c9 +Author: Behdad Esfahbod +Date: Sat Aug 1 19:10:41 2009 -0400 + + [HB] Fix for dfont's with multiple faces + + src/hb-ot-layout-open-private.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit e97a95f2ea2770689bbf076d3c3ac404f273271e +Author: Behdad Esfahbod +Date: Sat Aug 1 19:05:44 2009 -0400 + + [HB] Use calloc instead of malloc where feasible + + src/hb-blob.c | 8 +++++--- + src/hb-buffer.c | 4 ++-- + 2 files changed, 7 insertions(+), 5 deletions(-) + +commit 0090dc0f67b553d2f6eaaedc289c0956ade09ef6 +Author: Behdad Esfahbod +Date: Thu Jul 30 16:28:45 2009 -0400 + + [HB] Remove hinting setting and use ppem==0 to mean "no hinting" + + src/hb-blob.h | 3 --- + src/hb-common.h | 9 +++++++++ + src/hb-ot-layout-gpos-private.h | 36 ++++++++++++++++++++++++------------ + src/hb-ot-layout-private.h | 2 -- + src/hb-ot-layout.cc | 7 ------- + src/hb-ot-layout.h | 4 ---- + 6 files changed, 33 insertions(+), 28 deletions(-) + +commit f0954d1e08ae288eda9904e17108fc73f48c0b98 +Author: Behdad Esfahbod +Date: Thu Jul 30 15:33:57 2009 -0400 + + [HB] Add a "blob" manager + + src/Makefile.am | 5 +- + src/hb-blob.c | 181 ++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-blob.h | 74 +++++++++++++++++++ + src/hb-private.h | 2 + + src/hb-refcount-private.h | 54 ++++++++++++++ + 5 files changed, 315 insertions(+), 1 deletion(-) + +commit 02a370697d25b986dbf1d5c38f46a89a4833b495 +Author: Behdad Esfahbod +Date: Wed Jul 29 18:41:25 2009 -0400 + + [HB] Move direction to buffer + + src/hb-buffer.c | 9 +++++++++ + src/hb-buffer.h | 14 ++++++++++++++ + src/hb-ot-layout-gpos-private.h | 2 +- + src/hb-ot-layout-private.h | 1 - + src/hb-ot-layout.cc | 7 ------- + src/hb-ot-layout.h | 5 ----- + 6 files changed, 24 insertions(+), 14 deletions(-) + +commit 7cda6fa24c26887c5543d0657b07aad466452cb3 +Author: Behdad Esfahbod +Date: Wed Jul 29 18:37:57 2009 -0400 + + [HB] Rename internal vars + + src/hb-ot-layout-gsubgpos-private.h | 56 ++++++++++++++++++------------------- + 1 file changed, 28 insertions(+), 28 deletions(-) + +commit b196e6f2743d631ef181f1116370be3055063d36 +Author: Behdad Esfahbod +Date: Tue Jul 28 15:50:42 2009 -0400 + + [HB] Fix buffer enlargement. Ouch + + src/hb-buffer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f9cd1014f8f4d0394b5e0e9eefc1e2af13c59cab +Author: Behdad Esfahbod +Date: Tue Jul 28 15:43:34 2009 -0400 + + Apply patch from Jonathan Kew + + src/hb-buffer.c | 75 ++++++++++++++++++++++++++++------------------------- + src/hb-buffer.h | 6 ++++- + src/hb-ot-layout.cc | 31 ++++++++++++++++++++++ + src/hb-ot-layout.h | 15 +++++++++++ + src/hb-private.h | 2 +- + 5 files changed, 91 insertions(+), 38 deletions(-) + +commit 2ebb89d63dd27e800f2b6cbf624924601105f48a +Author: Behdad Esfahbod +Date: Sat Jul 25 19:09:01 2009 -0400 + + Revert "XX" + + This reverts commit c939f6aff405ca7b10b1f1538f46148bff719fcb. + + src/Makefile.am | 2 - + src/hb-buffer.c | 9 --- + src/hb-buffer.h | 14 ----- + src/hb-common.h | 3 - + src/hb-ot-layout-gdef-private.h | 32 +++++------ + src/hb-ot-layout-gpos-private.h | 108 ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.h | 46 +++++++-------- + src/hb-ot-layout-gsubgpos-private.h | 68 +++++++++++------------ + src/hb-ot-layout-private.h | 28 ++++------ + src/hb-ot-layout.cc | 30 ++++++++++ + src/hb-ot-layout.h | 5 ++ + src/hb-private.h | 16 ------ + 12 files changed, 174 insertions(+), 187 deletions(-) + +commit 55520d2af172f5f6617b909e80cbd7d898f2bc15 +Author: Behdad Esfahbod +Date: Wed Jun 10 23:26:51 2009 -0400 + + XX + + src/Makefile.am | 2 + + src/hb-buffer.c | 9 +++ + src/hb-buffer.h | 14 +++++ + src/hb-common.h | 3 + + src/hb-ot-layout-gdef-private.h | 32 +++++------ + src/hb-ot-layout-gpos-private.h | 108 ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.h | 46 +++++++-------- + src/hb-ot-layout-gsubgpos-private.h | 68 +++++++++++------------ + src/hb-ot-layout-private.h | 28 ++++++---- + src/hb-ot-layout.cc | 30 ---------- + src/hb-ot-layout.h | 5 -- + src/hb-private.h | 16 ++++++ + 12 files changed, 187 insertions(+), 174 deletions(-) + +commit f53d434b9151c4ec43c148734b49bb165e522cc9 +Author: Behdad Esfahbod +Date: Sat May 30 22:17:32 2009 -0400 + + [GPOS] Advance buffer cursor in SinglePos lookups. Ouch! + + src/hb-ot-layout-gpos-private.h | 4 ++++ + 1 file changed, 4 insertions(+) + +commit e35bbd570a5d914f86f1ea83941ee4328f268059 +Author: Behdad Esfahbod +Date: Sat May 30 12:02:46 2009 -0400 + + [HB] Improve buffer. Don't dup out buffer unless out is longer than in + + That is, we work in-place even for ligatures now. + + src/hb-buffer.c | 156 ++++++++++++++++++++++++-------------------------------- + src/hb-buffer.h | 7 ++- + 2 files changed, 71 insertions(+), 92 deletions(-) + +commit 6734ed4b6b2ce382917bf644aaf1acfa993f00ad +Author: Behdad Esfahbod +Date: Wed May 27 18:16:55 2009 -0400 + + [GPOS] Fix property checking + + src/hb-ot-layout-gpos-private.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit cc83ae12484108586fba6586bd9008971338b322 +Author: Behdad Esfahbod +Date: Wed May 27 00:17:37 2009 -0400 + + [GPOS] Add vertical TODO + + src/hb-ot-layout-gpos-private.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit b69d38e7eaea544ba6c1876cdc6ddac61a698dd3 +Author: Behdad Esfahbod +Date: Tue May 26 22:29:02 2009 -0400 + + [HB] Remove useless include + + src/hb-ot-layout-private.h | 3 --- + 1 file changed, 3 deletions(-) + +commit 6c8108cb583292a679b05844ab613b7f4587adc6 +Author: Behdad Esfahbod +Date: Tue May 26 22:26:08 2009 -0400 + + [GPOS] Remove unused variables + + src/hb-ot-layout-gpos-private.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 09c292e3b688a67fbae67b645d1e6ffcf8d8eb6e +Author: Behdad Esfahbod +Date: Tue May 26 19:48:16 2009 -0400 + + [HB] Fix glyph properties + + src/hb-ot-layout-common-private.h | 6 +++--- + src/hb-ot-layout-open-private.h | 2 +- + src/hb-ot-layout.cc | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit 64e33f008ff9cc807fdfdc4553ad3fe01bb0615f +Author: Behdad Esfahbod +Date: Tue May 26 18:57:56 2009 -0400 + + [GPOS] Fix PairPos signedness + + src/hb-ot-layout-gpos-private.h | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +commit 80ea5bd10e72561a7627a5196621a6d7eccd91b7 +Author: Behdad Esfahbod +Date: Tue May 26 17:58:37 2009 -0400 + + [GPOS] Fix mark matching + + src/hb-ot-layout-gpos-private.h | 44 +++++++++++++++++++---------------------- + 1 file changed, 20 insertions(+), 24 deletions(-) + +commit 4189b92aaa41e4a1756c561cc6e08b0ed024afda +Author: Behdad Esfahbod +Date: Tue May 26 17:31:56 2009 -0400 + + [HB] When looking back/forward, skip marks only + + src/TODO | 1 - + src/hb-ot-layout-gpos-private.h | 13 ++----- + src/hb-ot-layout-gsub-private.h | 38 +++++++++----------- + src/hb-ot-layout-gsubgpos-private.h | 14 ++++---- + src/hb-ot-layout-private.h | 6 ++++ + src/hb-ot-layout.cc | 69 ++++++++++++++++++++++++------------- + 6 files changed, 76 insertions(+), 65 deletions(-) + +commit 1246e41021ab1d782b4c97e5d81c4917a57e3ed4 +Author: Behdad Esfahbod +Date: Tue May 26 15:58:34 2009 -0400 + + [GDEF] Support MarkFilteringSets + + src/hb-ot-layout.cc | 59 +++++++++++++++++++---------------------------------- + 1 file changed, 21 insertions(+), 38 deletions(-) + +commit 5130c35e93528bcf3095fee5baf3847589167a58 +Author: Behdad Esfahbod +Date: Tue May 26 15:45:41 2009 -0400 + + [HB] Simplify MarkAttachmentType handling + + src/hb-ot-layout-gpos-private.h | 6 +++--- + src/hb-ot-layout-gsub-private.h | 6 ++---- + src/hb-ot-layout.cc | 18 ++++++++---------- + 3 files changed, 13 insertions(+), 17 deletions(-) + +commit e4b92b85a7750bd4271ad607b3c41f0184e89feb +Author: Behdad Esfahbod +Date: Tue May 26 15:38:53 2009 -0400 + + [HB] Support parsing MarkFilteringSets introduced in OpenType 1.6 + + src/hb-ot-layout-gdef-private.h | 55 +++++++++++++++++++++++++++++++++++------ + src/hb-ot-layout-gpos-private.h | 1 + + src/hb-ot-layout.cc | 6 ++--- + 3 files changed, 51 insertions(+), 11 deletions(-) + +commit 515ce4ceb2ab0151d8dfc03ff0bfc7d110dd93b5 +Author: Behdad Esfahbod +Date: Tue May 26 13:08:00 2009 -0400 + + [HB] More de-C++'ization + + src/hb-ot-layout-gsubgpos-private.h | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit d7df42d7ee586219475878d160f85ae5a188bd59 +Author: Behdad Esfahbod +Date: Tue May 26 13:04:59 2009 -0400 + + [HB] Start MarkFilteringSet support + + src/hb-ot-layout-common-private.h | 24 +++++++++++++++++++----- + 1 file changed, 19 insertions(+), 5 deletions(-) + +commit 62964afcecd96038cfaa8bc2bc931f43ee83be7e +Author: Behdad Esfahbod +Date: Tue May 26 12:40:10 2009 -0400 + + [HB] Implement get_lig_carets() + + src/hb-ot-layout-gdef-private.h | 57 ++++++++++++++++++++++++++++++++--------- + src/hb-ot-layout.cc | 17 +++++++++--- + src/hb-ot-layout.h | 8 +++++- + src/main.cc | 9 +------ + 4 files changed, 66 insertions(+), 25 deletions(-) + +commit 79420ad9caf2d5fc94c3693e8292edfa27060b2d +Author: Behdad Esfahbod +Date: Tue May 26 12:24:16 2009 -0400 + + [HB] Add get_attach_points() + + src/Makefile.am | 2 +- + src/hb-ot-layout-gdef-private.h | 35 +++++++++++++++++++++++++---------- + src/hb-ot-layout-gpos-private.h | 28 +++++++--------------------- + src/hb-ot-layout-gsub-private.h | 28 +++++++--------------------- + src/hb-ot-layout-open-private.h | 12 +++--------- + src/hb-ot-layout.cc | 9 +++++++++ + src/hb-ot-layout.h | 6 ++++++ + src/main.cc | 8 ++++---- + 8 files changed, 62 insertions(+), 66 deletions(-) + +commit 855720ca47bf5a7a44eb5b84dce9f7da6e7156bd +Author: Behdad Esfahbod +Date: Tue May 26 12:00:28 2009 -0400 + + [HB] Remove more macros + + src/hb-ot-layout-gdef-private.h | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit c968fc2dc87cf85b53f60a40db59d5ee7b992edf +Author: Behdad Esfahbod +Date: Mon May 25 04:04:24 2009 -0400 + + [HB] More buffer cleanup + + src/hb-buffer-private.h | 39 +++-------- + src/hb-buffer.c | 136 ++++++++++++++++++------------------ + src/hb-buffer.h | 22 +++--- + src/hb-ot-layout-gpos-private.h | 29 ++++---- + src/hb-ot-layout-gsub-private.h | 10 +-- + src/hb-ot-layout-gsubgpos-private.h | 8 +-- + src/hb-ot-layout-private.h | 13 ++-- + src/hb-ot-layout.cc | 16 ++--- + src/hb-private.h | 29 -------- + 9 files changed, 125 insertions(+), 177 deletions(-) + +commit 88a5f5a49b6809d88560791f9cf6b8f78f22a4ad +Author: Behdad Esfahbod +Date: Mon May 25 03:39:11 2009 -0400 + + [HB] Cleanup buffer + + src/hb-buffer-private.h | 2 +- + src/hb-buffer.c | 26 ++++++++------ + src/hb-ot-layout-gsub-private.h | 26 +++++--------- + src/hb-ot-layout-gsubgpos-private.h | 2 +- + src/hb-ot-layout.cc | 71 ------------------------------------- + 5 files changed, 25 insertions(+), 102 deletions(-) + +commit 347f0b8621d3adfec157e5634ff3defc818ea37f +Author: Behdad Esfahbod +Date: Mon May 25 03:30:31 2009 -0400 + + [HB] Clean more + + src/hb-ot-layout-private.h | 10 ++++------ + src/hb-ot-layout.cc | 8 ++++---- + 2 files changed, 8 insertions(+), 10 deletions(-) + +commit d9d2a07f4a8696666a12f5a206aa9cfb56dc2b35 +Author: Behdad Esfahbod +Date: Mon May 25 03:24:19 2009 -0400 + + [HB] Remove one XXX, add another + + src/hb-buffer.h | 2 ++ + src/hb-ot-layout-private.h | 3 +-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 6c78683c042250a7b5a6fc6ebae4717b03fadf9e +Author: Behdad Esfahbod +Date: Mon May 25 03:22:19 2009 -0400 + + [HB] Update copyright years + + src/hb-buffer-private.h | 2 +- + src/hb-buffer.h | 2 +- + src/hb-common.h | 2 +- + src/hb-ot-layout-private.h | 2 +- + src/hb-ot-layout.h | 2 +- + src/hb-private.h | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +commit 4497af0069a94c69fc1518b1db2c1282721b732a +Author: Behdad Esfahbod +Date: Mon May 25 03:20:18 2009 -0400 + + [HB] Would have helped if I actually knew C++ before using it... + + src/hb-ot-layout-gsubgpos-private.h | 4 ++-- + src/hb-ot-layout-open-private.h | 24 ++++++++++++------------ + 2 files changed, 14 insertions(+), 14 deletions(-) + +commit cc6c644ff2af5f6669b6ec100ff13e904872b21c +Author: Behdad Esfahbod +Date: Mon May 25 03:10:06 2009 -0400 + + [HB] More cleanup + + src/hb-ot-layout-common-private.h | 4 ++-- + src/hb-ot-layout-open-private.h | 9 +++++---- + 2 files changed, 7 insertions(+), 6 deletions(-) + +commit 20cc86b3592db33731de671f008d7d222776be49 +Author: Behdad Esfahbod +Date: Mon May 25 02:41:49 2009 -0400 + + [HB] Simplify Tag + + src/hb-ot-layout-open-private.h | 46 ++++++++++++++++------------------------- + 1 file changed, 18 insertions(+), 28 deletions(-) + +commit 3ec0092c5e2d48e8c4fc1618d3bee427adddb1e7 +Author: Behdad Esfahbod +Date: Mon May 25 02:34:25 2009 -0400 + + [HB] Simplify more + + src/hb-ot-layout-open-private.h | 31 ++++++++++--------------------- + 1 file changed, 10 insertions(+), 21 deletions(-) + +commit 6ad8d5f3c7028147b371137ae4bca6aae66b3489 +Author: Behdad Esfahbod +Date: Mon May 25 02:27:29 2009 -0400 + + [HB] Simplify some basic things + + src/hb-ot-layout-open-private.h | 90 +++++++++++++++++++++++++++-------------- + src/main.cc | 8 ++-- + 2 files changed, 64 insertions(+), 34 deletions(-) + +commit f96ffd43bce0ac6d9c897933c9be0e51d543e570 +Author: Behdad Esfahbod +Date: Sun May 24 15:01:16 2009 -0400 + + [HB] simplify macros + + src/hb-buffer-private.h | 4 ++-- + src/hb-buffer.h | 4 ++-- + src/hb-common.h | 8 ++++---- + src/hb-ot-layout-private.h | 4 ++-- + src/hb-ot-layout.h | 4 ++-- + 5 files changed, 12 insertions(+), 12 deletions(-) + +commit 8e7b30782a12f3997b9a5a18e6b9d01f6bff8b46 +Author: Behdad Esfahbod +Date: Sun May 24 14:27:24 2009 -0400 + + [HB] Update text files + + src/COPYING | 7 ------- + src/README | 13 ++----------- + 2 files changed, 2 insertions(+), 18 deletions(-) + +commit fa7d47249496fe00ea1ab6943b385c8dd80e5ce6 +Author: Behdad Esfahbod +Date: Sun May 24 14:24:35 2009 -0400 + + [HB] Remove stale makefile.msc too + + src/makefile.msc | 19 ------------------- + 1 file changed, 19 deletions(-) + +commit da2c52abcd75d46929b34cad55c4fb2c8892bc08 +Author: Behdad Esfahbod +Date: Sun May 24 14:22:22 2009 -0400 + + [HB] Remove old code! + + Goodbye 16 thousand lines of ten-year old code! + + src/harfbuzz-dump-main.c | 97 - + src/harfbuzz-dump.c | 768 ------ + src/harfbuzz-dump.h | 41 - + src/harfbuzz-gdef-private.h | 124 - + src/harfbuzz-gdef.c | 1160 -------- + src/harfbuzz-gdef.h | 135 - + src/harfbuzz-global.h | 84 - + src/harfbuzz-gpos-private.h | 712 ----- + src/harfbuzz-gpos.c | 6071 ----------------------------------------- + src/harfbuzz-gpos.h | 174 -- + src/harfbuzz-gsub-private.h | 476 ---- + src/harfbuzz-gsub.c | 4304 ----------------------------- + src/harfbuzz-gsub.h | 140 - + src/harfbuzz-impl.c | 84 - + src/harfbuzz-impl.h | 126 - + src/harfbuzz-open-private.h | 102 - + src/harfbuzz-open.c | 1405 ---------- + src/harfbuzz-open.h | 282 -- + src/harfbuzz-stream-private.h | 83 - + src/harfbuzz-stream.c | 257 -- + src/harfbuzz.c | 31 - + src/harfbuzz.h | 35 - + 22 files changed, 16691 deletions(-) + +commit e5372f1621602dcee4e14a4b22dc182c21502a50 +Author: Behdad Esfahbod +Date: Sun May 24 14:21:27 2009 -0400 + + [HB] Remove stale TODO mark + + src/hb-ot-layout-open-private.h | 1 - + 1 file changed, 1 deletion(-) + +commit 96908b898476ca5d7da5f386b15be76f9e83d76e +Author: Behdad Esfahbod +Date: Sun May 24 12:30:40 2009 -0400 + + [HB] Add FixedVersion cast to int + + src/hb-ot-layout-open-private.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit 957740dd253475020a94a62ec5dfcd03e3358176 +Author: Behdad Esfahbod +Date: Sun May 24 12:29:55 2009 -0400 + + [HB] Simplify tag + + src/hb-ot-layout-open-private.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 87fcdcbe3644da10154688765db2d62eb9ac079a +Author: Behdad Esfahbod +Date: Sun May 24 01:03:24 2009 -0400 + + [HB] Remove unused data types + + src/hb-ot-layout-gdef-private.h | 2 +- + src/hb-ot-layout-gsubgpos-private.h | 2 +- + src/hb-ot-layout-open-private.h | 54 ++++--------------------------------- + 3 files changed, 7 insertions(+), 51 deletions(-) + +commit 5876bf1b73fcb56cc41b4d348248a4817f9688cb +Author: Behdad Esfahbod +Date: Sun May 24 00:53:28 2009 -0400 + + [HB] Simplify version check in GSUB/GPOS + + src/hb-ot-layout-gpos-private.h | 5 ++++- + src/hb-ot-layout-gsub-private.h | 5 ++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +commit 212aba6189d7aaac0bab169b77ae6bdab16800a5 +Author: Behdad Esfahbod +Date: Sun May 24 00:50:27 2009 -0400 + + [HB] Check for GDEF/GSUB/GPOS versions + + src/hb-ot-layout-gdef-private.h | 3 +-- + src/hb-ot-layout-gpos-private.h | 3 +-- + src/hb-ot-layout-gsub-private.h | 3 +-- + src/hb-ot-layout-gsubgpos-private.h | 5 ++--- + src/hb-ot-layout-open-private.h | 11 ++++++++++- + 5 files changed, 15 insertions(+), 10 deletions(-) + +commit a21b5062cc32c04eeee3c4b20d26c7e2b34133e9 +Author: Behdad Esfahbod +Date: Sat May 23 22:39:42 2009 -0400 + + [HB] Minor + + src/hb-ot-layout-gdef-private.h | 6 +++--- + src/hb-ot-layout-open-private.h | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit a080b1cc2f66d6e109d431a1e09519d7cf53bb9a +Author: Behdad Esfahbod +Date: Sat May 23 18:50:44 2009 -0400 + + [HB] Add TODO items + + src/TODO | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit e4efdd80a8fa4edbcdec9cd84f35f5f4521943c2 +Author: Behdad Esfahbod +Date: Fri May 22 18:54:24 2009 -0400 + + [GDEF] Add some get_carret_value() code + + src/hb-ot-layout-gdef-private.h | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +commit 9b006bc0322723d065271e4b0ea4f137f81101e1 +Author: Behdad Esfahbod +Date: Fri May 22 18:29:45 2009 -0400 + + [GPOS] MarkLigPosFormat1 + + GPOS is complete now! Yay! + + src/hb-ot-layout-gpos-private.h | 128 +++++++++++++++++++++++++++++----------- + 1 file changed, 92 insertions(+), 36 deletions(-) + +commit 923923feb248250626c637c11a886804011197b0 +Author: Behdad Esfahbod +Date: Fri May 22 17:58:09 2009 -0400 + + [HB] Remove apply_subtables() again + + src/hb-ot-layout-gpos-private.h | 31 +++++++++++-------------------- + src/hb-ot-layout-gsub-private.h | 33 ++++++++++++--------------------- + 2 files changed, 23 insertions(+), 41 deletions(-) + +commit d468f9af5b9fdc2713b0b86f28129e4190ee5053 +Author: Behdad Esfahbod +Date: Thu May 21 22:31:33 2009 -0400 + + [HB] Share Extension lookup code between GSUB and GPOS + + src/hb-ot-layout-gpos-private.h | 64 +++++----------------------- + src/hb-ot-layout-gsub-private.h | 83 +++++++------------------------------ + src/hb-ot-layout-gsubgpos-private.h | 52 +++++++++++++++++++++++ + 3 files changed, 77 insertions(+), 122 deletions(-) + +commit 498f1909e0f7a32484b2058622c4a018cbfc1334 +Author: Behdad Esfahbod +Date: Thu May 21 15:51:04 2009 -0400 + + [GPOS] Remove printf. MarkMarkPos1 is working + + The "bug" was in the font. + + src/hb-ot-layout-gpos-private.h | 1 - + 1 file changed, 1 deletion(-) + +commit c7d457aa3ae7138630f52ca7263f663a3ea284c0 +Author: Behdad Esfahbod +Date: Thu May 21 12:46:29 2009 -0400 + + [HB] Ouch. Add files. + + src/hb-common.h | 13 +++++----- + src/hb-private.h | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 2 files changed, 78 insertions(+), 9 deletions(-) + +commit fe550f4dd815285e9de8c3cbff810b0a1c7b377f +Author: Behdad Esfahbod +Date: Thu May 21 08:27:07 2009 -0400 + + [GPOS] MarkMarkPosFormat1 + + Still not quite working. + + src/TODO | 4 +- + src/hb-ot-layout-gpos-private.h | 105 +++++++++++++++++++++++++++++----------- + 2 files changed, 79 insertions(+), 30 deletions(-) + +commit 357ccde36bba01a405d59b7da061fc5048cdc7b4 +Author: Behdad Esfahbod +Date: Thu May 21 06:32:01 2009 -0400 + + [GPOS] MarkBasePosFormat1 + + src/TODO | 1 + + src/hb-ot-layout-gpos-private.h | 62 +++++++++++++++++++++++++++++++++++++---- + 2 files changed, 58 insertions(+), 5 deletions(-) + +commit 377bfc5860ae018f54e4a2dd737b4b000383ab54 +Author: Behdad Esfahbod +Date: Thu May 21 04:58:24 2009 -0400 + + [GPOS] Implement MarkArray interface + + src/hb-ot-layout-gpos-private.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit c18ec2b1d7b8c7abe6ebf4b53c9ec75d5c9bb255 +Author: Behdad Esfahbod +Date: Thu May 21 04:54:01 2009 -0400 + + [GPOS] Implement Device support in AnchorFormat3 + + src/hb-ot-layout-gpos-private.h | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +commit fca6a0d158b847181dcf67a13f34499177df899b +Author: Behdad Esfahbod +Date: Thu May 21 04:49:04 2009 -0400 + + [GPOS] Remove apply_value() return value + + src/hb-ot-layout-gpos-private.h | 75 +++++++++++++++++++---------------------- + 1 file changed, 34 insertions(+), 41 deletions(-) + +commit fb3b5ccfefc4c38c9184d432703e81f73e1f5bc7 +Author: Behdad Esfahbod +Date: Thu May 21 04:47:05 2009 -0400 + + [GPOS] Start MarkBasePosFormat1 + + src/TODO | 1 + + src/hb-ot-layout-gpos-private.h | 38 +++++++++++++++++--------------------- + 2 files changed, 18 insertions(+), 21 deletions(-) + +commit ee8776d9e009a7fb8e1f3c1f9cf3ad42d9746a16 +Author: Behdad Esfahbod +Date: Wed May 20 15:46:12 2009 -0400 + + [HB] Add TODO item + + src/hb-ot-layout-gpos-private.h | 1 + + src/hb-ot-layout-gsub-private.h | 1 + + 2 files changed, 2 insertions(+) + +commit c6456ca5cfc35095378dcf29f8edc33ece9c3ea1 +Author: Behdad Esfahbod +Date: Wed May 20 06:15:23 2009 -0400 + + [HB] Add TODO item + + src/TODO | 1 + + 1 file changed, 1 insertion(+) + +commit 3015c4175179a1816aad2a4950da9a3b8baf2578 +Author: Behdad Esfahbod +Date: Wed May 20 06:01:16 2009 -0400 + + [HB] Remove last dependence on the old code base! + + src/hb-buffer-private.h | 88 ++++++++++++++++++++--------------------- + src/hb-buffer.c | 47 +++++++++++----------- + src/hb-ot-layout-gpos-private.h | 11 ++---- + src/hb-ot-layout-gsub-private.h | 12 +++--- + src/hb-ot-layout.cc | 16 ++++---- + 5 files changed, 85 insertions(+), 89 deletions(-) + +commit 5c0adce1ccc739415c4b26ff13ffd2d77ea4bc6c +Author: Behdad Esfahbod +Date: Wed May 20 05:42:12 2009 -0400 + + [HB] Rename harfbuzz-buffer to hb-buffer + + src/Makefile.am | 5 +++-- + src/{harfbuzz-buffer-private.h => hb-buffer-private.h} | 8 ++++---- + src/{harfbuzz-buffer.c => hb-buffer.c} | 6 ++---- + src/{harfbuzz-buffer.h => hb-buffer.h} | 8 ++++---- + src/hb-ot-layout-gsubgpos-private.h | 2 +- + src/hb-ot-layout-private.h | 2 +- + src/hb-ot-layout.cc | 5 +++-- + src/hb-ot-layout.h | 2 +- + 8 files changed, 19 insertions(+), 19 deletions(-) + +commit b857b49c82782d29d6d189f1a9f4a84d39cd84ea +Author: Behdad Esfahbod +Date: Wed May 20 05:35:14 2009 -0400 + + [HB] Remove all references to the old code! + + src/Makefile.am | 76 +++++++--------------- + src/harfbuzz-buffer.c | 154 +++++++++++++++++++-------------------------- + src/harfbuzz-buffer.h | 80 +++++++++++------------ + src/hb-ot-layout-private.h | 6 +- + src/hb-ot-layout.cc | 17 ++--- + src/hb-ot-layout.h | 1 + + 6 files changed, 137 insertions(+), 197 deletions(-) + +commit e1593a6e620ee6a8184487185d1c95e0d1820ba5 +Author: Behdad Esfahbod +Date: Wed May 20 04:51:30 2009 -0400 + + [GPOS] Finally it's working, up to Cursive + + Wow, IranNastaliq renders perfectly again! + + src/hb-ot-layout.cc | 24 ++++++++++++++++++++++++ + src/hb-ot-layout.h | 12 ++++++++++++ + 2 files changed, 36 insertions(+) + +commit 0f7e6b2cead0c7d527ef68ededb27e0afd71d819 +Author: Behdad Esfahbod +Date: Wed May 20 04:16:35 2009 -0400 + + [GPOS] Fix more brokenness + + src/Makefile.am | 2 +- + src/hb-ot-layout-gpos-private.h | 37 ++++++++++++++++++++----------------- + src/hb-ot-layout.cc | 7 +++++++ + src/hb-ot-layout.h | 5 +++++ + 4 files changed, 33 insertions(+), 18 deletions(-) + +commit ff05d257dd43221b7c8ebead188e78495daa8eda +Author: Behdad Esfahbod +Date: Wed May 20 03:53:00 2009 -0400 + + [HB] Move lookup types enum into subtable class + + src/hb-ot-layout-gpos-private.h | 66 ++++++++++++++++++++--------------------- + src/hb-ot-layout-gsub-private.h | 44 +++++++++++++-------------- + 2 files changed, 55 insertions(+), 55 deletions(-) + +commit 263bbef7670b59aa88ef9ba910579dfa51226524 +Author: Behdad Esfahbod +Date: Wed May 20 00:00:09 2009 -0400 + + [GDEF] Simplify Device access + + src/hb-ot-layout-gdef-private.h | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +commit 60d77cf05fddc5304b4b1fc19cdedba15cbee1e9 +Author: Behdad Esfahbod +Date: Tue May 19 23:58:54 2009 -0400 + + [HB] Indentation + + src/hb-ot-layout-common-private.h | 170 +++++++++++++++++------------------- + src/hb-ot-layout-gdef-private.h | 65 +++++++------- + src/hb-ot-layout-gsubgpos-private.h | 150 +++++++++++++++++-------------- + src/hb-ot-layout-open-private.h | 159 ++++++++++++++++----------------- + src/hb-ot-layout-private.h | 9 +- + 5 files changed, 288 insertions(+), 265 deletions(-) + +commit 90de3dfff9e82dae20b7517642511aebaf736b74 +Author: Behdad Esfahbod +Date: Tue May 19 23:43:04 2009 -0400 + + [HB] Remove unused methods + + src/hb-ot-layout-common-private.h | 6 ------ + 1 file changed, 6 deletions(-) + +commit 4c44d830d79431fcb143df2b5a29cdc8e8fccef3 +Author: Behdad Esfahbod +Date: Tue May 19 23:42:30 2009 -0400 + + [HB] Indentation + + src/hb-ot-layout-gpos-private.h | 253 +++++++++++++++++++++----------------- + src/hb-ot-layout-gsub-private.h | 262 ++++++++++++++++++++++------------------ + 2 files changed, 284 insertions(+), 231 deletions(-) + +commit d18fd8e3f7185f531fa4c4988d3f5d5c5282b8eb +Author: Behdad Esfahbod +Date: Tue May 19 23:25:41 2009 -0400 + + [GPOS] CursivePosFormat1 + + src/hb-ot-layout-gpos-private.h | 174 ++++++++++++++++++++++++++++++++++++++-- + src/hb-ot-layout-private.h | 2 +- + 2 files changed, 169 insertions(+), 7 deletions(-) + +commit 70632add333e4ab38f8f485bb87b25116128cf92 +Author: Behdad Esfahbod +Date: Tue May 19 22:30:09 2009 -0400 + + [GSUB] PairPosFormat2 + + src/hb-ot-layout-gpos-private.h | 43 ++++++++++++++++++++++++++++++++++++----- + 1 file changed, 38 insertions(+), 5 deletions(-) + +commit b24ecbadf44d56fd3286d1d3ff6928151ccec9bd +Author: Behdad Esfahbod +Date: Tue May 19 22:16:04 2009 -0400 + + [GPOS] PairPosFormat1 + + src/hb-ot-layout-gpos-private.h | 91 +++++++++++++++++++++++++++++++++-------- + 1 file changed, 73 insertions(+), 18 deletions(-) + +commit 056c7ec1aea1eca60a3b20b583b8a8072be9d758 +Author: Behdad Esfahbod +Date: Mon May 18 19:47:52 2009 -0400 + + [GPOS] Start filling apply() functions in + + src/harfbuzz-buffer-private.h | 1 + + src/harfbuzz-buffer.c | 3 - + src/hb-ot-layout-common-private.h | 35 ++++++----- + src/hb-ot-layout-gpos-private.h | 127 ++++++++++++++++++++++++++++---------- + 4 files changed, 116 insertions(+), 50 deletions(-) + +commit 4fa77d3c4305a76b956de8c1a9b83a961d035a80 +Author: Behdad Esfahbod +Date: Mon May 18 18:44:54 2009 -0400 + + [HB] Use enums + + src/hb-ot-layout-common-private.h | 14 ++++++++------ + src/hb-ot-layout-gdef-private.h | 22 +++++++++++++--------- + 2 files changed, 21 insertions(+), 15 deletions(-) + +commit 6b54c5d0446b514fbb6521e7e9e614d153435f0e +Author: Behdad Esfahbod +Date: Mon May 18 18:30:25 2009 -0400 + + [HB] More reference cast simplification + + src/hb-ot-layout-gsub-private.h | 8 ++++---- + src/hb-ot-layout-gsubgpos-private.h | 28 ++++++++++++++-------------- + src/hb-ot-layout-open-private.h | 2 +- + 3 files changed, 19 insertions(+), 19 deletions(-) + +commit eb0dfc830e09405492f494c85380e133ac5d0ea3 +Author: Behdad Esfahbod +Date: Mon May 18 18:22:44 2009 -0400 + + [HB] Rename LOOKUP_ARGS to APPLY_ARGS + + src/hb-ot-layout-gpos-private.h | 88 ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.h | 84 +++++++++++++++++----------------- + src/hb-ot-layout-gsubgpos-private.h | 90 ++++++++++++++++++------------------- + 3 files changed, 131 insertions(+), 131 deletions(-) + +commit 2a8e6accdf798a78ff180dcb593140592d62b872 +Author: Behdad Esfahbod +Date: Mon May 18 18:21:44 2009 -0400 + + [HB] Internally rename position() and substitute() to apply() + + src/hb-ot-layout-gpos-private.h | 110 ++++++++++++++++++++-------------------- + src/hb-ot-layout-gsub-private.h | 104 ++++++++++++++++++------------------- + 2 files changed, 107 insertions(+), 107 deletions(-) + +commit f6c8a6eacf27fd1c509d07c85985f0367c5e475f +Author: Behdad Esfahbod +Date: Mon May 18 18:01:19 2009 -0400 + + [HB] Simplify casts + + src/hb-ot-layout-gdef-private.h | 2 +- + src/hb-ot-layout-gpos-private.h | 6 +++--- + src/hb-ot-layout-gsub-private.h | 6 +++--- + src/hb-ot-layout-open-private.h | 10 +++++----- + 4 files changed, 12 insertions(+), 12 deletions(-) + +commit 9c42f05a5ccbb48a9367b80ecdf3679e88088fcf +Author: Behdad Esfahbod +Date: Mon May 18 17:43:49 2009 -0400 + + Switch Pango to new, defunt, GPOS + + src/hb-ot-layout-gpos-private.h | 22 +++++++++++++++------- + src/hb-ot-layout.cc | 13 +++++++++++++ + src/hb-ot-layout.h | 5 +++++ + 3 files changed, 33 insertions(+), 7 deletions(-) + +commit 5e5eb0573f7ea2ce2cf037fef0df70a4351e82c0 +Author: Behdad Esfahbod +Date: Mon May 18 17:09:33 2009 -0400 + + [HB] Start GPOS! + + src/hb-ot-layout-gpos-private.h | 915 ++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout-gsub-private.h | 2 - + src/hb-ot-layout-private.h | 15 +- + src/hb-ot-layout.cc | 5 +- + src/hb-ot-layout.h | 8 +- + 5 files changed, 936 insertions(+), 9 deletions(-) + +commit 64e67f7599deeec98b104f8b70d0d321cf96799d +Author: Behdad Esfahbod +Date: Mon May 18 15:32:40 2009 -0400 + + [GSUB] Minor + + src/hb-ot-layout-gsub-private.h | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +commit d79cae0b4eef8c2694ada791bb8e427c1202875e +Author: Behdad Esfahbod +Date: Mon May 18 13:50:15 2009 -0400 + + [HB] Minor + + src/hb-ot-layout-gsub-private.h | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit 8533bb985e6af2b656d7c45620d8f11f36330b85 +Author: Behdad Esfahbod +Date: Mon May 18 06:00:12 2009 -0400 + + [GSUB] Protect against mismatching Extension subtable types + + src/hb-ot-layout-gsub-private.h | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 969afd706e9b52adc79f6210c0088b2c6bbae9bc +Author: Behdad Esfahbod +Date: Mon May 18 05:47:47 2009 -0400 + + [GSUB] Implement ReverseChainSingleSubst + + GSUB is done! + + src/hb-ot-layout-gsub-private.h | 55 +++++++++++++++++++++++++++---------- + src/hb-ot-layout-gsubgpos-private.h | 43 +++++++++-------------------- + 2 files changed, 54 insertions(+), 44 deletions(-) + +commit 4acaffd786a11b5bd7d41b39fc65625fd8cd5077 +Author: Behdad Esfahbod +Date: Mon May 18 05:29:29 2009 -0400 + + [HB] Don't use G_LIKELY! + + src/hb-ot-layout-gsub-private.h | 12 ++++++------ + src/hb-ot-layout-gsubgpos-private.h | 12 ++++++------ + src/hb-ot-layout-open-private.h | 4 ++-- + src/hb-ot-layout.cc | 6 +++--- + 4 files changed, 17 insertions(+), 17 deletions(-) + +commit 3dcb12f171ebbf44461e6ce6439d286c9520dd88 +Author: Behdad Esfahbod +Date: Mon May 18 05:22:32 2009 -0400 + + [GSUB] Oops, fix Extension check + + src/hb-ot-layout-gsub-private.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 2e8fb6c38dbc01cb77b384c0ae0212514dfbb588 +Author: Behdad Esfahbod +Date: Mon May 18 04:37:37 2009 -0400 + + [HB] Tweak some constants and fix Coverage + + src/hb-ot-layout-common-private.h | 11 ++++++----- + src/hb-ot-layout-gsubgpos-private.h | 2 ++ + src/hb-ot-layout-open-private.h | 6 +++--- + 3 files changed, 11 insertions(+), 8 deletions(-) + +commit d6aae5f5cad54fc5dac8b0ff10a3921ebda533d4 +Author: Behdad Esfahbod +Date: Mon May 18 04:25:22 2009 -0400 + + [HB] Cleanup TODOs + + src/hb-ot-layout-gsub-private.h | 12 ++++++------ + src/hb-ot-layout-open-private.h | 2 +- + src/hb-ot-layout.cc | 4 ++-- + 3 files changed, 9 insertions(+), 9 deletions(-) + +commit 122f21fb9a3a0b914575929a3be11884f1ae00c0 +Author: Behdad Esfahbod +Date: Mon May 18 04:21:53 2009 -0400 + + [GSUB] Fix context_length handling in Ligature too + + src/hb-ot-layout-gsub-private.h | 9 ++++----- + src/hb-ot-layout-gsubgpos-private.h | 5 +++-- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 47958dea214fd55725bf04aa13d233870255fb03 +Author: Behdad Esfahbod +Date: Mon May 18 04:17:47 2009 -0400 + + [HB] Minor cleanup + + src/hb-ot-layout-gsubgpos-private.h | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +commit e73a0c2a903112ce9a35b95e14e10ab8ea2dc337 +Author: Behdad Esfahbod +Date: Mon May 18 04:15:25 2009 -0400 + + [HB] Correctly skip glyphs when applying (Chain)Context lookups + + src/hb-ot-layout-gsubgpos-private.h | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +commit 7cff75babd64cd49dd2b3faaa15193d12c098f42 +Author: Behdad Esfahbod +Date: Mon May 18 04:09:05 2009 -0400 + + [HB] Fix context_length checking + + src/hb-ot-layout-gsubgpos-private.h | 23 +++++++++++++---------- + src/hb-ot-layout-open-private.h | 2 +- + 2 files changed, 14 insertions(+), 11 deletions(-) + +commit d0ba0557007798db2c60ddd0b7a5a0624cd1698d +Author: Behdad Esfahbod +Date: Mon May 18 03:56:39 2009 -0400 + + [HB] ChainContext complete + + IranNastaliq renders perfectly again! + + src/hb-ot-layout-gsubgpos-private.h | 63 +++++++++++++++++++++++++++---------- + 1 file changed, 46 insertions(+), 17 deletions(-) + +commit e072c24e79f0e7c1e078a87c782ab5dd8f21dcda +Author: Behdad Esfahbod +Date: Mon May 18 03:47:31 2009 -0400 + + [HB] Implement backtrack matching + + src/hb-ot-layout-gsubgpos-private.h | 61 +++++++++++++++++++++++++++---------- + 1 file changed, 45 insertions(+), 16 deletions(-) + +commit 02e1e5c63fa4f896053fa3c21e495239e1e9caa2 +Author: Behdad Esfahbod +Date: Mon May 18 02:47:57 2009 -0400 + + [HB] One more step to go, for fully working GSUB and ChainContext + + src/hb-ot-layout-gsubgpos-private.h | 107 ++++++++++++++++++++---------------- + 1 file changed, 61 insertions(+), 46 deletions(-) + +commit f14c2b7acfba75b8a6880f41ceec758f9a56abce +Author: Behdad Esfahbod +Date: Mon May 18 02:36:18 2009 -0400 + + [HB] Further modularize Context matching + + src/hb-ot-layout-gsubgpos-private.h | 92 +++++++++++++++++++++++++------------ + 1 file changed, 63 insertions(+), 29 deletions(-) + +commit 13ed4405c558e445b052360f1ed8ee27ecf48e6e +Author: Behdad Esfahbod +Date: Mon May 18 02:14:37 2009 -0400 + + [HB] A step closer to working ChainContext + + src/hb-ot-layout-gsubgpos-private.h | 36 ++++++++++++++++++++++++++---------- + 1 file changed, 26 insertions(+), 10 deletions(-) + +commit e8cbaaf6d538036ff9b880b018db402e0895ed01 +Author: Behdad Esfahbod +Date: Mon May 18 02:03:58 2009 -0400 + + [HB] Add HeadlessArrayTo<> + + src/hb-ot-layout-gsub-private.h | 10 ++++------ + src/hb-ot-layout-gsubgpos-private.h | 5 ++--- + src/hb-ot-layout-open-private.h | 19 +++++++++++++++++++ + 3 files changed, 25 insertions(+), 9 deletions(-) + +commit dcb6b60254951a2831c03f3196962d229f7e556c +Author: Behdad Esfahbod +Date: Mon May 18 01:49:57 2009 -0400 + + [HB] More template goodness + + src/hb-ot-layout-gsubgpos-private.h | 37 +++++++++++++++---------------------- + 1 file changed, 15 insertions(+), 22 deletions(-) + +commit aa3d7adca5c821c91a2a1b5380fd6b3d19656ab1 +Author: Behdad Esfahbod +Date: Sun May 17 23:17:56 2009 -0400 + + [HB] More churning towards ChainContext lookups + + src/hb-ot-layout-common-private.h | 6 +- + src/hb-ot-layout-gsub-private.h | 15 +++- + src/hb-ot-layout-gsubgpos-private.h | 174 ++++++++++++++++++++++-------------- + 3 files changed, 125 insertions(+), 70 deletions(-) + +commit 48f16ed96ac7041b511d9e0864623d2aa09c6da3 +Author: Behdad Esfahbod +Date: Sun May 17 22:11:30 2009 -0400 + + [HB] Towards sharing Context and ChainContext code + + src/hb-ot-layout-gsubgpos-private.h | 220 ++++++++++++++++-------------------- + 1 file changed, 99 insertions(+), 121 deletions(-) + +commit 6cf2a52593cb4b23e3efe5e16228e3172bdcdd05 +Author: Behdad Esfahbod +Date: Sun May 17 21:11:49 2009 -0400 + + [HB] Add check to avoid infinite recursion + + src/hb-ot-layout-gsub-private.h | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 887c4b44165eeb8ac7fb09bc4474d11720b94a9e +Author: Behdad Esfahbod +Date: Sun May 17 21:06:08 2009 -0400 + + [HB] Cosmetic + + src/hb-ot-layout-gsub-private.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ca5290f4994e1b2db4dac03f7a22b7071441ba06 +Author: Behdad Esfahbod +Date: Sun May 17 20:48:27 2009 -0400 + + [HB] Start ChainContext and ReverseChainSingleSubst lookups + + src/hb-ot-layout-gsub-private.h | 269 ++++++++---------------------------- + src/hb-ot-layout-gsubgpos-private.h | 214 +++++++++++++++++++++++++++- + 2 files changed, 268 insertions(+), 215 deletions(-) + +commit 433f4aea741e39df079126769441b79ab64fd236 +Author: Behdad Esfahbod +Date: Sun May 17 20:30:05 2009 -0400 + + [HB] Remove stale TODO + + src/hb-ot-layout-private.h | 2 -- + 1 file changed, 2 deletions(-) + +commit 6f20f72e9c58ba23db2e31afa5d331acfea3d77e +Author: Behdad Esfahbod +Date: Sun May 17 20:28:01 2009 -0400 + + [HB] Split Layout-common tables into new files + + src/hb-ot-layout-common-private.h | 429 ++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout-gdef-private.h | 3 +- + src/hb-ot-layout-gsub-private.h | 1 + + src/hb-ot-layout-gsubgpos-private.h | 2 + + src/hb-ot-layout-open-private.h | 408 ---------------------------------- + 5 files changed, 434 insertions(+), 409 deletions(-) + +commit f45107fe0904414f1266648a6c42849c494fe611 +Author: Behdad Esfahbod +Date: Sun May 17 20:13:02 2009 -0400 + + [HB] More shuffling + + src/hb-ot-layout-gsub-private.h | 71 +++++++++++++++++++++---------------- + src/hb-ot-layout-gsubgpos-private.h | 30 ++++++++++++++++ + src/hb-ot-layout-open-private.h | 41 --------------------- + 3 files changed, 71 insertions(+), 71 deletions(-) + +commit f8dc67b3c24dfc805da756a73cb217b36e16b4b8 +Author: Behdad Esfahbod +Date: Sun May 17 19:47:54 2009 -0400 + + [HB] Cleanup format unions + + src/hb-ot-layout-gdef-private.h | 18 ++++---- + src/hb-ot-layout-gsub-private.h | 87 +++++++++++++++++++------------------ + src/hb-ot-layout-gsubgpos-private.h | 16 +++---- + src/hb-ot-layout-open-private.h | 41 +++++++---------- + 4 files changed, 77 insertions(+), 85 deletions(-) + +commit da1097bc3b1995776c205707fd2b17603b804646 +Author: Behdad Esfahbod +Date: Sun May 17 19:31:18 2009 -0400 + + [HB] Use four bytes for Null Tag, not 5 + + src/hb-ot-layout-open-private.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 19fc24f268b985d30971307ac2055622d11cb21f +Author: Behdad Esfahbod +Date: Sun May 17 09:45:32 2009 -0400 + + [HB] Couple size checks + + src/hb-ot-layout-gsub-private.h | 7 +++++-- + src/hb-ot-layout-gsubgpos-private.h | 4 ++-- + src/hb-ot-layout-open-private.h | 4 ++-- + 3 files changed, 9 insertions(+), 6 deletions(-) + +commit ecf17e849db19599bbb816d0018380ebf979576b +Author: Behdad Esfahbod +Date: Sun May 17 09:34:41 2009 -0400 + + [HB] Propagate property of first glyph + + This slightly grows code size. + + src/hb-ot-layout-gsub-private.h | 100 +++++++++++++++++++----------------- + src/hb-ot-layout-gsubgpos-private.h | 7 +-- + 2 files changed, 56 insertions(+), 51 deletions(-) + +commit eca8e33710cfce51454e64d974ff0c28b0eefa14 +Author: Behdad Esfahbod +Date: Sun May 17 09:07:27 2009 -0400 + + [GSUB] Further optimize the main switch + + src/hb-ot-layout-gsub-private.h | 31 +++++++++++++++++-------------- + 1 file changed, 17 insertions(+), 14 deletions(-) + +commit 13068232e7054748ae5ba0d961ee5a95b959e92e +Author: Behdad Esfahbod +Date: Sun May 17 08:59:01 2009 -0400 + + [HB] Unify first glyph property checking + + src/hb-ot-layout-gsub-private.h | 81 ++++++++++++++++--------------------- + src/hb-ot-layout-gsubgpos-private.h | 12 ------ + 2 files changed, 35 insertions(+), 58 deletions(-) + +commit 66bf7ce4e3135535c110a917178b84c4a2b1d11f +Author: Behdad Esfahbod +Date: Sun May 17 08:28:42 2009 -0400 + + [HB] Move Context matching logic out of GSUB + + src/hb-ot-layout-gdef-private.h | 2 - + src/hb-ot-layout-gsub-private.h | 331 +--------------------------------- + src/hb-ot-layout-gsubgpos-private.h | 347 ++++++++++++++++++++++++++++++++++++ + 3 files changed, 352 insertions(+), 328 deletions(-) + +commit a1625528cd5ed94bc8f18903da3300e823ee5b54 +Author: Behdad Esfahbod +Date: Sun May 17 07:52:11 2009 -0400 + + [GSUB] Unify ContextSubst matching + + src/hb-ot-layout-gsub-private.h | 378 ++++++++++++++++------------------------ + 1 file changed, 154 insertions(+), 224 deletions(-) + +commit c36238bea40e9e2b589028eb6de0710455b31585 +Author: Behdad Esfahbod +Date: Sun May 17 07:39:34 2009 -0400 + + [HB] Renames + + src/hb-ot-layout-gsub-private.h | 122 ++++++++++++++++++++-------------------- + 1 file changed, 61 insertions(+), 61 deletions(-) + +commit 15c3e75b39797a153b6bc0598f87b27c4a487228 +Author: Behdad Esfahbod +Date: Sun May 17 06:03:42 2009 -0400 + + [HB] Simplify buffer + + src/harfbuzz-buffer-private.h | 14 ++++++-------- + src/harfbuzz-buffer.c | 35 ++++++++++++++++------------------- + src/harfbuzz-gsub.c | 6 +++--- + src/hb-ot-layout-gsub-private.h | 12 ++++++------ + 4 files changed, 31 insertions(+), 36 deletions(-) + +commit 36f78446cef8a7cbae000d5e742c9d13e1cc7f83 +Author: Behdad Esfahbod +Date: Sun May 17 05:52:32 2009 -0400 + + [HB] Add TODO item + + src/TODO | 1 + + src/harfbuzz-buffer.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit ee58aaebd296ea8237516754fd4e825d524b11b7 +Author: Behdad Esfahbod +Date: Sun May 17 05:14:33 2009 -0400 + + [HB] Update copyright years + + src/hb-ot-layout-gdef-private.h | 2 +- + src/hb-ot-layout-open-private.h | 2 +- + src/hb-ot-layout.cc | 2 +- + src/main.cc | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit f4c9514935cf97a58dcb3b1962ac3f3b5ba61264 +Author: Behdad Esfahbod +Date: Sun May 17 04:59:56 2009 -0400 + + [HB] Simplify more arrays + + src/hb-ot-layout-open-private.h | 241 ++++++++++++++++------------------------ + src/hb-ot-layout.cc | 8 +- + 2 files changed, 100 insertions(+), 149 deletions(-) + +commit c9a7cbe9cb52264af9954e5ce9ac7a45d7e310cd +Author: Behdad Esfahbod +Date: Sun May 17 01:22:51 2009 -0400 + + [HB] Use ArrayOf<> in GSUB + + src/hb-ot-layout-gdef-private.h | 3 +- + src/hb-ot-layout-gsub-private.h | 157 +++++++++++++--------------------------- + src/hb-ot-layout-open-private.h | 5 -- + 3 files changed, 53 insertions(+), 112 deletions(-) + +commit 5f810363acc3ad3cba631a68620e3d37e54c95c4 +Author: Behdad Esfahbod +Date: Sun May 17 00:54:25 2009 -0400 + + [HB] Add ArrayOf<> + + src/hb-ot-layout-gdef-private.h | 62 ++++++++------------------------- + src/hb-ot-layout-open-private.h | 77 ++++++++++++++++++++++++++++++----------- + 2 files changed, 71 insertions(+), 68 deletions(-) + +commit 238c855fcd4f0ef97a94a8662d2a2f2bb5c21ecb +Author: Behdad Esfahbod +Date: Sun May 17 00:22:37 2009 -0400 + + [HB] Use OffsetTo<> for Coverage + + src/hb-ot-layout-gdef-private.h | 1 + + src/hb-ot-layout-gsub-private.h | 55 ++++++++++++++++------------------------- + src/hb-ot-layout-open-private.h | 10 +------- + 3 files changed, 23 insertions(+), 43 deletions(-) + +commit 3d54bd1293069fc3d3bdeeea8ad45036f3ee65f3 +Author: Behdad Esfahbod +Date: Sun May 17 00:15:51 2009 -0400 + + [HB] Use OffsetTo<> in more places + + src/hb-ot-layout-gdef-private.h | 12 +++++------- + src/hb-ot-layout-open-private.h | 4 ++++ + 2 files changed, 9 insertions(+), 7 deletions(-) + +commit 9e4d9d7b2721859172bc9c59c1aea27b01eb9c07 +Author: Behdad Esfahbod +Date: Sun May 17 00:09:20 2009 -0400 + + [HB] Add OffsetTo template. + + src/hb-ot-layout-gdef-private.h | 26 ++++++++++++++------------ + src/hb-ot-layout-gsub-private.h | 6 +++--- + src/hb-ot-layout-open-private.h | 27 ++++++++++++++++++--------- + 3 files changed, 35 insertions(+), 24 deletions(-) + +commit e07f89295b9b38d233dfd4acec1f6b4a3416f267 +Author: Behdad Esfahbod +Date: Sat May 16 23:20:48 2009 -0400 + + [HB] Automate int-type size assertion + + src/hb-ot-layout-open-private.h | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) + +commit 8b8358033184198ff638ee1379093717596e162d +Author: Behdad Esfahbod +Date: Sat May 16 22:48:14 2009 -0400 + + [HB] Use templates for Null objects + + Also use a common pool for all nul-content ones. + + src/hb-ot-layout-gdef-private.h | 12 ++-- + src/hb-ot-layout-gsub-private.h | 28 ++++---- + src/hb-ot-layout-open-private.h | 142 +++++++++++++++++++++++----------------- + src/hb-ot-layout.cc | 8 +-- + 4 files changed, 105 insertions(+), 85 deletions(-) + +commit 6e13d4140158aff736647fc53d8c0ae3a02c2afc +Author: Behdad Esfahbod +Date: Sat May 16 20:15:16 2009 -0400 + + [HB] Remove obsolete comment + + src/hb-ot-layout-gdef-private.h | 1 - + 1 file changed, 1 deletion(-) + +commit 9f721cf380954d67415dbfd0404a983cdd75b7df +Author: Behdad Esfahbod +Date: Sat May 16 19:59:15 2009 -0400 + + [GSUB] Start ChainContextSubst + + src/hb-ot-layout-gsub-private.h | 50 ++++++++++++++++++++++++++++++++--------- + 1 file changed, 39 insertions(+), 11 deletions(-) + +commit 7fca9e5245d2d283e8b5354eb1ddf553a7ffc033 +Author: Behdad Esfahbod +Date: Sat May 16 19:44:24 2009 -0400 + + [GSUB] Implement ContextSubstFormat3 + + src/hb-ot-layout-gsub-private.h | 62 ++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 61 insertions(+), 1 deletion(-) + +commit 1ff926a5681b5d4bfce65351062cda9dc1ffeba2 +Author: Behdad Esfahbod +Date: Fri May 15 20:25:37 2009 -0400 + + [GSUB] Implement ContextSubstFormat2 + + src/hb-ot-layout-gsub-private.h | 105 +++++++++++++++++++++++++++++++++++++--- + 1 file changed, 97 insertions(+), 8 deletions(-) + +commit fc36d9453ed7edb0a570abc44d7caa87aafb0fcf +Author: Behdad Esfahbod +Date: Fri May 15 20:11:10 2009 -0400 + + [GSUB] Add GSUB::substitute_lookup() + + src/hb-ot-layout-gsub-private.h | 7 +++++++ + src/hb-ot-layout.cc | 5 +---- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit c43562b2a7587fa3f9ef4c1c4338e4eda77368b5 +Author: Behdad Esfahbod +Date: Fri May 15 18:54:53 2009 -0400 + + [GSUB] Finish ContextSubstFormat1 + + src/hb-ot-layout-gsub-private.h | 77 ++++++++++++++++++++++++++++++++--------- + src/hb-ot-layout-private.h | 14 ++++++++ + src/hb-ot-layout.cc | 13 ------- + 3 files changed, 74 insertions(+), 30 deletions(-) + +commit 5ee21896224e3a9835a9695037a94ccf1c35a217 +Author: Behdad Esfahbod +Date: Fri May 15 13:28:56 2009 -0400 + + [HB] Fix typo + + src/hb-ot-layout-open-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6b59c9b445b6d2454008c83a2c7d6a995ea5995e +Author: Behdad Esfahbod +Date: Fri May 15 01:00:36 2009 -0400 + + [HB] Add TODO item + + src/TODO | 1 + + 1 file changed, 1 insertion(+) + +commit c5419b6cf28822e07f1ef9b0394825e9cb01a445 +Author: Behdad Esfahbod +Date: Fri May 8 21:17:56 2009 -0400 + + [HB] Remove DEFINE_NON_INSTANTIABLE + + src/hb-ot-layout-gdef-private.h | 2 -- + src/hb-ot-layout-gsub-private.h | 3 --- + src/hb-ot-layout-open-private.h | 18 +----------------- + 3 files changed, 1 insertion(+), 22 deletions(-) + +commit 0dff25f0368c5f14ebb0a4af35f3bb6658740d57 +Author: Behdad Esfahbod +Date: Fri May 8 21:12:18 2009 -0400 + + [HB] Remove get_size() + + src/hb-ot-layout-gdef-private.h | 9 ------ + src/hb-ot-layout-gsub-private.h | 63 ----------------------------------------- + src/hb-ot-layout-open-private.h | 42 ++------------------------- + 3 files changed, 3 insertions(+), 111 deletions(-) + +commit 25c6c9a3f6c062ec639d9202a8b9844be64d6fc0 +Author: Behdad Esfahbod +Date: Fri May 8 19:09:17 2009 -0400 + + [GSUB] ContextSubst format 1 + + src/hb-ot-layout-gsub-private.h | 52 +++++++++++++++++++++++++++++++++++------ + 1 file changed, 45 insertions(+), 7 deletions(-) + +commit f70229510303109bd0f71423cdf13aa200066d17 +Author: Behdad Esfahbod +Date: Fri May 8 18:45:53 2009 -0400 + + [GSUB] Shuffle + + src/hb-ot-layout-gsub-private.h | 170 ++++++++++++++++++++-------------------- + 1 file changed, 86 insertions(+), 84 deletions(-) + +commit a83e08f8728439ef75e3dfab2191ac913d8f907b +Author: Behdad Esfahbod +Date: Thu May 7 12:53:02 2009 -0400 + + [HarfBuzz] Start a TODO file + + src/TODO | 1 + + 1 file changed, 1 insertion(+) + +commit eed05b04ebc2cbb3fa699c99200db12a0081cefb +Author: Behdad Esfahbod +Date: Wed May 6 00:25:59 2009 -0400 + + [GSUB] minor + + src/hb-ot-layout-open-private.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit cdb317bc4e188421cad997b448abb19223d39e96 +Author: Behdad Esfahbod +Date: Wed May 6 00:12:29 2009 -0400 + + [GSUB] Towards Context subtitutes + + src/hb-ot-layout-gsub-private.h | 137 +++++++++++++++++++++++++++++++--------- + 1 file changed, 108 insertions(+), 29 deletions(-) + +commit c9c6a78aec2b16ac06dfca8cbfaf28a77a10bae2 +Author: Behdad Esfahbod +Date: Tue May 5 16:22:02 2009 -0400 + + [GSUB] Minor refactoring + + src/hb-ot-layout-gsub-private.h | 42 ++++++++++++++++++++++------------------- + 1 file changed, 23 insertions(+), 19 deletions(-) + +commit bb3899a579b00134b24df8891b69bf1621a8190f +Author: Behdad Esfahbod +Date: Tue May 5 13:25:13 2009 -0400 + + [GSUB] Implement ligature substitutions + + src/Makefile.am | 2 + + src/hb-ot-layout-gsub-private.h | 113 ++++++++++++++++++++++++++++++++-------- + 2 files changed, 93 insertions(+), 22 deletions(-) + +commit 38b011a293181856463dd08d43e2106e5bf1d56e +Author: Behdad Esfahbod +Date: Mon May 4 20:21:57 2009 -0400 + + [GSUB] Hook new GSUB up in Pango + + src/hb-ot-layout-gsub-private.h | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +commit a84e71ad11a72feff47ead16772a8c4bcf4f69d5 +Author: Behdad Esfahbod +Date: Thu Apr 16 16:53:40 2009 -0400 + + [GSUB] Start Ligature subtable support + + src/hb-ot-layout-gsub-private.h | 132 +++++++++++++++++++++++++++++----------- + src/hb-ot-layout.h | 2 +- + 2 files changed, 96 insertions(+), 38 deletions(-) + +commit 52886ca56b24a8335614b1df16a33dd4e2d7ae56 +Author: Behdad Esfahbod +Date: Thu Apr 16 14:19:42 2009 -0400 + + [GSUB] Implement Alternate subtables + + src/hb-ot-layout-gsub-private.h | 104 ++++++++++++++++++++++++++++++++++++---- + src/hb-ot-layout-open-private.h | 2 +- + 2 files changed, 97 insertions(+), 9 deletions(-) + +commit 4f27ce7e0213ac5ba356f0fd2ec0a175ffd002e6 +Author: Behdad Esfahbod +Date: Thu Apr 16 13:40:13 2009 -0400 + + [GSUB] Implement Extension subtables + + src/hb-ot-layout-gsub-private.h | 169 +++++++++++++++++++++++++--------------- + 1 file changed, 108 insertions(+), 61 deletions(-) + +commit 83e61ff4702121d3418fe82a8fe7ef6bb63bb5d2 +Author: Behdad Esfahbod +Date: Thu Apr 16 12:30:51 2009 -0400 + + [GSUB] Fix reverse lookup loop like we did in the old code before + + src/hb-ot-layout-gsub-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5a0b791184cf6ef39eae0570e14aca21abc32845 +Author: Behdad Esfahbod +Date: Thu Apr 16 04:45:30 2009 -0400 + + [harfbuzz/GSUB] towards a partially working GSUB + + src/harfbuzz-buffer.c | 2 +- + src/harfbuzz-impl.h | 2 +- + src/harfbuzz.c | 1 - + src/hb-ot-layout-gdef-private.h | 4 +- + src/hb-ot-layout-gsub-private.h | 383 +++++++++++++++++++++++++++++----------- + src/hb-ot-layout-open-private.h | 31 +++- + src/hb-ot-layout-private.h | 6 +- + src/hb-ot-layout.cc | 94 +++++++--- + src/hb-ot-layout.h | 2 - + 9 files changed, 381 insertions(+), 144 deletions(-) + +commit 30bd763fa2fa4aceee51433ec9fc8dc28480b5d7 +Author: Behdad Esfahbod +Date: Wed Apr 15 22:56:15 2009 -0400 + + Implement the first substitute() + + src/harfbuzz-buffer-private.h | 8 ++-- + src/harfbuzz-buffer.c | 4 +- + src/harfbuzz-buffer.h | 2 +- + src/harfbuzz-gdef-private.h | 4 +- + src/harfbuzz-gdef.c | 6 +-- + src/harfbuzz-gdef.h | 2 +- + src/harfbuzz-gpos.c | 8 ++-- + src/harfbuzz-gpos.h | 2 +- + src/harfbuzz-gsub.h | 2 +- + src/hb-ot-layout-gsub-private.h | 88 +++++++++++++++++++++++++++++++++++++---- + src/hb-ot-layout-open-private.h | 2 +- + src/hb-ot-layout-private.h | 23 ++++++----- + src/hb-ot-layout.cc | 54 +++++++++++++++++-------- + src/hb-ot-layout.h | 2 +- + 14 files changed, 151 insertions(+), 56 deletions(-) + +commit ce48f03946bef895912019046bdbe62bb1301d0b +Merge: 0e13beeb 2d15e72c +Author: Behdad Esfahbod +Date: Mon Nov 2 14:35:51 2009 -0500 + + Merge harfbuzz-ng + +commit 0e13beeb93077750183a8242780158b88df81e26 +Author: Behdad Esfahbod +Date: Fri Apr 17 17:03:39 2009 -0400 + + Use git.mk + + src/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2d15e72c75931398db5e027e660f1320bb979117 +Author: Behdad Esfahbod +Date: Wed Apr 15 19:50:16 2009 -0400 + + Give it a start at GSUB + + src/hb-common.h | 5 +- + src/hb-ot-layout-gdef-private.h | 24 ++++---- + src/hb-ot-layout-gsub-private.h | 120 +++++++++++++++++++++++++++++++++++++++- + src/hb-ot-layout-open-private.h | 51 ++++++++++------- + src/hb-ot-layout-private.h | 2 +- + src/hb-ot-layout.cc | 63 +++++++++++++++++++-- + src/hb-ot-layout.h | 29 +++++++++- + src/main.cc | 4 +- + 8 files changed, 253 insertions(+), 45 deletions(-) + +commit 9d870f2a558f4e463e3ff953312202a8d144158b +Author: Behdad Esfahbod +Date: Thu Apr 9 13:30:26 2009 -0400 + + Bug 577952 – Error loading {GDEF,GSUB,GPOS} table 0x6EAD + + Detect TrueType Collections by checking the font data header instead + of checking for "face->num_faces >1". + + src/harfbuzz-stream.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit d49caf1f77743550d83fc7feced1293ba34a4e99 +Author: Behdad Esfahbod +Date: Mon Mar 2 15:16:11 2009 +0330 + + [opentype] Protect against illegal access for arrays of length zero + + src/harfbuzz-gpos.c | 22 ++++++++++++++++++---- + src/harfbuzz-gsub.c | 6 ++++++ + 2 files changed, 24 insertions(+), 4 deletions(-) + +commit 66871797af194f9d2161faf8bfbc9684f09e207e +Author: Behdad Esfahbod +Date: Mon Mar 2 14:20:20 2009 +0330 + + [opentype] Use size_t instead of uint for malloc wrappers + + src/harfbuzz-impl.c | 4 ++-- + src/harfbuzz-impl.h | 6 ++++-- + 2 files changed, 6 insertions(+), 4 deletions(-) + +commit 3664e59c52ed56486a3e38126c0c3abb78f42233 +Author: Behdad Esfahbod +Date: Mon Mar 2 11:09:29 2009 +0330 + + Fix Bug 572529 – Poor -I ordering can break build + + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit aca4d11388eedd532a73bd34747abb65c0ea9291 +Author: Behdad Esfahbod +Date: Mon Feb 2 00:13:07 2009 +0000 + + Allocate all array rows in a single ALLOC call. Saves over 100 alloc calls + + 2009-01-31 Behdad Esfahbod + + * pango/opentype/harfbuzz-gpos.c (Load_Mark2Array), + (Free_Mark2Array): + Allocate all array rows in a single ALLOC call. Saves over 100 + alloc calls when loading DejaVu Sans, + + src/harfbuzz-gpos.c | 59 +++++++++++++++-------------------------------------- + 1 file changed, 17 insertions(+), 42 deletions(-) + +commit c561d69c721105b78bb06d1e3c5f21ca314d924a +Author: Behdad Esfahbod +Date: Thu Jan 29 09:20:08 2009 +0000 + + Remove ClassDef->Defined field. This is the comment accompanying it: + + 2009-01-29 Behdad Esfahbod + + * pango/opentype/harfbuzz-open.h: + * pango/opentype/harfbuzz-gdef.c (Make_ClassRange), + (HB_GDEF_Build_ClassDefinition): + * pango/opentype/harfbuzz-gpos.c (Load_PosClassRule), + (Load_ChainPosClassRule): + * pango/opentype/harfbuzz-gsub.c (Load_SubClassRule), + (Load_ChainSubClassRule): + * pango/opentype/harfbuzz-open.c (Load_ClassDef1), + (Load_ClassDef2), (_HB_OPEN_Load_ClassDefinition), + (_HB_OPEN_Load_EmptyClassDefinition), + (_HB_OPEN_Free_ClassDefinition): + Remove ClassDef->Defined field. This is the comment accompanying it: + + The `Defined' field is not defined in the OpenType specification + but apparently needed for processing fonts like trado.ttf: This + font refers to a class which contains not a single element. We + map such classes to class 0. + + The comment is correct that trado.ttf (MS Traditional Arabic) uses + such classes. However, in my testing I couldn't identify any + problems with the font if the special handling is removed. I also + processed as many fonts as I could get my hand on and trado.ttf was + the only not-totally-broken font hitting the special-case code. + DejaVu fonts hit it too, but I'm sure they do not require the + special-handling code. Most probably, that code introduces bugs + in them. + + The special-casing was consuming lots of memory. EIGHT MEGABYTES + for loading DejaVu Sans! While this could be complete fixed, I + decided to remove the special-handling code altogether. I don't + think it will make any real difference, and if it does, we'll fix + fonts. Such hacks will not be in harfbuzz-ng anyway. + + Bug originally reported by nsf. + + src/harfbuzz-gdef.c | 8 -------- + src/harfbuzz-gpos.c | 32 -------------------------------- + src/harfbuzz-gsub.c | 31 ------------------------------- + src/harfbuzz-open.c | 30 +++--------------------------- + src/harfbuzz-open.h | 8 -------- + 5 files changed, 3 insertions(+), 106 deletions(-) + +commit 9372edd6f020c92609853609dcb504c72551c9c3 +Author: Behdad Esfahbod +Date: Thu Jan 29 09:19:56 2009 +0000 + + Use calloc(), instead of malloc()ing and memset()ing. + + 2009-01-29 Behdad Esfahbod + + * pango/opentype/harfbuzz-impl.c (_hb_alloc): Use calloc(), + instead of malloc()ing and memset()ing. + + src/harfbuzz-impl.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 94c21d26ba878b3168a21f2e76f02bc52e8fe6fd +Author: Behdad Esfahbod +Date: Thu Jan 29 09:19:43 2009 +0000 + + Remove old cruft. + + 2009-01-29 Behdad Esfahbod + + * pango/opentype/harfbuzz-dump-main.c (main): Remove old cruft. + + src/harfbuzz-dump-main.c | 144 +---------------------------------------------- + 1 file changed, 1 insertion(+), 143 deletions(-) + +commit 0a47c4f78e8a9e81cd305f24ec92ea61ead7dd8d +Author: Behdad Esfahbod +Date: Thu Jan 29 09:19:20 2009 +0000 + + Allocate all array rows in a single ALLOC call. Saves over 2000 alloc + + 2009-01-29 Behdad Esfahbod + + * pango/opentype/harfbuzz-gpos.c (Load_BaseArray), (Free_BaseArray): + Allocate all array rows in a single ALLOC call. Saves over 2000 + alloc calls when loading DejaVu Sans! + + src/harfbuzz-gpos.c | 57 ++++++++++++++++------------------------------------- + 1 file changed, 17 insertions(+), 40 deletions(-) + +commit 549be924bccd187f53791dfa27647981ac909545 +Author: Behdad Esfahbod +Date: Fri Dec 26 02:31:47 2008 +0000 + + Bug 469049 – Fix all compiler warnings + + 2008-12-25 Behdad Esfahbod + + Bug 469049 – Fix all compiler warnings + + * pango-view/viewer-pangocairo.c (render_callback): + * pango/fonts.c (append_field), (pango_font_description_to_string): + * pango/opentype/harfbuzz-dump.c: + * pango/pango-bidi-type.c (pango_log2vis_get_embedding_levels): + * pango/pango-coverage.c (pango_coverage_set): + * pango/pango-markup.c (span_parse_func): + * pango/pango-renderer.c + (pango_renderer_default_draw_error_underline): + * pango/pango-utils.c (pango_scan_string): + * pango/pangocairo-render.c (pango_cairo_renderer_draw_trapezoid), + (draw_error_underline), (pango_cairo_renderer_class_init): + Fix all the remaining warnings. + + src/harfbuzz-dump.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit 719f9eaa755396ff377da10c5eeced01d3456b1b +Author: Behdad Esfahbod +Date: Fri Dec 26 02:31:35 2008 +0000 + + Fix more warnings. + + 2008-12-25 Behdad Esfahbod + + * pango/modules.c (pango_module_load), (script_info_free): + * pango/opentype/harfbuzz-gpos.c (HB_Load_GPOS_Table): + * pango/pango-bidi-type.c: + * pango/pango-coverage.c (pango_coverage_ref), + (pango_coverage_unref): + * pango/pango-engine.c (pango_engine_shape_real_covers), + (fallback_engine_shape), (fallback_engine_covers): + * pango/pango-fontmap.c (pango_font_map_init): + * pango/pango-ot-ruleset.c (pango_ot_ruleset_finalize), + (pango_ot_ruleset_new): + * pango/pangofc-decoder.c (pango_fc_decoder_init), + (pango_fc_decoder_class_init): + * pango/pangofc-font.c (pango_fc_font_find_shaper), + (pango_fc_font_get_coverage): + * pango/pangofc-fontmap.c (pango_fc_font_map_list_families), + (pango_fc_make_pattern), (pango_fc_font_map_get_patterns), + (get_first_font), (_pango_fc_font_map_get_coverage), + (cleanup_font), (pango_fc_font_description_from_pattern), + (pango_fc_face_list_sizes), (pango_fc_family_list_faces): + * pango/pangoft2-fontmap.c (pango_ft2_font_map_get_resolution): + * pango/pangoft2-render.c (pango_ft2_renderer_init), + (pango_ft2_renderer_draw_trapezoid): + * pango/pangoft2.c (pango_ft2_font_get_face), + (pango_ft2_font_real_unlock_face), + (pango_ft2_free_glyph_info_callback): + Fix more warnings. + + src/harfbuzz-gpos.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 21f7d507f4b50e2743ab47954270f4c72d5a722a +Author: Behdad Esfahbod +Date: Wed Oct 15 03:45:29 2008 +0000 + + Bug 528272 – "Error loading GPOS table 5503" when using katakana + + 2008-10-14 Behdad Esfahbod + + Bug 528272 – "Error loading GPOS table 5503" when using katakana + characters + + * pango/opentype/harfbuzz-gpos.c (Load_Mark2Array): Skip parsing + null anchor tables. + + src/harfbuzz-gpos.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit a26c6ae70502b4d60c52a0648662b1619c688b9a +Author: Behdad Esfahbod +Date: Mon Sep 29 22:28:47 2008 +0000 + + Fix left-to-right positioning. Reported by Peter Hunter. + + 2008-09-29 Behdad Esfahbod + + * pango/opentype/harfbuzz-gpos.c (Position_CursiveChain): + Fix left-to-right positioning. Reported by Peter Hunter. + + src/harfbuzz-gpos.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b6c06c56a33f1e1ec15e3b525ecafe8fadc679db +Author: Behdad Esfahbod +Date: Sun Jun 29 18:30:14 2008 +0000 + + Bug 540592 – Crash in HB_GSUB_Apply_String with Linux-Libertine font + + 2008-06-29 Behdad Esfahbod + + Bug 540592 – Crash in HB_GSUB_Apply_String with Linux-Libertine font + + * pango/opentype/harfbuzz-gsub.c (GSUB_Do_String_Lookup): Fix reverse + loops for type 8 lookups. + + src/harfbuzz-gsub.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c44733596c6648e209c12349e18e35424edf3d59 +Author: Behdad Esfahbod +Date: Mon Feb 18 21:14:23 2008 -0500 + + [hb-ot-layout] Add proper namespace to accessors + + src/hb-ot-layout.cc | 165 ++++++++++++++++++++++++++++++++++++++-------------- + src/hb-ot-layout.h | 115 +++++++++++++++++++++++------------- + 2 files changed, 198 insertions(+), 82 deletions(-) + +commit 57225672098ebdafb0c06ae091a1b55635daca29 +Author: Behdad Esfahbod +Date: Mon Feb 18 20:58:39 2008 -0500 + + Fix typo, add TODOs + + src/hb-ot-layout-open-private.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 4a26ea408c87f0bb59deca9ff44008d138471aa3 +Author: Behdad Esfahbod +Date: Mon Jan 28 07:40:10 2008 -0500 + + Finish script, language, and feature public API + + src/hb-ot-layout-open-private.h | 22 ++++++--- + src/hb-ot-layout.cc | 107 +++++++++++++++++++++++++++++++--------- + src/hb-ot-layout.h | 34 ++++++++++++- + 3 files changed, 132 insertions(+), 31 deletions(-) + +commit 706ab25a4cb043d46e6088aa0a7184ee200276c9 +Author: Behdad Esfahbod +Date: Mon Jan 28 05:58:50 2008 -0500 + + Add script and language public getter API + + src/hb-ot-layout-open-private.h | 40 ++++++++----- + src/hb-ot-layout.cc | 127 +++++++++++++++++++++++++++++++++++++++- + src/hb-ot-layout.h | 56 ++++++++++++++++++ + src/main.cc | 2 +- + 4 files changed, 207 insertions(+), 18 deletions(-) + +commit 40a81314fa3eb7c701aea47b43f81bfad985f717 +Author: Behdad Esfahbod +Date: Mon Jan 28 02:30:48 2008 -0500 + + Make main.cc compile again, which means finished getter API + + src/hb-ot-layout-open-private.h | 117 +++++++++++++++++++++++++++++----------- + src/main.cc | 99 +++++++++++++++++++++++----------- + 2 files changed, 155 insertions(+), 61 deletions(-) + +commit e50c3978d37b2c0d6ddd4ced6a6196f6857cd596 +Author: Behdad Esfahbod +Date: Mon Jan 28 00:16:49 2008 -0500 + + Rename HB_OT_Layout to hb_ot_layout_t + + src/hb-ot-layout-private.h | 8 ++++---- + src/hb-ot-layout.cc | 34 +++++++++++++++++----------------- + src/hb-ot-layout.h | 33 +++++++++++++++------------------ + 3 files changed, 36 insertions(+), 39 deletions(-) + +commit dfa811965133bc4d1696fa5a0166e17ed4142c98 +Author: Behdad Esfahbod +Date: Mon Jan 28 00:12:21 2008 -0500 + + Rename hb_ot_layout_create() to hb_ot_layout_create_for_data() + + src/hb-ot-layout.cc | 4 ++-- + src/hb-ot-layout.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 54e5aac5e2947d4e2864c6f2987e4d275da73100 +Author: Behdad Esfahbod +Date: Sun Jan 27 21:19:51 2008 -0500 + + GDEF completely working now + + src/hb-ot-layout-open-private.h | 11 ++++++++--- + src/hb-ot-layout-private.h | 16 +++++++++------- + src/hb-ot-layout.cc | 19 +++++++++---------- + src/hb-private.h | 7 +++++++ + src/main.cc | 12 ++++++------ + 5 files changed, 39 insertions(+), 26 deletions(-) + +commit 6f425b11799aa20dab553085f05744191b7318e2 +Author: Behdad Esfahbod +Date: Thu Jan 24 19:38:56 2008 -0500 + + [GDEF] Finish internal API + + src/hb-ot-layout-private.h | 15 +++++++- + src/hb-ot-layout.cc | 95 ++++++++++++++++++++++------------------------ + src/hb-ot-layout.h | 16 ++++---- + 3 files changed, 66 insertions(+), 60 deletions(-) + +commit 590d55cbb9e21ef74dfd88eee51fd0a763958cd2 +Author: Behdad Esfahbod +Date: Thu Jan 24 19:13:50 2008 -0500 + + [GDEF] Finish public API + + src/hb-common.h | 11 ++++ + src/hb-ot-layout-gdef-private.h | 28 +++++---- + src/hb-ot-layout-open-private.h | 25 ++++---- + src/hb-ot-layout-private.h | 23 ++------ + src/hb-ot-layout.cc | 123 +++++++++++++++++++++++++++++++++++++--- + src/hb-ot-layout.h | 29 ++++++---- + 6 files changed, 176 insertions(+), 63 deletions(-) + +commit aff831ed6787abe8e24a977e34d97ff2e0b7dc21 +Author: Behdad Esfahbod +Date: Thu Jan 24 06:03:45 2008 -0500 + + Implement glyph properties + + src/hb-ot-layout-gdef-private.h | 10 ++++- + src/hb-ot-layout-private.h | 16 +++++++- + src/hb-ot-layout.cc | 84 +++++++++++++++++++++++++++++++++++++---- + src/hb-ot-layout.h | 25 ++++++++---- + 4 files changed, 117 insertions(+), 18 deletions(-) + +commit ead428d7a0bf4dc84340a99f3959e5cc58123e99 +Author: Behdad Esfahbod +Date: Thu Jan 24 03:54:09 2008 -0500 + + More public api + + src/hb-ot-layout-open-private.h | 32 +++++++++++++++++++------------- + src/hb-ot-layout-private.h | 9 ++++++--- + src/hb-ot-layout.cc | 21 ++++++++++++++------- + src/hb-ot-layout.h | 2 -- + 4 files changed, 39 insertions(+), 25 deletions(-) + +commit fd92a3dde32fd10df30c9eeb97641bc3c15b1e9b +Author: Behdad Esfahbod +Date: Thu Jan 24 03:11:09 2008 -0500 + + Starting public interface + + src/{Makefile => Makefile.ng} | 0 + src/hb-ot-layout-gdef-private.h | 17 ++++---- + src/hb-ot-layout-gsub-private.h | 3 +- + src/hb-ot-layout-open-private.h | 92 +++++++++++++++++++++++++++++------------ + src/hb-ot-layout-private.h | 51 +++++++++++++++++++++++ + src/hb-ot-layout.cc | 67 ++++++++++++++++++++++++++++++ + src/hb-ot-layout.h | 35 ++++++++++++++-- + src/main.cc | 1 + + 8 files changed, 225 insertions(+), 41 deletions(-) + +commit 7d6b95b000ec6cd8ca93113b2d81a049ad2f9bbe +Author: Behdad Esfahbod +Date: Thu Jan 24 04:42:24 2008 +0000 + + Remove unused macro + + src/harfbuzz-impl.h | 2 -- + 1 file changed, 2 deletions(-) + +commit 7586089c6fa8185cad8387869d3703c637e5cbb1 +Author: Behdad Esfahbod +Date: Wed Jan 23 18:02:28 2008 -0500 + + Minor + + src/hb-ot-layout-gdef-private.h | 37 +++++++++++++++++++++++++------ + src/hb-ot-layout-gsub-private.h | 13 +++++++++++ + src/hb-ot-layout-open-private.h | 49 ++++++++++++++++++++++++++++++++++------- + src/hb-private.h | 2 ++ + 4 files changed, 86 insertions(+), 15 deletions(-) + +commit aefaafe5bc4fc6d37a412c135b1079c287be7045 +Author: Behdad Esfahbod +Date: Wed Jan 23 17:25:29 2008 -0500 + + Minor renaming + + src/hb-ot-layout-gdef-private.h | 10 +++++----- + src/hb-ot-layout-open-private.h | 16 +++++++--------- + src/main.cc | 4 ++-- + 3 files changed, 14 insertions(+), 16 deletions(-) + +commit a16ecbf0564a6e2576da22c12827f3c0719da549 +Author: Behdad Esfahbod +Date: Wed Jan 23 17:01:55 2008 -0500 + + Initial gsub stub + + src/hb-ot-layout-gdef-private.h | 4 + + src/hb-ot-layout-gsub-private.h | 453 ++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout-open-private.h | 3 + + src/main.cc | 1 + + 4 files changed, 461 insertions(+) + +commit 64aef3a54999496fd1de4f5aa5b019e4c03b3836 +Author: Behdad Esfahbod +Date: Wed Jan 23 16:14:38 2008 -0500 + + Add copyright notices. + + src/hb-common.h | 26 ++++++++++++++++++++++++++ + src/hb-ot-layout-gdef-private.h | 26 ++++++++++++++++++++++++++ + src/hb-ot-layout-open-private.h | 26 ++++++++++++++++++++++++++ + src/hb-ot-layout.h | 26 ++++++++++++++++++++++++++ + src/hb-private.h | 26 ++++++++++++++++++++++++++ + src/main.cc | 26 ++++++++++++++++++++++++++ + 6 files changed, 156 insertions(+) + +commit 12360f7c159826ae72271b34486dee59d96aa8ca +Author: Behdad Esfahbod +Date: Wed Jan 23 15:50:38 2008 -0500 + + Minor cleanup, add LIKELY and UNLIKELY annotations + + src/hb-ot-layout-gdef-private.h | 63 +++++++++++++++++++++++------------------ + src/hb-ot-layout-open-private.h | 36 ++++++++--------------- + src/hb-private.h | 15 ++++++++++ + 3 files changed, 63 insertions(+), 51 deletions(-) + +commit 8dd1c8b8d6797d899d0f5b0a8015886bf6520ca2 +Author: Behdad Esfahbod +Date: Wed Jan 23 05:00:30 2008 -0500 + + Clean up file names, add namespace + + src/harfbuzz-common.h | 14 -------------- + src/harfbuzz-gdef.h | 11 ----------- + src/hb-common.h | 14 ++++++++++++++ + ...harfbuzz-gdef-private.h => hb-ot-layout-gdef-private.h} | 8 ++++---- + ...harfbuzz-open-private.h => hb-ot-layout-open-private.h} | 10 +++++----- + src/{harfbuzz-open.h => hb-ot-layout.h} | 12 ++++++------ + src/{harfbuzz-private.h => hb-private.h} | 6 +++--- + src/main.cc | 4 ++-- + 8 files changed, 34 insertions(+), 45 deletions(-) + +commit 1f437e6f47fb6c15761021bd2078f31778f2179c +Author: Behdad Esfahbod +Date: Wed Jan 23 04:36:40 2008 -0500 + + Make all code NULL-free and assert-free + + src/harfbuzz-gdef-private.h | 125 ++++++++++--------- + src/harfbuzz-open-private.h | 285 +++++++++++++++++++++++--------------------- + src/main.cc | 8 +- + 3 files changed, 214 insertions(+), 204 deletions(-) + +commit 600e5eb80f553ea8eb862e6784133574c74ca513 +Author: Behdad Esfahbod +Date: Wed Jan 23 02:01:37 2008 -0500 + + Define get_for_data() factories + + src/harfbuzz-gdef-private.h | 3 +++ + src/harfbuzz-open-private.h | 42 +++++++++++++++++++++++++++++------------- + src/main.cc | 10 ++++------ + 3 files changed, 36 insertions(+), 19 deletions(-) + +commit b9d7688fb3d45894901484b74095c4f11cab6196 +Author: Behdad Esfahbod +Date: Wed Jan 23 01:38:10 2008 -0500 + + Finish and test GDEF + + src/harfbuzz-gdef-private.h | 72 ++++++++++++++++++++++++++++++++------------- + src/harfbuzz-open-private.h | 23 ++++++++------- + src/harfbuzz-open.h | 4 +++ + src/main.cc | 10 +++++++ + 4 files changed, 77 insertions(+), 32 deletions(-) + +commit 303fe62824d4e99df554b6bfaacba05d068522fb +Author: Behdad Esfahbod +Date: Wed Jan 23 00:20:48 2008 -0500 + + Misc cleanup + + src/Makefile | 10 ++++- + src/harfbuzz-gdef-private.h | 65 +++++++++++++++++++++------- + src/harfbuzz-open-private.h | 102 ++++++++++++++++++++++++++++++++++++++++---- + src/harfbuzz-private.h | 6 +++ + src/main.cc | 12 +++--- + 5 files changed, 163 insertions(+), 32 deletions(-) + +commit 17843245fde4cc8cddc7da8ef30357d3d8778187 +Author: Behdad Esfahbod +Date: Wed Jan 16 20:39:29 2008 +0000 + + Remove COPYING.GPL and COPYING.FTL that are no longer there. + + 2008-01-16 Behdad Esfahbod + + * pango/opentype/Makefile.am: Remove COPYING.GPL and COPYING.FTL that + are no longer there. + + src/Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +commit a2a9a023f6472ba262f89e5327318996b8258d25 +Author: Behdad Esfahbod +Date: Tue Jan 15 22:46:32 2008 +0000 + + HarfBuzz was relicensed to a more generous and simpler license. Adapt. See + + 2008-01-15 Behdad Esfahbod + + * pango/opentype/*: + HarfBuzz was relicensed to a more generous and simpler license. + Adapt. See pango/opentype/COPYING for the new license which is + LGPL-compatible. + + src/COPYING | 39 +++-- + src/COPYING.FTL | 174 --------------------- + src/COPYING.GPL | 340 ------------------------------------------ + src/harfbuzz-buffer-private.h | 32 ++-- + src/harfbuzz-buffer.c | 27 +++- + src/harfbuzz-buffer.h | 32 ++-- + src/harfbuzz-dump-main.c | 34 +++-- + src/harfbuzz-dump.c | 34 +++-- + src/harfbuzz-dump.h | 35 +++-- + src/harfbuzz-gdef-private.h | 29 +++- + src/harfbuzz-gdef.c | 29 +++- + src/harfbuzz-gdef.h | 29 +++- + src/harfbuzz-global.h | 29 +++- + src/harfbuzz-gpos-private.h | 29 +++- + src/harfbuzz-gpos.c | 31 +++- + src/harfbuzz-gpos.h | 29 +++- + src/harfbuzz-gsub-private.h | 29 +++- + src/harfbuzz-gsub.c | 31 +++- + src/harfbuzz-gsub.h | 29 +++- + src/harfbuzz-impl.c | 31 +++- + src/harfbuzz-impl.h | 29 +++- + src/harfbuzz-open-private.h | 29 +++- + src/harfbuzz-open.c | 29 +++- + src/harfbuzz-open.h | 29 +++- + src/harfbuzz-stream-private.h | 29 +++- + src/harfbuzz-stream.c | 31 +++- + src/harfbuzz.c | 28 +++- + src/harfbuzz.h | 29 +++- + 28 files changed, 564 insertions(+), 741 deletions(-) + +commit 4ccedd22eaa6e47bd8bbf255627a8b55fbb44736 +Author: Behdad Esfahbod +Date: Wed Dec 5 03:41:29 2007 +0000 + + Bug 501575 – Compile errors Patch from Jens Granseuer + + 2007-12-04 Behdad Esfahbod + + Bug 501575 – Compile errors + Patch from Jens Granseuer + + * pango/opentype/harfbuzz-stream.c (_hb_font_goto_table): + * pango/pango-utils.c (handle_alias_line): + Fix C99ism. + + src/harfbuzz-stream.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit cd55cfa2b0a1fe35d5a4ad1c8feaa399d7fb7ab3 +Author: Behdad Esfahbod +Date: Fri Nov 30 04:31:29 2007 +0000 + + Undo accidental change. + + src/harfbuzz-impl.c | 2 -- + 1 file changed, 2 deletions(-) + +commit 3f05da638c8d7b13e7f860aeda1a6321e5ebd92e +Author: Behdad Esfahbod +Date: Fri Nov 30 04:29:58 2007 +0000 + + Bug 485536 – underline_position can be zero + + 2007-11-29 Behdad Esfahbod + + Bug 485536 – underline_position can be zero + + * pango/pango-utils.c (pango_cairo_quantize_line_geometry): + Document that returned position may be zero. + + * pango/pangocairo-win32font.c + (pango_cairo_win32_font_create_metrics_for_context): + * pango/pangofc-font.c (get_face_metrics): + Handle case of underline_position==0 after rounding. + + src/harfbuzz-impl.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit e58278fedb67cbaac4bf4d6dfc33209cb22eec08 +Author: Behdad Esfahbod +Date: Sat Nov 24 01:40:13 2007 +0000 + + Remove unused macro. + + 2007-11-23 Behdad Esfahbod + + * pango/opentype/harfbuzz-impl.c: Remove unused macro. + + src/harfbuzz-impl.c | 18 ------------------ + 1 file changed, 18 deletions(-) + +commit 3b047380aec4ccc707c4579327d54172c19820fd +Author: Behdad Esfahbod +Date: Sun Nov 18 22:34:08 2007 +0000 + + Minor + + src/harfbuzz-dump-main.c | 4 +-- + src/harfbuzz-stream.c | 89 ++++++++++++++++++++++++------------------------ + 2 files changed, 46 insertions(+), 47 deletions(-) + +commit 10d6a25a26bdbab4ece4edf0e34ffd3d22410ebe +Author: Behdad Esfahbod +Date: Wed Nov 7 10:04:11 2007 +0000 + + Remove dead code. + + src/harfbuzz-gdef.c | 88 ----------------------------------------------------- + src/harfbuzz-gpos.h | 4 +-- + 2 files changed, 1 insertion(+), 91 deletions(-) + +commit 47d2c33e3d099fae79e199367de5011bc5c12273 +Author: Behdad Esfahbod +Date: Wed Nov 7 09:59:18 2007 +0000 + + And some more. + + 2007-11-07 Behdad Esfahbod + + * pango/opentype/*: And some more. + + src/harfbuzz-buffer.h | 8 ++--- + src/harfbuzz-dump-main.c | 22 ++++++------ + src/harfbuzz-gdef.c | 14 ++++---- + src/harfbuzz-gdef.h | 4 +-- + src/harfbuzz-global.h | 21 +++++------ + src/harfbuzz-gpos.c | 82 +++++++++++++++++++++---------------------- + src/harfbuzz-gpos.h | 12 +++---- + src/harfbuzz-gsub.c | 4 +-- + src/harfbuzz-gsub.h | 4 +-- + src/harfbuzz-stream-private.h | 4 +-- + src/harfbuzz-stream.c | 16 ++++----- + 11 files changed, 95 insertions(+), 96 deletions(-) + +commit 78ef65ba08967fe1b5f97bcb27074bd635f4b898 +Author: Behdad Esfahbod +Date: Wed Nov 7 08:06:01 2007 +0000 + + Some more cleanup and merging. + + 2007-11-07 Behdad Esfahbod + + * pango/opentype/*: Some more cleanup and merging. + + src/Makefile.am | 6 +- + src/harfbuzz-buffer-private.h | 33 ++++++ + src/harfbuzz-buffer.c | 4 +- + src/harfbuzz-dump-main.c | 3 +- + src/harfbuzz-gdef-private.h | 9 +- + src/harfbuzz-gdef.c | 39 +++++++ + src/harfbuzz-global.h | 2 + + src/harfbuzz-gpos-private.h | 1 + + src/harfbuzz-gpos.c | 32 +----- + src/harfbuzz-gsub-private.h | 1 + + src/harfbuzz-gsub.c | 33 +----- + src/harfbuzz-impl.c | 216 ++------------------------------------ + src/harfbuzz-impl.h | 100 +----------------- + src/harfbuzz-open-private.h | 4 +- + src/harfbuzz-stream-private.h | 70 +++++++++++++ + src/harfbuzz-stream.c | 234 ++++++++++++++++++++++++++++++++++++++++++ + src/harfbuzz.c | 1 + + src/harfbuzz.h | 3 +- + 18 files changed, 419 insertions(+), 372 deletions(-) + +commit 5c9bd379950d914982bdb91d0f82b8036908db37 +Author: Behdad Esfahbod +Date: Mon Oct 29 23:51:48 2007 +0000 + + Fix typo. + + src/Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit ef1f481752fa6e478f649e826c96927c98f21981 +Author: Behdad Esfahbod +Date: Thu Oct 25 23:37:11 2007 +0000 + + Even more cleanup and more type renames. + + 2007-10-25 Behdad Esfahbod + + * pango/opentype/*: Even more cleanup and more type renames. + + src/harfbuzz-buffer.h | 3 +-- + src/harfbuzz-global.h | 6 ++++++ + src/harfbuzz-impl.c | 16 ++++++++-------- + src/harfbuzz-impl.h | 22 +++++++++++----------- + src/harfbuzz-open.h | 3 --- + 5 files changed, 26 insertions(+), 24 deletions(-) + +commit 282c60a0eea0db784b0a094958bec35b5f3dc399 +Author: Behdad Esfahbod +Date: Thu Oct 25 23:22:17 2007 +0000 + + More cleanup, remove redundant error types. + + 2007-10-25 Behdad Esfahbod + + * pango/opentype/*: More cleanup, remove redundant error types. + + src/harfbuzz-dump-main.c | 4 +- + src/harfbuzz-dump.c | 14 +++--- + src/harfbuzz-gdef.c | 25 +++++----- + src/harfbuzz-gdef.h | 3 -- + src/harfbuzz-global.h | 31 ++++++------ + src/harfbuzz-gpos.c | 124 +++++++++++++++++++++++------------------------ + src/harfbuzz-gpos.h | 3 -- + src/harfbuzz-gsub.c | 86 ++++++++++++++++---------------- + src/harfbuzz-gsub.h | 3 -- + src/harfbuzz-impl.c | 18 +++---- + src/harfbuzz-impl.h | 2 + + src/harfbuzz-open.c | 24 ++++----- + src/harfbuzz-open.h | 6 +-- + 13 files changed, 170 insertions(+), 173 deletions(-) + +commit 4280ec4df45ae86c10c3cd24ddb9c05e47223d39 +Author: Behdad Esfahbod +Date: Thu Oct 25 00:23:46 2007 +0000 + + Rename ftglue.c to harfbuzz-impl.c and more type renames and moving code + + 2007-10-24 Behdad Esfahbod + + * pango/opentype/*: Rename ftglue.c to harfbuzz-impl.c and more + type renames and moving code around. + + src/Makefile.am | 3 +- + src/ftglue.h | 151 -------------------------------------- + src/harfbuzz-dump-main.c | 48 ++---------- + src/harfbuzz-dump.c | 30 ++++---- + src/harfbuzz-gdef.c | 18 ++--- + src/harfbuzz-global.h | 18 +++++ + src/harfbuzz-gpos-private.h | 2 +- + src/harfbuzz-gpos.c | 90 +++++++++++------------ + src/harfbuzz-gsub-private.h | 2 +- + src/harfbuzz-gsub.c | 64 ++++++++-------- + src/{ftglue.c => harfbuzz-impl.c} | 64 ++++++++-------- + src/harfbuzz-impl.h | 114 ++++++++++++++++++++++++++-- + src/harfbuzz-open-private.h | 14 ++-- + src/harfbuzz-open.c | 32 ++++---- + src/harfbuzz-open.h | 16 ---- + src/harfbuzz.c | 4 +- + 16 files changed, 289 insertions(+), 381 deletions(-) + +commit 5716ae278a82d318ddbfeba01d0785d4efbe1454 +Author: Behdad Esfahbod +Date: Wed Oct 24 22:44:47 2007 +0000 + + New header file harfbuzz-global.h. Rename FT_* int types to HB_* types. + + 2007-10-24 Behdad Esfahbod + + * pango/opentype/*: New header file harfbuzz-global.h. Rename + FT_* int types to HB_* types. + + src/Makefile.am | 1 + + src/ftglue.c | 30 +-- + src/ftglue.h | 26 +- + src/harfbuzz-buffer-private.h | 26 +- + src/harfbuzz-buffer.c | 40 ++-- + src/harfbuzz-buffer.h | 42 ++-- + src/harfbuzz-dump-main.c | 24 +- + src/harfbuzz-dump.c | 14 +- + src/harfbuzz-dump.h | 4 +- + src/harfbuzz-gdef-private.h | 30 +-- + src/harfbuzz-gdef.c | 104 ++++---- + src/harfbuzz-gdef.h | 32 +-- + src/harfbuzz-global.h | 34 +++ + src/harfbuzz-gpos-private.h | 182 +++++++------- + src/harfbuzz-gpos.c | 540 +++++++++++++++++++++--------------------- + src/harfbuzz-gpos.h | 52 ++-- + src/harfbuzz-gsub-private.h | 142 +++++------ + src/harfbuzz-gsub.c | 432 ++++++++++++++++----------------- + src/harfbuzz-gsub.h | 50 ++-- + src/harfbuzz-impl.h | 6 +- + src/harfbuzz-open-private.h | 26 +- + src/harfbuzz-open.c | 146 ++++++------ + src/harfbuzz-open.h | 88 +++---- + src/harfbuzz.h | 1 + + 24 files changed, 1056 insertions(+), 1016 deletions(-) + +commit 2130d852c76cccb94350a4aea222359640ffa8a4 +Author: Behdad Esfahbod +Date: Wed Oct 24 21:35:03 2007 +0000 + + Add commented-out dummy struct for Extension lookups. + + 2007-10-24 Behdad Esfahbod + + * pango/opentype/harfbuzz-gpos-private.h: + * pango/opentype/harfbuzz-gsub-private.h: + Add commented-out dummy struct for Extension lookups. + + src/harfbuzz-gpos-private.h | 13 +++++++++++++ + src/harfbuzz-gsub-private.h | 13 +++++++++++++ + 2 files changed, 26 insertions(+) + +commit 13b2b963848ada169c2fe3d3669fbc1c337f7fe7 +Author: Behdad Esfahbod +Date: Sun Oct 21 18:17:02 2007 +0000 + + Bug 488840 – harfbuzz: protect against ligid overflow + + 2007-10-21 Behdad Esfahbod + + Bug 488840 – harfbuzz: protect against ligid overflow + + * pango/opentype/harfbuzz-buffer.c (_hb_buffer_allocate_ligid): + Never return zero, even in case of overflow. + + * pango/opentype/harfbuzz-impl.h: Define dummy HB_LIKELY() and + HB_UNLIKELY(), to be filled later. + + src/harfbuzz-buffer.c | 6 +++++- + src/harfbuzz-impl.h | 3 +++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit 6b347138b597c41af24453f630336ba2fc033dc5 +Author: Behdad Esfahbod +Date: Thu Oct 11 08:30:50 2007 +0000 + + Mark internal symbols as HB_INTERNAL and define that to static in + + 2007-10-11 Behdad Esfahbod + + * pango/opentype/*: Mark internal symbols as HB_INTERNAL and + define that to static in harfbuzz.c. + + * pango/opentype/harfbuzz-buffer-internal.h: New file. + + src/Makefile.am | 1 + + src/ftglue.c | 18 +++---- + src/ftglue.h | 20 ++++---- + src/harfbuzz-buffer-private.h | 60 +++++++++++++++++++++++ + src/harfbuzz-buffer.c | 108 +++++++++++++++++++++------------------- + src/harfbuzz-buffer.h | 38 +-------------- + src/harfbuzz-gdef-private.h | 17 ++++--- + src/harfbuzz-gdef.c | 20 ++++---- + src/harfbuzz-gpos-private.h | 13 +++-- + src/harfbuzz-gpos.c | 16 +++--- + src/harfbuzz-gsub-private.h | 14 +++--- + src/harfbuzz-gsub.c | 20 ++++---- + src/harfbuzz-impl.h | 12 +++-- + src/harfbuzz-open-private.h | 81 +++++++++++++++++------------- + src/harfbuzz-open.c | 111 ++++++++++++++++++++++++------------------ + src/harfbuzz.c | 1 + + 16 files changed, 315 insertions(+), 235 deletions(-) + +commit 7cdfb61deefd8f43edb5eb79d45d38dbbbef9051 +Author: Behdad Esfahbod +Date: Thu Oct 11 07:46:33 2007 +0000 + + Remove FTGLUE_API/APIDEF cruft. + + 2007-10-11 Behdad Esfahbod + + * pango/opentype/ftglue.[ch]: Remove FTGLUE_API/APIDEF cruft. + + src/ftglue.c | 16 ++++++++-------- + src/ftglue.h | 24 ++++++++---------------- + 2 files changed, 16 insertions(+), 24 deletions(-) + +commit 61ddbafaaad31ccacde54cad7e60a84abffc0a9f +Author: Behdad Esfahbod +Date: Thu Oct 11 07:45:26 2007 +0000 + + Build harfbuzz.c instead of individual source files, to let compiler go + + 2007-10-11 Behdad Esfahbod + + * pango/opentype/Makefile.am: Build harfbuzz.c instead of individual + source files, to let compiler go wild with optimizations! + + src/Makefile.am | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit a219b3d003d6727c79dc51282d21e9ac48c44458 +Author: Behdad Esfahbod +Date: Thu Oct 11 07:34:08 2007 +0000 + + Same here. + + 2007-10-11 Behdad Esfahbod + + * pango/opentype/harfbuzz.c: Same here. + + src/harfbuzz.c | 1 - + 1 file changed, 1 deletion(-) + +commit 6567e16e3b14c08659342bbcc9f2735e71f9114e +Author: Behdad Esfahbod +Date: Thu Oct 11 07:33:19 2007 +0000 + + Don't include harfbuzz-dump.[ch] in libharfbuzz.a. Those are just used by + + 2007-10-11 Behdad Esfahbod + + * pango/opentype/Makefile.am: Don't include harfbuzz-dump.[ch] in + libharfbuzz.a. Those are just used by the harfbuzz-dump tool. + + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0b032549ba7581c879a0fc4e794b0e9a4723ae85 +Author: Behdad Esfahbod +Date: Thu Oct 11 07:24:47 2007 +0000 + + Some more cleanup. + + 2007-10-11 Behdad Esfahbod + + * pango/opentype/harfbuzz-buffer.c: Some more cleanup. + + src/harfbuzz-buffer.c | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +commit 7a26864308bd1ca8d5f47d798411cac7239b7d38 +Author: Behdad Esfahbod +Date: Thu Oct 11 07:21:31 2007 +0000 + + Move some code around. + + 2007-10-11 Behdad Esfahbod + + * pango/opentype/harfbuzz-buffer.c: Move some code around. + + src/harfbuzz-buffer.c | 91 +++++++++++++++++++++++++++------------------------ + 1 file changed, 48 insertions(+), 43 deletions(-) + +commit 7a5405c8261573a0f29d28fb533e800d698f6129 +Author: Behdad Esfahbod +Date: Thu Oct 11 07:15:16 2007 +0000 + + Minor. + + src/harfbuzz-buffer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 986f4fd96892ebda550793941bb1daed862c4a34 +Author: Behdad Esfahbod +Date: Thu Oct 11 07:12:49 2007 +0000 + + Rename buffer->inplace to buffer->separate_out with the inverted meaning, + + 2007-10-11 Behdad Esfahbod + + * pango/opentype/harfbuzz-buffer.[ch]: Rename buffer->inplace to + buffer->separate_out with the inverted meaning, such that buffer + is initialization is memset(0). + + src/harfbuzz-buffer.c | 34 +++++++++++++++++----------------- + src/harfbuzz-buffer.h | 2 +- + 2 files changed, 18 insertions(+), 18 deletions(-) + +commit 06003908ccf2473366816935dd1b144cde587be9 +Author: Behdad Esfahbod +Date: Thu Oct 11 07:05:09 2007 +0000 + + Allocate buffer->positions lazily. + + 2007-10-11 Behdad Esfahbod + + * pango/opentype/*: Allocate buffer->positions lazily. + + src/harfbuzz-buffer.c | 25 +++++++++++++++++++++++-- + src/harfbuzz-buffer.h | 3 +++ + src/harfbuzz-gpos.c | 13 ++++++++----- + src/harfbuzz-gsub.c | 5 +++-- + 4 files changed, 37 insertions(+), 9 deletions(-) + +commit fc3d6f575826704a0ae9ee9018323f6a3c422f4b +Author: Behdad Esfahbod +Date: Thu Oct 11 06:52:07 2007 +0000 + + Bug 485621 – Get rid of freetype memory allocator in harfbuzz + + 2007-10-11 Behdad Esfahbod + + Bug 485621 – Get rid of freetype memory allocator in harfbuzz + + * pango/opentype/*: Remove all occurences of FT_Memory. Use + malloc/realloc/free directly. + + * pango/pango-ot*: Update to above. + + src/ftglue.c | 52 ++--- + src/ftglue.h | 28 ++- + src/harfbuzz-buffer.c | 16 +- + src/harfbuzz-buffer.h | 4 +- + src/harfbuzz-gdef.c | 106 ++++------ + src/harfbuzz-gdef.h | 6 +- + src/harfbuzz-gpos-private.h | 1 - + src/harfbuzz-gpos.c | 462 ++++++++++++++++++-------------------------- + src/harfbuzz-gpos.h | 2 - + src/harfbuzz-gsub-private.h | 1 - + src/harfbuzz-gsub.c | 312 +++++++++++------------------- + src/harfbuzz-gsub.h | 2 - + src/harfbuzz-open-private.h | 25 ++- + src/harfbuzz-open.c | 127 ++++++------ + 14 files changed, 441 insertions(+), 703 deletions(-) + +commit a8abb8b994c3cd89808e8f7128a0c04b23eb3ede +Author: Behdad Esfahbod +Date: Thu Oct 11 00:07:58 2007 +0000 + + Bug 485559 – Boston Summit HarfBuzz optimizations + + 2007-10-10 Behdad Esfahbod + + Bug 485559 – Boston Summit HarfBuzz optimizations + + * pango/opentype/*: HarfBuzz hacking to: + + - Rename last remaining FT_Err stuff to HB_Err. + + - Fix a couple invalid table paths to be permissive so + fonts work better. Particularly GDEF table for Nafees + Nastaliq is loaded and works great now. + + - Optimize harfbuzz buffer to not copy/swap for simple + one-to-one and "copy" GSUB operations. + + * pango/pango-ot*: Update to FT_Err to HB_Err renaming. + + src/ftglue.c | 51 ++- + src/ftglue.h | 21 +- + src/harfbuzz-buffer.c | 190 +++++++-- + src/harfbuzz-buffer.h | 26 +- + src/harfbuzz-dump-main.c | 14 +- + src/harfbuzz-dump.c | 15 +- + src/harfbuzz-gdef-private.h | 4 +- + src/harfbuzz-gdef.c | 149 +++---- + src/harfbuzz-gdef.h | 10 +- + src/harfbuzz-gpos-private.h | 2 +- + src/harfbuzz-gpos.c | 810 ++++++++++++++++++-------------------- + src/harfbuzz-gpos.h | 30 +- + src/harfbuzz-gsub-private.h | 2 +- + src/harfbuzz-gsub.c | 919 +++++++++++++++++++------------------------- + src/harfbuzz-gsub.h | 24 +- + src/harfbuzz-impl.h | 22 +- + src/harfbuzz-open-private.h | 20 +- + src/harfbuzz-open.c | 238 ++++++------ + src/harfbuzz-open.h | 13 +- + 19 files changed, 1253 insertions(+), 1307 deletions(-) + +commit dd810b76bc554278d3a226cf89901d16992cf56d +Author: Behdad Esfahbod +Date: Wed Aug 29 08:46:50 2007 +0000 + + Bug 302952 – The placement of a diacritic marks for an arabic ligature + + 2007-08-29 Behdad Esfahbod + + Bug 302952 – The placement of a diacritic marks for an arabic ligature + is not correct + + * pango/opentype/harfbuzz-buffer.c (hb_buffer_allocate_ligid): Don't + use zero as allocated ligature id. Zero means no ligature id. + + src/harfbuzz-buffer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e90d19919434b90d79e67aaf199bddd991f8e5d8 +Author: Behdad Esfahbod +Date: Tue Aug 21 08:03:26 2007 +0000 + + Bug 463430 – Gets stuck while "formatting message" + + 2007-08-21 Behdad Esfahbod + + Bug 463430 – Gets stuck while "formatting message" + + * pango/opentype/harfbuzz-gpos.c (Lookup_PairPos1), + (Lookup_PairPos2), (Lookup_PairPos), (Do_ContextPos): + * pango/opentype/harfbuzz-gsub.c (Do_ContextSubst): + Change type of intermediate index variable from FT_UShort to + FT_ULong as it was overlowing with more than 65536 glyphs. + + src/harfbuzz-gpos.c | 15 ++++++++++----- + src/harfbuzz-gsub.c | 2 +- + 2 files changed, 11 insertions(+), 6 deletions(-) + +commit 13b86ee398905f96f57df001309312f6dfdfea9a +Author: Behdad Esfahbod +Date: Tue Aug 21 01:38:07 2007 +0000 + + Don't ignore error return value of hb_buffer_copy_output_glyph(). Patch + + 2007-08-20 Behdad Esfahbod + + * pango/opentype/harfbuzz-gsub.c (GSUB_Do_String_Lookup): Don't + ignore error return value of hb_buffer_copy_output_glyph(). Patch + sent to harfbuzz-list. + + src/harfbuzz-gsub.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4c2556cb4c38a56c3a5087deb54aa6262ab3aff9 +Author: Behdad Esfahbod +Date: Fri Jul 6 11:29:21 2007 -0400 + + [gdef] Initial implementation + + src/harfbuzz-gdef-private.h | 144 +++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 142 insertions(+), 2 deletions(-) + +commit 5b2e947fd2b7c5ea49b2bef1e0190d99a525058c +Author: Behdad Esfahbod +Date: Fri Jul 6 02:03:26 2007 -0400 + + [open] small fixes, including not using unions for main structs + + src/harfbuzz-open-private.h | 54 ++++++++++++++++++++++++--------------------- + 1 file changed, 29 insertions(+), 25 deletions(-) + +commit 151df44346990728b5dd249db5740a9543ae33b9 +Author: Behdad Esfahbod +Date: Thu Jul 5 17:22:07 2007 -0400 + + Improve stupid Makefile + + src/Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +commit 6c49bebc70a0118a803a5bc979f4436a82b48240 +Author: Behdad Esfahbod +Date: Tue May 1 02:32:12 2007 +0000 + + Link freetype to harfbuzz-dump, for those systems that don't track + + 2007-04-30 Behdad Esfahbod + + * pango/opentype/Makefile.am: Link freetype to harfbuzz-dump, for + those systems that don't track dependencies automatically. + + src/Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 7341a116916c8470f1211f0cb3c65b189b42ec9e +Author: Behdad Esfahbod +Date: Tue Apr 3 22:45:29 2007 +0000 + + Copy fixes from harfbuzz stable branch. Includes a leak fix, a kerning + + 2007-04-03 Behdad Esfahbod + + * pango/opentype/harfbuzz-gdef.c (_HB_GDEF_Check_Property): + * pango/opentype/harfbuzz-gpos.c (HB_Done_GPOS_Table), + (Lookup_PairPos): + * pango/opentype/harfbuzz-open.c (Get_Class1): + Copy fixes from harfbuzz stable branch. Includes a leak fix, + a kerning fix, and an array out-of-bound access fix. + + src/harfbuzz-gdef.c | 2 ++ + src/harfbuzz-gpos.c | 8 ++++++++ + src/harfbuzz-open.c | 2 +- + 3 files changed, 11 insertions(+), 1 deletion(-) + +commit 999a6f05758c10a902354457ecbf6c943bfed514 +Author: Hans Breuer +Date: Sat Jan 13 21:31:41 2007 +0000 + + updated + + 2007-01-13 Hans Breuer + + * pango/makefile.msc pango/opentype/makefile.msc : updated + + src/makefile.msc | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +commit 3c038d40da4bfe5037cc4e9de22bad08fa408465 +Author: Behdad Esfahbod +Date: Tue Jan 9 03:32:12 2007 +0000 + + Remove .cvsignore files (moved to svn:ignore prop) + + src/.cvsignore | 7 ------- + 1 file changed, 7 deletions(-) + +commit 5b3f7702a64fe0513d08a67bdb72704e46fd7cd4 +Author: Behdad Esfahbod +Date: Thu Dec 28 06:42:37 2006 -0500 + + Add stub GDEF files + + src/harfbuzz-gdef-private.h | 8 ++++++++ + src/harfbuzz-gdef.h | 11 +++++++++++ + src/harfbuzz-open-private.h | 3 +-- + src/harfbuzz-private.h | 6 ++++++ + src/main.cc | 1 + + 5 files changed, 27 insertions(+), 2 deletions(-) + +commit b3395a7aa36ff1ba5a17f494fbf359ec317a7e69 +Author: Behdad Esfahbod +Date: Thu Dec 28 06:31:18 2006 -0500 + + Don't shift down the mark attachment type + + src/harfbuzz-open-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 193b66d52ae2cb5ced7969e15b7f56dc1978ca8a +Author: Behdad Esfahbod +Date: Thu Dec 28 06:12:18 2006 -0500 + + Remove stale comment + + src/harfbuzz-open-private.h | 10 ---------- + 1 file changed, 10 deletions(-) + +commit 12c4568c680ea2b9b98a16a8b7402ca185c90ef6 +Author: Behdad Esfahbod +Date: Thu Dec 28 06:10:59 2006 -0500 + + Break and rename, in the layout of old HarfBuzz codebase + + src/.gitignore | 1 + + src/Makefile | 2 +- + src/harfbuzz-common.h | 14 +++ + src/{harfbuzz-ng.cc => harfbuzz-open-private.h} | 117 ++---------------------- + src/harfbuzz-open.h | 13 +++ + src/main.cc | 98 ++++++++++++++++++++ + 6 files changed, 133 insertions(+), 112 deletions(-) + +commit 3158d84b0dfe5032e7c56c03f2da97b8ab549d94 +Author: Behdad Esfahbod +Date: Wed Dec 27 20:08:07 2006 -0500 + + Oops. s/OpenTypeFontFaceFile/OpenTypeFontFile/g + + src/harfbuzz-ng.cc | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit bf0f9dd61375c5afce8e6b1664d0df5f6c8b2494 +Author: Behdad Esfahbod +Date: Wed Dec 27 20:06:42 2006 -0500 + + Use union for ClassDef + + src/harfbuzz-ng.cc | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit c46196d09c4ea879bf45182e8a0d649d4c750c39 +Author: Behdad Esfahbod +Date: Wed Dec 27 20:05:16 2006 -0500 + + Use union for Coverage + + src/harfbuzz-ng.cc | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) + +commit 86f450243dbaa82f187cf2d36364e9a59c0e64c7 +Author: Behdad Esfahbod +Date: Wed Dec 27 19:59:07 2006 -0500 + + Add GPOS stub + + src/harfbuzz-ng.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 133466177e104ddcd2501a88735670540252167c +Author: Behdad Esfahbod +Date: Wed Dec 27 19:58:32 2006 -0500 + + s/OpenTypeFont/OpenTypeFontFace/g + + src/harfbuzz-ng.cc | 44 +++++++++++++++++++++++--------------------- + 1 file changed, 23 insertions(+), 21 deletions(-) + +commit 71d62baab0429cdf56ba4019fd2a205f08188503 +Author: Behdad Esfahbod +Date: Wed Dec 27 01:29:24 2006 -0500 + + GSUBGPOSHeader + + src/harfbuzz-ng.cc | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 98 insertions(+), 5 deletions(-) + +commit eebabd8b2ec5296deba6b09d7755933da0a7d9dc +Author: Behdad Esfahbod +Date: Wed Dec 27 00:21:31 2006 -0500 + + Finished OpenType Common Table Formats + + src/harfbuzz-ng.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2b7374519766825971f9f4ff5b1cb49b74cfcaf8 +Author: Behdad Esfahbod +Date: Tue Dec 26 20:55:37 2006 -0500 + + Device tables. + + src/harfbuzz-ng.cc | 49 +++++++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 45 insertions(+), 4 deletions(-) + +commit eb32e374f4d6de8d428d36144f6eef93514820d2 +Author: Behdad Esfahbod +Date: Tue Dec 26 20:00:33 2006 -0500 + + ClassDef + + src/harfbuzz-ng.cc | 121 ++++++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 97 insertions(+), 24 deletions(-) + +commit 53502c6723dbf9cd3b6ba91b733678b3c7871715 +Author: Behdad Esfahbod +Date: Tue Dec 26 19:29:08 2006 -0500 + + Rename CoverageFormat to Coverage + + src/harfbuzz-ng.cc | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +commit 0d6db2abcbe98456569ccf7934ba0a8b37c7f6f3 +Author: Behdad Esfahbod +Date: Tue Dec 26 18:53:55 2006 -0500 + + Define more structs using DEFINE_INT_TYPE. + + src/harfbuzz-ng.cc | 39 +++++++++++++++++++-------------------- + 1 file changed, 19 insertions(+), 20 deletions(-) + +commit 915931b74a30e8652fac5fec153d499485513f63 +Author: Behdad Esfahbod +Date: Tue Dec 26 15:30:14 2006 -0500 + + s/DEFINE_NOT_INSTANTIABLE/DEFINE_NON_INSTANTIABLE/ + + src/harfbuzz-ng.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 0c0d55330ef4090f3e4864538e83a4344caaf3ba +Author: Behdad Esfahbod +Date: Tue Dec 26 15:29:38 2006 -0500 + + Coverage. + + src/harfbuzz-ng.cc | 91 +++++++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 79 insertions(+), 12 deletions(-) + +commit 882e52f59196535495af8ca8069df32308ad52cf +Author: Behdad Esfahbod +Date: Mon Dec 25 10:28:31 2006 -0500 + + Rename to harfbuzz-ng.cc + + src/Makefile | 2 +- + src/{hb-types-private.cc => harfbuzz-ng.cc} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit f8ba99f6f322800a915428ffc3b5eaf1be2e6c21 +Author: Behdad Esfahbod +Date: Mon Dec 25 09:58:02 2006 -0500 + + LookupFlags + + src/hb-types-private.cc | 52 ++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 47 insertions(+), 5 deletions(-) + +commit 25ad92c8a68bf72464601a644ed57b9213126a78 +Author: Behdad Esfahbod +Date: Mon Dec 25 09:35:06 2006 -0500 + + Implement Feature + + src/hb-types-private.cc | 46 ++++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 42 insertions(+), 4 deletions(-) + +commit befc022affd2386b3f46cd7d11e4262f6c8bce9f +Author: Behdad Esfahbod +Date: Mon Dec 25 09:14:52 2006 -0500 + + LangSys + + src/hb-types-private.cc | 51 ++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 44 insertions(+), 7 deletions(-) + +commit c81efca149b08832d5d96a944fb5f303f3d0ca42 +Author: Behdad Esfahbod +Date: Mon Dec 25 06:22:08 2006 -0500 + + Use CamelCaseTags. + + src/hb-types-private.cc | 29 ++++++++++++++--------------- + 1 file changed, 14 insertions(+), 15 deletions(-) + +commit 808dbe283c1ad66091f2cb67380888b7cf265c01 +Author: Behdad Esfahbod +Date: Mon Dec 25 06:18:52 2006 -0500 + + Make types not instantiable + + src/hb-types-private.cc | 104 ++++++++++++++++++++++++++---------------------- + 1 file changed, 57 insertions(+), 47 deletions(-) + +commit b739c05ca4b7acfa45bd4b0812ecbb3747f726f0 +Author: Behdad Esfahbod +Date: Mon Dec 25 05:39:20 2006 -0500 + + Add OpenTypeFontFile. + + src/Makefile | 2 +- + src/hb-types-private.cc | 113 +++++++++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 107 insertions(+), 8 deletions(-) + +commit 8596944b7421f982960e825019fc0263442520cb +Author: Behdad Esfahbod +Date: Sat Dec 23 17:49:25 2006 -0500 + + Add Makefile + + src/Makefile | 3 +++ + 1 file changed, 3 insertions(+) + +commit b6e62bc5db76ae342177b2b646c37f45eccad975 +Author: Behdad Esfahbod +Date: Fri Dec 22 02:21:55 2006 -0500 + + After DEFINE_SCRIPT_ARRAY + + src/hb-types-private.cc | 215 +++++++++++++++++++++++++++++++----------------- + 1 file changed, 140 insertions(+), 75 deletions(-) + +commit 01e4fcb032be601f272e62228881e2aabfb9d925 +Author: Behdad Esfahbod +Date: Thu Dec 21 22:31:31 2006 -0500 + + Remove the annoying HB_ prefix. + + src/hb-types-private.cc | 107 +++++++++++++++++++++++------------------------- + 1 file changed, 52 insertions(+), 55 deletions(-) + +commit 6b4ce01da121e12e1c78ad7eaedf469f35f3568d +Author: Behdad Esfahbod +Date: Thu Dec 21 22:31:10 2006 -0500 + + Second version. Complete redesign, based on C++ classes to ensure endian + correctness. + + src/hb-types-private.cc | 300 +++++++++++++++++++++++++++++++++--------------- + 1 file changed, 205 insertions(+), 95 deletions(-) + +commit f78e70c301311ffcfb007c7fc4125d71cbcff1e2 +Author: Behdad Esfahbod +Date: Thu Dec 21 22:30:38 2006 -0500 + + First version. + + src/hb-types-private.cc | 116 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 116 insertions(+) + +commit f726b20e56e8b1106dfde0bf8d575c73e83957c4 +Author: Behdad Esfahbod +Date: Tue Jul 25 01:02:27 2006 +0000 + + Bug 347073 – Allow empty GPOS table + + 2006-07-24 Behdad Esfahbod + + Bug 347073 – Allow empty GPOS table + + * pango/opentype/harfbuzz-open.c (_HB_OPEN_Load_ScriptList): Don't + err on empty GPOS/GSUB tables. + + src/harfbuzz-open.c | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 52481a5c55d466f41654dcdc67245d0ca8cefbcf +Author: Behdad Esfahbod +Date: Thu Jun 22 18:09:04 2006 +0000 + + Bug 345600 – cvs build error in pango/opentype/Makefile + + 2006-06-22 Behdad Esfahbod + + Bug 345600 – cvs build error in pango/opentype/Makefile + + * pango/opentype/Makefile.am: Rename variable SOURCES to MAINSOURCES. + Some automake versions seem to use it or something. + + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ffb2d5c1e7af33644d0a4058befa4b8358c9a7bf +Author: Behdad Esfahbod +Date: Wed May 31 07:42:55 2006 +0000 + + Bug 341138 – Using TTC font, Gtk2 programs begin to eating big memory + + 2006-05-31 Behdad Esfahbod + + Bug 341138 – Using TTC font, Gtk2 programs begin to eating big memory + and have many cpu usage. + Patch from Yong Li. + + * pango/opentype/ftglue.c (_hb_ftglue_face_goto_table): TrueType table + offsets are absolute, not relative. + + src/ftglue.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f8f7bd2451eeafb57f5c80c7b4e88a1e50b97c4f +Author: Behdad Esfahbod +Date: Wed May 31 07:23:02 2006 +0000 + + Bug 336153 – Mark to mark positioning (Lookup Type 6) isn't correct when + + 2006-05-31 Behdad Esfahbod + + Bug 336153 – Mark to mark positioning (Lookup Type 6) isn't correct + when using MarkAttchmentType + Patch from Tin Myo Htet. + + * pango/opentype/harfbuzz-gpos.c (Lookup_MarkMarkPos): Ignore marks + of non-matchin attachment type. + + src/harfbuzz-gpos.c | 37 ++++++++++++++++++++++--------------- + 1 file changed, 22 insertions(+), 15 deletions(-) + +commit d2a613187c1257371d62153b55c89336965e0754 +Author: Behdad Esfahbod +Date: Wed Apr 12 18:47:50 2006 +0000 + + Fix loop variables. (coverity found bug.) + + 2006-04-12 Behdad Esfahbod + + * pango/opentype/harfbuzz-gpos.c: Fix loop variables. (coverity + found bug.) + + src/harfbuzz-gpos.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 14022e826f63c48b689f9037645c9a3a3302d9b6 +Author: Behdad Esfahbod +Date: Tue Apr 11 08:31:44 2006 +0000 + + Bug 337924 – cleanups for issues reported by various compilers Patch + + 2006-04-11 Behdad Esfahbod + + Bug 337924 – cleanups for issues reported by various compilers + Patch from Kjartan Maraas. + + * examples/viewer-x.c (update): + * modules/arabic/arabic-fc.c (fallback_shape), + (arabic_engine_shape): + * modules/basic/basic-fc.c (fallback_shape), (basic_engine_shape): + * modules/basic/basic-x.c: + * modules/hangul/hangul-fc.c: + * modules/hebrew/hebrew-fc.c (hebrew_engine_shape): + * modules/indic/indic-fc.c: + * modules/khmer/khmer-fc.c: + * modules/syriac/syriac-fc.c: + * modules/thai/thai-fc.c: + * modules/tibetan/tibetan-fc.c: + * pango/break.c: + * pango/modules.c: + * pango/opentype/ftglue.c (_hb_ftglue_face_goto_table): + * pango/pango-attributes.c (pango_attr_list_filter): + * pango/pango-engine.c: + * pango/pango-fontset.c: + * pango/pango-layout.c (pango_layout_set_text), + (pango_layout_xy_to_index), (pango_layout_get_cursor_pos): + * pango/pango-markup.c (text_handler): + * pango/pango-utils.c (read_alias_file): + * pango/pangocairo-fcfont.c (G_DEFINE_TYPE_WITH_CODE): + * pango/pangocairo-fcfontmap.c (G_DEFINE_TYPE_WITH_CODE): + * pango/pangocairo-font.c (_pango_cairo_font_get_hex_box_info): + * pango/pangox-fontmap.c (pango_x_make_matching_xlfd): + * tests/dump-boundaries.c (fail): + Remove unused variables. Remove excess semicolon after DEFINE_TYPE + macros. + + src/ftglue.c | 2 -- + 1 file changed, 2 deletions(-) + +commit 59aafd07806a2f0d4f399eff13aec74557f60522 +Author: Behdad Esfahbod +Date: Mon Apr 10 10:33:17 2006 +0000 + + Fix minor bugs reported by the Coverity scan report. + + 2006-04-10 Behdad Esfahbod + + Fix minor bugs reported by the Coverity scan report. + + * pango/opentype/harfbuzz-gdef.c (HB_GDEF_Build_ClassDefinition): + * pango/opentype/harfbuzz-gpos.c (HB_GPOS_Query_Scripts), + (HB_GPOS_Query_Languages), (HB_GPOS_Query_Features): Do not access + structs before we check them for nullity. + + * pango/pango-layout.c (pango_layout_index_to_line), + (pango_layout_index_to_line_and_extents), + (pango_layout_index_to_pos): Check for invalid iterators outside the + loop, so we don't crash. + + * pango/pango-layout.c (pango_layout_line_x_to_index): Set + char_trailing instead of trailing in one of too many paths. Should + have been a typo. + + * pango/pangox.c (get_font_metrics_from_subfonts): Check for nullity + somewhere. + + src/harfbuzz-gdef.c | 3 ++- + src/harfbuzz-gpos.c | 9 ++++++--- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit b31d6def96ff99e89ba42e09661992498bda460d +Author: Behdad Esfahbod +Date: Thu Apr 6 18:23:49 2006 +0000 + + Update from HarfBuzz. Lars Knoll fixed all the warnings. + + 2006-04-06 Behdad Esfahbod + + * pango/opentype: Update from HarfBuzz. Lars Knoll fixed all the + warnings. + + src/harfbuzz-dump.c | 94 ++++++++++++++++++++++++++++--------------- + src/harfbuzz-gpos.c | 80 ++++++++++++++++++++++-------------- + src/harfbuzz-gsub.c | 114 +++++++++++++++++++++++++++++----------------------- + src/harfbuzz-impl.h | 4 ++ + 4 files changed, 179 insertions(+), 113 deletions(-) + +commit ca57250bc9d9f92c88a2ea516e251b9cbfdebda0 +Author: Behdad Esfahbod +Date: Mon Apr 3 20:13:17 2006 +0000 + + Make sure TTAG_GDEF and frineds are defined, needed for FreeType <= 2.1.7 + + 2006-04-03 Behdad Esfahbod + + * pango/opentype/harfbuzz-impl.h: Make sure TTAG_GDEF and frineds are + defined, needed for FreeType <= 2.1.7 (pointed by Tim Janik). + + src/harfbuzz-gdef.c | 3 --- + src/harfbuzz-gpos.c | 3 --- + src/harfbuzz-gsub.c | 3 --- + src/harfbuzz-impl.h | 11 +++++++++++ + 4 files changed, 11 insertions(+), 9 deletions(-) + +commit f618288e00914b6606ec977d506c18e4abdd3ce4 +Author: Behdad Esfahbod +Date: Fri Mar 31 13:19:29 2006 +0000 + + . + + src/.cvsignore | 2 -- + 1 file changed, 2 deletions(-) + +commit 5f1f943b9e6d753722ceadba7eb7ce1f14526ea5 +Author: Behdad Esfahbod +Date: Fri Mar 31 13:18:23 2006 +0000 + + . + + src/.cvsignore | 1 + + 1 file changed, 1 insertion(+) + +commit bce3e0b0d4ee521767d80c5c21704337bf5ac716 +Author: Behdad Esfahbod +Date: Fri Mar 31 12:45:40 2006 +0000 + + Define NULL. + + src/harfbuzz-impl.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 9f8da38cd108590514b71756b752d98952a9221f +Author: Behdad Esfahbod +Date: Fri Mar 31 12:28:09 2006 +0000 + + Convert pango/opentype to the new project called HarfBuzz. + + 2006-03-31 Behdad Esfahbod + + Convert pango/opentype to the new project called HarfBuzz. + + * pango/opentype/*: Restructured. + + * pango/pango-ot-*: Updated to use HarfBuzz symbol names. + + src/COPYING | 15 + + src/{FTL.TXT => COPYING.FTL} | 0 + src/COPYING.GPL | 340 ++ + src/FT-license.txt | 28 - + src/Makefile.am | 89 +- + src/README | 44 +- + src/ftglue.c | 88 +- + src/ftglue.h | 68 +- + src/ftxgdef.c | 1225 ------- + src/ftxgdef.h | 224 -- + src/ftxgpos.c | 6199 ------------------------------- + src/ftxgpos.h | 838 ----- + src/ftxgsub.c | 4533 ----------------------- + src/ftxgsub.h | 594 --- + src/ftxopen.c | 1552 -------- + src/ftxopen.h | 317 -- + src/ftxopenf.h | 166 - + src/harfbuzz-buffer.c | 227 ++ + src/harfbuzz-buffer.h | 106 + + src/{ottest.c => harfbuzz-dump-main.c} | 84 +- + src/{disasm.c => harfbuzz-dump.c} | 186 +- + src/{disasm.h => harfbuzz-dump.h} | 18 +- + src/harfbuzz-gdef-private.h | 101 + + src/harfbuzz-gdef.c | 1228 +++++++ + src/harfbuzz-gdef.h | 127 + + src/harfbuzz-gpos-private.h | 683 ++++ + src/harfbuzz-gpos.c | 6269 ++++++++++++++++++++++++++++++++ + src/harfbuzz-gpos.h | 168 + + src/harfbuzz-gsub-private.h | 448 +++ + src/harfbuzz-gsub.c | 4581 +++++++++++++++++++++++ + src/harfbuzz-gsub.h | 132 + + src/harfbuzz-impl.h | 64 + + src/harfbuzz-open-private.h | 81 + + src/harfbuzz-open.c | 1426 ++++++++ + src/harfbuzz-open.h | 285 ++ + src/harfbuzz.c | 19 + + src/harfbuzz.h | 23 + + src/otlbuffer.c | 238 -- + src/otlbuffer.h | 103 - + 39 files changed, 16582 insertions(+), 16335 deletions(-) + +commit dd2a8d4d490df1d310e7553ba6c7c8de661f28a1 +Author: Behdad Esfahbod +Date: Sat Mar 25 23:52:30 2006 +0000 + + Don't err on Table_Missing. + + 2006-03-25 Behdad Esfahbod + + * pango/opentype/ottest.c: Don't err on Table_Missing. + + src/ottest.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 434833b1b7b01d85a143f9ad4b04e7044dd72567 +Author: Behdad Esfahbod +Date: Mon Mar 13 05:06:05 2006 +0000 + + === Released 1.12.0 === + + 2006-03-13 Behdad Esfahbod + + * === Released 1.12.0 === + + * configure.in: Version 1.12.0 + + * NEWS, README: Updated. + + src/README | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8228828e1e4c8dd6f9435fb718ad4394bba95655 +Author: Behdad Esfahbod +Date: Mon Jan 30 22:37:48 2006 +0000 + + Handle GSUB Lookup type 8, and ReverseChainContextualSubst table. (bug + + 2006-01-30 Behdad Esfahbod + + * pango/opentype/ftxgsub.c: Handle GSUB Lookup type 8, + and ReverseChainContextualSubst table. (bug #149696, + patch from Aamir Wali) + + src/ftxgsub.c | 545 ++++++++++++++++++++++++++++++++++++++++++++++----------- + src/ftxgsub.h | 47 +++-- + src/ftxopen.c | 7 + + src/ftxopenf.h | 5 +- + 4 files changed, 487 insertions(+), 117 deletions(-) + +commit e040f681963d51eaadcd53a456100fde1a7addb6 +Author: Behdad Esfahbod +Date: Sat Jan 28 20:29:18 2006 +0000 + + Removed. + + 2006-01-28 Behdad Esfahbod + + * pango/opentype/pango-ot-*: Removed. + + * pango/pango-ot-*: Added. + + * pango/Makefile.am, pango/opentype/Makefile.am: Adjusted. + + src/Makefile.am | 30 +-- + src/pango-ot-buffer.c | 339 ------------------------ + src/pango-ot-info.c | 681 ------------------------------------------------- + src/pango-ot-private.h | 105 -------- + src/pango-ot-ruleset.c | 225 ---------------- + 5 files changed, 13 insertions(+), 1367 deletions(-) + +commit f45689bc655eb723f11a2eb65a41303221b80397 +Author: Behdad Esfahbod +Date: Wed Jan 25 19:33:58 2006 +0000 + + If major.minor of required and available glib versions are the same, add + + 2006-01-25 Behdad Esfahbod + + * configure.in: If major.minor of required and available glib versions + are the same, add -DG_DISABLE_DEPRECATED to GLIB_CFLAGS. (bug #328617) + + * */Makefile.am: Remove hardcoded -DG_DISABLE_DEPRECATED. + + src/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +commit 6cc6c9a57c674787f278ea5b60705384fd72b4ad +Author: Behdad Esfahbod +Date: Sat Jan 14 07:00:13 2006 +0000 + + Make sure #include is the first include in the file. (bug + + 2006-01-14 Behdad Esfahbod + + * */*.c, */*/*.c: Make sure #include is the first include + in the file. (bug #158870, based on patch by Luis Menina) + + src/disasm.c | 2 ++ + src/ftglue.c | 1 + + src/ftxgdef.c | 1 + + src/ftxgpos.c | 2 ++ + src/ftxgsub.c | 2 ++ + src/ftxopen.c | 2 ++ + src/otlbuffer.c | 3 +++ + src/ottest.c | 1 + + src/pango-ot-buffer.c | 2 ++ + src/pango-ot-info.c | 2 ++ + src/pango-ot-ruleset.c | 2 ++ + 11 files changed, 20 insertions(+) + +commit ca07fcf6ef61c09825e67ca7e2574a90e4f5a9a0 +Author: Behdad Esfahbod +Date: Thu Jan 5 16:14:49 2006 +0000 + + pango/Makefile.am, pango/fonts.c, pango/glyphstring.c, + + 2006-01-05 Behdad Esfahbod + + * pango/Makefile.am, + * pango/fonts.c, + * pango/glyphstring.c, + * pango/pango-attributes.c, + * pango/pango-color.c, + * pango/pango-impl-utils.h, + * pango/pango-item.c, + * pango/pango-layout.c, + * pango/pango-tabs.c, + * pango/pango-utils.c, + * pango/pango-utils.h, + * pango/pangoatsui-fontmap.c, + * pango/pangocairo-font.c, + * pango/pangocairo-fontmap.c, + * pango/pangofc-fontmap.c, + * pango/pangowin32-fontmap.c, + * pango/pangox-fontmap.c, + * pango/pangox.c, + * pango/opentype/pango-ot-info.c, + * pango/opentype/pango-ot-ruleset.c: Intern strings to avoid + unnecessary strdups in the type system. (bug #325832, Matthias Clasen) + + src/pango-ot-info.c | 3 ++- + src/pango-ot-ruleset.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit 71524f1bc891bb4450507f769e5cc8f6f6cffa0c +Author: Behdad Esfahbod +Date: Tue Dec 27 09:55:48 2005 +0000 + + Use g_slice for PangoOTBuffer allocation. (bug #325026, Matthias Clasen) + + 2005-12-27 Behdad Esfahbod + + * pango/opentype/pango-ot-buffer.c: Use g_slice for PangoOTBuffer + allocation. (bug #325026, Matthias Clasen) + + src/pango-ot-buffer.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b5baa43d3a972ebd3ef82ede14b54c185b723a71 +Author: Behdad Esfahbod +Date: Fri Nov 25 09:22:02 2005 +0000 + + Tiny doc improvement. + + src/pango-ot-info.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6f64314f7a031a5a5d6b7663c08b70c452961c89 +Author: Behdad Esfahbod +Date: Wed Nov 23 19:48:10 2005 +0000 + + Fix typo in docs. + + 2005-11-23 Behdad Esfahbod + + * pango/opentyp/pango-ot-buffer.c: Fix typo in docs. + + src/pango-ot-buffer.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit f2bcf72296b57c8cd7d5a08228c3aef6c8f97d2d +Author: Behdad Esfahbod +Date: Wed Nov 23 17:54:55 2005 +0000 + + Added "Since:" tags to all interfaces added after Pango 1.0. (#319116, + + 2005-11-23 Behdad Esfahbod + + * pango/fonts.c pango/pango-attributes.c pango/pango-context.c + pango/pango-glyph-item.c pango/pango-layout.c + pango/pango-script.c pango/pango-utils.c pango/pangofc-font.c + pango/pangoft2-fontmap.c pango/opentype/pango-ot-buffer.c + pango/opentype/pango-ot-ruleset.c: Added "Since:" tags to all + interfaces added after Pango 1.0. (#319116, Brian Cameron) + + src/pango-ot-buffer.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ + src/pango-ot-ruleset.c | 14 ++++++++++++++ + 2 files changed, 63 insertions(+) + +commit 682db81c23d2116072d8550657c914afb7c26d2b +Author: Behdad Esfahbod +Date: Wed Nov 23 15:19:48 2005 +0000 + + Protect against possible division by zeros (#316468, Steve Grubb) + + 2005-11-23 Behdad Esfahbod + + Protect against possible division by zeros (#316468, Steve Grubb) + + * pango/pango-context.c (update_metrics_from_items), + pango/pango-fontset.c (pango_fontset_real_get_metrics): If count is + zero, do not alter approximate_{char,digit}_width. + + * pango/opentype/disasm.c: Err on invalid DeltaFormat. + + src/disasm.c | 28 ++++++++++++++++++---------- + 1 file changed, 18 insertions(+), 10 deletions(-) + +commit e6e15352d154e1350340f8045759e5f7b0d86dc7 +Author: Behdad Esfahbod +Date: Wed Nov 23 11:53:03 2005 +0000 + + Reworked basic shaper with OpenType support. (#101079, based on patch from + + 2005-11-23 Behdad Esfahbod + + * modules/basic/basic-fc.c: Reworked basic shaper with OpenType + support. (#101079, based on patch from Denis Jacquerye and Noah Levitt) + + * modules/basic/basic-fc.c (basic_scripts): Added Unicode 4.1 addition + script PANGO_SCRIPT_GLAGOLITIC that is a "simple" script. + + * modules/arabic/arabic-fc.c, modules/syriac/syriac-fc.c: Replace + g_utf8_to_ucs4_fast() with g_utf8_strlen()! + + * pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_add_feature): + Remove reference in docs to pango_ot_ruleset_shape() that was + removed long ago. + + src/pango-ot-ruleset.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 612b6cf60928b356f4bbb59bc9d64886574322c3 +Author: Behdad Esfahbod +Date: Thu Nov 17 06:28:11 2005 +0000 + + Part of #101079: + + 2005-11-17 Behdad Esfahbod + + Part of #101079: + + * pango/opentype/ftxopen.c (Load_Lookup): In extension subtables, + offset is relative to the extension subtable, not the original + table. (Greg Aumann) + + * pango/opentype/ftxgpos.c (Load_BaseArray): When reading BaseAnchor, + skip offsets that are zero. Works around bug in Doulos SIL Regular. + + src/ftxgpos.c | 6 ++++++ + src/ftxopen.c | 6 ++++-- + 2 files changed, 10 insertions(+), 2 deletions(-) + +commit 1b2c314b804da97b1d5e7adab64bdd4177702579 +Author: Behdad Esfahbod +Date: Wed Nov 9 23:30:00 2005 +0000 + + Remove debug line that got in accidentally. + + 2005-11-09 Behdad Esfahbod + + * pango/opentype/ftxgpos.c, pango/opentype/ftxopen.c: Remove debug + line that got in accidentally. + + src/ftxgpos.c | 1 - + src/ftxopen.c | 1 - + 2 files changed, 2 deletions(-) + +commit 9717127a5be037e26afe52332a8b07f13474557a +Author: Behdad Esfahbod +Date: Fri Nov 4 23:55:38 2005 +0000 + + Turn various gcc warnings off. Adding const, adding static, fully + + 2005-11-04 Behdad Esfahbod + + * configure.in, examples/argcontext.c examples/cairoview.c, + examples/renderdemo.c, examples/renderdemo.h examples/xftview.c, + modules/basic/basic-x.c, modules/hangul/hangul-fc.c, + modules/hebrew/hebrew-shaper.c, modules/hebrew/hebrew-shaper.h, + modules/indic/indic-fc.c, modules/indic/mprefixups.c, + modules/syriac/syriac-fc.c, pango/break.c pango/fonts.c, + pango/modules.c, pango/pango-coverage.c pango/pango-engine.c, + pango/pango-engine.h, pango/pango-fontmap.c, + pango/pango-fontset.c, pango/pango-impl-utils.h, + pango/pango-layout.c, pango/pango-layout.h, + pango/pango-renderer.c, pango/pango-script.c, + pango/pango-utils.c, pango/pangocairo-fc.h, + pango/pangocairo-font.c, pango/pangocairo-fontmap.c, + pango/pangocairo-private.h, pango/pangofc-decoder.c, + pango/pangofc-font.c, pango/pangofc-fontmap.c pango/pangoft2.c, + pango/pangox-fontcache.c, pango/pangox-fontmap.c pango/pangox.c, + pango/pangoxft-font.c, pango/querymodules.c, + pango/opentype/ftglue.c, pango/opentype/ftxgpos.c, + pango/opentype/ftxopen.c, pango/opentype/pango-ot-buffer.c, + pango/opentype/pango-ot-info.c, + pango/opentype/pango-ot-ruleset.c, tests/dump-boundaries.c, + tests/testboundaries.c, tests/testcolor.c tests/testiter.c, + tests/testscript.c: Turn various gcc warnings off. Adding const, + adding static, fully initializing structs, match signedness in + comparisons. (#317804) + + * tests/testscript.c, tools/gen-script-for-lang.c: + (scripts_for_file): Pass error->message instead of error to fail(), + which was wrong. + (compare_lang): Fix typo comparing a and a instead of a and b. + + src/ftglue.c | 2 +- + src/ftxgpos.c | 4 ++++ + src/ftxopen.c | 1 + + src/pango-ot-buffer.c | 4 ++-- + src/pango-ot-info.c | 5 +++-- + src/pango-ot-ruleset.c | 5 +++-- + 6 files changed, 14 insertions(+), 7 deletions(-) + +commit c0505f3bb28feeba95b201e6464fb2fdac90194a +Author: Behdad Esfahbod +Date: Thu Nov 3 20:13:40 2005 +0000 + + Patches from #170414. Reviewed by Matthias Clasen. + + 2005-11-03 Behdad Esfahbod + + Patches from #170414. Reviewed by Matthias Clasen. + + * pango/opentype/ftxgpos.c, pango/opentype/ftxgsub.c: Use call table + to dispatch different lookup types. + + * pango/opentype/pango-ot-buffer.c, pango/opentype/pango-ot-ruleset.c: + Small cleanup. + + src/ftxgpos.c | 143 ++++++++++++++++++++++++------------------------- + src/ftxgsub.c | 115 +++++++++++++++++++++------------------ + src/pango-ot-buffer.c | 3 +- + src/pango-ot-ruleset.c | 75 +++++++++----------------- + 4 files changed, 159 insertions(+), 177 deletions(-) + +commit c6b22b9119ef54ea8d0d2f08b74fdeb024289d73 +Author: Behdad Esfahbod +Date: Mon Aug 29 10:06:40 2005 +0000 + + Generate valid XML output. Dump LookupFlag too. + + 2005-08-29 Behdad Esfahbod + + * pango/opentype/ottest.c, pango/opentype/disasm.c: Generate valid + XML output. Dump LookupFlag too. + + src/disasm.c | 58 ++++++++++++++++++++++++++++++---------------------------- + src/ottest.c | 23 ++++++++++++++--------- + 2 files changed, 44 insertions(+), 37 deletions(-) + +commit 1e3747ca5d1a6f607f8e56fb94e3daaf6ad623cb +Author: Behdad Esfahbod +Date: Mon Aug 15 04:16:04 2005 +0000 + + Replace perror with perror_. Remove FT_BEGIN_STMNT and FT_END_STMNT. + + 2005-08-15 Behdad Esfahbod + + * pango/opentype/ftglue.h: Replace perror with perror_. + Remove FT_BEGIN_STMNT and FT_END_STMNT. (#313477) + + src/ftglue.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 3c60250875fa9d04ca96dea35eba23fc70690ff5 +Author: Owen Taylor +Date: Tue Jul 26 18:33:27 2005 +0000 + + Skip lookups with lookup index out of range. (Patch from Behdad Esfahbod, + + 2005-07-26 Owen Taylor + + * pango/opentype/ftxgsub.c, pango/opentype/ftxgpos.c: Skip lookups + with lookup index out of range. (Patch from Behdad Esfahbod, #171170) + + src/ftxgpos.c | 30 ++++++++++++++++++++++++------ + src/ftxgsub.c | 30 ++++++++++++++++++++++++------ + 2 files changed, 48 insertions(+), 12 deletions(-) + +commit 91a3fa2e4bcdde8ae022d1264c783f133cd7e00d +Author: Owen Taylor +Date: Fri Jul 22 18:03:58 2005 +0000 + + Remove an unecessary set of block2. + + 2005-07-22 Owen Taylor + + * pango/opentype/ftglue.c (ftglue_realloc): Remove + an unecessary set of block2. + + src/ftglue.c | 1 - + 1 file changed, 1 deletion(-) + +commit ff7034787d79dcd1bec58a4e02602039313da00e +Author: Owen Taylor +Date: Fri Jul 22 17:56:37 2005 +0000 + + Patch from David Turner. Review and testing by Behdad Esfahbod + + 2005-07-22 Owen Taylor + + Patch from David Turner. Review and testing by Behdad Esfahbod + + * pango/opentype/ftglue.[ch] Makefile.am: Glue layer that provides + implementation of the internal functions that the opentype code + expects in terms of publically exported FreeType API. + + * pango/opentype/ftxgdef.c pango/opentype/ftxgpos.c + pango/opentype/ftxgsub.c pango/opentype/ftxopen.c + pango/opentype/otlbuffer.c pango/opentype/pango-ot-info.c + pango/opentype/pango-ot-ruleset.c: Remove includes of + internal headers. Small changes to work with ftglue.[ch] + + * pango/opentype/fterrcompat.h: Remove: no longer needed. + + * pango/opentype/ftxgpos.c: Use FT_IS_SFNT(face) rather + than poking at FT_MODULE_CLASS (face->driver)->module_name. + + * pango/opentype/ftxopen.c (Free_FeatureList): Free + fl->ApplyOrder. (Found by Behdad) + + src/Makefile.am | 3 +- + src/fterrcompat.h | 95 -------------- + src/ftglue.c | 350 +++++++++++++++++++++++++++++++++++++++++++++++++ + src/ftglue.h | 156 ++++++++++++++++++++++ + src/ftxgdef.c | 9 +- + src/ftxgpos.c | 9 +- + src/ftxgsub.c | 10 +- + src/ftxopen.c | 8 +- + src/otlbuffer.c | 4 +- + src/pango-ot-info.c | 6 +- + src/pango-ot-ruleset.c | 2 - + 11 files changed, 520 insertions(+), 132 deletions(-) + +commit 43dbec6f3a345ba0e4a43766610ed59622bbe4a0 +Author: Owen Taylor +Date: Thu Jul 21 18:15:45 2005 +0000 + + Fix up places where there is missing or incomplete Copyright and License + + 2005-07-21 Owen Taylor + + Fix up places where there is missing or incomplete + Copyright and License information (Reported by William N. Ray) + + * pango/opentype/fterrcompat.h: Mark as FreeType/GPL licensed. + + * pango/opentype/FT-license.txt: Make this the dual-licensing + description that covers the FreeType code (FreeType's + LICENSE.TXT) rather than the FTL. + + * pango/opentype/FTL.TXT: Move the FTL (referenced from + FT-license.txt) to here. + + * modules/basic/basic-common.h modules/hebrew/hebrew-shaper.h + modules/thai/thai-charprop.c modules/thai/thai-shaper.h + tools/gen-script-for-lang.c tests/testcolor.c: + Add LGPL header and copyright information. + + * modules/indic/indic-ot.[ch] modules/indic/indic-ot-class-tables.c + modules/thai/thai-ot.[ch]: Add LGPL header. + + * modules/thai/thai-shaper.c modules/thai/thai-charprop.h: + Minor fixes to copyright information. + + * modules/arabic/arabic-ot.c: Add Freetype license boilerplate. + + src/FT-license.txt | 179 +++++++---------------------------------------------- + src/FTL.TXT | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/fterrcompat.h | 10 ++- + 3 files changed, 204 insertions(+), 159 deletions(-) + +commit c55850d36d208c7aae8f6ed5c9e1e7927b988d6c +Author: Owen Taylor +Date: Tue Jun 14 19:54:19 2005 +0000 + + Chain up from finalize. (#307547, Paolo Borelli) + + 2005-06-14 Owen Taylor + + * pango/opentype/pango-ot-info.c (pango_ot_info_finalize) + pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_finalize): + Chain up from finalize. (#307547, Paolo Borelli) + + * pango/opentype/pango-ot-info.c (pango_ot_info_finalizer): + make accidentally public function static. + + src/pango-ot-info.c | 4 +++- + src/pango-ot-ruleset.c | 2 ++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 44ff46a364fb7981804eb45329c4999b415711f9 +Author: Tor Lillqvist +Date: Tue Apr 12 01:27:21 2005 +0000 + + Rename LDADDS to libpango_ot_la_LIBADD to actually make libpango-ot.la + + 2005-04-12 Tor Lillqvist + + * pango/opentype/Makefile.am: Rename LDADDS to + libpango_ot_la_LIBADD to actually make libpango-ot.la link with + it. + + * pango/pangowin32.def: Rename get_scale_factor to + get_metrics_factor here, too. (#300222, Ivan Wong) + + src/Makefile.am | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 0c349a032e5a52a9d0dcc8204f761b7cb28bfa6b +Author: Owen Taylor +Date: Thu Mar 3 19:38:02 2005 +0000 + + For all binary searches, handle the case where the number of items is 0. + + 2005-03-03 Owen Taylor + + * pango/opentype/ftxopen.c (Coverage_Index1, Coverage_Index2, + Get_Class2): For all binary searches, handle the case where + the number of items is 0. (#162977, Nick Lamb) + + * pango/opentype/ftxgdef.c (TT_GDEF_Build_ClassDefinition): + Handle the case where glyph_count == 0 properly. Fix a problem + with cleanups on memory allocation failure. + (Get_New_Count, Add_Glyph_Property): Avoid reading off the + end of the ClassRangeRecord array. + + src/ftxgdef.c | 60 +++++++++++++++++++++++++++++++++++------------------------ + src/ftxopen.c | 15 +++++++++++++++ + 2 files changed, 51 insertions(+), 24 deletions(-) + +commit 03838daaa9d485bffcb7bc46453a9a4c32a1f32f +Author: Owen Taylor +Date: Mon Nov 22 23:37:19 2004 +0000 + + Set G_LOG_DOMAIN. + + Mon Nov 22 18:30:14 2004 Owen Taylor + + * pango/opentype/Makefile.am pango/Makefile.am + modules/*/Makefile.am: Set G_LOG_DOMAIN. + + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 346d3b3cac253d2db41205151c185bf2fd9dda16 +Author: Owen Taylor +Date: Wed Sep 22 18:14:55 2004 +0000 + + Cleanups from 'sparse', #149922, Kjartan Maraas + + Wed Sep 22 14:07:47 2004 Owen Taylor + + Cleanups from 'sparse', #149922, Kjartan Maraas + + * pango/pango-utils.c (read_config): () => (void) in + definition. + + * pango/pangofc-fontmap.c (pango_fc_font_map_list_families): + Initialize *n_families, not n_families. + + * pango/pangofc-fontmap.c pango/pangoft2.c opentype/ftxgdef.c + opentype/ftxgpos.c opentype/ftxgsub.c: : Fix various 0/NULL + confusion. + + src/ftxgdef.c | 2 +- + src/ftxgpos.c | 6 +++--- + src/ftxgsub.c | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit 8b654dfb5ad6137ee9c5a48f5abe04bf7d28d8cd +Author: Owen Taylor +Date: Tue Sep 14 13:45:41 2004 +0000 + + === Released 1.6.0 === + + Mon Sep 13 17:38:58 2004 Owen Taylor + + * === Released 1.6.0 === + + * configure.in: Update versions for 1.6.0 + + * NEWS: Update. + + * README: Minor tweak. + + * pango/fonts.c pango/pango-context.c pango/pango-types.h + pango/pango-utils.c pango/pangoft2.c pango/pango-layout.c + pango/opentype/pango-ot-buffer.c: Add a bunch of missing + Since: 1.6. + + src/pango-ot-buffer.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit d41089a5b691967fdd622f47c8397a80af104396 +Author: Owen Taylor +Date: Fri Jul 30 21:23:04 2004 +0000 + + Finish extending properties flags from FT_UShort => FT_UInt. (OTLBuffer + + Fri Jul 30 17:17:05 2004 Owen Taylor + + * pango/opentype/ftxgpos.[ch] pango/opentype/ftxgsub.[ch] + pango/opentype/ftxopen.[ch]: Finish extending properties + flags from FT_UShort => FT_UInt. (OTLBuffer was already + using an FT_UInt) + + src/ftxgpos.c | 8 ++++---- + src/ftxgpos.h | 2 +- + src/ftxgsub.c | 8 ++++---- + src/ftxgsub.h | 2 +- + src/ftxopen.c | 2 +- + src/ftxopen.h | 2 +- + 6 files changed, 12 insertions(+), 12 deletions(-) + +commit f42d5eca291dcdfb27d7fbf88391d6d381b8e9c4 +Author: Owen Taylor +Date: Tue Jul 27 17:20:01 2004 +0000 + + Save the order in which features were added and use that when applying + + Tue Jul 27 12:38:05 2004 Owen Taylor + + * pango/opentype/ftxopen.[ch] pango/opentype/ftxgsub.c + pango/opentype/ftxpos.c: Save the order in which + features were added and use that when applying features. + (Patch from Soheil Hassas Yeganeh, #122330) + + src/ftxgpos.c | 41 ++++++++++++++++++++++++----------------- + src/ftxgsub.c | 34 +++++++++++++++++++++------------- + src/ftxopen.c | 14 +++++++++++--- + src/ftxopen.h | 2 ++ + 4 files changed, 58 insertions(+), 33 deletions(-) + +commit ae2daa972d74c5ecfe1d2f0057ce12682ad30b00 +Author: Behdad Esfahbod +Date: Tue Jul 27 13:12:19 2004 +0000 + + Remove the unused parameter from the IN_CURITEM() and IN_CURGLYPH macros. + + + * pango/opentype/ftxgpos.c: Remove the unused parameter + from the IN_CURITEM() and IN_CURGLYPH macros. + + src/ftxgpos.c | 68 +++++++++++++++++++++++++++++------------------------------ + src/ftxgsub.c | 2 +- + 2 files changed, 35 insertions(+), 35 deletions(-) + +commit 7d5435ea8cb345c79029b8a12d1bddbed28b1997 +Author: Behdad Esfahbod +Date: Tue Jul 27 10:43:58 2004 +0000 + + Fix bug to copy glyph from in_string, not out_string. + + + * pango/opentype/otlbuffer.c (otl_buffer_copy_output_glyph): + Fix bug to copy glyph from in_string, not out_string. + + src/otlbuffer.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2ea2a55bdf7ef1caebcd0c5922b0f542ed8bb5bf +Author: Owen Taylor +Date: Mon Jul 26 23:14:53 2004 +0000 + + Fix allocation and indexing in NewGlyphClasses array. (#130661, Masatake + + Mon Jul 26 19:11:46 2004 Owen Taylor + + * pango/opentype/ftxgdef.c: Fix allocation and indexing + in NewGlyphClasses array. (#130661, Masatake YAMATO) + + src/ftxgdef.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 5d42695e5ed89f73fbc665792ebec82c29ae04ae +Author: Owen Taylor +Date: Mon Jul 26 19:25:45 2004 +0000 + + Remove the unused parameter from the IN_CURITEM() and IN_CURGLYPH macros. + + Mon Jul 26 15:24:11 2004 Owen Taylor + + * pango/opentype/ftxgsub.c (ADD_Glyph): Remove the + unused parameter from the IN_CURITEM() and IN_CURGLYPH + macros. + + src/ftxgsub.c | 56 ++++++++++++++++++++++++++++---------------------------- + 1 file changed, 28 insertions(+), 28 deletions(-) + +commit a00c4ea5626526980139b122977e367b8434d24a +Author: Owen Taylor +Date: Mon Jul 26 19:23:06 2004 +0000 + + Add missing macro to make the last change actually compile. + + Mon Jul 26 15:21:23 2004 Owen Taylor + + * pango/opentype/ftxgsub.c: Add missing macro to make the + last change actually compile. + + src/ftxgsub.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit ed3e1f278d3ebfd224f0b57388502d4bb9fb1441 +Author: Owen Taylor +Date: Mon Jul 26 19:20:27 2004 +0000 + + Match backtrack context against the output glyphs not the input glyphs + + Mon Jul 26 15:16:07 2004 Owen Taylor + + * pango/opentype/ftxgsub.c (Lookup_ChainContextSubst[123]): + Match backtrack context against the output glyphs not + the input glyphs (#145174, Aamir Wali) + + src/ftxgsub.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit 78282cda004a88b2aadb2786dd3897884e22ed0b +Author: Owen Taylor +Date: Mon Jul 26 18:59:02 2004 +0000 + + Make Check_Property() take a OTL_GlyphItem, add a gproperties field to + + Mon Jul 26 14:49:22 2004 Owen Taylor + + * ftxgdef.[ch] otlbuffer.[ch]: Make Check_Property() take a + OTL_GlyphItem, add a gproperties field to OTLGlyphItem, + and use that to cache the properties for a glyph. + + * ftxgsub.c ftxgdef.c: Adapt to Check_Property() changes. + + * otlbuffer.[ch] ftxgsub.c: Add otl_buffer_copy_output_glyph() + to use when we are copying an unmodified glyph from input + to output that preserves the cached properties. + + src/ftxgdef.c | 16 ++++++++++------ + src/ftxgpos.c | 52 +++++++++++++++++++++++++++------------------------- + src/ftxgsub.c | 54 ++++++++++++++++++++++++++++-------------------------- + src/ftxopenf.h | 2 +- + src/otlbuffer.c | 21 +++++++++++++++++++-- + src/otlbuffer.h | 6 ++++++ + 6 files changed, 91 insertions(+), 60 deletions(-) + +commit 81b62af42313fb60db523374cd8c6901829f5c4e +Author: Owen Taylor +Date: Mon Jul 19 21:13:23 2004 +0000 + + Add support for ChainContextSubstFormat3. + + Mon Jul 19 17:09:11 2004 Owen Taylor + + * pango/opentype/disasm.c: Add support for + ChainContextSubstFormat3. + + src/disasm.c | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +commit d4f773ef92fdbaa7e61e6577db5e9b2846a100a4 +Author: Owen Taylor +Date: Mon Jul 19 20:37:22 2004 +0000 + + Fix pervasive buffer overruns when skipping glyphs when matching contexts. + + Mon Jul 19 16:29:45 2004 Owen Taylor + + * pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c: + Fix pervasive buffer overruns when skipping glyphs + when matching contexts. (#118592, Kailash C. Chowksey) + + src/ftxgpos.c | 259 ++++++++++++++++++---------------------- + src/ftxgsub.c | 376 ++++++++++++++++++++++++++-------------------------------- + 2 files changed, 284 insertions(+), 351 deletions(-) + +commit 99848cfafee8e598ef533f254cdb99fbae4c9364 +Author: Owen Taylor +Date: Wed Jun 23 20:33:35 2004 +0000 + + #143693, Sayamindu Dasgupta + + Wed Jun 23 16:13:53 2004 Owen Taylor + + #143693, Sayamindu Dasgupta + + * pango/opentype/pango-ot-buffer.c (pango_ot_buffer_set_zero_width_marks) pango/opentype/pango-ot-private.h: + Allow setting for whether marks should be given zero width, + defaulting to FALSE. + + * modules/arabic/arabic-fc.c (arabic_engine_shape): Turn + on zero-width-marks setting. + + src/pango-ot-buffer.c | 22 +++++++++++++++++++++- + src/pango-ot-private.h | 5 +++-- + 2 files changed, 24 insertions(+), 3 deletions(-) + +commit 68d4cedb8726fa239f56d62060d8fee7e09cb8be +Author: Owen Taylor +Date: Mon Jun 21 18:04:02 2004 +0000 + + Use the gcc-3.3 strict-aliasing compatible macros from fterrcompat.h + + Mon Jun 21 13:55:17 2004 Owen Taylor + + * pango/opentype/otlbuffer.c: Use the gcc-3.3 + strict-aliasing compatible macros from fterrcompat.h + (#140495, reported by Stanislav Brabec) + + src/otlbuffer.c | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) + +commit b327765176dff81047f942ac56a1d206344e6039 +Author: Theppitak Karoonboonyanan +Date: Fri May 28 16:41:36 2004 +0000 + + Negate y offset according to different conventions between + + * pango/opentype/pango-ot-buffer.c (apply_gpos_ltr): Negate y offset + according to different conventions between PangoGlyphString and OTL + (#142544) + + src/pango-ot-buffer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 068763b547d791e28b892bcaee810f3d60a83018 +Author: Owen Taylor +Date: Thu May 27 21:55:50 2004 +0000 + + Revert error return changes from last commit. + + Thu May 27 17:54:24 2004 Owen Taylor + + * pango/opentype/otlbuffer.c: Revert error return changes + from last commit. + + src/otlbuffer.c | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +commit ef07481025c5bbb9769b9f908d9dc78f44161bbb +Author: Owen Taylor +Date: Thu May 27 21:03:42 2004 +0000 + + Free buffer->positions, clean up error returns that were returning + + Thu May 27 16:57:30 2004 Owen Taylor + + * pango/opentype/otlbuffer.c: Free buffer->positions, + clean up error returns that were returning uninitialized + values. (#139239, Behdad Esfahbod) + + src/otlbuffer.c | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +commit de568e7e6200c7a49bae1f78ac63858b8df01173 +Author: Owen Taylor +Date: Tue Mar 16 19:23:43 2004 +0000 + + === Released 1.4.0 === + + Tue Mar 16 11:24:46 2004 Owen Taylor + + * === Released 1.4.0 === + + * configure.in: Version 1.4.0, interface ago 0. Require + glib-2.4.0. + + * NEWS: Updates. + + * README: Some updates; include details about the FreeType + license of the OpenType code. + + src/FT-license.txt | 77 +++++++++++++++++++++++++++++------------------------- + 1 file changed, 42 insertions(+), 35 deletions(-) + +commit 8b3554b3afe7c125b1a53171b01ac87de9c486fe +Author: Hans Breuer +Date: Wed Mar 3 22:35:19 2004 +0000 + + if PANGO_MODULE_PREFIX is defined include the basic backend shaper (should + + 2004-03-03 Hans Breuer + + * pango/module-defs-win32.c.win32 : if PANGO_MODULE_PREFIX is + defined include the basic backend shaper (should have been + commited at 2003-12-12, too) + + * pango/makefile.msc : generate correct type for PangoFontMask + (bug #135892, John Ehresman) + * pango/opentype/makefile.msc : updated + + * pango/pango.def pango/pangoft2.def : more updatd externals + + src/makefile.msc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit a7e096c5de3ec5319bf9333c9ace0732d97c52c3 +Author: Owen Taylor +Date: Sun Feb 29 15:44:50 2004 +0000 + + Rework opentype interfaces and other changes to make GPOS work for Arabic. + + Sun Feb 29 09:25:13 2004 Owen Taylor + + Rework opentype interfaces and other changes to make GPOS + work for Arabic. (Most of #117282, #121060) + + * pango/opentype/otlbuffer.[ch]: OTL_Buffer that + acts as a replacement for the separate GSUB and + GPOS string structures and hides many of the internal + details. + + * pango/opentype/ftxgsub.[ch] pango/opentype/ftxgpos.[ch]: + Adapt to OTL_Buffer. + + * pango/opentype/ftxgpos.c: Redo handling of cursive + chains so that it actually works. + + * pango/pango-ot.h pango/opentype/pango-ot-buffer.c: + Pango wrapper around OTL_Buffer. + + * pango/pango-ot.h pango/pango-ot-ruleset.c pango/pango-ot-buffer.c: + Split pango_ot_ruleset_shape() into pango_ot_ruleset_substitute(), + pango_ot_ruleset_position(), make them act on + PangoOTBuffer, add a separate pango_ot_buffer_output() + which does the default positioning and writes to a + PangoGlyphString. + + * modules/arabic/arabic-fc.c modules/indic/indic-fc.c + modules/indic/mprefixups.[ch]: Adapt to new OpenType + interfaces; add GPOS features for Arabic. + + * pango/opentype/pango-ot-info.c: Don't derive class information + from Unicode properties for Arabic presentation forms, + let the shaping process derive the properties. + + src/Makefile.am | 3 + + src/ftxgdef.c | 4 +- + src/ftxgpos.c | 573 ++++++++++++++++----------------------- + src/ftxgpos.h | 23 +- + src/ftxgsub.c | 719 +++++++++++-------------------------------------- + src/ftxgsub.h | 40 +-- + src/ftxopen.h | 1 + + src/otlbuffer.c | 213 +++++++++++++++ + src/otlbuffer.h | 97 +++++++ + src/ottest.c | 2 + + src/pango-ot-buffer.c | 265 ++++++++++++++++++ + src/pango-ot-info.c | 27 +- + src/pango-ot-private.h | 8 + + src/pango-ot-ruleset.c | 148 +++------- + 14 files changed, 1039 insertions(+), 1084 deletions(-) + +commit d670ddf99192dd4999775a9215a818ae63fa3416 +Author: Owen Taylor +Date: Sat Feb 21 14:53:12 2004 +0000 + + Sign convention for y offsets is opposite between PangoGlyphString and FT + + Sat Feb 21 09:49:23 2004 Owen Taylor + + * pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_shape): + Sign convention for y offsets is opposite between + PangoGlyphString and FT code. (#132591) + + src/pango-ot-ruleset.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b9b3c131c2b57c12a77124a52512fb19a1255f8e +Author: Owen Taylor +Date: Fri Feb 13 16:11:40 2004 +0000 + + Memory leak fixes from Masatake YAMATO, #130652 + + Fri Feb 13 10:54:18 2004 Owen Taylor + + Memory leak fixes from Masatake YAMATO, #130652 + + * pango/opentype/ftxgdef.c (TT_Done_GDEF_Table): + Free the gdef table as well as the contained data. + + * pango/opentype/ftxgdef.c (TT_GDEF_Build_ClassDefinition): + Set gcd->loaded, so that the contents get freed later. + + src/ftxgdef.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 926b8f322989298e43c8bac85f23e3525470a669 +Author: Owen Taylor +Date: Mon Jan 26 19:23:35 2004 +0000 + + Suport CFF fonts as well. (#131202, Manjunath Sripadarao) + + Mon Jan 26 14:20:34 2004 Owen Taylor + + * pango/opentype/pango-ot-info.c (is_truetype): Suport + CFF fonts as well. (#131202, Manjunath Sripadarao) + + src/pango-ot-info.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 945e479a3a35769e5e7c792fdcf306892523a5f9 +Author: Hans Breuer +Date: Sat Dec 13 14:31:50 2003 +0000 + + moved pango_fc_* to the latter where they live on *nix too. + + 2003-12-13 Hans Breuer + + * pango/pango.def pangoft2.def : moved pango_fc_* + to the latter where they live on *nix too. + + * pango/makefile.msc : make it build again (including + the Ft2 backend) + + * pango/module-defs-fc.c.win32 : if PANGO_MODULE_PREFIX is defined + include the basic backend shaper + + * pango/pangowin32.c (pango_win32_render_layout) : + initialize iter before first usage to avoid immediate crashing + + * pango/opentype/makefile.msc + pango/modules/makefile.msc : finally build with mscv, too. + [completely untested cause I'm not able to type, write or read + any of these languages] + + * modules/modules.def : follow module function renaming/changes + + * modules/basic/basic-win32.c : register the right engine, i.e. + make it compile + + src/makefile.msc | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit ba0ccd5cfcb514cdc45373158343138b7b190f9d +Author: Owen Taylor +Date: Sat Nov 1 15:02:17 2003 +0000 + + Switch over to recommended Freetype system of include ft2build.h then + + Sat Nov 1 09:32:15 2003 Owen Taylor + + * pango/pango-ot.h pango/pangofc-font.h modules/indic/indic-ot.h + pango/pangoft2.c pango/opentype/pango-ot-info.c + pango/opentype/pango-ot-ruleset.c pango/opentype/ottest.c + pango/opentype/ftxopen.[ch] pango/opentype/ftxgdef.c + pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c: + Switch over to recommended Freetype system of + include ft2build.h then #include FT_FREETYPE_H. + Fixes ftmodule.h problem with current Freetype CVS. + (#125548) + + src/ftxgdef.c | 14 +++++++------- + src/ftxgpos.c | 17 ++++++++--------- + src/ftxgsub.c | 13 ++++++------- + src/ftxopen.c | 10 +++++----- + src/ftxopen.h | 3 ++- + src/ottest.c | 1 - + src/pango-ot-info.c | 4 ++-- + src/pango-ot-private.h | 2 -- + src/pango-ot-ruleset.c | 4 ++-- + 9 files changed, 32 insertions(+), 36 deletions(-) + +commit 558171a7a3666999c679719ad0bfbdf7c6a52289 +Author: Owen Taylor +Date: Mon Sep 15 22:04:55 2003 +0000 + + Fix gcc-3.3 versions of macros to have the right return value. + + Mon Sep 15 17:16:59 2003 Owen Taylor + + * pango/opentype/fterrcompat.h: Fix gcc-3.3 versions of + macros to have the right return value. + + src/fterrcompat.h | 44 ++++++++++++++++++++++++++------------------ + 1 file changed, 26 insertions(+), 18 deletions(-) + +commit c99259bf7e08ccdc4130d4983e8d186021ea8e1a +Author: Owen Taylor +Date: Mon Aug 25 14:30:12 2003 +0000 + + pango/opentype/ftxgsub.c (Lookup_ChainContextSubst3) Fix problems where + + Mon Aug 25 10:17:21 2003 Owen Taylor + + * pango/opentype/ftxgsub.c (Lookup_ChainContextSubst3) + * pango/opentype/ftxgpos.c (Lookup_ChainContextPos3): + Fix problems where the coverage wasn't being checked + for the first input glyph. (#118639, Kailash C. Chowksey) + + src/ftxgpos.c | 7 +++---- + src/ftxgsub.c | 7 +++---- + 2 files changed, 6 insertions(+), 8 deletions(-) + +commit bcf81bcc80c6235dfbc7eeaa34ed21ea329c7a3d +Author: Owen Taylor +Date: Fri Aug 22 22:52:08 2003 +0000 + + Add some macro definitions for gcc-3.3 that suppress the bogus + + Fri Aug 22 18:09:52 2003 Owen Taylor + + * pango/opentype/fterrcompat.h: Add some macro definitions + for gcc-3.3 that suppress the bogus strict-aliasing + warnings. + + * pango/pango-utils.c (read_config_file): Use + g_hash_table_new_full() to simplify code and fix + gcc-3.3 warnings. + + * pango/pangox-fontmap.c (pango_x_real_get_coverage_win) + * pango/querymodules.c (query_module): Suppress gcc-3.3 + warnings. + + * pango/modules.c (pango_find_map): Fix warning from + missing declaration of pango_module_get_type(). + + * pango/pango-context.c/pango-engine.c: Fix name confusion + for pango_get_fallback_shaper(). + + src/fterrcompat.h | 36 ++++++++++++++++++++++++++++++++++-- + 1 file changed, 34 insertions(+), 2 deletions(-) + +commit 46d379596d7292a3b2e51f35fc8044b366d413a3 +Author: Owen Taylor +Date: Tue Jul 29 14:21:54 2003 +0000 + + Rewrite handling of IGNORE_SPECIAL_MARKS to be properly "ignore marks of + + Tue Jul 29 09:58:13 2003 Owen Taylor + + * pango/opentype/ftxgdef.c (Check_Property): Rewrite + handling of IGNORE_SPECIAL_MARKS to be properly + "ignore marks of attachment type different than + specified. (#118456, Kailash C. Chowksey) + + src/ftxgdef.c | 37 ++++++++++++++++++++++++++++--------- + 1 file changed, 28 insertions(+), 9 deletions(-) + +commit 8247acad79c1a4154e9337aed453eb3e4d23063d +Author: Owen Taylor +Date: Mon Jul 28 22:28:37 2003 +0000 + + Revert back out the FreeType patch preventing ligatures of not-originally + + Sat Jul 26 09:41:22 2003 Owen Taylor + + * pango/opentype/ftxgsub.c (Lookup_LigatureSubst): + Revert back out the FreeType patch preventing + ligatures of not-originally adjacent glyphs; + it doesn't work for all scripts. (#118472, + Kailash C. Chowksey) + + src/ftxgsub.c | 31 +++---------------------------- + 1 file changed, 3 insertions(+), 28 deletions(-) + +commit 825e6d7e86cac310161648601b09291fa05d5ba5 +Author: Owen Taylor +Date: Sun Jul 27 02:40:31 2003 +0000 + + Check for lookahead glyphs in the right place. (Patch from #116860) + + Sat Jul 26 22:30:59 2003 Owen Taylor + + * pango/opentype/ftxgsub.c (Lookup_ChainContextSubst{1,2,3}): + Check for lookahead glyphs in the right place. (Patch + from #116860) + + * pango/opentype/ftxgpos.c (Lookup_ChainContextPos{1,2,3}): + Same fix here. + + src/ftxgpos.c | 6 +++--- + src/ftxgsub.c | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 03a0fe09c711b81c7eb4065fd4700b8cfd2c977a +Author: Owen Taylor +Date: Sun Jul 27 02:19:52 2003 +0000 + + Fix return value to only contain TTO_Err_Not_Covered if *no* lookups + + Sat Jul 26 22:12:46 2003 Owen Taylor + + * pango/opentype/ftxgsub.c (Do_String_Lookup, + TT_GSUB_Apply_String): Fix return value to only + contain TTO_Err_Not_Covered if *no* lookups + matched. Fix memory leaks on error in Apply_String(). + + src/ftxgsub.c | 120 ++++++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 75 insertions(+), 45 deletions(-) + +commit e10ea2afd9a5868d4ec1ff3a2b99bcd64ce45816 +Author: Owen Taylor +Date: Sun Jul 27 01:10:15 2003 +0000 + + Fix confusion between boolean and FT_Error return. (GSUB equivalent of fix + + Sat Jul 26 21:06:26 2003 Owen Taylor + + * pango/opentype/ftxgsub.c (Load_EmptyOrClassDefinition): + Fix confusion between boolean and FT_Error return. + (GSUB equivalent of fix for #108358) + + src/ftxgsub.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit a7305ab2624cbc08160dc11587ba3dc4e17781c2 +Author: Owen Taylor +Date: Sat Jul 26 15:02:13 2003 +0000 + + Move allocation afer initial checks, fixing memory leak. + + Sat Jul 26 10:52:20 2003 Owen Taylor + + * pango/opentype/ftxgpos.c (Lookup_ContextPos2): + * pango/opentype/ftxgsub.c (Lookup_ContextSubst2): Move + allocation afer initial checks, fixing memory leak. + + * pango/opentype/ftxgsub.c (Lookup_ChainContextSubst2): + Fix some more error return memory leaks that weren't + fixed in the Qt changes. + + src/ftxgpos.c | 8 ++++---- + src/ftxgsub.c | 12 ++++++------ + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit f40b7c15e0bc4b71e706602c4e062f72d8f0fcdd +Author: Owen Taylor +Date: Sat Jul 26 14:50:23 2003 +0000 + + Fix various memory leaks from error returns that should have been jumps to + + Sat Jul 26 10:43:20 2003 Owen Taylor + + * pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c: + Fix various memory leaks from error returns that should + have been jumps to cleanup blocks. (From Qt, Lars Knoll) + + src/ftxgpos.c | 8 ++++---- + src/ftxgsub.c | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 256d21970733483833b9cf31d5e0fa7ae853e944 +Author: Owen Taylor +Date: Sat Jul 26 14:35:29 2003 +0000 + + Fix additional places where TTO_Err_Not_Covered wasn't considered a + + Sat Jul 26 10:30:24 2003 Owen Taylor + + * pango/opentype/ftxgpos.c: Fix additional places where + TTO_Err_Not_Covered wasn't considered a successful return + from Get_Class. (From Qt, Lars Knoll) + + src/ftxgpos.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 374960681e2e36d0e4032623d8cb92a7910baf71 +Author: Owen Taylor +Date: Sat Jul 26 13:50:23 2003 +0000 + + If applying a ligature lookup makes adjacent two glyphs that were not + + Sat Jul 26 09:41:22 2003 Owen Taylor + + * pango/opentype/ftxgsub.c (Lookup_LigatureSubst): + If applying a ligature lookup makes adjacent two glyphs + that were not originally adjacent, avoid making + subsequent ligatures between those glyphs. + (From FreeType, Werner Lemberg, 2001-08-22, 2001-08-23) + + src/ftxgsub.c | 31 ++++++++++++++++++++++++++++--- + 1 file changed, 28 insertions(+), 3 deletions(-) + +commit b682482df77608d67eca8a050db5b36f44953c13 +Author: Owen Taylor +Date: Sat Jul 26 13:20:52 2003 +0000 + + Fix some FreeType1 variable declarations that snuck in from the last + + Sat Jul 26 09:16:57 2003 Owen Taylor + + * pango/opentype/ftxgpos.c pango/opentype/ftxopen.c: + Fix some FreeType1 variable declarations that snuck + in from the last commits (Christophe Fergeau, + 118363) + + src/ftxgpos.c | 6 +++--- + src/ftxopen.c | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 06c12109de061c357f46dcec82c4bee7160afede +Author: Owen Taylor +Date: Sat Jul 26 03:45:44 2003 +0000 + + OpenType-1.4 update: backtrack information is stored with the item closest + + Fri Jul 25 23:38:07 2003 Owen Taylor + + * pango/opentype/ftxgpos.c pango/opentype/ftxgsub.c: + OpenType-1.4 update: backtrack information is stored with the + item closest to the input first (From FreeType, + Werner Lemberg, 2002-09-26) + + src/ftxgpos.c | 26 ++++++++++++++++++-------- + src/ftxgsub.c | 24 +++++++++++++++++------- + 2 files changed, 35 insertions(+), 15 deletions(-) + +commit 15a69e4a12739e7392f2a38d6f7bfdd96c0dc3ba +Author: Owen Taylor +Date: Sat Jul 26 03:14:23 2003 +0000 + + Update of GPOS and GSUB support to OpenType 1.3 (From FreeType, Werner + + Fri Jul 25 23:07:06 2003 Owen Taylor + + Update of GPOS and GSUB support to OpenType 1.3 + (From FreeType, Werner Lemberg, 2001-08-08) + + * pango/opentype/ftxopen.h: Add RIGHT_TO_LEFT LookupFlag + + * pango/opentype/ftxgpos.c (GPOS_Instance): Add 'first' + member to mark the beginning of a chain of cursive connections. + + * pango/opentype/ftxgpos.c (Do_String_Lookup): If the + RIGHT_TO_FLAG flag is set, shift cursive chain up so + last glyph is on the baseline. + + src/ftxgpos.c | 25 ++++++++++++++++++++++++- + src/ftxopen.h | 8 ++++++-- + 2 files changed, 30 insertions(+), 3 deletions(-) + +commit 6f74f18b77402f3adf5bfbae26e8f44de6543b4e +Author: Owen Taylor +Date: Sat Jul 26 03:03:40 2003 +0000 + + Add GPOS_LOOKUP_EXTENSION, GSUB_LOOKUP_EXTENSION, which allow lookup + + Fri Jul 25 22:59:13 2003 Owen Taylor + + * pango/opentype/ftx{gpos,gsub}.h pango/opentype/ftxgdef.c: + Add GPOS_LOOKUP_EXTENSION, GSUB_LOOKUP_EXTENSION, which + allow lookup information to be stored at 32-bit offets + via a double indirection. (From FreeType, Werner Lemberg, + 2001-08-08) + + src/ftxgpos.h | 17 +++++++++-------- + src/ftxgsub.h | 1 + + src/ftxopen.c | 19 +++++++++++++++++++ + 3 files changed, 29 insertions(+), 8 deletions(-) + +commit 375781c4546b5cfc453b99551ddf715bb162ffb9 +Author: Owen Taylor +Date: Sat Jul 26 02:44:19 2003 +0000 + + Fix a couple of places where TTO_Err_Not_Covered wasn't considered a + + Fri Jul 25 22:25:48 2003 Owen Taylor + + * pango/opentype/ftxgsub.c (Lookup_ContextSubst2, + Lookup_ChainContextSubst2): Fix a couple of + places where TTO_Err_Not_Covered wasn't considered + a successful return from Get_Class -- it means + use class index 0. (From FreeType, Werner Lemberg, + 2001-08-06) + + src/ftxgsub.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 378e1889cd294cb77313ba7fdab3e52959bf2c40 +Author: Owen Taylor +Date: Sat Jul 26 02:10:42 2003 +0000 + + Improvements to OpenType-dumping code, based on changes in Qt by Lars + + Fri Jul 25 20:12:00 2003 Owen Taylor + + Improvements to OpenType-dumping code, based on + changes in Qt by Lars Knoll. + + * pango/opentype/ottest.c: Tweak the debugging output, + suppress some warnings. + + * pango/opentype/disasm.c: Add support for + GSUB Context/Chain GPOS MarkBase lookups, improve + output in various ways. + + src/disasm.c | 242 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + src/ottest.c | 12 +-- + 2 files changed, 241 insertions(+), 13 deletions(-) + +commit 07bad0e77c42b5f2535e3b018bf9074d2f4ecc7c +Author: Owen Taylor +Date: Thu Jul 24 21:05:29 2003 +0000 + + Fix uses of g_assert() around statements with side effects. (#115498, + + Thu Jul 24 17:04:21 2003 Owen Taylor + + * pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_shape): + Fix uses of g_assert() around statements with side effects. + (#115498, patch from David Cuthbert) + + src/pango-ot-ruleset.c | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit f91deef2c9473da5c3cb5e120f2d4fbf0d638166 +Author: Owen Taylor +Date: Wed Apr 16 21:48:29 2003 +0000 + + More careful handling of face->charmap; if is NULL, try to set a unicode + + Wed Apr 16 03:46:42 2003 Owen Taylor + + * pango/opentype/pango-ot-info.c (synthesize_class_def): + More careful handling of face->charmap; if is NULL, + try to set a unicode charmap, if that doesn't succeed, + return. (Hopefully fixes #106550) + + src/pango-ot-info.c | 26 ++++++++++++++++++++++++-- + 1 file changed, 24 insertions(+), 2 deletions(-) + +commit 587b3940f3ce71e8e1c9950086923d4eb78d62db +Author: Owen Taylor +Date: Wed Apr 16 03:58:17 2003 +0000 + + When loading in Load_Chain{Sub,Pos}ClassRule, the limit we have only + + Tue Apr 15 11:49:39 2003 Owen Taylor + + * pango/opentype/ftxg{sub/pos}.c: When loading + in Load_Chain{Sub,Pos}ClassRule, the limit we + have only applies to the input ClassDef table. + Fixes problem with Arial Unicode. Much help from + Noah Levitt in tracing this down. + + src/ftxgpos.c | 7 ++++--- + src/ftxgsub.c | 7 ++++--- + 2 files changed, 8 insertions(+), 6 deletions(-) + +commit 0d7567f8eaa1f8d0ec9cb89218ce3a1475d258ac +Author: Owen Taylor +Date: Tue Apr 15 23:01:19 2003 +0000 + + Fix mispelled constant from last commit. + + Tue Apr 15 06:57:02 2003 Owen Taylor + + * pango/opentype/ftxgpos.c: Fix mispelled constant + from last commit. + + src/ftxgpos.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 73cd600798a9a7225b2ac8241ea371d48cf7baf3 +Author: Owen Taylor +Date: Tue Apr 15 22:15:41 2003 +0000 + + Fix confusion between boolean and FT_Error return. (#108358, Noah Levitt) + + Tue Apr 15 06:03:39 2003 Owen Taylor + + * pango/opentype/ftxgpos.c: Fix confusion between + boolean and FT_Error return. (#108358, Noah Levitt) + + * pango/opentype/ftxopen.c (Get_Class1): index is + allowed to be NULL. (#108358, Noah Levitt) + + src/ftxgpos.c | 5 +++-- + src/ftxopen.c | 3 ++- + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit 462bd0be608c3d14e5b4c01099b02b3948a52369 +Author: Owen Taylor +Date: Tue Apr 15 21:05:53 2003 +0000 + + Fix infinite loop in the case where the charmap contains a character > + + Tue Apr 15 05:00:39 2003 Owen Taylor + + * pango/opentype/pango-ot-info.c (synthesize_class_def): + Fix infinite loop in the case where the charmap contains + a character > 65535. (#106550, Morten Welinder.) + + src/pango-ot-info.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 312e1c1cf9f2c1e2137b9aaa5181a541447923cb +Author: James Henstridge +Date: Tue Mar 11 12:31:16 2003 +0000 + + make similar changes to the ones on glib head (call gtk-docize, etc). + + 2003-03-11 James Henstridge + + * autogen.sh: make similar changes to the ones on glib head (call + gtk-docize, etc). + + * configure.in: move some calculations into M4 macros, rather than + calculating them when configure runs. + Use AC_HELP_STRING where appropriate. + Replace gtk-doc checks with a call to GTK_DOC_CHECK. + Replace AC_OUTPUT_COMMANDS() call with a number of calls to + AC_CONFIG_COMMANDS (once per created file). + Get rid of the "chmod +x pango-config" bit, because there is no + pango-config anymore. + + * Makefile.am: get rid of custom distcheck rule, and set + DISTCHECK_CONFIGURE_FLAGS, which is equivalent. + Use += to select which .pc files to install. + + * pango/Makefile.am: Add rules to rebuild module-defs* files, and + remove them on clean. + Reorder so that rules related to each individual library are next + to each other. + Use BUILT_SOURCES for built sources. + + * pango/opentype/Makefile.am: don't use STRIP_BEGIN/STRIP_END. + + * modules/*/Makefile.am: simplify module makefiles through use of + +=, and regularise them a bit (fixed a few bugs in the process). + + * docs/Makefile.am: remove common rules, and instead include + gtk-doc.make. + + * examples/Makefile.am: add pango.modules to CLEANFILES. + + * tests/Makefile.am: remove temporary files on clean. + + src/Makefile.am | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit 1aad15fd0c007c9075f2f7f4c4cacf576d726eea +Author: Owen Taylor +Date: Mon Feb 17 22:04:29 2003 +0000 + + Add an --enable-debug configure argument defaulting to 'yes' for unstable + + Mon Feb 17 13:06:39 2003 Owen Taylor + + * configure.in **/Makefile.am: Add an --enable-debug + configure argument defaulting to 'yes' for unstable + releases and 'minimum' for stable releases. + For minimum, -DG_DISABLE_CAST_CHECKS. + + * pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c + pango/pangoxft-fontmap.c: Add caching of fontsets + (#104495, initial patch and review by Soeren Sandmann) + + * pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c + pango/pangoxft-fontmap.c pango/pangoft2-private.h + pango/pangoxft-private.h: Remove cache of recently freed + fonts; not necessary now that we cache fontsets. + + * pango/pangofc-fontmap.cI (pango_fc_pattern_set_free): + Rename from pango_fc_font_set_free to reflect + what it actually does. + + * pango/pangofc-fontmap.cI pango/pangoft-fontmap.c + pango/pangoxft-fontmap.c: Combine clear-the-cache + functions; we didn't need separate clear-the-font-cache + and clear-the-pattern-cache functions. + + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 5febce1ffc956ea44526d50be7cf14c69c66cb34 +Author: Owen Taylor +Date: Wed Feb 12 22:12:55 2003 +0000 + + Up the FreeType version requirement to 2.0.9. (2.2.1 had a compilation + + Wed Feb 12 16:59:23 2003 Owen Taylor + + * configure.in pango/opentype/fterrcompat.h README: + Up the FreeType version requirement to 2.0.9. + (2.2.1 had a compilation failure with older versions, + this catches it more cleanly, and removes some unneeded + checks. #105302, problem reported by Will Partain.) + + src/fterrcompat.h | 4 ---- + 1 file changed, 4 deletions(-) + +commit 54e85cc0cf3700d2c4af5396d79bd0e40df8f0da +Author: Owen Taylor +Date: Sat Jan 11 00:16:26 2003 +0000 + + Export TT_New_GDEF_Table to create an empty GDEF table. + + Fri Jan 10 18:56:36 2003 Owen Taylor + + * pango/opentype/ftxgdef.c: Export TT_New_GDEF_Table + to create an empty GDEF table. + + * pango/opentype/pango-ot-info.c: If the font doesn't + have a class definition table, synthesize one using + the charmap and the unicode properties of characters + in the charmap. (Needed to make things work with various + old Arabic fonts, such as the KACST fonts) + + src/ftxgdef.c | 46 +++++++++++++++------- + src/ftxgdef.h | 4 ++ + src/pango-ot-info.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 144 insertions(+), 14 deletions(-) + +commit db6bb4b034d4d8d546fc9bdc4ad28b16bb7f1bb7 +Author: Matthias Clasen +Date: Thu Nov 28 23:53:18 2002 +0000 + + Add docs. + + * docs/tmpl/xft-fonts.sgml: + * docs/tmpl/freetype-fonts.sgml: Add docs. + + * pango/pangoxft-fontmap.c (pango_xft_substitute_changed): + * pango/pangoft2-fontmap.c + (pango_ft2_font_map_set_default_substitute): + Fix doc typos. + + src/pango-ot-info.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 226d9b67db852eb29ad37ec8121b79f3ea6f0b73 +Author: Sebastian Wilhelmi +Date: Tue Nov 26 13:37:10 2002 +0000 + + Do not add GLIB_CFLAGS to CFLAGS. + + + 2002-11-26 Sebastian Wilhelmi + + * configure.in: Do not add GLIB_CFLAGS to CFLAGS. + + * docs/Makefile.am, examples/Makefile.am, + modules/arabic/Makefile.am, modules/basic/Makefile.am, + modules/hangul/Makefile.am, modules/hebrew/Makefile.am, + modules/indic/Makefile.am, modules/tamil/Makefile.am, + modules/thai/Makefile.am, pango/Makefile.am, + pango/mini-fribidi/Makefile.am, pango/opentype/Makefile.am: + Instead add $(GLIB_CFLAGS) directly to INCLUDES (GTKDOC_CFLAGS for + docs/Makefile.am). Also some cosmetic line wrapping and + reindentation. + + src/Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 80634a30b9abdf575320bc6fdacdba4e1ea3903d +Author: Manish Singh +Date: Mon Oct 14 22:50:48 2002 +0000 + + Get rid of unnecessary casts for g_object_{ref,unref} + + Mon Oct 14 15:39:41 2002 Manish Singh + + * pango/pango-context.c pango/pango-layout.c pango/pangoft2.c + pango/pangowin32-fontmap.c pango/pangowin32.c pango/pangox-fontmap.c + pango/pangox.c pango/pangoxft-font.c pango/pangoxft-fontmap.c + pango/testfonts.c pango/opentype/pango-ot-ruleset.c: + Get rid of unnecessary casts for g_object_{ref,unref} + + src/pango-ot-ruleset.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 741993e0b15b4df86d76fa8df5055bd764c42c71 +Author: Owen Taylor +Date: Sun Sep 29 19:06:58 2002 +0000 + + ligatures can be also used in MarkBasePos lookups. (2001-03-17 Werner + + Sun Sep 29 14:55:36 2002 Owen Taylor + + * pango/opentype/ftxgpos.c: ligatures can be also used in + MarkBasePos lookups. (2001-03-17 Werner Lemberg) + + src/ftxgpos.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +commit a35dc445e86ab433fe9f3937c95f2c1f18f58110 +Author: Owen Taylor +Date: Sun Sep 29 19:05:01 2002 +0000 + + Start of merges from freetype1 of OpenType fixes. + + Sun Sep 29 14:51:25 2002 Owen Taylor + + Start of merges from freetype1 of OpenType fixes. + + (2001-03-17 Werner Lemberg) + + * pango/opentype/ftxgdef.c pango/opentype/ftxgpos.c pango/opentype/ftxg\sub.c: + More fixes for special marks. + + src/ftxgdef.c | 13 ++++++++----- + src/ftxgpos.c | 6 +++--- + src/ftxgsub.c | 4 ++-- + 3 files changed, 13 insertions(+), 10 deletions(-) + +commit 5c53f14f371b349da65dfa3a848b17ab89ce3ba8 +Author: Tor Lillqvist +Date: Mon Sep 23 21:45:31 2002 +0000 + + Remove. Not used. (A static library is built here. Exported entries are in + + 2002-09-24 Tor Lillqvist + + * pango/opentype/pango-ot.def: Remove. Not used. (A static library + is built here. Exported entries are in ../pangoft2.def.) + + * pango/opentype/Makefile.am (EXTRA_DIST): Remove from here, too. + + src/Makefile.am | 3 +-- + src/pango-ot.def | 50 -------------------------------------------------- + 2 files changed, 1 insertion(+), 52 deletions(-) + +commit 35e4593ccd9ea5ed78f1e6f32f04b3a13cee0145 +Author: Tor Lillqvist +Date: Mon Sep 23 21:19:30 2002 +0000 + + pango/makefile.mingw.in pango/mini-fribidi/makefile.mingw Remove. Not + + 2002-09-23 Tor Lillqvist + + * pango/makefile.mingw.in + * pango/mini-fribidi/makefile.mingw + * pango/opentype/makefile.mingw.in: Remove. Not maintained. + + * pango/Makefile.am (EXTRA_DIST) + * pango/mini-fribidi/Makefile.am (EXTRA_DIST) + * pango/opentype/Makefile.am (EXTRA_DIST): Remove + makefile.mingw(.in) from here, too. + + * configure.in (AC_OUTPUT): Don't try to output above removed + files. + + src/Makefile.am | 3 +-- + src/makefile.mingw.in | 43 ------------------------------------------- + 2 files changed, 1 insertion(+), 45 deletions(-) + +commit fb279cb0bf676bb1d225e6a296282523d839074d +Author: Eric Mader +Date: Mon Sep 9 18:11:55 2002 +0000 + + Correctly handle back, new_advance. + + src/pango-ot-ruleset.c | 25 ++++++++++++++++--------- + 1 file changed, 16 insertions(+), 9 deletions(-) + +commit c880e814a50100577811a8a51bc06b4275c55a7e +Author: Eric Mader +Date: Fri Sep 6 22:45:23 2002 +0000 + + Don't fail when reading an empty script. + + src/ftxopen.c | 36 +++++++++++++++++++++++++----------- + src/ftxopen.h | 1 + + 2 files changed, 26 insertions(+), 11 deletions(-) + +commit 441e7d0292bf1a06396daac80fcbad23976a824d +Author: Owen Taylor +Date: Wed Aug 7 17:01:52 2002 +0000 + + Offset to MarkAttachClassDef is offset to table, not offset to offset to + + Wed Aug 7 12:32:39 2002 Owen Taylor + + * pango/opentype/ftxgsub.c (TT_Load_GSUB_Table): + Offset to MarkAttachClassDef is offset to table, + not offset to offset to table. + + * pango/opentype/ftxopen.c (Get_Device): Handle + NULL device tables which we represent with + d->DeltaValue == NULL. + + src/ftxgsub.c | 13 ------------- + src/ftxopen.c | 2 +- + 2 files changed, 1 insertion(+), 14 deletions(-) + +commit 48a16fa8090b67b046b2bb686ff4f6f038a2b8e8 +Author: Owen Taylor +Date: Tue Jun 4 00:20:51 2002 +0000 + + on Jun 3 18:56:09 2002 Owen Taylor + + Xft2 and fontconfig conversion, based largely on a patch + from Keith Packard. + + * configure.in acconfig.h: Add checks for fontconfig, switch + Xft checks to switch for Xft2 using pkg-config. + + * pangoxft.pc.in pangoxft.pc.in + modules/{arabic,basic,hebrew,indic,tamil}/Makefile.am + pango/Makefile.am: Reflect new Xft/fontconfig dependencies. + + * pango/pangoxft-private.h pango/pangoxft-fontmap.c + modules/arabic/arabic-xft.c modules/indic/indic-xft.c: + Switch over to using Xft2 and fontconfig. + + * pango/pangoft2.c pango/pangoft2-fontmap.c pango/pangoft2-private.h + pango/pango/Makefile.am: Remove usage of mini-xft in + favor of fontconfig. + + * pango/pango-ot.h pango/opentype/pango-ot-info.c pango/pangoxft.h + modules/arabic/arabic-{xft,ft2}.c modules/indic/indic-xft.c: + Attach OpenType information directly to the FT_Face + structure using FT_Generic. + + * modules/tamil/Makefile.am modules/tamil/tamil-xft.c + configure.in: Remove this module, no longer needed. + + * pango/pangoxft-font.c (pango_xft_real_render): Coalesce + calls to Xft rendering functions. + + src/pango-ot-info.c | 29 +++++++++++++++++++++++------ + 1 file changed, 23 insertions(+), 6 deletions(-) + +commit 9df9af0b3615dc6a52d784233a3410a9080d9369 +Author: Owen Taylor +Date: Fri May 10 18:44:47 2002 +0000 + + Fix acess outside of a loaded frame and some memory leaks on failure. + + Fri May 10 14:41:27 2002 Owen Taylor + + * pango/opentype/ftxgdef.c (TT_Load_GDEF_Table): Fix acess + outside of a loaded frame and some memory leaks + on failure. + + src/ftxgdef.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit a63dbbbeeb91ebf4ded2fc788f5810a3bd1e14fe +Author: Eric Mader +Date: Tue May 7 20:39:14 2002 +0000 + + Add modules modules/indic/indic-xft.c, indic-ot.c, indic-ot.h, + + Mon May 06 15:07:39 2002 Eric Mader + * Add modules modules/indic/indic-xft.c, indic-ot.c, indic-ot.h, indic-ot-class-tables.c + + * pango/opentype/ftxgdef.c: Compute full offset for mark attachment class table + + * pango/opentype/ftxgpos.c: Only return TTO_Err_Not_Covered if nothing matches + + * pango/opentype/pango-ot-ruleset.c: enable GPOS processing + + src/ftxgdef.c | 10 ++++++++-- + src/ftxgpos.c | 33 ++++++++++++++------------------- + src/pango-ot-ruleset.c | 35 ++++++++++++++++++++++++++++++++++- + 3 files changed, 56 insertions(+), 22 deletions(-) + +commit cf00f8217c9dfcf50febbb06fad245d489a0abe6 +Author: Owen Taylor +Date: Tue Apr 23 20:20:29 2002 +0000 + + Add compatibility defines for changes in FreeType 2.1.0. + + Tue Apr 23 16:15:07 2002 Owen Taylor + + * pango/opentype/fterrcompat.h: Add compatibility + defines for changes in FreeType 2.1.0. + + src/fterrcompat.h | 39 +++++++++++++++++++++++++++++++++++++-- + 1 file changed, 37 insertions(+), 2 deletions(-) + +commit 6b1b04e3736fdca774052ac3cfbe9f027548c29d +Author: Owen Taylor +Date: Fri Mar 15 06:46:05 2002 +0000 + + In Load_ChainContextSubst2, handle the case where an empty class + + Fri Mar 15 01:35:56 2002 Owen Taylor + + * pango/opentype/ftxgsub.c pango/opentype/ftxopen.c + pango/opentype/ftxopenf.h: In Load_ChainContextSubst2, + handle the case where an empty class definition + is represented by an offset of 0. + + * pango/opentype/ftxgpos.c: Same for Load_ChainContextPos2. + + * pango/opentype/{ftxopen.c,ftxgpos.c,ftxgsub.c,ftgdef.c}: + Fix pervasive bug where on cleanups on failure of loading + an array element, all array elements were freed, not + just the ones that had been succesfully loaded. + + src/ftxgdef.c | 24 +++--- + src/ftxgpos.c | 259 ++++++++++++++++++++++++++++++++++++--------------------- + src/ftxgsub.c | 159 ++++++++++++++++++++--------------- + src/ftxopen.c | 53 ++++++++---- + src/ftxopenf.h | 2 + + 5 files changed, 306 insertions(+), 191 deletions(-) + +commit 6050933f336f43453e35246525cfec362bd23acb +Author: Owen Taylor +Date: Fri Mar 15 04:22:14 2002 +0000 + + Uncomment GPOS parts. + + Thu Mar 14 23:05:18 2002 Owen Taylor + + * pango/opentype/ftxopen.c: Uncomment GPOS parts. + + * pango/opentype/disasm.c: Start adding some GPOS + dumping. + + src/disasm.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/ftxopen.c | 20 ++++---- + 2 files changed, 154 insertions(+), 12 deletions(-) + +commit 973bd60a2526666f68138255b8536d1eaee3c2c2 +Author: Sebastian Wilhelmi +Date: Thu Dec 13 17:44:46 2001 +0000 + + Resuming aborted commit + + + Resuming aborted commit + + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 6926ca94255e5d52d99d0d64d126165fc725432d +Author: Matthias Clasen +Date: Tue Oct 30 22:09:20 2001 +0000 + + Remove declarations of unimplemented functions + + * docs/pango-sections.txt, pango/pango-ot.h: Remove declarations + of unimplemented functions pango_ot_ruleset_set_glyph_loader and + pango_ot_ruleset_set_alternate_func and the related typedefs + PangoOTGlyphLoader and PangoOTAlternateFunc. + + * pango/opentype/pango-ot-info.c, + pango/opentype/pango-ot-ruleset.c: Documentation updates. + + src/pango-ot-info.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++ + src/pango-ot-ruleset.c | 27 ++++++++++++++++++ + 2 files changed, 103 insertions(+) + +commit 87a475c09f6b9b391bca37de47a303a62a397b83 +Author: Havoc Pennington +Date: Wed Sep 19 21:20:36 2001 +0000 + + header to abstract the difference between FreeType 2.0.3 and 2.0.4 error + + 2001-09-19 Havoc Pennington + + * pango/opentype/fterrcompat.h: header to abstract the difference + between FreeType 2.0.3 and 2.0.4 error codes, based on the + configure check. + + * configure.in: check for the tterrors.h header in FreeType 2.0.3, + and define HAVE_FREETYPE_2_0_3 if we have it + + src/Makefile.am | 1 + + src/fterrcompat.h | 16 ++++++++++++++++ + src/ftxgdef.c | 3 ++- + src/ftxgpos.c | 3 ++- + src/ftxgsub.c | 3 ++- + src/ftxopen.c | 3 ++- + src/pango-ot-info.c | 2 +- + 7 files changed, 26 insertions(+), 5 deletions(-) + +commit 9c37226efe2489b4cf9618ec98f581c998aaf9e4 +Author: Owen Taylor +Date: Tue Sep 18 20:05:20 2001 +0000 + + Up to 0.19. + + Tue Sep 18 15:47:08 2001 Owen Taylor + + * configure.in (PANGO_MINOR_VERSION): Up to 0.19. + + * pango/pango-font.h pango/pango-fontmap.[ch] pango/fonts.c + pango/pangoxft-fontmap.c pango/pangoft-fontmap.c pango/pango-context.[ch] + pango/pangox-fontmap.c: Add new PangoFontFace and PangoFontFamily + object types, and change the font listing API to list faces and + families, instead of face names and font descriptions. + + * pango/pango-font.h pango/fonts.c: Make PangoFontDescription + an opaque heap-allocated structure, add accessors and + convenience functions. + + * pango/pango-font.h pango/pango-private.h: Make PangoFontMetrics + heap allocated, protect the structure definition with + #ifdef PANGO_ENABLE_BACKEND, and add getters for the fields. + + * pango/pango-attributes.[ch] ( pango_attr_iterator_get_font): + instead of providing a base font description and one to fill + in, provide a single font description to modify based on + the attributes. + + * pango/pango-attributes.[ch]: Fix PangoAttrFontDesc to have + a PangoFontDescription by reference, not by value. + + * pango/pango-utils.[ch]: make pango_parse_style() and friends + take pointers to individual enumerations instead of to a + PangoFontDescription structure. + + * pango/*.c: Fix for the PangoFontDescription and PangoFontMetrics + changes. + + * pango/pango-{break,engine,indic,ot,xft}.h pango/Makefile.am + pango/opentype/Makefile.am: Protect portions with + PANGO_ENABLE_ENGINE to shrink the public API. + + * modules/*/Makefile.am: -DPANGO_ENABLE_ENGINE. + + * pango/{pangox.h,pangox-private.h} modules/basic/basic-x.c: Move + pango_x_font_get_unknown_glyph() into public header since it is + used from modules. + + * pango/pango-{context,font,fontmap,modules.utils}.h pango/Makefile.am: + Protect portions with PANGO_ENABLE_BACKEND to shrink the public API. + + * pango/*.h: Use G_BEGIN/END_DECLS + + * examples/viewer-qt.[cc,h]: Fix for changes to font listing API, + PangoFontDescription. + + * pango/pango-indic.h modules/indic/*: Since we install this + header fix it up to Pango conventions, namespece + ZERO_WIDTH_JOINER, ZERO_WIDTH_NON_JOINER. + + * docs/pango-sections.txt: Updated. + + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 7dd0838863f65a8ff2e27d12679c9a289a76aec1 +Author: Darin Adler +Date: Thu Jul 12 16:34:40 2001 +0000 + + Remove stray semicolon. + + * modules/arabic/arabic-x.c: (arabic_engine_shape): Remove stray + semicolon. + + * modules/arabic/arconv.h: + * modules/arabic/arconv.c: (shape), (doublelig), (arabic_reshape): + Use long* instead of int* for parameter to match what's passed in. + + * modules/indic/bengali-x.c: Add missing include. + (pango_indic_make_ligs): Use local variable that was added but not + ever used. + (pango_indic_engine_shape): Remove unused locals. + + * modules/indic/devanagari-x.c: Add missing include. + (pango_indic_engine_shape): Remove unused local. + + * modules/indic/gujarati-x.c: Add missing include. + (pango_indic_engine_shape): Remove unused local + + * modules/tamil/tamil-x.c: (tamil_engine_shape): Initialize a + variable to quiet the compiler's unused warning. + + * pango/.cvsignore: Ignore more generated files. + + * pango/opentype/ftxgpos.c: (Get_Anchor): Add code to set up the + ap variable. The old code would just use the uninitialized value. + + * pango/opentype/ftxopen.c: (Load_Coverage): Remove unused local. + + * pango/opentype/pango-ot-ruleset.c: (pango_ot_ruleset_shape): + Remove unused local. + + * pango/pango-attributes.c: (pango_attr_list_get_type), + (pango_color_get_type): Add needed function type casts (just + warnings under gcc, but could be errors in other compilers). + + * pango/pangoxft-font.c: (pango_xft_font_get_metrics), + (pango_xft_font_get_coverage), (pango_xft_get_shaper_map), + (pango_xft_font_find_shaper): Switch from lang char* to + PangoLanguage*. The code was still compiling, but would not have + worked. + + src/ftxgpos.c | 2 ++ + src/ftxopen.c | 1 - + src/pango-ot-ruleset.c | 1 - + 3 files changed, 2 insertions(+), 2 deletions(-) + +commit 68f8a64307441bd3b3d45971ac4dc93f63dedfe8 +Author: Owen Taylor +Date: Fri May 18 16:04:40 2001 +0000 + + Use ISO C99 varargs when available. + + Fri May 18 11:30:57 2001 Owen Taylor + + * pango/opentype/disasm.c: Use ISO C99 varargs when + available. + + Thu May 17 11:16:23 2001 Owen Taylor + + * pango/mapping.c: Fixup docs, remove some FIXMEs that are + no longer applicable. + + * pango/pango-layout.c: Move by graphemes, not characters. + + * pango/pango-layout.c (pango_layout_line_x_to_index): + Position at the closest grapheme boundary, not at character + boundaries. + + * pango/pango-layout.c (pango_layout_line_index_to_x): + Return positions of grapheme boundaries, not character + boundaries. + + src/Makefile.am | 2 ++ + src/disasm.c | 5 +++++ + 2 files changed, 7 insertions(+) + +commit 89eb36ebc6591025c063cb98f0e1b3badde73e9e +Author: Owen Taylor +Date: Tue Apr 24 15:47:22 2001 +0000 + + Remove excess call to DONE_Stream left over from conversion from FT1. + + Tue Apr 24 11:45:55 2001 Owen Taylor + + * pango/opentype/ftxgdef.c (TT_Load_GDEF_Table): Remove + excess call to DONE_Stream left over from conversion + from FT1. (reported by Michael Jansson) + + src/ftxgdef.c | 1 - + 1 file changed, 1 deletion(-) + +commit c61a730aaebec751831f8423894de5f4b539d0ec +Author: Owen Taylor +Date: Tue Apr 3 19:07:36 2001 +0000 + + Release 0.14 + + Tue Apr 3 15:05:19 2001 Owen Taylor + + * Release 0.14 + + * NEWS: updated. + + * pango/pango/opentype/Makefile.am: make dist fixes. + + * configure.in (PANGO_MINOR_VERSION): Up to 0.14 + + src/Makefile.am | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 405b878923ed219617c6f643a9aec06175223d16 +Author: Tor Lillqvist +Date: Thu Dec 21 19:55:23 2000 +0000 + + Only a script engine here. + + 2000-12-21 Tor Lillqvist + + * modules/basic/basic-win32.c (script_engine_load): Only a script + engine here. + + * pango/makefile.mingw.in: Add the built pango-enum-types.[ch]. + + * pango/pango.def + * pango/pangoft2.def: Update. + + * pango/opentype/pango-ot.def + * pango/opentype/makefile.mingw.in: New files. + + * pango/opentype/Makefile.am (EXTRA_DIST): Add them. + + * configure.in (included_modules): Generate + pango/opentype/makefile.mingw. + + src/Makefile.am | 4 +++- + src/makefile.mingw.in | 43 +++++++++++++++++++++++++++++++++++++++++++ + src/pango-ot.def | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 96 insertions(+), 1 deletion(-) + +commit 80a15829135065e16ce5b129c715d10d14b829ba +Author: Owen Taylor +Date: Wed Dec 20 04:41:36 2000 +0000 + + Since Xft may only be available statically without shlib deps, check for + + Tue Dec 19 22:47:16 2000 Owen Taylor + + * configure.in pango-config.in pangoxft.pc.in + modules/basic/Makefile.am: Since Xft may only be available + statically without shlib deps, check for FreeType libs explicitly + and include them when linking, otherwise things won't work. Also, + define FREETYPE_CFLAGS from freetype-config --cflags. + + * modules/basic/basic-xft.c pango/pangoxft-font{,map}.c: Fool + Xft into not converting glyph indices by loading the + face unencoded then calling FT_Set_Charmap ourselves. + + * pango/Makefile.am pango/pango-ot.h pango/opentype/* :Add start + of opentype handling - most of the actually meat of the code here + is the OpenType layout code from FreeType 1 ported to freetype2 + and adapted slighlty for our purposes. Also, includes a + incomplete OpenType-table-dumping code useful for figuring + out what is going on. + + * pango/pangoxft.h pango/pangoxft-font.h: Add calls for + getting FT_Face and PangoOTInfo from PangoXftFont. + + * modules/arabic/{Makefile.am,arabic-ot.[ch],arabic-xft.c}: + Initial support for rendering Arabic with OpenType fonts. + + src/.cvsignore | 8 + + src/FT-license.txt | 158 ++ + src/Makefile.am | 39 + + src/README | 36 + + src/disasm.c | 317 +++ + src/disasm.h | 26 + + src/ftxgdef.c | 1155 +++++++++ + src/ftxgdef.h | 220 ++ + src/ftxgpos.c | 6222 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/ftxgpos.h | 858 +++++++ + src/ftxgsub.c | 4531 +++++++++++++++++++++++++++++++++++ + src/ftxgsub.h | 612 +++++ + src/ftxopen.c | 1467 ++++++++++++ + src/ftxopen.h | 308 +++ + src/ftxopenf.h | 161 ++ + src/ottest.c | 265 +++ + src/pango-ot-info.c | 438 ++++ + src/pango-ot-private.h | 98 + + src/pango-ot-ruleset.c | 232 ++ + 19 files changed, 17151 insertions(+) diff --git a/source/libs/harfbuzz/harfbuzz-src/Makefile.am b/source/libs/harfbuzz/harfbuzz-src/Makefile.am new file mode 100644 index 000000000..2bbd3c55d --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/Makefile.am @@ -0,0 +1,103 @@ +# Process this file with automake to produce Makefile.in + +NULL = + +ACLOCAL_AMFLAGS = -I m4 + +SUBDIRS = src util test docs + +EXTRA_DIST = \ + autogen.sh \ + harfbuzz.doap \ + README.md \ + README.mingw.md \ + README.python.md \ + BUILD.md \ + CONFIG.md \ + RELEASING.md \ + TESTING.md \ + CMakeLists.txt \ + replace-enum-strings.cmake \ + mingw-configure.sh \ + mingw-ldd.py \ + mingw32.sh \ + mingw64.sh \ + $(NULL) + +MAINTAINERCLEANFILES = \ + $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \ + $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \ + $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \ + $(srcdir)/INSTALL \ + $(srcdir)/ChangeLog \ + $(srcdir)/gtk-doc.make \ + $(srcdir)/m4/gtk-doc.m4 \ + $(NULL) + + +# +# ChangeLog generation +# +CHANGELOG_RANGE = +ChangeLog: $(srcdir)/ChangeLog +$(srcdir)/ChangeLog: + $(AM_V_GEN) if test -d "$(top_srcdir)/.git"; then \ + (GIT_DIR=$(top_srcdir)/.git \ + $(GIT) log $(CHANGELOG_RANGE) --stat) > $@.tmp \ + && mv -f $@.tmp "$(srcdir)/ChangeLog" \ + || ($(RM) $@.tmp; \ + echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ + (test -f $@ || echo git-log is required to generate this file >> "$(srcdir)/$@")); \ + else \ + test -f $@ || \ + (echo A git checkout and git-log is required to generate ChangeLog >&2 && \ + echo A git checkout and git-log is required to generate this file >> "$(srcdir)/$@"); \ + fi +.PHONY: ChangeLog $(srcdir)/ChangeLog + + +# +# Release engineering +# + +DISTCHECK_CONFIGURE_FLAGS = \ + --enable-gtk-doc \ + --disable-doc-cross-references \ + --with-gobject \ + --enable-introspection \ + $(NULL) + +# TAR_OPTIONS is not set as env var for 'make dist'. How to fix that? +TAR_OPTIONS = --owner=0 --group=0 + +dist-hook: dist-clear-sticky-bits +# Clean up any sticky bits we may inherit from parent dir +dist-clear-sticky-bits: + chmod -R a-s $(distdir) + +tar_file = $(PACKAGE_TARNAME)-$(VERSION).tar.xz +sha256_file = $(tar_file).sha256 +gpg_file = $(sha256_file).asc +$(sha256_file): $(tar_file) + sha256sum $^ > $@ +$(gpg_file): $(sha256_file) + @echo "Please enter your GPG password to sign the checksum." + gpg --armor --sign $^ + +release-files: $(tar_file) $(sha256_file) $(gpg_file) + +dist-win: + @case $(host_triplet) in *-w64-mingw32) ;; *) echo "Error: Requires mingw build. See README.mingw.md.">&2; exit 1 ;; esac + @DIR=$(PACKAGE_TARNAME)-$(VERSION)-win`case $(host_triplet) in i686-*) echo 32 ;; x86_64-*) echo 64 ;; esac`; \ + $(RM) -r $$DIR; $(MKDIR_P) $$DIR || exit 1; \ + cp util/.libs/hb-{shape,view,subset}.exe $$DIR && \ + $(top_srcdir)/mingw-ldd.py $$DIR/hb-view.exe | grep -v 'not found' | cut -d '>' -f 2 | xargs cp -t $$DIR && \ + cp src/.libs/libharfbuzz{,-subset}-0.dll $$DIR && \ + chmod a+x $$DIR/*.{exe,dll} && \ + $(STRIP) $$DIR/*.{exe,dll} && \ + zip -r $$DIR.zip $$DIR && \ + $(RM) -r $$DIR && \ + echo "$$DIR.zip is ready." + + +-include $(top_srcdir)/git.mk diff --git a/source/libs/harfbuzz/harfbuzz-src/NEWS b/source/libs/harfbuzz/harfbuzz-src/NEWS new file mode 100644 index 000000000..30fa8c397 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/NEWS @@ -0,0 +1,2316 @@ +Overview of changes leading to 2.6.2 +Monday, September 30, 2019 +==================================== +- Misc small fixes, mostly to build-related issues. + + +Overview of changes leading to 2.6.1 +Thursday, August 22, 2019 +==================================== +- Fix regression with hb_font_create_sub_font scaling introduced in 2.6.0. +- Change interpretation of font PTEM size / CoreText font size handling. + See https://github.com/harfbuzz/harfbuzz/pull/1484 +- hb-ot-font: Prefer symbol cmap subtable if present. +- Apply 'dist'/'abvm'/'blwm' features to all scripts. +- Drop experimental DirectWrite API. + + +Overview of changes leading to 2.6.0 +Tuesday, August 13, 2019 +==================================== +- New OpenType metrics, baseline, and metadata table access APIs. +- New API to set font variations to a named-instance. +- New hb-gdi.h header and API for creating hb_face_t from HFONT. +- Amalgam: Provide a single-file harfbuzz.cc file for easier alternate building. +- More size-reduction configurable options, enabled by HB_TINY. +- New API: ++hb_font_set_var_named_instance() ++hb_gdi_face_create() ++hb_ot_layout_baseline_tag_t ++hb_ot_layout_get_baseline() ++hb_ot_meta_tag_t ++hb_ot_meta_get_entry_tags() ++hb_ot_meta_reference_entry() ++hb_ot_metrics_tag_t ++hb_ot_metrics_get_position() ++hb_ot_metrics_get_variation() ++hb_ot_metrics_get_x_variation() ++hb_ot_metrics_get_y_variation() + + +Overview of changes leading to 2.5.3 +Wednesday, June 26, 2019 +==================================== +- Fix UCD script data for Unicode 10+ scripts. This was broken since 2.5.0. +- More optimizations for HB_TINY. + + +Overview of changes leading to 2.5.2 +Thursday, June 20, 2019 +==================================== +- More hb-config.hh facilities to shrink library size, namely when built as + HB_TINY. +- New documentation of custom configurations in CONFIG.md. +- Fix build on gcc 4.8. That's supported again. +- Universal Shaping Engine improvements thanks to David Corbett. +- API Changes: Undeprecate some horizontal-kerning API and re-enable in hb-ft, + such that Type1 fonts will continue kerning. + + +Overview of changes leading to 2.5.1 +Friday, May 31, 2019 +==================================== +- Fix build with various versions of Visual Studio. +- Improved documentation, thanks to Nathan Willis. +- Bugfix in subsetting glyf table. +- Improved scripts for cross-compiling for Windows using mingw. +- Rename HB_MATH_GLYPH_PART_FLAG_EXTENDER to HB_OT_MATH_GLYPH_PART_FLAG_EXTENDER. + A deprecated macro is added for backwards-compatibility. + + +Overview of changes leading to 2.5.0 +Friday, May 24, 2019 +==================================== +- This release does not include much functional changes, but includes major internal + code-base changes. We now require C++11. Support for gcc 4.8 and earlier has been + dropped. +- New hb-config.hh facility for compiling smaller library for embedded and web usecases. +- New Unicode Character Databse implementation that is half the size of previously-used + UCDN. +- Subsetter improvements. +- Improved documentation, thanks to Nathan Willis. +- Misc shaping fixes. + + +Overview of changes leading to 2.4.0 +Monday, March 25, 2019 +==================================== +- Unicode 12. +- Misc fixes. +- Subsetter improvements. +- New API: +HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE +hb_directwrite_face_create() + + +Overview of changes leading to 2.3.1 +Wednesday, January 30, 2019 +==================================== +- AAT bug fixes. +- Misc internal housekeeping cleanup. + + +Overview of changes leading to 2.3.0 +Thursday, December 20, 2018 +==================================== +- Fix regression on big-endian architectures. Ouch! +- Misc bug and build fixes. +- Fix subsetting of simple GSUB/GDEF. +- Merge CFF / CFF2 support contributed by Adobe. This mostly involves + the subsetter, but also get_glyph_extents on CFF fonts. + +New API in hb-aat.h: ++hb_aat_layout_has_substitution() ++hb_aat_layout_has_positioning() ++hb_aat_layout_has_tracking() + + +Overview of changes leading to 2.2.0 +Thursday, November 29, 2018 +==================================== +- Misc shaping bug fixes. +- Add font variations named-instance API. +- Deprecate font variations axis enumeration API and add replacement. +- AAT shaping improvements: + o Fixed 'kern' table Format 2 implementation. + o Implement 'feat' table API for feature detection. + o Blacklist 'GSUB' table of fonts from 'MUTF' foundry that also have 'morx'. + +New API: ++hb_aat_layout_feature_type_t ++hb_aat_layout_feature_selector_t ++hb_aat_layout_get_feature_types() ++hb_aat_layout_feature_type_get_name_id ++hb_aat_layout_feature_selector_info_t ++HB_AAT_LAYOUT_NO_SELECTOR_INDEX ++hb_aat_layout_feature_type_get_selector_infos() ++hb_ot_var_axis_flags_t ++hb_ot_var_axis_info_t ++hb_ot_var_get_axis_infos() ++hb_ot_var_find_axis_info() ++hb_ot_var_get_named_instance_count() ++hb_ot_var_named_instance_get_subfamily_name_id() ++hb_ot_var_named_instance_get_postscript_name_id() ++hb_ot_var_named_instance_get_design_coords() + +Deprecated API: ++HB_OT_VAR_NO_AXIS_INDEX ++hb_ot_var_axis_t ++hb_ot_var_get_axes() ++hb_ot_var_find_axis() + + +Overview of changes leading to 2.1.3 +Friday, November 16, 2018 +==================================== +- Fix AAT 'mort' shaping, which was broken in 2.1.2 + + +Overview of changes leading to 2.1.2 +Friday, November 16, 2018 +==================================== +- Various internal changes. +- AAT shaping improvements: + o Implement kern table Format 1 state-machine-based kerning. + o Implement cross-stream kerning (cursive positioning, etc). + o Ignore emptyish GSUB tables (zero scripts) if morx present. + o Don't apply GPOS if morx is being applied. Matches Apple. + + +-Overview of changes leading to 2.1.1 +Monday, November 5, 2018 +==================================== +- AAT improvements: + o Implement 'mort' table. + o Implement 'kern' subtables Format 1 and Format 3. + + +Overview of changes leading to 2.1.0 +Tuesday, October 30, 2018 +==================================== +- AAT shaping improvements: + o Allow user controlling AAT features, for whole buffer only currently. + o Several 'morx' fixes. + o Implement tuple-kerns in 'kerx'; Fixes kerning with Apple default + San Francisco fonts. +- Support for color fonts: + o COLR/CPAL API to fetch color layers. + o SVG table to fetch SVG documents. + o CBDT/sbix API to fetch PNG images. +- New 'name' table API. +- hb-ot-font now uses 'VORG' table to correctly position CFF glyphs + in vertical layout. +- Various fuzzer-found bug fixes. + +Changed API: + +A type and a macro added in 2.0.0 were renamed: + +hb_name_id_t -> hb_ot_name_id_t +HB_NAME_ID_INVALID -> HB_OT_NAME_ID_INVALID + +New API: + ++hb_color_t ++HB_COLOR ++hb_color_get_alpha() ++hb_color_get_red() ++hb_color_get_green() ++hb_color_get_blue() ++hb_ot_color_has_palettes() ++hb_ot_color_palette_get_count() ++hb_ot_color_palette_get_name_id() ++hb_ot_color_palette_color_get_name_id() ++hb_ot_color_palette_flags_t ++hb_ot_color_palette_get_flags() ++hb_ot_color_palette_get_colors() ++hb_ot_color_has_layers() ++hb_ot_color_layer_t ++hb_ot_color_glyph_get_layers() ++hb_ot_color_has_svg() ++hb_ot_color_glyph_reference_svg() ++hb_ot_color_has_png() ++hb_ot_color_glyph_reference_png() + ++hb_ot_name_id_t ++HB_OT_NAME_ID_INVALID ++HB_OT_NAME_ID_COPYRIGHT ++HB_OT_NAME_ID_FONT_FAMILY ++HB_OT_NAME_ID_FONT_SUBFAMILY ++HB_OT_NAME_ID_UNIQUE_ID ++HB_OT_NAME_ID_FULL_NAME ++HB_OT_NAME_ID_VERSION_STRING ++HB_OT_NAME_ID_POSTSCRIPT_NAME ++HB_OT_NAME_ID_TRADEMARK ++HB_OT_NAME_ID_MANUFACTURER ++HB_OT_NAME_ID_DESIGNER ++HB_OT_NAME_ID_DESCRIPTION ++HB_OT_NAME_ID_VENDOR_URL ++HB_OT_NAME_ID_DESIGNER_URL ++HB_OT_NAME_ID_LICENSE ++HB_OT_NAME_ID_LICENSE_URL ++HB_OT_NAME_ID_TYPOGRAPHIC_FAMILY ++HB_OT_NAME_ID_TYPOGRAPHIC_SUBFAMILY ++HB_OT_NAME_ID_MAC_FULL_NAME ++HB_OT_NAME_ID_SAMPLE_TEXT ++HB_OT_NAME_ID_CID_FINDFONT_NAME ++HB_OT_NAME_ID_WWS_FAMILY ++HB_OT_NAME_ID_WWS_SUBFAMILY ++HB_OT_NAME_ID_LIGHT_BACKGROUND ++HB_OT_NAME_ID_DARK_BACKGROUND ++HB_OT_NAME_ID_VARIATIONS_PS_PREFIX ++hb_ot_name_entry_t ++hb_ot_name_list_names() ++hb_ot_name_get_utf8() ++hb_ot_name_get_utf16() ++hb_ot_name_get_utf32() + + +Overview of changes leading to 2.0.2 +Saturday, October 20, 2018 +==================================== +- Fix two minor memory access issues in AAT tables. + + +Overview of changes leading to 2.0.1 +Friday, October 19, 2018 +==================================== +- Fix hb-version.h reported release version that went wrong (1.8.0) + with previous release. +- Fix extrapolation in 'trak' table. +- Fix hb-font infinite-recursion issue with some font funcs and + subclassed fonts. +- Implement variation-kerning format in kerx table, although without + variation. +- Fix return value of hb_map_is_empty(). + + +Overview of changes leading to 2.0.0 +Thursday, October 18, 2018 +==================================== +- Added AAT shaping support (morx/kerx/trak). + Automatically used if GSUB/GPOS are not available respectively. + Set HB_OPTIONS=aat env var to have morx/kerx preferred over + GSUB/GPOS. +- Apply TrueType kern table internally, instead of relying on + hb_font_t callbacks. +- Khmer shaper significantly rewritten to better match Uniscribe. +- Indic3 tags ('dev3', etc) are passed to USE shaper. +- .dfont Mac font containers implemented. +- Script- and language-mapping revamped to better use BCP 47. +- Misc USE and Indic fixes. +- Misc everything fixes. +- Too many things to list. Biggest release since 0.9.1, with + over 500 commits in just over 5 weeks! Didn't intend it to + be a big release. Just happened to become. +- hb-ft now locks underlying FT_Face during use. + +API changes: + +- Newly-created hb_font_t's now have our internal "hb-ot-font" + callbacks set on them, so they should work out of the box + without any callbacks set. If callbacks are set, everything + is back to what it was before, the fallback callbacks are + null. If you to get the internal implementation modified, + sub_font it. + +- New hb_font_funcs_set_nominal_glyphs_func() allows speeding + up character to glyph mapping. + +New API: ++HB_FEATURE_GLOBAL_START ++HB_FEATURE_GLOBAL_END ++hb_buffer_set_invisible_glyph() ++hb_buffer_get_invisible_glyph() ++hb_font_funcs_set_nominal_glyphs_func() ++hb_ot_layout_table_select_script() ++hb_ot_layout_script_select_language() ++hb_ot_layout_feature_get_name_ids() ++hb_ot_layout_feature_get_characters() ++hb_name_id_t ++HB_NAME_ID_INVALID ++HB_OT_MAX_TAGS_PER_SCRIPT ++hb_ot_tags_from_script_and_language() ++hb_ot_tags_to_script_and_language() + +Deprecated API: +-hb_font_funcs_set_glyph_func() +-hb_unicode_eastasian_width_func_t +-hb_unicode_funcs_set_eastasian_width_func() +-hb_unicode_eastasian_width() +-hb_unicode_decompose_compatibility_func_t +-HB_UNICODE_MAX_DECOMPOSITION_LEN +-hb_unicode_funcs_set_decompose_compatibility_func() +-hb_unicode_decompose_compatibility() +-hb_font_funcs_set_glyph_h_kerning_func() +-hb_font_funcs_set_glyph_v_kerning_func() +-hb_font_get_glyph_h_kerning() +-hb_font_get_glyph_v_kerning() +-hb_font_get_glyph_kerning_for_direction() +-hb_ot_layout_table_choose_script() +-hb_ot_layout_script_find_language() +-hb_ot_tags_from_script() +-hb_ot_tag_from_language() + + +Overview of changes leading to 1.9.0 +Monday, September 10, 2018 +==================================== +- Added 'cmap' API to hb_face_t. +- Face-builder API. +- hb-ot-font re-creation should be much leaner now, as the + font tables it uses are cached on hb_face_t now. +- Internal source header file name changes: + hb-*-private.hh is renamed to hb-*.hh. + +New API: ++HB_UNICODE_MAX ++hb_face_collect_unicodes() ++hb_face_collect_variation_selectors() ++hb_face_collect_variation_unicodes() ++hb_face_builder_create() ++hb_face_builder_add_table() + + +Overview of changes leading to 1.8.8 +Tuesday, August 14, 2018 +==================================== +- Fix hb-icu crash on architectures where compare_exchange_weak() can + fail falsely. This bug was introduced in 1.8.4. + https://bugs.chromium.org/p/chromium/issues/detail?id=873568 +- More internal refactoring of atomic operations and singletons. +- API changes: + The following functions do NOT reference their return value before + returning: + * hb_unicode_funcs_get_default() + * hb_glib_get_unicode_funcs() + * hb_icu_get_unicode_funcs() + This is consistent with their naming ("get", instead of "reference") + as well as how they are used in the wild (ie. no one calls destroy() + on their return value.) + + +Overview of changes leading to 1.8.7 +Wednesday, August 8, 2018 +==================================== +- Fix assertion failure with GDEF-blacklisted fonts. + + +Overview of changes leading to 1.8.6 +Tuesday, August 7, 2018 +==================================== +- Internal code shuffling. +- New API to speed up getting advance widths for implementations + that have heavy overhead in get_h_advance callback: ++hb_font_funcs_set_glyph_h_advances_func ++hb_font_funcs_set_glyph_v_advances_func ++hb_font_get_glyph_advances_for_direction ++hb_font_get_glyph_h_advances ++hb_font_get_glyph_h_advances_func_t ++hb_font_get_glyph_v_advances ++hb_font_get_glyph_v_advances_func_t + + +Overview of changes leading to 1.8.5 +Wednesday, August 1, 2018 +==================================== +- Major Khmer shaper improvements to better match Microsoft. +- Indic bug fixes. +- Internal improvements to atomic operations. + + +Overview of changes leading to 1.8.4 +Tuesday, July 17, 2018 +==================================== +- Fix build on non-C++11. +- Use C++-style GCC atomics and C++11 atomics. + + +Overview of changes leading to 1.8.3 +Wednesday, July 11, 2018 +==================================== +- A couple of Indic / USE bug fixes. +- Disable vectorization, as it was causing unaligned access bus error on + certain 32bit architectures. + + +Overview of changes leading to 1.8.2 +Tuesday, July 3, 2018 +==================================== +- Fix infinite loop in Khmer shaper. +- Improve hb_blob_create_from_file() for streams. + + +Overview of changes leading to 1.8.1 +Tuesday, June 12, 2018 +==================================== +- Fix hb-version.h file generation; last two releases went out with wrong ones. +- Add correctness bug in hb_set_t operations, introduced in 1.7.7. +- Remove HB_SUBSET_BUILTIN build option. Not necessary. + + +Overview of changes leading to 1.8.0 +Tuesday, June 5, 2018 +==================================== +- Update to Unicode 11.0.0. + + +Overview of changes leading to 1.7.7 +Tuesday, June 5, 2018 +==================================== +- Lots of internal changes, but not yet exposed externally. +- All HarfBuzz objects are significantly smaller in size now. +- Sinhala: Position repha on top of post-consonant, not base. + This better matches Windows 10 behavior, which was changed + from previous Windows versions. +- New build options: + o New cpp macro HB_NO_ATEXIT + o New cpp macro HB_SUBSET_BUILTIN +- Significant libharfbuzz-subset changes. API subject to change. +- New API in libharfbuzz: + ++hb_blob_create_from_file() ++hb_face_count() + +A hashmap implementation: ++hb-map.h ++HB_MAP_VALUE_INVALID ++hb_map_t ++hb_map_create() ++hb_map_get_empty() ++hb_map_reference() ++hb_map_destroy() ++hb_map_set_user_data() ++hb_map_get_user_data() ++hb_map_allocation_successful() ++hb_map_clear() ++hb_map_is_empty() ++hb_map_get_population() ++hb_map_set() ++hb_map_get() ++hb_map_del() ++hb_map_has() + + +Overview of changes leading to 1.7.6 +Wednesday, March 7, 2018 +==================================== + +- Fix to hb_set_t binary operations. Ouch. +- New experimental harfbuzz-subset library. All of hb-subset.h + is experimental right now and API WILL change. + +- New API: +hb_blob_copy_writable_or_fail() +HB_OT_TAG_BASE +hb_set_previous() +hb_set_previous_range() + + +Overview of changes leading to 1.7.5 +Tuesday, January 30, 2018 +==================================== + +- Separate Khmer shaper from Indic. +- First stab at AAT morx. Not hooked up. +- Misc bug fixes. + + +Overview of changes leading to 1.7.4 +Wednesday, December 20, 2017 +==================================== + +- Fix collect_glyphs() regression caused by hb_set_t changes. + + +Overview of changes leading to 1.7.3 +Monday, December 18, 2017 +==================================== + +- hb_set_t performance tuning and optimizations. +- Speed up collect_glyphs() and reject garbage data. +- In hb_coretext_font_create() set font point-size (ptem). +- Misc fixes. + + +Overview of changes leading to 1.7.2 +Monday, December 4, 2017 +==================================== + +- Optimize hb_set_add_range(). +- Misc fixes. +- New API: +hb_coretext_font_create() + + +Overview of changes leading to 1.7.1 +Tuesday, November 14, 2017 +==================================== + +- Fix atexit object destruction regression. +- Fix minor integer-overflow. + + +Overview of changes leading to 1.7.0 +Monday, November 13, 2017 +==================================== + +- Minor Indic fixes. +- Implement kerning and glyph names in hb-ot-font. +- Various DSO optimization re .data and .bss sizes. +- Make C++11 optional; build fixes. +- Mark all other backends "unsafe-to-break". +- Graphite fix. + + +Overview of changes leading to 1.6.3 +Thursday, October 26th, 2017 +==================================== + +- Fix hb_set_t some more. Should be solid now. +- Implement get_glyph_name() for hb-ot-font. +- Misc fixes. + + +Overview of changes leading to 1.6.2 +Monday, October 23nd, 2017 +==================================== + +- Yesterday's release had a bad crasher; don't use it. That's what + happens when one works on Sunday... + https://github.com/harfbuzz/harfbuzz/issues/578 +- Build fixes for FreeBSD and Chrome Android. + + +Overview of changes leading to 1.6.1 +Sunday, October 22nd, 2017 +==================================== + +- Don't skip over COMBINING GRAPHEME JOINER when ligating, etc. + To be refined: https://github.com/harfbuzz/harfbuzz/issues/554 +- Faster hb_set_t implementation. +- Don't use deprecated ICU API. +- Fix undefined-behavior in Myanmar shaper, introduced in 1.6.0 +- Deprecated API: + hb_set_invert() + + +Overview of changes leading to 1.6.0 +Friday, October the 13th, 2017 +==================================== + +- Update to Unicode 10. + +- Various Indic and Universal Shaping Engine fixes as a result of + HarfBuzz Hackfest with Jonathan Kew at Web Engines Hackfest at + the Igalia offices in A Coruña, Spain. Thanks Igalia for having + us! + +- Implement Unicode Arabic Mark Ordering Algorithm UTR#53. + +- Implement optical sizing / tracking in CoreText backend, using + new API hb_font_set_ptem(). + +- Allow notifying hb_font_t that underlying FT_Face changed sizing, + using new API hb_ft_font_changed(). + +- More Graphite backend RTL fixes. + +- Fix caching of variable font shaping plans. + +- hb-view / hb-shape now accept following new arguments: + + o --unicodes: takes a list of hex numbers that represent Unicode + codepoints. + +New API: ++hb_face_get_table_tags() ++hb_font_set_ptem() ++hb_font_get_ptem() ++hb_ft_font_changed() + + +Overview of changes leading to 1.5.1 +Tuesday, September 5, 2017 +==================================== + +- Fix "unsafe-to-break" in fallback shaping and other corner cases. + All our tests pass with --verify now, meaning unsafe-to-break API + works as expected. +- Add --unicodes to hb-view / hb-shape. +- [indic] Treat Consonant_With_Stacker as consonant. This will need + further tweaking. +- hb_buffer_diff() tweaks. + + +Overview of changes leading to 1.5.0 +Wednesday, August 23, 2017 +==================================== + +- Misc new API, for appending a buffer to another, and for comparing + contents of two buffers for types of differences. + +- New "unsafe-to-break" API. Can be used to speed up reshaping + in line-breaking situations. Essentially, after shaping, it returns + positions in the input string (some of the cluster boundaries) that + are "safe to break" in that if the text is segmented at that position + and two sides reshaped and concatenated, the shaping result is + exactly the same as shaping the text in one piece. + + hb-view and hb-shape and hb-shape now take --verify, which verifies + the above property. + + Some corner cases of the implementation are still not quite working. + Those will be fixed in subsequent releases. + +- New API: + +hb_buffer_append() + +hb_glyph_flags_t +HB_GLYPH_FLAG_UNSAFE_TO_BREAK +HB_GLYPH_FLAG_DEFINED +hb_glyph_info_get_glyph_flags() + +HB_BUFFER_SERIALIZE_FLAG_GLYPH_FLAGS + +hb_buffer_diff_flags_t +HB_BUFFER_DIFF_FLAG_EQUAL +HB_BUFFER_DIFF_FLAG_CONTENT_TYPE_MISMATCH +HB_BUFFER_DIFF_FLAG_LENGTH_MISMATCH +HB_BUFFER_DIFF_FLAG_NOTDEF_PRESENT +HB_BUFFER_DIFF_FLAG_DOTTED_CIRCLE_PRESENT +HB_BUFFER_DIFF_FLAG_CODEPOINT_MISMATCH +HB_BUFFER_DIFF_FLAG_CLUSTER_MISMATCH +HB_BUFFER_DIFF_FLAG_GLYPH_FLAGS_MISMATCH +HB_BUFFER_DIFF_FLAG_POSITION_MISMATCH +hb_buffer_diff + + +Overview of changes leading to 1.4.8 +Tuesday, August 8, 2017 +==================================== + +- Major fix to avar table handling. +- Rename hb-shape --show-message to --trace. +- Build fixes. + + +Overview of changes leading to 1.4.7 +Tuesday, July 18, 2017 +==================================== + +- Multiple Indic, Tibetan, and Cham fixes. +- CoreText: Allow disabling kerning. +- Adjust Arabic feature order again. +- Misc build fixes. + + +Overview of changes leading to 1.4.6 +Sunday, April 23, 2017 +==================================== + +- Graphite2: Fix RTL positioning issue. +- Backlist GDEF of more versions of Padauk and Tahoma. +- New, experimental, cmake alternative build system. + + +Overview of changes leading to 1.4.5 +Friday, March 10, 2017 +==================================== + +- Revert "Fix Context lookup application when moving back after a glyph..." + This introduced memory access problems. To be fixed properly soon. + + +Overview of changes leading to 1.4.4 +Sunday, March 5, 2017 +==================================== + +- Fix Context lookup application when moving back after a glyph deletion. +- Fix buffer-overrun in Bengali. + + +Overview of changes leading to 1.4.3 +Saturday, February 25, 2017 +==================================== + +- Route Adlam script to Arabic shaper. +- Misc fixes. +- New API: + hb_font_set_face() +- Deprecate API: + hb_graphite2_font_get_gr_font() + + +Overview of changes leading to 1.4.2 +Monday, January 23, 2017 +==================================== + +- Implement OpenType Font Variation tables avar/fvar/HVAR/VVAR. +- hb-shape and hb-view now accept --variations. +- New API: + +hb_variation_t +hb_variation_from_string() +hb_variation_to_string() + +hb_font_set_variations() +hb_font_set_var_coords_design() +hb_font_get_var_coords_normalized() + +hb-ot-var.h: +hb_ot_var_axis_t +hb_ot_var_has_data() +hb_ot_var_get_axis_count() +hb_ot_var_get_axes() +hb_ot_var_find_axis() +hb_ot_var_normalize_variations() +hb_ot_var_normalize_coords() + +- MVAR to be implemented later. Access to named instances to be + implemented later as well. + +- Misc fixes. + + +Overview of changes leading to 1.4.1 +Thursday, January 5, 2017 +==================================== + +- Always build and use UCDN for Unicode data by default. + Reduces dependence on version of Unicode data in glib, + specially in the Windows bundles we are shipping, which + have very old glib. + + +Overview of changes leading to 1.4.0 +Thursday, January 5, 2017 +==================================== + +- Merged "OpenType GX" branch which adds core of support for + OpenType 1.8 Font Variations. To that extent, the relevant + new API is: + +New API: +hb_font_set_var_coords_normalized() + + with supporting API: + +New API: +HB_OT_LAYOUT_NO_VARIATIONS_INDEX +hb_ot_layout_table_find_feature_variations() +hb_ot_layout_feature_with_variations_get_lookups() +hb_shape_plan_create2() +hb_shape_plan_create_cached2() + + Currently variations in GSUB/GPOS/GDEF are fully supported, + and no other tables are supported. In particular, fvar/avar + are NOT supported, hence the hb_font_set_var_coords_normalized() + taking normalized coordinates. API to take design coordinates + will be added in the future. + + HVAR/VVAR/MVAR support will also be added to hb-ot-font in the + future. + +- Fix regression in GDEF glyph class processing. +- Add decompositions for Chakma, Limbu, and Balinese in USE shaper. +- Misc fixes. + + +Overview of changes leading to 1.3.4 +Monday, December 5, 2016 +==================================== + +- Fix vertical glyph origin in hb-ot-font. +- Implement CBDT/CBLC color font glyph extents in hb-ot-font. + + +Overview of changes leading to 1.3.3 +Wednesday, September 28, 2016 +==================================== + +- Implement parsing of OpenType MATH table. +New API: +HB_OT_TAG_MATH +HB_OT_MATH_SCRIPT +hb_ot_math_constant_t +hb_ot_math_kern_t +hb_ot_math_glyph_variant_t +hb_ot_math_glyph_part_flags_t +hb_ot_math_glyph_part_t +hb_ot_math_has_data +hb_ot_math_get_constant +hb_ot_math_get_glyph_italics_correction +hb_ot_math_get_glyph_top_accent_attachment +hb_ot_math_get_glyph_kerning +hb_ot_math_is_glyph_extended_shape +hb_ot_math_get_glyph_variants +hb_ot_math_get_min_connector_overlap +hb_ot_math_get_glyph_assembly + + +Overview of changes leading to 1.3.2 +Wednesday, September 27, 2016 +==================================== + +- Fix build of hb-coretext on older OS X versions. + + +Overview of changes leading to 1.3.1 +Wednesday, September 7, 2016 +==================================== + +- Blacklist bad GDEF of more fonts (Padauk). +- More CoreText backend crash fixes with OS X 10.9.5. +- Misc fixes. + + +Overview of changes leading to 1.3.0 +Thursday, July 21, 2016 +==================================== + +- Update to Unicode 9.0.0 +- Move Javanese from Indic shaper to Universal Shaping Engine. +- Allow MultipleSubst to delete a glyph (matching Windows engine). +- Update Universal Shaping Engine to latest draft from Microsoft. +- DirectWrite backend improvements. Note: this backend is for testing ONLY. +- CoreText backend improvements with unreachable fonts. +- Implement symbol fonts (cmap 3.0.0) in hb-ft and hb-ot-font. +- Blacklist bad GDEF of more fonts (Tahoma & others). +- Misc fixes. + + +Overview of changes leading to 1.2.7 +Monday, May 2, 2016 +==================================== + +- Blacklist another version of Times New Roman (Bold) Italic from Windows 7. +- Fix Mongolian Free Variation Selectors shaping with certain fonts. +- Fix Tibetan shorthand contractions shaping. +- Improved list of language tag mappings. +- Unbreak build on Windows CE. +- Make 'glyf' table loading lazy in hb-ot-font. + + +Overview of changes leading to 1.2.6 +Friday, April 8, 2016 +==================================== + +- Blacklist GDEF table of another set of Times New Roman (Bold) Italic. +- DirectWrite backend improvements. Note: DirectWrite backend is + exclusively for our internal testing and should NOT be used in any + production system whatsoever. + + +Overview of changes leading to 1.2.5 +Monday, April 4, 2016 +==================================== + +- Fix GDEF mark-filtering-set, which was broken in 1.2.3. + + +Overview of changes leading to 1.2.4 +Thursday, March 17, 2016 +==================================== + +- Synthesize GDEF glyph class for any glyph that does not have one in GDEF. + I really hope we don't discover broken fonts that shape badly with this + change. +- Misc build and other minor fixes. +- API changes: + - Added HB_NDEBUG. It's fine for production systems to define this to + disable high-overhead debugging checks. However, I also reduced the + overhead of those checks, so it's a non-issue right now. You can + forget it. Just not defining anything at all is fine. + + +Overview of changes leading to 1.2.3 +Thursday, February 25, 2016 +==================================== + +- Blacklist GDEF table of certain versions of Times New Roman (Bold) Italic, + due to bug in glyph class of ASCII double-quote character. This should + address "regression" introduced in 1.2.0 when we switched mark zeroing + in most shapers from BY_UNICODE_LATE to BY_GDEF_LATE. + This fourth release in a week should finally stablize things... + +- hb-ot-font's get_glyph() implementation saw some optimizations. Though, + might be really hard to measure in real-world situations. + +- Also, two rather small API changes: + +We now disable some time-consuming internal bookkeeping if built with NDEBUG +defined. This is a first time that we use NDEBUG to disable debug code. If +there exist production systems that do NOT want to enable NDEBUG, please let +me know and I'll add HB_NDEBUG. + +Added get_nominal_glyph() and get_variation_glyph() instead of get_glyph() + +New API: +- hb_font_get_nominal_glyph_func_t +- hb_font_get_variation_glyph_func_t +- hb_font_funcs_set_nominal_glyph_func() +- hb_font_funcs_set_variation_glyph_func() +- hb_font_get_nominal_glyph() +- hb_font_get_variation_glyph() + +Deprecated API: +- hb_font_get_glyph_func_t +- hb_font_funcs_set_glyph_func() + +Clients that implement their own font-funcs are encouraged to replace +their get_glyph() implementation with a get_nominal_glyph() and +get_variation_glyph() pair. The variation version can assume that +variation_selector argument is not zero. Old (deprecated) functions +will continue working indefinitely using internal gymnastics; it is +just more efficient to use the new functions. + + +Overview of changes leading to 1.2.2 +Wednesday, February 24, 2016 +==================================== + +- Fix regression with mark positioning with fonts that have + non-zero mark advances. This was introduced in 1.2.0 while + trying to make mark and cursive attachments to work together. + I have partially reverted that, so this version is much more + like what we had before. All clients who updated to 1.2.0 + should update to this version. + + +Overview of changes leading to 1.2.1 +Tuesday, February 23, 2016 +==================================== + +- CoreText: Fix bug with wrong scale if font scale was changed later. + https://github.com/libass/libass/issues/212 +- CoreText: Drastically speed up font initialization. +- CoreText: Fix tiny leak. +- Group ZWJ/ZWNJ with previous syllable under cluster-level=0. + https://github.com/harfbuzz/harfbuzz/issues/217 +- Add test/shaping/README.md about how to add tests to the suite. + + +Overview of changes leading to 1.2.0 +Friday, February 19, 2016 +==================================== + +- Fix various issues (hangs mostly) in case of memory allocation failure. +- Change mark zeroing types of most shapers from BY_UNICODE_LATE to + BY_GDEF_LATE. This seems to be what Uniscribe does. +- Change mark zeroing of USE shaper from NONE to BY_GDEF_EARLY. That's + what Windows does. +- Allow GPOS cursive connection on marks, and fix the interaction with + mark attachment. This work resulted in some changes to how mark + attachments work. See: + https://github.com/harfbuzz/harfbuzz/issues/211 + https://github.com/harfbuzz/harfbuzz/commit/86c68c7a2c971efe8e35b1f1bd99401dc8b688d2 +- Graphite2 shaper: improved negative advance handling (eg. Nastaliq). +- Add nmake-based build system for Windows. +- Minor speedup. +- Misc. improvements. + + +Overview of changes leading to 1.1.3 +Monday, January 11, 2016 +==================================== + +- Ported Indic shaper to Unicode 8.0 data. +- Universal Shaping Engine fixes. +- Speed up CoreText shaper when font fallback happens in CoreText. +- Documentation improvements, thanks to Khaled Hosny. +- Very rough directwrite shaper for testing, thanks to Ebrahim Byagowi. +- Misc bug fixes. +- New API: + + * Font extents: + hb_font_extents_t + hb_font_get_font_extents_func_t + hb_font_get_font_h_extents_func_t + hb_font_get_font_v_extents_func_t + hb_font_funcs_set_font_h_extents_func + hb_font_funcs_set_font_v_extents_func + hb_font_get_h_extents + hb_font_get_v_extents + hb_font_get_extents_for_direction + + * Buffer message (aka debug): + hb_buffer_message_func_t + hb_buffer_set_message_func() + Actual message protocol to be fleshed out later. + + +Overview of changes leading to 1.1.2 +Wednesday, November 26, 2015 +==================================== + +- Fix badly-broken fallback shaper that affected terminology. + https://github.com/harfbuzz/harfbuzz/issues/187 +- Fix y_scaling in Graphite shaper. +- API changes: + * An unset glyph_h_origin() function in font-funcs now (sensibly) + implies horizontal origin at 0,0. Ie, the nil callback returns + true instead of false. As such, implementations that have a + glyph_h_origin() that simply returns true, can remove that function + with HarfBuzz >= 1.1.2. This results in a tiny speedup. + + +Overview of changes leading to 1.1.1 +Wednesday, November 24, 2015 +==================================== + +- Build fixes, specially for hb-coretext. + + +Overview of changes leading to 1.1.0 +Wednesday, November 18, 2015 +==================================== + +- Implement 'stch' stretch feature for Syriac Abbreviation Mark. + https://github.com/harfbuzz/harfbuzz/issues/141 +- Disable use of decompose_compatibility() callback. +- Implement "shaping" of various Unicode space characters, even + if the font does not support them. + https://github.com/harfbuzz/harfbuzz/issues/153 +- If font does not support U+2011 NO-BREAK HYPHEN, fallback to + U+2010 HYPHEN. +- Changes resulting from libFuzzer continuous fuzzing: + * Reject font tables that need more than 8 edits, + * Bound buffer growth during shaping to 32x, + * Fix assertions and other issues at OOM / buffer max-growth. +- Misc fixes and optimizations. +- API changes: + * All fonts created with hb_font_create() now inherit from + (ie. have parent) hb_font_get_empty(). + + +Overview of changes leading to 1.0.6 +Thursday, October 15, 2015 +==================================== + +- Reduce max nesting level in OT lookups from 8 to 6. + Should not affect any real font as far as I know. +- Fix memory access issue in ot-font. +- Revert default load-flags of fonts created using hb_ft_font_create() + back to FT_LOAD_DEFAULT|FT_LOAD_NO_HINTING. This was changed in + last release (1.0.5), but caused major issues, so revert. + https://github.com/harfbuzz/harfbuzz/issues/143 + + +Overview of changes leading to 1.0.5 +Tuesday, October 13, 2015 +==================================== + +- Fix multiple memory access bugs discovered using libFuzzer. + https://github.com/harfbuzz/harfbuzz/issues/139 + Everyone should upgrade to this version as soon as possible. + We now have continuous fuzzing set up, to avoid issues like + these creeping in again. +- Misc fixes. + +- New API: + * hb_font_set_parent(). + * hb_ft_font_[sg]et_load_flags() + The default flags for fonts created using hb_ft_font_create() + has changed to default to FT_LOAD_DEFAULT now. Previously it + was defaulting to FT_LOAD_DFEAULT|FT_LOAD_NO_HINTING. + +- API changes: + * Fonts now default to units-per-EM as their scale, instead of 0. + * hb_font_create_sub_font() does NOT make parent font immutable + anymore. hb_font_make_immutable() does. + + +Overview of changes leading to 1.0.4 +Wednesday, September 30, 2015 +==================================== + +- Fix minor out-of-bounds read error. + + +Overview of changes leading to 1.0.3 +Tuesday, September 1, 2015 +==================================== + +- Start of user documentation, from Simon Cozens! +- Implement glyph_extents() for TrueType fonts in hb-ot-font. +- Improve GPOS cursive attachments with conflicting lookups. +- More fixes for cluster-level = 1. +- Uniscribe positioning fix. + + +Overview of changes leading to 1.0.2 +Wednesday, August 19, 2015 +==================================== + +- Fix shaping with cluster-level > 0. +- Fix Uniscribe backend font-size scaling. +- Declare dependencies in harfbuzz.pc. + FreeType is not declared though, to avoid bugs in pkg-config + 0.26 with recursive dependencies. +- Slightly improved debug infrastructure. More to come later. +- Misc build fixes. + + +Overview of changes leading to 1.0.1 +Monday, July 27, 2015 +==================================== + +- Fix out-of-bounds access in USE shaper. + + +Overview of changes leading to 1.0.0 +Sunday, July 26, 2015 +==================================== + +- Implement Universal Shaping Engine: + https://www.microsoft.com/typography/OpenTypeDev/USE/intro.htm + http://blogs.windows.com/bloggingwindows/2015/02/23/windows-shapes-the-worlds-languages/ +- Bump version to 1.0.0. The soname was NOT bumped. + + +Overview of changes leading to 0.9.42 +Thursday, July 26, 2015 +===================================== + +- New API to allow for retrieving finer-grained cluster + mappings if the client desires to handle them. Default + behavior is unchanged. +- Fix cluster merging when removing default-ignorables. +- Update to Unicode 8.0 +- hb-graphite2 fixes. +- Misc fixes. +- Removed HB_NO_MERGE_CLUSTERS hack. +- New API: + hb_buffer_cluster_level_t enum + hb_buffer_get_cluster_level() + hb_buffer_set_cluster_level() + hb-shape / hb-view --cluster-level + + +Overview of changes leading to 0.9.41 +Thursday, June 18, 2015 +===================================== + +- Fix hb-coretext with trailing whitespace in right-to-left. +- New API: hb_buffer_reverse_range(). +- Allow implementing atomic ops in config.h. +- Fix hb_language_t in language bindings. +- Misc fixes. + + +Overview of changes leading to 0.9.40 +Friday, March 20, 2015 +===================================== + +- Another hb-coretext crasher fix. Ouch! +- Happy Norouz! + + +Overview of changes leading to 0.9.39 +Wednesday, March 4, 2015 +===================================== + +- Critical hb-coretext fixes. +- Optimizations and refactoring; no functional change + expected. +- Misc build fixes. + + +Overview of changes leading to 0.9.38 +Friday, January 23, 2015 +===================================== + +- Fix minor out-of-bounds access in Indic shaper. +- Change New Tai Lue shaping engine from South-East Asian to default, + reflecting change in Unicode encoding model. +- Add hb-shape --font-size. Can take up to two numbers for separate + x / y size. +- Fix CoreText and FreeType scale issues with negative scales. +- Reject blobs larger than 2GB. This might break some icu-le-hb clients + that need security fixes. See: + http://www.icu-project.org/trac/ticket/11450 +- Avoid accessing font tables during face destruction, in casce rogue + clients released face data already. +- Fix up gobject-introspection a bit. Python bindings kinda working. + See README.python. +- Misc fixes. +- API additions: + hb_ft_face_create_referenced() + hb_ft_font_create_referenced() + + +Overview of changes leading to 0.9.37 +Wednesday, December 17, 2014 +===================================== + +- Fix out-of-bounds access in Context lookup format 3. +- Indic: Allow ZWJ/ZWNJ before syllable modifiers. + + +Overview of changes leading to 0.9.36 +Thursday, November 20, 2014 +===================================== + +- First time that three months went by without a release since + 0.9.2 was released on August 10, 2012! +- Fix performance bug in hb_ot_collect_glyphs(): + https://bugzilla.mozilla.org/show_bug.cgi?id=1090869 +- Add basic vertical-text support to hb-ot-font. +- Misc build fixes. + + +Overview of changes leading to 0.9.35 +Saturday, August 13, 2014 +===================================== + +- Fix major shape-plan caching bug when more than one shaper were + provided to hb_shape_full() (as exercised by XeTeX). + http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1246370.html +- Fix Arabic fallback shaping regression. This was broken in 0.9.32. +- Major hb-coretext fixes. That backend is complete now, including + respecing buffer direction and language, down to vertical writing. +- Build fixes for Windows CE. Should build fine now. +- Misc fixes: + Use atexit() only if it's safe to call from shared library + https://bugs.freedesktop.org/show_bug.cgi?id=82246 + Mandaic had errors in its Unicode Joining_Type + https://bugs.freedesktop.org/show_bug.cgi?id=82306 +- API changes: + + * hb_buffer_clear_contents() does not reset buffer flags now. + + After 763e5466c0a03a7c27020e1e2598e488612529a7, one doesn't + need to set flags for different pieces of text. The flags now + are something the client sets up once, depending on how it + actually uses the buffer. As such, don't clear it in + clear_contents(). + + I don't expect any changes to be needed to any existing client. + + +Overview of changes leading to 0.9.34 +Saturday, August 2, 2014 +===================================== + +- hb_feature_from_string() now accepts CSS font-feature-settings format. +- As a result, hb-shape / hb-view --features also accept CSS-style strings. + Eg, "'liga' off" is accepted now. +- Add old-spec Myanmar shaper: + https://bugs.freedesktop.org/show_bug.cgi?id=81775 +- Don't apply 'calt' in Hangul shaper. +- Fix mark advance zeroing for Hebrew shaper: + https://bugs.freedesktop.org/show_bug.cgi?id=76767 +- Implement Windows-1256 custom Arabic shaping. Only built on Windows, + and requires help from get_glyph(). Used by Firefox. + https://bugzilla.mozilla.org/show_bug.cgi?id=1045139 +- Disable 'liga' in vertical text. +- Build fixes. +- API changes: + + * Make HB_BUFFER_FLAG_BOT/EOT easier to use. + + Previously, we expected users to provide BOT/EOT flags when the + text *segment* was at paragraph boundaries. This meant that for + clients that provide full paragraph to HarfBuzz (eg. Pango), they + had code like this: + + hb_buffer_set_flags (hb_buffer, + (item_offset == 0 ? HB_BUFFER_FLAG_BOT : 0) | + (item_offset + item_length == paragraph_length ? + HB_BUFFER_FLAG_EOT : 0)); + + hb_buffer_add_utf8 (hb_buffer, + paragraph_text, paragraph_length, + item_offset, item_length); + + After this change such clients can simply say: + + hb_buffer_set_flags (hb_buffer, + HB_BUFFER_FLAG_BOT | HB_BUFFER_FLAG_EOT); + + hb_buffer_add_utf8 (hb_buffer, + paragraph_text, paragraph_length, + item_offset, item_length); + + Ie, HarfBuzz itself checks whether the segment is at the beginning/end + of the paragraph. Clients that only pass item-at-a-time to HarfBuzz + continue not setting any flags whatsoever. + + Another way to put it is: if there's pre-context text in the buffer, + HarfBuzz ignores the BOT flag. If there's post-context, it ignores + EOT flag. + + +Overview of changes leading to 0.9.33 +Tuesday, July 22, 2014 +===================================== + +- Turn off ARabic 'cswh' feature that was accidentally turned on. +- Add HB_TAG_MAX_SIGNED. +- Make hb_face_make_immutable() really make face immutable! +- Windows build fixes. + + +Overview of changes leading to 0.9.32 +Thursday, July 17, 2014 +===================================== + +- Apply Arabic shaping features in spec order exactly. +- Another fix for Mongolian free variation selectors. +- For non-Arabic scripts in Arabic shaper apply 'rlig' and 'calt' + together. +- Minor adjustment to U+FFFD logic. +- Fix hb-coretext build. + + +Overview of changes leading to 0.9.31 +Wednesday, July 16, 2014 +===================================== + +- Only accept valid UTF-8/16/32; we missed many cases before. +- Better shaping of invalid UTF-8/16/32. Falls back to + U+FFFD REPLACEMENT CHARACTER now. +- With all changes in this release, the buffer will contain fully + valid Unicode after hb_buffer_add_utf8/16/32 no matter how + broken the input is. This can be overridden though. See below. +- Fix Mongolian Variation Selectors for fonts without GDEF. +- Fix minor invalid buffer access. +- Accept zh-Hant and zh-Hans language tags. hb_ot_tag_to_language() + now uses these instead of private tags. +- Build fixes. +- New API: + * hb_buffer_add_codepoints(). This does what hb_buffer_add_utf32() + used to do, ie. no validity check on the input at all. add_utf32 + now replaces invalid Unicode codepoints with the replacement + character (see below). + * hb_buffer_set_replacement_codepoint() + * hb_buffer_get_replacement_codepoint() + Previously, in hb_buffer_add_utf8 and hb_buffer_add_utf16, when + we detected broken input, we replaced that with (hb_codepoint_t)-1. + This has changed to use U+FFFD now, but can be changed using these + new API. + + +Overview of changes leading to 0.9.30 +Wednesday, July 9, 2014 +===================================== + +- Update to Unicode 7.0.0: + * New scripts Manichaean and Psalter Pahlavi are shaped using + Arabic shaper. + * All the other new scripts to through the generic shaper for + now. +- Minor Indic improvements. +- Fix graphite2 backend cluster mapping [crasher!] +- API changes: + * New HB_SCRIPT_* values for Unicode 7.0 scripts. + * New function hb_ot_layout_language_get_required_feature(). +- Build fixes. + + +Overview of changes leading to 0.9.29 +Thursday, May 29, 2014 +===================================== + +- Implement cmap in hb-ot-font.h. No variation-selectors yet. +- Myanmar: Allow MedialYa+Asat. +- Various Indic fixes: + * Support most characters in Extended Devanagary and Vedic + Unicode blocks. + * Allow digits and a some punctuation as consonant placeholders. +- Build fixes. + + +Overview of changes leading to 0.9.28 +Monday, April 28, 2014 +===================================== + +- Unbreak old-spec Indic shaping. (bug 76705) +- Fix shaping of U+17DD and U+0FC6. +- Add HB_NO_MERGE_CLUSTERS build option. NOT to be enabled by default + for shipping libraries. It's an option for further experimentation + right now. When we are sure how to do it properly, we will add + public run-time API for the functionality. +- Build fixes. + + +Overview of changes leading to 0.9.27 +Tuesday, March 18, 2014 +===================================== + +- Don't use "register" storage class specifier +- Wrap definition of free_langs() with HAVE_ATEXIT +- Add coretext_aat shaper and hb_coretext_face_create() constructor +- If HAVE_ICU_BUILTIN is defined, use hb-icu Unicode callbacks +- Add Myanmar test case from OpenType Myanmar spec +- Only do fallback Hebrew composition if no GPOS 'mark' available +- Allow bootstrapping without gtk-doc +- Use AM_MISSING_PROG for ragel and git +- Typo in ucdn's Makefile.am +- Improve MemoryBarrier() implementation + + +Overview of changes leading to 0.9.26 +Thursday, January 30, 2014 +===================================== + +- Misc fixes. +- Fix application of 'rtlm' feature. +- Automatically apply frac/numr/dnom around U+2044 FRACTION SLASH. +- New header: hb-ot-shape.h +- Uniscribe: fix scratch-buffer accounting. +- Reorder Tai Tham SAKOT to after tone-marks. +- Add Hangul shaper. +- New files: + hb-ot-shape-complex-hangul.cc + hb-ot-shape-complex-hebrew.cc + hb-ot-shape-complex-tibetan.cc +- Disable 'cswh' feature in Arabic shaper. +- Coretext: better handle surrogate pairs. +- Add HB_TAG_MAX and _HB_SCRIPT_MAX_VALUE. + + +Overview of changes leading to 0.9.25 +Wednesday, December 4, 2013 +===================================== + +- Myanmar shaper improvements. +- Avoid font fallback in CoreText backend. +- Additional OpenType language tag mappiongs. +- More aggressive shape-plan caching. +- Build with / require automake 1.13. +- Build with libtool 2.4.2.418 alpha to support ppc64le. + + +Overview of changes leading to 0.9.24 +Tuesday, November 13, 2013 +===================================== + +- Misc compiler warning fixes with clang. +- No functional changes. + + +Overview of changes leading to 0.9.23 +Monday, October 28, 2013 +===================================== + +- "Udupi HarfBuzz Hackfest", Paris, October 14..18 2013. +- Fix (Chain)Context recursion with non-monotone lookup positions. +- Misc Indic bug fixes. +- New Javanese / Buginese shaping, similar to Windows 8.1. + + +Overview of changes leading to 0.9.22 +Thursday, October 3, 2013 +===================================== + +- Fix use-after-end-of-scope in hb_language_from_string(). +- Fix hiding of default_ignorables if font doesn't have space glyph. +- Protect against out-of-range lookup indices. + +- API Changes: + + * Added hb_ot_layout_table_get_lookup_count() + + +Overview of changes leading to 0.9.21 +Monday, September 16, 2013 +===================================== + +- Rename gobject-introspection library name from harfbuzz to HarfBuzz. +- Remove (long disabled) hb-old and hb-icu-le test shapers. +- Misc gtk-doc and gobject-introspection annotations. +- Misc fixes. +- API changes: + + * Add HB_SET_VALUE_INVALID + +Overview of changes leading to 0.9.20 +Thursday, August 29, 2013 +===================================== + +General: +- Misc substitute_closure() fixes. +- Build fixes. + +Documentation: +- gtk-doc boilerplate integrated. Docs are built now, but + contain no contents. By next release hopefully we have + some content in. Enable using --enable-gtk-doc. + +GObject and Introspection: +- Added harfbuzz-gobject library (hb-gobject.h) that has type + bindings for all HarfBuzz objects and enums. Enable using + --with-gobject. +- Added gobject-introspection boilerplate. Nothing useful + right now. Work in progress. Gets enabled automatically if + --with-gobject is used. Override with --disable-introspection. + +OpenType shaper: +- Apply 'mark' in Myanmar shaper. +- Don't apply 'dlig' by default. + +Uniscribe shaper: +- Support user features. +- Fix loading of fonts that are also installed on the system. +- Fix shaping of Arabic Presentation Forms. +- Fix build with wide chars. + +CoreText shaper: +- Support user features. + +Source changes: +- hb_face_t code moved to hb-face.h / hb-face.cc. +- Added hb-deprecated.h. + +API changes: +- Added HB_DISABLE_DEPRECATED. +- Deprecated HB_SCRIPT_CANADIAN_ABORIGINAL; replaced by + HB_SCRIPT_CANADIAN_SYLLABICS. +- Deprecated HB_BUFFER_FLAGS_DEFAULT; replaced by + HB_BUFFER_FLAG_DEFAULT. +- Deprecated HB_BUFFER_SERIALIZE_FLAGS_DEFAULT; replaced by + HB_BUFFER_SERIALIZE_FLAG_DEFAULT. + + +Overview of changes leading to 0.9.19 +Tuesday, July 16, 2013 +===================================== + +- Build fixes. +- Better handling of multiple variation selectors in a row. +- Pass on variation selector to GSUB if not consumed by cmap. +- Fix undefined memory access. +- Add Javanese config to Indic shaper. +- Misc bug fixes. + +Overview of changes leading to 0.9.18 +Tuesday, May 28, 2013 +===================================== + +New build system: + +- All unneeded code is all disabled by default, + +- Uniscribe and CoreText shapers can be enabled with their --with options, + +- icu_le and old shapers cannot be enabled for now, + +- glib, freetype, and cairo will be detected automatically. + They can be force on/off'ed with their --with options, + +- icu and graphite2 are default off, can be enabled with their --with + options, + +Moreover, ICU support is now build into a separate library: +libharfbuzz-icu.so, and a new harfbuzz-icu.pc is shipped for it. +Distros can enable ICU now without every application on earth +getting linked to via libharfbuzz.so. + +For distros I recommend that they make sure they are building --with-glib +--with-freetype --with-cairo, --with-icu, and optionally --with-graphite2; +And package harfbuzz and harfbuzz-icu separately. + + +Overview of changes leading to 0.9.17 +Monday, May 20, 2013 +===================================== + +- Build fixes. +- Fix bug in hb_set_get_min(). +- Fix regression with Arabic mark positioning / width-zeroing. + +Overview of changes leading to 0.9.16 +Friday, April 19, 2013 +===================================== + +- Major speedup in OpenType lookup processing. With the Amiri + Arabic font, this release is over 3x faster than previous + release. All scripts / languages should see this speedup. + +- New --num-iterations option for hb-shape / hb-view; useful for + profiling. + +Overview of changes leading to 0.9.15 +Friday, April 05, 2013 +===================================== + +- Build fixes. +- Fix crasher in graphite2 shaper. +- Fix Arabic mark width zeroing regression. +- Don't compose Hangul jamo into Unicode syllables. + + +Overview of changes leading to 0.9.14 +Thursday, March 21, 2013 +===================================== + +- Build fixes. +- Fix time-consuming sanitize with malicious fonts. +- Implement hb_buffer_deserialize_glyphs() for both json and text. +- Do not ignore Hangul filler characters. +- Indic fixes: + * Fix Malayalam pre-base reordering interaction with post-forms. + * Further adjust ZWJ handling. Should fix known regressions from + 0.9.13. + + +Overview of changes leading to 0.9.13 +Thursday, February 25, 2013 +===================================== + +- Build fixes. +- Ngapi HarfBuzz Hackfest in London (February 2013): + * Fixed all known Indic bugs, + * New Win8-style Myanmar shaper, + * New South-East Asian shaper for Tai Tham, Cham, and New Tai Lue, + * Smartly ignore Default_Ignorable characters (joiners, etc) wheb + matching GSUB/GPOS lookups, + * Fix 'Phags-Pa U+A872 shaping, + * Fix partial disabling of default-on features, + * Allow disabling of TrueType kerning. +- Fix possible crasher with broken fonts with overlapping tables. +- Removed generated files from git again. So, one needs ragel to + bootstrap from the git tree. + +API changes: +- hb_shape() and related APIs now abort if buffer direction is + HB_DIRECTION_INVALID. Previously, hb_shape() was calling + hb_buffer_guess_segment_properties() on the buffer before + shaping. The heuristics in that function are fragile. If the + user really wants the old behvaior, they can call that function + right before calling hb_shape() to get the old behavior. +- hb_blob_create_sub_blob() always creates sub-blob with + HB_MEMORY_MODE_READONLY. See comments for the reason. + + +Overview of changes leading to 0.9.12 +Thursday, January 18, 2013 +===================================== + +- Build fixes for Sun compiler. +- Minor bug fix. + +Overview of changes leading to 0.9.11 +Thursday, January 10, 2013 +===================================== + +- Build fixes. +- Fix GPOS mark attachment with null Anchor offsets. +- [Indic] Fix old-spec reordering of viramas if sequence ends in one. +- Fix multi-threaded shaper data creation crash. +- Add atomic ops for Solaris. + +API changes: +- Rename hb_buffer_clear() to hb_buffer_clear_contents(). + + +Overview of changes leading to 0.9.10 +Thursday, January 3, 2013 +===================================== + +- [Indic] Fixed rendering of Malayalam dot-reph +- Updated OT language tags. +- Updated graphite2 backend. +- Improved hb_ot_layout_get_size_params() logic. +- Improve hb-shape/hb-view help output. +- Fixed hb-set.h implementation to not crash. +- Fixed various issues with hb_ot_layout_collect_lookups(). +- Various build fixes. + +New API: + +hb_graphite2_face_get_gr_face() +hb_graphite2_font_get_gr_font() +hb_coretext_face_get_cg_font() + +Modified API: + +hb_ot_layout_get_size_params() + + +Overview of changes leading to 0.9.9 +Wednesday, December 5, 2012 +==================================== + +- Fix build on Windows. +- Minor improvements. + + +Overview of changes leading to 0.9.8 +Tuesday, December 4, 2012 +==================================== + + +- Actually implement hb_shape_plan_get_shaper (). +- Make UCDB data tables const. +- Lots of internal refactoring in OTLayout tables. +- Flesh out hb_ot_layout_lookup_collect_glyphs(). + +New API: + +hb_ot_layout_collect_lookups() +hb_ot_layout_get_size_params() + + +Overview of changes leading to 0.9.7 +Sunday, November 21, 2012 +==================================== + + +HarfBuzz "All-You-Can-Eat-Sushi" (aka Vancouver) Hackfest and follow-on fixes. + +- Fix Arabic contextual joining using pre-context text. +- Fix Sinhala "split matra" mess. +- Fix Khmer shaping with broken fonts. +- Implement Thai "PUA" shaping for old fonts. +- Do NOT route Kharoshthi script through the Indic shaper. +- Disable fallback positioning for Indic and Thai shapers. +- Misc fixes. + + +hb-shape / hb-view changes: + +- Add --text-before and --text-after +- Add --bot / --eot / --preserve-default-ignorables +- hb-shape --output-format=json + + +New API: + +hb_buffer_clear() + +hb_buffer_flags_t + +HB_BUFFER_FLAGS_DEFAULT +HB_BUFFER_FLAG_BOT +HB_BUFFER_FLAG_EOT +HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES + +hb_buffer_set_flags() +hb_buffer_get_flags() + +HB_BUFFER_SERIALIZE_FLAGS +hb_buffer_serialize_glyphs() +hb_buffer_deserialize_glyphs() +hb_buffer_serialize_list_formats() + +hb_set_add_range() +hb_set_del_range() +hb_set_get_population() +hb_set_next_range() + +hb_face_[sg]et_glyph_count() + +hb_segment_properties_t +HB_SEGMENT_PROPERTIES_DEFAULT +hb_segment_properties_equal() +hb_segment_properties_hash() + +hb_buffer_set_segment_properties() +hb_buffer_get_segment_properties() + +hb_ot_layout_glyph_class_t +hb_ot_layout_get_glyph_class() +hb_ot_layout_get_glyphs_in_class() + +hb_shape_plan_t +hb_shape_plan_create() +hb_shape_plan_create_cached() +hb_shape_plan_get_empty() +hb_shape_plan_reference() +hb_shape_plan_destroy() +hb_shape_plan_set_user_data() +hb_shape_plan_get_user_data() +hb_shape_plan_execute() +hb_shape_plan_get_shaper() + +hb_ot_shape_plan_collect_lookups() + + +API changes: + +- Remove "mask" parameter from hb_buffer_add(). +- Rename hb_ot_layout_would_substitute_lookup() and hb_ot_layout_substitute_closure_lookup(). +- hb-set.h API const correction. +- Renamed hb_set_min/max() to hb_set_get_min/max(). +- Rename hb_ot_layout_feature_get_lookup_indexes() to hb_ot_layout_feature_get_lookups(). +- Rename hb_buffer_guess_properties() to hb_buffer_guess_segment_properties(). + + + +Overview of changes leading to 0.9.6 +Sunday, November 13, 2012 +==================================== + +- Don't clear pre-context text if no new context is provided. +- Fix ReverseChainingSubstLookup, which was totally borked. +- Adjust output format of hb-shape a bit. +- Include config.h.in in-tree. Makes it easier for alternate build systems. +- Fix hb_buffer_set_length(buffer, 0) invalid memory allocation. +- Use ICU LayoutEngine's C API instead of C++. Avoids much headache. +- Drop glyphs for all of Unicode Default_Ignorable characters. +- Misc build fixes. + +Arabic shaper: +- Enable 'dlig' and 'mset' features in Arabic shaper. +- Implement 'Phags-pa shaping, improve Mongolian. + +Indic shaper: +- Decompose Sinhala split matras the way old HarfBuzz / Pango did. +- Initial support for Consonant Medials. +- Start adding new-style Myanmar shaping. +- Make reph and 'pref' logic introspect the font. +- Route Meetei-Mayek through the Indic shaper. +- Don't apply 'liga' in Indic shaper. +- Improve Malayalam pre-base reordering Ra interaction with Chillus. + + + +Overview of changes leading to 0.9.5 +Sunday, October 14, 2012 +==================================== + +- Synthetic-GSUB Arabic fallback shaping. + +- Misc Indic improvements. + +- Add build system support for pthread. + +- Imported UCDN for in-tree Unicode callbacks implementation. + +- Context-aware Arabic joining. + +- Misc other fixes. + +- New API: + + hb_feature_to/from-string() + hb_buffer_[sg]et_content_type() + + + +Overview of changes leading to 0.9.4 +Tuesday, Sep 03, 2012 +==================================== + +- Indic improvements with old-spec Malayalam. + +- Better fallback glyph positioning, specially with Thai / Lao marks. + +- Implement dotted-circle insertion. + +- Better Arabic fallback shaping / ligation. + +- Added ICU LayoutEngine backend for testing. Call it by the 'icu_le' name. + +- Misc fixes. + + + +Overview of changes leading to 0.9.3 +Friday, Aug 18, 2012 +==================================== + +- Fixed fallback mark positioning for left-to-right text. + +- Improve mark positioning for the remaining combining classes. + +- Unbreak Thai and fallback Arabic shaping. + +- Port Arabic shaper to shape-plan caching. + +- Use new ICU normalizer functions. + + + +Overview of changes leading to 0.9.2 +Friday, Aug 10, 2012 +==================================== + +- Over a thousand commits! This is the first major release of HarfBuzz. + +- HarfBuzz is feature-complete now! It should be in par, or better, than + both Pango's shapers and old HarfBuzz / Qt shapers. + +- New Indic shaper, supporting main Indic scripts, Sinhala, and Khmer. + +- Improved Arabic shaper, with fallback Arabic shaping, supporting Arabic, + Sinhala, N'ko, Mongolian, and Mandaic. + +- New Thai / Lao shaper. + +- Tibetan / Hangul support in the generic shaper. + +- Synthetic GDEF support for fonts without a GDEF table. + +- Fallback mark positioning for fonts without a GPOS table. + +- Unicode normalization shaping heuristic during glyph mapping. + +- New experimental Graphite2 backend. + +- New Uniscribe backend (primarily for testing). + +- New CoreText backend (primarily for testing). + +- Major optimization and speedup. + +- Test suites and testing infrastructure (work in progress). + +- Greatly improved hb-view cmdline tool. + +- hb-shape cmdline tool. + +- Unicode 6.1 support. + +Summary of API changes: + +o Changed API: + + - Users are expected to only include main header files now (ie. hb.h, + hb-glib.h, hb-ft.h, ...) + + - All struct tag names had their initial underscore removed. + Ie. "struct _hb_buffer_t" is "struct hb_buffer_t" now. + + - All set_user_data() functions now take a "replace" boolean parameter. + + - hb_buffer_create() takes zero arguments now. + Use hb_buffer_pre_allocate() to pre-allocate. + + - hb_buffer_add_utf*() now accept -1 for length parameteres, + meaning "nul-terminated". + + - hb_direction_t enum values changed. + + - All *_from_string() APIs now take a length parameter to allow for + non-nul-terminated strings. A -1 length means "nul-terminated". + + - Typedef for hb_language_t changed. + + - hb_get_table_func_t renamed to hb_reference_table_func_t. + + - hb_ot_layout_table_choose_script() + + - Various renames in hb-unicode.h. + +o New API: + + - hb_buffer_guess_properties() + Automatically called by hb_shape(). + + - hb_buffer_normalize_glyphs() + + - hb_tag_from_string() + + - hb-coretext.h + + - hb-uniscribe.h + + - hb_face_reference_blob() + - hb_face_[sg]et_index() + - hb_face_set_upem() + + - hb_font_get_glyph_name_func_t + hb_font_get_glyph_from_name_func_t + hb_font_funcs_set_glyph_name_func() + hb_font_funcs_set_glyph_from_name_func() + hb_font_get_glyph_name() + hb_font_get_glyph_from_name() + hb_font_glyph_to_string() + hb_font_glyph_from_string() + + - hb_font_set_funcs_data() + + - hb_ft_font_set_funcs() + - hb_ft_font_get_face() + + - hb-gobject.h (work in progress) + + - hb_ot_shape_glyphs_closure() + hb_ot_layout_substitute_closure_lookup() + + - hb-set.h + + - hb_shape_full() + + - hb_unicode_combining_class_t + + - hb_unicode_compose_func_t + hb_unicode_decompose_func_t + hb_unicode_decompose_compatibility_func_t + hb_unicode_funcs_set_compose_func() + hb_unicode_funcs_set_decompose_func() + hb_unicode_funcs_set_decompose_compatibility_func() + hb_unicode_compose() + hb_unicode_decompose() + hb_unicode_decompose_compatibility() + +o Removed API: + + - hb_ft_get_font_funcs() + + - hb_ot_layout_substitute_start() + hb_ot_layout_substitute_lookup() + hb_ot_layout_substitute_finish() + hb_ot_layout_position_start() + hb_ot_layout_position_lookup() + hb_ot_layout_position_finish() + + + +Overview of changes leading to 0.6.0 +Friday, May 27, 2011 +==================================== + +- Vertical text support in GPOS +- Almost all API entries have unit tests now, under test/ +- All thread-safety issues are fixed + +Summary of API changes follows. + + +* Simple Types API: + + o New API: + HB_LANGUAGE_INVALID + hb_language_get_default() + hb_direction_to_string() + hb_direction_from_string() + hb_script_get_horizontal_direction() + HB_UNTAG() + + o Renamed API: + hb_category_t renamed to hb_unicode_general_category_t + + o Changed API: + hb_language_t is a typed pointers now + + o Removed API: + HB_TAG_STR() + + +* Use ISO 15924 tags for hb_script_t: + + o New API: + hb_script_from_iso15924_tag() + hb_script_to_iso15924_tag() + hb_script_from_string() + + o Changed API: + HB_SCRIPT_* enum members changed value. + + +* Buffer API streamlined: + + o New API: + hb_buffer_reset() + hb_buffer_set_length() + hb_buffer_allocation_successful() + + o Renamed API: + hb_buffer_ensure() renamed to hb_buffer_pre_allocate() + hb_buffer_add_glyph() renamed to hb_buffer_add() + + o Removed API: + hb_buffer_clear() + hb_buffer_clear_positions() + + o Changed API: + hb_buffer_get_glyph_infos() takes an out length parameter now + hb_buffer_get_glyph_positions() takes an out length parameter now + + +* Blob API streamlined: + + o New API: + hb_blob_get_data() + hb_blob_get_data_writable() + + o Renamed API: + hb_blob_create_empty() renamed to hb_blob_get_empty() + + o Removed API: + hb_blob_lock() + hb_blob_unlock() + hb_blob_is_writable() + hb_blob_try_writable() + + o Changed API: + hb_blob_create() takes user_data before destroy now + + +* Unicode functions API: + + o Unicode function vectors can subclass other unicode function vectors now. + Unimplemented callbacks in the subclass automatically chainup to the parent. + + o All hb_unicode_funcs_t callbacks take a user_data now. Their setters + take a user_data and its respective destroy callback. + + o New API: + hb_unicode_funcs_get_empty() + hb_unicode_funcs_get_default() + hb_unicode_funcs_get_parent() + + o Changed API: + hb_unicode_funcs_create() now takes a parent_funcs. + + o Removed func getter functions: + hb_unicode_funcs_get_mirroring_func() + hb_unicode_funcs_get_general_category_func() + hb_unicode_funcs_get_script_func() + hb_unicode_funcs_get_combining_class_func() + hb_unicode_funcs_get_eastasian_width_func() + + +* Face API: + + o Renamed API: + hb_face_get_table() renamed to hb_face_reference_table() + hb_face_create_for_data() renamed to hb_face_create() + + o Changed API: + hb_face_create_for_tables() takes user_data before destroy now + hb_face_reference_table() returns empty blob instead of NULL + hb_get_table_func_t accepts the face as first parameter now + +* Font API: + + o Fonts can subclass other fonts now. Unimplemented callbacks in the + subclass automatically chainup to the parent. When chaining up, + scale is adjusted if the parent font has a different scale. + + o All hb_font_funcs_t callbacks take a user_data now. Their setters + take a user_data and its respective destroy callback. + + o New API: + hb_font_get_parent() + hb_font_funcs_get_empty() + hb_font_create_sub_font() + + o Removed API: + hb_font_funcs_copy() + hb_font_unset_funcs() + + o Removed func getter functions: + hb_font_funcs_get_glyph_func() + hb_font_funcs_get_glyph_advance_func() + hb_font_funcs_get_glyph_extents_func() + hb_font_funcs_get_contour_point_func() + hb_font_funcs_get_kerning_func() + + o Changed API: + hb_font_create() takes a face and references it now + hb_font_set_funcs() takes user_data before destroy now + hb_font_set_scale() accepts signed integers now + hb_font_get_contour_point_func_t now takes glyph first, then point_index + hb_font_get_glyph_func_t returns a success boolean now + + +* Changed object model: + + o All object types have a _get_empty() now: + hb_blob_get_empty() + hb_buffer_get_empty() + hb_face_get_empty() + hb_font_get_empty() + hb_font_funcs_get_empty() + hb_unicode_funcs_get_empty() + + o Added _set_user_data() and _get_user_data() for all object types: + hb_blob_get_user_data() + hb_blob_set_user_data() + hb_buffer_get_user_data() + hb_buffer_set_user_data() + hb_face_get_user_data() + hb_face_set_user_data() + hb_font_funcs_get_user_data() + hb_font_funcs_set_user_data() + hb_font_get_user_data() + hb_font_set_user_data() + hb_unicode_funcs_get_user_data() + hb_unicode_funcs_set_user_data() + + o Removed the _get_reference_count() from all object types: + hb_blob_get_reference_count() + hb_buffer_get_reference_count() + hb_face_get_reference_count() + hb_font_funcs_get_reference_count() + hb_font_get_reference_count() + hb_unicode_funcs_get_reference_count() + + o Added _make_immutable() and _is_immutable() for all object types except for buffer: + hb_blob_make_immutable() + hb_blob_is_immutable() + hb_face_make_immutable() + hb_face_is_immutable() + + +* Changed API for vertical text support + + o The following callbacks where removed: + hb_font_get_glyph_advance_func_t + hb_font_get_kerning_func_t + + o The following new callbacks added instead: + hb_font_get_glyph_h_advance_func_t + hb_font_get_glyph_v_advance_func_t + hb_font_get_glyph_h_origin_func_t + hb_font_get_glyph_v_origin_func_t + hb_font_get_glyph_h_kerning_func_t + hb_font_get_glyph_v_kerning_func_t + + o The following API removed as such: + hb_font_funcs_set_glyph_advance_func() + hb_font_funcs_set_kerning_func() + hb_font_get_glyph_advance() + hb_font_get_kerning() + + o New API added instead: + hb_font_funcs_set_glyph_h_advance_func() + hb_font_funcs_set_glyph_v_advance_func() + hb_font_funcs_set_glyph_h_origin_func() + hb_font_funcs_set_glyph_v_origin_func() + hb_font_funcs_set_glyph_h_kerning_func() + hb_font_funcs_set_glyph_v_kerning_func() + hb_font_get_glyph_h_advance() + hb_font_get_glyph_v_advance() + hb_font_get_glyph_h_origin() + hb_font_get_glyph_v_origin() + hb_font_get_glyph_h_kerning() + hb_font_get_glyph_v_kerning() + + o The following higher-leve API added for convenience: + hb_font_get_glyph_advance_for_direction() + hb_font_get_glyph_origin_for_direction() + hb_font_add_glyph_origin_for_direction() + hb_font_subtract_glyph_origin_for_direction() + hb_font_get_glyph_kerning_for_direction() + hb_font_get_glyph_extents_for_origin() + hb_font_get_glyph_contour_point_for_origin() + + +* OpenType Layout API: + + o New API: + hb_ot_layout_position_start() + hb_ot_layout_substitute_start() + hb_ot_layout_substitute_finish() + + +* Glue code: + + o New API: + hb_glib_script_to_script() + hb_glib_script_from_script() + hb_icu_script_to_script() + hb_icu_script_from_script() + + +* Version API added: + + o New API: + HB_VERSION_MAJOR + HB_VERSION_MINOR + HB_VERSION_MICRO + HB_VERSION_STRING + HB_VERSION_CHECK() + hb_version() + hb_version_string() + hb_version_check() + + diff --git a/source/libs/harfbuzz/harfbuzz-src/README b/source/libs/harfbuzz/harfbuzz-src/README new file mode 100644 index 000000000..c3cc0c26e --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/README @@ -0,0 +1,25 @@ +[![Travis Build Status](https://travis-ci.org/harfbuzz/harfbuzz.svg?branch=master)](https://travis-ci.org/harfbuzz/harfbuzz) +[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/0t0flrxpstj9lb9w?svg=true&branch=master)](https://ci.appveyor.com/project/harfbuzz/harfbuzz) +[![CircleCI Build Status](https://circleci.com/gh/harfbuzz/harfbuzz/tree/master.svg?style=svg)](https://circleci.com/gh/harfbuzz/harfbuzz/tree/master) +[![OSS-Fuzz Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/harfbuzz.svg)](https://oss-fuzz-build-logs.storage.googleapis.com/index.html) +[![Coverity Code Health](https://img.shields.io/coverity/scan/5450.svg)](https://scan.coverity.com/projects/behdad-harfbuzz) +[![Codacy Code Health](https://api.codacy.com/project/badge/Grade/f17f1708783c447488bc8dd317150eaa)](https://app.codacy.com/app/behdad/harfbuzz) +[![Codecov Code Coverage](https://codecov.io/gh/harfbuzz/harfbuzz/branch/master/graph/badge.svg)](https://codecov.io/gh/harfbuzz/harfbuzz) +[![Coverals Code Coverage](https://img.shields.io/coveralls/harfbuzz/harfbuzz.svg)](https://coveralls.io/r/harfbuzz/harfbuzz) +[ABI Tracker](http://abi-laboratory.pro/tracker/timeline/harfbuzz/) + +This is HarfBuzz, a text shaping library. + +For bug reports, mailing list, and other information please visit: + + http://harfbuzz.org/ + +For license information, see [COPYING](COPYING). + +For build information, see [BUILD.md](BUILD.md). + +For custom configurations, see [CONFIG.md](CONFIG.md). + +For test execution, see [TESTING.md](TESTING.md). + +Documentation: https://harfbuzz.github.io diff --git a/source/libs/harfbuzz/harfbuzz-src/README.md b/source/libs/harfbuzz/harfbuzz-src/README.md new file mode 100644 index 000000000..c3cc0c26e --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/README.md @@ -0,0 +1,25 @@ +[![Travis Build Status](https://travis-ci.org/harfbuzz/harfbuzz.svg?branch=master)](https://travis-ci.org/harfbuzz/harfbuzz) +[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/0t0flrxpstj9lb9w?svg=true&branch=master)](https://ci.appveyor.com/project/harfbuzz/harfbuzz) +[![CircleCI Build Status](https://circleci.com/gh/harfbuzz/harfbuzz/tree/master.svg?style=svg)](https://circleci.com/gh/harfbuzz/harfbuzz/tree/master) +[![OSS-Fuzz Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/harfbuzz.svg)](https://oss-fuzz-build-logs.storage.googleapis.com/index.html) +[![Coverity Code Health](https://img.shields.io/coverity/scan/5450.svg)](https://scan.coverity.com/projects/behdad-harfbuzz) +[![Codacy Code Health](https://api.codacy.com/project/badge/Grade/f17f1708783c447488bc8dd317150eaa)](https://app.codacy.com/app/behdad/harfbuzz) +[![Codecov Code Coverage](https://codecov.io/gh/harfbuzz/harfbuzz/branch/master/graph/badge.svg)](https://codecov.io/gh/harfbuzz/harfbuzz) +[![Coverals Code Coverage](https://img.shields.io/coveralls/harfbuzz/harfbuzz.svg)](https://coveralls.io/r/harfbuzz/harfbuzz) +[ABI Tracker](http://abi-laboratory.pro/tracker/timeline/harfbuzz/) + +This is HarfBuzz, a text shaping library. + +For bug reports, mailing list, and other information please visit: + + http://harfbuzz.org/ + +For license information, see [COPYING](COPYING). + +For build information, see [BUILD.md](BUILD.md). + +For custom configurations, see [CONFIG.md](CONFIG.md). + +For test execution, see [TESTING.md](TESTING.md). + +Documentation: https://harfbuzz.github.io diff --git a/source/libs/harfbuzz/harfbuzz-src/README.mingw.md b/source/libs/harfbuzz/harfbuzz-src/README.mingw.md new file mode 100644 index 000000000..76d1a8754 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/README.mingw.md @@ -0,0 +1,48 @@ +For the development of HarfBuzz, the Microsoft shaping technology, Uniscribe, +as a widely used and tested shaper is used as more-or-less OpenType reference +implementation and that specially is important where OpenType specification +is or wasn't that clear. For having access to Uniscribe on Linux/macOS these +steps are recommended: + +1. Install Wine from your favorite package manager. On Fedora that's `dnf install wine`. + +2. And `mingw-w64` compiler. + With `brew` on macOS, you can have it like `brew install mingw-w64`. + On Fedora, with `dnf install mingw32-gcc-c++`, or `dnf install mingw64-gcc-c++` for the + 64-bit Windows. + +3. Install cross-compiled dependency packages. Alternatively see [^1] below. + On Fedora that would be `dnf install mingw32-glib2 mingw32-cairo mingw32-freetype` + for 32-bit, or `dnf install mingw64-glib2 mingw64-cairo mingw64-freetype` for 64-bit. + +5. `NOCONFIGURE=1 ./autogen.sh && mkdir winbuild && cd winbuild` + +6. Run `../mingw32.sh` for 32-bit build, or `../mingw64.sh` for 64-bit. This configures + HarfBuzz for cross-compiling. It enables Uniscribe backend as well. + +7. `make` + +Now you can use hb-shape using `wine util/hb-shape.exe` but if you like to shape with +the Microsoft Uniscribe, + +8. Bring a 32bit version of `usp10.dll` for yourself from `C:\Windows\SysWOW64\usp10.dll` of your + Windows installation (assuming you have a 64-bit installation, otherwise + `C:\Windows\System32\usp10.dll`) that it is not a DirectWrite proxy + ([for more info](https://en.wikipedia.org/wiki/Uniscribe)). + Rule of thumb, your `usp10.dll` should have a size more than 500kb, otherwise + it is designed to work with DirectWrite which Wine can't work with its original one. + You want a Uniscribe from Windows 7 or older. + + Put the DLL in the folder you are going to run the next command, + +9. `WINEDLLOVERRIDES="usp10=n" wine util/hb-shape.exe fontname.ttf -u 0061,0062,0063 --shaper=uniscribe` + +(`0061,0062,0063` means `abc`, use test/shaping/hb-unicode-decode to generate ones you need) + + +[^1] Download and put [this](https://drive.google.com/open?id=0B3_fQkxDZZXXbWltRGd5bjVrUDQ) + in your `~/.local/i686-w64-mingw32`. Then replace all the instances of + `/home/behdad/.local/i586-mingw32msvc` and `/home/behdad/.local/i686-w64-mingw32` + with `<$HOME>/.local/i686-w64-mingw32` on that folder. + (`<$HOME>` replace it with `/home/XXX` or `/Users/XXX` on macOS) + You shouldn't replace the instances of those inside binary files. diff --git a/source/libs/harfbuzz/harfbuzz-src/README.python.md b/source/libs/harfbuzz/harfbuzz-src/README.python.md new file mode 100644 index 000000000..d9aaf8987 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/README.python.md @@ -0,0 +1,36 @@ +To enable HarfBuzz bindings for Python among other languages, make sure +you have latest version of gobject-introspection available. On Ubuntu, +you can install that this way: + +```bash +sudo apt-get install libgirepository1.0-dev +``` + +And then run `autogen.sh` (if building from git), and then: + +```bash +./configure --with-gobject --enable-introspection +``` + +Make sure that gobject-introspection is reported enabled then in the `configure` script output. + +Compile and install. + +Make sure you have the installation lib dir in `LD_LIBRARY_PATH`, as needed +for the linker to find the library. + +Then make sure you also have `GI_TYPELIB_PATH` pointing to the resulting +`$prefix/lib/girepository-*` directory. + +Make sure you have pygobject installed. Then check that the following +import works in your Python interpreter: + +```python +from gi.repository import HarfBuzz +``` + +If it does, you are ready to call HarfBuzz from Python! Congratulations. +See [`src/sample.py`](src/sample.py). + +The Python API will change. Let us know on the mailing list if you are +using it, and send lots of feedback. diff --git a/source/libs/harfbuzz/harfbuzz-src/RELEASING.md b/source/libs/harfbuzz/harfbuzz-src/RELEASING.md new file mode 100644 index 000000000..360aea764 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/RELEASING.md @@ -0,0 +1,72 @@ +HarfBuzz release walk-through checklist: + +1. Open gitk and review changes since last release. + + * `git diff $(git describe | sed 's/-.*//').. src/*.h` prints all public API + changes. + + Document them in NEWS. All API and API semantic changes should be clearly + marked as API additions, API changes, or API deletions. Document + deprecations. Ensure all new API / deprecations are in listed correctly in + docs/harfbuzz-sections.txt. If release added new API, add entry for new + API index at the end of docs/harfbuzz-docs.xml. + + If there's a backward-incompatible API change (including deletions for API + used anywhere), that's a release blocker. Do NOT release. + +2. Based on severity of changes, decide whether it's a minor or micro release + number bump, + +3. Search for REPLACEME on the repository and replace it with the chosen version + for the release. + +4. Make sure you have correct date and new version at the top of NEWS file, + +5. Bump version in configure.ac line 3, + +6. Do "make distcheck", if it passes, you get a tarball. + Otherwise, fix things and commit them separately before making release, + Note: Check src/hb-version.h and make sure the new version number is + there. Sometimes, it does not get updated. If that's the case, + "touch configure.ac" and rebuild. Also check that there is no hb-version.h + in your build/src file. Typically it will fail the distcheck if there is. + That's what happened to 2.0.0 going out with 1.8.0 hb-version.h... So, that's + a clue. + +7. Now that you have release files, commit NEWS, configure.ac, and src/hb-version.h, + as well as any REPLACEME changes you made. The commit message is simply the + release number. Eg. "1.4.7" + +8. "make dist" again to get a tarball with your new commit in the ChangeLog. Then + "make release-files". Enter your GPG password. This creates a sha256 hash + and signs it. Check the size of the three resulting files. + +9. Tag the release and sign it: Eg. "git tag -s 1.4.7 -m 1.4.7". Enter your + GPG password again. + +10. Build win32 bundle. + + a. Build Win32 binaries. See [README.mingw.md](README.mingw.md). + + b. Run "make dist-win" to build Win32 bundle. + +11. Copy all artefacts to users.freedesktop.org and move them into + `/srv/www.freedesktop.org/www/software/harfbuzz/release` There should be four + files. Eg.: + ``` +-rw-r--r-- 1 behdad eng 1592693 Jul 18 11:25 harfbuzz-1.4.7.tar.xz +-rw-r--r-- 1 behdad eng 89 Jul 18 11:34 harfbuzz-1.4.7.tar.xz.sha256 +-rw-r--r-- 1 behdad eng 339 Jul 18 11:34 harfbuzz-1.4.7.tar.xz.sha256.asc +-rw-r--r-- 1 behdad eng 2895619 Jul 18 11:34 harfbuzz-1.4.7-win32.zip +``` + +12. While doing that, quickly double-check the size of the .tar.xz and .zip + files against their previous releases to make sure nothing bad happened. + They should be in the ballpark, perhaps slightly larger. Sometimes they + do shrink, that's not by itself a stopper. + +13. Push the commit and tag out: "git push --follow-tags". Make sure it's + pushed both to freedesktop repo and github. + +14. Go to GitHub release page [here](https://github.com/harfbuzz/harfbuzz/releases), + edit the tag, upload artefacts and NEWS entry and save. diff --git a/source/libs/harfbuzz/harfbuzz-src/TESTING.md b/source/libs/harfbuzz/harfbuzz-src/TESTING.md new file mode 100644 index 000000000..4efc64ca5 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/TESTING.md @@ -0,0 +1,75 @@ +## Build & Run + +Depending on what area you are working in change or add `HB_DEBUG_`. +Values defined in `hb-debug.hh`. + +```shell +# quick sanity check +time (make -j4 CPPFLAGS='-DHB_DEBUG_SUBSET=100' \ + && (make -j4 -C test/api check || cat test/api/test-suite.log)) + +# slower sanity check +time (make -j4 CPPFLAGS='-DHB_DEBUG_SUBSET=100' \ + && make -j4 -C src check \ + && make -j4 -C test/api check \ + && make -j4 -C test/subset check) + +# confirm you didn't break anything else +time (make -j4 CPPFLAGS='-DHB_DEBUG_SUBSET=100' \ + && make -j4 check) + +# often catches files you didn't add, e.g. test fonts to EXTRA_DIST +make distcheck +``` + +### Run tests with asan + +**NOTE**: this sometimes yields harder to read results than the full fuzzer + +```shell +# For nice symbols tell asan how to symoblize. Note that it doesn't like versioned copies like llvm-symbolizer-3.8 +# export ASAN_SYMBOLIZER_PATH=path to version-less llvm-symbolizer +# ex +export ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-3.8/bin/llvm-symbolizer + +./configure CC=clang CXX=clang++ CPPFLAGS=-fsanitize=address LDFLAGS=-fsanitize=address +# make/run tests as usual +``` + +### Debug with GDB + +``` +cd ./util +../libtool --mode=execute gdb --args ./hb-subset ... +``` + +### Enable Debug Logging + +```shell +# make clean if you previously build w/o debug logging +make CPPFLAGS=-DHB_DEBUG_SUBSET=100 +``` + +## Build and Test via CMake + +Note: You'll need to first install ninja-build via apt-get. + +```shell +cd harfbuzz +mkdir buid +cmake -DHB_CHECK=ON -Bbuild -H. -GNinja && ninja -Cbuild && CTEST_OUTPUT_ON_FAILURE=1 ninja -Cbuild test +``` +## Test with the Fuzzer + +```shell +# push your changs to a branch on googlefonts/harfbuzz +# In a local copy of oss-fuzz, edit projects/harfbuzz/Dockerfile +# Change the git clone to pull your branch + +# Do this periodically +sudo python infra/helper.py build_image harfbuzz + +# Do these to update/run +sudo python infra/helper.py build_fuzzers --sanitizer address harfbuzz +sudo python infra/helper.py run_fuzzer harfbuzz hb-subset-fuzzer +``` diff --git a/source/libs/harfbuzz/harfbuzz-src/THANKS b/source/libs/harfbuzz/harfbuzz-src/THANKS new file mode 100644 index 000000000..88cb7e9ea --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/THANKS @@ -0,0 +1,7 @@ +Bradley Grainger +Kenichi Ishibashi +Ivan Kuckir +Ryan Lortie +Jeff Muizelaar +suzuki toshiya +Philip Withnall diff --git a/source/libs/harfbuzz/harfbuzz-src/TODO b/source/libs/harfbuzz/harfbuzz-src/TODO new file mode 100644 index 000000000..d8e41050e --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/TODO @@ -0,0 +1,28 @@ +API issues: +=========== + +- API to accept a list of languages? + +- Remove hb_ot_shape_glyphs_closure()? + + +API additions +============= + +- Language to/from script. + +- Add hb-cairo glue + +- Add sanitize API. + +- Add query / enumeration API for aalt-like features? + +- Add segmentation API + +- Add hb-fribidi glue? + + +hb-view / hb-shape enhancements: +=============================== + +- Add --width, --height, --auto-size, --ink-box, --align, etc? diff --git a/source/libs/harfbuzz/harfbuzz-src/autogen.sh b/source/libs/harfbuzz/harfbuzz-src/autogen.sh new file mode 100755 index 000000000..fd5c1983c --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/autogen.sh @@ -0,0 +1,48 @@ +#!/bin/sh +# Run this to generate all the initial makefiles, etc. + +test -n "$srcdir" || srcdir=`dirname "$0"` +test -n "$srcdir" || srcdir=. + +olddir=`pwd` +cd $srcdir + +#echo -n "checking for ragel... " +#which ragel || { +# echo "You need to install ragel... See http://www.complang.org/ragel/" +# exit 1 +#} + +echo -n "checking for pkg-config... " +which pkg-config || { + echo "*** No pkg-config found, please install it ***" + exit 1 +} + +echo -n "checking for libtoolize... " +which glibtoolize || which libtoolize || { + echo "*** No libtoolize (libtool) found, please install it ***" + exit 1 +} +echo -n "checking for gtkdocize... " +if which gtkdocize ; then + gtkdocize --copy || exit 1 +else + echo "*** No gtkdocize (gtk-doc) found, skipping documentation ***" + echo "EXTRA_DIST = " > gtk-doc.make +fi + +echo -n "checking for autoreconf... " +which autoreconf || { + echo "*** No autoreconf (autoconf) found, please install it ***" + exit 1 +} + +echo "running autoreconf --force --install --verbose" +autoreconf --force --install --verbose || exit $? + +cd $olddir +test -n "$NOCONFIGURE" || { + echo "running configure $@" + "$srcdir/configure" "$@" +} diff --git a/source/libs/harfbuzz/harfbuzz-src/config.h.in b/source/libs/harfbuzz/harfbuzz-src/config.h.in new file mode 100644 index 000000000..381036e59 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/config.h.in @@ -0,0 +1,187 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* The normal alignment of `struct{char;}', in bytes. */ +#undef ALIGNOF_STRUCT_CHAR__ + +/* Define to 1 if you have the `atexit' function. */ +#undef HAVE_ATEXIT + +/* Have cairo graphics library */ +#undef HAVE_CAIRO + +/* Have cairo-ft support in cairo graphics library */ +#undef HAVE_CAIRO_FT + +/* Have Core Text backend */ +#undef HAVE_CORETEXT + +/* define if the compiler supports basic C++11 syntax */ +#undef HAVE_CXX11 + +/* Have DirectWrite library */ +#undef HAVE_DIRECTWRITE + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_DWRITE_H + +/* Have fontconfig library */ +#undef HAVE_FONTCONFIG + +/* Have FreeType 2 library */ +#undef HAVE_FREETYPE + +/* Define to 1 if you have the `FT_Done_MM_Var' function. */ +#undef HAVE_FT_DONE_MM_VAR + +/* Define to 1 if you have the `FT_Get_Var_Blend_Coordinates' function. */ +#undef HAVE_FT_GET_VAR_BLEND_COORDINATES + +/* Define to 1 if you have the `FT_Set_Var_Blend_Coordinates' function. */ +#undef HAVE_FT_SET_VAR_BLEND_COORDINATES + +/* Have GDI library */ +#undef HAVE_GDI + +/* Define to 1 if you have the `getpagesize' function. */ +#undef HAVE_GETPAGESIZE + +/* Have glib2 library */ +#undef HAVE_GLIB + +/* Have gobject2 library */ +#undef HAVE_GOBJECT + +/* Have Graphite2 library */ +#undef HAVE_GRAPHITE2 + +/* Have ICU library */ +#undef HAVE_ICU + +/* Use hb-icu Unicode callbacks */ +#undef HAVE_ICU_BUILTIN + +/* Have Intel __sync_* atomic primitives */ +#undef HAVE_INTEL_ATOMIC_PRIMITIVES + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `isatty' function. */ +#undef HAVE_ISATTY + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `mmap' function. */ +#undef HAVE_MMAP + +/* Define to 1 if you have the `mprotect' function. */ +#undef HAVE_MPROTECT + +/* Define to 1 if you have the `newlocale' function. */ +#undef HAVE_NEWLOCALE + +/* Have POSIX threads */ +#undef HAVE_PTHREAD + +/* Have PTHREAD_PRIO_INHERIT. */ +#undef HAVE_PTHREAD_PRIO_INHERIT + +/* Define to 1 if you have the `roundf' function. */ +#undef HAVE_ROUNDF + +/* Define to 1 if you have the header file. */ +#undef HAVE_SCHED_H + +/* Have sched_yield */ +#undef HAVE_SCHED_YIELD + +/* Have Solaris __machine_*_barrier and atomic_* operations */ +#undef HAVE_SOLARIS_ATOMIC_OPS + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDBOOL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strtod_l' function. */ +#undef HAVE_STRTOD_L + +/* Define to 1 if you have the `sysconf' function. */ +#undef HAVE_SYSCONF + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_MMAN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Have Uniscribe library */ +#undef HAVE_UNISCRIBE + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_USP10_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_WINDOWS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_XLOCALE_H + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#undef LT_OBJDIR + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to necessary symbol if this constant uses a non-standard name on + your system. */ +#undef PTHREAD_CREATE_JOINABLE + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ +#undef _FILE_OFFSET_BITS + +/* Define for large files, on AIX-style hosts. */ +#undef _LARGE_FILES diff --git a/source/libs/harfbuzz/harfbuzz-src/configure.ac b/source/libs/harfbuzz/harfbuzz-src/configure.ac new file mode 100644 index 000000000..c88cffea6 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/configure.ac @@ -0,0 +1,542 @@ +AC_PREREQ([2.64]) +AC_INIT([HarfBuzz], + [2.6.2], + [https://github.com/harfbuzz/harfbuzz/issues/new], + [harfbuzz], + [http://harfbuzz.org/]) + +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_SRCDIR([src/harfbuzz.pc.in]) +AC_CONFIG_HEADERS([config.h]) + +AM_INIT_AUTOMAKE([1.13.0 gnits tar-ustar dist-xz no-dist-gzip -Wall no-define color-tests -Wno-portability]) +AM_SILENT_RULES([yes]) +AX_CODE_COVERAGE + +# Initialize libtool +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) +LT_PREREQ([2.2]) +LT_INIT([disable-static]) + +# Check for programs +AC_PROG_CC +AC_PROG_CC_C99 +AM_PROG_CC_C_O +AC_PROG_CXX +AX_CXX_COMPILE_STDCXX(11,, optional) +AC_SYS_LARGEFILE +PKG_PROG_PKG_CONFIG([0.20]) +AM_MISSING_PROG([RAGEL], [ragel]) +AM_MISSING_PROG([GIT], [git]) + +# Version +m4_define(hb_version_triplet,m4_split(AC_PACKAGE_VERSION,[[.]])) +m4_define(hb_version_major,m4_argn(1,hb_version_triplet)) +m4_define(hb_version_minor,m4_argn(2,hb_version_triplet)) +m4_define(hb_version_micro,m4_argn(3,hb_version_triplet)) +HB_VERSION_MAJOR=hb_version_major +HB_VERSION_MINOR=hb_version_minor +HB_VERSION_MICRO=hb_version_micro +HB_VERSION=AC_PACKAGE_VERSION +AC_SUBST(HB_VERSION_MAJOR) +AC_SUBST(HB_VERSION_MINOR) +AC_SUBST(HB_VERSION_MICRO) +AC_SUBST(HB_VERSION) + +# Libtool version +m4_define([hb_version_int], + m4_eval(hb_version_major*10000 + hb_version_minor*100 + hb_version_micro)) +m4_if(m4_eval(hb_version_minor % 2), [1], + dnl for unstable releases + [m4_define([hb_libtool_revision], 0)], + dnl for stable releases + [m4_define([hb_libtool_revision], hb_version_micro)]) +m4_define([hb_libtool_age], + m4_eval(hb_version_int - hb_libtool_revision)) +m4_define([hb_libtool_current], + m4_eval(hb_libtool_age)) +HB_LIBTOOL_VERSION_INFO=hb_libtool_current:hb_libtool_revision:hb_libtool_age +AC_SUBST(HB_LIBTOOL_VERSION_INFO) + +AC_ARG_WITH([libstdc++], + [AS_HELP_STRING([--with-libstdc++=@<:@yes/no@:>@], + [Allow linking with libstdc++ @<:@default=no@:>@])], + [with_libstdcxx=$withval], + [with_libstdcxx=no]) +AM_CONDITIONAL(WITH_LIBSTDCXX, [test "x$with_libstdcxx" = "xyes"]) + +# Documentation +have_gtk_doc=false +m4_ifdef([GTK_DOC_CHECK], [ +GTK_DOC_CHECK([1.15],[--flavour no-tmpl]) + if test "x$enable_gtk_doc" = xyes; then + have_gtk_doc=true + fi +], [ + AM_CONDITIONAL([ENABLE_GTK_DOC], false) +]) + +# Functions and headers +AC_CHECK_FUNCS(atexit mprotect sysconf getpagesize mmap isatty newlocale strtod_l roundf) +AC_CHECK_HEADERS(unistd.h sys/mman.h xlocale.h stdbool.h) + +# Compiler flags +AC_CANONICAL_HOST +AC_CHECK_ALIGNOF([struct{char;}]) +if test "x$GCC" = "xyes"; then + + # Make symbols link locally + AX_CHECK_LINK_FLAG([[-Bsymbolic-functions]], [LDFLAGS="$LDFLAGS -Bsymbolic-functions"]) + + # Make it possible to not link to libstdc++ + # No threadsafe statics in C++ as we do it ourselves. + # We don't use these features, so it's safe to disable them + # even in the cases where we DO link to libstdc++. + # Put -fno-rtti before $CXXFLAGS such that users can re-enable it + # by overriding CXXFLAGS. + CXXFLAGS="-fno-rtti $CXXFLAGS -fno-exceptions -fno-threadsafe-statics" + + case "$host" in + *-*-mingw*) + ;; + *) + # Hide inline methods + CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden" + ;; + esac + + case "$host" in + arm-*-*) + if test "x$ac_cv_alignof_struct_char__" != x1; then + # Request byte alignment + CXXFLAGS="$CXXFLAGS -mstructure-size-boundary=8" + fi + ;; + esac +fi + +AM_CONDITIONAL(HAVE_GCC, test "x$GCC" = "xyes") + +hb_os_win32=no +AC_MSG_CHECKING([for native Win32]) +case "$host" in + *-*-mingw*) + hb_os_win32=yes + ;; +esac +AC_MSG_RESULT([$hb_os_win32]) +AM_CONDITIONAL(OS_WIN32, test "$hb_os_win32" = "yes") + +have_pthread=false +AX_PTHREAD([have_pthread=true]) +if $have_pthread; then + AC_DEFINE(HAVE_PTHREAD, 1, [Have POSIX threads]) +fi +AM_CONDITIONAL(HAVE_PTHREAD, $have_pthread) + +dnl ========================================================================== + +AC_ARG_WITH(glib, + [AS_HELP_STRING([--with-glib=@<:@yes/no/auto@:>@], + [Use glib @<:@default=auto@:>@])],, + [with_glib=auto]) +have_glib=false +GLIB_DEPS="glib-2.0 >= 2.19.1" +AC_SUBST(GLIB_DEPS) +if test "x$with_glib" = "xyes" -o "x$with_glib" = "xauto"; then + PKG_CHECK_MODULES(GLIB, $GLIB_DEPS, have_glib=true, :) +fi +if test "x$with_glib" = "xyes" -a "x$have_glib" != "xtrue"; then + AC_MSG_ERROR([glib support requested but glib-2.0 not found]) +fi +if $have_glib; then + AC_DEFINE(HAVE_GLIB, 1, [Have glib2 library]) +fi +AM_CONDITIONAL(HAVE_GLIB, $have_glib) + +dnl =========================================================================== + +AC_ARG_WITH(gobject, + [AS_HELP_STRING([--with-gobject=@<:@yes/no/auto@:>@], + [Use gobject @<:@default=no@:>@])],, + [with_gobject=no]) +have_gobject=false +if test "x$with_gobject" = "xyes" -o "x$with_gobject" = "xauto"; then + PKG_CHECK_MODULES(GOBJECT, gobject-2.0 glib-2.0, have_gobject=true, :) +fi +if test "x$with_gobject" = "xyes" -a "x$have_gobject" != "xtrue"; then + AC_MSG_ERROR([gobject support requested but gobject-2.0 / glib-2.0 not found]) +fi +if $have_gobject; then + AC_DEFINE(HAVE_GOBJECT, 1, [Have gobject2 library]) + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + AC_SUBST(GLIB_MKENUMS) +fi +AM_CONDITIONAL(HAVE_GOBJECT, $have_gobject) +AC_SUBST(have_gobject) + +dnl =========================================================================== + + +dnl =========================================================================== +# Gobject-Introspection +have_introspection=false +m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [ + if $have_gobject; then + GOBJECT_INTROSPECTION_CHECK([1.34.0]) + if test "x$found_introspection" = xyes; then + have_introspection=true + fi + else + AM_CONDITIONAL([HAVE_INTROSPECTION], false) + fi +], [ + AM_CONDITIONAL([HAVE_INTROSPECTION], false) +]) + +dnl ========================================================================== + +AC_ARG_WITH(cairo, + [AS_HELP_STRING([--with-cairo=@<:@yes/no/auto@:>@], + [Use cairo @<:@default=auto@:>@])],, + [with_cairo=auto]) +have_cairo=false +if test "x$with_cairo" = "xyes" -o "x$with_cairo" = "xauto"; then + PKG_CHECK_MODULES(CAIRO, cairo >= 1.8.0, have_cairo=true, :) +fi +if test "x$with_cairo" = "xyes" -a "x$have_cairo" != "xtrue"; then + AC_MSG_ERROR([cairo support requested but not found]) +fi +if $have_cairo; then + AC_DEFINE(HAVE_CAIRO, 1, [Have cairo graphics library]) +fi +AM_CONDITIONAL(HAVE_CAIRO, $have_cairo) + +have_cairo_ft=false +if $have_cairo; then + PKG_CHECK_MODULES(CAIRO_FT, cairo-ft, have_cairo_ft=true, :) +fi +if $have_cairo_ft; then + AC_DEFINE(HAVE_CAIRO_FT, 1, [Have cairo-ft support in cairo graphics library]) +fi +AM_CONDITIONAL(HAVE_CAIRO_FT, $have_cairo_ft) + +dnl ========================================================================== + +AC_ARG_WITH(fontconfig, + [AS_HELP_STRING([--with-fontconfig=@<:@yes/no/auto@:>@], + [Use fontconfig @<:@default=auto@:>@])],, + [with_fontconfig=auto]) +have_fontconfig=false +if test "x$with_fontconfig" = "xyes" -o "x$with_fontconfig" = "xauto"; then + PKG_CHECK_MODULES(FONTCONFIG, fontconfig, have_fontconfig=true, :) +fi +if test "x$with_fontconfig" = "xyes" -a "x$have_fontconfig" != "xtrue"; then + AC_MSG_ERROR([fontconfig support requested but not found]) +fi +if $have_fontconfig; then + AC_DEFINE(HAVE_FONTCONFIG, 1, [Have fontconfig library]) +fi +AM_CONDITIONAL(HAVE_FONTCONFIG, $have_fontconfig) + +dnl ========================================================================== + +AC_ARG_WITH(icu, + [AS_HELP_STRING([--with-icu=@<:@yes/no/builtin/auto@:>@], + [Use ICU @<:@default=auto@:>@])],, + [with_icu=auto]) +have_icu=false +if test "x$with_icu" = "xyes" -o "x$with_icu" = "xbuiltin" -o "x$with_icu" = "xauto"; then + PKG_CHECK_MODULES(ICU, icu-uc, have_icu=true, :) + + dnl Fallback to icu-config if ICU pkg-config files could not be found + if test "$have_icu" != "true"; then + AC_CHECK_TOOL(ICU_CONFIG, icu-config, no) + AC_MSG_CHECKING([for ICU by using icu-config fallback]) + if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null; then + have_icu=true + # We don't use --cflags as this gives us a lot of things that we don't + # necessarily want, like debugging and optimization flags + # See man (1) icu-config for more info. + ICU_CFLAGS=`$ICU_CONFIG --cppflags` + ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly` + AC_SUBST(ICU_CFLAGS) + AC_SUBST(ICU_LIBS) + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + fi +fi +if test \( "x$with_icu" = "xyes" -o "x$with_icu" = "xbuiltin" \) -a "x$have_icu" != "xtrue"; then + AC_MSG_ERROR([icu support requested but icu-uc not found]) +fi + +if $have_icu; then + CXXFLAGS="$CXXFLAGS `$PKG_CONFIG --variable=CXXFLAGS icu-uc`" + AC_DEFINE(HAVE_ICU, 1, [Have ICU library]) + if test "x$with_icu" = "xbuiltin"; then + AC_DEFINE(HAVE_ICU_BUILTIN, 1, [Use hb-icu Unicode callbacks]) + fi +fi +AM_CONDITIONAL(HAVE_ICU, $have_icu) +AM_CONDITIONAL(HAVE_ICU_BUILTIN, $have_icu && test "x$with_icu" = "xbuiltin") + +dnl =========================================================================== + +AC_ARG_WITH(graphite2, + [AS_HELP_STRING([--with-graphite2=@<:@yes/no/auto@:>@], + [Use the graphite2 library @<:@default=no@:>@])],, + [with_graphite2=no]) +have_graphite2=false +GRAPHITE2_DEPS="graphite2 >= 1.2.0" +AC_SUBST(GRAPHITE2_DEPS) +if test "x$with_graphite2" = "xyes" -o "x$with_graphite2" = "xauto"; then + PKG_CHECK_MODULES(GRAPHITE2, $GRAPHITE2_DEPS, have_graphite2=true, :) + if test "x$have_graphite2" != "xtrue"; then + # If pkg-config is not available, graphite2 can still be there + ac_save_CFLAGS="$CFLAGS" + ac_save_CPPFLAGS="$CPPFLAGS" + CFLAGS="$CFLAGS $GRAPHITE2_CFLAGS" + CPPFLAGS="$CPPFLAGS $GRAPHITE2_CFLAGS" + AC_CHECK_HEADER(graphite2/Segment.h, have_graphite2=true, :) + CPPFLAGS="$ac_save_CPPFLAGS" + CFLAGS="$ac_save_CFLAGS" + fi +fi +if test "x$with_graphite2" = "xyes" -a "x$have_graphite2" != "xtrue"; then + AC_MSG_ERROR([graphite2 support requested but libgraphite2 not found]) +fi +if $have_graphite2; then + AC_DEFINE(HAVE_GRAPHITE2, 1, [Have Graphite2 library]) +fi +AM_CONDITIONAL(HAVE_GRAPHITE2, $have_graphite2) + +dnl ========================================================================== + +AC_ARG_WITH(freetype, + [AS_HELP_STRING([--with-freetype=@<:@yes/no/auto@:>@], + [Use the FreeType library @<:@default=auto@:>@])],, + [with_freetype=auto]) +have_freetype=false +FREETYPE_DEPS="freetype2 >= 12.0.6" +AC_SUBST(FREETYPE_DEPS) +if test "x$with_freetype" = "xyes" -o "x$with_freetype" = "xauto"; then + # See freetype/docs/VERSION.DLL; 12.0.6 means freetype-2.4.2 + PKG_CHECK_MODULES(FREETYPE, $FREETYPE_DEPS, have_freetype=true, :) +fi +if test "x$with_freetype" = "xyes" -a "x$have_freetype" != "xtrue"; then + AC_MSG_ERROR([FreeType support requested but libfreetype2 not found]) +fi +if $have_freetype; then + AC_DEFINE(HAVE_FREETYPE, 1, [Have FreeType 2 library]) + save_libs=$LIBS + LIBS="$LIBS $FREETYPE_LIBS" + AC_CHECK_FUNCS(FT_Get_Var_Blend_Coordinates FT_Set_Var_Blend_Coordinates FT_Done_MM_Var) + LIBS=$save_libs +fi +AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype) + +dnl =========================================================================== + +AC_ARG_WITH(uniscribe, + [AS_HELP_STRING([--with-uniscribe=@<:@yes/no/auto@:>@], + [Use the Uniscribe library @<:@default=no@:>@])],, + [with_uniscribe=no]) +have_uniscribe=false +if test "x$with_uniscribe" = "xyes" -o "x$with_uniscribe" = "xauto"; then + AC_CHECK_HEADERS(usp10.h windows.h, have_uniscribe=true) +fi +if test "x$with_uniscribe" = "xyes" -a "x$have_uniscribe" != "xtrue"; then + AC_MSG_ERROR([uniscribe support requested but not found]) +fi +if $have_uniscribe; then + UNISCRIBE_CFLAGS= + UNISCRIBE_LIBS="-lusp10 -lgdi32 -lrpcrt4" + AC_SUBST(UNISCRIBE_CFLAGS) + AC_SUBST(UNISCRIBE_LIBS) + AC_DEFINE(HAVE_UNISCRIBE, 1, [Have Uniscribe library]) +fi +AM_CONDITIONAL(HAVE_UNISCRIBE, $have_uniscribe) + +dnl =========================================================================== + +AC_ARG_WITH(gdi, + [AS_HELP_STRING([--with-gdi=@<:@yes/no/auto@:>@], + [Provide GDI integration helpers @<:@default=no@:>@])],, + [with_gdi=no]) +have_gdi=false +if test "x$with_gdi" = "xyes" -o "x$with_gdi" = "xauto"; then + AC_CHECK_HEADERS(windows.h, have_gdi=true) +fi +if test "x$with_gdi" = "xyes" -a "x$have_gdi" != "xtrue"; then + AC_MSG_ERROR([gdi support requested but not found]) +fi +if $have_gdi; then + GDI_CFLAGS= + GDI_LIBS="-lgdi32" + AC_SUBST(GDI_CFLAGS) + AC_SUBST(GDI_LIBS) + AC_DEFINE(HAVE_GDI, 1, [Have GDI library]) +fi +AM_CONDITIONAL(HAVE_GDI, $have_gdi) + +dnl =========================================================================== + +AC_ARG_WITH(directwrite, + [AS_HELP_STRING([--with-directwrite=@<:@yes/no/auto@:>@], + [Use the DirectWrite library (experimental) @<:@default=no@:>@])],, + [with_directwrite=no]) +have_directwrite=false +AC_LANG_PUSH([C++]) +if test "x$with_directwrite" = "xyes" -o "x$with_directwrite" = "xauto"; then + AC_CHECK_HEADERS(dwrite.h, have_directwrite=true) +fi +AC_LANG_POP([C++]) +if test "x$with_directwrite" = "xyes" -a "x$have_directwrite" != "xtrue"; then + AC_MSG_ERROR([directwrite support requested but not found]) +fi +if $have_directwrite; then + DIRECTWRITE_CXXFLAGS= + DIRECTWRITE_LIBS= + AC_SUBST(DIRECTWRITE_CXXFLAGS) + AC_SUBST(DIRECTWRITE_LIBS) + AC_DEFINE(HAVE_DIRECTWRITE, 1, [Have DirectWrite library]) +fi +AM_CONDITIONAL(HAVE_DIRECTWRITE, $have_directwrite) + +dnl =========================================================================== + +AC_ARG_WITH(coretext, + [AS_HELP_STRING([--with-coretext=@<:@yes/no/auto@:>@], + [Use CoreText @<:@default=no@:>@])],, + [with_coretext=no]) +have_coretext=false +if test "x$with_coretext" = "xyes" -o "x$with_coretext" = "xauto"; then + AC_CHECK_TYPE(CTFontRef, have_coretext=true,, [#include ]) + + if $have_coretext; then + CORETEXT_CFLAGS= + CORETEXT_LIBS="-framework ApplicationServices" + AC_SUBST(CORETEXT_CFLAGS) + AC_SUBST(CORETEXT_LIBS) + else + # On iOS CoreText and CoreGraphics are stand-alone frameworks + if test "x$have_coretext" != "xtrue"; then + # Check for a different symbol to avoid getting cached result. + AC_CHECK_TYPE(CTRunRef, have_coretext=true,, [#include ]) + fi + + if $have_coretext; then + CORETEXT_CFLAGS= + CORETEXT_LIBS="-framework CoreText -framework CoreGraphics -framework CoreFoundation" + AC_SUBST(CORETEXT_CFLAGS) + AC_SUBST(CORETEXT_LIBS) + fi + fi +fi +if test "x$with_coretext" = "xyes" -a "x$have_coretext" != "xtrue"; then + AC_MSG_ERROR([CoreText support requested but libcoretext not found]) +fi +if $have_coretext; then + AC_DEFINE(HAVE_CORETEXT, 1, [Have Core Text backend]) +fi +AM_CONDITIONAL(HAVE_CORETEXT, $have_coretext) + +dnl =========================================================================== + +AC_CACHE_CHECK([for Intel atomic primitives], hb_cv_have_intel_atomic_primitives, [ + hb_cv_have_intel_atomic_primitives=false + AC_TRY_LINK([ + void memory_barrier (void) { __sync_synchronize (); } + int atomic_add (int *i) { return __sync_fetch_and_add (i, 1); } + int mutex_trylock (int *m) { return __sync_lock_test_and_set (m, 1); } + void mutex_unlock (int *m) { __sync_lock_release (m); } + ], [], hb_cv_have_intel_atomic_primitives=true + ) +]) +if $hb_cv_have_intel_atomic_primitives; then + AC_DEFINE(HAVE_INTEL_ATOMIC_PRIMITIVES, 1, [Have Intel __sync_* atomic primitives]) +fi + +dnl =========================================================================== + +AC_CACHE_CHECK([for Solaris atomic operations], hb_cv_have_solaris_atomic_ops, [ + hb_cv_have_solaris_atomic_ops=false + AC_TRY_LINK([ + #include + /* This requires Solaris Studio 12.2 or newer: */ + #include + void memory_barrier (void) { __machine_rw_barrier (); } + int atomic_add (volatile unsigned *i) { return atomic_add_int_nv (i, 1); } + void *atomic_ptr_cmpxchg (volatile void **target, void *cmp, void *newval) { return atomic_cas_ptr (target, cmp, newval); } + ], [], hb_cv_have_solaris_atomic_ops=true + ) +]) +if $hb_cv_have_solaris_atomic_ops; then + AC_DEFINE(HAVE_SOLARIS_ATOMIC_OPS, 1, [Have Solaris __machine_*_barrier and atomic_* operations]) +fi + +if test "$os_win32" = no && ! $have_pthread; then + AC_CHECK_HEADERS(sched.h) + AC_SEARCH_LIBS(sched_yield,rt,AC_DEFINE(HAVE_SCHED_YIELD, 1, [Have sched_yield])) +fi + +dnl =========================================================================== + +AC_CONFIG_FILES([ +Makefile +src/Makefile +src/harfbuzz-config.cmake +util/Makefile +test/Makefile +test/api/Makefile +test/fuzzing/Makefile +test/shaping/Makefile +test/shaping/data/Makefile +test/shaping/data/aots/Makefile +test/shaping/data/in-house/Makefile +test/shaping/data/text-rendering-tests/Makefile +test/subset/Makefile +test/subset/data/Makefile +docs/Makefile +docs/version.xml +]) + +AC_OUTPUT + +echo +echo "C++ compiler version:" +$CXX --version +echo + +AC_MSG_NOTICE([ + +Build configuration: + +Unicode callbacks (you want at least one): + Builtin true + Glib: ${have_glib} + ICU: ${have_icu} + +Font callbacks (the more the merrier): + FreeType: ${have_freetype} + +Tools used for command-line utilities: + Cairo: ${have_cairo} + Fontconfig: ${have_fontconfig} + +Additional shapers (the more the merrier): + Graphite2: ${have_graphite2} + +Platform shapers (not normally needed): + CoreText: ${have_coretext} + DirectWrite: ${have_directwrite} + GDI: ${have_gdi} + Uniscribe: ${have_uniscribe} + +Other features: + Documentation: ${enable_gtk_doc} + GObject bindings: ${have_gobject} + Introspection: ${have_introspection} +]) diff --git a/source/libs/harfbuzz/harfbuzz-src/gtk-doc.make b/source/libs/harfbuzz/harfbuzz-src/gtk-doc.make new file mode 100644 index 000000000..7d9a27f34 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/gtk-doc.make @@ -0,0 +1,321 @@ +# -*- mode: makefile -*- +# +# gtk-doc.make - make rules for gtk-doc +# Copyright (C) 2003 James Henstridge +# 2004-2007 Damon Chaplin +# 2007-2017 Stefan Sauer +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +#################################### +# Everything below here is generic # +#################################### + +if GTK_DOC_USE_LIBTOOL +GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +GTKDOC_RUN = $(LIBTOOL) --mode=execute +else +GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +GTKDOC_RUN = +endif + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) + +TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) + +SETUP_FILES = \ + $(content_files) \ + $(expand_content_files) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + +EXTRA_DIST = \ + $(HTML_IMAGES) \ + $(SETUP_FILES) + +DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ + sgml.stamp html.stamp pdf.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +gtkdoc-check.test: Makefile + $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ + echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ + chmod +x $@ + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test + +if GTK_DOC_BUILD_HTML +HTML_BUILD_STAMP=html-build.stamp +else +HTML_BUILD_STAMP= +endif +if GTK_DOC_BUILD_PDF +PDF_BUILD_STAMP=pdf-build.stamp +else +PDF_BUILD_STAMP= +endif + +all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +.PHONY: all-gtk-doc + +if ENABLE_GTK_DOC +all-local: all-gtk-doc +endif + +docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) + +$(REPORT_FILES): sgml-build.stamp + +#### setup #### + +GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_@AM_V@) +GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_@AM_DEFAULT_V@) +GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; + +setup-build.stamp: + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ + if test "x$$files" != "x" ; then \ + for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file`; \ + test -d "$$destdir" || mkdir -p "$$destdir"; \ + test -f $(abs_srcdir)/$$file && \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + done; \ + fi; \ + fi + $(AM_V_at)touch setup-build.stamp + +#### scan #### + +GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_@AM_V@) +GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_@AM_DEFAULT_V@) +GTK_DOC_V_SCAN_0=@echo " DOC Scanning header files"; + +GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_@AM_V@) +GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_@AM_DEFAULT_V@) +GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects"; + +scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) + $(GTK_DOC_V_SCAN)_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$$?" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ + fi; \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ + else \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + $(AM_V_at)touch scan-build.stamp + +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true + +#### xml #### + +GTK_DOC_V_XML=$(GTK_DOC_V_XML_@AM_V@) +GTK_DOC_V_XML_=$(GTK_DOC_V_XML_@AM_DEFAULT_V@) +GTK_DOC_V_XML_0=@echo " DOC Building XML"; + +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent + $(GTK_DOC_V_XML)_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) + $(AM_V_at)touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +$(DOC_MAIN_SGML_FILE): sgml-build.stamp + @true + +xml/gtkdocentities.ent: Makefile + $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + ) > $@ + +#### html #### + +GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_@AM_V@) +GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_@AM_DEFAULT_V@) +GTK_DOC_V_HTML_0=@echo " DOC Building HTML"; + +GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_@AM_V@) +GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_@AM_DEFAULT_V@) +GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$$?" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkhtml_options="$$mkhtml_options --verbose"; \ + fi; \ + fi; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ + if test "$$?" = "0"; then \ + mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ + fi; \ + cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + -@test "x$(HTML_IMAGES)" = "x" || \ + for file in $(HTML_IMAGES) ; do \ + test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ + test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \ + test -f $$file && cp $$file $(abs_builddir)/html; \ + done; + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp + +#### pdf #### + +GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_@AM_V@) +GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_@AM_DEFAULT_V@) +GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; + +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ + gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$$?" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkpdf_options="$$mkpdf_options --verbose"; \ + fi; \ + fi; \ + if test "x$(HTML_IMAGES)" != "x"; then \ + for img in $(HTML_IMAGES); do \ + part=`dirname $$img`; \ + echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ + if test $$? != 0; then \ + mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ + fi; \ + done; \ + fi; \ + gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) + $(AM_V_at)touch pdf-build.stamp + +############## + +clean-local: + @rm -f *~ *.bak + @rm -rf .libs + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ + rm -f $(DOC_MODULE).types; \ + fi + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \ + rm -f $(DOC_MODULE)-sections.txt; \ + fi + +distclean-local: + @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + rm -f $(SETUP_FILES) $(DOC_MODULE).types; \ + fi + +maintainer-clean-local: + @rm -rf xml html + +install-data-local: + @installfiles=`echo $(builddir)/html/*`; \ + if test "$$installfiles" = '$(builddir)/html/*'; \ + then echo 1>&2 'Nothing to install' ; \ + else \ + if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ + fi; \ + $(mkinstalldirs) $${installdir} ; \ + for i in $$installfiles; do \ + echo ' $(INSTALL_DATA) '$$i ; \ + $(INSTALL_DATA) $$i $${installdir}; \ + done; \ + if test -n "$(DOC_MODULE_VERSION)"; then \ + mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ + fi; \ + $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ + fi + +uninstall-local: + @if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ + fi; \ + rm -rf $${installdir} + +# +# Require gtk-doc when making dist +# +if HAVE_GTK_DOC +dist-check-gtkdoc: docs +else +dist-check-gtkdoc: + @echo "*** gtk-doc is needed to run 'make dist'. ***" + @echo "*** gtk-doc was not found when 'configure' ran. ***" + @echo "*** please install gtk-doc and rerun 'configure'. ***" + @false +endif + +dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local + @mkdir $(distdir)/html + @cp ./html/* $(distdir)/html + @-cp ./$(DOC_MODULE).pdf $(distdir)/ + @-cp ./$(DOC_MODULE).types $(distdir)/ + @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ + @cd $(distdir) && rm -f $(DISTCLEANFILES) + @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + +.PHONY : dist-hook-local docs diff --git a/source/libs/harfbuzz/harfbuzz-src/harfbuzz.doap b/source/libs/harfbuzz/harfbuzz-src/harfbuzz.doap new file mode 100644 index 000000000..07699697f --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/harfbuzz.doap @@ -0,0 +1,24 @@ + + + harfbuzz + Text shaping library + + + + + + + + + Behdad Esfahbod + + + + diff --git a/source/libs/harfbuzz/harfbuzz-src/mingw-configure.sh b/source/libs/harfbuzz/harfbuzz-src/mingw-configure.sh new file mode 100755 index 000000000..3281ce382 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/mingw-configure.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +case $1 in + i686 | x86_64) ;; + *) echo "Usage: $0 i686|x86_64" >&2; exit 1 ;; +esac + +target=$1-w64-mingw32 +shift + +exec "$(dirname "$0")"/configure \ + --build=`../config.guess` \ + --host=$target \ + --prefix=$HOME/.local/$target \ + CC= \ + CXX= \ + CPP= \ + LD= \ + CFLAGS="-static-libgcc" \ + CXXFLAGS="-static-libgcc -static-libstdc++" \ + CPPFLAGS="-I$HOME/.local/$target/include" \ + LDFLAGS=-L$HOME/.local/$target/lib \ + PKG_CONFIG_LIBDIR=$HOME/.local/$target/lib/pkgconfig:/usr/$target/sys-root/mingw/lib/pkgconfig/ \ + PKG_CONFIG_PATH=$HOME/.local/$target/share/pkgconfig:/usr/$target/sys-root/mingw/share/pkgconfig/ \ + PATH=$HOME/.local/$target/bin:/usr/$target/sys-root/mingw/bin:/usr/$target/bin:$PATH \ + --without-icu \ + --with-uniscribe \ + "$@" diff --git a/source/libs/harfbuzz/harfbuzz-src/mingw-ldd.py b/source/libs/harfbuzz/harfbuzz-src/mingw-ldd.py new file mode 100644 index 000000000..1d659efa4 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/mingw-ldd.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python + +# Copied from https://github.com/xantares/mingw-ldd/blob/master/mingw-ldd.py +# Modified to point to right prefix location on Fedora. + +# WTFPL - Do What the Fuck You Want to Public License +from __future__ import print_function +import pefile +import os +import sys + + +def get_dependency(filename): + deps = [] + pe = pefile.PE(filename) + for imp in pe.DIRECTORY_ENTRY_IMPORT: + deps.append(imp.dll.decode()) + return deps + + +def dep_tree(root, prefix=None): + if not prefix: + arch = get_arch(root) + #print('Arch =', arch) + prefix = '/usr/'+arch+'-w64-mingw32/sys-root/mingw/bin' + #print('Using default prefix', prefix) + dep_dlls = dict() + + def dep_tree_impl(root, prefix): + for dll in get_dependency(root): + if dll in dep_dlls: + continue + full_path = os.path.join(prefix, dll) + if os.path.exists(full_path): + dep_dlls[dll] = full_path + dep_tree_impl(full_path, prefix=prefix) + else: + dep_dlls[dll] = 'not found' + + dep_tree_impl(root, prefix) + return (dep_dlls) + + +def get_arch(filename): + type2arch= {pefile.OPTIONAL_HEADER_MAGIC_PE: 'i686', + pefile.OPTIONAL_HEADER_MAGIC_PE_PLUS: 'x86_64'} + pe = pefile.PE(filename) + try: + return type2arch[pe.PE_TYPE] + except KeyError: + sys.stderr.write('Error: unknown architecture') + sys.exit(1) + +if __name__ == '__main__': + filename = sys.argv[1] + for dll, full_path in dep_tree(filename).items(): + print(' ' * 7, dll, '=>', full_path) + diff --git a/source/libs/harfbuzz/harfbuzz-src/mingw32.sh b/source/libs/harfbuzz/harfbuzz-src/mingw32.sh new file mode 100755 index 000000000..77edffa98 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/mingw32.sh @@ -0,0 +1,2 @@ +#!/bin/sh +exec "$(dirname "$0")"/mingw-configure.sh i686 "$@" diff --git a/source/libs/harfbuzz/harfbuzz-src/mingw64.sh b/source/libs/harfbuzz/harfbuzz-src/mingw64.sh new file mode 100755 index 000000000..28724a48e --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/mingw64.sh @@ -0,0 +1,2 @@ +#!/bin/sh +exec "$(dirname "$0")"/mingw-configure.sh x86_64 "$@" diff --git a/source/libs/harfbuzz/harfbuzz-src/replace-enum-strings.cmake b/source/libs/harfbuzz/harfbuzz-src/replace-enum-strings.cmake new file mode 100644 index 000000000..42fdbff90 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/replace-enum-strings.cmake @@ -0,0 +1,21 @@ +# CMake script to replace items +# in sources generated by glib-mkenums + +FILE(READ ${ENUM_INPUT_SRC} enum_in) + +STRING(REPLACE + "_t_get_type" + "_get_type" + enum_out_tmp + "${enum_in}" + ) + +STRING(REPLACE + "_T (" + " (" + enum_out + "${enum_out_tmp}" + ) + +FILE(WRITE ${ENUM_OUTPUT_SRC} "${enum_out}") +FILE(REMOVE ${ENUM_INPUT_SRC}) \ No newline at end of file diff --git a/source/libs/harfbuzz/harfbuzz-src/src/Makefile.am b/source/libs/harfbuzz/harfbuzz-src/src/Makefile.am new file mode 100644 index 000000000..a76d96858 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/Makefile.am @@ -0,0 +1,500 @@ +# Process this file with automake to produce Makefile.in + +NULL = +SUBDIRS = +DIST_SUBDIRS = +BUILT_SOURCES = +EXTRA_DIST = +CLEANFILES = +DISTCLEANFILES = +MAINTAINERCLEANFILES = +DISTCHECK_CONFIGURE_FLAGS = --enable-introspection +TESTS = +check_PROGRAMS = + +EXTRA_DIST += harfbuzz.cc + +# Convenience targets: +lib: $(BUILT_SOURCES) libharfbuzz.la +libs: $(BUILT_SOURCES) $(lib_LTLIBRARIES) +tiny: + $(MAKE) $(AM_MAKEFLAGS) CPPFLAGS="-Os -DHB_TINY $(CPPFLAGS)" libs +tinyz: + $(MAKE) $(AM_MAKEFLAGS) CPPFLAGS="-Oz -DHB_TINY $(CPPFLAGS)" libs + +lib_LTLIBRARIES = libharfbuzz.la + +include Makefile.sources + +HBCFLAGS = +HBLIBS = +HBNONPCLIBS = +HBDEPS = +HBSOURCES = $(HB_BASE_sources) +HBSOURCES += $(HB_BASE_RAGEL_GENERATED_sources) +HBHEADERS = $(HB_BASE_headers) + +if HAVE_PTHREAD +HBCFLAGS += $(PTHREAD_CFLAGS) +HBNONPCLIBS += $(PTHREAD_LIBS) +endif + +if HAVE_GLIB +HBCFLAGS += $(GLIB_CFLAGS) +HBLIBS += $(GLIB_LIBS) +HBDEPS += $(GLIB_DEPS) +HBSOURCES += $(HB_GLIB_sources) +HBHEADERS += $(HB_GLIB_headers) +endif + +if HAVE_FREETYPE +HBCFLAGS += $(FREETYPE_CFLAGS) +HBLIBS += $(FREETYPE_LIBS) +# XXX +# The following creates a recursive dependency on FreeType if FreeType is +# built with HarfBuzz support enabled. Newer pkg-config handles that just +# fine but pkg-config 0.26 as shipped in Ubuntu 14.04 crashes. Remove +# in a year or two, or otherwise work around it... +#HBDEPS += $(FREETYPE_DEPS) +HBSOURCES += $(HB_FT_sources) +HBHEADERS += $(HB_FT_headers) +endif + +if HAVE_GRAPHITE2 +HBCFLAGS += $(GRAPHITE2_CFLAGS) +HBLIBS += $(GRAPHITE2_LIBS) +HBDEPS += $(GRAPHITE2_DEPS) +HBSOURCES += $(HB_GRAPHITE2_sources) +HBHEADERS += $(HB_GRAPHITE2_headers) +endif + +if HAVE_UNISCRIBE +HBCFLAGS += $(UNISCRIBE_CFLAGS) +HBNONPCLIBS += $(UNISCRIBE_LIBS) +HBSOURCES += $(HB_UNISCRIBE_sources) +HBHEADERS += $(HB_UNISCRIBE_headers) +endif + +if HAVE_DIRECTWRITE +HBCFLAGS += $(DIRECTWRITE_CXXFLAGS) +HBNONPCLIBS += $(DIRECTWRITE_LIBS) +HBSOURCES += $(HB_DIRECTWRITE_sources) +HBHEADERS += $(HB_DIRECTWRITE_headers) +endif + +if HAVE_GDI +HBCFLAGS += $(GDI_CXXFLAGS) +HBNONPCLIBS += $(GDI_LIBS) +HBSOURCES += $(HB_GDI_sources) +HBHEADERS += $(HB_GDI_headers) +endif + +if HAVE_CORETEXT +HBCFLAGS += $(CORETEXT_CFLAGS) +HBNONPCLIBS += $(CORETEXT_LIBS) +HBSOURCES += $(HB_CORETEXT_sources) +HBHEADERS += $(HB_CORETEXT_headers) +endif + + +BUILT_SOURCES += \ + hb-version.h + +$(srcdir)/hb-version.h: hb-version.h.in $(top_srcdir)/configure.ac + $(AM_V_GEN) $(SED) \ + -e 's/[@]HB_VERSION_MAJOR@/$(HB_VERSION_MAJOR)/' \ + -e 's/[@]HB_VERSION_MINOR@/$(HB_VERSION_MINOR)/' \ + -e 's/[@]HB_VERSION_MICRO@/$(HB_VERSION_MICRO)/' \ + -e 's/[@]HB_VERSION@/$(HB_VERSION)/' \ + "$<" > "$@" || ($(RM) "$@"; false) + +# Put the library together + +HBLIBS += $(HBNONPCLIBS) + +if OS_WIN32 +export_symbols = -export-symbols harfbuzz.def +harfbuzz_def_dependency = harfbuzz.def +export_symbols_subset = -export-symbols harfbuzz-subset.def +harfbuzz_subset_def_dependency = harfbuzz-subset.def +export_symbols_icu = -export-symbols harfbuzz-icu.def +harfbuzz_icu_def_dependency = harfbuzz-icu.def +export_symbols_gobject = -export-symbols harfbuzz-gobject.def +harfbuzz_gobject_def_dependency = harfbuzz-gobject.def +chosen_linker = $(CXXLINK) +else +if WITH_LIBSTDCXX +chosen_linker = $(CXXLINK) +else +if HAVE_GCC +# Use a C linker for GCC, not C++; Don't link to libstdc++ +chosen_linker = $(LINK) +else +chosen_linker = $(CXXLINK) +endif +endif +endif + +@CODE_COVERAGE_RULES@ + +base_link_flags = $(AM_LDFLAGS) -lm -version-info $(HB_LIBTOOL_VERSION_INFO) -no-undefined +libharfbuzz_la_LINK = $(chosen_linker) $(libharfbuzz_la_LDFLAGS) +libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS) +libharfbuzz_la_CPPFLAGS = $(HBCFLAGS) $(CODE_COVERAGE_CFLAGS) +libharfbuzz_la_LDFLAGS = $(base_link_flags) $(export_symbols) $(CODE_COVERAGE_LDFLAGS) +libharfbuzz_la_LIBADD = $(HBLIBS) +EXTRA_libharfbuzz_la_DEPENDENCIES = $(harfbuzz_def_dependency) +pkginclude_HEADERS = $(HBHEADERS) +nodist_pkginclude_HEADERS = +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = harfbuzz.pc +cmakedir = $(libdir)/cmake/harfbuzz +cmake_DATA = harfbuzz-config.cmake +EXTRA_DIST += hb-version.h.in harfbuzz.pc.in harfbuzz-config.cmake.in + +lib_LTLIBRARIES += libharfbuzz-subset.la +libharfbuzz_subset_la_SOURCES = $(HB_SUBSET_sources) +libharfbuzz_subset_la_CPPFLAGS = $(HBCFLAGS) $(CODE_COVERAGE_CFLAGS) +libharfbuzz_subset_la_LDFLAGS = $(base_link_flags) $(export_symbols_subset) $(CODE_COVERAGE_LDFLAGS) +libharfbuzz_subset_la_LIBADD = libharfbuzz.la +EXTRA_libharfbuzz_subset_la_DEPENDENCIES = $(harfbuzz_subset_def_dependency) +pkginclude_HEADERS += $(HB_SUBSET_headers) +pkgconfig_DATA += harfbuzz-subset.pc +EXTRA_DIST += harfbuzz-subset.pc.in + +if HAVE_ICU +if HAVE_ICU_BUILTIN +HBCFLAGS += $(ICU_CFLAGS) +HBLIBS += $(ICU_LIBS) +HBSOURCES += $(HB_ICU_sources) +HBHEADERS += $(HB_ICU_headers) +else +lib_LTLIBRARIES += libharfbuzz-icu.la +libharfbuzz_icu_la_SOURCES = $(HB_ICU_sources) +libharfbuzz_icu_la_CPPFLAGS = $(HBCFLAGS) $(ICU_CFLAGS) $(CODE_COVERAGE_CFLAGS) +libharfbuzz_icu_la_LDFLAGS = $(base_link_flags) $(export_symbols_icu) $(CODE_COVERAGE_LDFLAGS) +libharfbuzz_icu_la_LIBADD = $(ICU_LIBS) libharfbuzz.la +EXTRA_libharfbuzz_icu_la_DEPENDENCIES = $(harfbuzz_icu_def_dependency) +pkginclude_HEADERS += $(HB_ICU_headers) +pkgconfig_DATA += harfbuzz-icu.pc +endif +endif +EXTRA_DIST += harfbuzz-icu.pc.in + +if HAVE_GOBJECT +lib_LTLIBRARIES += libharfbuzz-gobject.la +libharfbuzz_gobject_la_LINK = $(chosen_linker) $(libharfbuzz_gobject_la_LDFLAGS) +libharfbuzz_gobject_la_SOURCES = $(HB_GOBJECT_DIST_sources) +nodist_libharfbuzz_gobject_la_SOURCES = $(HB_GOBJECT_NODIST_sources) +libharfbuzz_gobject_la_CPPFLAGS = $(HBCFLAGS) $(GOBJECT_CFLAGS) $(CODE_COVERAGE_CFLAGS) +libharfbuzz_gobject_la_LDFLAGS = $(base_link_flags) $(CODE_COVERAGE_LDFLAGS) +libharfbuzz_gobject_la_LIBADD = $(GOBJECT_LIBS) libharfbuzz.la +EXTRA_libharfbuzz_gobject_la_DEPENDENCIES = $(harfbuzz_gobject_def_dependency) +pkginclude_HEADERS += $(HB_GOBJECT_DIST_headers) +nodist_pkginclude_HEADERS += $(HB_GOBJECT_NODIST_headers) +pkgconfig_DATA += harfbuzz-gobject.pc + +BUILT_SOURCES += \ + $(HB_GOBJECT_ENUM_sources) \ + $(HB_GOBJECT_ENUM_headers) \ + $(NULL) +DISTCLEANFILES += \ + $(HB_GOBJECT_ENUM_sources) \ + $(HB_GOBJECT_ENUM_headers) \ + $(NULL) +hb-gobject-enums.%: hb-gobject-enums.%.tmpl $(HBHEADERS) + $(AM_V_GEN) PYTHONIOENCODING=UTF-8 $(GLIB_MKENUMS) \ + --identifier-prefix hb_ --symbol-prefix hb_gobject \ + --template $^ | \ + sed 's/_t_get_type/_get_type/g; s/_T (/ (/g' > "$@" \ + || ($(RM) "$@"; false) +endif +EXTRA_DIST += \ + harfbuzz-gobject.pc.in \ + hb-gobject-enums.cc.tmpl \ + hb-gobject-enums.h.tmpl \ + $(NULL) + + +%.pc: %.pc.in $(top_builddir)/config.status + $(AM_V_GEN) \ + $(SED) -e 's@%prefix%@$(prefix)@g' \ + -e 's@%exec_prefix%@$(exec_prefix)@g' \ + -e 's@%libdir%@$(libdir)@g' \ + -e 's@%includedir%@$(includedir)@g' \ + -e 's@%libs_private%@$(HBNONPCLIBS)@g' \ + -e 's@%requires_private%@$(HBDEPS)@g' \ + -e 's@%VERSION%@$(VERSION)@g' \ + "$<" > "$@" \ + || ($(RM) "$@"; false) + +CLEANFILES += $(pkgconfig_DATA) + + +DEF_FILES = harfbuzz.def harfbuzz-subset.def harfbuzz-icu.def harfbuzz-deprecated-symbols.txt +if HAVE_GOBJECT +DEF_FILES += harfbuzz-gobject.def +endif +check: $(DEF_FILES) # For check-symbols.sh +CLEANFILES += $(DEF_FILES) +harfbuzz.def: $(HBHEADERS) $(HBNODISTHEADERS) + $(AM_V_GEN) $(srcdir)/gen-def.py "$@" $^ +harfbuzz-subset.def: $(HB_SUBSET_headers) + $(AM_V_GEN) $(srcdir)/gen-def.py "$@" $^ +harfbuzz-icu.def: $(HB_ICU_headers) + $(AM_V_GEN) $(srcdir)/gen-def.py "$@" $^ +harfbuzz-gobject.def: $(HB_GOBJECT_headers) + $(AM_V_GEN) $(srcdir)/gen-def.py "$@" $^ +harfbuzz-deprecated-symbols.txt: $(srcdir)/hb-deprecated.h + $(AM_V_GEN) PLAIN_LIST=1 $(srcdir)/gen-def.py "$@" $^ + + +GENERATORS = \ + gen-arabic-table.py \ + gen-def.py \ + gen-emoji-table.py \ + gen-indic-table.py \ + gen-os2-unicode-ranges.py \ + gen-tag-table.py \ + gen-ucd-table.py \ + gen-use-table.py \ + gen-vowel-constraints.py \ + $(NULL) +EXTRA_DIST += $(GENERATORS) + +unicode-tables: \ + arabic-table \ + emoji-table \ + indic-table \ + tag-table \ + ucd-table \ + use-table \ + emoji-table \ + $(NULL) + +arabic-table: gen-arabic-table.py ArabicShaping.txt UnicodeData.txt Blocks.txt + $(AM_V_GEN) $(builddir)/$^ > $(srcdir)/hb-ot-shape-complex-arabic-table.hh \ + || ($(RM) $(srcdir)/hb-ot-shape-complex-arabic-table.hh; false) +emoji-table: gen-emoji-table.py emoji-data.txt + $(AM_V_GEN) $(builddir)/$^ > $(srcdir)/hb-unicode-emoji-table.hh \ + || ($(RM) $(srcdir)/hb-unicode-emoji-table.hh; false) +indic-table: gen-indic-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt Blocks.txt + $(AM_V_GEN) $(builddir)/$^ > $(srcdir)/hb-ot-shape-complex-indic-table.cc \ + || ($(RM) $(srcdir)/hb-ot-shape-complex-indic-table.cc; false) +tag-table: gen-tag-table.py languagetags language-subtag-registry + $(AM_V_GEN) $(builddir)/$^ > $(srcdir)/hb-ot-tag-table.hh \ + || ($(RM) $(srcdir)/hb-ot-tag-table.hh; false) +ucd-table: gen-ucd-table.py ucd.nounihan.grouped.zip hb-common.h + $(AM_V_GEN) $(builddir)/$^ > $(srcdir)/hb-ucd-table.hh \ + || ($(RM) $(srcdir)/hb-ucd-table.hh; false) +use-table: gen-use-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt UnicodeData.txt Blocks.txt + $(AM_V_GEN) $(builddir)/$^ > $(srcdir)/hb-ot-shape-complex-use-table.cc \ + || ($(RM) $(srcdir)/hb-ot-shape-complex-use-table.cc; false) +vowel-constraints: gen-vowel-constraints.py HBIndicVowelConstraints.txt Scripts.txt + $(AM_V_GEN) $(builddir)/$^ > $(srcdir)/hb-ot-shape-complex-vowel-constraints.cc \ + || ($(RM) $(srcdir)/hb-ot-shape-complex-vowel-constraints.cc; false) + + +built-sources: $(BUILT_SOURCES) + +.PHONY: unicode-tables arabic-table indic-table tag-table use-table vowel-constraints emoji-table built-sources + +RAGEL_GENERATED = \ + $(patsubst %,$(srcdir)/%,$(HB_BASE_RAGEL_GENERATED_sources)) \ + $(NULL) +BUILT_SOURCES += $(RAGEL_GENERATED) +EXTRA_DIST += \ + $(HB_BASE_RAGEL_sources) \ + $(NULL) +# We decided to add ragel-generated files to git... +#MAINTAINERCLEANFILES += $(RAGEL_GENERATED) +$(srcdir)/%.hh: $(srcdir)/%.rl + $(AM_V_GEN)(cd $(srcdir) && $(RAGEL) -e -F1 -o "$*.hh" "$*.rl") \ + || ($(RM) "$@"; false) + +harfbuzz.cc: Makefile.sources + $(AM_V_GEN) \ + for f in \ + $(HB_BASE_sources) \ + $(HB_GLIB_sources) \ + $(HB_FT_sources) \ + $(HB_GRAPHITE2_sources) \ + $(HB_UNISCRIBE_sources) \ + $(HB_GDI_sources) \ + $(HB_DIRECTWRITE_sources) \ + $(HB_CORETEXT_sources) \ + ; do echo '#include "'$$f'"'; done | \ + grep '[.]cc"' > $(srcdir)/harfbuzz.cc \ + || ($(RM) $(srcdir)/harfbuzz.cc; false) +BUILT_SOURCES += harfbuzz.cc + +noinst_PROGRAMS = \ + main \ + test \ + test-buffer-serialize \ + test-ot-meta \ + test-ot-name \ + test-gpos-size-params \ + test-gsub-would-substitute \ + $(NULL) +bin_PROGRAMS = + +main_SOURCES = main.cc +main_CPPFLAGS = $(HBCFLAGS) +main_LDADD = libharfbuzz.la $(HBLIBS) + +test_SOURCES = test.cc +test_CPPFLAGS = $(HBCFLAGS) $(FREETYPE_CFLAGS) +test_LDADD = libharfbuzz.la $(HBLIBS) $(FREETYPE_LIBS) + +test_buffer_serialize_SOURCES = test-buffer-serialize.cc +test_buffer_serialize_CPPFLAGS = $(HBCFLAGS) +test_buffer_serialize_LDADD = libharfbuzz.la $(HBLIBS) + +test_ot_meta_SOURCES = test-ot-meta.cc +test_ot_meta_CPPFLAGS = $(HBCFLAGS) +test_ot_meta_LDADD = libharfbuzz.la $(HBLIBS) + +test_ot_name_SOURCES = test-ot-name.cc +test_ot_name_CPPFLAGS = $(HBCFLAGS) +test_ot_name_LDADD = libharfbuzz.la $(HBLIBS) + +test_gpos_size_params_SOURCES = test-gpos-size-params.cc +test_gpos_size_params_CPPFLAGS = $(HBCFLAGS) +test_gpos_size_params_LDADD = libharfbuzz.la $(HBLIBS) + +test_gsub_would_substitute_SOURCES = test-gsub-would-substitute.cc +test_gsub_would_substitute_CPPFLAGS = $(HBCFLAGS) $(FREETYPE_CFLAGS) +test_gsub_would_substitute_LDADD = libharfbuzz.la $(HBLIBS) $(FREETYPE_LIBS) + +if HAVE_FREETYPE +if HAVE_CAIRO_FT +noinst_PROGRAMS += test-ot-color +test_ot_color_SOURCES = test-ot-color.cc +test_ot_color_CPPFLAGS = $(HBCFLAGS) $(FREETYPE_CFLAGS) $(CAIRO_FT_CFLAGS) +test_ot_color_LDADD = libharfbuzz.la $(HBLIBS) $(FREETYPE_LIBS) $(CAIRO_LIBS) $(CAIRO_FT_LIBS) +endif # HAVE_CAIRO_FT +endif # HAVE_FREETYPE + +dist_check_SCRIPTS = \ + check-c-linkage-decls.sh \ + check-externs.sh \ + check-header-guards.sh \ + check-includes.sh \ + check-static-inits.sh \ + check-symbols.sh \ + $(NULL) +TESTS += $(dist_check_SCRIPTS) + +if !WITH_LIBSTDCXX +dist_check_SCRIPTS += \ + check-libstdc++.sh \ + $(NULL) +endif + +check_PROGRAMS += \ + dump-indic-data \ + dump-khmer-data \ + dump-myanmar-data \ + dump-use-data \ + $(NULL) +dump_indic_data_SOURCES = dump-indic-data.cc hb-ot-shape-complex-indic-table.cc +dump_indic_data_CPPFLAGS = $(HBCFLAGS) +dump_indic_data_LDADD = libharfbuzz.la $(HBLIBS) +dump_khmer_data_SOURCES = dump-khmer-data.cc hb-ot-shape-complex-indic-table.cc +dump_khmer_data_CPPFLAGS = $(HBCFLAGS) +dump_khmer_data_LDADD = libharfbuzz.la $(HBLIBS) +dump_myanmar_data_SOURCES = dump-myanmar-data.cc hb-ot-shape-complex-indic-table.cc +dump_myanmar_data_CPPFLAGS = $(HBCFLAGS) +dump_myanmar_data_LDADD = libharfbuzz.la $(HBLIBS) +dump_use_data_SOURCES = dump-use-data.cc hb-ot-shape-complex-use-table.cc +dump_use_data_CPPFLAGS = $(HBCFLAGS) +dump_use_data_LDADD = libharfbuzz.la $(HBLIBS) + +COMPILED_TESTS = test-algs test-iter test-meta test-number test-ot-tag test-unicode-ranges test-bimap +COMPILED_TESTS_CPPFLAGS = $(HBCFLAGS) -DMAIN -UNDEBUG +COMPILED_TESTS_LDADD = libharfbuzz.la $(HBLIBS) +check_PROGRAMS += $(COMPILED_TESTS) +TESTS += $(COMPILED_TESTS) + +test_algs_SOURCES = test-algs.cc hb-static.cc +test_algs_CPPFLAGS = $(COMPILED_TESTS_CPPFLAGS) +test_algs_LDADD = $(COMPILED_TESTS_LDADD) + +test_iter_SOURCES = test-iter.cc hb-static.cc +test_iter_CPPFLAGS = $(COMPILED_TESTS_CPPFLAGS) +test_iter_LDADD = $(COMPILED_TESTS_LDADD) + +test_meta_SOURCES = test-meta.cc hb-static.cc +test_meta_CPPFLAGS = $(COMPILED_TESTS_CPPFLAGS) +test_meta_LDADD = $(COMPILED_TESTS_LDADD) + +test_number_SOURCES = test-number.cc hb-number.cc +test_number_CPPFLAGS = $(COMPILED_TESTS_CPPFLAGS) +test_number_LDADD = $(COMPILED_TESTS_LDADD) + +test_ot_tag_SOURCES = hb-ot-tag.cc +test_ot_tag_CPPFLAGS = $(COMPILED_TESTS_CPPFLAGS) +test_ot_tag_LDADD = $(COMPILED_TESTS_LDADD) + +test_unicode_ranges_SOURCES = test-unicode-ranges.cc +test_unicode_ranges_CPPFLAGS = $(COMPILED_TESTS_CPPFLAGS) +test_unicode_ranges_LDADD = $(COMPILED_TESTS_LDADD) + +test_bimap_SOURCES = test-bimap.cc hb-static.cc +test_bimap_CPPFLAGS = $(COMPILED_TESTS_CPPFLAGS) +test_bimap_LDADD = $(COMPILED_TESTS_LDADD) + +TESTS_ENVIRONMENT = \ + srcdir="$(srcdir)" \ + MAKE="$(MAKE) $(AM_MAKEFLAGS)" \ + HBSOURCES="$(HBSOURCES)" \ + HBHEADERS="$(HBHEADERS)" \ + $(NULL) + +if HAVE_INTROSPECTION + +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = HarfBuzz-0.0.gir # What does the 0 mean anyway?! +INTROSPECTION_SCANNER_ARGS = -I$(srcdir) -n hb --identifier-prefix=hb_ --warn-all +INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) +INTROSPECTION_SCANNER_ENV = CC="$(CC)" + +HarfBuzz-0.0.gir: libharfbuzz.la libharfbuzz-gobject.la +HarfBuzz_0_0_gir_INCLUDES = GObject-2.0 +HarfBuzz_0_0_gir_CFLAGS = \ + $(INCLUDES) \ + $(HBCFLAGS) \ + -DHB_H \ + -DHB_H_IN \ + -DHB_OT_H \ + -DHB_OT_H_IN \ + -DHB_AAT_H \ + -DHB_AAT_H_IN \ + -DHB_GOBJECT_H \ + -DHB_GOBJECT_H_IN \ + -DHAVE_GOBJECT \ + -DHB_EXTERN= \ + $(NULL) +HarfBuzz_0_0_gir_LIBS = \ + libharfbuzz.la \ + libharfbuzz-gobject.la \ + $(NULL) +HarfBuzz_0_0_gir_FILES = \ + $(HBHEADERS) \ + $(HBSOURCES) \ + $(HB_GOBJECT_sources) \ + $(HB_GOBJECT_headers) \ + $(NULL) + +girdir = $(datadir)/gir-1.0 +gir_DATA = $(INTROSPECTION_GIRS) + +typelibdir = $(libdir)/girepository-1.0 +typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + +CLEANFILES += $(gir_DATA) $(typelib_DATA) + +endif + +-include $(top_srcdir)/git.mk diff --git a/source/libs/harfbuzz/harfbuzz-src/src/Makefile.sources b/source/libs/harfbuzz/harfbuzz-src/src/Makefile.sources new file mode 100644 index 000000000..eff0ad347 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/Makefile.sources @@ -0,0 +1,280 @@ +# Base and default-included sources and headers + +HB_BASE_sources = \ + hb-aat-fdsc-table.hh \ + hb-aat-layout-ankr-table.hh \ + hb-aat-layout-bsln-table.hh \ + hb-aat-layout-common.hh \ + hb-aat-layout-feat-table.hh \ + hb-aat-layout-just-table.hh \ + hb-aat-layout-kerx-table.hh \ + hb-aat-layout-lcar-table.hh \ + hb-aat-layout-morx-table.hh \ + hb-aat-layout-opbd-table.hh \ + hb-aat-layout-trak-table.hh \ + hb-aat-layout.cc \ + hb-aat-layout.hh \ + hb-aat-ltag-table.hh \ + hb-aat-map.cc \ + hb-aat-map.hh \ + hb-algs.hh \ + hb-array.hh \ + hb-atomic.hh \ + hb-blob.cc \ + hb-blob.hh \ + hb-buffer-serialize.cc \ + hb-buffer.cc \ + hb-buffer.hh \ + hb-cache.hh \ + hb-cff-interp-common.hh \ + hb-cff-interp-cs-common.hh \ + hb-cff-interp-dict-common.hh \ + hb-cff1-interp-cs.hh \ + hb-cff2-interp-cs.hh \ + hb-common.cc \ + hb-config.hh \ + hb-debug.hh \ + hb-dispatch.hh \ + hb-face.cc \ + hb-face.hh \ + hb-fallback-shape.cc \ + hb-font.cc \ + hb-font.hh \ + hb-iter.hh \ + hb-kern.hh \ + hb-machinery.hh \ + hb-map.cc \ + hb-map.hh \ + hb-bimap.hh \ + hb-meta.hh \ + hb-mutex.hh \ + hb-null.hh \ + hb-number.cc \ + hb-number.hh \ + hb-object.hh \ + hb-open-file.hh \ + hb-open-type.hh \ + hb-ot-cff-common.hh \ + hb-ot-cff1-table.cc \ + hb-ot-cff1-table.hh \ + hb-ot-cff2-table.cc \ + hb-ot-cff2-table.hh \ + hb-ot-cmap-table.hh \ + hb-ot-color-cbdt-table.hh \ + hb-ot-color-colr-table.hh \ + hb-ot-color-cpal-table.hh \ + hb-ot-color-sbix-table.hh \ + hb-ot-color-svg-table.hh \ + hb-ot-color.cc \ + hb-ot-face.cc \ + hb-ot-face.hh \ + hb-ot-face-table-list.hh \ + hb-ot-font.cc \ + hb-ot-gasp-table.hh \ + hb-ot-glyf-table.hh \ + hb-ot-hdmx-table.hh \ + hb-ot-head-table.hh \ + hb-ot-hhea-table.hh \ + hb-ot-hmtx-table.hh \ + hb-ot-kern-table.hh \ + hb-ot-layout-base-table.hh \ + hb-ot-layout-common.hh \ + hb-ot-layout-gdef-table.hh \ + hb-ot-layout-gpos-table.hh \ + hb-ot-layout-gsub-table.hh \ + hb-ot-layout-gsubgpos.hh \ + hb-ot-layout-jstf-table.hh \ + hb-ot-layout.cc \ + hb-ot-layout.hh \ + hb-ot-map.cc \ + hb-ot-map.hh \ + hb-ot-math-table.hh \ + hb-ot-math.cc \ + hb-ot-maxp-table.hh \ + hb-ot-meta-table.hh \ + hb-ot-meta.cc \ + hb-ot-metrics.cc \ + hb-ot-metrics.hh \ + hb-ot-name-language-static.hh \ + hb-ot-name-language.hh \ + hb-ot-name-table.hh \ + hb-ot-name.cc \ + hb-ot-os2-table.hh \ + hb-ot-os2-unicode-ranges.hh \ + hb-ot-post-macroman.hh \ + hb-ot-post-table.hh \ + hb-ot-shape-complex-arabic-fallback.hh \ + hb-ot-shape-complex-arabic-table.hh \ + hb-ot-shape-complex-arabic-win1256.hh \ + hb-ot-shape-complex-arabic.cc \ + hb-ot-shape-complex-arabic.hh \ + hb-ot-shape-complex-default.cc \ + hb-ot-shape-complex-hangul.cc \ + hb-ot-shape-complex-hebrew.cc \ + hb-ot-shape-complex-indic-table.cc \ + hb-ot-shape-complex-indic.cc \ + hb-ot-shape-complex-indic.hh \ + hb-ot-shape-complex-khmer.cc \ + hb-ot-shape-complex-khmer.hh \ + hb-ot-shape-complex-myanmar.cc \ + hb-ot-shape-complex-myanmar.hh \ + hb-ot-shape-complex-thai.cc \ + hb-ot-shape-complex-use-table.cc \ + hb-ot-shape-complex-use.cc \ + hb-ot-shape-complex-use.hh \ + hb-ot-shape-complex-vowel-constraints.cc \ + hb-ot-shape-complex-vowel-constraints.hh \ + hb-ot-shape-complex.hh \ + hb-ot-shape-fallback.cc \ + hb-ot-shape-fallback.hh \ + hb-ot-shape-normalize.cc \ + hb-ot-shape-normalize.hh \ + hb-ot-shape.cc \ + hb-ot-shape.hh \ + hb-ot-stat-table.hh \ + hb-ot-tag-table.hh \ + hb-ot-tag.cc \ + hb-ot-var-avar-table.hh \ + hb-ot-var-fvar-table.hh \ + hb-ot-var-hvar-table.hh \ + hb-ot-var-mvar-table.hh \ + hb-ot-var.cc \ + hb-ot-vorg-table.hh \ + hb-pool.hh \ + hb-sanitize.hh \ + hb-serialize.hh \ + hb-set-digest.hh \ + hb-set.cc \ + hb-set.hh \ + hb-shape-plan.cc \ + hb-shape-plan.hh \ + hb-shape.cc \ + hb-shaper-impl.hh \ + hb-shaper-list.hh \ + hb-shaper.cc \ + hb-shaper.hh \ + hb-static.cc \ + hb-string-array.hh \ + hb-ucd-table.hh \ + hb-ucd.cc \ + hb-unicode-emoji-table.hh \ + hb-unicode.cc \ + hb-unicode.hh \ + hb-utf.hh \ + hb-vector.hh \ + hb-warning.cc \ + hb.hh \ + $(NULL) + +HB_BASE_RAGEL_GENERATED_sources = \ + hb-buffer-deserialize-json.hh \ + hb-buffer-deserialize-text.hh \ + hb-number-parser.hh \ + hb-ot-shape-complex-indic-machine.hh \ + hb-ot-shape-complex-khmer-machine.hh \ + hb-ot-shape-complex-myanmar-machine.hh \ + hb-ot-shape-complex-use-machine.hh \ + $(NULL) +HB_BASE_RAGEL_sources = \ + hb-buffer-deserialize-json.rl \ + hb-buffer-deserialize-text.rl \ + hb-number-parser.rl \ + hb-ot-shape-complex-indic-machine.rl \ + hb-ot-shape-complex-khmer-machine.rl \ + hb-ot-shape-complex-myanmar-machine.rl \ + hb-ot-shape-complex-use-machine.rl \ + $(NULL) + +HB_BASE_headers = \ + hb-aat-layout.h \ + hb-aat.h \ + hb-blob.h \ + hb-buffer.h \ + hb-common.h \ + hb-deprecated.h \ + hb-face.h \ + hb-font.h \ + hb-map.h \ + hb-ot-color.h \ + hb-ot-deprecated.h \ + hb-ot-font.h \ + hb-ot-layout.h \ + hb-ot-math.h \ + hb-ot-meta.h \ + hb-ot-metrics.h \ + hb-ot-name.h \ + hb-ot-shape.h \ + hb-ot-var.h \ + hb-ot.h \ + hb-set.h \ + hb-shape-plan.h \ + hb-shape.h \ + hb-unicode.h \ + hb-version.h \ + hb.h \ + $(NULL) + +# Optional Sources and Headers with external deps + +HB_FT_sources = hb-ft.cc +HB_FT_headers = hb-ft.h + +HB_GLIB_sources = hb-glib.cc +HB_GLIB_headers = hb-glib.h + +HB_GRAPHITE2_sources = hb-graphite2.cc +HB_GRAPHITE2_headers = hb-graphite2.h + +# System-dependent sources and headers + +HB_CORETEXT_sources = hb-coretext.cc +HB_CORETEXT_headers = hb-coretext.h + +HB_DIRECTWRITE_sources = hb-directwrite.cc +HB_DIRECTWRITE_headers = hb-directwrite.h + +HB_GDI_sources = hb-gdi.cc +HB_GDI_headers = hb-gdi.h + +HB_UNISCRIBE_sources = hb-uniscribe.cc +HB_UNISCRIBE_headers = hb-uniscribe.h + +# Sources for libharfbuzz-gobject and libharfbuzz-icu +HB_ICU_sources = hb-icu.cc +HB_ICU_headers = hb-icu.h + +# Sources for libharfbuzz-subset +HB_SUBSET_sources = \ + hb-number.cc \ + hb-number.hh \ + hb-ot-cff1-table.cc \ + hb-ot-cff2-table.cc \ + hb-static.cc \ + hb-subset-cff-common.cc \ + hb-subset-cff-common.hh \ + hb-subset-cff1.cc \ + hb-subset-cff1.hh \ + hb-subset-cff2.cc \ + hb-subset-cff2.hh \ + hb-subset-input.cc \ + hb-subset-input.hh \ + hb-subset-plan.cc \ + hb-subset-plan.hh \ + hb-subset-plan.hh \ + hb-subset.cc \ + hb-subset.hh \ + hb-subset.hh \ + $(NULL) + +HB_SUBSET_headers = \ + hb-subset.h \ + $(NULL) + +HB_GOBJECT_DIST_sources = hb-gobject-structs.cc +HB_GOBJECT_DIST_headers = hb-gobject.h hb-gobject-structs.h +HB_GOBJECT_ENUM_sources = hb-gobject-enums.cc +HB_GOBJECT_ENUM_headers = hb-gobject-enums.h +HB_GOBJECT_NODIST_sources = $(HB_GOBJECT_ENUM_sources) +HB_GOBJECT_NODIST_headers = $(HB_GOBJECT_ENUM_headers) +HB_GOBJECT_sources = $(HB_GOBJECT_DIST_sources) $(HB_GOBJECT_NODIST_sources) +HB_GOBJECT_headers = $(HB_GOBJECT_DIST_headers) $(HB_GOBJECT_NODIST_headers) diff --git a/source/libs/harfbuzz/harfbuzz-src/src/check-c-linkage-decls.sh b/source/libs/harfbuzz/harfbuzz-src/src/check-c-linkage-decls.sh new file mode 100755 index 000000000..8234abc45 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/check-c-linkage-decls.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +LC_ALL=C +export LC_ALL + +test -z "$srcdir" && srcdir=. +stat=0 + +test "x$HBHEADERS" = x && HBHEADERS=`cd "$srcdir"; find . -maxdepth 1 -name 'hb*.h'` +test "x$HBSOURCES" = x && HBSOURCES=`cd "$srcdir"; find . -maxdepth 1 -name 'hb*.cc'` + +for x in $HBHEADERS; do + test -f "$srcdir/$x" -a ! -f "$x" && x="$srcdir/$x" + if ! grep -q HB_BEGIN_DECLS "$x" || ! grep -q HB_END_DECLS "$x"; then + echo "Ouch, file $x does not have HB_BEGIN_DECLS / HB_END_DECLS, but it should" + stat=1 + fi +done +for x in $HBSOURCES; do + test -f "$srcdir/$x" -a ! -f "$x" && x="$srcdir/$x" + if grep -q HB_BEGIN_DECLS "$x" || grep -q HB_END_DECLS "$x"; then + echo "Ouch, file $x has HB_BEGIN_DECLS / HB_END_DECLS, but it shouldn't" + stat=1 + fi +done + +exit $stat diff --git a/source/libs/harfbuzz/harfbuzz-src/src/check-externs.sh b/source/libs/harfbuzz/harfbuzz-src/src/check-externs.sh new file mode 100755 index 000000000..a6de37535 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/check-externs.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +LC_ALL=C +export LC_ALL + +test -z "$srcdir" && srcdir=. +stat=0 + +test "x$HBHEADERS" = x && HBHEADERS=`cd "$srcdir"; find . -maxdepth 1 -name 'hb*.h'` +test "x$EGREP" = x && EGREP='grep -E' + + +echo 'Checking that all public symbols are exported with HB_EXTERN' + +for x in $HBHEADERS; do + test -f "$srcdir/$x" -a ! -f "$x" && x="$srcdir/$x" + $EGREP -B1 -n '^hb_' /dev/null "$x" | + $EGREP -v '(^--|:hb_|-HB_EXTERN )' -A1 +done | +grep . >&2 && stat=1 + +exit $stat diff --git a/source/libs/harfbuzz/harfbuzz-src/src/check-header-guards.sh b/source/libs/harfbuzz/harfbuzz-src/src/check-header-guards.sh new file mode 100755 index 000000000..b67640fc1 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/check-header-guards.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +LC_ALL=C +export LC_ALL + +test -z "$srcdir" && srcdir=. +stat=0 + +test "x$HBHEADERS" = x && HBHEADERS=`cd "$srcdir"; find . -maxdepth 1 -name 'hb*.h' ! -name 'hb-gobject-structs.h'` +test "x$HBSOURCES" = x && HBSOURCES=`cd "$srcdir"; find . -maxdepth 1 -name 'hb-*.cc' -or -name 'hb-*.hh'` + +for x in $HBHEADERS $HBSOURCES; do + test -f "$srcdir/$x" -a ! -f "$x" && x="$srcdir/$x" + echo "$x" | grep -q '[^h]$' && continue; + xx=`echo "$x" | sed 's@.*/@@'` + tag=`echo "$xx" | tr 'a-z.-' 'A-Z_'` + lines=`grep -w "$tag" "$x" | wc -l | sed 's/[ ]*//g'` + if test "x$lines" != x3; then + echo "Ouch, header file $x does not have correct preprocessor guards" + stat=1 + fi +done + +exit $stat diff --git a/source/libs/harfbuzz/harfbuzz-src/src/check-includes.sh b/source/libs/harfbuzz/harfbuzz-src/src/check-includes.sh new file mode 100755 index 000000000..f938f706c --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/check-includes.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +LC_ALL=C +export LC_ALL + +test -z "$srcdir" && srcdir=. +stat=0 + +test "x$HBHEADERS" = x && HBHEADERS=`cd "$srcdir"; find . -maxdepth 1 -name 'hb*.h'` +test "x$HBSOURCES" = x && HBSOURCES=`cd "$srcdir"; find . -maxdepth 1 -name 'hb-*.cc' -or -name 'hb-*.hh'` + + +echo 'Checking that public header files #include "hb-common.h" or "hb.h" first (or none)' + +for x in $HBHEADERS; do + test -f "$srcdir/$x" -a ! -f "$x" && x="$srcdir/$x" + grep '#.*\' "$x" /dev/null | head -n 1 +done | +grep -v '"hb-common[.]h"' | +grep -v '"hb[.]h"' | +grep -v 'hb-common[.]h:' | +grep -v 'hb[.]h:' | +grep . >&2 && stat=1 + + +echo 'Checking that source files #include a private header first (or none)' + +for x in $HBSOURCES; do + test -f "$srcdir/$x" -a ! -f "$x" && x="$srcdir/$x" + grep '#.*\' "$x" /dev/null | head -n 1 +done | +grep -v '"hb-.*[.]hh"' | +grep -v 'hb[.]hh' | +grep . >&2 && stat=1 + + +echo 'Checking that there is no #include ' +for x in $HBHEADERS $HBSOURCES; do + test -f "$srcdir/$x" && x="$srcdir/$x" + grep '#.*\.*<.*hb' "$x" /dev/null >&2 && stat=1 +done + + +exit $stat diff --git a/source/libs/harfbuzz/harfbuzz-src/src/check-libstdc++.sh b/source/libs/harfbuzz/harfbuzz-src/src/check-libstdc++.sh new file mode 100755 index 000000000..ce0bdab75 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/check-libstdc++.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +LC_ALL=C +export LC_ALL + +test -z "$srcdir" && srcdir=. +test -z "$libs" && libs=.libs +stat=0 + + +if which ldd 2>/dev/null >/dev/null; then + LDD=ldd +else + # macOS specific tool + if which otool 2>/dev/null >/dev/null; then + LDD="otool -L" + else + echo "check-libstdc++.sh: 'ldd' not found; skipping test" + exit 77 + fi +fi + +tested=false +# harfbuzz-icu links to libstdc++ because icu does. +# harfbuzz-subset uses libstdc++. +for soname in harfbuzz harfbuzz-gobject; do + for suffix in so dylib; do + so=$libs/lib$soname.$suffix + if ! test -f "$so"; then continue; fi + + echo "Checking that we are not linking to libstdc++ or libc++ in $so" + if $LDD $so | grep 'libstdc[+][+]\|libc[+][+]'; then + echo "Ouch, linked to libstdc++ or libc++" + stat=1 + fi + tested=true + done +done +if ! $tested; then + echo "check-libstdc++.sh: libharfbuzz shared library not found; skipping test" + exit 77 +fi + +exit $stat diff --git a/source/libs/harfbuzz/harfbuzz-src/src/check-static-inits.sh b/source/libs/harfbuzz/harfbuzz-src/src/check-static-inits.sh new file mode 100755 index 000000000..def25c701 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/check-static-inits.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +LC_ALL=C +export LC_ALL + +test -z "$srcdir" && srcdir=. +test -z "$libs" && libs=.libs +stat=0 + +if which objdump 2>/dev/null >/dev/null; then + : +else + echo "check-static-inits.sh: 'objdump' not found; skipping test" + exit 77 +fi + +OBJS=$libs/*.o +if test "x`echo $OBJS`" = "x$OBJS" 2>/dev/null >/dev/null; then + echo "check-static-inits.sh: object files not found; skipping test" + exit 77 +fi + +echo "Checking that no object file has static initializers" +for obj in $OBJS; do + if objdump -t "$obj" | grep '[.][cd]tors' | grep -v '\<00*\>'; then + echo "Ouch, $obj has static initializers/finalizers" + stat=1 + fi +done + +echo "Checking that no object file has lazy static C++ constructors/destructors or other such stuff" +for obj in $OBJS; do + if objdump -t "$obj" | grep -q '__cxa_' && ! objdump -t "$obj" | grep -q __ubsan_handle; then + objdump -t "$obj" | grep '__cxa_' + echo "Ouch, $obj has lazy static C++ constructors/destructors or other such stuff" + stat=1 + fi +done + +exit $stat diff --git a/source/libs/harfbuzz/harfbuzz-src/src/check-symbols.sh b/source/libs/harfbuzz/harfbuzz-src/src/check-symbols.sh new file mode 100755 index 000000000..f181b6312 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/check-symbols.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +LC_ALL=C +export LC_ALL + +test -z "$srcdir" && srcdir=. +test -z "$libs" && libs=.libs +stat=0 + +IGNORED_SYMBOLS='_fini\|_init\|_fdata\|_ftext\|_fbss\|__bss_start\|__bss_start__\|__bss_end__\|_edata\|_end\|_bss_end__\|__end__\|__gcov_.*\|llvm_.*' + +if which nm 2>/dev/null >/dev/null; then + : +else + echo "check-symbols.sh: 'nm' not found; skipping test" + exit 77 +fi + +tested=false +for soname in harfbuzz harfbuzz-subset harfbuzz-icu harfbuzz-gobject; do + for suffix in so dylib; do + so=$libs/lib$soname.$suffix + if ! test -f "$so"; then continue; fi + + # On macOS, C symbols are prefixed with _ + symprefix= + if test $suffix = dylib; then symprefix=_; fi + + EXPORTED_SYMBOLS=`nm "$so" | grep ' [BCDGINRST] .' | grep -v " $symprefix\\($IGNORED_SYMBOLS\\>\\)" | cut -d' ' -f3 | c++filt` + + prefix=$symprefix`basename "$so" | sed 's/libharfbuzz/hb/; s/-/_/g; s/[.].*//'` + + echo "Checking that $so does not expose internal symbols" + if echo "$EXPORTED_SYMBOLS" | grep -v "^${prefix}\(_\|$\)"; then + echo "Ouch, internal symbols exposed" + stat=1 + fi + + def=$soname.def + if ! test -f "$def"; then + echo "'$def' not found; skipping" + else + echo "Checking that $so has the same symbol list as $def" + { + echo EXPORTS + echo "$EXPORTED_SYMBOLS" | sed -e "s/^${symprefix}hb/hb/g" + # cheat: copy the last line from the def file! + tail -n1 "$def" + } | c++filt | diff "$def" - >&2 || stat=1 + fi + + tested=true + done +done +if ! $tested; then + echo "check-symbols.sh: no shared libraries found; skipping test" + exit 77 +fi + +exit $stat diff --git a/source/libs/harfbuzz/harfbuzz-src/src/dump-indic-data.cc b/source/libs/harfbuzz/harfbuzz-src/src/dump-indic-data.cc new file mode 100644 index 000000000..8ddc9d5a4 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/dump-indic-data.cc @@ -0,0 +1,43 @@ +/* + * Copyright © 2018 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#include "hb-ot-shape-complex-indic.hh" + +int +main () +{ + for (hb_codepoint_t u = 0; u <= 0x10FFFF; u++) + { + hb_glyph_info_t info; + info.codepoint = u; + set_indic_properties (info); + if (info.indic_category() != INDIC_SYLLABIC_CATEGORY_OTHER || + info.indic_position() != INDIC_MATRA_CATEGORY_NOT_APPLICABLE) + printf("U+%04X %u %u\n", u, + info.indic_category(), + info.indic_position()); + } +} diff --git a/source/libs/harfbuzz/harfbuzz-src/src/dump-khmer-data.cc b/source/libs/harfbuzz/harfbuzz-src/src/dump-khmer-data.cc new file mode 100644 index 000000000..cffbb92df --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/dump-khmer-data.cc @@ -0,0 +1,41 @@ +/* + * Copyright © 2018 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#include "hb-ot-shape-complex-khmer.hh" + +int +main () +{ + for (hb_codepoint_t u = 0; u <= 0x10FFFF; u++) + { + hb_glyph_info_t info; + info.codepoint = u; + set_khmer_properties (info); + if (info.khmer_category() != INDIC_SYLLABIC_CATEGORY_OTHER) + printf("U+%04X %u\n", u, + info.khmer_category()); + } +} diff --git a/source/libs/harfbuzz/harfbuzz-src/src/dump-myanmar-data.cc b/source/libs/harfbuzz/harfbuzz-src/src/dump-myanmar-data.cc new file mode 100644 index 000000000..c1a303f8f --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/dump-myanmar-data.cc @@ -0,0 +1,43 @@ +/* + * Copyright © 2018 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#include "hb-ot-shape-complex-myanmar.hh" + +int +main () +{ + for (hb_codepoint_t u = 0; u <= 0x10FFFF; u++) + { + hb_glyph_info_t info; + info.codepoint = u; + set_myanmar_properties (info); + if (info.myanmar_category() != INDIC_SYLLABIC_CATEGORY_OTHER || + info.myanmar_position() != INDIC_MATRA_CATEGORY_NOT_APPLICABLE) + printf("U+%04X %u %u\n", u, + info.myanmar_category(), + info.myanmar_position()); + } +} diff --git a/source/libs/harfbuzz/harfbuzz-src/src/dump-use-data.cc b/source/libs/harfbuzz/harfbuzz-src/src/dump-use-data.cc new file mode 100644 index 000000000..d639426b7 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/dump-use-data.cc @@ -0,0 +1,38 @@ +/* + * Copyright © 2018 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#include "hb-ot-shape-complex-use.hh" + +int +main () +{ + for (hb_codepoint_t u = 0; u <= 0x10FFFF; u++) + { + unsigned int category = hb_use_get_category (u); + if (category != USE_O) + printf("U+%04X %u\n", u, category); + } +} diff --git a/source/libs/harfbuzz/harfbuzz-src/src/gen-arabic-table.py b/source/libs/harfbuzz/harfbuzz-src/src/gen-arabic-table.py new file mode 100755 index 000000000..ccecb406a --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/gen-arabic-table.py @@ -0,0 +1,267 @@ +#!/usr/bin/env python + +from __future__ import print_function, division, absolute_import + +import io, os.path, sys + +if len (sys.argv) != 4: + print ("usage: ./gen-arabic-table.py ArabicShaping.txt UnicodeData.txt Blocks.txt", file=sys.stderr) + sys.exit (1) + +files = [io.open (x, encoding='utf-8') for x in sys.argv[1:]] + +headers = [[files[0].readline (), files[0].readline ()], [files[2].readline (), files[2].readline ()]] +headers.append (["UnicodeData.txt does not have a header."]) +while files[0].readline ().find ('##################') < 0: + pass + +blocks = {} +def read_blocks(f): + global blocks + for line in f: + + j = line.find ('#') + if j >= 0: + line = line[:j] + + fields = [x.strip () for x in line.split (';')] + if len (fields) == 1: + continue + + uu = fields[0].split ('..') + start = int (uu[0], 16) + if len (uu) == 1: + end = start + else: + end = int (uu[1], 16) + + t = fields[1] + + for u in range (start, end + 1): + blocks[u] = t + +def print_joining_table(f): + + values = {} + for line in f: + + if line[0] == '#': + continue + + fields = [x.strip () for x in line.split (';')] + if len (fields) == 1: + continue + + u = int (fields[0], 16) + + if fields[3] in ["ALAPH", "DALATH RISH"]: + value = "JOINING_GROUP_" + fields[3].replace(' ', '_') + else: + value = "JOINING_TYPE_" + fields[2] + values[u] = value + + short_value = {} + for value in set([v for v in values.values()] + ['JOINING_TYPE_X']): + short = ''.join(x[0] for x in value.split('_')[2:]) + assert short not in short_value.values() + short_value[value] = short + + print () + for value,short in short_value.items(): + print ("#define %s %s" % (short, value)) + + uu = sorted(values.keys()) + num = len(values) + all_blocks = set([blocks[u] for u in uu]) + + last = -100000 + ranges = [] + for u in uu: + if u - last <= 1+16*5: + ranges[-1][-1] = u + else: + ranges.append([u,u]) + last = u + + print () + print ("static const uint8_t joining_table[] =") + print ("{") + last_block = None + offset = 0 + for start,end in ranges: + + print () + print ("#define joining_offset_0x%04xu %d" % (start, offset)) + + for u in range(start, end+1): + + block = blocks.get(u, last_block) + value = values.get(u, "JOINING_TYPE_X") + + if block != last_block or u == start: + if u != start: + print () + if block in all_blocks: + print ("\n /* %s */" % block) + else: + print ("\n /* FILLER */") + last_block = block + if u % 32 != 0: + print () + print (" /* %04X */" % (u//32*32), " " * (u % 32), end="") + + if u % 32 == 0: + print () + print (" /* %04X */ " % u, end="") + print ("%s," % short_value[value], end="") + print () + + offset += end - start + 1 + print () + occupancy = num * 100. / offset + print ("}; /* Table items: %d; occupancy: %d%% */" % (offset, occupancy)) + print () + + page_bits = 12; + print () + print ("static unsigned int") + print ("joining_type (hb_codepoint_t u)") + print ("{") + print (" switch (u >> %d)" % page_bits) + print (" {") + pages = set([u>>page_bits for u in [s for s,e in ranges]+[e for s,e in ranges]]) + for p in sorted(pages): + print (" case 0x%0Xu:" % p) + for (start,end) in ranges: + if p not in [start>>page_bits, end>>page_bits]: continue + offset = "joining_offset_0x%04xu" % start + print (" if (hb_in_range (u, 0x%04Xu, 0x%04Xu)) return joining_table[u - 0x%04Xu + %s];" % (start, end, start, offset)) + print (" break;") + print ("") + print (" default:") + print (" break;") + print (" }") + print (" return X;") + print ("}") + print () + for value,short in short_value.items(): + print ("#undef %s" % (short)) + print () + +def print_shaping_table(f): + + shapes = {} + ligatures = {} + names = {} + for line in f: + + fields = [x.strip () for x in line.split (';')] + if fields[5][0:1] != '<': + continue + + items = fields[5].split (' ') + shape, items = items[0][1:-1], tuple (int (x, 16) for x in items[1:]) + + if not shape in ['initial', 'medial', 'isolated', 'final']: + continue + + c = int (fields[0], 16) + if len (items) != 1: + # We only care about lam-alef ligatures + if len (items) != 2 or items[0] != 0x0644 or items[1] not in [0x0622, 0x0623, 0x0625, 0x0627]: + continue + + # Save ligature + names[c] = fields[1] + if items not in ligatures: + ligatures[items] = {} + ligatures[items][shape] = c + pass + else: + # Save shape + if items[0] not in names: + names[items[0]] = fields[1] + else: + names[items[0]] = os.path.commonprefix ([names[items[0]], fields[1]]).strip () + if items[0] not in shapes: + shapes[items[0]] = {} + shapes[items[0]][shape] = c + + print () + print ("static const uint16_t shaping_table[][4] =") + print ("{") + + keys = shapes.keys () + min_u, max_u = min (keys), max (keys) + for u in range (min_u, max_u + 1): + s = [shapes[u][shape] if u in shapes and shape in shapes[u] else 0 + for shape in ['initial', 'medial', 'final', 'isolated']] + value = ', '.join ("0x%04Xu" % c for c in s) + print (" {%s}, /* U+%04X %s */" % (value, u, names[u] if u in names else "")) + + print ("};") + print () + print ("#define SHAPING_TABLE_FIRST 0x%04Xu" % min_u) + print ("#define SHAPING_TABLE_LAST 0x%04Xu" % max_u) + print () + + ligas = {} + for pair in ligatures.keys (): + for shape in ligatures[pair]: + c = ligatures[pair][shape] + if shape == 'isolated': + liga = (shapes[pair[0]]['initial'], shapes[pair[1]]['final']) + elif shape == 'final': + liga = (shapes[pair[0]]['medial'], shapes[pair[1]]['final']) + else: + raise Exception ("Unexpected shape", shape) + if liga[0] not in ligas: + ligas[liga[0]] = [] + ligas[liga[0]].append ((liga[1], c)) + max_i = max (len (ligas[l]) for l in ligas) + print () + print ("static const struct ligature_set_t {") + print (" uint16_t first;") + print (" struct ligature_pairs_t {") + print (" uint16_t second;") + print (" uint16_t ligature;") + print (" } ligatures[%d];" % max_i) + print ("} ligature_table[] =") + print ("{") + for first in sorted (ligas.keys ()): + + print (" { 0x%04Xu, {" % (first)) + for liga in ligas[first]: + print (" { 0x%04Xu, 0x%04Xu }, /* %s */" % (liga[0], liga[1], names[liga[1]])) + print (" }},") + + print ("};") + print () + + + +print ("/* == Start of generated table == */") +print ("/*") +print (" * The following table is generated by running:") +print (" *") +print (" * ./gen-arabic-table.py ArabicShaping.txt UnicodeData.txt Blocks.txt") +print (" *") +print (" * on files with these headers:") +print (" *") +for h in headers: + for l in h: + print (" * %s" % (l.strip())) +print (" */") +print () +print ("#ifndef HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_HH") +print ("#define HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_HH") +print () + +read_blocks (files[2]) +print_joining_table (files[0]) +print_shaping_table (files[1]) + +print () +print ("#endif /* HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_HH */") +print () +print ("/* == End of generated table == */") diff --git a/source/libs/harfbuzz/harfbuzz-src/src/gen-def.py b/source/libs/harfbuzz/harfbuzz-src/src/gen-def.py new file mode 100644 index 000000000..9111c698c --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/gen-def.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python + +from __future__ import print_function, division, absolute_import + +import io, os, re, sys + +if len (sys.argv) < 3: + sys.exit("usage: gen-def.py harfbuzz.def hb.h [hb-blob.h hb-buffer.h ...]") + +output_file = sys.argv[1] +header_paths = sys.argv[2:] + +headers_content = [] +for h in header_paths: + if h.endswith (".h"): + with io.open (h, encoding='utf-8') as f: headers_content.append (f.read ()) + +symbols = "\n".join (sorted (re.findall (r"^hb_\w+(?= \()", "\n".join (headers_content), re.M))) + +result = symbols if os.environ.get('PLAIN_LIST', '') else """EXPORTS +%s +LIBRARY lib%s-0.dll""" % (symbols, output_file.replace ('.def', '')) + +with open (output_file, "w") as f: f.write (result) diff --git a/source/libs/harfbuzz/harfbuzz-src/src/gen-emoji-table.py b/source/libs/harfbuzz/harfbuzz-src/src/gen-emoji-table.py new file mode 100644 index 000000000..49770d4fd --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/gen-emoji-table.py @@ -0,0 +1,73 @@ +#!/usr/bin/python + +from __future__ import print_function, division, absolute_import +import sys +import os.path +from collections import OrderedDict +import packTab + +if len (sys.argv) != 2: + print("usage: ./gen-emoji-table.py emoji-data.txt", file=sys.stderr) + sys.exit (1) + +f = open(sys.argv[1]) +header = [f.readline () for _ in range(10)] + +ranges = OrderedDict() +for line in f.readlines(): + line = line.strip() + if not line or line[0] == '#': + continue + rang, typ = [s.strip() for s in line.split('#')[0].split(';')[:2]] + + rang = [int(s, 16) for s in rang.split('..')] + if len(rang) > 1: + start, end = rang + else: + start = end = rang[0] + + if typ not in ranges: + ranges[typ] = [] + if ranges[typ] and ranges[typ][-1][1] == start - 1: + ranges[typ][-1] = (ranges[typ][-1][0], end) + else: + ranges[typ].append((start, end)) + + + +print ("/* == Start of generated table == */") +print ("/*") +print (" * The following tables are generated by running:") +print (" *") +print (" * ./gen-emoji-table.py emoji-data.txt") +print (" *") +print (" * on file with this header:") +print (" *") +for l in header: + print (" * %s" % (l.strip())) +print (" */") +print () +print ("#ifndef HB_UNICODE_EMOJI_TABLE_HH") +print ("#define HB_UNICODE_EMOJI_TABLE_HH") +print () +print ('#include "hb-unicode.hh"') +print () + +for typ, s in ranges.items(): + if typ != "Extended_Pictographic": continue + + arr = dict() + for start,end in s: + for i in range(start,end): + arr[i] = 1 + + sol = packTab.pack_table(arr, 0, compression=3) + code = packTab.Code('_hb_emoji') + sol.genCode(code, 'is_'+typ) + code.print_c(linkage='static inline') + print() + +print () +print ("#endif /* HB_UNICODE_EMOJI_TABLE_HH */") +print () +print ("/* == End of generated table == */") diff --git a/source/libs/harfbuzz/harfbuzz-src/src/gen-indic-table.py b/source/libs/harfbuzz/harfbuzz-src/src/gen-indic-table.py new file mode 100755 index 000000000..912b1d7ea --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/gen-indic-table.py @@ -0,0 +1,271 @@ +#!/usr/bin/env python + +from __future__ import print_function, division, absolute_import + +import io, sys + +if len (sys.argv) != 4: + print ("usage: ./gen-indic-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt Blocks.txt", file=sys.stderr) + sys.exit (1) + +ALLOWED_SINGLES = [0x00A0, 0x25CC] +ALLOWED_BLOCKS = [ + 'Basic Latin', + 'Latin-1 Supplement', + 'Devanagari', + 'Bengali', + 'Gurmukhi', + 'Gujarati', + 'Oriya', + 'Tamil', + 'Telugu', + 'Kannada', + 'Malayalam', + 'Sinhala', + 'Myanmar', + 'Khmer', + 'Vedic Extensions', + 'General Punctuation', + 'Superscripts and Subscripts', + 'Devanagari Extended', + 'Myanmar Extended-B', + 'Myanmar Extended-A', +] + +files = [io.open (x, encoding='utf-8') for x in sys.argv[1:]] + +headers = [[f.readline () for i in range (2)] for f in files] + +data = [{} for f in files] +values = [{} for f in files] +for i, f in enumerate (files): + for line in f: + + j = line.find ('#') + if j >= 0: + line = line[:j] + + fields = [x.strip () for x in line.split (';')] + if len (fields) == 1: + continue + + uu = fields[0].split ('..') + start = int (uu[0], 16) + if len (uu) == 1: + end = start + else: + end = int (uu[1], 16) + + t = fields[1] + + for u in range (start, end + 1): + data[i][u] = t + values[i][t] = values[i].get (t, 0) + end - start + 1 + +# Merge data into one dict: +defaults = ('Other', 'Not_Applicable', 'No_Block') +for i,v in enumerate (defaults): + values[i][v] = values[i].get (v, 0) + 1 +combined = {} +for i,d in enumerate (data): + for u,v in d.items (): + if i == 2 and not u in combined: + continue + if not u in combined: + combined[u] = list (defaults) + combined[u][i] = v +combined = {k:v for k,v in combined.items() if k in ALLOWED_SINGLES or v[2] in ALLOWED_BLOCKS} +data = combined +del combined +num = len (data) + +# Move the outliers NO-BREAK SPACE and DOTTED CIRCLE out +singles = {} +for u in ALLOWED_SINGLES: + singles[u] = data[u] + del data[u] + +print ("/* == Start of generated table == */") +print ("/*") +print (" * The following table is generated by running:") +print (" *") +print (" * ./gen-indic-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt Blocks.txt") +print (" *") +print (" * on files with these headers:") +print (" *") +for h in headers: + for l in h: + print (" * %s" % (l.strip())) +print (" */") +print () +print ('#include "hb.hh"') +print () +print ('#ifndef HB_NO_OT_SHAPE') +print () +print ('#include "hb-ot-shape-complex-indic.hh"') +print () + +# Shorten values +short = [{ + "Bindu": 'Bi', + "Cantillation_Mark": 'Ca', + "Joiner": 'ZWJ', + "Non_Joiner": 'ZWNJ', + "Number": 'Nd', + "Visarga": 'Vs', + "Vowel": 'Vo', + "Vowel_Dependent": 'M', + "Consonant_Prefixed": 'CPrf', + "Other": 'x', +},{ + "Not_Applicable": 'x', +}] +all_shorts = [{},{}] + +# Add some of the values, to make them more readable, and to avoid duplicates + + +for i in range (2): + for v,s in short[i].items (): + all_shorts[i][s] = v + +what = ["INDIC_SYLLABIC_CATEGORY", "INDIC_MATRA_CATEGORY"] +what_short = ["ISC", "IMC"] +print ('#pragma GCC diagnostic push') +print ('#pragma GCC diagnostic ignored "-Wunused-macros"') +cat_defs = [] +for i in range (2): + vv = sorted (values[i].keys ()) + for v in vv: + v_no_and = v.replace ('_And_', '_') + if v in short[i]: + s = short[i][v] + else: + s = ''.join ([c for c in v_no_and if ord ('A') <= ord (c) <= ord ('Z')]) + if s in all_shorts[i]: + raise Exception ("Duplicate short value alias", v, all_shorts[i][s]) + all_shorts[i][s] = v + short[i][v] = s + cat_defs.append ((what_short[i] + '_' + s, what[i] + '_' + v.upper (), str (values[i][v]), v)) + +maxlen_s = max ([len (c[0]) for c in cat_defs]) +maxlen_l = max ([len (c[1]) for c in cat_defs]) +maxlen_n = max ([len (c[2]) for c in cat_defs]) +for s in what_short: + print () + for c in [c for c in cat_defs if s in c[0]]: + print ("#define %s %s /* %s chars; %s */" % + (c[0].ljust (maxlen_s), c[1].ljust (maxlen_l), c[2].rjust (maxlen_n), c[3])) +print () +print ('#pragma GCC diagnostic pop') +print () +print ("#define _(S,M) INDIC_COMBINE_CATEGORIES (ISC_##S, IMC_##M)") +print () +print () + +total = 0 +used = 0 +last_block = None +def print_block (block, start, end, data): + global total, used, last_block + if block and block != last_block: + print () + print () + print (" /* %s */" % block) + num = 0 + assert start % 8 == 0 + assert (end+1) % 8 == 0 + for u in range (start, end+1): + if u % 8 == 0: + print () + print (" /* %04X */" % u, end="") + if u in data: + num += 1 + d = data.get (u, defaults) + print ("%9s" % ("_(%s,%s)," % (short[0][d[0]], short[1][d[1]])), end="") + + total += end - start + 1 + used += num + if block: + last_block = block + +uu = sorted (data.keys ()) + +last = -100000 +num = 0 +offset = 0 +starts = [] +ends = [] +print ("static const INDIC_TABLE_ELEMENT_TYPE indic_table[] = {") +for u in uu: + if u <= last: + continue + block = data[u][2] + + start = u//8*8 + end = start+1 + while end in uu and block == data[end][2]: + end += 1 + end = (end-1)//8*8 + 7 + + if start != last + 1: + if start - last <= 1+16*3: + print_block (None, last+1, start-1, data) + last = start-1 + else: + if last >= 0: + ends.append (last + 1) + offset += ends[-1] - starts[-1] + print () + print () + print ("#define indic_offset_0x%04xu %d" % (start, offset)) + starts.append (start) + + print_block (block, start, end, data) + last = end +ends.append (last + 1) +offset += ends[-1] - starts[-1] +print () +print () +occupancy = used * 100. / total +page_bits = 12 +print ("}; /* Table items: %d; occupancy: %d%% */" % (offset, occupancy)) +print () +print ("INDIC_TABLE_ELEMENT_TYPE") +print ("hb_indic_get_categories (hb_codepoint_t u)") +print ("{") +print (" switch (u >> %d)" % page_bits) +print (" {") +pages = set ([u>>page_bits for u in starts+ends+list (singles.keys ())]) +for p in sorted(pages): + print (" case 0x%0Xu:" % p) + for u,d in singles.items (): + if p != u>>page_bits: continue + print (" if (unlikely (u == 0x%04Xu)) return _(%s,%s);" % (u, short[0][d[0]], short[1][d[1]])) + for (start,end) in zip (starts, ends): + if p not in [start>>page_bits, end>>page_bits]: continue + offset = "indic_offset_0x%04xu" % start + print (" if (hb_in_range (u, 0x%04Xu, 0x%04Xu)) return indic_table[u - 0x%04Xu + %s];" % (start, end-1, start, offset)) + print (" break;") + print ("") +print (" default:") +print (" break;") +print (" }") +print (" return _(x,x);") +print ("}") +print () +print ("#undef _") +for i in range (2): + print () + vv = sorted (values[i].keys ()) + for v in vv: + print ("#undef %s_%s" % + (what_short[i], short[i][v])) +print () +print ('#endif') +print () +print ("/* == End of generated table == */") + +# Maintain at least 30% occupancy in the table */ +if occupancy < 30: + raise Exception ("Table too sparse, please investigate: ", occupancy) diff --git a/source/libs/harfbuzz/harfbuzz-src/src/gen-os2-unicode-ranges.py b/source/libs/harfbuzz/harfbuzz-src/src/gen-os2-unicode-ranges.py new file mode 100644 index 000000000..515f4ca14 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/gen-os2-unicode-ranges.py @@ -0,0 +1,59 @@ +#!/usr/bin/python + +# -*- coding: utf-8 -*- + +# Generates the code for a sorted unicode range array as used in hb-ot-os2-unicode-ranges.hh +# Input is a tab seperated list of unicode ranges from the otspec +# (https://docs.microsoft.com/en-us/typography/opentype/spec/os2#ur). + +from __future__ import print_function, division, absolute_import + +import io +import re +import sys + +try: + reload(sys) + sys.setdefaultencoding('utf-8') +except NameError: + pass # Python 3 + +print ("""static OS2Range _hb_os2_unicode_ranges[] = +{""") + +args = sys.argv[1:] +input_file = args[0] + +with io.open(input_file, mode="r", encoding="utf-8") as f: + + all_ranges = []; + current_bit = 0 + while True: + line = f.readline().strip() + if not line: + break + fields = re.split(r'\t+', line) + if len(fields) == 3: + current_bit = fields[0] + fields = fields[1:] + elif len(fields) > 3: + raise Exception("bad input :(.") + + name = fields[0] + ranges = re.split("-", fields[1]) + if len(ranges) != 2: + raise Exception("bad input :(.") + + v = tuple((int(ranges[0], 16), int(ranges[1], 16), int(current_bit), name)) + all_ranges.append(v) + +all_ranges = sorted(all_ranges, key=lambda t: t[0]) + +for ranges in all_ranges: + start = ("0x%X" % ranges[0]).rjust(8) + end = ("0x%X" % ranges[1]).rjust(8) + bit = ("%s" % ranges[2]).rjust(3) + + print (" {%s, %s, %s}, // %s" % (start, end, bit, ranges[3])) + +print ("""};""") diff --git a/source/libs/harfbuzz/harfbuzz-src/src/gen-tag-table.py b/source/libs/harfbuzz/harfbuzz-src/src/gen-tag-table.py new file mode 100644 index 000000000..49f5b30bb --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/gen-tag-table.py @@ -0,0 +1,1124 @@ +#!/usr/bin/python + +"""Generator of the mapping from OpenType tags to BCP 47 tags and vice +versa. + +It creates a ``const LangTag[]``, matching the tags from the OpenType +languages system tag list to the language subtags of the BCP 47 language +subtag registry, with some manual adjustments. The mappings are +supplemented with macrolanguages' sublanguages and retired codes' +replacements, according to BCP 47 and some manual additions where BCP 47 +omits a retired code entirely. + +Also generated is a function, ``hb_ot_ambiguous_tag_to_language``, +intended for use by ``hb_ot_tag_to_language``. It maps OpenType tags +back to BCP 47 tags. Ambiguous OpenType tags (those that correspond to +multiple BCP 47 tags) are listed here, except when the alphabetically +first BCP 47 tag happens to be the chosen disambiguated tag. In that +case, the fallback behavior will choose the right tag anyway. +""" + +from __future__ import absolute_import, division, print_function, unicode_literals + +import collections +try: + from HTMLParser import HTMLParser + def write (s): + print (s.encode ('utf-8'), end='') +except ImportError: + from html.parser import HTMLParser + def write (s): + sys.stdout.flush () + sys.stdout.buffer.write (s.encode ('utf-8')) +import io +import itertools +import re +import sys +import unicodedata + +if len (sys.argv) != 3: + print ('usage: ./gen-tag-table.py languagetags language-subtag-registry', file=sys.stderr) + sys.exit (1) + +try: + from html import unescape + def html_unescape (parser, entity): + return unescape (entity) +except ImportError: + def html_unescape (parser, entity): + return parser.unescape (entity) + +def expect (condition, message=None): + if not condition: + if message is None: + raise AssertionError + raise AssertionError (message) + +# from http://www-01.sil.org/iso639-3/iso-639-3.tab +ISO_639_3_TO_1 = { + 'aar': 'aa', + 'abk': 'ab', + 'afr': 'af', + 'aka': 'ak', + 'amh': 'am', + 'ara': 'ar', + 'arg': 'an', + 'asm': 'as', + 'ava': 'av', + 'ave': 'ae', + 'aym': 'ay', + 'aze': 'az', + 'bak': 'ba', + 'bam': 'bm', + 'bel': 'be', + 'ben': 'bn', + 'bis': 'bi', + 'bod': 'bo', + 'bos': 'bs', + 'bre': 'br', + 'bul': 'bg', + 'cat': 'ca', + 'ces': 'cs', + 'cha': 'ch', + 'che': 'ce', + 'chu': 'cu', + 'chv': 'cv', + 'cor': 'kw', + 'cos': 'co', + 'cre': 'cr', + 'cym': 'cy', + 'dan': 'da', + 'deu': 'de', + 'div': 'dv', + 'dzo': 'dz', + 'ell': 'el', + 'eng': 'en', + 'epo': 'eo', + 'est': 'et', + 'eus': 'eu', + 'ewe': 'ee', + 'fao': 'fo', + 'fas': 'fa', + 'fij': 'fj', + 'fin': 'fi', + 'fra': 'fr', + 'fry': 'fy', + 'ful': 'ff', + 'gla': 'gd', + 'gle': 'ga', + 'glg': 'gl', + 'glv': 'gv', + 'grn': 'gn', + 'guj': 'gu', + 'hat': 'ht', + 'hau': 'ha', + 'hbs': 'sh', + 'heb': 'he', + 'her': 'hz', + 'hin': 'hi', + 'hmo': 'ho', + 'hrv': 'hr', + 'hun': 'hu', + 'hye': 'hy', + 'ibo': 'ig', + 'ido': 'io', + 'iii': 'ii', + 'iku': 'iu', + 'ile': 'ie', + 'ina': 'ia', + 'ind': 'id', + 'ipk': 'ik', + 'isl': 'is', + 'ita': 'it', + 'jav': 'jv', + 'jpn': 'ja', + 'kal': 'kl', + 'kan': 'kn', + 'kas': 'ks', + 'kat': 'ka', + 'kau': 'kr', + 'kaz': 'kk', + 'khm': 'km', + 'kik': 'ki', + 'kin': 'rw', + 'kir': 'ky', + 'kom': 'kv', + 'kon': 'kg', + 'kor': 'ko', + 'kua': 'kj', + 'kur': 'ku', + 'lao': 'lo', + 'lat': 'la', + 'lav': 'lv', + 'lim': 'li', + 'lin': 'ln', + 'lit': 'lt', + 'ltz': 'lb', + 'lub': 'lu', + 'lug': 'lg', + 'mah': 'mh', + 'mal': 'ml', + 'mar': 'mr', + 'mkd': 'mk', + 'mlg': 'mg', + 'mlt': 'mt', + 'mol': 'mo', + 'mon': 'mn', + 'mri': 'mi', + 'msa': 'ms', + 'mya': 'my', + 'nau': 'na', + 'nav': 'nv', + 'nbl': 'nr', + 'nde': 'nd', + 'ndo': 'ng', + 'nep': 'ne', + 'nld': 'nl', + 'nno': 'nn', + 'nob': 'nb', + 'nor': 'no', + 'nya': 'ny', + 'oci': 'oc', + 'oji': 'oj', + 'ori': 'or', + 'orm': 'om', + 'oss': 'os', + 'pan': 'pa', + 'pli': 'pi', + 'pol': 'pl', + 'por': 'pt', + 'pus': 'ps', + 'que': 'qu', + 'roh': 'rm', + 'ron': 'ro', + 'run': 'rn', + 'rus': 'ru', + 'sag': 'sg', + 'san': 'sa', + 'sin': 'si', + 'slk': 'sk', + 'slv': 'sl', + 'sme': 'se', + 'smo': 'sm', + 'sna': 'sn', + 'snd': 'sd', + 'som': 'so', + 'sot': 'st', + 'spa': 'es', + 'sqi': 'sq', + 'srd': 'sc', + 'srp': 'sr', + 'ssw': 'ss', + 'sun': 'su', + 'swa': 'sw', + 'swe': 'sv', + 'tah': 'ty', + 'tam': 'ta', + 'tat': 'tt', + 'tel': 'te', + 'tgk': 'tg', + 'tgl': 'tl', + 'tha': 'th', + 'tir': 'ti', + 'ton': 'to', + 'tsn': 'tn', + 'tso': 'ts', + 'tuk': 'tk', + 'tur': 'tr', + 'twi': 'tw', + 'uig': 'ug', + 'ukr': 'uk', + 'urd': 'ur', + 'uzb': 'uz', + 'ven': 've', + 'vie': 'vi', + 'vol': 'vo', + 'wln': 'wa', + 'wol': 'wo', + 'xho': 'xh', + 'yid': 'yi', + 'yor': 'yo', + 'zha': 'za', + 'zho': 'zh', + 'zul': 'zu', +} + +class LanguageTag (object): + """A BCP 47 language tag. + + Attributes: + subtags (List[str]): The list of subtags in this tag. + grandfathered (bool): Whether this tag is grandfathered. If + ``true``, the entire lowercased tag is the ``language`` + and the other subtag fields are empty. + language (str): The language subtag. + script (str): The script subtag. + region (str): The region subtag. + variant (str): The variant subtag. + + Args: + tag (str): A BCP 47 language tag. + + """ + def __init__ (self, tag): + global bcp_47 + self.subtags = tag.lower ().split ('-') + self.grandfathered = tag.lower () in bcp_47.grandfathered + if self.grandfathered: + self.language = tag.lower () + self.script = '' + self.region = '' + self.variant = '' + else: + self.language = self.subtags[0] + self.script = self._find_first (lambda s: len (s) == 4 and s[0] > '9', self.subtags) + self.region = self._find_first (lambda s: len (s) == 2 and s[0] > '9' or len (s) == 3 and s[0] <= '9', self.subtags[1:]) + self.variant = self._find_first (lambda s: len (s) > 4 or len (s) == 4 and s[0] <= '9', self.subtags) + + def __str__(self): + return '-'.join(self.subtags) + + def __repr__ (self): + return 'LanguageTag(%r)' % str(self) + + @staticmethod + def _find_first (function, sequence): + try: + return next (iter (filter (function, sequence))) + except StopIteration: + return None + + def is_complex (self): + """Return whether this tag is too complex to represent as a + ``LangTag`` in the generated code. + + Complex tags need to be handled in + ``hb_ot_tags_from_complex_language``. + + Returns: + Whether this tag is complex. + """ + return not (len (self.subtags) == 1 + or self.grandfathered + and len (self.subtags[1]) != 3 + and ot.from_bcp_47[self.subtags[0]] == ot.from_bcp_47[self.language]) + + def get_group (self): + """Return the group into which this tag should be categorized in + ``hb_ot_tags_from_complex_language``. + + The group is the first letter of the tag, or ``'und'`` if this tag + should not be matched in a ``switch`` statement in the generated + code. + + Returns: + This tag's group. + """ + return ('und' + if (self.language == 'und' + or self.variant in bcp_47.prefixes and len (bcp_47.prefixes[self.variant]) == 1) + else self.language[0]) + +class OpenTypeRegistryParser (HTMLParser): + """A parser for the OpenType language system tag registry. + + Attributes: + header (str): The "last updated" line of the registry. + names (Mapping[str, str]): A map of language system tags to the + names they are given in the registry. + ranks (DefaultDict[str, int]): A map of language system tags to + numbers. If a single BCP 47 tag corresponds to multiple + OpenType tags, the tags are ordered in increasing order by + rank. The rank is based on the number of BCP 47 tags + associated with a tag, though it may be manually modified. + to_bcp_47 (DefaultDict[str, AbstractSet[str]]): A map of + OpenType language system tags to sets of BCP 47 tags. + from_bcp_47 (DefaultDict[str, AbstractSet[str]]): ``to_bcp_47`` + inverted. Its values start as unsorted sets; + ``sort_languages`` converts them to sorted lists. + + """ + def __init__ (self): + HTMLParser.__init__ (self) + self.header = '' + self.names = {} + self.ranks = collections.defaultdict (int) + self.to_bcp_47 = collections.defaultdict (set) + self.from_bcp_47 = collections.defaultdict (set) + # Whether the parser is in a element. + self._current_tr = [] + + def handle_starttag (self, tag, attrs): + if tag == 'meta': + for attr, value in attrs: + if attr == 'name' and value == 'updated_at': + self.header = self.get_starttag_text () + break + elif tag == 'td': + self._td = True + self._current_tr.append ('') + elif tag == 'tr': + self._current_tr = [] + + def handle_endtag (self, tag): + if tag == 'td': + self._td = False + elif tag == 'tr' and self._current_tr: + expect (2 <= len (self._current_tr) <= 3) + name = self._current_tr[0].strip () + tag = self._current_tr[1].strip ("\t\n\v\f\r '") + rank = 0 + if len (tag) > 4: + expect (tag.endswith (' (deprecated)'), 'ill-formed OpenType tag: %s' % tag) + name += ' (deprecated)' + tag = tag.split (' ')[0] + rank = 1 + self.names[tag] = re.sub (' languages$', '', name) + if not self._current_tr[2]: + return + iso_codes = self._current_tr[2].strip () + self.to_bcp_47[tag].update (ISO_639_3_TO_1.get (code, code) for code in iso_codes.replace (' ', '').split (',')) + rank += 2 * len (self.to_bcp_47[tag]) + self.ranks[tag] = rank + + def handle_data (self, data): + if self._td: + self._current_tr[-1] += data + + def handle_charref (self, name): + self.handle_data (html_unescape (self, '&#%s;' % name)) + + def handle_entityref (self, name): + self.handle_data (html_unescape (self, '&%s;' % name)) + + def parse (self, filename): + """Parse the OpenType language system tag registry. + + Args: + filename (str): The file name of the registry. + """ + with io.open (filename, encoding='utf-8') as f: + self.feed (f.read ()) + expect (self.header) + for tag, iso_codes in self.to_bcp_47.items (): + for iso_code in iso_codes: + self.from_bcp_47[iso_code].add (tag) + + def add_language (self, bcp_47_tag, ot_tag): + """Add a language as if it were in the registry. + + Args: + bcp_47_tag (str): A BCP 47 tag. If the tag is more than just + a language subtag, and if the language subtag is a + macrolanguage, then new languages are added corresponding + to the macrolanguages' individual languages with the + remainder of the tag appended. + ot_tag (str): An OpenType language system tag. + """ + global bcp_47 + self.to_bcp_47[ot_tag].add (bcp_47_tag) + self.from_bcp_47[bcp_47_tag].add (ot_tag) + if bcp_47_tag.lower () not in bcp_47.grandfathered: + try: + [macrolanguage, suffix] = bcp_47_tag.split ('-', 1) + if macrolanguage in bcp_47.macrolanguages: + s = set () + for language in bcp_47.macrolanguages[macrolanguage]: + if language.lower () not in bcp_47.grandfathered: + s.add ('%s-%s' % (language, suffix)) + bcp_47.macrolanguages['%s-%s' % (macrolanguage, suffix)] = s + except ValueError: + pass + + @staticmethod + def _remove_language (tag_1, dict_1, dict_2): + for tag_2 in dict_1.pop (tag_1): + dict_2[tag_2].remove (tag_1) + if not dict_2[tag_2]: + del dict_2[tag_2] + + def remove_language_ot (self, ot_tag): + """Remove an OpenType tag from the registry. + + Args: + ot_tag (str): An OpenType tag. + """ + self._remove_language (ot_tag, self.to_bcp_47, self.from_bcp_47) + + def remove_language_bcp_47 (self, bcp_47_tag): + """Remove a BCP 47 tag from the registry. + + Args: + bcp_47_tag (str): A BCP 47 tag. + """ + self._remove_language (bcp_47_tag, self.from_bcp_47, self.to_bcp_47) + + def inherit_from_macrolanguages (self): + """Copy mappings from macrolanguages to individual languages. + + If a BCP 47 tag for an individual mapping has no OpenType + mapping but its macrolanguage does, the mapping is copied to + the individual language. For example, als (Tosk Albanian) has no + explicit mapping, so it inherits from sq (Albanian) the mapping + to SQI. + + If a BCP 47 tag for a macrolanguage has no OpenType mapping but + all of its individual languages do and they all map to the same + tags, the mapping is copied to the macrolanguage. + """ + global bcp_47 + original_ot_from_bcp_47 = dict (self.from_bcp_47) + for macrolanguage, languages in dict (bcp_47.macrolanguages).items (): + ot_macrolanguages = set (original_ot_from_bcp_47.get (macrolanguage, set ())) + if ot_macrolanguages: + for ot_macrolanguage in ot_macrolanguages: + for language in languages: + # Remove the following condition if e.g. nn should map to NYN,NOR + # instead of just NYN. + if language not in original_ot_from_bcp_47: + self.add_language (language, ot_macrolanguage) + self.ranks[ot_macrolanguage] += 1 + else: + for language in languages: + if language in original_ot_from_bcp_47: + if ot_macrolanguages: + ml = original_ot_from_bcp_47[language] + if ml: + ot_macrolanguages &= ml + else: + pass + else: + ot_macrolanguages |= original_ot_from_bcp_47[language] + else: + ot_macrolanguages.clear () + if not ot_macrolanguages: + break + for ot_macrolanguage in ot_macrolanguages: + self.add_language (macrolanguage, ot_macrolanguage) + + def sort_languages (self): + """Sort the values of ``from_bcp_47`` in ascending rank order.""" + for language, tags in self.from_bcp_47.items (): + self.from_bcp_47[language] = sorted (tags, + key=lambda t: (self.ranks[t] + rank_delta (language, t), t)) + +ot = OpenTypeRegistryParser () + +class BCP47Parser (object): + """A parser for the BCP 47 subtag registry. + + Attributes: + header (str): The "File-Date" line of the registry. + names (Mapping[str, str]): A map of subtags to the names they + are given in the registry. Each value is a + ``'\\n'``-separated list of names. + scopes (Mapping[str, str]): A map of language subtags to strings + suffixed to language names, including suffixes to explain + language scopes. + macrolanguages (DefaultDict[str, AbstractSet[str]]): A map of + language subtags to the sets of language subtags which + inherit from them. See + ``OpenTypeRegistryParser.inherit_from_macrolanguages``. + prefixes (DefaultDict[str, AbstractSet[str]]): A map of variant + subtags to their prefixes. + grandfathered (AbstractSet[str]): The set of grandfathered tags, + normalized to lowercase. + + """ + def __init__ (self): + self.header = '' + self.names = {} + self.scopes = {} + self.macrolanguages = collections.defaultdict (set) + self.prefixes = collections.defaultdict (set) + self.grandfathered = set () + + def parse (self, filename): + """Parse the BCP 47 subtag registry. + + Args: + filename (str): The file name of the registry. + """ + with io.open (filename, encoding='utf-8') as f: + subtag_type = None + subtag = None + deprecated = False + has_preferred_value = False + line_buffer = '' + for line in itertools.chain (f, ['']): + line = line.rstrip () + if line.startswith (' '): + line_buffer += line[1:] + continue + line, line_buffer = line_buffer, line + if line.startswith ('Type: '): + subtag_type = line.split (' ')[1] + deprecated = False + has_preferred_value = False + elif line.startswith ('Subtag: ') or line.startswith ('Tag: '): + subtag = line.split (' ')[1] + if subtag_type == 'grandfathered': + self.grandfathered.add (subtag.lower ()) + elif line.startswith ('Description: '): + description = line.split (' ', 1)[1].replace (' (individual language)', '') + description = re.sub (' (\((individual |macro)language\)|languages)$', '', + description) + if subtag in self.names: + self.names[subtag] += '\n' + description + else: + self.names[subtag] = description + elif subtag_type == 'language' or subtag_type == 'grandfathered': + if line.startswith ('Scope: '): + scope = line.split (' ')[1] + if scope == 'macrolanguage': + scope = ' [macrolanguage]' + elif scope == 'collection': + scope = ' [family]' + else: + continue + self.scopes[subtag] = scope + elif line.startswith ('Deprecated: '): + self.scopes[subtag] = ' (retired code)' + self.scopes.get (subtag, '') + deprecated = True + elif deprecated and line.startswith ('Comments: see '): + # If a subtag is split into multiple replacement subtags, + # it essentially represents a macrolanguage. + for language in line.replace (',', '').split (' ')[2:]: + self._add_macrolanguage (subtag, language) + elif line.startswith ('Preferred-Value: '): + # If a subtag is deprecated in favor of a single replacement subtag, + # it is either a dialect or synonym of the preferred subtag. Either + # way, it is close enough to the truth to consider the replacement + # the macrolanguage of the deprecated language. + has_preferred_value = True + macrolanguage = line.split (' ')[1] + self._add_macrolanguage (macrolanguage, subtag) + elif not has_preferred_value and line.startswith ('Macrolanguage: '): + self._add_macrolanguage (line.split (' ')[1], subtag) + elif subtag_type == 'variant': + if line.startswith ('Prefix: '): + self.prefixes[subtag].add (line.split (' ')[1]) + elif line.startswith ('File-Date: '): + self.header = line + expect (self.header) + + def _add_macrolanguage (self, macrolanguage, language): + global ot + if language not in ot.from_bcp_47: + for l in self.macrolanguages.get (language, set ()): + self._add_macrolanguage (macrolanguage, l) + if macrolanguage not in ot.from_bcp_47: + for ls in list (self.macrolanguages.values ()): + if macrolanguage in ls: + ls.add (language) + return + self.macrolanguages[macrolanguage].add (language) + + def remove_extra_macrolanguages (self): + """Make every language have at most one macrolanguage.""" + inverted = collections.defaultdict (list) + for macrolanguage, languages in self.macrolanguages.items (): + for language in languages: + inverted[language].append (macrolanguage) + for language, macrolanguages in inverted.items (): + if len (macrolanguages) > 1: + macrolanguages.sort (key=lambda ml: len (self.macrolanguages[ml])) + biggest_macrolanguage = macrolanguages.pop () + for macrolanguage in macrolanguages: + self._add_macrolanguage (biggest_macrolanguage, macrolanguage) + + def get_name (self, lt): + """Return the names of the subtags in a language tag. + + Args: + lt (LanguageTag): A BCP 47 language tag. + + Returns: + The name form of ``lt``. + """ + name = self.names[lt.language].split ('\n')[0] + if lt.script: + name += '; ' + self.names[lt.script.title ()].split ('\n')[0] + if lt.region: + name += '; ' + self.names[lt.region.upper ()].split ('\n')[0] + if lt.variant: + name += '; ' + self.names[lt.variant].split ('\n')[0] + return name + +bcp_47 = BCP47Parser () + +ot.parse (sys.argv[1]) +bcp_47.parse (sys.argv[2]) + +ot.add_language ('ary', 'MOR') + +ot.add_language ('ath', 'ATH') + +ot.add_language ('bai', 'BML') + +ot.ranks['BAL'] = ot.ranks['KAR'] + 1 + +ot.add_language ('ber', 'BBR') + +ot.remove_language_ot ('PGR') +ot.add_language ('el-polyton', 'PGR') + +bcp_47.macrolanguages['et'] = {'ekk'} + +bcp_47.names['flm'] = 'Falam Chin' +bcp_47.scopes['flm'] = ' (retired code)' +bcp_47.macrolanguages['flm'] = {'cfm'} + +ot.ranks['FNE'] = ot.ranks['TNE'] + 1 + +ot.add_language ('und-fonipa', 'IPPH') + +ot.add_language ('und-fonnapa', 'APPH') + +ot.remove_language_ot ('IRT') +ot.add_language ('ga-Latg', 'IRT') + +ot.remove_language_ot ('KGE') +ot.add_language ('und-Geok', 'KGE') + +ot.add_language ('guk', 'GUK') +ot.names['GUK'] = 'Gumuz (SIL fonts)' +ot.ranks['GUK'] = ot.ranks['GMZ'] + 1 + +bcp_47.macrolanguages['id'] = {'in'} + +bcp_47.macrolanguages['ijo'] = {'ijc'} + +ot.add_language ('kht', 'KHN') +ot.names['KHN'] = ot.names['KHT'] + ' (Microsoft fonts)' +ot.names['KHT'] = ot.names['KHT'] + ' (OpenType spec and SIL fonts)' +ot.ranks['KHN'] = ot.ranks['KHT'] +ot.ranks['KHT'] += 1 + +ot.ranks['LCR'] = ot.ranks['MCR'] + 1 + +ot.names['MAL'] = 'Malayalam Traditional' +ot.ranks['MLR'] += 1 + +bcp_47.names['mhv'] = 'Arakanese' +bcp_47.scopes['mhv'] = ' (retired code)' + +ot.add_language ('no', 'NOR') + +ot.add_language ('oc-provenc', 'PRO') + +ot.add_language ('qu', 'QUZ') +ot.add_language ('qub', 'QWH') +ot.add_language ('qud', 'QVI') +ot.add_language ('qug', 'QVI') +ot.add_language ('qup', 'QVI') +ot.add_language ('qur', 'QWH') +ot.add_language ('qus', 'QUH') +ot.add_language ('quw', 'QVI') +ot.add_language ('qux', 'QWH') +ot.add_language ('qva', 'QWH') +ot.add_language ('qvh', 'QWH') +ot.add_language ('qvj', 'QVI') +ot.add_language ('qvl', 'QWH') +ot.add_language ('qvm', 'QWH') +ot.add_language ('qvn', 'QWH') +ot.add_language ('qvo', 'QVI') +ot.add_language ('qvp', 'QWH') +ot.add_language ('qvw', 'QWH') +ot.add_language ('qvz', 'QVI') +ot.add_language ('qwa', 'QWH') +ot.add_language ('qws', 'QWH') +ot.add_language ('qxa', 'QWH') +ot.add_language ('qxc', 'QWH') +ot.add_language ('qxh', 'QWH') +ot.add_language ('qxl', 'QVI') +ot.add_language ('qxn', 'QWH') +ot.add_language ('qxo', 'QWH') +ot.add_language ('qxr', 'QVI') +ot.add_language ('qxt', 'QWH') +ot.add_language ('qxw', 'QWH') + +bcp_47.macrolanguages['ro'].remove ('mo') +bcp_47.macrolanguages['ro-MD'].add ('mo') + +ot.add_language ('sgw', 'SGW') +ot.names['SGW'] = ot.names['CHG'] + ' (SIL fonts)' +ot.ranks['SGW'] = ot.ranks['CHG'] + 1 + +ot.remove_language_ot ('SYRE') +ot.remove_language_ot ('SYRJ') +ot.remove_language_ot ('SYRN') +ot.add_language ('und-Syre', 'SYRE') +ot.add_language ('und-Syrj', 'SYRJ') +ot.add_language ('und-Syrn', 'SYRN') + +bcp_47.names['xst'] = u"Silt'e" +bcp_47.scopes['xst'] = ' (retired code)' +bcp_47.macrolanguages['xst'] = {'stv', 'wle'} + +ot.add_language ('xwo', 'TOD') + +ot.remove_language_ot ('ZHH') +ot.remove_language_ot ('ZHP') +ot.remove_language_ot ('ZHT') +bcp_47.macrolanguages['zh'].remove ('lzh') +bcp_47.macrolanguages['zh'].remove ('yue') +ot.add_language ('zh-Hant-MO', 'ZHH') +ot.add_language ('zh-Hant-HK', 'ZHH') +ot.add_language ('zh-Hans', 'ZHS') +ot.add_language ('zh-Hant', 'ZHT') +ot.add_language ('zh-HK', 'ZHH') +ot.add_language ('zh-MO', 'ZHH') +ot.add_language ('zh-TW', 'ZHT') +ot.add_language ('lzh', 'ZHT') +ot.add_language ('lzh-Hans', 'ZHS') +ot.add_language ('yue', 'ZHH') +ot.add_language ('yue-Hans', 'ZHS') + +bcp_47.macrolanguages['zom'] = {'yos'} + +def rank_delta (bcp_47, ot): + """Return a delta to apply to a BCP 47 tag's rank. + + Most OpenType tags have a constant rank, but a few have ranks that + depend on the BCP 47 tag. + + Args: + bcp_47 (str): A BCP 47 tag. + ot (str): An OpenType tag to. + + Returns: + A number to add to ``ot``'s rank when sorting ``bcp_47``'s + OpenType equivalents. + """ + if bcp_47 == 'ak' and ot == 'AKA': + return -1 + if bcp_47 == 'tw' and ot == 'TWI': + return -1 + return 0 + +disambiguation = { + 'ALT': 'alt', + 'ARK': 'rki', + 'BHI': 'bhb', + 'BLN': 'bjt', + 'BTI': 'beb', + 'CCHN': 'cco', + 'CMR': 'swb', + 'CPP': 'crp', + 'CRR': 'crx', + 'DUJ': 'dwu', + 'ECR': 'crj', + 'HAL': 'cfm', + 'HND': 'hnd', + 'KIS': 'kqs', + 'LRC': 'bqi', + 'NDB': 'nd', + 'NIS': 'njz', + 'PLG': 'pce', + 'PRO': 'pro', + 'QIN': 'bgr', + 'QUH': 'quh', + 'QVI': 'qvi', + 'QWH': 'qwh', + 'SIG': 'stv', + 'TNE': 'yrk', + 'ZHH': 'zh-HK', + 'ZHS': 'zh-Hans', + 'ZHT': 'zh-Hant', +} + +ot.inherit_from_macrolanguages () +bcp_47.remove_extra_macrolanguages () +ot.inherit_from_macrolanguages () +ot.sort_languages () + +print ('/* == Start of generated table == */') +print ('/*') +print (' * The following table is generated by running:') +print (' *') +print (' * %s languagetags language-subtag-registry' % sys.argv[0]) +print (' *') +print (' * on files with these headers:') +print (' *') +print (' * %s' % ot.header.strip ()) +print (' * %s' % bcp_47.header) +print (' */') +print () +print ('#ifndef HB_OT_TAG_TABLE_HH') +print ('#define HB_OT_TAG_TABLE_HH') +print () +print ('static const LangTag ot_languages[] = {') + +def hb_tag (tag): + """Convert a tag to ``HB_TAG`` form. + + Args: + tag (str): An OpenType tag. + + Returns: + A snippet of C++ representing ``tag``. + """ + return u"HB_TAG('%s','%s','%s','%s')" % tuple (('%-4s' % tag)[:4]) + +def get_variant_set (name): + """Return a set of variant language names from a name. + + Args: + name (str): A list of language names from the BCP 47 registry, + joined on ``'\\n'``. + + Returns: + A set of normalized language names. + """ + return set (unicodedata.normalize ('NFD', n.replace ('\u2019', u"'")) + .encode ('ASCII', 'ignore') + .strip () + for n in re.split ('[\n(),]', name) if n) + +def language_name_intersection (a, b): + """Return the names in common between two language names. + + Args: + a (str): A list of language names from the BCP 47 registry, + joined on ``'\\n'``. + b (str): A list of language names from the BCP 47 registry, + joined on ``'\\n'``. + + Returns: + The normalized language names shared by ``a`` and ``b``. + """ + return get_variant_set (a).intersection (get_variant_set (b)) + +def get_matching_language_name (intersection, candidates): + return next (iter (c for c in candidates if not intersection.isdisjoint (get_variant_set (c)))) + +def same_tag (bcp_47_tag, ot_tags): + return len (bcp_47_tag) == 3 and len (ot_tags) == 1 and bcp_47_tag == ot_tags[0].lower () + +for language, tags in sorted (ot.from_bcp_47.items ()): + if language == '' or '-' in language: + continue + commented_out = same_tag (language, tags) + for i, tag in enumerate (tags, start=1): + print ('%s{\"%s\",\t%s},' % ('/*' if commented_out else ' ', language, hb_tag (tag)), end='') + if commented_out: + print ('*/', end='') + print ('\t/* ', end='') + bcp_47_name = bcp_47.names.get (language, '') + bcp_47_name_candidates = bcp_47_name.split ('\n') + intersection = language_name_intersection (bcp_47_name, ot.names[tag]) + scope = bcp_47.scopes.get (language, '') + if not intersection: + write ('%s%s -> %s' % (bcp_47_name_candidates[0], scope, ot.names[tag])) + else: + name = get_matching_language_name (intersection, bcp_47_name_candidates) + bcp_47.names[language] = name + write ('%s%s' % (name if len (name) > len (ot.names[tag]) else ot.names[tag], scope)) + print (' */') + +print ('};') +print () + +print ('/**') +print (' * hb_ot_tags_from_complex_language:') +print (' * @lang_str: a BCP 47 language tag to convert.') +print (' * @limit: a pointer to the end of the substring of @lang_str to consider for') +print (' * conversion.') +print (' * @count: maximum number of language tags to retrieve (IN) and actual number of') +print (' * language tags retrieved (OUT). If no tags are retrieved, it is not modified.') +print (' * @tags: array of size at least @language_count to store the language tag') +print (' * results') +print (' *') +print (' * Converts a multi-subtag BCP 47 language tag to language tags.') +print (' *') +print (' * Return value: Whether any language systems were retrieved.') +print (' **/') +print ('static bool') +print ('hb_ot_tags_from_complex_language (const char *lang_str,') +print ('\t\t\t\t const char *limit,') +print ('\t\t\t\t unsigned int *count /* IN/OUT */,') +print ('\t\t\t\t hb_tag_t *tags /* OUT */)') +print ('{') + +def print_subtag_matches (subtag, new_line): + if subtag: + if new_line: + print () + print ('\t&& ', end='') + print ('subtag_matches (lang_str, limit, "-%s")' % subtag, end='') + +complex_tags = collections.defaultdict (list) +for initial, group in itertools.groupby ((lt_tags for lt_tags in [ + (LanguageTag (language), tags) + for language, tags in sorted (ot.from_bcp_47.items (), + key=lambda i: (-len (i[0]), i[0])) + ] if lt_tags[0].is_complex ()), + key=lambda lt_tags: lt_tags[0].get_group ()): + complex_tags[initial] += group + +for initial, items in sorted (complex_tags.items ()): + if initial != 'und': + continue + for lt, tags in items: + if lt.variant in bcp_47.prefixes: + expect (next (iter (bcp_47.prefixes[lt.variant])) == lt.language, + '%s is not a valid prefix of %s' % (lt.language, lt.variant)) + print (' if (', end='') + print_subtag_matches (lt.script, False) + print_subtag_matches (lt.region, False) + print_subtag_matches (lt.variant, False) + print (')') + print (' {') + write (' /* %s */' % bcp_47.get_name (lt)) + print () + if len (tags) == 1: + write (' tags[0] = %s; /* %s */' % (hb_tag (tags[0]), ot.names[tags[0]])) + print () + print (' *count = 1;') + else: + print (' hb_tag_t possible_tags[] = {') + for tag in tags: + write (' %s, /* %s */' % (hb_tag (tag), ot.names[tag])) + print () + print (' };') + print (' for (i = 0; i < %s && i < *count; i++)' % len (tags)) + print (' tags[i] = possible_tags[i];') + print (' *count = i;') + print (' return true;') + print (' }') + +print (' switch (lang_str[0])') +print (' {') +for initial, items in sorted (complex_tags.items ()): + if initial == 'und': + continue + print (" case '%s':" % initial) + for lt, tags in items: + print (' if (', end='') + if lt.grandfathered: + print ('0 == strcmp (&lang_str[1], "%s")' % lt.language[1:], end='') + else: + string_literal = lt.language[1:] + '-' + if lt.script: + string_literal += lt.script + lt.script = None + if lt.region: + string_literal += '-' + lt.region + lt.region = None + if string_literal[-1] == '-': + print ('0 == strncmp (&lang_str[1], "%s", %i)' % (string_literal, len (string_literal)), end='') + else: + print ('lang_matches (&lang_str[1], "%s")' % string_literal, end='') + print_subtag_matches (lt.script, True) + print_subtag_matches (lt.region, True) + print_subtag_matches (lt.variant, True) + print (')') + print (' {') + write (' /* %s */' % bcp_47.get_name (lt)) + print () + if len (tags) == 1: + write (' tags[0] = %s; /* %s */' % (hb_tag (tags[0]), ot.names[tags[0]])) + print () + print (' *count = 1;') + else: + print (' unsigned int i;') + print (' hb_tag_t possible_tags[] = {') + for tag in tags: + write ('\t%s, /* %s */' % (hb_tag (tag), ot.names[tag])) + print () + print (' };') + print (' for (i = 0; i < %s && i < *count; i++)' % len (tags)) + print ('\ttags[i] = possible_tags[i];') + print (' *count = i;') + print (' return true;') + print (' }') + print (' break;') + +print (' }') +print (' return false;') +print ('}') +print () +print ('/**') +print (' * hb_ot_ambiguous_tag_to_language') +print (' * @tag: A language tag.') +print (' *') +print (' * Converts @tag to a BCP 47 language tag if it is ambiguous (it corresponds to') +print (' * many language tags) and the best tag is not the alphabetically first, or if') +print (' * the best tag consists of multiple subtags, or if the best tag does not appear') +print (' * in #ot_languages.') +print (' *') +print (' * Return value: The #hb_language_t corresponding to the BCP 47 language tag,') +print (' * or #HB_LANGUAGE_INVALID if @tag is not ambiguous.') +print (' **/') +print ('static hb_language_t') +print ('hb_ot_ambiguous_tag_to_language (hb_tag_t tag)') +print ('{') +print (' switch (tag)') +print (' {') + +def verify_disambiguation_dict (): + """Verify and normalize ``disambiguation``. + + ``disambiguation`` is a map of ambiguous OpenType language system + tags to the particular BCP 47 tags they correspond to. This function + checks that all its keys really are ambiguous and that each key's + value is valid for that key. It checks that no ambiguous tag is + missing, except when it can figure out which BCP 47 tag is the best + by itself. + + It modifies ``disambiguation`` to remove keys whose values are the + same as those that the fallback would return anyway, and to add + ambiguous keys whose disambiguations it determined automatically. + + Raises: + AssertionError: Verification failed. + """ + global bcp_47 + global disambiguation + global ot + for ot_tag, bcp_47_tags in ot.to_bcp_47.items (): + primary_tags = list (t for t in bcp_47_tags if t not in bcp_47.grandfathered and ot.from_bcp_47.get (t)[0] == ot_tag) + if len (primary_tags) == 1: + expect (ot_tag not in disambiguation, 'unnecessary disambiguation for OT tag: %s' % ot_tag) + if '-' in primary_tags[0]: + disambiguation[ot_tag] = primary_tags[0] + elif len (primary_tags) == 0: + expect (ot_tag not in disambiguation, 'There is no possible valid disambiguation for %s' % ot_tag) + else: + macrolanguages = list (t for t in primary_tags if bcp_47.scopes.get (t) == ' [macrolanguage]') + if len (macrolanguages) != 1: + macrolanguages = list (t for t in primary_tags if bcp_47.scopes.get (t) == ' [family]') + if len (macrolanguages) != 1: + macrolanguages = list (t for t in primary_tags if 'retired code' not in bcp_47.scopes.get (t, '')) + if len (macrolanguages) != 1: + expect (ot_tag in disambiguation, 'ambiguous OT tag: %s %s' % (ot_tag, str (macrolanguages))) + expect (disambiguation[ot_tag] in bcp_47_tags, + '%s is not a valid disambiguation for %s' % (disambiguation[ot_tag], ot_tag)) + elif ot_tag not in disambiguation: + disambiguation[ot_tag] = macrolanguages[0] + different_primary_tags = sorted (t for t in primary_tags if not same_tag (t, ot.from_bcp_47.get (t))) + if different_primary_tags and disambiguation[ot_tag] == different_primary_tags[0] and '-' not in disambiguation[ot_tag]: + del disambiguation[ot_tag] + for ot_tag in disambiguation.keys (): + expect (ot_tag in ot.to_bcp_47, 'unknown OT tag: %s' % ot_tag) + +verify_disambiguation_dict () +for ot_tag, bcp_47_tag in sorted (disambiguation.items ()): + write (' case %s: /* %s */' % (hb_tag (ot_tag), ot.names[ot_tag])) + print () + write (' return hb_language_from_string (\"%s\", -1); /* %s */' % (bcp_47_tag, bcp_47.get_name (LanguageTag (bcp_47_tag)))) + print () + +print (' default:') +print (' return HB_LANGUAGE_INVALID;') +print (' }') +print ('}') + +print () +print ('#endif /* HB_OT_TAG_TABLE_HH */') +print () +print ('/* == End of generated table == */') + diff --git a/source/libs/harfbuzz/harfbuzz-src/src/gen-ucd-table.py b/source/libs/harfbuzz/harfbuzz-src/src/gen-ucd-table.py new file mode 100644 index 000000000..552c3c675 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/gen-ucd-table.py @@ -0,0 +1,164 @@ +#!/usr/bin/env python + +from __future__ import print_function, division, absolute_import + +import io, os.path, sys, re +import logging +logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.INFO) + +if len (sys.argv) not in (2, 3): + print("usage: ./gen-ucd-table ucd.nounihan.grouped.xml [/path/to/hb-common.h]", file=sys.stderr) + sys.exit(1) + +# https://github.com/harfbuzz/packtab +import packTab +import packTab.ucdxml + +logging.info('Loading UCDXML...') +ucdxml = packTab.ucdxml.load_ucdxml(sys.argv[1]) +ucd = packTab.ucdxml.ucdxml_get_repertoire(ucdxml) + +hb_common_h = 'hb-common.h' if len (sys.argv) < 3 else sys.argv[2] + +logging.info('Preparing data tables...') + +gc = [u['gc'] for u in ucd] +ccc = [int(u['ccc']) for u in ucd] +bmg = [int(v, 16) - int(u) if v else 0 for u,v in enumerate(u['bmg'] for u in ucd)] +#gc_ccc_non0 = set((cat,klass) for cat,klass in zip(gc,ccc) if klass) +#gc_bmg_non0 = set((cat,mirr) for cat,mirr in zip(gc, bmg) if mirr) + +sc = [u['sc'] for u in ucd] + +dm = {i:tuple(int(v, 16) for v in u['dm'].split()) for i,u in enumerate(ucd) + if u['dm'] != '#' and u['dt'] == 'can' and not (0xAC00 <= i < 0xAC00+11172)} +ce = {i for i,u in enumerate(ucd) if u['Comp_Ex'] == 'Y'} + +assert not any(v for v in dm.values() if len(v) not in (1,2)) +dm1 = sorted(set(v for v in dm.values() if len(v) == 1)) +assert all((v[0] >> 16) in (0,2) for v in dm1) +dm1_p0_array = ['0x%04Xu' % (v[0] & 0xFFFF) for v in dm1 if (v[0] >> 16) == 0] +dm1_p2_array = ['0x%04Xu' % (v[0] & 0xFFFF) for v in dm1 if (v[0] >> 16) == 2] +dm1_order = {v:i+1 for i,v in enumerate(dm1)} + +dm2 = sorted((v+(i if i not in ce and not ccc[i] else 0,), v) + for i,v in dm.items() if len(v) == 2) + +filt = lambda v: ((v[0] & 0xFFFFF800) == 0x0000 and + (v[1] & 0xFFFFFF80) == 0x0300 and + (v[2] & 0xFFF0C000) == 0x0000) +dm2_u32_array = [v for v in dm2 if filt(v[0])] +dm2_u64_array = [v for v in dm2 if not filt(v[0])] +assert dm2_u32_array + dm2_u64_array == dm2 +dm2_u32_array = ["HB_CODEPOINT_ENCODE3_11_7_14 (0x%04Xu, 0x%04Xu, 0x%04Xu)" % v[0] for v in dm2_u32_array] +dm2_u64_array = ["HB_CODEPOINT_ENCODE3 (0x%04Xu, 0x%04Xu, 0x%04Xu)" % v[0] for v in dm2_u64_array] + +l = 1 + len(dm1_p0_array) + len(dm1_p2_array) +dm2_order = {v[1]:i+l for i,v in enumerate(dm2)} + +dm_order = {None: 0} +dm_order.update(dm1_order) +dm_order.update(dm2_order) + +gc_order = dict() +for i,v in enumerate(('Cc', 'Cf', 'Cn', 'Co', 'Cs', 'Ll', 'Lm', 'Lo', 'Lt', 'Lu', + 'Mc', 'Me', 'Mn', 'Nd', 'Nl', 'No', 'Pc', 'Pd', 'Pe', 'Pf', + 'Pi', 'Po', 'Ps', 'Sc', 'Sk', 'Sm', 'So', 'Zl', 'Zp', 'Zs',)): + gc_order[i] = v + gc_order[v] = i + +sc_order = dict() +sc_array = [] +sc_re = re.compile(r"\b(HB_SCRIPT_[_A-Z]*).*HB_TAG [(]'(.)','(.)','(.)','(.)'[)]") +for line in open(hb_common_h): + m = sc_re.search (line) + if not m: continue + name = m.group(1) + tag = ''.join(m.group(i) for i in range(2, 6)) + i = len(sc_array) + sc_order[tag] = i + sc_order[i] = tag + sc_array.append(name) + +DEFAULT = 1 +COMPACT = 3 +SLOPPY = 5 + + +logging.info('Generating output...') +print("/* == Start of generated table == */") +print("/*") +print(" * The following table is generated by running:") +print(" *") +print(" * ./gen-ucd-table.py ucd.nounihan.grouped.xml") +print(" *") +print(" * on file with this description:", ucdxml.description) +print(" */") +print() +print("#ifndef HB_UCD_TABLE_HH") +print("#define HB_UCD_TABLE_HH") +print() +print('#include "hb.hh"') +print() + +code = packTab.Code('_hb_ucd') +sc_array, _ = code.addArray('hb_script_t', 'sc_map', sc_array) +dm1_p0_array, _ = code.addArray('uint16_t', 'dm1_p0_map', dm1_p0_array) +dm1_p2_array, _ = code.addArray('uint16_t', 'dm1_p2_map', dm1_p2_array) +dm2_u32_array, _ = code.addArray('uint32_t', 'dm2_u32_map', dm2_u32_array) +dm2_u64_array, _ = code.addArray('uint64_t', 'dm2_u64_map', dm2_u64_array) +code.print_c(linkage='static inline') + +datasets = [ + ('gc', gc, 'Cn', gc_order), + ('ccc', ccc, 0, None), + ('bmg', bmg, 0, None), + ('sc', sc, 'Zzzz', sc_order), + ('dm', dm, None, dm_order), +] + +for compression in (DEFAULT, COMPACT, SLOPPY): + logging.info(' Compression=%d:' % compression) + print() + if compression == DEFAULT: + print('#ifndef HB_OPTIMIZE_SIZE') + elif compression == COMPACT: + print('#elif !defined(HB_NO_UCD_UNASSIGNED)') + else: + print('#else') + print() + + if compression == SLOPPY: + for i in range(len(gc)): + if (i % 128) and gc[i] == 'Cn': + gc[i] = gc[i - 1] + for i in range(len(gc) - 2, -1, -1): + if ((i + 1) % 128) and gc[i] == 'Cn': + gc[i] = gc[i + 1] + for i in range(len(sc)): + if (i % 128) and sc[i] == 'Zzzz': + sc[i] = sc[i - 1] + for i in range(len(sc) - 2, -1, -1): + if ((i + 1) % 128) and sc[i] == 'Zzzz': + sc[i] = sc[i + 1] + + + code = packTab.Code('_hb_ucd') + + for name,data,default,mapping in datasets: + sol = packTab.pack_table(data, default, mapping=mapping, compression=compression) + logging.info(' Dataset=%-8s FullCost=%d' % (name, sol.fullCost)) + sol.genCode(code, name) + + code.print_c(linkage='static inline') + + print() + +print('#endif') +print() + +print() +print("#endif /* HB_UCD_TABLE_HH */") +print() +print("/* == End of generated table == */") +logging.info('Done.') diff --git a/source/libs/harfbuzz/harfbuzz-src/src/gen-use-table.py b/source/libs/harfbuzz/harfbuzz-src/src/gen-use-table.py new file mode 100755 index 000000000..a8a03a77b --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/gen-use-table.py @@ -0,0 +1,546 @@ +#!/usr/bin/env python +# flake8: noqa + +from __future__ import print_function, division, absolute_import + +import io +import sys + +if len (sys.argv) != 5: + print ("usage: ./gen-use-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt UnicodeData.txt Blocks.txt", file=sys.stderr) + sys.exit (1) + +BLACKLISTED_BLOCKS = ["Thai", "Lao"] + +files = [io.open (x, encoding='utf-8') for x in sys.argv[1:]] + +headers = [[f.readline () for i in range (2)] for j,f in enumerate(files) if j != 2] +headers.append (["UnicodeData.txt does not have a header."]) + +data = [{} for f in files] +values = [{} for f in files] +for i, f in enumerate (files): + for line in f: + + j = line.find ('#') + if j >= 0: + line = line[:j] + + fields = [x.strip () for x in line.split (';')] + if len (fields) == 1: + continue + + uu = fields[0].split ('..') + start = int (uu[0], 16) + if len (uu) == 1: + end = start + else: + end = int (uu[1], 16) + + t = fields[1 if i != 2 else 2] + + for u in range (start, end + 1): + data[i][u] = t + values[i][t] = values[i].get (t, 0) + end - start + 1 + +defaults = ('Other', 'Not_Applicable', 'Cn', 'No_Block') + +# TODO Characters that are not in Unicode Indic files, but used in USE +data[0][0x034F] = defaults[0] +data[0][0x1B61] = defaults[0] +data[0][0x1B63] = defaults[0] +data[0][0x1B64] = defaults[0] +data[0][0x1B65] = defaults[0] +data[0][0x1B66] = defaults[0] +data[0][0x1B67] = defaults[0] +data[0][0x1B69] = defaults[0] +data[0][0x1B6A] = defaults[0] +data[0][0x2060] = defaults[0] +# TODO https://github.com/harfbuzz/harfbuzz/pull/1685 +data[0][0x1B5B] = 'Consonant_Placeholder' +data[0][0x1B5C] = 'Consonant_Placeholder' +data[0][0x1B5F] = 'Consonant_Placeholder' +data[0][0x1B62] = 'Consonant_Placeholder' +data[0][0x1B68] = 'Consonant_Placeholder' +# TODO https://github.com/harfbuzz/harfbuzz/issues/1035 +data[0][0x11C44] = 'Consonant_Placeholder' +data[0][0x11C45] = 'Consonant_Placeholder' +# TODO https://github.com/harfbuzz/harfbuzz/pull/1399 +data[0][0x111C8] = 'Consonant_Placeholder' +for u in range (0xFE00, 0xFE0F + 1): + data[0][u] = defaults[0] + +# Merge data into one dict: +for i,v in enumerate (defaults): + values[i][v] = values[i].get (v, 0) + 1 +combined = {} +for i,d in enumerate (data): + for u,v in d.items (): + if i >= 2 and not u in combined: + continue + if not u in combined: + combined[u] = list (defaults) + combined[u][i] = v +combined = {k:v for k,v in combined.items() if v[3] not in BLACKLISTED_BLOCKS} +data = combined +del combined +num = len (data) + + +property_names = [ + # General_Category + 'Cc', 'Cf', 'Cn', 'Co', 'Cs', 'Ll', 'Lm', 'Lo', 'Lt', 'Lu', 'Mc', + 'Me', 'Mn', 'Nd', 'Nl', 'No', 'Pc', 'Pd', 'Pe', 'Pf', 'Pi', 'Po', + 'Ps', 'Sc', 'Sk', 'Sm', 'So', 'Zl', 'Zp', 'Zs', + # Indic_Syllabic_Category + 'Other', + 'Bindu', + 'Visarga', + 'Avagraha', + 'Nukta', + 'Virama', + 'Pure_Killer', + 'Invisible_Stacker', + 'Vowel_Independent', + 'Vowel_Dependent', + 'Vowel', + 'Consonant_Placeholder', + 'Consonant', + 'Consonant_Dead', + 'Consonant_With_Stacker', + 'Consonant_Prefixed', + 'Consonant_Preceding_Repha', + 'Consonant_Succeeding_Repha', + 'Consonant_Subjoined', + 'Consonant_Medial', + 'Consonant_Final', + 'Consonant_Head_Letter', + 'Consonant_Initial_Postfixed', + 'Modifying_Letter', + 'Tone_Letter', + 'Tone_Mark', + 'Gemination_Mark', + 'Cantillation_Mark', + 'Register_Shifter', + 'Syllable_Modifier', + 'Consonant_Killer', + 'Non_Joiner', + 'Joiner', + 'Number_Joiner', + 'Number', + 'Brahmi_Joining_Number', + # Indic_Positional_Category + 'Not_Applicable', + 'Right', + 'Left', + 'Visual_Order_Left', + 'Left_And_Right', + 'Top', + 'Bottom', + 'Top_And_Bottom', + 'Top_And_Right', + 'Top_And_Left', + 'Top_And_Left_And_Right', + 'Bottom_And_Left', + 'Bottom_And_Right', + 'Top_And_Bottom_And_Right', + 'Overstruck', +] + +try: + basestring +except NameError: + basestring = str + +class PropertyValue(object): + def __init__(self, name_): + self.name = name_ + def __str__(self): + return self.name + def __eq__(self, other): + return self.name == (other if isinstance(other, basestring) else other.name) + def __ne__(self, other): + return not (self == other) + def __hash__(self): + return hash(str(self)) + +property_values = {} + +for name in property_names: + value = PropertyValue(name) + assert value not in property_values + assert value not in globals() + property_values[name] = value +globals().update(property_values) + + +def is_BASE(U, UISC, UGC): + return (UISC in [Number, Consonant, Consonant_Head_Letter, + #SPEC-DRAFT Consonant_Placeholder, + Tone_Letter, + Vowel_Independent #SPEC-DRAFT + ] or + (UGC == Lo and UISC in [Avagraha, Bindu, Consonant_Final, Consonant_Medial, + Consonant_Subjoined, Vowel, Vowel_Dependent])) +def is_BASE_IND(U, UISC, UGC): + #SPEC-DRAFT return (UISC in [Consonant_Dead, Modifying_Letter] or UGC == Po) + return (UISC in [Consonant_Dead, Modifying_Letter] or + (UGC == Po and not U in [0x104B, 0x104E, 0x1B5B, 0x1B5C, 0x1B5F, 0x2022, 0x111C8, 0x11A3F, 0x11A45, 0x11C44, 0x11C45]) or + False # SPEC-DRAFT-OUTDATED! U == 0x002D + ) +def is_BASE_NUM(U, UISC, UGC): + return UISC == Brahmi_Joining_Number +def is_BASE_OTHER(U, UISC, UGC): + if UISC == Consonant_Placeholder: return True #SPEC-DRAFT + #SPEC-DRAFT return U in [0x00A0, 0x00D7, 0x2015, 0x2022, 0x25CC, 0x25FB, 0x25FC, 0x25FD, 0x25FE] + return U in [0x2015, 0x2022, 0x25FB, 0x25FC, 0x25FD, 0x25FE] +def is_CGJ(U, UISC, UGC): + return U == 0x034F +def is_CONS_FINAL(U, UISC, UGC): + return ((UISC == Consonant_Final and UGC != Lo) or + UISC == Consonant_Succeeding_Repha) +def is_CONS_FINAL_MOD(U, UISC, UGC): + #SPEC-DRAFT return UISC in [Consonant_Final_Modifier, Syllable_Modifier] + return UISC == Syllable_Modifier +def is_CONS_MED(U, UISC, UGC): + # Consonant_Initial_Postfixed is new in Unicode 11; not in the spec. + return (UISC == Consonant_Medial and UGC != Lo or + UISC == Consonant_Initial_Postfixed) +def is_CONS_MOD(U, UISC, UGC): + return UISC in [Nukta, Gemination_Mark, Consonant_Killer] +def is_CONS_SUB(U, UISC, UGC): + #SPEC-DRAFT return UISC == Consonant_Subjoined + return UISC == Consonant_Subjoined and UGC != Lo +def is_CONS_WITH_STACKER(U, UISC, UGC): + return UISC == Consonant_With_Stacker +def is_HALANT(U, UISC, UGC): + return (UISC in [Virama, Invisible_Stacker] + and not is_HALANT_OR_VOWEL_MODIFIER(U, UISC, UGC) + and not is_SAKOT(U, UISC, UGC)) +def is_HALANT_OR_VOWEL_MODIFIER(U, UISC, UGC): + # https://github.com/harfbuzz/harfbuzz/issues/1102 + # https://github.com/harfbuzz/harfbuzz/issues/1379 + return U in [0x11046, 0x1134D] +def is_HALANT_NUM(U, UISC, UGC): + return UISC == Number_Joiner +def is_ZWNJ(U, UISC, UGC): + return UISC == Non_Joiner +def is_ZWJ(U, UISC, UGC): + return UISC == Joiner +def is_Word_Joiner(U, UISC, UGC): + return U == 0x2060 +def is_OTHER(U, UISC, UGC): + #SPEC-OUTDATED return UGC == Zs # or any other SCRIPT_COMMON characters + return (UISC == Other + and not is_SYM(U, UISC, UGC) + and not is_SYM_MOD(U, UISC, UGC) + and not is_CGJ(U, UISC, UGC) + and not is_Word_Joiner(U, UISC, UGC) + and not is_VARIATION_SELECTOR(U, UISC, UGC) + ) +def is_Reserved(U, UISC, UGC): + return UGC == 'Cn' +def is_REPHA(U, UISC, UGC): + return UISC in [Consonant_Preceding_Repha, Consonant_Prefixed] +def is_SAKOT(U, UISC, UGC): + return U == 0x1A60 +def is_SYM(U, UISC, UGC): + if U == 0x25CC: return False #SPEC-DRAFT + #SPEC-DRAFT return UGC in [So, Sc] or UISC == Symbol_Letter + return UGC in [So, Sc] and U not in [0x1B62, 0x1B68] +def is_SYM_MOD(U, UISC, UGC): + return U in [0x1B6B, 0x1B6C, 0x1B6D, 0x1B6E, 0x1B6F, 0x1B70, 0x1B71, 0x1B72, 0x1B73] +def is_VARIATION_SELECTOR(U, UISC, UGC): + return 0xFE00 <= U <= 0xFE0F +def is_VOWEL(U, UISC, UGC): + # https://github.com/harfbuzz/harfbuzz/issues/376 + return (UISC == Pure_Killer or + (UGC != Lo and UISC in [Vowel, Vowel_Dependent] and U not in [0xAA29])) +def is_VOWEL_MOD(U, UISC, UGC): + # https://github.com/harfbuzz/harfbuzz/issues/376 + return (UISC in [Tone_Mark, Cantillation_Mark, Register_Shifter, Visarga] or + (UGC != Lo and (UISC == Bindu or U in [0xAA29]))) + +use_mapping = { + 'B': is_BASE, + 'IND': is_BASE_IND, + 'N': is_BASE_NUM, + 'GB': is_BASE_OTHER, + 'CGJ': is_CGJ, + 'F': is_CONS_FINAL, + 'FM': is_CONS_FINAL_MOD, + 'M': is_CONS_MED, + 'CM': is_CONS_MOD, + 'SUB': is_CONS_SUB, + 'CS': is_CONS_WITH_STACKER, + 'H': is_HALANT, + 'HVM': is_HALANT_OR_VOWEL_MODIFIER, + 'HN': is_HALANT_NUM, + 'ZWNJ': is_ZWNJ, + 'ZWJ': is_ZWJ, + 'WJ': is_Word_Joiner, + 'O': is_OTHER, + 'Rsv': is_Reserved, + 'R': is_REPHA, + 'S': is_SYM, + 'Sk': is_SAKOT, + 'SM': is_SYM_MOD, + 'VS': is_VARIATION_SELECTOR, + 'V': is_VOWEL, + 'VM': is_VOWEL_MOD, +} + +use_positions = { + 'F': { + 'Abv': [Top], + 'Blw': [Bottom], + 'Pst': [Right], + }, + 'M': { + 'Abv': [Top], + 'Blw': [Bottom, Bottom_And_Left], + 'Pst': [Right], + 'Pre': [Left], + }, + 'CM': { + 'Abv': [Top], + 'Blw': [Bottom], + }, + 'V': { + 'Abv': [Top, Top_And_Bottom, Top_And_Bottom_And_Right, Top_And_Right], + 'Blw': [Bottom, Overstruck, Bottom_And_Right], + 'Pst': [Right, Top_And_Left, Top_And_Left_And_Right, Left_And_Right], + 'Pre': [Left], + }, + 'VM': { + 'Abv': [Top], + 'Blw': [Bottom, Overstruck], + 'Pst': [Right], + 'Pre': [Left], + }, + 'SM': { + 'Abv': [Top], + 'Blw': [Bottom], + }, + 'H': None, + 'HVM': None, + 'B': None, + 'FM': { + 'Abv': [Top], + 'Blw': [Bottom], + 'Pst': [Not_Applicable], + }, + 'SUB': None, +} + +def map_to_use(data): + out = {} + items = use_mapping.items() + for U,(UISC,UIPC,UGC,UBlock) in data.items(): + + # Resolve Indic_Syllabic_Category + + # TODO: These don't have UISC assigned in Unicode 12.0, but have UIPC + if 0x1CE2 <= U <= 0x1CE8: UISC = Cantillation_Mark + + # Tibetan: + # TODO: These don't have UISC assigned in Unicode 12.0, but have UIPC + if 0x0F18 <= U <= 0x0F19 or 0x0F3E <= U <= 0x0F3F: UISC = Vowel_Dependent + if 0x0F86 <= U <= 0x0F87: UISC = Tone_Mark + # Overrides to allow NFC order matching syllable + # https://github.com/harfbuzz/harfbuzz/issues/1012 + if UBlock == 'Tibetan' and is_VOWEL (U, UISC, UGC): + if UIPC == Top: + UIPC = Bottom + + # TODO: https://github.com/harfbuzz/harfbuzz/pull/982 + # also https://github.com/harfbuzz/harfbuzz/issues/1012 + if UBlock == 'Chakma' and is_VOWEL (U, UISC, UGC): + if UIPC == Top: + UIPC = Bottom + elif UIPC == Bottom: + UIPC = Top + + # TODO: https://github.com/harfbuzz/harfbuzz/pull/627 + if 0x1BF2 <= U <= 0x1BF3: UISC = Nukta; UIPC = Bottom + + # TODO: U+1CED should only be allowed after some of + # the nasalization marks, maybe only for U+1CE9..U+1CF1. + if U == 0x1CED: UISC = Tone_Mark + + # TODO: https://github.com/harfbuzz/harfbuzz/issues/1105 + if U == 0x11134: UISC = Gemination_Mark + + values = [k for k,v in items if v(U,UISC,UGC)] + assert len(values) == 1, "%s %s %s %s" % (hex(U), UISC, UGC, values) + USE = values[0] + + # Resolve Indic_Positional_Category + + # TODO: These should die, but have UIPC in Unicode 12.0 + if U in [0x953, 0x954]: UIPC = Not_Applicable + + # TODO: In USE's override list but not in Unicode 12.0 + if U == 0x103C: UIPC = Left + + # TODO: These are not in USE's override list that we have, nor are they in Unicode 12.0 + if 0xA926 <= U <= 0xA92A: UIPC = Top + # TODO: https://github.com/harfbuzz/harfbuzz/pull/1037 + # and https://github.com/harfbuzz/harfbuzz/issues/1631 + if U in [0x11302, 0x11303, 0x114C1]: UIPC = Top + if U == 0x1171E: UIPC = Left + if 0x1CF8 <= U <= 0x1CF9: UIPC = Top + + assert (UIPC in [Not_Applicable, Visual_Order_Left] or + USE in use_positions), "%s %s %s %s %s" % (hex(U), UIPC, USE, UISC, UGC) + + pos_mapping = use_positions.get(USE, None) + if pos_mapping: + values = [k for k,v in pos_mapping.items() if v and UIPC in v] + assert len(values) == 1, "%s %s %s %s %s %s" % (hex(U), UIPC, USE, UISC, UGC, values) + USE = USE + values[0] + + out[U] = (USE, UBlock) + return out + +defaults = ('O', 'No_Block') +data = map_to_use(data) + +print ("/* == Start of generated table == */") +print ("/*") +print (" * The following table is generated by running:") +print (" *") +print (" * ./gen-use-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt UnicodeData.txt Blocks.txt") +print (" *") +print (" * on files with these headers:") +print (" *") +for h in headers: + for l in h: + print (" * %s" % (l.strip())) +print (" */") +print () +print ('#include "hb.hh"') +print () +print ('#ifndef HB_NO_OT_SHAPE') +print () +print ('#include "hb-ot-shape-complex-use.hh"') +print () + +total = 0 +used = 0 +last_block = None +def print_block (block, start, end, data): + global total, used, last_block + if block and block != last_block: + print () + print () + print (" /* %s */" % block) + if start % 16: + print (' ' * (20 + (start % 16 * 6)), end='') + num = 0 + assert start % 8 == 0 + assert (end+1) % 8 == 0 + for u in range (start, end+1): + if u % 16 == 0: + print () + print (" /* %04X */" % u, end='') + if u in data: + num += 1 + d = data.get (u, defaults) + print ("%6s," % d[0], end='') + + total += end - start + 1 + used += num + if block: + last_block = block + +uu = sorted (data.keys ()) + +last = -100000 +num = 0 +offset = 0 +starts = [] +ends = [] +print ('#pragma GCC diagnostic push') +print ('#pragma GCC diagnostic ignored "-Wunused-macros"') +for k,v in sorted(use_mapping.items()): + if k in use_positions and use_positions[k]: continue + print ("#define %s USE_%s /* %s */" % (k, k, v.__name__[3:])) +for k,v in sorted(use_positions.items()): + if not v: continue + for suf in v.keys(): + tag = k + suf + print ("#define %s USE_%s" % (tag, tag)) +print ('#pragma GCC diagnostic pop') +print ("") +print ("static const USE_TABLE_ELEMENT_TYPE use_table[] = {") +for u in uu: + if u <= last: + continue + block = data[u][1] + + start = u//8*8 + end = start+1 + while end in uu and block == data[end][1]: + end += 1 + end = (end-1)//8*8 + 7 + + if start != last + 1: + if start - last <= 1+16*3: + print_block (None, last+1, start-1, data) + last = start-1 + else: + if last >= 0: + ends.append (last + 1) + offset += ends[-1] - starts[-1] + print () + print () + print ("#define use_offset_0x%04xu %d" % (start, offset)) + starts.append (start) + + print_block (block, start, end, data) + last = end +ends.append (last + 1) +offset += ends[-1] - starts[-1] +print () +print () +occupancy = used * 100. / total +page_bits = 12 +print ("}; /* Table items: %d; occupancy: %d%% */" % (offset, occupancy)) +print () +print ("USE_TABLE_ELEMENT_TYPE") +print ("hb_use_get_category (hb_codepoint_t u)") +print ("{") +print (" switch (u >> %d)" % page_bits) +print (" {") +pages = set([u>>page_bits for u in starts+ends]) +for p in sorted(pages): + print (" case 0x%0Xu:" % p) + for (start,end) in zip (starts, ends): + if p not in [start>>page_bits, end>>page_bits]: continue + offset = "use_offset_0x%04xu" % start + print (" if (hb_in_range (u, 0x%04Xu, 0x%04Xu)) return use_table[u - 0x%04Xu + %s];" % (start, end-1, start, offset)) + print (" break;") + print ("") +print (" default:") +print (" break;") +print (" }") +print (" return USE_O;") +print ("}") +print () +for k in sorted(use_mapping.keys()): + if k in use_positions and use_positions[k]: continue + print ("#undef %s" % k) +for k,v in sorted(use_positions.items()): + if not v: continue + for suf in v.keys(): + tag = k + suf + print ("#undef %s" % tag) +print () +print () +print ('#endif') +print ("/* == End of generated table == */") + +# Maintain at least 50% occupancy in the table */ +if occupancy < 50: + raise Exception ("Table too sparse, please investigate: ", occupancy) diff --git a/source/libs/harfbuzz/harfbuzz-src/src/gen-vowel-constraints.py b/source/libs/harfbuzz/harfbuzz-src/src/gen-vowel-constraints.py new file mode 100644 index 000000000..8ca90c819 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/gen-vowel-constraints.py @@ -0,0 +1,233 @@ +#!/usr/bin/python + +"""Generator of the function to prohibit certain vowel sequences. + +It creates ``_hb_preprocess_text_vowel_constraints``, which inserts dotted +circles into sequences prohibited by the USE script development spec. +This function should be used as the ``preprocess_text`` of an +``hb_ot_complex_shaper_t``. +""" + +from __future__ import absolute_import, division, print_function, unicode_literals + +import collections +try: + from HTMLParser import HTMLParser + def write (s): + print (s.encode ('utf-8'), end='') +except ImportError: + from html.parser import HTMLParser + def write (s): + sys.stdout.flush () + sys.stdout.buffer.write (s.encode ('utf-8')) +import itertools +import io +import sys + +if len (sys.argv) != 3: + print ('usage: ./gen-vowel-constraints.py HBIndicVowelConstraints.txt Scripts.txt', file=sys.stderr) + sys.exit (1) + +with io.open (sys.argv[2], encoding='utf-8') as f: + scripts_header = [f.readline () for i in range (2)] + scripts = {} + script_order = {} + for line in f: + j = line.find ('#') + if j >= 0: + line = line[:j] + fields = [x.strip () for x in line.split (';')] + if len (fields) == 1: + continue + uu = fields[0].split ('..') + start = int (uu[0], 16) + if len (uu) == 1: + end = start + else: + end = int (uu[1], 16) + script = fields[1] + for u in range (start, end + 1): + scripts[u] = script + if script not in script_order: + script_order[script] = start + +class ConstraintSet (object): + """A set of prohibited code point sequences. + + Args: + constraint (List[int]): A prohibited code point sequence. + + """ + def __init__ (self, constraint): + # Either a list or a dictionary. As a list of code points, it + # represents a prohibited code point sequence. As a dictionary, + # it represents a set of prohibited sequences, where each item + # represents the set of prohibited sequences starting with the + # key (a code point) concatenated with any of the values + # (ConstraintSets). + self._c = constraint + + def add (self, constraint): + """Add a constraint to this set.""" + if not constraint: + return + first = constraint[0] + rest = constraint[1:] + if isinstance (self._c, list): + if constraint == self._c[:len (constraint)]: + self._c = constraint + elif self._c != constraint[:len (self._c)]: + self._c = {self._c[0]: ConstraintSet (self._c[1:])} + if isinstance (self._c, dict): + if first in self._c: + self._c[first].add (rest) + else: + self._c[first] = ConstraintSet (rest) + + def _indent (self, depth): + return (' ' * depth).replace (' ', '\t') + + def __str__ (self, index=0, depth=4): + s = [] + indent = self._indent (depth) + if isinstance (self._c, list): + if len (self._c) == 0: + s.append ('{}matched = true;\n'.format (indent)) + elif len (self._c) == 1: + s.append ('{}matched = 0x{:04X}u == buffer->cur ({}).codepoint;\n'.format (indent, next (iter (self._c)), index or '')) + else: + s.append ('{}if (0x{:04X}u == buffer->cur ({}).codepoint &&\n'.format (indent, self._c[0], index)) + s.append ('{}buffer->idx + {} < count &&\n'.format (self._indent (depth + 2), len (self._c))) + for i, cp in enumerate (self._c[1:], start=1): + s.append ('{}0x{:04X}u == buffer->cur ({}).codepoint{}\n'.format ( + self._indent (depth + 2), cp, index + i, ')' if i == len (self._c) - 1 else ' &&')) + s.append ('{}{{\n'.format (indent)) + for i in range (len (self._c)): + s.append ('{}buffer->next_glyph ();\n'.format (self._indent (depth + 1))) + s.append ('{}_output_dotted_circle (buffer);\n'.format (self._indent (depth + 1))) + s.append ('{}}}\n'.format (indent)) + else: + s.append ('{}switch (buffer->cur ({}).codepoint)\n'.format(indent, index or '')) + s.append ('{}{{\n'.format (indent)) + cases = collections.defaultdict (set) + for first, rest in sorted (self._c.items ()): + cases[rest.__str__ (index + 1, depth + 2)].add (first) + for body, labels in sorted (cases.items (), key=lambda b_ls: sorted (b_ls[1])[0]): + for i, cp in enumerate (sorted (labels)): + if i % 4 == 0: + s.append (self._indent (depth + 1)) + else: + s.append (' ') + s.append ('case 0x{:04X}u:{}'.format (cp, '\n' if i % 4 == 3 else '')) + if len (labels) % 4 != 0: + s.append ('\n') + s.append (body) + s.append ('{}break;\n'.format (self._indent (depth + 2))) + s.append ('{}}}\n'.format (indent)) + return ''.join (s) + +constraints = {} +with io.open (sys.argv[1], encoding='utf-8') as f: + constraints_header = [f.readline ().strip () for i in range (2)] + for line in f: + j = line.find ('#') + if j >= 0: + line = line[:j] + constraint = [int (cp, 16) for cp in line.split (';')[0].split ()] + if not constraint: continue + assert 2 <= len (constraint), 'Prohibited sequence is too short: {}'.format (constraint) + script = scripts[constraint[0]] + if script in constraints: + constraints[script].add (constraint) + else: + constraints[script] = ConstraintSet (constraint) + assert constraints, 'No constraints found' + +print ('/* == Start of generated functions == */') +print ('/*') +print (' * The following functions are generated by running:') +print (' *') +print (' * %s use Scripts.txt' % sys.argv[0]) +print (' *') +print (' * on files with these headers:') +print (' *') +for line in constraints_header: + print (' * %s' % line.strip ()) +print (' *') +for line in scripts_header: + print (' * %s' % line.strip ()) +print (' */') + +print () +print ('#include "hb.hh"') +print () +print ('#ifndef HB_NO_OT_SHAPE') +print () +print ('#include "hb-ot-shape-complex-vowel-constraints.hh"') +print () +print ('static void') +print ('_output_dotted_circle (hb_buffer_t *buffer)') +print ('{') +print (' hb_glyph_info_t &dottedcircle = buffer->output_glyph (0x25CCu);') +print (' _hb_glyph_info_reset_continuation (&dottedcircle);') +print ('}') +print () +print ('static void') +print ('_output_with_dotted_circle (hb_buffer_t *buffer)') +print ('{') +print (' _output_dotted_circle (buffer);') +print (' buffer->next_glyph ();') +print ('}') +print () + +print ('void') +print ('_hb_preprocess_text_vowel_constraints (const hb_ot_shape_plan_t *plan HB_UNUSED,') +print ('\t\t\t\t hb_buffer_t *buffer,') +print ('\t\t\t\t hb_font_t *font HB_UNUSED)') +print ('{') +print ('#if defined(HB_NO_OT_SHAPE_COMPLEX_VOWEL_CONSTRAINTS)') +print (' return;') +print ('#endif') +print (' if (buffer->flags & HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE)') +print (' return;') +print () +print (' /* UGLY UGLY UGLY business of adding dotted-circle in the middle of') +print (' * vowel-sequences that look like another vowel. Data for each script') +print (' * collected from the USE script development spec.') +print (' *') +print (' * https://github.com/harfbuzz/harfbuzz/issues/1019') +print (' */') +print (' bool processed = false;') +print (' buffer->clear_output ();') +print (' unsigned int count = buffer->len;') +print (' switch ((unsigned) buffer->props.script)') +print (' {') + +for script, constraints in sorted (constraints.items (), key=lambda s_c: script_order[s_c[0]]): + print (' case HB_SCRIPT_{}:'.format (script.upper ())) + print (' for (buffer->idx = 0; buffer->idx + 1 < count && buffer->successful;)') + print (' {') + print ('\tbool matched = false;') + write (str (constraints)) + print ('\tbuffer->next_glyph ();') + print ('\tif (matched) _output_with_dotted_circle (buffer);') + print (' }') + print (' processed = true;') + print (' break;') + print () + +print (' default:') +print (' break;') +print (' }') +print (' if (processed)') +print (' {') +print (' if (buffer->idx < count)') +print (' buffer->next_glyph ();') +print (' buffer->swap_buffers ();') +print (' }') +print ('}') + +print () +print () +print ('#endif') +print ('/* == End of generated functions == */') diff --git a/source/libs/harfbuzz/harfbuzz-src/src/harfbuzz-config.cmake.in b/source/libs/harfbuzz/harfbuzz-src/src/harfbuzz-config.cmake.in new file mode 100644 index 000000000..304410d9b --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/harfbuzz-config.cmake.in @@ -0,0 +1,86 @@ +# Set these variables so that the `${prefix}/lib` expands to something we can +# remove. +set(_harfbuzz_remove_string "REMOVE_ME") +set(exec_prefix "${_harfbuzz_remove_string}") +set(prefix "${_harfbuzz_remove_string}") + +# Compute the installation prefix by stripping components from our current +# location. +get_filename_component(_harfbuzz_prefix "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) +get_filename_component(_harfbuzz_prefix "${_harfbuzz_prefix}" DIRECTORY) +set(_harfbuzz_libdir "@libdir@") +string(REPLACE "${_harfbuzz_remove_string}/" "" _harfbuzz_libdir "${_harfbuzz_libdir}") +set(_harfbuzz_libdir_iter "${_harfbuzz_libdir}") +while (_harfbuzz_libdir_iter) + set(_harfbuzz_libdir_prev_iter "${_harfbuzz_libdir_iter}") + get_filename_component(_harfbuzz_libdir_iter "${_harfbuzz_libdir_iter}" DIRECTORY) + if (_harfbuzz_libdir_prev_iter STREQUAL _harfbuzz_libdir_iter) + break() + endif () + get_filename_component(_harfbuzz_prefix "${_harfbuzz_prefix}" DIRECTORY) +endwhile () +unset(_harfbuzz_libdir_iter) + +# Get the include subdir. +set(_harfbuzz_includedir "@includedir@") +string(REPLACE "${_harfbuzz_remove_string}/" "" _harfbuzz_includedir "${_harfbuzz_includedir}") + +# Extract version information from libtool. +set(_harfbuzz_version_info "@HB_LIBTOOL_VERSION_INFO@") +string(REPLACE ":" ";" _harfbuzz_version_info "${_harfbuzz_version_info}") +list(GET _harfbuzz_version_info 0 + _harfbuzz_current) +list(GET _harfbuzz_version_info 1 + _harfbuzz_revision) +list(GET _harfbuzz_version_info 2 + _harfbuzz_age) +unset(_harfbuzz_version_info) + +if (APPLE) + set(_harfbuzz_lib_suffix ".0${CMAKE_SHARED_LIBRARY_SUFFIX}") +elseif (UNIX) + set(_harfbuzz_lib_suffix "${CMAKE_SHARED_LIBRARY_SUFFIX}.0.${_harfbuzz_current}.${_harfbuzz_revision}") +else () + # Unsupported. + set(harfbuzz_FOUND 0) +endif () + +# Add the libraries. +add_library(harfbuzz::harfbuzz SHARED IMPORTED) +set_target_properties(harfbuzz::harfbuzz PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_harfbuzz_prefix}/${_harfbuzz_includedir}/harfbuzz" + IMPORTED_LOCATION "${_harfbuzz_prefix}/${_harfbuzz_libdir}/libharfbuzz${_harfbuzz_lib_suffix}") + +add_library(harfbuzz::icu SHARED IMPORTED) +set_target_properties(harfbuzz::icu PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_harfbuzz_prefix}/${_harfbuzz_includedir}/harfbuzz" + INTERFACE_LINK_LIBRARIES "harfbuzz::harfbuzz" + IMPORTED_LOCATION "${_harfbuzz_prefix}/${_harfbuzz_libdir}/libharfbuzz-icu${_harfbuzz_lib_suffix}") + +add_library(harfbuzz::subset SHARED IMPORTED) +set_target_properties(harfbuzz::subset PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_harfbuzz_prefix}/${_harfbuzz_includedir}/harfbuzz" + INTERFACE_LINK_LIBRARIES "harfbuzz::harfbuzz" + IMPORTED_LOCATION "${_harfbuzz_prefix}/${_harfbuzz_libdir}/libharfbuzz-subset${_harfbuzz_lib_suffix}") + +# Only add the gobject library if it was built. +set(_harfbuzz_have_gobject "@have_gobject@") +if (_harfbuzz_have_gobject) + add_library(harfbuzz::gobject SHARED IMPORTED) + set_target_properties(harfbuzz::gobject PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_harfbuzz_prefix}/${_harfbuzz_includedir}/harfbuzz" + INTERFACE_LINK_LIBRARIES "harfbuzz::harfbuzz" + IMPORTED_LOCATION "${_harfbuzz_prefix}/${_harfbuzz_libdir}/libharfbuzz-gobject${_harfbuzz_lib_suffix}") +endif () + +# Clean out variables we used in our scope. +unset(_harfbuzz_lib_suffix) +unset(_harfbuzz_current) +unset(_harfbuzz_revision) +unset(_harfbuzz_age) +unset(_harfbuzz_includedir) +unset(_harfbuzz_libdir) +unset(_harfbuzz_prefix) +unset(exec_prefix) +unset(prefix) +unset(_harfbuzz_remove_string) diff --git a/source/libs/harfbuzz/harfbuzz-src/src/harfbuzz-gobject.pc.in b/source/libs/harfbuzz/harfbuzz-src/src/harfbuzz-gobject.pc.in new file mode 100644 index 000000000..700836019 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/harfbuzz-gobject.pc.in @@ -0,0 +1,12 @@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir% + +Name: harfbuzz +Description: HarfBuzz text shaping library GObject integration +Version: %VERSION% + +Requires: harfbuzz gobject-2.0 glib-2.0 +Libs: -L${libdir} -lharfbuzz-gobject +Cflags: -I${includedir}/harfbuzz diff --git a/source/libs/harfbuzz/harfbuzz-src/src/harfbuzz-icu.pc.in b/source/libs/harfbuzz/harfbuzz-src/src/harfbuzz-icu.pc.in new file mode 100644 index 000000000..949869a35 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/harfbuzz-icu.pc.in @@ -0,0 +1,13 @@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir% + +Name: harfbuzz +Description: HarfBuzz text shaping library ICU integration +Version: %VERSION% + +Requires: harfbuzz +Requires.private: icu-uc +Libs: -L${libdir} -lharfbuzz-icu +Cflags: -I${includedir}/harfbuzz diff --git a/source/libs/harfbuzz/harfbuzz-src/src/harfbuzz-subset.pc.in b/source/libs/harfbuzz/harfbuzz-src/src/harfbuzz-subset.pc.in new file mode 100644 index 000000000..5da64b3f1 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/harfbuzz-subset.pc.in @@ -0,0 +1,12 @@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir% + +Name: harfbuzz +Description: HarfBuzz font subsetter +Version: %VERSION% + +Requires: harfbuzz +Libs: -L${libdir} -lharfbuzz-subset +Cflags: -I${includedir}/harfbuzz diff --git a/source/libs/harfbuzz/harfbuzz-src/src/harfbuzz.cc b/source/libs/harfbuzz/harfbuzz-src/src/harfbuzz.cc new file mode 100644 index 000000000..fe1c36023 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/harfbuzz.cc @@ -0,0 +1,54 @@ +#include "hb-aat-layout.cc" +#include "hb-aat-map.cc" +#include "hb-blob.cc" +#include "hb-buffer-serialize.cc" +#include "hb-buffer.cc" +#include "hb-common.cc" +#include "hb-face.cc" +#include "hb-fallback-shape.cc" +#include "hb-font.cc" +#include "hb-map.cc" +#include "hb-number.cc" +#include "hb-ot-cff1-table.cc" +#include "hb-ot-cff2-table.cc" +#include "hb-ot-color.cc" +#include "hb-ot-face.cc" +#include "hb-ot-font.cc" +#include "hb-ot-layout.cc" +#include "hb-ot-map.cc" +#include "hb-ot-math.cc" +#include "hb-ot-meta.cc" +#include "hb-ot-metrics.cc" +#include "hb-ot-name.cc" +#include "hb-ot-shape-complex-arabic.cc" +#include "hb-ot-shape-complex-default.cc" +#include "hb-ot-shape-complex-hangul.cc" +#include "hb-ot-shape-complex-hebrew.cc" +#include "hb-ot-shape-complex-indic-table.cc" +#include "hb-ot-shape-complex-indic.cc" +#include "hb-ot-shape-complex-khmer.cc" +#include "hb-ot-shape-complex-myanmar.cc" +#include "hb-ot-shape-complex-thai.cc" +#include "hb-ot-shape-complex-use-table.cc" +#include "hb-ot-shape-complex-use.cc" +#include "hb-ot-shape-complex-vowel-constraints.cc" +#include "hb-ot-shape-fallback.cc" +#include "hb-ot-shape-normalize.cc" +#include "hb-ot-shape.cc" +#include "hb-ot-tag.cc" +#include "hb-ot-var.cc" +#include "hb-set.cc" +#include "hb-shape-plan.cc" +#include "hb-shape.cc" +#include "hb-shaper.cc" +#include "hb-static.cc" +#include "hb-ucd.cc" +#include "hb-unicode.cc" +#include "hb-warning.cc" +#include "hb-glib.cc" +#include "hb-ft.cc" +#include "hb-graphite2.cc" +#include "hb-uniscribe.cc" +#include "hb-gdi.cc" +#include "hb-directwrite.cc" +#include "hb-coretext.cc" diff --git a/source/libs/harfbuzz/harfbuzz-src/src/harfbuzz.pc.in b/source/libs/harfbuzz/harfbuzz-src/src/harfbuzz.pc.in new file mode 100644 index 000000000..661251c2d --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/harfbuzz.pc.in @@ -0,0 +1,13 @@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir% + +Name: harfbuzz +Description: HarfBuzz text shaping library +Version: %VERSION% + +Libs: -L${libdir} -lharfbuzz +Libs.private: -lm %libs_private% +Requires.private: %requires_private% +Cflags: -I${includedir}/harfbuzz diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-fdsc-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-fdsc-table.hh new file mode 100644 index 000000000..604d5bcf0 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-fdsc-table.hh @@ -0,0 +1,126 @@ +/* + * Copyright © 2018 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#ifndef HB_AAT_FDSC_TABLE_HH +#define HB_AAT_FDSC_TABLE_HH + +#include "hb-aat-layout-common.hh" +#include "hb-open-type.hh" + +/* + * fdsc -- Font descriptors + * https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6fdsc.html + */ +#define HB_AAT_TAG_fdsc HB_TAG('f','d','s','c') + + +namespace AAT { + + +struct FontDescriptor +{ + bool has_data () const { return tag; } + + int cmp (hb_tag_t a) const { return tag.cmp (a); } + + float get_value () const { return u.value.to_float (); } + + enum non_alphabetic_value_t { + Alphabetic = 0, + Dingbats = 1, + PiCharacters = 2, + Fleurons = 3, + DecorativeBorders = 4, + InternationalSymbols= 5, + MathSymbols = 6 + }; + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + protected: + Tag tag; /* The 4-byte table tag name. */ + union { + HBFixed value; /* The value for the descriptor tag. */ + HBUINT32 nalfType; /* If the tag is `nalf`, see non_alphabetic_value_t */ + } u; + public: + DEFINE_SIZE_STATIC (8); +}; + +struct fdsc +{ + static constexpr hb_tag_t tableTag = HB_AAT_TAG_fdsc; + + enum { + Weight = HB_TAG ('w','g','h','t'), + /* Percent weight relative to regular weight. + * (defaul value: 1.0) */ + Width = HB_TAG ('w','d','t','h'), + /* Percent width relative to regular width. + * (default value: 1.0) */ + Slant = HB_TAG ('s','l','n','t'), + /* Angle of slant in degrees, where positive + * is clockwise from straight up. + * (default value: 0.0) */ + OpticalSize = HB_TAG ('o','p','s','z'), + /* Point size the font was designed for. + * (default value: 12.0) */ + NonAlphabetic= HB_TAG ('n','a','l','f') + /* These values are treated as integers, + * not fixed32s. 0 means alphabetic, and greater + * integers mean the font is non-alphabetic (e.g. symbols). + * (default value: 0) */ + }; + + const FontDescriptor &get_descriptor (hb_tag_t style) const + { return descriptors.lsearch (style); } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + descriptors.sanitize (c)); + } + + protected: + HBFixed version; /* Version number of the font descriptors + * table (0x00010000 for the current version). */ + LArrayOf + descriptors; /* List of tagged-coordinate pairs style descriptors + * that will be included to characterize this font. + * Each descriptor consists of a pair. + * These pairs are located in the gxFontDescriptor + * array that follows. */ + public: + DEFINE_SIZE_ARRAY (8, descriptors); +}; + +} /* namespace AAT */ + + +#endif /* HB_AAT_FDSC_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-ankr-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-ankr-table.hh new file mode 100644 index 000000000..ef988841a --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-ankr-table.hh @@ -0,0 +1,98 @@ +/* + * Copyright © 2018 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#ifndef HB_AAT_LAYOUT_ANKR_TABLE_HH +#define HB_AAT_LAYOUT_ANKR_TABLE_HH + +#include "hb-aat-layout-common.hh" + +/* + * ankr -- Anchor Point + * https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6ankr.html + */ +#define HB_AAT_TAG_ankr HB_TAG('a','n','k','r') + + +namespace AAT { + +using namespace OT; + + +struct Anchor +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + public: + FWORD xCoordinate; + FWORD yCoordinate; + public: + DEFINE_SIZE_STATIC (4); +}; + +typedef LArrayOf GlyphAnchors; + +struct ankr +{ + static constexpr hb_tag_t tableTag = HB_AAT_TAG_ankr; + + const Anchor &get_anchor (hb_codepoint_t glyph_id, + unsigned int i, + unsigned int num_glyphs) const + { + const NNOffsetTo *offset = (this+lookupTable).get_value (glyph_id, num_glyphs); + if (!offset) + return Null(Anchor); + const GlyphAnchors &anchors = &(this+anchorData) + *offset; + return anchors[i]; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + version == 0 && + c->check_range (this, anchorData) && + lookupTable.sanitize (c, this, &(this+anchorData)))); + } + + protected: + HBUINT16 version; /* Version number (set to zero) */ + HBUINT16 flags; /* Flags (currently unused; set to zero) */ + LOffsetTo>> + lookupTable; /* Offset to the table's lookup table */ + LNNOffsetTo + anchorData; /* Offset to the glyph data table */ + + public: + DEFINE_SIZE_STATIC (12); +}; + +} /* namespace AAT */ + + +#endif /* HB_AAT_LAYOUT_ANKR_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-bsln-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-bsln-table.hh new file mode 100644 index 000000000..15ef2da65 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-bsln-table.hh @@ -0,0 +1,158 @@ +/* + * Copyright © 2018 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#ifndef HB_AAT_LAYOUT_BSLN_TABLE_HH +#define HB_AAT_LAYOUT_BSLN_TABLE_HH + +#include "hb-aat-layout-common.hh" + +/* + * bsln -- Baseline + * https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6bsln.html + */ +#define HB_AAT_TAG_bsln HB_TAG('b','s','l','n') + + +namespace AAT { + + +struct BaselineTableFormat0Part +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this))); + } + + protected: + // Roman, Ideographic centered, Ideographic low, Hanging and Math + // are the default defined ones, but any other maybe accessed also. + HBINT16 deltas[32]; /* These are the FUnit distance deltas from + * the font's natural baseline to the other + * baselines used in the font. */ + public: + DEFINE_SIZE_STATIC (64); +}; + +struct BaselineTableFormat1Part +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + lookupTable.sanitize (c))); + } + + protected: + HBINT16 deltas[32]; /* ditto */ + Lookup + lookupTable; /* Lookup table that maps glyphs to their + * baseline values. */ + public: + DEFINE_SIZE_MIN (66); +}; + +struct BaselineTableFormat2Part +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this))); + } + + protected: + HBGlyphID stdGlyph; /* The specific glyph index number in this + * font that is used to set the baseline values. + * This is the standard glyph. + * This glyph must contain a set of control points + * (whose numbers are contained in the ctlPoints field) + * that are used to determine baseline distances. */ + HBUINT16 ctlPoints[32]; /* Set of control point numbers, + * associated with the standard glyph. + * A value of 0xFFFF means there is no corresponding + * control point in the standard glyph. */ + public: + DEFINE_SIZE_STATIC (66); +}; + +struct BaselineTableFormat3Part +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && lookupTable.sanitize (c)); + } + + protected: + HBGlyphID stdGlyph; /* ditto */ + HBUINT16 ctlPoints[32]; /* ditto */ + Lookup + lookupTable; /* Lookup table that maps glyphs to their + * baseline values. */ + public: + DEFINE_SIZE_MIN (68); +}; + +struct bsln +{ + static constexpr hb_tag_t tableTag = HB_AAT_TAG_bsln; + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (unlikely (!(c->check_struct (this) && defaultBaseline < 32))) + return_trace (false); + + switch (format) + { + case 0: return_trace (parts.format0.sanitize (c)); + case 1: return_trace (parts.format1.sanitize (c)); + case 2: return_trace (parts.format2.sanitize (c)); + case 3: return_trace (parts.format3.sanitize (c)); + default:return_trace (true); + } + } + + protected: + FixedVersion<>version; /* Version number of the Baseline table. */ + HBUINT16 format; /* Format of the baseline table. Only one baseline + * format may be selected for the font. */ + HBUINT16 defaultBaseline;/* Default baseline value for all glyphs. + * This value can be from 0 through 31. */ + union { + // Distance-Based Formats + BaselineTableFormat0Part format0; + BaselineTableFormat1Part format1; + // Control Point-based Formats + BaselineTableFormat2Part format2; + BaselineTableFormat3Part format3; + } parts; + public: + DEFINE_SIZE_MIN (8); +}; + +} /* namespace AAT */ + + +#endif /* HB_AAT_LAYOUT_BSLN_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-common.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-common.hh new file mode 100644 index 000000000..473f2cdcd --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-common.hh @@ -0,0 +1,841 @@ +/* + * Copyright © 2017 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_AAT_LAYOUT_COMMON_HH +#define HB_AAT_LAYOUT_COMMON_HH + +#include "hb-aat-layout.hh" +#include "hb-open-type.hh" + + +namespace AAT { + +using namespace OT; + + +/* + * Lookup Table + */ + +template struct Lookup; + +template +struct LookupFormat0 +{ + friend struct Lookup; + + private: + const T* get_value (hb_codepoint_t glyph_id, unsigned int num_glyphs) const + { + if (unlikely (glyph_id >= num_glyphs)) return nullptr; + return &arrayZ[glyph_id]; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (arrayZ.sanitize (c, c->get_num_glyphs ())); + } + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (arrayZ.sanitize (c, c->get_num_glyphs (), base)); + } + + protected: + HBUINT16 format; /* Format identifier--format = 0 */ + UnsizedArrayOf + arrayZ; /* Array of lookup values, indexed by glyph index. */ + public: + DEFINE_SIZE_UNBOUNDED (2); +}; + + +template +struct LookupSegmentSingle +{ + static constexpr unsigned TerminationWordCount = 2u; + + int cmp (hb_codepoint_t g) const + { return g < first ? -1 : g <= last ? 0 : +1 ; } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && value.sanitize (c)); + } + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && value.sanitize (c, base)); + } + + HBGlyphID last; /* Last GlyphID in this segment */ + HBGlyphID first; /* First GlyphID in this segment */ + T value; /* The lookup value (only one) */ + public: + DEFINE_SIZE_STATIC (4 + T::static_size); +}; + +template +struct LookupFormat2 +{ + friend struct Lookup; + + private: + const T* get_value (hb_codepoint_t glyph_id) const + { + const LookupSegmentSingle *v = segments.bsearch (glyph_id); + return v ? &v->value : nullptr; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (segments.sanitize (c)); + } + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (segments.sanitize (c, base)); + } + + protected: + HBUINT16 format; /* Format identifier--format = 2 */ + VarSizedBinSearchArrayOf> + segments; /* The actual segments. These must already be sorted, + * according to the first word in each one (the last + * glyph in each segment). */ + public: + DEFINE_SIZE_ARRAY (8, segments); +}; + +template +struct LookupSegmentArray +{ + static constexpr unsigned TerminationWordCount = 2u; + + const T* get_value (hb_codepoint_t glyph_id, const void *base) const + { + return first <= glyph_id && glyph_id <= last ? &(base+valuesZ)[glyph_id - first] : nullptr; + } + + int cmp (hb_codepoint_t g) const + { return g < first ? -1 : g <= last ? 0 : +1; } + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + first <= last && + valuesZ.sanitize (c, base, last - first + 1)); + } + template + bool sanitize (hb_sanitize_context_t *c, const void *base, Ts&&... ds) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + first <= last && + valuesZ.sanitize (c, base, last - first + 1, hb_forward (ds)...)); + } + + HBGlyphID last; /* Last GlyphID in this segment */ + HBGlyphID first; /* First GlyphID in this segment */ + NNOffsetTo> + valuesZ; /* A 16-bit offset from the start of + * the table to the data. */ + public: + DEFINE_SIZE_STATIC (6); +}; + +template +struct LookupFormat4 +{ + friend struct Lookup; + + private: + const T* get_value (hb_codepoint_t glyph_id) const + { + const LookupSegmentArray *v = segments.bsearch (glyph_id); + return v ? v->get_value (glyph_id, this) : nullptr; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (segments.sanitize (c, this)); + } + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (segments.sanitize (c, this, base)); + } + + protected: + HBUINT16 format; /* Format identifier--format = 4 */ + VarSizedBinSearchArrayOf> + segments; /* The actual segments. These must already be sorted, + * according to the first word in each one (the last + * glyph in each segment). */ + public: + DEFINE_SIZE_ARRAY (8, segments); +}; + +template +struct LookupSingle +{ + static constexpr unsigned TerminationWordCount = 1u; + + int cmp (hb_codepoint_t g) const { return glyph.cmp (g); } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && value.sanitize (c)); + } + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && value.sanitize (c, base)); + } + + HBGlyphID glyph; /* Last GlyphID */ + T value; /* The lookup value (only one) */ + public: + DEFINE_SIZE_STATIC (2 + T::static_size); +}; + +template +struct LookupFormat6 +{ + friend struct Lookup; + + private: + const T* get_value (hb_codepoint_t glyph_id) const + { + const LookupSingle *v = entries.bsearch (glyph_id); + return v ? &v->value : nullptr; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (entries.sanitize (c)); + } + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (entries.sanitize (c, base)); + } + + protected: + HBUINT16 format; /* Format identifier--format = 6 */ + VarSizedBinSearchArrayOf> + entries; /* The actual entries, sorted by glyph index. */ + public: + DEFINE_SIZE_ARRAY (8, entries); +}; + +template +struct LookupFormat8 +{ + friend struct Lookup; + + private: + const T* get_value (hb_codepoint_t glyph_id) const + { + return firstGlyph <= glyph_id && glyph_id - firstGlyph < glyphCount ? + &valueArrayZ[glyph_id - firstGlyph] : nullptr; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && valueArrayZ.sanitize (c, glyphCount)); + } + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && valueArrayZ.sanitize (c, glyphCount, base)); + } + + protected: + HBUINT16 format; /* Format identifier--format = 8 */ + HBGlyphID firstGlyph; /* First glyph index included in the trimmed array. */ + HBUINT16 glyphCount; /* Total number of glyphs (equivalent to the last + * glyph minus the value of firstGlyph plus 1). */ + UnsizedArrayOf + valueArrayZ; /* The lookup values (indexed by the glyph index + * minus the value of firstGlyph). */ + public: + DEFINE_SIZE_ARRAY (6, valueArrayZ); +}; + +template +struct LookupFormat10 +{ + friend struct Lookup; + + private: + const typename T::type get_value_or_null (hb_codepoint_t glyph_id) const + { + if (!(firstGlyph <= glyph_id && glyph_id - firstGlyph < glyphCount)) + return Null(T); + + const HBUINT8 *p = &valueArrayZ[(glyph_id - firstGlyph) * valueSize]; + + unsigned int v = 0; + unsigned int count = valueSize; + for (unsigned int i = 0; i < count; i++) + v = (v << 8) | *p++; + + return v; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + valueSize <= 4 && + valueArrayZ.sanitize (c, glyphCount * valueSize)); + } + + protected: + HBUINT16 format; /* Format identifier--format = 8 */ + HBUINT16 valueSize; /* Byte size of each value. */ + HBGlyphID firstGlyph; /* First glyph index included in the trimmed array. */ + HBUINT16 glyphCount; /* Total number of glyphs (equivalent to the last + * glyph minus the value of firstGlyph plus 1). */ + UnsizedArrayOf + valueArrayZ; /* The lookup values (indexed by the glyph index + * minus the value of firstGlyph). */ + public: + DEFINE_SIZE_ARRAY (8, valueArrayZ); +}; + +template +struct Lookup +{ + const T* get_value (hb_codepoint_t glyph_id, unsigned int num_glyphs) const + { + switch (u.format) { + case 0: return u.format0.get_value (glyph_id, num_glyphs); + case 2: return u.format2.get_value (glyph_id); + case 4: return u.format4.get_value (glyph_id); + case 6: return u.format6.get_value (glyph_id); + case 8: return u.format8.get_value (glyph_id); + default:return nullptr; + } + } + + const typename T::type get_value_or_null (hb_codepoint_t glyph_id, unsigned int num_glyphs) const + { + switch (u.format) { + /* Format 10 cannot return a pointer. */ + case 10: return u.format10.get_value_or_null (glyph_id); + default: + const T *v = get_value (glyph_id, num_glyphs); + return v ? *v : Null(T); + } + } + + typename T::type get_class (hb_codepoint_t glyph_id, + unsigned int num_glyphs, + unsigned int outOfRange) const + { + const T *v = get_value (glyph_id, num_glyphs); + return v ? *v : outOfRange; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (!u.format.sanitize (c)) return_trace (false); + switch (u.format) { + case 0: return_trace (u.format0.sanitize (c)); + case 2: return_trace (u.format2.sanitize (c)); + case 4: return_trace (u.format4.sanitize (c)); + case 6: return_trace (u.format6.sanitize (c)); + case 8: return_trace (u.format8.sanitize (c)); + case 10: return_trace (u.format10.sanitize (c)); + default:return_trace (true); + } + } + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + if (!u.format.sanitize (c)) return_trace (false); + switch (u.format) { + case 0: return_trace (u.format0.sanitize (c, base)); + case 2: return_trace (u.format2.sanitize (c, base)); + case 4: return_trace (u.format4.sanitize (c, base)); + case 6: return_trace (u.format6.sanitize (c, base)); + case 8: return_trace (u.format8.sanitize (c, base)); + case 10: return_trace (false); /* We don't support format10 here currently. */ + default:return_trace (true); + } + } + + protected: + union { + HBUINT16 format; /* Format identifier */ + LookupFormat0 format0; + LookupFormat2 format2; + LookupFormat4 format4; + LookupFormat6 format6; + LookupFormat8 format8; + LookupFormat10 format10; + } u; + public: + DEFINE_SIZE_UNION (2, format); +}; +/* Lookup 0 has unbounded size (dependant on num_glyphs). So we need to defined + * special NULL objects for Lookup<> objects, but since it's template our macros + * don't work. So we have to hand-code them here. UGLY. */ +} /* Close namespace. */ +/* Ugly hand-coded null objects for template Lookup<> :(. */ +extern HB_INTERNAL const unsigned char _hb_Null_AAT_Lookup[2]; +template +struct Null> { + static AAT::Lookup const & get_null () + { return *reinterpret_cast *> (_hb_Null_AAT_Lookup); } +}; +namespace AAT { + +enum { DELETED_GLYPH = 0xFFFF }; + +/* + * (Extended) State Table + */ + +template +struct Entry +{ + bool sanitize (hb_sanitize_context_t *c, unsigned int count) const + { + TRACE_SANITIZE (this); + /* Note, we don't recurse-sanitize data because we don't access it. + * That said, in our DEFINE_SIZE_STATIC we access T::static_size, + * which ensures that data has a simple sanitize(). To be determined + * if I need to remove that as well. + * + * HOWEVER! Because we are a template, our DEFINE_SIZE_STATIC + * assertion wouldn't be checked, hence the line below. */ + static_assert (T::static_size, ""); + + return_trace (c->check_struct (this)); + } + + public: + HBUINT16 newState; /* Byte offset from beginning of state table + * to the new state. Really?!?! Or just state + * number? The latter in morx for sure. */ + HBUINT16 flags; /* Table specific. */ + T data; /* Optional offsets to per-glyph tables. */ + public: + DEFINE_SIZE_STATIC (4 + T::static_size); +}; + +template <> +struct Entry +{ + bool sanitize (hb_sanitize_context_t *c, unsigned int count /*XXX Unused?*/) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + public: + HBUINT16 newState; /* Byte offset from beginning of state table to the new state. */ + HBUINT16 flags; /* Table specific. */ + public: + DEFINE_SIZE_STATIC (4); +}; + +template +struct StateTable +{ + typedef typename Types::HBUINT HBUINT; + typedef typename Types::HBUSHORT HBUSHORT; + typedef typename Types::ClassTypeNarrow ClassType; + + enum State + { + STATE_START_OF_TEXT = 0, + STATE_START_OF_LINE = 1, + }; + enum Class + { + CLASS_END_OF_TEXT = 0, + CLASS_OUT_OF_BOUNDS = 1, + CLASS_DELETED_GLYPH = 2, + CLASS_END_OF_LINE = 3, + }; + + int new_state (unsigned int newState) const + { return Types::extended ? newState : ((int) newState - (int) stateArrayTable) / (int) nClasses; } + + unsigned int get_class (hb_codepoint_t glyph_id, unsigned int num_glyphs) const + { + if (unlikely (glyph_id == DELETED_GLYPH)) return CLASS_DELETED_GLYPH; + return (this+classTable).get_class (glyph_id, num_glyphs, 1); + } + + const Entry *get_entries () const + { return (this+entryTable).arrayZ; } + + const Entry &get_entry (int state, unsigned int klass) const + { + if (unlikely (klass >= nClasses)) + klass = StateTable>::CLASS_OUT_OF_BOUNDS; + + const HBUSHORT *states = (this+stateArrayTable).arrayZ; + const Entry *entries = (this+entryTable).arrayZ; + + unsigned int entry = states[state * nClasses + klass]; + DEBUG_MSG (APPLY, nullptr, "e%u", entry); + + return entries[entry]; + } + + bool sanitize (hb_sanitize_context_t *c, + unsigned int *num_entries_out = nullptr) const + { + TRACE_SANITIZE (this); + if (unlikely (!(c->check_struct (this) && + nClasses >= 4 /* Ensure pre-defined classes fit. */ && + classTable.sanitize (c, this)))) return_trace (false); + + const HBUSHORT *states = (this+stateArrayTable).arrayZ; + const Entry *entries = (this+entryTable).arrayZ; + + unsigned int num_classes = nClasses; + if (unlikely (hb_unsigned_mul_overflows (num_classes, states[0].static_size))) + return_trace (false); + unsigned int row_stride = num_classes * states[0].static_size; + + /* Apple 'kern' table has this peculiarity: + * + * "Because the stateTableOffset in the state table header is (strictly + * speaking) redundant, some 'kern' tables use it to record an initial + * state where that should not be StartOfText. To determine if this is + * done, calculate what the stateTableOffset should be. If it's different + * from the actual stateTableOffset, use it as the initial state." + * + * We implement this by calling the initial state zero, but allow *negative* + * states if the start state indeed was not the first state. Since the code + * is shared, this will also apply to 'mort' table. The 'kerx' / 'morx' + * tables are not affected since those address states by index, not offset. + */ + + int min_state = 0; + int max_state = 0; + unsigned int num_entries = 0; + + int state_pos = 0; + int state_neg = 0; + unsigned int entry = 0; + while (min_state < state_neg || state_pos <= max_state) + { + if (min_state < state_neg) + { + /* Negative states. */ + if (unlikely (hb_unsigned_mul_overflows (min_state, num_classes))) + return_trace (false); + if (unlikely (!c->check_range (&states[min_state * num_classes], + -min_state, + row_stride))) + return_trace (false); + if ((c->max_ops -= state_neg - min_state) <= 0) + return_trace (false); + { /* Sweep new states. */ + const HBUSHORT *stop = &states[min_state * num_classes]; + if (unlikely (stop > states)) + return_trace (false); + for (const HBUSHORT *p = states; stop < p; p--) + num_entries = hb_max (num_entries, *(p - 1) + 1); + state_neg = min_state; + } + } + + if (state_pos <= max_state) + { + /* Positive states. */ + if (unlikely (!c->check_range (states, + max_state + 1, + row_stride))) + return_trace (false); + if ((c->max_ops -= max_state - state_pos + 1) <= 0) + return_trace (false); + { /* Sweep new states. */ + if (unlikely (hb_unsigned_mul_overflows ((max_state + 1), num_classes))) + return_trace (false); + const HBUSHORT *stop = &states[(max_state + 1) * num_classes]; + if (unlikely (stop < states)) + return_trace (false); + for (const HBUSHORT *p = &states[state_pos * num_classes]; p < stop; p++) + num_entries = hb_max (num_entries, *p + 1); + state_pos = max_state + 1; + } + } + + if (unlikely (!c->check_array (entries, num_entries))) + return_trace (false); + if ((c->max_ops -= num_entries - entry) <= 0) + return_trace (false); + { /* Sweep new entries. */ + const Entry *stop = &entries[num_entries]; + for (const Entry *p = &entries[entry]; p < stop; p++) + { + int newState = new_state (p->newState); + min_state = hb_min (min_state, newState); + max_state = hb_max (max_state, newState); + } + entry = num_entries; + } + } + + if (num_entries_out) + *num_entries_out = num_entries; + + return_trace (true); + } + + protected: + HBUINT nClasses; /* Number of classes, which is the number of indices + * in a single line in the state array. */ + NNOffsetTo + classTable; /* Offset to the class table. */ + NNOffsetTo, HBUINT> + stateArrayTable;/* Offset to the state array. */ + NNOffsetTo>, HBUINT> + entryTable; /* Offset to the entry array. */ + + public: + DEFINE_SIZE_STATIC (4 * sizeof (HBUINT)); +}; + +template +struct ClassTable +{ + unsigned int get_class (hb_codepoint_t glyph_id, unsigned int outOfRange) const + { + unsigned int i = glyph_id - firstGlyph; + return i >= classArray.len ? outOfRange : classArray.arrayZ[i]; + } + unsigned int get_class (hb_codepoint_t glyph_id, + unsigned int num_glyphs HB_UNUSED, + unsigned int outOfRange) const + { + return get_class (glyph_id, outOfRange); + } + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && classArray.sanitize (c)); + } + protected: + HBGlyphID firstGlyph; /* First glyph index included in the trimmed array. */ + ArrayOf classArray; /* The class codes (indexed by glyph index minus + * firstGlyph). */ + public: + DEFINE_SIZE_ARRAY (4, classArray); +}; + +struct ObsoleteTypes +{ + static constexpr bool extended = false; + typedef HBUINT16 HBUINT; + typedef HBUINT8 HBUSHORT; + typedef ClassTable ClassTypeNarrow; + typedef ClassTable ClassTypeWide; + + template + static unsigned int offsetToIndex (unsigned int offset, + const void *base, + const T *array) + { + return (offset - ((const char *) array - (const char *) base)) / T::static_size; + } + template + static unsigned int byteOffsetToIndex (unsigned int offset, + const void *base, + const T *array) + { + return offsetToIndex (offset, base, array); + } + template + static unsigned int wordOffsetToIndex (unsigned int offset, + const void *base, + const T *array) + { + return offsetToIndex (2 * offset, base, array); + } +}; +struct ExtendedTypes +{ + static constexpr bool extended = true; + typedef HBUINT32 HBUINT; + typedef HBUINT16 HBUSHORT; + typedef Lookup ClassTypeNarrow; + typedef Lookup ClassTypeWide; + + template + static unsigned int offsetToIndex (unsigned int offset, + const void *base HB_UNUSED, + const T *array HB_UNUSED) + { + return offset; + } + template + static unsigned int byteOffsetToIndex (unsigned int offset, + const void *base HB_UNUSED, + const T *array HB_UNUSED) + { + return offset / 2; + } + template + static unsigned int wordOffsetToIndex (unsigned int offset, + const void *base HB_UNUSED, + const T *array HB_UNUSED) + { + return offset; + } +}; + +template +struct StateTableDriver +{ + StateTableDriver (const StateTable &machine_, + hb_buffer_t *buffer_, + hb_face_t *face_) : + machine (machine_), + buffer (buffer_), + num_glyphs (face_->get_num_glyphs ()) {} + + template + void drive (context_t *c) + { + if (!c->in_place) + buffer->clear_output (); + + int state = StateTable::STATE_START_OF_TEXT; + for (buffer->idx = 0; buffer->successful;) + { + unsigned int klass = buffer->idx < buffer->len ? + machine.get_class (buffer->info[buffer->idx].codepoint, num_glyphs) : + (unsigned) StateTable::CLASS_END_OF_TEXT; + DEBUG_MSG (APPLY, nullptr, "c%u at %u", klass, buffer->idx); + const Entry &entry = machine.get_entry (state, klass); + + /* Unsafe-to-break before this if not in state 0, as things might + * go differently if we start from state 0 here. + * + * Ugh. The indexing here is ugly... */ + if (state && buffer->backtrack_len () && buffer->idx < buffer->len) + { + /* If there's no action and we're just epsilon-transitioning to state 0, + * safe to break. */ + if (c->is_actionable (this, entry) || + !(entry.newState == StateTable::STATE_START_OF_TEXT && + entry.flags == context_t::DontAdvance)) + buffer->unsafe_to_break_from_outbuffer (buffer->backtrack_len () - 1, buffer->idx + 1); + } + + /* Unsafe-to-break if end-of-text would kick in here. */ + if (buffer->idx + 2 <= buffer->len) + { + const Entry &end_entry = machine.get_entry (state, StateTable::CLASS_END_OF_TEXT); + if (c->is_actionable (this, end_entry)) + buffer->unsafe_to_break (buffer->idx, buffer->idx + 2); + } + + c->transition (this, entry); + + state = machine.new_state (entry.newState); + DEBUG_MSG (APPLY, nullptr, "s%d", state); + + if (buffer->idx == buffer->len) + break; + + if (!(entry.flags & context_t::DontAdvance) || buffer->max_ops-- <= 0) + buffer->next_glyph (); + } + + if (!c->in_place) + { + for (; buffer->successful && buffer->idx < buffer->len;) + buffer->next_glyph (); + buffer->swap_buffers (); + } + } + + public: + const StateTable &machine; + hb_buffer_t *buffer; + unsigned int num_glyphs; +}; + + +struct ankr; + +struct hb_aat_apply_context_t : + hb_dispatch_context_t +{ + const char *get_name () { return "APPLY"; } + template + return_t dispatch (const T &obj) { return obj.apply (this); } + static return_t default_return_value () { return false; } + bool stop_sublookup_iteration (return_t r) const { return r; } + + const hb_ot_shape_plan_t *plan; + hb_font_t *font; + hb_face_t *face; + hb_buffer_t *buffer; + hb_sanitize_context_t sanitizer; + const ankr *ankr_table; + + /* Unused. For debug tracing only. */ + unsigned int lookup_index; + unsigned int debug_depth; + + HB_INTERNAL hb_aat_apply_context_t (const hb_ot_shape_plan_t *plan_, + hb_font_t *font_, + hb_buffer_t *buffer_, + hb_blob_t *blob = const_cast (&Null(hb_blob_t))); + + HB_INTERNAL ~hb_aat_apply_context_t (); + + HB_INTERNAL void set_ankr_table (const AAT::ankr *ankr_table_); + + void set_lookup_index (unsigned int i) { lookup_index = i; } +}; + + +} /* namespace AAT */ + + +#endif /* HB_AAT_LAYOUT_COMMON_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-feat-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-feat-table.hh new file mode 100644 index 000000000..788d4084a --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-feat-table.hh @@ -0,0 +1,214 @@ +/* + * Copyright © 2018 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#ifndef HB_AAT_LAYOUT_FEAT_TABLE_HH +#define HB_AAT_LAYOUT_FEAT_TABLE_HH + +#include "hb-aat-layout-common.hh" + +/* + * feat -- Feature Name + * https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6feat.html + */ +#define HB_AAT_TAG_feat HB_TAG('f','e','a','t') + + +namespace AAT { + + +struct SettingName +{ + friend struct FeatureName; + + int cmp (hb_aat_layout_feature_selector_t key) const + { return (int) key - (int) setting; } + + hb_aat_layout_feature_selector_t get_selector () const + { return (hb_aat_layout_feature_selector_t) (unsigned) setting; } + + hb_aat_layout_feature_selector_info_t get_info (hb_aat_layout_feature_selector_t default_selector) const + { + return { + nameIndex, + (hb_aat_layout_feature_selector_t) (unsigned int) setting, + default_selector == HB_AAT_LAYOUT_FEATURE_SELECTOR_INVALID + ? (hb_aat_layout_feature_selector_t) (setting + 1) + : default_selector, + 0 + }; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this))); + } + + protected: + HBUINT16 setting; /* The setting. */ + NameID nameIndex; /* The name table index for the setting's name. */ + public: + DEFINE_SIZE_STATIC (4); +}; +DECLARE_NULL_NAMESPACE_BYTES (AAT, SettingName); + +struct feat; + +struct FeatureName +{ + int cmp (hb_aat_layout_feature_type_t key) const + { return (int) key - (int) feature; } + + enum { + Exclusive = 0x8000, /* If set, the feature settings are mutually exclusive. */ + NotDefault = 0x4000, /* If clear, then the setting with an index of 0 in + * the setting name array for this feature should + * be taken as the default for the feature + * (if one is required). If set, then bits 0-15 of this + * featureFlags field contain the index of the setting + * which is to be taken as the default. */ + IndexMask = 0x00FF /* If bits 30 and 31 are set, then these sixteen bits + * indicate the index of the setting in the setting name + * array for this feature which should be taken + * as the default. */ + }; + + unsigned int get_selector_infos (unsigned int start_offset, + unsigned int *selectors_count, /* IN/OUT. May be NULL. */ + hb_aat_layout_feature_selector_info_t *selectors, /* OUT. May be NULL. */ + unsigned int *pdefault_index, /* OUT. May be NULL. */ + const void *base) const + { + hb_array_t< const SettingName> settings_table = (base+settingTableZ).as_array (nSettings); + + static_assert (Index::NOT_FOUND_INDEX == HB_AAT_LAYOUT_NO_SELECTOR_INDEX, ""); + + hb_aat_layout_feature_selector_t default_selector = HB_AAT_LAYOUT_FEATURE_SELECTOR_INVALID; + unsigned int default_index = Index::NOT_FOUND_INDEX; + if (featureFlags & Exclusive) + { + default_index = (featureFlags & NotDefault) ? featureFlags & IndexMask : 0; + default_selector = settings_table[default_index].get_selector (); + } + if (pdefault_index) + *pdefault_index = default_index; + + if (selectors_count) + { + + settings_table.sub_array (start_offset, selectors_count) + | hb_map ([=] (const SettingName& setting) { return setting.get_info (default_selector); }) + | hb_sink (hb_array (selectors, *selectors_count)) + ; + } + return settings_table.length; + } + + hb_aat_layout_feature_type_t get_feature_type () const + { return (hb_aat_layout_feature_type_t) (unsigned int) feature; } + + hb_ot_name_id_t get_feature_name_id () const { return nameIndex; } + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + (base+settingTableZ).sanitize (c, nSettings))); + } + + protected: + HBUINT16 feature; /* Feature type. */ + HBUINT16 nSettings; /* The number of records in the setting name array. */ + LOffsetTo, false> + settingTableZ; /* Offset in bytes from the beginning of this table to + * this feature's setting name array. The actual type of + * record this offset refers to will depend on the + * exclusivity value, as described below. */ + HBUINT16 featureFlags; /* Single-bit flags associated with the feature type. */ + HBINT16 nameIndex; /* The name table index for the feature's name. + * This index has values greater than 255 and + * less than 32768. */ + public: + DEFINE_SIZE_STATIC (12); +}; + +struct feat +{ + static constexpr hb_tag_t tableTag = HB_AAT_TAG_feat; + + bool has_data () const { return version.to_int (); } + + unsigned int get_feature_types (unsigned int start_offset, + unsigned int *count, + hb_aat_layout_feature_type_t *features) const + { + if (count) + { + + namesZ.as_array (featureNameCount).sub_array (start_offset, count) + | hb_map (&FeatureName::get_feature_type) + | hb_sink (hb_array (features, *count)) + ; + } + return featureNameCount; + } + + const FeatureName& get_feature (hb_aat_layout_feature_type_t feature_type) const + { return namesZ.bsearch (featureNameCount, feature_type); } + + hb_ot_name_id_t get_feature_name_id (hb_aat_layout_feature_type_t feature) const + { return get_feature (feature).get_feature_name_id (); } + + unsigned int get_selector_infos (hb_aat_layout_feature_type_t feature_type, + unsigned int start_offset, + unsigned int *selectors_count, /* IN/OUT. May be NULL. */ + hb_aat_layout_feature_selector_info_t *selectors, /* OUT. May be NULL. */ + unsigned int *default_index /* OUT. May be NULL. */) const + { + return get_feature (feature_type).get_selector_infos (start_offset, selectors_count, selectors, + default_index, this); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + version.major == 1 && + namesZ.sanitize (c, featureNameCount, this))); + } + + protected: + FixedVersion<>version; /* Version number of the feature name table + * (0x00010000 for the current version). */ + HBUINT16 featureNameCount; + /* The number of entries in the feature name array. */ + HBUINT16 reserved1; /* Reserved (set to zero). */ + HBUINT32 reserved2; /* Reserved (set to zero). */ + SortedUnsizedArrayOf + namesZ; /* The feature name array. */ + public: + DEFINE_SIZE_ARRAY (12, namesZ); +}; + +} /* namespace AAT */ + +#endif /* HB_AAT_LAYOUT_FEAT_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-just-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-just-table.hh new file mode 100644 index 000000000..e1787d10c --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-just-table.hh @@ -0,0 +1,417 @@ +/* + * Copyright © 2018 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#ifndef HB_AAT_LAYOUT_JUST_TABLE_HH +#define HB_AAT_LAYOUT_JUST_TABLE_HH + +#include "hb-aat-layout-common.hh" +#include "hb-ot-layout.hh" +#include "hb-open-type.hh" + +#include "hb-aat-layout-morx-table.hh" + +/* + * just -- Justification + * https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6just.html + */ +#define HB_AAT_TAG_just HB_TAG('j','u','s','t') + + +namespace AAT { + +using namespace OT; + + +struct ActionSubrecordHeader +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this))); + } + + HBUINT16 actionClass; /* The JustClass value associated with this + * ActionSubrecord. */ + HBUINT16 actionType; /* The type of postcompensation action. */ + HBUINT16 actionLength; /* Length of this ActionSubrecord record, which + * must be a multiple of 4. */ + public: + DEFINE_SIZE_STATIC (6); +}; + +struct DecompositionAction +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this))); + } + + ActionSubrecordHeader + header; + HBFixed lowerLimit; /* If the distance factor is less than this value, + * then the ligature is decomposed. */ + HBFixed upperLimit; /* If the distance factor is greater than this value, + * then the ligature is decomposed. */ + HBUINT16 order; /* Numerical order in which this ligature will + * be decomposed; you may want infrequent ligatures + * to decompose before more frequent ones. The ligatures + * on the line of text will decompose in increasing + * value of this field. */ + ArrayOf + decomposedglyphs; + /* Number of 16-bit glyph indexes that follow; + * the ligature will be decomposed into these glyphs. + * + * Array of decomposed glyphs. */ + public: + DEFINE_SIZE_ARRAY (18, decomposedglyphs); +}; + +struct UnconditionalAddGlyphAction +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + protected: + ActionSubrecordHeader + header; + HBGlyphID addGlyph; /* Glyph that should be added if the distance factor + * is growing. */ + + public: + DEFINE_SIZE_STATIC (8); +}; + +struct ConditionalAddGlyphAction +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this))); + } + + protected: + ActionSubrecordHeader + header; + HBFixed substThreshold; /* Distance growth factor (in ems) at which + * this glyph is replaced and the growth factor + * recalculated. */ + HBGlyphID addGlyph; /* Glyph to be added as kashida. If this value is + * 0xFFFF, no extra glyph will be added. Note that + * generally when a glyph is added, justification + * will need to be redone. */ + HBGlyphID substGlyph; /* Glyph to be substituted for this glyph if the + * growth factor equals or exceeds the value of + * substThreshold. */ + public: + DEFINE_SIZE_STATIC (14); +}; + +struct DuctileGlyphAction +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this))); + } + + protected: + ActionSubrecordHeader + header; + HBUINT32 variationAxis; /* The 4-byte tag identifying the ductile axis. + * This would normally be 0x64756374 ('duct'), + * but you may use any axis the font contains. */ + HBFixed minimumLimit; /* The lowest value for the ductility axis tha + * still yields an acceptable appearance. Normally + * this will be 1.0. */ + HBFixed noStretchValue; /* This is the default value that corresponds to + * no change in appearance. Normally, this will + * be 1.0. */ + HBFixed maximumLimit; /* The highest value for the ductility axis that + * still yields an acceptable appearance. */ + public: + DEFINE_SIZE_STATIC (22); +}; + +struct RepeatedAddGlyphAction +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this))); + } + + protected: + ActionSubrecordHeader + header; + HBUINT16 flags; /* Currently unused; set to 0. */ + HBGlyphID glyph; /* Glyph that should be added if the distance factor + * is growing. */ + public: + DEFINE_SIZE_STATIC (10); +}; + +struct ActionSubrecord +{ + unsigned int get_length () const { return u.header.actionLength; } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (unlikely (!c->check_struct (this))) + return_trace (false); + + switch (u.header.actionType) + { + case 0: return_trace (u.decompositionAction.sanitize (c)); + case 1: return_trace (u.unconditionalAddGlyphAction.sanitize (c)); + case 2: return_trace (u.conditionalAddGlyphAction.sanitize (c)); + // case 3: return_trace (u.stretchGlyphAction.sanitize (c)); + case 4: return_trace (u.decompositionAction.sanitize (c)); + case 5: return_trace (u.decompositionAction.sanitize (c)); + default: return_trace (true); + } + } + + protected: + union { + ActionSubrecordHeader header; + DecompositionAction decompositionAction; + UnconditionalAddGlyphAction unconditionalAddGlyphAction; + ConditionalAddGlyphAction conditionalAddGlyphAction; + /* StretchGlyphAction stretchGlyphAction; -- Not supported by CoreText */ + DuctileGlyphAction ductileGlyphAction; + RepeatedAddGlyphAction repeatedAddGlyphAction; + } u; /* Data. The format of this data depends on + * the value of the actionType field. */ + public: + DEFINE_SIZE_UNION (6, header); +}; + +struct PostcompensationActionChain +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (unlikely (!c->check_struct (this))) + return_trace (false); + + unsigned int offset = min_size; + for (unsigned int i = 0; i < count; i++) + { + const ActionSubrecord& subrecord = StructAtOffset (this, offset); + if (unlikely (!subrecord.sanitize (c))) return_trace (false); + offset += subrecord.get_length (); + } + + return_trace (true); + } + + protected: + HBUINT32 count; + + public: + DEFINE_SIZE_STATIC (4); +}; + +struct JustWidthDeltaEntry +{ + enum Flags + { + Reserved1 =0xE000,/* Reserved. You should set these bits to zero. */ + UnlimiteGap =0x1000,/* The glyph can take unlimited gap. When this + * glyph participates in the justification process, + * it and any other glyphs on the line having this + * bit set absorb all the remaining gap. */ + Reserved2 =0x0FF0,/* Reserved. You should set these bits to zero. */ + Priority =0x000F /* The justification priority of the glyph. */ + }; + + enum Priority + { + Kashida = 0, /* Kashida priority. This is the highest priority + * during justification. */ + Whitespace = 1, /* Whitespace priority. Any whitespace glyphs (as + * identified in the glyph properties table) will + * get this priority. */ + InterCharacter = 2, /* Inter-character priority. Give this to any + * remaining glyphs. */ + NullPriority = 3 /* Null priority. You should set this priority for + * glyphs that only participate in justification + * after the above priorities. Normally all glyphs + * have one of the previous three values. If you + * don't want a glyph to participate in justification, + * and you don't want to set its factors to zero, + * you may instead assign it to the null priority. */ + }; + + protected: + HBFixed beforeGrowLimit;/* The ratio by which the advance width of the + * glyph is permitted to grow on the left or top side. */ + HBFixed beforeShrinkLimit; + /* The ratio by which the advance width of the + * glyph is permitted to shrink on the left or top side. */ + HBFixed afterGrowLimit; /* The ratio by which the advance width of the glyph + * is permitted to shrink on the left or top side. */ + HBFixed afterShrinkLimit; + /* The ratio by which the advance width of the glyph + * is at most permitted to shrink on the right or + * bottom side. */ + HBUINT16 growFlags; /* Flags controlling the grow case. */ + HBUINT16 shrinkFlags; /* Flags controlling the shrink case. */ + + public: + DEFINE_SIZE_STATIC (20); +}; + +struct WidthDeltaPair +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this))); + } + + protected: + HBUINT32 justClass; /* The justification category associated + * with the wdRecord field. Only 7 bits of + * this field are used. (The other bits are + * used as padding to guarantee longword + * alignment of the following record). */ + JustWidthDeltaEntry + wdRecord; /* The actual width delta record. */ + + public: + DEFINE_SIZE_STATIC (24); +}; + +typedef OT::LArrayOf WidthDeltaCluster; + +struct JustificationCategory +{ + typedef void EntryData; + + enum Flags + { + SetMark =0x8000,/* If set, make the current glyph the marked + * glyph. */ + DontAdvance =0x4000,/* If set, don't advance to the next glyph before + * going to the new state. */ + MarkCategory =0x3F80,/* The justification category for the marked + * glyph if nonzero. */ + CurrentCategory =0x007F /* The justification category for the current + * glyph if nonzero. */ + }; + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + morphHeader.sanitize (c) && + stHeader.sanitize (c))); + } + + protected: + ChainSubtable + morphHeader; /* Metamorphosis-style subtable header. */ + StateTable + stHeader; /* The justification insertion state table header */ + public: + DEFINE_SIZE_STATIC (30); +}; + +struct JustificationHeader +{ + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + justClassTable.sanitize (c, base, base) && + wdcTable.sanitize (c, base) && + pcTable.sanitize (c, base) && + lookupTable.sanitize (c, base))); + } + + protected: + OffsetTo + justClassTable; /* Offset to the justification category state table. */ + OffsetTo + wdcTable; /* Offset from start of justification table to start + * of the subtable containing the width delta factors + * for the glyphs in your font. + * + * The width delta clusters table. */ + OffsetTo + pcTable; /* Offset from start of justification table to start + * of postcompensation subtable (set to zero if none). + * + * The postcompensation subtable, if present in the font. */ + Lookup> + lookupTable; /* Lookup table associating glyphs with width delta + * clusters. See the description of Width Delta Clusters + * table for details on how to interpret the lookup values. */ + + public: + DEFINE_SIZE_MIN (8); +}; + +struct just +{ + static constexpr hb_tag_t tableTag = HB_AAT_TAG_just; + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + + return_trace (likely (c->check_struct (this) && + version.major == 1 && + horizData.sanitize (c, this, this) && + vertData.sanitize (c, this, this))); + } + + protected: + FixedVersion<>version; /* Version of the justification table + * (0x00010000u for version 1.0). */ + HBUINT16 format; /* Format of the justification table (set to 0). */ + OffsetTo + horizData; /* Byte offset from the start of the justification table + * to the header for tables that contain justification + * information for horizontal text. + * If you are not including this information, + * store 0. */ + OffsetTo + vertData; /* ditto, vertical */ + + public: + DEFINE_SIZE_STATIC (10); +}; + +} /* namespace AAT */ + + +#endif /* HB_AAT_LAYOUT_JUST_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-kerx-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-kerx-table.hh new file mode 100644 index 000000000..8026b4ef1 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-kerx-table.hh @@ -0,0 +1,1001 @@ +/* + * Copyright © 2018 Ebrahim Byagowi + * Copyright © 2018 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_AAT_LAYOUT_KERX_TABLE_HH +#define HB_AAT_LAYOUT_KERX_TABLE_HH + +#include "hb-kern.hh" +#include "hb-aat-layout-ankr-table.hh" + +/* + * kerx -- Extended Kerning + * https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6kerx.html + */ +#define HB_AAT_TAG_kerx HB_TAG('k','e','r','x') + + +namespace AAT { + +using namespace OT; + + +static inline int +kerxTupleKern (int value, + unsigned int tupleCount, + const void *base, + hb_aat_apply_context_t *c) +{ + if (likely (!tupleCount || !c)) return value; + + unsigned int offset = value; + const FWORD *pv = &StructAtOffset (base, offset); + if (unlikely (!c->sanitizer.check_array (pv, tupleCount))) return 0; + return *pv; +} + + +struct hb_glyph_pair_t +{ + hb_codepoint_t left; + hb_codepoint_t right; +}; + +struct KernPair +{ + int get_kerning () const { return value; } + + int cmp (const hb_glyph_pair_t &o) const + { + int ret = left.cmp (o.left); + if (ret) return ret; + return right.cmp (o.right); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + protected: + HBGlyphID left; + HBGlyphID right; + FWORD value; + public: + DEFINE_SIZE_STATIC (6); +}; + +template +struct KerxSubTableFormat0 +{ + int get_kerning (hb_codepoint_t left, hb_codepoint_t right, + hb_aat_apply_context_t *c = nullptr) const + { + hb_glyph_pair_t pair = {left, right}; + int v = pairs.bsearch (pair).get_kerning (); + return kerxTupleKern (v, header.tuple_count (), this, c); + } + + bool apply (hb_aat_apply_context_t *c) const + { + TRACE_APPLY (this); + + if (!c->plan->requested_kerning) + return false; + + if (header.coverage & header.Backwards) + return false; + + accelerator_t accel (*this, c); + hb_kern_machine_t machine (accel, header.coverage & header.CrossStream); + machine.kern (c->font, c->buffer, c->plan->kern_mask); + + return_trace (true); + } + + struct accelerator_t + { + const KerxSubTableFormat0 &table; + hb_aat_apply_context_t *c; + + accelerator_t (const KerxSubTableFormat0 &table_, + hb_aat_apply_context_t *c_) : + table (table_), c (c_) {} + + int get_kerning (hb_codepoint_t left, hb_codepoint_t right) const + { return table.get_kerning (left, right, c); } + }; + + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (pairs.sanitize (c))); + } + + protected: + KernSubTableHeader header; + BinSearchArrayOf + pairs; /* Sorted kern records. */ + public: + DEFINE_SIZE_ARRAY (KernSubTableHeader::static_size + 16, pairs); +}; + + +template +struct Format1Entry; + +template <> +struct Format1Entry +{ + enum Flags + { + Push = 0x8000, /* If set, push this glyph on the kerning stack. */ + DontAdvance = 0x4000, /* If set, don't advance to the next glyph + * before going to the new state. */ + Reset = 0x2000, /* If set, reset the kerning data (clear the stack) */ + Reserved = 0x1FFF, /* Not used; set to 0. */ + }; + + struct EntryData + { + HBUINT16 kernActionIndex;/* Index into the kerning value array. If + * this index is 0xFFFF, then no kerning + * is to be performed. */ + public: + DEFINE_SIZE_STATIC (2); + }; + + static bool performAction (const Entry &entry) + { return entry.data.kernActionIndex != 0xFFFF; } + + static unsigned int kernActionIndex (const Entry &entry) + { return entry.data.kernActionIndex; } +}; +template <> +struct Format1Entry +{ + enum Flags + { + Push = 0x8000, /* If set, push this glyph on the kerning stack. */ + DontAdvance = 0x4000, /* If set, don't advance to the next glyph + * before going to the new state. */ + Offset = 0x3FFF, /* Byte offset from beginning of subtable to the + * value table for the glyphs on the kerning stack. */ + + Reset = 0x0000, /* Not supported? */ + }; + + typedef void EntryData; + + static bool performAction (const Entry &entry) + { return entry.flags & Offset; } + + static unsigned int kernActionIndex (const Entry &entry) + { return entry.flags & Offset; } +}; + +template +struct KerxSubTableFormat1 +{ + typedef typename KernSubTableHeader::Types Types; + typedef typename Types::HBUINT HBUINT; + + typedef Format1Entry Format1EntryT; + typedef typename Format1EntryT::EntryData EntryData; + + struct driver_context_t + { + static constexpr bool in_place = true; + enum + { + DontAdvance = Format1EntryT::DontAdvance, + }; + + driver_context_t (const KerxSubTableFormat1 *table_, + hb_aat_apply_context_t *c_) : + c (c_), + table (table_), + /* Apparently the offset kernAction is from the beginning of the state-machine, + * similar to offsets in morx table, NOT from beginning of this table, like + * other subtables in kerx. Discovered via testing. */ + kernAction (&table->machine + table->kernAction), + depth (0), + crossStream (table->header.coverage & table->header.CrossStream) {} + + bool is_actionable (StateTableDriver *driver HB_UNUSED, + const Entry &entry) + { + return Format1EntryT::performAction (entry); + } + void transition (StateTableDriver *driver, + const Entry &entry) + { + hb_buffer_t *buffer = driver->buffer; + unsigned int flags = entry.flags; + + if (flags & Format1EntryT::Reset) + depth = 0; + + if (flags & Format1EntryT::Push) + { + if (likely (depth < ARRAY_LENGTH (stack))) + stack[depth++] = buffer->idx; + else + depth = 0; /* Probably not what CoreText does, but better? */ + } + + if (Format1EntryT::performAction (entry) && depth) + { + unsigned int tuple_count = hb_max (1u, table->header.tuple_count ()); + + unsigned int kern_idx = Format1EntryT::kernActionIndex (entry); + kern_idx = Types::byteOffsetToIndex (kern_idx, &table->machine, kernAction.arrayZ); + const FWORD *actions = &kernAction[kern_idx]; + if (!c->sanitizer.check_array (actions, depth, tuple_count)) + { + depth = 0; + return; + } + + hb_mask_t kern_mask = c->plan->kern_mask; + + /* From Apple 'kern' spec: + * "Each pops one glyph from the kerning stack and applies the kerning value to it. + * The end of the list is marked by an odd value... */ + bool last = false; + while (!last && depth) + { + unsigned int idx = stack[--depth]; + int v = *actions; + actions += tuple_count; + if (idx >= buffer->len) continue; + + /* "The end of the list is marked by an odd value..." */ + last = v & 1; + v &= ~1; + + hb_glyph_position_t &o = buffer->pos[idx]; + + /* Testing shows that CoreText only applies kern (cross-stream or not) + * if none has been applied by previous subtables. That is, it does + * NOT seem to accumulate as otherwise implied by specs. */ + + /* The following flag is undocumented in the spec, but described + * in the 'kern' table example. */ + if (v == -0x8000) + { + o.attach_type() = ATTACH_TYPE_NONE; + o.attach_chain() = 0; + o.x_offset = o.y_offset = 0; + } + else if (HB_DIRECTION_IS_HORIZONTAL (buffer->props.direction)) + { + if (crossStream) + { + if (buffer->pos[idx].attach_type() && !buffer->pos[idx].y_offset) + { + o.y_offset = c->font->em_scale_y (v); + buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT; + } + } + else if (buffer->info[idx].mask & kern_mask) + { + if (!buffer->pos[idx].x_offset) + { + buffer->pos[idx].x_advance += c->font->em_scale_x (v); + buffer->pos[idx].x_offset += c->font->em_scale_x (v); + } + } + } + else + { + if (crossStream) + { + /* CoreText doesn't do crossStream kerning in vertical. We do. */ + if (buffer->pos[idx].attach_type() && !buffer->pos[idx].x_offset) + { + o.x_offset = c->font->em_scale_x (v); + buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT; + } + } + else if (buffer->info[idx].mask & kern_mask) + { + if (!buffer->pos[idx].y_offset) + { + buffer->pos[idx].y_advance += c->font->em_scale_y (v); + buffer->pos[idx].y_offset += c->font->em_scale_y (v); + } + } + } + } + } + } + + private: + hb_aat_apply_context_t *c; + const KerxSubTableFormat1 *table; + const UnsizedArrayOf &kernAction; + unsigned int stack[8]; + unsigned int depth; + bool crossStream; + }; + + bool apply (hb_aat_apply_context_t *c) const + { + TRACE_APPLY (this); + + if (!c->plan->requested_kerning && + !(header.coverage & header.CrossStream)) + return false; + + driver_context_t dc (this, c); + + StateTableDriver driver (machine, c->buffer, c->font->face); + driver.drive (&dc); + + return_trace (true); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + /* The rest of array sanitizations are done at run-time. */ + return_trace (likely (c->check_struct (this) && + machine.sanitize (c))); + } + + protected: + KernSubTableHeader header; + StateTable machine; + NNOffsetTo, HBUINT> kernAction; + public: + DEFINE_SIZE_STATIC (KernSubTableHeader::static_size + 5 * sizeof (HBUINT)); +}; + +template +struct KerxSubTableFormat2 +{ + typedef typename KernSubTableHeader::Types Types; + typedef typename Types::HBUINT HBUINT; + + int get_kerning (hb_codepoint_t left, hb_codepoint_t right, + hb_aat_apply_context_t *c) const + { + unsigned int num_glyphs = c->sanitizer.get_num_glyphs (); + unsigned int l = (this+leftClassTable).get_class (left, num_glyphs, 0); + unsigned int r = (this+rightClassTable).get_class (right, num_glyphs, 0); + + const UnsizedArrayOf &arrayZ = this+array; + unsigned int kern_idx = l + r; + kern_idx = Types::offsetToIndex (kern_idx, this, arrayZ.arrayZ); + const FWORD *v = &arrayZ[kern_idx]; + if (unlikely (!v->sanitize (&c->sanitizer))) return 0; + + return kerxTupleKern (*v, header.tuple_count (), this, c); + } + + bool apply (hb_aat_apply_context_t *c) const + { + TRACE_APPLY (this); + + if (!c->plan->requested_kerning) + return false; + + if (header.coverage & header.Backwards) + return false; + + accelerator_t accel (*this, c); + hb_kern_machine_t machine (accel, header.coverage & header.CrossStream); + machine.kern (c->font, c->buffer, c->plan->kern_mask); + + return_trace (true); + } + + struct accelerator_t + { + const KerxSubTableFormat2 &table; + hb_aat_apply_context_t *c; + + accelerator_t (const KerxSubTableFormat2 &table_, + hb_aat_apply_context_t *c_) : + table (table_), c (c_) {} + + int get_kerning (hb_codepoint_t left, hb_codepoint_t right) const + { return table.get_kerning (left, right, c); } + }; + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + leftClassTable.sanitize (c, this) && + rightClassTable.sanitize (c, this) && + c->check_range (this, array))); + } + + protected: + KernSubTableHeader header; + HBUINT rowWidth; /* The width, in bytes, of a row in the table. */ + NNOffsetTo + leftClassTable; /* Offset from beginning of this subtable to + * left-hand class table. */ + NNOffsetTo + rightClassTable;/* Offset from beginning of this subtable to + * right-hand class table. */ + NNOffsetTo, HBUINT> + array; /* Offset from beginning of this subtable to + * the start of the kerning array. */ + public: + DEFINE_SIZE_STATIC (KernSubTableHeader::static_size + 4 * sizeof (HBUINT)); +}; + +template +struct KerxSubTableFormat4 +{ + typedef ExtendedTypes Types; + + struct EntryData + { + HBUINT16 ankrActionIndex;/* Either 0xFFFF (for no action) or the index of + * the action to perform. */ + public: + DEFINE_SIZE_STATIC (2); + }; + + struct driver_context_t + { + static constexpr bool in_place = true; + enum Flags + { + Mark = 0x8000, /* If set, remember this glyph as the marked glyph. */ + DontAdvance = 0x4000, /* If set, don't advance to the next glyph before + * going to the new state. */ + Reserved = 0x3FFF, /* Not used; set to 0. */ + }; + + enum SubTableFlags + { + ActionType = 0xC0000000, /* A two-bit field containing the action type. */ + Unused = 0x3F000000, /* Unused - must be zero. */ + Offset = 0x00FFFFFF, /* Masks the offset in bytes from the beginning + * of the subtable to the beginning of the control + * point table. */ + }; + + driver_context_t (const KerxSubTableFormat4 *table, + hb_aat_apply_context_t *c_) : + c (c_), + action_type ((table->flags & ActionType) >> 30), + ankrData ((HBUINT16 *) ((const char *) &table->machine + (table->flags & Offset))), + mark_set (false), + mark (0) {} + + bool is_actionable (StateTableDriver *driver HB_UNUSED, + const Entry &entry) + { + return entry.data.ankrActionIndex != 0xFFFF; + } + void transition (StateTableDriver *driver, + const Entry &entry) + { + hb_buffer_t *buffer = driver->buffer; + + if (mark_set && entry.data.ankrActionIndex != 0xFFFF && buffer->idx < buffer->len) + { + hb_glyph_position_t &o = buffer->cur_pos(); + switch (action_type) + { + case 0: /* Control Point Actions.*/ + { + /* indexed into glyph outline. */ + const HBUINT16 *data = &ankrData[entry.data.ankrActionIndex]; + if (!c->sanitizer.check_array (data, 2)) return; + HB_UNUSED unsigned int markControlPoint = *data++; + HB_UNUSED unsigned int currControlPoint = *data++; + hb_position_t markX = 0; + hb_position_t markY = 0; + hb_position_t currX = 0; + hb_position_t currY = 0; + if (!c->font->get_glyph_contour_point_for_origin (c->buffer->info[mark].codepoint, + markControlPoint, + HB_DIRECTION_LTR /*XXX*/, + &markX, &markY) || + !c->font->get_glyph_contour_point_for_origin (c->buffer->cur ().codepoint, + currControlPoint, + HB_DIRECTION_LTR /*XXX*/, + &currX, &currY)) + return; + + o.x_offset = markX - currX; + o.y_offset = markY - currY; + } + break; + + case 1: /* Anchor Point Actions. */ + { + /* Indexed into 'ankr' table. */ + const HBUINT16 *data = &ankrData[entry.data.ankrActionIndex]; + if (!c->sanitizer.check_array (data, 2)) return; + unsigned int markAnchorPoint = *data++; + unsigned int currAnchorPoint = *data++; + const Anchor &markAnchor = c->ankr_table->get_anchor (c->buffer->info[mark].codepoint, + markAnchorPoint, + c->sanitizer.get_num_glyphs ()); + const Anchor &currAnchor = c->ankr_table->get_anchor (c->buffer->cur ().codepoint, + currAnchorPoint, + c->sanitizer.get_num_glyphs ()); + + o.x_offset = c->font->em_scale_x (markAnchor.xCoordinate) - c->font->em_scale_x (currAnchor.xCoordinate); + o.y_offset = c->font->em_scale_y (markAnchor.yCoordinate) - c->font->em_scale_y (currAnchor.yCoordinate); + } + break; + + case 2: /* Control Point Coordinate Actions. */ + { + const FWORD *data = (const FWORD *) &ankrData[entry.data.ankrActionIndex]; + if (!c->sanitizer.check_array (data, 4)) return; + int markX = *data++; + int markY = *data++; + int currX = *data++; + int currY = *data++; + + o.x_offset = c->font->em_scale_x (markX) - c->font->em_scale_x (currX); + o.y_offset = c->font->em_scale_y (markY) - c->font->em_scale_y (currY); + } + break; + } + o.attach_type() = ATTACH_TYPE_MARK; + o.attach_chain() = (int) mark - (int) buffer->idx; + buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT; + } + + if (entry.flags & Mark) + { + mark_set = true; + mark = buffer->idx; + } + } + + private: + hb_aat_apply_context_t *c; + unsigned int action_type; + const HBUINT16 *ankrData; + bool mark_set; + unsigned int mark; + }; + + bool apply (hb_aat_apply_context_t *c) const + { + TRACE_APPLY (this); + + driver_context_t dc (this, c); + + StateTableDriver driver (machine, c->buffer, c->font->face); + driver.drive (&dc); + + return_trace (true); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + /* The rest of array sanitizations are done at run-time. */ + return_trace (likely (c->check_struct (this) && + machine.sanitize (c))); + } + + protected: + KernSubTableHeader header; + StateTable machine; + HBUINT32 flags; + public: + DEFINE_SIZE_STATIC (KernSubTableHeader::static_size + 20); +}; + +template +struct KerxSubTableFormat6 +{ + enum Flags + { + ValuesAreLong = 0x00000001, + }; + + bool is_long () const { return flags & ValuesAreLong; } + + int get_kerning (hb_codepoint_t left, hb_codepoint_t right, + hb_aat_apply_context_t *c) const + { + unsigned int num_glyphs = c->sanitizer.get_num_glyphs (); + if (is_long ()) + { + const typename U::Long &t = u.l; + unsigned int l = (this+t.rowIndexTable).get_value_or_null (left, num_glyphs); + unsigned int r = (this+t.columnIndexTable).get_value_or_null (right, num_glyphs); + unsigned int offset = l + r; + if (unlikely (offset < l)) return 0; /* Addition overflow. */ + if (unlikely (hb_unsigned_mul_overflows (offset, sizeof (FWORD32)))) return 0; + const FWORD32 *v = &StructAtOffset (&(this+t.array), offset * sizeof (FWORD32)); + if (unlikely (!v->sanitize (&c->sanitizer))) return 0; + return kerxTupleKern (*v, header.tuple_count (), &(this+vector), c); + } + else + { + const typename U::Short &t = u.s; + unsigned int l = (this+t.rowIndexTable).get_value_or_null (left, num_glyphs); + unsigned int r = (this+t.columnIndexTable).get_value_or_null (right, num_glyphs); + unsigned int offset = l + r; + const FWORD *v = &StructAtOffset (&(this+t.array), offset * sizeof (FWORD)); + if (unlikely (!v->sanitize (&c->sanitizer))) return 0; + return kerxTupleKern (*v, header.tuple_count (), &(this+vector), c); + } + } + + bool apply (hb_aat_apply_context_t *c) const + { + TRACE_APPLY (this); + + if (!c->plan->requested_kerning) + return false; + + if (header.coverage & header.Backwards) + return false; + + accelerator_t accel (*this, c); + hb_kern_machine_t machine (accel, header.coverage & header.CrossStream); + machine.kern (c->font, c->buffer, c->plan->kern_mask); + + return_trace (true); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + (is_long () ? + ( + u.l.rowIndexTable.sanitize (c, this) && + u.l.columnIndexTable.sanitize (c, this) && + c->check_range (this, u.l.array) + ) : ( + u.s.rowIndexTable.sanitize (c, this) && + u.s.columnIndexTable.sanitize (c, this) && + c->check_range (this, u.s.array) + )) && + (header.tuple_count () == 0 || + c->check_range (this, vector)))); + } + + struct accelerator_t + { + const KerxSubTableFormat6 &table; + hb_aat_apply_context_t *c; + + accelerator_t (const KerxSubTableFormat6 &table_, + hb_aat_apply_context_t *c_) : + table (table_), c (c_) {} + + int get_kerning (hb_codepoint_t left, hb_codepoint_t right) const + { return table.get_kerning (left, right, c); } + }; + + protected: + KernSubTableHeader header; + HBUINT32 flags; + HBUINT16 rowCount; + HBUINT16 columnCount; + union U + { + struct Long + { + LNNOffsetTo> rowIndexTable; + LNNOffsetTo> columnIndexTable; + LNNOffsetTo> array; + } l; + struct Short + { + LNNOffsetTo> rowIndexTable; + LNNOffsetTo> columnIndexTable; + LNNOffsetTo> array; + } s; + } u; + LNNOffsetTo> vector; + public: + DEFINE_SIZE_STATIC (KernSubTableHeader::static_size + 24); +}; + + +struct KerxSubTableHeader +{ + typedef ExtendedTypes Types; + + unsigned int tuple_count () const { return tupleCount; } + bool is_horizontal () const { return !(coverage & Vertical); } + + enum Coverage + { + Vertical = 0x80000000u, /* Set if table has vertical kerning values. */ + CrossStream = 0x40000000u, /* Set if table has cross-stream kerning values. */ + Variation = 0x20000000u, /* Set if table has variation kerning values. */ + Backwards = 0x10000000u, /* If clear, process the glyphs forwards, that + * is, from first to last in the glyph stream. + * If we, process them from last to first. + * This flag only applies to state-table based + * 'kerx' subtables (types 1 and 4). */ + Reserved = 0x0FFFFF00u, /* Reserved, set to zero. */ + SubtableType= 0x000000FFu, /* Subtable type. */ + }; + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this))); + } + + public: + HBUINT32 length; + HBUINT32 coverage; + HBUINT32 tupleCount; + public: + DEFINE_SIZE_STATIC (12); +}; + +struct KerxSubTable +{ + friend struct kerx; + + unsigned int get_size () const { return u.header.length; } + unsigned int get_type () const { return u.header.coverage & u.header.SubtableType; } + + template + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const + { + unsigned int subtable_type = get_type (); + TRACE_DISPATCH (this, subtable_type); + switch (subtable_type) { + case 0: return_trace (c->dispatch (u.format0, hb_forward (ds)...)); + case 1: return_trace (c->dispatch (u.format1, hb_forward (ds)...)); + case 2: return_trace (c->dispatch (u.format2, hb_forward (ds)...)); + case 4: return_trace (c->dispatch (u.format4, hb_forward (ds)...)); + case 6: return_trace (c->dispatch (u.format6, hb_forward (ds)...)); + default: return_trace (c->default_return_value ()); + } + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (!u.header.sanitize (c) || + u.header.length <= u.header.static_size || + !c->check_range (this, u.header.length)) + return_trace (false); + + return_trace (dispatch (c)); + } + + public: + union { + KerxSubTableHeader header; + KerxSubTableFormat0 format0; + KerxSubTableFormat1 format1; + KerxSubTableFormat2 format2; + KerxSubTableFormat4 format4; + KerxSubTableFormat6 format6; + } u; + public: + DEFINE_SIZE_MIN (12); +}; + + +/* + * The 'kerx' Table + */ + +template +struct KerxTable +{ + /* https://en.wikipedia.org/wiki/Curiously_recurring_template_pattern */ + const T* thiz () const { return static_cast (this); } + + bool has_state_machine () const + { + typedef typename T::SubTable SubTable; + + const SubTable *st = &thiz()->firstSubTable; + unsigned int count = thiz()->tableCount; + for (unsigned int i = 0; i < count; i++) + { + if (st->get_type () == 1) + return true; + st = &StructAfter (*st); + } + return false; + } + + bool has_cross_stream () const + { + typedef typename T::SubTable SubTable; + + const SubTable *st = &thiz()->firstSubTable; + unsigned int count = thiz()->tableCount; + for (unsigned int i = 0; i < count; i++) + { + if (st->u.header.coverage & st->u.header.CrossStream) + return true; + st = &StructAfter (*st); + } + return false; + } + + int get_h_kerning (hb_codepoint_t left, hb_codepoint_t right) const + { + typedef typename T::SubTable SubTable; + + int v = 0; + const SubTable *st = &thiz()->firstSubTable; + unsigned int count = thiz()->tableCount; + for (unsigned int i = 0; i < count; i++) + { + if ((st->u.header.coverage & (st->u.header.Variation | st->u.header.CrossStream)) || + !st->u.header.is_horizontal ()) + continue; + v += st->get_kerning (left, right); + st = &StructAfter (*st); + } + return v; + } + + bool apply (AAT::hb_aat_apply_context_t *c) const + { + typedef typename T::SubTable SubTable; + + bool ret = false; + bool seenCrossStream = false; + c->set_lookup_index (0); + const SubTable *st = &thiz()->firstSubTable; + unsigned int count = thiz()->tableCount; + for (unsigned int i = 0; i < count; i++) + { + bool reverse; + + if (!T::Types::extended && (st->u.header.coverage & st->u.header.Variation)) + goto skip; + + if (HB_DIRECTION_IS_HORIZONTAL (c->buffer->props.direction) != st->u.header.is_horizontal ()) + goto skip; + + reverse = bool (st->u.header.coverage & st->u.header.Backwards) != + HB_DIRECTION_IS_BACKWARD (c->buffer->props.direction); + + if (!c->buffer->message (c->font, "start %c%c%c%c subtable %d", HB_UNTAG (thiz()->tableTag), c->lookup_index)) + goto skip; + + if (!seenCrossStream && + (st->u.header.coverage & st->u.header.CrossStream)) + { + /* Attach all glyphs into a chain. */ + seenCrossStream = true; + hb_glyph_position_t *pos = c->buffer->pos; + unsigned int count = c->buffer->len; + for (unsigned int i = 0; i < count; i++) + { + pos[i].attach_type() = ATTACH_TYPE_CURSIVE; + pos[i].attach_chain() = HB_DIRECTION_IS_FORWARD (c->buffer->props.direction) ? -1 : +1; + /* We intentionally don't set HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT, + * since there needs to be a non-zero attachment for post-positioning to + * be needed. */ + } + } + + if (reverse) + c->buffer->reverse (); + + { + /* See comment in sanitize() for conditional here. */ + hb_sanitize_with_object_t with (&c->sanitizer, i < count - 1 ? st : (const SubTable *) nullptr); + ret |= st->dispatch (c); + } + + if (reverse) + c->buffer->reverse (); + + (void) c->buffer->message (c->font, "end %c%c%c%c subtable %d", HB_UNTAG (thiz()->tableTag), c->lookup_index); + + skip: + st = &StructAfter (*st); + c->set_lookup_index (c->lookup_index + 1); + } + + return ret; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (unlikely (!thiz()->version.sanitize (c) || + (unsigned) thiz()->version < (unsigned) T::minVersion || + !thiz()->tableCount.sanitize (c))) + return_trace (false); + + typedef typename T::SubTable SubTable; + + const SubTable *st = &thiz()->firstSubTable; + unsigned int count = thiz()->tableCount; + for (unsigned int i = 0; i < count; i++) + { + if (unlikely (!st->u.header.sanitize (c))) + return_trace (false); + /* OpenType kern table has 2-byte subtable lengths. That's limiting. + * MS implementation also only supports one subtable, of format 0, + * anyway. Certain versions of some fonts, like Calibry, contain + * kern subtable that exceeds 64kb. Looks like, the subtable length + * is simply ignored. Which makes sense. It's only needed if you + * have multiple subtables. To handle such fonts, we just ignore + * the length for the last subtable. */ + hb_sanitize_with_object_t with (c, i < count - 1 ? st : (const SubTable *) nullptr); + + if (unlikely (!st->sanitize (c))) + return_trace (false); + + st = &StructAfter (*st); + } + + return_trace (true); + } +}; + +struct kerx : KerxTable +{ + friend struct KerxTable; + + static constexpr hb_tag_t tableTag = HB_AAT_TAG_kerx; + static constexpr unsigned minVersion = 2u; + + typedef KerxSubTableHeader SubTableHeader; + typedef SubTableHeader::Types Types; + typedef KerxSubTable SubTable; + + bool has_data () const { return version; } + + protected: + HBUINT16 version; /* The version number of the extended kerning table + * (currently 2, 3, or 4). */ + HBUINT16 unused; /* Set to 0. */ + HBUINT32 tableCount; /* The number of subtables included in the extended kerning + * table. */ + SubTable firstSubTable; /* Subtables. */ +/*subtableGlyphCoverageArray*/ /* Only if version >= 3. We don't use. */ + + public: + DEFINE_SIZE_MIN (8); +}; + + +} /* namespace AAT */ + + +#endif /* HB_AAT_LAYOUT_KERX_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-lcar-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-lcar-table.hh new file mode 100644 index 000000000..7063b386c --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-lcar-table.hh @@ -0,0 +1,162 @@ +/* + * Copyright © 2018 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ +#ifndef HB_AAT_LAYOUT_LCAR_TABLE_HH +#define HB_AAT_LAYOUT_LCAR_TABLE_HH + +#include "hb-open-type.hh" +#include "hb-aat-layout-common.hh" + +/* + * lcar -- Ligature caret + * https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6lcar.html + */ +#define HB_AAT_TAG_lcar HB_TAG('l','c','a','r') + + +namespace AAT { + +typedef ArrayOf LigCaretClassEntry; + +struct lcarFormat0 +{ + unsigned int get_lig_carets (hb_font_t *font, + hb_direction_t direction, + hb_codepoint_t glyph, + unsigned int start_offset, + unsigned int *caret_count /* IN/OUT */, + hb_position_t *caret_array /* OUT */, + const void *base) const + { + const OffsetTo* entry_offset = lookupTable.get_value (glyph, + font->face->get_num_glyphs ()); + const LigCaretClassEntry& array = entry_offset ? base+*entry_offset : Null (LigCaretClassEntry); + if (caret_count) + { + hb_array_t arr = array.sub_array (start_offset, caret_count); + for (unsigned int i = 0; i < arr.length; ++i) + caret_array[i] = font->em_scale_dir (arr[i], direction); + } + return array.len; + } + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && lookupTable.sanitize (c, base))); + } + + protected: + Lookup> + lookupTable; /* data Lookup table associating glyphs */ + public: + DEFINE_SIZE_MIN (2); +}; + +struct lcarFormat1 +{ + unsigned int get_lig_carets (hb_font_t *font, + hb_direction_t direction, + hb_codepoint_t glyph, + unsigned int start_offset, + unsigned int *caret_count /* IN/OUT */, + hb_position_t *caret_array /* OUT */, + const void *base) const + { + const OffsetTo* entry_offset = lookupTable.get_value (glyph, + font->face->get_num_glyphs ()); + const LigCaretClassEntry& array = entry_offset ? base+*entry_offset : Null (LigCaretClassEntry); + if (caret_count) + { + hb_array_t arr = array.sub_array (start_offset, caret_count); + for (unsigned int i = 0; i < arr.length; ++i) + { + hb_position_t x = 0, y = 0; + font->get_glyph_contour_point_for_origin (glyph, arr[i], direction, &x, &y); + caret_array[i] = HB_DIRECTION_IS_HORIZONTAL (direction) ? x : y; + } + } + return array.len; + } + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && lookupTable.sanitize (c, base))); + } + + protected: + Lookup> + lookupTable; /* data Lookup table associating glyphs */ + public: + DEFINE_SIZE_MIN (2); +}; + +struct lcar +{ + static constexpr hb_tag_t tableTag = HB_AAT_TAG_lcar; + + unsigned int get_lig_carets (hb_font_t *font, + hb_direction_t direction, + hb_codepoint_t glyph, + unsigned int start_offset, + unsigned int *caret_count /* IN/OUT */, + hb_position_t *caret_array /* OUT */) const + { + switch (format) + { + case 0: return u.format0.get_lig_carets (font, direction, glyph, start_offset, + caret_count, caret_array, this); + case 1: return u.format1.get_lig_carets (font, direction, glyph, start_offset, + caret_count, caret_array, this); + default:if (caret_count) *caret_count = 0; return 0; + } + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (unlikely (!c->check_struct (this) || version.major != 1)) + return_trace (false); + + switch (format) { + case 0: return_trace (u.format0.sanitize (c, this)); + case 1: return_trace (u.format1.sanitize (c, this)); + default:return_trace (true); + } + } + + protected: + FixedVersion<>version; /* Version number of the ligature caret table */ + HBUINT16 format; /* Format of the ligature caret table. */ + union { + lcarFormat0 format0; + lcarFormat0 format1; + } u; + public: + DEFINE_SIZE_MIN (8); +}; + +} /* namespace AAT */ + +#endif /* HB_AAT_LAYOUT_LCAR_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-morx-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-morx-table.hh new file mode 100644 index 000000000..d8df579f5 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-morx-table.hh @@ -0,0 +1,1153 @@ +/* + * Copyright © 2017 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_AAT_LAYOUT_MORX_TABLE_HH +#define HB_AAT_LAYOUT_MORX_TABLE_HH + +#include "hb-open-type.hh" +#include "hb-aat-layout-common.hh" +#include "hb-ot-layout-common.hh" +#include "hb-aat-map.hh" + +/* + * morx -- Extended Glyph Metamorphosis + * https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6morx.html + * https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6mort.html + */ +#define HB_AAT_TAG_morx HB_TAG('m','o','r','x') +#define HB_AAT_TAG_mort HB_TAG('m','o','r','t') + + +namespace AAT { + +using namespace OT; + +template +struct RearrangementSubtable +{ + typedef typename Types::HBUINT HBUINT; + + typedef void EntryData; + + struct driver_context_t + { + static constexpr bool in_place = true; + enum Flags + { + MarkFirst = 0x8000, /* If set, make the current glyph the first + * glyph to be rearranged. */ + DontAdvance = 0x4000, /* If set, don't advance to the next glyph + * before going to the new state. This means + * that the glyph index doesn't change, even + * if the glyph at that index has changed. */ + MarkLast = 0x2000, /* If set, make the current glyph the last + * glyph to be rearranged. */ + Reserved = 0x1FF0, /* These bits are reserved and should be set to 0. */ + Verb = 0x000F, /* The type of rearrangement specified. */ + }; + + driver_context_t (const RearrangementSubtable *table HB_UNUSED) : + ret (false), + start (0), end (0) {} + + bool is_actionable (StateTableDriver *driver HB_UNUSED, + const Entry &entry) + { + return (entry.flags & Verb) && start < end; + } + void transition (StateTableDriver *driver, + const Entry &entry) + { + hb_buffer_t *buffer = driver->buffer; + unsigned int flags = entry.flags; + + if (flags & MarkFirst) + start = buffer->idx; + + if (flags & MarkLast) + end = hb_min (buffer->idx + 1, buffer->len); + + if ((flags & Verb) && start < end) + { + /* The following map has two nibbles, for start-side + * and end-side. Values of 0,1,2 mean move that many + * to the other side. Value of 3 means move 2 and + * flip them. */ + const unsigned char map[16] = + { + 0x00, /* 0 no change */ + 0x10, /* 1 Ax => xA */ + 0x01, /* 2 xD => Dx */ + 0x11, /* 3 AxD => DxA */ + 0x20, /* 4 ABx => xAB */ + 0x30, /* 5 ABx => xBA */ + 0x02, /* 6 xCD => CDx */ + 0x03, /* 7 xCD => DCx */ + 0x12, /* 8 AxCD => CDxA */ + 0x13, /* 9 AxCD => DCxA */ + 0x21, /* 10 ABxD => DxAB */ + 0x31, /* 11 ABxD => DxBA */ + 0x22, /* 12 ABxCD => CDxAB */ + 0x32, /* 13 ABxCD => CDxBA */ + 0x23, /* 14 ABxCD => DCxAB */ + 0x33, /* 15 ABxCD => DCxBA */ + }; + + unsigned int m = map[flags & Verb]; + unsigned int l = hb_min (2u, m >> 4); + unsigned int r = hb_min (2u, m & 0x0F); + bool reverse_l = 3 == (m >> 4); + bool reverse_r = 3 == (m & 0x0F); + + if (end - start >= l + r) + { + buffer->merge_clusters (start, hb_min (buffer->idx + 1, buffer->len)); + buffer->merge_clusters (start, end); + + hb_glyph_info_t *info = buffer->info; + hb_glyph_info_t buf[4]; + + memcpy (buf, info + start, l * sizeof (buf[0])); + memcpy (buf + 2, info + end - r, r * sizeof (buf[0])); + + if (l != r) + memmove (info + start + r, info + start + l, (end - start - l - r) * sizeof (buf[0])); + + memcpy (info + start, buf + 2, r * sizeof (buf[0])); + memcpy (info + end - l, buf, l * sizeof (buf[0])); + if (reverse_l) + { + buf[0] = info[end - 1]; + info[end - 1] = info[end - 2]; + info[end - 2] = buf[0]; + } + if (reverse_r) + { + buf[0] = info[start]; + info[start] = info[start + 1]; + info[start + 1] = buf[0]; + } + } + } + } + + public: + bool ret; + private: + unsigned int start; + unsigned int end; + }; + + bool apply (hb_aat_apply_context_t *c) const + { + TRACE_APPLY (this); + + driver_context_t dc (this); + + StateTableDriver driver (machine, c->buffer, c->face); + driver.drive (&dc); + + return_trace (dc.ret); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (machine.sanitize (c)); + } + + protected: + StateTable machine; + public: + DEFINE_SIZE_STATIC (16); +}; + +template +struct ContextualSubtable +{ + typedef typename Types::HBUINT HBUINT; + + struct EntryData + { + HBUINT16 markIndex; /* Index of the substitution table for the + * marked glyph (use 0xFFFF for none). */ + HBUINT16 currentIndex; /* Index of the substitution table for the + * current glyph (use 0xFFFF for none). */ + public: + DEFINE_SIZE_STATIC (4); + }; + + struct driver_context_t + { + static constexpr bool in_place = true; + enum Flags + { + SetMark = 0x8000, /* If set, make the current glyph the marked glyph. */ + DontAdvance = 0x4000, /* If set, don't advance to the next glyph before + * going to the new state. */ + Reserved = 0x3FFF, /* These bits are reserved and should be set to 0. */ + }; + + driver_context_t (const ContextualSubtable *table_, + hb_aat_apply_context_t *c_) : + ret (false), + c (c_), + mark_set (false), + mark (0), + table (table_), + subs (table+table->substitutionTables) {} + + bool is_actionable (StateTableDriver *driver, + const Entry &entry) + { + hb_buffer_t *buffer = driver->buffer; + + if (buffer->idx == buffer->len && !mark_set) + return false; + + return entry.data.markIndex != 0xFFFF || entry.data.currentIndex != 0xFFFF; + } + void transition (StateTableDriver *driver, + const Entry &entry) + { + hb_buffer_t *buffer = driver->buffer; + + /* Looks like CoreText applies neither mark nor current substitution for + * end-of-text if mark was not explicitly set. */ + if (buffer->idx == buffer->len && !mark_set) + return; + + const HBGlyphID *replacement; + + replacement = nullptr; + if (Types::extended) + { + if (entry.data.markIndex != 0xFFFF) + { + const Lookup &lookup = subs[entry.data.markIndex]; + replacement = lookup.get_value (buffer->info[mark].codepoint, driver->num_glyphs); + } + } + else + { + unsigned int offset = entry.data.markIndex + buffer->info[mark].codepoint; + const UnsizedArrayOf &subs_old = (const UnsizedArrayOf &) subs; + replacement = &subs_old[Types::wordOffsetToIndex (offset, table, subs_old.arrayZ)]; + if (!replacement->sanitize (&c->sanitizer) || !*replacement) + replacement = nullptr; + } + if (replacement) + { + buffer->unsafe_to_break (mark, hb_min (buffer->idx + 1, buffer->len)); + buffer->info[mark].codepoint = *replacement; + ret = true; + } + + replacement = nullptr; + unsigned int idx = hb_min (buffer->idx, buffer->len - 1); + if (Types::extended) + { + if (entry.data.currentIndex != 0xFFFF) + { + const Lookup &lookup = subs[entry.data.currentIndex]; + replacement = lookup.get_value (buffer->info[idx].codepoint, driver->num_glyphs); + } + } + else + { + unsigned int offset = entry.data.currentIndex + buffer->info[idx].codepoint; + const UnsizedArrayOf &subs_old = (const UnsizedArrayOf &) subs; + replacement = &subs_old[Types::wordOffsetToIndex (offset, table, subs_old.arrayZ)]; + if (!replacement->sanitize (&c->sanitizer) || !*replacement) + replacement = nullptr; + } + if (replacement) + { + buffer->info[idx].codepoint = *replacement; + ret = true; + } + + if (entry.flags & SetMark) + { + mark_set = true; + mark = buffer->idx; + } + } + + public: + bool ret; + private: + hb_aat_apply_context_t *c; + bool mark_set; + unsigned int mark; + const ContextualSubtable *table; + const UnsizedOffsetListOf, HBUINT, false> &subs; + }; + + bool apply (hb_aat_apply_context_t *c) const + { + TRACE_APPLY (this); + + driver_context_t dc (this, c); + + StateTableDriver driver (machine, c->buffer, c->face); + driver.drive (&dc); + + return_trace (dc.ret); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + + unsigned int num_entries = 0; + if (unlikely (!machine.sanitize (c, &num_entries))) return_trace (false); + + if (!Types::extended) + return_trace (substitutionTables.sanitize (c, this, 0)); + + unsigned int num_lookups = 0; + + const Entry *entries = machine.get_entries (); + for (unsigned int i = 0; i < num_entries; i++) + { + const EntryData &data = entries[i].data; + + if (data.markIndex != 0xFFFF) + num_lookups = hb_max (num_lookups, 1 + data.markIndex); + if (data.currentIndex != 0xFFFF) + num_lookups = hb_max (num_lookups, 1 + data.currentIndex); + } + + return_trace (substitutionTables.sanitize (c, this, num_lookups)); + } + + protected: + StateTable + machine; + NNOffsetTo, HBUINT, false>, HBUINT> + substitutionTables; + public: + DEFINE_SIZE_STATIC (20); +}; + + +template +struct LigatureEntry; + +template <> +struct LigatureEntry +{ + enum Flags + { + SetComponent = 0x8000, /* Push this glyph onto the component stack for + * eventual processing. */ + DontAdvance = 0x4000, /* Leave the glyph pointer at this glyph for the + next iteration. */ + PerformAction = 0x2000, /* Use the ligActionIndex to process a ligature + * group. */ + Reserved = 0x1FFF, /* These bits are reserved and should be set to 0. */ + }; + + struct EntryData + { + HBUINT16 ligActionIndex; /* Index to the first ligActionTable entry + * for processing this group, if indicated + * by the flags. */ + public: + DEFINE_SIZE_STATIC (2); + }; + + static bool performAction (const Entry &entry) + { return entry.flags & PerformAction; } + + static unsigned int ligActionIndex (const Entry &entry) + { return entry.data.ligActionIndex; } +}; +template <> +struct LigatureEntry +{ + enum Flags + { + SetComponent = 0x8000, /* Push this glyph onto the component stack for + * eventual processing. */ + DontAdvance = 0x4000, /* Leave the glyph pointer at this glyph for the + next iteration. */ + Offset = 0x3FFF, /* Byte offset from beginning of subtable to the + * ligature action list. This value must be a + * multiple of 4. */ + }; + + typedef void EntryData; + + static bool performAction (const Entry &entry) + { return entry.flags & Offset; } + + static unsigned int ligActionIndex (const Entry &entry) + { return entry.flags & Offset; } +}; + + +template +struct LigatureSubtable +{ + typedef typename Types::HBUINT HBUINT; + + typedef LigatureEntry LigatureEntryT; + typedef typename LigatureEntryT::EntryData EntryData; + + struct driver_context_t + { + static constexpr bool in_place = false; + enum + { + DontAdvance = LigatureEntryT::DontAdvance, + }; + enum LigActionFlags + { + LigActionLast = 0x80000000, /* This is the last action in the list. This also + * implies storage. */ + LigActionStore = 0x40000000, /* Store the ligature at the current cumulated index + * in the ligature table in place of the marked + * (i.e. currently-popped) glyph. */ + LigActionOffset = 0x3FFFFFFF, /* A 30-bit value which is sign-extended to 32-bits + * and added to the glyph ID, resulting in an index + * into the component table. */ + }; + + driver_context_t (const LigatureSubtable *table_, + hb_aat_apply_context_t *c_) : + ret (false), + c (c_), + table (table_), + ligAction (table+table->ligAction), + component (table+table->component), + ligature (table+table->ligature), + match_length (0) {} + + bool is_actionable (StateTableDriver *driver HB_UNUSED, + const Entry &entry) + { + return LigatureEntryT::performAction (entry); + } + void transition (StateTableDriver *driver, + const Entry &entry) + { + hb_buffer_t *buffer = driver->buffer; + + DEBUG_MSG (APPLY, nullptr, "Ligature transition at %u", buffer->idx); + if (entry.flags & LigatureEntryT::SetComponent) + { + /* Never mark same index twice, in case DontAdvance was used... */ + if (match_length && match_positions[(match_length - 1u) % ARRAY_LENGTH (match_positions)] == buffer->out_len) + match_length--; + + match_positions[match_length++ % ARRAY_LENGTH (match_positions)] = buffer->out_len; + DEBUG_MSG (APPLY, nullptr, "Set component at %u", buffer->out_len); + } + + if (LigatureEntryT::performAction (entry)) + { + DEBUG_MSG (APPLY, nullptr, "Perform action with %u", match_length); + unsigned int end = buffer->out_len; + + if (unlikely (!match_length)) + return; + + if (buffer->idx >= buffer->len) + return; /* TODO Work on previous instead? */ + + unsigned int cursor = match_length; + + unsigned int action_idx = LigatureEntryT::ligActionIndex (entry); + action_idx = Types::offsetToIndex (action_idx, table, ligAction.arrayZ); + const HBUINT32 *actionData = &ligAction[action_idx]; + + unsigned int ligature_idx = 0; + unsigned int action; + do + { + if (unlikely (!cursor)) + { + /* Stack underflow. Clear the stack. */ + DEBUG_MSG (APPLY, nullptr, "Stack underflow"); + match_length = 0; + break; + } + + DEBUG_MSG (APPLY, nullptr, "Moving to stack position %u", cursor - 1); + buffer->move_to (match_positions[--cursor % ARRAY_LENGTH (match_positions)]); + + if (unlikely (!actionData->sanitize (&c->sanitizer))) break; + action = *actionData; + + uint32_t uoffset = action & LigActionOffset; + if (uoffset & 0x20000000) + uoffset |= 0xC0000000; /* Sign-extend. */ + int32_t offset = (int32_t) uoffset; + unsigned int component_idx = buffer->cur().codepoint + offset; + component_idx = Types::wordOffsetToIndex (component_idx, table, component.arrayZ); + const HBUINT16 &componentData = component[component_idx]; + if (unlikely (!componentData.sanitize (&c->sanitizer))) break; + ligature_idx += componentData; + + DEBUG_MSG (APPLY, nullptr, "Action store %u last %u", + bool (action & LigActionStore), + bool (action & LigActionLast)); + if (action & (LigActionStore | LigActionLast)) + { + ligature_idx = Types::offsetToIndex (ligature_idx, table, ligature.arrayZ); + const HBGlyphID &ligatureData = ligature[ligature_idx]; + if (unlikely (!ligatureData.sanitize (&c->sanitizer))) break; + hb_codepoint_t lig = ligatureData; + + DEBUG_MSG (APPLY, nullptr, "Produced ligature %u", lig); + buffer->replace_glyph (lig); + + unsigned int lig_end = match_positions[(match_length - 1u) % ARRAY_LENGTH (match_positions)] + 1u; + /* Now go and delete all subsequent components. */ + while (match_length - 1u > cursor) + { + DEBUG_MSG (APPLY, nullptr, "Skipping ligature component"); + buffer->move_to (match_positions[--match_length % ARRAY_LENGTH (match_positions)]); + buffer->replace_glyph (DELETED_GLYPH); + } + + buffer->move_to (lig_end); + buffer->merge_out_clusters (match_positions[cursor % ARRAY_LENGTH (match_positions)], buffer->out_len); + } + + actionData++; + } + while (!(action & LigActionLast)); + buffer->move_to (end); + } + } + + public: + bool ret; + private: + hb_aat_apply_context_t *c; + const LigatureSubtable *table; + const UnsizedArrayOf &ligAction; + const UnsizedArrayOf &component; + const UnsizedArrayOf &ligature; + unsigned int match_length; + unsigned int match_positions[HB_MAX_CONTEXT_LENGTH]; + }; + + bool apply (hb_aat_apply_context_t *c) const + { + TRACE_APPLY (this); + + driver_context_t dc (this, c); + + StateTableDriver driver (machine, c->buffer, c->face); + driver.drive (&dc); + + return_trace (dc.ret); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + /* The rest of array sanitizations are done at run-time. */ + return_trace (c->check_struct (this) && machine.sanitize (c) && + ligAction && component && ligature); + } + + protected: + StateTable + machine; + NNOffsetTo, HBUINT> + ligAction; /* Offset to the ligature action table. */ + NNOffsetTo, HBUINT> + component; /* Offset to the component table. */ + NNOffsetTo, HBUINT> + ligature; /* Offset to the actual ligature lists. */ + public: + DEFINE_SIZE_STATIC (28); +}; + +template +struct NoncontextualSubtable +{ + bool apply (hb_aat_apply_context_t *c) const + { + TRACE_APPLY (this); + + bool ret = false; + unsigned int num_glyphs = c->face->get_num_glyphs (); + + hb_glyph_info_t *info = c->buffer->info; + unsigned int count = c->buffer->len; + for (unsigned int i = 0; i < count; i++) + { + const HBGlyphID *replacement = substitute.get_value (info[i].codepoint, num_glyphs); + if (replacement) + { + info[i].codepoint = *replacement; + ret = true; + } + } + + return_trace (ret); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (substitute.sanitize (c)); + } + + protected: + Lookup substitute; + public: + DEFINE_SIZE_MIN (2); +}; + +template +struct InsertionSubtable +{ + typedef typename Types::HBUINT HBUINT; + + struct EntryData + { + HBUINT16 currentInsertIndex; /* Zero-based index into the insertion glyph table. + * The number of glyphs to be inserted is contained + * in the currentInsertCount field in the flags. + * A value of 0xFFFF indicates no insertion is to + * be done. */ + HBUINT16 markedInsertIndex; /* Zero-based index into the insertion glyph table. + * The number of glyphs to be inserted is contained + * in the markedInsertCount field in the flags. + * A value of 0xFFFF indicates no insertion is to + * be done. */ + public: + DEFINE_SIZE_STATIC (4); + }; + + struct driver_context_t + { + static constexpr bool in_place = false; + enum Flags + { + SetMark = 0x8000, /* If set, mark the current glyph. */ + DontAdvance = 0x4000, /* If set, don't advance to the next glyph before + * going to the new state. This does not mean + * that the glyph pointed to is the same one as + * before. If you've made insertions immediately + * downstream of the current glyph, the next glyph + * processed would in fact be the first one + * inserted. */ + CurrentIsKashidaLike= 0x2000, /* If set, and the currentInsertList is nonzero, + * then the specified glyph list will be inserted + * as a kashida-like insertion, either before or + * after the current glyph (depending on the state + * of the currentInsertBefore flag). If clear, and + * the currentInsertList is nonzero, then the + * specified glyph list will be inserted as a + * split-vowel-like insertion, either before or + * after the current glyph (depending on the state + * of the currentInsertBefore flag). */ + MarkedIsKashidaLike= 0x1000, /* If set, and the markedInsertList is nonzero, + * then the specified glyph list will be inserted + * as a kashida-like insertion, either before or + * after the marked glyph (depending on the state + * of the markedInsertBefore flag). If clear, and + * the markedInsertList is nonzero, then the + * specified glyph list will be inserted as a + * split-vowel-like insertion, either before or + * after the marked glyph (depending on the state + * of the markedInsertBefore flag). */ + CurrentInsertBefore= 0x0800, /* If set, specifies that insertions are to be made + * to the left of the current glyph. If clear, + * they're made to the right of the current glyph. */ + MarkedInsertBefore= 0x0400, /* If set, specifies that insertions are to be + * made to the left of the marked glyph. If clear, + * they're made to the right of the marked glyph. */ + CurrentInsertCount= 0x3E0, /* This 5-bit field is treated as a count of the + * number of glyphs to insert at the current + * position. Since zero means no insertions, the + * largest number of insertions at any given + * current location is 31 glyphs. */ + MarkedInsertCount= 0x001F, /* This 5-bit field is treated as a count of the + * number of glyphs to insert at the marked + * position. Since zero means no insertions, the + * largest number of insertions at any given + * marked location is 31 glyphs. */ + }; + + driver_context_t (const InsertionSubtable *table, + hb_aat_apply_context_t *c_) : + ret (false), + c (c_), + mark (0), + insertionAction (table+table->insertionAction) {} + + bool is_actionable (StateTableDriver *driver HB_UNUSED, + const Entry &entry) + { + return (entry.flags & (CurrentInsertCount | MarkedInsertCount)) && + (entry.data.currentInsertIndex != 0xFFFF ||entry.data.markedInsertIndex != 0xFFFF); + } + void transition (StateTableDriver *driver, + const Entry &entry) + { + hb_buffer_t *buffer = driver->buffer; + unsigned int flags = entry.flags; + + unsigned mark_loc = buffer->out_len; + + if (entry.data.markedInsertIndex != 0xFFFF) + { + unsigned int count = (flags & MarkedInsertCount); + unsigned int start = entry.data.markedInsertIndex; + const HBGlyphID *glyphs = &insertionAction[start]; + if (unlikely (!c->sanitizer.check_array (glyphs, count))) count = 0; + + bool before = flags & MarkedInsertBefore; + + unsigned int end = buffer->out_len; + buffer->move_to (mark); + + if (buffer->idx < buffer->len && !before) + buffer->copy_glyph (); + /* TODO We ignore KashidaLike setting. */ + for (unsigned int i = 0; i < count; i++) + buffer->output_glyph (glyphs[i]); + if (buffer->idx < buffer->len && !before) + buffer->skip_glyph (); + + buffer->move_to (end + count); + + buffer->unsafe_to_break_from_outbuffer (mark, hb_min (buffer->idx + 1, buffer->len)); + } + + if (flags & SetMark) + mark = mark_loc; + + if (entry.data.currentInsertIndex != 0xFFFF) + { + unsigned int count = (flags & CurrentInsertCount) >> 5; + unsigned int start = entry.data.currentInsertIndex; + const HBGlyphID *glyphs = &insertionAction[start]; + if (unlikely (!c->sanitizer.check_array (glyphs, count))) count = 0; + + bool before = flags & CurrentInsertBefore; + + unsigned int end = buffer->out_len; + + if (buffer->idx < buffer->len && !before) + buffer->copy_glyph (); + /* TODO We ignore KashidaLike setting. */ + for (unsigned int i = 0; i < count; i++) + buffer->output_glyph (glyphs[i]); + if (buffer->idx < buffer->len && !before) + buffer->skip_glyph (); + + /* Humm. Not sure where to move to. There's this wording under + * DontAdvance flag: + * + * "If set, don't update the glyph index before going to the new state. + * This does not mean that the glyph pointed to is the same one as + * before. If you've made insertions immediately downstream of the + * current glyph, the next glyph processed would in fact be the first + * one inserted." + * + * This suggests that if DontAdvance is NOT set, we should move to + * end+count. If it *was*, then move to end, such that newly inserted + * glyphs are now visible. + * + * https://github.com/harfbuzz/harfbuzz/issues/1224#issuecomment-427691417 + */ + buffer->move_to ((flags & DontAdvance) ? end : end + count); + } + } + + public: + bool ret; + private: + hb_aat_apply_context_t *c; + unsigned int mark; + const UnsizedArrayOf &insertionAction; + }; + + bool apply (hb_aat_apply_context_t *c) const + { + TRACE_APPLY (this); + + driver_context_t dc (this, c); + + StateTableDriver driver (machine, c->buffer, c->face); + driver.drive (&dc); + + return_trace (dc.ret); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + /* The rest of array sanitizations are done at run-time. */ + return_trace (c->check_struct (this) && machine.sanitize (c) && + insertionAction); + } + + protected: + StateTable + machine; + NNOffsetTo, HBUINT> + insertionAction; /* Byte offset from stateHeader to the start of + * the insertion glyph table. */ + public: + DEFINE_SIZE_STATIC (20); +}; + + +struct Feature +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + public: + HBUINT16 featureType; /* The type of feature. */ + HBUINT16 featureSetting; /* The feature's setting (aka selector). */ + HBUINT32 enableFlags; /* Flags for the settings that this feature + * and setting enables. */ + HBUINT32 disableFlags; /* Complement of flags for the settings that this + * feature and setting disable. */ + + public: + DEFINE_SIZE_STATIC (12); +}; + +template +struct ChainSubtable +{ + typedef typename Types::HBUINT HBUINT; + + template + friend struct Chain; + + unsigned int get_size () const { return length; } + unsigned int get_type () const { return coverage & 0xFF; } + unsigned int get_coverage () const { return coverage >> (sizeof (HBUINT) * 8 - 8); } + + enum Coverage + { + Vertical = 0x80, /* If set, this subtable will only be applied + * to vertical text. If clear, this subtable + * will only be applied to horizontal text. */ + Backwards = 0x40, /* If set, this subtable will process glyphs + * in descending order. If clear, it will + * process the glyphs in ascending order. */ + AllDirections = 0x20, /* If set, this subtable will be applied to + * both horizontal and vertical text (i.e. + * the state of bit 0x80000000 is ignored). */ + Logical = 0x10, /* If set, this subtable will process glyphs + * in logical order (or reverse logical order, + * depending on the value of bit 0x80000000). */ + }; + enum Type + { + Rearrangement = 0, + Contextual = 1, + Ligature = 2, + Noncontextual = 4, + Insertion = 5 + }; + + template + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const + { + unsigned int subtable_type = get_type (); + TRACE_DISPATCH (this, subtable_type); + switch (subtable_type) { + case Rearrangement: return_trace (c->dispatch (u.rearrangement, hb_forward (ds)...)); + case Contextual: return_trace (c->dispatch (u.contextual, hb_forward (ds)...)); + case Ligature: return_trace (c->dispatch (u.ligature, hb_forward (ds)...)); + case Noncontextual: return_trace (c->dispatch (u.noncontextual, hb_forward (ds)...)); + case Insertion: return_trace (c->dispatch (u.insertion, hb_forward (ds)...)); + default: return_trace (c->default_return_value ()); + } + } + + bool apply (hb_aat_apply_context_t *c) const + { + TRACE_APPLY (this); + hb_sanitize_with_object_t with (&c->sanitizer, this); + return_trace (dispatch (c)); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (!length.sanitize (c) || + length <= min_size || + !c->check_range (this, length)) + return_trace (false); + + hb_sanitize_with_object_t with (c, this); + return_trace (dispatch (c)); + } + + protected: + HBUINT length; /* Total subtable length, including this header. */ + HBUINT coverage; /* Coverage flags and subtable type. */ + HBUINT32 subFeatureFlags;/* The 32-bit mask identifying which subtable this is. */ + union { + RearrangementSubtable rearrangement; + ContextualSubtable contextual; + LigatureSubtable ligature; + NoncontextualSubtable noncontextual; + InsertionSubtable insertion; + } u; + public: + DEFINE_SIZE_MIN (2 * sizeof (HBUINT) + 4); +}; + +template +struct Chain +{ + typedef typename Types::HBUINT HBUINT; + + hb_mask_t compile_flags (const hb_aat_map_builder_t *map) const + { + hb_mask_t flags = defaultFlags; + { + unsigned int count = featureCount; + for (unsigned i = 0; i < count; i++) + { + const Feature &feature = featureZ[i]; + hb_aat_layout_feature_type_t type = (hb_aat_layout_feature_type_t) (unsigned int) feature.featureType; + hb_aat_layout_feature_selector_t setting = (hb_aat_layout_feature_selector_t) (unsigned int) feature.featureSetting; + retry: + const hb_aat_map_builder_t::feature_info_t *info = map->features.bsearch (type); + if (info && info->setting == setting) + { + flags &= feature.disableFlags; + flags |= feature.enableFlags; + } + else if (type == HB_AAT_LAYOUT_FEATURE_TYPE_LETTER_CASE && setting == HB_AAT_LAYOUT_FEATURE_SELECTOR_SMALL_CAPS) + { + /* Deprecated. https://github.com/harfbuzz/harfbuzz/issues/1342 */ + type = HB_AAT_LAYOUT_FEATURE_TYPE_LOWER_CASE; + setting = HB_AAT_LAYOUT_FEATURE_SELECTOR_LOWER_CASE_SMALL_CAPS; + goto retry; + } + } + } + return flags; + } + + void apply (hb_aat_apply_context_t *c, + hb_mask_t flags) const + { + const ChainSubtable *subtable = &StructAfter> (featureZ.as_array (featureCount)); + unsigned int count = subtableCount; + for (unsigned int i = 0; i < count; i++) + { + bool reverse; + + if (!(subtable->subFeatureFlags & flags)) + goto skip; + + if (!(subtable->get_coverage() & ChainSubtable::AllDirections) && + HB_DIRECTION_IS_VERTICAL (c->buffer->props.direction) != + bool (subtable->get_coverage() & ChainSubtable::Vertical)) + goto skip; + + /* Buffer contents is always in logical direction. Determine if + * we need to reverse before applying this subtable. We reverse + * back after if we did reverse indeed. + * + * Quoting the spac: + * """ + * Bits 28 and 30 of the coverage field control the order in which + * glyphs are processed when the subtable is run by the layout engine. + * Bit 28 is used to indicate if the glyph processing direction is + * the same as logical order or layout order. Bit 30 is used to + * indicate whether glyphs are processed forwards or backwards within + * that order. + + Bit 30 Bit 28 Interpretation for Horizontal Text + 0 0 The subtable is processed in layout order + (the same order as the glyphs, which is + always left-to-right). + 1 0 The subtable is processed in reverse layout order + (the order opposite that of the glyphs, which is + always right-to-left). + 0 1 The subtable is processed in logical order + (the same order as the characters, which may be + left-to-right or right-to-left). + 1 1 The subtable is processed in reverse logical order + (the order opposite that of the characters, which + may be right-to-left or left-to-right). + */ + reverse = subtable->get_coverage () & ChainSubtable::Logical ? + bool (subtable->get_coverage () & ChainSubtable::Backwards) : + bool (subtable->get_coverage () & ChainSubtable::Backwards) != + HB_DIRECTION_IS_BACKWARD (c->buffer->props.direction); + + if (!c->buffer->message (c->font, "start chain subtable %d", c->lookup_index)) + goto skip; + + if (reverse) + c->buffer->reverse (); + + subtable->apply (c); + + if (reverse) + c->buffer->reverse (); + + (void) c->buffer->message (c->font, "end chain subtable %d", c->lookup_index); + + if (unlikely (!c->buffer->successful)) return; + + skip: + subtable = &StructAfter> (*subtable); + c->set_lookup_index (c->lookup_index + 1); + } + } + + unsigned int get_size () const { return length; } + + bool sanitize (hb_sanitize_context_t *c, unsigned int version HB_UNUSED) const + { + TRACE_SANITIZE (this); + if (!length.sanitize (c) || + length < min_size || + !c->check_range (this, length)) + return_trace (false); + + if (!c->check_array (featureZ.arrayZ, featureCount)) + return_trace (false); + + const ChainSubtable *subtable = &StructAfter> (featureZ.as_array (featureCount)); + unsigned int count = subtableCount; + for (unsigned int i = 0; i < count; i++) + { + if (!subtable->sanitize (c)) + return_trace (false); + subtable = &StructAfter> (*subtable); + } + + return_trace (true); + } + + protected: + HBUINT32 defaultFlags; /* The default specification for subtables. */ + HBUINT32 length; /* Total byte count, including this header. */ + HBUINT featureCount; /* Number of feature subtable entries. */ + HBUINT subtableCount; /* The number of subtables in the chain. */ + + UnsizedArrayOf featureZ; /* Features. */ +/*ChainSubtable firstSubtable;*//* Subtables. */ +/*subtableGlyphCoverageArray*/ /* Only if version >= 3. We don't use. */ + + public: + DEFINE_SIZE_MIN (8 + 2 * sizeof (HBUINT)); +}; + + +/* + * The 'mort'/'morx' Table + */ + +template +struct mortmorx +{ + static constexpr hb_tag_t tableTag = TAG; + + bool has_data () const { return version != 0; } + + void compile_flags (const hb_aat_map_builder_t *mapper, + hb_aat_map_t *map) const + { + const Chain *chain = &firstChain; + unsigned int count = chainCount; + for (unsigned int i = 0; i < count; i++) + { + map->chain_flags.push (chain->compile_flags (mapper)); + chain = &StructAfter> (*chain); + } + } + + void apply (hb_aat_apply_context_t *c) const + { + if (unlikely (!c->buffer->successful)) return; + c->set_lookup_index (0); + const Chain *chain = &firstChain; + unsigned int count = chainCount; + for (unsigned int i = 0; i < count; i++) + { + chain->apply (c, c->plan->aat_map.chain_flags[i]); + if (unlikely (!c->buffer->successful)) return; + chain = &StructAfter> (*chain); + } + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (!version.sanitize (c) || !version || !chainCount.sanitize (c)) + return_trace (false); + + const Chain *chain = &firstChain; + unsigned int count = chainCount; + for (unsigned int i = 0; i < count; i++) + { + if (!chain->sanitize (c, version)) + return_trace (false); + chain = &StructAfter> (*chain); + } + + return_trace (true); + } + + protected: + HBUINT16 version; /* Version number of the glyph metamorphosis table. + * 1, 2, or 3. */ + HBUINT16 unused; /* Set to 0. */ + HBUINT32 chainCount; /* Number of metamorphosis chains contained in this + * table. */ + Chain firstChain; /* Chains. */ + + public: + DEFINE_SIZE_MIN (8); +}; + +struct morx : mortmorx {}; +struct mort : mortmorx {}; + + +} /* namespace AAT */ + + +#endif /* HB_AAT_LAYOUT_MORX_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-opbd-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-opbd-table.hh new file mode 100644 index 000000000..4e0234074 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-opbd-table.hh @@ -0,0 +1,173 @@ +/* + * Copyright © 2019 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#ifndef HB_AAT_LAYOUT_OPBD_TABLE_HH +#define HB_AAT_LAYOUT_OPBD_TABLE_HH + +#include "hb-aat-layout-common.hh" +#include "hb-open-type.hh" + +/* + * opbd -- Optical Bounds + * https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6opbd.html + */ +#define HB_AAT_TAG_opbd HB_TAG('o','p','b','d') + + +namespace AAT { + +struct OpticalBounds +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this))); + } + + FWORD leftSide; + FWORD topSide; + FWORD rightSide; + FWORD bottomSide; + public: + DEFINE_SIZE_STATIC (8); +}; + +struct opbdFormat0 +{ + bool get_bounds (hb_font_t *font, hb_codepoint_t glyph_id, + hb_glyph_extents_t *extents, const void *base) const + { + const OffsetTo *bounds_offset = lookupTable.get_value (glyph_id, font->face->get_num_glyphs ()); + if (!bounds_offset) return false; + const OpticalBounds &bounds = base+*bounds_offset; + + if (extents) + *extents = { + font->em_scale_x (bounds.leftSide), + font->em_scale_y (bounds.topSide), + font->em_scale_x (bounds.rightSide), + font->em_scale_y (bounds.bottomSide) + }; + return true; + } + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && lookupTable.sanitize (c, base))); + } + + protected: + Lookup> + lookupTable; /* Lookup table associating glyphs with the four + * int16 values for the left-side, top-side, + * right-side, and bottom-side optical bounds. */ + public: + DEFINE_SIZE_MIN (2); +}; + +struct opbdFormat1 +{ + bool get_bounds (hb_font_t *font, hb_codepoint_t glyph_id, + hb_glyph_extents_t *extents, const void *base) const + { + const OffsetTo *bounds_offset = lookupTable.get_value (glyph_id, font->face->get_num_glyphs ()); + if (!bounds_offset) return false; + const OpticalBounds &bounds = base+*bounds_offset; + + hb_position_t left = 0, top = 0, right = 0, bottom = 0, ignore; + if (font->get_glyph_contour_point (glyph_id, bounds.leftSide, &left, &ignore) || + font->get_glyph_contour_point (glyph_id, bounds.topSide, &ignore, &top) || + font->get_glyph_contour_point (glyph_id, bounds.rightSide, &right, &ignore) || + font->get_glyph_contour_point (glyph_id, bounds.bottomSide, &ignore, &bottom)) + { + if (extents) + *extents = {left, top, right, bottom}; + return true; + } + return false; + } + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && lookupTable.sanitize (c, base))); + } + + protected: + Lookup> + lookupTable; /* Lookup table associating glyphs with the four + * int16 values for the left-side, top-side, + * right-side, and bottom-side optical bounds. */ + public: + DEFINE_SIZE_MIN (2); +}; + +struct opbd +{ + static constexpr hb_tag_t tableTag = HB_AAT_TAG_opbd; + + bool get_bounds (hb_font_t *font, hb_codepoint_t glyph_id, + hb_glyph_extents_t *extents) const + { + switch (format) + { + case 0: return u.format0.get_bounds (font, glyph_id, extents, this); + case 1: return u.format1.get_bounds (font, glyph_id, extents, this); + default:return false; + } + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (unlikely (!c->check_struct (this) || version.major != 1)) + return_trace (false); + + switch (format) + { + case 0: return_trace (u.format0.sanitize (c, this)); + case 1: return_trace (u.format1.sanitize (c, this)); + default:return_trace (true); + } + } + + protected: + FixedVersion<>version; /* Version number of the optical bounds + * table (0x00010000 for the current version). */ + HBUINT16 format; /* Format of the optical bounds table. + * Format 0 indicates distance and Format 1 indicates + * control point. */ + union { + opbdFormat0 format0; + opbdFormat1 format1; + } u; + public: + DEFINE_SIZE_MIN (8); +}; + +} /* namespace AAT */ + + +#endif /* HB_AAT_LAYOUT_OPBD_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-trak-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-trak-table.hh new file mode 100644 index 000000000..99dddd882 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-trak-table.hh @@ -0,0 +1,230 @@ +/* + * Copyright © 2018 Ebrahim Byagowi + * Copyright © 2018 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_AAT_LAYOUT_TRAK_TABLE_HH +#define HB_AAT_LAYOUT_TRAK_TABLE_HH + +#include "hb-aat-layout-common.hh" +#include "hb-ot-layout.hh" +#include "hb-open-type.hh" + +/* + * trak -- Tracking + * https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6trak.html + */ +#define HB_AAT_TAG_trak HB_TAG('t','r','a','k') + + +namespace AAT { + + +struct TrackTableEntry +{ + friend struct TrackData; + + float get_track_value () const { return track.to_float (); } + + int get_value (const void *base, unsigned int index, + unsigned int table_size) const + { return (base+valuesZ).as_array (table_size)[index]; } + + public: + bool sanitize (hb_sanitize_context_t *c, const void *base, + unsigned int table_size) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + (valuesZ.sanitize (c, base, table_size)))); + } + + protected: + HBFixed track; /* Track value for this record. */ + NameID trackNameID; /* The 'name' table index for this track. + * (a short word or phrase like "loose" + * or "very tight") */ + NNOffsetTo> + valuesZ; /* Offset from start of tracking table to + * per-size tracking values for this track. */ + + public: + DEFINE_SIZE_STATIC (8); +}; + +struct TrackData +{ + float interpolate_at (unsigned int idx, + float target_size, + const TrackTableEntry &trackTableEntry, + const void *base) const + { + unsigned int sizes = nSizes; + hb_array_t size_table ((base+sizeTable).arrayZ, sizes); + + float s0 = size_table[idx].to_float (); + float s1 = size_table[idx + 1].to_float (); + float t = unlikely (s0 == s1) ? 0.f : (target_size - s0) / (s1 - s0); + return t * trackTableEntry.get_value (base, idx + 1, sizes) + + (1.f - t) * trackTableEntry.get_value (base, idx, sizes); + } + + int get_tracking (const void *base, float ptem) const + { + /* + * Choose track. + */ + const TrackTableEntry *trackTableEntry = nullptr; + unsigned int count = nTracks; + for (unsigned int i = 0; i < count; i++) + { + /* Note: Seems like the track entries are sorted by values. But the + * spec doesn't explicitly say that. It just mentions it in the example. */ + + /* For now we only seek for track entries with zero tracking value */ + + if (trackTable[i].get_track_value () == 0.f) + { + trackTableEntry = &trackTable[i]; + break; + } + } + if (!trackTableEntry) return 0.; + + /* + * Choose size. + */ + unsigned int sizes = nSizes; + if (!sizes) return 0.; + if (sizes == 1) return trackTableEntry->get_value (base, 0, sizes); + + hb_array_t size_table ((base+sizeTable).arrayZ, sizes); + unsigned int size_index; + for (size_index = 0; size_index < sizes - 1; size_index++) + if (size_table[size_index].to_float () >= ptem) + break; + + return roundf (interpolate_at (size_index ? size_index - 1 : 0, ptem, + *trackTableEntry, base)); + } + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + sizeTable.sanitize (c, base, nSizes) && + trackTable.sanitize (c, nTracks, base, nSizes))); + } + + protected: + HBUINT16 nTracks; /* Number of separate tracks included in this table. */ + HBUINT16 nSizes; /* Number of point sizes included in this table. */ + LOffsetTo, false> + sizeTable; /* Offset from start of the tracking table to + * Array[nSizes] of size values.. */ + UnsizedArrayOf + trackTable; /* Array[nTracks] of TrackTableEntry records. */ + + public: + DEFINE_SIZE_ARRAY (8, trackTable); +}; + +struct trak +{ + static constexpr hb_tag_t tableTag = HB_AAT_TAG_trak; + + bool has_data () const { return version.to_int (); } + + bool apply (hb_aat_apply_context_t *c) const + { + TRACE_APPLY (this); + + hb_mask_t trak_mask = c->plan->trak_mask; + + const float ptem = c->font->ptem; + if (unlikely (ptem <= 0.f)) + return_trace (false); + + hb_buffer_t *buffer = c->buffer; + if (HB_DIRECTION_IS_HORIZONTAL (buffer->props.direction)) + { + const TrackData &trackData = this+horizData; + int tracking = trackData.get_tracking (this, ptem); + hb_position_t offset_to_add = c->font->em_scalef_x (tracking / 2); + hb_position_t advance_to_add = c->font->em_scalef_x (tracking); + foreach_grapheme (buffer, start, end) + { + if (!(buffer->info[start].mask & trak_mask)) continue; + buffer->pos[start].x_advance += advance_to_add; + buffer->pos[start].x_offset += offset_to_add; + } + } + else + { + const TrackData &trackData = this+vertData; + int tracking = trackData.get_tracking (this, ptem); + hb_position_t offset_to_add = c->font->em_scalef_y (tracking / 2); + hb_position_t advance_to_add = c->font->em_scalef_y (tracking); + foreach_grapheme (buffer, start, end) + { + if (!(buffer->info[start].mask & trak_mask)) continue; + buffer->pos[start].y_advance += advance_to_add; + buffer->pos[start].y_offset += offset_to_add; + } + } + + return_trace (true); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + + return_trace (likely (c->check_struct (this) && + version.major == 1 && + horizData.sanitize (c, this, this) && + vertData.sanitize (c, this, this))); + } + + protected: + FixedVersion<>version; /* Version of the tracking table + * (0x00010000u for version 1.0). */ + HBUINT16 format; /* Format of the tracking table (set to 0). */ + OffsetTo + horizData; /* Offset from start of tracking table to TrackData + * for horizontal text (or 0 if none). */ + OffsetTo + vertData; /* Offset from start of tracking table to TrackData + * for vertical text (or 0 if none). */ + HBUINT16 reserved; /* Reserved. Set to 0. */ + + public: + DEFINE_SIZE_STATIC (12); +}; + +} /* namespace AAT */ + + +#endif /* HB_AAT_LAYOUT_TRAK_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout.cc new file mode 100644 index 000000000..4e506de16 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout.cc @@ -0,0 +1,388 @@ +/* + * Copyright © 2017 Google, Inc. + * Copyright © 2018 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#include "hb.hh" + +#include "hb-aat-layout.hh" +#include "hb-aat-fdsc-table.hh" // Just so we compile it; unused otherwise. +#include "hb-aat-layout-ankr-table.hh" +#include "hb-aat-layout-bsln-table.hh" // Just so we compile it; unused otherwise. +#include "hb-aat-layout-feat-table.hh" +#include "hb-aat-layout-just-table.hh" // Just so we compile it; unused otherwise. +#include "hb-aat-layout-kerx-table.hh" +#include "hb-aat-layout-morx-table.hh" +#include "hb-aat-layout-trak-table.hh" +#include "hb-aat-ltag-table.hh" + + +/* + * hb_aat_apply_context_t + */ + +/* Note: This context is used for kerning, even without AAT, hence the condition. */ +#if !defined(HB_NO_AAT) || !defined(HB_NO_OT_KERN) + +AAT::hb_aat_apply_context_t::hb_aat_apply_context_t (const hb_ot_shape_plan_t *plan_, + hb_font_t *font_, + hb_buffer_t *buffer_, + hb_blob_t *blob) : + plan (plan_), + font (font_), + face (font->face), + buffer (buffer_), + sanitizer (), + ankr_table (&Null(AAT::ankr)), + lookup_index (0), + debug_depth (0) +{ + sanitizer.init (blob); + sanitizer.set_num_glyphs (face->get_num_glyphs ()); + sanitizer.start_processing (); + sanitizer.set_max_ops (HB_SANITIZE_MAX_OPS_MAX); +} + +AAT::hb_aat_apply_context_t::~hb_aat_apply_context_t () +{ sanitizer.end_processing (); } + +void +AAT::hb_aat_apply_context_t::set_ankr_table (const AAT::ankr *ankr_table_) +{ ankr_table = ankr_table_; } + +#endif + + +/** + * SECTION:hb-aat-layout + * @title: hb-aat-layout + * @short_description: Apple Advanced Typography Layout + * @include: hb-aat.h + * + * Functions for querying OpenType Layout features in the font face. + **/ + + +#if !defined(HB_NO_AAT) || defined(HAVE_CORETEXT) + +/* Table data courtesy of Apple. Converted from mnemonics to integers + * when moving to this file. */ +static const hb_aat_feature_mapping_t feature_mappings[] = +{ + {HB_TAG ('a','f','r','c'), HB_AAT_LAYOUT_FEATURE_TYPE_FRACTIONS, HB_AAT_LAYOUT_FEATURE_SELECTOR_VERTICAL_FRACTIONS, HB_AAT_LAYOUT_FEATURE_SELECTOR_NO_FRACTIONS}, + {HB_TAG ('c','2','p','c'), HB_AAT_LAYOUT_FEATURE_TYPE_UPPER_CASE, HB_AAT_LAYOUT_FEATURE_SELECTOR_UPPER_CASE_PETITE_CAPS, HB_AAT_LAYOUT_FEATURE_SELECTOR_DEFAULT_UPPER_CASE}, + {HB_TAG ('c','2','s','c'), HB_AAT_LAYOUT_FEATURE_TYPE_UPPER_CASE, HB_AAT_LAYOUT_FEATURE_SELECTOR_UPPER_CASE_SMALL_CAPS, HB_AAT_LAYOUT_FEATURE_SELECTOR_DEFAULT_UPPER_CASE}, + {HB_TAG ('c','a','l','t'), HB_AAT_LAYOUT_FEATURE_TYPE_CONTEXTUAL_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_CONTEXTUAL_ALTERNATES_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_CONTEXTUAL_ALTERNATES_OFF}, + {HB_TAG ('c','a','s','e'), HB_AAT_LAYOUT_FEATURE_TYPE_CASE_SENSITIVE_LAYOUT, HB_AAT_LAYOUT_FEATURE_SELECTOR_CASE_SENSITIVE_LAYOUT_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_CASE_SENSITIVE_LAYOUT_OFF}, + {HB_TAG ('c','l','i','g'), HB_AAT_LAYOUT_FEATURE_TYPE_LIGATURES, HB_AAT_LAYOUT_FEATURE_SELECTOR_CONTEXTUAL_LIGATURES_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_CONTEXTUAL_LIGATURES_OFF}, + {HB_TAG ('c','p','s','p'), HB_AAT_LAYOUT_FEATURE_TYPE_CASE_SENSITIVE_LAYOUT, HB_AAT_LAYOUT_FEATURE_SELECTOR_CASE_SENSITIVE_SPACING_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_CASE_SENSITIVE_SPACING_OFF}, + {HB_TAG ('c','s','w','h'), HB_AAT_LAYOUT_FEATURE_TYPE_CONTEXTUAL_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_CONTEXTUAL_SWASH_ALTERNATES_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_CONTEXTUAL_SWASH_ALTERNATES_OFF}, + {HB_TAG ('d','l','i','g'), HB_AAT_LAYOUT_FEATURE_TYPE_LIGATURES, HB_AAT_LAYOUT_FEATURE_SELECTOR_RARE_LIGATURES_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_RARE_LIGATURES_OFF}, + {HB_TAG ('e','x','p','t'), HB_AAT_LAYOUT_FEATURE_TYPE_CHARACTER_SHAPE, HB_AAT_LAYOUT_FEATURE_SELECTOR_EXPERT_CHARACTERS, (hb_aat_layout_feature_selector_t) 16}, + {HB_TAG ('f','r','a','c'), HB_AAT_LAYOUT_FEATURE_TYPE_FRACTIONS, HB_AAT_LAYOUT_FEATURE_SELECTOR_DIAGONAL_FRACTIONS, HB_AAT_LAYOUT_FEATURE_SELECTOR_NO_FRACTIONS}, + {HB_TAG ('f','w','i','d'), HB_AAT_LAYOUT_FEATURE_TYPE_TEXT_SPACING, HB_AAT_LAYOUT_FEATURE_SELECTOR_MONOSPACED_TEXT, (hb_aat_layout_feature_selector_t) 7}, + {HB_TAG ('h','a','l','t'), HB_AAT_LAYOUT_FEATURE_TYPE_TEXT_SPACING, HB_AAT_LAYOUT_FEATURE_SELECTOR_ALT_HALF_WIDTH_TEXT, (hb_aat_layout_feature_selector_t) 7}, + {HB_TAG ('h','i','s','t'), HB_AAT_LAYOUT_FEATURE_TYPE_LIGATURES, HB_AAT_LAYOUT_FEATURE_SELECTOR_HISTORICAL_LIGATURES_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_HISTORICAL_LIGATURES_OFF}, + {HB_TAG ('h','k','n','a'), HB_AAT_LAYOUT_FEATURE_TYPE_ALTERNATE_KANA, HB_AAT_LAYOUT_FEATURE_SELECTOR_ALTERNATE_HORIZ_KANA_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_ALTERNATE_HORIZ_KANA_OFF}, + {HB_TAG ('h','l','i','g'), HB_AAT_LAYOUT_FEATURE_TYPE_LIGATURES, HB_AAT_LAYOUT_FEATURE_SELECTOR_HISTORICAL_LIGATURES_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_HISTORICAL_LIGATURES_OFF}, + {HB_TAG ('h','n','g','l'), HB_AAT_LAYOUT_FEATURE_TYPE_TRANSLITERATION, HB_AAT_LAYOUT_FEATURE_SELECTOR_HANJA_TO_HANGUL, HB_AAT_LAYOUT_FEATURE_SELECTOR_NO_TRANSLITERATION}, + {HB_TAG ('h','o','j','o'), HB_AAT_LAYOUT_FEATURE_TYPE_CHARACTER_SHAPE, HB_AAT_LAYOUT_FEATURE_SELECTOR_HOJO_CHARACTERS, (hb_aat_layout_feature_selector_t) 16}, + {HB_TAG ('h','w','i','d'), HB_AAT_LAYOUT_FEATURE_TYPE_TEXT_SPACING, HB_AAT_LAYOUT_FEATURE_SELECTOR_HALF_WIDTH_TEXT, (hb_aat_layout_feature_selector_t) 7}, + {HB_TAG ('i','t','a','l'), HB_AAT_LAYOUT_FEATURE_TYPE_ITALIC_CJK_ROMAN, HB_AAT_LAYOUT_FEATURE_SELECTOR_CJK_ITALIC_ROMAN_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_CJK_ITALIC_ROMAN_OFF}, + {HB_TAG ('j','p','0','4'), HB_AAT_LAYOUT_FEATURE_TYPE_CHARACTER_SHAPE, HB_AAT_LAYOUT_FEATURE_SELECTOR_JIS2004_CHARACTERS, (hb_aat_layout_feature_selector_t) 16}, + {HB_TAG ('j','p','7','8'), HB_AAT_LAYOUT_FEATURE_TYPE_CHARACTER_SHAPE, HB_AAT_LAYOUT_FEATURE_SELECTOR_JIS1978_CHARACTERS, (hb_aat_layout_feature_selector_t) 16}, + {HB_TAG ('j','p','8','3'), HB_AAT_LAYOUT_FEATURE_TYPE_CHARACTER_SHAPE, HB_AAT_LAYOUT_FEATURE_SELECTOR_JIS1983_CHARACTERS, (hb_aat_layout_feature_selector_t) 16}, + {HB_TAG ('j','p','9','0'), HB_AAT_LAYOUT_FEATURE_TYPE_CHARACTER_SHAPE, HB_AAT_LAYOUT_FEATURE_SELECTOR_JIS1990_CHARACTERS, (hb_aat_layout_feature_selector_t) 16}, + {HB_TAG ('l','i','g','a'), HB_AAT_LAYOUT_FEATURE_TYPE_LIGATURES, HB_AAT_LAYOUT_FEATURE_SELECTOR_COMMON_LIGATURES_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_COMMON_LIGATURES_OFF}, + {HB_TAG ('l','n','u','m'), HB_AAT_LAYOUT_FEATURE_TYPE_NUMBER_CASE, HB_AAT_LAYOUT_FEATURE_SELECTOR_UPPER_CASE_NUMBERS, (hb_aat_layout_feature_selector_t) 2}, + {HB_TAG ('m','g','r','k'), HB_AAT_LAYOUT_FEATURE_TYPE_MATHEMATICAL_EXTRAS, HB_AAT_LAYOUT_FEATURE_SELECTOR_MATHEMATICAL_GREEK_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_MATHEMATICAL_GREEK_OFF}, + {HB_TAG ('n','l','c','k'), HB_AAT_LAYOUT_FEATURE_TYPE_CHARACTER_SHAPE, HB_AAT_LAYOUT_FEATURE_SELECTOR_NLCCHARACTERS, (hb_aat_layout_feature_selector_t) 16}, + {HB_TAG ('o','n','u','m'), HB_AAT_LAYOUT_FEATURE_TYPE_NUMBER_CASE, HB_AAT_LAYOUT_FEATURE_SELECTOR_LOWER_CASE_NUMBERS, (hb_aat_layout_feature_selector_t) 2}, + {HB_TAG ('o','r','d','n'), HB_AAT_LAYOUT_FEATURE_TYPE_VERTICAL_POSITION, HB_AAT_LAYOUT_FEATURE_SELECTOR_ORDINALS, HB_AAT_LAYOUT_FEATURE_SELECTOR_NORMAL_POSITION}, + {HB_TAG ('p','a','l','t'), HB_AAT_LAYOUT_FEATURE_TYPE_TEXT_SPACING, HB_AAT_LAYOUT_FEATURE_SELECTOR_ALT_PROPORTIONAL_TEXT, (hb_aat_layout_feature_selector_t) 7}, + {HB_TAG ('p','c','a','p'), HB_AAT_LAYOUT_FEATURE_TYPE_LOWER_CASE, HB_AAT_LAYOUT_FEATURE_SELECTOR_LOWER_CASE_PETITE_CAPS, HB_AAT_LAYOUT_FEATURE_SELECTOR_DEFAULT_LOWER_CASE}, + {HB_TAG ('p','k','n','a'), HB_AAT_LAYOUT_FEATURE_TYPE_TEXT_SPACING, HB_AAT_LAYOUT_FEATURE_SELECTOR_PROPORTIONAL_TEXT, (hb_aat_layout_feature_selector_t) 7}, + {HB_TAG ('p','n','u','m'), HB_AAT_LAYOUT_FEATURE_TYPE_NUMBER_SPACING, HB_AAT_LAYOUT_FEATURE_SELECTOR_PROPORTIONAL_NUMBERS, (hb_aat_layout_feature_selector_t) 4}, + {HB_TAG ('p','w','i','d'), HB_AAT_LAYOUT_FEATURE_TYPE_TEXT_SPACING, HB_AAT_LAYOUT_FEATURE_SELECTOR_PROPORTIONAL_TEXT, (hb_aat_layout_feature_selector_t) 7}, + {HB_TAG ('q','w','i','d'), HB_AAT_LAYOUT_FEATURE_TYPE_TEXT_SPACING, HB_AAT_LAYOUT_FEATURE_SELECTOR_QUARTER_WIDTH_TEXT, (hb_aat_layout_feature_selector_t) 7}, + {HB_TAG ('r','u','b','y'), HB_AAT_LAYOUT_FEATURE_TYPE_RUBY_KANA, HB_AAT_LAYOUT_FEATURE_SELECTOR_RUBY_KANA_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_RUBY_KANA_OFF}, + {HB_TAG ('s','i','n','f'), HB_AAT_LAYOUT_FEATURE_TYPE_VERTICAL_POSITION, HB_AAT_LAYOUT_FEATURE_SELECTOR_SCIENTIFIC_INFERIORS, HB_AAT_LAYOUT_FEATURE_SELECTOR_NORMAL_POSITION}, + {HB_TAG ('s','m','c','p'), HB_AAT_LAYOUT_FEATURE_TYPE_LOWER_CASE, HB_AAT_LAYOUT_FEATURE_SELECTOR_LOWER_CASE_SMALL_CAPS, HB_AAT_LAYOUT_FEATURE_SELECTOR_DEFAULT_LOWER_CASE}, + {HB_TAG ('s','m','p','l'), HB_AAT_LAYOUT_FEATURE_TYPE_CHARACTER_SHAPE, HB_AAT_LAYOUT_FEATURE_SELECTOR_SIMPLIFIED_CHARACTERS, (hb_aat_layout_feature_selector_t) 16}, + {HB_TAG ('s','s','0','1'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_ONE_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_ONE_OFF}, + {HB_TAG ('s','s','0','2'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_TWO_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_TWO_OFF}, + {HB_TAG ('s','s','0','3'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_THREE_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_THREE_OFF}, + {HB_TAG ('s','s','0','4'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_FOUR_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_FOUR_OFF}, + {HB_TAG ('s','s','0','5'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_FIVE_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_FIVE_OFF}, + {HB_TAG ('s','s','0','6'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_SIX_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_SIX_OFF}, + {HB_TAG ('s','s','0','7'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_SEVEN_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_SEVEN_OFF}, + {HB_TAG ('s','s','0','8'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_EIGHT_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_EIGHT_OFF}, + {HB_TAG ('s','s','0','9'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_NINE_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_NINE_OFF}, + {HB_TAG ('s','s','1','0'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_TEN_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_TEN_OFF}, + {HB_TAG ('s','s','1','1'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_ELEVEN_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_ELEVEN_OFF}, + {HB_TAG ('s','s','1','2'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_TWELVE_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_TWELVE_OFF}, + {HB_TAG ('s','s','1','3'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_THIRTEEN_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_THIRTEEN_OFF}, + {HB_TAG ('s','s','1','4'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_FOURTEEN_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_FOURTEEN_OFF}, + {HB_TAG ('s','s','1','5'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_FIFTEEN_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_FIFTEEN_OFF}, + {HB_TAG ('s','s','1','6'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_SIXTEEN_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_SIXTEEN_OFF}, + {HB_TAG ('s','s','1','7'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_SEVENTEEN_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_SEVENTEEN_OFF}, + {HB_TAG ('s','s','1','8'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_EIGHTEEN_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_EIGHTEEN_OFF}, + {HB_TAG ('s','s','1','9'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_NINETEEN_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_NINETEEN_OFF}, + {HB_TAG ('s','s','2','0'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_TWENTY_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_TWENTY_OFF}, + {HB_TAG ('s','u','b','s'), HB_AAT_LAYOUT_FEATURE_TYPE_VERTICAL_POSITION, HB_AAT_LAYOUT_FEATURE_SELECTOR_INFERIORS, HB_AAT_LAYOUT_FEATURE_SELECTOR_NORMAL_POSITION}, + {HB_TAG ('s','u','p','s'), HB_AAT_LAYOUT_FEATURE_TYPE_VERTICAL_POSITION, HB_AAT_LAYOUT_FEATURE_SELECTOR_SUPERIORS, HB_AAT_LAYOUT_FEATURE_SELECTOR_NORMAL_POSITION}, + {HB_TAG ('s','w','s','h'), HB_AAT_LAYOUT_FEATURE_TYPE_CONTEXTUAL_ALTERNATIVES, HB_AAT_LAYOUT_FEATURE_SELECTOR_SWASH_ALTERNATES_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_SWASH_ALTERNATES_OFF}, + {HB_TAG ('t','i','t','l'), HB_AAT_LAYOUT_FEATURE_TYPE_STYLE_OPTIONS, HB_AAT_LAYOUT_FEATURE_SELECTOR_TITLING_CAPS, HB_AAT_LAYOUT_FEATURE_SELECTOR_NO_STYLE_OPTIONS}, + {HB_TAG ('t','n','a','m'), HB_AAT_LAYOUT_FEATURE_TYPE_CHARACTER_SHAPE, HB_AAT_LAYOUT_FEATURE_SELECTOR_TRADITIONAL_NAMES_CHARACTERS, (hb_aat_layout_feature_selector_t) 16}, + {HB_TAG ('t','n','u','m'), HB_AAT_LAYOUT_FEATURE_TYPE_NUMBER_SPACING, HB_AAT_LAYOUT_FEATURE_SELECTOR_MONOSPACED_NUMBERS, (hb_aat_layout_feature_selector_t) 4}, + {HB_TAG ('t','r','a','d'), HB_AAT_LAYOUT_FEATURE_TYPE_CHARACTER_SHAPE, HB_AAT_LAYOUT_FEATURE_SELECTOR_TRADITIONAL_CHARACTERS, (hb_aat_layout_feature_selector_t) 16}, + {HB_TAG ('t','w','i','d'), HB_AAT_LAYOUT_FEATURE_TYPE_TEXT_SPACING, HB_AAT_LAYOUT_FEATURE_SELECTOR_THIRD_WIDTH_TEXT, (hb_aat_layout_feature_selector_t) 7}, + {HB_TAG ('u','n','i','c'), HB_AAT_LAYOUT_FEATURE_TYPE_LETTER_CASE, (hb_aat_layout_feature_selector_t) 14, (hb_aat_layout_feature_selector_t) 15}, + {HB_TAG ('v','a','l','t'), HB_AAT_LAYOUT_FEATURE_TYPE_TEXT_SPACING, HB_AAT_LAYOUT_FEATURE_SELECTOR_ALT_PROPORTIONAL_TEXT, (hb_aat_layout_feature_selector_t) 7}, + {HB_TAG ('v','e','r','t'), HB_AAT_LAYOUT_FEATURE_TYPE_VERTICAL_SUBSTITUTION, HB_AAT_LAYOUT_FEATURE_SELECTOR_SUBSTITUTE_VERTICAL_FORMS_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_SUBSTITUTE_VERTICAL_FORMS_OFF}, + {HB_TAG ('v','h','a','l'), HB_AAT_LAYOUT_FEATURE_TYPE_TEXT_SPACING, HB_AAT_LAYOUT_FEATURE_SELECTOR_ALT_HALF_WIDTH_TEXT, (hb_aat_layout_feature_selector_t) 7}, + {HB_TAG ('v','k','n','a'), HB_AAT_LAYOUT_FEATURE_TYPE_ALTERNATE_KANA, HB_AAT_LAYOUT_FEATURE_SELECTOR_ALTERNATE_VERT_KANA_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_ALTERNATE_VERT_KANA_OFF}, + {HB_TAG ('v','p','a','l'), HB_AAT_LAYOUT_FEATURE_TYPE_TEXT_SPACING, HB_AAT_LAYOUT_FEATURE_SELECTOR_ALT_PROPORTIONAL_TEXT, (hb_aat_layout_feature_selector_t) 7}, + {HB_TAG ('v','r','t','2'), HB_AAT_LAYOUT_FEATURE_TYPE_VERTICAL_SUBSTITUTION, HB_AAT_LAYOUT_FEATURE_SELECTOR_SUBSTITUTE_VERTICAL_FORMS_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_SUBSTITUTE_VERTICAL_FORMS_OFF}, + {HB_TAG ('z','e','r','o'), HB_AAT_LAYOUT_FEATURE_TYPE_TYPOGRAPHIC_EXTRAS, HB_AAT_LAYOUT_FEATURE_SELECTOR_SLASHED_ZERO_ON, HB_AAT_LAYOUT_FEATURE_SELECTOR_SLASHED_ZERO_OFF}, +}; + +const hb_aat_feature_mapping_t * +hb_aat_layout_find_feature_mapping (hb_tag_t tag) +{ + return (const hb_aat_feature_mapping_t *) hb_bsearch (&tag, + feature_mappings, + ARRAY_LENGTH (feature_mappings), + sizeof (feature_mappings[0]), + hb_aat_feature_mapping_t::cmp); +} +#endif + + +#ifndef HB_NO_AAT + +/* + * mort/morx/kerx/trak + */ + + +void +hb_aat_layout_compile_map (const hb_aat_map_builder_t *mapper, + hb_aat_map_t *map) +{ + const AAT::morx& morx = *mapper->face->table.morx; + if (morx.has_data ()) + { + morx.compile_flags (mapper, map); + return; + } + + const AAT::mort& mort = *mapper->face->table.mort; + if (mort.has_data ()) + { + mort.compile_flags (mapper, map); + return; + } +} + + +/* + * hb_aat_layout_has_substitution: + * @face: + * + * Returns: + * Since: 2.3.0 + */ +hb_bool_t +hb_aat_layout_has_substitution (hb_face_t *face) +{ + return face->table.morx->has_data () || + face->table.mort->has_data (); +} + +void +hb_aat_layout_substitute (const hb_ot_shape_plan_t *plan, + hb_font_t *font, + hb_buffer_t *buffer) +{ + hb_blob_t *morx_blob = font->face->table.morx.get_blob (); + const AAT::morx& morx = *morx_blob->as (); + if (morx.has_data ()) + { + AAT::hb_aat_apply_context_t c (plan, font, buffer, morx_blob); + morx.apply (&c); + return; + } + + hb_blob_t *mort_blob = font->face->table.mort.get_blob (); + const AAT::mort& mort = *mort_blob->as (); + if (mort.has_data ()) + { + AAT::hb_aat_apply_context_t c (plan, font, buffer, mort_blob); + mort.apply (&c); + return; + } +} + +void +hb_aat_layout_zero_width_deleted_glyphs (hb_buffer_t *buffer) +{ + unsigned int count = buffer->len; + hb_glyph_info_t *info = buffer->info; + hb_glyph_position_t *pos = buffer->pos; + for (unsigned int i = 0; i < count; i++) + if (unlikely (info[i].codepoint == AAT::DELETED_GLYPH)) + pos[i].x_advance = pos[i].y_advance = pos[i].x_offset = pos[i].y_offset = 0; +} + +static bool +is_deleted_glyph (const hb_glyph_info_t *info) +{ + return info->codepoint == AAT::DELETED_GLYPH; +} + +void +hb_aat_layout_remove_deleted_glyphs (hb_buffer_t *buffer) +{ + hb_ot_layout_delete_glyphs_inplace (buffer, is_deleted_glyph); +} + +/* + * hb_aat_layout_has_positioning: + * @face: + * + * Returns: + * Since: 2.3.0 + */ +hb_bool_t +hb_aat_layout_has_positioning (hb_face_t *face) +{ + return face->table.kerx->has_data (); +} + +void +hb_aat_layout_position (const hb_ot_shape_plan_t *plan, + hb_font_t *font, + hb_buffer_t *buffer) +{ + hb_blob_t *kerx_blob = font->face->table.kerx.get_blob (); + const AAT::kerx& kerx = *kerx_blob->as (); + + AAT::hb_aat_apply_context_t c (plan, font, buffer, kerx_blob); + c.set_ankr_table (font->face->table.ankr.get ()); + kerx.apply (&c); +} + + +/* + * hb_aat_layout_has_tracking: + * @face: + * + * Returns: + * Since: 2.3.0 + */ +hb_bool_t +hb_aat_layout_has_tracking (hb_face_t *face) +{ + return face->table.trak->has_data (); +} + +void +hb_aat_layout_track (const hb_ot_shape_plan_t *plan, + hb_font_t *font, + hb_buffer_t *buffer) +{ + const AAT::trak& trak = *font->face->table.trak; + + AAT::hb_aat_apply_context_t c (plan, font, buffer); + trak.apply (&c); +} + +/** + * hb_aat_layout_get_feature_types: + * @face: a face object + * @start_offset: iteration's start offset + * @feature_count:(inout) (allow-none): buffer size as input, filled size as output + * @features: (out caller-allocates) (array length=feature_count): features buffer + * + * Return value: Number of all available feature types. + * + * Since: 2.2.0 + */ +unsigned int +hb_aat_layout_get_feature_types (hb_face_t *face, + unsigned int start_offset, + unsigned int *feature_count, /* IN/OUT. May be NULL. */ + hb_aat_layout_feature_type_t *features /* OUT. May be NULL. */) +{ + return face->table.feat->get_feature_types (start_offset, feature_count, features); +} + +/** + * hb_aat_layout_feature_type_get_name_id: + * @face: a face object + * @feature_type: feature id + * + * Return value: Name ID index + * + * Since: 2.2.0 + */ +hb_ot_name_id_t +hb_aat_layout_feature_type_get_name_id (hb_face_t *face, + hb_aat_layout_feature_type_t feature_type) +{ + return face->table.feat->get_feature_name_id (feature_type); +} + +/** + * hb_aat_layout_feature_type_get_selectors: + * @face: a face object + * @feature_type: feature id + * @start_offset: iteration's start offset + * @selector_count: (inout) (allow-none): buffer size as input, filled size as output + * @selectors: (out caller-allocates) (array length=selector_count): settings buffer + * @default_index: (out) (allow-none): index of default selector if any + * + * If upon return, @default_index is set to #HB_AAT_LAYOUT_NO_SELECTOR_INDEX, then + * the feature type is non-exclusive. Otherwise, @default_index is the index of + * the selector that is selected by default. + * + * Return value: Number of all available feature selectors. + * + * Since: 2.2.0 + */ +unsigned int +hb_aat_layout_feature_type_get_selector_infos (hb_face_t *face, + hb_aat_layout_feature_type_t feature_type, + unsigned int start_offset, + unsigned int *selector_count, /* IN/OUT. May be NULL. */ + hb_aat_layout_feature_selector_info_t *selectors, /* OUT. May be NULL. */ + unsigned int *default_index /* OUT. May be NULL. */) +{ + return face->table.feat->get_selector_infos (feature_type, start_offset, selector_count, selectors, default_index); +} + + +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout.h new file mode 100644 index 000000000..b617e8b70 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout.h @@ -0,0 +1,486 @@ +/* + * Copyright © 2018 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#ifndef HB_AAT_H_IN +#error "Include instead." +#endif + +#ifndef HB_AAT_LAYOUT_H +#define HB_AAT_LAYOUT_H + +#include "hb.h" + +#include "hb-ot.h" + +HB_BEGIN_DECLS + +/** + * hb_aat_layout_feature_type_t: + * + * + * Since: 2.2.0 + */ +typedef enum +{ + HB_AAT_LAYOUT_FEATURE_TYPE_INVALID = 0xFFFF, + + HB_AAT_LAYOUT_FEATURE_TYPE_ALL_TYPOGRAPHIC = 0, + HB_AAT_LAYOUT_FEATURE_TYPE_LIGATURES = 1, + HB_AAT_LAYOUT_FEATURE_TYPE_CURISVE_CONNECTION = 2, + HB_AAT_LAYOUT_FEATURE_TYPE_LETTER_CASE = 3, + HB_AAT_LAYOUT_FEATURE_TYPE_VERTICAL_SUBSTITUTION = 4, + HB_AAT_LAYOUT_FEATURE_TYPE_LINGUISTIC_REARRANGEMENT = 5, + HB_AAT_LAYOUT_FEATURE_TYPE_NUMBER_SPACING = 6, + HB_AAT_LAYOUT_FEATURE_TYPE_SMART_SWASH_TYPE = 8, + HB_AAT_LAYOUT_FEATURE_TYPE_DIACRITICS_TYPE = 9, + HB_AAT_LAYOUT_FEATURE_TYPE_VERTICAL_POSITION = 10, + HB_AAT_LAYOUT_FEATURE_TYPE_FRACTIONS = 11, + HB_AAT_LAYOUT_FEATURE_TYPE_OVERLAPPING_CHARACTERS_TYPE = 13, + HB_AAT_LAYOUT_FEATURE_TYPE_TYPOGRAPHIC_EXTRAS = 14, + HB_AAT_LAYOUT_FEATURE_TYPE_MATHEMATICAL_EXTRAS = 15, + HB_AAT_LAYOUT_FEATURE_TYPE_ORNAMENT_SETS_TYPE = 16, + HB_AAT_LAYOUT_FEATURE_TYPE_CHARACTER_ALTERNATIVES = 17, + HB_AAT_LAYOUT_FEATURE_TYPE_DESIGN_COMPLEXITY_TYPE = 18, + HB_AAT_LAYOUT_FEATURE_TYPE_STYLE_OPTIONS = 19, + HB_AAT_LAYOUT_FEATURE_TYPE_CHARACTER_SHAPE = 20, + HB_AAT_LAYOUT_FEATURE_TYPE_NUMBER_CASE = 21, + HB_AAT_LAYOUT_FEATURE_TYPE_TEXT_SPACING = 22, + HB_AAT_LAYOUT_FEATURE_TYPE_TRANSLITERATION = 23, + HB_AAT_LAYOUT_FEATURE_TYPE_ANNOTATION_TYPE = 24, + HB_AAT_LAYOUT_FEATURE_TYPE_KANA_SPACING_TYPE = 25, + HB_AAT_LAYOUT_FEATURE_TYPE_IDEOGRAPHIC_SPACING_TYPE = 26, + HB_AAT_LAYOUT_FEATURE_TYPE_UNICODE_DECOMPOSITION_TYPE = 27, + HB_AAT_LAYOUT_FEATURE_TYPE_RUBY_KANA = 28, + HB_AAT_LAYOUT_FEATURE_TYPE_CJK_SYMBOL_ALTERNATIVES_TYPE = 29, + HB_AAT_LAYOUT_FEATURE_TYPE_IDEOGRAPHIC_ALTERNATIVES_TYPE = 30, + HB_AAT_LAYOUT_FEATURE_TYPE_CJK_VERTICAL_ROMAN_PLACEMENT_TYPE = 31, + HB_AAT_LAYOUT_FEATURE_TYPE_ITALIC_CJK_ROMAN = 32, + HB_AAT_LAYOUT_FEATURE_TYPE_CASE_SENSITIVE_LAYOUT = 33, + HB_AAT_LAYOUT_FEATURE_TYPE_ALTERNATE_KANA = 34, + HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES = 35, + HB_AAT_LAYOUT_FEATURE_TYPE_CONTEXTUAL_ALTERNATIVES = 36, + HB_AAT_LAYOUT_FEATURE_TYPE_LOWER_CASE = 37, + HB_AAT_LAYOUT_FEATURE_TYPE_UPPER_CASE = 38, + HB_AAT_LAYOUT_FEATURE_TYPE_LANGUAGE_TAG_TYPE = 39, + HB_AAT_LAYOUT_FEATURE_TYPE_CJK_ROMAN_SPACING_TYPE = 103, + + _HB_AAT_LAYOUT_FEATURE_TYPE_MAX_VALUE = HB_TAG_MAX_SIGNED /*< skip >*/ +} hb_aat_layout_feature_type_t; + +/** + * hb_aat_layout_feature_selector_t: + * + * + * Since: 2.2.0 + */ +typedef enum +{ + HB_AAT_LAYOUT_FEATURE_SELECTOR_INVALID = 0xFFFF, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_ALL_TYPOGRAPHIC */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_ALL_TYPE_FEATURES_ON = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_ALL_TYPE_FEATURES_OFF = 1, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_LIGATURES */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_REQUIRED_LIGATURES_ON = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_REQUIRED_LIGATURES_OFF = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_COMMON_LIGATURES_ON = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_COMMON_LIGATURES_OFF = 3, + HB_AAT_LAYOUT_FEATURE_SELECTOR_RARE_LIGATURES_ON = 4, + HB_AAT_LAYOUT_FEATURE_SELECTOR_RARE_LIGATURES_OFF = 5, + HB_AAT_LAYOUT_FEATURE_SELECTOR_LOGOS_ON = 6, + HB_AAT_LAYOUT_FEATURE_SELECTOR_LOGOS_OFF = 7, + HB_AAT_LAYOUT_FEATURE_SELECTOR_REBUS_PICTURES_ON = 8, + HB_AAT_LAYOUT_FEATURE_SELECTOR_REBUS_PICTURES_OFF = 9, + HB_AAT_LAYOUT_FEATURE_SELECTOR_DIPHTHONG_LIGATURES_ON = 10, + HB_AAT_LAYOUT_FEATURE_SELECTOR_DIPHTHONG_LIGATURES_OFF = 11, + HB_AAT_LAYOUT_FEATURE_SELECTOR_SQUARED_LIGATURES_ON = 12, + HB_AAT_LAYOUT_FEATURE_SELECTOR_SQUARED_LIGATURES_OFF = 13, + HB_AAT_LAYOUT_FEATURE_SELECTOR_ABBREV_SQUARED_LIGATURES_ON = 14, + HB_AAT_LAYOUT_FEATURE_SELECTOR_ABBREV_SQUARED_LIGATURES_OFF = 15, + HB_AAT_LAYOUT_FEATURE_SELECTOR_SYMBOL_LIGATURES_ON = 16, + HB_AAT_LAYOUT_FEATURE_SELECTOR_SYMBOL_LIGATURES_OFF = 17, + HB_AAT_LAYOUT_FEATURE_SELECTOR_CONTEXTUAL_LIGATURES_ON = 18, + HB_AAT_LAYOUT_FEATURE_SELECTOR_CONTEXTUAL_LIGATURES_OFF = 19, + HB_AAT_LAYOUT_FEATURE_SELECTOR_HISTORICAL_LIGATURES_ON = 20, + HB_AAT_LAYOUT_FEATURE_SELECTOR_HISTORICAL_LIGATURES_OFF = 21, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_LIGATURES */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_UNCONNECTED = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_PARTIALLY_CONNECTED = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_CURSIVE = 2, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_LETTER_CASE */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_UPPER_AND_LOWER_CASE = 0, /* deprecated */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_ALL_CAPS = 1, /* deprecated */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_ALL_LOWER_CASE = 2, /* deprecated */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_SMALL_CAPS = 3, /* deprecated */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_INITIAL_CAPS = 4, /* deprecated */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_INITIAL_CAPS_AND_SMALL_CAPS = 5, /* deprecated */ + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_VERTICAL_SUBSTITUTION */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_SUBSTITUTE_VERTICAL_FORMS_ON = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_SUBSTITUTE_VERTICAL_FORMS_OFF = 1, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_LINGUISTIC_REARRANGEMENT */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_LINGUISTIC_REARRANGEMENT_ON = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_LINGUISTIC_REARRANGEMENT_OFF = 1, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_NUMBER_SPACING */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_MONOSPACED_NUMBERS = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_PROPORTIONAL_NUMBERS = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_THIRD_WIDTH_NUMBERS = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_QUARTER_WIDTH_NUMBERS = 3, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_SMART_SWASH_TYPE */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_WORD_INITIAL_SWASHES_ON = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_WORD_INITIAL_SWASHES_OFF = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_WORD_FINAL_SWASHES_ON = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_WORD_FINAL_SWASHES_OFF = 3, + HB_AAT_LAYOUT_FEATURE_SELECTOR_LINE_INITIAL_SWASHES_ON = 4, + HB_AAT_LAYOUT_FEATURE_SELECTOR_LINE_INITIAL_SWASHES_OFF = 5, + HB_AAT_LAYOUT_FEATURE_SELECTOR_LINE_FINAL_SWASHES_ON = 6, + HB_AAT_LAYOUT_FEATURE_SELECTOR_LINE_FINAL_SWASHES_OFF = 7, + HB_AAT_LAYOUT_FEATURE_SELECTOR_NON_FINAL_SWASHES_ON = 8, + HB_AAT_LAYOUT_FEATURE_SELECTOR_NON_FINAL_SWASHES_OFF = 9, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_DIACRITICS_TYPE */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_SHOW_DIACRITICS = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_HIDE_DIACRITICS = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_DECOMPOSE_DIACRITICS = 2, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_VERTICAL_POSITION */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_NORMAL_POSITION = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_SUPERIORS = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_INFERIORS = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_ORDINALS = 3, + HB_AAT_LAYOUT_FEATURE_SELECTOR_SCIENTIFIC_INFERIORS = 4, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_FRACTIONS */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_NO_FRACTIONS = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_VERTICAL_FRACTIONS = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_DIAGONAL_FRACTIONS = 2, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_OVERLAPPING_CHARACTERS_TYPE */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_PREVENT_OVERLAP_ON = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_PREVENT_OVERLAP_OFF = 1, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_TYPOGRAPHIC_EXTRAS */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_HYPHENS_TO_EM_DASH_ON = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_HYPHENS_TO_EM_DASH_OFF = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_HYPHEN_TO_EN_DASH_ON = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_HYPHEN_TO_EN_DASH_OFF = 3, + HB_AAT_LAYOUT_FEATURE_SELECTOR_SLASHED_ZERO_ON = 4, + HB_AAT_LAYOUT_FEATURE_SELECTOR_SLASHED_ZERO_OFF = 5, + HB_AAT_LAYOUT_FEATURE_SELECTOR_FORM_INTERROBANG_ON = 6, + HB_AAT_LAYOUT_FEATURE_SELECTOR_FORM_INTERROBANG_OFF = 7, + HB_AAT_LAYOUT_FEATURE_SELECTOR_SMART_QUOTES_ON = 8, + HB_AAT_LAYOUT_FEATURE_SELECTOR_SMART_QUOTES_OFF = 9, + HB_AAT_LAYOUT_FEATURE_SELECTOR_PERIODS_TO_ELLIPSIS_ON = 10, + HB_AAT_LAYOUT_FEATURE_SELECTOR_PERIODS_TO_ELLIPSIS_OFF = 11, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_MATHEMATICAL_EXTRAS */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_HYPHEN_TO_MINUS_ON = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_HYPHEN_TO_MINUS_OFF = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_ASTERISK_TO_MULTIPLY_ON = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_ASTERISK_TO_MULTIPLY_OFF = 3, + HB_AAT_LAYOUT_FEATURE_SELECTOR_SLASH_TO_DIVIDE_ON = 4, + HB_AAT_LAYOUT_FEATURE_SELECTOR_SLASH_TO_DIVIDE_OFF = 5, + HB_AAT_LAYOUT_FEATURE_SELECTOR_INEQUALITY_LIGATURES_ON = 6, + HB_AAT_LAYOUT_FEATURE_SELECTOR_INEQUALITY_LIGATURES_OFF = 7, + HB_AAT_LAYOUT_FEATURE_SELECTOR_EXPONENTS_ON = 8, + HB_AAT_LAYOUT_FEATURE_SELECTOR_EXPONENTS_OFF = 9, + HB_AAT_LAYOUT_FEATURE_SELECTOR_MATHEMATICAL_GREEK_ON = 10, + HB_AAT_LAYOUT_FEATURE_SELECTOR_MATHEMATICAL_GREEK_OFF = 11, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_ORNAMENT_SETS_TYPE */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_NO_ORNAMENTS = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_DINGBATS = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_PI_CHARACTERS = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_FLEURONS = 3, + HB_AAT_LAYOUT_FEATURE_SELECTOR_DECORATIVE_BORDERS = 4, + HB_AAT_LAYOUT_FEATURE_SELECTOR_INTERNATIONAL_SYMBOLS = 5, + HB_AAT_LAYOUT_FEATURE_SELECTOR_MATH_SYMBOLS = 6, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_CHARACTER_ALTERNATIVES */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_NO_ALTERNATES = 0, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_DESIGN_COMPLEXITY_TYPE */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_DESIGN_LEVEL1 = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_DESIGN_LEVEL2 = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_DESIGN_LEVEL3 = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_DESIGN_LEVEL4 = 3, + HB_AAT_LAYOUT_FEATURE_SELECTOR_DESIGN_LEVEL5 = 4, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_STYLE_OPTIONS */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_NO_STYLE_OPTIONS = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_DISPLAY_TEXT = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_ENGRAVED_TEXT = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_ILLUMINATED_CAPS = 3, + HB_AAT_LAYOUT_FEATURE_SELECTOR_TITLING_CAPS = 4, + HB_AAT_LAYOUT_FEATURE_SELECTOR_TALL_CAPS = 5, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_CHARACTER_SHAPE */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_TRADITIONAL_CHARACTERS = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_SIMPLIFIED_CHARACTERS = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_JIS1978_CHARACTERS = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_JIS1983_CHARACTERS = 3, + HB_AAT_LAYOUT_FEATURE_SELECTOR_JIS1990_CHARACTERS = 4, + HB_AAT_LAYOUT_FEATURE_SELECTOR_TRADITIONAL_ALT_ONE = 5, + HB_AAT_LAYOUT_FEATURE_SELECTOR_TRADITIONAL_ALT_TWO = 6, + HB_AAT_LAYOUT_FEATURE_SELECTOR_TRADITIONAL_ALT_THREE = 7, + HB_AAT_LAYOUT_FEATURE_SELECTOR_TRADITIONAL_ALT_FOUR = 8, + HB_AAT_LAYOUT_FEATURE_SELECTOR_TRADITIONAL_ALT_FIVE = 9, + HB_AAT_LAYOUT_FEATURE_SELECTOR_EXPERT_CHARACTERS = 10, + HB_AAT_LAYOUT_FEATURE_SELECTOR_JIS2004_CHARACTERS = 11, + HB_AAT_LAYOUT_FEATURE_SELECTOR_HOJO_CHARACTERS = 12, + HB_AAT_LAYOUT_FEATURE_SELECTOR_NLCCHARACTERS = 13, + HB_AAT_LAYOUT_FEATURE_SELECTOR_TRADITIONAL_NAMES_CHARACTERS = 14, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_NUMBER_CASE */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_LOWER_CASE_NUMBERS = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_UPPER_CASE_NUMBERS = 1, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_TEXT_SPACING */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_PROPORTIONAL_TEXT = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_MONOSPACED_TEXT = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_HALF_WIDTH_TEXT = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_THIRD_WIDTH_TEXT = 3, + HB_AAT_LAYOUT_FEATURE_SELECTOR_QUARTER_WIDTH_TEXT = 4, + HB_AAT_LAYOUT_FEATURE_SELECTOR_ALT_PROPORTIONAL_TEXT = 5, + HB_AAT_LAYOUT_FEATURE_SELECTOR_ALT_HALF_WIDTH_TEXT = 6, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_TRANSLITERATION */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_NO_TRANSLITERATION = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_HANJA_TO_HANGUL = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_HIRAGANA_TO_KATAKANA = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_KATAKANA_TO_HIRAGANA = 3, + HB_AAT_LAYOUT_FEATURE_SELECTOR_KANA_TO_ROMANIZATION = 4, + HB_AAT_LAYOUT_FEATURE_SELECTOR_ROMANIZATION_TO_HIRAGANA = 5, + HB_AAT_LAYOUT_FEATURE_SELECTOR_ROMANIZATION_TO_KATAKANA = 6, + HB_AAT_LAYOUT_FEATURE_SELECTOR_HANJA_TO_HANGUL_ALT_ONE = 7, + HB_AAT_LAYOUT_FEATURE_SELECTOR_HANJA_TO_HANGUL_ALT_TWO = 8, + HB_AAT_LAYOUT_FEATURE_SELECTOR_HANJA_TO_HANGUL_ALT_THREE = 9, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_ANNOTATION_TYPE */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_NO_ANNOTATION = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_BOX_ANNOTATION = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_ROUNDED_BOX_ANNOTATION = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_CIRCLE_ANNOTATION = 3, + HB_AAT_LAYOUT_FEATURE_SELECTOR_INVERTED_CIRCLE_ANNOTATION = 4, + HB_AAT_LAYOUT_FEATURE_SELECTOR_PARENTHESIS_ANNOTATION = 5, + HB_AAT_LAYOUT_FEATURE_SELECTOR_PERIOD_ANNOTATION = 6, + HB_AAT_LAYOUT_FEATURE_SELECTOR_ROMAN_NUMERAL_ANNOTATION = 7, + HB_AAT_LAYOUT_FEATURE_SELECTOR_DIAMOND_ANNOTATION = 8, + HB_AAT_LAYOUT_FEATURE_SELECTOR_INVERTED_BOX_ANNOTATION = 9, + HB_AAT_LAYOUT_FEATURE_SELECTOR_INVERTED_ROUNDED_BOX_ANNOTATION= 10, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_KANA_SPACING_TYPE */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_FULL_WIDTH_KANA = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_PROPORTIONAL_KANA = 1, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_IDEOGRAPHIC_SPACING_TYPE */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_FULL_WIDTH_IDEOGRAPHS = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_PROPORTIONAL_IDEOGRAPHS = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_HALF_WIDTH_IDEOGRAPHS = 2, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_UNICODE_DECOMPOSITION_TYPE */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_CANONICAL_COMPOSITION_ON = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_CANONICAL_COMPOSITION_OFF = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_COMPATIBILITY_COMPOSITION_ON = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_COMPATIBILITY_COMPOSITION_OFF = 3, + HB_AAT_LAYOUT_FEATURE_SELECTOR_TRANSCODING_COMPOSITION_ON = 4, + HB_AAT_LAYOUT_FEATURE_SELECTOR_TRANSCODING_COMPOSITION_OFF = 5, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_RUBY_KANA */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_NO_RUBY_KANA = 0, /* deprecated - use HB_AAT_LAYOUT_FEATURE_SELECTOR_RUBY_KANA_OFF instead */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_RUBY_KANA = 1, /* deprecated - use HB_AAT_LAYOUT_FEATURE_SELECTOR_RUBY_KANA_ON instead */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_RUBY_KANA_ON = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_RUBY_KANA_OFF = 3, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_CJK_SYMBOL_ALTERNATIVES_TYPE */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_NO_CJK_SYMBOL_ALTERNATIVES = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_CJK_SYMBOL_ALT_ONE = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_CJK_SYMBOL_ALT_TWO = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_CJK_SYMBOL_ALT_THREE = 3, + HB_AAT_LAYOUT_FEATURE_SELECTOR_CJK_SYMBOL_ALT_FOUR = 4, + HB_AAT_LAYOUT_FEATURE_SELECTOR_CJK_SYMBOL_ALT_FIVE = 5, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_IDEOGRAPHIC_ALTERNATIVES_TYPE */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_NO_IDEOGRAPHIC_ALTERNATIVES = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_IDEOGRAPHIC_ALT_ONE = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_IDEOGRAPHIC_ALT_TWO = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_IDEOGRAPHIC_ALT_THREE = 3, + HB_AAT_LAYOUT_FEATURE_SELECTOR_IDEOGRAPHIC_ALT_FOUR = 4, + HB_AAT_LAYOUT_FEATURE_SELECTOR_IDEOGRAPHIC_ALT_FIVE = 5, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_CJK_VERTICAL_ROMAN_PLACEMENT_TYPE */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_CJK_VERTICAL_ROMAN_CENTERED = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_CJK_VERTICAL_ROMAN_HBASELINE = 1, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_ITALIC_CJK_ROMAN */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_NO_CJK_ITALIC_ROMAN = 0, /* deprecated - use HB_AAT_LAYOUT_FEATURE_SELECTOR_CJK_ITALIC_ROMAN_OFF instead */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_CJK_ITALIC_ROMAN = 1, /* deprecated - use HB_AAT_LAYOUT_FEATURE_SELECTOR_CJK_ITALIC_ROMAN_ON instead */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_CJK_ITALIC_ROMAN_ON = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_CJK_ITALIC_ROMAN_OFF = 3, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_CASE_SENSITIVE_LAYOUT */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_CASE_SENSITIVE_LAYOUT_ON = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_CASE_SENSITIVE_LAYOUT_OFF = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_CASE_SENSITIVE_SPACING_ON = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_CASE_SENSITIVE_SPACING_OFF = 3, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_ALTERNATE_KANA */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_ALTERNATE_HORIZ_KANA_ON = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_ALTERNATE_HORIZ_KANA_OFF = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_ALTERNATE_VERT_KANA_ON = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_ALTERNATE_VERT_KANA_OFF = 3, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_STYLISTIC_ALTERNATIVES */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_NO_STYLISTIC_ALTERNATES = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_ONE_ON = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_ONE_OFF = 3, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_TWO_ON = 4, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_TWO_OFF = 5, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_THREE_ON = 6, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_THREE_OFF = 7, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_FOUR_ON = 8, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_FOUR_OFF = 9, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_FIVE_ON = 10, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_FIVE_OFF = 11, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_SIX_ON = 12, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_SIX_OFF = 13, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_SEVEN_ON = 14, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_SEVEN_OFF = 15, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_EIGHT_ON = 16, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_EIGHT_OFF = 17, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_NINE_ON = 18, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_NINE_OFF = 19, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_TEN_ON = 20, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_TEN_OFF = 21, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_ELEVEN_ON = 22, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_ELEVEN_OFF = 23, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_TWELVE_ON = 24, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_TWELVE_OFF = 25, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_THIRTEEN_ON = 26, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_THIRTEEN_OFF = 27, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_FOURTEEN_ON = 28, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_FOURTEEN_OFF = 29, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_FIFTEEN_ON = 30, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_FIFTEEN_OFF = 31, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_SIXTEEN_ON = 32, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_SIXTEEN_OFF = 33, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_SEVENTEEN_ON = 34, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_SEVENTEEN_OFF = 35, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_EIGHTEEN_ON = 36, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_EIGHTEEN_OFF = 37, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_NINETEEN_ON = 38, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_NINETEEN_OFF = 39, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_TWENTY_ON = 40, + HB_AAT_LAYOUT_FEATURE_SELECTOR_STYLISTIC_ALT_TWENTY_OFF = 41, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_CONTEXTUAL_ALTERNATIVES */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_CONTEXTUAL_ALTERNATES_ON = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_CONTEXTUAL_ALTERNATES_OFF = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_SWASH_ALTERNATES_ON = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_SWASH_ALTERNATES_OFF = 3, + HB_AAT_LAYOUT_FEATURE_SELECTOR_CONTEXTUAL_SWASH_ALTERNATES_ON = 4, + HB_AAT_LAYOUT_FEATURE_SELECTOR_CONTEXTUAL_SWASH_ALTERNATES_OFF= 5, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_LOWER_CASE */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_DEFAULT_LOWER_CASE = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_LOWER_CASE_SMALL_CAPS = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_LOWER_CASE_PETITE_CAPS = 2, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_UPPER_CASE */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_DEFAULT_UPPER_CASE = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_UPPER_CASE_SMALL_CAPS = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_UPPER_CASE_PETITE_CAPS = 2, + + /* Selectors for #HB_AAT_LAYOUT_FEATURE_TYPE_CJK_ROMAN_SPACING_TYPE */ + HB_AAT_LAYOUT_FEATURE_SELECTOR_HALF_WIDTH_CJK_ROMAN = 0, + HB_AAT_LAYOUT_FEATURE_SELECTOR_PROPORTIONAL_CJK_ROMAN = 1, + HB_AAT_LAYOUT_FEATURE_SELECTOR_DEFAULT_CJK_ROMAN = 2, + HB_AAT_LAYOUT_FEATURE_SELECTOR_FULL_WIDTH_CJK_ROMAN = 3, + + _HB_AAT_LAYOUT_FEATURE_SELECTOR_MAX_VALUE = HB_TAG_MAX_SIGNED /*< skip >*/ +} hb_aat_layout_feature_selector_t; + +HB_EXTERN unsigned int +hb_aat_layout_get_feature_types (hb_face_t *face, + unsigned int start_offset, + unsigned int *feature_count, /* IN/OUT. May be NULL. */ + hb_aat_layout_feature_type_t *features /* OUT. May be NULL. */); + +HB_EXTERN hb_ot_name_id_t +hb_aat_layout_feature_type_get_name_id (hb_face_t *face, + hb_aat_layout_feature_type_t feature_type); + +typedef struct hb_aat_layout_feature_selector_info_t +{ + hb_ot_name_id_t name_id; + hb_aat_layout_feature_selector_t enable; + hb_aat_layout_feature_selector_t disable; + /*< private >*/ + unsigned int reserved; +} hb_aat_layout_feature_selector_info_t; + +#define HB_AAT_LAYOUT_NO_SELECTOR_INDEX 0xFFFFu + +HB_EXTERN unsigned int +hb_aat_layout_feature_type_get_selector_infos (hb_face_t *face, + hb_aat_layout_feature_type_t feature_type, + unsigned int start_offset, + unsigned int *selector_count, /* IN/OUT. May be NULL. */ + hb_aat_layout_feature_selector_info_t *selectors, /* OUT. May be NULL. */ + unsigned int *default_index /* OUT. May be NULL. */); + + +/* + * morx/mort + */ + +HB_EXTERN hb_bool_t +hb_aat_layout_has_substitution (hb_face_t *face); + + +/* + * kerx + */ + +HB_EXTERN hb_bool_t +hb_aat_layout_has_positioning (hb_face_t *face); + + +/* + * trak + */ + +HB_EXTERN hb_bool_t +hb_aat_layout_has_tracking (hb_face_t *face); + + +HB_END_DECLS + +#endif /* HB_AAT_LAYOUT_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout.hh new file mode 100644 index 000000000..8310bfcc2 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout.hh @@ -0,0 +1,81 @@ +/* + * Copyright © 2017 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_AAT_LAYOUT_HH +#define HB_AAT_LAYOUT_HH + +#include "hb.hh" + +#include "hb-ot-shape.hh" +#include "hb-aat-ltag-table.hh" + +struct hb_aat_feature_mapping_t +{ + hb_tag_t otFeatureTag; + hb_aat_layout_feature_type_t aatFeatureType; + hb_aat_layout_feature_selector_t selectorToEnable; + hb_aat_layout_feature_selector_t selectorToDisable; + + HB_INTERNAL static int cmp (const void *key_, const void *entry_) + { + hb_tag_t key = * (unsigned int *) key_; + const hb_aat_feature_mapping_t * entry = (const hb_aat_feature_mapping_t *) entry_; + return key < entry->otFeatureTag ? -1 : + key > entry->otFeatureTag ? 1 : + 0; + } +}; + +HB_INTERNAL const hb_aat_feature_mapping_t * +hb_aat_layout_find_feature_mapping (hb_tag_t tag); + +HB_INTERNAL void +hb_aat_layout_compile_map (const hb_aat_map_builder_t *mapper, + hb_aat_map_t *map); + +HB_INTERNAL void +hb_aat_layout_substitute (const hb_ot_shape_plan_t *plan, + hb_font_t *font, + hb_buffer_t *buffer); + +HB_INTERNAL void +hb_aat_layout_zero_width_deleted_glyphs (hb_buffer_t *buffer); + +HB_INTERNAL void +hb_aat_layout_remove_deleted_glyphs (hb_buffer_t *buffer); + +HB_INTERNAL void +hb_aat_layout_position (const hb_ot_shape_plan_t *plan, + hb_font_t *font, + hb_buffer_t *buffer); + +HB_INTERNAL void +hb_aat_layout_track (const hb_ot_shape_plan_t *plan, + hb_font_t *font, + hb_buffer_t *buffer); + + +#endif /* HB_AAT_LAYOUT_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-ltag-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-ltag-table.hh new file mode 100644 index 000000000..711f9aa6c --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-ltag-table.hh @@ -0,0 +1,92 @@ +/* + * Copyright © 2018 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#ifndef HB_AAT_LTAG_TABLE_HH +#define HB_AAT_LTAG_TABLE_HH + +#include "hb-open-type.hh" + +/* + * ltag -- Language Tag + * https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6ltag.html + */ +#define HB_AAT_TAG_ltag HB_TAG('l','t','a','g') + + +namespace AAT { + +using namespace OT; + + +struct FTStringRange +{ + friend struct ltag; + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && (base+tag).sanitize (c, length)); + } + + protected: + NNOffsetTo> + tag; /* Offset from the start of the table to + * the beginning of the string */ + HBUINT16 length; /* String length (in bytes) */ + public: + DEFINE_SIZE_STATIC (4); +}; + +struct ltag +{ + static constexpr hb_tag_t tableTag = HB_AAT_TAG_ltag; + + hb_language_t get_language (unsigned int i) const + { + const FTStringRange &range = tagRanges[i]; + return hb_language_from_string ((const char *) (this+range.tag).arrayZ, + range.length); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + version >= 1 && + tagRanges.sanitize (c, this))); + } + + protected: + HBUINT32 version; /* Table version; currently 1 */ + HBUINT32 flags; /* Table flags; currently none defined */ + LArrayOf + tagRanges; /* Range for each tag's string */ + public: + DEFINE_SIZE_ARRAY (12, tagRanges); +}; + +} /* namespace AAT */ + + +#endif /* HB_AAT_LTAG_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-map.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-map.cc new file mode 100644 index 000000000..bc879359a --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-map.cc @@ -0,0 +1,75 @@ +/* + * Copyright © 2009,2010 Red Hat, Inc. + * Copyright © 2010,2011,2013 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#include "hb.hh" + +#ifndef HB_NO_AAT_SHAPE + +#include "hb-aat-map.hh" + +#include "hb-aat-layout.hh" + + +void hb_aat_map_builder_t::add_feature (hb_tag_t tag, + unsigned int value) +{ + if (tag == HB_TAG ('a','a','l','t')) + { + feature_info_t *info = features.push(); + info->type = HB_AAT_LAYOUT_FEATURE_TYPE_CHARACTER_ALTERNATIVES; + info->setting = (hb_aat_layout_feature_selector_t) value; + return; + } + + const hb_aat_feature_mapping_t *mapping = hb_aat_layout_find_feature_mapping (tag); + if (!mapping) return; + + feature_info_t *info = features.push(); + info->type = mapping->aatFeatureType; + info->setting = value ? mapping->selectorToEnable : mapping->selectorToDisable; +} + +void +hb_aat_map_builder_t::compile (hb_aat_map_t &m) +{ + /* Sort features and merge duplicates */ + if (features.length) + { + features.qsort (); + unsigned int j = 0; + for (unsigned int i = 1; i < features.length; i++) + if (features[i].type != features[j].type) + features[++j] = features[i]; + features.shrink (j + 1); + } + + hb_aat_layout_compile_map (this, &m); +} + + +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-map.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-map.hh new file mode 100644 index 000000000..984a59cca --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-map.hh @@ -0,0 +1,91 @@ +/* + * Copyright © 2018 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_AAT_MAP_HH +#define HB_AAT_MAP_HH + +#include "hb.hh" + + +struct hb_aat_map_t +{ + friend struct hb_aat_map_builder_t; + + public: + + void init () + { + memset (this, 0, sizeof (*this)); + chain_flags.init (); + } + void fini () { chain_flags.fini (); } + + public: + hb_vector_t chain_flags; +}; + +struct hb_aat_map_builder_t +{ + public: + + HB_INTERNAL hb_aat_map_builder_t (hb_face_t *face_, + const hb_segment_properties_t *props_ HB_UNUSED) : + face (face_) {} + + HB_INTERNAL void add_feature (hb_tag_t tag, unsigned int value=1); + + HB_INTERNAL void compile (hb_aat_map_t &m); + + public: + struct feature_info_t + { + hb_aat_layout_feature_type_t type; + hb_aat_layout_feature_selector_t setting; + unsigned seq; /* For stable sorting only. */ + + HB_INTERNAL static int cmp (const void *pa, const void *pb) + { + const feature_info_t *a = (const feature_info_t *) pa; + const feature_info_t *b = (const feature_info_t *) pb; + return (a->type != b->type) ? (a->type < b->type ? -1 : 1) : + (a->seq < b->seq ? -1 : a->seq > b->seq ? 1 : 0); + } + + int cmp (hb_aat_layout_feature_type_t ty) const + { + return (type != ty) ? (type < ty ? -1 : 1) : 0; + } + }; + + public: + hb_face_t *face; + + public: + hb_sorted_vector_t features; +}; + + +#endif /* HB_AAT_MAP_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-aat.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat.h new file mode 100644 index 000000000..c14313d1e --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-aat.h @@ -0,0 +1,38 @@ +/* + * Copyright © 2018 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#ifndef HB_AAT_H +#define HB_AAT_H +#define HB_AAT_H_IN + +#include "hb.h" + +#include "hb-aat-layout.h" + +HB_BEGIN_DECLS + +HB_END_DECLS + +#undef HB_AAT_H_IN +#endif /* HB_AAT_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-algs.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-algs.hh new file mode 100644 index 000000000..c57481bfe --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-algs.hh @@ -0,0 +1,1051 @@ +/* + * Copyright © 2017 Google, Inc. + * Copyright © 2019 Facebook, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + * Facebook Author(s): Behdad Esfahbod + */ + +#ifndef HB_ALGS_HH +#define HB_ALGS_HH + +#include "hb.hh" +#include "hb-meta.hh" +#include "hb-null.hh" +#include "hb-number.hh" + + +/* Encodes three unsigned integers in one 64-bit number. If the inputs have more than 21 bits, + * values will be truncated / overlap, and might not decode exactly. */ +#define HB_CODEPOINT_ENCODE3(x,y,z) (((uint64_t) (x) << 42) | ((uint64_t) (y) << 21) | (uint64_t) (z)) +#define HB_CODEPOINT_DECODE3_1(v) ((hb_codepoint_t) ((v) >> 42)) +#define HB_CODEPOINT_DECODE3_2(v) ((hb_codepoint_t) ((v) >> 21) & 0x1FFFFFu) +#define HB_CODEPOINT_DECODE3_3(v) ((hb_codepoint_t) (v) & 0x1FFFFFu) + +/* Custom encoding used by hb-ucd. */ +#define HB_CODEPOINT_ENCODE3_11_7_14(x,y,z) (((uint32_t) ((x) & 0x07FFu) << 21) | (((uint32_t) (y) & 0x007Fu) << 14) | (uint32_t) ((z) & 0x3FFFu)) +#define HB_CODEPOINT_DECODE3_11_7_14_1(v) ((hb_codepoint_t) ((v) >> 21)) +#define HB_CODEPOINT_DECODE3_11_7_14_2(v) ((hb_codepoint_t) (((v) >> 14) & 0x007Fu) | 0x0300) +#define HB_CODEPOINT_DECODE3_11_7_14_3(v) ((hb_codepoint_t) (v) & 0x3FFFu) + +struct +{ + /* Note. This is dangerous in that if it's passed an rvalue, it returns rvalue-reference. */ + template constexpr auto + operator () (T&& v) const HB_AUTO_RETURN ( hb_forward (v) ) +} +HB_FUNCOBJ (hb_identity); +struct +{ + /* Like identity(), but only retains lvalue-references. Rvalues are returned as rvalues. */ + template constexpr T& + operator () (T& v) const { return v; } + + template constexpr hb_remove_reference + operator () (T&& v) const { return v; } +} +HB_FUNCOBJ (hb_lidentity); +struct +{ + /* Like identity(), but always returns rvalue. */ + template constexpr hb_remove_reference + operator () (T&& v) const { return v; } +} +HB_FUNCOBJ (hb_ridentity); + +struct +{ + template constexpr bool + operator () (T&& v) const { return bool (hb_forward (v)); } +} +HB_FUNCOBJ (hb_bool); + +struct +{ + private: + + template constexpr auto + impl (const T& v, hb_priority<1>) const HB_RETURN (uint32_t, hb_deref (v).hash ()) + + template constexpr auto + impl (const T& v, hb_priority<0>) const HB_AUTO_RETURN + ( + /* Knuth's multiplicative method: */ + (uint32_t) v * 2654435761u + ) + + public: + + template constexpr auto + operator () (const T& v) const HB_RETURN (uint32_t, impl (v, hb_prioritize)) +} +HB_FUNCOBJ (hb_hash); + + +struct +{ + private: + + /* Pointer-to-member-function. */ + template auto + impl (Appl&& a, hb_priority<2>, T &&v, Ts&&... ds) const HB_AUTO_RETURN + ((hb_deref (hb_forward (v)).*hb_forward (a)) (hb_forward (ds)...)) + + /* Pointer-to-member. */ + template auto + impl (Appl&& a, hb_priority<1>, T &&v) const HB_AUTO_RETURN + ((hb_deref (hb_forward (v))).*hb_forward (a)) + + /* Operator(). */ + template auto + impl (Appl&& a, hb_priority<0>, Ts&&... ds) const HB_AUTO_RETURN + (hb_deref (hb_forward (a)) (hb_forward (ds)...)) + + public: + + template auto + operator () (Appl&& a, Ts&&... ds) const HB_AUTO_RETURN + ( + impl (hb_forward (a), + hb_prioritize, + hb_forward (ds)...) + ) +} +HB_FUNCOBJ (hb_invoke); + +template +struct hb_partial_t +{ + hb_partial_t (Appl a, V v) : a (a), v (v) {} + + static_assert (Pos > 0, ""); + + template auto + operator () (Ts&& ...ds) -> decltype (hb_invoke (hb_declval (Appl), + hb_declval (V), + hb_declval (Ts)...)) + { + return hb_invoke (hb_forward (a), + hb_forward (v), + hb_forward (ds)...); + } + template auto + operator () (T0&& d0, Ts&& ...ds) -> decltype (hb_invoke (hb_declval (Appl), + hb_declval (T0), + hb_declval (V), + hb_declval (Ts)...)) + { + return hb_invoke (hb_forward (a), + hb_forward (d0), + hb_forward (v), + hb_forward (ds)...); + } + + private: + hb_reference_wrapper a; + V v; +}; +template +auto hb_partial (Appl&& a, V&& v) HB_AUTO_RETURN +(( hb_partial_t (a, v) )) + +/* The following, HB_PARTIALIZE, macro uses a particular corner-case + * of C++11 that is not particularly well-supported by all compilers. + * What's happening is that it's using "this" in a trailing return-type + * via decltype(). Broken compilers deduce the type of "this" pointer + * in that context differently from what it resolves to in the body + * of the function. + * + * One probable cause of this is that at the time of trailing return + * type declaration, "this" points to an incomplete type, whereas in + * the function body the type is complete. That doesn't justify the + * error in any way, but is probably what's happening. + * + * In the case of MSVC, we get around this by using C++14 "decltype(auto)" + * which deduces the type from the actual return statement. For gcc 4.8 + * we use "+this" instead of "this" which produces an rvalue that seems + * to be deduced as the same type with this particular compiler, and seem + * to be fine as default code path as well. + */ +#ifdef _MSC_VER +/* https://github.com/harfbuzz/harfbuzz/issues/1730 */ \ +#define HB_PARTIALIZE(Pos) \ + template \ + decltype(auto) operator () (_T&& _v) const \ + { return hb_partial (this, hb_forward<_T> (_v)); } \ + static_assert (true, "") +#else +/* https://github.com/harfbuzz/harfbuzz/issues/1724 */ +#define HB_PARTIALIZE(Pos) \ + template \ + auto operator () (_T&& _v) const HB_AUTO_RETURN \ + (hb_partial (+this, hb_forward<_T> (_v))) \ + static_assert (true, "") +#endif + + +struct +{ + private: + + template auto + impl (Pred&& p, Val &&v, hb_priority<1>) const HB_AUTO_RETURN + (hb_deref (hb_forward (p)).has (hb_forward (v))) + + template auto + impl (Pred&& p, Val &&v, hb_priority<0>) const HB_AUTO_RETURN + ( + hb_invoke (hb_forward (p), + hb_forward (v)) + ) + + public: + + template auto + operator () (Pred&& p, Val &&v) const HB_RETURN (bool, + impl (hb_forward (p), + hb_forward (v), + hb_prioritize) + ) +} +HB_FUNCOBJ (hb_has); + +struct +{ + private: + + template auto + impl (Pred&& p, Val &&v, hb_priority<1>) const HB_AUTO_RETURN + ( + hb_has (hb_forward (p), + hb_forward (v)) + ) + + template auto + impl (Pred&& p, Val &&v, hb_priority<0>) const HB_AUTO_RETURN + ( + hb_forward (p) == hb_forward (v) + ) + + public: + + template auto + operator () (Pred&& p, Val &&v) const HB_RETURN (bool, + impl (hb_forward (p), + hb_forward (v), + hb_prioritize) + ) +} +HB_FUNCOBJ (hb_match); + +struct +{ + private: + + template auto + impl (Proj&& f, Val &&v, hb_priority<2>) const HB_AUTO_RETURN + (hb_deref (hb_forward (f)).get (hb_forward (v))) + + template auto + impl (Proj&& f, Val &&v, hb_priority<1>) const HB_AUTO_RETURN + ( + hb_invoke (hb_forward (f), + hb_forward (v)) + ) + + template auto + impl (Proj&& f, Val &&v, hb_priority<0>) const HB_AUTO_RETURN + ( + hb_forward (f)[hb_forward (v)] + ) + + public: + + template auto + operator () (Proj&& f, Val &&v) const HB_AUTO_RETURN + ( + impl (hb_forward (f), + hb_forward (v), + hb_prioritize) + ) +} +HB_FUNCOBJ (hb_get); + + +template +struct hb_pair_t +{ + typedef T1 first_t; + typedef T2 second_t; + typedef hb_pair_t pair_t; + + hb_pair_t (T1 a, T2 b) : first (a), second (b) {} + + template + operator hb_pair_t () { return hb_pair_t (first, second); } + + hb_pair_t reverse () const + { return hb_pair_t (second, first); } + + bool operator == (const pair_t& o) const { return first == o.first && second == o.second; } + bool operator != (const pair_t& o) const { return !(*this == o); } + bool operator < (const pair_t& o) const { return first < o.first || (first == o.first && second < o.second); } + bool operator >= (const pair_t& o) const { return !(*this < o); } + bool operator > (const pair_t& o) const { return first > o.first || (first == o.first && second > o.second); } + bool operator <= (const pair_t& o) const { return !(*this > o); } + + T1 first; + T2 second; +}; +#define hb_pair_t(T1,T2) hb_pair_t +template static inline hb_pair_t +hb_pair (T1&& a, T2&& b) { return hb_pair_t (a, b); } + +struct +{ + template constexpr typename Pair::first_t + operator () (const Pair& pair) const { return pair.first; } +} +HB_FUNCOBJ (hb_first); + +struct +{ + template constexpr typename Pair::second_t + operator () (const Pair& pair) const { return pair.second; } +} +HB_FUNCOBJ (hb_second); + +/* Note. In min/max impl, we can use hb_type_identity for second argument. + * However, that would silently convert between different-signedness integers. + * Instead we accept two different types, such that compiler can err if + * comparing integers of different signedness. */ +struct +{ + template constexpr auto + operator () (T&& a, T2&& b) const HB_AUTO_RETURN + (hb_forward (a) <= hb_forward (b) ? hb_forward (a) : hb_forward (b)) +} +HB_FUNCOBJ (hb_min); +struct +{ + template constexpr auto + operator () (T&& a, T2&& b) const HB_AUTO_RETURN + (hb_forward (a) >= hb_forward (b) ? hb_forward (a) : hb_forward (b)) +} +HB_FUNCOBJ (hb_max); + + +/* + * Bithacks. + */ + +/* Return the number of 1 bits in v. */ +template +static inline HB_CONST_FUNC unsigned int +hb_popcount (T v) +{ +#if (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__) + if (sizeof (T) <= sizeof (unsigned int)) + return __builtin_popcount (v); + + if (sizeof (T) <= sizeof (unsigned long)) + return __builtin_popcountl (v); + + if (sizeof (T) <= sizeof (unsigned long long)) + return __builtin_popcountll (v); +#endif + + if (sizeof (T) <= 4) + { + /* "HACKMEM 169" */ + uint32_t y; + y = (v >> 1) &033333333333; + y = v - y - ((y >>1) & 033333333333); + return (((y + (y >> 3)) & 030707070707) % 077); + } + + if (sizeof (T) == 8) + { + unsigned int shift = 32; + return hb_popcount ((uint32_t) v) + hb_popcount ((uint32_t) (v >> shift)); + } + + if (sizeof (T) == 16) + { + unsigned int shift = 64; + return hb_popcount ((uint64_t) v) + hb_popcount ((uint64_t) (v >> shift)); + } + + assert (0); + return 0; /* Shut up stupid compiler. */ +} + +/* Returns the number of bits needed to store number */ +template +static inline HB_CONST_FUNC unsigned int +hb_bit_storage (T v) +{ + if (unlikely (!v)) return 0; + +#if (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__) + if (sizeof (T) <= sizeof (unsigned int)) + return sizeof (unsigned int) * 8 - __builtin_clz (v); + + if (sizeof (T) <= sizeof (unsigned long)) + return sizeof (unsigned long) * 8 - __builtin_clzl (v); + + if (sizeof (T) <= sizeof (unsigned long long)) + return sizeof (unsigned long long) * 8 - __builtin_clzll (v); +#endif + +#if (defined(_MSC_VER) && _MSC_VER >= 1500) || (defined(__MINGW32__) && (__GNUC__ < 4)) + if (sizeof (T) <= sizeof (unsigned int)) + { + unsigned long where; + _BitScanReverse (&where, v); + return 1 + where; + } +# if defined(_WIN64) + if (sizeof (T) <= 8) + { + unsigned long where; + _BitScanReverse64 (&where, v); + return 1 + where; + } +# endif +#endif + + if (sizeof (T) <= 4) + { + /* "bithacks" */ + const unsigned int b[] = {0x2, 0xC, 0xF0, 0xFF00, 0xFFFF0000}; + const unsigned int S[] = {1, 2, 4, 8, 16}; + unsigned int r = 0; + for (int i = 4; i >= 0; i--) + if (v & b[i]) + { + v >>= S[i]; + r |= S[i]; + } + return r + 1; + } + if (sizeof (T) <= 8) + { + /* "bithacks" */ + const uint64_t b[] = {0x2ULL, 0xCULL, 0xF0ULL, 0xFF00ULL, 0xFFFF0000ULL, 0xFFFFFFFF00000000ULL}; + const unsigned int S[] = {1, 2, 4, 8, 16, 32}; + unsigned int r = 0; + for (int i = 5; i >= 0; i--) + if (v & b[i]) + { + v >>= S[i]; + r |= S[i]; + } + return r + 1; + } + if (sizeof (T) == 16) + { + unsigned int shift = 64; + return (v >> shift) ? hb_bit_storage ((uint64_t) (v >> shift)) + shift : + hb_bit_storage ((uint64_t) v); + } + + assert (0); + return 0; /* Shut up stupid compiler. */ +} + +/* Returns the number of zero bits in the least significant side of v */ +template +static inline HB_CONST_FUNC unsigned int +hb_ctz (T v) +{ + if (unlikely (!v)) return 0; + +#if (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__) + if (sizeof (T) <= sizeof (unsigned int)) + return __builtin_ctz (v); + + if (sizeof (T) <= sizeof (unsigned long)) + return __builtin_ctzl (v); + + if (sizeof (T) <= sizeof (unsigned long long)) + return __builtin_ctzll (v); +#endif + +#if (defined(_MSC_VER) && _MSC_VER >= 1500) || (defined(__MINGW32__) && (__GNUC__ < 4)) + if (sizeof (T) <= sizeof (unsigned int)) + { + unsigned long where; + _BitScanForward (&where, v); + return where; + } +# if defined(_WIN64) + if (sizeof (T) <= 8) + { + unsigned long where; + _BitScanForward64 (&where, v); + return where; + } +# endif +#endif + + if (sizeof (T) <= 4) + { + /* "bithacks" */ + unsigned int c = 32; + v &= - (int32_t) v; + if (v) c--; + if (v & 0x0000FFFF) c -= 16; + if (v & 0x00FF00FF) c -= 8; + if (v & 0x0F0F0F0F) c -= 4; + if (v & 0x33333333) c -= 2; + if (v & 0x55555555) c -= 1; + return c; + } + if (sizeof (T) <= 8) + { + /* "bithacks" */ + unsigned int c = 64; + v &= - (int64_t) (v); + if (v) c--; + if (v & 0x00000000FFFFFFFFULL) c -= 32; + if (v & 0x0000FFFF0000FFFFULL) c -= 16; + if (v & 0x00FF00FF00FF00FFULL) c -= 8; + if (v & 0x0F0F0F0F0F0F0F0FULL) c -= 4; + if (v & 0x3333333333333333ULL) c -= 2; + if (v & 0x5555555555555555ULL) c -= 1; + return c; + } + if (sizeof (T) == 16) + { + unsigned int shift = 64; + return (uint64_t) v ? hb_bit_storage ((uint64_t) v) : + hb_bit_storage ((uint64_t) (v >> shift)) + shift; + } + + assert (0); + return 0; /* Shut up stupid compiler. */ +} + + +/* + * Tiny stuff. + */ + +/* ASCII tag/character handling */ +static inline bool ISALPHA (unsigned char c) +{ return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'); } +static inline bool ISALNUM (unsigned char c) +{ return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9'); } +static inline bool ISSPACE (unsigned char c) +{ return c == ' ' || c =='\f'|| c =='\n'|| c =='\r'|| c =='\t'|| c =='\v'; } +static inline unsigned char TOUPPER (unsigned char c) +{ return (c >= 'a' && c <= 'z') ? c - 'a' + 'A' : c; } +static inline unsigned char TOLOWER (unsigned char c) +{ return (c >= 'A' && c <= 'Z') ? c - 'A' + 'a' : c; } + +static inline unsigned int DIV_CEIL (const unsigned int a, unsigned int b) +{ return (a + (b - 1)) / b; } + + +#undef ARRAY_LENGTH +template +static inline unsigned int ARRAY_LENGTH (const Type (&)[n]) { return n; } +/* A const version, but does not detect erratically being called on pointers. */ +#define ARRAY_LENGTH_CONST(__array) ((signed int) (sizeof (__array) / sizeof (__array[0]))) + + +static inline int +hb_memcmp (const void *a, const void *b, unsigned int len) +{ + /* It's illegal to pass NULL to memcmp(), even if len is zero. + * So, wrap it. + * https://sourceware.org/bugzilla/show_bug.cgi?id=23878 */ + if (!len) return 0; + return memcmp (a, b, len); +} + +static inline bool +hb_unsigned_mul_overflows (unsigned int count, unsigned int size) +{ + return (size > 0) && (count >= ((unsigned int) -1) / size); +} + +static inline unsigned int +hb_ceil_to_4 (unsigned int v) +{ + return ((v - 1) | 3) + 1; +} + +template static inline bool +hb_in_range (T u, T lo, T hi) +{ + static_assert (!hb_is_signed::value, ""); + + /* The casts below are important as if T is smaller than int, + * the subtract results will become a signed int! */ + return (T)(u - lo) <= (T)(hi - lo); +} +template static inline bool +hb_in_ranges (T u, T lo1, T hi1, T lo2, T hi2) +{ + return hb_in_range (u, lo1, hi1) || hb_in_range (u, lo2, hi2); +} +template static inline bool +hb_in_ranges (T u, T lo1, T hi1, T lo2, T hi2, T lo3, T hi3) +{ + return hb_in_range (u, lo1, hi1) || hb_in_range (u, lo2, hi2) || hb_in_range (u, lo3, hi3); +} + + +/* + * Sort and search. + */ +template +static inline void * +hb_bsearch (const void *key, const void *base, + size_t nmemb, size_t size, + int (*compar)(const void *_key, const void *_item, Ts... _ds), + Ts... ds) +{ + int min = 0, max = (int) nmemb - 1; + while (min <= max) + { + int mid = ((unsigned int) min + (unsigned int) max) / 2; + const void *p = (const void *) (((const char *) base) + (mid * size)); + int c = compar (key, p, ds...); + if (c < 0) + max = mid - 1; + else if (c > 0) + min = mid + 1; + else + return (void *) p; + } + return nullptr; +} + + +/* From https://github.com/noporpoise/sort_r + Feb 5, 2019 (c8c65c1e) + Modified to support optional argument using templates */ + +/* Isaac Turner 29 April 2014 Public Domain */ + +/* +hb_qsort function to be exported. +Parameters: + base is the array to be sorted + nel is the number of elements in the array + width is the size in bytes of each element of the array + compar is the comparison function + arg (optional) is a pointer to be passed to the comparison function + +void hb_qsort(void *base, size_t nel, size_t width, + int (*compar)(const void *_a, const void *_b, [void *_arg]), + [void *arg]); +*/ + +#define SORT_R_SWAP(a,b,tmp) ((tmp) = (a), (a) = (b), (b) = (tmp)) + +/* swap a and b */ +/* a and b must not be equal! */ +static inline void sort_r_swap(char *__restrict a, char *__restrict b, + size_t w) +{ + char tmp, *end = a+w; + for(; a < end; a++, b++) { SORT_R_SWAP(*a, *b, tmp); } +} + +/* swap a, b iff a>b */ +/* a and b must not be equal! */ +/* __restrict is same as restrict but better support on old machines */ +template +static inline int sort_r_cmpswap(char *__restrict a, + char *__restrict b, size_t w, + int (*compar)(const void *_a, + const void *_b, + Ts... _ds), + Ts... ds) +{ + if(compar(a, b, ds...) > 0) { + sort_r_swap(a, b, w); + return 1; + } + return 0; +} + +/* +Swap consecutive blocks of bytes of size na and nb starting at memory addr ptr, +with the smallest swap so that the blocks are in the opposite order. Blocks may +be internally re-ordered e.g. + 12345ab -> ab34512 + 123abc -> abc123 + 12abcde -> deabc12 +*/ +static inline void sort_r_swap_blocks(char *ptr, size_t na, size_t nb) +{ + if(na > 0 && nb > 0) { + if(na > nb) { sort_r_swap(ptr, ptr+na, nb); } + else { sort_r_swap(ptr, ptr+nb, na); } + } +} + +/* Implement recursive quicksort ourselves */ +/* Note: quicksort is not stable, equivalent values may be swapped */ +template +static inline void sort_r_simple(void *base, size_t nel, size_t w, + int (*compar)(const void *_a, + const void *_b, + Ts... _ds), + Ts... ds) +{ + char *b = (char *)base, *end = b + nel*w; + + /* for(size_t i=0; i b && sort_r_cmpswap(pj-w,pj,w,compar,ds...); pj -= w) {} + } + } + else + { + /* nel > 9; Quicksort */ + + int cmp; + char *pl, *ple, *pr, *pre, *pivot; + char *last = b+w*(nel-1), *tmp; + + /* + Use median of second, middle and second-last items as pivot. + First and last may have been swapped with pivot and therefore be extreme + */ + char *l[3]; + l[0] = b + w; + l[1] = b+w*(nel/2); + l[2] = last - w; + + /* printf("pivots: %i, %i, %i\n", *(int*)l[0], *(int*)l[1], *(int*)l[2]); */ + + if(compar(l[0],l[1],ds...) > 0) { SORT_R_SWAP(l[0], l[1], tmp); } + if(compar(l[1],l[2],ds...) > 0) { + SORT_R_SWAP(l[1], l[2], tmp); + if(compar(l[0],l[1],ds...) > 0) { SORT_R_SWAP(l[0], l[1], tmp); } + } + + /* swap mid value (l[1]), and last element to put pivot as last element */ + if(l[1] != last) { sort_r_swap(l[1], last, w); } + + /* + pl is the next item on the left to be compared to the pivot + pr is the last item on the right that was compared to the pivot + ple is the left position to put the next item that equals the pivot + ple is the last right position where we put an item that equals the pivot + v- end (beyond the array) + EEEEEELLLLLLLLuuuuuuuuGGGGGGGEEEEEEEE. + ^- b ^- ple ^- pl ^- pr ^- pre ^- last (where the pivot is) + Pivot comparison key: + E = equal, L = less than, u = unknown, G = greater than, E = equal + */ + pivot = last; + ple = pl = b; + pre = pr = last; + + /* + Strategy: + Loop into the list from the left and right at the same time to find: + - an item on the left that is greater than the pivot + - an item on the right that is less than the pivot + Once found, they are swapped and the loop continues. + Meanwhile items that are equal to the pivot are moved to the edges of the + array. + */ + while(pl < pr) { + /* Move left hand items which are equal to the pivot to the far left. + break when we find an item that is greater than the pivot */ + for(; pl < pr; pl += w) { + cmp = compar(pl, pivot, ds...); + if(cmp > 0) { break; } + else if(cmp == 0) { + if(ple < pl) { sort_r_swap(ple, pl, w); } + ple += w; + } + } + /* break if last batch of left hand items were equal to pivot */ + if(pl >= pr) { break; } + /* Move right hand items which are equal to the pivot to the far right. + break when we find an item that is less than the pivot */ + for(; pl < pr; ) { + pr -= w; /* Move right pointer onto an unprocessed item */ + cmp = compar(pr, pivot, ds...); + if(cmp == 0) { + pre -= w; + if(pr < pre) { sort_r_swap(pr, pre, w); } + } + else if(cmp < 0) { + if(pl < pr) { sort_r_swap(pl, pr, w); } + pl += w; + break; + } + } + } + + pl = pr; /* pr may have gone below pl */ + + /* + Now we need to go from: EEELLLGGGGEEEE + to: LLLEEEEEEEGGGG + Pivot comparison key: + E = equal, L = less than, u = unknown, G = greater than, E = equal + */ + sort_r_swap_blocks(b, ple-b, pl-ple); + sort_r_swap_blocks(pr, pre-pr, end-pre); + + /*for(size_t i=0; i static inline void +hb_stable_sort (T *array, unsigned int len, int(*compar)(const T2 *, const T2 *), T3 *array2) +{ + for (unsigned int i = 1; i < len; i++) + { + unsigned int j = i; + while (j && compar (&array[j - 1], &array[i]) > 0) + j--; + if (i == j) + continue; + /* Move item i to occupy place for item j, shift what's in between. */ + { + T t = array[i]; + memmove (&array[j + 1], &array[j], (i - j) * sizeof (T)); + array[j] = t; + } + if (array2) + { + T3 t = array2[i]; + memmove (&array2[j + 1], &array2[j], (i - j) * sizeof (T3)); + array2[j] = t; + } + } +} + +template static inline void +hb_stable_sort (T *array, unsigned int len, int(*compar)(const T *, const T *)) +{ + hb_stable_sort (array, len, compar, (int *) nullptr); +} + +static inline hb_bool_t +hb_codepoint_parse (const char *s, unsigned int len, int base, hb_codepoint_t *out) +{ + unsigned int v; + const char *p = s; + const char *end = p + len; + if (unlikely (!hb_parse_uint (&p, end, &v, true/* whole buffer */, base))) + return false; + + *out = v; + return true; +} + + +/* Operators. */ + +struct hb_bitwise_and +{ HB_PARTIALIZE(2); + static constexpr bool passthru_left = false; + static constexpr bool passthru_right = false; + template constexpr auto + operator () (const T &a, const T &b) const HB_AUTO_RETURN (a & b) +} +HB_FUNCOBJ (hb_bitwise_and); +struct hb_bitwise_or +{ HB_PARTIALIZE(2); + static constexpr bool passthru_left = true; + static constexpr bool passthru_right = true; + template constexpr auto + operator () (const T &a, const T &b) const HB_AUTO_RETURN (a | b) +} +HB_FUNCOBJ (hb_bitwise_or); +struct hb_bitwise_xor +{ HB_PARTIALIZE(2); + static constexpr bool passthru_left = true; + static constexpr bool passthru_right = true; + template constexpr auto + operator () (const T &a, const T &b) const HB_AUTO_RETURN (a ^ b) +} +HB_FUNCOBJ (hb_bitwise_xor); +struct hb_bitwise_sub +{ HB_PARTIALIZE(2); + static constexpr bool passthru_left = true; + static constexpr bool passthru_right = false; + template constexpr auto + operator () (const T &a, const T &b) const HB_AUTO_RETURN (a & ~b) +} +HB_FUNCOBJ (hb_bitwise_sub); +struct +{ + template constexpr auto + operator () (const T &a) const HB_AUTO_RETURN (~a) +} +HB_FUNCOBJ (hb_bitwise_neg); + +struct +{ HB_PARTIALIZE(2); + template constexpr auto + operator () (const T &a, const T2 &b) const HB_AUTO_RETURN (a + b) +} +HB_FUNCOBJ (hb_add); +struct +{ HB_PARTIALIZE(2); + template constexpr auto + operator () (const T &a, const T2 &b) const HB_AUTO_RETURN (a - b) +} +HB_FUNCOBJ (hb_sub); +struct +{ HB_PARTIALIZE(2); + template constexpr auto + operator () (const T &a, const T2 &b) const HB_AUTO_RETURN (a * b) +} +HB_FUNCOBJ (hb_mul); +struct +{ HB_PARTIALIZE(2); + template constexpr auto + operator () (const T &a, const T2 &b) const HB_AUTO_RETURN (a / b) +} +HB_FUNCOBJ (hb_div); +struct +{ HB_PARTIALIZE(2); + template constexpr auto + operator () (const T &a, const T2 &b) const HB_AUTO_RETURN (a % b) +} +HB_FUNCOBJ (hb_mod); +struct +{ + template constexpr auto + operator () (const T &a) const HB_AUTO_RETURN (+a) +} +HB_FUNCOBJ (hb_pos); +struct +{ + template constexpr auto + operator () (const T &a) const HB_AUTO_RETURN (-a) +} +HB_FUNCOBJ (hb_neg); +struct +{ + template constexpr auto + operator () (T &a) const HB_AUTO_RETURN (++a) +} +HB_FUNCOBJ (hb_inc); +struct +{ + template constexpr auto + operator () (T &a) const HB_AUTO_RETURN (--a) +} +HB_FUNCOBJ (hb_dec); + + +/* Compiler-assisted vectorization. */ + +/* Type behaving similar to vectorized vars defined using __attribute__((vector_size(...))), + * basically a fixed-size bitset. */ +template +struct hb_vector_size_t +{ + elt_t& operator [] (unsigned int i) { return v[i]; } + const elt_t& operator [] (unsigned int i) const { return v[i]; } + + void clear (unsigned char v = 0) { memset (this, v, sizeof (*this)); } + + template + hb_vector_size_t process (const Op& op) const + { + hb_vector_size_t r; + for (unsigned int i = 0; i < ARRAY_LENGTH (v); i++) + r.v[i] = op (v[i]); + return r; + } + template + hb_vector_size_t process (const Op& op, const hb_vector_size_t &o) const + { + hb_vector_size_t r; + for (unsigned int i = 0; i < ARRAY_LENGTH (v); i++) + r.v[i] = op (v[i], o.v[i]); + return r; + } + hb_vector_size_t operator | (const hb_vector_size_t &o) const + { return process (hb_bitwise_or, o); } + hb_vector_size_t operator & (const hb_vector_size_t &o) const + { return process (hb_bitwise_and, o); } + hb_vector_size_t operator ^ (const hb_vector_size_t &o) const + { return process (hb_bitwise_xor, o); } + hb_vector_size_t operator ~ () const + { return process (hb_bitwise_neg); } + + private: + static_assert (0 == byte_size % sizeof (elt_t), ""); + elt_t v[byte_size / sizeof (elt_t)]; +}; + + +#endif /* HB_ALGS_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-array.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-array.hh new file mode 100644 index 000000000..6efaf5fa5 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-array.hh @@ -0,0 +1,358 @@ +/* + * Copyright © 2018 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_ARRAY_HH +#define HB_ARRAY_HH + +#include "hb.hh" +#include "hb-algs.hh" +#include "hb-iter.hh" +#include "hb-null.hh" + + +template +struct hb_sorted_array_t; + +template +struct hb_array_t : hb_iter_with_fallback_t, Type&> +{ + /* + * Constructors. + */ + hb_array_t () : arrayZ (nullptr), length (0), backwards_length (0) {} + hb_array_t (Type *array_, unsigned int length_) : arrayZ (array_), length (length_), backwards_length (0) {} + template + hb_array_t (Type (&array_)[length_]) : arrayZ (array_), length (length_), backwards_length (0) {} + + template + hb_array_t (const hb_array_t &o) : + hb_iter_with_fallback_t (), + arrayZ (o.arrayZ), length (o.length), backwards_length (o.backwards_length) {} + template + hb_array_t& operator = (const hb_array_t &o) + { arrayZ = o.arrayZ; length = o.length; backwards_length = o.backwards_length; return *this; } + + /* + * Iterator implementation. + */ + typedef Type& __item_t__; + static constexpr bool is_random_access_iterator = true; + Type& __item_at__ (unsigned i) const + { + if (unlikely (i >= length)) return CrapOrNull (Type); + return arrayZ[i]; + } + void __forward__ (unsigned n) + { + if (unlikely (n > length)) + n = length; + length -= n; + backwards_length += n; + arrayZ += n; + } + void __rewind__ (unsigned n) + { + if (unlikely (n > backwards_length)) + n = backwards_length; + length += n; + backwards_length -= n; + arrayZ -= n; + } + unsigned __len__ () const { return length; } + /* Ouch. The operator== compares the contents of the array. For range-based for loops, + * it's best if we can just compare arrayZ, though comparing contents is still fast, + * but also would require that Type has operator==. As such, we optimize this operator + * for range-based for loop and just compare arrayZ. No need to compare length, as we + * assume we're only compared to .end(). */ + bool operator != (const hb_array_t& o) const + { return arrayZ != o.arrayZ; } + + /* Extra operators. + */ + Type * operator & () const { return arrayZ; } + operator hb_array_t () { return hb_array_t (arrayZ, length); } + template operator T * () const { return arrayZ; } + + HB_INTERNAL bool operator == (const hb_array_t &o) const; + HB_INTERNAL uint32_t hash () const; + + /* + * Compare, Sort, and Search. + */ + + /* Note: our compare is NOT lexicographic; it also does NOT call Type::cmp. */ + int cmp (const hb_array_t &a) const + { + if (length != a.length) + return (int) a.length - (int) length; + return hb_memcmp (a.arrayZ, arrayZ, get_size ()); + } + HB_INTERNAL static int cmp (const void *pa, const void *pb) + { + hb_array_t *a = (hb_array_t *) pa; + hb_array_t *b = (hb_array_t *) pb; + return b->cmp (*a); + } + + template + Type *lsearch (const T &x, Type *not_found = nullptr) + { + unsigned int count = length; + for (unsigned int i = 0; i < count; i++) + if (!this->arrayZ[i].cmp (x)) + return &this->arrayZ[i]; + return not_found; + } + template + const Type *lsearch (const T &x, const Type *not_found = nullptr) const + { + unsigned int count = length; + for (unsigned int i = 0; i < count; i++) + if (!this->arrayZ[i].cmp (x)) + return &this->arrayZ[i]; + return not_found; + } + + hb_sorted_array_t qsort (int (*cmp_)(const void*, const void*)) + { + if (likely (length)) + hb_qsort (arrayZ, length, this->get_item_size (), cmp_); + return hb_sorted_array_t (*this); + } + hb_sorted_array_t qsort () + { + if (likely (length)) + hb_qsort (arrayZ, length, this->get_item_size (), Type::cmp); + return hb_sorted_array_t (*this); + } + void qsort (unsigned int start, unsigned int end) + { + end = hb_min (end, length); + assert (start <= end); + if (likely (start < end)) + hb_qsort (arrayZ + start, end - start, this->get_item_size (), Type::cmp); + } + + /* + * Other methods. + */ + + unsigned int get_size () const { return length * this->get_item_size (); } + + hb_array_t sub_array (unsigned int start_offset = 0, unsigned int *seg_count = nullptr /* IN/OUT */) const + { + if (!start_offset && !seg_count) + return *this; + + unsigned int count = length; + if (unlikely (start_offset > count)) + count = 0; + else + count -= start_offset; + if (seg_count) + count = *seg_count = hb_min (count, *seg_count); + return hb_array_t (arrayZ + start_offset, count); + } + hb_array_t sub_array (unsigned int start_offset, unsigned int seg_count) const + { return sub_array (start_offset, &seg_count); } + + hb_array_t truncate (unsigned length) const { return sub_array (0, length); } + + template + const T *as () const + { return length < hb_null_size (T) ? &Null (T) : reinterpret_cast (arrayZ); } + + /* Only call if you allocated the underlying array using malloc() or similar. */ + void free () + { ::free ((void *) arrayZ); arrayZ = nullptr; length = 0; } + + template + hb_array_t copy (hb_serialize_context_t *c) const + { + TRACE_SERIALIZE (this); + auto* out = c->start_embed (arrayZ); + if (unlikely (!c->extend_size (out, get_size ()))) return_trace (hb_array_t ()); + for (unsigned i = 0; i < length; i++) + out[i] = arrayZ[i]; /* TODO: add version that calls c->copy() */ + return_trace (hb_array_t (out, length)); + } + + template + bool sanitize (hb_sanitize_context_t *c) const + { return c->check_array (arrayZ, length); } + + /* + * Members + */ + + public: + Type *arrayZ; + unsigned int length; + unsigned int backwards_length; +}; +template inline hb_array_t +hb_array (T *array, unsigned int length) +{ return hb_array_t (array, length); } +template inline hb_array_t +hb_array (T (&array_)[length_]) +{ return hb_array_t (array_); } + +enum hb_bfind_not_found_t +{ + HB_BFIND_NOT_FOUND_DONT_STORE, + HB_BFIND_NOT_FOUND_STORE, + HB_BFIND_NOT_FOUND_STORE_CLOSEST, +}; + +template +struct hb_sorted_array_t : + hb_iter_t, Type&>, + hb_array_t +{ + typedef hb_iter_t iter_base_t; + HB_ITER_USING (iter_base_t); + static constexpr bool is_random_access_iterator = true; + static constexpr bool is_sorted_iterator = true; + + hb_sorted_array_t () : hb_array_t () {} + hb_sorted_array_t (Type *array_, unsigned int length_) : hb_array_t (array_, length_) {} + template + hb_sorted_array_t (Type (&array_)[length_]) : hb_array_t (array_) {} + + template + hb_sorted_array_t (const hb_array_t &o) : + hb_iter_t (), + hb_array_t (o) {} + template + hb_sorted_array_t& operator = (const hb_array_t &o) + { hb_array_t (*this) = o; return *this; } + + /* Iterator implementation. */ + bool operator != (const hb_sorted_array_t& o) const + { return this->arrayZ != o.arrayZ || this->length != o.length; } + + hb_sorted_array_t sub_array (unsigned int start_offset, unsigned int *seg_count /* IN/OUT */) const + { return hb_sorted_array_t (((const hb_array_t *) (this))->sub_array (start_offset, seg_count)); } + hb_sorted_array_t sub_array (unsigned int start_offset, unsigned int seg_count) const + { return sub_array (start_offset, &seg_count); } + + hb_sorted_array_t truncate (unsigned length) const { return sub_array (0, length); } + + template + Type *bsearch (const T &x, Type *not_found = nullptr) + { + unsigned int i; + return bfind (x, &i) ? &this->arrayZ[i] : not_found; + } + template + const Type *bsearch (const T &x, const Type *not_found = nullptr) const + { + unsigned int i; + return bfind (x, &i) ? &this->arrayZ[i] : not_found; + } + template + bool bfind (const T &x, unsigned int *i = nullptr, + hb_bfind_not_found_t not_found = HB_BFIND_NOT_FOUND_DONT_STORE, + unsigned int to_store = (unsigned int) -1) const + { + int min = 0, max = (int) this->length - 1; + const Type *array = this->arrayZ; + while (min <= max) + { + int mid = ((unsigned int) min + (unsigned int) max) / 2; + int c = array[mid].cmp (x); + if (c < 0) + max = mid - 1; + else if (c > 0) + min = mid + 1; + else + { + if (i) + *i = mid; + return true; + } + } + if (i) + { + switch (not_found) + { + case HB_BFIND_NOT_FOUND_DONT_STORE: + break; + + case HB_BFIND_NOT_FOUND_STORE: + *i = to_store; + break; + + case HB_BFIND_NOT_FOUND_STORE_CLOSEST: + if (max < 0 || (max < (int) this->length && array[max].cmp (x) > 0)) + max++; + *i = max; + break; + } + } + return false; + } +}; +template inline hb_sorted_array_t +hb_sorted_array (T *array, unsigned int length) +{ return hb_sorted_array_t (array, length); } +template inline hb_sorted_array_t +hb_sorted_array (T (&array_)[length_]) +{ return hb_sorted_array_t (array_); } + +template +bool hb_array_t::operator == (const hb_array_t &o) const +{ + return length == o.length && + + hb_zip (*this, o) + | hb_map ([] (hb_pair_t &&_) { return _.first == _.second; }) + | hb_all + ; +} +template +uint32_t hb_array_t::hash () const +{ + return + + hb_iter (*this) + | hb_map (hb_hash) + | hb_reduce ([] (uint32_t a, uint32_t b) { return a * 31 + b; }, 0) + ; +} + +typedef hb_array_t hb_bytes_t; +typedef hb_array_t hb_ubytes_t; + +/* TODO Specialize opeator==/hash() for hb_bytes_t and hb_ubytes_t. */ +//template <> +//uint32_t hb_array_t::hash () const { return 0; } + +#endif /* HB_ARRAY_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-atomic.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-atomic.hh new file mode 100644 index 000000000..09d88937c --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-atomic.hh @@ -0,0 +1,301 @@ +/* + * Copyright © 2007 Chris Wilson + * Copyright © 2009,2010 Red Hat, Inc. + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Contributor(s): + * Chris Wilson + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_ATOMIC_HH +#define HB_ATOMIC_HH + +#include "hb.hh" +#include "hb-meta.hh" + + +/* + * Atomic integers and pointers. + */ + + +/* We need external help for these */ + +#if defined(hb_atomic_int_impl_add) \ + && defined(hb_atomic_ptr_impl_get) \ + && defined(hb_atomic_ptr_impl_cmpexch) + +/* Defined externally, i.e. in config.h. */ + + +#elif !defined(HB_NO_MT) && defined(__ATOMIC_ACQUIRE) + +/* C++11-style GCC primitives. */ + +#define _hb_memory_barrier() __sync_synchronize () + +#define hb_atomic_int_impl_add(AI, V) __atomic_fetch_add ((AI), (V), __ATOMIC_ACQ_REL) +#define hb_atomic_int_impl_set_relaxed(AI, V) __atomic_store_n ((AI), (V), __ATOMIC_RELAXED) +#define hb_atomic_int_impl_set(AI, V) __atomic_store_n ((AI), (V), __ATOMIC_RELEASE) +#define hb_atomic_int_impl_get_relaxed(AI) __atomic_load_n ((AI), __ATOMIC_RELAXED) +#define hb_atomic_int_impl_get(AI) __atomic_load_n ((AI), __ATOMIC_ACQUIRE) + +#define hb_atomic_ptr_impl_set_relaxed(P, V) __atomic_store_n ((P), (V), __ATOMIC_RELAXED) +#define hb_atomic_ptr_impl_get_relaxed(P) __atomic_load_n ((P), __ATOMIC_RELAXED) +#define hb_atomic_ptr_impl_get(P) __atomic_load_n ((P), __ATOMIC_ACQUIRE) +static inline bool +_hb_atomic_ptr_impl_cmplexch (const void **P, const void *O_, const void *N) +{ + const void *O = O_; // Need lvalue + return __atomic_compare_exchange_n ((void **) P, (void **) &O, (void *) N, true, __ATOMIC_ACQ_REL, __ATOMIC_RELAXED); +} +#define hb_atomic_ptr_impl_cmpexch(P,O,N) _hb_atomic_ptr_impl_cmplexch ((const void **) (P), (O), (N)) + +#elif !defined(HB_NO_MT) && __cplusplus >= 201103L + +/* C++11 atomics. */ + +#include + +#define _hb_memory_barrier() std::atomic_thread_fence(std::memory_order_ack_rel) +#define _hb_memory_r_barrier() std::atomic_thread_fence(std::memory_order_acquire) +#define _hb_memory_w_barrier() std::atomic_thread_fence(std::memory_order_release) + +#define hb_atomic_int_impl_add(AI, V) (reinterpret_cast *> (AI)->fetch_add ((V), std::memory_order_acq_rel)) +#define hb_atomic_int_impl_set_relaxed(AI, V) (reinterpret_cast *> (AI)->store ((V), std::memory_order_relaxed)) +#define hb_atomic_int_impl_set(AI, V) (reinterpret_cast *> (AI)->store ((V), std::memory_order_release)) +#define hb_atomic_int_impl_get_relaxed(AI) (reinterpret_cast const *> (AI)->load (std::memory_order_relaxed)) +#define hb_atomic_int_impl_get(AI) (reinterpret_cast const *> (AI)->load (std::memory_order_acquire)) + +#define hb_atomic_ptr_impl_set_relaxed(P, V) (reinterpret_cast *> (P)->store ((V), std::memory_order_relaxed)) +#define hb_atomic_ptr_impl_get_relaxed(P) (reinterpret_cast const *> (P)->load (std::memory_order_relaxed)) +#define hb_atomic_ptr_impl_get(P) (reinterpret_cast *> (P)->load (std::memory_order_acquire)) +static inline bool +_hb_atomic_ptr_impl_cmplexch (const void **P, const void *O_, const void *N) +{ + const void *O = O_; // Need lvalue + return reinterpret_cast *> (P)->compare_exchange_weak (O, N, std::memory_order_acq_rel, std::memory_order_relaxed); +} +#define hb_atomic_ptr_impl_cmpexch(P,O,N) _hb_atomic_ptr_impl_cmplexch ((const void **) (P), (O), (N)) + + +#elif !defined(HB_NO_MT) && defined(_WIN32) + +#include + +static inline void _hb_memory_barrier () +{ +#if !defined(MemoryBarrier) && !defined(__MINGW32_VERSION) + /* MinGW has a convoluted history of supporting MemoryBarrier. */ + LONG dummy = 0; + InterlockedExchange (&dummy, 1); +#else + MemoryBarrier (); +#endif +} +#define _hb_memory_barrier() _hb_memory_barrier () + +#define hb_atomic_int_impl_add(AI, V) InterlockedExchangeAdd ((LONG *) (AI), (V)) +static_assert ((sizeof (LONG) == sizeof (int)), ""); + +#define hb_atomic_ptr_impl_cmpexch(P,O,N) (InterlockedCompareExchangePointer ((P), (N), (O)) == (O)) + + +#elif !defined(HB_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES) + +#define _hb_memory_barrier() __sync_synchronize () + +#define hb_atomic_int_impl_add(AI, V) __sync_fetch_and_add ((AI), (V)) + +#define hb_atomic_ptr_impl_cmpexch(P,O,N) __sync_bool_compare_and_swap ((P), (O), (N)) + + +#elif !defined(HB_NO_MT) && defined(HAVE_SOLARIS_ATOMIC_OPS) + +#include +#include + +#define _hb_memory_r_barrier() __machine_r_barrier () +#define _hb_memory_w_barrier() __machine_w_barrier () +#define _hb_memory_barrier() __machine_rw_barrier () + +static inline int _hb_fetch_and_add (int *AI, int V) +{ + _hb_memory_w_barrier (); + int result = atomic_add_int_nv ((uint_t *) AI, V) - V; + _hb_memory_r_barrier (); + return result; +} +static inline bool _hb_compare_and_swap_ptr (void **P, void *O, void *N) +{ + _hb_memory_w_barrier (); + bool result = atomic_cas_ptr (P, O, N) == O; + _hb_memory_r_barrier (); + return result; +} + +#define hb_atomic_int_impl_add(AI, V) _hb_fetch_and_add ((AI), (V)) + +#define hb_atomic_ptr_impl_cmpexch(P,O,N) _hb_compare_and_swap_ptr ((P), (O), (N)) + + +#elif !defined(HB_NO_MT) && defined(__APPLE__) + +#include +#ifdef __MAC_OS_X_MIN_REQUIRED +#include +#elif defined(__IPHONE_OS_MIN_REQUIRED) +#include +#endif + +#define _hb_memory_barrier() OSMemoryBarrier () + +#define hb_atomic_int_impl_add(AI, V) (OSAtomicAdd32Barrier ((V), (AI)) - (V)) + +#if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_VERSION_MIN_REQUIRED >= 20100) +#define hb_atomic_ptr_impl_cmpexch(P,O,N) OSAtomicCompareAndSwapPtrBarrier ((O), (N), (P)) +#else +#if __ppc64__ || __x86_64__ || __aarch64__ +#define hb_atomic_ptr_impl_cmpexch(P,O,N) OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P)) +#else +#define hb_atomic_ptr_impl_cmpexch(P,O,N) OSAtomicCompareAndSwap32Barrier ((int32_t) (O), (int32_t) (N), (int32_t*) (P)) +#endif +#endif + + +#elif !defined(HB_NO_MT) && defined(_AIX) && (defined(__IBMCPP__) || defined(__ibmxl__)) + +#include + +#define _hb_memory_barrier() __lwsync () + +static inline int _hb_fetch_and_add (int *AI, int V) +{ + _hb_memory_barrier (); + int result = __fetch_and_add (AI, V); + _hb_memory_barrier (); + return result; +} +static inline bool _hb_compare_and_swaplp (long *P, long O, long N) +{ + _hb_memory_barrier (); + bool result = __compare_and_swaplp (P, &O, N); + _hb_memory_barrier (); + return result; +} + +#define hb_atomic_int_impl_add(AI, V) _hb_fetch_and_add ((AI), (V)) + +#define hb_atomic_ptr_impl_cmpexch(P,O,N) _hb_compare_and_swaplp ((long *) (P), (long) (O), (long) (N)) +static_assert ((sizeof (long) == sizeof (void *)), ""); + + +#elif !defined(HB_NO_MT) + +#define HB_ATOMIC_INT_NIL 1 /* Warn that fallback implementation is in use. */ + +#define _hb_memory_barrier() do {} while (0) + +#define hb_atomic_int_impl_add(AI, V) ((*(AI) += (V)) - (V)) + +#define hb_atomic_ptr_impl_cmpexch(P,O,N) (* (void **) (P) == (void *) (O) ? (* (void **) (P) = (void *) (N), true) : false) + + +#else /* HB_NO_MT */ + +#define hb_atomic_int_impl_add(AI, V) ((*(AI) += (V)) - (V)) + +#define _hb_memory_barrier() do {} while (0) + +#define hb_atomic_ptr_impl_cmpexch(P,O,N) (* (void **) (P) == (void *) (O) ? (* (void **) (P) = (void *) (N), true) : false) + + +#endif + + +#ifndef _hb_memory_r_barrier +#define _hb_memory_r_barrier() _hb_memory_barrier () +#endif +#ifndef _hb_memory_w_barrier +#define _hb_memory_w_barrier() _hb_memory_barrier () +#endif +#ifndef hb_atomic_int_impl_set_relaxed +#define hb_atomic_int_impl_set_relaxed(AI, V) (*(AI) = (V)) +#endif +#ifndef hb_atomic_int_impl_get_relaxed +#define hb_atomic_int_impl_get_relaxed(AI) (*(AI)) +#endif + +#ifndef hb_atomic_ptr_impl_set_relaxed +#define hb_atomic_ptr_impl_set_relaxed(P, V) (*(P) = (V)) +#endif +#ifndef hb_atomic_ptr_impl_get_relaxed +#define hb_atomic_ptr_impl_get_relaxed(P) (*(P)) +#endif +#ifndef hb_atomic_int_impl_set +inline void hb_atomic_int_impl_set (int *AI, int v) { _hb_memory_w_barrier (); *AI = v; } +#endif +#ifndef hb_atomic_int_impl_get +inline int hb_atomic_int_impl_get (const int *AI) { int v = *AI; _hb_memory_r_barrier (); return v; } +#endif +#ifndef hb_atomic_ptr_impl_get +inline void *hb_atomic_ptr_impl_get (void ** const P) { void *v = *P; _hb_memory_r_barrier (); return v; } +#endif + + +#define HB_ATOMIC_INT_INIT(V) {V} +struct hb_atomic_int_t +{ + void set_relaxed (int v_) { hb_atomic_int_impl_set_relaxed (&v, v_); } + void set (int v_) { hb_atomic_int_impl_set (&v, v_); } + int get_relaxed () const { return hb_atomic_int_impl_get_relaxed (&v); } + int get () const { return hb_atomic_int_impl_get (&v); } + int inc () { return hb_atomic_int_impl_add (&v, 1); } + int dec () { return hb_atomic_int_impl_add (&v, -1); } + + int v; +}; + + +#define HB_ATOMIC_PTR_INIT(V) {V} +template +struct hb_atomic_ptr_t +{ + typedef hb_remove_pointer

T; + + void init (T* v_ = nullptr) { set_relaxed (v_); } + void set_relaxed (T* v_) { hb_atomic_ptr_impl_set_relaxed (&v, v_); } + T *get_relaxed () const { return (T *) hb_atomic_ptr_impl_get_relaxed (&v); } + T *get () const { return (T *) hb_atomic_ptr_impl_get ((void **) &v); } + bool cmpexch (const T *old, T *new_) const { return hb_atomic_ptr_impl_cmpexch ((void **) &v, (void *) old, (void *) new_); } + + T * operator -> () const { return get (); } + template operator C * () const { return get (); } + + T *v; +}; + + +#endif /* HB_ATOMIC_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-bimap.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-bimap.hh new file mode 100644 index 000000000..a773951ab --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-bimap.hh @@ -0,0 +1,143 @@ +/* + * Copyright © 2019 Adobe Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Adobe Author(s): Michiharu Ariza + */ + +#ifndef HB_BIMAP_HH +#define HB_BIMAP_HH + +#include "hb.hh" +#include "hb-map.hh" + +/* Bi-directional map */ +struct hb_bimap_t +{ + hb_bimap_t () { init (); } + ~hb_bimap_t () { fini (); } + + void init () + { + forw_map.init (); + back_map.init (); + } + + void fini () + { + forw_map.fini (); + back_map.fini (); + } + + void reset () + { + forw_map.reset (); + back_map.reset (); + } + + bool in_error () const { return forw_map.in_error () || back_map.in_error (); } + + void set (hb_codepoint_t lhs, hb_codepoint_t rhs) + { + if (unlikely (lhs == HB_MAP_VALUE_INVALID)) return; + if (unlikely (rhs == HB_MAP_VALUE_INVALID)) { del (lhs); return; } + forw_map.set (lhs, rhs); + back_map.set (rhs, lhs); + } + + hb_codepoint_t get (hb_codepoint_t lhs) const { return forw_map.get (lhs); } + hb_codepoint_t backward (hb_codepoint_t rhs) const { return back_map.get (rhs); } + + hb_codepoint_t operator [] (hb_codepoint_t lhs) const { return get (lhs); } + bool has (hb_codepoint_t lhs, hb_codepoint_t *vp = nullptr) const { return forw_map.has (lhs, vp); } + + void del (hb_codepoint_t lhs) + { + back_map.del (get (lhs)); + forw_map.del (lhs); + } + + void clear () + { + forw_map.clear (); + back_map.clear (); + } + + bool is_empty () const { return get_population () == 0; } + + unsigned int get_population () const { return forw_map.get_population (); } + + protected: + hb_map_t forw_map; + hb_map_t back_map; +}; + +/* Inremental bimap: only lhs is given, rhs is incrementally assigned */ +struct hb_inc_bimap_t : hb_bimap_t +{ + /* Add a mapping from lhs to rhs with a unique value if lhs is unknown. + * Return the rhs value as the result. + */ + hb_codepoint_t add (hb_codepoint_t lhs) + { + hb_codepoint_t rhs = forw_map[lhs]; + if (rhs == HB_MAP_VALUE_INVALID) + { + rhs = get_population (); + set (lhs, rhs); + } + return rhs; + } + + /* Create an identity map. */ + bool identity (unsigned int size) + { + clear (); + for (hb_codepoint_t i = 0; i < size; i++) set (i, i); + return !in_error (); + } + + protected: + static int cmp_id (const void* a, const void* b) + { return (int)*(const hb_codepoint_t *)a - (int)*(const hb_codepoint_t *)b; } + + public: + /* Optional: after finished adding all mappings in a random order, + * reassign rhs to lhs so that they are in the same order. */ + void sort () + { + hb_codepoint_t count = get_population (); + hb_vector_t work; + work.resize (count); + + for (hb_codepoint_t rhs = 0; rhs < count; rhs++) + work[rhs] = back_map[rhs]; + + work.qsort (cmp_id); + + clear (); + for (hb_codepoint_t rhs = 0; rhs < count; rhs++) + set (work[rhs], rhs); + } +}; + +#endif /* HB_BIMAP_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-blob.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-blob.cc new file mode 100644 index 000000000..2e72683c8 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-blob.cc @@ -0,0 +1,679 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2018 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + */ + + +/* https://github.com/harfbuzz/harfbuzz/issues/1308 + * http://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html + * https://www.oracle.com/technetwork/articles/servers-storage-dev/standardheaderfiles-453865.html + */ +#if !defined(_POSIX_C_SOURCE) && !defined(_MSC_VER) && !defined(__NetBSD__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-macros" +#define _POSIX_C_SOURCE 200809L +#pragma GCC diagnostic pop +#endif + +#include "hb.hh" +#include "hb-blob.hh" + +#ifdef HAVE_SYS_MMAN_H +#ifdef HAVE_UNISTD_H +#include +#endif /* HAVE_UNISTD_H */ +#include +#endif /* HAVE_SYS_MMAN_H */ + +#include +#include + + +/** + * SECTION: hb-blob + * @title: hb-blob + * @short_description: Binary data containers + * @include: hb.h + * + * Blobs wrap a chunk of binary data to handle lifecycle management of data + * while it is passed between client and HarfBuzz. Blobs are primarily used + * to create font faces, but also to access font face tables, as well as + * pass around other binary data. + **/ + + +/** + * hb_blob_create: (skip) + * @data: Pointer to blob data. + * @length: Length of @data in bytes. + * @mode: Memory mode for @data. + * @user_data: Data parameter to pass to @destroy. + * @destroy: Callback to call when @data is not needed anymore. + * + * Creates a new "blob" object wrapping @data. The @mode parameter is used + * to negotiate ownership and lifecycle of @data. + * + * Return value: New blob, or the empty blob if something failed or if @length is + * zero. Destroy with hb_blob_destroy(). + * + * Since: 0.9.2 + **/ +hb_blob_t * +hb_blob_create (const char *data, + unsigned int length, + hb_memory_mode_t mode, + void *user_data, + hb_destroy_func_t destroy) +{ + hb_blob_t *blob; + + if (!length || + length >= 1u << 31 || + !(blob = hb_object_create ())) { + if (destroy) + destroy (user_data); + return hb_blob_get_empty (); + } + + blob->data = data; + blob->length = length; + blob->mode = mode; + + blob->user_data = user_data; + blob->destroy = destroy; + + if (blob->mode == HB_MEMORY_MODE_DUPLICATE) { + blob->mode = HB_MEMORY_MODE_READONLY; + if (!blob->try_make_writable ()) { + hb_blob_destroy (blob); + return hb_blob_get_empty (); + } + } + + return blob; +} + +static void +_hb_blob_destroy (void *data) +{ + hb_blob_destroy ((hb_blob_t *) data); +} + +/** + * hb_blob_create_sub_blob: + * @parent: Parent blob. + * @offset: Start offset of sub-blob within @parent, in bytes. + * @length: Length of sub-blob. + * + * Returns a blob that represents a range of bytes in @parent. The new + * blob is always created with %HB_MEMORY_MODE_READONLY, meaning that it + * will never modify data in the parent blob. The parent data is not + * expected to be modified, and will result in undefined behavior if it + * is. + * + * Makes @parent immutable. + * + * Return value: New blob, or the empty blob if something failed or if + * @length is zero or @offset is beyond the end of @parent's data. Destroy + * with hb_blob_destroy(). + * + * Since: 0.9.2 + **/ +hb_blob_t * +hb_blob_create_sub_blob (hb_blob_t *parent, + unsigned int offset, + unsigned int length) +{ + hb_blob_t *blob; + + if (!length || !parent || offset >= parent->length) + return hb_blob_get_empty (); + + hb_blob_make_immutable (parent); + + blob = hb_blob_create (parent->data + offset, + hb_min (length, parent->length - offset), + HB_MEMORY_MODE_READONLY, + hb_blob_reference (parent), + _hb_blob_destroy); + + return blob; +} + +/** + * hb_blob_copy_writable_or_fail: + * @blob: A blob. + * + * Makes a writable copy of @blob. + * + * Return value: New blob, or nullptr if allocation failed. + * + * Since: 1.8.0 + **/ +hb_blob_t * +hb_blob_copy_writable_or_fail (hb_blob_t *blob) +{ + blob = hb_blob_create (blob->data, + blob->length, + HB_MEMORY_MODE_DUPLICATE, + nullptr, + nullptr); + + if (unlikely (blob == hb_blob_get_empty ())) + blob = nullptr; + + return blob; +} + +/** + * hb_blob_get_empty: + * + * Returns the singleton empty blob. + * + * See TODO:link object types for more information. + * + * Return value: (transfer full): the empty blob. + * + * Since: 0.9.2 + **/ +hb_blob_t * +hb_blob_get_empty () +{ + return const_cast (&Null(hb_blob_t)); +} + +/** + * hb_blob_reference: (skip) + * @blob: a blob. + * + * Increases the reference count on @blob. + * + * See TODO:link object types for more information. + * + * Return value: @blob. + * + * Since: 0.9.2 + **/ +hb_blob_t * +hb_blob_reference (hb_blob_t *blob) +{ + return hb_object_reference (blob); +} + +/** + * hb_blob_destroy: (skip) + * @blob: a blob. + * + * Decreases the reference count on @blob, and if it reaches zero, destroys + * @blob, freeing all memory, possibly calling the destroy-callback the blob + * was created for if it has not been called already. + * + * See TODO:link object types for more information. + * + * Since: 0.9.2 + **/ +void +hb_blob_destroy (hb_blob_t *blob) +{ + if (!hb_object_destroy (blob)) return; + + blob->fini_shallow (); + + free (blob); +} + +/** + * hb_blob_set_user_data: (skip) + * @blob: a blob. + * @key: key for data to set. + * @data: data to set. + * @destroy: callback to call when @data is not needed anymore. + * @replace: whether to replace an existing data with the same key. + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_blob_set_user_data (hb_blob_t *blob, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace) +{ + return hb_object_set_user_data (blob, key, data, destroy, replace); +} + +/** + * hb_blob_get_user_data: (skip) + * @blob: a blob. + * @key: key for data to get. + * + * + * + * Return value: (transfer none): + * + * Since: 0.9.2 + **/ +void * +hb_blob_get_user_data (hb_blob_t *blob, + hb_user_data_key_t *key) +{ + return hb_object_get_user_data (blob, key); +} + + +/** + * hb_blob_make_immutable: + * @blob: a blob. + * + * + * + * Since: 0.9.2 + **/ +void +hb_blob_make_immutable (hb_blob_t *blob) +{ + if (hb_object_is_immutable (blob)) + return; + + hb_object_make_immutable (blob); +} + +/** + * hb_blob_is_immutable: + * @blob: a blob. + * + * + * + * Return value: TODO + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_blob_is_immutable (hb_blob_t *blob) +{ + return hb_object_is_immutable (blob); +} + + +/** + * hb_blob_get_length: + * @blob: a blob. + * + * + * + * Return value: the length of blob data in bytes. + * + * Since: 0.9.2 + **/ +unsigned int +hb_blob_get_length (hb_blob_t *blob) +{ + return blob->length; +} + +/** + * hb_blob_get_data: + * @blob: a blob. + * @length: (out): + * + * + * + * Returns: (transfer none) (array length=length): + * + * Since: 0.9.2 + **/ +const char * +hb_blob_get_data (hb_blob_t *blob, unsigned int *length) +{ + if (length) + *length = blob->length; + + return blob->data; +} + +/** + * hb_blob_get_data_writable: + * @blob: a blob. + * @length: (out): output length of the writable data. + * + * Tries to make blob data writable (possibly copying it) and + * return pointer to data. + * + * Fails if blob has been made immutable, or if memory allocation + * fails. + * + * Returns: (transfer none) (array length=length): Writable blob data, + * or %NULL if failed. + * + * Since: 0.9.2 + **/ +char * +hb_blob_get_data_writable (hb_blob_t *blob, unsigned int *length) +{ + if (!blob->try_make_writable ()) { + if (length) + *length = 0; + + return nullptr; + } + + if (length) + *length = blob->length; + + return const_cast (blob->data); +} + + +bool +hb_blob_t::try_make_writable_inplace_unix () +{ +#if defined(HAVE_SYS_MMAN_H) && defined(HAVE_MPROTECT) + uintptr_t pagesize = -1, mask, length; + const char *addr; + +#if defined(HAVE_SYSCONF) && defined(_SC_PAGE_SIZE) + pagesize = (uintptr_t) sysconf (_SC_PAGE_SIZE); +#elif defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE) + pagesize = (uintptr_t) sysconf (_SC_PAGESIZE); +#elif defined(HAVE_GETPAGESIZE) + pagesize = (uintptr_t) getpagesize (); +#endif + + if ((uintptr_t) -1L == pagesize) { + DEBUG_MSG_FUNC (BLOB, this, "failed to get pagesize: %s", strerror (errno)); + return false; + } + DEBUG_MSG_FUNC (BLOB, this, "pagesize is %lu", (unsigned long) pagesize); + + mask = ~(pagesize-1); + addr = (const char *) (((uintptr_t) this->data) & mask); + length = (const char *) (((uintptr_t) this->data + this->length + pagesize-1) & mask) - addr; + DEBUG_MSG_FUNC (BLOB, this, + "calling mprotect on [%p..%p] (%lu bytes)", + addr, addr+length, (unsigned long) length); + if (-1 == mprotect ((void *) addr, length, PROT_READ | PROT_WRITE)) { + DEBUG_MSG_FUNC (BLOB, this, "mprotect failed: %s", strerror (errno)); + return false; + } + + this->mode = HB_MEMORY_MODE_WRITABLE; + + DEBUG_MSG_FUNC (BLOB, this, + "successfully made [%p..%p] (%lu bytes) writable\n", + addr, addr+length, (unsigned long) length); + return true; +#else + return false; +#endif +} + +bool +hb_blob_t::try_make_writable_inplace () +{ + DEBUG_MSG_FUNC (BLOB, this, "making writable inplace\n"); + + if (this->try_make_writable_inplace_unix ()) + return true; + + DEBUG_MSG_FUNC (BLOB, this, "making writable -> FAILED\n"); + + /* Failed to make writable inplace, mark that */ + this->mode = HB_MEMORY_MODE_READONLY; + return false; +} + +bool +hb_blob_t::try_make_writable () +{ + if (hb_object_is_immutable (this)) + return false; + + if (this->mode == HB_MEMORY_MODE_WRITABLE) + return true; + + if (this->mode == HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE && this->try_make_writable_inplace ()) + return true; + + if (this->mode == HB_MEMORY_MODE_WRITABLE) + return true; + + + DEBUG_MSG_FUNC (BLOB, this, "current data is -> %p\n", this->data); + + char *new_data; + + new_data = (char *) malloc (this->length); + if (unlikely (!new_data)) + return false; + + DEBUG_MSG_FUNC (BLOB, this, "dupped successfully -> %p\n", this->data); + + memcpy (new_data, this->data, this->length); + this->destroy_user_data (); + this->mode = HB_MEMORY_MODE_WRITABLE; + this->data = new_data; + this->user_data = new_data; + this->destroy = free; + + return true; +} + +/* + * Mmap + */ + +#ifndef HB_NO_OPEN +#ifdef HAVE_MMAP +# include +# include +# include +#endif + +#ifdef _WIN32 +# include +#else +# ifndef O_BINARY +# define O_BINARY 0 +# endif +#endif + +#ifndef MAP_NORESERVE +# define MAP_NORESERVE 0 +#endif + +struct hb_mapped_file_t +{ + char *contents; + unsigned long length; +#ifdef _WIN32 + HANDLE mapping; +#endif +}; + +#if (defined(HAVE_MMAP) || defined(_WIN32)) && !defined(HB_NO_MMAP) +static void +_hb_mapped_file_destroy (void *file_) +{ + hb_mapped_file_t *file = (hb_mapped_file_t *) file_; +#ifdef HAVE_MMAP + munmap (file->contents, file->length); +#elif defined(_WIN32) + UnmapViewOfFile (file->contents); + CloseHandle (file->mapping); +#else + assert (0); // If we don't have mmap we shouldn't reach here +#endif + + free (file); +} +#endif + +/** + * hb_blob_create_from_file: + * @file_name: font filename. + * + * Returns: A hb_blob_t pointer with the content of the file + * + * Since: 1.7.7 + **/ +hb_blob_t * +hb_blob_create_from_file (const char *file_name) +{ + /* Adopted from glib's gmappedfile.c with Matthias Clasen and + Allison Lortie permission but changed a lot to suit our need. */ +#if defined(HAVE_MMAP) && !defined(HB_NO_MMAP) + hb_mapped_file_t *file = (hb_mapped_file_t *) calloc (1, sizeof (hb_mapped_file_t)); + if (unlikely (!file)) return hb_blob_get_empty (); + + int fd = open (file_name, O_RDONLY | O_BINARY, 0); + if (unlikely (fd == -1)) goto fail_without_close; + + struct stat st; + if (unlikely (fstat (fd, &st) == -1)) goto fail; + + file->length = (unsigned long) st.st_size; + file->contents = (char *) mmap (nullptr, file->length, PROT_READ, + MAP_PRIVATE | MAP_NORESERVE, fd, 0); + + if (unlikely (file->contents == MAP_FAILED)) goto fail; + + close (fd); + + return hb_blob_create (file->contents, file->length, + HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE, (void *) file, + (hb_destroy_func_t) _hb_mapped_file_destroy); + +fail: + close (fd); +fail_without_close: + free (file); + +#elif defined(_WIN32) && !defined(HB_NO_MMAP) + hb_mapped_file_t *file = (hb_mapped_file_t *) calloc (1, sizeof (hb_mapped_file_t)); + if (unlikely (!file)) return hb_blob_get_empty (); + + HANDLE fd; + unsigned int size = strlen (file_name) + 1; + wchar_t * wchar_file_name = (wchar_t *) malloc (sizeof (wchar_t) * size); + if (unlikely (wchar_file_name == nullptr)) goto fail_without_close; + mbstowcs (wchar_file_name, file_name, size); +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP) + { + CREATEFILE2_EXTENDED_PARAMETERS ceparams = { 0 }; + ceparams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS); + ceparams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED & 0xFFFF; + ceparams.dwFileFlags = FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED & 0xFFF00000; + ceparams.dwSecurityQosFlags = FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED & 0x000F0000; + ceparams.lpSecurityAttributes = nullptr; + ceparams.hTemplateFile = nullptr; + fd = CreateFile2 (wchar_file_name, GENERIC_READ, FILE_SHARE_READ, + OPEN_EXISTING, &ceparams); + } +#else + fd = CreateFileW (wchar_file_name, GENERIC_READ, FILE_SHARE_READ, nullptr, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL|FILE_FLAG_OVERLAPPED, + nullptr); +#endif + free (wchar_file_name); + + if (unlikely (fd == INVALID_HANDLE_VALUE)) goto fail_without_close; + +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP) + { + LARGE_INTEGER length; + GetFileSizeEx (fd, &length); + file->length = length.LowPart; + file->mapping = CreateFileMappingFromApp (fd, nullptr, PAGE_READONLY, length.QuadPart, nullptr); + } +#else + file->length = (unsigned long) GetFileSize (fd, nullptr); + file->mapping = CreateFileMapping (fd, nullptr, PAGE_READONLY, 0, 0, nullptr); +#endif + if (unlikely (file->mapping == nullptr)) goto fail; + +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP) + file->contents = (char *) MapViewOfFileFromApp (file->mapping, FILE_MAP_READ, 0, 0); +#else + file->contents = (char *) MapViewOfFile (file->mapping, FILE_MAP_READ, 0, 0, 0); +#endif + if (unlikely (file->contents == nullptr)) goto fail; + + CloseHandle (fd); + return hb_blob_create (file->contents, file->length, + HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE, (void *) file, + (hb_destroy_func_t) _hb_mapped_file_destroy); + +fail: + CloseHandle (fd); +fail_without_close: + free (file); + +#endif + + /* The following tries to read a file without knowing its size beforehand + It's used as a fallback for systems without mmap or to read from pipes */ + unsigned long len = 0, allocated = BUFSIZ * 16; + char *data = (char *) malloc (allocated); + if (unlikely (data == nullptr)) return hb_blob_get_empty (); + + FILE *fp = fopen (file_name, "rb"); + if (unlikely (fp == nullptr)) goto fread_fail_without_close; + + while (!feof (fp)) + { + if (allocated - len < BUFSIZ) + { + allocated *= 2; + /* Don't allocate and go more than ~536MB, our mmap reader still + can cover files like that but lets limit our fallback reader */ + if (unlikely (allocated > (2 << 28))) goto fread_fail; + char *new_data = (char *) realloc (data, allocated); + if (unlikely (new_data == nullptr)) goto fread_fail; + data = new_data; + } + + unsigned long addition = fread (data + len, 1, allocated - len, fp); + + int err = ferror (fp); +#ifdef EINTR // armcc doesn't have it + if (unlikely (err == EINTR)) continue; +#endif + if (unlikely (err)) goto fread_fail; + + len += addition; + } + + return hb_blob_create (data, len, HB_MEMORY_MODE_WRITABLE, data, + (hb_destroy_func_t) free); + +fread_fail: + fclose (fp); +fread_fail_without_close: + free (data); + return hb_blob_get_empty (); +} +#endif /* !HB_NO_OPEN */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-blob.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-blob.h new file mode 100644 index 000000000..f80e9af2d --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-blob.h @@ -0,0 +1,131 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + */ + +#ifndef HB_H_IN +#error "Include instead." +#endif + +#ifndef HB_BLOB_H +#define HB_BLOB_H + +#include "hb-common.h" + +HB_BEGIN_DECLS + + +/* + * Note re various memory-modes: + * + * - In no case shall the HarfBuzz client modify memory + * that is passed to HarfBuzz in a blob. If there is + * any such possibility, MODE_DUPLICATE should be used + * such that HarfBuzz makes a copy immediately, + * + * - Use MODE_READONLY otherwise, unless you really really + * really know what you are doing, + * + * - MODE_WRITABLE is appropriate if you really made a + * copy of data solely for the purpose of passing to + * HarfBuzz and doing that just once (no reuse!), + * + * - If the font is mmap()ed, it's ok to use + * READONLY_MAY_MAKE_WRITABLE, however, using that mode + * correctly is very tricky. Use MODE_READONLY instead. + */ +typedef enum { + HB_MEMORY_MODE_DUPLICATE, + HB_MEMORY_MODE_READONLY, + HB_MEMORY_MODE_WRITABLE, + HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE +} hb_memory_mode_t; + +typedef struct hb_blob_t hb_blob_t; + +HB_EXTERN hb_blob_t * +hb_blob_create (const char *data, + unsigned int length, + hb_memory_mode_t mode, + void *user_data, + hb_destroy_func_t destroy); + +HB_EXTERN hb_blob_t * +hb_blob_create_from_file (const char *file_name); + +/* Always creates with MEMORY_MODE_READONLY. + * Even if the parent blob is writable, we don't + * want the user of the sub-blob to be able to + * modify the parent data as that data may be + * shared among multiple sub-blobs. + */ +HB_EXTERN hb_blob_t * +hb_blob_create_sub_blob (hb_blob_t *parent, + unsigned int offset, + unsigned int length); + +HB_EXTERN hb_blob_t * +hb_blob_copy_writable_or_fail (hb_blob_t *blob); + +HB_EXTERN hb_blob_t * +hb_blob_get_empty (void); + +HB_EXTERN hb_blob_t * +hb_blob_reference (hb_blob_t *blob); + +HB_EXTERN void +hb_blob_destroy (hb_blob_t *blob); + +HB_EXTERN hb_bool_t +hb_blob_set_user_data (hb_blob_t *blob, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace); + + +HB_EXTERN void * +hb_blob_get_user_data (hb_blob_t *blob, + hb_user_data_key_t *key); + + +HB_EXTERN void +hb_blob_make_immutable (hb_blob_t *blob); + +HB_EXTERN hb_bool_t +hb_blob_is_immutable (hb_blob_t *blob); + + +HB_EXTERN unsigned int +hb_blob_get_length (hb_blob_t *blob); + +HB_EXTERN const char * +hb_blob_get_data (hb_blob_t *blob, unsigned int *length); + +HB_EXTERN char * +hb_blob_get_data_writable (hb_blob_t *blob, unsigned int *length); + +HB_END_DECLS + +#endif /* HB_BLOB_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-blob.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-blob.hh new file mode 100644 index 000000000..d85bd823b --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-blob.hh @@ -0,0 +1,97 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2018 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_BLOB_HH +#define HB_BLOB_HH + +#include "hb.hh" + + +/* + * hb_blob_t + */ + +struct hb_blob_t +{ + void fini_shallow () { destroy_user_data (); } + + void destroy_user_data () + { + if (destroy) + { + destroy (user_data); + user_data = nullptr; + destroy = nullptr; + } + } + + HB_INTERNAL bool try_make_writable (); + HB_INTERNAL bool try_make_writable_inplace (); + HB_INTERNAL bool try_make_writable_inplace_unix (); + + hb_bytes_t as_bytes () const { return hb_bytes_t (data, length); } + template + const Type* as () const { return as_bytes ().as (); } + + public: + hb_object_header_t header; + + const char *data; + unsigned int length; + hb_memory_mode_t mode; + + void *user_data; + hb_destroy_func_t destroy; +}; + + +/* + * hb_blob_ptr_t + */ + +template +struct hb_blob_ptr_t +{ + typedef hb_remove_pointer

T; + + hb_blob_ptr_t (hb_blob_t *b_ = nullptr) : b (b_) {} + hb_blob_t * operator = (hb_blob_t *b_) { return b = b_; } + const T * operator -> () const { return get (); } + const T & operator * () const { return *get (); } + template operator const C * () const { return get (); } + operator const char * () const { return (const char *) get (); } + const T * get () const { return b->as (); } + hb_blob_t * get_blob () const { return b.get_raw (); } + unsigned int get_length () const { return b.get ()->length; } + void destroy () { hb_blob_destroy (b.get ()); b = nullptr; } + + hb_nonnull_ptr_t b; +}; + + +#endif /* HB_BLOB_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer-deserialize-json.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer-deserialize-json.hh new file mode 100644 index 000000000..1f9e2e91d --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer-deserialize-json.hh @@ -0,0 +1,643 @@ + +#line 1 "hb-buffer-deserialize-json.rl" +/* + * Copyright © 2013 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_BUFFER_DESERIALIZE_JSON_HH +#define HB_BUFFER_DESERIALIZE_JSON_HH + +#include "hb.hh" + + +#line 36 "hb-buffer-deserialize-json.hh" +static const unsigned char _deserialize_json_trans_keys[] = { + 0u, 0u, 9u, 123u, 9u, 34u, 97u, 103u, 120u, 121u, 34u, 34u, 9u, 58u, 9u, 57u, + 48u, 57u, 9u, 125u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u, + 9u, 125u, 9u, 125u, 108u, 108u, 34u, 34u, 9u, 58u, 9u, 57u, 9u, 125u, 9u, 125u, + 120u, 121u, 34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u, 9u, 125u, 9u, 125u, 34u, 34u, + 9u, 58u, 9u, 57u, 48u, 57u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u, + 65u, 122u, 34u, 122u, 9u, 125u, 9u, 125u, 9u, 93u, 9u, 123u, 0u, 0u, 0 +}; + +static const char _deserialize_json_key_spans[] = { + 0, 115, 26, 7, 2, 1, 50, 49, + 10, 117, 117, 117, 1, 50, 49, 10, + 117, 117, 1, 1, 50, 49, 117, 117, + 2, 1, 50, 49, 10, 117, 117, 1, + 50, 49, 10, 117, 117, 1, 50, 49, + 58, 89, 117, 117, 85, 115, 0 +}; + +static const short _deserialize_json_index_offsets[] = { + 0, 0, 116, 143, 151, 154, 156, 207, + 257, 268, 386, 504, 622, 624, 675, 725, + 736, 854, 972, 974, 976, 1027, 1077, 1195, + 1313, 1316, 1318, 1369, 1419, 1430, 1548, 1666, + 1668, 1719, 1769, 1780, 1898, 2016, 2018, 2069, + 2119, 2178, 2268, 2386, 2504, 2590, 2706 +}; + +static const char _deserialize_json_indicies[] = { + 0, 0, 0, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 0, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 2, 1, 3, 3, 3, + 3, 3, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 3, 1, 4, 1, + 5, 1, 6, 7, 1, 1, 8, 1, + 9, 10, 1, 11, 1, 11, 11, 11, + 11, 11, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 11, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 12, 1, + 12, 12, 12, 12, 12, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 12, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 13, 1, 1, 14, + 15, 15, 15, 15, 15, 15, 15, 15, + 15, 1, 16, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 1, 18, 18, 18, + 18, 18, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 18, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 19, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 20, 1, 21, 21, 21, 21, 21, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 21, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 3, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 22, + 1, 18, 18, 18, 18, 18, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 18, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 19, 1, 1, 1, + 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 20, 1, 23, + 1, 23, 23, 23, 23, 23, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 23, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 24, 1, 24, 24, 24, 24, + 24, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 24, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 25, 1, 1, 26, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 1, 28, 29, + 29, 29, 29, 29, 29, 29, 29, 29, + 1, 30, 30, 30, 30, 30, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 30, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 31, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 32, 1, 30, + 30, 30, 30, 30, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 30, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 31, 1, 1, 1, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 32, 1, 33, 1, 34, + 1, 34, 34, 34, 34, 34, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 34, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 35, 1, 35, 35, 35, 35, + 35, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 35, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 36, 37, 37, 37, 37, + 37, 37, 37, 37, 37, 1, 38, 38, + 38, 38, 38, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 38, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 39, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 40, 1, 38, 38, 38, 38, + 38, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 38, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 39, + 1, 1, 1, 41, 41, 41, 41, 41, + 41, 41, 41, 41, 41, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 40, 1, 42, 43, 1, 44, 1, 44, + 44, 44, 44, 44, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 44, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 45, 1, 45, 45, 45, 45, 45, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 45, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 46, 1, + 1, 47, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 1, 49, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 1, 51, + 51, 51, 51, 51, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 51, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 52, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 53, 1, 51, 51, 51, + 51, 51, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 51, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 52, 1, 1, 1, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 53, 1, 54, 1, 54, 54, 54, + 54, 54, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 54, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 55, 1, + 55, 55, 55, 55, 55, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 55, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 56, 1, 1, 57, + 58, 58, 58, 58, 58, 58, 58, 58, + 58, 1, 59, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 1, 61, 61, 61, + 61, 61, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 61, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 62, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 63, 1, 61, 61, 61, 61, 61, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 61, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 62, 1, + 1, 1, 60, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 63, + 1, 64, 1, 64, 64, 64, 64, 64, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 64, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 65, 1, 65, 65, + 65, 65, 65, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 65, 1, 66, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 67, 68, 68, + 68, 68, 68, 68, 68, 68, 68, 1, + 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 1, 1, 1, 1, 1, 1, + 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 1, 70, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 71, 71, + 1, 71, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 1, 1, 1, 1, 1, + 1, 1, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 71, 1, 1, 1, 1, + 71, 1, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 71, 1, 72, 72, 72, + 72, 72, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 72, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 73, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 74, 1, 72, 72, 72, 72, 72, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 72, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 73, 1, + 1, 1, 75, 75, 75, 75, 75, 75, + 75, 75, 75, 75, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 74, + 1, 76, 76, 76, 76, 76, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 76, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 77, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 78, 1, 0, + 0, 0, 0, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 0, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 1, 1, 0 +}; + +static const char _deserialize_json_trans_targs[] = { + 1, 0, 2, 2, 3, 4, 18, 24, + 37, 5, 12, 6, 7, 8, 9, 11, + 9, 11, 10, 2, 44, 10, 44, 13, + 14, 15, 16, 17, 16, 17, 10, 2, + 44, 19, 20, 21, 22, 23, 10, 2, + 44, 23, 25, 31, 26, 27, 28, 29, + 30, 29, 30, 10, 2, 44, 32, 33, + 34, 35, 36, 35, 36, 10, 2, 44, + 38, 39, 40, 42, 43, 41, 10, 41, + 10, 2, 44, 43, 44, 45, 46 +}; + +static const char _deserialize_json_trans_actions[] = { + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 2, 2, 2, + 0, 0, 3, 3, 4, 0, 5, 0, + 0, 2, 2, 2, 0, 0, 6, 6, + 7, 0, 0, 0, 2, 2, 8, 8, + 9, 0, 0, 0, 0, 0, 2, 2, + 2, 0, 0, 10, 10, 11, 0, 0, + 2, 2, 2, 0, 0, 12, 12, 13, + 0, 0, 0, 2, 2, 2, 14, 0, + 15, 15, 16, 0, 0, 0, 0 +}; + +static const int deserialize_json_start = 1; +static const int deserialize_json_first_final = 44; +static const int deserialize_json_error = 0; + +static const int deserialize_json_en_main = 1; + + +#line 97 "hb-buffer-deserialize-json.rl" + + +static hb_bool_t +_hb_buffer_deserialize_glyphs_json (hb_buffer_t *buffer, + const char *buf, + unsigned int buf_len, + const char **end_ptr, + hb_font_t *font) +{ + const char *p = buf, *pe = buf + buf_len; + + /* Ensure we have positions. */ + (void) hb_buffer_get_glyph_positions (buffer, nullptr); + + while (p < pe && ISSPACE (*p)) + p++; + if (p < pe && *p == (buffer->len ? ',' : '[')) + { + *end_ptr = ++p; + } + + const char *tok = nullptr; + int cs; + hb_glyph_info_t info = {0}; + hb_glyph_position_t pos = {0}; + +#line 466 "hb-buffer-deserialize-json.hh" + { + cs = deserialize_json_start; + } + +#line 471 "hb-buffer-deserialize-json.hh" + { + int _slen; + int _trans; + const unsigned char *_keys; + const char *_inds; + if ( p == pe ) + goto _test_eof; + if ( cs == 0 ) + goto _out; +_resume: + _keys = _deserialize_json_trans_keys + (cs<<1); + _inds = _deserialize_json_indicies + _deserialize_json_index_offsets[cs]; + + _slen = _deserialize_json_key_spans[cs]; + _trans = _inds[ _slen > 0 && _keys[0] <=(*p) && + (*p) <= _keys[1] ? + (*p) - _keys[0] : _slen ]; + + cs = _deserialize_json_trans_targs[_trans]; + + if ( _deserialize_json_trans_actions[_trans] == 0 ) + goto _again; + + switch ( _deserialize_json_trans_actions[_trans] ) { + case 1: +#line 38 "hb-buffer-deserialize-json.rl" + { + memset (&info, 0, sizeof (info)); + memset (&pos , 0, sizeof (pos )); +} + break; + case 5: +#line 43 "hb-buffer-deserialize-json.rl" + { + buffer->add_info (info); + if (unlikely (!buffer->successful)) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 2: +#line 51 "hb-buffer-deserialize-json.rl" + { + tok = p; +} + break; + case 14: +#line 55 "hb-buffer-deserialize-json.rl" + { + if (!hb_font_glyph_from_string (font, + tok, p - tok, + &info.codepoint)) + return false; +} + break; + case 15: +#line 62 "hb-buffer-deserialize-json.rl" + { if (!parse_uint (tok, p, &info.codepoint)) return false; } + break; + case 8: +#line 63 "hb-buffer-deserialize-json.rl" + { if (!parse_uint (tok, p, &info.cluster )) return false; } + break; + case 10: +#line 64 "hb-buffer-deserialize-json.rl" + { if (!parse_int (tok, p, &pos.x_offset )) return false; } + break; + case 12: +#line 65 "hb-buffer-deserialize-json.rl" + { if (!parse_int (tok, p, &pos.y_offset )) return false; } + break; + case 3: +#line 66 "hb-buffer-deserialize-json.rl" + { if (!parse_int (tok, p, &pos.x_advance)) return false; } + break; + case 6: +#line 67 "hb-buffer-deserialize-json.rl" + { if (!parse_int (tok, p, &pos.y_advance)) return false; } + break; + case 16: +#line 62 "hb-buffer-deserialize-json.rl" + { if (!parse_uint (tok, p, &info.codepoint)) return false; } +#line 43 "hb-buffer-deserialize-json.rl" + { + buffer->add_info (info); + if (unlikely (!buffer->successful)) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 9: +#line 63 "hb-buffer-deserialize-json.rl" + { if (!parse_uint (tok, p, &info.cluster )) return false; } +#line 43 "hb-buffer-deserialize-json.rl" + { + buffer->add_info (info); + if (unlikely (!buffer->successful)) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 11: +#line 64 "hb-buffer-deserialize-json.rl" + { if (!parse_int (tok, p, &pos.x_offset )) return false; } +#line 43 "hb-buffer-deserialize-json.rl" + { + buffer->add_info (info); + if (unlikely (!buffer->successful)) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 13: +#line 65 "hb-buffer-deserialize-json.rl" + { if (!parse_int (tok, p, &pos.y_offset )) return false; } +#line 43 "hb-buffer-deserialize-json.rl" + { + buffer->add_info (info); + if (unlikely (!buffer->successful)) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 4: +#line 66 "hb-buffer-deserialize-json.rl" + { if (!parse_int (tok, p, &pos.x_advance)) return false; } +#line 43 "hb-buffer-deserialize-json.rl" + { + buffer->add_info (info); + if (unlikely (!buffer->successful)) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 7: +#line 67 "hb-buffer-deserialize-json.rl" + { if (!parse_int (tok, p, &pos.y_advance)) return false; } +#line 43 "hb-buffer-deserialize-json.rl" + { + buffer->add_info (info); + if (unlikely (!buffer->successful)) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; +#line 624 "hb-buffer-deserialize-json.hh" + } + +_again: + if ( cs == 0 ) + goto _out; + if ( ++p != pe ) + goto _resume; + _test_eof: {} + _out: {} + } + +#line 125 "hb-buffer-deserialize-json.rl" + + + *end_ptr = p; + + return p == pe && *(p-1) != ']'; +} + +#endif /* HB_BUFFER_DESERIALIZE_JSON_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer-deserialize-json.rl b/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer-deserialize-json.rl new file mode 100644 index 000000000..f3abb027b --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer-deserialize-json.rl @@ -0,0 +1,132 @@ +/* + * Copyright © 2013 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_BUFFER_DESERIALIZE_JSON_HH +#define HB_BUFFER_DESERIALIZE_JSON_HH + +#include "hb.hh" + +%%{ + +machine deserialize_json; +alphtype unsigned char; +write data; + +action clear_item { + memset (&info, 0, sizeof (info)); + memset (&pos , 0, sizeof (pos )); +} + +action add_item { + buffer->add_info (info); + if (unlikely (!buffer->successful)) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + +action tok { + tok = p; +} + +action parse_glyph { + if (!hb_font_glyph_from_string (font, + tok, p - tok, + &info.codepoint)) + return false; +} + +action parse_gid { if (!parse_uint (tok, p, &info.codepoint)) return false; } +action parse_cluster { if (!parse_uint (tok, p, &info.cluster )) return false; } +action parse_x_offset { if (!parse_int (tok, p, &pos.x_offset )) return false; } +action parse_y_offset { if (!parse_int (tok, p, &pos.y_offset )) return false; } +action parse_x_advance { if (!parse_int (tok, p, &pos.x_advance)) return false; } +action parse_y_advance { if (!parse_int (tok, p, &pos.y_advance)) return false; } + +unum = '0' | [1-9] digit*; +num = '-'? unum; + +comma = space* ',' space*; +colon = space* ':' space*; + +glyph_id = unum; +glyph_name = alpha (alnum|'_'|'.'|'-')*; + +glyph_string = '"' (glyph_name >tok %parse_glyph) '"'; +glyph_number = (glyph_id >tok %parse_gid); + +glyph = "\"g\"" colon (glyph_string | glyph_number); +cluster = "\"cl\"" colon (unum >tok %parse_cluster); +xoffset = "\"dx\"" colon (num >tok %parse_x_offset); +yoffset = "\"dy\"" colon (num >tok %parse_y_offset); +xadvance= "\"ax\"" colon (num >tok %parse_x_advance); +yadvance= "\"ay\"" colon (num >tok %parse_y_advance); + +element = glyph | cluster | xoffset | yoffset | xadvance | yadvance; +item = + ( '{' space* element (comma element)* space* '}') + >clear_item + @add_item + ; + +main := space* item (comma item)* space* (','|']')?; + +}%% + +static hb_bool_t +_hb_buffer_deserialize_glyphs_json (hb_buffer_t *buffer, + const char *buf, + unsigned int buf_len, + const char **end_ptr, + hb_font_t *font) +{ + const char *p = buf, *pe = buf + buf_len; + + /* Ensure we have positions. */ + (void) hb_buffer_get_glyph_positions (buffer, nullptr); + + while (p < pe && ISSPACE (*p)) + p++; + if (p < pe && *p == (buffer->len ? ',' : '[')) + { + *end_ptr = ++p; + } + + const char *tok = nullptr; + int cs; + hb_glyph_info_t info = {0}; + hb_glyph_position_t pos = {0}; + %%{ + write init; + write exec; + }%% + + *end_ptr = p; + + return p == pe && *(p-1) != ']'; +} + +#endif /* HB_BUFFER_DESERIALIZE_JSON_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer-deserialize-text.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer-deserialize-text.hh new file mode 100644 index 000000000..67f0a1252 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer-deserialize-text.hh @@ -0,0 +1,571 @@ + +#line 1 "hb-buffer-deserialize-text.rl" +/* + * Copyright © 2013 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_BUFFER_DESERIALIZE_TEXT_HH +#define HB_BUFFER_DESERIALIZE_TEXT_HH + +#include "hb.hh" + + +#line 36 "hb-buffer-deserialize-text.hh" +static const unsigned char _deserialize_text_trans_keys[] = { + 0u, 0u, 9u, 122u, 45u, 57u, 48u, 57u, 45u, 57u, 48u, 57u, 48u, 57u, 45u, 57u, + 48u, 57u, 44u, 44u, 45u, 57u, 48u, 57u, 44u, 57u, 9u, 124u, 9u, 124u, 0u, 0u, + 9u, 122u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, + 9u, 124u, 9u, 124u, 9u, 124u, 0 +}; + +static const char _deserialize_text_key_spans[] = { + 0, 114, 13, 10, 13, 10, 10, 13, + 10, 1, 13, 10, 14, 116, 116, 0, + 114, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116 +}; + +static const short _deserialize_text_index_offsets[] = { + 0, 0, 115, 129, 140, 154, 165, 176, + 190, 201, 203, 217, 228, 243, 360, 477, + 478, 593, 710, 827, 944, 1061, 1178, 1295, + 1412, 1529, 1646 +}; + +static const char _deserialize_text_indicies[] = { + 0, 0, 0, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 0, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 2, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 1, 1, 1, 1, 1, 1, + 1, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 1, 1, 1, 1, 1, + 1, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 1, 5, 1, 1, 6, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 1, 8, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 1, 10, 1, 1, + 11, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 1, 13, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 1, 15, 16, + 16, 16, 16, 16, 16, 16, 16, 16, + 1, 17, 1, 1, 18, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 1, 20, + 21, 21, 21, 21, 21, 21, 21, 21, + 21, 1, 22, 1, 23, 1, 1, 24, + 25, 25, 25, 25, 25, 25, 25, 25, + 25, 1, 26, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 1, 22, 1, 1, + 1, 21, 21, 21, 21, 21, 21, 21, + 21, 21, 21, 1, 28, 28, 28, 28, + 28, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 28, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 29, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 30, 1, 1, 31, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 32, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 33, + 1, 34, 34, 34, 34, 34, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 34, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 35, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 36, 1, 1, 0, + 0, 0, 0, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 0, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 3, + 3, 3, 3, 3, 3, 3, 3, 3, + 1, 1, 1, 1, 1, 1, 1, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 1, 1, 1, 1, 1, 1, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 1, 28, 28, 28, 28, 28, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 28, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 29, 1, 1, 1, + 1, 37, 37, 37, 37, 37, 37, 37, + 37, 37, 37, 1, 1, 1, 30, 1, + 1, 31, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 32, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 33, 1, 38, + 38, 38, 38, 38, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 38, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 39, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 40, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 41, 1, 42, 42, 42, 42, + 42, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 42, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 43, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 44, + 1, 42, 42, 42, 42, 42, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 42, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 14, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 43, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 44, 1, 38, 38, + 38, 38, 38, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 38, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 39, 1, 1, 1, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 40, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 41, 1, 45, 45, 45, 45, 45, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 45, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 46, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 47, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 48, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 49, 1, + 50, 50, 50, 50, 50, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 50, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 51, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 52, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 53, 1, 50, 50, 50, + 50, 50, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 50, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 51, + 1, 1, 1, 1, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 27, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 52, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 53, 1, 45, 45, 45, 45, 45, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 45, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 46, 1, 1, 1, + 1, 54, 54, 54, 54, 54, 54, 54, + 54, 54, 54, 1, 1, 1, 1, 1, + 1, 47, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 48, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 49, 1, 28, + 28, 28, 28, 28, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 28, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 29, 1, 55, 55, 1, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, + 1, 1, 1, 30, 1, 1, 31, 55, + 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, + 55, 1, 1, 32, 1, 55, 1, 55, + 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, + 55, 1, 33, 1, 0 +}; + +static const char _deserialize_text_trans_targs[] = { + 1, 0, 13, 17, 26, 3, 18, 21, + 18, 21, 5, 19, 20, 19, 20, 22, + 25, 8, 9, 12, 9, 12, 10, 11, + 23, 24, 23, 24, 14, 2, 6, 7, + 15, 16, 14, 15, 16, 17, 14, 4, + 15, 16, 14, 15, 16, 14, 2, 7, + 15, 16, 14, 2, 15, 16, 25, 26 +}; + +static const char _deserialize_text_trans_actions[] = { + 0, 0, 1, 1, 1, 2, 2, 2, + 0, 0, 2, 2, 2, 0, 0, 2, + 2, 2, 2, 2, 0, 0, 3, 2, + 2, 2, 0, 0, 4, 5, 5, 5, + 4, 4, 0, 0, 0, 0, 6, 7, + 6, 6, 8, 8, 8, 9, 10, 10, + 9, 9, 11, 12, 11, 11, 0, 0 +}; + +static const char _deserialize_text_eof_actions[] = { + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 4, 0, 0, + 0, 4, 6, 8, 8, 6, 9, 11, + 11, 9, 4 +}; + +static const int deserialize_text_start = 1; +static const int deserialize_text_first_final = 13; +static const int deserialize_text_error = 0; + +static const int deserialize_text_en_main = 1; + + +#line 91 "hb-buffer-deserialize-text.rl" + + +static hb_bool_t +_hb_buffer_deserialize_glyphs_text (hb_buffer_t *buffer, + const char *buf, + unsigned int buf_len, + const char **end_ptr, + hb_font_t *font) +{ + const char *p = buf, *pe = buf + buf_len; + + /* Ensure we have positions. */ + (void) hb_buffer_get_glyph_positions (buffer, nullptr); + + while (p < pe && ISSPACE (*p)) + p++; + if (p < pe && *p == (buffer->len ? '|' : '[')) + { + *end_ptr = ++p; + } + + const char *eof = pe, *tok = nullptr; + int cs; + hb_glyph_info_t info = {0}; + hb_glyph_position_t pos = {0}; + +#line 343 "hb-buffer-deserialize-text.hh" + { + cs = deserialize_text_start; + } + +#line 348 "hb-buffer-deserialize-text.hh" + { + int _slen; + int _trans; + const unsigned char *_keys; + const char *_inds; + if ( p == pe ) + goto _test_eof; + if ( cs == 0 ) + goto _out; +_resume: + _keys = _deserialize_text_trans_keys + (cs<<1); + _inds = _deserialize_text_indicies + _deserialize_text_index_offsets[cs]; + + _slen = _deserialize_text_key_spans[cs]; + _trans = _inds[ _slen > 0 && _keys[0] <=(*p) && + (*p) <= _keys[1] ? + (*p) - _keys[0] : _slen ]; + + cs = _deserialize_text_trans_targs[_trans]; + + if ( _deserialize_text_trans_actions[_trans] == 0 ) + goto _again; + + switch ( _deserialize_text_trans_actions[_trans] ) { + case 2: +#line 51 "hb-buffer-deserialize-text.rl" + { + tok = p; +} + break; + case 5: +#line 55 "hb-buffer-deserialize-text.rl" + { + if (!hb_font_glyph_from_string (font, + tok, p - tok, + &info.codepoint)) + return false; +} + break; + case 10: +#line 62 "hb-buffer-deserialize-text.rl" + { if (!parse_uint (tok, p, &info.cluster )) return false; } + break; + case 3: +#line 63 "hb-buffer-deserialize-text.rl" + { if (!parse_int (tok, p, &pos.x_offset )) return false; } + break; + case 12: +#line 64 "hb-buffer-deserialize-text.rl" + { if (!parse_int (tok, p, &pos.y_offset )) return false; } + break; + case 7: +#line 65 "hb-buffer-deserialize-text.rl" + { if (!parse_int (tok, p, &pos.x_advance)) return false; } + break; + case 1: +#line 38 "hb-buffer-deserialize-text.rl" + { + memset (&info, 0, sizeof (info)); + memset (&pos , 0, sizeof (pos )); +} +#line 51 "hb-buffer-deserialize-text.rl" + { + tok = p; +} + break; + case 4: +#line 55 "hb-buffer-deserialize-text.rl" + { + if (!hb_font_glyph_from_string (font, + tok, p - tok, + &info.codepoint)) + return false; +} +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (unlikely (!buffer->successful)) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 9: +#line 62 "hb-buffer-deserialize-text.rl" + { if (!parse_uint (tok, p, &info.cluster )) return false; } +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (unlikely (!buffer->successful)) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 11: +#line 64 "hb-buffer-deserialize-text.rl" + { if (!parse_int (tok, p, &pos.y_offset )) return false; } +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (unlikely (!buffer->successful)) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 6: +#line 65 "hb-buffer-deserialize-text.rl" + { if (!parse_int (tok, p, &pos.x_advance)) return false; } +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (unlikely (!buffer->successful)) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 8: +#line 66 "hb-buffer-deserialize-text.rl" + { if (!parse_int (tok, p, &pos.y_advance)) return false; } +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (unlikely (!buffer->successful)) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; +#line 480 "hb-buffer-deserialize-text.hh" + } + +_again: + if ( cs == 0 ) + goto _out; + if ( ++p != pe ) + goto _resume; + _test_eof: {} + if ( p == eof ) + { + switch ( _deserialize_text_eof_actions[cs] ) { + case 4: +#line 55 "hb-buffer-deserialize-text.rl" + { + if (!hb_font_glyph_from_string (font, + tok, p - tok, + &info.codepoint)) + return false; +} +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (unlikely (!buffer->successful)) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 9: +#line 62 "hb-buffer-deserialize-text.rl" + { if (!parse_uint (tok, p, &info.cluster )) return false; } +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (unlikely (!buffer->successful)) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 11: +#line 64 "hb-buffer-deserialize-text.rl" + { if (!parse_int (tok, p, &pos.y_offset )) return false; } +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (unlikely (!buffer->successful)) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 6: +#line 65 "hb-buffer-deserialize-text.rl" + { if (!parse_int (tok, p, &pos.x_advance)) return false; } +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (unlikely (!buffer->successful)) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 8: +#line 66 "hb-buffer-deserialize-text.rl" + { if (!parse_int (tok, p, &pos.y_advance)) return false; } +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (unlikely (!buffer->successful)) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; +#line 557 "hb-buffer-deserialize-text.hh" + } + } + + _out: {} + } + +#line 119 "hb-buffer-deserialize-text.rl" + + + *end_ptr = p; + + return p == pe && *(p-1) != ']'; +} + +#endif /* HB_BUFFER_DESERIALIZE_TEXT_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer-deserialize-text.rl b/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer-deserialize-text.rl new file mode 100644 index 000000000..6268a6c50 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer-deserialize-text.rl @@ -0,0 +1,126 @@ +/* + * Copyright © 2013 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_BUFFER_DESERIALIZE_TEXT_HH +#define HB_BUFFER_DESERIALIZE_TEXT_HH + +#include "hb.hh" + +%%{ + +machine deserialize_text; +alphtype unsigned char; +write data; + +action clear_item { + memset (&info, 0, sizeof (info)); + memset (&pos , 0, sizeof (pos )); +} + +action add_item { + buffer->add_info (info); + if (unlikely (!buffer->successful)) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + +action tok { + tok = p; +} + +action parse_glyph { + if (!hb_font_glyph_from_string (font, + tok, p - tok, + &info.codepoint)) + return false; +} + +action parse_cluster { if (!parse_uint (tok, p, &info.cluster )) return false; } +action parse_x_offset { if (!parse_int (tok, p, &pos.x_offset )) return false; } +action parse_y_offset { if (!parse_int (tok, p, &pos.y_offset )) return false; } +action parse_x_advance { if (!parse_int (tok, p, &pos.x_advance)) return false; } +action parse_y_advance { if (!parse_int (tok, p, &pos.y_advance)) return false; } + +unum = '0' | [1-9] digit*; +num = '-'? unum; + +glyph_id = unum; +glyph_name = alpha (alnum|'_'|'.'|'-')*; + +glyph = (glyph_id | glyph_name) >tok %parse_glyph; +cluster = '=' (unum >tok %parse_cluster); +offsets = '@' (num >tok %parse_x_offset) ',' (num >tok %parse_y_offset ); +advances= '+' (num >tok %parse_x_advance) (',' (num >tok %parse_y_advance))?; +item = + ( + glyph + cluster? + offsets? + advances? + ) + >clear_item + %add_item + ; + +main := space* item (space* '|' space* item)* space* ('|'|']')?; + +}%% + +static hb_bool_t +_hb_buffer_deserialize_glyphs_text (hb_buffer_t *buffer, + const char *buf, + unsigned int buf_len, + const char **end_ptr, + hb_font_t *font) +{ + const char *p = buf, *pe = buf + buf_len; + + /* Ensure we have positions. */ + (void) hb_buffer_get_glyph_positions (buffer, nullptr); + + while (p < pe && ISSPACE (*p)) + p++; + if (p < pe && *p == (buffer->len ? '|' : '[')) + { + *end_ptr = ++p; + } + + const char *eof = pe, *tok = nullptr; + int cs; + hb_glyph_info_t info = {0}; + hb_glyph_position_t pos = {0}; + %%{ + write init; + write exec; + }%% + + *end_ptr = p; + + return p == pe && *(p-1) != ']'; +} + +#endif /* HB_BUFFER_DESERIALIZE_TEXT_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer-serialize.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer-serialize.cc new file mode 100644 index 000000000..e64eb0ee6 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer-serialize.cc @@ -0,0 +1,474 @@ +/* + * Copyright © 2012,2013 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#include "hb.hh" + +#ifndef HB_NO_BUFFER_SERIALIZE + +#include "hb-buffer.hh" + + +static const char *serialize_formats[] = { + "text", + "json", + nullptr +}; + +/** + * hb_buffer_serialize_list_formats: + * + * Returns a list of supported buffer serialization formats. + * + * Return value: (transfer none): + * A string array of buffer serialization formats. Should not be freed. + * + * Since: 0.9.7 + **/ +const char ** +hb_buffer_serialize_list_formats () +{ + return serialize_formats; +} + +/** + * hb_buffer_serialize_format_from_string: + * @str: (array length=len) (element-type uint8_t): a string to parse + * @len: length of @str, or -1 if string is %NULL terminated + * + * Parses a string into an #hb_buffer_serialize_format_t. Does not check if + * @str is a valid buffer serialization format, use + * hb_buffer_serialize_list_formats() to get the list of supported formats. + * + * Return value: + * The parsed #hb_buffer_serialize_format_t. + * + * Since: 0.9.7 + **/ +hb_buffer_serialize_format_t +hb_buffer_serialize_format_from_string (const char *str, int len) +{ + /* Upper-case it. */ + return (hb_buffer_serialize_format_t) (hb_tag_from_string (str, len) & ~0x20202020u); +} + +/** + * hb_buffer_serialize_format_to_string: + * @format: an #hb_buffer_serialize_format_t to convert. + * + * Converts @format to the string corresponding it, or %NULL if it is not a valid + * #hb_buffer_serialize_format_t. + * + * Return value: (transfer none): + * A %NULL terminated string corresponding to @format. Should not be freed. + * + * Since: 0.9.7 + **/ +const char * +hb_buffer_serialize_format_to_string (hb_buffer_serialize_format_t format) +{ + switch ((unsigned) format) + { + case HB_BUFFER_SERIALIZE_FORMAT_TEXT: return serialize_formats[0]; + case HB_BUFFER_SERIALIZE_FORMAT_JSON: return serialize_formats[1]; + default: + case HB_BUFFER_SERIALIZE_FORMAT_INVALID: return nullptr; + } +} + +static unsigned int +_hb_buffer_serialize_glyphs_json (hb_buffer_t *buffer, + unsigned int start, + unsigned int end, + char *buf, + unsigned int buf_size, + unsigned int *buf_consumed, + hb_font_t *font, + hb_buffer_serialize_flags_t flags) +{ + hb_glyph_info_t *info = hb_buffer_get_glyph_infos (buffer, nullptr); + hb_glyph_position_t *pos = (flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS) ? + nullptr : hb_buffer_get_glyph_positions (buffer, nullptr); + + *buf_consumed = 0; + hb_position_t x = 0, y = 0; + for (unsigned int i = start; i < end; i++) + { + char b[1024]; + char *p = b; + + /* In the following code, we know b is large enough that no overflow can happen. */ + +#define APPEND(s) HB_STMT_START { strcpy (p, s); p += strlen (s); } HB_STMT_END + + if (i) + *p++ = ','; + + *p++ = '{'; + + APPEND ("\"g\":"); + if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES)) + { + char g[128]; + hb_font_glyph_to_string (font, info[i].codepoint, g, sizeof (g)); + *p++ = '"'; + for (char *q = g; *q; q++) { + if (*q == '"') + *p++ = '\\'; + *p++ = *q; + } + *p++ = '"'; + } + else + p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "%u", info[i].codepoint)); + + if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS)) { + p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"cl\":%u", info[i].cluster)); + } + + if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS)) + { + p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"dx\":%d,\"dy\":%d", + x+pos[i].x_offset, y+pos[i].y_offset)); + if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES)) + p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"ax\":%d,\"ay\":%d", + pos[i].x_advance, pos[i].y_advance)); + } + + if (flags & HB_BUFFER_SERIALIZE_FLAG_GLYPH_FLAGS) + { + if (info[i].mask & HB_GLYPH_FLAG_DEFINED) + p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"fl\":%u", info[i].mask & HB_GLYPH_FLAG_DEFINED)); + } + + if (flags & HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS) + { + hb_glyph_extents_t extents; + hb_font_get_glyph_extents(font, info[i].codepoint, &extents); + p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"xb\":%d,\"yb\":%d", + extents.x_bearing, extents.y_bearing)); + p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"w\":%d,\"h\":%d", + extents.width, extents.height)); + } + + *p++ = '}'; + + unsigned int l = p - b; + if (buf_size > l) + { + memcpy (buf, b, l); + buf += l; + buf_size -= l; + *buf_consumed += l; + *buf = '\0'; + } else + return i - start; + + if (pos && (flags & HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES)) + { + x += pos[i].x_advance; + y += pos[i].y_advance; + } + } + + return end - start; +} + +static unsigned int +_hb_buffer_serialize_glyphs_text (hb_buffer_t *buffer, + unsigned int start, + unsigned int end, + char *buf, + unsigned int buf_size, + unsigned int *buf_consumed, + hb_font_t *font, + hb_buffer_serialize_flags_t flags) +{ + hb_glyph_info_t *info = hb_buffer_get_glyph_infos (buffer, nullptr); + hb_glyph_position_t *pos = (flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS) ? + nullptr : hb_buffer_get_glyph_positions (buffer, nullptr); + + *buf_consumed = 0; + hb_position_t x = 0, y = 0; + for (unsigned int i = start; i < end; i++) + { + char b[1024]; + char *p = b; + + /* In the following code, we know b is large enough that no overflow can happen. */ + + if (i) + *p++ = '|'; + + if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES)) + { + hb_font_glyph_to_string (font, info[i].codepoint, p, 128); + p += strlen (p); + } + else + p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "%u", info[i].codepoint)); + + if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS)) { + p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "=%u", info[i].cluster)); + } + + if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS)) + { + if (x+pos[i].x_offset || y+pos[i].y_offset) + p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "@%d,%d", x+pos[i].x_offset, y+pos[i].y_offset)); + + if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES)) + { + *p++ = '+'; + p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "%d", pos[i].x_advance)); + if (pos[i].y_advance) + p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",%d", pos[i].y_advance)); + } + } + + if (flags & HB_BUFFER_SERIALIZE_FLAG_GLYPH_FLAGS) + { + if (info[i].mask & HB_GLYPH_FLAG_DEFINED) + p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "#%X", info[i].mask &HB_GLYPH_FLAG_DEFINED)); + } + + if (flags & HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS) + { + hb_glyph_extents_t extents; + hb_font_get_glyph_extents(font, info[i].codepoint, &extents); + p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "<%d,%d,%d,%d>", extents.x_bearing, extents.y_bearing, extents.width, extents.height)); + } + + unsigned int l = p - b; + if (buf_size > l) + { + memcpy (buf, b, l); + buf += l; + buf_size -= l; + *buf_consumed += l; + *buf = '\0'; + } else + return i - start; + + if (pos && (flags & HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES)) + { + x += pos[i].x_advance; + y += pos[i].y_advance; + } + } + + return end - start; +} + +/** + * hb_buffer_serialize_glyphs: + * @buffer: an #hb_buffer_t buffer. + * @start: the first item in @buffer to serialize. + * @end: the last item in @buffer to serialize. + * @buf: (out) (array length=buf_size) (element-type uint8_t): output string to + * write serialized buffer into. + * @buf_size: the size of @buf. + * @buf_consumed: (out) (allow-none): if not %NULL, will be set to the number of byes written into @buf. + * @font: (allow-none): the #hb_font_t used to shape this buffer, needed to + * read glyph names and extents. If %NULL, and empty font will be used. + * @format: the #hb_buffer_serialize_format_t to use for formatting the output. + * @flags: the #hb_buffer_serialize_flags_t that control what glyph properties + * to serialize. + * + * Serializes @buffer into a textual representation of its glyph content, + * useful for showing the contents of the buffer, for example during debugging. + * There are currently two supported serialization formats: + * + * ## text + * A human-readable, plain text format. + * The serialized glyphs will look something like: + * + * ``` + * [uni0651=0@518,0+0|uni0628=0+1897] + * ``` + * - The serialized glyphs are delimited with `[` and `]`. + * - Glyphs are separated with `|` + * - Each glyph starts with glyph name, or glyph index if + * #HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES flag is set. Then, + * - If #HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS is not set, `=` then #hb_glyph_info_t.cluster. + * - If #HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS is not set, the #hb_glyph_position_t in the format: + * - If both #hb_glyph_position_t.x_offset and #hb_glyph_position_t.y_offset are not 0, `@x_offset,y_offset`. Then, + * - `+x_advance`, then `,y_advance` if #hb_glyph_position_t.y_advance is not 0. Then, + * - If #HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS is set, the + * #hb_glyph_extents_t in the format + * `<x_bearing,y_bearing,width,height>` + * + * ## json + * TODO. + * + * Return value: + * The number of serialized items. + * + * Since: 0.9.7 + **/ +unsigned int +hb_buffer_serialize_glyphs (hb_buffer_t *buffer, + unsigned int start, + unsigned int end, + char *buf, + unsigned int buf_size, + unsigned int *buf_consumed, + hb_font_t *font, + hb_buffer_serialize_format_t format, + hb_buffer_serialize_flags_t flags) +{ + assert (start <= end && end <= buffer->len); + + unsigned int sconsumed; + if (!buf_consumed) + buf_consumed = &sconsumed; + *buf_consumed = 0; + if (buf_size) + *buf = '\0'; + + assert ((!buffer->len && buffer->content_type == HB_BUFFER_CONTENT_TYPE_INVALID) || + buffer->content_type == HB_BUFFER_CONTENT_TYPE_GLYPHS); + + if (!buffer->have_positions) + flags |= HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS; + + if (unlikely (start == end)) + return 0; + + if (!font) + font = hb_font_get_empty (); + + switch (format) + { + case HB_BUFFER_SERIALIZE_FORMAT_TEXT: + return _hb_buffer_serialize_glyphs_text (buffer, start, end, + buf, buf_size, buf_consumed, + font, flags); + + case HB_BUFFER_SERIALIZE_FORMAT_JSON: + return _hb_buffer_serialize_glyphs_json (buffer, start, end, + buf, buf_size, buf_consumed, + font, flags); + + default: + case HB_BUFFER_SERIALIZE_FORMAT_INVALID: + return 0; + + } +} + +static bool +parse_int (const char *pp, const char *end, int32_t *pv) +{ + int v; + const char *p = pp; + if (unlikely (!hb_parse_int (&p, end, &v, true/* whole buffer */))) + return false; + + *pv = v; + return true; +} + +static bool +parse_uint (const char *pp, const char *end, uint32_t *pv) +{ + unsigned int v; + const char *p = pp; + if (unlikely (!hb_parse_uint (&p, end, &v, true/* whole buffer */))) + return false; + + *pv = v; + return true; +} + +#include "hb-buffer-deserialize-json.hh" +#include "hb-buffer-deserialize-text.hh" + +/** + * hb_buffer_deserialize_glyphs: + * @buffer: an #hb_buffer_t buffer. + * @buf: (array length=buf_len): + * @buf_len: + * @end_ptr: (out): + * @font: + * @format: + * + * + * + * Return value: + * + * Since: 0.9.7 + **/ +hb_bool_t +hb_buffer_deserialize_glyphs (hb_buffer_t *buffer, + const char *buf, + int buf_len, /* -1 means nul-terminated */ + const char **end_ptr, /* May be NULL */ + hb_font_t *font, /* May be NULL */ + hb_buffer_serialize_format_t format) +{ + const char *end; + if (!end_ptr) + end_ptr = &end; + *end_ptr = buf; + + assert ((!buffer->len && buffer->content_type == HB_BUFFER_CONTENT_TYPE_INVALID) || + buffer->content_type == HB_BUFFER_CONTENT_TYPE_GLYPHS); + + if (buf_len == -1) + buf_len = strlen (buf); + + if (!buf_len) + { + *end_ptr = buf; + return false; + } + + hb_buffer_set_content_type (buffer, HB_BUFFER_CONTENT_TYPE_GLYPHS); + + if (!font) + font = hb_font_get_empty (); + + switch (format) + { + case HB_BUFFER_SERIALIZE_FORMAT_TEXT: + return _hb_buffer_deserialize_glyphs_text (buffer, + buf, buf_len, end_ptr, + font); + + case HB_BUFFER_SERIALIZE_FORMAT_JSON: + return _hb_buffer_deserialize_glyphs_json (buffer, + buf, buf_len, end_ptr, + font); + + default: + case HB_BUFFER_SERIALIZE_FORMAT_INVALID: + return false; + + } +} + + +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.cc new file mode 100644 index 000000000..bb7f3c7c1 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.cc @@ -0,0 +1,2034 @@ +/* + * Copyright © 1998-2004 David Turner and Werner Lemberg + * Copyright © 2004,2007,2009,2010 Red Hat, Inc. + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Owen Taylor, Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#include "hb-buffer.hh" +#include "hb-utf.hh" + + +/** + * SECTION: hb-buffer + * @title: hb-buffer + * @short_description: Input and output buffers + * @include: hb.h + * + * Buffers serve dual role in HarfBuzz; they hold the input characters that are + * passed to hb_shape(), and after shaping they hold the output glyphs. + **/ + + +/** + * hb_segment_properties_equal: + * @a: first #hb_segment_properties_t to compare. + * @b: second #hb_segment_properties_t to compare. + * + * Checks the equality of two #hb_segment_properties_t's. + * + * Return value: + * %true if all properties of @a equal those of @b, false otherwise. + * + * Since: 0.9.7 + **/ +hb_bool_t +hb_segment_properties_equal (const hb_segment_properties_t *a, + const hb_segment_properties_t *b) +{ + return a->direction == b->direction && + a->script == b->script && + a->language == b->language && + a->reserved1 == b->reserved1 && + a->reserved2 == b->reserved2; + +} + +/** + * hb_segment_properties_hash: + * @p: #hb_segment_properties_t to hash. + * + * Creates a hash representing @p. + * + * Return value: + * A hash of @p. + * + * Since: 0.9.7 + **/ +unsigned int +hb_segment_properties_hash (const hb_segment_properties_t *p) +{ + return (unsigned int) p->direction ^ + (unsigned int) p->script ^ + (intptr_t) (p->language); +} + + + +/* Here is how the buffer works internally: + * + * There are two info pointers: info and out_info. They always have + * the same allocated size, but different lengths. + * + * As an optimization, both info and out_info may point to the + * same piece of memory, which is owned by info. This remains the + * case as long as out_len doesn't exceed i at any time. + * In that case, swap_buffers() is no-op and the glyph operations operate + * mostly in-place. + * + * As soon as out_info gets longer than info, out_info is moved over + * to an alternate buffer (which we reuse the pos buffer for!), and its + * current contents (out_len entries) are copied to the new place. + * This should all remain transparent to the user. swap_buffers() then + * switches info and out_info. + */ + + + +/* Internal API */ + +bool +hb_buffer_t::enlarge (unsigned int size) +{ + if (unlikely (!successful)) + return false; + if (unlikely (size > max_len)) + { + successful = false; + return false; + } + + unsigned int new_allocated = allocated; + hb_glyph_position_t *new_pos = nullptr; + hb_glyph_info_t *new_info = nullptr; + bool separate_out = out_info != info; + + if (unlikely (hb_unsigned_mul_overflows (size, sizeof (info[0])))) + goto done; + + while (size >= new_allocated) + new_allocated += (new_allocated >> 1) + 32; + + static_assert ((sizeof (info[0]) == sizeof (pos[0])), ""); + if (unlikely (hb_unsigned_mul_overflows (new_allocated, sizeof (info[0])))) + goto done; + + new_pos = (hb_glyph_position_t *) realloc (pos, new_allocated * sizeof (pos[0])); + new_info = (hb_glyph_info_t *) realloc (info, new_allocated * sizeof (info[0])); + +done: + if (unlikely (!new_pos || !new_info)) + successful = false; + + if (likely (new_pos)) + pos = new_pos; + + if (likely (new_info)) + info = new_info; + + out_info = separate_out ? (hb_glyph_info_t *) pos : info; + if (likely (successful)) + allocated = new_allocated; + + return likely (successful); +} + +bool +hb_buffer_t::make_room_for (unsigned int num_in, + unsigned int num_out) +{ + if (unlikely (!ensure (out_len + num_out))) return false; + + if (out_info == info && + out_len + num_out > idx + num_in) + { + assert (have_output); + + out_info = (hb_glyph_info_t *) pos; + memcpy (out_info, info, out_len * sizeof (out_info[0])); + } + + return true; +} + +bool +hb_buffer_t::shift_forward (unsigned int count) +{ + assert (have_output); + if (unlikely (!ensure (len + count))) return false; + + memmove (info + idx + count, info + idx, (len - idx) * sizeof (info[0])); + if (idx + count > len) + { + /* Under memory failure we might expose this area. At least + * clean it up. Oh well... + * + * Ideally, we should at least set Default_Ignorable bits on + * these, as well as consistent cluster values. But the former + * is layering violation... */ + memset (info + len, 0, (idx + count - len) * sizeof (info[0])); + } + len += count; + idx += count; + + return true; +} + +hb_buffer_t::scratch_buffer_t * +hb_buffer_t::get_scratch_buffer (unsigned int *size) +{ + have_output = false; + have_positions = false; + + out_len = 0; + out_info = info; + + assert ((uintptr_t) pos % sizeof (scratch_buffer_t) == 0); + *size = allocated * sizeof (pos[0]) / sizeof (scratch_buffer_t); + return (scratch_buffer_t *) (void *) pos; +} + + + +/* HarfBuzz-Internal API */ + +void +hb_buffer_t::reset () +{ + if (unlikely (hb_object_is_immutable (this))) + return; + + hb_unicode_funcs_destroy (unicode); + unicode = hb_unicode_funcs_reference (hb_unicode_funcs_get_default ()); + flags = HB_BUFFER_FLAG_DEFAULT; + replacement = HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT; + invisible = 0; + + clear (); +} + +void +hb_buffer_t::clear () +{ + if (unlikely (hb_object_is_immutable (this))) + return; + + hb_segment_properties_t default_props = HB_SEGMENT_PROPERTIES_DEFAULT; + props = default_props; + scratch_flags = HB_BUFFER_SCRATCH_FLAG_DEFAULT; + + content_type = HB_BUFFER_CONTENT_TYPE_INVALID; + successful = true; + have_output = false; + have_positions = false; + + idx = 0; + len = 0; + out_len = 0; + out_info = info; + + serial = 0; + + memset (context, 0, sizeof context); + memset (context_len, 0, sizeof context_len); + + deallocate_var_all (); +} + +void +hb_buffer_t::add (hb_codepoint_t codepoint, + unsigned int cluster) +{ + hb_glyph_info_t *glyph; + + if (unlikely (!ensure (len + 1))) return; + + glyph = &info[len]; + + memset (glyph, 0, sizeof (*glyph)); + glyph->codepoint = codepoint; + glyph->mask = 0; + glyph->cluster = cluster; + + len++; +} + +void +hb_buffer_t::add_info (const hb_glyph_info_t &glyph_info) +{ + if (unlikely (!ensure (len + 1))) return; + + info[len] = glyph_info; + + len++; +} + + +void +hb_buffer_t::remove_output () +{ + if (unlikely (hb_object_is_immutable (this))) + return; + + have_output = false; + have_positions = false; + + out_len = 0; + out_info = info; +} + +void +hb_buffer_t::clear_output () +{ + if (unlikely (hb_object_is_immutable (this))) + return; + + have_output = true; + have_positions = false; + + out_len = 0; + out_info = info; +} + +void +hb_buffer_t::clear_positions () +{ + if (unlikely (hb_object_is_immutable (this))) + return; + + have_output = false; + have_positions = true; + + out_len = 0; + out_info = info; + + if (likely (len)) + memset (pos, 0, sizeof (pos[0]) * len); +} + +void +hb_buffer_t::swap_buffers () +{ + if (unlikely (!successful)) return; + + assert (have_output); + have_output = false; + + if (out_info != info) + { + hb_glyph_info_t *tmp_string; + tmp_string = info; + info = out_info; + out_info = tmp_string; + pos = (hb_glyph_position_t *) out_info; + } + + unsigned int tmp; + tmp = len; + len = out_len; + out_len = tmp; + + idx = 0; +} + + +void +hb_buffer_t::replace_glyphs (unsigned int num_in, + unsigned int num_out, + const uint32_t *glyph_data) +{ + if (unlikely (!make_room_for (num_in, num_out))) return; + + assert (idx + num_in <= len); + + merge_clusters (idx, idx + num_in); + + hb_glyph_info_t orig_info = info[idx]; + hb_glyph_info_t *pinfo = &out_info[out_len]; + for (unsigned int i = 0; i < num_out; i++) + { + *pinfo = orig_info; + pinfo->codepoint = glyph_data[i]; + pinfo++; + } + + idx += num_in; + out_len += num_out; +} + +bool +hb_buffer_t::move_to (unsigned int i) +{ + if (!have_output) + { + assert (i <= len); + idx = i; + return true; + } + if (unlikely (!successful)) + return false; + + assert (i <= out_len + (len - idx)); + + if (out_len < i) + { + unsigned int count = i - out_len; + if (unlikely (!make_room_for (count, count))) return false; + + memmove (out_info + out_len, info + idx, count * sizeof (out_info[0])); + idx += count; + out_len += count; + } + else if (out_len > i) + { + /* Tricky part: rewinding... */ + unsigned int count = out_len - i; + + /* This will blow in our face if memory allocation fails later + * in this same lookup... + * + * We used to shift with extra 32 items, instead of the 0 below. + * But that would leave empty slots in the buffer in case of allocation + * failures. Setting to zero for now to avoid other problems (see + * comments in shift_forward(). This can cause O(N^2) behavior more + * severely than adding 32 empty slots can... */ + if (unlikely (idx < count && !shift_forward (count + 0))) return false; + + assert (idx >= count); + + idx -= count; + out_len -= count; + memmove (info + idx, out_info + out_len, count * sizeof (out_info[0])); + } + + return true; +} + + +void +hb_buffer_t::set_masks (hb_mask_t value, + hb_mask_t mask, + unsigned int cluster_start, + unsigned int cluster_end) +{ + hb_mask_t not_mask = ~mask; + value &= mask; + + if (!mask) + return; + + if (cluster_start == 0 && cluster_end == (unsigned int)-1) { + unsigned int count = len; + for (unsigned int i = 0; i < count; i++) + info[i].mask = (info[i].mask & not_mask) | value; + return; + } + + unsigned int count = len; + for (unsigned int i = 0; i < count; i++) + if (cluster_start <= info[i].cluster && info[i].cluster < cluster_end) + info[i].mask = (info[i].mask & not_mask) | value; +} + +void +hb_buffer_t::reverse_range (unsigned int start, + unsigned int end) +{ + unsigned int i, j; + + if (end - start < 2) + return; + + for (i = start, j = end - 1; i < j; i++, j--) { + hb_glyph_info_t t; + + t = info[i]; + info[i] = info[j]; + info[j] = t; + } + + if (have_positions) { + for (i = start, j = end - 1; i < j; i++, j--) { + hb_glyph_position_t t; + + t = pos[i]; + pos[i] = pos[j]; + pos[j] = t; + } + } +} + +void +hb_buffer_t::reverse () +{ + if (unlikely (!len)) + return; + + reverse_range (0, len); +} + +void +hb_buffer_t::reverse_clusters () +{ + unsigned int i, start, count, last_cluster; + + if (unlikely (!len)) + return; + + reverse (); + + count = len; + start = 0; + last_cluster = info[0].cluster; + for (i = 1; i < count; i++) { + if (last_cluster != info[i].cluster) { + reverse_range (start, i); + start = i; + last_cluster = info[i].cluster; + } + } + reverse_range (start, i); +} + +void +hb_buffer_t::merge_clusters_impl (unsigned int start, + unsigned int end) +{ + if (cluster_level == HB_BUFFER_CLUSTER_LEVEL_CHARACTERS) + { + unsafe_to_break (start, end); + return; + } + + unsigned int cluster = info[start].cluster; + + for (unsigned int i = start + 1; i < end; i++) + cluster = hb_min (cluster, info[i].cluster); + + /* Extend end */ + while (end < len && info[end - 1].cluster == info[end].cluster) + end++; + + /* Extend start */ + while (idx < start && info[start - 1].cluster == info[start].cluster) + start--; + + /* If we hit the start of buffer, continue in out-buffer. */ + if (idx == start) + for (unsigned int i = out_len; i && out_info[i - 1].cluster == info[start].cluster; i--) + set_cluster (out_info[i - 1], cluster); + + for (unsigned int i = start; i < end; i++) + set_cluster (info[i], cluster); +} +void +hb_buffer_t::merge_out_clusters (unsigned int start, + unsigned int end) +{ + if (cluster_level == HB_BUFFER_CLUSTER_LEVEL_CHARACTERS) + return; + + if (unlikely (end - start < 2)) + return; + + unsigned int cluster = out_info[start].cluster; + + for (unsigned int i = start + 1; i < end; i++) + cluster = hb_min (cluster, out_info[i].cluster); + + /* Extend start */ + while (start && out_info[start - 1].cluster == out_info[start].cluster) + start--; + + /* Extend end */ + while (end < out_len && out_info[end - 1].cluster == out_info[end].cluster) + end++; + + /* If we hit the end of out-buffer, continue in buffer. */ + if (end == out_len) + for (unsigned int i = idx; i < len && info[i].cluster == out_info[end - 1].cluster; i++) + set_cluster (info[i], cluster); + + for (unsigned int i = start; i < end; i++) + set_cluster (out_info[i], cluster); +} +void +hb_buffer_t::delete_glyph () +{ + /* The logic here is duplicated in hb_ot_hide_default_ignorables(). */ + + unsigned int cluster = info[idx].cluster; + if (idx + 1 < len && cluster == info[idx + 1].cluster) + { + /* Cluster survives; do nothing. */ + goto done; + } + + if (out_len) + { + /* Merge cluster backward. */ + if (cluster < out_info[out_len - 1].cluster) + { + unsigned int mask = info[idx].mask; + unsigned int old_cluster = out_info[out_len - 1].cluster; + for (unsigned i = out_len; i && out_info[i - 1].cluster == old_cluster; i--) + set_cluster (out_info[i - 1], cluster, mask); + } + goto done; + } + + if (idx + 1 < len) + { + /* Merge cluster forward. */ + merge_clusters (idx, idx + 2); + goto done; + } + +done: + skip_glyph (); +} + +void +hb_buffer_t::unsafe_to_break_impl (unsigned int start, unsigned int end) +{ + unsigned int cluster = (unsigned int) -1; + cluster = _unsafe_to_break_find_min_cluster (info, start, end, cluster); + _unsafe_to_break_set_mask (info, start, end, cluster); +} +void +hb_buffer_t::unsafe_to_break_from_outbuffer (unsigned int start, unsigned int end) +{ + if (!have_output) + { + unsafe_to_break_impl (start, end); + return; + } + + assert (start <= out_len); + assert (idx <= end); + + unsigned int cluster = (unsigned int) -1; + cluster = _unsafe_to_break_find_min_cluster (out_info, start, out_len, cluster); + cluster = _unsafe_to_break_find_min_cluster (info, idx, end, cluster); + _unsafe_to_break_set_mask (out_info, start, out_len, cluster); + _unsafe_to_break_set_mask (info, idx, end, cluster); +} + +void +hb_buffer_t::guess_segment_properties () +{ + assert (content_type == HB_BUFFER_CONTENT_TYPE_UNICODE || + (!len && content_type == HB_BUFFER_CONTENT_TYPE_INVALID)); + + /* If script is set to INVALID, guess from buffer contents */ + if (props.script == HB_SCRIPT_INVALID) { + for (unsigned int i = 0; i < len; i++) { + hb_script_t script = unicode->script (info[i].codepoint); + if (likely (script != HB_SCRIPT_COMMON && + script != HB_SCRIPT_INHERITED && + script != HB_SCRIPT_UNKNOWN)) { + props.script = script; + break; + } + } + } + + /* If direction is set to INVALID, guess from script */ + if (props.direction == HB_DIRECTION_INVALID) { + props.direction = hb_script_get_horizontal_direction (props.script); + if (props.direction == HB_DIRECTION_INVALID) + props.direction = HB_DIRECTION_LTR; + } + + /* If language is not set, use default language from locale */ + if (props.language == HB_LANGUAGE_INVALID) { + /* TODO get_default_for_script? using $LANGUAGE */ + props.language = hb_language_get_default (); + } +} + + +/* Public API */ + +DEFINE_NULL_INSTANCE (hb_buffer_t) = +{ + HB_OBJECT_HEADER_STATIC, + + const_cast (&_hb_Null_hb_unicode_funcs_t), + HB_BUFFER_FLAG_DEFAULT, + HB_BUFFER_CLUSTER_LEVEL_DEFAULT, + HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT, + 0, /* invisible */ + HB_BUFFER_SCRATCH_FLAG_DEFAULT, + HB_BUFFER_MAX_LEN_DEFAULT, + HB_BUFFER_MAX_OPS_DEFAULT, + + HB_BUFFER_CONTENT_TYPE_INVALID, + HB_SEGMENT_PROPERTIES_DEFAULT, + false, /* successful */ + true, /* have_output */ + true /* have_positions */ + + /* Zero is good enough for everything else. */ +}; + + +/** + * hb_buffer_create: (Xconstructor) + * + * Creates a new #hb_buffer_t with all properties to defaults. + * + * Return value: (transfer full): + * A newly allocated #hb_buffer_t with a reference count of 1. The initial + * reference count should be released with hb_buffer_destroy() when you are done + * using the #hb_buffer_t. This function never returns %NULL. If memory cannot + * be allocated, a special #hb_buffer_t object will be returned on which + * hb_buffer_allocation_successful() returns %false. + * + * Since: 0.9.2 + **/ +hb_buffer_t * +hb_buffer_create () +{ + hb_buffer_t *buffer; + + if (!(buffer = hb_object_create ())) + return hb_buffer_get_empty (); + + buffer->max_len = HB_BUFFER_MAX_LEN_DEFAULT; + buffer->max_ops = HB_BUFFER_MAX_OPS_DEFAULT; + + buffer->reset (); + + return buffer; +} + +/** + * hb_buffer_get_empty: + * + * + * + * Return value: (transfer full): + * + * Since: 0.9.2 + **/ +hb_buffer_t * +hb_buffer_get_empty () +{ + return const_cast (&Null(hb_buffer_t)); +} + +/** + * hb_buffer_reference: (skip) + * @buffer: an #hb_buffer_t. + * + * Increases the reference count on @buffer by one. This prevents @buffer from + * being destroyed until a matching call to hb_buffer_destroy() is made. + * + * Return value: (transfer full): + * The referenced #hb_buffer_t. + * + * Since: 0.9.2 + **/ +hb_buffer_t * +hb_buffer_reference (hb_buffer_t *buffer) +{ + return hb_object_reference (buffer); +} + +/** + * hb_buffer_destroy: (skip) + * @buffer: an #hb_buffer_t. + * + * Deallocate the @buffer. + * Decreases the reference count on @buffer by one. If the result is zero, then + * @buffer and all associated resources are freed. See hb_buffer_reference(). + * + * Since: 0.9.2 + **/ +void +hb_buffer_destroy (hb_buffer_t *buffer) +{ + if (!hb_object_destroy (buffer)) return; + + hb_unicode_funcs_destroy (buffer->unicode); + + free (buffer->info); + free (buffer->pos); + if (buffer->message_destroy) + buffer->message_destroy (buffer->message_data); + + free (buffer); +} + +/** + * hb_buffer_set_user_data: (skip) + * @buffer: an #hb_buffer_t. + * @key: + * @data: + * @destroy: + * @replace: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_buffer_set_user_data (hb_buffer_t *buffer, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace) +{ + return hb_object_set_user_data (buffer, key, data, destroy, replace); +} + +/** + * hb_buffer_get_user_data: (skip) + * @buffer: an #hb_buffer_t. + * @key: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +void * +hb_buffer_get_user_data (hb_buffer_t *buffer, + hb_user_data_key_t *key) +{ + return hb_object_get_user_data (buffer, key); +} + + +/** + * hb_buffer_set_content_type: + * @buffer: an #hb_buffer_t. + * @content_type: the type of buffer contents to set + * + * Sets the type of @buffer contents, buffers are either empty, contain + * characters (before shaping) or glyphs (the result of shaping). + * + * Since: 0.9.5 + **/ +void +hb_buffer_set_content_type (hb_buffer_t *buffer, + hb_buffer_content_type_t content_type) +{ + buffer->content_type = content_type; +} + +/** + * hb_buffer_get_content_type: + * @buffer: an #hb_buffer_t. + * + * see hb_buffer_set_content_type(). + * + * Return value: + * The type of @buffer contents. + * + * Since: 0.9.5 + **/ +hb_buffer_content_type_t +hb_buffer_get_content_type (hb_buffer_t *buffer) +{ + return buffer->content_type; +} + + +/** + * hb_buffer_set_unicode_funcs: + * @buffer: an #hb_buffer_t. + * @unicode_funcs: + * + * + * + * Since: 0.9.2 + **/ +void +hb_buffer_set_unicode_funcs (hb_buffer_t *buffer, + hb_unicode_funcs_t *unicode_funcs) +{ + if (unlikely (hb_object_is_immutable (buffer))) + return; + + if (!unicode_funcs) + unicode_funcs = hb_unicode_funcs_get_default (); + + hb_unicode_funcs_reference (unicode_funcs); + hb_unicode_funcs_destroy (buffer->unicode); + buffer->unicode = unicode_funcs; +} + +/** + * hb_buffer_get_unicode_funcs: + * @buffer: an #hb_buffer_t. + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_unicode_funcs_t * +hb_buffer_get_unicode_funcs (hb_buffer_t *buffer) +{ + return buffer->unicode; +} + +/** + * hb_buffer_set_direction: + * @buffer: an #hb_buffer_t. + * @direction: the #hb_direction_t of the @buffer + * + * Set the text flow direction of the buffer. No shaping can happen without + * setting @buffer direction, and it controls the visual direction for the + * output glyphs; for RTL direction the glyphs will be reversed. Many layout + * features depend on the proper setting of the direction, for example, + * reversing RTL text before shaping, then shaping with LTR direction is not + * the same as keeping the text in logical order and shaping with RTL + * direction. + * + * Since: 0.9.2 + **/ +void +hb_buffer_set_direction (hb_buffer_t *buffer, + hb_direction_t direction) + +{ + if (unlikely (hb_object_is_immutable (buffer))) + return; + + buffer->props.direction = direction; +} + +/** + * hb_buffer_get_direction: + * @buffer: an #hb_buffer_t. + * + * See hb_buffer_set_direction() + * + * Return value: + * The direction of the @buffer. + * + * Since: 0.9.2 + **/ +hb_direction_t +hb_buffer_get_direction (hb_buffer_t *buffer) +{ + return buffer->props.direction; +} + +/** + * hb_buffer_set_script: + * @buffer: an #hb_buffer_t. + * @script: an #hb_script_t to set. + * + * Sets the script of @buffer to @script. + * + * Script is crucial for choosing the proper shaping behaviour for scripts that + * require it (e.g. Arabic) and the which OpenType features defined in the font + * to be applied. + * + * You can pass one of the predefined #hb_script_t values, or use + * hb_script_from_string() or hb_script_from_iso15924_tag() to get the + * corresponding script from an ISO 15924 script tag. + * + * Since: 0.9.2 + **/ +void +hb_buffer_set_script (hb_buffer_t *buffer, + hb_script_t script) +{ + if (unlikely (hb_object_is_immutable (buffer))) + return; + + buffer->props.script = script; +} + +/** + * hb_buffer_get_script: + * @buffer: an #hb_buffer_t. + * + * See hb_buffer_set_script(). + * + * Return value: + * The #hb_script_t of the @buffer. + * + * Since: 0.9.2 + **/ +hb_script_t +hb_buffer_get_script (hb_buffer_t *buffer) +{ + return buffer->props.script; +} + +/** + * hb_buffer_set_language: + * @buffer: an #hb_buffer_t. + * @language: an hb_language_t to set. + * + * Sets the language of @buffer to @language. + * + * Languages are crucial for selecting which OpenType feature to apply to the + * buffer which can result in applying language-specific behaviour. Languages + * are orthogonal to the scripts, and though they are related, they are + * different concepts and should not be confused with each other. + * + * Use hb_language_from_string() to convert from BCP 47 language tags to + * #hb_language_t. + * + * Since: 0.9.2 + **/ +void +hb_buffer_set_language (hb_buffer_t *buffer, + hb_language_t language) +{ + if (unlikely (hb_object_is_immutable (buffer))) + return; + + buffer->props.language = language; +} + +/** + * hb_buffer_get_language: + * @buffer: an #hb_buffer_t. + * + * See hb_buffer_set_language(). + * + * Return value: (transfer none): + * The #hb_language_t of the buffer. Must not be freed by the caller. + * + * Since: 0.9.2 + **/ +hb_language_t +hb_buffer_get_language (hb_buffer_t *buffer) +{ + return buffer->props.language; +} + +/** + * hb_buffer_set_segment_properties: + * @buffer: an #hb_buffer_t. + * @props: an #hb_segment_properties_t to use. + * + * Sets the segment properties of the buffer, a shortcut for calling + * hb_buffer_set_direction(), hb_buffer_set_script() and + * hb_buffer_set_language() individually. + * + * Since: 0.9.7 + **/ +void +hb_buffer_set_segment_properties (hb_buffer_t *buffer, + const hb_segment_properties_t *props) +{ + if (unlikely (hb_object_is_immutable (buffer))) + return; + + buffer->props = *props; +} + +/** + * hb_buffer_get_segment_properties: + * @buffer: an #hb_buffer_t. + * @props: (out): the output #hb_segment_properties_t. + * + * Sets @props to the #hb_segment_properties_t of @buffer. + * + * Since: 0.9.7 + **/ +void +hb_buffer_get_segment_properties (hb_buffer_t *buffer, + hb_segment_properties_t *props) +{ + *props = buffer->props; +} + + +/** + * hb_buffer_set_flags: + * @buffer: an #hb_buffer_t. + * @flags: the buffer flags to set. + * + * Sets @buffer flags to @flags. See #hb_buffer_flags_t. + * + * Since: 0.9.7 + **/ +void +hb_buffer_set_flags (hb_buffer_t *buffer, + hb_buffer_flags_t flags) +{ + if (unlikely (hb_object_is_immutable (buffer))) + return; + + buffer->flags = flags; +} + +/** + * hb_buffer_get_flags: + * @buffer: an #hb_buffer_t. + * + * See hb_buffer_set_flags(). + * + * Return value: + * The @buffer flags. + * + * Since: 0.9.7 + **/ +hb_buffer_flags_t +hb_buffer_get_flags (hb_buffer_t *buffer) +{ + return buffer->flags; +} + +/** + * hb_buffer_set_cluster_level: + * @buffer: an #hb_buffer_t. + * @cluster_level: + * + * + * + * Since: 0.9.42 + **/ +void +hb_buffer_set_cluster_level (hb_buffer_t *buffer, + hb_buffer_cluster_level_t cluster_level) +{ + if (unlikely (hb_object_is_immutable (buffer))) + return; + + buffer->cluster_level = cluster_level; +} + +/** + * hb_buffer_get_cluster_level: + * @buffer: an #hb_buffer_t. + * + * + * + * Return value: + * + * Since: 0.9.42 + **/ +hb_buffer_cluster_level_t +hb_buffer_get_cluster_level (hb_buffer_t *buffer) +{ + return buffer->cluster_level; +} + + +/** + * hb_buffer_set_replacement_codepoint: + * @buffer: an #hb_buffer_t. + * @replacement: the replacement #hb_codepoint_t + * + * Sets the #hb_codepoint_t that replaces invalid entries for a given encoding + * when adding text to @buffer. + * + * Default is %HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT. + * + * Since: 0.9.31 + **/ +void +hb_buffer_set_replacement_codepoint (hb_buffer_t *buffer, + hb_codepoint_t replacement) +{ + if (unlikely (hb_object_is_immutable (buffer))) + return; + + buffer->replacement = replacement; +} + +/** + * hb_buffer_get_replacement_codepoint: + * @buffer: an #hb_buffer_t. + * + * See hb_buffer_set_replacement_codepoint(). + * + * Return value: + * The @buffer replacement #hb_codepoint_t. + * + * Since: 0.9.31 + **/ +hb_codepoint_t +hb_buffer_get_replacement_codepoint (hb_buffer_t *buffer) +{ + return buffer->replacement; +} + + +/** + * hb_buffer_set_invisible_glyph: + * @buffer: an #hb_buffer_t. + * @invisible: the invisible #hb_codepoint_t + * + * Sets the #hb_codepoint_t that replaces invisible characters in + * the shaping result. If set to zero (default), the glyph for the + * U+0020 SPACE character is used. Otherwise, this value is used + * verbatim. + * + * Since: 2.0.0 + **/ +void +hb_buffer_set_invisible_glyph (hb_buffer_t *buffer, + hb_codepoint_t invisible) +{ + if (unlikely (hb_object_is_immutable (buffer))) + return; + + buffer->invisible = invisible; +} + +/** + * hb_buffer_get_invisible_glyph: + * @buffer: an #hb_buffer_t. + * + * See hb_buffer_set_invisible_glyph(). + * + * Return value: + * The @buffer invisible #hb_codepoint_t. + * + * Since: 2.0.0 + **/ +hb_codepoint_t +hb_buffer_get_invisible_glyph (hb_buffer_t *buffer) +{ + return buffer->invisible; +} + + +/** + * hb_buffer_reset: + * @buffer: an #hb_buffer_t. + * + * Resets the buffer to its initial status, as if it was just newly created + * with hb_buffer_create(). + * + * Since: 0.9.2 + **/ +void +hb_buffer_reset (hb_buffer_t *buffer) +{ + buffer->reset (); +} + +/** + * hb_buffer_clear_contents: + * @buffer: an #hb_buffer_t. + * + * Similar to hb_buffer_reset(), but does not clear the Unicode functions and + * the replacement code point. + * + * Since: 0.9.11 + **/ +void +hb_buffer_clear_contents (hb_buffer_t *buffer) +{ + buffer->clear (); +} + +/** + * hb_buffer_pre_allocate: + * @buffer: an #hb_buffer_t. + * @size: number of items to pre allocate. + * + * Pre allocates memory for @buffer to fit at least @size number of items. + * + * Return value: + * %true if @buffer memory allocation succeeded, %false otherwise. + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_buffer_pre_allocate (hb_buffer_t *buffer, unsigned int size) +{ + return buffer->ensure (size); +} + +/** + * hb_buffer_allocation_successful: + * @buffer: an #hb_buffer_t. + * + * Check if allocating memory for the buffer succeeded. + * + * Return value: + * %true if @buffer memory allocation succeeded, %false otherwise. + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_buffer_allocation_successful (hb_buffer_t *buffer) +{ + return buffer->successful; +} + +/** + * hb_buffer_add: + * @buffer: an #hb_buffer_t. + * @codepoint: a Unicode code point. + * @cluster: the cluster value of @codepoint. + * + * Appends a character with the Unicode value of @codepoint to @buffer, and + * gives it the initial cluster value of @cluster. Clusters can be any thing + * the client wants, they are usually used to refer to the index of the + * character in the input text stream and are output in + * #hb_glyph_info_t.cluster field. + * + * This function does not check the validity of @codepoint, it is up to the + * caller to ensure it is a valid Unicode code point. + * + * Since: 0.9.7 + **/ +void +hb_buffer_add (hb_buffer_t *buffer, + hb_codepoint_t codepoint, + unsigned int cluster) +{ + buffer->add (codepoint, cluster); + buffer->clear_context (1); +} + +/** + * hb_buffer_set_length: + * @buffer: an #hb_buffer_t. + * @length: the new length of @buffer. + * + * Similar to hb_buffer_pre_allocate(), but clears any new items added at the + * end. + * + * Return value: + * %true if @buffer memory allocation succeeded, %false otherwise. + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_buffer_set_length (hb_buffer_t *buffer, + unsigned int length) +{ + if (unlikely (hb_object_is_immutable (buffer))) + return length == 0; + + if (!buffer->ensure (length)) + return false; + + /* Wipe the new space */ + if (length > buffer->len) { + memset (buffer->info + buffer->len, 0, sizeof (buffer->info[0]) * (length - buffer->len)); + if (buffer->have_positions) + memset (buffer->pos + buffer->len, 0, sizeof (buffer->pos[0]) * (length - buffer->len)); + } + + buffer->len = length; + + if (!length) + { + buffer->content_type = HB_BUFFER_CONTENT_TYPE_INVALID; + buffer->clear_context (0); + } + buffer->clear_context (1); + + return true; +} + +/** + * hb_buffer_get_length: + * @buffer: an #hb_buffer_t. + * + * Returns the number of items in the buffer. + * + * Return value: + * The @buffer length. + * The value valid as long as buffer has not been modified. + * + * Since: 0.9.2 + **/ +unsigned int +hb_buffer_get_length (hb_buffer_t *buffer) +{ + return buffer->len; +} + +/** + * hb_buffer_get_glyph_infos: + * @buffer: an #hb_buffer_t. + * @length: (out): output array length. + * + * Returns @buffer glyph information array. Returned pointer + * is valid as long as @buffer contents are not modified. + * + * Return value: (transfer none) (array length=length): + * The @buffer glyph information array. + * The value valid as long as buffer has not been modified. + * + * Since: 0.9.2 + **/ +hb_glyph_info_t * +hb_buffer_get_glyph_infos (hb_buffer_t *buffer, + unsigned int *length) +{ + if (length) + *length = buffer->len; + + return (hb_glyph_info_t *) buffer->info; +} + +/** + * hb_buffer_get_glyph_positions: + * @buffer: an #hb_buffer_t. + * @length: (out): output length. + * + * Returns @buffer glyph position array. Returned pointer + * is valid as long as @buffer contents are not modified. + * + * Return value: (transfer none) (array length=length): + * The @buffer glyph position array. + * The value valid as long as buffer has not been modified. + * + * Since: 0.9.2 + **/ +hb_glyph_position_t * +hb_buffer_get_glyph_positions (hb_buffer_t *buffer, + unsigned int *length) +{ + if (!buffer->have_positions) + buffer->clear_positions (); + + if (length) + *length = buffer->len; + + return (hb_glyph_position_t *) buffer->pos; +} + +/** + * hb_glyph_info_get_glyph_flags: + * @info: a #hb_glyph_info_t. + * + * Returns glyph flags encoded within a #hb_glyph_info_t. + * + * Return value: + * The #hb_glyph_flags_t encoded within @info. + * + * Since: 1.5.0 + **/ +hb_glyph_flags_t +(hb_glyph_info_get_glyph_flags) (const hb_glyph_info_t *info) +{ + return hb_glyph_info_get_glyph_flags (info); +} + +/** + * hb_buffer_reverse: + * @buffer: an #hb_buffer_t. + * + * Reverses buffer contents. + * + * Since: 0.9.2 + **/ +void +hb_buffer_reverse (hb_buffer_t *buffer) +{ + buffer->reverse (); +} + +/** + * hb_buffer_reverse_range: + * @buffer: an #hb_buffer_t. + * @start: start index. + * @end: end index. + * + * Reverses buffer contents between start to end. + * + * Since: 0.9.41 + **/ +void +hb_buffer_reverse_range (hb_buffer_t *buffer, + unsigned int start, unsigned int end) +{ + buffer->reverse_range (start, end); +} + +/** + * hb_buffer_reverse_clusters: + * @buffer: an #hb_buffer_t. + * + * Reverses buffer clusters. That is, the buffer contents are + * reversed, then each cluster (consecutive items having the + * same cluster number) are reversed again. + * + * Since: 0.9.2 + **/ +void +hb_buffer_reverse_clusters (hb_buffer_t *buffer) +{ + buffer->reverse_clusters (); +} + +/** + * hb_buffer_guess_segment_properties: + * @buffer: an #hb_buffer_t. + * + * Sets unset buffer segment properties based on buffer Unicode + * contents. If buffer is not empty, it must have content type + * %HB_BUFFER_CONTENT_TYPE_UNICODE. + * + * If buffer script is not set (ie. is %HB_SCRIPT_INVALID), it + * will be set to the Unicode script of the first character in + * the buffer that has a script other than %HB_SCRIPT_COMMON, + * %HB_SCRIPT_INHERITED, and %HB_SCRIPT_UNKNOWN. + * + * Next, if buffer direction is not set (ie. is %HB_DIRECTION_INVALID), + * it will be set to the natural horizontal direction of the + * buffer script as returned by hb_script_get_horizontal_direction(). + * If hb_script_get_horizontal_direction() returns %HB_DIRECTION_INVALID, + * then %HB_DIRECTION_LTR is used. + * + * Finally, if buffer language is not set (ie. is %HB_LANGUAGE_INVALID), + * it will be set to the process's default language as returned by + * hb_language_get_default(). This may change in the future by + * taking buffer script into consideration when choosing a language. + * Note that hb_language_get_default() is NOT threadsafe the first time + * it is called. See documentation for that function for details. + * + * Since: 0.9.7 + **/ +void +hb_buffer_guess_segment_properties (hb_buffer_t *buffer) +{ + buffer->guess_segment_properties (); +} + +template +static inline void +hb_buffer_add_utf (hb_buffer_t *buffer, + const typename utf_t::codepoint_t *text, + int text_length, + unsigned int item_offset, + int item_length) +{ + typedef typename utf_t::codepoint_t T; + const hb_codepoint_t replacement = buffer->replacement; + + assert (buffer->content_type == HB_BUFFER_CONTENT_TYPE_UNICODE || + (!buffer->len && buffer->content_type == HB_BUFFER_CONTENT_TYPE_INVALID)); + + if (unlikely (hb_object_is_immutable (buffer))) + return; + + if (text_length == -1) + text_length = utf_t::strlen (text); + + if (item_length == -1) + item_length = text_length - item_offset; + + buffer->ensure (buffer->len + item_length * sizeof (T) / 4); + + /* If buffer is empty and pre-context provided, install it. + * This check is written this way, to make sure people can + * provide pre-context in one add_utf() call, then provide + * text in a follow-up call. See: + * + * https://bugzilla.mozilla.org/show_bug.cgi?id=801410#c13 + */ + if (!buffer->len && item_offset > 0) + { + /* Add pre-context */ + buffer->clear_context (0); + const T *prev = text + item_offset; + const T *start = text; + while (start < prev && buffer->context_len[0] < buffer->CONTEXT_LENGTH) + { + hb_codepoint_t u; + prev = utf_t::prev (prev, start, &u, replacement); + buffer->context[0][buffer->context_len[0]++] = u; + } + } + + const T *next = text + item_offset; + const T *end = next + item_length; + while (next < end) + { + hb_codepoint_t u; + const T *old_next = next; + next = utf_t::next (next, end, &u, replacement); + buffer->add (u, old_next - (const T *) text); + } + + /* Add post-context */ + buffer->clear_context (1); + end = text + text_length; + while (next < end && buffer->context_len[1] < buffer->CONTEXT_LENGTH) + { + hb_codepoint_t u; + next = utf_t::next (next, end, &u, replacement); + buffer->context[1][buffer->context_len[1]++] = u; + } + + buffer->content_type = HB_BUFFER_CONTENT_TYPE_UNICODE; +} + +/** + * hb_buffer_add_utf8: + * @buffer: an #hb_buffer_t. + * @text: (array length=text_length) (element-type uint8_t): an array of UTF-8 + * characters to append. + * @text_length: the length of the @text, or -1 if it is %NULL terminated. + * @item_offset: the offset of the first character to add to the @buffer. + * @item_length: the number of characters to add to the @buffer, or -1 for the + * end of @text (assuming it is %NULL terminated). + * + * See hb_buffer_add_codepoints(). + * + * Replaces invalid UTF-8 characters with the @buffer replacement code point, + * see hb_buffer_set_replacement_codepoint(). + * + * Since: 0.9.2 + **/ +void +hb_buffer_add_utf8 (hb_buffer_t *buffer, + const char *text, + int text_length, + unsigned int item_offset, + int item_length) +{ + hb_buffer_add_utf (buffer, (const uint8_t *) text, text_length, item_offset, item_length); +} + +/** + * hb_buffer_add_utf16: + * @buffer: an #hb_buffer_t. + * @text: (array length=text_length): an array of UTF-16 characters to append. + * @text_length: the length of the @text, or -1 if it is %NULL terminated. + * @item_offset: the offset of the first character to add to the @buffer. + * @item_length: the number of characters to add to the @buffer, or -1 for the + * end of @text (assuming it is %NULL terminated). + * + * See hb_buffer_add_codepoints(). + * + * Replaces invalid UTF-16 characters with the @buffer replacement code point, + * see hb_buffer_set_replacement_codepoint(). + * + * Since: 0.9.2 + **/ +void +hb_buffer_add_utf16 (hb_buffer_t *buffer, + const uint16_t *text, + int text_length, + unsigned int item_offset, + int item_length) +{ + hb_buffer_add_utf (buffer, text, text_length, item_offset, item_length); +} + +/** + * hb_buffer_add_utf32: + * @buffer: an #hb_buffer_t. + * @text: (array length=text_length): an array of UTF-32 characters to append. + * @text_length: the length of the @text, or -1 if it is %NULL terminated. + * @item_offset: the offset of the first character to add to the @buffer. + * @item_length: the number of characters to add to the @buffer, or -1 for the + * end of @text (assuming it is %NULL terminated). + * + * See hb_buffer_add_codepoints(). + * + * Replaces invalid UTF-32 characters with the @buffer replacement code point, + * see hb_buffer_set_replacement_codepoint(). + * + * Since: 0.9.2 + **/ +void +hb_buffer_add_utf32 (hb_buffer_t *buffer, + const uint32_t *text, + int text_length, + unsigned int item_offset, + int item_length) +{ + hb_buffer_add_utf (buffer, text, text_length, item_offset, item_length); +} + +/** + * hb_buffer_add_latin1: + * @buffer: an #hb_buffer_t. + * @text: (array length=text_length) (element-type uint8_t): an array of UTF-8 + * characters to append. + * @text_length: the length of the @text, or -1 if it is %NULL terminated. + * @item_offset: the offset of the first character to add to the @buffer. + * @item_length: the number of characters to add to the @buffer, or -1 for the + * end of @text (assuming it is %NULL terminated). + * + * Similar to hb_buffer_add_codepoints(), but allows only access to first 256 + * Unicode code points that can fit in 8-bit strings. + * + * Has nothing to do with non-Unicode Latin-1 encoding. + * + * Since: 0.9.39 + **/ +void +hb_buffer_add_latin1 (hb_buffer_t *buffer, + const uint8_t *text, + int text_length, + unsigned int item_offset, + int item_length) +{ + hb_buffer_add_utf (buffer, text, text_length, item_offset, item_length); +} + +/** + * hb_buffer_add_codepoints: + * @buffer: a #hb_buffer_t to append characters to. + * @text: (array length=text_length): an array of Unicode code points to append. + * @text_length: the length of the @text, or -1 if it is %NULL terminated. + * @item_offset: the offset of the first code point to add to the @buffer. + * @item_length: the number of code points to add to the @buffer, or -1 for the + * end of @text (assuming it is %NULL terminated). + * + * Appends characters from @text array to @buffer. The @item_offset is the + * position of the first character from @text that will be appended, and + * @item_length is the number of character. When shaping part of a larger text + * (e.g. a run of text from a paragraph), instead of passing just the substring + * corresponding to the run, it is preferable to pass the whole + * paragraph and specify the run start and length as @item_offset and + * @item_length, respectively, to give HarfBuzz the full context to be able, + * for example, to do cross-run Arabic shaping or properly handle combining + * marks at stat of run. + * + * This function does not check the validity of @text, it is up to the caller + * to ensure it contains a valid Unicode code points. + * + * Since: 0.9.31 + **/ +void +hb_buffer_add_codepoints (hb_buffer_t *buffer, + const hb_codepoint_t *text, + int text_length, + unsigned int item_offset, + int item_length) +{ + hb_buffer_add_utf (buffer, text, text_length, item_offset, item_length); +} + + +/** + * hb_buffer_append: + * @buffer: an #hb_buffer_t. + * @source: source #hb_buffer_t. + * @start: start index into source buffer to copy. Use 0 to copy from start of buffer. + * @end: end index into source buffer to copy. Use (unsigned int) -1 to copy to end of buffer. + * + * Append (part of) contents of another buffer to this buffer. + * + * Since: 1.5.0 + **/ +HB_EXTERN void +hb_buffer_append (hb_buffer_t *buffer, + hb_buffer_t *source, + unsigned int start, + unsigned int end) +{ + assert (!buffer->have_output && !source->have_output); + assert (buffer->have_positions == source->have_positions || + !buffer->len || !source->len); + assert (buffer->content_type == source->content_type || + !buffer->len || !source->len); + + if (end > source->len) + end = source->len; + if (start > end) + start = end; + if (start == end) + return; + + if (!buffer->len) + buffer->content_type = source->content_type; + if (!buffer->have_positions && source->have_positions) + buffer->clear_positions (); + + if (buffer->len + (end - start) < buffer->len) /* Overflows. */ + { + buffer->successful = false; + return; + } + + unsigned int orig_len = buffer->len; + hb_buffer_set_length (buffer, buffer->len + (end - start)); + if (unlikely (!buffer->successful)) + return; + + memcpy (buffer->info + orig_len, source->info + start, (end - start) * sizeof (buffer->info[0])); + if (buffer->have_positions) + memcpy (buffer->pos + orig_len, source->pos + start, (end - start) * sizeof (buffer->pos[0])); +} + + +static int +compare_info_codepoint (const hb_glyph_info_t *pa, + const hb_glyph_info_t *pb) +{ + return (int) pb->codepoint - (int) pa->codepoint; +} + +static inline void +normalize_glyphs_cluster (hb_buffer_t *buffer, + unsigned int start, + unsigned int end, + bool backward) +{ + hb_glyph_position_t *pos = buffer->pos; + + /* Total cluster advance */ + hb_position_t total_x_advance = 0, total_y_advance = 0; + for (unsigned int i = start; i < end; i++) + { + total_x_advance += pos[i].x_advance; + total_y_advance += pos[i].y_advance; + } + + hb_position_t x_advance = 0, y_advance = 0; + for (unsigned int i = start; i < end; i++) + { + pos[i].x_offset += x_advance; + pos[i].y_offset += y_advance; + + x_advance += pos[i].x_advance; + y_advance += pos[i].y_advance; + + pos[i].x_advance = 0; + pos[i].y_advance = 0; + } + + if (backward) + { + /* Transfer all cluster advance to the last glyph. */ + pos[end - 1].x_advance = total_x_advance; + pos[end - 1].y_advance = total_y_advance; + + hb_stable_sort (buffer->info + start, end - start - 1, compare_info_codepoint, buffer->pos + start); + } else { + /* Transfer all cluster advance to the first glyph. */ + pos[start].x_advance += total_x_advance; + pos[start].y_advance += total_y_advance; + for (unsigned int i = start + 1; i < end; i++) { + pos[i].x_offset -= total_x_advance; + pos[i].y_offset -= total_y_advance; + } + hb_stable_sort (buffer->info + start + 1, end - start - 1, compare_info_codepoint, buffer->pos + start + 1); + } +} + +/** + * hb_buffer_normalize_glyphs: + * @buffer: an #hb_buffer_t. + * + * Reorders a glyph buffer to have canonical in-cluster glyph order / position. + * The resulting clusters should behave identical to pre-reordering clusters. + * + * This has nothing to do with Unicode normalization. + * + * Since: 0.9.2 + **/ +void +hb_buffer_normalize_glyphs (hb_buffer_t *buffer) +{ + assert (buffer->have_positions); + assert (buffer->content_type == HB_BUFFER_CONTENT_TYPE_GLYPHS || + (!buffer->len && buffer->content_type == HB_BUFFER_CONTENT_TYPE_INVALID)); + + bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction); + + unsigned int count = buffer->len; + if (unlikely (!count)) return; + hb_glyph_info_t *info = buffer->info; + + unsigned int start = 0; + unsigned int end; + for (end = start + 1; end < count; end++) + if (info[start].cluster != info[end].cluster) { + normalize_glyphs_cluster (buffer, start, end, backward); + start = end; + } + normalize_glyphs_cluster (buffer, start, end, backward); +} + +void +hb_buffer_t::sort (unsigned int start, unsigned int end, int(*compar)(const hb_glyph_info_t *, const hb_glyph_info_t *)) +{ + assert (!have_positions); + for (unsigned int i = start + 1; i < end; i++) + { + unsigned int j = i; + while (j > start && compar (&info[j - 1], &info[i]) > 0) + j--; + if (i == j) + continue; + /* Move item i to occupy place for item j, shift what's in between. */ + merge_clusters (j, i + 1); + { + hb_glyph_info_t t = info[i]; + memmove (&info[j + 1], &info[j], (i - j) * sizeof (hb_glyph_info_t)); + info[j] = t; + } + } +} + + +/* + * Comparing buffers. + */ + +/** + * hb_buffer_diff: + * @buffer: a buffer. + * @reference: other buffer to compare to. + * @dottedcircle_glyph: glyph id of U+25CC DOTTED CIRCLE, or (hb_codepont_t) -1. + * @position_fuzz: allowed absolute difference in position values. + * + * If dottedcircle_glyph is (hb_codepoint_t) -1 then %HB_BUFFER_DIFF_FLAG_DOTTED_CIRCLE_PRESENT + * and %HB_BUFFER_DIFF_FLAG_NOTDEF_PRESENT are never returned. This should be used by most + * callers if just comparing two buffers is needed. + * + * Since: 1.5.0 + **/ +hb_buffer_diff_flags_t +hb_buffer_diff (hb_buffer_t *buffer, + hb_buffer_t *reference, + hb_codepoint_t dottedcircle_glyph, + unsigned int position_fuzz) +{ + if (buffer->content_type != reference->content_type && buffer->len && reference->len) + return HB_BUFFER_DIFF_FLAG_CONTENT_TYPE_MISMATCH; + + hb_buffer_diff_flags_t result = HB_BUFFER_DIFF_FLAG_EQUAL; + bool contains = dottedcircle_glyph != (hb_codepoint_t) -1; + + unsigned int count = reference->len; + + if (buffer->len != count) + { + /* + * we can't compare glyph-by-glyph, but we do want to know if there + * are .notdef or dottedcircle glyphs present in the reference buffer + */ + const hb_glyph_info_t *info = reference->info; + unsigned int i; + for (i = 0; i < count; i++) + { + if (contains && info[i].codepoint == dottedcircle_glyph) + result |= HB_BUFFER_DIFF_FLAG_DOTTED_CIRCLE_PRESENT; + if (contains && info[i].codepoint == 0) + result |= HB_BUFFER_DIFF_FLAG_NOTDEF_PRESENT; + } + result |= HB_BUFFER_DIFF_FLAG_LENGTH_MISMATCH; + return hb_buffer_diff_flags_t (result); + } + + if (!count) + return hb_buffer_diff_flags_t (result); + + const hb_glyph_info_t *buf_info = buffer->info; + const hb_glyph_info_t *ref_info = reference->info; + for (unsigned int i = 0; i < count; i++) + { + if (buf_info->codepoint != ref_info->codepoint) + result |= HB_BUFFER_DIFF_FLAG_CODEPOINT_MISMATCH; + if (buf_info->cluster != ref_info->cluster) + result |= HB_BUFFER_DIFF_FLAG_CLUSTER_MISMATCH; + if ((buf_info->mask & ~ref_info->mask & HB_GLYPH_FLAG_DEFINED)) + result |= HB_BUFFER_DIFF_FLAG_GLYPH_FLAGS_MISMATCH; + if (contains && ref_info->codepoint == dottedcircle_glyph) + result |= HB_BUFFER_DIFF_FLAG_DOTTED_CIRCLE_PRESENT; + if (contains && ref_info->codepoint == 0) + result |= HB_BUFFER_DIFF_FLAG_NOTDEF_PRESENT; + buf_info++; + ref_info++; + } + + if (buffer->content_type == HB_BUFFER_CONTENT_TYPE_GLYPHS) + { + assert (buffer->have_positions); + const hb_glyph_position_t *buf_pos = buffer->pos; + const hb_glyph_position_t *ref_pos = reference->pos; + for (unsigned int i = 0; i < count; i++) + { + if ((unsigned int) abs (buf_pos->x_advance - ref_pos->x_advance) > position_fuzz || + (unsigned int) abs (buf_pos->y_advance - ref_pos->y_advance) > position_fuzz || + (unsigned int) abs (buf_pos->x_offset - ref_pos->x_offset) > position_fuzz || + (unsigned int) abs (buf_pos->y_offset - ref_pos->y_offset) > position_fuzz) + { + result |= HB_BUFFER_DIFF_FLAG_POSITION_MISMATCH; + break; + } + buf_pos++; + ref_pos++; + } + } + + return result; +} + + +/* + * Debugging. + */ + +#ifndef HB_NO_BUFFER_MESSAGE +/** + * hb_buffer_set_message_func: + * @buffer: an #hb_buffer_t. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 1.1.3 + **/ +void +hb_buffer_set_message_func (hb_buffer_t *buffer, + hb_buffer_message_func_t func, + void *user_data, hb_destroy_func_t destroy) +{ + if (buffer->message_destroy) + buffer->message_destroy (buffer->message_data); + + if (func) { + buffer->message_func = func; + buffer->message_data = user_data; + buffer->message_destroy = destroy; + } else { + buffer->message_func = nullptr; + buffer->message_data = nullptr; + buffer->message_destroy = nullptr; + } +} +bool +hb_buffer_t::message_impl (hb_font_t *font, const char *fmt, va_list ap) +{ + char buf[100]; + vsnprintf (buf, sizeof (buf), fmt, ap); + return (bool) this->message_func (this, font, buf, this->message_data); +} +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.h new file mode 100644 index 000000000..d5cb74686 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.h @@ -0,0 +1,586 @@ +/* + * Copyright © 1998-2004 David Turner and Werner Lemberg + * Copyright © 2004,2007,2009 Red Hat, Inc. + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Owen Taylor, Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_H_IN +#error "Include instead." +#endif + +#ifndef HB_BUFFER_H +#define HB_BUFFER_H + +#include "hb-common.h" +#include "hb-unicode.h" +#include "hb-font.h" + +HB_BEGIN_DECLS + +/** + * hb_glyph_info_t: + * @codepoint: either a Unicode code point (before shaping) or a glyph index + * (after shaping). + * @cluster: the index of the character in the original text that corresponds + * to this #hb_glyph_info_t, or whatever the client passes to + * hb_buffer_add(). More than one #hb_glyph_info_t can have the same + * @cluster value, if they resulted from the same character (e.g. one + * to many glyph substitution), and when more than one character gets + * merged in the same glyph (e.g. many to one glyph substitution) the + * #hb_glyph_info_t will have the smallest cluster value of them. + * By default some characters are merged into the same cluster + * (e.g. combining marks have the same cluster as their bases) + * even if they are separate glyphs, hb_buffer_set_cluster_level() + * allow selecting more fine-grained cluster handling. + * + * The #hb_glyph_info_t is the structure that holds information about the + * glyphs and their relation to input text. + */ +typedef struct hb_glyph_info_t +{ + hb_codepoint_t codepoint; + /*< private >*/ + hb_mask_t mask; + /*< public >*/ + uint32_t cluster; + + /*< private >*/ + hb_var_int_t var1; + hb_var_int_t var2; +} hb_glyph_info_t; + +/** + * hb_glyph_flags_t: + * @HB_GLYPH_FLAG_UNSAFE_TO_BREAK: Indicates that if input text is broken at the + * beginning of the cluster this glyph is part of, + * then both sides need to be re-shaped, as the + * result might be different. On the flip side, + * it means that when this flag is not present, + * then it's safe to break the glyph-run at the + * beginning of this cluster, and the two sides + * represent the exact same result one would get + * if breaking input text at the beginning of + * this cluster and shaping the two sides + * separately. This can be used to optimize + * paragraph layout, by avoiding re-shaping + * of each line after line-breaking, or limiting + * the reshaping to a small piece around the + * breaking point only. + * @HB_GLYPH_FLAG_DEFINED: All the currently defined flags. + * + * Since: 1.5.0 + */ +typedef enum { /*< flags >*/ + HB_GLYPH_FLAG_UNSAFE_TO_BREAK = 0x00000001, + + HB_GLYPH_FLAG_DEFINED = 0x00000001 /* OR of all defined flags */ +} hb_glyph_flags_t; + +HB_EXTERN hb_glyph_flags_t +hb_glyph_info_get_glyph_flags (const hb_glyph_info_t *info); + +#define hb_glyph_info_get_glyph_flags(info) \ + ((hb_glyph_flags_t) ((unsigned int) (info)->mask & HB_GLYPH_FLAG_DEFINED)) + + +/** + * hb_glyph_position_t: + * @x_advance: how much the line advances after drawing this glyph when setting + * text in horizontal direction. + * @y_advance: how much the line advances after drawing this glyph when setting + * text in vertical direction. + * @x_offset: how much the glyph moves on the X-axis before drawing it, this + * should not affect how much the line advances. + * @y_offset: how much the glyph moves on the Y-axis before drawing it, this + * should not affect how much the line advances. + * + * The #hb_glyph_position_t is the structure that holds the positions of the + * glyph in both horizontal and vertical directions. All positions in + * #hb_glyph_position_t are relative to the current point. + * + */ +typedef struct hb_glyph_position_t { + hb_position_t x_advance; + hb_position_t y_advance; + hb_position_t x_offset; + hb_position_t y_offset; + + /*< private >*/ + hb_var_int_t var; +} hb_glyph_position_t; + +/** + * hb_segment_properties_t: + * @direction: the #hb_direction_t of the buffer, see hb_buffer_set_direction(). + * @script: the #hb_script_t of the buffer, see hb_buffer_set_script(). + * @language: the #hb_language_t of the buffer, see hb_buffer_set_language(). + * + * The structure that holds various text properties of an #hb_buffer_t. Can be + * set and retrieved using hb_buffer_set_segment_properties() and + * hb_buffer_get_segment_properties(), respectively. + */ +typedef struct hb_segment_properties_t { + hb_direction_t direction; + hb_script_t script; + hb_language_t language; + /*< private >*/ + void *reserved1; + void *reserved2; +} hb_segment_properties_t; + +#define HB_SEGMENT_PROPERTIES_DEFAULT {HB_DIRECTION_INVALID, \ + HB_SCRIPT_INVALID, \ + HB_LANGUAGE_INVALID, \ + (void *) 0, \ + (void *) 0} + +HB_EXTERN hb_bool_t +hb_segment_properties_equal (const hb_segment_properties_t *a, + const hb_segment_properties_t *b); + +HB_EXTERN unsigned int +hb_segment_properties_hash (const hb_segment_properties_t *p); + + + +/** + * hb_buffer_t: + * + * The main structure holding the input text and its properties before shaping, + * and output glyphs and their information after shaping. + */ + +typedef struct hb_buffer_t hb_buffer_t; + +HB_EXTERN hb_buffer_t * +hb_buffer_create (void); + +HB_EXTERN hb_buffer_t * +hb_buffer_get_empty (void); + +HB_EXTERN hb_buffer_t * +hb_buffer_reference (hb_buffer_t *buffer); + +HB_EXTERN void +hb_buffer_destroy (hb_buffer_t *buffer); + +HB_EXTERN hb_bool_t +hb_buffer_set_user_data (hb_buffer_t *buffer, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace); + +HB_EXTERN void * +hb_buffer_get_user_data (hb_buffer_t *buffer, + hb_user_data_key_t *key); + + +/** + * hb_buffer_content_type_t: + * @HB_BUFFER_CONTENT_TYPE_INVALID: Initial value for new buffer. + * @HB_BUFFER_CONTENT_TYPE_UNICODE: The buffer contains input characters (before shaping). + * @HB_BUFFER_CONTENT_TYPE_GLYPHS: The buffer contains output glyphs (after shaping). + */ +typedef enum { + HB_BUFFER_CONTENT_TYPE_INVALID = 0, + HB_BUFFER_CONTENT_TYPE_UNICODE, + HB_BUFFER_CONTENT_TYPE_GLYPHS +} hb_buffer_content_type_t; + +HB_EXTERN void +hb_buffer_set_content_type (hb_buffer_t *buffer, + hb_buffer_content_type_t content_type); + +HB_EXTERN hb_buffer_content_type_t +hb_buffer_get_content_type (hb_buffer_t *buffer); + + +HB_EXTERN void +hb_buffer_set_unicode_funcs (hb_buffer_t *buffer, + hb_unicode_funcs_t *unicode_funcs); + +HB_EXTERN hb_unicode_funcs_t * +hb_buffer_get_unicode_funcs (hb_buffer_t *buffer); + +HB_EXTERN void +hb_buffer_set_direction (hb_buffer_t *buffer, + hb_direction_t direction); + +HB_EXTERN hb_direction_t +hb_buffer_get_direction (hb_buffer_t *buffer); + +HB_EXTERN void +hb_buffer_set_script (hb_buffer_t *buffer, + hb_script_t script); + +HB_EXTERN hb_script_t +hb_buffer_get_script (hb_buffer_t *buffer); + +HB_EXTERN void +hb_buffer_set_language (hb_buffer_t *buffer, + hb_language_t language); + + +HB_EXTERN hb_language_t +hb_buffer_get_language (hb_buffer_t *buffer); + +HB_EXTERN void +hb_buffer_set_segment_properties (hb_buffer_t *buffer, + const hb_segment_properties_t *props); + +HB_EXTERN void +hb_buffer_get_segment_properties (hb_buffer_t *buffer, + hb_segment_properties_t *props); + +HB_EXTERN void +hb_buffer_guess_segment_properties (hb_buffer_t *buffer); + + +/** + * hb_buffer_flags_t: + * @HB_BUFFER_FLAG_DEFAULT: the default buffer flag. + * @HB_BUFFER_FLAG_BOT: flag indicating that special handling of the beginning + * of text paragraph can be applied to this buffer. Should usually + * be set, unless you are passing to the buffer only part + * of the text without the full context. + * @HB_BUFFER_FLAG_EOT: flag indicating that special handling of the end of text + * paragraph can be applied to this buffer, similar to + * @HB_BUFFER_FLAG_BOT. + * @HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES: + * flag indication that character with Default_Ignorable + * Unicode property should use the corresponding glyph + * from the font, instead of hiding them (done by + * replacing them with the space glyph and zeroing the + * advance width.) This flag takes precedence over + * @HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES. + * @HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES: + * flag indication that character with Default_Ignorable + * Unicode property should be removed from glyph string + * instead of hiding them (done by replacing them with the + * space glyph and zeroing the advance width.) + * @HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES takes + * precedence over this flag. Since: 1.8.0 + * @HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE: + * flag indicating that a dotted circle should + * not be inserted in the rendering of incorrect + * character sequences (such at <0905 093E>). Since: 2.4 + * + * Since: 0.9.20 + */ +typedef enum { /*< flags >*/ + HB_BUFFER_FLAG_DEFAULT = 0x00000000u, + HB_BUFFER_FLAG_BOT = 0x00000001u, /* Beginning-of-text */ + HB_BUFFER_FLAG_EOT = 0x00000002u, /* End-of-text */ + HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES = 0x00000004u, + HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES = 0x00000008u, + HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE = 0x00000010u +} hb_buffer_flags_t; + +HB_EXTERN void +hb_buffer_set_flags (hb_buffer_t *buffer, + hb_buffer_flags_t flags); + +HB_EXTERN hb_buffer_flags_t +hb_buffer_get_flags (hb_buffer_t *buffer); + +/** + * hb_buffer_cluster_level_t: + * @HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES: Return cluster values grouped by graphemes into + * monotone order. + * @HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS: Return cluster values grouped into monotone order. + * @HB_BUFFER_CLUSTER_LEVEL_CHARACTERS: Don't group cluster values. + * @HB_BUFFER_CLUSTER_LEVEL_DEFAULT: Default cluster level, + * equal to @HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES. + * + * Since: 0.9.42 + */ +typedef enum { + HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES = 0, + HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS = 1, + HB_BUFFER_CLUSTER_LEVEL_CHARACTERS = 2, + HB_BUFFER_CLUSTER_LEVEL_DEFAULT = HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES +} hb_buffer_cluster_level_t; + +HB_EXTERN void +hb_buffer_set_cluster_level (hb_buffer_t *buffer, + hb_buffer_cluster_level_t cluster_level); + +HB_EXTERN hb_buffer_cluster_level_t +hb_buffer_get_cluster_level (hb_buffer_t *buffer); + +/** + * HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT: + * + * The default code point for replacing invalid characters in a given encoding. + * Set to U+FFFD REPLACEMENT CHARACTER. + * + * Since: 0.9.31 + */ +#define HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT 0xFFFDu + +HB_EXTERN void +hb_buffer_set_replacement_codepoint (hb_buffer_t *buffer, + hb_codepoint_t replacement); + +HB_EXTERN hb_codepoint_t +hb_buffer_get_replacement_codepoint (hb_buffer_t *buffer); + +HB_EXTERN void +hb_buffer_set_invisible_glyph (hb_buffer_t *buffer, + hb_codepoint_t invisible); + +HB_EXTERN hb_codepoint_t +hb_buffer_get_invisible_glyph (hb_buffer_t *buffer); + + +HB_EXTERN void +hb_buffer_reset (hb_buffer_t *buffer); + +HB_EXTERN void +hb_buffer_clear_contents (hb_buffer_t *buffer); + +HB_EXTERN hb_bool_t +hb_buffer_pre_allocate (hb_buffer_t *buffer, + unsigned int size); + + +HB_EXTERN hb_bool_t +hb_buffer_allocation_successful (hb_buffer_t *buffer); + +HB_EXTERN void +hb_buffer_reverse (hb_buffer_t *buffer); + +HB_EXTERN void +hb_buffer_reverse_range (hb_buffer_t *buffer, + unsigned int start, unsigned int end); + +HB_EXTERN void +hb_buffer_reverse_clusters (hb_buffer_t *buffer); + + +/* Filling the buffer in */ + +HB_EXTERN void +hb_buffer_add (hb_buffer_t *buffer, + hb_codepoint_t codepoint, + unsigned int cluster); + +HB_EXTERN void +hb_buffer_add_utf8 (hb_buffer_t *buffer, + const char *text, + int text_length, + unsigned int item_offset, + int item_length); + +HB_EXTERN void +hb_buffer_add_utf16 (hb_buffer_t *buffer, + const uint16_t *text, + int text_length, + unsigned int item_offset, + int item_length); + +HB_EXTERN void +hb_buffer_add_utf32 (hb_buffer_t *buffer, + const uint32_t *text, + int text_length, + unsigned int item_offset, + int item_length); + +HB_EXTERN void +hb_buffer_add_latin1 (hb_buffer_t *buffer, + const uint8_t *text, + int text_length, + unsigned int item_offset, + int item_length); + +HB_EXTERN void +hb_buffer_add_codepoints (hb_buffer_t *buffer, + const hb_codepoint_t *text, + int text_length, + unsigned int item_offset, + int item_length); + +HB_EXTERN void +hb_buffer_append (hb_buffer_t *buffer, + hb_buffer_t *source, + unsigned int start, + unsigned int end); + +HB_EXTERN hb_bool_t +hb_buffer_set_length (hb_buffer_t *buffer, + unsigned int length); + +HB_EXTERN unsigned int +hb_buffer_get_length (hb_buffer_t *buffer); + +/* Getting glyphs out of the buffer */ + +HB_EXTERN hb_glyph_info_t * +hb_buffer_get_glyph_infos (hb_buffer_t *buffer, + unsigned int *length); + +HB_EXTERN hb_glyph_position_t * +hb_buffer_get_glyph_positions (hb_buffer_t *buffer, + unsigned int *length); + + +HB_EXTERN void +hb_buffer_normalize_glyphs (hb_buffer_t *buffer); + + +/* + * Serialize + */ + +/** + * hb_buffer_serialize_flags_t: + * @HB_BUFFER_SERIALIZE_FLAG_DEFAULT: serialize glyph names, clusters and positions. + * @HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS: do not serialize glyph cluster. + * @HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS: do not serialize glyph position information. + * @HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES: do no serialize glyph name. + * @HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS: serialize glyph extents. + * @HB_BUFFER_SERIALIZE_FLAG_GLYPH_FLAGS: serialize glyph flags. Since: 1.5.0 + * @HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES: do not serialize glyph advances, + * glyph offsets will reflect absolute glyph positions. Since: 1.8.0 + * + * Flags that control what glyph information are serialized in hb_buffer_serialize_glyphs(). + * + * Since: 0.9.20 + */ +typedef enum { /*< flags >*/ + HB_BUFFER_SERIALIZE_FLAG_DEFAULT = 0x00000000u, + HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS = 0x00000001u, + HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS = 0x00000002u, + HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES = 0x00000004u, + HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS = 0x00000008u, + HB_BUFFER_SERIALIZE_FLAG_GLYPH_FLAGS = 0x00000010u, + HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES = 0x00000020u +} hb_buffer_serialize_flags_t; + +/** + * hb_buffer_serialize_format_t: + * @HB_BUFFER_SERIALIZE_FORMAT_TEXT: a human-readable, plain text format. + * @HB_BUFFER_SERIALIZE_FORMAT_JSON: a machine-readable JSON format. + * @HB_BUFFER_SERIALIZE_FORMAT_INVALID: invalid format. + * + * The buffer serialization and de-serialization format used in + * hb_buffer_serialize_glyphs() and hb_buffer_deserialize_glyphs(). + * + * Since: 0.9.2 + */ +typedef enum { + HB_BUFFER_SERIALIZE_FORMAT_TEXT = HB_TAG('T','E','X','T'), + HB_BUFFER_SERIALIZE_FORMAT_JSON = HB_TAG('J','S','O','N'), + HB_BUFFER_SERIALIZE_FORMAT_INVALID = HB_TAG_NONE +} hb_buffer_serialize_format_t; + +HB_EXTERN hb_buffer_serialize_format_t +hb_buffer_serialize_format_from_string (const char *str, int len); + +HB_EXTERN const char * +hb_buffer_serialize_format_to_string (hb_buffer_serialize_format_t format); + +HB_EXTERN const char ** +hb_buffer_serialize_list_formats (void); + +HB_EXTERN unsigned int +hb_buffer_serialize_glyphs (hb_buffer_t *buffer, + unsigned int start, + unsigned int end, + char *buf, + unsigned int buf_size, + unsigned int *buf_consumed, + hb_font_t *font, + hb_buffer_serialize_format_t format, + hb_buffer_serialize_flags_t flags); + +HB_EXTERN hb_bool_t +hb_buffer_deserialize_glyphs (hb_buffer_t *buffer, + const char *buf, + int buf_len, + const char **end_ptr, + hb_font_t *font, + hb_buffer_serialize_format_t format); + + +/* + * Compare buffers + */ + +typedef enum { /*< flags >*/ + HB_BUFFER_DIFF_FLAG_EQUAL = 0x0000, + + /* Buffers with different content_type cannot be meaningfully compared + * in any further detail. */ + HB_BUFFER_DIFF_FLAG_CONTENT_TYPE_MISMATCH = 0x0001, + + /* For buffers with differing length, the per-glyph comparison is not + * attempted, though we do still scan reference for dottedcircle / .notdef + * glyphs. */ + HB_BUFFER_DIFF_FLAG_LENGTH_MISMATCH = 0x0002, + + /* We want to know if dottedcircle / .notdef glyphs are present in the + * reference, as we may not care so much about other differences in this + * case. */ + HB_BUFFER_DIFF_FLAG_NOTDEF_PRESENT = 0x0004, + HB_BUFFER_DIFF_FLAG_DOTTED_CIRCLE_PRESENT = 0x0008, + + /* If the buffers have the same length, we compare them glyph-by-glyph + * and report which aspect(s) of the glyph info/position are different. */ + HB_BUFFER_DIFF_FLAG_CODEPOINT_MISMATCH = 0x0010, + HB_BUFFER_DIFF_FLAG_CLUSTER_MISMATCH = 0x0020, + HB_BUFFER_DIFF_FLAG_GLYPH_FLAGS_MISMATCH = 0x0040, + HB_BUFFER_DIFF_FLAG_POSITION_MISMATCH = 0x0080 + +} hb_buffer_diff_flags_t; + +/* Compare the contents of two buffers, report types of differences. */ +HB_EXTERN hb_buffer_diff_flags_t +hb_buffer_diff (hb_buffer_t *buffer, + hb_buffer_t *reference, + hb_codepoint_t dottedcircle_glyph, + unsigned int position_fuzz); + + +/* + * Debugging. + */ + +typedef hb_bool_t (*hb_buffer_message_func_t) (hb_buffer_t *buffer, + hb_font_t *font, + const char *message, + void *user_data); + +HB_EXTERN void +hb_buffer_set_message_func (hb_buffer_t *buffer, + hb_buffer_message_func_t func, + void *user_data, hb_destroy_func_t destroy); + + +HB_END_DECLS + +#endif /* HB_BUFFER_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.hh new file mode 100644 index 000000000..de0655de3 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.hh @@ -0,0 +1,452 @@ +/* + * Copyright © 1998-2004 David Turner and Werner Lemberg + * Copyright © 2004,2007,2009,2010 Red Hat, Inc. + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Owen Taylor, Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_BUFFER_HH +#define HB_BUFFER_HH + +#include "hb.hh" +#include "hb-unicode.hh" + + +#ifndef HB_BUFFER_MAX_LEN_FACTOR +#define HB_BUFFER_MAX_LEN_FACTOR 32 +#endif +#ifndef HB_BUFFER_MAX_LEN_MIN +#define HB_BUFFER_MAX_LEN_MIN 8192 +#endif +#ifndef HB_BUFFER_MAX_LEN_DEFAULT +#define HB_BUFFER_MAX_LEN_DEFAULT 0x3FFFFFFF /* Shaping more than a billion chars? Let us know! */ +#endif + +#ifndef HB_BUFFER_MAX_OPS_FACTOR +#define HB_BUFFER_MAX_OPS_FACTOR 64 +#endif +#ifndef HB_BUFFER_MAX_OPS_MIN +#define HB_BUFFER_MAX_OPS_MIN 1024 +#endif +#ifndef HB_BUFFER_MAX_OPS_DEFAULT +#define HB_BUFFER_MAX_OPS_DEFAULT 0x1FFFFFFF /* Shaping more than a billion operations? Let us know! */ +#endif + +static_assert ((sizeof (hb_glyph_info_t) == 20), ""); +static_assert ((sizeof (hb_glyph_info_t) == sizeof (hb_glyph_position_t)), ""); + +HB_MARK_AS_FLAG_T (hb_buffer_flags_t); +HB_MARK_AS_FLAG_T (hb_buffer_serialize_flags_t); +HB_MARK_AS_FLAG_T (hb_buffer_diff_flags_t); + +enum hb_buffer_scratch_flags_t { + HB_BUFFER_SCRATCH_FLAG_DEFAULT = 0x00000000u, + HB_BUFFER_SCRATCH_FLAG_HAS_NON_ASCII = 0x00000001u, + HB_BUFFER_SCRATCH_FLAG_HAS_DEFAULT_IGNORABLES = 0x00000002u, + HB_BUFFER_SCRATCH_FLAG_HAS_SPACE_FALLBACK = 0x00000004u, + HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT = 0x00000008u, + HB_BUFFER_SCRATCH_FLAG_HAS_UNSAFE_TO_BREAK = 0x00000010u, + HB_BUFFER_SCRATCH_FLAG_HAS_CGJ = 0x00000020u, + + /* Reserved for complex shapers' internal use. */ + HB_BUFFER_SCRATCH_FLAG_COMPLEX0 = 0x01000000u, + HB_BUFFER_SCRATCH_FLAG_COMPLEX1 = 0x02000000u, + HB_BUFFER_SCRATCH_FLAG_COMPLEX2 = 0x04000000u, + HB_BUFFER_SCRATCH_FLAG_COMPLEX3 = 0x08000000u, +}; +HB_MARK_AS_FLAG_T (hb_buffer_scratch_flags_t); + + +/* + * hb_buffer_t + */ + +struct hb_buffer_t +{ + hb_object_header_t header; + + /* Information about how the text in the buffer should be treated */ + hb_unicode_funcs_t *unicode; /* Unicode functions */ + hb_buffer_flags_t flags; /* BOT / EOT / etc. */ + hb_buffer_cluster_level_t cluster_level; + hb_codepoint_t replacement; /* U+FFFD or something else. */ + hb_codepoint_t invisible; /* 0 or something else. */ + hb_buffer_scratch_flags_t scratch_flags; /* Have space-fallback, etc. */ + unsigned int max_len; /* Maximum allowed len. */ + int max_ops; /* Maximum allowed operations. */ + + /* Buffer contents */ + hb_buffer_content_type_t content_type; + hb_segment_properties_t props; /* Script, language, direction */ + + bool successful; /* Allocations successful */ + bool have_output; /* Whether we have an output buffer going on */ + bool have_positions; /* Whether we have positions */ + + unsigned int idx; /* Cursor into ->info and ->pos arrays */ + unsigned int len; /* Length of ->info and ->pos arrays */ + unsigned int out_len; /* Length of ->out array if have_output */ + + unsigned int allocated; /* Length of allocated arrays */ + hb_glyph_info_t *info; + hb_glyph_info_t *out_info; + hb_glyph_position_t *pos; + + unsigned int serial; + + /* Text before / after the main buffer contents. + * Always in Unicode, and ordered outward. + * Index 0 is for "pre-context", 1 for "post-context". */ + static constexpr unsigned CONTEXT_LENGTH = 5u; + hb_codepoint_t context[2][CONTEXT_LENGTH]; + unsigned int context_len[2]; + + /* Debugging API */ +#ifndef HB_NO_BUFFER_MESSAGE + hb_buffer_message_func_t message_func; +#endif + void *message_data; + hb_destroy_func_t message_destroy; + + /* Internal debugging. */ + /* The bits here reflect current allocations of the bytes in glyph_info_t's var1 and var2. */ +#ifndef HB_NDEBUG + uint8_t allocated_var_bits; +#endif + + + /* Methods */ + + bool in_error () const { return !successful; } + + void allocate_var (unsigned int start, unsigned int count) + { +#ifndef HB_NDEBUG + unsigned int end = start + count; + assert (end <= 8); + unsigned int bits = (1u<len, \ + start = 0, end = _count ? _next_cluster (buffer, 0) : 0; \ + start < _count; \ + start = end, end = _next_cluster (buffer, start)) + +static inline unsigned int +_next_cluster (hb_buffer_t *buffer, unsigned int start) +{ + hb_glyph_info_t *info = buffer->info; + unsigned int count = buffer->len; + + unsigned int cluster = info[start].cluster; + while (++start < count && cluster == info[start].cluster) + ; + + return start; +} + + +#define HB_BUFFER_XALLOCATE_VAR(b, func, var) \ + b->func (offsetof (hb_glyph_info_t, var) - offsetof(hb_glyph_info_t, var1), \ + sizeof (b->info[0].var)) +#define HB_BUFFER_ALLOCATE_VAR(b, var) HB_BUFFER_XALLOCATE_VAR (b, allocate_var, var ()) +#define HB_BUFFER_DEALLOCATE_VAR(b, var) HB_BUFFER_XALLOCATE_VAR (b, deallocate_var, var ()) +#define HB_BUFFER_ASSERT_VAR(b, var) HB_BUFFER_XALLOCATE_VAR (b, assert_var, var ()) + + +#endif /* HB_BUFFER_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-cache.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-cache.hh new file mode 100644 index 000000000..bf26d96be --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-cache.hh @@ -0,0 +1,80 @@ +/* + * Copyright © 2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_CACHE_HH +#define HB_CACHE_HH + +#include "hb.hh" + + +/* Implements a lock-free cache for int->int functions. */ + +template +struct hb_cache_t +{ + static_assert ((key_bits >= cache_bits), ""); + static_assert ((key_bits + value_bits - cache_bits <= 8 * sizeof (hb_atomic_int_t)), ""); + static_assert (sizeof (hb_atomic_int_t) == sizeof (unsigned int), ""); + + void init () { clear (); } + void fini () {} + + void clear () + { + for (unsigned i = 0; i < ARRAY_LENGTH (values); i++) + values[i].set_relaxed (-1); + } + + bool get (unsigned int key, unsigned int *value) const + { + unsigned int k = key & ((1u<> value_bits) != (key >> cache_bits)) + return false; + *value = v & ((1u<> key_bits) || (value >> value_bits))) + return false; /* Overflows */ + unsigned int k = key & ((1u<>cache_bits)< hb_cmap_cache_t; +typedef hb_cache_t<16, 24, 8> hb_advance_cache_t; + + +#endif /* HB_CACHE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-cff-interp-common.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-cff-interp-common.hh new file mode 100644 index 000000000..fdc5c683a --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-cff-interp-common.hh @@ -0,0 +1,694 @@ +/* + * Copyright © 2018 Adobe Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Adobe Author(s): Michiharu Ariza + */ +#ifndef HB_CFF_INTERP_COMMON_HH +#define HB_CFF_INTERP_COMMON_HH + +namespace CFF { + +using namespace OT; + +typedef unsigned int op_code_t; + + +/* === Dict operators === */ + +/* One byte operators (0-31) */ +#define OpCode_version 0 /* CFF Top */ +#define OpCode_Notice 1 /* CFF Top */ +#define OpCode_FullName 2 /* CFF Top */ +#define OpCode_FamilyName 3 /* CFF Top */ +#define OpCode_Weight 4 /* CFF Top */ +#define OpCode_FontBBox 5 /* CFF Top */ +#define OpCode_BlueValues 6 /* CFF Private, CFF2 Private */ +#define OpCode_OtherBlues 7 /* CFF Private, CFF2 Private */ +#define OpCode_FamilyBlues 8 /* CFF Private, CFF2 Private */ +#define OpCode_FamilyOtherBlues 9 /* CFF Private, CFF2 Private */ +#define OpCode_StdHW 10 /* CFF Private, CFF2 Private */ +#define OpCode_StdVW 11 /* CFF Private, CFF2 Private */ +#define OpCode_escape 12 /* All. Shared with CS */ +#define OpCode_UniqueID 13 /* CFF Top */ +#define OpCode_XUID 14 /* CFF Top */ +#define OpCode_charset 15 /* CFF Top (0) */ +#define OpCode_Encoding 16 /* CFF Top (0) */ +#define OpCode_CharStrings 17 /* CFF Top, CFF2 Top */ +#define OpCode_Private 18 /* CFF Top, CFF2 FD */ +#define OpCode_Subrs 19 /* CFF Private, CFF2 Private */ +#define OpCode_defaultWidthX 20 /* CFF Private (0) */ +#define OpCode_nominalWidthX 21 /* CFF Private (0) */ +#define OpCode_vsindexdict 22 /* CFF2 Private/CS */ +#define OpCode_blenddict 23 /* CFF2 Private/CS */ +#define OpCode_vstore 24 /* CFF2 Top */ +#define OpCode_reserved25 25 +#define OpCode_reserved26 26 +#define OpCode_reserved27 27 + +/* Numbers */ +#define OpCode_shortint 28 /* 16-bit integer, All */ +#define OpCode_longintdict 29 /* 32-bit integer, All */ +#define OpCode_BCD 30 /* Real number, CFF2 Top/FD */ +#define OpCode_reserved31 31 + +/* 1-byte integers */ +#define OpCode_OneByteIntFirst 32 /* All. beginning of the range of first byte ints */ +#define OpCode_OneByteIntLast 246 /* All. ending of the range of first byte int */ + +/* 2-byte integers */ +#define OpCode_TwoBytePosInt0 247 /* All. first byte of two byte positive int (+108 to +1131) */ +#define OpCode_TwoBytePosInt1 248 +#define OpCode_TwoBytePosInt2 249 +#define OpCode_TwoBytePosInt3 250 + +#define OpCode_TwoByteNegInt0 251 /* All. first byte of two byte negative int (-1131 to -108) */ +#define OpCode_TwoByteNegInt1 252 +#define OpCode_TwoByteNegInt2 253 +#define OpCode_TwoByteNegInt3 254 + +/* Two byte escape operators 12, (0-41) */ +#define OpCode_ESC_Base 256 +#define Make_OpCode_ESC(byte2) ((op_code_t)(OpCode_ESC_Base + (byte2))) + +inline op_code_t Unmake_OpCode_ESC (op_code_t op) { return (op_code_t)(op - OpCode_ESC_Base); } +inline bool Is_OpCode_ESC (op_code_t op) { return op >= OpCode_ESC_Base; } +inline unsigned int OpCode_Size (op_code_t op) { return Is_OpCode_ESC (op) ? 2: 1; } + +#define OpCode_Copyright Make_OpCode_ESC(0) /* CFF Top */ +#define OpCode_isFixedPitch Make_OpCode_ESC(1) /* CFF Top (false) */ +#define OpCode_ItalicAngle Make_OpCode_ESC(2) /* CFF Top (0) */ +#define OpCode_UnderlinePosition Make_OpCode_ESC(3) /* CFF Top (-100) */ +#define OpCode_UnderlineThickness Make_OpCode_ESC(4) /* CFF Top (50) */ +#define OpCode_PaintType Make_OpCode_ESC(5) /* CFF Top (0) */ +#define OpCode_CharstringType Make_OpCode_ESC(6) /* CFF Top (2) */ +#define OpCode_FontMatrix Make_OpCode_ESC(7) /* CFF Top, CFF2 Top (.001 0 0 .001 0 0)*/ +#define OpCode_StrokeWidth Make_OpCode_ESC(8) /* CFF Top (0) */ +#define OpCode_BlueScale Make_OpCode_ESC(9) /* CFF Private, CFF2 Private (0.039625) */ +#define OpCode_BlueShift Make_OpCode_ESC(10) /* CFF Private, CFF2 Private (7) */ +#define OpCode_BlueFuzz Make_OpCode_ESC(11) /* CFF Private, CFF2 Private (1) */ +#define OpCode_StemSnapH Make_OpCode_ESC(12) /* CFF Private, CFF2 Private */ +#define OpCode_StemSnapV Make_OpCode_ESC(13) /* CFF Private, CFF2 Private */ +#define OpCode_ForceBold Make_OpCode_ESC(14) /* CFF Private (false) */ +#define OpCode_reservedESC15 Make_OpCode_ESC(15) +#define OpCode_reservedESC16 Make_OpCode_ESC(16) +#define OpCode_LanguageGroup Make_OpCode_ESC(17) /* CFF Private, CFF2 Private (0) */ +#define OpCode_ExpansionFactor Make_OpCode_ESC(18) /* CFF Private, CFF2 Private (0.06) */ +#define OpCode_initialRandomSeed Make_OpCode_ESC(19) /* CFF Private (0) */ +#define OpCode_SyntheticBase Make_OpCode_ESC(20) /* CFF Top */ +#define OpCode_PostScript Make_OpCode_ESC(21) /* CFF Top */ +#define OpCode_BaseFontName Make_OpCode_ESC(22) /* CFF Top */ +#define OpCode_BaseFontBlend Make_OpCode_ESC(23) /* CFF Top */ +#define OpCode_reservedESC24 Make_OpCode_ESC(24) +#define OpCode_reservedESC25 Make_OpCode_ESC(25) +#define OpCode_reservedESC26 Make_OpCode_ESC(26) +#define OpCode_reservedESC27 Make_OpCode_ESC(27) +#define OpCode_reservedESC28 Make_OpCode_ESC(28) +#define OpCode_reservedESC29 Make_OpCode_ESC(29) +#define OpCode_ROS Make_OpCode_ESC(30) /* CFF Top_CID */ +#define OpCode_CIDFontVersion Make_OpCode_ESC(31) /* CFF Top_CID (0) */ +#define OpCode_CIDFontRevision Make_OpCode_ESC(32) /* CFF Top_CID (0) */ +#define OpCode_CIDFontType Make_OpCode_ESC(33) /* CFF Top_CID (0) */ +#define OpCode_CIDCount Make_OpCode_ESC(34) /* CFF Top_CID (8720) */ +#define OpCode_UIDBase Make_OpCode_ESC(35) /* CFF Top_CID */ +#define OpCode_FDArray Make_OpCode_ESC(36) /* CFF Top_CID, CFF2 Top */ +#define OpCode_FDSelect Make_OpCode_ESC(37) /* CFF Top_CID, CFF2 Top */ +#define OpCode_FontName Make_OpCode_ESC(38) /* CFF Top_CID */ + + +/* === CharString operators === */ + +#define OpCode_hstem 1 /* CFF, CFF2 */ +#define OpCode_Reserved2 2 +#define OpCode_vstem 3 /* CFF, CFF2 */ +#define OpCode_vmoveto 4 /* CFF, CFF2 */ +#define OpCode_rlineto 5 /* CFF, CFF2 */ +#define OpCode_hlineto 6 /* CFF, CFF2 */ +#define OpCode_vlineto 7 /* CFF, CFF2 */ +#define OpCode_rrcurveto 8 /* CFF, CFF2 */ +#define OpCode_Reserved9 9 +#define OpCode_callsubr 10 /* CFF, CFF2 */ +#define OpCode_return 11 /* CFF */ +//#define OpCode_escape 12 /* CFF, CFF2 */ +#define OpCode_Reserved13 13 +#define OpCode_endchar 14 /* CFF */ +#define OpCode_vsindexcs 15 /* CFF2 */ +#define OpCode_blendcs 16 /* CFF2 */ +#define OpCode_Reserved17 17 +#define OpCode_hstemhm 18 /* CFF, CFF2 */ +#define OpCode_hintmask 19 /* CFF, CFF2 */ +#define OpCode_cntrmask 20 /* CFF, CFF2 */ +#define OpCode_rmoveto 21 /* CFF, CFF2 */ +#define OpCode_hmoveto 22 /* CFF, CFF2 */ +#define OpCode_vstemhm 23 /* CFF, CFF2 */ +#define OpCode_rcurveline 24 /* CFF, CFF2 */ +#define OpCode_rlinecurve 25 /* CFF, CFF2 */ +#define OpCode_vvcurveto 26 /* CFF, CFF2 */ +#define OpCode_hhcurveto 27 /* CFF, CFF2 */ +//#define OpCode_shortint 28 /* CFF, CFF2 */ +#define OpCode_callgsubr 29 /* CFF, CFF2 */ +#define OpCode_vhcurveto 30 /* CFF, CFF2 */ +#define OpCode_hvcurveto 31 /* CFF, CFF2 */ + +#define OpCode_fixedcs 255 /* 32-bit fixed */ + +/* Two byte escape operators 12, (0-41) */ +#define OpCode_dotsection Make_OpCode_ESC(0) /* CFF (obsoleted) */ +#define OpCode_ReservedESC1 Make_OpCode_ESC(1) +#define OpCode_ReservedESC2 Make_OpCode_ESC(2) +#define OpCode_and Make_OpCode_ESC(3) /* CFF */ +#define OpCode_or Make_OpCode_ESC(4) /* CFF */ +#define OpCode_not Make_OpCode_ESC(5) /* CFF */ +#define OpCode_ReservedESC6 Make_OpCode_ESC(6) +#define OpCode_ReservedESC7 Make_OpCode_ESC(7) +#define OpCode_ReservedESC8 Make_OpCode_ESC(8) +#define OpCode_abs Make_OpCode_ESC(9) /* CFF */ +#define OpCode_add Make_OpCode_ESC(10) /* CFF */ +#define OpCode_sub Make_OpCode_ESC(11) /* CFF */ +#define OpCode_div Make_OpCode_ESC(12) /* CFF */ +#define OpCode_ReservedESC13 Make_OpCode_ESC(13) +#define OpCode_neg Make_OpCode_ESC(14) /* CFF */ +#define OpCode_eq Make_OpCode_ESC(15) /* CFF */ +#define OpCode_ReservedESC16 Make_OpCode_ESC(16) +#define OpCode_ReservedESC17 Make_OpCode_ESC(17) +#define OpCode_drop Make_OpCode_ESC(18) /* CFF */ +#define OpCode_ReservedESC19 Make_OpCode_ESC(19) +#define OpCode_put Make_OpCode_ESC(20) /* CFF */ +#define OpCode_get Make_OpCode_ESC(21) /* CFF */ +#define OpCode_ifelse Make_OpCode_ESC(22) /* CFF */ +#define OpCode_random Make_OpCode_ESC(23) /* CFF */ +#define OpCode_mul Make_OpCode_ESC(24) /* CFF */ +//#define OpCode_reservedESC25 Make_OpCode_ESC(25) +#define OpCode_sqrt Make_OpCode_ESC(26) /* CFF */ +#define OpCode_dup Make_OpCode_ESC(27) /* CFF */ +#define OpCode_exch Make_OpCode_ESC(28) /* CFF */ +#define OpCode_index Make_OpCode_ESC(29) /* CFF */ +#define OpCode_roll Make_OpCode_ESC(30) /* CFF */ +#define OpCode_reservedESC31 Make_OpCode_ESC(31) +#define OpCode_reservedESC32 Make_OpCode_ESC(32) +#define OpCode_reservedESC33 Make_OpCode_ESC(33) +#define OpCode_hflex Make_OpCode_ESC(34) /* CFF, CFF2 */ +#define OpCode_flex Make_OpCode_ESC(35) /* CFF, CFF2 */ +#define OpCode_hflex1 Make_OpCode_ESC(36) /* CFF, CFF2 */ +#define OpCode_flex1 Make_OpCode_ESC(37) /* CFF, CFF2 */ + + +#define OpCode_Invalid 0xFFFFu + + +struct number_t +{ + void init () { set_real (0.0); } + void fini () {} + + void set_int (int v) { value = (double) v; } + int to_int () const { return (int) value; } + + void set_fixed (int32_t v) { value = v / 65536.0; } + int32_t to_fixed () const { return (int32_t) (value * 65536.0); } + + void set_real (double v) { value = v; } + double to_real () const { return value; } + + int ceil () const { return (int) ::ceil (value); } + int floor () const { return (int) ::floor (value); } + + bool in_int_range () const + { return ((double) (int16_t) to_int () == value); } + + bool operator > (const number_t &n) const { return value > n.to_real (); } + bool operator < (const number_t &n) const { return n > *this; } + bool operator >= (const number_t &n) const { return !(*this < n); } + bool operator <= (const number_t &n) const { return !(*this > n); } + + const number_t &operator += (const number_t &n) + { + set_real (to_real () + n.to_real ()); + + return *this; + } + + protected: + double value; +}; + +/* byte string */ +struct UnsizedByteStr : UnsizedArrayOf +{ + // encode 2-byte int (Dict/CharString) or 4-byte int (Dict) + template + static bool serialize_int (hb_serialize_context_t *c, op_code_t intOp, int value) + { + TRACE_SERIALIZE (this); + + if (unlikely ((value < minVal || value > maxVal))) + return_trace (false); + + HBUINT8 *p = c->allocate_size (1); + if (unlikely (p == nullptr)) return_trace (false); + *p = intOp; + + INTTYPE *ip = c->allocate_size (INTTYPE::static_size); + if (unlikely (ip == nullptr)) return_trace (false); + *ip = (unsigned int) value; + + return_trace (true); + } + + static bool serialize_int4 (hb_serialize_context_t *c, int value) + { return serialize_int (c, OpCode_longintdict, value); } + + static bool serialize_int2 (hb_serialize_context_t *c, int value) + { return serialize_int (c, OpCode_shortint, value); } + + /* Defining null_size allows a Null object may be created. Should be safe because: + * A descendent struct Dict uses a Null pointer to indicate a missing table, + * checked before access. + * byte_str_t, a wrapper struct pairing a byte pointer along with its length, always + * checks the length before access. A Null pointer is used as the initial pointer + * along with zero length by the default ctor. + */ + DEFINE_SIZE_MIN(0); +}; + +/* Holder of a section of byte string within a CFFIndex entry */ +struct byte_str_t : hb_ubytes_t +{ + byte_str_t () + : hb_ubytes_t () {} + byte_str_t (const UnsizedByteStr& s, unsigned int l) + : hb_ubytes_t ((const unsigned char*)&s, l) {} + byte_str_t (const unsigned char *s, unsigned int l) + : hb_ubytes_t (s, l) {} + byte_str_t (const hb_ubytes_t &ub) /* conversion from hb_ubytes_t */ + : hb_ubytes_t (ub) {} + + /* sub-string */ + byte_str_t sub_str (unsigned int offset, unsigned int len_) const + { return byte_str_t (hb_ubytes_t::sub_array (offset, len_)); } + + bool check_limit (unsigned int offset, unsigned int count) const + { return (offset + count <= length); } +}; + +/* A byte string associated with the current offset and an error condition */ +struct byte_str_ref_t +{ + byte_str_ref_t () { init (); } + + void init () + { + str = byte_str_t (); + offset = 0; + error = false; + } + + void fini () {} + + byte_str_ref_t (const byte_str_t &str_, unsigned int offset_ = 0) + : str (str_), offset (offset_), error (false) {} + + void reset (const byte_str_t &str_, unsigned int offset_ = 0) + { + str = str_; + offset = offset_; + error = false; + } + + const unsigned char& operator [] (int i) { + if (unlikely ((unsigned int) (offset + i) >= str.length)) + { + set_error (); + return Null (unsigned char); + } + return str[offset + i]; + } + + /* Conversion to byte_str_t */ + operator byte_str_t () const { return str.sub_str (offset, str.length - offset); } + + byte_str_t sub_str (unsigned int offset_, unsigned int len_) const + { return str.sub_str (offset_, len_); } + + bool avail (unsigned int count=1) const + { return (!in_error () && str.check_limit (offset, count)); } + void inc (unsigned int count=1) + { + if (likely (!in_error () && (offset <= str.length) && (offset + count <= str.length))) + { + offset += count; + } + else + { + offset = str.length; + set_error (); + } + } + + void set_error () { error = true; } + bool in_error () const { return error; } + + byte_str_t str; + unsigned int offset; /* beginning of the sub-string within str */ + + protected: + bool error; +}; + +typedef hb_vector_t byte_str_array_t; + +/* stack */ +template +struct cff_stack_t +{ + void init () + { + error = false; + count = 0; + elements.init (); + elements.resize (kSizeLimit); + for (unsigned int i = 0; i < elements.length; i++) + elements[i].init (); + } + void fini () { elements.fini_deep (); } + + ELEM& operator [] (unsigned int i) + { + if (unlikely (i >= count)) set_error (); + return elements[i]; + } + + void push (const ELEM &v) + { + if (likely (count < elements.length)) + elements[count++] = v; + else + set_error (); + } + ELEM &push () + { + if (likely (count < elements.length)) + return elements[count++]; + else + { + set_error (); + return Crap(ELEM); + } + } + + ELEM& pop () + { + if (likely (count > 0)) + return elements[--count]; + else + { + set_error (); + return Crap(ELEM); + } + } + void pop (unsigned int n) + { + if (likely (count >= n)) + count -= n; + else + set_error (); + } + + const ELEM& peek () + { + if (unlikely (count < 0)) + { + set_error (); + return Null(ELEM); + } + return elements[count - 1]; + } + + void unpop () + { + if (likely (count < elements.length)) + count++; + else + set_error (); + } + + void clear () { count = 0; } + + bool in_error () const { return (error || elements.in_error ()); } + void set_error () { error = true; } + + unsigned int get_count () const { return count; } + bool is_empty () const { return !count; } + + static constexpr unsigned kSizeLimit = LIMIT; + + protected: + bool error; + unsigned int count; + hb_vector_t elements; +}; + +/* argument stack */ +template +struct arg_stack_t : cff_stack_t +{ + void push_int (int v) + { + ARG &n = S::push (); + n.set_int (v); + } + + void push_fixed (int32_t v) + { + ARG &n = S::push (); + n.set_fixed (v); + } + + void push_real (double v) + { + ARG &n = S::push (); + n.set_real (v); + } + + ARG& pop_num () { return this->pop (); } + + int pop_int () { return this->pop ().to_int (); } + + unsigned int pop_uint () + { + int i = pop_int (); + if (unlikely (i < 0)) + { + i = 0; + S::set_error (); + } + return (unsigned) i; + } + + void push_longint_from_substr (byte_str_ref_t& str_ref) + { + push_int ((str_ref[0] << 24) | (str_ref[1] << 16) | (str_ref[2] << 8) | (str_ref[3])); + str_ref.inc (4); + } + + bool push_fixed_from_substr (byte_str_ref_t& str_ref) + { + if (unlikely (!str_ref.avail (4))) + return false; + push_fixed ((int32_t)*(const HBUINT32*)&str_ref[0]); + str_ref.inc (4); + return true; + } + + hb_array_t get_subarray (unsigned int start) const + { return S::elements.sub_array (start); } + + private: + typedef cff_stack_t S; +}; + +/* an operator prefixed by its operands in a byte string */ +struct op_str_t +{ + void init () {} + void fini () {} + + op_code_t op; + byte_str_t str; +}; + +/* base of OP_SERIALIZER */ +struct op_serializer_t +{ + protected: + bool copy_opstr (hb_serialize_context_t *c, const op_str_t& opstr) const + { + TRACE_SERIALIZE (this); + + HBUINT8 *d = c->allocate_size (opstr.str.length); + if (unlikely (d == nullptr)) return_trace (false); + memcpy (d, &opstr.str[0], opstr.str.length); + return_trace (true); + } +}; + +template +struct parsed_values_t +{ + void init () + { + opStart = 0; + values.init (); + } + void fini () { values.fini_deep (); } + + void add_op (op_code_t op, const byte_str_ref_t& str_ref = byte_str_ref_t ()) + { + VAL *val = values.push (); + val->op = op; + val->str = str_ref.str.sub_str (opStart, str_ref.offset - opStart); + opStart = str_ref.offset; + } + + void add_op (op_code_t op, const byte_str_ref_t& str_ref, const VAL &v) + { + VAL *val = values.push (v); + val->op = op; + val->str = str_ref.sub_str ( opStart, str_ref.offset - opStart); + opStart = str_ref.offset; + } + + bool has_op (op_code_t op) const + { + for (unsigned int i = 0; i < get_count (); i++) + if (get_value (i).op == op) return true; + return false; + } + + unsigned get_count () const { return values.length; } + const VAL &get_value (unsigned int i) const { return values[i]; } + const VAL &operator [] (unsigned int i) const { return get_value (i); } + + unsigned int opStart; + hb_vector_t values; +}; + +template +struct interp_env_t +{ + void init (const byte_str_t &str_) + { + str_ref.reset (str_); + argStack.init (); + error = false; + } + void fini () { argStack.fini (); } + + bool in_error () const + { return error || str_ref.in_error () || argStack.in_error (); } + + void set_error () { error = true; } + + op_code_t fetch_op () + { + op_code_t op = OpCode_Invalid; + if (unlikely (!str_ref.avail ())) + return OpCode_Invalid; + op = (op_code_t)(unsigned char)str_ref[0]; + if (op == OpCode_escape) { + if (unlikely (!str_ref.avail ())) + return OpCode_Invalid; + op = Make_OpCode_ESC(str_ref[1]); + str_ref.inc (); + } + str_ref.inc (); + return op; + } + + const ARG& eval_arg (unsigned int i) { return argStack[i]; } + + ARG& pop_arg () { return argStack.pop (); } + void pop_n_args (unsigned int n) { argStack.pop (n); } + + void clear_args () { pop_n_args (argStack.get_count ()); } + + byte_str_ref_t + str_ref; + arg_stack_t + argStack; + protected: + bool error; +}; + +typedef interp_env_t<> num_interp_env_t; + +template +struct opset_t +{ + static void process_op (op_code_t op, interp_env_t& env) + { + switch (op) { + case OpCode_shortint: + env.argStack.push_int ((int16_t)((env.str_ref[0] << 8) | env.str_ref[1])); + env.str_ref.inc (2); + break; + + case OpCode_TwoBytePosInt0: case OpCode_TwoBytePosInt1: + case OpCode_TwoBytePosInt2: case OpCode_TwoBytePosInt3: + env.argStack.push_int ((int16_t)((op - OpCode_TwoBytePosInt0) * 256 + env.str_ref[0] + 108)); + env.str_ref.inc (); + break; + + case OpCode_TwoByteNegInt0: case OpCode_TwoByteNegInt1: + case OpCode_TwoByteNegInt2: case OpCode_TwoByteNegInt3: + env.argStack.push_int ((-(int16_t)(op - OpCode_TwoByteNegInt0) * 256 - env.str_ref[0] - 108)); + env.str_ref.inc (); + break; + + default: + /* 1-byte integer */ + if (likely ((OpCode_OneByteIntFirst <= op) && (op <= OpCode_OneByteIntLast))) + { + env.argStack.push_int ((int)op - 139); + } else { + /* invalid unknown operator */ + env.clear_args (); + env.set_error (); + } + break; + } + } +}; + +template +struct interpreter_t +{ + ~interpreter_t() { fini (); } + + void fini () { env.fini (); } + + ENV env; +}; + +} /* namespace CFF */ + +#endif /* HB_CFF_INTERP_COMMON_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-cff-interp-cs-common.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-cff-interp-cs-common.hh new file mode 100644 index 000000000..d9ad4d0d6 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-cff-interp-cs-common.hh @@ -0,0 +1,906 @@ +/* + * Copyright © 2018 Adobe Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Adobe Author(s): Michiharu Ariza + */ +#ifndef HB_CFF_INTERP_CS_COMMON_HH +#define HB_CFF_INTERP_CS_COMMON_HH + +#include "hb.hh" +#include "hb-cff-interp-common.hh" + +namespace CFF { + +using namespace OT; + +enum cs_type_t { + CSType_CharString, + CSType_GlobalSubr, + CSType_LocalSubr +}; + +struct call_context_t +{ + void init (const byte_str_ref_t substr_=byte_str_ref_t (), cs_type_t type_=CSType_CharString, unsigned int subr_num_=0) + { + str_ref = substr_; + type = type_; + subr_num = subr_num_; + } + + void fini () {} + + byte_str_ref_t str_ref; + cs_type_t type; + unsigned int subr_num; +}; + +/* call stack */ +const unsigned int kMaxCallLimit = 10; +struct call_stack_t : cff_stack_t {}; + +template +struct biased_subrs_t +{ + void init (const SUBRS *subrs_) + { + subrs = subrs_; + unsigned int nSubrs = get_count (); + if (nSubrs < 1240) + bias = 107; + else if (nSubrs < 33900) + bias = 1131; + else + bias = 32768; + } + + void fini () {} + + unsigned int get_count () const { return (subrs == nullptr) ? 0 : subrs->count; } + unsigned int get_bias () const { return bias; } + + byte_str_t operator [] (unsigned int index) const + { + if (unlikely ((subrs == nullptr) || index >= subrs->count)) + return Null(byte_str_t); + else + return (*subrs)[index]; + } + + protected: + unsigned int bias; + const SUBRS *subrs; +}; + +struct point_t +{ + void init () + { + x.init (); + y.init (); + } + + void set_int (int _x, int _y) + { + x.set_int (_x); + y.set_int (_y); + } + + void move_x (const number_t &dx) { x += dx; } + void move_y (const number_t &dy) { y += dy; } + void move (const number_t &dx, const number_t &dy) { move_x (dx); move_y (dy); } + void move (const point_t &d) { move_x (d.x); move_y (d.y); } + + number_t x; + number_t y; +}; + +template +struct cs_interp_env_t : interp_env_t +{ + void init (const byte_str_t &str, const SUBRS *globalSubrs_, const SUBRS *localSubrs_) + { + interp_env_t::init (str); + + context.init (str, CSType_CharString); + seen_moveto = true; + seen_hintmask = false; + hstem_count = 0; + vstem_count = 0; + hintmask_size = 0; + pt.init (); + callStack.init (); + globalSubrs.init (globalSubrs_); + localSubrs.init (localSubrs_); + } + void fini () + { + interp_env_t::fini (); + + callStack.fini (); + globalSubrs.fini (); + localSubrs.fini (); + } + + bool in_error () const + { + return callStack.in_error () || SUPER::in_error (); + } + + bool pop_subr_num (const biased_subrs_t& biasedSubrs, unsigned int &subr_num) + { + subr_num = 0; + int n = SUPER::argStack.pop_int (); + n += biasedSubrs.get_bias (); + if (unlikely ((n < 0) || ((unsigned int)n >= biasedSubrs.get_count ()))) + return false; + + subr_num = (unsigned int)n; + return true; + } + + void call_subr (const biased_subrs_t& biasedSubrs, cs_type_t type) + { + unsigned int subr_num = 0; + + if (unlikely (!pop_subr_num (biasedSubrs, subr_num) + || callStack.get_count () >= kMaxCallLimit)) + { + SUPER::set_error (); + return; + } + context.str_ref = SUPER::str_ref; + callStack.push (context); + + context.init ( biasedSubrs[subr_num], type, subr_num); + SUPER::str_ref = context.str_ref; + } + + void return_from_subr () + { + if (unlikely (SUPER::str_ref.in_error ())) + SUPER::set_error (); + context = callStack.pop (); + SUPER::str_ref = context.str_ref; + } + + void determine_hintmask_size () + { + if (!seen_hintmask) + { + vstem_count += SUPER::argStack.get_count() / 2; + hintmask_size = (hstem_count + vstem_count + 7) >> 3; + seen_hintmask = true; + } + } + + void set_endchar (bool endchar_flag_) { endchar_flag = endchar_flag_; } + bool is_endchar () const { return endchar_flag; } + + const number_t &get_x () const { return pt.x; } + const number_t &get_y () const { return pt.y; } + const point_t &get_pt () const { return pt; } + + void moveto (const point_t &pt_ ) { pt = pt_; } + + public: + call_context_t context; + bool endchar_flag; + bool seen_moveto; + bool seen_hintmask; + + unsigned int hstem_count; + unsigned int vstem_count; + unsigned int hintmask_size; + call_stack_t callStack; + biased_subrs_t globalSubrs; + biased_subrs_t localSubrs; + + private: + point_t pt; + + typedef interp_env_t SUPER; +}; + +template +struct path_procs_null_t +{ + static void rmoveto (ENV &env, PARAM& param) {} + static void hmoveto (ENV &env, PARAM& param) {} + static void vmoveto (ENV &env, PARAM& param) {} + static void rlineto (ENV &env, PARAM& param) {} + static void hlineto (ENV &env, PARAM& param) {} + static void vlineto (ENV &env, PARAM& param) {} + static void rrcurveto (ENV &env, PARAM& param) {} + static void rcurveline (ENV &env, PARAM& param) {} + static void rlinecurve (ENV &env, PARAM& param) {} + static void vvcurveto (ENV &env, PARAM& param) {} + static void hhcurveto (ENV &env, PARAM& param) {} + static void vhcurveto (ENV &env, PARAM& param) {} + static void hvcurveto (ENV &env, PARAM& param) {} + static void moveto (ENV &env, PARAM& param, const point_t &pt) {} + static void line (ENV &env, PARAM& param, const point_t &pt1) {} + static void curve (ENV &env, PARAM& param, const point_t &pt1, const point_t &pt2, const point_t &pt3) {} + static void hflex (ENV &env, PARAM& param) {} + static void flex (ENV &env, PARAM& param) {} + static void hflex1 (ENV &env, PARAM& param) {} + static void flex1 (ENV &env, PARAM& param) {} +}; + +template > +struct cs_opset_t : opset_t +{ + static void process_op (op_code_t op, ENV &env, PARAM& param) + { + switch (op) { + + case OpCode_return: + env.return_from_subr (); + break; + case OpCode_endchar: + OPSET::check_width (op, env, param); + env.set_endchar (true); + OPSET::flush_args_and_op (op, env, param); + break; + + case OpCode_fixedcs: + env.argStack.push_fixed_from_substr (env.str_ref); + break; + + case OpCode_callsubr: + env.call_subr (env.localSubrs, CSType_LocalSubr); + break; + + case OpCode_callgsubr: + env.call_subr (env.globalSubrs, CSType_GlobalSubr); + break; + + case OpCode_hstem: + case OpCode_hstemhm: + OPSET::check_width (op, env, param); + OPSET::process_hstem (op, env, param); + break; + case OpCode_vstem: + case OpCode_vstemhm: + OPSET::check_width (op, env, param); + OPSET::process_vstem (op, env, param); + break; + case OpCode_hintmask: + case OpCode_cntrmask: + OPSET::check_width (op, env, param); + OPSET::process_hintmask (op, env, param); + break; + case OpCode_rmoveto: + OPSET::check_width (op, env, param); + PATH::rmoveto (env, param); + OPSET::process_post_move (op, env, param); + break; + case OpCode_hmoveto: + OPSET::check_width (op, env, param); + PATH::hmoveto (env, param); + OPSET::process_post_move (op, env, param); + break; + case OpCode_vmoveto: + OPSET::check_width (op, env, param); + PATH::vmoveto (env, param); + OPSET::process_post_move (op, env, param); + break; + case OpCode_rlineto: + PATH::rlineto (env, param); + process_post_path (op, env, param); + break; + case OpCode_hlineto: + PATH::hlineto (env, param); + process_post_path (op, env, param); + break; + case OpCode_vlineto: + PATH::vlineto (env, param); + process_post_path (op, env, param); + break; + case OpCode_rrcurveto: + PATH::rrcurveto (env, param); + process_post_path (op, env, param); + break; + case OpCode_rcurveline: + PATH::rcurveline (env, param); + process_post_path (op, env, param); + break; + case OpCode_rlinecurve: + PATH::rlinecurve (env, param); + process_post_path (op, env, param); + break; + case OpCode_vvcurveto: + PATH::vvcurveto (env, param); + process_post_path (op, env, param); + break; + case OpCode_hhcurveto: + PATH::hhcurveto (env, param); + process_post_path (op, env, param); + break; + case OpCode_vhcurveto: + PATH::vhcurveto (env, param); + process_post_path (op, env, param); + break; + case OpCode_hvcurveto: + PATH::hvcurveto (env, param); + process_post_path (op, env, param); + break; + + case OpCode_hflex: + PATH::hflex (env, param); + OPSET::process_post_flex (op, env, param); + break; + + case OpCode_flex: + PATH::flex (env, param); + OPSET::process_post_flex (op, env, param); + break; + + case OpCode_hflex1: + PATH::hflex1 (env, param); + OPSET::process_post_flex (op, env, param); + break; + + case OpCode_flex1: + PATH::flex1 (env, param); + OPSET::process_post_flex (op, env, param); + break; + + default: + SUPER::process_op (op, env); + break; + } + } + + static void process_hstem (op_code_t op, ENV &env, PARAM& param) + { + env.hstem_count += env.argStack.get_count () / 2; + OPSET::flush_args_and_op (op, env, param); + } + + static void process_vstem (op_code_t op, ENV &env, PARAM& param) + { + env.vstem_count += env.argStack.get_count () / 2; + OPSET::flush_args_and_op (op, env, param); + } + + static void process_hintmask (op_code_t op, ENV &env, PARAM& param) + { + env.determine_hintmask_size (); + if (likely (env.str_ref.avail (env.hintmask_size))) + { + OPSET::flush_hintmask (op, env, param); + env.str_ref.inc (env.hintmask_size); + } + } + + static void process_post_flex (op_code_t op, ENV &env, PARAM& param) + { + OPSET::flush_args_and_op (op, env, param); + } + + static void check_width (op_code_t op, ENV &env, PARAM& param) + {} + + static void process_post_move (op_code_t op, ENV &env, PARAM& param) + { + if (!env.seen_moveto) + { + env.determine_hintmask_size (); + env.seen_moveto = true; + } + OPSET::flush_args_and_op (op, env, param); + } + + static void process_post_path (op_code_t op, ENV &env, PARAM& param) + { + OPSET::flush_args_and_op (op, env, param); + } + + static void flush_args_and_op (op_code_t op, ENV &env, PARAM& param) + { + OPSET::flush_args (env, param); + OPSET::flush_op (op, env, param); + } + + static void flush_args (ENV &env, PARAM& param) + { + env.pop_n_args (env.argStack.get_count ()); + } + + static void flush_op (op_code_t op, ENV &env, PARAM& param) + { + } + + static void flush_hintmask (op_code_t op, ENV &env, PARAM& param) + { + OPSET::flush_args_and_op (op, env, param); + } + + static bool is_number_op (op_code_t op) + { + switch (op) + { + case OpCode_shortint: + case OpCode_fixedcs: + case OpCode_TwoBytePosInt0: case OpCode_TwoBytePosInt1: + case OpCode_TwoBytePosInt2: case OpCode_TwoBytePosInt3: + case OpCode_TwoByteNegInt0: case OpCode_TwoByteNegInt1: + case OpCode_TwoByteNegInt2: case OpCode_TwoByteNegInt3: + return true; + + default: + /* 1-byte integer */ + return (OpCode_OneByteIntFirst <= op) && (op <= OpCode_OneByteIntLast); + } + } + + protected: + typedef opset_t SUPER; +}; + +template +struct path_procs_t +{ + static void rmoveto (ENV &env, PARAM& param) + { + point_t pt1 = env.get_pt (); + const number_t &dy = env.pop_arg (); + const number_t &dx = env.pop_arg (); + pt1.move (dx, dy); + PATH::moveto (env, param, pt1); + } + + static void hmoveto (ENV &env, PARAM& param) + { + point_t pt1 = env.get_pt (); + pt1.move_x (env.pop_arg ()); + PATH::moveto (env, param, pt1); + } + + static void vmoveto (ENV &env, PARAM& param) + { + point_t pt1 = env.get_pt (); + pt1.move_y (env.pop_arg ()); + PATH::moveto (env, param, pt1); + } + + static void rlineto (ENV &env, PARAM& param) + { + for (unsigned int i = 0; i + 2 <= env.argStack.get_count (); i += 2) + { + point_t pt1 = env.get_pt (); + pt1.move (env.eval_arg (i), env.eval_arg (i+1)); + PATH::line (env, param, pt1); + } + } + + static void hlineto (ENV &env, PARAM& param) + { + point_t pt1; + unsigned int i = 0; + for (; i + 2 <= env.argStack.get_count (); i += 2) + { + pt1 = env.get_pt (); + pt1.move_x (env.eval_arg (i)); + PATH::line (env, param, pt1); + pt1.move_y (env.eval_arg (i+1)); + PATH::line (env, param, pt1); + } + if (i < env.argStack.get_count ()) + { + pt1 = env.get_pt (); + pt1.move_x (env.eval_arg (i)); + PATH::line (env, param, pt1); + } + } + + static void vlineto (ENV &env, PARAM& param) + { + point_t pt1; + unsigned int i = 0; + for (; i + 2 <= env.argStack.get_count (); i += 2) + { + pt1 = env.get_pt (); + pt1.move_y (env.eval_arg (i)); + PATH::line (env, param, pt1); + pt1.move_x (env.eval_arg (i+1)); + PATH::line (env, param, pt1); + } + if (i < env.argStack.get_count ()) + { + pt1 = env.get_pt (); + pt1.move_y (env.eval_arg (i)); + PATH::line (env, param, pt1); + } + } + + static void rrcurveto (ENV &env, PARAM& param) + { + for (unsigned int i = 0; i + 6 <= env.argStack.get_count (); i += 6) + { + point_t pt1 = env.get_pt (); + pt1.move (env.eval_arg (i), env.eval_arg (i+1)); + point_t pt2 = pt1; + pt2.move (env.eval_arg (i+2), env.eval_arg (i+3)); + point_t pt3 = pt2; + pt3.move (env.eval_arg (i+4), env.eval_arg (i+5)); + PATH::curve (env, param, pt1, pt2, pt3); + } + } + + static void rcurveline (ENV &env, PARAM& param) + { + unsigned int i = 0; + for (; i + 6 <= env.argStack.get_count (); i += 6) + { + point_t pt1 = env.get_pt (); + pt1.move (env.eval_arg (i), env.eval_arg (i+1)); + point_t pt2 = pt1; + pt2.move (env.eval_arg (i+2), env.eval_arg (i+3)); + point_t pt3 = pt2; + pt3.move (env.eval_arg (i+4), env.eval_arg (i+5)); + PATH::curve (env, param, pt1, pt2, pt3); + } + for (; i + 2 <= env.argStack.get_count (); i += 2) + { + point_t pt1 = env.get_pt (); + pt1.move (env.eval_arg (i), env.eval_arg (i+1)); + PATH::line (env, param, pt1); + } + } + + static void rlinecurve (ENV &env, PARAM& param) + { + unsigned int i = 0; + unsigned int line_limit = (env.argStack.get_count () % 6); + for (; i + 2 <= line_limit; i += 2) + { + point_t pt1 = env.get_pt (); + pt1.move (env.eval_arg (i), env.eval_arg (i+1)); + PATH::line (env, param, pt1); + } + for (; i + 6 <= env.argStack.get_count (); i += 6) + { + point_t pt1 = env.get_pt (); + pt1.move (env.eval_arg (i), env.eval_arg (i+1)); + point_t pt2 = pt1; + pt2.move (env.eval_arg (i+2), env.eval_arg (i+3)); + point_t pt3 = pt2; + pt3.move (env.eval_arg (i+4), env.eval_arg (i+5)); + PATH::curve (env, param, pt1, pt2, pt3); + } + } + + static void vvcurveto (ENV &env, PARAM& param) + { + unsigned int i = 0; + point_t pt1 = env.get_pt (); + if ((env.argStack.get_count () & 1) != 0) + pt1.move_x (env.eval_arg (i++)); + for (; i + 4 <= env.argStack.get_count (); i += 4) + { + pt1.move_y (env.eval_arg (i)); + point_t pt2 = pt1; + pt2.move (env.eval_arg (i+1), env.eval_arg (i+2)); + point_t pt3 = pt2; + pt3.move_y (env.eval_arg (i+3)); + PATH::curve (env, param, pt1, pt2, pt3); + pt1 = env.get_pt (); + } + } + + static void hhcurveto (ENV &env, PARAM& param) + { + unsigned int i = 0; + point_t pt1 = env.get_pt (); + if ((env.argStack.get_count () & 1) != 0) + pt1.move_y (env.eval_arg (i++)); + for (; i + 4 <= env.argStack.get_count (); i += 4) + { + pt1.move_x (env.eval_arg (i)); + point_t pt2 = pt1; + pt2.move (env.eval_arg (i+1), env.eval_arg (i+2)); + point_t pt3 = pt2; + pt3.move_x (env.eval_arg (i+3)); + PATH::curve (env, param, pt1, pt2, pt3); + pt1 = env.get_pt (); + } + } + + static void vhcurveto (ENV &env, PARAM& param) + { + point_t pt1, pt2, pt3; + unsigned int i = 0; + if ((env.argStack.get_count () % 8) >= 4) + { + point_t pt1 = env.get_pt (); + pt1.move_y (env.eval_arg (i)); + point_t pt2 = pt1; + pt2.move (env.eval_arg (i+1), env.eval_arg (i+2)); + point_t pt3 = pt2; + pt3.move_x (env.eval_arg (i+3)); + i += 4; + + for (; i + 8 <= env.argStack.get_count (); i += 8) + { + PATH::curve (env, param, pt1, pt2, pt3); + pt1 = env.get_pt (); + pt1.move_x (env.eval_arg (i)); + pt2 = pt1; + pt2.move (env.eval_arg (i+1), env.eval_arg (i+2)); + pt3 = pt2; + pt3.move_y (env.eval_arg (i+3)); + PATH::curve (env, param, pt1, pt2, pt3); + + pt1 = pt3; + pt1.move_y (env.eval_arg (i+4)); + pt2 = pt1; + pt2.move (env.eval_arg (i+5), env.eval_arg (i+6)); + pt3 = pt2; + pt3.move_x (env.eval_arg (i+7)); + } + if (i < env.argStack.get_count ()) + pt3.move_y (env.eval_arg (i)); + PATH::curve (env, param, pt1, pt2, pt3); + } + else + { + for (; i + 8 <= env.argStack.get_count (); i += 8) + { + pt1 = env.get_pt (); + pt1.move_y (env.eval_arg (i)); + pt2 = pt1; + pt2.move (env.eval_arg (i+1), env.eval_arg (i+2)); + pt3 = pt2; + pt3.move_x (env.eval_arg (i+3)); + PATH::curve (env, param, pt1, pt2, pt3); + + pt1 = pt3; + pt1.move_x (env.eval_arg (i+4)); + pt2 = pt1; + pt2.move (env.eval_arg (i+5), env.eval_arg (i+6)); + pt3 = pt2; + pt3.move_y (env.eval_arg (i+7)); + if ((env.argStack.get_count () - i < 16) && ((env.argStack.get_count () & 1) != 0)) + pt3.move_x (env.eval_arg (i+8)); + PATH::curve (env, param, pt1, pt2, pt3); + } + } + } + + static void hvcurveto (ENV &env, PARAM& param) + { + point_t pt1, pt2, pt3; + unsigned int i = 0; + if ((env.argStack.get_count () % 8) >= 4) + { + point_t pt1 = env.get_pt (); + pt1.move_x (env.eval_arg (i)); + point_t pt2 = pt1; + pt2.move (env.eval_arg (i+1), env.eval_arg (i+2)); + point_t pt3 = pt2; + pt3.move_y (env.eval_arg (i+3)); + i += 4; + + for (; i + 8 <= env.argStack.get_count (); i += 8) + { + PATH::curve (env, param, pt1, pt2, pt3); + pt1 = env.get_pt (); + pt1.move_y (env.eval_arg (i)); + pt2 = pt1; + pt2.move (env.eval_arg (i+1), env.eval_arg (i+2)); + pt3 = pt2; + pt3.move_x (env.eval_arg (i+3)); + PATH::curve (env, param, pt1, pt2, pt3); + + pt1 = pt3; + pt1.move_x (env.eval_arg (i+4)); + pt2 = pt1; + pt2.move (env.eval_arg (i+5), env.eval_arg (i+6)); + pt3 = pt2; + pt3.move_y (env.eval_arg (i+7)); + } + if (i < env.argStack.get_count ()) + pt3.move_x (env.eval_arg (i)); + PATH::curve (env, param, pt1, pt2, pt3); + } + else + { + for (; i + 8 <= env.argStack.get_count (); i += 8) + { + pt1 = env.get_pt (); + pt1.move_x (env.eval_arg (i)); + pt2 = pt1; + pt2.move (env.eval_arg (i+1), env.eval_arg (i+2)); + pt3 = pt2; + pt3.move_y (env.eval_arg (i+3)); + PATH::curve (env, param, pt1, pt2, pt3); + + pt1 = pt3; + pt1.move_y (env.eval_arg (i+4)); + pt2 = pt1; + pt2.move (env.eval_arg (i+5), env.eval_arg (i+6)); + pt3 = pt2; + pt3.move_x (env.eval_arg (i+7)); + if ((env.argStack.get_count () - i < 16) && ((env.argStack.get_count () & 1) != 0)) + pt3.move_y (env.eval_arg (i+8)); + PATH::curve (env, param, pt1, pt2, pt3); + } + } + } + + /* default actions to be overridden */ + static void moveto (ENV &env, PARAM& param, const point_t &pt) + { env.moveto (pt); } + + static void line (ENV &env, PARAM& param, const point_t &pt1) + { PATH::moveto (env, param, pt1); } + + static void curve (ENV &env, PARAM& param, const point_t &pt1, const point_t &pt2, const point_t &pt3) + { PATH::moveto (env, param, pt3); } + + static void hflex (ENV &env, PARAM& param) + { + if (likely (env.argStack.get_count () == 7)) + { + point_t pt1 = env.get_pt (); + pt1.move_x (env.eval_arg (0)); + point_t pt2 = pt1; + pt2.move (env.eval_arg (1), env.eval_arg (2)); + point_t pt3 = pt2; + pt3.move_x (env.eval_arg (3)); + point_t pt4 = pt3; + pt4.move_x (env.eval_arg (4)); + point_t pt5 = pt4; + pt5.move_x (env.eval_arg (5)); + pt5.y = pt1.y; + point_t pt6 = pt5; + pt6.move_x (env.eval_arg (6)); + + curve2 (env, param, pt1, pt2, pt3, pt4, pt5, pt6); + } + else + env.set_error (); + } + + static void flex (ENV &env, PARAM& param) + { + if (likely (env.argStack.get_count () == 13)) + { + point_t pt1 = env.get_pt (); + pt1.move (env.eval_arg (0), env.eval_arg (1)); + point_t pt2 = pt1; + pt2.move (env.eval_arg (2), env.eval_arg (3)); + point_t pt3 = pt2; + pt3.move (env.eval_arg (4), env.eval_arg (5)); + point_t pt4 = pt3; + pt4.move (env.eval_arg (6), env.eval_arg (7)); + point_t pt5 = pt4; + pt5.move (env.eval_arg (8), env.eval_arg (9)); + point_t pt6 = pt5; + pt6.move (env.eval_arg (10), env.eval_arg (11)); + + curve2 (env, param, pt1, pt2, pt3, pt4, pt5, pt6); + } + else + env.set_error (); + } + + static void hflex1 (ENV &env, PARAM& param) + { + if (likely (env.argStack.get_count () == 9)) + { + point_t pt1 = env.get_pt (); + pt1.move (env.eval_arg (0), env.eval_arg (1)); + point_t pt2 = pt1; + pt2.move (env.eval_arg (2), env.eval_arg (3)); + point_t pt3 = pt2; + pt3.move_x (env.eval_arg (4)); + point_t pt4 = pt3; + pt4.move_x (env.eval_arg (5)); + point_t pt5 = pt4; + pt5.move (env.eval_arg (6), env.eval_arg (7)); + point_t pt6 = pt5; + pt6.move_x (env.eval_arg (8)); + pt6.y = env.get_pt ().y; + + curve2 (env, param, pt1, pt2, pt3, pt4, pt5, pt6); + } + else + env.set_error (); + } + + static void flex1 (ENV &env, PARAM& param) + { + if (likely (env.argStack.get_count () == 11)) + { + point_t d; + d.init (); + for (unsigned int i = 0; i < 10; i += 2) + d.move (env.eval_arg (i), env.eval_arg (i+1)); + + point_t pt1 = env.get_pt (); + pt1.move (env.eval_arg (0), env.eval_arg (1)); + point_t pt2 = pt1; + pt2.move (env.eval_arg (2), env.eval_arg (3)); + point_t pt3 = pt2; + pt3.move (env.eval_arg (4), env.eval_arg (5)); + point_t pt4 = pt3; + pt4.move (env.eval_arg (6), env.eval_arg (7)); + point_t pt5 = pt4; + pt5.move (env.eval_arg (8), env.eval_arg (9)); + point_t pt6 = pt5; + + if (fabs (d.x.to_real ()) > fabs (d.y.to_real ())) + { + pt6.move_x (env.eval_arg (10)); + pt6.y = env.get_pt ().y; + } + else + { + pt6.x = env.get_pt ().x; + pt6.move_y (env.eval_arg (10)); + } + + curve2 (env, param, pt1, pt2, pt3, pt4, pt5, pt6); + } + else + env.set_error (); + } + + protected: + static void curve2 (ENV &env, PARAM& param, + const point_t &pt1, const point_t &pt2, const point_t &pt3, + const point_t &pt4, const point_t &pt5, const point_t &pt6) + { + PATH::curve (env, param, pt1, pt2, pt3); + PATH::curve (env, param, pt4, pt5, pt6); + } +}; + +template +struct cs_interpreter_t : interpreter_t +{ + bool interpret (PARAM& param) + { + SUPER::env.set_endchar (false); + + for (;;) { + OPSET::process_op (SUPER::env.fetch_op (), SUPER::env, param); + if (unlikely (SUPER::env.in_error ())) + return false; + if (SUPER::env.is_endchar ()) + break; + } + + return true; + } + + private: + typedef interpreter_t SUPER; +}; + +} /* namespace CFF */ + +#endif /* HB_CFF_INTERP_CS_COMMON_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-cff-interp-dict-common.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-cff-interp-dict-common.hh new file mode 100644 index 000000000..1f03d8239 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-cff-interp-dict-common.hh @@ -0,0 +1,216 @@ +/* + * Copyright © 2018 Adobe Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Adobe Author(s): Michiharu Ariza + */ +#ifndef HB_CFF_INTERP_DICT_COMMON_HH +#define HB_CFF_INTERP_DICT_COMMON_HH + +#include "hb-cff-interp-common.hh" +#include +#include + +namespace CFF { + +using namespace OT; + +/* an opstr and the parsed out dict value(s) */ +struct dict_val_t : op_str_t +{ + void init () { single_val.set_int (0); } + void fini () {} + + number_t single_val; +}; + +typedef dict_val_t num_dict_val_t; + +template struct dict_values_t : parsed_values_t {}; + +template +struct top_dict_values_t : dict_values_t +{ + void init () + { + dict_values_t::init (); + charStringsOffset = 0; + FDArrayOffset = 0; + } + void fini () { dict_values_t::fini (); } + + unsigned int calculate_serialized_op_size (const OPSTR& opstr) const + { + switch (opstr.op) + { + case OpCode_CharStrings: + case OpCode_FDArray: + return OpCode_Size (OpCode_longintdict) + 4 + OpCode_Size (opstr.op); + + default: + return opstr.str.length; + } + } + + unsigned int charStringsOffset; + unsigned int FDArrayOffset; +}; + +struct dict_opset_t : opset_t +{ + static void process_op (op_code_t op, interp_env_t& env) + { + switch (op) { + case OpCode_longintdict: /* 5-byte integer */ + env.argStack.push_longint_from_substr (env.str_ref); + break; + + case OpCode_BCD: /* real number */ + env.argStack.push_real (parse_bcd (env.str_ref)); + break; + + default: + opset_t::process_op (op, env); + break; + } + } + + /* Turns CFF's BCD format into strtod understandable string */ + static double parse_bcd (byte_str_ref_t& str_ref) + { + if (unlikely (str_ref.in_error ())) return .0; + + enum Nibble { DECIMAL=10, EXP_POS, EXP_NEG, RESERVED, NEG, END }; + + char buf[32]; + unsigned char byte = 0; + for (unsigned i = 0, count = 0; count < ARRAY_LENGTH (buf); ++i, ++count) + { + unsigned nibble; + if (!(i & 1)) + { + if (unlikely (!str_ref.avail ())) break; + + byte = str_ref[0]; + str_ref.inc (); + nibble = byte >> 4; + } + else + nibble = byte & 0x0F; + + if (unlikely (nibble == RESERVED)) break; + else if (nibble == END) + { + const char *p = buf; + double pv; + if (unlikely (!hb_parse_double (&p, p + count, &pv, true/* whole buffer */))) + break; + return pv; + } + else + { + buf[count] = "0123456789.EE?-?"[nibble]; + if (nibble == EXP_NEG) + { + ++count; + if (unlikely (count == ARRAY_LENGTH (buf))) break; + buf[count] = '-'; + } + } + } + + str_ref.set_error (); + return .0; + } + + static bool is_hint_op (op_code_t op) + { + switch (op) + { + case OpCode_BlueValues: + case OpCode_OtherBlues: + case OpCode_FamilyBlues: + case OpCode_FamilyOtherBlues: + case OpCode_StemSnapH: + case OpCode_StemSnapV: + case OpCode_StdHW: + case OpCode_StdVW: + case OpCode_BlueScale: + case OpCode_BlueShift: + case OpCode_BlueFuzz: + case OpCode_ForceBold: + case OpCode_LanguageGroup: + case OpCode_ExpansionFactor: + return true; + default: + return false; + } + } +}; + +template +struct top_dict_opset_t : dict_opset_t +{ + static void process_op (op_code_t op, interp_env_t& env, top_dict_values_t & dictval) + { + switch (op) { + case OpCode_CharStrings: + dictval.charStringsOffset = env.argStack.pop_uint (); + env.clear_args (); + break; + case OpCode_FDArray: + dictval.FDArrayOffset = env.argStack.pop_uint (); + env.clear_args (); + break; + case OpCode_FontMatrix: + env.clear_args (); + break; + default: + dict_opset_t::process_op (op, env); + break; + } + } +}; + +template +struct dict_interpreter_t : interpreter_t +{ + bool interpret (PARAM& param) + { + param.init (); + while (SUPER::env.str_ref.avail ()) + { + OPSET::process_op (SUPER::env.fetch_op (), SUPER::env, param); + if (unlikely (SUPER::env.in_error ())) + return false; + } + + return true; + } + + private: + typedef interpreter_t SUPER; +}; + +} /* namespace CFF */ + +#endif /* HB_CFF_INTERP_DICT_COMMON_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-cff1-interp-cs.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-cff1-interp-cs.hh new file mode 100644 index 000000000..1c8762c17 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-cff1-interp-cs.hh @@ -0,0 +1,161 @@ +/* + * Copyright © 2018 Adobe Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Adobe Author(s): Michiharu Ariza + */ +#ifndef HB_CFF1_INTERP_CS_HH +#define HB_CFF1_INTERP_CS_HH + +#include "hb.hh" +#include "hb-cff-interp-cs-common.hh" + +namespace CFF { + +using namespace OT; + +typedef biased_subrs_t cff1_biased_subrs_t; + +struct cff1_cs_interp_env_t : cs_interp_env_t +{ + template + void init (const byte_str_t &str, ACC &acc, unsigned int fd) + { + SUPER::init (str, acc.globalSubrs, acc.privateDicts[fd].localSubrs); + processed_width = false; + has_width = false; + arg_start = 0; + in_seac = false; + } + + void fini () { SUPER::fini (); } + + void set_width (bool has_width_) + { + if (likely (!processed_width && (SUPER::argStack.get_count () > 0))) + { + if (has_width_) + { + width = SUPER::argStack[0]; + has_width = true; + arg_start = 1; + } + } + processed_width = true; + } + + void clear_args () + { + arg_start = 0; + SUPER::clear_args (); + } + + void set_in_seac (bool _in_seac) { in_seac = _in_seac; } + + bool processed_width; + bool has_width; + unsigned int arg_start; + number_t width; + bool in_seac; + + private: + typedef cs_interp_env_t SUPER; +}; + +template > +struct cff1_cs_opset_t : cs_opset_t +{ + /* PostScript-originated legacy opcodes (OpCode_add etc) are unsupported */ + /* Type 1-originated deprecated opcodes, seac behavior of endchar and dotsection are supported */ + + static void process_op (op_code_t op, cff1_cs_interp_env_t &env, PARAM& param) + { + switch (op) { + case OpCode_dotsection: + SUPER::flush_args_and_op (op, env, param); + break; + + case OpCode_endchar: + OPSET::check_width (op, env, param); + if (env.argStack.get_count () >= 4) + { + OPSET::process_seac (env, param); + } + OPSET::flush_args_and_op (op, env, param); + env.set_endchar (true); + break; + + default: + SUPER::process_op (op, env, param); + } + } + + static void check_width (op_code_t op, cff1_cs_interp_env_t &env, PARAM& param) + { + if (!env.processed_width) + { + bool has_width = false; + switch (op) + { + case OpCode_endchar: + case OpCode_hstem: + case OpCode_hstemhm: + case OpCode_vstem: + case OpCode_vstemhm: + case OpCode_hintmask: + case OpCode_cntrmask: + has_width = ((env.argStack.get_count () & 1) != 0); + break; + case OpCode_hmoveto: + case OpCode_vmoveto: + has_width = (env.argStack.get_count () > 1); + break; + case OpCode_rmoveto: + has_width = (env.argStack.get_count () > 2); + break; + default: + return; + } + env.set_width (has_width); + } + } + + static void process_seac (cff1_cs_interp_env_t &env, PARAM& param) + { + } + + static void flush_args (cff1_cs_interp_env_t &env, PARAM& param) + { + SUPER::flush_args (env, param); + env.clear_args (); /* pop off width */ + } + + private: + typedef cs_opset_t SUPER; +}; + +template +struct cff1_cs_interpreter_t : cs_interpreter_t {}; + +} /* namespace CFF */ + +#endif /* HB_CFF1_INTERP_CS_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-cff2-interp-cs.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-cff2-interp-cs.hh new file mode 100644 index 000000000..a72100e1a --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-cff2-interp-cs.hh @@ -0,0 +1,271 @@ +/* + * Copyright © 2018 Adobe Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Adobe Author(s): Michiharu Ariza + */ +#ifndef HB_CFF2_INTERP_CS_HH +#define HB_CFF2_INTERP_CS_HH + +#include "hb.hh" +#include "hb-cff-interp-cs-common.hh" + +namespace CFF { + +using namespace OT; + +struct blend_arg_t : number_t +{ + void init () + { + number_t::init (); + deltas.init (); + } + + void fini () + { + number_t::fini (); + deltas.fini_deep (); + } + + void set_int (int v) { reset_blends (); number_t::set_int (v); } + void set_fixed (int32_t v) { reset_blends (); number_t::set_fixed (v); } + void set_real (double v) { reset_blends (); number_t::set_real (v); } + + void set_blends (unsigned int numValues_, unsigned int valueIndex_, + unsigned int numBlends, hb_array_t blends_) + { + numValues = numValues_; + valueIndex = valueIndex_; + deltas.resize (numBlends); + for (unsigned int i = 0; i < numBlends; i++) + deltas[i] = blends_[i]; + } + + bool blending () const { return deltas.length > 0; } + void reset_blends () + { + numValues = valueIndex = 0; + deltas.resize (0); + } + + unsigned int numValues; + unsigned int valueIndex; + hb_vector_t deltas; +}; + +typedef interp_env_t BlendInterpEnv; +typedef biased_subrs_t cff2_biased_subrs_t; + +struct cff2_cs_interp_env_t : cs_interp_env_t +{ + template + void init (const byte_str_t &str, ACC &acc, unsigned int fd, + const int *coords_=nullptr, unsigned int num_coords_=0) + { + SUPER::init (str, acc.globalSubrs, acc.privateDicts[fd].localSubrs); + + coords = coords_; + num_coords = num_coords_; + varStore = acc.varStore; + seen_blend = false; + seen_vsindex_ = false; + scalars.init (); + do_blend = (coords != nullptr) && num_coords && (varStore != &Null(CFF2VariationStore)); + set_ivs (acc.privateDicts[fd].ivs); + } + + void fini () + { + scalars.fini (); + SUPER::fini (); + } + + op_code_t fetch_op () + { + if (this->str_ref.avail ()) + return SUPER::fetch_op (); + + /* make up return or endchar op */ + if (this->callStack.is_empty ()) + return OpCode_endchar; + else + return OpCode_return; + } + + const blend_arg_t& eval_arg (unsigned int i) + { + blend_arg_t &arg = argStack[i]; + blend_arg (arg); + return arg; + } + + const blend_arg_t& pop_arg () + { + blend_arg_t &arg = argStack.pop (); + blend_arg (arg); + return arg; + } + + void process_blend () + { + if (!seen_blend) + { + region_count = varStore->varStore.get_region_index_count (get_ivs ()); + if (do_blend) + { + scalars.resize (region_count); + varStore->varStore.get_scalars (get_ivs (), + (int *)coords, num_coords, + &scalars[0], region_count); + } + seen_blend = true; + } + } + + void process_vsindex () + { + unsigned int index = argStack.pop_uint (); + if (unlikely (seen_vsindex () || seen_blend)) + { + set_error (); + } + else + { + set_ivs (index); + } + seen_vsindex_ = true; + } + + unsigned int get_region_count () const { return region_count; } + void set_region_count (unsigned int region_count_) { region_count = region_count_; } + unsigned int get_ivs () const { return ivs; } + void set_ivs (unsigned int ivs_) { ivs = ivs_; } + bool seen_vsindex () const { return seen_vsindex_; } + + protected: + void blend_arg (blend_arg_t &arg) + { + if (do_blend && arg.blending ()) + { + if (likely (scalars.length == arg.deltas.length)) + { + double v = arg.to_real (); + for (unsigned int i = 0; i < scalars.length; i++) + { + v += (double)scalars[i] * arg.deltas[i].to_real (); + } + arg.set_real (v); + arg.deltas.resize (0); + } + } + } + + protected: + const int *coords; + unsigned int num_coords; + const CFF2VariationStore *varStore; + unsigned int region_count; + unsigned int ivs; + hb_vector_t scalars; + bool do_blend; + bool seen_vsindex_; + bool seen_blend; + + typedef cs_interp_env_t SUPER; +}; +template > +struct cff2_cs_opset_t : cs_opset_t +{ + static void process_op (op_code_t op, cff2_cs_interp_env_t &env, PARAM& param) + { + switch (op) { + case OpCode_callsubr: + case OpCode_callgsubr: + /* a subroutine number shoudln't be a blended value */ + if (unlikely (env.argStack.peek ().blending ())) + { + env.set_error (); + break; + } + SUPER::process_op (op, env, param); + break; + + case OpCode_blendcs: + OPSET::process_blend (env, param); + break; + + case OpCode_vsindexcs: + if (unlikely (env.argStack.peek ().blending ())) + { + env.set_error (); + break; + } + OPSET::process_vsindex (env, param); + break; + + default: + SUPER::process_op (op, env, param); + } + } + + static void process_blend (cff2_cs_interp_env_t &env, PARAM& param) + { + unsigned int n, k; + + env.process_blend (); + k = env.get_region_count (); + n = env.argStack.pop_uint (); + /* copy the blend values into blend array of the default values */ + unsigned int start = env.argStack.get_count () - ((k+1) * n); + /* let an obvious error case fail, but note CFF2 spec doesn't forbid n==0 */ + if (unlikely (start > env.argStack.get_count ())) + { + env.set_error (); + return; + } + for (unsigned int i = 0; i < n; i++) + { + const hb_array_t blends = env.argStack.get_subarray (start + n + (i * k)); + env.argStack[start + i].set_blends (n, i, k, blends); + } + + /* pop off blend values leaving default values now adorned with blend values */ + env.argStack.pop (k * n); + } + + static void process_vsindex (cff2_cs_interp_env_t &env, PARAM& param) + { + env.process_vsindex (); + env.clear_args (); + } + + private: + typedef cs_opset_t SUPER; +}; + +template +struct cff2_cs_interpreter_t : cs_interpreter_t {}; + +} /* namespace CFF */ + +#endif /* HB_CFF2_INTERP_CS_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-common.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-common.cc new file mode 100644 index 000000000..0ae0c05f4 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-common.cc @@ -0,0 +1,1124 @@ +/* + * Copyright © 2009,2010 Red Hat, Inc. + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#include "hb.hh" +#include "hb-machinery.hh" + +#include + +#ifdef HB_NO_SETLOCALE +#define setlocale(Category, Locale) "C" +#endif + +/** + * SECTION:hb-common + * @title: hb-common + * @short_description: Common data types + * @include: hb.h + * + * Common data types used across HarfBuzz are defined here. + **/ + + +/* hb_options_t */ + +hb_atomic_int_t _hb_options; + +void +_hb_options_init () +{ + hb_options_union_t u; + u.i = 0; + u.opts.initialized = true; + + const char *c = getenv ("HB_OPTIONS"); + if (c) + { + while (*c) + { + const char *p = strchr (c, ':'); + if (!p) + p = c + strlen (c); + +#define OPTION(name, symbol) \ + if (0 == strncmp (c, name, p - c) && strlen (name) == static_cast(p - c)) do { u.opts.symbol = true; } while (0) + + OPTION ("uniscribe-bug-compatible", uniscribe_bug_compatible); + OPTION ("aat", aat); + +#undef OPTION + + c = *p ? p + 1 : p; + } + + } + + /* This is idempotent and threadsafe. */ + _hb_options.set_relaxed (u.i); +} + + +/* hb_tag_t */ + +/** + * hb_tag_from_string: + * @str: (array length=len) (element-type uint8_t): + * @len: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_tag_t +hb_tag_from_string (const char *str, int len) +{ + char tag[4]; + unsigned int i; + + if (!str || !len || !*str) + return HB_TAG_NONE; + + if (len < 0 || len > 4) + len = 4; + for (i = 0; i < (unsigned) len && str[i]; i++) + tag[i] = str[i]; + for (; i < 4; i++) + tag[i] = ' '; + + return HB_TAG (tag[0], tag[1], tag[2], tag[3]); +} + +/** + * hb_tag_to_string: + * @tag: + * @buf: (out caller-allocates) (array fixed-size=4) (element-type uint8_t): + * + * + * + * Since: 0.9.5 + **/ +void +hb_tag_to_string (hb_tag_t tag, char *buf) +{ + buf[0] = (char) (uint8_t) (tag >> 24); + buf[1] = (char) (uint8_t) (tag >> 16); + buf[2] = (char) (uint8_t) (tag >> 8); + buf[3] = (char) (uint8_t) (tag >> 0); +} + + +/* hb_direction_t */ + +const char direction_strings[][4] = { + "ltr", + "rtl", + "ttb", + "btt" +}; + +/** + * hb_direction_from_string: + * @str: (array length=len) (element-type uint8_t): + * @len: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_direction_t +hb_direction_from_string (const char *str, int len) +{ + if (unlikely (!str || !len || !*str)) + return HB_DIRECTION_INVALID; + + /* Lets match loosely: just match the first letter, such that + * all of "ltr", "left-to-right", etc work! + */ + char c = TOLOWER (str[0]); + for (unsigned int i = 0; i < ARRAY_LENGTH (direction_strings); i++) + if (c == direction_strings[i][0]) + return (hb_direction_t) (HB_DIRECTION_LTR + i); + + return HB_DIRECTION_INVALID; +} + +/** + * hb_direction_to_string: + * @direction: + * + * + * + * Return value: (transfer none): + * + * Since: 0.9.2 + **/ +const char * +hb_direction_to_string (hb_direction_t direction) +{ + if (likely ((unsigned int) (direction - HB_DIRECTION_LTR) + < ARRAY_LENGTH (direction_strings))) + return direction_strings[direction - HB_DIRECTION_LTR]; + + return "invalid"; +} + + +/* hb_language_t */ + +struct hb_language_impl_t { + const char s[1]; +}; + +static const char canon_map[256] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '-', 0, 0, + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 0, 0, 0, 0, 0, 0, + 0, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', + 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 0, 0, 0, 0, '-', + 0, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', + 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 0, 0, 0, 0, 0 +}; + +static bool +lang_equal (hb_language_t v1, + const void *v2) +{ + const unsigned char *p1 = (const unsigned char *) v1; + const unsigned char *p2 = (const unsigned char *) v2; + + while (*p1 && *p1 == canon_map[*p2]) { + p1++; + p2++; + } + + return *p1 == canon_map[*p2]; +} + +#if 0 +static unsigned int +lang_hash (const void *key) +{ + const unsigned char *p = key; + unsigned int h = 0; + while (canon_map[*p]) + { + h = (h << 5) - h + canon_map[*p]; + p++; + } + + return h; +} +#endif + + +struct hb_language_item_t { + + struct hb_language_item_t *next; + hb_language_t lang; + + bool operator == (const char *s) const + { return lang_equal (lang, s); } + + hb_language_item_t & operator = (const char *s) { + /* If a custom allocated is used calling strdup() pairs + badly with a call to the custom free() in fini() below. + Therefore don't call strdup(), implement its behavior. + */ + size_t len = strlen(s) + 1; + lang = (hb_language_t) malloc(len); + if (likely (lang)) + { + memcpy((unsigned char *) lang, s, len); + for (unsigned char *p = (unsigned char *) lang; *p; p++) + *p = canon_map[*p]; + } + + return *this; + } + + void fini () { free ((void *) lang); } +}; + + +/* Thread-safe lock-free language list */ + +static hb_atomic_ptr_t langs; + +#if HB_USE_ATEXIT +static void +free_langs () +{ +retry: + hb_language_item_t *first_lang = langs; + if (unlikely (!langs.cmpexch (first_lang, nullptr))) + goto retry; + + while (first_lang) { + hb_language_item_t *next = first_lang->next; + first_lang->fini (); + free (first_lang); + first_lang = next; + } +} +#endif + +static hb_language_item_t * +lang_find_or_insert (const char *key) +{ +retry: + hb_language_item_t *first_lang = langs; + + for (hb_language_item_t *lang = first_lang; lang; lang = lang->next) + if (*lang == key) + return lang; + + /* Not found; allocate one. */ + hb_language_item_t *lang = (hb_language_item_t *) calloc (1, sizeof (hb_language_item_t)); + if (unlikely (!lang)) + return nullptr; + lang->next = first_lang; + *lang = key; + if (unlikely (!lang->lang)) + { + free (lang); + return nullptr; + } + + if (unlikely (!langs.cmpexch (first_lang, lang))) + { + lang->fini (); + free (lang); + goto retry; + } + +#if HB_USE_ATEXIT + if (!first_lang) + atexit (free_langs); /* First person registers atexit() callback. */ +#endif + + return lang; +} + + +/** + * hb_language_from_string: + * @str: (array length=len) (element-type uint8_t): a string representing + * a BCP 47 language tag + * @len: length of the @str, or -1 if it is %NULL-terminated. + * + * Converts @str representing a BCP 47 language tag to the corresponding + * #hb_language_t. + * + * Return value: (transfer none): + * The #hb_language_t corresponding to the BCP 47 language tag. + * + * Since: 0.9.2 + **/ +hb_language_t +hb_language_from_string (const char *str, int len) +{ + if (!str || !len || !*str) + return HB_LANGUAGE_INVALID; + + hb_language_item_t *item = nullptr; + if (len >= 0) + { + /* NUL-terminate it. */ + char strbuf[64]; + len = hb_min (len, (int) sizeof (strbuf) - 1); + memcpy (strbuf, str, len); + strbuf[len] = '\0'; + item = lang_find_or_insert (strbuf); + } + else + item = lang_find_or_insert (str); + + return likely (item) ? item->lang : HB_LANGUAGE_INVALID; +} + +/** + * hb_language_to_string: + * @language: an #hb_language_t to convert. + * + * See hb_language_from_string(). + * + * Return value: (transfer none): + * A %NULL-terminated string representing the @language. Must not be freed by + * the caller. + * + * Since: 0.9.2 + **/ +const char * +hb_language_to_string (hb_language_t language) +{ + if (unlikely (!language)) return nullptr; + + return language->s; +} + +/** + * hb_language_get_default: + * + * Get default language from current locale. + * + * Note that the first time this function is called, it calls + * "setlocale (LC_CTYPE, nullptr)" to fetch current locale. The underlying + * setlocale function is, in many implementations, NOT threadsafe. To avoid + * problems, call this function once before multiple threads can call it. + * This function is only used from hb_buffer_guess_segment_properties() by + * HarfBuzz itself. + * + * Return value: (transfer none): + * + * Since: 0.9.2 + **/ +hb_language_t +hb_language_get_default () +{ + static hb_atomic_ptr_t default_language; + + hb_language_t language = default_language; + if (unlikely (language == HB_LANGUAGE_INVALID)) + { + language = hb_language_from_string (setlocale (LC_CTYPE, nullptr), -1); + (void) default_language.cmpexch (HB_LANGUAGE_INVALID, language); + } + + return language; +} + + +/* hb_script_t */ + +/** + * hb_script_from_iso15924_tag: + * @tag: an #hb_tag_t representing an ISO 15924 tag. + * + * Converts an ISO 15924 script tag to a corresponding #hb_script_t. + * + * Return value: + * An #hb_script_t corresponding to the ISO 15924 tag. + * + * Since: 0.9.2 + **/ +hb_script_t +hb_script_from_iso15924_tag (hb_tag_t tag) +{ + if (unlikely (tag == HB_TAG_NONE)) + return HB_SCRIPT_INVALID; + + /* Be lenient, adjust case (one capital letter followed by three small letters) */ + tag = (tag & 0xDFDFDFDFu) | 0x00202020u; + + switch (tag) { + + /* These graduated from the 'Q' private-area codes, but + * the old code is still aliased by Unicode, and the Qaai + * one in use by ICU. */ + case HB_TAG('Q','a','a','i'): return HB_SCRIPT_INHERITED; + case HB_TAG('Q','a','a','c'): return HB_SCRIPT_COPTIC; + + /* Script variants from https://unicode.org/iso15924/ */ + case HB_TAG('C','y','r','s'): return HB_SCRIPT_CYRILLIC; + case HB_TAG('L','a','t','f'): return HB_SCRIPT_LATIN; + case HB_TAG('L','a','t','g'): return HB_SCRIPT_LATIN; + case HB_TAG('S','y','r','e'): return HB_SCRIPT_SYRIAC; + case HB_TAG('S','y','r','j'): return HB_SCRIPT_SYRIAC; + case HB_TAG('S','y','r','n'): return HB_SCRIPT_SYRIAC; + } + + /* If it looks right, just use the tag as a script */ + if (((uint32_t) tag & 0xE0E0E0E0u) == 0x40606060u) + return (hb_script_t) tag; + + /* Otherwise, return unknown */ + return HB_SCRIPT_UNKNOWN; +} + +/** + * hb_script_from_string: + * @str: (array length=len) (element-type uint8_t): a string representing an + * ISO 15924 tag. + * @len: length of the @str, or -1 if it is %NULL-terminated. + * + * Converts a string @str representing an ISO 15924 script tag to a + * corresponding #hb_script_t. Shorthand for hb_tag_from_string() then + * hb_script_from_iso15924_tag(). + * + * Return value: + * An #hb_script_t corresponding to the ISO 15924 tag. + * + * Since: 0.9.2 + **/ +hb_script_t +hb_script_from_string (const char *str, int len) +{ + return hb_script_from_iso15924_tag (hb_tag_from_string (str, len)); +} + +/** + * hb_script_to_iso15924_tag: + * @script: an #hb_script_t to convert. + * + * See hb_script_from_iso15924_tag(). + * + * Return value: + * An #hb_tag_t representing an ISO 15924 script tag. + * + * Since: 0.9.2 + **/ +hb_tag_t +hb_script_to_iso15924_tag (hb_script_t script) +{ + return (hb_tag_t) script; +} + +/** + * hb_script_get_horizontal_direction: + * @script: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_direction_t +hb_script_get_horizontal_direction (hb_script_t script) +{ + /* https://docs.google.com/spreadsheets/d/1Y90M0Ie3MUJ6UVCRDOypOtijlMDLNNyyLk36T6iMu0o */ + switch ((hb_tag_t) script) + { + /* Unicode-1.1 additions */ + case HB_SCRIPT_ARABIC: + case HB_SCRIPT_HEBREW: + + /* Unicode-3.0 additions */ + case HB_SCRIPT_SYRIAC: + case HB_SCRIPT_THAANA: + + /* Unicode-4.0 additions */ + case HB_SCRIPT_CYPRIOT: + + /* Unicode-4.1 additions */ + case HB_SCRIPT_KHAROSHTHI: + + /* Unicode-5.0 additions */ + case HB_SCRIPT_PHOENICIAN: + case HB_SCRIPT_NKO: + + /* Unicode-5.1 additions */ + case HB_SCRIPT_LYDIAN: + + /* Unicode-5.2 additions */ + case HB_SCRIPT_AVESTAN: + case HB_SCRIPT_IMPERIAL_ARAMAIC: + case HB_SCRIPT_INSCRIPTIONAL_PAHLAVI: + case HB_SCRIPT_INSCRIPTIONAL_PARTHIAN: + case HB_SCRIPT_OLD_SOUTH_ARABIAN: + case HB_SCRIPT_OLD_TURKIC: + case HB_SCRIPT_SAMARITAN: + + /* Unicode-6.0 additions */ + case HB_SCRIPT_MANDAIC: + + /* Unicode-6.1 additions */ + case HB_SCRIPT_MEROITIC_CURSIVE: + case HB_SCRIPT_MEROITIC_HIEROGLYPHS: + + /* Unicode-7.0 additions */ + case HB_SCRIPT_MANICHAEAN: + case HB_SCRIPT_MENDE_KIKAKUI: + case HB_SCRIPT_NABATAEAN: + case HB_SCRIPT_OLD_NORTH_ARABIAN: + case HB_SCRIPT_PALMYRENE: + case HB_SCRIPT_PSALTER_PAHLAVI: + + /* Unicode-8.0 additions */ + case HB_SCRIPT_HATRAN: + + /* Unicode-9.0 additions */ + case HB_SCRIPT_ADLAM: + + /* Unicode-11.0 additions */ + case HB_SCRIPT_HANIFI_ROHINGYA: + case HB_SCRIPT_OLD_SOGDIAN: + case HB_SCRIPT_SOGDIAN: + + return HB_DIRECTION_RTL; + + + /* https://github.com/harfbuzz/harfbuzz/issues/1000 */ + case HB_SCRIPT_OLD_HUNGARIAN: + case HB_SCRIPT_OLD_ITALIC: + case HB_SCRIPT_RUNIC: + + return HB_DIRECTION_INVALID; + } + + return HB_DIRECTION_LTR; +} + + +/* hb_user_data_array_t */ + +bool +hb_user_data_array_t::set (hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace) +{ + if (!key) + return false; + + if (replace) { + if (!data && !destroy) { + items.remove (key, lock); + return true; + } + } + hb_user_data_item_t item = {key, data, destroy}; + bool ret = !!items.replace_or_insert (item, lock, (bool) replace); + + return ret; +} + +void * +hb_user_data_array_t::get (hb_user_data_key_t *key) +{ + hb_user_data_item_t item = {nullptr, nullptr, nullptr}; + + return items.find (key, &item, lock) ? item.data : nullptr; +} + + +/* hb_version */ + + +/** + * SECTION:hb-version + * @title: hb-version + * @short_description: Information about the version of HarfBuzz in use + * @include: hb.h + * + * These functions and macros allow accessing version of the HarfBuzz + * library used at compile- as well as run-time, and to direct code + * conditionally based on those versions, again, at compile- or run-time. + **/ + + +/** + * hb_version: + * @major: (out): Library major version component. + * @minor: (out): Library minor version component. + * @micro: (out): Library micro version component. + * + * Returns library version as three integer components. + * + * Since: 0.9.2 + **/ +void +hb_version (unsigned int *major, + unsigned int *minor, + unsigned int *micro) +{ + *major = HB_VERSION_MAJOR; + *minor = HB_VERSION_MINOR; + *micro = HB_VERSION_MICRO; +} + +/** + * hb_version_string: + * + * Returns library version as a string with three components. + * + * Return value: library version string. + * + * Since: 0.9.2 + **/ +const char * +hb_version_string () +{ + return HB_VERSION_STRING; +} + +/** + * hb_version_atleast: + * @major: + * @minor: + * @micro: + * + * + * + * Return value: + * + * Since: 0.9.30 + **/ +hb_bool_t +hb_version_atleast (unsigned int major, + unsigned int minor, + unsigned int micro) +{ + return HB_VERSION_ATLEAST (major, minor, micro); +} + + + +/* hb_feature_t and hb_variation_t */ + +static bool +parse_space (const char **pp, const char *end) +{ + while (*pp < end && ISSPACE (**pp)) + (*pp)++; + return true; +} + +static bool +parse_char (const char **pp, const char *end, char c) +{ + parse_space (pp, end); + + if (*pp == end || **pp != c) + return false; + + (*pp)++; + return true; +} + +static bool +parse_uint (const char **pp, const char *end, unsigned int *pv) +{ + /* Intentionally use hb_parse_int inside instead of hb_parse_uint, + * such that -1 turns into "big number"... */ + int v; + if (unlikely (!hb_parse_int (pp, end, &v))) return false; + + *pv = v; + return true; +} + +static bool +parse_uint32 (const char **pp, const char *end, uint32_t *pv) +{ + /* Intentionally use hb_parse_int inside instead of hb_parse_uint, + * such that -1 turns into "big number"... */ + int v; + if (unlikely (!hb_parse_int (pp, end, &v))) return false; + + *pv = v; + return true; +} + +static bool +parse_bool (const char **pp, const char *end, uint32_t *pv) +{ + parse_space (pp, end); + + const char *p = *pp; + while (*pp < end && ISALPHA(**pp)) + (*pp)++; + + /* CSS allows on/off as aliases 1/0. */ + if (*pp - p == 2 + && TOLOWER (p[0]) == 'o' + && TOLOWER (p[1]) == 'n') + *pv = 1; + else if (*pp - p == 3 + && TOLOWER (p[0]) == 'o' + && TOLOWER (p[1]) == 'f' + && TOLOWER (p[2]) == 'f') + *pv = 0; + else + return false; + + return true; +} + +/* hb_feature_t */ + +static bool +parse_feature_value_prefix (const char **pp, const char *end, hb_feature_t *feature) +{ + if (parse_char (pp, end, '-')) + feature->value = 0; + else { + parse_char (pp, end, '+'); + feature->value = 1; + } + + return true; +} + +static bool +parse_tag (const char **pp, const char *end, hb_tag_t *tag) +{ + parse_space (pp, end); + + char quote = 0; + + if (*pp < end && (**pp == '\'' || **pp == '"')) + { + quote = **pp; + (*pp)++; + } + + const char *p = *pp; + while (*pp < end && (ISALNUM(**pp) || **pp == '_')) + (*pp)++; + + if (p == *pp || *pp - p > 4) + return false; + + *tag = hb_tag_from_string (p, *pp - p); + + if (quote) + { + /* CSS expects exactly four bytes. And we only allow quotations for + * CSS compatibility. So, enforce the length. */ + if (*pp - p != 4) + return false; + if (*pp == end || **pp != quote) + return false; + (*pp)++; + } + + return true; +} + +static bool +parse_feature_indices (const char **pp, const char *end, hb_feature_t *feature) +{ + parse_space (pp, end); + + bool has_start; + + feature->start = HB_FEATURE_GLOBAL_START; + feature->end = HB_FEATURE_GLOBAL_END; + + if (!parse_char (pp, end, '[')) + return true; + + has_start = parse_uint (pp, end, &feature->start); + + if (parse_char (pp, end, ':') || parse_char (pp, end, ';')) { + parse_uint (pp, end, &feature->end); + } else { + if (has_start) + feature->end = feature->start + 1; + } + + return parse_char (pp, end, ']'); +} + +static bool +parse_feature_value_postfix (const char **pp, const char *end, hb_feature_t *feature) +{ + bool had_equal = parse_char (pp, end, '='); + bool had_value = parse_uint32 (pp, end, &feature->value) || + parse_bool (pp, end, &feature->value); + /* CSS doesn't use equal-sign between tag and value. + * If there was an equal-sign, then there *must* be a value. + * A value without an equal-sign is ok, but not required. */ + return !had_equal || had_value; +} + +static bool +parse_one_feature (const char **pp, const char *end, hb_feature_t *feature) +{ + return parse_feature_value_prefix (pp, end, feature) && + parse_tag (pp, end, &feature->tag) && + parse_feature_indices (pp, end, feature) && + parse_feature_value_postfix (pp, end, feature) && + parse_space (pp, end) && + *pp == end; +} + +/** + * hb_feature_from_string: + * @str: (array length=len) (element-type uint8_t): a string to parse + * @len: length of @str, or -1 if string is %NULL terminated + * @feature: (out): the #hb_feature_t to initialize with the parsed values + * + * Parses a string into a #hb_feature_t. + * + * The format for specifying feature strings follows. All valid CSS + * font-feature-settings values other than 'normal' and the global values are + * also accepted, though not documented below. CSS string escapes are not + * supported. + * + * The range indices refer to the positions between Unicode characters. The + * position before the first character is always 0. + * + * The format is Python-esque. Here is how it all works: + * + * + * + *

+ * Syntax Value Start End + * + * + * Setting value: + * kern 1 0 ∞ Turn feature on + * +kern 1 0 ∞ Turn feature on + * -kern 0 0 ∞ Turn feature off + * kern=0 0 0 ∞ Turn feature off + * kern=1 1 0 ∞ Turn feature on + * aalt=2 2 0 ∞ Choose 2nd alternate + * Setting index: + * kern[] 1 0 ∞ Turn feature on + * kern[:] 1 0 ∞ Turn feature on + * kern[5:] 1 5 ∞ Turn feature on, partial + * kern[:5] 1 0 5 Turn feature on, partial + * kern[3:5] 1 3 5 Turn feature on, range + * kern[3] 1 3 3+1 Turn feature on, single char + * Mixing it all: + * aalt[3:5]=2 2 3 5 Turn 2nd alternate on for range + * + * + * + * + * Return value: + * %true if @str is successfully parsed, %false otherwise. + * + * Since: 0.9.5 + **/ +hb_bool_t +hb_feature_from_string (const char *str, int len, + hb_feature_t *feature) +{ + hb_feature_t feat; + + if (len < 0) + len = strlen (str); + + if (likely (parse_one_feature (&str, str + len, &feat))) + { + if (feature) + *feature = feat; + return true; + } + + if (feature) + memset (feature, 0, sizeof (*feature)); + return false; +} + +/** + * hb_feature_to_string: + * @feature: an #hb_feature_t to convert + * @buf: (array length=size) (out): output string + * @size: the allocated size of @buf + * + * Converts a #hb_feature_t into a %NULL-terminated string in the format + * understood by hb_feature_from_string(). The client in responsible for + * allocating big enough size for @buf, 128 bytes is more than enough. + * + * Since: 0.9.5 + **/ +void +hb_feature_to_string (hb_feature_t *feature, + char *buf, unsigned int size) +{ + if (unlikely (!size)) return; + + char s[128]; + unsigned int len = 0; + if (feature->value == 0) + s[len++] = '-'; + hb_tag_to_string (feature->tag, s + len); + len += 4; + while (len && s[len - 1] == ' ') + len--; + if (feature->start != 0 || feature->end != (unsigned int) -1) + { + s[len++] = '['; + if (feature->start) + len += hb_max (0, snprintf (s + len, ARRAY_LENGTH (s) - len, "%u", feature->start)); + if (feature->end != feature->start + 1) { + s[len++] = ':'; + if (feature->end != (unsigned int) -1) + len += hb_max (0, snprintf (s + len, ARRAY_LENGTH (s) - len, "%u", feature->end)); + } + s[len++] = ']'; + } + if (feature->value > 1) + { + s[len++] = '='; + len += hb_max (0, snprintf (s + len, ARRAY_LENGTH (s) - len, "%u", feature->value)); + } + assert (len < ARRAY_LENGTH (s)); + len = hb_min (len, size - 1); + memcpy (buf, s, len); + buf[len] = '\0'; +} + +/* hb_variation_t */ + +static bool +parse_variation_value (const char **pp, const char *end, hb_variation_t *variation) +{ + parse_char (pp, end, '='); /* Optional. */ + double v; + if (unlikely (!hb_parse_double (pp, end, &v))) return false; + + variation->value = v; + return true; +} + +static bool +parse_one_variation (const char **pp, const char *end, hb_variation_t *variation) +{ + return parse_tag (pp, end, &variation->tag) && + parse_variation_value (pp, end, variation) && + parse_space (pp, end) && + *pp == end; +} + +/** + * hb_variation_from_string: + * + * Since: 1.4.2 + */ +hb_bool_t +hb_variation_from_string (const char *str, int len, + hb_variation_t *variation) +{ + hb_variation_t var; + + if (len < 0) + len = strlen (str); + + if (likely (parse_one_variation (&str, str + len, &var))) + { + if (variation) + *variation = var; + return true; + } + + if (variation) + memset (variation, 0, sizeof (*variation)); + return false; +} + +/** + * hb_variation_to_string: + * + * Since: 1.4.2 + */ +void +hb_variation_to_string (hb_variation_t *variation, + char *buf, unsigned int size) +{ + if (unlikely (!size)) return; + + char s[128]; + unsigned int len = 0; + hb_tag_to_string (variation->tag, s + len); + len += 4; + while (len && s[len - 1] == ' ') + len--; + s[len++] = '='; + len += hb_max (0, snprintf (s + len, ARRAY_LENGTH (s) - len, "%g", (double) variation->value)); + + assert (len < ARRAY_LENGTH (s)); + len = hb_min (len, size - 1); + memcpy (buf, s, len); + buf[len] = '\0'; +} + +/** + * hb_color_get_alpha: + * color: a #hb_color_t we are interested in its channels. + * + * Return value: Alpha channel value of the given color + * + * Since: 2.1.0 + */ +uint8_t +(hb_color_get_alpha) (hb_color_t color) +{ + return hb_color_get_alpha (color); +} + +/** + * hb_color_get_red: + * color: a #hb_color_t we are interested in its channels. + * + * Return value: Red channel value of the given color + * + * Since: 2.1.0 + */ +uint8_t +(hb_color_get_red) (hb_color_t color) +{ + return hb_color_get_red (color); +} + +/** + * hb_color_get_green: + * color: a #hb_color_t we are interested in its channels. + * + * Return value: Green channel value of the given color + * + * Since: 2.1.0 + */ +uint8_t +(hb_color_get_green) (hb_color_t color) +{ + return hb_color_get_green (color); +} + +/** + * hb_color_get_blue: + * color: a #hb_color_t we are interested in its channels. + * + * Return value: Blue channel value of the given color + * + * Since: 2.1.0 + */ +uint8_t +(hb_color_get_blue) (hb_color_t color) +{ + return hb_color_get_blue (color); +} + + +/* If there is no visibility control, then hb-static.cc will NOT + * define anything. Instead, we get it to define one set in here + * only, so only libharfbuzz.so defines them, not other libs. */ +#ifdef HB_NO_VISIBILITY +#undef HB_NO_VISIBILITY +#include "hb-static.cc" +#define HB_NO_VISIBILITY 1 +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-common.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-common.h new file mode 100644 index 000000000..9f1764bdc --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-common.h @@ -0,0 +1,490 @@ +/* + * Copyright © 2007,2008,2009 Red Hat, Inc. + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_H_IN +#error "Include instead." +#endif + +#ifndef HB_COMMON_H +#define HB_COMMON_H + +#ifndef HB_EXTERN +#define HB_EXTERN extern +#endif + +#ifndef HB_BEGIN_DECLS +# ifdef __cplusplus +# define HB_BEGIN_DECLS extern "C" { +# define HB_END_DECLS } +# else /* !__cplusplus */ +# define HB_BEGIN_DECLS +# define HB_END_DECLS +# endif /* !__cplusplus */ +#endif + +#if defined (_SVR4) || defined (SVR4) || defined (__OpenBSD__) || \ + defined (_sgi) || defined (__sun) || defined (sun) || \ + defined (__digital__) || defined (__HP_cc) +# include +#elif defined (_AIX) +# include +#elif defined (_MSC_VER) && _MSC_VER < 1600 +/* VS 2010 (_MSC_VER 1600) has stdint.h */ +typedef __int8 int8_t; +typedef unsigned __int8 uint8_t; +typedef __int16 int16_t; +typedef unsigned __int16 uint16_t; +typedef __int32 int32_t; +typedef unsigned __int32 uint32_t; +typedef __int64 int64_t; +typedef unsigned __int64 uint64_t; +#elif defined (__KERNEL__) +# include +#else +# include +#endif + +#if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) +#define HB_DEPRECATED __attribute__((__deprecated__)) +#elif defined(_MSC_VER) && (_MSC_VER >= 1300) +#define HB_DEPRECATED __declspec(deprecated) +#else +#define HB_DEPRECATED +#endif + +#if defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) +#define HB_DEPRECATED_FOR(f) __attribute__((__deprecated__("Use '" #f "' instead"))) +#elif defined(_MSC_FULL_VER) && (_MSC_FULL_VER > 140050320) +#define HB_DEPRECATED_FOR(f) __declspec(deprecated("is deprecated. Use '" #f "' instead")) +#else +#define HB_DEPRECATED_FOR(f) HB_DEPRECATED +#endif + + +HB_BEGIN_DECLS + + +typedef int hb_bool_t; + +typedef uint32_t hb_codepoint_t; +typedef int32_t hb_position_t; +typedef uint32_t hb_mask_t; + +typedef union _hb_var_int_t { + uint32_t u32; + int32_t i32; + uint16_t u16[2]; + int16_t i16[2]; + uint8_t u8[4]; + int8_t i8[4]; +} hb_var_int_t; + + +/* hb_tag_t */ + +typedef uint32_t hb_tag_t; + +#define HB_TAG(c1,c2,c3,c4) ((hb_tag_t)((((uint32_t)(c1)&0xFF)<<24)|(((uint32_t)(c2)&0xFF)<<16)|(((uint32_t)(c3)&0xFF)<<8)|((uint32_t)(c4)&0xFF))) +#define HB_UNTAG(tag) (uint8_t)(((tag)>>24)&0xFF), (uint8_t)(((tag)>>16)&0xFF), (uint8_t)(((tag)>>8)&0xFF), (uint8_t)((tag)&0xFF) + +#define HB_TAG_NONE HB_TAG(0,0,0,0) +#define HB_TAG_MAX HB_TAG(0xff,0xff,0xff,0xff) +#define HB_TAG_MAX_SIGNED HB_TAG(0x7f,0xff,0xff,0xff) + +/* len=-1 means str is NUL-terminated. */ +HB_EXTERN hb_tag_t +hb_tag_from_string (const char *str, int len); + +/* buf should have 4 bytes. */ +HB_EXTERN void +hb_tag_to_string (hb_tag_t tag, char *buf); + + +/** + * hb_direction_t: + * @HB_DIRECTION_INVALID: Initial, unset direction. + * @HB_DIRECTION_LTR: Text is set horizontally from left to right. + * @HB_DIRECTION_RTL: Text is set horizontally from right to left. + * @HB_DIRECTION_TTB: Text is set vertically from top to bottom. + * @HB_DIRECTION_BTT: Text is set vertically from bottom to top. + */ +typedef enum { + HB_DIRECTION_INVALID = 0, + HB_DIRECTION_LTR = 4, + HB_DIRECTION_RTL, + HB_DIRECTION_TTB, + HB_DIRECTION_BTT +} hb_direction_t; + +/* len=-1 means str is NUL-terminated */ +HB_EXTERN hb_direction_t +hb_direction_from_string (const char *str, int len); + +HB_EXTERN const char * +hb_direction_to_string (hb_direction_t direction); + +#define HB_DIRECTION_IS_VALID(dir) ((((unsigned int) (dir)) & ~3U) == 4) +/* Direction must be valid for the following */ +#define HB_DIRECTION_IS_HORIZONTAL(dir) ((((unsigned int) (dir)) & ~1U) == 4) +#define HB_DIRECTION_IS_VERTICAL(dir) ((((unsigned int) (dir)) & ~1U) == 6) +#define HB_DIRECTION_IS_FORWARD(dir) ((((unsigned int) (dir)) & ~2U) == 4) +#define HB_DIRECTION_IS_BACKWARD(dir) ((((unsigned int) (dir)) & ~2U) == 5) +#define HB_DIRECTION_REVERSE(dir) ((hb_direction_t) (((unsigned int) (dir)) ^ 1)) + + +/* hb_language_t */ + +typedef const struct hb_language_impl_t *hb_language_t; + +HB_EXTERN hb_language_t +hb_language_from_string (const char *str, int len); + +HB_EXTERN const char * +hb_language_to_string (hb_language_t language); + +#define HB_LANGUAGE_INVALID ((hb_language_t) 0) + +HB_EXTERN hb_language_t +hb_language_get_default (void); + + +/* hb_script_t */ + +/* https://unicode.org/iso15924/ */ +/* https://docs.google.com/spreadsheets/d/1Y90M0Ie3MUJ6UVCRDOypOtijlMDLNNyyLk36T6iMu0o */ +/* Unicode Character Database property: Script (sc) */ +typedef enum +{ + /*1.1*/ HB_SCRIPT_COMMON = HB_TAG ('Z','y','y','y'), + /*1.1*/ HB_SCRIPT_INHERITED = HB_TAG ('Z','i','n','h'), + /*5.0*/ HB_SCRIPT_UNKNOWN = HB_TAG ('Z','z','z','z'), + + /*1.1*/ HB_SCRIPT_ARABIC = HB_TAG ('A','r','a','b'), + /*1.1*/ HB_SCRIPT_ARMENIAN = HB_TAG ('A','r','m','n'), + /*1.1*/ HB_SCRIPT_BENGALI = HB_TAG ('B','e','n','g'), + /*1.1*/ HB_SCRIPT_CYRILLIC = HB_TAG ('C','y','r','l'), + /*1.1*/ HB_SCRIPT_DEVANAGARI = HB_TAG ('D','e','v','a'), + /*1.1*/ HB_SCRIPT_GEORGIAN = HB_TAG ('G','e','o','r'), + /*1.1*/ HB_SCRIPT_GREEK = HB_TAG ('G','r','e','k'), + /*1.1*/ HB_SCRIPT_GUJARATI = HB_TAG ('G','u','j','r'), + /*1.1*/ HB_SCRIPT_GURMUKHI = HB_TAG ('G','u','r','u'), + /*1.1*/ HB_SCRIPT_HANGUL = HB_TAG ('H','a','n','g'), + /*1.1*/ HB_SCRIPT_HAN = HB_TAG ('H','a','n','i'), + /*1.1*/ HB_SCRIPT_HEBREW = HB_TAG ('H','e','b','r'), + /*1.1*/ HB_SCRIPT_HIRAGANA = HB_TAG ('H','i','r','a'), + /*1.1*/ HB_SCRIPT_KANNADA = HB_TAG ('K','n','d','a'), + /*1.1*/ HB_SCRIPT_KATAKANA = HB_TAG ('K','a','n','a'), + /*1.1*/ HB_SCRIPT_LAO = HB_TAG ('L','a','o','o'), + /*1.1*/ HB_SCRIPT_LATIN = HB_TAG ('L','a','t','n'), + /*1.1*/ HB_SCRIPT_MALAYALAM = HB_TAG ('M','l','y','m'), + /*1.1*/ HB_SCRIPT_ORIYA = HB_TAG ('O','r','y','a'), + /*1.1*/ HB_SCRIPT_TAMIL = HB_TAG ('T','a','m','l'), + /*1.1*/ HB_SCRIPT_TELUGU = HB_TAG ('T','e','l','u'), + /*1.1*/ HB_SCRIPT_THAI = HB_TAG ('T','h','a','i'), + + /*2.0*/ HB_SCRIPT_TIBETAN = HB_TAG ('T','i','b','t'), + + /*3.0*/ HB_SCRIPT_BOPOMOFO = HB_TAG ('B','o','p','o'), + /*3.0*/ HB_SCRIPT_BRAILLE = HB_TAG ('B','r','a','i'), + /*3.0*/ HB_SCRIPT_CANADIAN_SYLLABICS = HB_TAG ('C','a','n','s'), + /*3.0*/ HB_SCRIPT_CHEROKEE = HB_TAG ('C','h','e','r'), + /*3.0*/ HB_SCRIPT_ETHIOPIC = HB_TAG ('E','t','h','i'), + /*3.0*/ HB_SCRIPT_KHMER = HB_TAG ('K','h','m','r'), + /*3.0*/ HB_SCRIPT_MONGOLIAN = HB_TAG ('M','o','n','g'), + /*3.0*/ HB_SCRIPT_MYANMAR = HB_TAG ('M','y','m','r'), + /*3.0*/ HB_SCRIPT_OGHAM = HB_TAG ('O','g','a','m'), + /*3.0*/ HB_SCRIPT_RUNIC = HB_TAG ('R','u','n','r'), + /*3.0*/ HB_SCRIPT_SINHALA = HB_TAG ('S','i','n','h'), + /*3.0*/ HB_SCRIPT_SYRIAC = HB_TAG ('S','y','r','c'), + /*3.0*/ HB_SCRIPT_THAANA = HB_TAG ('T','h','a','a'), + /*3.0*/ HB_SCRIPT_YI = HB_TAG ('Y','i','i','i'), + + /*3.1*/ HB_SCRIPT_DESERET = HB_TAG ('D','s','r','t'), + /*3.1*/ HB_SCRIPT_GOTHIC = HB_TAG ('G','o','t','h'), + /*3.1*/ HB_SCRIPT_OLD_ITALIC = HB_TAG ('I','t','a','l'), + + /*3.2*/ HB_SCRIPT_BUHID = HB_TAG ('B','u','h','d'), + /*3.2*/ HB_SCRIPT_HANUNOO = HB_TAG ('H','a','n','o'), + /*3.2*/ HB_SCRIPT_TAGALOG = HB_TAG ('T','g','l','g'), + /*3.2*/ HB_SCRIPT_TAGBANWA = HB_TAG ('T','a','g','b'), + + /*4.0*/ HB_SCRIPT_CYPRIOT = HB_TAG ('C','p','r','t'), + /*4.0*/ HB_SCRIPT_LIMBU = HB_TAG ('L','i','m','b'), + /*4.0*/ HB_SCRIPT_LINEAR_B = HB_TAG ('L','i','n','b'), + /*4.0*/ HB_SCRIPT_OSMANYA = HB_TAG ('O','s','m','a'), + /*4.0*/ HB_SCRIPT_SHAVIAN = HB_TAG ('S','h','a','w'), + /*4.0*/ HB_SCRIPT_TAI_LE = HB_TAG ('T','a','l','e'), + /*4.0*/ HB_SCRIPT_UGARITIC = HB_TAG ('U','g','a','r'), + + /*4.1*/ HB_SCRIPT_BUGINESE = HB_TAG ('B','u','g','i'), + /*4.1*/ HB_SCRIPT_COPTIC = HB_TAG ('C','o','p','t'), + /*4.1*/ HB_SCRIPT_GLAGOLITIC = HB_TAG ('G','l','a','g'), + /*4.1*/ HB_SCRIPT_KHAROSHTHI = HB_TAG ('K','h','a','r'), + /*4.1*/ HB_SCRIPT_NEW_TAI_LUE = HB_TAG ('T','a','l','u'), + /*4.1*/ HB_SCRIPT_OLD_PERSIAN = HB_TAG ('X','p','e','o'), + /*4.1*/ HB_SCRIPT_SYLOTI_NAGRI = HB_TAG ('S','y','l','o'), + /*4.1*/ HB_SCRIPT_TIFINAGH = HB_TAG ('T','f','n','g'), + + /*5.0*/ HB_SCRIPT_BALINESE = HB_TAG ('B','a','l','i'), + /*5.0*/ HB_SCRIPT_CUNEIFORM = HB_TAG ('X','s','u','x'), + /*5.0*/ HB_SCRIPT_NKO = HB_TAG ('N','k','o','o'), + /*5.0*/ HB_SCRIPT_PHAGS_PA = HB_TAG ('P','h','a','g'), + /*5.0*/ HB_SCRIPT_PHOENICIAN = HB_TAG ('P','h','n','x'), + + /*5.1*/ HB_SCRIPT_CARIAN = HB_TAG ('C','a','r','i'), + /*5.1*/ HB_SCRIPT_CHAM = HB_TAG ('C','h','a','m'), + /*5.1*/ HB_SCRIPT_KAYAH_LI = HB_TAG ('K','a','l','i'), + /*5.1*/ HB_SCRIPT_LEPCHA = HB_TAG ('L','e','p','c'), + /*5.1*/ HB_SCRIPT_LYCIAN = HB_TAG ('L','y','c','i'), + /*5.1*/ HB_SCRIPT_LYDIAN = HB_TAG ('L','y','d','i'), + /*5.1*/ HB_SCRIPT_OL_CHIKI = HB_TAG ('O','l','c','k'), + /*5.1*/ HB_SCRIPT_REJANG = HB_TAG ('R','j','n','g'), + /*5.1*/ HB_SCRIPT_SAURASHTRA = HB_TAG ('S','a','u','r'), + /*5.1*/ HB_SCRIPT_SUNDANESE = HB_TAG ('S','u','n','d'), + /*5.1*/ HB_SCRIPT_VAI = HB_TAG ('V','a','i','i'), + + /*5.2*/ HB_SCRIPT_AVESTAN = HB_TAG ('A','v','s','t'), + /*5.2*/ HB_SCRIPT_BAMUM = HB_TAG ('B','a','m','u'), + /*5.2*/ HB_SCRIPT_EGYPTIAN_HIEROGLYPHS = HB_TAG ('E','g','y','p'), + /*5.2*/ HB_SCRIPT_IMPERIAL_ARAMAIC = HB_TAG ('A','r','m','i'), + /*5.2*/ HB_SCRIPT_INSCRIPTIONAL_PAHLAVI = HB_TAG ('P','h','l','i'), + /*5.2*/ HB_SCRIPT_INSCRIPTIONAL_PARTHIAN = HB_TAG ('P','r','t','i'), + /*5.2*/ HB_SCRIPT_JAVANESE = HB_TAG ('J','a','v','a'), + /*5.2*/ HB_SCRIPT_KAITHI = HB_TAG ('K','t','h','i'), + /*5.2*/ HB_SCRIPT_LISU = HB_TAG ('L','i','s','u'), + /*5.2*/ HB_SCRIPT_MEETEI_MAYEK = HB_TAG ('M','t','e','i'), + /*5.2*/ HB_SCRIPT_OLD_SOUTH_ARABIAN = HB_TAG ('S','a','r','b'), + /*5.2*/ HB_SCRIPT_OLD_TURKIC = HB_TAG ('O','r','k','h'), + /*5.2*/ HB_SCRIPT_SAMARITAN = HB_TAG ('S','a','m','r'), + /*5.2*/ HB_SCRIPT_TAI_THAM = HB_TAG ('L','a','n','a'), + /*5.2*/ HB_SCRIPT_TAI_VIET = HB_TAG ('T','a','v','t'), + + /*6.0*/ HB_SCRIPT_BATAK = HB_TAG ('B','a','t','k'), + /*6.0*/ HB_SCRIPT_BRAHMI = HB_TAG ('B','r','a','h'), + /*6.0*/ HB_SCRIPT_MANDAIC = HB_TAG ('M','a','n','d'), + + /*6.1*/ HB_SCRIPT_CHAKMA = HB_TAG ('C','a','k','m'), + /*6.1*/ HB_SCRIPT_MEROITIC_CURSIVE = HB_TAG ('M','e','r','c'), + /*6.1*/ HB_SCRIPT_MEROITIC_HIEROGLYPHS = HB_TAG ('M','e','r','o'), + /*6.1*/ HB_SCRIPT_MIAO = HB_TAG ('P','l','r','d'), + /*6.1*/ HB_SCRIPT_SHARADA = HB_TAG ('S','h','r','d'), + /*6.1*/ HB_SCRIPT_SORA_SOMPENG = HB_TAG ('S','o','r','a'), + /*6.1*/ HB_SCRIPT_TAKRI = HB_TAG ('T','a','k','r'), + + /* + * Since: 0.9.30 + */ + /*7.0*/ HB_SCRIPT_BASSA_VAH = HB_TAG ('B','a','s','s'), + /*7.0*/ HB_SCRIPT_CAUCASIAN_ALBANIAN = HB_TAG ('A','g','h','b'), + /*7.0*/ HB_SCRIPT_DUPLOYAN = HB_TAG ('D','u','p','l'), + /*7.0*/ HB_SCRIPT_ELBASAN = HB_TAG ('E','l','b','a'), + /*7.0*/ HB_SCRIPT_GRANTHA = HB_TAG ('G','r','a','n'), + /*7.0*/ HB_SCRIPT_KHOJKI = HB_TAG ('K','h','o','j'), + /*7.0*/ HB_SCRIPT_KHUDAWADI = HB_TAG ('S','i','n','d'), + /*7.0*/ HB_SCRIPT_LINEAR_A = HB_TAG ('L','i','n','a'), + /*7.0*/ HB_SCRIPT_MAHAJANI = HB_TAG ('M','a','h','j'), + /*7.0*/ HB_SCRIPT_MANICHAEAN = HB_TAG ('M','a','n','i'), + /*7.0*/ HB_SCRIPT_MENDE_KIKAKUI = HB_TAG ('M','e','n','d'), + /*7.0*/ HB_SCRIPT_MODI = HB_TAG ('M','o','d','i'), + /*7.0*/ HB_SCRIPT_MRO = HB_TAG ('M','r','o','o'), + /*7.0*/ HB_SCRIPT_NABATAEAN = HB_TAG ('N','b','a','t'), + /*7.0*/ HB_SCRIPT_OLD_NORTH_ARABIAN = HB_TAG ('N','a','r','b'), + /*7.0*/ HB_SCRIPT_OLD_PERMIC = HB_TAG ('P','e','r','m'), + /*7.0*/ HB_SCRIPT_PAHAWH_HMONG = HB_TAG ('H','m','n','g'), + /*7.0*/ HB_SCRIPT_PALMYRENE = HB_TAG ('P','a','l','m'), + /*7.0*/ HB_SCRIPT_PAU_CIN_HAU = HB_TAG ('P','a','u','c'), + /*7.0*/ HB_SCRIPT_PSALTER_PAHLAVI = HB_TAG ('P','h','l','p'), + /*7.0*/ HB_SCRIPT_SIDDHAM = HB_TAG ('S','i','d','d'), + /*7.0*/ HB_SCRIPT_TIRHUTA = HB_TAG ('T','i','r','h'), + /*7.0*/ HB_SCRIPT_WARANG_CITI = HB_TAG ('W','a','r','a'), + + /*8.0*/ HB_SCRIPT_AHOM = HB_TAG ('A','h','o','m'), + /*8.0*/ HB_SCRIPT_ANATOLIAN_HIEROGLYPHS = HB_TAG ('H','l','u','w'), + /*8.0*/ HB_SCRIPT_HATRAN = HB_TAG ('H','a','t','r'), + /*8.0*/ HB_SCRIPT_MULTANI = HB_TAG ('M','u','l','t'), + /*8.0*/ HB_SCRIPT_OLD_HUNGARIAN = HB_TAG ('H','u','n','g'), + /*8.0*/ HB_SCRIPT_SIGNWRITING = HB_TAG ('S','g','n','w'), + + /* + * Since 1.3.0 + */ + /*9.0*/ HB_SCRIPT_ADLAM = HB_TAG ('A','d','l','m'), + /*9.0*/ HB_SCRIPT_BHAIKSUKI = HB_TAG ('B','h','k','s'), + /*9.0*/ HB_SCRIPT_MARCHEN = HB_TAG ('M','a','r','c'), + /*9.0*/ HB_SCRIPT_OSAGE = HB_TAG ('O','s','g','e'), + /*9.0*/ HB_SCRIPT_TANGUT = HB_TAG ('T','a','n','g'), + /*9.0*/ HB_SCRIPT_NEWA = HB_TAG ('N','e','w','a'), + + /* + * Since 1.6.0 + */ + /*10.0*/HB_SCRIPT_MASARAM_GONDI = HB_TAG ('G','o','n','m'), + /*10.0*/HB_SCRIPT_NUSHU = HB_TAG ('N','s','h','u'), + /*10.0*/HB_SCRIPT_SOYOMBO = HB_TAG ('S','o','y','o'), + /*10.0*/HB_SCRIPT_ZANABAZAR_SQUARE = HB_TAG ('Z','a','n','b'), + + /* + * Since 1.8.0 + */ + /*11.0*/HB_SCRIPT_DOGRA = HB_TAG ('D','o','g','r'), + /*11.0*/HB_SCRIPT_GUNJALA_GONDI = HB_TAG ('G','o','n','g'), + /*11.0*/HB_SCRIPT_HANIFI_ROHINGYA = HB_TAG ('R','o','h','g'), + /*11.0*/HB_SCRIPT_MAKASAR = HB_TAG ('M','a','k','a'), + /*11.0*/HB_SCRIPT_MEDEFAIDRIN = HB_TAG ('M','e','d','f'), + /*11.0*/HB_SCRIPT_OLD_SOGDIAN = HB_TAG ('S','o','g','o'), + /*11.0*/HB_SCRIPT_SOGDIAN = HB_TAG ('S','o','g','d'), + + /* + * Since 2.4.0 + */ + /*12.0*/HB_SCRIPT_ELYMAIC = HB_TAG ('E','l','y','m'), + /*12.0*/HB_SCRIPT_NANDINAGARI = HB_TAG ('N','a','n','d'), + /*12.0*/HB_SCRIPT_NYIAKENG_PUACHUE_HMONG = HB_TAG ('H','m','n','p'), + /*12.0*/HB_SCRIPT_WANCHO = HB_TAG ('W','c','h','o'), + + /* No script set. */ + HB_SCRIPT_INVALID = HB_TAG_NONE, + + /* Dummy values to ensure any hb_tag_t value can be passed/stored as hb_script_t + * without risking undefined behavior. We have two, for historical reasons. + * HB_TAG_MAX used to be unsigned, but that was invalid Ansi C, so was changed + * to _HB_SCRIPT_MAX_VALUE to be equal to HB_TAG_MAX_SIGNED as well. + * + * See this thread for technicalities: + * + * https://lists.freedesktop.org/archives/harfbuzz/2014-March/004150.html + */ + _HB_SCRIPT_MAX_VALUE = HB_TAG_MAX_SIGNED, /*< skip >*/ + _HB_SCRIPT_MAX_VALUE_SIGNED = HB_TAG_MAX_SIGNED /*< skip >*/ + +} hb_script_t; + + +/* Script functions */ + +HB_EXTERN hb_script_t +hb_script_from_iso15924_tag (hb_tag_t tag); + +HB_EXTERN hb_script_t +hb_script_from_string (const char *str, int len); + +HB_EXTERN hb_tag_t +hb_script_to_iso15924_tag (hb_script_t script); + +HB_EXTERN hb_direction_t +hb_script_get_horizontal_direction (hb_script_t script); + + +/* User data */ + +typedef struct hb_user_data_key_t { + /*< private >*/ + char unused; +} hb_user_data_key_t; + +typedef void (*hb_destroy_func_t) (void *user_data); + + +/* Font features and variations. */ + +/** + * HB_FEATURE_GLOBAL_START + * + * Since: 2.0.0 + */ +#define HB_FEATURE_GLOBAL_START 0 +/** + * HB_FEATURE_GLOBAL_END + * + * Since: 2.0.0 + */ +#define HB_FEATURE_GLOBAL_END ((unsigned int) -1) + +typedef struct hb_feature_t { + hb_tag_t tag; + uint32_t value; + unsigned int start; + unsigned int end; +} hb_feature_t; + +HB_EXTERN hb_bool_t +hb_feature_from_string (const char *str, int len, + hb_feature_t *feature); + +HB_EXTERN void +hb_feature_to_string (hb_feature_t *feature, + char *buf, unsigned int size); + +/** + * hb_variation_t: + * + * Since: 1.4.2 + */ +typedef struct hb_variation_t { + hb_tag_t tag; + float value; +} hb_variation_t; + +HB_EXTERN hb_bool_t +hb_variation_from_string (const char *str, int len, + hb_variation_t *variation); + +HB_EXTERN void +hb_variation_to_string (hb_variation_t *variation, + char *buf, unsigned int size); + +/** + * hb_color_t: + * + * Data type for holding color values. + * + * Since: 2.1.0 + */ +typedef uint32_t hb_color_t; + +#define HB_COLOR(b,g,r,a) ((hb_color_t) HB_TAG ((b),(g),(r),(a))) + +HB_EXTERN uint8_t +hb_color_get_alpha (hb_color_t color); +#define hb_color_get_alpha(color) ((color) & 0xFF) + +HB_EXTERN uint8_t +hb_color_get_red (hb_color_t color); +#define hb_color_get_red(color) (((color) >> 8) & 0xFF) + +HB_EXTERN uint8_t +hb_color_get_green (hb_color_t color); +#define hb_color_get_green(color) (((color) >> 16) & 0xFF) + +HB_EXTERN uint8_t +hb_color_get_blue (hb_color_t color); +#define hb_color_get_blue(color) (((color) >> 24) & 0xFF) + +HB_END_DECLS + +#endif /* HB_COMMON_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-config.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-config.hh new file mode 100644 index 000000000..14c539595 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-config.hh @@ -0,0 +1,162 @@ +/* + * Copyright © 2019 Facebook, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Facebook Author(s): Behdad Esfahbod + */ + +#ifndef HB_CONFIG_HH +#define HB_CONFIG_HH + +#if 0 /* Make test happy. */ +#include "hb.hh" +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + + +#ifdef HB_TINY +#define HB_LEAN +#define HB_MINI +#define HB_NO_MT +#define HB_NO_UCD_UNASSIGNED +#ifndef NDEBUG +#define NDEBUG +#endif +#ifndef __OPTIMIZE_SIZE__ +#define __OPTIMIZE_SIZE__ +#endif +#endif + +#ifdef HB_LEAN +#define HB_DISABLE_DEPRECATED +#define HB_NDEBUG +#define HB_NO_ATEXIT +#define HB_NO_BUFFER_MESSAGE +#define HB_NO_BUFFER_SERIALIZE +#define HB_NO_BITMAP +#define HB_NO_CFF +#define HB_NO_COLOR +#define HB_NO_ERRNO +#define HB_NO_FACE_COLLECT_UNICODES +#define HB_NO_GETENV +#define HB_NO_HINTING +#define HB_NO_LANGUAGE_PRIVATE_SUBTAG +#define HB_NO_LAYOUT_FEATURE_PARAMS +#define HB_NO_LAYOUT_COLLECT_GLYPHS +#define HB_NO_LAYOUT_UNUSED +#define HB_NO_MATH +#define HB_NO_META +#define HB_NO_METRICS +#define HB_NO_MMAP +#define HB_NO_NAME +#define HB_NO_OPEN +#define HB_NO_SETLOCALE +#define HB_NO_OT_FONT_GLYPH_NAMES +#define HB_NO_OT_SHAPE_FRACTIONS +#define HB_NO_STAT +#define HB_NO_SUBSET_LAYOUT +#define HB_NO_VAR +#endif + +#ifdef HB_MINI +#define HB_NO_AAT +#define HB_NO_LEGACY +#endif + + +/* Closure of options. */ + +#ifdef HB_DISABLE_DEPRECATED +#define HB_IF_NOT_DEPRECATED(x) +#else +#define HB_IF_NOT_DEPRECATED(x) x +#endif + +#ifdef HB_NO_AAT +#define HB_NO_OT_NAME_LANGUAGE_AAT +#define HB_NO_AAT_SHAPE +#endif + +#ifdef HB_NO_BITMAP +#define HB_NO_OT_FONT_BITMAP +#endif + +#ifdef HB_NO_CFF +#define HB_NO_OT_FONT_CFF +#define HB_NO_SUBSET_CFF +#endif + +#ifdef HB_NO_GETENV +#define HB_NO_UNISCRIBE_BUG_COMPATIBLE +#endif + +#ifdef HB_NO_LEGACY +#define HB_NO_CMAP_LEGACY_SUBTABLES +#define HB_NO_FALLBACK_SHAPE +#define HB_NO_OT_KERN +#define HB_NO_OT_LAYOUT_BLACKLIST +#define HB_NO_OT_SHAPE_FALLBACK +#endif + +#ifdef HB_NO_NAME +#define HB_NO_OT_NAME_LANGUAGE +#endif + +#ifdef HB_NO_OT +#define HB_NO_OT_FONT +#define HB_NO_OT_LAYOUT +#define HB_NO_OT_TAG +#define HB_NO_OT_SHAPE +#endif + +#ifdef HB_NO_OT_SHAPE +#define HB_NO_AAT_SHAPE +#endif + +#ifdef HB_NO_OT_SHAPE_FALLBACK +#define HB_NO_OT_SHAPE_COMPLEX_ARABIC_FALLBACK +#define HB_NO_OT_SHAPE_COMPLEX_HEBREW_FALLBACK +#define HB_NO_OT_SHAPE_COMPLEX_THAI_FALLBACK +#define HB_NO_OT_SHAPE_COMPLEX_VOWEL_CONSTRAINTS +#endif + +#ifdef NDEBUG +#ifndef HB_NDEBUG +#define HB_NDEBUG +#endif +#endif + +#ifdef __OPTIMIZE_SIZE__ +#ifndef HB_OPTIMIZE_SIZE +#define HB_OPTIMIZE_SIZE +#endif +#endif + +#ifdef HAVE_CONFIG_OVERRIDE_H +#include "config-override.h" +#endif + + +#endif /* HB_CONFIG_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-coretext.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-coretext.cc new file mode 100644 index 000000000..8885cfe73 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-coretext.cc @@ -0,0 +1,1139 @@ +/* + * Copyright © 2012,2013 Mozilla Foundation. + * Copyright © 2012,2013 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Mozilla Author(s): Jonathan Kew + * Google Author(s): Behdad Esfahbod + */ + +#include "hb.hh" + +#ifdef HAVE_CORETEXT + +#include "hb-shaper-impl.hh" + +#include "hb-coretext.h" +#include "hb-aat-layout.hh" +#include + + +/** + * SECTION:hb-coretext + * @title: hb-coretext + * @short_description: CoreText integration + * @include: hb-coretext.h + * + * Functions for using HarfBuzz with the CoreText fonts. + **/ + +/* https://developer.apple.com/documentation/coretext/1508745-ctfontcreatewithgraphicsfont */ +#define HB_CORETEXT_DEFAULT_FONT_SIZE 12.f + +static void +release_table_data (void *user_data) +{ + CFDataRef cf_data = reinterpret_cast (user_data); + CFRelease(cf_data); +} + +static hb_blob_t * +_hb_cg_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data) +{ + CGFontRef cg_font = reinterpret_cast (user_data); + CFDataRef cf_data = CGFontCopyTableForTag (cg_font, tag); + if (unlikely (!cf_data)) + return nullptr; + + const char *data = reinterpret_cast (CFDataGetBytePtr (cf_data)); + const size_t length = CFDataGetLength (cf_data); + if (!data || !length) + { + CFRelease (cf_data); + return nullptr; + } + + return hb_blob_create (data, length, HB_MEMORY_MODE_READONLY, + reinterpret_cast (const_cast<__CFData *> (cf_data)), + release_table_data); +} + +static void +_hb_cg_font_release (void *data) +{ + CGFontRelease ((CGFontRef) data); +} + + +static CTFontDescriptorRef +get_last_resort_font_desc () +{ + // TODO Handle allocation failures? + CTFontDescriptorRef last_resort = CTFontDescriptorCreateWithNameAndSize (CFSTR("LastResort"), 0); + CFArrayRef cascade_list = CFArrayCreate (kCFAllocatorDefault, + (const void **) &last_resort, + 1, + &kCFTypeArrayCallBacks); + CFRelease (last_resort); + CFDictionaryRef attributes = CFDictionaryCreate (kCFAllocatorDefault, + (const void **) &kCTFontCascadeListAttribute, + (const void **) &cascade_list, + 1, + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + CFRelease (cascade_list); + + CTFontDescriptorRef font_desc = CTFontDescriptorCreateWithAttributes (attributes); + CFRelease (attributes); + return font_desc; +} + +static void +release_data (void *info, const void *data, size_t size) +{ + assert (hb_blob_get_length ((hb_blob_t *) info) == size && + hb_blob_get_data ((hb_blob_t *) info, nullptr) == data); + + hb_blob_destroy ((hb_blob_t *) info); +} + +static CGFontRef +create_cg_font (hb_face_t *face) +{ + CGFontRef cg_font = nullptr; + if (face->destroy == _hb_cg_font_release) + { + cg_font = CGFontRetain ((CGFontRef) face->user_data); + } + else + { + hb_blob_t *blob = hb_face_reference_blob (face); + unsigned int blob_length; + const char *blob_data = hb_blob_get_data (blob, &blob_length); + if (unlikely (!blob_length)) + DEBUG_MSG (CORETEXT, face, "Face has empty blob"); + + CGDataProviderRef provider = CGDataProviderCreateWithData (blob, blob_data, blob_length, &release_data); + if (likely (provider)) + { + cg_font = CGFontCreateWithDataProvider (provider); + if (unlikely (!cg_font)) + DEBUG_MSG (CORETEXT, face, "Face CGFontCreateWithDataProvider() failed"); + CGDataProviderRelease (provider); + } + } + return cg_font; +} + +static CTFontRef +create_ct_font (CGFontRef cg_font, CGFloat font_size) +{ + CTFontRef ct_font = nullptr; + + /* CoreText does not enable trak table usage / tracking when creating a CTFont + * using CTFontCreateWithGraphicsFont. The only way of enabling tracking seems + * to be through the CTFontCreateUIFontForLanguage call. */ + CFStringRef cg_postscript_name = CGFontCopyPostScriptName (cg_font); + if (CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSText")) || + CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSDisplay"))) + { +#if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1080 +# define kCTFontUIFontSystem kCTFontSystemFontType +# define kCTFontUIFontEmphasizedSystem kCTFontEmphasizedSystemFontType +#endif + CTFontUIFontType font_type = kCTFontUIFontSystem; + if (CFStringHasSuffix (cg_postscript_name, CFSTR ("-Bold"))) + font_type = kCTFontUIFontEmphasizedSystem; + + ct_font = CTFontCreateUIFontForLanguage (font_type, font_size, nullptr); + CFStringRef ct_result_name = CTFontCopyPostScriptName(ct_font); + if (CFStringCompare (ct_result_name, cg_postscript_name, 0) != kCFCompareEqualTo) + { + CFRelease(ct_font); + ct_font = nullptr; + } + CFRelease (ct_result_name); + } + CFRelease (cg_postscript_name); + + if (!ct_font) + ct_font = CTFontCreateWithGraphicsFont (cg_font, font_size, nullptr, nullptr); + + if (unlikely (!ct_font)) { + DEBUG_MSG (CORETEXT, cg_font, "Font CTFontCreateWithGraphicsFont() failed"); + return nullptr; + } + + /* crbug.com/576941 and crbug.com/625902 and the investigation in the latter + * bug indicate that the cascade list reconfiguration occasionally causes + * crashes in CoreText on OS X 10.9, thus let's skip this step on older + * operating system versions. Except for the emoji font, where _not_ + * reconfiguring the cascade list causes CoreText crashes. For details, see + * crbug.com/549610 */ + // 0x00070000 stands for "kCTVersionNumber10_10", see CoreText.h + if (&CTGetCoreTextVersion != nullptr && CTGetCoreTextVersion() < 0x00070000) { + CFStringRef fontName = CTFontCopyPostScriptName (ct_font); + bool isEmojiFont = CFStringCompare (fontName, CFSTR("AppleColorEmoji"), 0) == kCFCompareEqualTo; + CFRelease (fontName); + if (!isEmojiFont) + return ct_font; + } + + CFURLRef original_url = nullptr; +#if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060 + ATSFontRef atsFont; + FSRef fsref; + OSStatus status; + atsFont = CTFontGetPlatformFont (ct_font, NULL); + status = ATSFontGetFileReference (atsFont, &fsref); + if (status == noErr) + original_url = CFURLCreateFromFSRef (NULL, &fsref); +#else + original_url = (CFURLRef) CTFontCopyAttribute (ct_font, kCTFontURLAttribute); +#endif + + /* Create font copy with cascade list that has LastResort first; this speeds up CoreText + * font fallback which we don't need anyway. */ + { + CTFontDescriptorRef last_resort_font_desc = get_last_resort_font_desc (); + CTFontRef new_ct_font = CTFontCreateCopyWithAttributes (ct_font, 0.0, nullptr, last_resort_font_desc); + CFRelease (last_resort_font_desc); + if (new_ct_font) + { + /* The CTFontCreateCopyWithAttributes call fails to stay on the same font + * when reconfiguring the cascade list and may switch to a different font + * when there are fonts that go by the same name, since the descriptor is + * just name and size. + * + * Avoid reconfiguring the cascade lists if the new font is outside the + * system locations that we cannot access from the sandboxed renderer + * process in Blink. This can be detected by the new file URL location + * that the newly found font points to. */ + CFURLRef new_url = nullptr; +#if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060 + atsFont = CTFontGetPlatformFont (new_ct_font, NULL); + status = ATSFontGetFileReference (atsFont, &fsref); + if (status == noErr) + new_url = CFURLCreateFromFSRef (NULL, &fsref); +#else + new_url = (CFURLRef) CTFontCopyAttribute (new_ct_font, kCTFontURLAttribute); +#endif + // Keep reconfigured font if URL cannot be retrieved (seems to be the case + // on Mac OS 10.12 Sierra), speculative fix for crbug.com/625606 + if (!original_url || !new_url || CFEqual (original_url, new_url)) { + CFRelease (ct_font); + ct_font = new_ct_font; + } else { + CFRelease (new_ct_font); + DEBUG_MSG (CORETEXT, ct_font, "Discarding reconfigured CTFont, location changed."); + } + if (new_url) + CFRelease (new_url); + } + else + DEBUG_MSG (CORETEXT, ct_font, "Font copy with empty cascade list failed"); + } + + if (original_url) + CFRelease (original_url); + return ct_font; +} + +hb_coretext_face_data_t * +_hb_coretext_shaper_face_data_create (hb_face_t *face) +{ + CGFontRef cg_font = create_cg_font (face); + + if (unlikely (!cg_font)) + { + DEBUG_MSG (CORETEXT, face, "CGFont creation failed.."); + return nullptr; + } + + return (hb_coretext_face_data_t *) cg_font; +} + +void +_hb_coretext_shaper_face_data_destroy (hb_coretext_face_data_t *data) +{ + CFRelease ((CGFontRef) data); +} + +hb_face_t * +hb_coretext_face_create (CGFontRef cg_font) +{ + return hb_face_create_for_tables (_hb_cg_reference_table, CGFontRetain (cg_font), _hb_cg_font_release); +} + +/* + * Since: 0.9.10 + */ +CGFontRef +hb_coretext_face_get_cg_font (hb_face_t *face) +{ + return (CGFontRef) (const void *) face->data.coretext; +} + + +hb_coretext_font_data_t * +_hb_coretext_shaper_font_data_create (hb_font_t *font) +{ + hb_face_t *face = font->face; + const hb_coretext_face_data_t *face_data = face->data.coretext; + if (unlikely (!face_data)) return nullptr; + CGFontRef cg_font = (CGFontRef) (const void *) face->data.coretext; + + CGFloat font_size = (CGFloat) (font->ptem <= 0.f ? HB_CORETEXT_DEFAULT_FONT_SIZE : font->ptem); + CTFontRef ct_font = create_ct_font (cg_font, font_size); + + if (unlikely (!ct_font)) + { + DEBUG_MSG (CORETEXT, font, "CGFont creation failed.."); + return nullptr; + } + + return (hb_coretext_font_data_t *) ct_font; +} + +void +_hb_coretext_shaper_font_data_destroy (hb_coretext_font_data_t *data) +{ + CFRelease ((CTFontRef) data); +} + +static const hb_coretext_font_data_t * +hb_coretext_font_data_sync (hb_font_t *font) +{ +retry: + const hb_coretext_font_data_t *data = font->data.coretext; + if (unlikely (!data)) return nullptr; + + if (fabs (CTFontGetSize ((CTFontRef) data) - (CGFloat) font->ptem) > .5) + { + /* XXX-MT-bug + * Note that evaluating condition above can be dangerous if another thread + * got here first and destructed data. That's, as always, bad use pattern. + * If you modify the font (change font size), other threads must not be + * using it at the same time. However, since this check is delayed to + * when one actually tries to shape something, this is a XXX race condition + * (and the only one we have that I know of) right now. Ie. you modify the + * font size in one thread, then (supposedly safely) try to use it from two + * or more threads and BOOM! I'm not sure how to fix this. We want RCU. + */ + + /* Drop and recreate. */ + /* If someone dropped it in the mean time, throw it away and don't touch it. + * Otherwise, destruct it. */ + if (likely (font->data.coretext.cmpexch (const_cast (data), nullptr))) + _hb_coretext_shaper_font_data_destroy (const_cast (data)); + else + goto retry; + } + return font->data.coretext; +} + + +/* + * Since: 1.7.2 + */ +hb_font_t * +hb_coretext_font_create (CTFontRef ct_font) +{ + CGFontRef cg_font = CTFontCopyGraphicsFont (ct_font, nullptr); + hb_face_t *face = hb_coretext_face_create (cg_font); + CFRelease (cg_font); + hb_font_t *font = hb_font_create (face); + hb_face_destroy (face); + + if (unlikely (hb_object_is_immutable (font))) + return font; + + hb_font_set_ptem (font, CTFontGetSize (ct_font)); + + /* Let there be dragons here... */ + font->data.coretext.cmpexch (nullptr, (hb_coretext_font_data_t *) CFRetain (ct_font)); + + return font; +} + +CTFontRef +hb_coretext_font_get_ct_font (hb_font_t *font) +{ + const hb_coretext_font_data_t *data = hb_coretext_font_data_sync (font); + return data ? (CTFontRef) data : nullptr; +} + + +/* + * shaper + */ + +struct feature_record_t { + unsigned int feature; + unsigned int setting; +}; + +struct active_feature_t { + feature_record_t rec; + unsigned int order; + + HB_INTERNAL static int cmp (const void *pa, const void *pb) { + const active_feature_t *a = (const active_feature_t *) pa; + const active_feature_t *b = (const active_feature_t *) pb; + return a->rec.feature < b->rec.feature ? -1 : a->rec.feature > b->rec.feature ? 1 : + a->order < b->order ? -1 : a->order > b->order ? 1 : + a->rec.setting < b->rec.setting ? -1 : a->rec.setting > b->rec.setting ? 1 : + 0; + } + bool operator== (const active_feature_t *f) { + return cmp (this, f) == 0; + } +}; + +struct feature_event_t { + unsigned int index; + bool start; + active_feature_t feature; + + HB_INTERNAL static int cmp (const void *pa, const void *pb) { + const feature_event_t *a = (const feature_event_t *) pa; + const feature_event_t *b = (const feature_event_t *) pb; + return a->index < b->index ? -1 : a->index > b->index ? 1 : + a->start < b->start ? -1 : a->start > b->start ? 1 : + active_feature_t::cmp (&a->feature, &b->feature); + } +}; + +struct range_record_t { + CTFontRef font; + unsigned int index_first; /* == start */ + unsigned int index_last; /* == end - 1 */ +}; + + +hb_bool_t +_hb_coretext_shape (hb_shape_plan_t *shape_plan, + hb_font_t *font, + hb_buffer_t *buffer, + const hb_feature_t *features, + unsigned int num_features) +{ + hb_face_t *face = font->face; + CGFontRef cg_font = (CGFontRef) (const void *) face->data.coretext; + CTFontRef ct_font = (CTFontRef) hb_coretext_font_data_sync (font); + + CGFloat ct_font_size = CTFontGetSize (ct_font); + CGFloat x_mult = (CGFloat) font->x_scale / ct_font_size; + CGFloat y_mult = (CGFloat) font->y_scale / ct_font_size; + + /* Attach marks to their bases, to match the 'ot' shaper. + * Adapted from a very old version of hb-ot-shape:hb_form_clusters(). + * Note that this only makes us be closer to the 'ot' shaper, + * but by no means the same. For example, if there's + * B1 M1 B2 M2, and B1-B2 form a ligature, M2's cluster will + * continue pointing to B2 even though B2 was merged into B1's + * cluster... */ + if (buffer->cluster_level == HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES) + { + hb_unicode_funcs_t *unicode = buffer->unicode; + unsigned int count = buffer->len; + hb_glyph_info_t *info = buffer->info; + for (unsigned int i = 1; i < count; i++) + if (HB_UNICODE_GENERAL_CATEGORY_IS_MARK (unicode->general_category (info[i].codepoint))) + buffer->merge_clusters (i - 1, i + 1); + } + + hb_vector_t feature_records; + hb_vector_t range_records; + + /* + * Set up features. + * (copied + modified from code from hb-uniscribe.cc) + */ + if (num_features) + { + /* Sort features by start/end events. */ + hb_vector_t feature_events; + for (unsigned int i = 0; i < num_features; i++) + { + const hb_aat_feature_mapping_t * mapping = hb_aat_layout_find_feature_mapping (features[i].tag); + if (!mapping) + continue; + + active_feature_t feature; + feature.rec.feature = mapping->aatFeatureType; + feature.rec.setting = features[i].value ? mapping->selectorToEnable : mapping->selectorToDisable; + feature.order = i; + + feature_event_t *event; + + event = feature_events.push (); + event->index = features[i].start; + event->start = true; + event->feature = feature; + + event = feature_events.push (); + event->index = features[i].end; + event->start = false; + event->feature = feature; + } + feature_events.qsort (); + /* Add a strategic final event. */ + { + active_feature_t feature; + feature.rec.feature = HB_TAG_NONE; + feature.rec.setting = 0; + feature.order = num_features + 1; + + feature_event_t *event = feature_events.push (); + event->index = 0; /* This value does magic. */ + event->start = false; + event->feature = feature; + } + + /* Scan events and save features for each range. */ + hb_vector_t active_features; + unsigned int last_index = 0; + for (unsigned int i = 0; i < feature_events.length; i++) + { + feature_event_t *event = &feature_events[i]; + + if (event->index != last_index) + { + /* Save a snapshot of active features and the range. */ + range_record_t *range = range_records.push (); + + if (active_features.length) + { + CFMutableArrayRef features_array = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); + + /* TODO sort and resolve conflicting features? */ + /* active_features.qsort (); */ + for (unsigned int j = 0; j < active_features.length; j++) + { + CFStringRef keys[] = { + kCTFontFeatureTypeIdentifierKey, + kCTFontFeatureSelectorIdentifierKey + }; + CFNumberRef values[] = { + CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &active_features[j].rec.feature), + CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &active_features[j].rec.setting) + }; + static_assert ((ARRAY_LENGTH_CONST (keys) == ARRAY_LENGTH_CONST (values)), ""); + CFDictionaryRef dict = CFDictionaryCreate (kCFAllocatorDefault, + (const void **) keys, + (const void **) values, + ARRAY_LENGTH (keys), + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + for (unsigned int i = 0; i < ARRAY_LENGTH (values); i++) + CFRelease (values[i]); + + CFArrayAppendValue (features_array, dict); + CFRelease (dict); + + } + + CFDictionaryRef attributes = CFDictionaryCreate (kCFAllocatorDefault, + (const void **) &kCTFontFeatureSettingsAttribute, + (const void **) &features_array, + 1, + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + CFRelease (features_array); + + CTFontDescriptorRef font_desc = CTFontDescriptorCreateWithAttributes (attributes); + CFRelease (attributes); + + range->font = CTFontCreateCopyWithAttributes (ct_font, 0.0, nullptr, font_desc); + CFRelease (font_desc); + } + else + { + range->font = nullptr; + } + + range->index_first = last_index; + range->index_last = event->index - 1; + + last_index = event->index; + } + + if (event->start) + { + active_features.push (event->feature); + } else { + active_feature_t *feature = active_features.find (&event->feature); + if (feature) + active_features.remove (feature - active_features.arrayZ); + } + } + } + + unsigned int scratch_size; + hb_buffer_t::scratch_buffer_t *scratch = buffer->get_scratch_buffer (&scratch_size); + +#define ALLOCATE_ARRAY(Type, name, len, on_no_room) \ + Type *name = (Type *) scratch; \ + do { \ + unsigned int _consumed = DIV_CEIL ((len) * sizeof (Type), sizeof (*scratch)); \ + if (unlikely (_consumed > scratch_size)) \ + { \ + on_no_room; \ + assert (0); \ + } \ + scratch += _consumed; \ + scratch_size -= _consumed; \ + } while (0) + + ALLOCATE_ARRAY (UniChar, pchars, buffer->len * 2, /*nothing*/); + unsigned int chars_len = 0; + for (unsigned int i = 0; i < buffer->len; i++) { + hb_codepoint_t c = buffer->info[i].codepoint; + if (likely (c <= 0xFFFFu)) + pchars[chars_len++] = c; + else if (unlikely (c > 0x10FFFFu)) + pchars[chars_len++] = 0xFFFDu; + else { + pchars[chars_len++] = 0xD800u + ((c - 0x10000u) >> 10); + pchars[chars_len++] = 0xDC00u + ((c - 0x10000u) & ((1u << 10) - 1)); + } + } + + ALLOCATE_ARRAY (unsigned int, log_clusters, chars_len, /*nothing*/); + chars_len = 0; + for (unsigned int i = 0; i < buffer->len; i++) + { + hb_codepoint_t c = buffer->info[i].codepoint; + unsigned int cluster = buffer->info[i].cluster; + log_clusters[chars_len++] = cluster; + if (hb_in_range (c, 0x10000u, 0x10FFFFu)) + log_clusters[chars_len++] = cluster; /* Surrogates. */ + } + +#define FAIL(...) \ + HB_STMT_START { \ + DEBUG_MSG (CORETEXT, nullptr, __VA_ARGS__); \ + ret = false; \ + goto fail; \ + } HB_STMT_END + + bool ret = true; + CFStringRef string_ref = nullptr; + CTLineRef line = nullptr; + + if (false) + { +resize_and_retry: + DEBUG_MSG (CORETEXT, buffer, "Buffer resize"); + /* string_ref uses the scratch-buffer for backing store, and line references + * string_ref (via attr_string). We must release those before resizing buffer. */ + assert (string_ref); + assert (line); + CFRelease (string_ref); + CFRelease (line); + string_ref = nullptr; + line = nullptr; + + /* Get previous start-of-scratch-area, that we use later for readjusting + * our existing scratch arrays. */ + unsigned int old_scratch_used; + hb_buffer_t::scratch_buffer_t *old_scratch; + old_scratch = buffer->get_scratch_buffer (&old_scratch_used); + old_scratch_used = scratch - old_scratch; + + if (unlikely (!buffer->ensure (buffer->allocated * 2))) + FAIL ("Buffer resize failed"); + + /* Adjust scratch, pchars, and log_cluster arrays. This is ugly, but really the + * cleanest way to do without completely restructuring the rest of this shaper. */ + scratch = buffer->get_scratch_buffer (&scratch_size); + pchars = reinterpret_cast (((char *) scratch + ((char *) pchars - (char *) old_scratch))); + log_clusters = reinterpret_cast (((char *) scratch + ((char *) log_clusters - (char *) old_scratch))); + scratch += old_scratch_used; + scratch_size -= old_scratch_used; + } + { + string_ref = CFStringCreateWithCharactersNoCopy (nullptr, + pchars, chars_len, + kCFAllocatorNull); + if (unlikely (!string_ref)) + FAIL ("CFStringCreateWithCharactersNoCopy failed"); + + /* Create an attributed string, populate it, and create a line from it, then release attributed string. */ + { + CFMutableAttributedStringRef attr_string = CFAttributedStringCreateMutable (kCFAllocatorDefault, + chars_len); + if (unlikely (!attr_string)) + FAIL ("CFAttributedStringCreateMutable failed"); + CFAttributedStringReplaceString (attr_string, CFRangeMake (0, 0), string_ref); + if (HB_DIRECTION_IS_VERTICAL (buffer->props.direction)) + { + CFAttributedStringSetAttribute (attr_string, CFRangeMake (0, chars_len), + kCTVerticalFormsAttributeName, kCFBooleanTrue); + } + + if (buffer->props.language) + { +/* What's the iOS equivalent of this check? + * The symbols was introduced in iOS 7.0. + * At any rate, our fallback is safe and works fine. */ +#if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1090 +# define kCTLanguageAttributeName CFSTR ("NSLanguage") +#endif + CFStringRef lang = CFStringCreateWithCStringNoCopy (kCFAllocatorDefault, + hb_language_to_string (buffer->props.language), + kCFStringEncodingUTF8, + kCFAllocatorNull); + if (unlikely (!lang)) + { + CFRelease (attr_string); + FAIL ("CFStringCreateWithCStringNoCopy failed"); + } + CFAttributedStringSetAttribute (attr_string, CFRangeMake (0, chars_len), + kCTLanguageAttributeName, lang); + CFRelease (lang); + } + CFAttributedStringSetAttribute (attr_string, CFRangeMake (0, chars_len), + kCTFontAttributeName, ct_font); + + if (num_features && range_records.length) + { + unsigned int start = 0; + range_record_t *last_range = &range_records[0]; + for (unsigned int k = 0; k < chars_len; k++) + { + range_record_t *range = last_range; + while (log_clusters[k] < range->index_first) + range--; + while (log_clusters[k] > range->index_last) + range++; + if (range != last_range) + { + if (last_range->font) + CFAttributedStringSetAttribute (attr_string, CFRangeMake (start, k - start), + kCTFontAttributeName, last_range->font); + + start = k; + } + + last_range = range; + } + if (start != chars_len && last_range->font) + CFAttributedStringSetAttribute (attr_string, CFRangeMake (start, chars_len - start), + kCTFontAttributeName, last_range->font); + } + /* Enable/disable kern if requested. + * + * Note: once kern is disabled, reenabling it doesn't currently seem to work in CoreText. + */ + if (num_features) + { + unsigned int zeroint = 0; + CFNumberRef zero = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &zeroint); + for (unsigned int i = 0; i < num_features; i++) + { + const hb_feature_t &feature = features[i]; + if (feature.tag == HB_TAG('k','e','r','n') && + feature.start < chars_len && feature.start < feature.end) + { + CFRange feature_range = CFRangeMake (feature.start, + hb_min (feature.end, chars_len) - feature.start); + if (feature.value) + CFAttributedStringRemoveAttribute (attr_string, feature_range, kCTKernAttributeName); + else + CFAttributedStringSetAttribute (attr_string, feature_range, kCTKernAttributeName, zero); + } + } + CFRelease (zero); + } + + int level = HB_DIRECTION_IS_FORWARD (buffer->props.direction) ? 0 : 1; + CFNumberRef level_number = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &level); +#if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060 + extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel; +#endif + CFDictionaryRef options = CFDictionaryCreate (kCFAllocatorDefault, + (const void **) &kCTTypesetterOptionForcedEmbeddingLevel, + (const void **) &level_number, + 1, + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + CFRelease (level_number); + if (unlikely (!options)) + { + CFRelease (attr_string); + FAIL ("CFDictionaryCreate failed"); + } + + CTTypesetterRef typesetter = CTTypesetterCreateWithAttributedStringAndOptions (attr_string, options); + CFRelease (options); + CFRelease (attr_string); + if (unlikely (!typesetter)) + FAIL ("CTTypesetterCreateWithAttributedStringAndOptions failed"); + + line = CTTypesetterCreateLine (typesetter, CFRangeMake(0, 0)); + CFRelease (typesetter); + if (unlikely (!line)) + FAIL ("CTTypesetterCreateLine failed"); + } + + CFArrayRef glyph_runs = CTLineGetGlyphRuns (line); + unsigned int num_runs = CFArrayGetCount (glyph_runs); + DEBUG_MSG (CORETEXT, nullptr, "Num runs: %d", num_runs); + + buffer->len = 0; + uint32_t status_and = ~0, status_or = 0; + double advances_so_far = 0; + /* For right-to-left runs, CoreText returns the glyphs positioned such that + * any trailing whitespace is to the left of (0,0). Adjust coordinate system + * to fix for that. Test with any RTL string with trailing spaces. + * https://crbug.com/469028 + */ + if (HB_DIRECTION_IS_BACKWARD (buffer->props.direction)) + { + advances_so_far -= CTLineGetTrailingWhitespaceWidth (line); + if (HB_DIRECTION_IS_VERTICAL (buffer->props.direction)) + advances_so_far = -advances_so_far; + } + + const CFRange range_all = CFRangeMake (0, 0); + + for (unsigned int i = 0; i < num_runs; i++) + { + CTRunRef run = static_cast(CFArrayGetValueAtIndex (glyph_runs, i)); + CTRunStatus run_status = CTRunGetStatus (run); + status_or |= run_status; + status_and &= run_status; + DEBUG_MSG (CORETEXT, run, "CTRunStatus: %x", run_status); + double run_advance = CTRunGetTypographicBounds (run, range_all, nullptr, nullptr, nullptr); + if (HB_DIRECTION_IS_VERTICAL (buffer->props.direction)) + run_advance = -run_advance; + DEBUG_MSG (CORETEXT, run, "Run advance: %g", run_advance); + + /* CoreText does automatic font fallback (AKA "cascading") for characters + * not supported by the requested font, and provides no way to turn it off, + * so we must detect if the returned run uses a font other than the requested + * one and fill in the buffer with .notdef glyphs instead of random glyph + * indices from a different font. + */ + CFDictionaryRef attributes = CTRunGetAttributes (run); + CTFontRef run_ct_font = static_cast(CFDictionaryGetValue (attributes, kCTFontAttributeName)); + if (!CFEqual (run_ct_font, ct_font)) + { + /* The run doesn't use our main font instance. We have to figure out + * whether font fallback happened, or this is just CoreText giving us + * another CTFont using the same underlying CGFont. CoreText seems + * to do that in a variety of situations, one of which being vertical + * text, but also perhaps for caching reasons. + * + * First, see if it uses any of our subfonts created to set font features... + * + * Next, compare the CGFont to the one we used to create our fonts. + * Even this doesn't work all the time. + * + * Finally, we compare PS names, which I don't think are unique... + * + * Looks like if we really want to be sure here we have to modify the + * font to change the name table, similar to what we do in the uniscribe + * backend. + * + * However, even that wouldn't work if we were passed in the CGFont to + * construct a hb_face to begin with. + * + * See: https://github.com/harfbuzz/harfbuzz/pull/36 + * + * Also see: https://bugs.chromium.org/p/chromium/issues/detail?id=597098 + */ + bool matched = false; + for (unsigned int i = 0; i < range_records.length; i++) + if (range_records[i].font && CFEqual (run_ct_font, range_records[i].font)) + { + matched = true; + break; + } + if (!matched) + { + CGFontRef run_cg_font = CTFontCopyGraphicsFont (run_ct_font, nullptr); + if (run_cg_font) + { + matched = CFEqual (run_cg_font, cg_font); + CFRelease (run_cg_font); + } + } + if (!matched) + { + CFStringRef font_ps_name = CTFontCopyName (ct_font, kCTFontPostScriptNameKey); + CFStringRef run_ps_name = CTFontCopyName (run_ct_font, kCTFontPostScriptNameKey); + CFComparisonResult result = CFStringCompare (run_ps_name, font_ps_name, 0); + CFRelease (run_ps_name); + CFRelease (font_ps_name); + if (result == kCFCompareEqualTo) + matched = true; + } + if (!matched) + { + CFRange range = CTRunGetStringRange (run); + DEBUG_MSG (CORETEXT, run, "Run used fallback font: %ld..%ld", + range.location, range.location + range.length); + if (!buffer->ensure_inplace (buffer->len + range.length)) + goto resize_and_retry; + hb_glyph_info_t *info = buffer->info + buffer->len; + + hb_codepoint_t notdef = 0; + hb_direction_t dir = buffer->props.direction; + hb_position_t x_advance, y_advance, x_offset, y_offset; + hb_font_get_glyph_advance_for_direction (font, notdef, dir, &x_advance, &y_advance); + hb_font_get_glyph_origin_for_direction (font, notdef, dir, &x_offset, &y_offset); + hb_position_t advance = x_advance + y_advance; + x_offset = -x_offset; + y_offset = -y_offset; + + unsigned int old_len = buffer->len; + for (CFIndex j = range.location; j < range.location + range.length; j++) + { + UniChar ch = CFStringGetCharacterAtIndex (string_ref, j); + if (hb_in_range (ch, 0xDC00u, 0xDFFFu) && range.location < j) + { + ch = CFStringGetCharacterAtIndex (string_ref, j - 1); + if (hb_in_range (ch, 0xD800u, 0xDBFFu)) + /* This is the second of a surrogate pair. Don't need .notdef + * for this one. */ + continue; + } + if (buffer->unicode->is_default_ignorable (ch)) + continue; + + info->codepoint = notdef; + info->cluster = log_clusters[j]; + + info->mask = advance; + info->var1.i32 = x_offset; + info->var2.i32 = y_offset; + + info++; + buffer->len++; + } + if (HB_DIRECTION_IS_BACKWARD (buffer->props.direction)) + buffer->reverse_range (old_len, buffer->len); + advances_so_far += run_advance; + continue; + } + } + + unsigned int num_glyphs = CTRunGetGlyphCount (run); + if (num_glyphs == 0) + continue; + + if (!buffer->ensure_inplace (buffer->len + num_glyphs)) + goto resize_and_retry; + + hb_glyph_info_t *run_info = buffer->info + buffer->len; + + /* Testing used to indicate that CTRunGetGlyphsPtr, etc (almost?) always + * succeed, and so copying data to our own buffer will be rare. Reports + * have it that this changed in OS X 10.10 Yosemite, and nullptr is returned + * frequently. At any rate, we can test that codepath by setting USE_PTR + * to false. */ + +#define USE_PTR true + +#define SCRATCH_SAVE() \ + unsigned int scratch_size_saved = scratch_size; \ + hb_buffer_t::scratch_buffer_t *scratch_saved = scratch + +#define SCRATCH_RESTORE() \ + scratch_size = scratch_size_saved; \ + scratch = scratch_saved + + { /* Setup glyphs */ + SCRATCH_SAVE(); + const CGGlyph* glyphs = USE_PTR ? CTRunGetGlyphsPtr (run) : nullptr; + if (!glyphs) { + ALLOCATE_ARRAY (CGGlyph, glyph_buf, num_glyphs, goto resize_and_retry); + CTRunGetGlyphs (run, range_all, glyph_buf); + glyphs = glyph_buf; + } + const CFIndex* string_indices = USE_PTR ? CTRunGetStringIndicesPtr (run) : nullptr; + if (!string_indices) { + ALLOCATE_ARRAY (CFIndex, index_buf, num_glyphs, goto resize_and_retry); + CTRunGetStringIndices (run, range_all, index_buf); + string_indices = index_buf; + } + hb_glyph_info_t *info = run_info; + for (unsigned int j = 0; j < num_glyphs; j++) + { + info->codepoint = glyphs[j]; + info->cluster = log_clusters[string_indices[j]]; + info++; + } + SCRATCH_RESTORE(); + } + { + /* Setup positions. + * Note that CoreText does not return advances for glyphs. As such, + * for all but last glyph, we use the delta position to next glyph as + * advance (in the advance direction only), and for last glyph we set + * whatever is needed to make the whole run's advance add up. */ + SCRATCH_SAVE(); + const CGPoint* positions = USE_PTR ? CTRunGetPositionsPtr (run) : nullptr; + if (!positions) { + ALLOCATE_ARRAY (CGPoint, position_buf, num_glyphs, goto resize_and_retry); + CTRunGetPositions (run, range_all, position_buf); + positions = position_buf; + } + hb_glyph_info_t *info = run_info; + if (HB_DIRECTION_IS_HORIZONTAL (buffer->props.direction)) + { + hb_position_t x_offset = (positions[0].x - advances_so_far) * x_mult; + for (unsigned int j = 0; j < num_glyphs; j++) + { + double advance; + if (likely (j + 1 < num_glyphs)) + advance = positions[j + 1].x - positions[j].x; + else /* last glyph */ + advance = run_advance - (positions[j].x - positions[0].x); + info->mask = advance * x_mult; + info->var1.i32 = x_offset; + info->var2.i32 = positions[j].y * y_mult; + info++; + } + } + else + { + hb_position_t y_offset = (positions[0].y - advances_so_far) * y_mult; + for (unsigned int j = 0; j < num_glyphs; j++) + { + double advance; + if (likely (j + 1 < num_glyphs)) + advance = positions[j + 1].y - positions[j].y; + else /* last glyph */ + advance = run_advance - (positions[j].y - positions[0].y); + info->mask = advance * y_mult; + info->var1.i32 = positions[j].x * x_mult; + info->var2.i32 = y_offset; + info++; + } + } + SCRATCH_RESTORE(); + advances_so_far += run_advance; + } +#undef SCRATCH_RESTORE +#undef SCRATCH_SAVE +#undef USE_PTR +#undef ALLOCATE_ARRAY + + buffer->len += num_glyphs; + } + + /* Mac OS 10.6 doesn't have kCTTypesetterOptionForcedEmbeddingLevel, + * or if it does, it doesn't respect it. So we get runs with wrong + * directions. As such, disable the assert... It wouldn't crash, but + * cursoring will be off... + * + * https://crbug.com/419769 + */ + if (false) + { + /* Make sure all runs had the expected direction. */ + HB_UNUSED bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction); + assert (bool (status_and & kCTRunStatusRightToLeft) == backward); + assert (bool (status_or & kCTRunStatusRightToLeft) == backward); + } + + buffer->clear_positions (); + + unsigned int count = buffer->len; + hb_glyph_info_t *info = buffer->info; + hb_glyph_position_t *pos = buffer->pos; + if (HB_DIRECTION_IS_HORIZONTAL (buffer->props.direction)) + for (unsigned int i = 0; i < count; i++) + { + pos->x_advance = info->mask; + pos->x_offset = info->var1.i32; + pos->y_offset = info->var2.i32; + + info++, pos++; + } + else + for (unsigned int i = 0; i < count; i++) + { + pos->y_advance = info->mask; + pos->x_offset = info->var1.i32; + pos->y_offset = info->var2.i32; + + info++, pos++; + } + + /* Fix up clusters so that we never return out-of-order indices; + * if core text has reordered glyphs, we'll merge them to the + * beginning of the reordered cluster. CoreText is nice enough + * to tell us whenever it has produced nonmonotonic results... + * Note that we assume the input clusters were nonmonotonic to + * begin with. + * + * This does *not* mean we'll form the same clusters as Uniscribe + * or the native OT backend, only that the cluster indices will be + * monotonic in the output buffer. */ + if (count > 1 && (status_or & kCTRunStatusNonMonotonic)) + { + hb_glyph_info_t *info = buffer->info; + if (HB_DIRECTION_IS_FORWARD (buffer->props.direction)) + { + unsigned int cluster = info[count - 1].cluster; + for (unsigned int i = count - 1; i > 0; i--) + { + cluster = hb_min (cluster, info[i - 1].cluster); + info[i - 1].cluster = cluster; + } + } + else + { + unsigned int cluster = info[0].cluster; + for (unsigned int i = 1; i < count; i++) + { + cluster = hb_min (cluster, info[i].cluster); + info[i].cluster = cluster; + } + } + } + } + + buffer->unsafe_to_break_all (); + +#undef FAIL + +fail: + if (string_ref) + CFRelease (string_ref); + if (line) + CFRelease (line); + + for (unsigned int i = 0; i < range_records.length; i++) + if (range_records[i].font) + CFRelease (range_records[i].font); + + return ret; +} + + +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-coretext.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-coretext.h new file mode 100644 index 000000000..4b0a6f01b --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-coretext.h @@ -0,0 +1,64 @@ +/* + * Copyright © 2012 Mozilla Foundation. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Mozilla Author(s): Jonathan Kew + */ + +#ifndef HB_CORETEXT_H +#define HB_CORETEXT_H + +#include "hb.h" + +#include +#if TARGET_OS_IPHONE +# include +# include +#else +# include +#endif + +HB_BEGIN_DECLS + + +#define HB_CORETEXT_TAG_MORT HB_TAG('m','o','r','t') +#define HB_CORETEXT_TAG_MORX HB_TAG('m','o','r','x') +#define HB_CORETEXT_TAG_KERX HB_TAG('k','e','r','x') + + +HB_EXTERN hb_face_t * +hb_coretext_face_create (CGFontRef cg_font); + +HB_EXTERN hb_font_t * +hb_coretext_font_create (CTFontRef ct_font); + + +HB_EXTERN CGFontRef +hb_coretext_face_get_cg_font (hb_face_t *face); + +HB_EXTERN CTFontRef +hb_coretext_font_get_ct_font (hb_font_t *font); + + +HB_END_DECLS + +#endif /* HB_CORETEXT_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-debug.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-debug.hh new file mode 100644 index 000000000..a7e52c8cb --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-debug.hh @@ -0,0 +1,464 @@ +/* + * Copyright © 2017 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_DEBUG_HH +#define HB_DEBUG_HH + +#include "hb.hh" +#include "hb-atomic.hh" +#include "hb-algs.hh" + + +#ifndef HB_DEBUG +#define HB_DEBUG 0 +#endif + + +/* + * Global runtime options. + */ + +struct hb_options_t +{ + bool unused : 1; /* In-case sign bit is here. */ + bool initialized : 1; + bool uniscribe_bug_compatible : 1; + bool aat : 1; +}; + +union hb_options_union_t { + int i; + hb_options_t opts; +}; +static_assert ((sizeof (hb_atomic_int_t) >= sizeof (hb_options_union_t)), ""); + +HB_INTERNAL void +_hb_options_init (); + +extern HB_INTERNAL hb_atomic_int_t _hb_options; + +static inline hb_options_t +hb_options () +{ +#ifdef HB_NO_GETENV + return hb_options_t (); +#endif + /* Make a local copy, so we can access bitfield threadsafely. */ + hb_options_union_t u; + u.i = _hb_options.get_relaxed (); + + if (unlikely (!u.i)) + { + _hb_options_init (); + u.i = _hb_options.get_relaxed (); + } + + return u.opts; +} + + +/* + * Debug output (needs enabling at compile time.) + */ + +static inline bool +_hb_debug (unsigned int level, + unsigned int max_level) +{ + return level < max_level; +} + +#define DEBUG_LEVEL_ENABLED(WHAT, LEVEL) (_hb_debug ((LEVEL), HB_DEBUG_##WHAT)) +#define DEBUG_ENABLED(WHAT) (DEBUG_LEVEL_ENABLED (WHAT, 0)) + +static inline void +_hb_print_func (const char *func) +{ + if (func) + { + unsigned int func_len = strlen (func); + /* Skip "static" */ + if (0 == strncmp (func, "static ", 7)) + func += 7; + /* Skip "typename" */ + if (0 == strncmp (func, "typename ", 9)) + func += 9; + /* Skip return type */ + const char *space = strchr (func, ' '); + if (space) + func = space + 1; + /* Skip parameter list */ + const char *paren = strchr (func, '('); + if (paren) + func_len = paren - func; + fprintf (stderr, "%.*s", func_len, func); + } +} + +template static inline void +_hb_debug_msg_va (const char *what, + const void *obj, + const char *func, + bool indented, + unsigned int level, + int level_dir, + const char *message, + va_list ap) HB_PRINTF_FUNC(7, 0); +template static inline void +_hb_debug_msg_va (const char *what, + const void *obj, + const char *func, + bool indented, + unsigned int level, + int level_dir, + const char *message, + va_list ap) +{ + if (!_hb_debug (level, max_level)) + return; + + fprintf (stderr, "%-10s", what ? what : ""); + + if (obj) + fprintf (stderr, "(%*p) ", (unsigned int) (2 * sizeof (void *)), obj); + else + fprintf (stderr, " %*s ", (unsigned int) (2 * sizeof (void *)), ""); + + if (indented) { +#define VBAR "\342\224\202" /* U+2502 BOX DRAWINGS LIGHT VERTICAL */ +#define VRBAR "\342\224\234" /* U+251C BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ +#define DLBAR "\342\225\256" /* U+256E BOX DRAWINGS LIGHT ARC DOWN AND LEFT */ +#define ULBAR "\342\225\257" /* U+256F BOX DRAWINGS LIGHT ARC UP AND LEFT */ +#define LBAR "\342\225\264" /* U+2574 BOX DRAWINGS LIGHT LEFT */ + static const char bars[] = + VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR + VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR + VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR + VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR + VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR; + fprintf (stderr, "%2u %s" VRBAR "%s", + level, + bars + sizeof (bars) - 1 - hb_min ((unsigned int) sizeof (bars) - 1, (unsigned int) (sizeof (VBAR) - 1) * level), + level_dir ? (level_dir > 0 ? DLBAR : ULBAR) : LBAR); + } else + fprintf (stderr, " " VRBAR LBAR); + + _hb_print_func (func); + + if (message) + { + fprintf (stderr, ": "); + vfprintf (stderr, message, ap); + } + + fprintf (stderr, "\n"); +} +template <> inline void HB_PRINTF_FUNC(7, 0) +_hb_debug_msg_va<0> (const char *what HB_UNUSED, + const void *obj HB_UNUSED, + const char *func HB_UNUSED, + bool indented HB_UNUSED, + unsigned int level HB_UNUSED, + int level_dir HB_UNUSED, + const char *message HB_UNUSED, + va_list ap HB_UNUSED) {} + +template static inline void +_hb_debug_msg (const char *what, + const void *obj, + const char *func, + bool indented, + unsigned int level, + int level_dir, + const char *message, + ...) HB_PRINTF_FUNC(7, 8); +template static inline void HB_PRINTF_FUNC(7, 8) +_hb_debug_msg (const char *what, + const void *obj, + const char *func, + bool indented, + unsigned int level, + int level_dir, + const char *message, + ...) +{ + va_list ap; + va_start (ap, message); + _hb_debug_msg_va (what, obj, func, indented, level, level_dir, message, ap); + va_end (ap); +} +template <> inline void +_hb_debug_msg<0> (const char *what HB_UNUSED, + const void *obj HB_UNUSED, + const char *func HB_UNUSED, + bool indented HB_UNUSED, + unsigned int level HB_UNUSED, + int level_dir HB_UNUSED, + const char *message HB_UNUSED, + ...) HB_PRINTF_FUNC(7, 8); +template <> inline void HB_PRINTF_FUNC(7, 8) +_hb_debug_msg<0> (const char *what HB_UNUSED, + const void *obj HB_UNUSED, + const char *func HB_UNUSED, + bool indented HB_UNUSED, + unsigned int level HB_UNUSED, + int level_dir HB_UNUSED, + const char *message HB_UNUSED, + ...) {} + +#define DEBUG_MSG_LEVEL(WHAT, OBJ, LEVEL, LEVEL_DIR, ...) _hb_debug_msg (#WHAT, (OBJ), nullptr, true, (LEVEL), (LEVEL_DIR), __VA_ARGS__) +#define DEBUG_MSG(WHAT, OBJ, ...) _hb_debug_msg (#WHAT, (OBJ), nullptr, false, 0, 0, __VA_ARGS__) +#define DEBUG_MSG_FUNC(WHAT, OBJ, ...) _hb_debug_msg (#WHAT, (OBJ), HB_FUNC, false, 0, 0, __VA_ARGS__) + + +/* + * Printer + */ + +template +struct hb_printer_t { + const char *print (const T&) { return "something"; } +}; + +template <> +struct hb_printer_t { + const char *print (bool v) { return v ? "true" : "false"; } +}; + +template <> +struct hb_printer_t { + const char *print (hb_empty_t) { return ""; } +}; + + +/* + * Trace + */ + +template +static inline void _hb_warn_no_return (bool returned) +{ + if (unlikely (!returned)) { + fprintf (stderr, "OUCH, returned with no call to return_trace(). This is a bug, please report.\n"); + } +} +template <> +/*static*/ inline void _hb_warn_no_return (bool returned HB_UNUSED) +{} + +template +struct hb_auto_trace_t +{ + explicit inline hb_auto_trace_t (unsigned int *plevel_, + const char *what_, + const void *obj_, + const char *func, + const char *message, + ...) HB_PRINTF_FUNC(6, 7) + : plevel (plevel_), what (what_), obj (obj_), returned (false) + { + if (plevel) ++*plevel; + + va_list ap; + va_start (ap, message); + _hb_debug_msg_va (what, obj, func, true, plevel ? *plevel : 0, +1, message, ap); + va_end (ap); + } + ~hb_auto_trace_t () + { + _hb_warn_no_return (returned); + if (!returned) { + _hb_debug_msg (what, obj, nullptr, true, plevel ? *plevel : 1, -1, " "); + } + if (plevel) --*plevel; + } + + template + T ret (T&& v, + const char *func = "", + unsigned int line = 0) + { + if (unlikely (returned)) { + fprintf (stderr, "OUCH, double calls to return_trace(). This is a bug, please report.\n"); + return hb_forward (v); + } + + _hb_debug_msg (what, obj, func, true, plevel ? *plevel : 1, -1, + "return %s (line %d)", + hb_printer_t().print (v), line); + if (plevel) --*plevel; + plevel = nullptr; + returned = true; + return hb_forward (v); + } + + private: + unsigned int *plevel; + const char *what; + const void *obj; + bool returned; +}; +template /* Make sure we don't use hb_auto_trace_t when not tracing. */ +struct hb_auto_trace_t<0, ret_t> +{ + explicit inline hb_auto_trace_t (unsigned int *plevel_, + const char *what_, + const void *obj_, + const char *func, + const char *message, + ...) HB_PRINTF_FUNC(6, 7) {} + + template + T ret (T&& v, + const char *func HB_UNUSED = nullptr, + unsigned int line HB_UNUSED = 0) { return hb_forward (v); } +}; + +/* For disabled tracing; optimize out everything. + * https://github.com/harfbuzz/harfbuzz/pull/605 */ +template +struct hb_no_trace_t { + template + T ret (T&& v, + const char *func HB_UNUSED = nullptr, + unsigned int line HB_UNUSED = 0) { return hb_forward (v); } +}; + +#define return_trace(RET) return trace.ret (RET, HB_FUNC, __LINE__) + + +/* + * Instances. + */ + +#ifndef HB_DEBUG_ARABIC +#define HB_DEBUG_ARABIC (HB_DEBUG+0) +#endif + +#ifndef HB_DEBUG_BLOB +#define HB_DEBUG_BLOB (HB_DEBUG+0) +#endif + +#ifndef HB_DEBUG_CORETEXT +#define HB_DEBUG_CORETEXT (HB_DEBUG+0) +#endif + +#ifndef HB_DEBUG_DIRECTWRITE +#define HB_DEBUG_DIRECTWRITE (HB_DEBUG+0) +#endif + +#ifndef HB_DEBUG_FT +#define HB_DEBUG_FT (HB_DEBUG+0) +#endif + +#ifndef HB_DEBUG_GET_COVERAGE +#define HB_DEBUG_GET_COVERAGE (HB_DEBUG+0) +#endif + +#ifndef HB_DEBUG_OBJECT +#define HB_DEBUG_OBJECT (HB_DEBUG+0) +#endif + +#ifndef HB_DEBUG_SHAPE_PLAN +#define HB_DEBUG_SHAPE_PLAN (HB_DEBUG+0) +#endif + +#ifndef HB_DEBUG_UNISCRIBE +#define HB_DEBUG_UNISCRIBE (HB_DEBUG+0) +#endif + +/* + * With tracing. + */ + +#ifndef HB_DEBUG_APPLY +#define HB_DEBUG_APPLY (HB_DEBUG+0) +#endif +#if HB_DEBUG_APPLY +#define TRACE_APPLY(this) \ + hb_auto_trace_t trace \ + (&c->debug_depth, c->get_name (), this, HB_FUNC, \ + "idx %d gid %u lookup %d", \ + c->buffer->idx, c->buffer->cur().codepoint, (int) c->lookup_index) +#else +#define TRACE_APPLY(this) hb_no_trace_t trace +#endif + +#ifndef HB_DEBUG_SANITIZE +#define HB_DEBUG_SANITIZE (HB_DEBUG+0) +#endif +#if HB_DEBUG_SANITIZE +#define TRACE_SANITIZE(this) \ + hb_auto_trace_t trace \ + (&c->debug_depth, c->get_name (), this, HB_FUNC, \ + " ") +#else +#define TRACE_SANITIZE(this) hb_no_trace_t trace +#endif + +#ifndef HB_DEBUG_SERIALIZE +#define HB_DEBUG_SERIALIZE (HB_DEBUG+0) +#endif +#if HB_DEBUG_SERIALIZE +#define TRACE_SERIALIZE(this) \ + hb_auto_trace_t trace \ + (&c->debug_depth, "SERIALIZE", c, HB_FUNC, \ + " ") +#else +#define TRACE_SERIALIZE(this) hb_no_trace_t trace +#endif + +#ifndef HB_DEBUG_SUBSET +#define HB_DEBUG_SUBSET (HB_DEBUG+0) +#endif +#if HB_DEBUG_SUBSET +#define TRACE_SUBSET(this) \ + hb_auto_trace_t trace \ + (&c->debug_depth, c->get_name (), this, HB_FUNC, \ + " ") +#else +#define TRACE_SUBSET(this) hb_no_trace_t trace +#endif + +#ifndef HB_DEBUG_DISPATCH +#define HB_DEBUG_DISPATCH ( \ + HB_DEBUG_APPLY + \ + HB_DEBUG_SANITIZE + \ + HB_DEBUG_SERIALIZE + \ + HB_DEBUG_SUBSET + \ + 0) +#endif +#if HB_DEBUG_DISPATCH +#define TRACE_DISPATCH(this, format) \ + hb_auto_trace_t trace \ + (&c->debug_depth, c->get_name (), this, HB_FUNC, \ + "format %d", (int) format) +#else +#define TRACE_DISPATCH(this, format) hb_no_trace_t trace +#endif + + +#endif /* HB_DEBUG_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-deprecated.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-deprecated.h new file mode 100644 index 000000000..43f89a4c4 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-deprecated.h @@ -0,0 +1,195 @@ +/* + * Copyright © 2013 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_H_IN +#error "Include instead." +#endif + +#ifndef HB_DEPRECATED_H +#define HB_DEPRECATED_H + +#include "hb-common.h" +#include "hb-unicode.h" +#include "hb-font.h" +#include "hb-set.h" + + +/** + * SECTION:hb-deprecated + * @title: hb-deprecated + * @short_description: Deprecated API + * @include: hb.h + * + * These API have been deprecated in favor of newer API, or because they + * were deemed unnecessary. + **/ + + +HB_BEGIN_DECLS + +#ifndef HB_DISABLE_DEPRECATED + + +#define HB_SCRIPT_CANADIAN_ABORIGINAL HB_SCRIPT_CANADIAN_SYLLABICS + +#define HB_BUFFER_FLAGS_DEFAULT HB_BUFFER_FLAG_DEFAULT +#define HB_BUFFER_SERIALIZE_FLAGS_DEFAULT HB_BUFFER_SERIALIZE_FLAG_DEFAULT + +typedef hb_bool_t (*hb_font_get_glyph_func_t) (hb_font_t *font, void *font_data, + hb_codepoint_t unicode, hb_codepoint_t variation_selector, + hb_codepoint_t *glyph, + void *user_data); + +HB_EXTERN HB_DEPRECATED_FOR(hb_font_funcs_set_nominal_glyph_func and hb_font_funcs_set_variation_glyph_func) void +hb_font_funcs_set_glyph_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_func_t func, + void *user_data, hb_destroy_func_t destroy); + +HB_EXTERN HB_DEPRECATED void +hb_set_invert (hb_set_t *set); + +/** + * hb_unicode_eastasian_width_func_t: + * + * Deprecated: 2.0.0 + */ +typedef unsigned int (*hb_unicode_eastasian_width_func_t) (hb_unicode_funcs_t *ufuncs, + hb_codepoint_t unicode, + void *user_data); + +/** + * hb_unicode_funcs_set_eastasian_width_func: + * @ufuncs: a Unicode function structure + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + * Deprecated: 2.0.0 + **/ +HB_EXTERN HB_DEPRECATED void +hb_unicode_funcs_set_eastasian_width_func (hb_unicode_funcs_t *ufuncs, + hb_unicode_eastasian_width_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_unicode_eastasian_width: + * + * Since: 0.9.2 + * Deprecated: 2.0.0 + **/ +HB_EXTERN HB_DEPRECATED unsigned int +hb_unicode_eastasian_width (hb_unicode_funcs_t *ufuncs, + hb_codepoint_t unicode); + + +/** + * hb_unicode_decompose_compatibility_func_t: + * @ufuncs: a Unicode function structure + * @u: codepoint to decompose + * @decomposed: address of codepoint array (of length %HB_UNICODE_MAX_DECOMPOSITION_LEN) to write decomposition into + * @user_data: user data pointer as passed to hb_unicode_funcs_set_decompose_compatibility_func() + * + * Fully decompose @u to its Unicode compatibility decomposition. The codepoints of the decomposition will be written to @decomposed. + * The complete length of the decomposition will be returned. + * + * If @u has no compatibility decomposition, zero should be returned. + * + * The Unicode standard guarantees that a buffer of length %HB_UNICODE_MAX_DECOMPOSITION_LEN codepoints will always be sufficient for any + * compatibility decomposition plus an terminating value of 0. Consequently, @decompose must be allocated by the caller to be at least this length. Implementations + * of this function type must ensure that they do not write past the provided array. + * + * Return value: number of codepoints in the full compatibility decomposition of @u, or 0 if no decomposition available. + * + * Deprecated: 2.0.0 + */ +typedef unsigned int (*hb_unicode_decompose_compatibility_func_t) (hb_unicode_funcs_t *ufuncs, + hb_codepoint_t u, + hb_codepoint_t *decomposed, + void *user_data); + +/** + * HB_UNICODE_MAX_DECOMPOSITION_LEN: + * + * See Unicode 6.1 for details on the maximum decomposition length. + * + * Deprecated: 2.0.0 + */ +#define HB_UNICODE_MAX_DECOMPOSITION_LEN (18+1) /* codepoints */ + +/** + * hb_unicode_funcs_set_decompose_compatibility_func: + * @ufuncs: a Unicode function structure + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + * Deprecated: 2.0.0 + **/ +HB_EXTERN HB_DEPRECATED void +hb_unicode_funcs_set_decompose_compatibility_func (hb_unicode_funcs_t *ufuncs, + hb_unicode_decompose_compatibility_func_t func, + void *user_data, hb_destroy_func_t destroy); + +HB_EXTERN HB_DEPRECATED unsigned int +hb_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs, + hb_codepoint_t u, + hb_codepoint_t *decomposed); + + +typedef hb_font_get_glyph_kerning_func_t hb_font_get_glyph_v_kerning_func_t; + +/** + * hb_font_funcs_set_glyph_v_kerning_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + * Deprecated: 2.0.0 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_v_kerning_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_v_kerning_func_t func, + void *user_data, hb_destroy_func_t destroy); + +HB_EXTERN hb_position_t +hb_font_get_glyph_v_kerning (hb_font_t *font, + hb_codepoint_t top_glyph, hb_codepoint_t bottom_glyph); + +#endif + +HB_END_DECLS + +#endif /* HB_DEPRECATED_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.cc new file mode 100644 index 000000000..efb2029ec --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.cc @@ -0,0 +1,979 @@ +/* + * Copyright © 2015-2019 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#include "hb.hh" + +#ifdef HAVE_DIRECTWRITE + +#include "hb-shaper-impl.hh" + +#include + +#include "hb-directwrite.h" + + +/* Declare object creator for dynamic support of DWRITE */ +typedef HRESULT (* WINAPI t_DWriteCreateFactory)( + DWRITE_FACTORY_TYPE factoryType, + REFIID iid, + IUnknown **factory +); + +/* + * hb-directwrite uses new/delete syntatically but as we let users + * to override malloc/free, we will redefine new/delete so users + * won't need to do that by their own. + */ +void* operator new (size_t size) { return malloc (size); } +void* operator new [] (size_t size) { return malloc (size); } +void operator delete (void* pointer) { free (pointer); } +void operator delete [] (void* pointer) { free (pointer); } + + +/* + * DirectWrite font stream helpers + */ + +// This is a font loader which provides only one font (unlike its original design). +// For a better implementation which was also source of this +// and DWriteFontFileStream, have a look at to NativeFontResourceDWrite.cpp in Mozilla +class DWriteFontFileLoader : public IDWriteFontFileLoader +{ +private: + IDWriteFontFileStream *mFontFileStream; +public: + DWriteFontFileLoader (IDWriteFontFileStream *fontFileStream) + { mFontFileStream = fontFileStream; } + + // IUnknown interface + IFACEMETHOD (QueryInterface) (IID const& iid, OUT void** ppObject) + { return S_OK; } + IFACEMETHOD_ (ULONG, AddRef) () { return 1; } + IFACEMETHOD_ (ULONG, Release) () { return 1; } + + // IDWriteFontFileLoader methods + virtual HRESULT STDMETHODCALLTYPE + CreateStreamFromKey (void const* fontFileReferenceKey, + uint32_t fontFileReferenceKeySize, + OUT IDWriteFontFileStream** fontFileStream) + { + *fontFileStream = mFontFileStream; + return S_OK; + } + + virtual ~DWriteFontFileLoader() {} +}; + +class DWriteFontFileStream : public IDWriteFontFileStream +{ +private: + uint8_t *mData; + uint32_t mSize; +public: + DWriteFontFileStream (uint8_t *aData, uint32_t aSize) + { + mData = aData; + mSize = aSize; + } + + // IUnknown interface + IFACEMETHOD (QueryInterface) (IID const& iid, OUT void** ppObject) + { return S_OK; } + IFACEMETHOD_ (ULONG, AddRef) () { return 1; } + IFACEMETHOD_ (ULONG, Release) () { return 1; } + + // IDWriteFontFileStream methods + virtual HRESULT STDMETHODCALLTYPE + ReadFileFragment (void const** fragmentStart, + UINT64 fileOffset, + UINT64 fragmentSize, + OUT void** fragmentContext) + { + // We are required to do bounds checking. + if (fileOffset + fragmentSize > mSize) return E_FAIL; + + // truncate the 64 bit fileOffset to size_t sized index into mData + size_t index = static_cast (fileOffset); + + // We should be alive for the duration of this. + *fragmentStart = &mData[index]; + *fragmentContext = nullptr; + return S_OK; + } + + virtual void STDMETHODCALLTYPE + ReleaseFileFragment (void* fragmentContext) {} + + virtual HRESULT STDMETHODCALLTYPE + GetFileSize (OUT UINT64* fileSize) + { + *fileSize = mSize; + return S_OK; + } + + virtual HRESULT STDMETHODCALLTYPE + GetLastWriteTime (OUT UINT64* lastWriteTime) { return E_NOTIMPL; } + + virtual ~DWriteFontFileStream() {} +}; + + +/* +* shaper face data +*/ + +struct hb_directwrite_face_data_t +{ + HMODULE dwrite_dll; + IDWriteFactory *dwriteFactory; + IDWriteFontFile *fontFile; + DWriteFontFileStream *fontFileStream; + DWriteFontFileLoader *fontFileLoader; + IDWriteFontFace *fontFace; + hb_blob_t *faceBlob; +}; + +hb_directwrite_face_data_t * +_hb_directwrite_shaper_face_data_create (hb_face_t *face) +{ + hb_directwrite_face_data_t *data = new hb_directwrite_face_data_t; + if (unlikely (!data)) + return nullptr; + +#define FAIL(...) \ + HB_STMT_START { \ + DEBUG_MSG (DIRECTWRITE, nullptr, __VA_ARGS__); \ + return nullptr; \ + } HB_STMT_END + + data->dwrite_dll = LoadLibrary (TEXT ("DWRITE")); + if (unlikely (!data->dwrite_dll)) + FAIL ("Cannot find DWrite.DLL"); + + t_DWriteCreateFactory p_DWriteCreateFactory; + +#if defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wcast-function-type" +#endif + + p_DWriteCreateFactory = (t_DWriteCreateFactory) + GetProcAddress (data->dwrite_dll, "DWriteCreateFactory"); + +#if defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + if (unlikely (!p_DWriteCreateFactory)) + FAIL ("Cannot find DWriteCreateFactory()."); + + HRESULT hr; + + // TODO: factory and fontFileLoader should be cached separately + IDWriteFactory* dwriteFactory; + hr = p_DWriteCreateFactory (DWRITE_FACTORY_TYPE_SHARED, __uuidof (IDWriteFactory), + (IUnknown**) &dwriteFactory); + + if (unlikely (hr != S_OK)) + FAIL ("Failed to run DWriteCreateFactory()."); + + hb_blob_t *blob = hb_face_reference_blob (face); + DWriteFontFileStream *fontFileStream; + fontFileStream = new DWriteFontFileStream ((uint8_t *) hb_blob_get_data (blob, nullptr), + hb_blob_get_length (blob)); + + DWriteFontFileLoader *fontFileLoader = new DWriteFontFileLoader (fontFileStream); + dwriteFactory->RegisterFontFileLoader (fontFileLoader); + + IDWriteFontFile *fontFile; + uint64_t fontFileKey = 0; + hr = dwriteFactory->CreateCustomFontFileReference (&fontFileKey, sizeof (fontFileKey), + fontFileLoader, &fontFile); + + if (FAILED (hr)) + FAIL ("Failed to load font file from data!"); + + BOOL isSupported; + DWRITE_FONT_FILE_TYPE fileType; + DWRITE_FONT_FACE_TYPE faceType; + uint32_t numberOfFaces; + hr = fontFile->Analyze (&isSupported, &fileType, &faceType, &numberOfFaces); + if (FAILED (hr) || !isSupported) + FAIL ("Font file is not supported."); + +#undef FAIL + + IDWriteFontFace *fontFace; + dwriteFactory->CreateFontFace (faceType, 1, &fontFile, 0, + DWRITE_FONT_SIMULATIONS_NONE, &fontFace); + + data->dwriteFactory = dwriteFactory; + data->fontFile = fontFile; + data->fontFileStream = fontFileStream; + data->fontFileLoader = fontFileLoader; + data->fontFace = fontFace; + data->faceBlob = blob; + + return data; +} + +void +_hb_directwrite_shaper_face_data_destroy (hb_directwrite_face_data_t *data) +{ + if (data->fontFace) + data->fontFace->Release (); + if (data->fontFile) + data->fontFile->Release (); + if (data->dwriteFactory) + { + if (data->fontFileLoader) + data->dwriteFactory->UnregisterFontFileLoader (data->fontFileLoader); + data->dwriteFactory->Release (); + } + if (data->fontFileLoader) + delete data->fontFileLoader; + if (data->fontFileStream) + delete data->fontFileStream; + if (data->faceBlob) + hb_blob_destroy (data->faceBlob); + if (data->dwrite_dll) + FreeLibrary (data->dwrite_dll); + if (data) + delete data; +} + + +/* + * shaper font data + */ + +struct hb_directwrite_font_data_t {}; + +hb_directwrite_font_data_t * +_hb_directwrite_shaper_font_data_create (hb_font_t *font) +{ + hb_directwrite_font_data_t *data = new hb_directwrite_font_data_t; + if (unlikely (!data)) + return nullptr; + + return data; +} + +void +_hb_directwrite_shaper_font_data_destroy (hb_directwrite_font_data_t *data) +{ + delete data; +} + + +// Most of TextAnalysis is originally written by Bas Schouten for Mozilla project +// but now is relicensed to MIT for HarfBuzz use +class TextAnalysis : public IDWriteTextAnalysisSource, public IDWriteTextAnalysisSink +{ +public: + + IFACEMETHOD (QueryInterface) (IID const& iid, OUT void** ppObject) + { return S_OK; } + IFACEMETHOD_ (ULONG, AddRef) () { return 1; } + IFACEMETHOD_ (ULONG, Release) () { return 1; } + + // A single contiguous run of characters containing the same analysis + // results. + struct Run + { + uint32_t mTextStart; // starting text position of this run + uint32_t mTextLength; // number of contiguous code units covered + uint32_t mGlyphStart; // starting glyph in the glyphs array + uint32_t mGlyphCount; // number of glyphs associated with this run + // text + DWRITE_SCRIPT_ANALYSIS mScript; + uint8_t mBidiLevel; + bool mIsSideways; + + bool ContainsTextPosition (uint32_t aTextPosition) const + { + return aTextPosition >= mTextStart && + aTextPosition < mTextStart + mTextLength; + } + + Run *nextRun; + }; + +public: + TextAnalysis (const wchar_t* text, uint32_t textLength, + const wchar_t* localeName, DWRITE_READING_DIRECTION readingDirection) + : mTextLength (textLength), mText (text), mLocaleName (localeName), + mReadingDirection (readingDirection), mCurrentRun (nullptr) {} + ~TextAnalysis () + { + // delete runs, except mRunHead which is part of the TextAnalysis object + for (Run *run = mRunHead.nextRun; run;) + { + Run *origRun = run; + run = run->nextRun; + delete origRun; + } + } + + STDMETHODIMP + GenerateResults (IDWriteTextAnalyzer* textAnalyzer, Run **runHead) + { + // Analyzes the text using the script analyzer and returns + // the result as a series of runs. + + HRESULT hr = S_OK; + + // Initially start out with one result that covers the entire range. + // This result will be subdivided by the analysis processes. + mRunHead.mTextStart = 0; + mRunHead.mTextLength = mTextLength; + mRunHead.mBidiLevel = + (mReadingDirection == DWRITE_READING_DIRECTION_RIGHT_TO_LEFT); + mRunHead.nextRun = nullptr; + mCurrentRun = &mRunHead; + + // Call each of the analyzers in sequence, recording their results. + if (SUCCEEDED (hr = textAnalyzer->AnalyzeScript (this, 0, mTextLength, this))) + *runHead = &mRunHead; + + return hr; + } + + // IDWriteTextAnalysisSource implementation + + IFACEMETHODIMP + GetTextAtPosition (uint32_t textPosition, + OUT wchar_t const** textString, + OUT uint32_t* textLength) + { + if (textPosition >= mTextLength) + { + // No text at this position, valid query though. + *textString = nullptr; + *textLength = 0; + } + else + { + *textString = mText + textPosition; + *textLength = mTextLength - textPosition; + } + return S_OK; + } + + IFACEMETHODIMP + GetTextBeforePosition (uint32_t textPosition, + OUT wchar_t const** textString, + OUT uint32_t* textLength) + { + if (textPosition == 0 || textPosition > mTextLength) + { + // Either there is no text before here (== 0), or this + // is an invalid position. The query is considered valid though. + *textString = nullptr; + *textLength = 0; + } + else + { + *textString = mText; + *textLength = textPosition; + } + return S_OK; + } + + IFACEMETHODIMP_ (DWRITE_READING_DIRECTION) + GetParagraphReadingDirection () { return mReadingDirection; } + + IFACEMETHODIMP GetLocaleName (uint32_t textPosition, uint32_t* textLength, + wchar_t const** localeName) + { return S_OK; } + + IFACEMETHODIMP + GetNumberSubstitution (uint32_t textPosition, + OUT uint32_t* textLength, + OUT IDWriteNumberSubstitution** numberSubstitution) + { + // We do not support number substitution. + *numberSubstitution = nullptr; + *textLength = mTextLength - textPosition; + + return S_OK; + } + + // IDWriteTextAnalysisSink implementation + + IFACEMETHODIMP + SetScriptAnalysis (uint32_t textPosition, uint32_t textLength, + DWRITE_SCRIPT_ANALYSIS const* scriptAnalysis) + { + SetCurrentRun (textPosition); + SplitCurrentRun (textPosition); + while (textLength > 0) + { + Run *run = FetchNextRun (&textLength); + run->mScript = *scriptAnalysis; + } + + return S_OK; + } + + IFACEMETHODIMP + SetLineBreakpoints (uint32_t textPosition, + uint32_t textLength, + const DWRITE_LINE_BREAKPOINT* lineBreakpoints) + { return S_OK; } + + IFACEMETHODIMP SetBidiLevel (uint32_t textPosition, uint32_t textLength, + uint8_t explicitLevel, uint8_t resolvedLevel) + { return S_OK; } + + IFACEMETHODIMP + SetNumberSubstitution (uint32_t textPosition, uint32_t textLength, + IDWriteNumberSubstitution* numberSubstitution) + { return S_OK; } + +protected: + Run *FetchNextRun (IN OUT uint32_t* textLength) + { + // Used by the sink setters, this returns a reference to the next run. + // Position and length are adjusted to now point after the current run + // being returned. + + Run *origRun = mCurrentRun; + // Split the tail if needed (the length remaining is less than the + // current run's size). + if (*textLength < mCurrentRun->mTextLength) + SplitCurrentRun (mCurrentRun->mTextStart + *textLength); + else + // Just advance the current run. + mCurrentRun = mCurrentRun->nextRun; + *textLength -= origRun->mTextLength; + + // Return a reference to the run that was just current. + return origRun; + } + + void SetCurrentRun (uint32_t textPosition) + { + // Move the current run to the given position. + // Since the analyzers generally return results in a forward manner, + // this will usually just return early. If not, find the + // corresponding run for the text position. + + if (mCurrentRun && mCurrentRun->ContainsTextPosition (textPosition)) + return; + + for (Run *run = &mRunHead; run; run = run->nextRun) + if (run->ContainsTextPosition (textPosition)) + { + mCurrentRun = run; + return; + } + assert (0); // We should always be able to find the text position in one of our runs + } + + void SplitCurrentRun (uint32_t splitPosition) + { + if (!mCurrentRun) + { + assert (0); // SplitCurrentRun called without current run + // Shouldn't be calling this when no current run is set! + return; + } + // Split the current run. + if (splitPosition <= mCurrentRun->mTextStart) + { + // No need to split, already the start of a run + // or before it. Usually the first. + return; + } + Run *newRun = new Run; + + *newRun = *mCurrentRun; + + // Insert the new run in our linked list. + newRun->nextRun = mCurrentRun->nextRun; + mCurrentRun->nextRun = newRun; + + // Adjust runs' text positions and lengths. + uint32_t splitPoint = splitPosition - mCurrentRun->mTextStart; + newRun->mTextStart += splitPoint; + newRun->mTextLength -= splitPoint; + mCurrentRun->mTextLength = splitPoint; + mCurrentRun = newRun; + } + +protected: + // Input + // (weak references are fine here, since this class is a transient + // stack-based helper that doesn't need to copy data) + uint32_t mTextLength; + const wchar_t* mText; + const wchar_t* mLocaleName; + DWRITE_READING_DIRECTION mReadingDirection; + + // Current processing state. + Run *mCurrentRun; + + // Output is a list of runs starting here + Run mRunHead; +}; + +/* + * shaper + */ + +static hb_bool_t +_hb_directwrite_shape_full (hb_shape_plan_t *shape_plan, + hb_font_t *font, + hb_buffer_t *buffer, + const hb_feature_t *features, + unsigned int num_features, + float lineWidth) +{ + hb_face_t *face = font->face; + const hb_directwrite_face_data_t *face_data = face->data.directwrite; + IDWriteFactory *dwriteFactory = face_data->dwriteFactory; + IDWriteFontFace *fontFace = face_data->fontFace; + + IDWriteTextAnalyzer* analyzer; + dwriteFactory->CreateTextAnalyzer (&analyzer); + + unsigned int scratch_size; + hb_buffer_t::scratch_buffer_t *scratch = buffer->get_scratch_buffer (&scratch_size); +#define ALLOCATE_ARRAY(Type, name, len) \ + Type *name = (Type *) scratch; \ + do { \ + unsigned int _consumed = DIV_CEIL ((len) * sizeof (Type), sizeof (*scratch)); \ + assert (_consumed <= scratch_size); \ + scratch += _consumed; \ + scratch_size -= _consumed; \ + } while (0) + +#define utf16_index() var1.u32 + + ALLOCATE_ARRAY (wchar_t, textString, buffer->len * 2); + + unsigned int chars_len = 0; + for (unsigned int i = 0; i < buffer->len; i++) + { + hb_codepoint_t c = buffer->info[i].codepoint; + buffer->info[i].utf16_index () = chars_len; + if (likely (c <= 0xFFFFu)) + textString[chars_len++] = c; + else if (unlikely (c > 0x10FFFFu)) + textString[chars_len++] = 0xFFFDu; + else + { + textString[chars_len++] = 0xD800u + ((c - 0x10000u) >> 10); + textString[chars_len++] = 0xDC00u + ((c - 0x10000u) & ((1u << 10) - 1)); + } + } + + ALLOCATE_ARRAY (WORD, log_clusters, chars_len); + /* Need log_clusters to assign features. */ + chars_len = 0; + for (unsigned int i = 0; i < buffer->len; i++) + { + hb_codepoint_t c = buffer->info[i].codepoint; + unsigned int cluster = buffer->info[i].cluster; + log_clusters[chars_len++] = cluster; + if (hb_in_range (c, 0x10000u, 0x10FFFFu)) + log_clusters[chars_len++] = cluster; /* Surrogates. */ + } + + // TODO: Handle TEST_DISABLE_OPTIONAL_LIGATURES + + DWRITE_READING_DIRECTION readingDirection; + readingDirection = buffer->props.direction ? + DWRITE_READING_DIRECTION_RIGHT_TO_LEFT : + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT; + + /* + * There's an internal 16-bit limit on some things inside the analyzer, + * but we never attempt to shape a word longer than 64K characters + * in a single gfxShapedWord, so we cannot exceed that limit. + */ + uint32_t textLength = buffer->len; + + TextAnalysis analysis (textString, textLength, nullptr, readingDirection); + TextAnalysis::Run *runHead; + HRESULT hr; + hr = analysis.GenerateResults (analyzer, &runHead); + +#define FAIL(...) \ + HB_STMT_START { \ + DEBUG_MSG (DIRECTWRITE, nullptr, __VA_ARGS__); \ + return false; \ + } HB_STMT_END + + if (FAILED (hr)) + FAIL ("Analyzer failed to generate results."); + + uint32_t maxGlyphCount = 3 * textLength / 2 + 16; + uint32_t glyphCount; + bool isRightToLeft = HB_DIRECTION_IS_BACKWARD (buffer->props.direction); + + const wchar_t localeName[20] = {0}; + if (buffer->props.language != nullptr) + mbstowcs ((wchar_t*) localeName, + hb_language_to_string (buffer->props.language), 20); + + // TODO: it does work but doesn't care about ranges + DWRITE_TYPOGRAPHIC_FEATURES typographic_features; + typographic_features.featureCount = num_features; + if (num_features) + { + typographic_features.features = new DWRITE_FONT_FEATURE[num_features]; + for (unsigned int i = 0; i < num_features; ++i) + { + typographic_features.features[i].nameTag = (DWRITE_FONT_FEATURE_TAG) + hb_uint32_swap (features[i].tag); + typographic_features.features[i].parameter = features[i].value; + } + } + const DWRITE_TYPOGRAPHIC_FEATURES* dwFeatures; + dwFeatures = (const DWRITE_TYPOGRAPHIC_FEATURES*) &typographic_features; + const uint32_t featureRangeLengths[] = { textLength }; + // + + uint16_t* clusterMap; + clusterMap = new uint16_t[textLength]; + DWRITE_SHAPING_TEXT_PROPERTIES* textProperties; + textProperties = new DWRITE_SHAPING_TEXT_PROPERTIES[textLength]; +retry_getglyphs: + uint16_t* glyphIndices = new uint16_t[maxGlyphCount]; + DWRITE_SHAPING_GLYPH_PROPERTIES* glyphProperties; + glyphProperties = new DWRITE_SHAPING_GLYPH_PROPERTIES[maxGlyphCount]; + + hr = analyzer->GetGlyphs (textString, textLength, fontFace, false, + isRightToLeft, &runHead->mScript, localeName, + nullptr, &dwFeatures, featureRangeLengths, 1, + maxGlyphCount, clusterMap, textProperties, + glyphIndices, glyphProperties, &glyphCount); + + if (unlikely (hr == HRESULT_FROM_WIN32 (ERROR_INSUFFICIENT_BUFFER))) + { + delete [] glyphIndices; + delete [] glyphProperties; + + maxGlyphCount *= 2; + + goto retry_getglyphs; + } + if (FAILED (hr)) + FAIL ("Analyzer failed to get glyphs."); + + float* glyphAdvances = new float[maxGlyphCount]; + DWRITE_GLYPH_OFFSET* glyphOffsets = new DWRITE_GLYPH_OFFSET[maxGlyphCount]; + + /* The -2 in the following is to compensate for possible + * alignment needed after the WORD array. sizeof (WORD) == 2. */ + unsigned int glyphs_size = (scratch_size * sizeof (int) - 2) + / (sizeof (WORD) + + sizeof (DWRITE_SHAPING_GLYPH_PROPERTIES) + + sizeof (int) + + sizeof (DWRITE_GLYPH_OFFSET) + + sizeof (uint32_t)); + ALLOCATE_ARRAY (uint32_t, vis_clusters, glyphs_size); + +#undef ALLOCATE_ARRAY + + int fontEmSize = font->face->get_upem (); + if (fontEmSize < 0) fontEmSize = -fontEmSize; + + if (fontEmSize < 0) fontEmSize = -fontEmSize; + double x_mult = (double) font->x_scale / fontEmSize; + double y_mult = (double) font->y_scale / fontEmSize; + + hr = analyzer->GetGlyphPlacements (textString, clusterMap, textProperties, + textLength, glyphIndices, glyphProperties, + glyphCount, fontFace, fontEmSize, + false, isRightToLeft, &runHead->mScript, localeName, + &dwFeatures, featureRangeLengths, 1, + glyphAdvances, glyphOffsets); + + if (FAILED (hr)) + FAIL ("Analyzer failed to get glyph placements."); + + IDWriteTextAnalyzer1* analyzer1; + analyzer->QueryInterface (&analyzer1); + + if (analyzer1 && lineWidth) + { + DWRITE_JUSTIFICATION_OPPORTUNITY* justificationOpportunities = + new DWRITE_JUSTIFICATION_OPPORTUNITY[maxGlyphCount]; + hr = analyzer1->GetJustificationOpportunities (fontFace, fontEmSize, runHead->mScript, + textLength, glyphCount, textString, + clusterMap, glyphProperties, + justificationOpportunities); + + if (FAILED (hr)) + FAIL ("Analyzer failed to get justification opportunities."); + + float* justifiedGlyphAdvances = new float[maxGlyphCount]; + DWRITE_GLYPH_OFFSET* justifiedGlyphOffsets = new DWRITE_GLYPH_OFFSET[glyphCount]; + hr = analyzer1->JustifyGlyphAdvances (lineWidth, glyphCount, justificationOpportunities, + glyphAdvances, glyphOffsets, justifiedGlyphAdvances, + justifiedGlyphOffsets); + + if (FAILED (hr)) FAIL ("Analyzer failed to get justify glyph advances."); + + DWRITE_SCRIPT_PROPERTIES scriptProperties; + hr = analyzer1->GetScriptProperties (runHead->mScript, &scriptProperties); + if (FAILED (hr)) FAIL ("Analyzer failed to get script properties."); + uint32_t justificationCharacter = scriptProperties.justificationCharacter; + + // if a script justificationCharacter is not space, it can have GetJustifiedGlyphs + if (justificationCharacter != 32) + { + uint16_t* modifiedClusterMap = new uint16_t[textLength]; + retry_getjustifiedglyphs: + uint16_t* modifiedGlyphIndices = new uint16_t[maxGlyphCount]; + float* modifiedGlyphAdvances = new float[maxGlyphCount]; + DWRITE_GLYPH_OFFSET* modifiedGlyphOffsets = new DWRITE_GLYPH_OFFSET[maxGlyphCount]; + uint32_t actualGlyphsCount; + hr = analyzer1->GetJustifiedGlyphs (fontFace, fontEmSize, runHead->mScript, + textLength, glyphCount, maxGlyphCount, + clusterMap, glyphIndices, glyphAdvances, + justifiedGlyphAdvances, justifiedGlyphOffsets, + glyphProperties, &actualGlyphsCount, + modifiedClusterMap, modifiedGlyphIndices, + modifiedGlyphAdvances, modifiedGlyphOffsets); + + if (hr == HRESULT_FROM_WIN32 (ERROR_INSUFFICIENT_BUFFER)) + { + maxGlyphCount = actualGlyphsCount; + delete [] modifiedGlyphIndices; + delete [] modifiedGlyphAdvances; + delete [] modifiedGlyphOffsets; + + maxGlyphCount = actualGlyphsCount; + + goto retry_getjustifiedglyphs; + } + if (FAILED (hr)) + FAIL ("Analyzer failed to get justified glyphs."); + + delete [] clusterMap; + delete [] glyphIndices; + delete [] glyphAdvances; + delete [] glyphOffsets; + + glyphCount = actualGlyphsCount; + clusterMap = modifiedClusterMap; + glyphIndices = modifiedGlyphIndices; + glyphAdvances = modifiedGlyphAdvances; + glyphOffsets = modifiedGlyphOffsets; + + delete [] justifiedGlyphAdvances; + delete [] justifiedGlyphOffsets; + } + else + { + delete [] glyphAdvances; + delete [] glyphOffsets; + + glyphAdvances = justifiedGlyphAdvances; + glyphOffsets = justifiedGlyphOffsets; + } + + delete [] justificationOpportunities; + } + + /* Ok, we've got everything we need, now compose output buffer, + * very, *very*, carefully! */ + + /* Calculate visual-clusters. That's what we ship. */ + for (unsigned int i = 0; i < glyphCount; i++) + vis_clusters[i] = (uint32_t) -1; + for (unsigned int i = 0; i < buffer->len; i++) + { + uint32_t *p = + &vis_clusters[log_clusters[buffer->info[i].utf16_index ()]]; + *p = hb_min (*p, buffer->info[i].cluster); + } + for (unsigned int i = 1; i < glyphCount; i++) + if (vis_clusters[i] == (uint32_t) -1) + vis_clusters[i] = vis_clusters[i - 1]; + +#undef utf16_index + + if (unlikely (!buffer->ensure (glyphCount))) + FAIL ("Buffer in error"); + +#undef FAIL + + /* Set glyph infos */ + buffer->len = 0; + for (unsigned int i = 0; i < glyphCount; i++) + { + hb_glyph_info_t *info = &buffer->info[buffer->len++]; + + info->codepoint = glyphIndices[i]; + info->cluster = vis_clusters[i]; + + /* The rest is crap. Let's store position info there for now. */ + info->mask = glyphAdvances[i]; + info->var1.i32 = glyphOffsets[i].advanceOffset; + info->var2.i32 = glyphOffsets[i].ascenderOffset; + } + + /* Set glyph positions */ + buffer->clear_positions (); + for (unsigned int i = 0; i < glyphCount; i++) + { + hb_glyph_info_t *info = &buffer->info[i]; + hb_glyph_position_t *pos = &buffer->pos[i]; + + /* TODO vertical */ + pos->x_advance = x_mult * (int32_t) info->mask; + pos->x_offset = x_mult * (isRightToLeft ? -info->var1.i32 : info->var1.i32); + pos->y_offset = y_mult * info->var2.i32; + } + + if (isRightToLeft) hb_buffer_reverse (buffer); + + delete [] clusterMap; + delete [] glyphIndices; + delete [] textProperties; + delete [] glyphProperties; + delete [] glyphAdvances; + delete [] glyphOffsets; + + if (num_features) + delete [] typographic_features.features; + + /* Wow, done! */ + return true; +} + +hb_bool_t +_hb_directwrite_shape (hb_shape_plan_t *shape_plan, + hb_font_t *font, + hb_buffer_t *buffer, + const hb_feature_t *features, + unsigned int num_features) +{ + return _hb_directwrite_shape_full (shape_plan, font, buffer, + features, num_features, 0); +} + +HB_UNUSED static bool +_hb_directwrite_shape_experimental_width (hb_font_t *font, + hb_buffer_t *buffer, + const hb_feature_t *features, + unsigned int num_features, + float width) +{ + static const char *shapers = "directwrite"; + hb_shape_plan_t *shape_plan; + shape_plan = hb_shape_plan_create_cached (font->face, &buffer->props, + features, num_features, &shapers); + hb_bool_t res = _hb_directwrite_shape_full (shape_plan, font, buffer, + features, num_features, width); + + buffer->unsafe_to_break_all (); + + return res; +} + +struct _hb_directwrite_font_table_context { + IDWriteFontFace *face; + void *table_context; +}; + +static void +_hb_directwrite_table_data_release (void *data) +{ + _hb_directwrite_font_table_context *context = (_hb_directwrite_font_table_context *) data; + context->face->ReleaseFontTable (context->table_context); + delete context; +} + +static hb_blob_t * +_hb_directwrite_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data) +{ + IDWriteFontFace *dw_face = ((IDWriteFontFace *) user_data); + const void *data; + uint32_t length; + void *table_context; + BOOL exists; + if (!dw_face || FAILED (dw_face->TryGetFontTable (hb_uint32_swap (tag), &data, + &length, &table_context, &exists))) + return nullptr; + + if (!data || !exists || !length) + { + dw_face->ReleaseFontTable (table_context); + return nullptr; + } + + _hb_directwrite_font_table_context *context = new _hb_directwrite_font_table_context; + context->face = dw_face; + context->table_context = table_context; + + return hb_blob_create ((const char *) data, length, HB_MEMORY_MODE_READONLY, + context, _hb_directwrite_table_data_release); +} + +static void +_hb_directwrite_font_release (void *data) +{ + if (data) + ((IDWriteFontFace *) data)->Release (); +} + +/** + * hb_directwrite_face_create: + * @font_face: a DirectWrite IDWriteFontFace object. + * + * Return value: #hb_face_t object corresponding to the given input + * + * Since: 2.4.0 + **/ +hb_face_t * +hb_directwrite_face_create (IDWriteFontFace *font_face) +{ + if (font_face) + font_face->AddRef (); + return hb_face_create_for_tables (_hb_directwrite_reference_table, font_face, + _hb_directwrite_font_release); +} + +/** +* hb_directwrite_face_get_font_face: +* @face: a #hb_face_t object +* +* Return value: DirectWrite IDWriteFontFace object corresponding to the given input +* +* Since: 2.5.0 +**/ +IDWriteFontFace * +hb_directwrite_face_get_font_face (hb_face_t *face) +{ + return face->data.directwrite->fontFace; +} + + +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.h new file mode 100644 index 000000000..f837627a2 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.h @@ -0,0 +1,40 @@ +/* + * Copyright © 2015-2019 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#ifndef HB_DIRECTWRITE_H +#define HB_DIRECTWRITE_H + +#include "hb.h" + +HB_BEGIN_DECLS + +HB_EXTERN hb_face_t * +hb_directwrite_face_create (IDWriteFontFace *font_face); + +HB_EXTERN IDWriteFontFace * +hb_directwrite_face_get_font_face (hb_face_t *face); + +HB_END_DECLS + +#endif /* HB_DIRECTWRITE_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-dispatch.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-dispatch.hh new file mode 100644 index 000000000..1ce3fac93 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-dispatch.hh @@ -0,0 +1,58 @@ +/* + * Copyright © 2007,2008,2009,2010 Red Hat, Inc. + * Copyright © 2012,2018 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_DISPATCH_HH +#define HB_DISPATCH_HH + +#include "hb.hh" + +/* + * Dispatch + */ + +template +struct hb_dispatch_context_t +{ + private: + /* https://en.wikipedia.org/wiki/Curiously_recurring_template_pattern */ + const Context* thiz () const { return static_cast (this); } + Context* thiz () { return static_cast< Context *> (this); } + public: + static constexpr unsigned max_debug_depth = MaxDebugDepth; + typedef Return return_t; + template + bool may_dispatch (const T *obj HB_UNUSED, const F *format HB_UNUSED) { return true; } + template + return_t dispatch (const T &obj, Ts&&... ds) + { return obj.dispatch (thiz (), hb_forward (ds)...); } + static return_t no_dispatch_return_value () { return Context::default_return_value (); } + static bool stop_sublookup_iteration (const return_t r HB_UNUSED) { return false; } +}; + + +#endif /* HB_DISPATCH_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-face.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-face.cc new file mode 100644 index 000000000..0c9949fff --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-face.cc @@ -0,0 +1,725 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#include "hb.hh" + +#include "hb-face.hh" +#include "hb-blob.hh" +#include "hb-open-file.hh" +#include "hb-ot-face.hh" +#include "hb-ot-cmap-table.hh" + + +/** + * SECTION:hb-face + * @title: hb-face + * @short_description: Font face objects + * @include: hb.h + * + * Font face is objects represent a single face in a font family. + * More exactly, a font face represents a single face in a binary font file. + * Font faces are typically built from a binary blob and a face index. + * Font faces are used to create fonts. + **/ + + +/** + * hb_face_count: + * @blob: a blob. + * + * Get number of faces in a blob. + * + * Return value: Number of faces in @blob + * + * Since: 1.7.7 + **/ +unsigned int +hb_face_count (hb_blob_t *blob) +{ + if (unlikely (!blob)) + return 0; + + /* TODO We shouldn't be sanitizing blob. Port to run sanitizer and return if not sane. */ + /* Make API signature const after. */ + hb_blob_t *sanitized = hb_sanitize_context_t ().sanitize_blob (hb_blob_reference (blob)); + const OT::OpenTypeFontFile& ot = *sanitized->as (); + unsigned int ret = ot.get_face_count (); + hb_blob_destroy (sanitized); + + return ret; +} + +/* + * hb_face_t + */ + +DEFINE_NULL_INSTANCE (hb_face_t) = +{ + HB_OBJECT_HEADER_STATIC, + + nullptr, /* reference_table_func */ + nullptr, /* user_data */ + nullptr, /* destroy */ + + 0, /* index */ + HB_ATOMIC_INT_INIT (1000), /* upem */ + HB_ATOMIC_INT_INIT (0), /* num_glyphs */ + + /* Zero for the rest is fine. */ +}; + + +/** + * hb_face_create_for_tables: + * @reference_table_func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Return value: (transfer full) + * + * Since: 0.9.2 + **/ +hb_face_t * +hb_face_create_for_tables (hb_reference_table_func_t reference_table_func, + void *user_data, + hb_destroy_func_t destroy) +{ + hb_face_t *face; + + if (!reference_table_func || !(face = hb_object_create ())) { + if (destroy) + destroy (user_data); + return hb_face_get_empty (); + } + + face->reference_table_func = reference_table_func; + face->user_data = user_data; + face->destroy = destroy; + + face->num_glyphs.set_relaxed (-1); + + face->data.init0 (face); + face->table.init0 (face); + + return face; +} + + +typedef struct hb_face_for_data_closure_t { + hb_blob_t *blob; + unsigned int index; +} hb_face_for_data_closure_t; + +static hb_face_for_data_closure_t * +_hb_face_for_data_closure_create (hb_blob_t *blob, unsigned int index) +{ + hb_face_for_data_closure_t *closure; + + closure = (hb_face_for_data_closure_t *) calloc (1, sizeof (hb_face_for_data_closure_t)); + if (unlikely (!closure)) + return nullptr; + + closure->blob = blob; + closure->index = index; + + return closure; +} + +static void +_hb_face_for_data_closure_destroy (void *data) +{ + hb_face_for_data_closure_t *closure = (hb_face_for_data_closure_t *) data; + + hb_blob_destroy (closure->blob); + free (closure); +} + +static hb_blob_t * +_hb_face_for_data_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data) +{ + hb_face_for_data_closure_t *data = (hb_face_for_data_closure_t *) user_data; + + if (tag == HB_TAG_NONE) + return hb_blob_reference (data->blob); + + const OT::OpenTypeFontFile &ot_file = *data->blob->as (); + unsigned int base_offset; + const OT::OpenTypeFontFace &ot_face = ot_file.get_face (data->index, &base_offset); + + const OT::OpenTypeTable &table = ot_face.get_table_by_tag (tag); + + hb_blob_t *blob = hb_blob_create_sub_blob (data->blob, base_offset + table.offset, table.length); + + return blob; +} + +/** + * hb_face_create: (Xconstructor) + * @blob: + * @index: + * + * + * + * Return value: (transfer full): + * + * Since: 0.9.2 + **/ +hb_face_t * +hb_face_create (hb_blob_t *blob, + unsigned int index) +{ + hb_face_t *face; + + if (unlikely (!blob)) + blob = hb_blob_get_empty (); + + hb_face_for_data_closure_t *closure = _hb_face_for_data_closure_create (hb_sanitize_context_t ().sanitize_blob (hb_blob_reference (blob)), index); + + if (unlikely (!closure)) + return hb_face_get_empty (); + + face = hb_face_create_for_tables (_hb_face_for_data_reference_table, + closure, + _hb_face_for_data_closure_destroy); + + face->index = index; + + return face; +} + +/** + * hb_face_get_empty: + * + * + * + * Return value: (transfer full) + * + * Since: 0.9.2 + **/ +hb_face_t * +hb_face_get_empty () +{ + return const_cast (&Null(hb_face_t)); +} + + +/** + * hb_face_reference: (skip) + * @face: a face. + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_face_t * +hb_face_reference (hb_face_t *face) +{ + return hb_object_reference (face); +} + +/** + * hb_face_destroy: (skip) + * @face: a face. + * + * + * + * Since: 0.9.2 + **/ +void +hb_face_destroy (hb_face_t *face) +{ + if (!hb_object_destroy (face)) return; + + for (hb_face_t::plan_node_t *node = face->shape_plans; node; ) + { + hb_face_t::plan_node_t *next = node->next; + hb_shape_plan_destroy (node->shape_plan); + free (node); + node = next; + } + + face->data.fini (); + face->table.fini (); + + if (face->destroy) + face->destroy (face->user_data); + + free (face); +} + +/** + * hb_face_set_user_data: (skip) + * @face: a face. + * @key: + * @data: + * @destroy: + * @replace: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_face_set_user_data (hb_face_t *face, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace) +{ + return hb_object_set_user_data (face, key, data, destroy, replace); +} + +/** + * hb_face_get_user_data: (skip) + * @face: a face. + * @key: + * + * + * + * Return value: (transfer none): + * + * Since: 0.9.2 + **/ +void * +hb_face_get_user_data (const hb_face_t *face, + hb_user_data_key_t *key) +{ + return hb_object_get_user_data (face, key); +} + +/** + * hb_face_make_immutable: + * @face: a face. + * + * + * + * Since: 0.9.2 + **/ +void +hb_face_make_immutable (hb_face_t *face) +{ + if (hb_object_is_immutable (face)) + return; + + hb_object_make_immutable (face); +} + +/** + * hb_face_is_immutable: + * @face: a face. + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_face_is_immutable (const hb_face_t *face) +{ + return hb_object_is_immutable (face); +} + + +/** + * hb_face_reference_table: + * @face: a face. + * @tag: + * + * + * + * Return value: (transfer full): + * + * Since: 0.9.2 + **/ +hb_blob_t * +hb_face_reference_table (const hb_face_t *face, + hb_tag_t tag) +{ + if (unlikely (tag == HB_TAG_NONE)) + return hb_blob_get_empty (); + + return face->reference_table (tag); +} + +/** + * hb_face_reference_blob: + * @face: a face. + * + * + * + * Return value: (transfer full): + * + * Since: 0.9.2 + **/ +hb_blob_t * +hb_face_reference_blob (hb_face_t *face) +{ + return face->reference_table (HB_TAG_NONE); +} + +/** + * hb_face_set_index: + * @face: a face. + * @index: + * + * + * + * Since: 0.9.2 + **/ +void +hb_face_set_index (hb_face_t *face, + unsigned int index) +{ + if (hb_object_is_immutable (face)) + return; + + face->index = index; +} + +/** + * hb_face_get_index: + * @face: a face. + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +unsigned int +hb_face_get_index (const hb_face_t *face) +{ + return face->index; +} + +/** + * hb_face_set_upem: + * @face: a face. + * @upem: + * + * + * + * Since: 0.9.2 + **/ +void +hb_face_set_upem (hb_face_t *face, + unsigned int upem) +{ + if (hb_object_is_immutable (face)) + return; + + face->upem.set_relaxed (upem); +} + +/** + * hb_face_get_upem: + * @face: a face. + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +unsigned int +hb_face_get_upem (const hb_face_t *face) +{ + return face->get_upem (); +} + +/** + * hb_face_set_glyph_count: + * @face: a face. + * @glyph_count: + * + * + * + * Since: 0.9.7 + **/ +void +hb_face_set_glyph_count (hb_face_t *face, + unsigned int glyph_count) +{ + if (hb_object_is_immutable (face)) + return; + + face->num_glyphs.set_relaxed (glyph_count); +} + +/** + * hb_face_get_glyph_count: + * @face: a face. + * + * + * + * Return value: + * + * Since: 0.9.7 + **/ +unsigned int +hb_face_get_glyph_count (const hb_face_t *face) +{ + return face->get_num_glyphs (); +} + +/** + * hb_face_get_table_tags: + * @face: a face. + * @start_offset: index of first tag to return. + * @table_count: input length of @table_tags array, output number of items written. + * @table_tags: array to write tags into. + * + * Retrieves table tags for a face, if possible. + * + * Return value: total number of tables, or 0 if not possible to list. + * + * Since: 1.6.0 + **/ +unsigned int +hb_face_get_table_tags (const hb_face_t *face, + unsigned int start_offset, + unsigned int *table_count, /* IN/OUT */ + hb_tag_t *table_tags /* OUT */) +{ + if (face->destroy != (hb_destroy_func_t) _hb_face_for_data_closure_destroy) + { + if (table_count) + *table_count = 0; + return 0; + } + + hb_face_for_data_closure_t *data = (hb_face_for_data_closure_t *) face->user_data; + + const OT::OpenTypeFontFile &ot_file = *data->blob->as (); + const OT::OpenTypeFontFace &ot_face = ot_file.get_face (data->index); + + return ot_face.get_table_tags (start_offset, table_count, table_tags); +} + + +/* + * Character set. + */ + + +#ifndef HB_NO_FACE_COLLECT_UNICODES +/** + * hb_face_collect_unicodes: + * @face: font face. + * @out: set to add Unicode characters covered by @face to. + * + * Since: 1.9.0 + */ +void +hb_face_collect_unicodes (hb_face_t *face, + hb_set_t *out) +{ + face->table.cmap->collect_unicodes (out); +} +/** + * hb_face_collect_variation_selectors: + * @face: font face. + * @out: set to add Variation Selector characters covered by @face to. + * + * + * + * Since: 1.9.0 + */ +void +hb_face_collect_variation_selectors (hb_face_t *face, + hb_set_t *out) +{ + face->table.cmap->collect_variation_selectors (out); +} +/** + * hb_face_collect_variation_unicodes: + * @face: font face. + * @out: set to add Unicode characters for @variation_selector covered by @face to. + * + * + * + * Since: 1.9.0 + */ +void +hb_face_collect_variation_unicodes (hb_face_t *face, + hb_codepoint_t variation_selector, + hb_set_t *out) +{ + face->table.cmap->collect_variation_unicodes (variation_selector, out); +} +#endif + + +/* + * face-builder: A face that has add_table(). + */ + +struct hb_face_builder_data_t +{ + struct table_entry_t + { + int cmp (hb_tag_t t) const + { + if (t < tag) return -1; + if (t > tag) return -1; + return 0; + } + + hb_tag_t tag; + hb_blob_t *blob; + }; + + hb_vector_t tables; +}; + +static hb_face_builder_data_t * +_hb_face_builder_data_create () +{ + hb_face_builder_data_t *data = (hb_face_builder_data_t *) calloc (1, sizeof (hb_face_builder_data_t)); + if (unlikely (!data)) + return nullptr; + + data->tables.init (); + + return data; +} + +static void +_hb_face_builder_data_destroy (void *user_data) +{ + hb_face_builder_data_t *data = (hb_face_builder_data_t *) user_data; + + for (unsigned int i = 0; i < data->tables.length; i++) + hb_blob_destroy (data->tables[i].blob); + + data->tables.fini (); + + free (data); +} + +static hb_blob_t * +_hb_face_builder_data_reference_blob (hb_face_builder_data_t *data) +{ + + unsigned int table_count = data->tables.length; + unsigned int face_length = table_count * 16 + 12; + + for (unsigned int i = 0; i < table_count; i++) + face_length += hb_ceil_to_4 (hb_blob_get_length (data->tables[i].blob)); + + char *buf = (char *) malloc (face_length); + if (unlikely (!buf)) + return nullptr; + + hb_serialize_context_t c (buf, face_length); + c.propagate_error (data->tables); + OT::OpenTypeFontFile *f = c.start_serialize (); + + bool is_cff = data->tables.lsearch (HB_TAG ('C','F','F',' ')) || data->tables.lsearch (HB_TAG ('C','F','F','2')); + hb_tag_t sfnt_tag = is_cff ? OT::OpenTypeFontFile::CFFTag : OT::OpenTypeFontFile::TrueTypeTag; + + bool ret = f->serialize_single (&c, sfnt_tag, data->tables.as_array ()); + + c.end_serialize (); + + if (unlikely (!ret)) + { + free (buf); + return nullptr; + } + + return hb_blob_create (buf, face_length, HB_MEMORY_MODE_WRITABLE, buf, free); +} + +static hb_blob_t * +_hb_face_builder_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data) +{ + hb_face_builder_data_t *data = (hb_face_builder_data_t *) user_data; + + if (!tag) + return _hb_face_builder_data_reference_blob (data); + + hb_face_builder_data_t::table_entry_t *entry = data->tables.lsearch (tag); + if (entry) + return hb_blob_reference (entry->blob); + + return nullptr; +} + + +/** + * hb_face_builder_create: + * + * Creates a #hb_face_t that can be used with hb_face_builder_add_table(). + * After tables are added to the face, it can be compiled to a binary + * font file by calling hb_face_reference_blob(). + * + * Return value: (transfer full): New face. + * + * Since: 1.9.0 + **/ +hb_face_t * +hb_face_builder_create () +{ + hb_face_builder_data_t *data = _hb_face_builder_data_create (); + if (unlikely (!data)) return hb_face_get_empty (); + + return hb_face_create_for_tables (_hb_face_builder_reference_table, + data, + _hb_face_builder_data_destroy); +} + +/** + * hb_face_builder_add_table: + * + * Add table for @tag with data provided by @blob to the face. @face must + * be created using hb_face_builder_create(). + * + * Since: 1.9.0 + **/ +hb_bool_t +hb_face_builder_add_table (hb_face_t *face, hb_tag_t tag, hb_blob_t *blob) +{ + if (unlikely (face->destroy != (hb_destroy_func_t) _hb_face_builder_data_destroy)) + return false; + + hb_face_builder_data_t *data = (hb_face_builder_data_t *) face->user_data; + hb_face_builder_data_t::table_entry_t *entry = data->tables.push (); + + entry->tag = tag; + entry->blob = hb_blob_reference (blob); + + return true; +} diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-face.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-face.h new file mode 100644 index 000000000..e8ff090d5 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-face.h @@ -0,0 +1,158 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + */ + +#ifndef HB_H_IN +#error "Include instead." +#endif + +#ifndef HB_FACE_H +#define HB_FACE_H + +#include "hb-common.h" +#include "hb-blob.h" +#include "hb-set.h" + +HB_BEGIN_DECLS + + +HB_EXTERN unsigned int +hb_face_count (hb_blob_t *blob); + + +/* + * hb_face_t + */ + +typedef struct hb_face_t hb_face_t; + +HB_EXTERN hb_face_t * +hb_face_create (hb_blob_t *blob, + unsigned int index); + +typedef hb_blob_t * (*hb_reference_table_func_t) (hb_face_t *face, hb_tag_t tag, void *user_data); + +/* calls destroy() when not needing user_data anymore */ +HB_EXTERN hb_face_t * +hb_face_create_for_tables (hb_reference_table_func_t reference_table_func, + void *user_data, + hb_destroy_func_t destroy); + +HB_EXTERN hb_face_t * +hb_face_get_empty (void); + +HB_EXTERN hb_face_t * +hb_face_reference (hb_face_t *face); + +HB_EXTERN void +hb_face_destroy (hb_face_t *face); + +HB_EXTERN hb_bool_t +hb_face_set_user_data (hb_face_t *face, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace); + +HB_EXTERN void * +hb_face_get_user_data (const hb_face_t *face, + hb_user_data_key_t *key); + +HB_EXTERN void +hb_face_make_immutable (hb_face_t *face); + +HB_EXTERN hb_bool_t +hb_face_is_immutable (const hb_face_t *face); + + +HB_EXTERN hb_blob_t * +hb_face_reference_table (const hb_face_t *face, + hb_tag_t tag); + +HB_EXTERN hb_blob_t * +hb_face_reference_blob (hb_face_t *face); + +HB_EXTERN void +hb_face_set_index (hb_face_t *face, + unsigned int index); + +HB_EXTERN unsigned int +hb_face_get_index (const hb_face_t *face); + +HB_EXTERN void +hb_face_set_upem (hb_face_t *face, + unsigned int upem); + +HB_EXTERN unsigned int +hb_face_get_upem (const hb_face_t *face); + +HB_EXTERN void +hb_face_set_glyph_count (hb_face_t *face, + unsigned int glyph_count); + +HB_EXTERN unsigned int +hb_face_get_glyph_count (const hb_face_t *face); + +HB_EXTERN unsigned int +hb_face_get_table_tags (const hb_face_t *face, + unsigned int start_offset, + unsigned int *table_count, /* IN/OUT */ + hb_tag_t *table_tags /* OUT */); + + +/* + * Character set. + */ + +HB_EXTERN void +hb_face_collect_unicodes (hb_face_t *face, + hb_set_t *out); + +HB_EXTERN void +hb_face_collect_variation_selectors (hb_face_t *face, + hb_set_t *out); + +HB_EXTERN void +hb_face_collect_variation_unicodes (hb_face_t *face, + hb_codepoint_t variation_selector, + hb_set_t *out); + + +/* + * Builder face. + */ + +HB_EXTERN hb_face_t * +hb_face_builder_create (void); + +HB_EXTERN hb_bool_t +hb_face_builder_add_table (hb_face_t *face, + hb_tag_t tag, + hb_blob_t *blob); + + +HB_END_DECLS + +#endif /* HB_FACE_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-face.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-face.hh new file mode 100644 index 000000000..68834baeb --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-face.hh @@ -0,0 +1,109 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_FACE_HH +#define HB_FACE_HH + +#include "hb.hh" + +#include "hb-shaper.hh" +#include "hb-shape-plan.hh" +#include "hb-ot-face.hh" + + +/* + * hb_face_t + */ + +#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_INSTANTIATE_SHAPERS(shaper, face); +#include "hb-shaper-list.hh" +#undef HB_SHAPER_IMPLEMENT + +struct hb_face_t +{ + hb_object_header_t header; + + hb_reference_table_func_t reference_table_func; + void *user_data; + hb_destroy_func_t destroy; + + unsigned int index; /* Face index in a collection, zero-based. */ + mutable hb_atomic_int_t upem; /* Units-per-EM. */ + mutable hb_atomic_int_t num_glyphs; /* Number of glyphs. */ + + hb_shaper_object_dataset_t data;/* Various shaper data. */ + hb_ot_face_t table; /* All the face's tables. */ + + /* Cache */ + struct plan_node_t + { + hb_shape_plan_t *shape_plan; + plan_node_t *next; + }; + hb_atomic_ptr_t shape_plans; + + hb_blob_t *reference_table (hb_tag_t tag) const + { + hb_blob_t *blob; + + if (unlikely (!reference_table_func)) + return hb_blob_get_empty (); + + blob = reference_table_func (/*XXX*/const_cast (this), tag, user_data); + if (unlikely (!blob)) + return hb_blob_get_empty (); + + return blob; + } + + HB_PURE_FUNC unsigned int get_upem () const + { + unsigned int ret = upem.get_relaxed (); + if (unlikely (!ret)) + { + return load_upem (); + } + return ret; + } + + unsigned int get_num_glyphs () const + { + unsigned int ret = num_glyphs.get_relaxed (); + if (unlikely (ret == (unsigned int) -1)) + return load_num_glyphs (); + return ret; + } + + private: + HB_INTERNAL unsigned int load_upem () const; + HB_INTERNAL unsigned int load_num_glyphs () const; +}; +DECLARE_NULL_INSTANCE (hb_face_t); + + +#endif /* HB_FACE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-fallback-shape.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-fallback-shape.cc new file mode 100644 index 000000000..c5b7c2c23 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-fallback-shape.cc @@ -0,0 +1,125 @@ +/* + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#include "hb-shaper-impl.hh" + +#ifndef HB_NO_FALLBACK_SHAPE + +/* + * shaper face data + */ + +struct hb_fallback_face_data_t {}; + +hb_fallback_face_data_t * +_hb_fallback_shaper_face_data_create (hb_face_t *face HB_UNUSED) +{ + return (hb_fallback_face_data_t *) HB_SHAPER_DATA_SUCCEEDED; +} + +void +_hb_fallback_shaper_face_data_destroy (hb_fallback_face_data_t *data HB_UNUSED) +{ +} + + +/* + * shaper font data + */ + +struct hb_fallback_font_data_t {}; + +hb_fallback_font_data_t * +_hb_fallback_shaper_font_data_create (hb_font_t *font HB_UNUSED) +{ + return (hb_fallback_font_data_t *) HB_SHAPER_DATA_SUCCEEDED; +} + +void +_hb_fallback_shaper_font_data_destroy (hb_fallback_font_data_t *data HB_UNUSED) +{ +} + + +/* + * shaper + */ + +hb_bool_t +_hb_fallback_shape (hb_shape_plan_t *shape_plan HB_UNUSED, + hb_font_t *font, + hb_buffer_t *buffer, + const hb_feature_t *features HB_UNUSED, + unsigned int num_features HB_UNUSED) +{ + /* TODO + * + * - Apply fallback kern. + * - Handle Variation Selectors? + * - Apply normalization? + * + * This will make the fallback shaper into a dumb "TrueType" + * shaper which many people unfortunately still request. + */ + + hb_codepoint_t space; + bool has_space = (bool) font->get_nominal_glyph (' ', &space); + + buffer->clear_positions (); + + hb_direction_t direction = buffer->props.direction; + hb_unicode_funcs_t *unicode = buffer->unicode; + unsigned int count = buffer->len; + hb_glyph_info_t *info = buffer->info; + hb_glyph_position_t *pos = buffer->pos; + for (unsigned int i = 0; i < count; i++) + { + if (has_space && unicode->is_default_ignorable (info[i].codepoint)) { + info[i].codepoint = space; + pos[i].x_advance = 0; + pos[i].y_advance = 0; + continue; + } + (void) font->get_nominal_glyph (info[i].codepoint, &info[i].codepoint); + font->get_glyph_advance_for_direction (info[i].codepoint, + direction, + &pos[i].x_advance, + &pos[i].y_advance); + font->subtract_glyph_origin_for_direction (info[i].codepoint, + direction, + &pos[i].x_offset, + &pos[i].y_offset); + } + + if (HB_DIRECTION_IS_BACKWARD (direction)) + hb_buffer_reverse (buffer); + + buffer->safe_to_break_all (); + + return true; +} + +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-font.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-font.cc new file mode 100644 index 000000000..ee35966c1 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-font.cc @@ -0,0 +1,2077 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#include "hb.hh" + +#include "hb-font.hh" +#include "hb-machinery.hh" + +#include "hb-ot.h" + + +/** + * SECTION:hb-font + * @title: hb-font + * @short_description: Font objects + * @include: hb.h + * + * Font objects represent a font face at a certain size and other + * parameters (pixels per EM, points per EM, variation settings.) + * Fonts are created from font faces, and are used as input to + * hb_shape() among other things. + **/ + + +/* + * hb_font_funcs_t + */ + +static hb_bool_t +hb_font_get_font_h_extents_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_font_extents_t *extents, + void *user_data HB_UNUSED) +{ + memset (extents, 0, sizeof (*extents)); + return false; +} +static hb_bool_t +hb_font_get_font_h_extents_default (hb_font_t *font, + void *font_data HB_UNUSED, + hb_font_extents_t *extents, + void *user_data HB_UNUSED) +{ + hb_bool_t ret = font->parent->get_font_h_extents (extents); + if (ret) { + extents->ascender = font->parent_scale_y_distance (extents->ascender); + extents->descender = font->parent_scale_y_distance (extents->descender); + extents->line_gap = font->parent_scale_y_distance (extents->line_gap); + } + return ret; +} + +static hb_bool_t +hb_font_get_font_v_extents_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_font_extents_t *extents, + void *user_data HB_UNUSED) +{ + memset (extents, 0, sizeof (*extents)); + return false; +} +static hb_bool_t +hb_font_get_font_v_extents_default (hb_font_t *font, + void *font_data HB_UNUSED, + hb_font_extents_t *extents, + void *user_data HB_UNUSED) +{ + hb_bool_t ret = font->parent->get_font_v_extents (extents); + if (ret) { + extents->ascender = font->parent_scale_x_distance (extents->ascender); + extents->descender = font->parent_scale_x_distance (extents->descender); + extents->line_gap = font->parent_scale_x_distance (extents->line_gap); + } + return ret; +} + +static hb_bool_t +hb_font_get_nominal_glyph_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t unicode HB_UNUSED, + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + *glyph = 0; + return false; +} +static hb_bool_t +hb_font_get_nominal_glyph_default (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t unicode, + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + if (font->has_nominal_glyphs_func_set ()) + { + return font->get_nominal_glyphs (1, &unicode, 0, glyph, 0); + } + return font->parent->get_nominal_glyph (unicode, glyph); +} + +#define hb_font_get_nominal_glyphs_nil hb_font_get_nominal_glyphs_default +static unsigned int +hb_font_get_nominal_glyphs_default (hb_font_t *font, + void *font_data HB_UNUSED, + unsigned int count, + const hb_codepoint_t *first_unicode, + unsigned int unicode_stride, + hb_codepoint_t *first_glyph, + unsigned int glyph_stride, + void *user_data HB_UNUSED) +{ + if (font->has_nominal_glyph_func_set ()) + { + for (unsigned int i = 0; i < count; i++) + { + if (!font->get_nominal_glyph (*first_unicode, first_glyph)) + return i; + + first_unicode = &StructAtOffsetUnaligned (first_unicode, unicode_stride); + first_glyph = &StructAtOffsetUnaligned (first_glyph, glyph_stride); + } + return count; + } + + return font->parent->get_nominal_glyphs (count, + first_unicode, unicode_stride, + first_glyph, glyph_stride); +} + +static hb_bool_t +hb_font_get_variation_glyph_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t unicode HB_UNUSED, + hb_codepoint_t variation_selector HB_UNUSED, + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + *glyph = 0; + return false; +} +static hb_bool_t +hb_font_get_variation_glyph_default (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t unicode, + hb_codepoint_t variation_selector, + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + return font->parent->get_variation_glyph (unicode, variation_selector, glyph); +} + + +static hb_position_t +hb_font_get_glyph_h_advance_nil (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t glyph HB_UNUSED, + void *user_data HB_UNUSED) +{ + return font->x_scale; +} +static hb_position_t +hb_font_get_glyph_h_advance_default (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + void *user_data HB_UNUSED) +{ + if (font->has_glyph_h_advances_func_set ()) + { + hb_position_t ret; + font->get_glyph_h_advances (1, &glyph, 0, &ret, 0); + return ret; + } + return font->parent_scale_x_distance (font->parent->get_glyph_h_advance (glyph)); +} + +static hb_position_t +hb_font_get_glyph_v_advance_nil (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t glyph HB_UNUSED, + void *user_data HB_UNUSED) +{ + /* TODO use font_extents.ascender+descender */ + return font->y_scale; +} +static hb_position_t +hb_font_get_glyph_v_advance_default (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + void *user_data HB_UNUSED) +{ + if (font->has_glyph_v_advances_func_set ()) + { + hb_position_t ret; + font->get_glyph_v_advances (1, &glyph, 0, &ret, 0); + return ret; + } + return font->parent_scale_y_distance (font->parent->get_glyph_v_advance (glyph)); +} + +#define hb_font_get_glyph_h_advances_nil hb_font_get_glyph_h_advances_default +static void +hb_font_get_glyph_h_advances_default (hb_font_t* font, + void* font_data HB_UNUSED, + unsigned int count, + const hb_codepoint_t *first_glyph, + unsigned int glyph_stride, + hb_position_t *first_advance, + unsigned int advance_stride, + void *user_data HB_UNUSED) +{ + if (font->has_glyph_h_advance_func_set ()) + { + for (unsigned int i = 0; i < count; i++) + { + *first_advance = font->get_glyph_h_advance (*first_glyph); + first_glyph = &StructAtOffsetUnaligned (first_glyph, glyph_stride); + first_advance = &StructAtOffsetUnaligned (first_advance, advance_stride); + } + return; + } + + font->parent->get_glyph_h_advances (count, + first_glyph, glyph_stride, + first_advance, advance_stride); + for (unsigned int i = 0; i < count; i++) + { + *first_advance = font->parent_scale_x_distance (*first_advance); + first_advance = &StructAtOffsetUnaligned (first_advance, advance_stride); + } +} + +#define hb_font_get_glyph_v_advances_nil hb_font_get_glyph_v_advances_default +static void +hb_font_get_glyph_v_advances_default (hb_font_t* font, + void* font_data HB_UNUSED, + unsigned int count, + const hb_codepoint_t *first_glyph, + unsigned int glyph_stride, + hb_position_t *first_advance, + unsigned int advance_stride, + void *user_data HB_UNUSED) +{ + if (font->has_glyph_v_advance_func_set ()) + { + for (unsigned int i = 0; i < count; i++) + { + *first_advance = font->get_glyph_v_advance (*first_glyph); + first_glyph = &StructAtOffsetUnaligned (first_glyph, glyph_stride); + first_advance = &StructAtOffsetUnaligned (first_advance, advance_stride); + } + return; + } + + font->parent->get_glyph_v_advances (count, + first_glyph, glyph_stride, + first_advance, advance_stride); + for (unsigned int i = 0; i < count; i++) + { + *first_advance = font->parent_scale_y_distance (*first_advance); + first_advance = &StructAtOffsetUnaligned (first_advance, advance_stride); + } +} + +static hb_bool_t +hb_font_get_glyph_h_origin_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t glyph HB_UNUSED, + hb_position_t *x, + hb_position_t *y, + void *user_data HB_UNUSED) +{ + *x = *y = 0; + return true; +} +static hb_bool_t +hb_font_get_glyph_h_origin_default (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + hb_position_t *x, + hb_position_t *y, + void *user_data HB_UNUSED) +{ + hb_bool_t ret = font->parent->get_glyph_h_origin (glyph, x, y); + if (ret) + font->parent_scale_position (x, y); + return ret; +} + +static hb_bool_t +hb_font_get_glyph_v_origin_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t glyph HB_UNUSED, + hb_position_t *x, + hb_position_t *y, + void *user_data HB_UNUSED) +{ + *x = *y = 0; + return false; +} +static hb_bool_t +hb_font_get_glyph_v_origin_default (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + hb_position_t *x, + hb_position_t *y, + void *user_data HB_UNUSED) +{ + hb_bool_t ret = font->parent->get_glyph_v_origin (glyph, x, y); + if (ret) + font->parent_scale_position (x, y); + return ret; +} + +static hb_position_t +hb_font_get_glyph_h_kerning_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t left_glyph HB_UNUSED, + hb_codepoint_t right_glyph HB_UNUSED, + void *user_data HB_UNUSED) +{ + return 0; +} +static hb_position_t +hb_font_get_glyph_h_kerning_default (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t left_glyph, + hb_codepoint_t right_glyph, + void *user_data HB_UNUSED) +{ + return font->parent_scale_x_distance (font->parent->get_glyph_h_kerning (left_glyph, right_glyph)); +} + +#ifndef HB_DISABLE_DEPRECATED +static hb_position_t +hb_font_get_glyph_v_kerning_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t top_glyph HB_UNUSED, + hb_codepoint_t bottom_glyph HB_UNUSED, + void *user_data HB_UNUSED) +{ + return 0; +} +static hb_position_t +hb_font_get_glyph_v_kerning_default (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t top_glyph, + hb_codepoint_t bottom_glyph, + void *user_data HB_UNUSED) +{ + return font->parent_scale_y_distance (font->parent->get_glyph_v_kerning (top_glyph, bottom_glyph)); +} +#endif + +static hb_bool_t +hb_font_get_glyph_extents_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t glyph HB_UNUSED, + hb_glyph_extents_t *extents, + void *user_data HB_UNUSED) +{ + memset (extents, 0, sizeof (*extents)); + return false; +} +static hb_bool_t +hb_font_get_glyph_extents_default (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + hb_glyph_extents_t *extents, + void *user_data HB_UNUSED) +{ + hb_bool_t ret = font->parent->get_glyph_extents (glyph, extents); + if (ret) { + font->parent_scale_position (&extents->x_bearing, &extents->y_bearing); + font->parent_scale_distance (&extents->width, &extents->height); + } + return ret; +} + +static hb_bool_t +hb_font_get_glyph_contour_point_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t glyph HB_UNUSED, + unsigned int point_index HB_UNUSED, + hb_position_t *x, + hb_position_t *y, + void *user_data HB_UNUSED) +{ + *x = *y = 0; + return false; +} +static hb_bool_t +hb_font_get_glyph_contour_point_default (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + unsigned int point_index, + hb_position_t *x, + hb_position_t *y, + void *user_data HB_UNUSED) +{ + hb_bool_t ret = font->parent->get_glyph_contour_point (glyph, point_index, x, y); + if (ret) + font->parent_scale_position (x, y); + return ret; +} + +static hb_bool_t +hb_font_get_glyph_name_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t glyph HB_UNUSED, + char *name, unsigned int size, + void *user_data HB_UNUSED) +{ + if (size) *name = '\0'; + return false; +} +static hb_bool_t +hb_font_get_glyph_name_default (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + char *name, unsigned int size, + void *user_data HB_UNUSED) +{ + return font->parent->get_glyph_name (glyph, name, size); +} + +static hb_bool_t +hb_font_get_glyph_from_name_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + const char *name HB_UNUSED, + int len HB_UNUSED, /* -1 means nul-terminated */ + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + *glyph = 0; + return false; +} +static hb_bool_t +hb_font_get_glyph_from_name_default (hb_font_t *font, + void *font_data HB_UNUSED, + const char *name, int len, /* -1 means nul-terminated */ + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + return font->parent->get_glyph_from_name (name, len, glyph); +} + +DEFINE_NULL_INSTANCE (hb_font_funcs_t) = +{ + HB_OBJECT_HEADER_STATIC, + + { +#define HB_FONT_FUNC_IMPLEMENT(name) nullptr, + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + }, + { +#define HB_FONT_FUNC_IMPLEMENT(name) nullptr, + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + }, + { + { +#define HB_FONT_FUNC_IMPLEMENT(name) hb_font_get_##name##_nil, + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + } + } +}; + +static const hb_font_funcs_t _hb_font_funcs_default = { + HB_OBJECT_HEADER_STATIC, + + { +#define HB_FONT_FUNC_IMPLEMENT(name) nullptr, + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + }, + { +#define HB_FONT_FUNC_IMPLEMENT(name) nullptr, + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + }, + { + { +#define HB_FONT_FUNC_IMPLEMENT(name) hb_font_get_##name##_default, + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + } + } +}; + + +/** + * hb_font_funcs_create: (Xconstructor) + * + * + * + * Return value: (transfer full): + * + * Since: 0.9.2 + **/ +hb_font_funcs_t * +hb_font_funcs_create () +{ + hb_font_funcs_t *ffuncs; + + if (!(ffuncs = hb_object_create ())) + return hb_font_funcs_get_empty (); + + ffuncs->get = _hb_font_funcs_default.get; + + return ffuncs; +} + +/** + * hb_font_funcs_get_empty: + * + * + * + * Return value: (transfer full): + * + * Since: 0.9.2 + **/ +hb_font_funcs_t * +hb_font_funcs_get_empty () +{ + return const_cast (&_hb_font_funcs_default); +} + +/** + * hb_font_funcs_reference: (skip) + * @ffuncs: font functions. + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_font_funcs_t * +hb_font_funcs_reference (hb_font_funcs_t *ffuncs) +{ + return hb_object_reference (ffuncs); +} + +/** + * hb_font_funcs_destroy: (skip) + * @ffuncs: font functions. + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_funcs_destroy (hb_font_funcs_t *ffuncs) +{ + if (!hb_object_destroy (ffuncs)) return; + +#define HB_FONT_FUNC_IMPLEMENT(name) if (ffuncs->destroy.name) \ + ffuncs->destroy.name (ffuncs->user_data.name); + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + + free (ffuncs); +} + +/** + * hb_font_funcs_set_user_data: (skip) + * @ffuncs: font functions. + * @key: + * @data: + * @destroy: + * @replace: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_funcs_set_user_data (hb_font_funcs_t *ffuncs, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace) +{ + return hb_object_set_user_data (ffuncs, key, data, destroy, replace); +} + +/** + * hb_font_funcs_get_user_data: (skip) + * @ffuncs: font functions. + * @key: + * + * + * + * Return value: (transfer none): + * + * Since: 0.9.2 + **/ +void * +hb_font_funcs_get_user_data (hb_font_funcs_t *ffuncs, + hb_user_data_key_t *key) +{ + return hb_object_get_user_data (ffuncs, key); +} + + +/** + * hb_font_funcs_make_immutable: + * @ffuncs: font functions. + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_funcs_make_immutable (hb_font_funcs_t *ffuncs) +{ + if (hb_object_is_immutable (ffuncs)) + return; + + hb_object_make_immutable (ffuncs); +} + +/** + * hb_font_funcs_is_immutable: + * @ffuncs: font functions. + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_funcs_is_immutable (hb_font_funcs_t *ffuncs) +{ + return hb_object_is_immutable (ffuncs); +} + + +#define HB_FONT_FUNC_IMPLEMENT(name) \ + \ +void \ +hb_font_funcs_set_##name##_func (hb_font_funcs_t *ffuncs, \ + hb_font_get_##name##_func_t func, \ + void *user_data, \ + hb_destroy_func_t destroy) \ +{ \ + if (hb_object_is_immutable (ffuncs)) { \ + if (destroy) \ + destroy (user_data); \ + return; \ + } \ + \ + if (ffuncs->destroy.name) \ + ffuncs->destroy.name (ffuncs->user_data.name); \ + \ + if (func) { \ + ffuncs->get.f.name = func; \ + ffuncs->user_data.name = user_data; \ + ffuncs->destroy.name = destroy; \ + } else { \ + ffuncs->get.f.name = hb_font_get_##name##_default; \ + ffuncs->user_data.name = nullptr; \ + ffuncs->destroy.name = nullptr; \ + } \ +} + +HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + +bool +hb_font_t::has_func_set (unsigned int i) +{ + return this->klass->get.array[i] != _hb_font_funcs_default.get.array[i]; +} + +bool +hb_font_t::has_func (unsigned int i) +{ + return has_func_set (i) || + (parent && parent != &_hb_Null_hb_font_t && parent->has_func (i)); +} + +/* Public getters */ + +/** + * hb_font_get_h_extents: + * @font: a font. + * @extents: (out): + * + * + * + * Return value: + * + * Since: 1.1.3 + **/ +hb_bool_t +hb_font_get_h_extents (hb_font_t *font, + hb_font_extents_t *extents) +{ + return font->get_font_h_extents (extents); +} + +/** + * hb_font_get_v_extents: + * @font: a font. + * @extents: (out): + * + * + * + * Return value: + * + * Since: 1.1.3 + **/ +hb_bool_t +hb_font_get_v_extents (hb_font_t *font, + hb_font_extents_t *extents) +{ + return font->get_font_v_extents (extents); +} + +/** + * hb_font_get_glyph: + * @font: a font. + * @unicode: + * @variation_selector: + * @glyph: (out): + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_get_glyph (hb_font_t *font, + hb_codepoint_t unicode, hb_codepoint_t variation_selector, + hb_codepoint_t *glyph) +{ + if (unlikely (variation_selector)) + return font->get_variation_glyph (unicode, variation_selector, glyph); + return font->get_nominal_glyph (unicode, glyph); +} + +/** + * hb_font_get_nominal_glyph: + * @font: a font. + * @unicode: + * @glyph: (out): + * + * + * + * Return value: + * + * Since: 1.2.3 + **/ +hb_bool_t +hb_font_get_nominal_glyph (hb_font_t *font, + hb_codepoint_t unicode, + hb_codepoint_t *glyph) +{ + return font->get_nominal_glyph (unicode, glyph); +} + +/** + * hb_font_get_variation_glyph: + * @font: a font. + * @unicode: + * @variation_selector: + * @glyph: (out): + * + * + * + * Return value: + * + * Since: 1.2.3 + **/ +hb_bool_t +hb_font_get_variation_glyph (hb_font_t *font, + hb_codepoint_t unicode, hb_codepoint_t variation_selector, + hb_codepoint_t *glyph) +{ + return font->get_variation_glyph (unicode, variation_selector, glyph); +} + +/** + * hb_font_get_glyph_h_advance: + * @font: a font. + * @glyph: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_position_t +hb_font_get_glyph_h_advance (hb_font_t *font, + hb_codepoint_t glyph) +{ + return font->get_glyph_h_advance (glyph); +} + +/** + * hb_font_get_glyph_v_advance: + * @font: a font. + * @glyph: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_position_t +hb_font_get_glyph_v_advance (hb_font_t *font, + hb_codepoint_t glyph) +{ + return font->get_glyph_v_advance (glyph); +} + +/** + * hb_font_get_glyph_h_advances: + * @font: a font. + * + * + * + * Since: 1.8.6 + **/ +void +hb_font_get_glyph_h_advances (hb_font_t* font, + unsigned int count, + const hb_codepoint_t *first_glyph, + unsigned glyph_stride, + hb_position_t *first_advance, + unsigned advance_stride) +{ + font->get_glyph_h_advances (count, first_glyph, glyph_stride, first_advance, advance_stride); +} +/** + * hb_font_get_glyph_v_advances: + * @font: a font. + * + * + * + * Since: 1.8.6 + **/ +void +hb_font_get_glyph_v_advances (hb_font_t* font, + unsigned int count, + const hb_codepoint_t *first_glyph, + unsigned glyph_stride, + hb_position_t *first_advance, + unsigned advance_stride) +{ + font->get_glyph_v_advances (count, first_glyph, glyph_stride, first_advance, advance_stride); +} + +/** + * hb_font_get_glyph_h_origin: + * @font: a font. + * @glyph: + * @x: (out): + * @y: (out): + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_get_glyph_h_origin (hb_font_t *font, + hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) +{ + return font->get_glyph_h_origin (glyph, x, y); +} + +/** + * hb_font_get_glyph_v_origin: + * @font: a font. + * @glyph: + * @x: (out): + * @y: (out): + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_get_glyph_v_origin (hb_font_t *font, + hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) +{ + return font->get_glyph_v_origin (glyph, x, y); +} + +/** + * hb_font_get_glyph_h_kerning: + * @font: a font. + * @left_glyph: + * @right_glyph: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_position_t +hb_font_get_glyph_h_kerning (hb_font_t *font, + hb_codepoint_t left_glyph, hb_codepoint_t right_glyph) +{ + return font->get_glyph_h_kerning (left_glyph, right_glyph); +} + +#ifndef HB_DISABLE_DEPRECATED +/** + * hb_font_get_glyph_v_kerning: + * @font: a font. + * @top_glyph: + * @bottom_glyph: + * + * + * + * Return value: + * + * Since: 0.9.2 + * Deprecated: 2.0.0 + **/ +hb_position_t +hb_font_get_glyph_v_kerning (hb_font_t *font, + hb_codepoint_t top_glyph, hb_codepoint_t bottom_glyph) +{ + return font->get_glyph_v_kerning (top_glyph, bottom_glyph); +} +#endif + +/** + * hb_font_get_glyph_extents: + * @font: a font. + * @glyph: + * @extents: (out): + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_get_glyph_extents (hb_font_t *font, + hb_codepoint_t glyph, + hb_glyph_extents_t *extents) +{ + return font->get_glyph_extents (glyph, extents); +} + +/** + * hb_font_get_glyph_contour_point: + * @font: a font. + * @glyph: + * @point_index: + * @x: (out): + * @y: (out): + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_get_glyph_contour_point (hb_font_t *font, + hb_codepoint_t glyph, unsigned int point_index, + hb_position_t *x, hb_position_t *y) +{ + return font->get_glyph_contour_point (glyph, point_index, x, y); +} + +/** + * hb_font_get_glyph_name: + * @font: a font. + * @glyph: + * @name: (array length=size): + * @size: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_get_glyph_name (hb_font_t *font, + hb_codepoint_t glyph, + char *name, unsigned int size) +{ + return font->get_glyph_name (glyph, name, size); +} + +/** + * hb_font_get_glyph_from_name: + * @font: a font. + * @name: (array length=len): + * @len: + * @glyph: (out): + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_get_glyph_from_name (hb_font_t *font, + const char *name, int len, /* -1 means nul-terminated */ + hb_codepoint_t *glyph) +{ + return font->get_glyph_from_name (name, len, glyph); +} + + +/* A bit higher-level, and with fallback */ + +/** + * hb_font_get_extents_for_direction: + * @font: a font. + * @direction: + * @extents: (out): + * + * + * + * Since: 1.1.3 + **/ +void +hb_font_get_extents_for_direction (hb_font_t *font, + hb_direction_t direction, + hb_font_extents_t *extents) +{ + return font->get_extents_for_direction (direction, extents); +} +/** + * hb_font_get_glyph_advance_for_direction: + * @font: a font. + * @glyph: + * @direction: + * @x: (out): + * @y: (out): + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_get_glyph_advance_for_direction (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) +{ + return font->get_glyph_advance_for_direction (glyph, direction, x, y); +} +/** + * hb_font_get_glyph_advances_for_direction: + * @font: a font. + * @direction: + * + * + * + * Since: 1.8.6 + **/ +HB_EXTERN void +hb_font_get_glyph_advances_for_direction (hb_font_t* font, + hb_direction_t direction, + unsigned int count, + const hb_codepoint_t *first_glyph, + unsigned glyph_stride, + hb_position_t *first_advance, + unsigned advance_stride) +{ + font->get_glyph_advances_for_direction (direction, count, first_glyph, glyph_stride, first_advance, advance_stride); +} + +/** + * hb_font_get_glyph_origin_for_direction: + * @font: a font. + * @glyph: + * @direction: + * @x: (out): + * @y: (out): + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_get_glyph_origin_for_direction (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) +{ + return font->get_glyph_origin_for_direction (glyph, direction, x, y); +} + +/** + * hb_font_add_glyph_origin_for_direction: + * @font: a font. + * @glyph: + * @direction: + * @x: (out): + * @y: (out): + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_add_glyph_origin_for_direction (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) +{ + return font->add_glyph_origin_for_direction (glyph, direction, x, y); +} + +/** + * hb_font_subtract_glyph_origin_for_direction: + * @font: a font. + * @glyph: + * @direction: + * @x: (out): + * @y: (out): + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_subtract_glyph_origin_for_direction (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) +{ + return font->subtract_glyph_origin_for_direction (glyph, direction, x, y); +} + +/** + * hb_font_get_glyph_kerning_for_direction: + * @font: a font. + * @first_glyph: + * @second_glyph: + * @direction: + * @x: (out): + * @y: (out): + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_get_glyph_kerning_for_direction (hb_font_t *font, + hb_codepoint_t first_glyph, hb_codepoint_t second_glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) +{ + return font->get_glyph_kerning_for_direction (first_glyph, second_glyph, direction, x, y); +} + +/** + * hb_font_get_glyph_extents_for_origin: + * @font: a font. + * @glyph: + * @direction: + * @extents: (out): + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_get_glyph_extents_for_origin (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_glyph_extents_t *extents) +{ + return font->get_glyph_extents_for_origin (glyph, direction, extents); +} + +/** + * hb_font_get_glyph_contour_point_for_origin: + * @font: a font. + * @glyph: + * @point_index: + * @direction: + * @x: (out): + * @y: (out): + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_get_glyph_contour_point_for_origin (hb_font_t *font, + hb_codepoint_t glyph, unsigned int point_index, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) +{ + return font->get_glyph_contour_point_for_origin (glyph, point_index, direction, x, y); +} + +/* Generates gidDDD if glyph has no name. */ +/** + * hb_font_glyph_to_string: + * @font: a font. + * @glyph: + * @s: (array length=size): + * @size: + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_glyph_to_string (hb_font_t *font, + hb_codepoint_t glyph, + char *s, unsigned int size) +{ + font->glyph_to_string (glyph, s, size); +} + +/* Parses gidDDD and uniUUUU strings automatically. */ +/** + * hb_font_glyph_from_string: + * @font: a font. + * @s: (array length=len) (element-type uint8_t): + * @len: + * @glyph: (out): + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_glyph_from_string (hb_font_t *font, + const char *s, int len, /* -1 means nul-terminated */ + hb_codepoint_t *glyph) +{ + return font->glyph_from_string (s, len, glyph); +} + + +/* + * hb_font_t + */ + +DEFINE_NULL_INSTANCE (hb_font_t) = +{ + HB_OBJECT_HEADER_STATIC, + + nullptr, /* parent */ + const_cast (&_hb_Null_hb_face_t), + + 1000, /* x_scale */ + 1000, /* y_scale */ + 1<<16, /* x_mult */ + 1<<16, /* y_mult */ + + 0, /* x_ppem */ + 0, /* y_ppem */ + 0, /* ptem */ + + 0, /* num_coords */ + nullptr, /* coords */ + + const_cast (&_hb_Null_hb_font_funcs_t), + + /* Zero for the rest is fine. */ +}; + + +static hb_font_t * +_hb_font_create (hb_face_t *face) +{ + hb_font_t *font; + + if (unlikely (!face)) + face = hb_face_get_empty (); + if (!(font = hb_object_create ())) + return hb_font_get_empty (); + + hb_face_make_immutable (face); + font->parent = hb_font_get_empty (); + font->face = hb_face_reference (face); + font->klass = hb_font_funcs_get_empty (); + font->data.init0 (font); + font->x_scale = font->y_scale = hb_face_get_upem (face); + font->x_mult = font->y_mult = 1 << 16; + + return font; +} + +/** + * hb_font_create: (Xconstructor) + * @face: a face. + * + * + * + * Return value: (transfer full): + * + * Since: 0.9.2 + **/ +hb_font_t * +hb_font_create (hb_face_t *face) +{ + hb_font_t *font = _hb_font_create (face); + +#ifndef HB_NO_OT_FONT + /* Install our in-house, very lightweight, funcs. */ + hb_ot_font_set_funcs (font); +#endif + + return font; +} + +/** + * hb_font_create_sub_font: + * @parent: parent font. + * + * + * + * Return value: (transfer full): + * + * Since: 0.9.2 + **/ +hb_font_t * +hb_font_create_sub_font (hb_font_t *parent) +{ + if (unlikely (!parent)) + parent = hb_font_get_empty (); + + hb_font_t *font = _hb_font_create (parent->face); + + if (unlikely (hb_object_is_immutable (font))) + return font; + + font->parent = hb_font_reference (parent); + + font->x_scale = parent->x_scale; + font->y_scale = parent->y_scale; + font->mults_changed (); + font->x_ppem = parent->x_ppem; + font->y_ppem = parent->y_ppem; + font->ptem = parent->ptem; + + font->num_coords = parent->num_coords; + if (font->num_coords) + { + unsigned int size = parent->num_coords * sizeof (parent->coords[0]); + font->coords = (int *) malloc (size); + if (unlikely (!font->coords)) + font->num_coords = 0; + else + memcpy (font->coords, parent->coords, size); + } + + return font; +} + +/** + * hb_font_get_empty: + * + * + * + * Return value: (transfer full) + * + * Since: 0.9.2 + **/ +hb_font_t * +hb_font_get_empty () +{ + return const_cast (&Null(hb_font_t)); +} + +/** + * hb_font_reference: (skip) + * @font: a font. + * + * + * + * Return value: (transfer full): + * + * Since: 0.9.2 + **/ +hb_font_t * +hb_font_reference (hb_font_t *font) +{ + return hb_object_reference (font); +} + +/** + * hb_font_destroy: (skip) + * @font: a font. + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_destroy (hb_font_t *font) +{ + if (!hb_object_destroy (font)) return; + + font->data.fini (); + + if (font->destroy) + font->destroy (font->user_data); + + hb_font_destroy (font->parent); + hb_face_destroy (font->face); + hb_font_funcs_destroy (font->klass); + + free (font->coords); + + free (font); +} + +/** + * hb_font_set_user_data: (skip) + * @font: a font. + * @key: + * @data: + * @destroy: + * @replace: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_set_user_data (hb_font_t *font, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace) +{ + return hb_object_set_user_data (font, key, data, destroy, replace); +} + +/** + * hb_font_get_user_data: (skip) + * @font: a font. + * @key: + * + * + * + * Return value: (transfer none): + * + * Since: 0.9.2 + **/ +void * +hb_font_get_user_data (hb_font_t *font, + hb_user_data_key_t *key) +{ + return hb_object_get_user_data (font, key); +} + +/** + * hb_font_make_immutable: + * @font: a font. + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_make_immutable (hb_font_t *font) +{ + if (hb_object_is_immutable (font)) + return; + + if (font->parent) + hb_font_make_immutable (font->parent); + + hb_object_make_immutable (font); +} + +/** + * hb_font_is_immutable: + * @font: a font. + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_is_immutable (hb_font_t *font) +{ + return hb_object_is_immutable (font); +} + +/** + * hb_font_set_parent: + * @font: a font. + * @parent: new parent. + * + * Sets parent font of @font. + * + * Since: 1.0.5 + **/ +void +hb_font_set_parent (hb_font_t *font, + hb_font_t *parent) +{ + if (hb_object_is_immutable (font)) + return; + + if (!parent) + parent = hb_font_get_empty (); + + hb_font_t *old = font->parent; + + font->parent = hb_font_reference (parent); + + hb_font_destroy (old); +} + +/** + * hb_font_get_parent: + * @font: a font. + * + * + * + * Return value: (transfer none): + * + * Since: 0.9.2 + **/ +hb_font_t * +hb_font_get_parent (hb_font_t *font) +{ + return font->parent; +} + +/** + * hb_font_set_face: + * @font: a font. + * @face: new face. + * + * Sets font-face of @font. + * + * Since: 1.4.3 + **/ +void +hb_font_set_face (hb_font_t *font, + hb_face_t *face) +{ + if (hb_object_is_immutable (font)) + return; + + if (unlikely (!face)) + face = hb_face_get_empty (); + + hb_face_t *old = font->face; + + hb_face_make_immutable (face); + font->face = hb_face_reference (face); + font->mults_changed (); + + hb_face_destroy (old); +} + +/** + * hb_font_get_face: + * @font: a font. + * + * + * + * Return value: (transfer none): + * + * Since: 0.9.2 + **/ +hb_face_t * +hb_font_get_face (hb_font_t *font) +{ + return font->face; +} + + +/** + * hb_font_set_funcs: + * @font: a font. + * @klass: (closure font_data) (destroy destroy) (scope notified): + * @font_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_set_funcs (hb_font_t *font, + hb_font_funcs_t *klass, + void *font_data, + hb_destroy_func_t destroy) +{ + if (hb_object_is_immutable (font)) + { + if (destroy) + destroy (font_data); + return; + } + + if (font->destroy) + font->destroy (font->user_data); + + if (!klass) + klass = hb_font_funcs_get_empty (); + + hb_font_funcs_reference (klass); + hb_font_funcs_destroy (font->klass); + font->klass = klass; + font->user_data = font_data; + font->destroy = destroy; +} + +/** + * hb_font_set_funcs_data: + * @font: a font. + * @font_data: (destroy destroy) (scope notified): + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_set_funcs_data (hb_font_t *font, + void *font_data, + hb_destroy_func_t destroy) +{ + /* Destroy user_data? */ + if (hb_object_is_immutable (font)) + { + if (destroy) + destroy (font_data); + return; + } + + if (font->destroy) + font->destroy (font->user_data); + + font->user_data = font_data; + font->destroy = destroy; +} + + +/** + * hb_font_set_scale: + * @font: a font. + * @x_scale: + * @y_scale: + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_set_scale (hb_font_t *font, + int x_scale, + int y_scale) +{ + if (hb_object_is_immutable (font)) + return; + + font->x_scale = x_scale; + font->y_scale = y_scale; + font->mults_changed (); +} + +/** + * hb_font_get_scale: + * @font: a font. + * @x_scale: (out): + * @y_scale: (out): + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_get_scale (hb_font_t *font, + int *x_scale, + int *y_scale) +{ + if (x_scale) *x_scale = font->x_scale; + if (y_scale) *y_scale = font->y_scale; +} + +/** + * hb_font_set_ppem: + * @font: a font. + * @x_ppem: + * @y_ppem: + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_set_ppem (hb_font_t *font, + unsigned int x_ppem, + unsigned int y_ppem) +{ + if (hb_object_is_immutable (font)) + return; + + font->x_ppem = x_ppem; + font->y_ppem = y_ppem; +} + +/** + * hb_font_get_ppem: + * @font: a font. + * @x_ppem: (out): + * @y_ppem: (out): + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_get_ppem (hb_font_t *font, + unsigned int *x_ppem, + unsigned int *y_ppem) +{ + if (x_ppem) *x_ppem = font->x_ppem; + if (y_ppem) *y_ppem = font->y_ppem; +} + +/** + * hb_font_set_ptem: + * @font: a font. + * @ptem: font size in points. + * + * Sets "point size" of the font. Set to 0 to unset. + * + * There are 72 points in an inch. + * + * Since: 1.6.0 + **/ +void +hb_font_set_ptem (hb_font_t *font, float ptem) +{ + if (hb_object_is_immutable (font)) + return; + + font->ptem = ptem; +} + +/** + * hb_font_get_ptem: + * @font: a font. + * + * Gets the "point size" of the font. A value of 0 means unset. + * + * Return value: Point size. + * + * Since: 0.9.2 + **/ +float +hb_font_get_ptem (hb_font_t *font) +{ + return font->ptem; +} + +#ifndef HB_NO_VAR +/* + * Variations + */ + +static void +_hb_font_adopt_var_coords_normalized (hb_font_t *font, + int *coords, /* 2.14 normalized */ + unsigned int coords_length) +{ + free (font->coords); + + font->coords = coords; + font->num_coords = coords_length; +} + +/** + * hb_font_set_variations: + * + * Since: 1.4.2 + */ +void +hb_font_set_variations (hb_font_t *font, + const hb_variation_t *variations, + unsigned int variations_length) +{ + if (hb_object_is_immutable (font)) + return; + + if (!variations_length) + { + hb_font_set_var_coords_normalized (font, nullptr, 0); + return; + } + + unsigned int coords_length = hb_ot_var_get_axis_count (font->face); + + int *normalized = coords_length ? (int *) calloc (coords_length, sizeof (int)) : nullptr; + if (unlikely (coords_length && !normalized)) + return; + + hb_ot_var_normalize_variations (font->face, + variations, variations_length, + normalized, coords_length); + _hb_font_adopt_var_coords_normalized (font, normalized, coords_length); +} + +/** + * hb_font_set_var_coords_design: + * + * Since: 1.4.2 + */ +void +hb_font_set_var_coords_design (hb_font_t *font, + const float *coords, + unsigned int coords_length) +{ + if (hb_object_is_immutable (font)) + return; + + int *normalized = coords_length ? (int *) calloc (coords_length, sizeof (int)) : nullptr; + if (unlikely (coords_length && !normalized)) + return; + + hb_ot_var_normalize_coords (font->face, coords_length, coords, normalized); + _hb_font_adopt_var_coords_normalized (font, normalized, coords_length); +} + +/** + * hb_font_set_var_named_instance: + * @font: a font. + * @instance_index: named instance index. + * + * Sets design coords of a font from a named instance index. + * + * Since: 2.6.0 + */ +void +hb_font_set_var_named_instance (hb_font_t *font, + unsigned instance_index) +{ + if (hb_object_is_immutable (font)) + return; + + unsigned int coords_length = hb_ot_var_named_instance_get_design_coords (font->face, instance_index, nullptr, nullptr); + + float *coords = coords_length ? (float *) calloc (coords_length, sizeof (float)) : nullptr; + if (unlikely (coords_length && !coords)) + return; + + hb_ot_var_named_instance_get_design_coords (font->face, instance_index, &coords_length, coords); + hb_font_set_var_coords_design (font, coords, coords_length); + free (coords); +} + +/** + * hb_font_set_var_coords_normalized: + * + * Since: 1.4.2 + */ +void +hb_font_set_var_coords_normalized (hb_font_t *font, + const int *coords, /* 2.14 normalized */ + unsigned int coords_length) +{ + if (hb_object_is_immutable (font)) + return; + + int *copy = coords_length ? (int *) calloc (coords_length, sizeof (coords[0])) : nullptr; + if (unlikely (coords_length && !copy)) + return; + + if (coords_length) + memcpy (copy, coords, coords_length * sizeof (coords[0])); + + _hb_font_adopt_var_coords_normalized (font, copy, coords_length); +} + +/** + * hb_font_get_var_coords_normalized: + * + * Return value is valid as long as variation coordinates of the font + * are not modified. + * + * Since: 1.4.2 + */ +const int * +hb_font_get_var_coords_normalized (hb_font_t *font, + unsigned int *length) +{ + if (length) + *length = font->num_coords; + + return font->coords; +} +#endif + +#ifndef HB_DISABLE_DEPRECATED +/* + * Deprecated get_glyph_func(): + */ + +struct hb_trampoline_closure_t +{ + void *user_data; + hb_destroy_func_t destroy; + unsigned int ref_count; +}; + +template +struct hb_trampoline_t +{ + hb_trampoline_closure_t closure; /* Must be first. */ + FuncType func; +}; + +template +static hb_trampoline_t * +trampoline_create (FuncType func, + void *user_data, + hb_destroy_func_t destroy) +{ + typedef hb_trampoline_t trampoline_t; + + trampoline_t *trampoline = (trampoline_t *) calloc (1, sizeof (trampoline_t)); + + if (unlikely (!trampoline)) + return nullptr; + + trampoline->closure.user_data = user_data; + trampoline->closure.destroy = destroy; + trampoline->closure.ref_count = 1; + trampoline->func = func; + + return trampoline; +} + +static void +trampoline_reference (hb_trampoline_closure_t *closure) +{ + closure->ref_count++; +} + +static void +trampoline_destroy (void *user_data) +{ + hb_trampoline_closure_t *closure = (hb_trampoline_closure_t *) user_data; + + if (--closure->ref_count) + return; + + if (closure->destroy) + closure->destroy (closure->user_data); + free (closure); +} + +typedef hb_trampoline_t hb_font_get_glyph_trampoline_t; + +static hb_bool_t +hb_font_get_nominal_glyph_trampoline (hb_font_t *font, + void *font_data, + hb_codepoint_t unicode, + hb_codepoint_t *glyph, + void *user_data) +{ + hb_font_get_glyph_trampoline_t *trampoline = (hb_font_get_glyph_trampoline_t *) user_data; + return trampoline->func (font, font_data, unicode, 0, glyph, trampoline->closure.user_data); +} + +static hb_bool_t +hb_font_get_variation_glyph_trampoline (hb_font_t *font, + void *font_data, + hb_codepoint_t unicode, + hb_codepoint_t variation_selector, + hb_codepoint_t *glyph, + void *user_data) +{ + hb_font_get_glyph_trampoline_t *trampoline = (hb_font_get_glyph_trampoline_t *) user_data; + return trampoline->func (font, font_data, unicode, variation_selector, glyph, trampoline->closure.user_data); +} + +/** + * hb_font_funcs_set_glyph_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): callback function. + * @user_data: data to pass to @func. + * @destroy: function to call when @user_data is not needed anymore. + * + * Deprecated. Use hb_font_funcs_set_nominal_glyph_func() and + * hb_font_funcs_set_variation_glyph_func() instead. + * + * Since: 0.9.2 + * Deprecated: 1.2.3 + **/ +void +hb_font_funcs_set_glyph_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_func_t func, + void *user_data, hb_destroy_func_t destroy) +{ + hb_font_get_glyph_trampoline_t *trampoline; + + trampoline = trampoline_create (func, user_data, destroy); + if (unlikely (!trampoline)) + { + if (destroy) + destroy (user_data); + return; + } + + hb_font_funcs_set_nominal_glyph_func (ffuncs, + hb_font_get_nominal_glyph_trampoline, + trampoline, + trampoline_destroy); + + trampoline_reference (&trampoline->closure); + hb_font_funcs_set_variation_glyph_func (ffuncs, + hb_font_get_variation_glyph_trampoline, + trampoline, + trampoline_destroy); +} +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-font.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-font.h new file mode 100644 index 000000000..9b6518791 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-font.h @@ -0,0 +1,714 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + */ + +#ifndef HB_H_IN +#error "Include instead." +#endif + +#ifndef HB_FONT_H +#define HB_FONT_H + +#include "hb-common.h" +#include "hb-face.h" + +HB_BEGIN_DECLS + + +typedef struct hb_font_t hb_font_t; + + +/* + * hb_font_funcs_t + */ + +typedef struct hb_font_funcs_t hb_font_funcs_t; + +HB_EXTERN hb_font_funcs_t * +hb_font_funcs_create (void); + +HB_EXTERN hb_font_funcs_t * +hb_font_funcs_get_empty (void); + +HB_EXTERN hb_font_funcs_t * +hb_font_funcs_reference (hb_font_funcs_t *ffuncs); + +HB_EXTERN void +hb_font_funcs_destroy (hb_font_funcs_t *ffuncs); + +HB_EXTERN hb_bool_t +hb_font_funcs_set_user_data (hb_font_funcs_t *ffuncs, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace); + + +HB_EXTERN void * +hb_font_funcs_get_user_data (hb_font_funcs_t *ffuncs, + hb_user_data_key_t *key); + + +HB_EXTERN void +hb_font_funcs_make_immutable (hb_font_funcs_t *ffuncs); + +HB_EXTERN hb_bool_t +hb_font_funcs_is_immutable (hb_font_funcs_t *ffuncs); + + +/* font and glyph extents */ + +/* Note that typically ascender is positive and descender negative in coordinate systems that grow up. */ +typedef struct hb_font_extents_t +{ + hb_position_t ascender; /* typographic ascender. */ + hb_position_t descender; /* typographic descender. */ + hb_position_t line_gap; /* suggested line spacing gap. */ + /*< private >*/ + hb_position_t reserved9; + hb_position_t reserved8; + hb_position_t reserved7; + hb_position_t reserved6; + hb_position_t reserved5; + hb_position_t reserved4; + hb_position_t reserved3; + hb_position_t reserved2; + hb_position_t reserved1; +} hb_font_extents_t; + +/* Note that height is negative in coordinate systems that grow up. */ +typedef struct hb_glyph_extents_t +{ + hb_position_t x_bearing; /* left side of glyph from origin. */ + hb_position_t y_bearing; /* top side of glyph from origin. */ + hb_position_t width; /* distance from left to right side. */ + hb_position_t height; /* distance from top to bottom side. */ +} hb_glyph_extents_t; + +/* func types */ + +typedef hb_bool_t (*hb_font_get_font_extents_func_t) (hb_font_t *font, void *font_data, + hb_font_extents_t *extents, + void *user_data); +typedef hb_font_get_font_extents_func_t hb_font_get_font_h_extents_func_t; +typedef hb_font_get_font_extents_func_t hb_font_get_font_v_extents_func_t; + + +typedef hb_bool_t (*hb_font_get_nominal_glyph_func_t) (hb_font_t *font, void *font_data, + hb_codepoint_t unicode, + hb_codepoint_t *glyph, + void *user_data); +typedef hb_bool_t (*hb_font_get_variation_glyph_func_t) (hb_font_t *font, void *font_data, + hb_codepoint_t unicode, hb_codepoint_t variation_selector, + hb_codepoint_t *glyph, + void *user_data); + +typedef unsigned int (*hb_font_get_nominal_glyphs_func_t) (hb_font_t *font, void *font_data, + unsigned int count, + const hb_codepoint_t *first_unicode, + unsigned int unicode_stride, + hb_codepoint_t *first_glyph, + unsigned int glyph_stride, + void *user_data); + + +typedef hb_position_t (*hb_font_get_glyph_advance_func_t) (hb_font_t *font, void *font_data, + hb_codepoint_t glyph, + void *user_data); +typedef hb_font_get_glyph_advance_func_t hb_font_get_glyph_h_advance_func_t; +typedef hb_font_get_glyph_advance_func_t hb_font_get_glyph_v_advance_func_t; + +typedef void (*hb_font_get_glyph_advances_func_t) (hb_font_t* font, void* font_data, + unsigned int count, + const hb_codepoint_t *first_glyph, + unsigned glyph_stride, + hb_position_t *first_advance, + unsigned advance_stride, + void *user_data); +typedef hb_font_get_glyph_advances_func_t hb_font_get_glyph_h_advances_func_t; +typedef hb_font_get_glyph_advances_func_t hb_font_get_glyph_v_advances_func_t; + +typedef hb_bool_t (*hb_font_get_glyph_origin_func_t) (hb_font_t *font, void *font_data, + hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y, + void *user_data); +typedef hb_font_get_glyph_origin_func_t hb_font_get_glyph_h_origin_func_t; +typedef hb_font_get_glyph_origin_func_t hb_font_get_glyph_v_origin_func_t; + +typedef hb_position_t (*hb_font_get_glyph_kerning_func_t) (hb_font_t *font, void *font_data, + hb_codepoint_t first_glyph, hb_codepoint_t second_glyph, + void *user_data); +typedef hb_font_get_glyph_kerning_func_t hb_font_get_glyph_h_kerning_func_t; + + +typedef hb_bool_t (*hb_font_get_glyph_extents_func_t) (hb_font_t *font, void *font_data, + hb_codepoint_t glyph, + hb_glyph_extents_t *extents, + void *user_data); +typedef hb_bool_t (*hb_font_get_glyph_contour_point_func_t) (hb_font_t *font, void *font_data, + hb_codepoint_t glyph, unsigned int point_index, + hb_position_t *x, hb_position_t *y, + void *user_data); + + +typedef hb_bool_t (*hb_font_get_glyph_name_func_t) (hb_font_t *font, void *font_data, + hb_codepoint_t glyph, + char *name, unsigned int size, + void *user_data); +typedef hb_bool_t (*hb_font_get_glyph_from_name_func_t) (hb_font_t *font, void *font_data, + const char *name, int len, /* -1 means nul-terminated */ + hb_codepoint_t *glyph, + void *user_data); + + +/* func setters */ + +/** + * hb_font_funcs_set_font_h_extents_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 1.1.2 + **/ +HB_EXTERN void +hb_font_funcs_set_font_h_extents_func (hb_font_funcs_t *ffuncs, + hb_font_get_font_h_extents_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_font_v_extents_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 1.1.2 + **/ +HB_EXTERN void +hb_font_funcs_set_font_v_extents_func (hb_font_funcs_t *ffuncs, + hb_font_get_font_v_extents_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_nominal_glyph_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 1.2.3 + **/ +HB_EXTERN void +hb_font_funcs_set_nominal_glyph_func (hb_font_funcs_t *ffuncs, + hb_font_get_nominal_glyph_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_nominal_glyphs_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 2.0.0 + **/ +HB_EXTERN void +hb_font_funcs_set_nominal_glyphs_func (hb_font_funcs_t *ffuncs, + hb_font_get_nominal_glyphs_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_variation_glyph_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 1.2.3 + **/ +HB_EXTERN void +hb_font_funcs_set_variation_glyph_func (hb_font_funcs_t *ffuncs, + hb_font_get_variation_glyph_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_h_advance_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_h_advance_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_h_advance_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_v_advance_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_v_advance_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_v_advance_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_h_advances_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 1.8.6 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_h_advances_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_h_advances_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_v_advances_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 1.8.6 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_v_advances_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_v_advances_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_h_origin_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_h_origin_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_h_origin_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_v_origin_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_v_origin_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_v_origin_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_h_kerning_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_h_kerning_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_h_kerning_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_extents_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_extents_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_extents_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_contour_point_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_contour_point_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_contour_point_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_name_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_name_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_name_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_from_name_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_from_name_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_from_name_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/* func dispatch */ + +HB_EXTERN hb_bool_t +hb_font_get_h_extents (hb_font_t *font, + hb_font_extents_t *extents); +HB_EXTERN hb_bool_t +hb_font_get_v_extents (hb_font_t *font, + hb_font_extents_t *extents); + +HB_EXTERN hb_bool_t +hb_font_get_nominal_glyph (hb_font_t *font, + hb_codepoint_t unicode, + hb_codepoint_t *glyph); +HB_EXTERN hb_bool_t +hb_font_get_variation_glyph (hb_font_t *font, + hb_codepoint_t unicode, hb_codepoint_t variation_selector, + hb_codepoint_t *glyph); + +HB_EXTERN hb_position_t +hb_font_get_glyph_h_advance (hb_font_t *font, + hb_codepoint_t glyph); +HB_EXTERN hb_position_t +hb_font_get_glyph_v_advance (hb_font_t *font, + hb_codepoint_t glyph); + +HB_EXTERN void +hb_font_get_glyph_h_advances (hb_font_t* font, + unsigned int count, + const hb_codepoint_t *first_glyph, + unsigned glyph_stride, + hb_position_t *first_advance, + unsigned advance_stride); +HB_EXTERN void +hb_font_get_glyph_v_advances (hb_font_t* font, + unsigned int count, + const hb_codepoint_t *first_glyph, + unsigned glyph_stride, + hb_position_t *first_advance, + unsigned advance_stride); + +HB_EXTERN hb_bool_t +hb_font_get_glyph_h_origin (hb_font_t *font, + hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y); +HB_EXTERN hb_bool_t +hb_font_get_glyph_v_origin (hb_font_t *font, + hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y); + +HB_EXTERN hb_position_t +hb_font_get_glyph_h_kerning (hb_font_t *font, + hb_codepoint_t left_glyph, hb_codepoint_t right_glyph); + +HB_EXTERN hb_bool_t +hb_font_get_glyph_extents (hb_font_t *font, + hb_codepoint_t glyph, + hb_glyph_extents_t *extents); + +HB_EXTERN hb_bool_t +hb_font_get_glyph_contour_point (hb_font_t *font, + hb_codepoint_t glyph, unsigned int point_index, + hb_position_t *x, hb_position_t *y); + +HB_EXTERN hb_bool_t +hb_font_get_glyph_name (hb_font_t *font, + hb_codepoint_t glyph, + char *name, unsigned int size); +HB_EXTERN hb_bool_t +hb_font_get_glyph_from_name (hb_font_t *font, + const char *name, int len, /* -1 means nul-terminated */ + hb_codepoint_t *glyph); + + +/* high-level funcs, with fallback */ + +/* Calls either hb_font_get_nominal_glyph() if variation_selector is 0, + * otherwise calls hb_font_get_variation_glyph(). */ +HB_EXTERN hb_bool_t +hb_font_get_glyph (hb_font_t *font, + hb_codepoint_t unicode, hb_codepoint_t variation_selector, + hb_codepoint_t *glyph); + +HB_EXTERN void +hb_font_get_extents_for_direction (hb_font_t *font, + hb_direction_t direction, + hb_font_extents_t *extents); +HB_EXTERN void +hb_font_get_glyph_advance_for_direction (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y); +HB_EXTERN void +hb_font_get_glyph_advances_for_direction (hb_font_t* font, + hb_direction_t direction, + unsigned int count, + const hb_codepoint_t *first_glyph, + unsigned glyph_stride, + hb_position_t *first_advance, + unsigned advance_stride); +HB_EXTERN void +hb_font_get_glyph_origin_for_direction (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y); +HB_EXTERN void +hb_font_add_glyph_origin_for_direction (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y); +HB_EXTERN void +hb_font_subtract_glyph_origin_for_direction (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y); + +HB_EXTERN void +hb_font_get_glyph_kerning_for_direction (hb_font_t *font, + hb_codepoint_t first_glyph, hb_codepoint_t second_glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y); + +HB_EXTERN hb_bool_t +hb_font_get_glyph_extents_for_origin (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_glyph_extents_t *extents); + +HB_EXTERN hb_bool_t +hb_font_get_glyph_contour_point_for_origin (hb_font_t *font, + hb_codepoint_t glyph, unsigned int point_index, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y); + +/* Generates gidDDD if glyph has no name. */ +HB_EXTERN void +hb_font_glyph_to_string (hb_font_t *font, + hb_codepoint_t glyph, + char *s, unsigned int size); +/* Parses gidDDD and uniUUUU strings automatically. */ +HB_EXTERN hb_bool_t +hb_font_glyph_from_string (hb_font_t *font, + const char *s, int len, /* -1 means nul-terminated */ + hb_codepoint_t *glyph); + + +/* + * hb_font_t + */ + +/* Fonts are very light-weight objects */ + +HB_EXTERN hb_font_t * +hb_font_create (hb_face_t *face); + +HB_EXTERN hb_font_t * +hb_font_create_sub_font (hb_font_t *parent); + +HB_EXTERN hb_font_t * +hb_font_get_empty (void); + +HB_EXTERN hb_font_t * +hb_font_reference (hb_font_t *font); + +HB_EXTERN void +hb_font_destroy (hb_font_t *font); + +HB_EXTERN hb_bool_t +hb_font_set_user_data (hb_font_t *font, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace); + + +HB_EXTERN void * +hb_font_get_user_data (hb_font_t *font, + hb_user_data_key_t *key); + +HB_EXTERN void +hb_font_make_immutable (hb_font_t *font); + +HB_EXTERN hb_bool_t +hb_font_is_immutable (hb_font_t *font); + +HB_EXTERN void +hb_font_set_parent (hb_font_t *font, + hb_font_t *parent); + +HB_EXTERN hb_font_t * +hb_font_get_parent (hb_font_t *font); + +HB_EXTERN void +hb_font_set_face (hb_font_t *font, + hb_face_t *face); + +HB_EXTERN hb_face_t * +hb_font_get_face (hb_font_t *font); + + +HB_EXTERN void +hb_font_set_funcs (hb_font_t *font, + hb_font_funcs_t *klass, + void *font_data, + hb_destroy_func_t destroy); + +/* Be *very* careful with this function! */ +HB_EXTERN void +hb_font_set_funcs_data (hb_font_t *font, + void *font_data, + hb_destroy_func_t destroy); + + +HB_EXTERN void +hb_font_set_scale (hb_font_t *font, + int x_scale, + int y_scale); + +HB_EXTERN void +hb_font_get_scale (hb_font_t *font, + int *x_scale, + int *y_scale); + +/* + * A zero value means "no hinting in that direction" + */ +HB_EXTERN void +hb_font_set_ppem (hb_font_t *font, + unsigned int x_ppem, + unsigned int y_ppem); + +HB_EXTERN void +hb_font_get_ppem (hb_font_t *font, + unsigned int *x_ppem, + unsigned int *y_ppem); + +/* + * Point size per EM. Used for optical-sizing in CoreText. + * A value of zero means "not set". + */ +HB_EXTERN void +hb_font_set_ptem (hb_font_t *font, float ptem); + +HB_EXTERN float +hb_font_get_ptem (hb_font_t *font); + +HB_EXTERN void +hb_font_set_variations (hb_font_t *font, + const hb_variation_t *variations, + unsigned int variations_length); + +HB_EXTERN void +hb_font_set_var_coords_design (hb_font_t *font, + const float *coords, + unsigned int coords_length); + +HB_EXTERN void +hb_font_set_var_coords_normalized (hb_font_t *font, + const int *coords, /* 2.14 normalized */ + unsigned int coords_length); + +HB_EXTERN const int * +hb_font_get_var_coords_normalized (hb_font_t *font, + unsigned int *length); + +HB_EXTERN void +hb_font_set_var_named_instance (hb_font_t *font, + unsigned instance_index); + +HB_END_DECLS + +#endif /* HB_FONT_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-font.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-font.hh new file mode 100644 index 000000000..4adf6ae99 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-font.hh @@ -0,0 +1,631 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_FONT_HH +#define HB_FONT_HH + +#include "hb.hh" + +#include "hb-face.hh" +#include "hb-shaper.hh" + + +/* + * hb_font_funcs_t + */ + +#define HB_FONT_FUNCS_IMPLEMENT_CALLBACKS \ + HB_FONT_FUNC_IMPLEMENT (font_h_extents) \ + HB_FONT_FUNC_IMPLEMENT (font_v_extents) \ + HB_FONT_FUNC_IMPLEMENT (nominal_glyph) \ + HB_FONT_FUNC_IMPLEMENT (nominal_glyphs) \ + HB_FONT_FUNC_IMPLEMENT (variation_glyph) \ + HB_FONT_FUNC_IMPLEMENT (glyph_h_advance) \ + HB_FONT_FUNC_IMPLEMENT (glyph_v_advance) \ + HB_FONT_FUNC_IMPLEMENT (glyph_h_advances) \ + HB_FONT_FUNC_IMPLEMENT (glyph_v_advances) \ + HB_FONT_FUNC_IMPLEMENT (glyph_h_origin) \ + HB_FONT_FUNC_IMPLEMENT (glyph_v_origin) \ + HB_FONT_FUNC_IMPLEMENT (glyph_h_kerning) \ + HB_IF_NOT_DEPRECATED (HB_FONT_FUNC_IMPLEMENT (glyph_v_kerning)) \ + HB_FONT_FUNC_IMPLEMENT (glyph_extents) \ + HB_FONT_FUNC_IMPLEMENT (glyph_contour_point) \ + HB_FONT_FUNC_IMPLEMENT (glyph_name) \ + HB_FONT_FUNC_IMPLEMENT (glyph_from_name) \ + /* ^--- Add new callbacks here */ + +struct hb_font_funcs_t +{ + hb_object_header_t header; + + struct { +#define HB_FONT_FUNC_IMPLEMENT(name) void *name; + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + } user_data; + + struct { +#define HB_FONT_FUNC_IMPLEMENT(name) hb_destroy_func_t name; + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + } destroy; + + /* Don't access these directly. Call font->get_*() instead. */ + union get_t { + struct get_funcs_t { +#define HB_FONT_FUNC_IMPLEMENT(name) hb_font_get_##name##_func_t name; + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + } f; + void (*array[0 +#define HB_FONT_FUNC_IMPLEMENT(name) +1 + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + ]) (); + } get; +}; +DECLARE_NULL_INSTANCE (hb_font_funcs_t); + + +/* + * hb_font_t + */ + +#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_INSTANTIATE_SHAPERS(shaper, font); +#include "hb-shaper-list.hh" +#undef HB_SHAPER_IMPLEMENT + +struct hb_font_t +{ + hb_object_header_t header; + + hb_font_t *parent; + hb_face_t *face; + + int32_t x_scale; + int32_t y_scale; + int64_t x_mult; + int64_t y_mult; + + unsigned int x_ppem; + unsigned int y_ppem; + + float ptem; + + /* Font variation coordinates. */ + unsigned int num_coords; + int *coords; + + hb_font_funcs_t *klass; + void *user_data; + hb_destroy_func_t destroy; + + hb_shaper_object_dataset_t data; /* Various shaper data. */ + + + /* Convert from font-space to user-space */ + int64_t dir_mult (hb_direction_t direction) + { return HB_DIRECTION_IS_VERTICAL(direction) ? y_mult : x_mult; } + hb_position_t em_scale_x (int16_t v) { return em_mult (v, x_mult); } + hb_position_t em_scale_y (int16_t v) { return em_mult (v, y_mult); } + hb_position_t em_scalef_x (float v) { return em_scalef (v, x_scale); } + hb_position_t em_scalef_y (float v) { return em_scalef (v, y_scale); } + float em_fscale_x (int16_t v) { return em_fscale (v, x_scale); } + float em_fscale_y (int16_t v) { return em_fscale (v, y_scale); } + hb_position_t em_scale_dir (int16_t v, hb_direction_t direction) + { return em_mult (v, dir_mult (direction)); } + + /* Convert from parent-font user-space to our user-space */ + hb_position_t parent_scale_x_distance (hb_position_t v) + { + if (unlikely (parent && parent->x_scale != x_scale)) + return (hb_position_t) (v * (int64_t) this->x_scale / this->parent->x_scale); + return v; + } + hb_position_t parent_scale_y_distance (hb_position_t v) + { + if (unlikely (parent && parent->y_scale != y_scale)) + return (hb_position_t) (v * (int64_t) this->y_scale / this->parent->y_scale); + return v; + } + hb_position_t parent_scale_x_position (hb_position_t v) + { return parent_scale_x_distance (v); } + hb_position_t parent_scale_y_position (hb_position_t v) + { return parent_scale_y_distance (v); } + + void parent_scale_distance (hb_position_t *x, hb_position_t *y) + { + *x = parent_scale_x_distance (*x); + *y = parent_scale_y_distance (*y); + } + void parent_scale_position (hb_position_t *x, hb_position_t *y) + { + *x = parent_scale_x_position (*x); + *y = parent_scale_y_position (*y); + } + + + /* Public getters */ + + HB_INTERNAL bool has_func (unsigned int i); + HB_INTERNAL bool has_func_set (unsigned int i); + + /* has_* ... */ +#define HB_FONT_FUNC_IMPLEMENT(name) \ + bool \ + has_##name##_func () \ + { \ + hb_font_funcs_t *funcs = this->klass; \ + unsigned int i = offsetof (hb_font_funcs_t::get_t::get_funcs_t, name) / sizeof (funcs->get.array[0]); \ + return has_func (i); \ + } \ + bool \ + has_##name##_func_set () \ + { \ + hb_font_funcs_t *funcs = this->klass; \ + unsigned int i = offsetof (hb_font_funcs_t::get_t::get_funcs_t, name) / sizeof (funcs->get.array[0]); \ + return has_func_set (i); \ + } + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + + hb_bool_t get_font_h_extents (hb_font_extents_t *extents) + { + memset (extents, 0, sizeof (*extents)); + return klass->get.f.font_h_extents (this, user_data, + extents, + klass->user_data.font_h_extents); + } + hb_bool_t get_font_v_extents (hb_font_extents_t *extents) + { + memset (extents, 0, sizeof (*extents)); + return klass->get.f.font_v_extents (this, user_data, + extents, + klass->user_data.font_v_extents); + } + + bool has_glyph (hb_codepoint_t unicode) + { + hb_codepoint_t glyph; + return get_nominal_glyph (unicode, &glyph); + } + + hb_bool_t get_nominal_glyph (hb_codepoint_t unicode, + hb_codepoint_t *glyph) + { + *glyph = 0; + return klass->get.f.nominal_glyph (this, user_data, + unicode, glyph, + klass->user_data.nominal_glyph); + } + unsigned int get_nominal_glyphs (unsigned int count, + const hb_codepoint_t *first_unicode, + unsigned int unicode_stride, + hb_codepoint_t *first_glyph, + unsigned int glyph_stride) + { + return klass->get.f.nominal_glyphs (this, user_data, + count, + first_unicode, unicode_stride, + first_glyph, glyph_stride, + klass->user_data.nominal_glyphs); + } + + hb_bool_t get_variation_glyph (hb_codepoint_t unicode, hb_codepoint_t variation_selector, + hb_codepoint_t *glyph) + { + *glyph = 0; + return klass->get.f.variation_glyph (this, user_data, + unicode, variation_selector, glyph, + klass->user_data.variation_glyph); + } + + hb_position_t get_glyph_h_advance (hb_codepoint_t glyph) + { + return klass->get.f.glyph_h_advance (this, user_data, + glyph, + klass->user_data.glyph_h_advance); + } + + hb_position_t get_glyph_v_advance (hb_codepoint_t glyph) + { + return klass->get.f.glyph_v_advance (this, user_data, + glyph, + klass->user_data.glyph_v_advance); + } + + void get_glyph_h_advances (unsigned int count, + const hb_codepoint_t *first_glyph, + unsigned int glyph_stride, + hb_position_t *first_advance, + unsigned int advance_stride) + { + return klass->get.f.glyph_h_advances (this, user_data, + count, + first_glyph, glyph_stride, + first_advance, advance_stride, + klass->user_data.glyph_h_advances); + } + + void get_glyph_v_advances (unsigned int count, + const hb_codepoint_t *first_glyph, + unsigned int glyph_stride, + hb_position_t *first_advance, + unsigned int advance_stride) + { + return klass->get.f.glyph_v_advances (this, user_data, + count, + first_glyph, glyph_stride, + first_advance, advance_stride, + klass->user_data.glyph_v_advances); + } + + hb_bool_t get_glyph_h_origin (hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) + { + *x = *y = 0; + return klass->get.f.glyph_h_origin (this, user_data, + glyph, x, y, + klass->user_data.glyph_h_origin); + } + + hb_bool_t get_glyph_v_origin (hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) + { + *x = *y = 0; + return klass->get.f.glyph_v_origin (this, user_data, + glyph, x, y, + klass->user_data.glyph_v_origin); + } + + hb_position_t get_glyph_h_kerning (hb_codepoint_t left_glyph, + hb_codepoint_t right_glyph) + { +#ifdef HB_DISABLE_DEPRECATED + return 0; +#else + return klass->get.f.glyph_h_kerning (this, user_data, + left_glyph, right_glyph, + klass->user_data.glyph_h_kerning); +#endif + } + + hb_position_t get_glyph_v_kerning (hb_codepoint_t top_glyph, + hb_codepoint_t bottom_glyph) + { +#ifdef HB_DISABLE_DEPRECATED + return 0; +#else + return klass->get.f.glyph_v_kerning (this, user_data, + top_glyph, bottom_glyph, + klass->user_data.glyph_v_kerning); +#endif + } + + hb_bool_t get_glyph_extents (hb_codepoint_t glyph, + hb_glyph_extents_t *extents) + { + memset (extents, 0, sizeof (*extents)); + return klass->get.f.glyph_extents (this, user_data, + glyph, + extents, + klass->user_data.glyph_extents); + } + + hb_bool_t get_glyph_contour_point (hb_codepoint_t glyph, unsigned int point_index, + hb_position_t *x, hb_position_t *y) + { + *x = *y = 0; + return klass->get.f.glyph_contour_point (this, user_data, + glyph, point_index, + x, y, + klass->user_data.glyph_contour_point); + } + + hb_bool_t get_glyph_name (hb_codepoint_t glyph, + char *name, unsigned int size) + { + if (size) *name = '\0'; + return klass->get.f.glyph_name (this, user_data, + glyph, + name, size, + klass->user_data.glyph_name); + } + + hb_bool_t get_glyph_from_name (const char *name, int len, /* -1 means nul-terminated */ + hb_codepoint_t *glyph) + { + *glyph = 0; + if (len == -1) len = strlen (name); + return klass->get.f.glyph_from_name (this, user_data, + name, len, + glyph, + klass->user_data.glyph_from_name); + } + + + /* A bit higher-level, and with fallback */ + + void get_h_extents_with_fallback (hb_font_extents_t *extents) + { + if (!get_font_h_extents (extents)) + { + extents->ascender = y_scale * .8; + extents->descender = extents->ascender - y_scale; + extents->line_gap = 0; + } + } + void get_v_extents_with_fallback (hb_font_extents_t *extents) + { + if (!get_font_v_extents (extents)) + { + extents->ascender = x_scale / 2; + extents->descender = extents->ascender - x_scale; + extents->line_gap = 0; + } + } + + void get_extents_for_direction (hb_direction_t direction, + hb_font_extents_t *extents) + { + if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) + get_h_extents_with_fallback (extents); + else + get_v_extents_with_fallback (extents); + } + + void get_glyph_advance_for_direction (hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) + { + *x = *y = 0; + if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) + *x = get_glyph_h_advance (glyph); + else + *y = get_glyph_v_advance (glyph); + } + void get_glyph_advances_for_direction (hb_direction_t direction, + unsigned int count, + const hb_codepoint_t *first_glyph, + unsigned glyph_stride, + hb_position_t *first_advance, + unsigned advance_stride) + { + if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) + get_glyph_h_advances (count, first_glyph, glyph_stride, first_advance, advance_stride); + else + get_glyph_v_advances (count, first_glyph, glyph_stride, first_advance, advance_stride); + } + + void guess_v_origin_minus_h_origin (hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) + { + *x = get_glyph_h_advance (glyph) / 2; + + /* TODO cache this somehow?! */ + hb_font_extents_t extents; + get_h_extents_with_fallback (&extents); + *y = extents.ascender; + } + + void get_glyph_h_origin_with_fallback (hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) + { + if (!get_glyph_h_origin (glyph, x, y) && + get_glyph_v_origin (glyph, x, y)) + { + hb_position_t dx, dy; + guess_v_origin_minus_h_origin (glyph, &dx, &dy); + *x -= dx; *y -= dy; + } + } + void get_glyph_v_origin_with_fallback (hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) + { + if (!get_glyph_v_origin (glyph, x, y) && + get_glyph_h_origin (glyph, x, y)) + { + hb_position_t dx, dy; + guess_v_origin_minus_h_origin (glyph, &dx, &dy); + *x += dx; *y += dy; + } + } + + void get_glyph_origin_for_direction (hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) + { + if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) + get_glyph_h_origin_with_fallback (glyph, x, y); + else + get_glyph_v_origin_with_fallback (glyph, x, y); + } + + void add_glyph_h_origin (hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) + { + hb_position_t origin_x, origin_y; + + get_glyph_h_origin_with_fallback (glyph, &origin_x, &origin_y); + + *x += origin_x; + *y += origin_y; + } + void add_glyph_v_origin (hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) + { + hb_position_t origin_x, origin_y; + + get_glyph_v_origin_with_fallback (glyph, &origin_x, &origin_y); + + *x += origin_x; + *y += origin_y; + } + void add_glyph_origin_for_direction (hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) + { + hb_position_t origin_x, origin_y; + + get_glyph_origin_for_direction (glyph, direction, &origin_x, &origin_y); + + *x += origin_x; + *y += origin_y; + } + + void subtract_glyph_h_origin (hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) + { + hb_position_t origin_x, origin_y; + + get_glyph_h_origin_with_fallback (glyph, &origin_x, &origin_y); + + *x -= origin_x; + *y -= origin_y; + } + void subtract_glyph_v_origin (hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) + { + hb_position_t origin_x, origin_y; + + get_glyph_v_origin_with_fallback (glyph, &origin_x, &origin_y); + + *x -= origin_x; + *y -= origin_y; + } + void subtract_glyph_origin_for_direction (hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) + { + hb_position_t origin_x, origin_y; + + get_glyph_origin_for_direction (glyph, direction, &origin_x, &origin_y); + + *x -= origin_x; + *y -= origin_y; + } + + void get_glyph_kerning_for_direction (hb_codepoint_t first_glyph, hb_codepoint_t second_glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) + { + if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) { + *y = 0; + *x = get_glyph_h_kerning (first_glyph, second_glyph); + } else { + *x = 0; + *y = get_glyph_v_kerning (first_glyph, second_glyph); + } + } + + hb_bool_t get_glyph_extents_for_origin (hb_codepoint_t glyph, + hb_direction_t direction, + hb_glyph_extents_t *extents) + { + hb_bool_t ret = get_glyph_extents (glyph, extents); + + if (ret) + subtract_glyph_origin_for_direction (glyph, direction, &extents->x_bearing, &extents->y_bearing); + + return ret; + } + + hb_bool_t get_glyph_contour_point_for_origin (hb_codepoint_t glyph, unsigned int point_index, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) + { + hb_bool_t ret = get_glyph_contour_point (glyph, point_index, x, y); + + if (ret) + subtract_glyph_origin_for_direction (glyph, direction, x, y); + + return ret; + } + + /* Generates gidDDD if glyph has no name. */ + void + glyph_to_string (hb_codepoint_t glyph, + char *s, unsigned int size) + { + if (get_glyph_name (glyph, s, size)) return; + + if (size && snprintf (s, size, "gid%u", glyph) < 0) + *s = '\0'; + } + + /* Parses gidDDD and uniUUUU strings automatically. */ + hb_bool_t + glyph_from_string (const char *s, int len, /* -1 means nul-terminated */ + hb_codepoint_t *glyph) + { + if (get_glyph_from_name (s, len, glyph)) return true; + + if (len == -1) len = strlen (s); + + /* Straight glyph index. */ + if (hb_codepoint_parse (s, len, 10, glyph)) + return true; + + if (len > 3) + { + /* gidDDD syntax for glyph indices. */ + if (0 == strncmp (s, "gid", 3) && + hb_codepoint_parse (s + 3, len - 3, 10, glyph)) + return true; + + /* uniUUUU and other Unicode character indices. */ + hb_codepoint_t unichar; + if (0 == strncmp (s, "uni", 3) && + hb_codepoint_parse (s + 3, len - 3, 16, &unichar) && + get_nominal_glyph (unichar, glyph)) + return true; + } + + return false; + } + + void mults_changed () + { + signed upem = face->get_upem (); + x_mult = ((int64_t) x_scale << 16) / upem; + y_mult = ((int64_t) y_scale << 16) / upem; + } + + hb_position_t em_mult (int16_t v, int64_t mult) + { + return (hb_position_t) ((v * mult) >> 16); + } + hb_position_t em_scalef (float v, int scale) + { return (hb_position_t) roundf (v * scale / face->get_upem ()); } + float em_fscale (int16_t v, int scale) + { return (float) v * scale / face->get_upem (); } +}; +DECLARE_NULL_INSTANCE (hb_font_t); + + +#endif /* HB_FONT_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.cc new file mode 100644 index 000000000..e526bf40d --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.cc @@ -0,0 +1,884 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2009 Keith Stribley + * Copyright © 2015 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#include "hb.hh" + +#ifdef HAVE_FREETYPE + +#include "hb-ft.h" + +#include "hb-font.hh" +#include "hb-machinery.hh" +#include "hb-cache.hh" + +#include FT_ADVANCES_H +#include FT_MULTIPLE_MASTERS_H +#include FT_TRUETYPE_TABLES_H + + +/** + * SECTION:hb-ft + * @title: hb-ft + * @short_description: FreeType integration + * @include: hb-ft.h + * + * Functions for using HarfBuzz with the FreeType library to provide face and + * font data. + **/ + + +/* TODO: + * + * In general, this file does a fine job of what it's supposed to do. + * There are, however, things that need more work: + * + * - FreeType works in 26.6 mode. Clients can decide to use that mode, and everything + * would work fine. However, we also abuse this API for performing in font-space, + * but don't pass the correct flags to FreeType. We just abuse the no-hinting mode + * for that, such that no rounding etc happens. As such, we don't set ppem, and + * pass NO_HINTING as load_flags. Would be much better to use NO_SCALE, and scale + * ourselves. + * + * - We don't handle / allow for emboldening / obliqueing. + * + * - In the future, we should add constructors to create fonts in font space? + */ + + +struct hb_ft_font_t +{ + mutable hb_mutex_t lock; + FT_Face ft_face; + int load_flags; + bool symbol; /* Whether selected cmap is symbol cmap. */ + bool unref; /* Whether to destroy ft_face when done. */ + + mutable hb_atomic_int_t cached_x_scale; + mutable hb_advance_cache_t advance_cache; +}; + +static hb_ft_font_t * +_hb_ft_font_create (FT_Face ft_face, bool symbol, bool unref) +{ + hb_ft_font_t *ft_font = (hb_ft_font_t *) calloc (1, sizeof (hb_ft_font_t)); + + if (unlikely (!ft_font)) + return nullptr; + + ft_font->lock.init (); + ft_font->ft_face = ft_face; + ft_font->symbol = symbol; + ft_font->unref = unref; + + ft_font->load_flags = FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING; + + ft_font->cached_x_scale.set_relaxed (0); + ft_font->advance_cache.init (); + + return ft_font; +} + +static void +_hb_ft_face_destroy (void *data) +{ + FT_Done_Face ((FT_Face) data); +} + +static void +_hb_ft_font_destroy (void *data) +{ + hb_ft_font_t *ft_font = (hb_ft_font_t *) data; + + ft_font->advance_cache.fini (); + + if (ft_font->unref) + _hb_ft_face_destroy (ft_font->ft_face); + + ft_font->lock.fini (); + + free (ft_font); +} + +/** + * hb_ft_font_set_load_flags: + * @font: + * @load_flags: + * + * + * + * Since: 1.0.5 + **/ +void +hb_ft_font_set_load_flags (hb_font_t *font, int load_flags) +{ + if (hb_object_is_immutable (font)) + return; + + if (font->destroy != (hb_destroy_func_t) _hb_ft_font_destroy) + return; + + hb_ft_font_t *ft_font = (hb_ft_font_t *) font->user_data; + + ft_font->load_flags = load_flags; +} + +/** + * hb_ft_font_get_load_flags: + * @font: + * + * + * + * Return value: + * Since: 1.0.5 + **/ +int +hb_ft_font_get_load_flags (hb_font_t *font) +{ + if (font->destroy != (hb_destroy_func_t) _hb_ft_font_destroy) + return 0; + + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font->user_data; + + return ft_font->load_flags; +} + +FT_Face +hb_ft_font_get_face (hb_font_t *font) +{ + if (font->destroy != (hb_destroy_func_t) _hb_ft_font_destroy) + return nullptr; + + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font->user_data; + + return ft_font->ft_face; +} + + + +static hb_bool_t +hb_ft_get_nominal_glyph (hb_font_t *font HB_UNUSED, + void *font_data, + hb_codepoint_t unicode, + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + hb_lock_t lock (ft_font->lock); + unsigned int g = FT_Get_Char_Index (ft_font->ft_face, unicode); + + if (unlikely (!g)) + { + if (unlikely (ft_font->symbol) && unicode <= 0x00FFu) + { + /* For symbol-encoded OpenType fonts, we duplicate the + * U+F000..F0FF range at U+0000..U+00FF. That's what + * Windows seems to do, and that's hinted about at: + * https://docs.microsoft.com/en-us/typography/opentype/spec/recom + * under "Non-Standard (Symbol) Fonts". */ + g = FT_Get_Char_Index (ft_font->ft_face, 0xF000u + unicode); + if (!g) + return false; + } + else + return false; + } + + *glyph = g; + return true; +} + +static unsigned int +hb_ft_get_nominal_glyphs (hb_font_t *font HB_UNUSED, + void *font_data, + unsigned int count, + const hb_codepoint_t *first_unicode, + unsigned int unicode_stride, + hb_codepoint_t *first_glyph, + unsigned int glyph_stride, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + hb_lock_t lock (ft_font->lock); + unsigned int done; + for (done = 0; + done < count && (*first_glyph = FT_Get_Char_Index (ft_font->ft_face, *first_unicode)); + done++) + { + first_unicode = &StructAtOffsetUnaligned (first_unicode, unicode_stride); + first_glyph = &StructAtOffsetUnaligned (first_glyph, glyph_stride); + } + /* We don't need to do ft_font->symbol dance here, since HB calls the singular + * nominal_glyph() for what we don't handle here. */ + return done; +} + + +static hb_bool_t +hb_ft_get_variation_glyph (hb_font_t *font HB_UNUSED, + void *font_data, + hb_codepoint_t unicode, + hb_codepoint_t variation_selector, + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + hb_lock_t lock (ft_font->lock); + unsigned int g = FT_Face_GetCharVariantIndex (ft_font->ft_face, unicode, variation_selector); + + if (unlikely (!g)) + return false; + + *glyph = g; + return true; +} + +static void +hb_ft_get_glyph_h_advances (hb_font_t* font, void* font_data, + unsigned count, + const hb_codepoint_t *first_glyph, + unsigned glyph_stride, + hb_position_t *first_advance, + unsigned advance_stride, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + hb_lock_t lock (ft_font->lock); + FT_Face ft_face = ft_font->ft_face; + int load_flags = ft_font->load_flags; + int mult = font->x_scale < 0 ? -1 : +1; + + if (font->x_scale != ft_font->cached_x_scale.get ()) + { + ft_font->advance_cache.clear (); + ft_font->cached_x_scale.set (font->x_scale); + } + + for (unsigned int i = 0; i < count; i++) + { + FT_Fixed v = 0; + hb_codepoint_t glyph = *first_glyph; + + unsigned int cv; + if (ft_font->advance_cache.get (glyph, &cv)) + v = cv; + else + { + FT_Get_Advance (ft_face, glyph, load_flags, &v); + ft_font->advance_cache.set (glyph, v); + } + + *first_advance = (v * mult + (1<<9)) >> 10; + first_glyph = &StructAtOffsetUnaligned (first_glyph, glyph_stride); + first_advance = &StructAtOffsetUnaligned (first_advance, advance_stride); + } +} + +static hb_position_t +hb_ft_get_glyph_v_advance (hb_font_t *font, + void *font_data, + hb_codepoint_t glyph, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + hb_lock_t lock (ft_font->lock); + FT_Fixed v; + + if (unlikely (FT_Get_Advance (ft_font->ft_face, glyph, ft_font->load_flags | FT_LOAD_VERTICAL_LAYOUT, &v))) + return 0; + + if (font->y_scale < 0) + v = -v; + + /* Note: FreeType's vertical metrics grows downward while other FreeType coordinates + * have a Y growing upward. Hence the extra negation. */ + return (-v + (1<<9)) >> 10; +} + +static hb_bool_t +hb_ft_get_glyph_v_origin (hb_font_t *font, + void *font_data, + hb_codepoint_t glyph, + hb_position_t *x, + hb_position_t *y, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + hb_lock_t lock (ft_font->lock); + FT_Face ft_face = ft_font->ft_face; + + if (unlikely (FT_Load_Glyph (ft_face, glyph, ft_font->load_flags))) + return false; + + /* Note: FreeType's vertical metrics grows downward while other FreeType coordinates + * have a Y growing upward. Hence the extra negation. */ + *x = ft_face->glyph->metrics.horiBearingX - ft_face->glyph->metrics.vertBearingX; + *y = ft_face->glyph->metrics.horiBearingY - (-ft_face->glyph->metrics.vertBearingY); + + if (font->x_scale < 0) + *x = -*x; + if (font->y_scale < 0) + *y = -*y; + + return true; +} + +#ifndef HB_NO_OT_SHAPE_FALLBACK +static hb_position_t +hb_ft_get_glyph_h_kerning (hb_font_t *font, + void *font_data, + hb_codepoint_t left_glyph, + hb_codepoint_t right_glyph, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + FT_Vector kerningv; + + FT_Kerning_Mode mode = font->x_ppem ? FT_KERNING_DEFAULT : FT_KERNING_UNFITTED; + if (FT_Get_Kerning (ft_font->ft_face, left_glyph, right_glyph, mode, &kerningv)) + return 0; + + return kerningv.x; +} +#endif + +static hb_bool_t +hb_ft_get_glyph_extents (hb_font_t *font, + void *font_data, + hb_codepoint_t glyph, + hb_glyph_extents_t *extents, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + hb_lock_t lock (ft_font->lock); + FT_Face ft_face = ft_font->ft_face; + + if (unlikely (FT_Load_Glyph (ft_face, glyph, ft_font->load_flags))) + return false; + + extents->x_bearing = ft_face->glyph->metrics.horiBearingX; + extents->y_bearing = ft_face->glyph->metrics.horiBearingY; + extents->width = ft_face->glyph->metrics.width; + extents->height = -ft_face->glyph->metrics.height; + if (font->x_scale < 0) + { + extents->x_bearing = -extents->x_bearing; + extents->width = -extents->width; + } + if (font->y_scale < 0) + { + extents->y_bearing = -extents->y_bearing; + extents->height = -extents->height; + } + return true; +} + +static hb_bool_t +hb_ft_get_glyph_contour_point (hb_font_t *font HB_UNUSED, + void *font_data, + hb_codepoint_t glyph, + unsigned int point_index, + hb_position_t *x, + hb_position_t *y, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + hb_lock_t lock (ft_font->lock); + FT_Face ft_face = ft_font->ft_face; + + if (unlikely (FT_Load_Glyph (ft_face, glyph, ft_font->load_flags))) + return false; + + if (unlikely (ft_face->glyph->format != FT_GLYPH_FORMAT_OUTLINE)) + return false; + + if (unlikely (point_index >= (unsigned int) ft_face->glyph->outline.n_points)) + return false; + + *x = ft_face->glyph->outline.points[point_index].x; + *y = ft_face->glyph->outline.points[point_index].y; + + return true; +} + +static hb_bool_t +hb_ft_get_glyph_name (hb_font_t *font HB_UNUSED, + void *font_data, + hb_codepoint_t glyph, + char *name, unsigned int size, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + hb_lock_t lock (ft_font->lock); + FT_Face ft_face = ft_font->ft_face; + + hb_bool_t ret = !FT_Get_Glyph_Name (ft_face, glyph, name, size); + if (ret && (size && !*name)) + ret = false; + + return ret; +} + +static hb_bool_t +hb_ft_get_glyph_from_name (hb_font_t *font HB_UNUSED, + void *font_data, + const char *name, int len, /* -1 means nul-terminated */ + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + hb_lock_t lock (ft_font->lock); + FT_Face ft_face = ft_font->ft_face; + + if (len < 0) + *glyph = FT_Get_Name_Index (ft_face, (FT_String *) name); + else { + /* Make a nul-terminated version. */ + char buf[128]; + len = hb_min (len, (int) sizeof (buf) - 1); + strncpy (buf, name, len); + buf[len] = '\0'; + *glyph = FT_Get_Name_Index (ft_face, buf); + } + + if (*glyph == 0) + { + /* Check whether the given name was actually the name of glyph 0. */ + char buf[128]; + if (!FT_Get_Glyph_Name(ft_face, 0, buf, sizeof (buf)) && + len < 0 ? !strcmp (buf, name) : !strncmp (buf, name, len)) + return true; + } + + return *glyph != 0; +} + +static hb_bool_t +hb_ft_get_font_h_extents (hb_font_t *font HB_UNUSED, + void *font_data, + hb_font_extents_t *metrics, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + hb_lock_t lock (ft_font->lock); + FT_Face ft_face = ft_font->ft_face; + metrics->ascender = FT_MulFix(ft_face->ascender, ft_face->size->metrics.y_scale); + metrics->descender = FT_MulFix(ft_face->descender, ft_face->size->metrics.y_scale); + metrics->line_gap = FT_MulFix( ft_face->height, ft_face->size->metrics.y_scale ) - (metrics->ascender - metrics->descender); + if (font->y_scale < 0) + { + metrics->ascender = -metrics->ascender; + metrics->descender = -metrics->descender; + metrics->line_gap = -metrics->line_gap; + } + return true; +} + +#if HB_USE_ATEXIT +static void free_static_ft_funcs (); +#endif + +static struct hb_ft_font_funcs_lazy_loader_t : hb_font_funcs_lazy_loader_t +{ + static hb_font_funcs_t *create () + { + hb_font_funcs_t *funcs = hb_font_funcs_create (); + + hb_font_funcs_set_font_h_extents_func (funcs, hb_ft_get_font_h_extents, nullptr, nullptr); + //hb_font_funcs_set_font_v_extents_func (funcs, hb_ft_get_font_v_extents, nullptr, nullptr); + hb_font_funcs_set_nominal_glyph_func (funcs, hb_ft_get_nominal_glyph, nullptr, nullptr); + hb_font_funcs_set_nominal_glyphs_func (funcs, hb_ft_get_nominal_glyphs, nullptr, nullptr); + hb_font_funcs_set_variation_glyph_func (funcs, hb_ft_get_variation_glyph, nullptr, nullptr); + hb_font_funcs_set_glyph_h_advances_func (funcs, hb_ft_get_glyph_h_advances, nullptr, nullptr); + hb_font_funcs_set_glyph_v_advance_func (funcs, hb_ft_get_glyph_v_advance, nullptr, nullptr); + //hb_font_funcs_set_glyph_h_origin_func (funcs, hb_ft_get_glyph_h_origin, nullptr, nullptr); + hb_font_funcs_set_glyph_v_origin_func (funcs, hb_ft_get_glyph_v_origin, nullptr, nullptr); +#ifndef HB_NO_OT_SHAPE_FALLBACK + hb_font_funcs_set_glyph_h_kerning_func (funcs, hb_ft_get_glyph_h_kerning, nullptr, nullptr); +#endif + //hb_font_funcs_set_glyph_v_kerning_func (funcs, hb_ft_get_glyph_v_kerning, nullptr, nullptr); + hb_font_funcs_set_glyph_extents_func (funcs, hb_ft_get_glyph_extents, nullptr, nullptr); + hb_font_funcs_set_glyph_contour_point_func (funcs, hb_ft_get_glyph_contour_point, nullptr, nullptr); + hb_font_funcs_set_glyph_name_func (funcs, hb_ft_get_glyph_name, nullptr, nullptr); + hb_font_funcs_set_glyph_from_name_func (funcs, hb_ft_get_glyph_from_name, nullptr, nullptr); + + hb_font_funcs_make_immutable (funcs); + +#if HB_USE_ATEXIT + atexit (free_static_ft_funcs); +#endif + + return funcs; + } +} static_ft_funcs; + +#if HB_USE_ATEXIT +static +void free_static_ft_funcs () +{ + static_ft_funcs.free_instance (); +} +#endif + +static hb_font_funcs_t * +_hb_ft_get_font_funcs () +{ + return static_ft_funcs.get_unconst (); +} + +static void +_hb_ft_font_set_funcs (hb_font_t *font, FT_Face ft_face, bool unref) +{ + bool symbol = ft_face->charmap && ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL; + + hb_font_set_funcs (font, + _hb_ft_get_font_funcs (), + _hb_ft_font_create (ft_face, symbol, unref), + _hb_ft_font_destroy); +} + + +static hb_blob_t * +_hb_ft_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data) +{ + FT_Face ft_face = (FT_Face) user_data; + FT_Byte *buffer; + FT_ULong length = 0; + FT_Error error; + + /* Note: FreeType like HarfBuzz uses the NONE tag for fetching the entire blob */ + + error = FT_Load_Sfnt_Table (ft_face, tag, 0, nullptr, &length); + if (error) + return nullptr; + + buffer = (FT_Byte *) malloc (length); + if (!buffer) + return nullptr; + + error = FT_Load_Sfnt_Table (ft_face, tag, 0, buffer, &length); + if (error) + { + free (buffer); + return nullptr; + } + + return hb_blob_create ((const char *) buffer, length, + HB_MEMORY_MODE_WRITABLE, + buffer, free); +} + +/** + * hb_ft_face_create: + * @ft_face: (destroy destroy) (scope notified): + * @destroy: + * + * + * + * Return value: (transfer full): + * Since: 0.9.2 + **/ +hb_face_t * +hb_ft_face_create (FT_Face ft_face, + hb_destroy_func_t destroy) +{ + hb_face_t *face; + + if (!ft_face->stream->read) { + hb_blob_t *blob; + + blob = hb_blob_create ((const char *) ft_face->stream->base, + (unsigned int) ft_face->stream->size, + HB_MEMORY_MODE_READONLY, + ft_face, destroy); + face = hb_face_create (blob, ft_face->face_index); + hb_blob_destroy (blob); + } else { + face = hb_face_create_for_tables (_hb_ft_reference_table, ft_face, destroy); + } + + hb_face_set_index (face, ft_face->face_index); + hb_face_set_upem (face, ft_face->units_per_EM); + + return face; +} + +/** + * hb_ft_face_create_referenced: + * @ft_face: + * + * + * + * Return value: (transfer full): + * Since: 0.9.38 + **/ +hb_face_t * +hb_ft_face_create_referenced (FT_Face ft_face) +{ + FT_Reference_Face (ft_face); + return hb_ft_face_create (ft_face, _hb_ft_face_destroy); +} + +static void +hb_ft_face_finalize (FT_Face ft_face) +{ + hb_face_destroy ((hb_face_t *) ft_face->generic.data); +} + +/** + * hb_ft_face_create_cached: + * @ft_face: + * + * + * + * Return value: (transfer full): + * Since: 0.9.2 + **/ +hb_face_t * +hb_ft_face_create_cached (FT_Face ft_face) +{ + if (unlikely (!ft_face->generic.data || ft_face->generic.finalizer != (FT_Generic_Finalizer) hb_ft_face_finalize)) + { + if (ft_face->generic.finalizer) + ft_face->generic.finalizer (ft_face); + + ft_face->generic.data = hb_ft_face_create (ft_face, nullptr); + ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize; + } + + return hb_face_reference ((hb_face_t *) ft_face->generic.data); +} + + +/** + * hb_ft_font_create: + * @ft_face: (destroy destroy) (scope notified): + * @destroy: + * + * + * + * Return value: (transfer full): + * Since: 0.9.2 + **/ +hb_font_t * +hb_ft_font_create (FT_Face ft_face, + hb_destroy_func_t destroy) +{ + hb_font_t *font; + hb_face_t *face; + + face = hb_ft_face_create (ft_face, destroy); + font = hb_font_create (face); + hb_face_destroy (face); + _hb_ft_font_set_funcs (font, ft_face, false); + hb_ft_font_changed (font); + return font; +} + +void +hb_ft_font_changed (hb_font_t *font) +{ + if (font->destroy != (hb_destroy_func_t) _hb_ft_font_destroy) + return; + + hb_ft_font_t *ft_font = (hb_ft_font_t *) font->user_data; + FT_Face ft_face = ft_font->ft_face; + + hb_font_set_scale (font, + (int) (((uint64_t) ft_face->size->metrics.x_scale * (uint64_t) ft_face->units_per_EM + (1u<<15)) >> 16), + (int) (((uint64_t) ft_face->size->metrics.y_scale * (uint64_t) ft_face->units_per_EM + (1u<<15)) >> 16)); +#if 0 /* hb-ft works in no-hinting model */ + hb_font_set_ppem (font, + ft_face->size->metrics.x_ppem, + ft_face->size->metrics.y_ppem); +#endif + +#ifdef HAVE_FT_GET_VAR_BLEND_COORDINATES + FT_MM_Var *mm_var = nullptr; + if (!FT_Get_MM_Var (ft_face, &mm_var)) + { + FT_Fixed *ft_coords = (FT_Fixed *) calloc (mm_var->num_axis, sizeof (FT_Fixed)); + int *coords = (int *) calloc (mm_var->num_axis, sizeof (int)); + if (coords && ft_coords) + { + if (!FT_Get_Var_Blend_Coordinates (ft_face, mm_var->num_axis, ft_coords)) + { + bool nonzero = false; + + for (unsigned int i = 0; i < mm_var->num_axis; ++i) + { + coords[i] = ft_coords[i] >>= 2; + nonzero = nonzero || coords[i]; + } + + if (nonzero) + hb_font_set_var_coords_normalized (font, coords, mm_var->num_axis); + else + hb_font_set_var_coords_normalized (font, nullptr, 0); + } + } + free (coords); + free (ft_coords); +#ifdef HAVE_FT_DONE_MM_VAR + FT_Done_MM_Var (ft_face->glyph->library, mm_var); +#else + free (mm_var); +#endif + } +#endif +} + +/** + * hb_ft_font_create_referenced: + * @ft_face: + * + * + * + * Return value: (transfer full): + * Since: 0.9.38 + **/ +hb_font_t * +hb_ft_font_create_referenced (FT_Face ft_face) +{ + FT_Reference_Face (ft_face); + return hb_ft_font_create (ft_face, _hb_ft_face_destroy); +} + +#if HB_USE_ATEXIT +static void free_static_ft_library (); +#endif + +static struct hb_ft_library_lazy_loader_t : hb_lazy_loader_t, + hb_ft_library_lazy_loader_t> +{ + static FT_Library create () + { + FT_Library l; + if (FT_Init_FreeType (&l)) + return nullptr; + +#if HB_USE_ATEXIT + atexit (free_static_ft_library); +#endif + + return l; + } + static void destroy (FT_Library l) + { + FT_Done_FreeType (l); + } + static FT_Library get_null () + { + return nullptr; + } +} static_ft_library; + +#if HB_USE_ATEXIT +static +void free_static_ft_library () +{ + static_ft_library.free_instance (); +} +#endif + +static FT_Library +get_ft_library () +{ + return static_ft_library.get_unconst (); +} + +static void +_release_blob (FT_Face ft_face) +{ + hb_blob_destroy ((hb_blob_t *) ft_face->generic.data); +} + +void +hb_ft_font_set_funcs (hb_font_t *font) +{ + hb_blob_t *blob = hb_face_reference_blob (font->face); + unsigned int blob_length; + const char *blob_data = hb_blob_get_data (blob, &blob_length); + if (unlikely (!blob_length)) + DEBUG_MSG (FT, font, "Font face has empty blob"); + + FT_Face ft_face = nullptr; + FT_Error err = FT_New_Memory_Face (get_ft_library (), + (const FT_Byte *) blob_data, + blob_length, + hb_face_get_index (font->face), + &ft_face); + + if (unlikely (err)) { + hb_blob_destroy (blob); + DEBUG_MSG (FT, font, "Font face FT_New_Memory_Face() failed"); + return; + } + + if (FT_Select_Charmap (ft_face, FT_ENCODING_MS_SYMBOL)) + FT_Select_Charmap (ft_face, FT_ENCODING_UNICODE); + + FT_Set_Char_Size (ft_face, + abs (font->x_scale), abs (font->y_scale), + 0, 0); +#if 0 + font->x_ppem * 72 * 64 / font->x_scale, + font->y_ppem * 72 * 64 / font->y_scale); +#endif + if (font->x_scale < 0 || font->y_scale < 0) + { + FT_Matrix matrix = { font->x_scale < 0 ? -1 : +1, 0, + 0, font->y_scale < 0 ? -1 : +1}; + FT_Set_Transform (ft_face, &matrix, nullptr); + } + +#ifdef HAVE_FT_SET_VAR_BLEND_COORDINATES + unsigned int num_coords; + const int *coords = hb_font_get_var_coords_normalized (font, &num_coords); + if (num_coords) + { + FT_Fixed *ft_coords = (FT_Fixed *) calloc (num_coords, sizeof (FT_Fixed)); + if (ft_coords) + { + for (unsigned int i = 0; i < num_coords; i++) + ft_coords[i] = coords[i] * 4; + FT_Set_Var_Blend_Coordinates (ft_face, num_coords, ft_coords); + free (ft_coords); + } + } +#endif + + ft_face->generic.data = blob; + ft_face->generic.finalizer = (FT_Generic_Finalizer) _release_blob; + + _hb_ft_font_set_funcs (font, ft_face, true); + hb_ft_font_set_load_flags (font, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING); +} + + +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.h new file mode 100644 index 000000000..94013eeb9 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.h @@ -0,0 +1,132 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2015 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_FT_H +#define HB_FT_H + +#include "hb.h" + +#include +#include FT_FREETYPE_H + +HB_BEGIN_DECLS + +/* + * Note: FreeType is not thread-safe. + * Hence, these functions are not either. + */ + +/* + * hb-face from ft-face. + */ + +/* This one creates a new hb-face for given ft-face. + * When the returned hb-face is destroyed, the destroy + * callback is called (if not NULL), with the ft-face passed + * to it. + * + * The client is responsible to make sure that ft-face is + * destroyed after hb-face is destroyed. + * + * Most often you don't want this function. You should use either + * hb_ft_face_create_cached(), or hb_ft_face_create_referenced(). + * In particular, if you are going to pass NULL as destroy, you + * probably should use (the more recent) hb_ft_face_create_referenced() + * instead. + */ +HB_EXTERN hb_face_t * +hb_ft_face_create (FT_Face ft_face, + hb_destroy_func_t destroy); + +/* This version is like hb_ft_face_create(), except that it caches + * the hb-face using the generic pointer of the ft-face. This means + * that subsequent calls to this function with the same ft-face will + * return the same hb-face (correctly referenced). + * + * Client is still responsible for making sure that ft-face is destroyed + * after hb-face is. + */ +HB_EXTERN hb_face_t * +hb_ft_face_create_cached (FT_Face ft_face); + +/* This version is like hb_ft_face_create(), except that it calls + * FT_Reference_Face() on ft-face, as such keeping ft-face alive + * as long as the hb-face is. + * + * This is the most convenient version to use. Use it unless you have + * very good reasons not to. + */ +HB_EXTERN hb_face_t * +hb_ft_face_create_referenced (FT_Face ft_face); + + +/* + * hb-font from ft-face. + */ + +/* + * Note: + * + * Set face size on ft-face before creating hb-font from it. + * Otherwise hb-ft would NOT pick up the font size correctly. + */ + +/* See notes on hb_ft_face_create(). Same issues re lifecycle-management + * apply here. Use hb_ft_font_create_referenced() if you can. */ +HB_EXTERN hb_font_t * +hb_ft_font_create (FT_Face ft_face, + hb_destroy_func_t destroy); + +/* See notes on hb_ft_face_create_referenced() re lifecycle-management + * issues. */ +HB_EXTERN hb_font_t * +hb_ft_font_create_referenced (FT_Face ft_face); + +HB_EXTERN FT_Face +hb_ft_font_get_face (hb_font_t *font); + +HB_EXTERN void +hb_ft_font_set_load_flags (hb_font_t *font, int load_flags); + +HB_EXTERN int +hb_ft_font_get_load_flags (hb_font_t *font); + +/* Call when size or variations settings on underlying FT_Face change. */ +HB_EXTERN void +hb_ft_font_changed (hb_font_t *font); + +/* Makes an hb_font_t use FreeType internally to implement font functions. + * Note: this internally creates an FT_Face. Use it when you create your + * hb_face_t using hb_face_create(). */ +HB_EXTERN void +hb_ft_font_set_funcs (hb_font_t *font); + + +HB_END_DECLS + +#endif /* HB_FT_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-gdi.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-gdi.cc new file mode 100644 index 000000000..f6306ef89 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-gdi.cc @@ -0,0 +1,73 @@ +/* + * Copyright © 2019 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#include "hb.hh" + +#ifdef HAVE_GDI + +#include "hb-gdi.h" + +static hb_blob_t * +_hb_gdi_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data) +{ + char *buffer = nullptr; + DWORD length = 0; + + HDC hdc = GetDC (nullptr); + if (unlikely (!SelectObject (hdc, (HFONT) user_data))) goto fail; + + length = GetFontData (hdc, hb_uint32_swap (tag), 0, buffer, length); + if (unlikely (length == GDI_ERROR)) goto fail_with_releasedc; + + buffer = (char *) malloc (length); + if (unlikely (!buffer)) goto fail_with_releasedc; + length = GetFontData (hdc, hb_uint32_swap (tag), 0, buffer, length); + if (unlikely (length == GDI_ERROR)) goto fail_with_releasedc_and_free; + ReleaseDC (nullptr, hdc); + + return hb_blob_create ((const char *) buffer, length, HB_MEMORY_MODE_WRITABLE, buffer, free); + +fail_with_releasedc_and_free: + free (buffer); +fail_with_releasedc: + ReleaseDC (nullptr, hdc); +fail: + return hb_blob_get_empty (); +} + +/** + * hb_gdi_face_create: + * @hfont: a HFONT object. + * + * Return value: #hb_face_t object corresponding to the given input + * + * Since: 2.6.0 + **/ +hb_face_t * +hb_gdi_face_create (HFONT hfont) +{ + return hb_face_create_for_tables (_hb_gdi_reference_table, (void *) hfont, nullptr); +} + +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-gdi.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-gdi.h new file mode 100644 index 000000000..68cc43917 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-gdi.h @@ -0,0 +1,39 @@ +/* + * Copyright © 2019 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#ifndef HB_GDI_H +#define HB_GDI_H + +#include "hb.h" + +#include + +HB_BEGIN_DECLS + +HB_EXTERN hb_face_t * +hb_gdi_face_create (HFONT hfont); + +HB_END_DECLS + +#endif /* HB_GDI_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-glib.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-glib.cc new file mode 100644 index 000000000..db02b6760 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-glib.cc @@ -0,0 +1,411 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#include "hb.hh" + +#ifdef HAVE_GLIB + +#include "hb-glib.h" + +#include "hb-machinery.hh" + + +/** + * SECTION:hb-glib + * @title: hb-glib + * @short_description: GLib integration + * @include: hb-glib.h + * + * Functions for using HarfBuzz with the GLib library to provide Unicode data. + **/ + + +#if !GLIB_CHECK_VERSION(2,29,14) +static const hb_script_t +glib_script_to_script[] = +{ + HB_SCRIPT_COMMON, + HB_SCRIPT_INHERITED, + HB_SCRIPT_ARABIC, + HB_SCRIPT_ARMENIAN, + HB_SCRIPT_BENGALI, + HB_SCRIPT_BOPOMOFO, + HB_SCRIPT_CHEROKEE, + HB_SCRIPT_COPTIC, + HB_SCRIPT_CYRILLIC, + HB_SCRIPT_DESERET, + HB_SCRIPT_DEVANAGARI, + HB_SCRIPT_ETHIOPIC, + HB_SCRIPT_GEORGIAN, + HB_SCRIPT_GOTHIC, + HB_SCRIPT_GREEK, + HB_SCRIPT_GUJARATI, + HB_SCRIPT_GURMUKHI, + HB_SCRIPT_HAN, + HB_SCRIPT_HANGUL, + HB_SCRIPT_HEBREW, + HB_SCRIPT_HIRAGANA, + HB_SCRIPT_KANNADA, + HB_SCRIPT_KATAKANA, + HB_SCRIPT_KHMER, + HB_SCRIPT_LAO, + HB_SCRIPT_LATIN, + HB_SCRIPT_MALAYALAM, + HB_SCRIPT_MONGOLIAN, + HB_SCRIPT_MYANMAR, + HB_SCRIPT_OGHAM, + HB_SCRIPT_OLD_ITALIC, + HB_SCRIPT_ORIYA, + HB_SCRIPT_RUNIC, + HB_SCRIPT_SINHALA, + HB_SCRIPT_SYRIAC, + HB_SCRIPT_TAMIL, + HB_SCRIPT_TELUGU, + HB_SCRIPT_THAANA, + HB_SCRIPT_THAI, + HB_SCRIPT_TIBETAN, + HB_SCRIPT_CANADIAN_SYLLABICS, + HB_SCRIPT_YI, + HB_SCRIPT_TAGALOG, + HB_SCRIPT_HANUNOO, + HB_SCRIPT_BUHID, + HB_SCRIPT_TAGBANWA, + + /* Unicode-4.0 additions */ + HB_SCRIPT_BRAILLE, + HB_SCRIPT_CYPRIOT, + HB_SCRIPT_LIMBU, + HB_SCRIPT_OSMANYA, + HB_SCRIPT_SHAVIAN, + HB_SCRIPT_LINEAR_B, + HB_SCRIPT_TAI_LE, + HB_SCRIPT_UGARITIC, + + /* Unicode-4.1 additions */ + HB_SCRIPT_NEW_TAI_LUE, + HB_SCRIPT_BUGINESE, + HB_SCRIPT_GLAGOLITIC, + HB_SCRIPT_TIFINAGH, + HB_SCRIPT_SYLOTI_NAGRI, + HB_SCRIPT_OLD_PERSIAN, + HB_SCRIPT_KHAROSHTHI, + + /* Unicode-5.0 additions */ + HB_SCRIPT_UNKNOWN, + HB_SCRIPT_BALINESE, + HB_SCRIPT_CUNEIFORM, + HB_SCRIPT_PHOENICIAN, + HB_SCRIPT_PHAGS_PA, + HB_SCRIPT_NKO, + + /* Unicode-5.1 additions */ + HB_SCRIPT_KAYAH_LI, + HB_SCRIPT_LEPCHA, + HB_SCRIPT_REJANG, + HB_SCRIPT_SUNDANESE, + HB_SCRIPT_SAURASHTRA, + HB_SCRIPT_CHAM, + HB_SCRIPT_OL_CHIKI, + HB_SCRIPT_VAI, + HB_SCRIPT_CARIAN, + HB_SCRIPT_LYCIAN, + HB_SCRIPT_LYDIAN, + + /* Unicode-5.2 additions */ + HB_SCRIPT_AVESTAN, + HB_SCRIPT_BAMUM, + HB_SCRIPT_EGYPTIAN_HIEROGLYPHS, + HB_SCRIPT_IMPERIAL_ARAMAIC, + HB_SCRIPT_INSCRIPTIONAL_PAHLAVI, + HB_SCRIPT_INSCRIPTIONAL_PARTHIAN, + HB_SCRIPT_JAVANESE, + HB_SCRIPT_KAITHI, + HB_SCRIPT_TAI_THAM, + HB_SCRIPT_LISU, + HB_SCRIPT_MEETEI_MAYEK, + HB_SCRIPT_OLD_SOUTH_ARABIAN, + HB_SCRIPT_OLD_TURKIC, + HB_SCRIPT_SAMARITAN, + HB_SCRIPT_TAI_VIET, + + /* Unicode-6.0 additions */ + HB_SCRIPT_BATAK, + HB_SCRIPT_BRAHMI, + HB_SCRIPT_MANDAIC, + + /* Unicode-6.1 additions */ + HB_SCRIPT_CHAKMA, + HB_SCRIPT_MEROITIC_CURSIVE, + HB_SCRIPT_MEROITIC_HIEROGLYPHS, + HB_SCRIPT_MIAO, + HB_SCRIPT_SHARADA, + HB_SCRIPT_SORA_SOMPENG, + HB_SCRIPT_TAKRI +}; +#endif + +hb_script_t +hb_glib_script_to_script (GUnicodeScript script) +{ +#if GLIB_CHECK_VERSION(2,29,14) + return (hb_script_t) g_unicode_script_to_iso15924 (script); +#else + if (likely ((unsigned int) script < ARRAY_LENGTH (glib_script_to_script))) + return glib_script_to_script[script]; + + if (unlikely (script == G_UNICODE_SCRIPT_INVALID_CODE)) + return HB_SCRIPT_INVALID; + + return HB_SCRIPT_UNKNOWN; +#endif +} + +GUnicodeScript +hb_glib_script_from_script (hb_script_t script) +{ +#if GLIB_CHECK_VERSION(2,29,14) + return g_unicode_script_from_iso15924 (script); +#else + unsigned int count = ARRAY_LENGTH (glib_script_to_script); + for (unsigned int i = 0; i < count; i++) + if (glib_script_to_script[i] == script) + return (GUnicodeScript) i; + + if (unlikely (script == HB_SCRIPT_INVALID)) + return G_UNICODE_SCRIPT_INVALID_CODE; + + return G_UNICODE_SCRIPT_UNKNOWN; +#endif +} + + +static hb_unicode_combining_class_t +hb_glib_unicode_combining_class (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t unicode, + void *user_data HB_UNUSED) + +{ + return (hb_unicode_combining_class_t) g_unichar_combining_class (unicode); +} + +static hb_unicode_general_category_t +hb_glib_unicode_general_category (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t unicode, + void *user_data HB_UNUSED) + +{ + /* hb_unicode_general_category_t and GUnicodeType are identical */ + return (hb_unicode_general_category_t) g_unichar_type (unicode); +} + +static hb_codepoint_t +hb_glib_unicode_mirroring (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t unicode, + void *user_data HB_UNUSED) +{ + g_unichar_get_mirror_char (unicode, &unicode); + return unicode; +} + +static hb_script_t +hb_glib_unicode_script (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t unicode, + void *user_data HB_UNUSED) +{ + return hb_glib_script_to_script (g_unichar_get_script (unicode)); +} + +static hb_bool_t +hb_glib_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t a, + hb_codepoint_t b, + hb_codepoint_t *ab, + void *user_data HB_UNUSED) +{ +#if GLIB_CHECK_VERSION(2,29,12) + return g_unichar_compose (a, b, ab); +#endif + + /* We don't ifdef-out the fallback code such that compiler always + * sees it and makes sure it's compilable. */ + + gchar utf8[12]; + gchar *normalized; + int len; + hb_bool_t ret; + + len = g_unichar_to_utf8 (a, utf8); + len += g_unichar_to_utf8 (b, utf8 + len); + normalized = g_utf8_normalize (utf8, len, G_NORMALIZE_NFC); + len = g_utf8_strlen (normalized, -1); + if (unlikely (!len)) + return false; + + if (len == 1) { + *ab = g_utf8_get_char (normalized); + ret = true; + } else { + ret = false; + } + + g_free (normalized); + return ret; +} + +static hb_bool_t +hb_glib_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t ab, + hb_codepoint_t *a, + hb_codepoint_t *b, + void *user_data HB_UNUSED) +{ +#if GLIB_CHECK_VERSION(2,29,12) + return g_unichar_decompose (ab, a, b); +#endif + + /* We don't ifdef-out the fallback code such that compiler always + * sees it and makes sure it's compilable. */ + + gchar utf8[6]; + gchar *normalized; + int len; + hb_bool_t ret; + + len = g_unichar_to_utf8 (ab, utf8); + normalized = g_utf8_normalize (utf8, len, G_NORMALIZE_NFD); + len = g_utf8_strlen (normalized, -1); + if (unlikely (!len)) + return false; + + if (len == 1) { + *a = g_utf8_get_char (normalized); + *b = 0; + ret = *a != ab; + } else if (len == 2) { + *a = g_utf8_get_char (normalized); + *b = g_utf8_get_char (g_utf8_next_char (normalized)); + /* Here's the ugly part: if ab decomposes to a single character and + * that character decomposes again, we have to detect that and undo + * the second part :-(. */ + gchar *recomposed = g_utf8_normalize (normalized, -1, G_NORMALIZE_NFC); + hb_codepoint_t c = g_utf8_get_char (recomposed); + if (c != ab && c != *a) { + *a = c; + *b = 0; + } + g_free (recomposed); + ret = true; + } else { + /* If decomposed to more than two characters, take the last one, + * and recompose the rest to get the first component. */ + gchar *end = g_utf8_offset_to_pointer (normalized, len - 1); + gchar *recomposed; + *b = g_utf8_get_char (end); + recomposed = g_utf8_normalize (normalized, end - normalized, G_NORMALIZE_NFC); + /* We expect that recomposed has exactly one character now. */ + *a = g_utf8_get_char (recomposed); + g_free (recomposed); + ret = true; + } + + g_free (normalized); + return ret; +} + + +#if HB_USE_ATEXIT +static void free_static_glib_funcs (); +#endif + +static struct hb_glib_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader_t +{ + static hb_unicode_funcs_t *create () + { + hb_unicode_funcs_t *funcs = hb_unicode_funcs_create (nullptr); + + hb_unicode_funcs_set_combining_class_func (funcs, hb_glib_unicode_combining_class, nullptr, nullptr); + hb_unicode_funcs_set_general_category_func (funcs, hb_glib_unicode_general_category, nullptr, nullptr); + hb_unicode_funcs_set_mirroring_func (funcs, hb_glib_unicode_mirroring, nullptr, nullptr); + hb_unicode_funcs_set_script_func (funcs, hb_glib_unicode_script, nullptr, nullptr); + hb_unicode_funcs_set_compose_func (funcs, hb_glib_unicode_compose, nullptr, nullptr); + hb_unicode_funcs_set_decompose_func (funcs, hb_glib_unicode_decompose, nullptr, nullptr); + + hb_unicode_funcs_make_immutable (funcs); + +#if HB_USE_ATEXIT + atexit (free_static_glib_funcs); +#endif + + return funcs; + } +} static_glib_funcs; + +#if HB_USE_ATEXIT +static +void free_static_glib_funcs () +{ + static_glib_funcs.free_instance (); +} +#endif + +hb_unicode_funcs_t * +hb_glib_get_unicode_funcs () +{ + return static_glib_funcs.get_unconst (); +} + + + +#if GLIB_CHECK_VERSION(2,31,10) + +static void +_hb_g_bytes_unref (void *data) +{ + g_bytes_unref ((GBytes *) data); +} + +/** + * hb_glib_blob_create: + * + * Since: 0.9.38 + **/ +hb_blob_t * +hb_glib_blob_create (GBytes *gbytes) +{ + gsize size = 0; + gconstpointer data = g_bytes_get_data (gbytes, &size); + return hb_blob_create ((const char *) data, + size, + HB_MEMORY_MODE_READONLY, + g_bytes_ref (gbytes), + _hb_g_bytes_unref); +} +#endif + + +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-glib.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-glib.h new file mode 100644 index 000000000..5f04183ba --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-glib.h @@ -0,0 +1,56 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_GLIB_H +#define HB_GLIB_H + +#include "hb.h" + +#include + +HB_BEGIN_DECLS + + +HB_EXTERN hb_script_t +hb_glib_script_to_script (GUnicodeScript script); + +HB_EXTERN GUnicodeScript +hb_glib_script_from_script (hb_script_t script); + + +HB_EXTERN hb_unicode_funcs_t * +hb_glib_get_unicode_funcs (void); + +#if GLIB_CHECK_VERSION(2,31,10) +HB_EXTERN hb_blob_t * +hb_glib_blob_create (GBytes *gbytes); +#endif + +HB_END_DECLS + +#endif /* HB_GLIB_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-gobject-enums.cc.tmpl b/source/libs/harfbuzz/harfbuzz-src/src/hb-gobject-enums.cc.tmpl new file mode 100644 index 000000000..17f1adeb1 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-gobject-enums.cc.tmpl @@ -0,0 +1,80 @@ +/*** BEGIN file-header ***/ +/* + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#include "hb.hh" + +#ifdef HAVE_GOBJECT + +/* g++ didn't like older gtype.h gcc-only code path. */ +#include +#if !GLIB_CHECK_VERSION(2,29,16) +#undef __GNUC__ +#undef __GNUC_MINOR__ +#define __GNUC__ 2 +#define __GNUC_MINOR__ 6 +#endif + +#include "hb-gobject.h" + +/*** END file-header ***/ + +/*** BEGIN file-production ***/ +/* enumerations from "@filename@" */ +/*** END file-production ***/ + +/*** BEGIN file-tail ***/ + +#endif +/*** END file-tail ***/ + +/*** BEGIN value-header ***/ +GType +@enum_name@_get_type () +{ + static gsize type_id = 0; + + if (g_once_init_enter (&type_id)) + { + static const G@Type@Value values[] = { +/*** END value-header ***/ + +/*** BEGIN value-production ***/ + { @VALUENAME@, "@VALUENAME@", "@valuenick@" }, +/*** END value-production ***/ + +/*** BEGIN value-tail ***/ + { 0, NULL, NULL } + }; + GType id = + g_@type@_register_static (g_intern_static_string ("@EnumName@"), values); + g_once_init_leave (&type_id, id); + } + + return type_id; +} + +/*** END value-tail ***/ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-gobject-enums.h.tmpl b/source/libs/harfbuzz/harfbuzz-src/src/hb-gobject-enums.h.tmpl new file mode 100644 index 000000000..7ef9dfc02 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-gobject-enums.h.tmpl @@ -0,0 +1,56 @@ +/*** BEGIN file-header ***/ +/* + * Copyright © 2013 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_GOBJECT_H_IN +#error "Include instead." +#endif + +#ifndef HB_GOBJECT_ENUMS_H +#define HB_GOBJECT_ENUMS_H + +#include "hb.h" + +#include + +HB_BEGIN_DECLS + + +/*** END file-header ***/ + +/*** BEGIN value-header ***/ +HB_EXTERN GType +@enum_name@_get_type () G_GNUC_CONST; +#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ()) + +/*** END value-header ***/ + +/*** BEGIN file-tail ***/ + +HB_END_DECLS + +#endif /* HB_GOBJECT_ENUMS_H */ +/*** END file-tail ***/ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-gobject-structs.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-gobject-structs.cc new file mode 100644 index 000000000..7f4922ef1 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-gobject-structs.cc @@ -0,0 +1,101 @@ +/* + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#include "hb.hh" + +#ifdef HAVE_GOBJECT + + +/** + * SECTION:hb-gobject + * @title: hb-gobject + * @short_description: GObject integration + * @include: hb-gobject.h + * + * Functions for using HarfBuzz with the GObject library to provide + * type data. + **/ + + +/* g++ didn't like older gtype.h gcc-only code path. */ +#include +#if !GLIB_CHECK_VERSION(2,29,16) +#undef __GNUC__ +#undef __GNUC_MINOR__ +#define __GNUC__ 2 +#define __GNUC_MINOR__ 6 +#endif + +#include "hb-gobject.h" + +#define HB_DEFINE_BOXED_TYPE(name,copy_func,free_func) \ +GType \ +hb_gobject_##name##_get_type () \ +{ \ + static gsize type_id = 0; \ + if (g_once_init_enter (&type_id)) { \ + GType id = g_boxed_type_register_static (g_intern_static_string ("hb_" #name "_t"), \ + (GBoxedCopyFunc) copy_func, \ + (GBoxedFreeFunc) free_func); \ + g_once_init_leave (&type_id, id); \ + } \ + return type_id; \ +} + +#define HB_DEFINE_OBJECT_TYPE(name) \ + HB_DEFINE_BOXED_TYPE (name, hb_##name##_reference, hb_##name##_destroy) + +#define HB_DEFINE_VALUE_TYPE(name) \ + static hb_##name##_t *_hb_##name##_reference (const hb_##name##_t *l) \ + { \ + hb_##name##_t *c = (hb_##name##_t *) calloc (1, sizeof (hb_##name##_t)); \ + if (unlikely (!c)) return nullptr; \ + *c = *l; \ + return c; \ + } \ + static void _hb_##name##_destroy (hb_##name##_t *l) { free (l); } \ + HB_DEFINE_BOXED_TYPE (name, _hb_##name##_reference, _hb_##name##_destroy) + +HB_DEFINE_OBJECT_TYPE (buffer) +HB_DEFINE_OBJECT_TYPE (blob) +HB_DEFINE_OBJECT_TYPE (face) +HB_DEFINE_OBJECT_TYPE (font) +HB_DEFINE_OBJECT_TYPE (font_funcs) +HB_DEFINE_OBJECT_TYPE (set) +HB_DEFINE_OBJECT_TYPE (map) +HB_DEFINE_OBJECT_TYPE (shape_plan) +HB_DEFINE_OBJECT_TYPE (unicode_funcs) +HB_DEFINE_VALUE_TYPE (feature) +HB_DEFINE_VALUE_TYPE (glyph_info) +HB_DEFINE_VALUE_TYPE (glyph_position) +HB_DEFINE_VALUE_TYPE (segment_properties) +HB_DEFINE_VALUE_TYPE (user_data_key) + +HB_DEFINE_VALUE_TYPE (ot_math_glyph_variant) +HB_DEFINE_VALUE_TYPE (ot_math_glyph_part) + + +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-gobject-structs.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-gobject-structs.h new file mode 100644 index 000000000..800beede0 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-gobject-structs.h @@ -0,0 +1,142 @@ +/* + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_GOBJECT_H_IN +#error "Include instead." +#endif + +#ifndef HB_GOBJECT_STRUCTS_H +#define HB_GOBJECT_STRUCTS_H + +#include "hb.h" + +#include + +HB_BEGIN_DECLS + + +/* Object types */ + +/** + * hb_gobject_blob_get_type: + * + * Since: 0.9.2 + **/ +HB_EXTERN GType +hb_gobject_blob_get_type (void); +#define HB_GOBJECT_TYPE_BLOB (hb_gobject_blob_get_type ()) + +/** + * hb_gobject_buffer_get_type: + * + * Since: 0.9.2 + **/ +HB_EXTERN GType +hb_gobject_buffer_get_type (void); +#define HB_GOBJECT_TYPE_BUFFER (hb_gobject_buffer_get_type ()) + +/** + * hb_gobject_face_get_type: + * + * Since: 0.9.2 + **/ +HB_EXTERN GType +hb_gobject_face_get_type (void); +#define HB_GOBJECT_TYPE_FACE (hb_gobject_face_get_type ()) + +/** + * hb_gobject_font_get_type: + * + * Since: 0.9.2 + **/ +HB_EXTERN GType +hb_gobject_font_get_type (void); +#define HB_GOBJECT_TYPE_FONT (hb_gobject_font_get_type ()) + +/** + * hb_gobject_font_funcs_get_type: + * + * Since: 0.9.2 + **/ +HB_EXTERN GType +hb_gobject_font_funcs_get_type (void); +#define HB_GOBJECT_TYPE_FONT_FUNCS (hb_gobject_font_funcs_get_type ()) + +HB_EXTERN GType +hb_gobject_set_get_type (void); +#define HB_GOBJECT_TYPE_SET (hb_gobject_set_get_type ()) + +HB_EXTERN GType +hb_gobject_map_get_type (void); +#define HB_GOBJECT_TYPE_MAP (hb_gobject_map_get_type ()) + +HB_EXTERN GType +hb_gobject_shape_plan_get_type (void); +#define HB_GOBJECT_TYPE_SHAPE_PLAN (hb_gobject_shape_plan_get_type ()) + +/** + * hb_gobject_unicode_funcs_get_type: + * + * Since: 0.9.2 + **/ +HB_EXTERN GType +hb_gobject_unicode_funcs_get_type (void); +#define HB_GOBJECT_TYPE_UNICODE_FUNCS (hb_gobject_unicode_funcs_get_type ()) + +/* Value types */ + +HB_EXTERN GType +hb_gobject_feature_get_type (void); +#define HB_GOBJECT_TYPE_FEATURE (hb_gobject_feature_get_type ()) + +HB_EXTERN GType +hb_gobject_glyph_info_get_type (void); +#define HB_GOBJECT_TYPE_GLYPH_INFO (hb_gobject_glyph_info_get_type ()) + +HB_EXTERN GType +hb_gobject_glyph_position_get_type (void); +#define HB_GOBJECT_TYPE_GLYPH_POSITION (hb_gobject_glyph_position_get_type ()) + +HB_EXTERN GType +hb_gobject_segment_properties_get_type (void); +#define HB_GOBJECT_TYPE_SEGMENT_PROPERTIES (hb_gobject_segment_properties_get_type ()) + +HB_EXTERN GType +hb_gobject_user_data_key_get_type (void); +#define HB_GOBJECT_TYPE_USER_DATA_KEY (hb_gobject_user_data_key_get_type ()) + +HB_EXTERN GType +hb_gobject_ot_math_glyph_variant_get_type (void); +#define HB_GOBJECT_TYPE_OT_MATH_GLYPH_VARIANT (hb_gobject_ot_math_glyph_variant_get_type ()) + +HB_EXTERN GType +hb_gobject_ot_math_glyph_part_get_type (void); +#define HB_GOBJECT_TYPE_OT_MATH_GLYPH_PART (hb_gobject_ot_math_glyph_part_get_type ()) + + +HB_END_DECLS + +#endif /* HB_GOBJECT_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-gobject.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-gobject.h new file mode 100644 index 000000000..ea1bd25df --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-gobject.h @@ -0,0 +1,40 @@ +/* + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_GOBJECT_H +#define HB_GOBJECT_H +#define HB_GOBJECT_H_IN + +#include "hb.h" + +#include "hb-gobject-enums.h" +#include "hb-gobject-structs.h" + +HB_BEGIN_DECLS +HB_END_DECLS + +#undef HB_GOBJECT_H_IN +#endif /* HB_GOBJECT_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-graphite2.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-graphite2.cc new file mode 100644 index 000000000..f0f2f8c73 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-graphite2.cc @@ -0,0 +1,430 @@ +/* + * Copyright © 2011 Martin Hosken + * Copyright © 2011 SIL International + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#include "hb.hh" + +#ifdef HAVE_GRAPHITE2 + +#include "hb-shaper-impl.hh" + +#include "hb-graphite2.h" + +#include + +#include "hb-ot-layout.h" + + +/** + * SECTION:hb-graphite2 + * @title: hb-graphite2 + * @short_description: Graphite2 integration + * @include: hb-graphite2.h + * + * Functions for using HarfBuzz with the Graphite2 fonts. + **/ + + +/* + * shaper face data + */ + +typedef struct hb_graphite2_tablelist_t +{ + struct hb_graphite2_tablelist_t *next; + hb_blob_t *blob; + unsigned int tag; +} hb_graphite2_tablelist_t; + +struct hb_graphite2_face_data_t +{ + hb_face_t *face; + gr_face *grface; + hb_atomic_ptr_t tlist; +}; + +static const void *hb_graphite2_get_table (const void *data, unsigned int tag, size_t *len) +{ + hb_graphite2_face_data_t *face_data = (hb_graphite2_face_data_t *) data; + hb_graphite2_tablelist_t *tlist = face_data->tlist; + + hb_blob_t *blob = nullptr; + + for (hb_graphite2_tablelist_t *p = tlist; p; p = p->next) + if (p->tag == tag) { + blob = p->blob; + break; + } + + if (unlikely (!blob)) + { + blob = face_data->face->reference_table (tag); + + hb_graphite2_tablelist_t *p = (hb_graphite2_tablelist_t *) calloc (1, sizeof (hb_graphite2_tablelist_t)); + if (unlikely (!p)) { + hb_blob_destroy (blob); + return nullptr; + } + p->blob = blob; + p->tag = tag; + +retry: + hb_graphite2_tablelist_t *tlist = face_data->tlist; + p->next = tlist; + + if (unlikely (!face_data->tlist.cmpexch (tlist, p))) + goto retry; + } + + unsigned int tlen; + const char *d = hb_blob_get_data (blob, &tlen); + *len = tlen; + return d; +} + +hb_graphite2_face_data_t * +_hb_graphite2_shaper_face_data_create (hb_face_t *face) +{ + hb_blob_t *silf_blob = face->reference_table (HB_GRAPHITE2_TAG_SILF); + /* Umm, we just reference the table to check whether it exists. + * Maybe add better API for this? */ + if (!hb_blob_get_length (silf_blob)) + { + hb_blob_destroy (silf_blob); + return nullptr; + } + hb_blob_destroy (silf_blob); + + hb_graphite2_face_data_t *data = (hb_graphite2_face_data_t *) calloc (1, sizeof (hb_graphite2_face_data_t)); + if (unlikely (!data)) + return nullptr; + + data->face = face; + data->grface = gr_make_face (data, &hb_graphite2_get_table, gr_face_preloadAll); + + if (unlikely (!data->grface)) { + free (data); + return nullptr; + } + + return data; +} + +void +_hb_graphite2_shaper_face_data_destroy (hb_graphite2_face_data_t *data) +{ + hb_graphite2_tablelist_t *tlist = data->tlist; + + while (tlist) + { + hb_graphite2_tablelist_t *old = tlist; + hb_blob_destroy (tlist->blob); + tlist = tlist->next; + free (old); + } + + gr_face_destroy (data->grface); + + free (data); +} + +/* + * Since: 0.9.10 + */ +gr_face * +hb_graphite2_face_get_gr_face (hb_face_t *face) +{ + const hb_graphite2_face_data_t *data = face->data.graphite2; + return data ? data->grface : nullptr; +} + + +/* + * shaper font data + */ + +struct hb_graphite2_font_data_t {}; + +hb_graphite2_font_data_t * +_hb_graphite2_shaper_font_data_create (hb_font_t *font HB_UNUSED) +{ + return (hb_graphite2_font_data_t *) HB_SHAPER_DATA_SUCCEEDED; +} + +void +_hb_graphite2_shaper_font_data_destroy (hb_graphite2_font_data_t *data HB_UNUSED) +{ +} + +#ifndef HB_DISABLE_DEPRECATED +/** + * hb_graphite2_font_get_gr_font: + * + * Since: 0.9.10 + * Deprecated: 1.4.2 + */ +gr_font * +hb_graphite2_font_get_gr_font (hb_font_t *font HB_UNUSED) +{ + return nullptr; +} +#endif + + +/* + * shaper + */ + +struct hb_graphite2_cluster_t { + unsigned int base_char; + unsigned int num_chars; + unsigned int base_glyph; + unsigned int num_glyphs; + unsigned int cluster; + unsigned int advance; +}; + +hb_bool_t +_hb_graphite2_shape (hb_shape_plan_t *shape_plan HB_UNUSED, + hb_font_t *font, + hb_buffer_t *buffer, + const hb_feature_t *features, + unsigned int num_features) +{ + hb_face_t *face = font->face; + gr_face *grface = face->data.graphite2->grface; + + const char *lang = hb_language_to_string (hb_buffer_get_language (buffer)); + const char *lang_end = lang ? strchr (lang, '-') : nullptr; + int lang_len = lang_end ? lang_end - lang : -1; + gr_feature_val *feats = gr_face_featureval_for_lang (grface, lang ? hb_tag_from_string (lang, lang_len) : 0); + + for (unsigned int i = 0; i < num_features; i++) + { + const gr_feature_ref *fref = gr_face_find_fref (grface, features[i].tag); + if (fref) + gr_fref_set_feature_value (fref, features[i].value, feats); + } + + gr_segment *seg = nullptr; + const gr_slot *is; + unsigned int ci = 0, ic = 0; + unsigned int curradvx = 0, curradvy = 0; + + unsigned int scratch_size; + hb_buffer_t::scratch_buffer_t *scratch = buffer->get_scratch_buffer (&scratch_size); + + uint32_t *chars = (uint32_t *) scratch; + + for (unsigned int i = 0; i < buffer->len; ++i) + chars[i] = buffer->info[i].codepoint; + + /* TODO ensure_native_direction. */ + + hb_tag_t script_tag[HB_OT_MAX_TAGS_PER_SCRIPT]; + unsigned int count = HB_OT_MAX_TAGS_PER_SCRIPT; + hb_ot_tags_from_script_and_language (hb_buffer_get_script (buffer), + HB_LANGUAGE_INVALID, + &count, + script_tag, + nullptr, nullptr); + + seg = gr_make_seg (nullptr, grface, + count ? script_tag[count - 1] : HB_OT_TAG_DEFAULT_SCRIPT, + feats, + gr_utf32, chars, buffer->len, + 2 | (hb_buffer_get_direction (buffer) == HB_DIRECTION_RTL ? 1 : 0)); + + if (unlikely (!seg)) { + if (feats) gr_featureval_destroy (feats); + return false; + } + + unsigned int glyph_count = gr_seg_n_slots (seg); + if (unlikely (!glyph_count)) { + if (feats) gr_featureval_destroy (feats); + gr_seg_destroy (seg); + buffer->len = 0; + return true; + } + + buffer->ensure (glyph_count); + scratch = buffer->get_scratch_buffer (&scratch_size); + while ((DIV_CEIL (sizeof (hb_graphite2_cluster_t) * buffer->len, sizeof (*scratch)) + + DIV_CEIL (sizeof (hb_codepoint_t) * glyph_count, sizeof (*scratch))) > scratch_size) + { + if (unlikely (!buffer->ensure (buffer->allocated * 2))) + { + if (feats) gr_featureval_destroy (feats); + gr_seg_destroy (seg); + return false; + } + scratch = buffer->get_scratch_buffer (&scratch_size); + } + +#define ALLOCATE_ARRAY(Type, name, len) \ + Type *name = (Type *) scratch; \ + do { \ + unsigned int _consumed = DIV_CEIL ((len) * sizeof (Type), sizeof (*scratch)); \ + assert (_consumed <= scratch_size); \ + scratch += _consumed; \ + scratch_size -= _consumed; \ + } while (0) + + ALLOCATE_ARRAY (hb_graphite2_cluster_t, clusters, buffer->len); + ALLOCATE_ARRAY (hb_codepoint_t, gids, glyph_count); + +#undef ALLOCATE_ARRAY + + memset (clusters, 0, sizeof (clusters[0]) * buffer->len); + + hb_codepoint_t *pg = gids; + clusters[0].cluster = buffer->info[0].cluster; + unsigned int upem = hb_face_get_upem (face); + float xscale = (float) font->x_scale / upem; + float yscale = (float) font->y_scale / upem; + yscale *= yscale / xscale; + unsigned int curradv = 0; + if (HB_DIRECTION_IS_BACKWARD(buffer->props.direction)) + { + curradv = gr_slot_origin_X(gr_seg_first_slot(seg)) * xscale; + clusters[0].advance = gr_seg_advance_X(seg) * xscale - curradv; + } + else + clusters[0].advance = 0; + for (is = gr_seg_first_slot (seg), ic = 0; is; is = gr_slot_next_in_segment (is), ic++) + { + unsigned int before = gr_slot_before (is); + unsigned int after = gr_slot_after (is); + *pg = gr_slot_gid (is); + pg++; + while (clusters[ci].base_char > before && ci) + { + clusters[ci-1].num_chars += clusters[ci].num_chars; + clusters[ci-1].num_glyphs += clusters[ci].num_glyphs; + clusters[ci-1].advance += clusters[ci].advance; + ci--; + } + + if (gr_slot_can_insert_before (is) && clusters[ci].num_chars && before >= clusters[ci].base_char + clusters[ci].num_chars) + { + hb_graphite2_cluster_t *c = clusters + ci + 1; + c->base_char = clusters[ci].base_char + clusters[ci].num_chars; + c->cluster = buffer->info[c->base_char].cluster; + c->num_chars = before - c->base_char; + c->base_glyph = ic; + c->num_glyphs = 0; + if (HB_DIRECTION_IS_BACKWARD(buffer->props.direction)) + { + c->advance = curradv - gr_slot_origin_X(is) * xscale; + curradv -= c->advance; + } + else + { + c->advance = 0; + clusters[ci].advance += gr_slot_origin_X(is) * xscale - curradv; + curradv += clusters[ci].advance; + } + ci++; + } + clusters[ci].num_glyphs++; + + if (clusters[ci].base_char + clusters[ci].num_chars < after + 1) + clusters[ci].num_chars = after + 1 - clusters[ci].base_char; + } + + if (HB_DIRECTION_IS_BACKWARD(buffer->props.direction)) + clusters[ci].advance += curradv; + else + clusters[ci].advance += gr_seg_advance_X(seg) * xscale - curradv; + ci++; + + for (unsigned int i = 0; i < ci; ++i) + { + for (unsigned int j = 0; j < clusters[i].num_glyphs; ++j) + { + hb_glyph_info_t *info = &buffer->info[clusters[i].base_glyph + j]; + info->codepoint = gids[clusters[i].base_glyph + j]; + info->cluster = clusters[i].cluster; + info->var1.i32 = clusters[i].advance; // all glyphs in the cluster get the same advance + } + } + buffer->len = glyph_count; + + /* Positioning. */ + unsigned int currclus = (unsigned int) -1; + const hb_glyph_info_t *info = buffer->info; + hb_glyph_position_t *pPos = hb_buffer_get_glyph_positions (buffer, nullptr); + if (!HB_DIRECTION_IS_BACKWARD(buffer->props.direction)) + { + curradvx = 0; + for (is = gr_seg_first_slot (seg); is; pPos++, ++info, is = gr_slot_next_in_segment (is)) + { + pPos->x_offset = gr_slot_origin_X (is) * xscale - curradvx; + pPos->y_offset = gr_slot_origin_Y (is) * yscale - curradvy; + if (info->cluster != currclus) { + pPos->x_advance = info->var1.i32; + curradvx += pPos->x_advance; + currclus = info->cluster; + } else + pPos->x_advance = 0.; + + pPos->y_advance = gr_slot_advance_Y (is, grface, nullptr) * yscale; + curradvy += pPos->y_advance; + } + } + else + { + curradvx = gr_seg_advance_X(seg) * xscale; + for (is = gr_seg_first_slot (seg); is; pPos++, info++, is = gr_slot_next_in_segment (is)) + { + if (info->cluster != currclus) + { + pPos->x_advance = info->var1.i32; + curradvx -= pPos->x_advance; + currclus = info->cluster; + } else + pPos->x_advance = 0.; + + pPos->y_advance = gr_slot_advance_Y (is, grface, nullptr) * yscale; + curradvy -= pPos->y_advance; + pPos->x_offset = gr_slot_origin_X (is) * xscale - info->var1.i32 - curradvx + pPos->x_advance; + pPos->y_offset = gr_slot_origin_Y (is) * yscale - curradvy; + } + hb_buffer_reverse_clusters (buffer); + } + + if (feats) gr_featureval_destroy (feats); + gr_seg_destroy (seg); + + buffer->unsafe_to_break_all (); + + return true; +} + + +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-graphite2.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-graphite2.h new file mode 100644 index 000000000..1720191b4 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-graphite2.h @@ -0,0 +1,52 @@ +/* + * Copyright © 2011 Martin Hosken + * Copyright © 2011 SIL International + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#ifndef HB_GRAPHITE2_H +#define HB_GRAPHITE2_H + +#include "hb.h" + +#include + +HB_BEGIN_DECLS + + +#define HB_GRAPHITE2_TAG_SILF HB_TAG('S','i','l','f') + + +HB_EXTERN gr_face * +hb_graphite2_face_get_gr_face (hb_face_t *face); + +#ifndef HB_DISABLE_DEPRECATED + +HB_EXTERN HB_DEPRECATED_FOR (hb_graphite2_face_get_gr_face) gr_font * +hb_graphite2_font_get_gr_font (hb_font_t *font); + +#endif + + +HB_END_DECLS + +#endif /* HB_GRAPHITE2_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-icu.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-icu.cc new file mode 100644 index 000000000..985ff02dc --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-icu.cc @@ -0,0 +1,363 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2009 Keith Stribley + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#include "hb.hh" + +#ifdef HAVE_ICU + +#include "hb-icu.h" + +#include "hb-machinery.hh" + +#include +#include +#include +#include +#include + +/* ICU extra semicolon, fixed since 65, https://github.com/unicode-org/icu/commit/480bec3 */ +#if U_ICU_VERSION_MAJOR_NUM < 65 && (defined(__GNUC__) || defined(__clang__)) +#define HB_ICU_EXTRA_SEMI_IGNORED +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wextra-semi-stmt" +#endif + +/** + * SECTION:hb-icu + * @title: hb-icu + * @short_description: ICU integration + * @include: hb-icu.h + * + * Functions for using HarfBuzz with the ICU library to provide Unicode data. + **/ + +hb_script_t +hb_icu_script_to_script (UScriptCode script) +{ + if (unlikely (script == USCRIPT_INVALID_CODE)) + return HB_SCRIPT_INVALID; + + return hb_script_from_string (uscript_getShortName (script), -1); +} + +UScriptCode +hb_icu_script_from_script (hb_script_t script) +{ + if (unlikely (script == HB_SCRIPT_INVALID)) + return USCRIPT_INVALID_CODE; + + unsigned int numScriptCode = 1 + u_getIntPropertyMaxValue (UCHAR_SCRIPT); + for (unsigned int i = 0; i < numScriptCode; i++) + if (unlikely (hb_icu_script_to_script ((UScriptCode) i) == script)) + return (UScriptCode) i; + + return USCRIPT_UNKNOWN; +} + + +static hb_unicode_combining_class_t +hb_icu_unicode_combining_class (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t unicode, + void *user_data HB_UNUSED) + +{ + return (hb_unicode_combining_class_t) u_getCombiningClass (unicode); +} + +static hb_unicode_general_category_t +hb_icu_unicode_general_category (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t unicode, + void *user_data HB_UNUSED) +{ + switch (u_getIntPropertyValue(unicode, UCHAR_GENERAL_CATEGORY)) + { + case U_UNASSIGNED: return HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED; + + case U_UPPERCASE_LETTER: return HB_UNICODE_GENERAL_CATEGORY_UPPERCASE_LETTER; + case U_LOWERCASE_LETTER: return HB_UNICODE_GENERAL_CATEGORY_LOWERCASE_LETTER; + case U_TITLECASE_LETTER: return HB_UNICODE_GENERAL_CATEGORY_TITLECASE_LETTER; + case U_MODIFIER_LETTER: return HB_UNICODE_GENERAL_CATEGORY_MODIFIER_LETTER; + case U_OTHER_LETTER: return HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER; + + case U_NON_SPACING_MARK: return HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK; + case U_ENCLOSING_MARK: return HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK; + case U_COMBINING_SPACING_MARK: return HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK; + + case U_DECIMAL_DIGIT_NUMBER: return HB_UNICODE_GENERAL_CATEGORY_DECIMAL_NUMBER; + case U_LETTER_NUMBER: return HB_UNICODE_GENERAL_CATEGORY_LETTER_NUMBER; + case U_OTHER_NUMBER: return HB_UNICODE_GENERAL_CATEGORY_OTHER_NUMBER; + + case U_SPACE_SEPARATOR: return HB_UNICODE_GENERAL_CATEGORY_SPACE_SEPARATOR; + case U_LINE_SEPARATOR: return HB_UNICODE_GENERAL_CATEGORY_LINE_SEPARATOR; + case U_PARAGRAPH_SEPARATOR: return HB_UNICODE_GENERAL_CATEGORY_PARAGRAPH_SEPARATOR; + + case U_CONTROL_CHAR: return HB_UNICODE_GENERAL_CATEGORY_CONTROL; + case U_FORMAT_CHAR: return HB_UNICODE_GENERAL_CATEGORY_FORMAT; + case U_PRIVATE_USE_CHAR: return HB_UNICODE_GENERAL_CATEGORY_PRIVATE_USE; + case U_SURROGATE: return HB_UNICODE_GENERAL_CATEGORY_SURROGATE; + + + case U_DASH_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_DASH_PUNCTUATION; + case U_START_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_OPEN_PUNCTUATION; + case U_END_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_CLOSE_PUNCTUATION; + case U_CONNECTOR_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_CONNECT_PUNCTUATION; + case U_OTHER_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_OTHER_PUNCTUATION; + + case U_MATH_SYMBOL: return HB_UNICODE_GENERAL_CATEGORY_MATH_SYMBOL; + case U_CURRENCY_SYMBOL: return HB_UNICODE_GENERAL_CATEGORY_CURRENCY_SYMBOL; + case U_MODIFIER_SYMBOL: return HB_UNICODE_GENERAL_CATEGORY_MODIFIER_SYMBOL; + case U_OTHER_SYMBOL: return HB_UNICODE_GENERAL_CATEGORY_OTHER_SYMBOL; + + case U_INITIAL_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_INITIAL_PUNCTUATION; + case U_FINAL_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_FINAL_PUNCTUATION; + } + + return HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED; +} + +static hb_codepoint_t +hb_icu_unicode_mirroring (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t unicode, + void *user_data HB_UNUSED) +{ + return u_charMirror(unicode); +} + +static hb_script_t +hb_icu_unicode_script (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t unicode, + void *user_data HB_UNUSED) +{ + UErrorCode status = U_ZERO_ERROR; + UScriptCode scriptCode = uscript_getScript(unicode, &status); + + if (unlikely (U_FAILURE (status))) + return HB_SCRIPT_UNKNOWN; + + return hb_icu_script_to_script (scriptCode); +} + +static hb_bool_t +hb_icu_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t a, + hb_codepoint_t b, + hb_codepoint_t *ab, + void *user_data HB_UNUSED) +{ +#if U_ICU_VERSION_MAJOR_NUM >= 49 + { + const UNormalizer2 *normalizer = (const UNormalizer2 *) user_data; + UChar32 ret = unorm2_composePair (normalizer, a, b); + if (ret < 0) return false; + *ab = ret; + return true; + } +#endif + + /* We don't ifdef-out the fallback code such that compiler always + * sees it and makes sure it's compilable. */ + + UChar utf16[4], normalized[5]; + unsigned int len; + hb_bool_t ret, err; + UErrorCode icu_err; + + len = 0; + err = false; + U16_APPEND (utf16, len, ARRAY_LENGTH (utf16), a, err); + if (err) return false; + U16_APPEND (utf16, len, ARRAY_LENGTH (utf16), b, err); + if (err) return false; + + icu_err = U_ZERO_ERROR; + len = unorm2_normalize (unorm2_getNFCInstance (&icu_err), utf16, len, normalized, ARRAY_LENGTH (normalized), &icu_err); + if (U_FAILURE (icu_err)) + return false; + if (u_countChar32 (normalized, len) == 1) { + U16_GET_UNSAFE (normalized, 0, *ab); + ret = true; + } else { + ret = false; + } + + return ret; +} + +static hb_bool_t +hb_icu_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t ab, + hb_codepoint_t *a, + hb_codepoint_t *b, + void *user_data HB_UNUSED) +{ +#if U_ICU_VERSION_MAJOR_NUM >= 49 + { + const UNormalizer2 *normalizer = (const UNormalizer2 *) user_data; + UChar decomposed[4]; + int len; + UErrorCode icu_err = U_ZERO_ERROR; + len = unorm2_getRawDecomposition (normalizer, ab, decomposed, + ARRAY_LENGTH (decomposed), &icu_err); + if (U_FAILURE (icu_err) || len < 0) return false; + + len = u_countChar32 (decomposed, len); + if (len == 1) { + U16_GET_UNSAFE (decomposed, 0, *a); + *b = 0; + return *a != ab; + } else if (len == 2) { + len = 0; + U16_NEXT_UNSAFE (decomposed, len, *a); + U16_NEXT_UNSAFE (decomposed, len, *b); + } + return true; + } +#endif + + /* We don't ifdef-out the fallback code such that compiler always + * sees it and makes sure it's compilable. */ + + UChar utf16[2], normalized[2 * 19/*HB_UNICODE_MAX_DECOMPOSITION_LEN*/ + 1]; + unsigned int len; + hb_bool_t ret, err; + UErrorCode icu_err; + + /* This function is a monster! Maybe it wasn't a good idea adding a + * pairwise decompose API... */ + /* Watchout for the dragons. Err, watchout for macros changing len. */ + + len = 0; + err = false; + U16_APPEND (utf16, len, ARRAY_LENGTH (utf16), ab, err); + if (err) return false; + + icu_err = U_ZERO_ERROR; + len = unorm2_normalize (unorm2_getNFDInstance (&icu_err), utf16, len, normalized, ARRAY_LENGTH (normalized), &icu_err); + if (U_FAILURE (icu_err)) + return false; + + len = u_countChar32 (normalized, len); + + if (len == 1) { + U16_GET_UNSAFE (normalized, 0, *a); + *b = 0; + ret = *a != ab; + } else if (len == 2) { + len = 0; + U16_NEXT_UNSAFE (normalized, len, *a); + U16_NEXT_UNSAFE (normalized, len, *b); + + /* Here's the ugly part: if ab decomposes to a single character and + * that character decomposes again, we have to detect that and undo + * the second part :-(. */ + UChar recomposed[20]; + icu_err = U_ZERO_ERROR; + unorm2_normalize (unorm2_getNFCInstance (&icu_err), normalized, len, recomposed, ARRAY_LENGTH (recomposed), &icu_err); + if (U_FAILURE (icu_err)) + return false; + hb_codepoint_t c; + U16_GET_UNSAFE (recomposed, 0, c); + if (c != *a && c != ab) { + *a = c; + *b = 0; + } + ret = true; + } else { + /* If decomposed to more than two characters, take the last one, + * and recompose the rest to get the first component. */ + U16_PREV_UNSAFE (normalized, len, *b); /* Changes len in-place. */ + UChar recomposed[18 * 2]; + icu_err = U_ZERO_ERROR; + len = unorm2_normalize (unorm2_getNFCInstance (&icu_err), normalized, len, recomposed, ARRAY_LENGTH (recomposed), &icu_err); + if (U_FAILURE (icu_err)) + return false; + /* We expect that recomposed has exactly one character now. */ + if (unlikely (u_countChar32 (recomposed, len) != 1)) + return false; + U16_GET_UNSAFE (recomposed, 0, *a); + ret = true; + } + + return ret; +} + + +#if HB_USE_ATEXIT +static void free_static_icu_funcs (); +#endif + +static struct hb_icu_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader_t +{ + static hb_unicode_funcs_t *create () + { + void *user_data = nullptr; +#if U_ICU_VERSION_MAJOR_NUM >= 49 + UErrorCode icu_err = U_ZERO_ERROR; + user_data = (void *) unorm2_getNFCInstance (&icu_err); + assert (user_data); +#endif + + hb_unicode_funcs_t *funcs = hb_unicode_funcs_create (nullptr); + + hb_unicode_funcs_set_combining_class_func (funcs, hb_icu_unicode_combining_class, nullptr, nullptr); + hb_unicode_funcs_set_general_category_func (funcs, hb_icu_unicode_general_category, nullptr, nullptr); + hb_unicode_funcs_set_mirroring_func (funcs, hb_icu_unicode_mirroring, nullptr, nullptr); + hb_unicode_funcs_set_script_func (funcs, hb_icu_unicode_script, nullptr, nullptr); + hb_unicode_funcs_set_compose_func (funcs, hb_icu_unicode_compose, user_data, nullptr); + hb_unicode_funcs_set_decompose_func (funcs, hb_icu_unicode_decompose, user_data, nullptr); + + hb_unicode_funcs_make_immutable (funcs); + +#if HB_USE_ATEXIT + atexit (free_static_icu_funcs); +#endif + + return funcs; + } +} static_icu_funcs; + +#if HB_USE_ATEXIT +static +void free_static_icu_funcs () +{ + static_icu_funcs.free_instance (); +} +#endif + +hb_unicode_funcs_t * +hb_icu_get_unicode_funcs () +{ + return static_icu_funcs.get_unconst (); +} + +#ifdef HB_ICU_EXTRA_SEMI_IGNORED +#pragma GCC diagnostic pop +#endif + +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-icu.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-icu.h new file mode 100644 index 000000000..2db6a7b67 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-icu.h @@ -0,0 +1,52 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_ICU_H +#define HB_ICU_H + +#include "hb.h" + +#include + +HB_BEGIN_DECLS + + +HB_EXTERN hb_script_t +hb_icu_script_to_script (UScriptCode script); + +HB_EXTERN UScriptCode +hb_icu_script_from_script (hb_script_t script); + + +HB_EXTERN hb_unicode_funcs_t * +hb_icu_get_unicode_funcs (void); + + +HB_END_DECLS + +#endif /* HB_ICU_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-iter.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-iter.hh new file mode 100644 index 000000000..981c5c218 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-iter.hh @@ -0,0 +1,939 @@ +/* + * Copyright © 2018 Google, Inc. + * Copyright © 2019 Facebook, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + * Facebook Author(s): Behdad Esfahbod + */ + +#ifndef HB_ITER_HH +#define HB_ITER_HH + +#include "hb.hh" +#include "hb-algs.hh" +#include "hb-meta.hh" + + +/* Unified iterator object. + * + * The goal of this template is to make the same iterator interface + * available to all types, and make it very easy and compact to use. + * hb_iter_tator objects are small, light-weight, objects that can be + * copied by value. If the collection / object being iterated on + * is writable, then the iterator returns lvalues, otherwise it + * returns rvalues. + * + * TODO Document more. + * + * If iterator implementation implements operator!=, then can be + * used in range-based for loop. That comes free if the iterator + * is random-access. Otherwise, the range-based for loop incurs + * one traversal to find end(), which can be avoided if written + * as a while-style for loop, or if iterator implements a faster + * __end__() method. + * TODO When opting in for C++17, address this by changing return + * type of .end()? + */ + +/* + * Base classes for iterators. + */ + +/* Base class for all iterators. */ +template +struct hb_iter_t +{ + typedef Item item_t; + constexpr unsigned get_item_size () const { return hb_static_size (Item); } + static constexpr bool is_iterator = true; + static constexpr bool is_random_access_iterator = false; + static constexpr bool is_sorted_iterator = false; + + private: + /* https://en.wikipedia.org/wiki/Curiously_recurring_template_pattern */ + const iter_t* thiz () const { return static_cast (this); } + iter_t* thiz () { return static_cast< iter_t *> (this); } + public: + + /* TODO: + * Port operators below to use hb_enable_if to sniff which method implements + * an operator and use it, and remove hb_iter_fallback_mixin_t completely. */ + + /* Operators. */ + iter_t iter () const { return *thiz(); } + iter_t operator + () const { return *thiz(); } + iter_t begin () const { return *thiz(); } + iter_t end () const { return thiz()->__end__ (); } + explicit operator bool () const { return thiz()->__more__ (); } + unsigned len () const { return thiz()->__len__ (); } + /* The following can only be enabled if item_t is reference type. Otherwise + * it will be returning pointer to temporary rvalue. + * TODO Use a wrapper return type to fix for non-reference type. */ + template + hb_remove_reference* operator -> () const { return hb_addressof (**thiz()); } + item_t operator * () const { return thiz()->__item__ (); } + item_t operator * () { return thiz()->__item__ (); } + item_t operator [] (unsigned i) const { return thiz()->__item_at__ (i); } + item_t operator [] (unsigned i) { return thiz()->__item_at__ (i); } + iter_t& operator += (unsigned count) & { thiz()->__forward__ (count); return *thiz(); } + iter_t operator += (unsigned count) && { thiz()->__forward__ (count); return *thiz(); } + iter_t& operator ++ () & { thiz()->__next__ (); return *thiz(); } + iter_t operator ++ () && { thiz()->__next__ (); return *thiz(); } + iter_t& operator -= (unsigned count) & { thiz()->__rewind__ (count); return *thiz(); } + iter_t operator -= (unsigned count) && { thiz()->__rewind__ (count); return *thiz(); } + iter_t& operator -- () & { thiz()->__prev__ (); return *thiz(); } + iter_t operator -- () && { thiz()->__prev__ (); return *thiz(); } + iter_t operator + (unsigned count) const { auto c = thiz()->iter (); c += count; return c; } + friend iter_t operator + (unsigned count, const iter_t &it) { return it + count; } + iter_t operator ++ (int) { iter_t c (*thiz()); ++*thiz(); return c; } + iter_t operator - (unsigned count) const { auto c = thiz()->iter (); c -= count; return c; } + iter_t operator -- (int) { iter_t c (*thiz()); --*thiz(); return c; } + template + iter_t& operator >> (T &v) & { v = **thiz(); ++*thiz(); return *thiz(); } + template + iter_t operator >> (T &v) && { v = **thiz(); ++*thiz(); return *thiz(); } + template + iter_t& operator << (const T v) & { **thiz() = v; ++*thiz(); return *thiz(); } + template + iter_t operator << (const T v) && { **thiz() = v; ++*thiz(); return *thiz(); } + + protected: + hb_iter_t () = default; + hb_iter_t (const hb_iter_t &o HB_UNUSED) = default; + hb_iter_t (hb_iter_t &&o HB_UNUSED) = default; + hb_iter_t& operator = (const hb_iter_t &o HB_UNUSED) = default; + hb_iter_t& operator = (hb_iter_t &&o HB_UNUSED) = default; +}; + +#define HB_ITER_USING(Name) \ + using item_t = typename Name::item_t; \ + using Name::begin; \ + using Name::end; \ + using Name::get_item_size; \ + using Name::is_iterator; \ + using Name::iter; \ + using Name::operator bool; \ + using Name::len; \ + using Name::operator ->; \ + using Name::operator *; \ + using Name::operator []; \ + using Name::operator +=; \ + using Name::operator ++; \ + using Name::operator -=; \ + using Name::operator --; \ + using Name::operator +; \ + using Name::operator -; \ + using Name::operator >>; \ + using Name::operator <<; \ + static_assert (true, "") + +/* Returns iterator / item type of a type. */ +template +using hb_iter_type = decltype (hb_deref (hb_declval (Iterable)).iter ()); +template +using hb_item_type = decltype (*hb_deref (hb_declval (Iterable)).iter ()); + + +template struct hb_array_t; +template struct hb_sorted_array_t; + +struct +{ + template hb_iter_type + operator () (T&& c) const + { return hb_deref (hb_forward (c)).iter (); } + + /* Specialization for C arrays. */ + + template inline hb_array_t + operator () (Type *array, unsigned int length) const + { return hb_array_t (array, length); } + + template hb_array_t + operator () (Type (&array)[length]) const + { return hb_array_t (array, length); } + +} +HB_FUNCOBJ (hb_iter); +struct +{ + template unsigned + operator () (T&& c) const + { return c.len (); } + +} +HB_FUNCOBJ (hb_len); + +/* Mixin to fill in what the subclass doesn't provide. */ +template +struct hb_iter_fallback_mixin_t +{ + private: + /* https://en.wikipedia.org/wiki/Curiously_recurring_template_pattern */ + const iter_t* thiz () const { return static_cast (this); } + iter_t* thiz () { return static_cast< iter_t *> (this); } + public: + + /* Access: Implement __item__(), or __item_at__() if random-access. */ + item_t __item__ () const { return (*thiz())[0]; } + item_t __item_at__ (unsigned i) const { return *(*thiz() + i); } + + /* Termination: Implement __more__(), or __len__() if random-access. */ + bool __more__ () const { return bool (thiz()->len ()); } + unsigned __len__ () const + { iter_t c (*thiz()); unsigned l = 0; while (c) { c++; l++; } return l; } + + /* Advancing: Implement __next__(), or __forward__() if random-access. */ + void __next__ () { *thiz() += 1; } + void __forward__ (unsigned n) { while (*thiz() && n--) ++*thiz(); } + + /* Rewinding: Implement __prev__() or __rewind__() if bidirectional. */ + void __prev__ () { *thiz() -= 1; } + void __rewind__ (unsigned n) { while (*thiz() && n--) --*thiz(); } + + /* Range-based for: Implement __end__() if can be done faster, + * and operator!=. */ + iter_t __end__ () const + { + if (thiz()->is_random_access_iterator) + return *thiz() + thiz()->len (); + /* Above expression loops twice. Following loops once. */ + auto it = *thiz(); + while (it) ++it; + return it; + } + + protected: + hb_iter_fallback_mixin_t () = default; + hb_iter_fallback_mixin_t (const hb_iter_fallback_mixin_t &o HB_UNUSED) = default; + hb_iter_fallback_mixin_t (hb_iter_fallback_mixin_t &&o HB_UNUSED) = default; + hb_iter_fallback_mixin_t& operator = (const hb_iter_fallback_mixin_t &o HB_UNUSED) = default; + hb_iter_fallback_mixin_t& operator = (hb_iter_fallback_mixin_t &&o HB_UNUSED) = default; +}; + +template +struct hb_iter_with_fallback_t : + hb_iter_t, + hb_iter_fallback_mixin_t +{ + protected: + hb_iter_with_fallback_t () = default; + hb_iter_with_fallback_t (const hb_iter_with_fallback_t &o HB_UNUSED) = default; + hb_iter_with_fallback_t (hb_iter_with_fallback_t &&o HB_UNUSED) = default; + hb_iter_with_fallback_t& operator = (const hb_iter_with_fallback_t &o HB_UNUSED) = default; + hb_iter_with_fallback_t& operator = (hb_iter_with_fallback_t &&o HB_UNUSED) = default; +}; + +/* + * Meta-programming predicates. + */ + +/* hb_is_iterator() / hb_is_iterator_of() */ + +template +struct hb_is_iterator_of +{ + template + static hb_true_type impl (hb_priority<2>, hb_iter_t> *); + static hb_false_type impl (hb_priority<0>, const void *); + + public: + static constexpr bool value = decltype (impl (hb_prioritize, hb_declval (Iter*)))::value; +}; +#define hb_is_iterator_of(Iter, Item) hb_is_iterator_of::value +#define hb_is_iterator(Iter) hb_is_iterator_of (Iter, typename Iter::item_t) + +/* hb_is_iterable() */ + +template +struct hb_is_iterable +{ + private: + + template + static auto impl (hb_priority<1>) -> decltype (hb_declval (U).iter (), hb_true_type ()); + + template + static hb_false_type impl (hb_priority<0>); + + public: + static constexpr bool value = decltype (impl (hb_prioritize))::value; +}; +#define hb_is_iterable(Iterable) hb_is_iterable::value + +/* hb_is_source_of() / hb_is_sink_of() */ + +template +struct hb_is_source_of +{ + private: + template >))> + static hb_true_type impl (hb_priority<2>); + template + static auto impl (hb_priority<1>) -> decltype (hb_declval (Iter2) >> hb_declval (Item &), hb_true_type ()); + static hb_false_type impl (hb_priority<0>); + + public: + static constexpr bool value = decltype (impl (hb_prioritize))::value; +}; +#define hb_is_source_of(Iter, Item) hb_is_source_of::value + +template +struct hb_is_sink_of +{ + private: + template ))> + static hb_true_type impl (hb_priority<2>); + template + static auto impl (hb_priority<1>) -> decltype (hb_declval (Iter2) << hb_declval (Item), hb_true_type ()); + static hb_false_type impl (hb_priority<0>); + + public: + static constexpr bool value = decltype (impl (hb_prioritize))::value; +}; +#define hb_is_sink_of(Iter, Item) hb_is_sink_of::value + +/* This is commonly used, so define: */ +#define hb_is_sorted_source_of(Iter, Item) \ + (hb_is_source_of(Iter, Item) && Iter::is_sorted_iterator) + + +/* Range-based 'for' for iterables. */ + +template +static inline auto begin (Iterable&& iterable) HB_AUTO_RETURN (hb_iter (iterable).begin ()) + +template +static inline auto end (Iterable&& iterable) HB_AUTO_RETURN (hb_iter (iterable).end ()) + +/* begin()/end() are NOT looked up non-ADL. So each namespace must declare them. + * Do it for namespace OT. */ +namespace OT { + +template +static inline auto begin (Iterable&& iterable) HB_AUTO_RETURN (hb_iter (iterable).begin ()) + +template +static inline auto end (Iterable&& iterable) HB_AUTO_RETURN (hb_iter (iterable).end ()) + +} + + +/* + * Adaptors, combiners, etc. + */ + +template +static inline auto +operator | (Lhs&& lhs, Rhs&& rhs) HB_AUTO_RETURN (hb_forward (rhs) (hb_forward (lhs))) + +/* hb_map(), hb_filter(), hb_reduce() */ + +enum class hb_function_sortedness_t { + NOT_SORTED, + RETAINS_SORTING, + SORTED, +}; + +template +struct hb_map_iter_t : + hb_iter_t, + decltype (hb_get (hb_declval (Proj), *hb_declval (Iter)))> +{ + hb_map_iter_t (const Iter& it, Proj f_) : it (it), f (f_) {} + + typedef decltype (hb_get (hb_declval (Proj), *hb_declval (Iter))) __item_t__; + static constexpr bool is_random_access_iterator = Iter::is_random_access_iterator; + static constexpr bool is_sorted_iterator = + Sorted == hb_function_sortedness_t::SORTED ? true : + Sorted == hb_function_sortedness_t::RETAINS_SORTING ? Iter::is_sorted_iterator : + false; + __item_t__ __item__ () const { return hb_get (f.get (), *it); } + __item_t__ __item_at__ (unsigned i) const { return hb_get (f.get (), it[i]); } + bool __more__ () const { return bool (it); } + unsigned __len__ () const { return it.len (); } + void __next__ () { ++it; } + void __forward__ (unsigned n) { it += n; } + void __prev__ () { --it; } + void __rewind__ (unsigned n) { it -= n; } + hb_map_iter_t __end__ () const { return hb_map_iter_t (it.end (), f); } + bool operator != (const hb_map_iter_t& o) const + { return it != o.it; } + + private: + Iter it; + hb_reference_wrapper f; +}; + +template +struct hb_map_iter_factory_t +{ + hb_map_iter_factory_t (Proj f) : f (f) {} + + template + hb_map_iter_t + operator () (Iter it) + { return hb_map_iter_t (it, f); } + + private: + Proj f; +}; +struct +{ + template + hb_map_iter_factory_t + operator () (Proj&& f) const + { return hb_map_iter_factory_t (f); } +} +HB_FUNCOBJ (hb_map); +struct +{ + template + hb_map_iter_factory_t + operator () (Proj&& f) const + { return hb_map_iter_factory_t (f); } +} +HB_FUNCOBJ (hb_map_retains_sorting); +struct +{ + template + hb_map_iter_factory_t + operator () (Proj&& f) const + { return hb_map_iter_factory_t (f); } +} +HB_FUNCOBJ (hb_map_sorted); + +template +struct hb_filter_iter_t : + hb_iter_with_fallback_t, + typename Iter::item_t> +{ + hb_filter_iter_t (const Iter& it_, Pred p_, Proj f_) : it (it_), p (p_), f (f_) + { while (it && !hb_has (p.get (), hb_get (f.get (), *it))) ++it; } + + typedef typename Iter::item_t __item_t__; + static constexpr bool is_sorted_iterator = Iter::is_sorted_iterator; + __item_t__ __item__ () const { return *it; } + bool __more__ () const { return bool (it); } + void __next__ () { do ++it; while (it && !hb_has (p.get (), hb_get (f.get (), *it))); } + void __prev__ () { do --it; while (it && !hb_has (p.get (), hb_get (f.get (), *it))); } + hb_filter_iter_t __end__ () const { return hb_filter_iter_t (it.end (), p, f); } + bool operator != (const hb_filter_iter_t& o) const + { return it != o.it; } + + private: + Iter it; + hb_reference_wrapper p; + hb_reference_wrapper f; +}; +template +struct hb_filter_iter_factory_t +{ + hb_filter_iter_factory_t (Pred p, Proj f) : p (p), f (f) {} + + template + hb_filter_iter_t + operator () (Iter it) + { return hb_filter_iter_t (it, p, f); } + + private: + Pred p; + Proj f; +}; +struct +{ + template + hb_filter_iter_factory_t + operator () (Pred&& p = hb_identity, Proj&& f = hb_identity) const + { return hb_filter_iter_factory_t (p, f); } +} +HB_FUNCOBJ (hb_filter); + +template +struct hb_reduce_t +{ + hb_reduce_t (Redu r, InitT init_value) : r (r), init_value (init_value) {} + + template > + AccuT + operator () (Iter it) + { + AccuT value = init_value; + for (; it; ++it) + value = r (value, *it); + return value; + } + + private: + Redu r; + InitT init_value; +}; +struct +{ + template + hb_reduce_t + operator () (Redu&& r, InitT init_value) const + { return hb_reduce_t (r, init_value); } +} +HB_FUNCOBJ (hb_reduce); + + +/* hb_zip() */ + +template +struct hb_zip_iter_t : + hb_iter_t, + hb_pair_t> +{ + hb_zip_iter_t () {} + hb_zip_iter_t (const A& a, const B& b) : a (a), b (b) {} + + typedef hb_pair_t __item_t__; + static constexpr bool is_random_access_iterator = + A::is_random_access_iterator && + B::is_random_access_iterator; + /* Note. The following categorization is only valid if A is strictly sorted, + * ie. does NOT have duplicates. Previously I tried to categorize sortedness + * more granularly, see commits: + * + * 513762849a683914fc266a17ddf38f133cccf072 + * 4d3cf2adb669c345cc43832d11689271995e160a + * + * However, that was not enough, since hb_sorted_array_t, hb_sorted_vector_t, + * SortedArrayOf, etc all needed to be updated to add more variants. At that + * point I saw it not worth the effort, and instead we now deem all sorted + * collections as essentially strictly-sorted for the purposes of zip. + * + * The above assumption is not as bad as it sounds. Our "sorted" comes with + * no guarantees. It's just a contract, put in place to help you remember, + * and think about, whether an iterator you receive is expected to be + * sorted or not. As such, it's not perfect by definition, and should not + * be treated so. The inaccuracy here just errs in the direction of being + * more permissive, so your code compiles instead of erring on the side of + * marking your zipped iterator unsorted in which case your code won't + * compile. + * + * This semantical limitation does NOT affect logic in any other place I + * know of as of this writing. + */ + static constexpr bool is_sorted_iterator = A::is_sorted_iterator; + + __item_t__ __item__ () const { return __item_t__ (*a, *b); } + __item_t__ __item_at__ (unsigned i) const { return __item_t__ (a[i], b[i]); } + bool __more__ () const { return bool (a) && bool (b); } + unsigned __len__ () const { return hb_min (a.len (), b.len ()); } + void __next__ () { ++a; ++b; } + void __forward__ (unsigned n) { a += n; b += n; } + void __prev__ () { --a; --b; } + void __rewind__ (unsigned n) { a -= n; b -= n; } + hb_zip_iter_t __end__ () const { return hb_zip_iter_t (a.end (), b.end ()); } + /* Note, we should stop if ANY of the iters reaches end. As such two compare + * unequal if both items are unequal, NOT if either is unequal. */ + bool operator != (const hb_zip_iter_t& o) const + { return a != o.a && b != o.b; } + + private: + A a; + B b; +}; +struct +{ HB_PARTIALIZE(2); + template + hb_zip_iter_t, hb_iter_type> + operator () (A&& a, B&& b) const + { return hb_zip_iter_t, hb_iter_type> (hb_iter (a), hb_iter (b)); } +} +HB_FUNCOBJ (hb_zip); + +/* hb_apply() */ + +template +struct hb_apply_t +{ + hb_apply_t (Appl a) : a (a) {} + + template + void operator () (Iter it) + { + for (; it; ++it) + (void) hb_invoke (a, *it); + } + + private: + Appl a; +}; +struct +{ + template hb_apply_t + operator () (Appl&& a) const + { return hb_apply_t (a); } + + template hb_apply_t + operator () (Appl *a) const + { return hb_apply_t (*a); } +} +HB_FUNCOBJ (hb_apply); + +/* hb_range()/hb_iota()/hb_repeat() */ + +template +struct hb_range_iter_t : + hb_iter_t, T> +{ + hb_range_iter_t (T start, T end_, S step) : v (start), end_ (end_for (start, end_, step)), step (step) {} + + typedef T __item_t__; + static constexpr bool is_random_access_iterator = true; + static constexpr bool is_sorted_iterator = true; + __item_t__ __item__ () const { return hb_ridentity (v); } + __item_t__ __item_at__ (unsigned j) const { return v + j * step; } + bool __more__ () const { return v != end_; } + unsigned __len__ () const { return !step ? UINT_MAX : (end_ - v) / step; } + void __next__ () { v += step; } + void __forward__ (unsigned n) { v += n * step; } + void __prev__ () { v -= step; } + void __rewind__ (unsigned n) { v -= n * step; } + hb_range_iter_t __end__ () const { return hb_range_iter_t (end_, end_, step); } + bool operator != (const hb_range_iter_t& o) const + { return v != o.v; } + + private: + static inline T end_for (T start, T end_, S step) + { + if (!step) + return end_; + auto res = (end_ - start) % step; + if (!res) + return end_; + end_ += step - res; + return end_; + } + + private: + T v; + T end_; + S step; +}; +struct +{ + template hb_range_iter_t + operator () (T end = (unsigned) -1) const + { return hb_range_iter_t (0, end, 1u); } + + template hb_range_iter_t + operator () (T start, T end, S step = 1u) const + { return hb_range_iter_t (start, end, step); } +} +HB_FUNCOBJ (hb_range); + +template +struct hb_iota_iter_t : + hb_iter_with_fallback_t, T> +{ + hb_iota_iter_t (T start, S step) : v (start), step (step) {} + + private: + + template + auto + inc (hb_type_identity s, hb_priority<1>) + -> hb_void_t (s), hb_declval ()))> + { v = hb_invoke (hb_forward (s), v); } + + void + inc (S s, hb_priority<0>) + { v += s; } + + public: + + typedef T __item_t__; + static constexpr bool is_random_access_iterator = true; + static constexpr bool is_sorted_iterator = true; + __item_t__ __item__ () const { return hb_ridentity (v); } + bool __more__ () const { return true; } + unsigned __len__ () const { return UINT_MAX; } + void __next__ () { inc (step, hb_prioritize); } + void __prev__ () { v -= step; } + hb_iota_iter_t __end__ () const { return *this; } + bool operator != (const hb_iota_iter_t& o) const { return true; } + + private: + T v; + S step; +}; +struct +{ + template hb_iota_iter_t + operator () (T start = 0u, S step = 1u) const + { return hb_iota_iter_t (start, step); } +} +HB_FUNCOBJ (hb_iota); + +template +struct hb_repeat_iter_t : + hb_iter_t, T> +{ + hb_repeat_iter_t (T value) : v (value) {} + + typedef T __item_t__; + static constexpr bool is_random_access_iterator = true; + static constexpr bool is_sorted_iterator = true; + __item_t__ __item__ () const { return v; } + __item_t__ __item_at__ (unsigned j) const { return v; } + bool __more__ () const { return true; } + unsigned __len__ () const { return UINT_MAX; } + void __next__ () {} + void __forward__ (unsigned) {} + void __prev__ () {} + void __rewind__ (unsigned) {} + hb_repeat_iter_t __end__ () const { return *this; } + bool operator != (const hb_repeat_iter_t& o) const { return true; } + + private: + T v; +}; +struct +{ + template hb_repeat_iter_t + operator () (T value) const + { return hb_repeat_iter_t (value); } +} +HB_FUNCOBJ (hb_repeat); + +/* hb_enumerate()/hb_take() */ + +struct +{ + template + auto operator () (Iterable&& it, Index start = 0u) const HB_AUTO_RETURN + ( hb_zip (hb_iota (start), it) ) +} +HB_FUNCOBJ (hb_enumerate); + +struct +{ HB_PARTIALIZE(2); + template + auto operator () (Iterable&& it, unsigned count) const HB_AUTO_RETURN + ( hb_zip (hb_range (count), it) | hb_map (hb_second) ) + + /* Specialization arrays. */ + + template inline hb_array_t + operator () (hb_array_t array, unsigned count) const + { return array.sub_array (0, count); } + + template inline hb_sorted_array_t + operator () (hb_sorted_array_t array, unsigned count) const + { return array.sub_array (0, count); } +} +HB_FUNCOBJ (hb_take); + +struct +{ HB_PARTIALIZE(2); + template + auto operator () (Iter it, unsigned count) const HB_AUTO_RETURN + ( + + hb_iota (it, hb_add (count)) + | hb_map (hb_take (count)) + | hb_take ((hb_len (it) + count - 1) / count) + ) +} +HB_FUNCOBJ (hb_chop); + +/* hb_sink() */ + +template +struct hb_sink_t +{ + hb_sink_t (Sink s) : s (s) {} + + template + void operator () (Iter it) + { + for (; it; ++it) + s << *it; + } + + private: + Sink s; +}; +struct +{ + template hb_sink_t + operator () (Sink&& s) const + { return hb_sink_t (s); } + + template hb_sink_t + operator () (Sink *s) const + { return hb_sink_t (*s); } +} +HB_FUNCOBJ (hb_sink); + +/* hb-drain: hb_sink to void / blackhole / /dev/null. */ + +struct +{ + template + void operator () (Iter it) const + { + for (; it; ++it) + (void) *it; + } +} +HB_FUNCOBJ (hb_drain); + +/* hb_unzip(): unzip and sink to two sinks. */ + +template +struct hb_unzip_t +{ + hb_unzip_t (Sink1 s1, Sink2 s2) : s1 (s1), s2 (s2) {} + + template + void operator () (Iter it) + { + for (; it; ++it) + { + const auto &v = *it; + s1 << v.first; + s2 << v.second; + } + } + + private: + Sink1 s1; + Sink2 s2; +}; +struct +{ + template hb_unzip_t + operator () (Sink1&& s1, Sink2&& s2) const + { return hb_unzip_t (s1, s2); } + + template hb_unzip_t + operator () (Sink1 *s1, Sink2 *s2) const + { return hb_unzip_t (*s1, *s2); } +} +HB_FUNCOBJ (hb_unzip); + + +/* hb-all, hb-any, hb-none. */ + +struct +{ + template + bool operator () (Iterable&& c, + Pred&& p = hb_identity, + Proj&& f = hb_identity) const + { + for (auto it = hb_iter (c); it; ++it) + if (!hb_match (hb_forward (p), hb_get (hb_forward (f), *it))) + return false; + return true; + } +} +HB_FUNCOBJ (hb_all); +struct +{ + template + bool operator () (Iterable&& c, + Pred&& p = hb_identity, + Proj&& f = hb_identity) const + { + for (auto it = hb_iter (c); it; ++it) + if (hb_match (hb_forward (p), hb_get (hb_forward (f), *it))) + return true; + return false; + } +} +HB_FUNCOBJ (hb_any); +struct +{ + template + bool operator () (Iterable&& c, + Pred&& p = hb_identity, + Proj&& f = hb_identity) const + { + for (auto it = hb_iter (c); it; ++it) + if (hb_match (hb_forward (p), hb_get (hb_forward (f), *it))) + return false; + return true; + } +} +HB_FUNCOBJ (hb_none); + +/* + * Algorithms operating on iterators. + */ + +template +inline void +hb_fill (C& c, const V &v) +{ + for (auto i = hb_iter (c); i; i++) + *i = v; +} + +template +inline void +hb_copy (S&& is, D&& id) +{ + hb_iter (is) | hb_sink (id); +} + + +#endif /* HB_ITER_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-kern.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-kern.hh new file mode 100644 index 000000000..99d533c04 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-kern.hh @@ -0,0 +1,139 @@ +/* + * Copyright © 2017 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_KERN_HH +#define HB_KERN_HH + +#include "hb-open-type.hh" +#include "hb-aat-layout-common.hh" +#include "hb-ot-layout-gpos-table.hh" + + +namespace OT { + + +template +struct hb_kern_machine_t +{ + hb_kern_machine_t (const Driver &driver_, + bool crossStream_ = false) : + driver (driver_), + crossStream (crossStream_) {} + + HB_NO_SANITIZE_SIGNED_INTEGER_OVERFLOW + void kern (hb_font_t *font, + hb_buffer_t *buffer, + hb_mask_t kern_mask, + bool scale = true) const + { + OT::hb_ot_apply_context_t c (1, font, buffer); + c.set_lookup_mask (kern_mask); + c.set_lookup_props (OT::LookupFlag::IgnoreMarks); + OT::hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c.iter_input; + skippy_iter.init (&c); + + bool horizontal = HB_DIRECTION_IS_HORIZONTAL (buffer->props.direction); + unsigned int count = buffer->len; + hb_glyph_info_t *info = buffer->info; + hb_glyph_position_t *pos = buffer->pos; + for (unsigned int idx = 0; idx < count;) + { + if (!(info[idx].mask & kern_mask)) + { + idx++; + continue; + } + + skippy_iter.reset (idx, 1); + if (!skippy_iter.next ()) + { + idx++; + continue; + } + + unsigned int i = idx; + unsigned int j = skippy_iter.idx; + + hb_position_t kern = driver.get_kerning (info[i].codepoint, + info[j].codepoint); + + + if (likely (!kern)) + goto skip; + + if (horizontal) + { + if (scale) + kern = font->em_scale_x (kern); + if (crossStream) + { + pos[j].y_offset = kern; + buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT; + } + else + { + hb_position_t kern1 = kern >> 1; + hb_position_t kern2 = kern - kern1; + pos[i].x_advance += kern1; + pos[j].x_advance += kern2; + pos[j].x_offset += kern2; + } + } + else + { + if (scale) + kern = font->em_scale_y (kern); + if (crossStream) + { + pos[j].x_offset = kern; + buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT; + } + else + { + hb_position_t kern1 = kern >> 1; + hb_position_t kern2 = kern - kern1; + pos[i].y_advance += kern1; + pos[j].y_advance += kern2; + pos[j].y_offset += kern2; + } + } + + buffer->unsafe_to_break (i, j + 1); + + skip: + idx = skippy_iter.idx; + } + } + + const Driver &driver; + bool crossStream; +}; + + +} /* namespace OT */ + + +#endif /* HB_KERN_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-machinery.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-machinery.hh new file mode 100644 index 000000000..15535d75b --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-machinery.hh @@ -0,0 +1,323 @@ +/* + * Copyright © 2007,2008,2009,2010 Red Hat, Inc. + * Copyright © 2012,2018 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_MACHINERY_HH +#define HB_MACHINERY_HH + +#include "hb.hh" +#include "hb-blob.hh" + +#include "hb-dispatch.hh" +#include "hb-sanitize.hh" +#include "hb-serialize.hh" + + +/* + * Casts + */ + +/* Cast to struct T, reference to reference */ +template +static inline const Type& CastR(const TObject &X) +{ return reinterpret_cast (X); } +template +static inline Type& CastR(TObject &X) +{ return reinterpret_cast (X); } + +/* Cast to struct T, pointer to pointer */ +template +static inline const Type* CastP(const TObject *X) +{ return reinterpret_cast (X); } +template +static inline Type* CastP(TObject *X) +{ return reinterpret_cast (X); } + +/* StructAtOffset(P,Ofs) returns the struct T& that is placed at memory + * location pointed to by P plus Ofs bytes. */ +template +static inline const Type& StructAtOffset(const void *P, unsigned int offset) +{ return * reinterpret_cast ((const char *) P + offset); } +template +static inline Type& StructAtOffset(void *P, unsigned int offset) +{ return * reinterpret_cast ((char *) P + offset); } +template +static inline const Type& StructAtOffsetUnaligned(const void *P, unsigned int offset) +{ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wcast-align" + return * reinterpret_cast ((char *) P + offset); +#pragma GCC diagnostic pop +} +template +static inline Type& StructAtOffsetUnaligned(void *P, unsigned int offset) +{ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wcast-align" + return * reinterpret_cast ((char *) P + offset); +#pragma GCC diagnostic pop +} + +/* StructAfter(X) returns the struct T& that is placed after X. + * Works with X of variable size also. X must implement get_size() */ +template +static inline const Type& StructAfter(const TObject &X) +{ return StructAtOffset(&X, X.get_size()); } +template +static inline Type& StructAfter(TObject &X) +{ return StructAtOffset(&X, X.get_size()); } + + +/* + * Size checking + */ + +/* Check _assertion in a method environment */ +#define _DEFINE_INSTANCE_ASSERTION1(_line, _assertion) \ + void _instance_assertion_on_line_##_line () const \ + { static_assert ((_assertion), ""); } +# define _DEFINE_INSTANCE_ASSERTION0(_line, _assertion) _DEFINE_INSTANCE_ASSERTION1 (_line, _assertion) +# define DEFINE_INSTANCE_ASSERTION(_assertion) _DEFINE_INSTANCE_ASSERTION0 (__LINE__, _assertion) + +/* Check that _code compiles in a method environment */ +#define _DEFINE_COMPILES_ASSERTION1(_line, _code) \ + void _compiles_assertion_on_line_##_line () const \ + { _code; } +# define _DEFINE_COMPILES_ASSERTION0(_line, _code) _DEFINE_COMPILES_ASSERTION1 (_line, _code) +# define DEFINE_COMPILES_ASSERTION(_code) _DEFINE_COMPILES_ASSERTION0 (__LINE__, _code) + + +#define DEFINE_SIZE_STATIC(size) \ + DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size)) \ + unsigned int get_size () const { return (size); } \ + static constexpr unsigned null_size = (size); \ + static constexpr unsigned min_size = (size); \ + static constexpr unsigned static_size = (size) + +#define DEFINE_SIZE_UNION(size, _member) \ + DEFINE_COMPILES_ASSERTION ((void) this->u._member.static_size) \ + DEFINE_INSTANCE_ASSERTION (sizeof(this->u._member) == (size)) \ + static constexpr unsigned null_size = (size); \ + static constexpr unsigned min_size = (size) + +#define DEFINE_SIZE_MIN(size) \ + DEFINE_INSTANCE_ASSERTION (sizeof (*this) >= (size)) \ + static constexpr unsigned null_size = (size); \ + static constexpr unsigned min_size = (size) + +#define DEFINE_SIZE_UNBOUNDED(size) \ + DEFINE_INSTANCE_ASSERTION (sizeof (*this) >= (size)) \ + static constexpr unsigned min_size = (size) + +#define DEFINE_SIZE_ARRAY(size, array) \ + DEFINE_COMPILES_ASSERTION ((void) (array)[0].static_size) \ + DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size) + HB_VAR_ARRAY * sizeof ((array)[0])) \ + static constexpr unsigned null_size = (size); \ + static constexpr unsigned min_size = (size) + +#define DEFINE_SIZE_ARRAY_SIZED(size, array) \ + unsigned int get_size () const { return (size - (array).min_size + (array).get_size ()); } \ + DEFINE_SIZE_ARRAY(size, array) + + + +/* + * Lazy loaders. + */ + +template +struct hb_data_wrapper_t +{ + static_assert (WheresData > 0, ""); + + Data * get_data () const + { return *(((Data **) (void *) this) - WheresData); } + + bool is_inert () const { return !get_data (); } + + template + Stored * call_create () const { return Subclass::create (get_data ()); } +}; +template <> +struct hb_data_wrapper_t +{ + bool is_inert () const { return false; } + + template + Stored * call_create () const { return Funcs::create (); } +}; + +template struct hb_non_void_t { typedef T1 value; }; +template struct hb_non_void_t { typedef T2 value; }; + +template +struct hb_lazy_loader_t : hb_data_wrapper_t +{ + typedef typename hb_non_void_t + >::value Funcs; + + void init0 () {} /* Init, when memory is already set to 0. No-op for us. */ + void init () { instance.set_relaxed (nullptr); } + void fini () { do_destroy (instance.get ()); } + + void free_instance () + { + retry: + Stored *p = instance.get (); + if (unlikely (p && !cmpexch (p, nullptr))) + goto retry; + do_destroy (p); + } + + static void do_destroy (Stored *p) + { + if (p && p != const_cast (Funcs::get_null ())) + Funcs::destroy (p); + } + + const Returned * operator -> () const { return get (); } + const Returned & operator * () const { return *get (); } + explicit operator bool () const + { return get_stored () != Funcs::get_null (); } + template operator const C * () const { return get (); } + + Stored * get_stored () const + { + retry: + Stored *p = this->instance.get (); + if (unlikely (!p)) + { + if (unlikely (this->is_inert ())) + return const_cast (Funcs::get_null ()); + + p = this->template call_create (); + if (unlikely (!p)) + p = const_cast (Funcs::get_null ()); + + if (unlikely (!cmpexch (nullptr, p))) + { + do_destroy (p); + goto retry; + } + } + return p; + } + Stored * get_stored_relaxed () const + { + return this->instance.get_relaxed (); + } + + bool cmpexch (Stored *current, Stored *value) const + { + /* This *must* be called when there are no other threads accessing. */ + return this->instance.cmpexch (current, value); + } + + const Returned * get () const { return Funcs::convert (get_stored ()); } + const Returned * get_relaxed () const { return Funcs::convert (get_stored_relaxed ()); } + Returned * get_unconst () const { return const_cast (Funcs::convert (get_stored ())); } + + /* To be possibly overloaded by subclasses. */ + static Returned* convert (Stored *p) { return p; } + + /* By default null/init/fini the object. */ + static const Stored* get_null () { return &Null(Stored); } + static Stored *create (Data *data) + { + Stored *p = (Stored *) calloc (1, sizeof (Stored)); + if (likely (p)) + p->init (data); + return p; + } + static Stored *create () + { + Stored *p = (Stored *) calloc (1, sizeof (Stored)); + if (likely (p)) + p->init (); + return p; + } + static void destroy (Stored *p) + { + p->fini (); + free (p); + } + +// private: + /* Must only have one pointer. */ + hb_atomic_ptr_t instance; +}; + +/* Specializations. */ + +template +struct hb_face_lazy_loader_t : hb_lazy_loader_t, + hb_face_t, WheresFace> {}; + +template +struct hb_table_lazy_loader_t : hb_lazy_loader_t, + hb_face_t, WheresFace, + hb_blob_t> +{ + static hb_blob_t *create (hb_face_t *face) + { return hb_sanitize_context_t ().reference_table (face); } + static void destroy (hb_blob_t *p) { hb_blob_destroy (p); } + + static const hb_blob_t *get_null () + { return hb_blob_get_empty (); } + + static const T* convert (const hb_blob_t *blob) + { return blob->as (); } + + hb_blob_t* get_blob () const { return this->get_stored (); } +}; + +template +struct hb_font_funcs_lazy_loader_t : hb_lazy_loader_t +{ + static void destroy (hb_font_funcs_t *p) + { hb_font_funcs_destroy (p); } + static const hb_font_funcs_t *get_null () + { return hb_font_funcs_get_empty (); } +}; +template +struct hb_unicode_funcs_lazy_loader_t : hb_lazy_loader_t +{ + static void destroy (hb_unicode_funcs_t *p) + { hb_unicode_funcs_destroy (p); } + static const hb_unicode_funcs_t *get_null () + { return hb_unicode_funcs_get_empty (); } +}; + + +#endif /* HB_MACHINERY_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-map.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-map.cc new file mode 100644 index 000000000..a2c770c58 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-map.cc @@ -0,0 +1,268 @@ +/* + * Copyright © 2018 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#include "hb-map.hh" + + +/** + * SECTION:hb-map + * @title: hb-map + * @short_description: Object representing integer to integer mapping + * @include: hb.h + * + * Map objects are integer-to-integer hash-maps. Currently they are + * not used in the HarfBuzz public API, but are provided for client's + * use if desired. + **/ + + +/** + * hb_map_create: (Xconstructor) + * + * Return value: (transfer full): + * + * Since: 1.7.7 + **/ +hb_map_t * +hb_map_create () +{ + hb_map_t *map; + + if (!(map = hb_object_create ())) + return hb_map_get_empty (); + + map->init_shallow (); + + return map; +} + +/** + * hb_map_get_empty: + * + * Return value: (transfer full): + * + * Since: 1.7.7 + **/ +hb_map_t * +hb_map_get_empty () +{ + return const_cast (&Null(hb_map_t)); +} + +/** + * hb_map_reference: (skip) + * @map: a map. + * + * Return value: (transfer full): + * + * Since: 1.7.7 + **/ +hb_map_t * +hb_map_reference (hb_map_t *map) +{ + return hb_object_reference (map); +} + +/** + * hb_map_destroy: (skip) + * @map: a map. + * + * Since: 1.7.7 + **/ +void +hb_map_destroy (hb_map_t *map) +{ + if (!hb_object_destroy (map)) return; + + map->fini_shallow (); + + free (map); +} + +/** + * hb_map_set_user_data: (skip) + * @map: a map. + * @key: + * @data: + * @destroy: + * @replace: + * + * Return value: + * + * Since: 1.7.7 + **/ +hb_bool_t +hb_map_set_user_data (hb_map_t *map, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace) +{ + return hb_object_set_user_data (map, key, data, destroy, replace); +} + +/** + * hb_map_get_user_data: (skip) + * @map: a map. + * @key: + * + * Return value: (transfer none): + * + * Since: 1.7.7 + **/ +void * +hb_map_get_user_data (hb_map_t *map, + hb_user_data_key_t *key) +{ + return hb_object_get_user_data (map, key); +} + + +/** + * hb_map_allocation_successful: + * @map: a map. + * + * + * + * Return value: + * + * Since: 1.7.7 + **/ +hb_bool_t +hb_map_allocation_successful (const hb_map_t *map) +{ + return map->successful; +} + + +/** + * hb_map_set: + * @map: a map. + * @key: + * @value: + * + * + * + * Since: 1.7.7 + **/ +void +hb_map_set (hb_map_t *map, + hb_codepoint_t key, + hb_codepoint_t value) +{ + map->set (key, value); +} + +/** + * hb_map_get: + * @map: a map. + * @key: + * + * + * + * Since: 1.7.7 + **/ +hb_codepoint_t +hb_map_get (const hb_map_t *map, + hb_codepoint_t key) +{ + return map->get (key); +} + +/** + * hb_map_del: + * @map: a map. + * @key: + * + * + * + * Since: 1.7.7 + **/ +void +hb_map_del (hb_map_t *map, + hb_codepoint_t key) +{ + map->del (key); +} + +/** + * hb_map_has: + * @map: a map. + * @key: + * + * + * + * Since: 1.7.7 + **/ +hb_bool_t +hb_map_has (const hb_map_t *map, + hb_codepoint_t key) +{ + return map->has (key); +} + + +/** + * hb_map_clear: + * @map: a map. + * + * + * + * Since: 1.7.7 + **/ +void +hb_map_clear (hb_map_t *map) +{ + return map->clear (); +} + +/** + * hb_map_is_empty: + * @map: a map. + * + * + * + * Since: 1.7.7 + **/ +hb_bool_t +hb_map_is_empty (const hb_map_t *map) +{ + return map->is_empty (); +} + +/** + * hb_map_get_population: + * @map: a map. + * + * + * + * Since: 1.7.7 + **/ +unsigned int +hb_map_get_population (const hb_map_t *map) +{ + return map->get_population (); +} diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-map.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-map.h new file mode 100644 index 000000000..b77843c2b --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-map.h @@ -0,0 +1,104 @@ +/* + * Copyright © 2018 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_H_IN +#error "Include instead." +#endif + +#ifndef HB_MAP_H +#define HB_MAP_H + +#include "hb-common.h" + +HB_BEGIN_DECLS + + +/* + * Since: 1.7.7 + */ +#define HB_MAP_VALUE_INVALID ((hb_codepoint_t) -1) + +typedef struct hb_map_t hb_map_t; + + +HB_EXTERN hb_map_t * +hb_map_create (void); + +HB_EXTERN hb_map_t * +hb_map_get_empty (void); + +HB_EXTERN hb_map_t * +hb_map_reference (hb_map_t *map); + +HB_EXTERN void +hb_map_destroy (hb_map_t *map); + +HB_EXTERN hb_bool_t +hb_map_set_user_data (hb_map_t *map, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace); + +HB_EXTERN void * +hb_map_get_user_data (hb_map_t *map, + hb_user_data_key_t *key); + + +/* Returns false if allocation has failed before */ +HB_EXTERN hb_bool_t +hb_map_allocation_successful (const hb_map_t *map); + +HB_EXTERN void +hb_map_clear (hb_map_t *map); + +HB_EXTERN hb_bool_t +hb_map_is_empty (const hb_map_t *map); + +HB_EXTERN unsigned int +hb_map_get_population (const hb_map_t *map); + +HB_EXTERN void +hb_map_set (hb_map_t *map, + hb_codepoint_t key, + hb_codepoint_t value); + +HB_EXTERN hb_codepoint_t +hb_map_get (const hb_map_t *map, + hb_codepoint_t key); + +HB_EXTERN void +hb_map_del (hb_map_t *map, + hb_codepoint_t key); + +HB_EXTERN hb_bool_t +hb_map_has (const hb_map_t *map, + hb_codepoint_t key); + + +HB_END_DECLS + +#endif /* HB_MAP_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-map.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-map.hh new file mode 100644 index 000000000..26e4930a5 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-map.hh @@ -0,0 +1,318 @@ +/* + * Copyright © 2018 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_MAP_HH +#define HB_MAP_HH + +#include "hb.hh" + + +/* + * hb_hashmap_t + */ + +template +struct hb_hashmap_t +{ + HB_DELETE_COPY_ASSIGN (hb_hashmap_t); + hb_hashmap_t () { init (); } + ~hb_hashmap_t () { fini (); } + + static_assert (hb_is_integral (K) || hb_is_pointer (K), ""); + static_assert (hb_is_integral (V) || hb_is_pointer (V), ""); + + /* TODO If key type is a pointer, keep hash in item_t and use to: + * 1. avoid rehashing when resizing table, and + * 2. compare hash before comparing keys, for speed. + */ + struct item_t + { + K key; + V value; + + void clear () { key = kINVALID; value = vINVALID; } + + bool operator == (K o) { return hb_deref (key) == hb_deref (o); } + bool operator == (const item_t &o) { return *this == o.key; } + bool is_unused () const { return key == kINVALID; } + bool is_tombstone () const { return key != kINVALID && value == vINVALID; } + bool is_real () const { return key != kINVALID && value != vINVALID; } + hb_pair_t get_pair() const { return hb_pair_t (key, value); } + }; + + hb_object_header_t header; + bool successful; /* Allocations successful */ + unsigned int population; /* Not including tombstones. */ + unsigned int occupancy; /* Including tombstones. */ + unsigned int mask; + unsigned int prime; + item_t *items; + + void init_shallow () + { + successful = true; + population = occupancy = 0; + mask = 0; + prime = 0; + items = nullptr; + } + void init () + { + hb_object_init (this); + init_shallow (); + } + void fini_shallow () + { + free (items); + items = nullptr; + population = occupancy = 0; + } + void fini () + { + hb_object_fini (this); + fini_shallow (); + } + + void reset () + { + if (unlikely (hb_object_is_immutable (this))) + return; + successful = true; + clear (); + } + + bool in_error () const { return !successful; } + + bool resize () + { + if (unlikely (!successful)) return false; + + unsigned int power = hb_bit_storage (population * 2 + 8); + unsigned int new_size = 1u << power; + item_t *new_items = (item_t *) malloc ((size_t) new_size * sizeof (item_t)); + if (unlikely (!new_items)) + { + successful = false; + return false; + } + + hb_iter (new_items, new_size) + | hb_apply (&item_t::clear) + ; + + unsigned int old_size = mask + 1; + item_t *old_items = items; + + /* Switch to new, empty, array. */ + population = occupancy = 0; + mask = new_size - 1; + prime = prime_for (power); + items = new_items; + + /* Insert back old items. */ + if (old_items) + for (unsigned int i = 0; i < old_size; i++) + if (old_items[i].is_real ()) + set (old_items[i].key, old_items[i].value); + + free (old_items); + + return true; + } + + void set (K key, V value) + { + if (unlikely (!successful)) return; + if (unlikely (key == kINVALID)) return; + if ((occupancy + occupancy / 2) >= mask && !resize ()) return; + unsigned int i = bucket_for (key); + + if (value == vINVALID && items[i].key != key) + return; /* Trying to delete non-existent key. */ + + if (!items[i].is_unused ()) + { + occupancy--; + if (items[i].is_tombstone ()) + population--; + } + + items[i].key = key; + items[i].value = value; + + occupancy++; + if (!items[i].is_tombstone ()) + population++; + + } + V get (K key) const + { + if (unlikely (!items)) return vINVALID; + unsigned int i = bucket_for (key); + return items[i].is_real () && items[i] == key ? items[i].value : vINVALID; + } + + void del (K key) { set (key, vINVALID); } + + /* Has interface. */ + static constexpr V SENTINEL = vINVALID; + typedef V value_t; + value_t operator [] (K k) const { return get (k); } + bool has (K k, V *vp = nullptr) const + { + V v = (*this)[k]; + if (vp) *vp = v; + return v != SENTINEL; + } + /* Projection. */ + V operator () (K k) const { return get (k); } + + void clear () + { + if (unlikely (hb_object_is_immutable (this))) + return; + if (items) + + hb_iter (items, mask + 1) + | hb_apply (&item_t::clear) + ; + + population = occupancy = 0; + } + + bool is_empty () const { return population == 0; } + + unsigned int get_population () const { return population; } + + /* + * Iterator + */ + auto iter () const HB_AUTO_RETURN + ( + + hb_array (items, mask ? mask + 1 : 0) + | hb_filter (&item_t::is_real) + | hb_map (&item_t::get_pair) + ) + auto keys () const HB_AUTO_RETURN + ( + + hb_array (items, mask ? mask + 1 : 0) + | hb_filter (&item_t::is_real) + | hb_map (&item_t::key) + | hb_map (hb_ridentity) + ) + auto values () const HB_AUTO_RETURN + ( + + hb_array (items, mask ? mask + 1 : 0) + | hb_filter (&item_t::is_real) + | hb_map (&item_t::value) + | hb_map (hb_ridentity) + ) + + /* Sink interface. */ + hb_hashmap_t& operator << (const hb_pair_t& v) + { set (v.first, v.second); return *this; } + + protected: + + unsigned int bucket_for (K key) const + { + unsigned int i = hb_hash (key) % prime; + unsigned int step = 0; + unsigned int tombstone = (unsigned) -1; + while (!items[i].is_unused ()) + { + if (items[i] == key) + return i; + if (tombstone == (unsigned) -1 && items[i].is_tombstone ()) + tombstone = i; + i = (i + ++step) & mask; + } + return tombstone == (unsigned) -1 ? i : tombstone; + } + + static unsigned int prime_for (unsigned int shift) + { + /* Following comment and table copied from glib. */ + /* Each table size has an associated prime modulo (the first prime + * lower than the table size) used to find the initial bucket. Probing + * then works modulo 2^n. The prime modulo is necessary to get a + * good distribution with poor hash functions. + */ + /* Not declaring static to make all kinds of compilers happy... */ + /*static*/ const unsigned int prime_mod [32] = + { + 1, /* For 1 << 0 */ + 2, + 3, + 7, + 13, + 31, + 61, + 127, + 251, + 509, + 1021, + 2039, + 4093, + 8191, + 16381, + 32749, + 65521, /* For 1 << 16 */ + 131071, + 262139, + 524287, + 1048573, + 2097143, + 4194301, + 8388593, + 16777213, + 33554393, + 67108859, + 134217689, + 268435399, + 536870909, + 1073741789, + 2147483647 /* For 1 << 31 */ + }; + + if (unlikely (shift >= ARRAY_LENGTH (prime_mod))) + return prime_mod[ARRAY_LENGTH (prime_mod) - 1]; + + return prime_mod[shift]; + } +}; + +/* + * hb_map_t + */ + +struct hb_map_t : hb_hashmap_t {}; + + +#endif /* HB_MAP_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-meta.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-meta.hh new file mode 100644 index 000000000..2dfaeb7b4 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-meta.hh @@ -0,0 +1,400 @@ +/* + * Copyright © 2018 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_META_HH +#define HB_META_HH + +#include "hb.hh" + + +/* + * C++ template meta-programming & fundamentals used with them. + */ + +/* Void! For when we need a expression-type of void. */ +struct hb_empty_t {}; + +/* https://en.cppreference.com/w/cpp/types/void_t */ +template struct _hb_void_t { typedef void type; }; +template using hb_void_t = typename _hb_void_t::type; + +template struct _hb_head_t { typedef Head type; }; +template using hb_head_t = typename _hb_head_t::type; + +template struct hb_integral_constant { static constexpr T value = v; }; +template using hb_bool_constant = hb_integral_constant; +using hb_true_type = hb_bool_constant; +using hb_false_type = hb_bool_constant; + + +/* Basic type SFINAE. */ + +template struct hb_enable_if {}; +template struct hb_enable_if { typedef T type; }; +#define hb_enable_if(Cond) typename hb_enable_if<(Cond)>::type* = nullptr +/* Concepts/Requires alias: */ +#define hb_requires(Cond) hb_enable_if((Cond)) + +template struct hb_is_same : hb_false_type {}; +template struct hb_is_same : hb_true_type {}; +#define hb_is_same(T, T2) hb_is_same::value + +/* Function overloading SFINAE and priority. */ + +#define HB_RETURN(Ret, E) -> hb_head_t { return (E); } +#define HB_AUTO_RETURN(E) -> decltype ((E)) { return (E); } +#define HB_VOID_RETURN(E) -> hb_void_t { (E); } + +template struct hb_priority : hb_priority {}; +template <> struct hb_priority<0> {}; +#define hb_prioritize hb_priority<16> () + +#define HB_FUNCOBJ(x) static_const x HB_UNUSED + + +template struct hb_type_identity_t { typedef T type; }; +template using hb_type_identity = typename hb_type_identity_t::type; + +struct +{ + template constexpr T* + operator () (T& arg) const + { +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wcast-align" + /* https://en.cppreference.com/w/cpp/memory/addressof */ + return reinterpret_cast ( + &const_cast ( + reinterpret_cast (arg))); +#pragma GCC diagnostic pop + } +} +HB_FUNCOBJ (hb_addressof); + +template static inline T hb_declval (); +#define hb_declval(T) (hb_declval ()) + +template struct hb_match_const : hb_type_identity_t, hb_bool_constant{}; +template struct hb_match_const : hb_type_identity_t, hb_bool_constant {}; +template using hb_remove_const = typename hb_match_const::type; +template using hb_add_const = const T; +#define hb_is_const(T) hb_match_const::value +template struct hb_match_reference : hb_type_identity_t, hb_bool_constant{}; +template struct hb_match_reference : hb_type_identity_t, hb_bool_constant {}; +template struct hb_match_reference : hb_type_identity_t, hb_bool_constant {}; +template using hb_remove_reference = typename hb_match_reference::type; +template auto _hb_try_add_lvalue_reference (hb_priority<1>) -> hb_type_identity; +template auto _hb_try_add_lvalue_reference (hb_priority<0>) -> hb_type_identity; +template using hb_add_lvalue_reference = decltype (_hb_try_add_lvalue_reference (hb_prioritize)); +template auto _hb_try_add_rvalue_reference (hb_priority<1>) -> hb_type_identity; +template auto _hb_try_add_rvalue_reference (hb_priority<0>) -> hb_type_identity; +template using hb_add_rvalue_reference = decltype (_hb_try_add_rvalue_reference (hb_prioritize)); +#define hb_is_reference(T) hb_match_reference::value +template struct hb_match_pointer : hb_type_identity_t, hb_bool_constant{}; +template struct hb_match_pointer : hb_type_identity_t, hb_bool_constant {}; +template using hb_remove_pointer = typename hb_match_pointer::type; +template auto _hb_try_add_pointer (hb_priority<1>) -> hb_type_identity*>; +template auto _hb_try_add_pointer (hb_priority<1>) -> hb_type_identity; +template using hb_add_pointer = decltype (_hb_try_add_pointer (hb_prioritize)); +#define hb_is_pointer(T) hb_match_pointer::value + + +/* TODO Add feature-parity to std::decay. */ +template using hb_decay = hb_remove_const>; + + +template +struct _hb_conditional { typedef T type; }; +template +struct _hb_conditional { typedef F type; }; +template +using hb_conditional = typename _hb_conditional::type; + + +template +struct hb_is_convertible +{ + private: + static constexpr bool from_void = hb_is_same (void, hb_decay); + static constexpr bool to_void = hb_is_same (void, hb_decay ); + static constexpr bool either_void = from_void || to_void; + static constexpr bool both_void = from_void && to_void; + + static hb_true_type impl2 (hb_conditional); + + template + static auto impl (hb_priority<1>) -> decltype (impl2 (hb_declval (T))); + template + static hb_false_type impl (hb_priority<0>); + public: + static constexpr bool value = both_void || + (!either_void && + decltype (impl> (hb_prioritize))::value); +}; +#define hb_is_convertible(From,To) hb_is_convertible::value + +template +using hb_is_base_of = hb_is_convertible *, hb_decay *>; +#define hb_is_base_of(Base,Derived) hb_is_base_of::value + +template +using hb_is_cr_convertible = hb_bool_constant< + hb_is_same (hb_decay, hb_decay) && + (!hb_is_const (From) || hb_is_const (To)) && + (!hb_is_reference (To) || hb_is_const (To) || hb_is_reference (To)) +>; +#define hb_is_cr_convertible(From,To) hb_is_cr_convertible::value + +/* std::move and std::forward */ + +template +static constexpr hb_remove_reference&& hb_move (T&& t) { return (hb_remove_reference&&) (t); } + +template +static constexpr T&& hb_forward (hb_remove_reference& t) { return (T&&) t; } +template +static constexpr T&& hb_forward (hb_remove_reference&& t) { return (T&&) t; } + +struct +{ + template constexpr auto + operator () (T&& v) const HB_AUTO_RETURN (hb_forward (v)) + + template constexpr auto + operator () (T *v) const HB_AUTO_RETURN (*v) +} +HB_FUNCOBJ (hb_deref); + +struct +{ + template constexpr auto + operator () (T&& v) const HB_AUTO_RETURN (hb_forward (v)) + + template constexpr auto + operator () (T& v) const HB_AUTO_RETURN (hb_addressof (v)) +} +HB_FUNCOBJ (hb_ref); + +template +struct hb_reference_wrapper +{ + hb_reference_wrapper (T v) : v (v) {} + bool operator == (const hb_reference_wrapper& o) const { return v == o.v; } + bool operator != (const hb_reference_wrapper& o) const { return v != o.v; } + operator T () const { return v; } + T get () const { return v; } + T v; +}; +template +struct hb_reference_wrapper +{ + hb_reference_wrapper (T& v) : v (hb_addressof (v)) {} + bool operator == (const hb_reference_wrapper& o) const { return v == o.v; } + bool operator != (const hb_reference_wrapper& o) const { return v != o.v; } + operator T& () const { return *v; } + T& get () const { return *v; } + T* v; +}; + + +template +using hb_is_integral = hb_bool_constant< + hb_is_same (hb_decay, char) || + hb_is_same (hb_decay, signed char) || + hb_is_same (hb_decay, unsigned char) || + hb_is_same (hb_decay, signed int) || + hb_is_same (hb_decay, unsigned int) || + hb_is_same (hb_decay, signed short) || + hb_is_same (hb_decay, unsigned short) || + hb_is_same (hb_decay, signed long) || + hb_is_same (hb_decay, unsigned long) || + hb_is_same (hb_decay, signed long long) || + hb_is_same (hb_decay, unsigned long long) || + false +>; +#define hb_is_integral(T) hb_is_integral::value +template +using hb_is_floating_point = hb_bool_constant< + hb_is_same (hb_decay, float) || + hb_is_same (hb_decay, double) || + hb_is_same (hb_decay, long double) || + false +>; +#define hb_is_floating_point(T) hb_is_floating_point::value +template +using hb_is_arithmetic = hb_bool_constant< + hb_is_integral (T) || + hb_is_floating_point (T) || + false +>; +#define hb_is_arithmetic(T) hb_is_arithmetic::value + + +template +using hb_is_signed = hb_conditional, + hb_false_type>; +#define hb_is_signed(T) hb_is_signed::value +template +using hb_is_unsigned = hb_conditional, + hb_false_type>; +#define hb_is_unsigned(T) hb_is_unsigned::value + +template struct hb_int_min; +template <> struct hb_int_min : hb_integral_constant {}; +template <> struct hb_int_min : hb_integral_constant {}; +template <> struct hb_int_min : hb_integral_constant {}; +template <> struct hb_int_min : hb_integral_constant {}; +template <> struct hb_int_min : hb_integral_constant {}; +template <> struct hb_int_min : hb_integral_constant {}; +template <> struct hb_int_min : hb_integral_constant {}; +template <> struct hb_int_min : hb_integral_constant {}; +template <> struct hb_int_min : hb_integral_constant {}; +template <> struct hb_int_min : hb_integral_constant {}; +template <> struct hb_int_min : hb_integral_constant {}; +#define hb_int_min(T) hb_int_min::value +template struct hb_int_max; +template <> struct hb_int_max : hb_integral_constant {}; +template <> struct hb_int_max : hb_integral_constant {}; +template <> struct hb_int_max : hb_integral_constant {}; +template <> struct hb_int_max : hb_integral_constant {}; +template <> struct hb_int_max : hb_integral_constant {}; +template <> struct hb_int_max : hb_integral_constant {}; +template <> struct hb_int_max : hb_integral_constant {}; +template <> struct hb_int_max : hb_integral_constant {}; +template <> struct hb_int_max : hb_integral_constant {}; +template <> struct hb_int_max : hb_integral_constant {}; +template <> struct hb_int_max : hb_integral_constant {}; +#define hb_int_max(T) hb_int_max::value + + + +template +struct _hb_is_destructible : hb_false_type {}; +template +struct _hb_is_destructible> : hb_true_type {}; +template +using hb_is_destructible = _hb_is_destructible; +#define hb_is_destructible(T) hb_is_destructible::value + +template +struct _hb_is_constructible : hb_false_type {}; +template +struct _hb_is_constructible, Ts...> : hb_true_type {}; +template +using hb_is_constructible = _hb_is_constructible; +#define hb_is_constructible(...) hb_is_constructible<__VA_ARGS__>::value + +template +using hb_is_default_constructible = hb_is_constructible; +#define hb_is_default_constructible(T) hb_is_default_constructible::value + +template +using hb_is_copy_constructible = hb_is_constructible>>; +#define hb_is_copy_constructible(T) hb_is_copy_constructible::value + +template +using hb_is_move_constructible = hb_is_constructible>>; +#define hb_is_move_constructible(T) hb_is_move_constructible::value + +template +struct _hb_is_assignable : hb_false_type {}; +template +struct _hb_is_assignable> : hb_true_type {}; +template +using hb_is_assignable = _hb_is_assignable; +#define hb_is_assignable(T,U) hb_is_assignable::value + +template +using hb_is_copy_assignable = hb_is_assignable, + hb_add_lvalue_reference>>; +#define hb_is_copy_assignable(T) hb_is_copy_assignable::value + +template +using hb_is_move_assignable = hb_is_assignable, + hb_add_rvalue_reference>; +#define hb_is_move_assignable(T) hb_is_move_assignable::value + +/* Trivial versions. */ + +template union hb_trivial { T value; }; + +/* Don't know how to do the following. */ +template +using hb_is_trivially_destructible= hb_is_destructible>; +#define hb_is_trivially_destructible(T) hb_is_trivially_destructible::value + +/* Don't know how to do the following. */ +//template +//using hb_is_trivially_constructible= hb_is_constructible, hb_trivial...>; +//#define hb_is_trivially_constructible(...) hb_is_trivially_constructible<__VA_ARGS__>::value + +template +using hb_is_trivially_default_constructible= hb_is_default_constructible>; +#define hb_is_trivially_default_constructible(T) hb_is_trivially_default_constructible::value + +template +using hb_is_trivially_copy_constructible= hb_is_copy_constructible>; +#define hb_is_trivially_copy_constructible(T) hb_is_trivially_copy_constructible::value + +template +using hb_is_trivially_move_constructible= hb_is_move_constructible>; +#define hb_is_trivially_move_constructible(T) hb_is_trivially_move_constructible::value + +/* Don't know how to do the following. */ +//template +//using hb_is_trivially_assignable= hb_is_assignable, hb_trivial>; +//#define hb_is_trivially_assignable(T,U) hb_is_trivially_assignable::value + +template +using hb_is_trivially_copy_assignable= hb_is_copy_assignable>; +#define hb_is_trivially_copy_assignable(T) hb_is_trivially_copy_assignable::value + +template +using hb_is_trivially_move_assignable= hb_is_move_assignable>; +#define hb_is_trivially_move_assignable(T) hb_is_trivially_move_assignable::value + +template +using hb_is_trivially_copyable= hb_bool_constant< + hb_is_trivially_destructible (T) && + (!hb_is_move_assignable (T) || hb_is_trivially_move_assignable (T)) && + (!hb_is_move_constructible (T) || hb_is_trivially_move_constructible (T)) && + (!hb_is_copy_assignable (T) || hb_is_trivially_copy_assignable (T)) && + (!hb_is_copy_constructible (T) || hb_is_trivially_copy_constructible (T)) && + true +>; +#define hb_is_trivially_copyable(T) hb_is_trivially_copyable::value + +template +using hb_is_trivial= hb_bool_constant< + hb_is_trivially_copyable (T) && + hb_is_trivially_default_constructible (T) +>; +#define hb_is_trivial(T) hb_is_trivial::value + + +#endif /* HB_META_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-mutex.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-mutex.hh new file mode 100644 index 000000000..e13626731 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-mutex.hh @@ -0,0 +1,147 @@ +/* + * Copyright © 2007 Chris Wilson + * Copyright © 2009,2010 Red Hat, Inc. + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Contributor(s): + * Chris Wilson + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_MUTEX_HH +#define HB_MUTEX_HH + +#include "hb.hh" + + +/* mutex */ + +/* We need external help for these */ + +#if defined(HB_MUTEX_IMPL_INIT) \ + && defined(hb_mutex_impl_init) \ + && defined(hb_mutex_impl_lock) \ + && defined(hb_mutex_impl_unlock) \ + && defined(hb_mutex_impl_finish) + +/* Defined externally, i.e. in config.h; must have typedef'ed hb_mutex_impl_t as well. */ + + +#elif !defined(HB_NO_MT) && (defined(HAVE_PTHREAD) || defined(__APPLE__)) + +#include +typedef pthread_mutex_t hb_mutex_impl_t; +#define HB_MUTEX_IMPL_INIT PTHREAD_MUTEX_INITIALIZER +#define hb_mutex_impl_init(M) pthread_mutex_init (M, nullptr) +#define hb_mutex_impl_lock(M) pthread_mutex_lock (M) +#define hb_mutex_impl_unlock(M) pthread_mutex_unlock (M) +#define hb_mutex_impl_finish(M) pthread_mutex_destroy (M) + + +#elif !defined(HB_NO_MT) && defined(_WIN32) + +#include +typedef CRITICAL_SECTION hb_mutex_impl_t; +#define HB_MUTEX_IMPL_INIT {0} +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP) +#define hb_mutex_impl_init(M) InitializeCriticalSectionEx (M, 0, 0) +#else +#define hb_mutex_impl_init(M) InitializeCriticalSection (M) +#endif +#define hb_mutex_impl_lock(M) EnterCriticalSection (M) +#define hb_mutex_impl_unlock(M) LeaveCriticalSection (M) +#define hb_mutex_impl_finish(M) DeleteCriticalSection (M) + + +#elif !defined(HB_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES) + +#if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_YIELD) +# include +# define HB_SCHED_YIELD() sched_yield () +#else +# define HB_SCHED_YIELD() HB_STMT_START {} HB_STMT_END +#endif + +/* This actually is not a totally awful implementation. */ +typedef volatile int hb_mutex_impl_t; +#define HB_MUTEX_IMPL_INIT 0 +#define hb_mutex_impl_init(M) *(M) = 0 +#define hb_mutex_impl_lock(M) HB_STMT_START { while (__sync_lock_test_and_set((M), 1)) HB_SCHED_YIELD (); } HB_STMT_END +#define hb_mutex_impl_unlock(M) __sync_lock_release (M) +#define hb_mutex_impl_finish(M) HB_STMT_START {} HB_STMT_END + + +#elif !defined(HB_NO_MT) + +#if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_YIELD) +# include +# define HB_SCHED_YIELD() sched_yield () +#else +# define HB_SCHED_YIELD() HB_STMT_START {} HB_STMT_END +#endif + +#define HB_MUTEX_INT_NIL 1 /* Warn that fallback implementation is in use. */ +typedef volatile int hb_mutex_impl_t; +#define HB_MUTEX_IMPL_INIT 0 +#define hb_mutex_impl_init(M) *(M) = 0 +#define hb_mutex_impl_lock(M) HB_STMT_START { while (*(M)) HB_SCHED_YIELD (); (*(M))++; } HB_STMT_END +#define hb_mutex_impl_unlock(M) (*(M))-- +#define hb_mutex_impl_finish(M) HB_STMT_START {} HB_STMT_END + + +#else /* HB_NO_MT */ + +typedef int hb_mutex_impl_t; +#define HB_MUTEX_IMPL_INIT 0 +#define hb_mutex_impl_init(M) HB_STMT_START {} HB_STMT_END +#define hb_mutex_impl_lock(M) HB_STMT_START {} HB_STMT_END +#define hb_mutex_impl_unlock(M) HB_STMT_START {} HB_STMT_END +#define hb_mutex_impl_finish(M) HB_STMT_START {} HB_STMT_END + + +#endif + + +#define HB_MUTEX_INIT {HB_MUTEX_IMPL_INIT} + +struct hb_mutex_t +{ + hb_mutex_impl_t m; + + void init () { hb_mutex_impl_init (&m); } + void lock () { hb_mutex_impl_lock (&m); } + void unlock () { hb_mutex_impl_unlock (&m); } + void fini () { hb_mutex_impl_finish (&m); } +}; + +struct hb_lock_t +{ + hb_lock_t (hb_mutex_t &mutex_) : mutex (mutex_) { mutex.lock (); } + ~hb_lock_t () { mutex.unlock (); } + private: + hb_mutex_t &mutex; +}; + + +#endif /* HB_MUTEX_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-null.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-null.hh new file mode 100644 index 000000000..d4578205e --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-null.hh @@ -0,0 +1,184 @@ +/* + * Copyright © 2018 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_NULL_HH +#define HB_NULL_HH + +#include "hb.hh" +#include "hb-meta.hh" + + +/* + * Static pools + */ + +/* Global nul-content Null pool. Enlarge as necessary. */ + +#define HB_NULL_POOL_SIZE 384 + +/* Use SFINAE to sniff whether T has min_size; in which case return T::null_size, + * otherwise return sizeof(T). */ + +/* The hard way... + * https://stackoverflow.com/questions/7776448/sfinae-tried-with-bool-gives-compiler-error-template-argument-tvalue-invol + */ + +template +struct _hb_null_size : hb_integral_constant {}; +template +struct _hb_null_size> : hb_integral_constant {}; + +template +using hb_null_size = _hb_null_size; +#define hb_null_size(T) hb_null_size::value + +/* These doesn't belong here, but since is copy/paste from above, put it here. */ + +/* hb_static_size (T) + * Returns T::static_size if T::min_size is defined, or sizeof (T) otherwise. */ + +template +struct _hb_static_size : hb_integral_constant {}; +template +struct _hb_static_size> : hb_integral_constant {}; +template +using hb_static_size = _hb_static_size; +#define hb_static_size(T) hb_static_size::value + + +/* + * Null() + */ + +extern HB_INTERNAL +uint64_t const _hb_NullPool[(HB_NULL_POOL_SIZE + sizeof (uint64_t) - 1) / sizeof (uint64_t)]; + +/* Generic nul-content Null objects. */ +template +struct Null { + static Type const & get_null () + { + static_assert (hb_null_size (Type) <= HB_NULL_POOL_SIZE, "Increase HB_NULL_POOL_SIZE."); + return *reinterpret_cast (_hb_NullPool); + } +}; +template +struct NullHelper +{ + typedef hb_remove_const> Type; + static const Type & get_null () { return Null::get_null (); } +}; +#define Null(Type) NullHelper::get_null () + +/* Specializations for arbitrary-content Null objects expressed in bytes. */ +#define DECLARE_NULL_NAMESPACE_BYTES(Namespace, Type) \ + } /* Close namespace. */ \ + extern HB_INTERNAL const unsigned char _hb_Null_##Namespace##_##Type[Namespace::Type::null_size]; \ + template <> \ + struct Null { \ + static Namespace::Type const & get_null () { \ + return *reinterpret_cast (_hb_Null_##Namespace##_##Type); \ + } \ + }; \ + namespace Namespace { \ + static_assert (true, "Just so we take semicolon after.") +#define DEFINE_NULL_NAMESPACE_BYTES(Namespace, Type) \ + const unsigned char _hb_Null_##Namespace##_##Type[Namespace::Type::null_size] + +/* Specializations for arbitrary-content Null objects expressed as struct initializer. */ +#define DECLARE_NULL_INSTANCE(Type) \ + extern HB_INTERNAL const Type _hb_Null_##Type; \ + template <> \ + struct Null { \ + static Type const & get_null () { \ + return _hb_Null_##Type; \ + } \ + }; \ + static_assert (true, "Just so we take semicolon after.") +#define DEFINE_NULL_INSTANCE(Type) \ + const Type _hb_Null_##Type + +/* Global writable pool. Enlarge as necessary. */ + +/* To be fully correct, CrapPool must be thread_local. However, we do not rely on CrapPool + * for correct operation. It only exist to catch and divert program logic bugs instead of + * causing bad memory access. So, races there are not actually introducing incorrectness + * in the code. Has ~12kb binary size overhead to have it, also clang build fails with it. */ +extern HB_INTERNAL +/*thread_local*/ uint64_t _hb_CrapPool[(HB_NULL_POOL_SIZE + sizeof (uint64_t) - 1) / sizeof (uint64_t)]; + +/* CRAP pool: Common Region for Access Protection. */ +template +static inline Type& Crap () { + static_assert (hb_null_size (Type) <= HB_NULL_POOL_SIZE, "Increase HB_NULL_POOL_SIZE."); + Type *obj = reinterpret_cast (_hb_CrapPool); + memcpy (obj, &Null(Type), sizeof (*obj)); + return *obj; +} +template +struct CrapHelper +{ + typedef hb_remove_const> Type; + static Type & get_crap () { return Crap (); } +}; +#define Crap(Type) CrapHelper::get_crap () + +template +struct CrapOrNullHelper { + static Type & get () { return Crap(Type); } +}; +template +struct CrapOrNullHelper { + static const Type & get () { return Null(Type); } +}; +#define CrapOrNull(Type) CrapOrNullHelper::get () + + +/* + * hb_nonnull_ptr_t + */ + +template +struct hb_nonnull_ptr_t +{ + typedef hb_remove_pointer

T; + + hb_nonnull_ptr_t (T *v_ = nullptr) : v (v_) {} + T * operator = (T *v_) { return v = v_; } + T * operator -> () const { return get (); } + T & operator * () const { return *get (); } + T ** operator & () const { return &v; } + /* Only auto-cast to const types. */ + template operator const C * () const { return get (); } + operator const char * () const { return (const char *) get (); } + T * get () const { return v ? v : const_cast (&Null(T)); } + T * get_raw () const { return v; } + + T *v; +}; + + +#endif /* HB_NULL_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-number-parser.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-number-parser.hh new file mode 100644 index 000000000..c78c85097 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-number-parser.hh @@ -0,0 +1,240 @@ + +#line 1 "hb-number-parser.rl" +/* + * Copyright © 2019 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + */ + +#ifndef HB_NUMBER_PARSER_HH +#define HB_NUMBER_PARSER_HH + +#include "hb.hh" + +#include + + +#line 37 "hb-number-parser.hh" +static const unsigned char _double_parser_trans_keys[] = { + 0u, 0u, 43u, 57u, 46u, 57u, 48u, 57u, 43u, 57u, 48u, 57u, 48u, 101u, 48u, 57u, + 46u, 101u, 0 +}; + +static const char _double_parser_key_spans[] = { + 0, 15, 12, 10, 15, 10, 54, 10, + 56 +}; + +static const unsigned char _double_parser_index_offsets[] = { + 0, 0, 16, 29, 40, 56, 67, 122, + 133 +}; + +static const char _double_parser_indicies[] = { + 0, 1, 2, 3, 1, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 1, 3, 1, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 1, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, + 1, 6, 1, 7, 1, 1, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, + 1, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 1, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 9, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 9, 1, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 1, 3, 1, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 9, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 9, 1, 0 +}; + +static const char _double_parser_trans_targs[] = { + 2, 0, 2, 3, 8, 6, 5, 5, + 7, 4 +}; + +static const char _double_parser_trans_actions[] = { + 0, 0, 1, 0, 2, 3, 0, 4, + 5, 0 +}; + +static const int double_parser_start = 1; +static const int double_parser_first_final = 6; +static const int double_parser_error = 0; + +static const int double_parser_en_main = 1; + + +#line 70 "hb-number-parser.rl" + + +/* Works only for n < 512 */ +static inline double +_pow10 (unsigned int exponent) +{ + static const double _powers_of_10[] = + { + 1.0e+256, + 1.0e+128, + 1.0e+64, + 1.0e+32, + 1.0e+16, + 1.0e+8, + 10000., + 100., + 10. + }; + unsigned int mask = 1 << (ARRAY_LENGTH (_powers_of_10) - 1); + double result = 1; + for (const double *power = _powers_of_10; mask; ++power, mask >>= 1) + if (exponent & mask) result *= *power; + return result; +} + +static inline double +strtod_rl (const char *buf, char **end_ptr) +{ + const char *p, *pe; + double value = 0; + double frac = 0; + double frac_count = 0; + unsigned int exp = 0; + bool neg = false, exp_neg = false, exp_overflow = false; + const unsigned long long MAX_FRACT = 0xFFFFFFFFFFFFFull; /* 1^52-1 */ + const unsigned int MAX_EXP = 0x7FFu; /* 1^11-1 */ + p = buf; + pe = p + strlen (p); + + while (p < pe && ISSPACE (*p)) + p++; + + int cs; + +#line 142 "hb-number-parser.hh" + { + cs = double_parser_start; + } + +#line 147 "hb-number-parser.hh" + { + int _slen; + int _trans; + const unsigned char *_keys; + const char *_inds; + if ( p == pe ) + goto _test_eof; + if ( cs == 0 ) + goto _out; +_resume: + _keys = _double_parser_trans_keys + (cs<<1); + _inds = _double_parser_indicies + _double_parser_index_offsets[cs]; + + _slen = _double_parser_key_spans[cs]; + _trans = _inds[ _slen > 0 && _keys[0] <=(*p) && + (*p) <= _keys[1] ? + (*p) - _keys[0] : _slen ]; + + cs = _double_parser_trans_targs[_trans]; + + if ( _double_parser_trans_actions[_trans] == 0 ) + goto _again; + + switch ( _double_parser_trans_actions[_trans] ) { + case 1: +#line 39 "hb-number-parser.rl" + { neg = true; } + break; + case 4: +#line 40 "hb-number-parser.rl" + { exp_neg = true; } + break; + case 2: +#line 42 "hb-number-parser.rl" + { + value = value * 10. + ((*p) - '0'); +} + break; + case 3: +#line 45 "hb-number-parser.rl" + { + if (likely (frac <= MAX_FRACT / 10)) + { + frac = frac * 10. + ((*p) - '0'); + ++frac_count; + } +} + break; + case 5: +#line 52 "hb-number-parser.rl" + { + if (likely (exp * 10 + ((*p) - '0') <= MAX_EXP)) + exp = exp * 10 + ((*p) - '0'); + else + exp_overflow = true; +} + break; +#line 205 "hb-number-parser.hh" + } + +_again: + if ( cs == 0 ) + goto _out; + if ( ++p != pe ) + goto _resume; + _test_eof: {} + _out: {} + } + +#line 116 "hb-number-parser.rl" + + + *end_ptr = (char *) p; + + if (frac_count) value += frac / _pow10 (frac_count); + if (neg) value *= -1.; + + if (unlikely (exp_overflow)) + { + if (value == 0) return value; + if (exp_neg) return neg ? -DBL_MIN : DBL_MIN; + else return neg ? -DBL_MAX : DBL_MAX; + } + + if (exp) + { + if (exp_neg) value /= _pow10 (exp); + else value *= _pow10 (exp); + } + + return value; +} + +#endif /* HB_NUMBER_PARSER_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-number-parser.rl b/source/libs/harfbuzz/harfbuzz-src/src/hb-number-parser.rl new file mode 100644 index 000000000..8445fa22a --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-number-parser.rl @@ -0,0 +1,139 @@ +/* + * Copyright © 2019 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + */ + +#ifndef HB_NUMBER_PARSER_HH +#define HB_NUMBER_PARSER_HH + +#include "hb.hh" + +#include + +%%{ + +machine double_parser; +alphtype unsigned char; +write data; + +action see_neg { neg = true; } +action see_exp_neg { exp_neg = true; } + +action add_int { + value = value * 10. + (fc - '0'); +} +action add_frac { + if (likely (frac <= MAX_FRACT / 10)) + { + frac = frac * 10. + (fc - '0'); + ++frac_count; + } +} +action add_exp { + if (likely (exp * 10 + (fc - '0') <= MAX_EXP)) + exp = exp * 10 + (fc - '0'); + else + exp_overflow = true; +} + +num = [0-9]+; + +main := ( + ( + (('+'|'-'@see_neg)? num @add_int) ('.' num @add_frac)? + | + (('+'|'-'@see_neg)? '.' num @add_frac) + ) + (('e'|'E') (('+'|'-'@see_exp_neg)? num @add_exp))? +); + +}%% + +/* Works only for n < 512 */ +static inline double +_pow10 (unsigned int exponent) +{ + static const double _powers_of_10[] = + { + 1.0e+256, + 1.0e+128, + 1.0e+64, + 1.0e+32, + 1.0e+16, + 1.0e+8, + 10000., + 100., + 10. + }; + unsigned int mask = 1 << (ARRAY_LENGTH (_powers_of_10) - 1); + double result = 1; + for (const double *power = _powers_of_10; mask; ++power, mask >>= 1) + if (exponent & mask) result *= *power; + return result; +} + +static inline double +strtod_rl (const char *buf, char **end_ptr) +{ + const char *p, *pe; + double value = 0; + double frac = 0; + double frac_count = 0; + unsigned int exp = 0; + bool neg = false, exp_neg = false, exp_overflow = false; + const unsigned long long MAX_FRACT = 0xFFFFFFFFFFFFFull; /* 1^52-1 */ + const unsigned int MAX_EXP = 0x7FFu; /* 1^11-1 */ + p = buf; + pe = p + strlen (p); + + while (p < pe && ISSPACE (*p)) + p++; + + int cs; + %%{ + write init; + write exec; + }%% + + *end_ptr = (char *) p; + + if (frac_count) value += frac / _pow10 (frac_count); + if (neg) value *= -1.; + + if (unlikely (exp_overflow)) + { + if (value == 0) return value; + if (exp_neg) return neg ? -DBL_MIN : DBL_MIN; + else return neg ? -DBL_MAX : DBL_MAX; + } + + if (exp) + { + if (exp_neg) value /= _pow10 (exp); + else value *= _pow10 (exp); + } + + return value; +} + +#endif /* HB_NUMBER_PARSER_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-number.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-number.cc new file mode 100644 index 000000000..4f84d4ad5 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-number.cc @@ -0,0 +1,147 @@ +/* + * Copyright © 2019 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + */ + +#include "hb.hh" +#include "hb-machinery.hh" +#include "hb-number-parser.hh" + +#include +#ifdef HAVE_XLOCALE_H +#include +#endif + +template +static bool +_parse_number (const char **pp, const char *end, T *pv, + bool whole_buffer, Func f) +{ + char buf[32]; + unsigned int len = hb_min (ARRAY_LENGTH (buf) - 1, + (unsigned int) (end - *pp)); + strncpy (buf, *pp, len); + buf[len] = '\0'; + + char *p = buf; + char *pend = p; + + errno = 0; + *pv = f (p, &pend); + if (unlikely (errno || p == pend || + /* Check if consumed whole buffer if is requested */ + (whole_buffer && pend - p != end - *pp))) return false; + + *pp += pend - p; + return true; +} + +bool +hb_parse_int (const char **pp, const char *end, int *pv, bool whole_buffer) +{ + return _parse_number (pp, end, pv, whole_buffer, + [] (const char *p, char **end) + { return strtol (p, end, 10); }); +} + +bool +hb_parse_uint (const char **pp, const char *end, unsigned int *pv, + bool whole_buffer, int base) +{ + return _parse_number (pp, end, pv, whole_buffer, + [base] (const char *p, char **end) + { return strtoul (p, end, base); }); +} + + +#if defined (HAVE_NEWLOCALE) && defined (HAVE_STRTOD_L) +#define USE_XLOCALE 1 +#define HB_LOCALE_T locale_t +#define HB_CREATE_LOCALE(locName) newlocale (LC_ALL_MASK, locName, nullptr) +#define HB_FREE_LOCALE(loc) freelocale (loc) +#elif defined(_MSC_VER) +#define USE_XLOCALE 1 +#define HB_LOCALE_T _locale_t +#define HB_CREATE_LOCALE(locName) _create_locale (LC_ALL, locName) +#define HB_FREE_LOCALE(loc) _free_locale (loc) +#define strtod_l(a, b, c) _strtod_l ((a), (b), (c)) +#endif + +#ifdef USE_XLOCALE + +#if HB_USE_ATEXIT +static void free_static_C_locale (); +#endif + +static struct hb_C_locale_lazy_loader_t : hb_lazy_loader_t, + hb_C_locale_lazy_loader_t> +{ + static HB_LOCALE_T create () + { + HB_LOCALE_T C_locale = HB_CREATE_LOCALE ("C"); + +#if HB_USE_ATEXIT + atexit (free_static_C_locale); +#endif + + return C_locale; + } + static void destroy (HB_LOCALE_T p) + { + HB_FREE_LOCALE (p); + } + static HB_LOCALE_T get_null () + { + return nullptr; + } +} static_C_locale; + +#if HB_USE_ATEXIT +static +void free_static_C_locale () +{ + static_C_locale.free_instance (); +} +#endif + +static HB_LOCALE_T +get_C_locale () +{ + return static_C_locale.get_unconst (); +} +#endif /* USE_XLOCALE */ + +bool +hb_parse_double (const char **pp, const char *end, double *pv, + bool whole_buffer) +{ + return _parse_number (pp, end, pv, whole_buffer, + [] (const char *p, char **end) + { +#ifdef USE_XLOCALE + return strtod_l (p, end, get_C_locale ()); +#else + return strtod_rl (p, end); +#endif + }); +} diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-number.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-number.hh new file mode 100644 index 000000000..14d1260aa --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-number.hh @@ -0,0 +1,41 @@ +/* + * Copyright © 2019 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + */ + +#ifndef HB_NUMBER_HH +#define HB_NUMBER_HH + +HB_INTERNAL bool +hb_parse_int (const char **pp, const char *end, int *pv, + bool whole_buffer = false); + +HB_INTERNAL bool +hb_parse_uint (const char **pp, const char *end, unsigned int *pv, + bool whole_buffer = false, int base = 10); + +HB_INTERNAL bool +hb_parse_double (const char **pp, const char *end, double *pv, + bool whole_buffer = false); + +#endif /* HB_NUMBER_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-object.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-object.hh new file mode 100644 index 000000000..c470532aa --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-object.hh @@ -0,0 +1,342 @@ +/* + * Copyright © 2007 Chris Wilson + * Copyright © 2009,2010 Red Hat, Inc. + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Contributor(s): + * Chris Wilson + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OBJECT_HH +#define HB_OBJECT_HH + +#include "hb.hh" +#include "hb-atomic.hh" +#include "hb-mutex.hh" +#include "hb-vector.hh" + + +/* + * Lockable set + */ + +template +struct hb_lockable_set_t +{ + hb_vector_t items; + + void init () { items.init (); } + + template + item_t *replace_or_insert (T v, lock_t &l, bool replace) + { + l.lock (); + item_t *item = items.find (v); + if (item) { + if (replace) { + item_t old = *item; + *item = v; + l.unlock (); + old.fini (); + } + else { + item = nullptr; + l.unlock (); + } + } else { + item = items.push (v); + l.unlock (); + } + return item; + } + + template + void remove (T v, lock_t &l) + { + l.lock (); + item_t *item = items.find (v); + if (item) + { + item_t old = *item; + *item = items[items.length - 1]; + items.pop (); + l.unlock (); + old.fini (); + } else { + l.unlock (); + } + } + + template + bool find (T v, item_t *i, lock_t &l) + { + l.lock (); + item_t *item = items.find (v); + if (item) + *i = *item; + l.unlock (); + return !!item; + } + + template + item_t *find_or_insert (T v, lock_t &l) + { + l.lock (); + item_t *item = items.find (v); + if (!item) { + item = items.push (v); + } + l.unlock (); + return item; + } + + void fini (lock_t &l) + { + if (!items.length) + { + /* No need to lock. */ + items.fini (); + return; + } + l.lock (); + while (items.length) + { + item_t old = items[items.length - 1]; + items.pop (); + l.unlock (); + old.fini (); + l.lock (); + } + items.fini (); + l.unlock (); + } + +}; + + +/* + * Reference-count. + */ + +#define HB_REFERENCE_COUNT_INERT_VALUE 0 +#define HB_REFERENCE_COUNT_POISON_VALUE -0x0000DEAD +#define HB_REFERENCE_COUNT_INIT {HB_ATOMIC_INT_INIT (HB_REFERENCE_COUNT_INERT_VALUE)} + +struct hb_reference_count_t +{ + mutable hb_atomic_int_t ref_count; + + void init (int v = 1) { ref_count.set_relaxed (v); } + int get_relaxed () const { return ref_count.get_relaxed (); } + int inc () const { return ref_count.inc (); } + int dec () const { return ref_count.dec (); } + void fini () { ref_count.set_relaxed (HB_REFERENCE_COUNT_POISON_VALUE); } + + bool is_inert () const { return ref_count.get_relaxed () == HB_REFERENCE_COUNT_INERT_VALUE; } + bool is_valid () const { return ref_count.get_relaxed () > 0; } +}; + + +/* user_data */ + +struct hb_user_data_array_t +{ + struct hb_user_data_item_t { + hb_user_data_key_t *key; + void *data; + hb_destroy_func_t destroy; + + bool operator == (hb_user_data_key_t *other_key) const { return key == other_key; } + bool operator == (hb_user_data_item_t &other) const { return key == other.key; } + + void fini () { if (destroy) destroy (data); } + }; + + hb_mutex_t lock; + hb_lockable_set_t items; + + void init () { lock.init (); items.init (); } + + HB_INTERNAL bool set (hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace); + + HB_INTERNAL void *get (hb_user_data_key_t *key); + + void fini () { items.fini (lock); lock.fini (); } +}; + + +/* + * Object header + */ + +struct hb_object_header_t +{ + hb_reference_count_t ref_count; + mutable hb_atomic_int_t writable; + hb_atomic_ptr_t user_data; +}; +#define HB_OBJECT_HEADER_STATIC \ + { \ + HB_REFERENCE_COUNT_INIT, \ + HB_ATOMIC_INT_INIT (false), \ + HB_ATOMIC_PTR_INIT (nullptr) \ + } + + +/* + * Object + */ + +template +static inline void hb_object_trace (const Type *obj, const char *function) +{ + DEBUG_MSG (OBJECT, (void *) obj, + "%s refcount=%d", + function, + obj ? obj->header.ref_count.get_relaxed () : 0); +} + +template +static inline Type *hb_object_create () +{ + Type *obj = (Type *) calloc (1, sizeof (Type)); + + if (unlikely (!obj)) + return obj; + + hb_object_init (obj); + hb_object_trace (obj, HB_FUNC); + return obj; +} +template +static inline void hb_object_init (Type *obj) +{ + obj->header.ref_count.init (); + obj->header.writable.set_relaxed (true); + obj->header.user_data.init (); +} +template +static inline bool hb_object_is_inert (const Type *obj) +{ + return unlikely (obj->header.ref_count.is_inert ()); +} +template +static inline bool hb_object_is_valid (const Type *obj) +{ + return likely (obj->header.ref_count.is_valid ()); +} +template +static inline bool hb_object_is_immutable (const Type *obj) +{ + return !obj->header.writable.get_relaxed (); +} +template +static inline void hb_object_make_immutable (const Type *obj) +{ + obj->header.writable.set_relaxed (false); +} +template +static inline Type *hb_object_reference (Type *obj) +{ + hb_object_trace (obj, HB_FUNC); + if (unlikely (!obj || hb_object_is_inert (obj))) + return obj; + assert (hb_object_is_valid (obj)); + obj->header.ref_count.inc (); + return obj; +} +template +static inline bool hb_object_destroy (Type *obj) +{ + hb_object_trace (obj, HB_FUNC); + if (unlikely (!obj || hb_object_is_inert (obj))) + return false; + assert (hb_object_is_valid (obj)); + if (obj->header.ref_count.dec () != 1) + return false; + + hb_object_fini (obj); + return true; +} +template +static inline void hb_object_fini (Type *obj) +{ + obj->header.ref_count.fini (); /* Do this before user_data */ + hb_user_data_array_t *user_data = obj->header.user_data.get (); + if (user_data) + { + user_data->fini (); + free (user_data); + user_data = nullptr; + } +} +template +static inline bool hb_object_set_user_data (Type *obj, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace) +{ + if (unlikely (!obj || hb_object_is_inert (obj))) + return false; + assert (hb_object_is_valid (obj)); + +retry: + hb_user_data_array_t *user_data = obj->header.user_data.get (); + if (unlikely (!user_data)) + { + user_data = (hb_user_data_array_t *) calloc (sizeof (hb_user_data_array_t), 1); + if (unlikely (!user_data)) + return false; + user_data->init (); + if (unlikely (!obj->header.user_data.cmpexch (nullptr, user_data))) + { + user_data->fini (); + free (user_data); + goto retry; + } + } + + return user_data->set (key, data, destroy, replace); +} + +template +static inline void *hb_object_get_user_data (Type *obj, + hb_user_data_key_t *key) +{ + if (unlikely (!obj || hb_object_is_inert (obj))) + return nullptr; + assert (hb_object_is_valid (obj)); + hb_user_data_array_t *user_data = obj->header.user_data.get (); + if (!user_data) + return nullptr; + return user_data->get (key); +} + + +#endif /* HB_OBJECT_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-open-file.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-open-file.hh new file mode 100644 index 000000000..b05393647 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-open-file.hh @@ -0,0 +1,526 @@ +/* + * Copyright © 2007,2008,2009 Red Hat, Inc. + * Copyright © 2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OPEN_FILE_HH +#define HB_OPEN_FILE_HH + +#include "hb-open-type.hh" +#include "hb-ot-head-table.hh" + + +namespace OT { + + +/* + * + * The OpenType Font File + * + */ + + +/* + * Organization of an OpenType Font + */ + +struct OpenTypeFontFile; +struct OffsetTable; +struct TTCHeader; + + +typedef struct TableRecord +{ + int cmp (Tag t) const { return -t.cmp (tag); } + + HB_INTERNAL static int cmp (const void *pa, const void *pb) + { + const TableRecord *a = (const TableRecord *) pa; + const TableRecord *b = (const TableRecord *) pb; + return b->cmp (a->tag); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + Tag tag; /* 4-byte identifier. */ + CheckSum checkSum; /* CheckSum for this table. */ + Offset32 offset; /* Offset from beginning of TrueType font + * file. */ + HBUINT32 length; /* Length of this table. */ + public: + DEFINE_SIZE_STATIC (16); +} OpenTypeTable; + +typedef struct OffsetTable +{ + friend struct OpenTypeFontFile; + + unsigned int get_table_count () const { return tables.len; } + const TableRecord& get_table (unsigned int i) const + { return tables[i]; } + unsigned int get_table_tags (unsigned int start_offset, + unsigned int *table_count, /* IN/OUT */ + hb_tag_t *table_tags /* OUT */) const + { + if (table_count) + { + if (start_offset >= tables.len) + *table_count = 0; + else + *table_count = hb_min (*table_count, tables.len - start_offset); + + const TableRecord *sub_tables = tables.arrayZ + start_offset; + unsigned int count = *table_count; + for (unsigned int i = 0; i < count; i++) + table_tags[i] = sub_tables[i].tag; + } + return tables.len; + } + bool find_table_index (hb_tag_t tag, unsigned int *table_index) const + { + Tag t; + t = tag; + return tables.bfind (t, table_index, HB_BFIND_NOT_FOUND_STORE, Index::NOT_FOUND_INDEX); + } + const TableRecord& get_table_by_tag (hb_tag_t tag) const + { + unsigned int table_index; + find_table_index (tag, &table_index); + return get_table (table_index); + } + + public: + + template + bool serialize (hb_serialize_context_t *c, + hb_tag_t sfnt_tag, + hb_array_t items) + { + TRACE_SERIALIZE (this); + /* Alloc 12 for the OTHeader. */ + if (unlikely (!c->extend_min (*this))) return_trace (false); + /* Write sfntVersion (bytes 0..3). */ + sfnt_version = sfnt_tag; + /* Take space for numTables, searchRange, entrySelector, RangeShift + * and the TableRecords themselves. */ + if (unlikely (!tables.serialize (c, items.length))) return_trace (false); + + const char *dir_end = (const char *) c->head; + HBUINT32 *checksum_adjustment = nullptr; + + /* Write OffsetTables, alloc for and write actual table blobs. */ + for (unsigned int i = 0; i < tables.len; i++) + { + TableRecord &rec = tables.arrayZ[i]; + hb_blob_t *blob = items[i].blob; + rec.tag = items[i].tag; + rec.length = blob->length; + rec.offset.serialize (c, this); + + /* Allocate room for the table and copy it. */ + char *start = (char *) c->allocate_size (rec.length); + if (unlikely (!start)) return false; + + if (likely (rec.length)) + memcpy (start, blob->data, rec.length); + + /* 4-byte alignment. */ + c->align (4); + const char *end = (const char *) c->head; + + if (items[i].tag == HB_OT_TAG_head && + (unsigned) (end - start) >= head::static_size) + { + head *h = (head *) start; + checksum_adjustment = &h->checkSumAdjustment; + *checksum_adjustment = 0; + } + + rec.checkSum.set_for_data (start, end - start); + } + + tables.qsort (); + + if (checksum_adjustment) + { + CheckSum checksum; + + /* The following line is a slower version of the following block. */ + //checksum.set_for_data (this, (const char *) c->head - (const char *) this); + checksum.set_for_data (this, dir_end - (const char *) this); + for (unsigned int i = 0; i < items.length; i++) + { + TableRecord &rec = tables.arrayZ[i]; + checksum = checksum + rec.checkSum; + } + + *checksum_adjustment = 0xB1B0AFBAu - checksum; + } + + return_trace (true); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && tables.sanitize (c)); + } + + protected: + Tag sfnt_version; /* '\0\001\0\00' if TrueType / 'OTTO' if CFF */ + BinSearchArrayOf + tables; + public: + DEFINE_SIZE_ARRAY (12, tables); +} OpenTypeFontFace; + + +/* + * TrueType Collections + */ + +struct TTCHeaderVersion1 +{ + friend struct TTCHeader; + + unsigned int get_face_count () const { return table.len; } + const OpenTypeFontFace& get_face (unsigned int i) const { return this+table[i]; } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (table.sanitize (c, this)); + } + + protected: + Tag ttcTag; /* TrueType Collection ID string: 'ttcf' */ + FixedVersion<>version; /* Version of the TTC Header (1.0), + * 0x00010000u */ + LArrayOf> + table; /* Array of offsets to the OffsetTable for each font + * from the beginning of the file */ + public: + DEFINE_SIZE_ARRAY (12, table); +}; + +struct TTCHeader +{ + friend struct OpenTypeFontFile; + + private: + + unsigned int get_face_count () const + { + switch (u.header.version.major) { + case 2: /* version 2 is compatible with version 1 */ + case 1: return u.version1.get_face_count (); + default:return 0; + } + } + const OpenTypeFontFace& get_face (unsigned int i) const + { + switch (u.header.version.major) { + case 2: /* version 2 is compatible with version 1 */ + case 1: return u.version1.get_face (i); + default:return Null(OpenTypeFontFace); + } + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (unlikely (!u.header.version.sanitize (c))) return_trace (false); + switch (u.header.version.major) { + case 2: /* version 2 is compatible with version 1 */ + case 1: return_trace (u.version1.sanitize (c)); + default:return_trace (true); + } + } + + protected: + union { + struct { + Tag ttcTag; /* TrueType Collection ID string: 'ttcf' */ + FixedVersion<>version; /* Version of the TTC Header (1.0 or 2.0), + * 0x00010000u or 0x00020000u */ + } header; + TTCHeaderVersion1 version1; + } u; +}; + +/* + * Mac Resource Fork + * + * http://mirror.informatimago.com/next/developer.apple.com/documentation/mac/MoreToolbox/MoreToolbox-99.html + */ + +struct ResourceRecord +{ + const OpenTypeFontFace & get_face (const void *data_base) const + { return CastR ((data_base+offset).arrayZ); } + + bool sanitize (hb_sanitize_context_t *c, + const void *data_base) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + offset.sanitize (c, data_base) && + get_face (data_base).sanitize (c)); + } + + protected: + HBUINT16 id; /* Resource ID. */ + HBINT16 nameOffset; /* Offset from beginning of resource name list + * to resource name, -1 means there is none. */ + HBUINT8 attrs; /* Resource attributes */ + NNOffsetTo, HBUINT24> + offset; /* Offset from beginning of data block to + * data for this resource */ + HBUINT32 reserved; /* Reserved for handle to resource */ + public: + DEFINE_SIZE_STATIC (12); +}; + +#define HB_TAG_sfnt HB_TAG ('s','f','n','t') + +struct ResourceTypeRecord +{ + unsigned int get_resource_count () const + { return tag == HB_TAG_sfnt ? resCountM1 + 1 : 0; } + + bool is_sfnt () const { return tag == HB_TAG_sfnt; } + + const ResourceRecord& get_resource_record (unsigned int i, + const void *type_base) const + { return (type_base+resourcesZ).as_array (get_resource_count ())[i]; } + + bool sanitize (hb_sanitize_context_t *c, + const void *type_base, + const void *data_base) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + resourcesZ.sanitize (c, type_base, + get_resource_count (), + data_base)); + } + + protected: + Tag tag; /* Resource type. */ + HBUINT16 resCountM1; /* Number of resources minus 1. */ + NNOffsetTo> + resourcesZ; /* Offset from beginning of resource type list + * to reference item list for this type. */ + public: + DEFINE_SIZE_STATIC (8); +}; + +struct ResourceMap +{ + unsigned int get_face_count () const + { + unsigned int count = get_type_count (); + for (unsigned int i = 0; i < count; i++) + { + const ResourceTypeRecord& type = get_type_record (i); + if (type.is_sfnt ()) + return type.get_resource_count (); + } + return 0; + } + + const OpenTypeFontFace& get_face (unsigned int idx, + const void *data_base) const + { + unsigned int count = get_type_count (); + for (unsigned int i = 0; i < count; i++) + { + const ResourceTypeRecord& type = get_type_record (i); + /* The check for idx < count is here because ResourceRecord is NOT null-safe. + * Because an offset of 0 there does NOT mean null. */ + if (type.is_sfnt () && idx < type.get_resource_count ()) + return type.get_resource_record (idx, &(this+typeList)).get_face (data_base); + } + return Null (OpenTypeFontFace); + } + + bool sanitize (hb_sanitize_context_t *c, const void *data_base) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + typeList.sanitize (c, this, + &(this+typeList), + data_base)); + } + + private: + unsigned int get_type_count () const { return (this+typeList).lenM1 + 1; } + + const ResourceTypeRecord& get_type_record (unsigned int i) const + { return (this+typeList)[i]; } + + protected: + HBUINT8 reserved0[16]; /* Reserved for copy of resource header */ + HBUINT32 reserved1; /* Reserved for handle to next resource map */ + HBUINT16 resreved2; /* Reserved for file reference number */ + HBUINT16 attrs; /* Resource fork attribute */ + NNOffsetTo> + typeList; /* Offset from beginning of map to + * resource type list */ + Offset16 nameList; /* Offset from beginning of map to + * resource name list */ + public: + DEFINE_SIZE_STATIC (28); +}; + +struct ResourceForkHeader +{ + unsigned int get_face_count () const + { return (this+map).get_face_count (); } + + const OpenTypeFontFace& get_face (unsigned int idx, + unsigned int *base_offset = nullptr) const + { + const OpenTypeFontFace &face = (this+map).get_face (idx, &(this+data)); + if (base_offset) + *base_offset = (const char *) &face - (const char *) this; + return face; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + data.sanitize (c, this, dataLen) && + map.sanitize (c, this, &(this+data))); + } + + protected: + LNNOffsetTo> + data; /* Offset from beginning of resource fork + * to resource data */ + LNNOffsetTo + map; /* Offset from beginning of resource fork + * to resource map */ + HBUINT32 dataLen; /* Length of resource data */ + HBUINT32 mapLen; /* Length of resource map */ + public: + DEFINE_SIZE_STATIC (16); +}; + +/* + * OpenType Font File + */ + +struct OpenTypeFontFile +{ + enum { + CFFTag = HB_TAG ('O','T','T','O'), /* OpenType with Postscript outlines */ + TrueTypeTag = HB_TAG ( 0 , 1 , 0 , 0 ), /* OpenType with TrueType outlines */ + TTCTag = HB_TAG ('t','t','c','f'), /* TrueType Collection */ + DFontTag = HB_TAG ( 0 , 0 , 1 , 0 ), /* DFont Mac Resource Fork */ + TrueTag = HB_TAG ('t','r','u','e'), /* Obsolete Apple TrueType */ + Typ1Tag = HB_TAG ('t','y','p','1') /* Obsolete Apple Type1 font in SFNT container */ + }; + + hb_tag_t get_tag () const { return u.tag; } + + unsigned int get_face_count () const + { + switch (u.tag) { + case CFFTag: /* All the non-collection tags */ + case TrueTag: + case Typ1Tag: + case TrueTypeTag: return 1; + case TTCTag: return u.ttcHeader.get_face_count (); + case DFontTag: return u.rfHeader.get_face_count (); + default: return 0; + } + } + const OpenTypeFontFace& get_face (unsigned int i, unsigned int *base_offset = nullptr) const + { + if (base_offset) + *base_offset = 0; + switch (u.tag) { + /* Note: for non-collection SFNT data we ignore index. This is because + * Apple dfont container is a container of SFNT's. So each SFNT is a + * non-TTC, but the index is more than zero. */ + case CFFTag: /* All the non-collection tags */ + case TrueTag: + case Typ1Tag: + case TrueTypeTag: return u.fontFace; + case TTCTag: return u.ttcHeader.get_face (i); + case DFontTag: return u.rfHeader.get_face (i, base_offset); + default: return Null(OpenTypeFontFace); + } + } + + template + bool serialize_single (hb_serialize_context_t *c, + hb_tag_t sfnt_tag, + hb_array_t items) + { + TRACE_SERIALIZE (this); + assert (sfnt_tag != TTCTag); + if (unlikely (!c->extend_min (*this))) return_trace (false); + return_trace (u.fontFace.serialize (c, sfnt_tag, items)); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (unlikely (!u.tag.sanitize (c))) return_trace (false); + switch (u.tag) { + case CFFTag: /* All the non-collection tags */ + case TrueTag: + case Typ1Tag: + case TrueTypeTag: return_trace (u.fontFace.sanitize (c)); + case TTCTag: return_trace (u.ttcHeader.sanitize (c)); + case DFontTag: return_trace (u.rfHeader.sanitize (c)); + default: return_trace (true); + } + } + + protected: + union { + Tag tag; /* 4-byte identifier. */ + OpenTypeFontFace fontFace; + TTCHeader ttcHeader; + ResourceForkHeader rfHeader; + } u; + public: + DEFINE_SIZE_UNION (4, tag); +}; + + +} /* namespace OT */ + + +#endif /* HB_OPEN_FILE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-open-type.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-open-type.hh new file mode 100644 index 000000000..fce559103 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-open-type.hh @@ -0,0 +1,1065 @@ +/* + * Copyright © 2007,2008,2009,2010 Red Hat, Inc. + * Copyright © 2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OPEN_TYPE_HH +#define HB_OPEN_TYPE_HH + +#include "hb.hh" +#include "hb-blob.hh" +#include "hb-face.hh" +#include "hb-machinery.hh" +#include "hb-subset.hh" + + +namespace OT { + + +/* + * + * The OpenType Font File: Data Types + */ + + +/* "The following data types are used in the OpenType font file. + * All OpenType fonts use Motorola-style byte ordering (Big Endian):" */ + +/* + * Int types + */ + +/* Integer types in big-endian order and no alignment requirement */ +template +struct IntType +{ + typedef Type type; + typedef hb_conditional wide_type; + + IntType& operator = (wide_type i) { v = i; return *this; } + operator wide_type () const { return v; } + bool operator == (const IntType &o) const { return (Type) v == (Type) o.v; } + bool operator != (const IntType &o) const { return !(*this == o); } + + IntType& operator += (unsigned count) { *this = *this + count; return *this; } + IntType& operator -= (unsigned count) { *this = *this - count; return *this; } + IntType& operator ++ () { *this += 1; return *this; } + IntType& operator -- () { *this -= 1; return *this; } + IntType operator ++ (int) { IntType c (*this); ++*this; return c; } + IntType operator -- (int) { IntType c (*this); --*this; return c; } + + HB_INTERNAL static int cmp (const IntType *a, const IntType *b) + { return b->cmp (*a); } + template + int cmp (Type2 a) const + { + Type b = v; + if (sizeof (Type) < sizeof (int) && sizeof (Type2) < sizeof (int)) + return (int) a - (int) b; + else + return a < b ? -1 : a == b ? 0 : +1; + } + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this))); + } + protected: + BEInt v; + public: + DEFINE_SIZE_STATIC (Size); +}; + +typedef IntType HBUINT8; /* 8-bit unsigned integer. */ +typedef IntType HBINT8; /* 8-bit signed integer. */ +typedef IntType HBUINT16; /* 16-bit unsigned integer. */ +typedef IntType HBINT16; /* 16-bit signed integer. */ +typedef IntType HBUINT32; /* 32-bit unsigned integer. */ +typedef IntType HBINT32; /* 32-bit signed integer. */ +/* Note: we cannot defined a signed HBINT24 because there's no corresponding C type. + * Works for unsigned, but not signed, since we rely on compiler for sign-extension. */ +typedef IntType HBUINT24; /* 24-bit unsigned integer. */ + +/* 16-bit signed integer (HBINT16) that describes a quantity in FUnits. */ +typedef HBINT16 FWORD; + +/* 32-bit signed integer (HBINT32) that describes a quantity in FUnits. */ +typedef HBINT32 FWORD32; + +/* 16-bit unsigned integer (HBUINT16) that describes a quantity in FUnits. */ +typedef HBUINT16 UFWORD; + +/* 16-bit signed fixed number with the low 14 bits of fraction (2.14). */ +struct F2DOT14 : HBINT16 +{ + F2DOT14& operator = (uint16_t i ) { HBINT16::operator= (i); return *this; } + // 16384 means 1<<14 + float to_float () const { return ((int32_t) v) / 16384.f; } + void set_float (float f) { v = roundf (f * 16384.f); } + public: + DEFINE_SIZE_STATIC (2); +}; + +/* 32-bit signed fixed-point number (16.16). */ +struct HBFixed : HBINT32 +{ + HBFixed& operator = (uint32_t i) { HBINT32::operator= (i); return *this; } + // 65536 means 1<<16 + float to_float () const { return ((int32_t) v) / 65536.f; } + void set_float (float f) { v = roundf (f * 65536.f); } + public: + DEFINE_SIZE_STATIC (4); +}; + +/* Date represented in number of seconds since 12:00 midnight, January 1, + * 1904. The value is represented as a signed 64-bit integer. */ +struct LONGDATETIME +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this))); + } + protected: + HBINT32 major; + HBUINT32 minor; + public: + DEFINE_SIZE_STATIC (8); +}; + +/* Array of four uint8s (length = 32 bits) used to identify a script, language + * system, feature, or baseline */ +struct Tag : HBUINT32 +{ + Tag& operator = (hb_tag_t i) { HBUINT32::operator= (i); return *this; } + /* What the char* converters return is NOT nul-terminated. Print using "%.4s" */ + operator const char* () const { return reinterpret_cast (&this->v); } + operator char* () { return reinterpret_cast (&this->v); } + public: + DEFINE_SIZE_STATIC (4); +}; + +/* Glyph index number, same as uint16 (length = 16 bits) */ +struct HBGlyphID : HBUINT16 +{ + HBGlyphID& operator = (uint16_t i) { HBUINT16::operator= (i); return *this; } +}; + +/* Script/language-system/feature index */ +struct Index : HBUINT16 { + static constexpr unsigned NOT_FOUND_INDEX = 0xFFFFu; + Index& operator = (uint16_t i) { HBUINT16::operator= (i); return *this; } +}; +DECLARE_NULL_NAMESPACE_BYTES (OT, Index); + +typedef Index NameID; + +/* Offset, Null offset = 0 */ +template +struct Offset : Type +{ + Offset& operator = (typename Type::type i) { Type::operator= (i); return *this; } + + typedef Type type; + + bool is_null () const { return has_null && 0 == *this; } + + void *serialize (hb_serialize_context_t *c, const void *base) + { + void *t = c->start_embed (); + c->check_assign (*this, (unsigned) ((char *) t - (char *) base)); + return t; + } + + public: + DEFINE_SIZE_STATIC (sizeof (Type)); +}; + +typedef Offset Offset16; +typedef Offset Offset32; + + +/* CheckSum */ +struct CheckSum : HBUINT32 +{ + CheckSum& operator = (uint32_t i) { HBUINT32::operator= (i); return *this; } + + /* This is reference implementation from the spec. */ + static uint32_t CalcTableChecksum (const HBUINT32 *Table, uint32_t Length) + { + uint32_t Sum = 0L; + assert (0 == (Length & 3)); + const HBUINT32 *EndPtr = Table + Length / HBUINT32::static_size; + + while (Table < EndPtr) + Sum += *Table++; + return Sum; + } + + /* Note: data should be 4byte aligned and have 4byte padding at the end. */ + void set_for_data (const void *data, unsigned int length) + { *this = CalcTableChecksum ((const HBUINT32 *) data, length); } + + public: + DEFINE_SIZE_STATIC (4); +}; + + +/* + * Version Numbers + */ + +template +struct FixedVersion +{ + uint32_t to_int () const { return (major << (sizeof (FixedType) * 8)) + minor; } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + FixedType major; + FixedType minor; + public: + DEFINE_SIZE_STATIC (2 * sizeof (FixedType)); +}; + + +/* + * Template subclasses of Offset that do the dereferencing. + * Use: (base+offset) + */ + +template +struct _hb_has_null +{ + static const Type *get_null () { return nullptr; } + static Type *get_crap () { return nullptr; } +}; +template +struct _hb_has_null +{ + static const Type *get_null () { return &Null(Type); } + static Type *get_crap () { return &Crap(Type); } +}; + +template +struct OffsetTo : Offset +{ + HB_DELETE_COPY_ASSIGN (OffsetTo); + OffsetTo () = default; + + OffsetTo& operator = (typename OffsetType::type i) { OffsetType::operator= (i); return *this; } + + const Type& operator () (const void *base) const + { + if (unlikely (this->is_null ())) return *_hb_has_null::get_null (); + return StructAtOffset (base, *this); + } + Type& operator () (void *base) const + { + if (unlikely (this->is_null ())) return *_hb_has_null::get_crap (); + return StructAtOffset (base, *this); + } + + template + friend const Type& operator + (const Base &base, const OffsetTo &offset) { return offset ((const void *) base); } + template + friend const Type& operator + (const OffsetTo &offset, const Base &base) { return offset ((const void *) base); } + template + friend Type& operator + (Base &&base, OffsetTo &offset) { return offset ((void *) base); } + template + friend Type& operator + (OffsetTo &offset, Base &&base) { return offset ((void *) base); } + + Type& serialize (hb_serialize_context_t *c, const void *base) + { + return * (Type *) Offset::serialize (c, base); + } + + template + bool serialize_subset (hb_subset_context_t *c, + const OffsetTo& src, + const void *src_base, + const void *dst_base, + Ts&&... ds) + { + *this = 0; + if (src.is_null ()) + return false; + + auto *s = c->serializer; + + s->push (); + + bool ret = c->dispatch (src_base+src, hb_forward (ds)...); + + if (ret || !has_null) + s->add_link (*this, s->pop_pack (), dst_base); + else + s->pop_discard (); + + return ret; + } + + /* TODO: Somehow merge this with previous function into a serialize_dispatch(). */ + template + bool serialize_copy (hb_serialize_context_t *c, + const OffsetTo& src, + const void *src_base, + const void *dst_base, + Ts&&... ds) + { + *this = 0; + if (src.is_null ()) + return false; + + c->push (); + + bool ret = c->copy (src_base+src, hb_forward (ds)...); + + c->add_link (*this, c->pop_pack (), dst_base); + + return ret; + } + + bool sanitize_shallow (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + if (unlikely (!c->check_struct (this))) return_trace (false); + if (unlikely (this->is_null ())) return_trace (true); + if (unlikely (!c->check_range (base, *this))) return_trace (false); + return_trace (true); + } + + template + bool sanitize (hb_sanitize_context_t *c, const void *base, Ts&&... ds) const + { + TRACE_SANITIZE (this); + return_trace (sanitize_shallow (c, base) && + (this->is_null () || + c->dispatch (StructAtOffset (base, *this), hb_forward (ds)...) || + neuter (c))); + } + + /* Set the offset to Null */ + bool neuter (hb_sanitize_context_t *c) const + { + if (!has_null) return false; + return c->try_set (this, 0); + } + DEFINE_SIZE_STATIC (sizeof (OffsetType)); +}; +/* Partial specializations. */ +template +using LOffsetTo = OffsetTo; +template +using NNOffsetTo = OffsetTo; +template +using LNNOffsetTo = LOffsetTo; + + +/* + * Array Types + */ + +template +struct UnsizedArrayOf +{ + typedef Type item_t; + static constexpr unsigned item_size = hb_static_size (Type); + + HB_DELETE_CREATE_COPY_ASSIGN (UnsizedArrayOf); + + const Type& operator [] (int i_) const + { + unsigned int i = (unsigned int) i_; + const Type *p = &arrayZ[i]; + if (unlikely (p < arrayZ)) return Null (Type); /* Overflowed. */ + return *p; + } + Type& operator [] (int i_) + { + unsigned int i = (unsigned int) i_; + Type *p = &arrayZ[i]; + if (unlikely (p < arrayZ)) return Crap (Type); /* Overflowed. */ + return *p; + } + + unsigned int get_size (unsigned int len) const + { return len * Type::static_size; } + + template operator T * () { return arrayZ; } + template operator const T * () const { return arrayZ; } + hb_array_t as_array (unsigned int len) + { return hb_array (arrayZ, len); } + hb_array_t as_array (unsigned int len) const + { return hb_array (arrayZ, len); } + operator hb_array_t () { return as_array (); } + operator hb_array_t () const { return as_array (); } + + template + Type &lsearch (unsigned int len, const T &x, Type ¬_found = Crap (Type)) + { return *as_array (len).lsearch (x, ¬_found); } + template + const Type &lsearch (unsigned int len, const T &x, const Type ¬_found = Null (Type)) const + { return *as_array (len).lsearch (x, ¬_found); } + + void qsort (unsigned int len, unsigned int start = 0, unsigned int end = (unsigned int) -1) + { as_array (len).qsort (start, end); } + + bool serialize (hb_serialize_context_t *c, unsigned int items_len) + { + TRACE_SERIALIZE (this); + if (unlikely (!c->extend (*this, items_len))) return_trace (false); + return_trace (true); + } + template + bool serialize (hb_serialize_context_t *c, Iterator items) + { + TRACE_SERIALIZE (this); + unsigned count = items.len (); + if (unlikely (!serialize (c, count))) return_trace (false); + /* TODO Umm. Just exhaust the iterator instead? Being extra + * cautious right now.. */ + for (unsigned i = 0; i < count; i++, ++items) + arrayZ[i] = *items; + return_trace (true); + } + + UnsizedArrayOf* copy (hb_serialize_context_t *c, unsigned count) const + { + TRACE_SERIALIZE (this); + auto *out = c->start_embed (this); + if (unlikely (!as_array (count).copy (c))) return_trace (nullptr); + return_trace (out); + } + + template + bool sanitize (hb_sanitize_context_t *c, unsigned int count, Ts&&... ds) const + { + TRACE_SANITIZE (this); + if (unlikely (!sanitize_shallow (c, count))) return_trace (false); + if (!sizeof... (Ts) && hb_is_trivially_copyable (Type)) return_trace (true); + for (unsigned int i = 0; i < count; i++) + if (unlikely (!c->dispatch (arrayZ[i], hb_forward (ds)...))) + return_trace (false); + return_trace (true); + } + + bool sanitize_shallow (hb_sanitize_context_t *c, unsigned int count) const + { + TRACE_SANITIZE (this); + return_trace (c->check_array (arrayZ, count)); + } + + public: + Type arrayZ[HB_VAR_ARRAY]; + public: + DEFINE_SIZE_UNBOUNDED (0); +}; + +/* Unsized array of offset's */ +template +using UnsizedOffsetArrayOf = UnsizedArrayOf>; + +/* Unsized array of offsets relative to the beginning of the array itself. */ +template +struct UnsizedOffsetListOf : UnsizedOffsetArrayOf +{ + const Type& operator [] (int i_) const + { + unsigned int i = (unsigned int) i_; + const OffsetTo *p = &this->arrayZ[i]; + if (unlikely (p < this->arrayZ)) return Null (Type); /* Overflowed. */ + return this+*p; + } + Type& operator [] (int i_) + { + unsigned int i = (unsigned int) i_; + const OffsetTo *p = &this->arrayZ[i]; + if (unlikely (p < this->arrayZ)) return Crap (Type); /* Overflowed. */ + return this+*p; + } + + template + bool sanitize (hb_sanitize_context_t *c, unsigned int count, Ts&&... ds) const + { + TRACE_SANITIZE (this); + return_trace ((UnsizedOffsetArrayOf + ::sanitize (c, count, this, hb_forward (ds)...))); + } +}; + +/* An array with sorted elements. Supports binary searching. */ +template +struct SortedUnsizedArrayOf : UnsizedArrayOf +{ + hb_sorted_array_t as_array (unsigned int len) + { return hb_sorted_array (this->arrayZ, len); } + hb_sorted_array_t as_array (unsigned int len) const + { return hb_sorted_array (this->arrayZ, len); } + operator hb_sorted_array_t () { return as_array (); } + operator hb_sorted_array_t () const { return as_array (); } + + template + Type &bsearch (unsigned int len, const T &x, Type ¬_found = Crap (Type)) + { return *as_array (len).bsearch (x, ¬_found); } + template + const Type &bsearch (unsigned int len, const T &x, const Type ¬_found = Null (Type)) const + { return *as_array (len).bsearch (x, ¬_found); } + template + bool bfind (unsigned int len, const T &x, unsigned int *i = nullptr, + hb_bfind_not_found_t not_found = HB_BFIND_NOT_FOUND_DONT_STORE, + unsigned int to_store = (unsigned int) -1) const + { return as_array (len).bfind (x, i, not_found, to_store); } +}; + + +/* An array with a number of elements. */ +template +struct ArrayOf +{ + typedef Type item_t; + static constexpr unsigned item_size = hb_static_size (Type); + + HB_DELETE_CREATE_COPY_ASSIGN (ArrayOf); + + const Type& operator [] (int i_) const + { + unsigned int i = (unsigned int) i_; + if (unlikely (i >= len)) return Null (Type); + return arrayZ[i]; + } + Type& operator [] (int i_) + { + unsigned int i = (unsigned int) i_; + if (unlikely (i >= len)) return Crap (Type); + return arrayZ[i]; + } + + unsigned int get_size () const + { return len.static_size + len * Type::static_size; } + + explicit operator bool () const { return len; } + + void pop () { len--; } + + hb_array_t< Type> as_array () { return hb_array (arrayZ, len); } + hb_array_t as_array () const { return hb_array (arrayZ, len); } + + /* Iterator. */ + typedef hb_array_t iter_t; + typedef hb_array_t< Type> writer_t; + iter_t iter () const { return as_array (); } + writer_t writer () { return as_array (); } + operator iter_t () const { return iter (); } + operator writer_t () { return writer (); } + + hb_array_t sub_array (unsigned int start_offset, unsigned int count) const + { return as_array ().sub_array (start_offset, count); } + hb_array_t sub_array (unsigned int start_offset, unsigned int *count = nullptr /* IN/OUT */) const + { return as_array ().sub_array (start_offset, count); } + hb_array_t sub_array (unsigned int start_offset, unsigned int count) + { return as_array ().sub_array (start_offset, count); } + hb_array_t sub_array (unsigned int start_offset, unsigned int *count = nullptr /* IN/OUT */) + { return as_array ().sub_array (start_offset, count); } + + bool serialize (hb_serialize_context_t *c, unsigned int items_len) + { + TRACE_SERIALIZE (this); + if (unlikely (!c->extend_min (*this))) return_trace (false); + c->check_assign (len, items_len); + if (unlikely (!c->extend (*this))) return_trace (false); + return_trace (true); + } + template + bool serialize (hb_serialize_context_t *c, Iterator items) + { + TRACE_SERIALIZE (this); + unsigned count = items.len (); + if (unlikely (!serialize (c, count))) return_trace (false); + /* TODO Umm. Just exhaust the iterator instead? Being extra + * cautious right now.. */ + for (unsigned i = 0; i < count; i++, ++items) + arrayZ[i] = *items; + return_trace (true); + } + + Type* serialize_append (hb_serialize_context_t *c) + { + TRACE_SERIALIZE (this); + len++; + if (unlikely (!len || !c->extend (*this))) + { + len--; + return_trace (nullptr); + } + return_trace (&arrayZ[len - 1]); + } + + ArrayOf* copy (hb_serialize_context_t *c) const + { + TRACE_SERIALIZE (this); + auto *out = c->start_embed (this); + if (unlikely (!c->extend_min (out))) return_trace (nullptr); + c->check_assign (out->len, len); + if (unlikely (!as_array ().copy (c))) return_trace (nullptr); + return_trace (out); + } + + template + bool sanitize (hb_sanitize_context_t *c, Ts&&... ds) const + { + TRACE_SANITIZE (this); + if (unlikely (!sanitize_shallow (c))) return_trace (false); + if (!sizeof... (Ts) && hb_is_trivially_copyable (Type)) return_trace (true); + unsigned int count = len; + for (unsigned int i = 0; i < count; i++) + if (unlikely (!c->dispatch (arrayZ[i], hb_forward (ds)...))) + return_trace (false); + return_trace (true); + } + + template + Type &lsearch (const T &x, Type ¬_found = Crap (Type)) + { return *as_array ().lsearch (x, ¬_found); } + template + const Type &lsearch (const T &x, const Type ¬_found = Null (Type)) const + { return *as_array ().lsearch (x, ¬_found); } + + void qsort (unsigned int start = 0, unsigned int end = (unsigned int) -1) + { as_array ().qsort (start, end); } + + bool sanitize_shallow (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (len.sanitize (c) && c->check_array (arrayZ, len)); + } + + public: + LenType len; + Type arrayZ[HB_VAR_ARRAY]; + public: + DEFINE_SIZE_ARRAY (sizeof (LenType), arrayZ); +}; +template +using LArrayOf = ArrayOf; +using PString = ArrayOf; + +/* Array of Offset's */ +template +using OffsetArrayOf = ArrayOf>; +template +using LOffsetArrayOf = ArrayOf>; +template +using LOffsetLArrayOf = ArrayOf, HBUINT32>; + +/* Array of offsets relative to the beginning of the array itself. */ +template +struct OffsetListOf : OffsetArrayOf +{ + const Type& operator [] (int i_) const + { + unsigned int i = (unsigned int) i_; + if (unlikely (i >= this->len)) return Null (Type); + return this+this->arrayZ[i]; + } + const Type& operator [] (int i_) + { + unsigned int i = (unsigned int) i_; + if (unlikely (i >= this->len)) return Crap (Type); + return this+this->arrayZ[i]; + } + + bool subset (hb_subset_context_t *c) const + { + TRACE_SUBSET (this); + struct OffsetListOf *out = c->serializer->embed (*this); + if (unlikely (!out)) return_trace (false); + unsigned int count = this->len; + for (unsigned int i = 0; i < count; i++) + out->arrayZ[i].serialize_subset (c, this->arrayZ[i], this, out); + return_trace (true); + } + + template + bool sanitize (hb_sanitize_context_t *c, Ts&&... ds) const + { + TRACE_SANITIZE (this); + return_trace (OffsetArrayOf::sanitize (c, this, hb_forward (ds)...)); + } +}; + +/* An array starting at second element. */ +template +struct HeadlessArrayOf +{ + static constexpr unsigned item_size = Type::static_size; + + HB_DELETE_CREATE_COPY_ASSIGN (HeadlessArrayOf); + + const Type& operator [] (int i_) const + { + unsigned int i = (unsigned int) i_; + if (unlikely (i >= lenP1 || !i)) return Null (Type); + return arrayZ[i-1]; + } + Type& operator [] (int i_) + { + unsigned int i = (unsigned int) i_; + if (unlikely (i >= lenP1 || !i)) return Crap (Type); + return arrayZ[i-1]; + } + unsigned int get_size () const + { return lenP1.static_size + get_length () * Type::static_size; } + + unsigned get_length () const { return lenP1 ? lenP1 - 1 : 0; } + + hb_array_t< Type> as_array () { return hb_array (arrayZ, get_length ()); } + hb_array_t as_array () const { return hb_array (arrayZ, get_length ()); } + + /* Iterator. */ + typedef hb_array_t iter_t; + typedef hb_array_t< Type> writer_t; + iter_t iter () const { return as_array (); } + writer_t writer () { return as_array (); } + operator iter_t () const { return iter (); } + operator writer_t () { return writer (); } + + bool serialize (hb_serialize_context_t *c, unsigned int items_len) + { + TRACE_SERIALIZE (this); + if (unlikely (!c->extend_min (*this))) return_trace (false); + c->check_assign (lenP1, items_len + 1); + if (unlikely (!c->extend (*this))) return_trace (false); + return_trace (true); + } + template + bool serialize (hb_serialize_context_t *c, Iterator items) + { + TRACE_SERIALIZE (this); + unsigned count = items.len (); + if (unlikely (!serialize (c, count))) return_trace (false); + /* TODO Umm. Just exhaust the iterator instead? Being extra + * cautious right now.. */ + for (unsigned i = 0; i < count; i++, ++items) + arrayZ[i] = *items; + return_trace (true); + } + + template + bool sanitize (hb_sanitize_context_t *c, Ts&&... ds) const + { + TRACE_SANITIZE (this); + if (unlikely (!sanitize_shallow (c))) return_trace (false); + if (!sizeof... (Ts) && hb_is_trivially_copyable (Type)) return_trace (true); + unsigned int count = get_length (); + for (unsigned int i = 0; i < count; i++) + if (unlikely (!c->dispatch (arrayZ[i], hb_forward (ds)...))) + return_trace (false); + return_trace (true); + } + + private: + bool sanitize_shallow (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (lenP1.sanitize (c) && + (!lenP1 || c->check_array (arrayZ, lenP1 - 1))); + } + + public: + LenType lenP1; + Type arrayZ[HB_VAR_ARRAY]; + public: + DEFINE_SIZE_ARRAY (sizeof (LenType), arrayZ); +}; + +/* An array storing length-1. */ +template +struct ArrayOfM1 +{ + HB_DELETE_CREATE_COPY_ASSIGN (ArrayOfM1); + + const Type& operator [] (int i_) const + { + unsigned int i = (unsigned int) i_; + if (unlikely (i > lenM1)) return Null (Type); + return arrayZ[i]; + } + Type& operator [] (int i_) + { + unsigned int i = (unsigned int) i_; + if (unlikely (i > lenM1)) return Crap (Type); + return arrayZ[i]; + } + unsigned int get_size () const + { return lenM1.static_size + (lenM1 + 1) * Type::static_size; } + + template + bool sanitize (hb_sanitize_context_t *c, Ts&&... ds) const + { + TRACE_SANITIZE (this); + if (unlikely (!sanitize_shallow (c))) return_trace (false); + unsigned int count = lenM1 + 1; + for (unsigned int i = 0; i < count; i++) + if (unlikely (!c->dispatch (arrayZ[i], hb_forward (ds)...))) + return_trace (false); + return_trace (true); + } + + private: + bool sanitize_shallow (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (lenM1.sanitize (c) && + (c->check_array (arrayZ, lenM1 + 1))); + } + + public: + LenType lenM1; + Type arrayZ[HB_VAR_ARRAY]; + public: + DEFINE_SIZE_ARRAY (sizeof (LenType), arrayZ); +}; + +/* An array with sorted elements. Supports binary searching. */ +template +struct SortedArrayOf : ArrayOf +{ + hb_sorted_array_t< Type> as_array () { return hb_sorted_array (this->arrayZ, this->len); } + hb_sorted_array_t as_array () const { return hb_sorted_array (this->arrayZ, this->len); } + + /* Iterator. */ + typedef hb_sorted_array_t iter_t; + typedef hb_sorted_array_t< Type> writer_t; + iter_t iter () const { return as_array (); } + writer_t writer () { return as_array (); } + operator iter_t () const { return iter (); } + operator writer_t () { return writer (); } + + hb_sorted_array_t sub_array (unsigned int start_offset, unsigned int count) const + { return as_array ().sub_array (start_offset, count); } + hb_sorted_array_t sub_array (unsigned int start_offset, unsigned int *count = nullptr /* IN/OUT */) const + { return as_array ().sub_array (start_offset, count); } + hb_sorted_array_t sub_array (unsigned int start_offset, unsigned int count) + { return as_array ().sub_array (start_offset, count); } + hb_sorted_array_t sub_array (unsigned int start_offset, unsigned int *count = nullptr /* IN/OUT */) + { return as_array ().sub_array (start_offset, count); } + + bool serialize (hb_serialize_context_t *c, unsigned int items_len) + { + TRACE_SERIALIZE (this); + bool ret = ArrayOf::serialize (c, items_len); + return_trace (ret); + } + template + bool serialize (hb_serialize_context_t *c, Iterator items) + { + TRACE_SERIALIZE (this); + bool ret = ArrayOf::serialize (c, items); + return_trace (ret); + } + + template + Type &bsearch (const T &x, Type ¬_found = Crap (Type)) + { return *as_array ().bsearch (x, ¬_found); } + template + const Type &bsearch (const T &x, const Type ¬_found = Null (Type)) const + { return *as_array ().bsearch (x, ¬_found); } + template + bool bfind (const T &x, unsigned int *i = nullptr, + hb_bfind_not_found_t not_found = HB_BFIND_NOT_FOUND_DONT_STORE, + unsigned int to_store = (unsigned int) -1) const + { return as_array ().bfind (x, i, not_found, to_store); } +}; + +/* + * Binary-search arrays + */ + +template +struct BinSearchHeader +{ + operator uint32_t () const { return len; } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + BinSearchHeader& operator = (unsigned int v) + { + len = v; + assert (len == v); + entrySelector = hb_max (1u, hb_bit_storage (v)) - 1; + searchRange = 16 * (1u << entrySelector); + rangeShift = v * 16 > searchRange + ? 16 * v - searchRange + : 0; + return *this; + } + + protected: + LenType len; + LenType searchRange; + LenType entrySelector; + LenType rangeShift; + + public: + DEFINE_SIZE_STATIC (8); +}; + +template +using BinSearchArrayOf = SortedArrayOf>; + + +struct VarSizedBinSearchHeader +{ + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + HBUINT16 unitSize; /* Size of a lookup unit for this search in bytes. */ + HBUINT16 nUnits; /* Number of units of the preceding size to be searched. */ + HBUINT16 searchRange; /* The value of unitSize times the largest power of 2 + * that is less than or equal to the value of nUnits. */ + HBUINT16 entrySelector; /* The log base 2 of the largest power of 2 less than + * or equal to the value of nUnits. */ + HBUINT16 rangeShift; /* The value of unitSize times the difference of the + * value of nUnits minus the largest power of 2 less + * than or equal to the value of nUnits. */ + public: + DEFINE_SIZE_STATIC (10); +}; + +template +struct VarSizedBinSearchArrayOf +{ + static constexpr unsigned item_size = Type::static_size; + + HB_DELETE_CREATE_COPY_ASSIGN (VarSizedBinSearchArrayOf); + + bool last_is_terminator () const + { + if (unlikely (!header.nUnits)) return false; + + /* Gah. + * + * "The number of termination values that need to be included is table-specific. + * The value that indicates binary search termination is 0xFFFF." */ + const HBUINT16 *words = &StructAtOffset (&bytesZ, (header.nUnits - 1) * header.unitSize); + unsigned int count = Type::TerminationWordCount; + for (unsigned int i = 0; i < count; i++) + if (words[i] != 0xFFFFu) + return false; + return true; + } + + const Type& operator [] (int i_) const + { + unsigned int i = (unsigned int) i_; + if (unlikely (i >= get_length ())) return Null (Type); + return StructAtOffset (&bytesZ, i * header.unitSize); + } + Type& operator [] (int i_) + { + unsigned int i = (unsigned int) i_; + if (unlikely (i >= get_length ())) return Crap (Type); + return StructAtOffset (&bytesZ, i * header.unitSize); + } + unsigned int get_length () const + { return header.nUnits - last_is_terminator (); } + unsigned int get_size () const + { return header.static_size + header.nUnits * header.unitSize; } + + template + bool sanitize (hb_sanitize_context_t *c, Ts&&... ds) const + { + TRACE_SANITIZE (this); + if (unlikely (!sanitize_shallow (c))) return_trace (false); + if (!sizeof... (Ts) && hb_is_trivially_copyable (Type)) return_trace (true); + unsigned int count = get_length (); + for (unsigned int i = 0; i < count; i++) + if (unlikely (!(*this)[i].sanitize (c, hb_forward (ds)...))) + return_trace (false); + return_trace (true); + } + + template + const Type *bsearch (const T &key) const + { + unsigned int size = header.unitSize; + int min = 0, max = (int) get_length () - 1; + while (min <= max) + { + int mid = ((unsigned int) min + (unsigned int) max) / 2; + const Type *p = (const Type *) (((const char *) &bytesZ) + (mid * size)); + int c = p->cmp (key); + if (c < 0) max = mid - 1; + else if (c > 0) min = mid + 1; + else return p; + } + return nullptr; + } + + private: + bool sanitize_shallow (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (header.sanitize (c) && + Type::static_size <= header.unitSize && + c->check_range (bytesZ.arrayZ, + header.nUnits, + header.unitSize)); + } + + protected: + VarSizedBinSearchHeader header; + UnsizedArrayOf bytesZ; + public: + DEFINE_SIZE_ARRAY (10, bytesZ); +}; + + +} /* namespace OT */ + + +#endif /* HB_OPEN_TYPE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff-common.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff-common.hh new file mode 100644 index 000000000..f4c4fe857 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff-common.hh @@ -0,0 +1,653 @@ +/* + * Copyright © 2018 Adobe Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Adobe Author(s): Michiharu Ariza + */ +#ifndef HB_OT_CFF_COMMON_HH +#define HB_OT_CFF_COMMON_HH + +#include "hb-open-type.hh" +#include "hb-bimap.hh" +#include "hb-ot-layout-common.hh" +#include "hb-cff-interp-dict-common.hh" +#include "hb-subset-plan.hh" + +namespace CFF { + +using namespace OT; + +#define CFF_UNDEF_CODE 0xFFFFFFFF + +/* utility macro */ +template +static inline const Type& StructAtOffsetOrNull (const void *P, unsigned int offset) +{ return offset ? StructAtOffset (P, offset) : Null (Type); } + +inline unsigned int calcOffSize (unsigned int dataSize) +{ + unsigned int size = 1; + unsigned int offset = dataSize + 1; + while (offset & ~0xFF) + { + size++; + offset >>= 8; + } + /* format does not support size > 4; caller should handle it as an error */ + return size; +} + +struct code_pair_t +{ + hb_codepoint_t code; + hb_codepoint_t glyph; +}; + +typedef hb_vector_t str_buff_t; +struct str_buff_vec_t : hb_vector_t +{ + void fini () { SUPER::fini_deep (); } + + unsigned int total_size () const + { + unsigned int size = 0; + for (unsigned int i = 0; i < length; i++) + size += (*this)[i].length; + return size; + } + + private: + typedef hb_vector_t SUPER; +}; + +/* CFF INDEX */ +template +struct CFFIndex +{ + static unsigned int calculate_offset_array_size (unsigned int offSize, unsigned int count) + { return offSize * (count + 1); } + + unsigned int offset_array_size () const + { return calculate_offset_array_size (offSize, count); } + + static unsigned int calculate_serialized_size (unsigned int offSize_, unsigned int count, + unsigned int dataSize) + { + if (count == 0) return COUNT::static_size; + return min_size + calculate_offset_array_size (offSize_, count) + dataSize; + } + + bool serialize (hb_serialize_context_t *c, const CFFIndex &src) + { + TRACE_SERIALIZE (this); + unsigned int size = src.get_size (); + CFFIndex *dest = c->allocate_size (size); + if (unlikely (dest == nullptr)) return_trace (false); + memcpy (dest, &src, size); + return_trace (true); + } + + bool serialize (hb_serialize_context_t *c, + unsigned int offSize_, + const byte_str_array_t &byteArray) + { + TRACE_SERIALIZE (this); + if (byteArray.length == 0) + { + COUNT *dest = c->allocate_min (); + if (unlikely (dest == nullptr)) return_trace (false); + *dest = 0; + } + else + { + /* serialize CFFIndex header */ + if (unlikely (!c->extend_min (*this))) return_trace (false); + this->count = byteArray.length; + this->offSize = offSize_; + if (unlikely (!c->allocate_size (offSize_ * (byteArray.length + 1)))) + return_trace (false); + + /* serialize indices */ + unsigned int offset = 1; + unsigned int i = 0; + for (; i < byteArray.length; i++) + { + set_offset_at (i, offset); + offset += byteArray[i].get_size (); + } + set_offset_at (i, offset); + + /* serialize data */ + for (unsigned int i = 0; i < byteArray.length; i++) + { + const byte_str_t &bs = byteArray[i]; + unsigned char *dest = c->allocate_size (bs.length); + if (unlikely (dest == nullptr)) + return_trace (false); + memcpy (dest, &bs[0], bs.length); + } + } + return_trace (true); + } + + bool serialize (hb_serialize_context_t *c, + unsigned int offSize_, + const str_buff_vec_t &buffArray) + { + byte_str_array_t byteArray; + byteArray.init (); + byteArray.resize (buffArray.length); + for (unsigned int i = 0; i < byteArray.length; i++) + byteArray[i] = byte_str_t (buffArray[i].arrayZ, buffArray[i].length); + bool result = this->serialize (c, offSize_, byteArray); + byteArray.fini (); + return result; + } + + void set_offset_at (unsigned int index, unsigned int offset) + { + HBUINT8 *p = offsets + offSize * index + offSize; + unsigned int size = offSize; + for (; size; size--) + { + --p; + *p = offset & 0xFF; + offset >>= 8; + } + } + + unsigned int offset_at (unsigned int index) const + { + assert (index <= count); + const HBUINT8 *p = offsets + offSize * index; + unsigned int size = offSize; + unsigned int offset = 0; + for (; size; size--) + offset = (offset << 8) + *p++; + return offset; + } + + unsigned int length_at (unsigned int index) const + { + if (unlikely ((offset_at (index + 1) < offset_at (index)) || + (offset_at (index + 1) > offset_at (count)))) + return 0; + return offset_at (index + 1) - offset_at (index); + } + + const unsigned char *data_base () const + { return (const unsigned char *) this + min_size + offset_array_size (); } + + unsigned int data_size () const { return HBINT8::static_size; } + + byte_str_t operator [] (unsigned int index) const + { + if (unlikely (index >= count)) return Null (byte_str_t); + return byte_str_t (data_base () + offset_at (index) - 1, length_at (index)); + } + + unsigned int get_size () const + { + if (this == &Null (CFFIndex)) return 0; + if (count > 0) + return min_size + offset_array_size () + (offset_at (count) - 1); + return count.static_size; /* empty CFFIndex contains count only */ + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely ((c->check_struct (this) && count == 0) || /* empty INDEX */ + (c->check_struct (this) && offSize >= 1 && offSize <= 4 && + c->check_array (offsets, offSize, count + 1) && + c->check_array ((const HBUINT8*) data_base (), 1, max_offset () - 1)))); + } + + protected: + unsigned int max_offset () const + { + unsigned int max = 0; + for (unsigned int i = 0; i < count + 1u; i++) + { + unsigned int off = offset_at (i); + if (off > max) max = off; + } + return max; + } + + public: + COUNT count; /* Number of object data. Note there are (count+1) offsets */ + HBUINT8 offSize; /* The byte size of each offset in the offsets array. */ + HBUINT8 offsets[HB_VAR_ARRAY]; /* The array of (count + 1) offsets into objects array (1-base). */ + /* HBUINT8 data[HB_VAR_ARRAY]; Object data */ + public: + DEFINE_SIZE_ARRAY (COUNT::static_size + HBUINT8::static_size, offsets); +}; + +template +struct CFFIndexOf : CFFIndex +{ + const byte_str_t operator [] (unsigned int index) const + { + if (likely (index < CFFIndex::count)) + return byte_str_t (CFFIndex::data_base () + CFFIndex::offset_at (index) - 1, CFFIndex::length_at (index)); + return Null(byte_str_t); + } + + template + bool serialize (hb_serialize_context_t *c, + unsigned int offSize_, + const DATA *dataArray, + unsigned int dataArrayLen, + const hb_vector_t &dataSizeArray, + const PARAM1 ¶m1, + const PARAM2 ¶m2) + { + TRACE_SERIALIZE (this); + /* serialize CFFIndex header */ + if (unlikely (!c->extend_min (*this))) return_trace (false); + this->count = dataArrayLen; + this->offSize = offSize_; + if (unlikely (!c->allocate_size (offSize_ * (dataArrayLen + 1)))) + return_trace (false); + + /* serialize indices */ + unsigned int offset = 1; + unsigned int i = 0; + for (; i < dataArrayLen; i++) + { + CFFIndex::set_offset_at (i, offset); + offset += dataSizeArray[i]; + } + CFFIndex::set_offset_at (i, offset); + + /* serialize data */ + for (unsigned int i = 0; i < dataArrayLen; i++) + { + TYPE *dest = c->start_embed (); + if (unlikely (dest == nullptr || + !dest->serialize (c, dataArray[i], param1, param2))) + return_trace (false); + } + return_trace (true); + } + + /* in parallel to above */ + template + static unsigned int calculate_serialized_size (unsigned int &offSize_ /* OUT */, + const DATA *dataArray, + unsigned int dataArrayLen, + hb_vector_t &dataSizeArray, /* OUT */ + const PARAM ¶m) + { + /* determine offset size */ + unsigned int totalDataSize = 0; + for (unsigned int i = 0; i < dataArrayLen; i++) + { + unsigned int dataSize = TYPE::calculate_serialized_size (dataArray[i], param); + dataSizeArray[i] = dataSize; + totalDataSize += dataSize; + } + offSize_ = calcOffSize (totalDataSize); + + return CFFIndex::calculate_serialized_size (offSize_, dataArrayLen, totalDataSize); + } +}; + +/* Top Dict, Font Dict, Private Dict */ +struct Dict : UnsizedByteStr +{ + template + bool serialize (hb_serialize_context_t *c, + const DICTVAL &dictval, + OP_SERIALIZER& opszr, + PARAM& param) + { + TRACE_SERIALIZE (this); + for (unsigned int i = 0; i < dictval.get_count (); i++) + if (unlikely (!opszr.serialize (c, dictval[i], param))) + return_trace (false); + + return_trace (true); + } + + /* in parallel to above */ + template + static unsigned int calculate_serialized_size (const DICTVAL &dictval, + OP_SERIALIZER& opszr, + PARAM& param) + { + unsigned int size = 0; + for (unsigned int i = 0; i < dictval.get_count (); i++) + size += opszr.calculate_serialized_size (dictval[i], param); + return size; + } + + template + static unsigned int calculate_serialized_size (const DICTVAL &dictval, + OP_SERIALIZER& opszr) + { + unsigned int size = 0; + for (unsigned int i = 0; i < dictval.get_count (); i++) + size += opszr.calculate_serialized_size (dictval[i]); + return size; + } + + template + static bool serialize_int_op (hb_serialize_context_t *c, op_code_t op, int value, op_code_t intOp) + { + // XXX: not sure why but LLVM fails to compile the following 'unlikely' macro invocation + if (/*unlikely*/ (!serialize_int (c, intOp, value))) + return false; + + TRACE_SERIALIZE (this); + /* serialize the opcode */ + HBUINT8 *p = c->allocate_size (OpCode_Size (op)); + if (unlikely (p == nullptr)) return_trace (false); + if (Is_OpCode_ESC (op)) + { + *p = OpCode_escape; + op = Unmake_OpCode_ESC (op); + p++; + } + *p = op; + return_trace (true); + } + + static bool serialize_uint4_op (hb_serialize_context_t *c, op_code_t op, int value) + { return serialize_int_op (c, op, value, OpCode_longintdict); } + + static bool serialize_uint2_op (hb_serialize_context_t *c, op_code_t op, int value) + { return serialize_int_op (c, op, value, OpCode_shortint); } + + static bool serialize_offset4_op (hb_serialize_context_t *c, op_code_t op, int value) + { return serialize_uint4_op (c, op, value); } + + static bool serialize_offset2_op (hb_serialize_context_t *c, op_code_t op, int value) + { return serialize_uint2_op (c, op, value); } +}; + +struct TopDict : Dict {}; +struct FontDict : Dict {}; +struct PrivateDict : Dict {}; + +struct table_info_t +{ + void init () { offSize = offset = size = 0; } + + unsigned int offset; + unsigned int size; + unsigned int offSize; +}; + +template +struct FDArray : CFFIndexOf +{ + /* used by CFF1 */ + template + bool serialize (hb_serialize_context_t *c, + unsigned int offSize_, + const hb_vector_t &fontDicts, + OP_SERIALIZER& opszr) + { + TRACE_SERIALIZE (this); + if (unlikely (!c->extend_min (*this))) return_trace (false); + this->count = fontDicts.length; + this->offSize = offSize_; + if (unlikely (!c->allocate_size (offSize_ * (fontDicts.length + 1)))) + return_trace (false); + + /* serialize font dict offsets */ + unsigned int offset = 1; + unsigned int fid = 0; + for (; fid < fontDicts.length; fid++) + { + CFFIndexOf::set_offset_at (fid, offset); + offset += FontDict::calculate_serialized_size (fontDicts[fid], opszr); + } + CFFIndexOf::set_offset_at (fid, offset); + + /* serialize font dicts */ + for (unsigned int i = 0; i < fontDicts.length; i++) + { + FontDict *dict = c->start_embed (); + if (unlikely (!dict->serialize (c, fontDicts[i], opszr, fontDicts[i]))) + return_trace (false); + } + return_trace (true); + } + + /* used by CFF2 */ + template + bool serialize (hb_serialize_context_t *c, + unsigned int offSize_, + const hb_vector_t &fontDicts, + unsigned int fdCount, + const hb_inc_bimap_t &fdmap, + OP_SERIALIZER& opszr, + const hb_vector_t &privateInfos) + { + TRACE_SERIALIZE (this); + if (unlikely (!c->extend_min (*this))) return_trace (false); + this->count = fdCount; + this->offSize = offSize_; + if (unlikely (!c->allocate_size (offSize_ * (fdCount + 1)))) + return_trace (false); + + /* serialize font dict offsets */ + unsigned int offset = 1; + unsigned int fid = 0; + for (unsigned i = 0; i < fontDicts.length; i++) + if (fdmap.has (i)) + { + if (unlikely (fid >= fdCount)) return_trace (false); + CFFIndexOf::set_offset_at (fid++, offset); + offset += FontDict::calculate_serialized_size (fontDicts[i], opszr); + } + CFFIndexOf::set_offset_at (fid, offset); + + /* serialize font dicts */ + for (unsigned int i = 0; i < fontDicts.length; i++) + if (fdmap.has (i)) + { + FontDict *dict = c->start_embed (); + if (unlikely (!dict->serialize (c, fontDicts[i], opszr, privateInfos[fdmap[i]]))) + return_trace (false); + } + return_trace (true); + } + + /* in parallel to above */ + template + static unsigned int calculate_serialized_size (unsigned int &offSize_ /* OUT */, + const hb_vector_t &fontDicts, + unsigned int fdCount, + const hb_inc_bimap_t &fdmap, + OP_SERIALIZER& opszr) + { + unsigned int dictsSize = 0; + for (unsigned int i = 0; i < fontDicts.len; i++) + if (fdmap.has (i)) + dictsSize += FontDict::calculate_serialized_size (fontDicts[i], opszr); + + offSize_ = calcOffSize (dictsSize); + return CFFIndex::calculate_serialized_size (offSize_, fdCount, dictsSize); + } +}; + +/* FDSelect */ +struct FDSelect0 { + bool sanitize (hb_sanitize_context_t *c, unsigned int fdcount) const + { + TRACE_SANITIZE (this); + if (unlikely (!(c->check_struct (this)))) + return_trace (false); + for (unsigned int i = 0; i < c->get_num_glyphs (); i++) + if (unlikely (!fds[i].sanitize (c))) + return_trace (false); + + return_trace (true); + } + + hb_codepoint_t get_fd (hb_codepoint_t glyph) const + { return (hb_codepoint_t) fds[glyph]; } + + unsigned int get_size (unsigned int num_glyphs) const + { return HBUINT8::static_size * num_glyphs; } + + HBUINT8 fds[HB_VAR_ARRAY]; + + DEFINE_SIZE_MIN (0); +}; + +template +struct FDSelect3_4_Range +{ + bool sanitize (hb_sanitize_context_t *c, const void * /*nullptr*/, unsigned int fdcount) const + { + TRACE_SANITIZE (this); + return_trace (first < c->get_num_glyphs () && (fd < fdcount)); + } + + GID_TYPE first; + FD_TYPE fd; + public: + DEFINE_SIZE_STATIC (GID_TYPE::static_size + FD_TYPE::static_size); +}; + +template +struct FDSelect3_4 +{ + unsigned int get_size () const + { return GID_TYPE::static_size * 2 + ranges.get_size (); } + + bool sanitize (hb_sanitize_context_t *c, unsigned int fdcount) const + { + TRACE_SANITIZE (this); + if (unlikely (!c->check_struct (this) || !ranges.sanitize (c, nullptr, fdcount) || + (nRanges () == 0) || ranges[0].first != 0)) + return_trace (false); + + for (unsigned int i = 1; i < nRanges (); i++) + if (unlikely (ranges[i - 1].first >= ranges[i].first)) + return_trace (false); + + if (unlikely (!sentinel().sanitize (c) || (sentinel() != c->get_num_glyphs ()))) + return_trace (false); + + return_trace (true); + } + + hb_codepoint_t get_fd (hb_codepoint_t glyph) const + { + unsigned int i; + for (i = 1; i < nRanges (); i++) + if (glyph < ranges[i].first) + break; + + return (hb_codepoint_t)ranges[i - 1].fd; + } + + GID_TYPE &nRanges () { return ranges.len; } + GID_TYPE nRanges () const { return ranges.len; } + GID_TYPE &sentinel () { return StructAfter (ranges[nRanges () - 1]); } + const GID_TYPE &sentinel () const { return StructAfter (ranges[nRanges () - 1]); } + + ArrayOf, GID_TYPE> ranges; + /* GID_TYPE sentinel */ + + DEFINE_SIZE_ARRAY (GID_TYPE::static_size, ranges); +}; + +typedef FDSelect3_4 FDSelect3; +typedef FDSelect3_4_Range FDSelect3_Range; + +struct FDSelect +{ + bool serialize (hb_serialize_context_t *c, const FDSelect &src, unsigned int num_glyphs) + { + TRACE_SERIALIZE (this); + unsigned int size = src.get_size (num_glyphs); + FDSelect *dest = c->allocate_size (size); + if (unlikely (dest == nullptr)) return_trace (false); + memcpy (dest, &src, size); + return_trace (true); + } + + unsigned int calculate_serialized_size (unsigned int num_glyphs) const + { return get_size (num_glyphs); } + + unsigned int get_size (unsigned int num_glyphs) const + { + switch (format) + { + case 0: return format.static_size + u.format0.get_size (num_glyphs); + case 3: return format.static_size + u.format3.get_size (); + default:return 0; + } + } + + hb_codepoint_t get_fd (hb_codepoint_t glyph) const + { + if (this == &Null (FDSelect)) + return 0; + switch (format) + { + case 0: return u.format0.get_fd (glyph); + case 3: return u.format3.get_fd (glyph); + default:return 0; + } + } + + bool sanitize (hb_sanitize_context_t *c, unsigned int fdcount) const + { + TRACE_SANITIZE (this); + if (unlikely (!c->check_struct (this))) + return_trace (false); + + switch (format) + { + case 0: return_trace (u.format0.sanitize (c, fdcount)); + case 3: return_trace (u.format3.sanitize (c, fdcount)); + default:return_trace (false); + } + } + + HBUINT8 format; + union { + FDSelect0 format0; + FDSelect3 format3; + } u; + public: + DEFINE_SIZE_MIN (1); +}; + +template +struct Subrs : CFFIndex +{ + typedef COUNT count_type; + typedef CFFIndex SUPER; +}; + +} /* namespace CFF */ + +#endif /* HB_OT_CFF_COMMON_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff1-table.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff1-table.cc new file mode 100644 index 000000000..3e4fc204f --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff1-table.cc @@ -0,0 +1,397 @@ +/* + * Copyright © 2018 Adobe Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Adobe Author(s): Michiharu Ariza + */ + +#include "hb.hh" + +#ifndef HB_NO_CFF + +#include "hb-ot-cff1-table.hh" +#include "hb-cff1-interp-cs.hh" + +using namespace CFF; + +/* SID to code */ +static const uint8_t standard_encoding_to_code [] = +{ + 0, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, + 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, + 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, + 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, + 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 177, + 178, 179, 180, 182, 183, 184, 185, 186, 187, 188, 189, 191, 193, 194, 195, 196, + 197, 198, 199, 200, 202, 203, 205, 206, 207, 208, 225, 227, 232, 233, 234, 235, + 241, 245, 248, 249, 250, 251 +}; + +/* SID to code */ +static const uint8_t expert_encoding_to_code [] = +{ + 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 45, 46, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 58, 59, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 87, 88, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 201, 0, 0, 0, 0, 189, 0, 0, 188, 0, + 0, 0, 0, 190, 202, 0, 0, 0, 0, 203, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 33, 34, 36, 37, 38, 39, 40, 41, 42, 43, 48, + 49, 50, 51, 52, 53, 54, 55, 56, 57, 60, 61, 62, 63, 65, 66, 67, + 68, 69, 73, 76, 77, 78, 79, 82, 83, 84, 86, 89, 90, 91, 93, 94, + 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, + 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, + 161, 162, 163, 166, 167, 168, 169, 170, 172, 175, 178, 179, 182, 183, 184, 191, + 192, 193, 194, 195, 196, 197, 200, 204, 205, 206, 207, 208, 209, 210, 211, 212, + 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, + 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, + 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255 +}; + +/* glyph ID to SID */ +static const uint16_t expert_charset_to_sid [] = +{ + 0, 1, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 13, 14, 15, 99, + 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 27, 28, 249, 250, 251, 252, + 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 109, 110, + 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, + 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, + 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, + 315, 316, 317, 318, 158, 155, 163, 319, 320, 321, 322, 323, 324, 325, 326, 150, + 164, 169, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, + 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, + 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, + 373, 374, 375, 376, 377, 378 +}; + +/* glyph ID to SID */ +static const uint16_t expert_subset_charset_to_sid [] = +{ + 0, 1, 231, 232, 235, 236, 237, 238, 13, 14, 15, 99, 239, 240, 241, 242, + 243, 244, 245, 246, 247, 248, 27, 28, 249, 250, 251, 253, 254, 255, 256, 257, + 258, 259, 260, 261, 262, 263, 264, 265, 266, 109, 110, 267, 268, 269, 270, 272, + 300, 301, 302, 305, 314, 315, 158, 155, 163, 320, 321, 322, 323, 324, 325, 326, + 150, 164, 169, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, + 340, 341, 342, 343, 344, 345, 346 +}; + +/* code to SID */ +static const uint8_t standard_encoding_to_sid [] = +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, + 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, + 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, + 0, 111, 112, 113, 114, 0, 115, 116, 117, 118, 119, 120, 121, 122, 0, 123, + 0, 124, 125, 126, 127, 128, 129, 130, 131, 0, 132, 133, 0, 134, 135, 136, + 137, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 138, 0, 139, 0, 0, 0, 0, 140, 141, 142, 143, 0, 0, 0, 0, + 0, 144, 0, 0, 0, 145, 0, 0, 146, 147, 148, 149, 0, 0, 0, 0 +}; + +hb_codepoint_t OT::cff1::lookup_standard_encoding_for_code (hb_codepoint_t sid) +{ + if (sid < ARRAY_LENGTH (standard_encoding_to_code)) + return (hb_codepoint_t)standard_encoding_to_code[sid]; + else + return 0; +} + +hb_codepoint_t OT::cff1::lookup_expert_encoding_for_code (hb_codepoint_t sid) +{ + if (sid < ARRAY_LENGTH (expert_encoding_to_code)) + return (hb_codepoint_t)expert_encoding_to_code[sid]; + else + return 0; +} + +hb_codepoint_t OT::cff1::lookup_expert_charset_for_sid (hb_codepoint_t glyph) +{ + if (glyph < ARRAY_LENGTH (expert_charset_to_sid)) + return (hb_codepoint_t)expert_charset_to_sid[glyph]; + else + return 0; +} + +hb_codepoint_t OT::cff1::lookup_expert_subset_charset_for_sid (hb_codepoint_t glyph) +{ + if (glyph < ARRAY_LENGTH (expert_subset_charset_to_sid)) + return (hb_codepoint_t)expert_subset_charset_to_sid[glyph]; + else + return 0; +} + +hb_codepoint_t OT::cff1::lookup_standard_encoding_for_sid (hb_codepoint_t code) +{ + if (code < ARRAY_LENGTH (standard_encoding_to_sid)) + return (hb_codepoint_t)standard_encoding_to_sid[code]; + else + return CFF_UNDEF_SID; +} + +struct bounds_t +{ + void init () + { + min.set_int (INT_MAX, INT_MAX); + max.set_int (INT_MIN, INT_MIN); + } + + void update (const point_t &pt) + { + if (pt.x < min.x) min.x = pt.x; + if (pt.x > max.x) max.x = pt.x; + if (pt.y < min.y) min.y = pt.y; + if (pt.y > max.y) max.y = pt.y; + } + + void merge (const bounds_t &b) + { + if (empty ()) + *this = b; + else if (!b.empty ()) + { + if (b.min.x < min.x) min.x = b.min.x; + if (b.max.x > max.x) max.x = b.max.x; + if (b.min.y < min.y) min.y = b.min.y; + if (b.max.y > max.y) max.y = b.max.y; + } + } + + void offset (const point_t &delta) + { + if (!empty ()) + { + min.move (delta); + max.move (delta); + } + } + + bool empty () const + { return (min.x >= max.x) || (min.y >= max.y); } + + point_t min; + point_t max; +}; + +struct cff1_extents_param_t +{ + void init (const OT::cff1::accelerator_t *_cff) + { + path_open = false; + cff = _cff; + bounds.init (); + } + + void start_path () { path_open = true; } + void end_path () { path_open = false; } + bool is_path_open () const { return path_open; } + + bool path_open; + bounds_t bounds; + + const OT::cff1::accelerator_t *cff; +}; + +struct cff1_path_procs_extents_t : path_procs_t +{ + static void moveto (cff1_cs_interp_env_t &env, cff1_extents_param_t& param, const point_t &pt) + { + param.end_path (); + env.moveto (pt); + } + + static void line (cff1_cs_interp_env_t &env, cff1_extents_param_t& param, const point_t &pt1) + { + if (!param.is_path_open ()) + { + param.start_path (); + param.bounds.update (env.get_pt ()); + } + env.moveto (pt1); + param.bounds.update (env.get_pt ()); + } + + static void curve (cff1_cs_interp_env_t &env, cff1_extents_param_t& param, const point_t &pt1, const point_t &pt2, const point_t &pt3) + { + if (!param.is_path_open ()) + { + param.start_path (); + param.bounds.update (env.get_pt ()); + } + /* include control points */ + param.bounds.update (pt1); + param.bounds.update (pt2); + env.moveto (pt3); + param.bounds.update (env.get_pt ()); + } +}; + +static bool _get_bounds (const OT::cff1::accelerator_t *cff, hb_codepoint_t glyph, bounds_t &bounds, bool in_seac=false); + +struct cff1_cs_opset_extents_t : cff1_cs_opset_t +{ + static void process_seac (cff1_cs_interp_env_t &env, cff1_extents_param_t& param) + { + unsigned int n = env.argStack.get_count (); + point_t delta; + delta.x = env.argStack[n-4]; + delta.y = env.argStack[n-3]; + hb_codepoint_t base = param.cff->std_code_to_glyph (env.argStack[n-2].to_int ()); + hb_codepoint_t accent = param.cff->std_code_to_glyph (env.argStack[n-1].to_int ()); + + bounds_t base_bounds, accent_bounds; + if (likely (!env.in_seac && base && accent + && _get_bounds (param.cff, base, base_bounds, true) + && _get_bounds (param.cff, accent, accent_bounds, true))) + { + param.bounds.merge (base_bounds); + accent_bounds.offset (delta); + param.bounds.merge (accent_bounds); + } + else + env.set_error (); + } +}; + +bool _get_bounds (const OT::cff1::accelerator_t *cff, hb_codepoint_t glyph, bounds_t &bounds, bool in_seac) +{ + bounds.init (); + if (unlikely (!cff->is_valid () || (glyph >= cff->num_glyphs))) return false; + + unsigned int fd = cff->fdSelect->get_fd (glyph); + cff1_cs_interpreter_t interp; + const byte_str_t str = (*cff->charStrings)[glyph]; + interp.env.init (str, *cff, fd); + interp.env.set_in_seac (in_seac); + cff1_extents_param_t param; + param.init (cff); + if (unlikely (!interp.interpret (param))) return false; + bounds = param.bounds; + return true; +} + +bool OT::cff1::accelerator_t::get_extents (hb_codepoint_t glyph, hb_glyph_extents_t *extents) const +{ +#ifdef HB_NO_OT_FONT_CFF + /* XXX Remove check when this code moves to .hh file. */ + return true; +#endif + + bounds_t bounds; + + if (!_get_bounds (this, glyph, bounds)) + return false; + + if (bounds.min.x >= bounds.max.x) + { + extents->width = 0; + extents->x_bearing = 0; + } + else + { + extents->x_bearing = (int32_t)bounds.min.x.floor (); + extents->width = (int32_t)bounds.max.x.ceil () - extents->x_bearing; + } + if (bounds.min.y >= bounds.max.y) + { + extents->height = 0; + extents->y_bearing = 0; + } + else + { + extents->y_bearing = (int32_t)bounds.max.y.ceil (); + extents->height = (int32_t)bounds.min.y.floor () - extents->y_bearing; + } + + return true; +} + +struct get_seac_param_t +{ + void init (const OT::cff1::accelerator_t *_cff) + { + cff = _cff; + base = 0; + accent = 0; + } + + bool has_seac () const { return base && accent; } + + const OT::cff1::accelerator_t *cff; + hb_codepoint_t base; + hb_codepoint_t accent; +}; + +struct cff1_cs_opset_seac_t : cff1_cs_opset_t +{ + static void process_seac (cff1_cs_interp_env_t &env, get_seac_param_t& param) + { + unsigned int n = env.argStack.get_count (); + hb_codepoint_t base_char = (hb_codepoint_t)env.argStack[n-2].to_int (); + hb_codepoint_t accent_char = (hb_codepoint_t)env.argStack[n-1].to_int (); + + param.base = param.cff->std_code_to_glyph (base_char); + param.accent = param.cff->std_code_to_glyph (accent_char); + } +}; + +bool OT::cff1::accelerator_t::get_seac_components (hb_codepoint_t glyph, hb_codepoint_t *base, hb_codepoint_t *accent) const +{ + if (unlikely (!is_valid () || (glyph >= num_glyphs))) return false; + + unsigned int fd = fdSelect->get_fd (glyph); + cff1_cs_interpreter_t interp; + const byte_str_t str = (*charStrings)[glyph]; + interp.env.init (str, *this, fd); + get_seac_param_t param; + param.init (this); + if (unlikely (!interp.interpret (param))) return false; + + if (param.has_seac ()) + { + *base = param.base; + *accent = param.accent; + return true; + } + return false; +} + + +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff1-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff1-table.hh new file mode 100644 index 000000000..882250f26 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff1-table.hh @@ -0,0 +1,1320 @@ +/* + * Copyright © 2018 Adobe Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Adobe Author(s): Michiharu Ariza + */ + +#ifndef HB_OT_CFF1_TABLE_HH +#define HB_OT_CFF1_TABLE_HH + +#include "hb-ot-head-table.hh" +#include "hb-ot-cff-common.hh" +#include "hb-subset-cff1.hh" + +namespace CFF { + +/* + * CFF -- Compact Font Format (CFF) + * http://www.adobe.com/content/dam/acom/en/devnet/font/pdfs/5176.CFF.pdf + */ +#define HB_OT_TAG_cff1 HB_TAG('C','F','F',' ') + +#define CFF_UNDEF_SID CFF_UNDEF_CODE + +enum EncodingID { StandardEncoding = 0, ExpertEncoding = 1 }; +enum CharsetID { ISOAdobeCharset = 0, ExpertCharset = 1, ExpertSubsetCharset = 2 }; + +typedef CFFIndex CFF1Index; +template struct CFF1IndexOf : CFFIndexOf {}; + +typedef CFFIndex CFF1Index; +typedef CFF1Index CFF1CharStrings; +typedef FDArray CFF1FDArray; +typedef Subrs CFF1Subrs; + +struct CFF1FDSelect : FDSelect {}; + +/* Encoding */ +struct Encoding0 { + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (codes.sanitize (c)); + } + + hb_codepoint_t get_code (hb_codepoint_t glyph) const + { + assert (glyph > 0); + glyph--; + if (glyph < nCodes ()) + { + return (hb_codepoint_t)codes[glyph]; + } + else + return CFF_UNDEF_CODE; + } + + HBUINT8 &nCodes () { return codes.len; } + HBUINT8 nCodes () const { return codes.len; } + + ArrayOf codes; + + DEFINE_SIZE_ARRAY_SIZED (1, codes); +}; + +struct Encoding1_Range { + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + HBUINT8 first; + HBUINT8 nLeft; + + DEFINE_SIZE_STATIC (2); +}; + +struct Encoding1 { + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (ranges.sanitize (c)); + } + + hb_codepoint_t get_code (hb_codepoint_t glyph) const + { + assert (glyph > 0); + glyph--; + for (unsigned int i = 0; i < nRanges (); i++) + { + if (glyph <= ranges[i].nLeft) + { + hb_codepoint_t code = (hb_codepoint_t) ranges[i].first + glyph; + return (likely (code < 0x100) ? code: CFF_UNDEF_CODE); + } + glyph -= (ranges[i].nLeft + 1); + } + return CFF_UNDEF_CODE; + } + + HBUINT8 &nRanges () { return ranges.len; } + HBUINT8 nRanges () const { return ranges.len; } + + ArrayOf ranges; + + DEFINE_SIZE_ARRAY_SIZED (1, ranges); +}; + +struct SuppEncoding { + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + HBUINT8 code; + HBUINT16 glyph; + + DEFINE_SIZE_STATIC (3); +}; + +struct CFF1SuppEncData { + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (supps.sanitize (c)); + } + + void get_codes (hb_codepoint_t sid, hb_vector_t &codes) const + { + for (unsigned int i = 0; i < nSups (); i++) + if (sid == supps[i].glyph) + codes.push (supps[i].code); + } + + HBUINT8 &nSups () { return supps.len; } + HBUINT8 nSups () const { return supps.len; } + + ArrayOf supps; + + DEFINE_SIZE_ARRAY_SIZED (1, supps); +}; + +struct Encoding +{ + /* serialize a fullset Encoding */ + bool serialize (hb_serialize_context_t *c, const Encoding &src) + { + TRACE_SERIALIZE (this); + unsigned int size = src.get_size (); + Encoding *dest = c->allocate_size (size); + if (unlikely (dest == nullptr)) return_trace (false); + memcpy (dest, &src, size); + return_trace (true); + } + + /* serialize a subset Encoding */ + bool serialize (hb_serialize_context_t *c, + uint8_t format, + unsigned int enc_count, + const hb_vector_t& code_ranges, + const hb_vector_t& supp_codes) + { + TRACE_SERIALIZE (this); + Encoding *dest = c->extend_min (*this); + if (unlikely (dest == nullptr)) return_trace (false); + dest->format = format | ((supp_codes.length > 0) ? 0x80 : 0); + switch (format) { + case 0: + { + Encoding0 *fmt0 = c->allocate_size (Encoding0::min_size + HBUINT8::static_size * enc_count); + if (unlikely (fmt0 == nullptr)) return_trace (false); + fmt0->nCodes () = enc_count; + unsigned int glyph = 0; + for (unsigned int i = 0; i < code_ranges.length; i++) + { + hb_codepoint_t code = code_ranges[i].code; + for (int left = (int)code_ranges[i].glyph; left >= 0; left--) + fmt0->codes[glyph++] = code++; + if (unlikely (!((glyph <= 0x100) && (code <= 0x100)))) + return_trace (false); + } + } + break; + + case 1: + { + Encoding1 *fmt1 = c->allocate_size (Encoding1::min_size + Encoding1_Range::static_size * code_ranges.length); + if (unlikely (fmt1 == nullptr)) return_trace (false); + fmt1->nRanges () = code_ranges.length; + for (unsigned int i = 0; i < code_ranges.length; i++) + { + if (unlikely (!((code_ranges[i].code <= 0xFF) && (code_ranges[i].glyph <= 0xFF)))) + return_trace (false); + fmt1->ranges[i].first = code_ranges[i].code; + fmt1->ranges[i].nLeft = code_ranges[i].glyph; + } + } + break; + + } + + if (supp_codes.length) + { + CFF1SuppEncData *suppData = c->allocate_size (CFF1SuppEncData::min_size + SuppEncoding::static_size * supp_codes.length); + if (unlikely (suppData == nullptr)) return_trace (false); + suppData->nSups () = supp_codes.length; + for (unsigned int i = 0; i < supp_codes.length; i++) + { + suppData->supps[i].code = supp_codes[i].code; + suppData->supps[i].glyph = supp_codes[i].glyph; /* actually SID */ + } + } + + return_trace (true); + } + + /* parallel to above: calculate the size of a subset Encoding */ + static unsigned int calculate_serialized_size (uint8_t format, + unsigned int enc_count, + unsigned int supp_count) + { + unsigned int size = min_size; + switch (format) + { + case 0: size += Encoding0::min_size + HBUINT8::static_size * enc_count; break; + case 1: size += Encoding1::min_size + Encoding1_Range::static_size * enc_count; break; + default:return 0; + } + if (supp_count > 0) + size += CFF1SuppEncData::min_size + SuppEncoding::static_size * supp_count; + return size; + } + + unsigned int get_size () const + { + unsigned int size = min_size; + switch (table_format ()) + { + case 0: size += u.format0.get_size (); break; + case 1: size += u.format1.get_size (); break; + } + if (has_supplement ()) + size += suppEncData ().get_size (); + return size; + } + + hb_codepoint_t get_code (hb_codepoint_t glyph) const + { + switch (table_format ()) + { + case 0: return u.format0.get_code (glyph); + case 1: return u.format1.get_code (glyph); + default:return 0; + } + } + + uint8_t table_format () const { return format & 0x7F; } + bool has_supplement () const { return format & 0x80; } + + void get_supplement_codes (hb_codepoint_t sid, hb_vector_t &codes) const + { + codes.resize (0); + if (has_supplement ()) + suppEncData().get_codes (sid, codes); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (unlikely (!c->check_struct (this))) + return_trace (false); + + switch (table_format ()) + { + case 0: if (unlikely (!u.format0.sanitize (c))) { return_trace (false); } break; + case 1: if (unlikely (!u.format1.sanitize (c))) { return_trace (false); } break; + default:return_trace (false); + } + return_trace (likely (!has_supplement () || suppEncData ().sanitize (c))); + } + + protected: + const CFF1SuppEncData &suppEncData () const + { + switch (table_format ()) + { + case 0: return StructAfter (u.format0.codes[u.format0.nCodes ()-1]); + case 1: return StructAfter (u.format1.ranges[u.format1.nRanges ()-1]); + default:return Null (CFF1SuppEncData); + } + } + + public: + HBUINT8 format; + union { + Encoding0 format0; + Encoding1 format1; + } u; + /* CFF1SuppEncData suppEncData; */ + + DEFINE_SIZE_MIN (1); +}; + +/* Charset */ +struct Charset0 { + bool sanitize (hb_sanitize_context_t *c, unsigned int num_glyphs) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && sids[num_glyphs - 1].sanitize (c)); + } + + hb_codepoint_t get_sid (hb_codepoint_t glyph) const + { + if (glyph == 0) + return 0; + else + return sids[glyph - 1]; + } + + hb_codepoint_t get_glyph (hb_codepoint_t sid, unsigned int num_glyphs) const + { + if (sid == 0) + return 0; + + for (unsigned int glyph = 1; glyph < num_glyphs; glyph++) + { + if (sids[glyph-1] == sid) + return glyph; + } + return 0; + } + + unsigned int get_size (unsigned int num_glyphs) const + { + assert (num_glyphs > 0); + return HBUINT16::static_size * (num_glyphs - 1); + } + + HBUINT16 sids[HB_VAR_ARRAY]; + + DEFINE_SIZE_ARRAY(0, sids); +}; + +template +struct Charset_Range { + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + HBUINT16 first; + TYPE nLeft; + + DEFINE_SIZE_STATIC (HBUINT16::static_size + TYPE::static_size); +}; + +template +struct Charset1_2 { + bool sanitize (hb_sanitize_context_t *c, unsigned int num_glyphs) const + { + TRACE_SANITIZE (this); + if (unlikely (!c->check_struct (this))) + return_trace (false); + num_glyphs--; + for (unsigned int i = 0; num_glyphs > 0; i++) + { + if (unlikely (!ranges[i].sanitize (c) || (num_glyphs < ranges[i].nLeft + 1))) + return_trace (false); + num_glyphs -= (ranges[i].nLeft + 1); + } + return_trace (true); + } + + hb_codepoint_t get_sid (hb_codepoint_t glyph) const + { + if (glyph == 0) return 0; + glyph--; + for (unsigned int i = 0;; i++) + { + if (glyph <= ranges[i].nLeft) + return (hb_codepoint_t)ranges[i].first + glyph; + glyph -= (ranges[i].nLeft + 1); + } + + return 0; + } + + hb_codepoint_t get_glyph (hb_codepoint_t sid, unsigned int num_glyphs) const + { + if (sid == 0) return 0; + hb_codepoint_t glyph = 1; + for (unsigned int i = 0;; i++) + { + if (glyph >= num_glyphs) + return 0; + if ((ranges[i].first <= sid) && (sid <= ranges[i].first + ranges[i].nLeft)) + return glyph + (sid - ranges[i].first); + glyph += (ranges[i].nLeft + 1); + } + + return 0; + } + + unsigned int get_size (unsigned int num_glyphs) const + { + unsigned int size = HBUINT8::static_size; + int glyph = (int)num_glyphs; + + assert (glyph > 0); + glyph--; + for (unsigned int i = 0; glyph > 0; i++) + { + glyph -= (ranges[i].nLeft + 1); + size += Charset_Range::static_size; + } + + return size; + } + + Charset_Range ranges[HB_VAR_ARRAY]; + + DEFINE_SIZE_ARRAY (0, ranges); +}; + +typedef Charset1_2 Charset1; +typedef Charset1_2 Charset2; +typedef Charset_Range Charset1_Range; +typedef Charset_Range Charset2_Range; + +struct Charset +{ + /* serialize a fullset Charset */ + bool serialize (hb_serialize_context_t *c, const Charset &src, unsigned int num_glyphs) + { + TRACE_SERIALIZE (this); + unsigned int size = src.get_size (num_glyphs); + Charset *dest = c->allocate_size (size); + if (unlikely (dest == nullptr)) return_trace (false); + memcpy (dest, &src, size); + return_trace (true); + } + + /* serialize a subset Charset */ + bool serialize (hb_serialize_context_t *c, + uint8_t format, + unsigned int num_glyphs, + const hb_vector_t& sid_ranges) + { + TRACE_SERIALIZE (this); + Charset *dest = c->extend_min (*this); + if (unlikely (dest == nullptr)) return_trace (false); + dest->format = format; + switch (format) + { + case 0: + { + Charset0 *fmt0 = c->allocate_size (Charset0::min_size + HBUINT16::static_size * (num_glyphs - 1)); + if (unlikely (fmt0 == nullptr)) return_trace (false); + unsigned int glyph = 0; + for (unsigned int i = 0; i < sid_ranges.length; i++) + { + hb_codepoint_t sid = sid_ranges[i].code; + for (int left = (int)sid_ranges[i].glyph; left >= 0; left--) + fmt0->sids[glyph++] = sid++; + } + } + break; + + case 1: + { + Charset1 *fmt1 = c->allocate_size (Charset1::min_size + Charset1_Range::static_size * sid_ranges.length); + if (unlikely (fmt1 == nullptr)) return_trace (false); + for (unsigned int i = 0; i < sid_ranges.length; i++) + { + if (unlikely (!(sid_ranges[i].glyph <= 0xFF))) + return_trace (false); + fmt1->ranges[i].first = sid_ranges[i].code; + fmt1->ranges[i].nLeft = sid_ranges[i].glyph; + } + } + break; + + case 2: + { + Charset2 *fmt2 = c->allocate_size (Charset2::min_size + Charset2_Range::static_size * sid_ranges.length); + if (unlikely (fmt2 == nullptr)) return_trace (false); + for (unsigned int i = 0; i < sid_ranges.length; i++) + { + if (unlikely (!(sid_ranges[i].glyph <= 0xFFFF))) + return_trace (false); + fmt2->ranges[i].first = sid_ranges[i].code; + fmt2->ranges[i].nLeft = sid_ranges[i].glyph; + } + } + break; + + } + return_trace (true); + } + + /* parallel to above: calculate the size of a subset Charset */ + static unsigned int calculate_serialized_size (uint8_t format, + unsigned int count) + { + switch (format) + { + case 0: return min_size + Charset0::min_size + HBUINT16::static_size * (count - 1); + case 1: return min_size + Charset1::min_size + Charset1_Range::static_size * count; + case 2: return min_size + Charset2::min_size + Charset2_Range::static_size * count; + default:return 0; + } + } + + unsigned int get_size (unsigned int num_glyphs) const + { + switch (format) + { + case 0: return min_size + u.format0.get_size (num_glyphs); + case 1: return min_size + u.format1.get_size (num_glyphs); + case 2: return min_size + u.format2.get_size (num_glyphs); + default:return 0; + } + } + + hb_codepoint_t get_sid (hb_codepoint_t glyph) const + { + switch (format) + { + case 0: return u.format0.get_sid (glyph); + case 1: return u.format1.get_sid (glyph); + case 2: return u.format2.get_sid (glyph); + default:return 0; + } + } + + hb_codepoint_t get_glyph (hb_codepoint_t sid, unsigned int num_glyphs) const + { + switch (format) + { + case 0: return u.format0.get_glyph (sid, num_glyphs); + case 1: return u.format1.get_glyph (sid, num_glyphs); + case 2: return u.format2.get_glyph (sid, num_glyphs); + default:return 0; + } + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (unlikely (!c->check_struct (this))) + return_trace (false); + + switch (format) + { + case 0: return_trace (u.format0.sanitize (c, c->get_num_glyphs ())); + case 1: return_trace (u.format1.sanitize (c, c->get_num_glyphs ())); + case 2: return_trace (u.format2.sanitize (c, c->get_num_glyphs ())); + default:return_trace (false); + } + } + + HBUINT8 format; + union { + Charset0 format0; + Charset1 format1; + Charset2 format2; + } u; + + DEFINE_SIZE_MIN (1); +}; + +struct CFF1StringIndex : CFF1Index +{ + bool serialize (hb_serialize_context_t *c, const CFF1StringIndex &strings, + unsigned int offSize_, const hb_inc_bimap_t &sidmap) + { + TRACE_SERIALIZE (this); + if (unlikely ((strings.count == 0) || (sidmap.get_population () == 0))) + { + if (unlikely (!c->extend_min (this->count))) + return_trace (false); + count = 0; + return_trace (true); + } + + byte_str_array_t bytesArray; + bytesArray.init (); + if (!bytesArray.resize (sidmap.get_population ())) + return_trace (false); + for (unsigned int i = 0; i < strings.count; i++) + { + hb_codepoint_t j = sidmap[i]; + if (j != CFF_UNDEF_CODE) + bytesArray[j] = strings[i]; + } + + bool result = CFF1Index::serialize (c, offSize_, bytesArray); + bytesArray.fini (); + return_trace (result); + } + + /* in parallel to above */ + unsigned int calculate_serialized_size (unsigned int &offSize_ /*OUT*/, const hb_inc_bimap_t &sidmap) const + { + offSize_ = 0; + if ((count == 0) || (sidmap.get_population () == 0)) + return count.static_size; + + unsigned int dataSize = 0; + for (unsigned int i = 0; i < count; i++) + if (sidmap[i] != CFF_UNDEF_CODE) + dataSize += length_at (i); + + offSize_ = calcOffSize(dataSize); + return CFF1Index::calculate_serialized_size (offSize_, sidmap.get_population (), dataSize); + } +}; + +struct cff1_top_dict_interp_env_t : num_interp_env_t +{ + cff1_top_dict_interp_env_t () + : num_interp_env_t(), prev_offset(0), last_offset(0) {} + + unsigned int prev_offset; + unsigned int last_offset; +}; + +struct name_dict_values_t +{ + enum name_dict_val_index_t + { + version, + notice, + copyright, + fullName, + familyName, + weight, + postscript, + fontName, + baseFontName, + registry, + ordering, + + ValCount + }; + + void init () + { + for (unsigned int i = 0; i < ValCount; i++) + values[i] = CFF_UNDEF_SID; + } + + unsigned int& operator[] (unsigned int i) + { assert (i < ValCount); return values[i]; } + + unsigned int operator[] (unsigned int i) const + { assert (i < ValCount); return values[i]; } + + static enum name_dict_val_index_t name_op_to_index (op_code_t op) + { + switch (op) { + default: // can't happen - just make some compiler happy + case OpCode_version: + return version; + case OpCode_Notice: + return notice; + case OpCode_Copyright: + return copyright; + case OpCode_FullName: + return fullName; + case OpCode_FamilyName: + return familyName; + case OpCode_Weight: + return weight; + case OpCode_PostScript: + return postscript; + case OpCode_FontName: + return fontName; + case OpCode_BaseFontName: + return baseFontName; + } + } + + unsigned int values[ValCount]; +}; + +struct cff1_top_dict_val_t : op_str_t +{ + unsigned int last_arg_offset; +}; + +struct cff1_top_dict_values_t : top_dict_values_t +{ + void init () + { + top_dict_values_t::init (); + + nameSIDs.init (); + ros_supplement = 0; + cidCount = 8720; + EncodingOffset = 0; + CharsetOffset = 0; + FDSelectOffset = 0; + privateDictInfo.init (); + } + void fini () { top_dict_values_t::fini (); } + + bool is_CID () const + { return nameSIDs[name_dict_values_t::registry] != CFF_UNDEF_SID; } + + name_dict_values_t nameSIDs; + unsigned int ros_supplement_offset; + unsigned int ros_supplement; + unsigned int cidCount; + + unsigned int EncodingOffset; + unsigned int CharsetOffset; + unsigned int FDSelectOffset; + table_info_t privateDictInfo; +}; + +struct cff1_top_dict_opset_t : top_dict_opset_t +{ + static void process_op (op_code_t op, cff1_top_dict_interp_env_t& env, cff1_top_dict_values_t& dictval) + { + cff1_top_dict_val_t val; + val.last_arg_offset = (env.last_offset-1) - dictval.opStart; /* offset to the last argument */ + + switch (op) { + case OpCode_version: + case OpCode_Notice: + case OpCode_Copyright: + case OpCode_FullName: + case OpCode_FamilyName: + case OpCode_Weight: + case OpCode_PostScript: + case OpCode_BaseFontName: + dictval.nameSIDs[name_dict_values_t::name_op_to_index (op)] = env.argStack.pop_uint (); + env.clear_args (); + break; + case OpCode_isFixedPitch: + case OpCode_ItalicAngle: + case OpCode_UnderlinePosition: + case OpCode_UnderlineThickness: + case OpCode_PaintType: + case OpCode_CharstringType: + case OpCode_UniqueID: + case OpCode_StrokeWidth: + case OpCode_SyntheticBase: + case OpCode_CIDFontVersion: + case OpCode_CIDFontRevision: + case OpCode_CIDFontType: + case OpCode_UIDBase: + case OpCode_FontBBox: + case OpCode_XUID: + case OpCode_BaseFontBlend: + env.clear_args (); + break; + + case OpCode_CIDCount: + dictval.cidCount = env.argStack.pop_uint (); + env.clear_args (); + break; + + case OpCode_ROS: + dictval.ros_supplement = env.argStack.pop_uint (); + dictval.nameSIDs[name_dict_values_t::ordering] = env.argStack.pop_uint (); + dictval.nameSIDs[name_dict_values_t::registry] = env.argStack.pop_uint (); + env.clear_args (); + break; + + case OpCode_Encoding: + dictval.EncodingOffset = env.argStack.pop_uint (); + env.clear_args (); + if (unlikely (dictval.EncodingOffset == 0)) return; + break; + + case OpCode_charset: + dictval.CharsetOffset = env.argStack.pop_uint (); + env.clear_args (); + if (unlikely (dictval.CharsetOffset == 0)) return; + break; + + case OpCode_FDSelect: + dictval.FDSelectOffset = env.argStack.pop_uint (); + env.clear_args (); + break; + + case OpCode_Private: + dictval.privateDictInfo.offset = env.argStack.pop_uint (); + dictval.privateDictInfo.size = env.argStack.pop_uint (); + env.clear_args (); + break; + + default: + env.last_offset = env.str_ref.offset; + top_dict_opset_t::process_op (op, env, dictval); + /* Record this operand below if stack is empty, otherwise done */ + if (!env.argStack.is_empty ()) return; + break; + } + + if (unlikely (env.in_error ())) return; + + dictval.add_op (op, env.str_ref, val); + } +}; + +struct cff1_font_dict_values_t : dict_values_t +{ + void init () + { + dict_values_t::init (); + privateDictInfo.init (); + fontName = CFF_UNDEF_SID; + } + void fini () { dict_values_t::fini (); } + + table_info_t privateDictInfo; + unsigned int fontName; +}; + +struct cff1_font_dict_opset_t : dict_opset_t +{ + static void process_op (op_code_t op, num_interp_env_t& env, cff1_font_dict_values_t& dictval) + { + switch (op) { + case OpCode_FontName: + dictval.fontName = env.argStack.pop_uint (); + env.clear_args (); + break; + case OpCode_FontMatrix: + case OpCode_PaintType: + env.clear_args (); + break; + case OpCode_Private: + dictval.privateDictInfo.offset = env.argStack.pop_uint (); + dictval.privateDictInfo.size = env.argStack.pop_uint (); + env.clear_args (); + break; + + default: + dict_opset_t::process_op (op, env); + if (!env.argStack.is_empty ()) return; + break; + } + + if (unlikely (env.in_error ())) return; + + dictval.add_op (op, env.str_ref); + } +}; + +template +struct cff1_private_dict_values_base_t : dict_values_t +{ + void init () + { + dict_values_t::init (); + subrsOffset = 0; + localSubrs = &Null(CFF1Subrs); + } + void fini () { dict_values_t::fini (); } + + unsigned int calculate_serialized_size () const + { + unsigned int size = 0; + for (unsigned int i = 0; i < dict_values_t::get_count; i++) + if (dict_values_t::get_value (i).op == OpCode_Subrs) + size += OpCode_Size (OpCode_shortint) + 2 + OpCode_Size (OpCode_Subrs); + else + size += dict_values_t::get_value (i).str.length; + return size; + } + + unsigned int subrsOffset; + const CFF1Subrs *localSubrs; +}; + +typedef cff1_private_dict_values_base_t cff1_private_dict_values_subset_t; +typedef cff1_private_dict_values_base_t cff1_private_dict_values_t; + +struct cff1_private_dict_opset_t : dict_opset_t +{ + static void process_op (op_code_t op, num_interp_env_t& env, cff1_private_dict_values_t& dictval) + { + num_dict_val_t val; + val.init (); + + switch (op) { + case OpCode_BlueValues: + case OpCode_OtherBlues: + case OpCode_FamilyBlues: + case OpCode_FamilyOtherBlues: + case OpCode_StemSnapH: + case OpCode_StemSnapV: + env.clear_args (); + break; + case OpCode_StdHW: + case OpCode_StdVW: + case OpCode_BlueScale: + case OpCode_BlueShift: + case OpCode_BlueFuzz: + case OpCode_ForceBold: + case OpCode_LanguageGroup: + case OpCode_ExpansionFactor: + case OpCode_initialRandomSeed: + case OpCode_defaultWidthX: + case OpCode_nominalWidthX: + val.single_val = env.argStack.pop_num (); + env.clear_args (); + break; + case OpCode_Subrs: + dictval.subrsOffset = env.argStack.pop_uint (); + env.clear_args (); + break; + + default: + dict_opset_t::process_op (op, env); + if (!env.argStack.is_empty ()) return; + break; + } + + if (unlikely (env.in_error ())) return; + + dictval.add_op (op, env.str_ref, val); + } +}; + +struct cff1_private_dict_opset_subset : dict_opset_t +{ + static void process_op (op_code_t op, num_interp_env_t& env, cff1_private_dict_values_subset_t& dictval) + { + switch (op) { + case OpCode_BlueValues: + case OpCode_OtherBlues: + case OpCode_FamilyBlues: + case OpCode_FamilyOtherBlues: + case OpCode_StemSnapH: + case OpCode_StemSnapV: + case OpCode_StdHW: + case OpCode_StdVW: + case OpCode_BlueScale: + case OpCode_BlueShift: + case OpCode_BlueFuzz: + case OpCode_ForceBold: + case OpCode_LanguageGroup: + case OpCode_ExpansionFactor: + case OpCode_initialRandomSeed: + case OpCode_defaultWidthX: + case OpCode_nominalWidthX: + env.clear_args (); + break; + + case OpCode_Subrs: + dictval.subrsOffset = env.argStack.pop_uint (); + env.clear_args (); + break; + + default: + dict_opset_t::process_op (op, env); + if (!env.argStack.is_empty ()) return; + break; + } + + if (unlikely (env.in_error ())) return; + + dictval.add_op (op, env.str_ref); + } +}; + +typedef dict_interpreter_t cff1_top_dict_interpreter_t; +typedef dict_interpreter_t cff1_font_dict_interpreter_t; + +typedef CFF1Index CFF1NameIndex; +typedef CFF1IndexOf CFF1TopDictIndex; + +} /* namespace CFF */ + +namespace OT { + +using namespace CFF; + +struct cff1 +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_cff1; + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + likely (version.major == 1)); + } + + template + struct accelerator_templ_t + { + void init (hb_face_t *face) + { + topDict.init (); + fontDicts.init (); + privateDicts.init (); + + this->blob = sc.reference_table (face); + + /* setup for run-time santization */ + sc.init (this->blob); + sc.start_processing (); + + const OT::cff1 *cff = this->blob->template as (); + + if (cff == &Null(OT::cff1)) + { fini (); return; } + + nameIndex = &cff->nameIndex (cff); + if ((nameIndex == &Null (CFF1NameIndex)) || !nameIndex->sanitize (&sc)) + { fini (); return; } + + topDictIndex = &StructAtOffset (nameIndex, nameIndex->get_size ()); + if ((topDictIndex == &Null (CFF1TopDictIndex)) || !topDictIndex->sanitize (&sc) || (topDictIndex->count == 0)) + { fini (); return; } + + { /* parse top dict */ + const byte_str_t topDictStr = (*topDictIndex)[0]; + if (unlikely (!topDictStr.sanitize (&sc))) { fini (); return; } + cff1_top_dict_interpreter_t top_interp; + top_interp.env.init (topDictStr); + topDict.init (); + if (unlikely (!top_interp.interpret (topDict))) { fini (); return; } + } + + if (is_predef_charset ()) + charset = &Null(Charset); + else + { + charset = &StructAtOffsetOrNull (cff, topDict.CharsetOffset); + if (unlikely ((charset == &Null (Charset)) || !charset->sanitize (&sc))) { fini (); return; } + } + + fdCount = 1; + if (is_CID ()) + { + fdArray = &StructAtOffsetOrNull (cff, topDict.FDArrayOffset); + fdSelect = &StructAtOffsetOrNull (cff, topDict.FDSelectOffset); + if (unlikely ((fdArray == &Null(CFF1FDArray)) || !fdArray->sanitize (&sc) || + (fdSelect == &Null(CFF1FDSelect)) || !fdSelect->sanitize (&sc, fdArray->count))) + { fini (); return; } + + fdCount = fdArray->count; + } + else + { + fdArray = &Null(CFF1FDArray); + fdSelect = &Null(CFF1FDSelect); + } + + stringIndex = &StructAtOffset (topDictIndex, topDictIndex->get_size ()); + if ((stringIndex == &Null (CFF1StringIndex)) || !stringIndex->sanitize (&sc)) + { fini (); return; } + + globalSubrs = &StructAtOffset (stringIndex, stringIndex->get_size ()); + if ((globalSubrs != &Null (CFF1Subrs)) && !globalSubrs->sanitize (&sc)) + { fini (); return; } + + charStrings = &StructAtOffsetOrNull (cff, topDict.charStringsOffset); + + if ((charStrings == &Null(CFF1CharStrings)) || unlikely (!charStrings->sanitize (&sc))) + { fini (); return; } + + num_glyphs = charStrings->count; + if (num_glyphs != sc.get_num_glyphs ()) + { fini (); return; } + + privateDicts.resize (fdCount); + for (unsigned int i = 0; i < fdCount; i++) + privateDicts[i].init (); + + // parse CID font dicts and gather private dicts + if (is_CID ()) + { + for (unsigned int i = 0; i < fdCount; i++) + { + byte_str_t fontDictStr = (*fdArray)[i]; + if (unlikely (!fontDictStr.sanitize (&sc))) { fini (); return; } + cff1_font_dict_values_t *font; + cff1_font_dict_interpreter_t font_interp; + font_interp.env.init (fontDictStr); + font = fontDicts.push (); + if (unlikely (font == &Crap(cff1_font_dict_values_t))) { fini (); return; } + font->init (); + if (unlikely (!font_interp.interpret (*font))) { fini (); return; } + PRIVDICTVAL *priv = &privateDicts[i]; + const byte_str_t privDictStr (StructAtOffset (cff, font->privateDictInfo.offset), font->privateDictInfo.size); + if (unlikely (!privDictStr.sanitize (&sc))) { fini (); return; } + dict_interpreter_t priv_interp; + priv_interp.env.init (privDictStr); + priv->init (); + if (unlikely (!priv_interp.interpret (*priv))) { fini (); return; } + + priv->localSubrs = &StructAtOffsetOrNull (&privDictStr, priv->subrsOffset); + if (priv->localSubrs != &Null(CFF1Subrs) && + unlikely (!priv->localSubrs->sanitize (&sc))) + { fini (); return; } + } + } + else /* non-CID */ + { + cff1_top_dict_values_t *font = &topDict; + PRIVDICTVAL *priv = &privateDicts[0]; + + const byte_str_t privDictStr (StructAtOffset (cff, font->privateDictInfo.offset), font->privateDictInfo.size); + if (unlikely (!privDictStr.sanitize (&sc))) { fini (); return; } + dict_interpreter_t priv_interp; + priv_interp.env.init (privDictStr); + priv->init (); + if (unlikely (!priv_interp.interpret (*priv))) { fini (); return; } + + priv->localSubrs = &StructAtOffsetOrNull (&privDictStr, priv->subrsOffset); + if (priv->localSubrs != &Null(CFF1Subrs) && + unlikely (!priv->localSubrs->sanitize (&sc))) + { fini (); return; } + } + } + + void fini () + { + sc.end_processing (); + topDict.fini (); + fontDicts.fini_deep (); + privateDicts.fini_deep (); + hb_blob_destroy (blob); + blob = nullptr; + } + + bool is_valid () const { return blob != nullptr; } + bool is_CID () const { return topDict.is_CID (); } + + bool is_predef_charset () const { return topDict.CharsetOffset <= ExpertSubsetCharset; } + + unsigned int std_code_to_glyph (hb_codepoint_t code) const + { + hb_codepoint_t sid = lookup_standard_encoding_for_sid (code); + if (unlikely (sid == CFF_UNDEF_SID)) + return 0; + + if (charset != &Null(Charset)) + return charset->get_glyph (sid, num_glyphs); + else if ((topDict.CharsetOffset == ISOAdobeCharset) + && (code <= 228 /*zcaron*/)) return sid; + return 0; + } + + protected: + hb_blob_t *blob; + hb_sanitize_context_t sc; + + public: + const Charset *charset; + const CFF1NameIndex *nameIndex; + const CFF1TopDictIndex *topDictIndex; + const CFF1StringIndex *stringIndex; + const CFF1Subrs *globalSubrs; + const CFF1CharStrings *charStrings; + const CFF1FDArray *fdArray; + const CFF1FDSelect *fdSelect; + unsigned int fdCount; + + cff1_top_dict_values_t topDict; + hb_vector_t fontDicts; + hb_vector_t privateDicts; + + unsigned int num_glyphs; + }; + + struct accelerator_t : accelerator_templ_t + { + HB_INTERNAL bool get_extents (hb_codepoint_t glyph, hb_glyph_extents_t *extents) const; + HB_INTERNAL bool get_seac_components (hb_codepoint_t glyph, hb_codepoint_t *base, hb_codepoint_t *accent) const; + }; + + struct accelerator_subset_t : accelerator_templ_t + { + void init (hb_face_t *face) + { + SUPER::init (face); + if (blob == nullptr) return; + + const OT::cff1 *cff = this->blob->as (); + encoding = &Null(Encoding); + if (is_CID ()) + { + if (unlikely (charset == &Null(Charset))) { fini (); return; } + } + else + { + if (!is_predef_encoding ()) + { + encoding = &StructAtOffsetOrNull (cff, topDict.EncodingOffset); + if (unlikely ((encoding == &Null (Encoding)) || !encoding->sanitize (&sc))) { fini (); return; } + } + } + } + + bool is_predef_encoding () const { return topDict.EncodingOffset <= ExpertEncoding; } + + hb_codepoint_t glyph_to_code (hb_codepoint_t glyph) const + { + if (encoding != &Null(Encoding)) + return encoding->get_code (glyph); + else + { + hb_codepoint_t sid = glyph_to_sid (glyph); + if (sid == 0) return 0; + hb_codepoint_t code = 0; + switch (topDict.EncodingOffset) + { + case StandardEncoding: + code = lookup_standard_encoding_for_code (sid); + break; + case ExpertEncoding: + code = lookup_expert_encoding_for_code (sid); + break; + default: + break; + } + return code; + } + } + + hb_codepoint_t glyph_to_sid (hb_codepoint_t glyph) const + { + if (charset != &Null(Charset)) + return charset->get_sid (glyph); + else + { + hb_codepoint_t sid = 0; + switch (topDict.CharsetOffset) + { + case ISOAdobeCharset: + if (glyph <= 228 /*zcaron*/) sid = glyph; + break; + case ExpertCharset: + sid = lookup_expert_charset_for_sid (glyph); + break; + case ExpertSubsetCharset: + sid = lookup_expert_subset_charset_for_sid (glyph); + break; + default: + break; + } + return sid; + } + } + + const Encoding *encoding; + + private: + typedef accelerator_templ_t SUPER; + }; + + bool subset (hb_subset_plan_t *plan) const + { + hb_blob_t *cff_prime = nullptr; + + bool success = true; + if (hb_subset_cff1 (plan, &cff_prime)) { + success = success && plan->add_table (HB_OT_TAG_cff1, cff_prime); + hb_blob_t *head_blob = hb_sanitize_context_t().reference_table (plan->source); + success = success && head_blob && plan->add_table (HB_OT_TAG_head, head_blob); + hb_blob_destroy (head_blob); + } else { + success = false; + } + hb_blob_destroy (cff_prime); + + return success; + } + + protected: + HB_INTERNAL static hb_codepoint_t lookup_standard_encoding_for_code (hb_codepoint_t sid); + HB_INTERNAL static hb_codepoint_t lookup_expert_encoding_for_code (hb_codepoint_t sid); + HB_INTERNAL static hb_codepoint_t lookup_expert_charset_for_sid (hb_codepoint_t glyph); + HB_INTERNAL static hb_codepoint_t lookup_expert_subset_charset_for_sid (hb_codepoint_t glyph); + HB_INTERNAL static hb_codepoint_t lookup_standard_encoding_for_sid (hb_codepoint_t code); + + public: + FixedVersion version; /* Version of CFF table. set to 0x0100u */ + OffsetTo nameIndex; /* headerSize = Offset to Name INDEX. */ + HBUINT8 offSize; /* offset size (unused?) */ + + public: + DEFINE_SIZE_STATIC (4); +}; + +struct cff1_accelerator_t : cff1::accelerator_t {}; +} /* namespace OT */ + +#endif /* HB_OT_CFF1_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff2-table.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff2-table.cc new file mode 100644 index 000000000..0251efac8 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff2-table.cc @@ -0,0 +1,146 @@ +/* + * Copyright © 2018 Adobe Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Adobe Author(s): Michiharu Ariza + */ + +#include "hb.hh" + +#ifndef HB_NO_OT_FONT_CFF + +#include "hb-ot-cff2-table.hh" +#include "hb-cff2-interp-cs.hh" + +using namespace CFF; + +struct cff2_extents_param_t +{ + void init () + { + path_open = false; + min_x.set_int (INT_MAX); + min_y.set_int (INT_MAX); + max_x.set_int (INT_MIN); + max_y.set_int (INT_MIN); + } + + void start_path () { path_open = true; } + void end_path () { path_open = false; } + bool is_path_open () const { return path_open; } + + void update_bounds (const point_t &pt) + { + if (pt.x < min_x) min_x = pt.x; + if (pt.x > max_x) max_x = pt.x; + if (pt.y < min_y) min_y = pt.y; + if (pt.y > max_y) max_y = pt.y; + } + + bool path_open; + number_t min_x; + number_t min_y; + number_t max_x; + number_t max_y; +}; + +struct cff2_path_procs_extents_t : path_procs_t +{ + static void moveto (cff2_cs_interp_env_t &env, cff2_extents_param_t& param, const point_t &pt) + { + param.end_path (); + env.moveto (pt); + } + + static void line (cff2_cs_interp_env_t &env, cff2_extents_param_t& param, const point_t &pt1) + { + if (!param.is_path_open ()) + { + param.start_path (); + param.update_bounds (env.get_pt ()); + } + env.moveto (pt1); + param.update_bounds (env.get_pt ()); + } + + static void curve (cff2_cs_interp_env_t &env, cff2_extents_param_t& param, const point_t &pt1, const point_t &pt2, const point_t &pt3) + { + if (!param.is_path_open ()) + { + param.start_path (); + param.update_bounds (env.get_pt ()); + } + /* include control points */ + param.update_bounds (pt1); + param.update_bounds (pt2); + env.moveto (pt3); + param.update_bounds (env.get_pt ()); + } +}; + +struct cff2_cs_opset_extents_t : cff2_cs_opset_t {}; + +bool OT::cff2::accelerator_t::get_extents (hb_font_t *font, + hb_codepoint_t glyph, + hb_glyph_extents_t *extents) const +{ +#ifdef HB_NO_OT_FONT_CFF + /* XXX Remove check when this code moves to .hh file. */ + return true; +#endif + + if (unlikely (!is_valid () || (glyph >= num_glyphs))) return false; + + unsigned int fd = fdSelect->get_fd (glyph); + cff2_cs_interpreter_t interp; + const byte_str_t str = (*charStrings)[glyph]; + interp.env.init (str, *this, fd, font->coords, font->num_coords); + cff2_extents_param_t param; + param.init (); + if (unlikely (!interp.interpret (param))) return false; + + if (param.min_x >= param.max_x) + { + extents->width = 0; + extents->x_bearing = 0; + } + else + { + extents->x_bearing = (int32_t)param.min_x.floor (); + extents->width = (int32_t)param.max_x.ceil () - extents->x_bearing; + } + if (param.min_y >= param.max_y) + { + extents->height = 0; + extents->y_bearing = 0; + } + else + { + extents->y_bearing = (int32_t)param.max_y.ceil (); + extents->height = (int32_t)param.min_y.floor () - extents->y_bearing; + } + + return true; +} + + +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff2-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff2-table.hh new file mode 100644 index 000000000..8646cde58 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff2-table.hh @@ -0,0 +1,570 @@ +/* + * Copyright © 2018 Adobe Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Adobe Author(s): Michiharu Ariza + */ + +#ifndef HB_OT_CFF2_TABLE_HH +#define HB_OT_CFF2_TABLE_HH + +#include "hb-ot-head-table.hh" +#include "hb-ot-cff-common.hh" +#include "hb-subset-cff2.hh" + +namespace CFF { + +/* + * CFF2 -- Compact Font Format (CFF) Version 2 + * https://docs.microsoft.com/en-us/typography/opentype/spec/cff2 + */ +#define HB_OT_TAG_cff2 HB_TAG('C','F','F','2') + +typedef CFFIndex CFF2Index; +template struct CFF2IndexOf : CFFIndexOf {}; + +typedef CFF2Index CFF2CharStrings; +typedef FDArray CFF2FDArray; +typedef Subrs CFF2Subrs; + +typedef FDSelect3_4 FDSelect4; +typedef FDSelect3_4_Range FDSelect4_Range; + +struct CFF2FDSelect +{ + bool serialize (hb_serialize_context_t *c, const CFF2FDSelect &src, unsigned int num_glyphs) + { + TRACE_SERIALIZE (this); + unsigned int size = src.get_size (num_glyphs); + CFF2FDSelect *dest = c->allocate_size (size); + if (unlikely (dest == nullptr)) return_trace (false); + memcpy (dest, &src, size); + return_trace (true); + } + + unsigned int calculate_serialized_size (unsigned int num_glyphs) const + { return get_size (num_glyphs); } + + unsigned int get_size (unsigned int num_glyphs) const + { + switch (format) + { + case 0: return format.static_size + u.format0.get_size (num_glyphs); + case 3: return format.static_size + u.format3.get_size (); + case 4: return format.static_size + u.format4.get_size (); + default:return 0; + } + } + + hb_codepoint_t get_fd (hb_codepoint_t glyph) const + { + if (this == &Null (CFF2FDSelect)) + return 0; + + switch (format) + { + case 0: return u.format0.get_fd (glyph); + case 3: return u.format3.get_fd (glyph); + case 4: return u.format4.get_fd (glyph); + default:return 0; + } + } + + bool sanitize (hb_sanitize_context_t *c, unsigned int fdcount) const + { + TRACE_SANITIZE (this); + if (unlikely (!c->check_struct (this))) + return_trace (false); + + switch (format) + { + case 0: return_trace (u.format0.sanitize (c, fdcount)); + case 3: return_trace (u.format3.sanitize (c, fdcount)); + case 4: return_trace (u.format4.sanitize (c, fdcount)); + default:return_trace (false); + } + } + + HBUINT8 format; + union { + FDSelect0 format0; + FDSelect3 format3; + FDSelect4 format4; + } u; + public: + DEFINE_SIZE_MIN (2); +}; + +struct CFF2VariationStore +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this)) && c->check_range (&varStore, size) && varStore.sanitize (c)); + } + + bool serialize (hb_serialize_context_t *c, const CFF2VariationStore *varStore) + { + TRACE_SERIALIZE (this); + unsigned int size_ = varStore->get_size (); + CFF2VariationStore *dest = c->allocate_size (size_); + if (unlikely (dest == nullptr)) return_trace (false); + memcpy (dest, varStore, size_); + return_trace (true); + } + + unsigned int get_size () const { return HBUINT16::static_size + size; } + + HBUINT16 size; + VariationStore varStore; + + DEFINE_SIZE_MIN (2 + VariationStore::min_size); +}; + +struct cff2_top_dict_values_t : top_dict_values_t<> +{ + void init () + { + top_dict_values_t<>::init (); + vstoreOffset = 0; + FDSelectOffset = 0; + } + void fini () { top_dict_values_t<>::fini (); } + + unsigned int calculate_serialized_size () const + { + unsigned int size = 0; + for (unsigned int i = 0; i < get_count (); i++) + { + op_code_t op = get_value (i).op; + switch (op) + { + case OpCode_vstore: + case OpCode_FDSelect: + size += OpCode_Size (OpCode_longintdict) + 4 + OpCode_Size (op); + break; + default: + size += top_dict_values_t<>::calculate_serialized_op_size (get_value (i)); + break; + } + } + return size; + } + + unsigned int vstoreOffset; + unsigned int FDSelectOffset; +}; + +struct cff2_top_dict_opset_t : top_dict_opset_t<> +{ + static void process_op (op_code_t op, num_interp_env_t& env, cff2_top_dict_values_t& dictval) + { + switch (op) { + case OpCode_FontMatrix: + { + dict_val_t val; + val.init (); + dictval.add_op (op, env.str_ref); + env.clear_args (); + } + break; + + case OpCode_vstore: + dictval.vstoreOffset = env.argStack.pop_uint (); + env.clear_args (); + break; + case OpCode_FDSelect: + dictval.FDSelectOffset = env.argStack.pop_uint (); + env.clear_args (); + break; + + default: + SUPER::process_op (op, env, dictval); + /* Record this operand below if stack is empty, otherwise done */ + if (!env.argStack.is_empty ()) return; + } + + if (unlikely (env.in_error ())) return; + + dictval.add_op (op, env.str_ref); + } + + typedef top_dict_opset_t<> SUPER; +}; + +struct cff2_font_dict_values_t : dict_values_t +{ + void init () + { + dict_values_t::init (); + privateDictInfo.init (); + } + void fini () { dict_values_t::fini (); } + + table_info_t privateDictInfo; +}; + +struct cff2_font_dict_opset_t : dict_opset_t +{ + static void process_op (op_code_t op, num_interp_env_t& env, cff2_font_dict_values_t& dictval) + { + switch (op) { + case OpCode_Private: + dictval.privateDictInfo.offset = env.argStack.pop_uint (); + dictval.privateDictInfo.size = env.argStack.pop_uint (); + env.clear_args (); + break; + + default: + SUPER::process_op (op, env); + if (!env.argStack.is_empty ()) + return; + } + + if (unlikely (env.in_error ())) return; + + dictval.add_op (op, env.str_ref); + } + + private: + typedef dict_opset_t SUPER; +}; + +template +struct cff2_private_dict_values_base_t : dict_values_t +{ + void init () + { + dict_values_t::init (); + subrsOffset = 0; + localSubrs = &Null(CFF2Subrs); + ivs = 0; + } + void fini () { dict_values_t::fini (); } + + unsigned int calculate_serialized_size () const + { + unsigned int size = 0; + for (unsigned int i = 0; i < dict_values_t::get_count; i++) + if (dict_values_t::get_value (i).op == OpCode_Subrs) + size += OpCode_Size (OpCode_shortint) + 2 + OpCode_Size (OpCode_Subrs); + else + size += dict_values_t::get_value (i).str.length; + return size; + } + + unsigned int subrsOffset; + const CFF2Subrs *localSubrs; + unsigned int ivs; +}; + +typedef cff2_private_dict_values_base_t cff2_private_dict_values_subset_t; +typedef cff2_private_dict_values_base_t cff2_private_dict_values_t; + +struct cff2_priv_dict_interp_env_t : num_interp_env_t +{ + void init (const byte_str_t &str) + { + num_interp_env_t::init (str); + ivs = 0; + seen_vsindex = false; + } + + void process_vsindex () + { + if (likely (!seen_vsindex)) + { + set_ivs (argStack.pop_uint ()); + } + seen_vsindex = true; + } + + unsigned int get_ivs () const { return ivs; } + void set_ivs (unsigned int ivs_) { ivs = ivs_; } + + protected: + unsigned int ivs; + bool seen_vsindex; +}; + +struct cff2_private_dict_opset_t : dict_opset_t +{ + static void process_op (op_code_t op, cff2_priv_dict_interp_env_t& env, cff2_private_dict_values_t& dictval) + { + num_dict_val_t val; + val.init (); + + switch (op) { + case OpCode_StdHW: + case OpCode_StdVW: + case OpCode_BlueScale: + case OpCode_BlueShift: + case OpCode_BlueFuzz: + case OpCode_ExpansionFactor: + case OpCode_LanguageGroup: + val.single_val = env.argStack.pop_num (); + env.clear_args (); + break; + case OpCode_BlueValues: + case OpCode_OtherBlues: + case OpCode_FamilyBlues: + case OpCode_FamilyOtherBlues: + case OpCode_StemSnapH: + case OpCode_StemSnapV: + env.clear_args (); + break; + case OpCode_Subrs: + dictval.subrsOffset = env.argStack.pop_uint (); + env.clear_args (); + break; + case OpCode_vsindexdict: + env.process_vsindex (); + dictval.ivs = env.get_ivs (); + env.clear_args (); + break; + case OpCode_blenddict: + break; + + default: + dict_opset_t::process_op (op, env); + if (!env.argStack.is_empty ()) return; + break; + } + + if (unlikely (env.in_error ())) return; + + dictval.add_op (op, env.str_ref, val); + } +}; + +struct cff2_private_dict_opset_subset_t : dict_opset_t +{ + static void process_op (op_code_t op, cff2_priv_dict_interp_env_t& env, cff2_private_dict_values_subset_t& dictval) + { + switch (op) { + case OpCode_BlueValues: + case OpCode_OtherBlues: + case OpCode_FamilyBlues: + case OpCode_FamilyOtherBlues: + case OpCode_StdHW: + case OpCode_StdVW: + case OpCode_BlueScale: + case OpCode_BlueShift: + case OpCode_BlueFuzz: + case OpCode_StemSnapH: + case OpCode_StemSnapV: + case OpCode_LanguageGroup: + case OpCode_ExpansionFactor: + env.clear_args (); + break; + + case OpCode_blenddict: + env.clear_args (); + return; + + case OpCode_Subrs: + dictval.subrsOffset = env.argStack.pop_uint (); + env.clear_args (); + break; + + default: + SUPER::process_op (op, env); + if (!env.argStack.is_empty ()) return; + break; + } + + if (unlikely (env.in_error ())) return; + + dictval.add_op (op, env.str_ref); + } + + private: + typedef dict_opset_t SUPER; +}; + +typedef dict_interpreter_t cff2_top_dict_interpreter_t; +typedef dict_interpreter_t cff2_font_dict_interpreter_t; + +} /* namespace CFF */ + +namespace OT { + +using namespace CFF; + +struct cff2 +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_cff2; + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + likely (version.major == 2)); + } + + template + struct accelerator_templ_t + { + void init (hb_face_t *face) + { + topDict.init (); + fontDicts.init (); + privateDicts.init (); + + this->blob = sc.reference_table (face); + + /* setup for run-time santization */ + sc.init (this->blob); + sc.start_processing (); + + const OT::cff2 *cff2 = this->blob->template as (); + + if (cff2 == &Null(OT::cff2)) + { fini (); return; } + + { /* parse top dict */ + byte_str_t topDictStr (cff2 + cff2->topDict, cff2->topDictSize); + if (unlikely (!topDictStr.sanitize (&sc))) { fini (); return; } + cff2_top_dict_interpreter_t top_interp; + top_interp.env.init (topDictStr); + topDict.init (); + if (unlikely (!top_interp.interpret (topDict))) { fini (); return; } + } + + globalSubrs = &StructAtOffset (cff2, cff2->topDict + cff2->topDictSize); + varStore = &StructAtOffsetOrNull (cff2, topDict.vstoreOffset); + charStrings = &StructAtOffsetOrNull (cff2, topDict.charStringsOffset); + fdArray = &StructAtOffsetOrNull (cff2, topDict.FDArrayOffset); + fdSelect = &StructAtOffsetOrNull (cff2, topDict.FDSelectOffset); + + if (((varStore != &Null(CFF2VariationStore)) && unlikely (!varStore->sanitize (&sc))) || + (charStrings == &Null(CFF2CharStrings)) || unlikely (!charStrings->sanitize (&sc)) || + (globalSubrs == &Null(CFF2Subrs)) || unlikely (!globalSubrs->sanitize (&sc)) || + (fdArray == &Null(CFF2FDArray)) || unlikely (!fdArray->sanitize (&sc)) || + (((fdSelect != &Null(CFF2FDSelect)) && unlikely (!fdSelect->sanitize (&sc, fdArray->count))))) + { fini (); return; } + + num_glyphs = charStrings->count; + if (num_glyphs != sc.get_num_glyphs ()) + { fini (); return; } + + fdCount = fdArray->count; + privateDicts.resize (fdCount); + + /* parse font dicts and gather private dicts */ + for (unsigned int i = 0; i < fdCount; i++) + { + const byte_str_t fontDictStr = (*fdArray)[i]; + if (unlikely (!fontDictStr.sanitize (&sc))) { fini (); return; } + cff2_font_dict_values_t *font; + cff2_font_dict_interpreter_t font_interp; + font_interp.env.init (fontDictStr); + font = fontDicts.push (); + if (unlikely (font == &Crap(cff2_font_dict_values_t))) { fini (); return; } + font->init (); + if (unlikely (!font_interp.interpret (*font))) { fini (); return; } + + const byte_str_t privDictStr (StructAtOffsetOrNull (cff2, font->privateDictInfo.offset), font->privateDictInfo.size); + if (unlikely (!privDictStr.sanitize (&sc))) { fini (); return; } + dict_interpreter_t priv_interp; + priv_interp.env.init(privDictStr); + privateDicts[i].init (); + if (unlikely (!priv_interp.interpret (privateDicts[i]))) { fini (); return; } + + privateDicts[i].localSubrs = &StructAtOffsetOrNull (&privDictStr[0], privateDicts[i].subrsOffset); + if (privateDicts[i].localSubrs != &Null(CFF2Subrs) && + unlikely (!privateDicts[i].localSubrs->sanitize (&sc))) + { fini (); return; } + } + } + + void fini () + { + sc.end_processing (); + topDict.fini (); + fontDicts.fini_deep (); + privateDicts.fini_deep (); + hb_blob_destroy (blob); + blob = nullptr; + } + + bool is_valid () const { return blob != nullptr; } + + protected: + hb_blob_t *blob; + hb_sanitize_context_t sc; + + public: + cff2_top_dict_values_t topDict; + const CFF2Subrs *globalSubrs; + const CFF2VariationStore *varStore; + const CFF2CharStrings *charStrings; + const CFF2FDArray *fdArray; + const CFF2FDSelect *fdSelect; + unsigned int fdCount; + + hb_vector_t fontDicts; + hb_vector_t privateDicts; + + unsigned int num_glyphs; + }; + + struct accelerator_t : accelerator_templ_t + { + HB_INTERNAL bool get_extents (hb_font_t *font, + hb_codepoint_t glyph, + hb_glyph_extents_t *extents) const; + }; + + typedef accelerator_templ_t accelerator_subset_t; + + bool subset (hb_subset_plan_t *plan) const + { + hb_blob_t *cff2_prime = nullptr; + + bool success = true; + if (hb_subset_cff2 (plan, &cff2_prime)) { + success = success && plan->add_table (HB_OT_TAG_cff2, cff2_prime); + hb_blob_t *head_blob = hb_sanitize_context_t().reference_table (plan->source); + success = success && head_blob && plan->add_table (HB_OT_TAG_head, head_blob); + hb_blob_destroy (head_blob); + } else { + success = false; + } + hb_blob_destroy (cff2_prime); + + return success; + } + + public: + FixedVersion version; /* Version of CFF2 table. set to 0x0200u */ + NNOffsetTo topDict; /* headerSize = Offset to Top DICT. */ + HBUINT16 topDictSize; /* Top DICT size */ + + public: + DEFINE_SIZE_STATIC (5); +}; + +struct cff2_accelerator_t : cff2::accelerator_t {}; +} /* namespace OT */ + +#endif /* HB_OT_CFF2_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cmap-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cmap-table.hh new file mode 100644 index 000000000..eb6f2406b --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cmap-table.hh @@ -0,0 +1,1446 @@ +/* + * Copyright © 2014 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OT_CMAP_TABLE_HH +#define HB_OT_CMAP_TABLE_HH + +#include "hb-open-type.hh" +#include "hb-set.hh" + +/* + * cmap -- Character to Glyph Index Mapping + * https://docs.microsoft.com/en-us/typography/opentype/spec/cmap + */ +#define HB_OT_TAG_cmap HB_TAG('c','m','a','p') + +namespace OT { + + +struct CmapSubtableFormat0 +{ + bool get_glyph (hb_codepoint_t codepoint, hb_codepoint_t *glyph) const + { + hb_codepoint_t gid = codepoint < 256 ? glyphIdArray[codepoint] : 0; + if (!gid) + return false; + *glyph = gid; + return true; + } + void collect_unicodes (hb_set_t *out) const + { + for (unsigned int i = 0; i < 256; i++) + if (glyphIdArray[i]) + out->add (i); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + protected: + HBUINT16 format; /* Format number is set to 0. */ + HBUINT16 length; /* Byte length of this subtable. */ + HBUINT16 language; /* Ignore. */ + HBUINT8 glyphIdArray[256];/* An array that maps character + * code to glyph index values. */ + public: + DEFINE_SIZE_STATIC (6 + 256); +}; + +struct CmapSubtableFormat4 +{ + + template + HBUINT16* serialize_endcode_array (hb_serialize_context_t *c, + Iterator it) + { + HBUINT16 *endCode = c->start_embed (); + hb_codepoint_t prev_endcp = 0xFFFF; + + + it + | hb_apply ([&] (const hb_item_type _) + { + if (prev_endcp != 0xFFFF && prev_endcp + 1u != _.first) + { + HBUINT16 end_code; + end_code = prev_endcp; + c->copy (end_code); + } + prev_endcp = _.first; + }) + ; + + { + // last endCode + HBUINT16 endcode; + endcode = prev_endcp; + if (unlikely (!c->copy (endcode))) return nullptr; + // There must be a final entry with end_code == 0xFFFF. + if (prev_endcp != 0xFFFF) + { + HBUINT16 finalcode; + finalcode = 0xFFFF; + if (unlikely (!c->copy (finalcode))) return nullptr; + } + } + + return endCode; + } + + template + HBUINT16* serialize_startcode_array (hb_serialize_context_t *c, + Iterator it) + { + HBUINT16 *startCode = c->start_embed (); + hb_codepoint_t prev_cp = 0xFFFF; + + + it + | hb_apply ([&] (const hb_item_type _) + { + if (prev_cp == 0xFFFF || prev_cp + 1u != _.first) + { + HBUINT16 start_code; + start_code = _.first; + c->copy (start_code); + } + + prev_cp = _.first; + }) + ; + + // There must be a final entry with end_code == 0xFFFF. + if (it.len () == 0 || prev_cp != 0xFFFF) + { + HBUINT16 finalcode; + finalcode = 0xFFFF; + if (unlikely (!c->copy (finalcode))) return nullptr; + } + + return startCode; + } + + template + HBINT16* serialize_idDelta_array (hb_serialize_context_t *c, + Iterator it, + HBUINT16 *endCode, + HBUINT16 *startCode, + unsigned segcount) + { + unsigned i = 0; + hb_codepoint_t last_gid = 0, start_gid = 0, last_cp = 0xFFFF; + bool use_delta = true; + + HBINT16 *idDelta = c->start_embed (); + if ((char *)idDelta - (char *)startCode != (int) segcount * (int) HBINT16::static_size) + return nullptr; + + + it + | hb_apply ([&] (const hb_item_type _) + { + if (_.first == startCode[i]) + { + use_delta = true; + start_gid = _.second; + } + else if (_.second != last_gid + 1) use_delta = false; + + if (_.first == endCode[i]) + { + HBINT16 delta; + if (use_delta) delta = (int)start_gid - (int)startCode[i]; + else delta = 0; + c->copy (delta); + + i++; + } + + last_gid = _.second; + last_cp = _.first; + }) + ; + + if (it.len () == 0 || last_cp != 0xFFFF) + { + HBINT16 delta; + delta = 1; + if (unlikely (!c->copy (delta))) return nullptr; + } + + return idDelta; + } + + template + HBUINT16* serialize_rangeoffset_glyid (hb_serialize_context_t *c, + Iterator it, + HBUINT16 *endCode, + HBUINT16 *startCode, + HBINT16 *idDelta, + unsigned segcount) + { + HBUINT16 *idRangeOffset = c->allocate_size (HBUINT16::static_size * segcount); + if (unlikely (!c->check_success (idRangeOffset))) return nullptr; + if (unlikely ((char *)idRangeOffset - (char *)idDelta != (int) segcount * (int) HBINT16::static_size)) return nullptr; + + + hb_range (segcount) + | hb_filter ([&] (const unsigned _) { return idDelta[_] == 0; }) + | hb_apply ([&] (const unsigned i) + { + idRangeOffset[i] = 2 * (c->start_embed () - idRangeOffset - i); + + + it + | hb_filter ([&] (const hb_item_type _) { return _.first >= startCode[i] && _.first <= endCode[i]; }) + | hb_apply ([&] (const hb_item_type _) + { + HBUINT16 glyID; + glyID = _.second; + c->copy (glyID); + }) + ; + + + }) + ; + + return idRangeOffset; + } + + template + void serialize (hb_serialize_context_t *c, + Iterator it) + { + unsigned table_initpos = c->length (); + if (unlikely (!c->extend_min (*this))) return; + this->format = 4; + + //serialize endCode[] + HBUINT16 *endCode = serialize_endcode_array (c, it); + if (unlikely (!endCode)) return; + + unsigned segcount = (c->length () - min_size) / HBUINT16::static_size; + + // 2 bytes of padding. + if (unlikely (!c->allocate_size (HBUINT16::static_size))) return; // 2 bytes of padding. + + // serialize startCode[] + HBUINT16 *startCode = serialize_startcode_array (c, it); + if (unlikely (!startCode)) return; + + //serialize idDelta[] + HBINT16 *idDelta = serialize_idDelta_array (c, it, endCode, startCode, segcount); + if (unlikely (!idDelta)) return; + + HBUINT16 *idRangeOffset = serialize_rangeoffset_glyid (c, it, endCode, startCode, idDelta, segcount); + if (unlikely (!c->check_success (idRangeOffset))) return; + + if (unlikely (!c->check_assign(this->length, c->length () - table_initpos))) return; + this->segCountX2 = segcount * 2; + this->entrySelector = hb_max (1u, hb_bit_storage (segcount)) - 1; + this->searchRange = 2 * (1u << this->entrySelector); + this->rangeShift = segcount * 2 > this->searchRange + ? 2 * segcount - this->searchRange + : 0; + } + + struct accelerator_t + { + accelerator_t () {} + accelerator_t (const CmapSubtableFormat4 *subtable) { init (subtable); } + ~accelerator_t () { fini (); } + + void init (const CmapSubtableFormat4 *subtable) + { + segCount = subtable->segCountX2 / 2; + endCount = subtable->values.arrayZ; + startCount = endCount + segCount + 1; + idDelta = startCount + segCount; + idRangeOffset = idDelta + segCount; + glyphIdArray = idRangeOffset + segCount; + glyphIdArrayLength = (subtable->length - 16 - 8 * segCount) / 2; + } + void fini () {} + + bool get_glyph (hb_codepoint_t codepoint, hb_codepoint_t *glyph) const + { + /* Custom two-array bsearch. */ + int min = 0, max = (int) this->segCount - 1; + const HBUINT16 *startCount = this->startCount; + const HBUINT16 *endCount = this->endCount; + unsigned int i; + while (min <= max) + { + int mid = ((unsigned int) min + (unsigned int) max) / 2; + if (codepoint < startCount[mid]) + max = mid - 1; + else if (codepoint > endCount[mid]) + min = mid + 1; + else + { + i = mid; + goto found; + } + } + return false; + + found: + hb_codepoint_t gid; + unsigned int rangeOffset = this->idRangeOffset[i]; + if (rangeOffset == 0) + gid = codepoint + this->idDelta[i]; + else + { + /* Somebody has been smoking... */ + unsigned int index = rangeOffset / 2 + (codepoint - this->startCount[i]) + i - this->segCount; + if (unlikely (index >= this->glyphIdArrayLength)) + return false; + gid = this->glyphIdArray[index]; + if (unlikely (!gid)) + return false; + gid += this->idDelta[i]; + } + gid &= 0xFFFFu; + if (!gid) + return false; + *glyph = gid; + return true; + } + HB_INTERNAL static bool get_glyph_func (const void *obj, hb_codepoint_t codepoint, hb_codepoint_t *glyph) + { return ((const accelerator_t *) obj)->get_glyph (codepoint, glyph); } + void collect_unicodes (hb_set_t *out) const + { + unsigned int count = this->segCount; + if (count && this->startCount[count - 1] == 0xFFFFu) + count--; /* Skip sentinel segment. */ + for (unsigned int i = 0; i < count; i++) + { + unsigned int rangeOffset = this->idRangeOffset[i]; + if (rangeOffset == 0) + out->add_range (this->startCount[i], this->endCount[i]); + else + { + for (hb_codepoint_t codepoint = this->startCount[i]; + codepoint <= this->endCount[i]; + codepoint++) + { + unsigned int index = rangeOffset / 2 + (codepoint - this->startCount[i]) + i - this->segCount; + if (unlikely (index >= this->glyphIdArrayLength)) + break; + hb_codepoint_t gid = this->glyphIdArray[index]; + if (unlikely (!gid)) + continue; + out->add (codepoint); + } + } + } + } + + const HBUINT16 *endCount; + const HBUINT16 *startCount; + const HBUINT16 *idDelta; + const HBUINT16 *idRangeOffset; + const HBUINT16 *glyphIdArray; + unsigned int segCount; + unsigned int glyphIdArrayLength; + }; + + bool get_glyph (hb_codepoint_t codepoint, hb_codepoint_t *glyph) const + { + accelerator_t accel (this); + return accel.get_glyph_func (&accel, codepoint, glyph); + } + void collect_unicodes (hb_set_t *out) const + { + accelerator_t accel (this); + accel.collect_unicodes (out); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (unlikely (!c->check_struct (this))) + return_trace (false); + + if (unlikely (!c->check_range (this, length))) + { + /* Some broken fonts have too long of a "length" value. + * If that is the case, just change the value to truncate + * the subtable at the end of the blob. */ + uint16_t new_length = (uint16_t) hb_min ((uintptr_t) 65535, + (uintptr_t) (c->end - + (char *) this)); + if (!c->try_set (&length, new_length)) + return_trace (false); + } + + return_trace (16 + 4 * (unsigned int) segCountX2 <= length); + } + + + + protected: + HBUINT16 format; /* Format number is set to 4. */ + HBUINT16 length; /* This is the length in bytes of the + * subtable. */ + HBUINT16 language; /* Ignore. */ + HBUINT16 segCountX2; /* 2 x segCount. */ + HBUINT16 searchRange; /* 2 * (2**floor(log2(segCount))) */ + HBUINT16 entrySelector; /* log2(searchRange/2) */ + HBUINT16 rangeShift; /* 2 x segCount - searchRange */ + + UnsizedArrayOf + values; +#if 0 + HBUINT16 endCount[segCount]; /* End characterCode for each segment, + * last=0xFFFFu. */ + HBUINT16 reservedPad; /* Set to 0. */ + HBUINT16 startCount[segCount]; /* Start character code for each segment. */ + HBINT16 idDelta[segCount]; /* Delta for all character codes in segment. */ + HBUINT16 idRangeOffset[segCount];/* Offsets into glyphIdArray or 0 */ + UnsizedArrayOf + glyphIdArray; /* Glyph index array (arbitrary length) */ +#endif + + public: + DEFINE_SIZE_ARRAY (14, values); +}; + +struct CmapSubtableLongGroup +{ + friend struct CmapSubtableFormat12; + friend struct CmapSubtableFormat13; + template + friend struct CmapSubtableLongSegmented; + friend struct cmap; + + int cmp (hb_codepoint_t codepoint) const + { + if (codepoint < startCharCode) return -1; + if (codepoint > endCharCode) return +1; + return 0; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + private: + HBUINT32 startCharCode; /* First character code in this group. */ + HBUINT32 endCharCode; /* Last character code in this group. */ + HBUINT32 glyphID; /* Glyph index; interpretation depends on + * subtable format. */ + public: + DEFINE_SIZE_STATIC (12); +}; +DECLARE_NULL_NAMESPACE_BYTES (OT, CmapSubtableLongGroup); + +template +struct CmapSubtableTrimmed +{ + bool get_glyph (hb_codepoint_t codepoint, hb_codepoint_t *glyph) const + { + /* Rely on our implicit array bound-checking. */ + hb_codepoint_t gid = glyphIdArray[codepoint - startCharCode]; + if (!gid) + return false; + *glyph = gid; + return true; + } + void collect_unicodes (hb_set_t *out) const + { + hb_codepoint_t start = startCharCode; + unsigned int count = glyphIdArray.len; + for (unsigned int i = 0; i < count; i++) + if (glyphIdArray[i]) + out->add (start + i); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && glyphIdArray.sanitize (c)); + } + + protected: + UINT formatReserved; /* Subtable format and (maybe) padding. */ + UINT length; /* Byte length of this subtable. */ + UINT language; /* Ignore. */ + UINT startCharCode; /* First character code covered. */ + ArrayOf + glyphIdArray; /* Array of glyph index values for character + * codes in the range. */ + public: + DEFINE_SIZE_ARRAY (5 * sizeof (UINT), glyphIdArray); +}; + +struct CmapSubtableFormat6 : CmapSubtableTrimmed {}; +struct CmapSubtableFormat10 : CmapSubtableTrimmed {}; + +template +struct CmapSubtableLongSegmented +{ + friend struct cmap; + + bool get_glyph (hb_codepoint_t codepoint, hb_codepoint_t *glyph) const + { + hb_codepoint_t gid = T::group_get_glyph (groups.bsearch (codepoint), codepoint); + if (!gid) + return false; + *glyph = gid; + return true; + } + + void collect_unicodes (hb_set_t *out) const + { + for (unsigned int i = 0; i < this->groups.len; i++) { + out->add_range (this->groups[i].startCharCode, + hb_min ((hb_codepoint_t) this->groups[i].endCharCode, + (hb_codepoint_t) HB_UNICODE_MAX)); + } + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && groups.sanitize (c)); + } + + protected: + HBUINT16 format; /* Subtable format; set to 12. */ + HBUINT16 reserved; /* Reserved; set to 0. */ + HBUINT32 length; /* Byte length of this subtable. */ + HBUINT32 language; /* Ignore. */ + SortedArrayOf + groups; /* Groupings. */ + public: + DEFINE_SIZE_ARRAY (16, groups); +}; + +struct CmapSubtableFormat12 : CmapSubtableLongSegmented +{ + static hb_codepoint_t group_get_glyph (const CmapSubtableLongGroup &group, + hb_codepoint_t u) + { return likely (group.startCharCode <= group.endCharCode) ? + group.glyphID + (u - group.startCharCode) : 0; } + + + template + void serialize (hb_serialize_context_t *c, + Iterator it) + { + if (it.len () == 0) return; + unsigned table_initpos = c->length (); + if (unlikely (!c->extend_min (*this))) return; + + hb_codepoint_t startCharCode = 0xFFFF, endCharCode = 0xFFFF; + hb_codepoint_t glyphID = 0; + + + it + | hb_apply ([&] (const hb_item_type _) + { + if (startCharCode == 0xFFFF) + { + startCharCode = _.first; + endCharCode = _.first; + glyphID = _.second; + } + else if (!_is_gid_consecutive (endCharCode, startCharCode, glyphID, _.first, _.second)) + { + CmapSubtableLongGroup grouprecord; + grouprecord.startCharCode = startCharCode; + grouprecord.endCharCode = endCharCode; + grouprecord.glyphID = glyphID; + c->copy (grouprecord); + + startCharCode = _.first; + endCharCode = _.first; + glyphID = _.second; + } + else + { + endCharCode = _.first; + } + }) + ; + + CmapSubtableLongGroup record; + record.startCharCode = startCharCode; + record.endCharCode = endCharCode; + record.glyphID = glyphID; + c->copy (record); + + this->format = 12; + this->reserved = 0; + this->length = c->length () - table_initpos; + this->groups.len = (this->length - min_size)/CmapSubtableLongGroup::static_size; + } + + static size_t get_sub_table_size (const hb_sorted_vector_t &groups_data) + { return 16 + 12 * groups_data.length; } + + private: + static bool _is_gid_consecutive (hb_codepoint_t endCharCode, + hb_codepoint_t startCharCode, + hb_codepoint_t glyphID, + hb_codepoint_t cp, + hb_codepoint_t new_gid) + { + return (cp - 1 == endCharCode) && + new_gid == glyphID + (cp - startCharCode); + } + +}; + +struct CmapSubtableFormat13 : CmapSubtableLongSegmented +{ + static hb_codepoint_t group_get_glyph (const CmapSubtableLongGroup &group, + hb_codepoint_t u HB_UNUSED) + { return group.glyphID; } +}; + +typedef enum +{ + GLYPH_VARIANT_NOT_FOUND = 0, + GLYPH_VARIANT_FOUND = 1, + GLYPH_VARIANT_USE_DEFAULT = 2 +} glyph_variant_t; + +struct UnicodeValueRange +{ + int cmp (const hb_codepoint_t &codepoint) const + { + if (codepoint < startUnicodeValue) return -1; + if (codepoint > startUnicodeValue + additionalCount) return +1; + return 0; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + HBUINT24 startUnicodeValue; /* First value in this range. */ + HBUINT8 additionalCount; /* Number of additional values in this + * range. */ + public: + DEFINE_SIZE_STATIC (4); +}; + +struct DefaultUVS : SortedArrayOf +{ + void collect_unicodes (hb_set_t *out) const + { + unsigned int count = len; + for (unsigned int i = 0; i < count; i++) + { + hb_codepoint_t first = arrayZ[i].startUnicodeValue; + hb_codepoint_t last = hb_min ((hb_codepoint_t) (first + arrayZ[i].additionalCount), + (hb_codepoint_t) HB_UNICODE_MAX); + out->add_range (first, last); + } + } + + DefaultUVS* copy (hb_serialize_context_t *c, + const hb_set_t *unicodes) const + { + DefaultUVS *out = c->start_embed (); + if (unlikely (!out)) return nullptr; + auto snap = c->snapshot (); + + HBUINT32 len; + len = 0; + if (unlikely (!c->copy (len))) return nullptr; + unsigned init_len = c->length (); + + hb_codepoint_t lastCode = HB_MAP_VALUE_INVALID; + int count = -1; + + for (const UnicodeValueRange& _ : as_array ()) + { + for (const unsigned addcnt : hb_range ((unsigned) _.additionalCount + 1)) + { + unsigned curEntry = (unsigned) _.startUnicodeValue + addcnt; + if (!unicodes->has (curEntry)) continue; + count += 1; + if (lastCode == HB_MAP_VALUE_INVALID) + lastCode = curEntry; + else if (lastCode + count != curEntry) + { + UnicodeValueRange rec; + rec.startUnicodeValue = lastCode; + rec.additionalCount = count - 1; + c->copy (rec); + + lastCode = curEntry; + count = 0; + } + } + } + + if (lastCode != HB_MAP_VALUE_INVALID) + { + UnicodeValueRange rec; + rec.startUnicodeValue = lastCode; + rec.additionalCount = count; + c->copy (rec); + } + + if (c->length () - init_len == 0) + { + c->revert (snap); + return nullptr; + } + else + { + if (unlikely (!c->check_assign (out->len, (c->length () - init_len) / UnicodeValueRange::static_size))) return nullptr; + return out; + } + } + + public: + DEFINE_SIZE_ARRAY (4, *this); +}; + +struct UVSMapping +{ + int cmp (const hb_codepoint_t &codepoint) const + { + return unicodeValue.cmp (codepoint); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + HBUINT24 unicodeValue; /* Base Unicode value of the UVS */ + HBGlyphID glyphID; /* Glyph ID of the UVS */ + public: + DEFINE_SIZE_STATIC (5); +}; + +struct NonDefaultUVS : SortedArrayOf +{ + void collect_unicodes (hb_set_t *out) const + { + unsigned int count = len; + for (unsigned int i = 0; i < count; i++) + out->add (arrayZ[i].glyphID); + } + + void closure_glyphs (const hb_set_t *unicodes, + hb_set_t *glyphset) const + { + + as_array () + | hb_filter (unicodes, &UVSMapping::unicodeValue) + | hb_map (&UVSMapping::glyphID) + | hb_sink (glyphset) + ; + } + + NonDefaultUVS* copy (hb_serialize_context_t *c, + const hb_set_t *unicodes, + const hb_set_t *glyphs, + const hb_map_t *glyph_map) const + { + NonDefaultUVS *out = c->start_embed (); + if (unlikely (!out)) return nullptr; + + auto it = + + as_array () + | hb_filter ([&] (const UVSMapping& _) + { + return unicodes->has (_.unicodeValue) || glyphs->has (_.glyphID); + }) + ; + + if (!it) return nullptr; + + HBUINT32 len; + len = it.len (); + if (unlikely (!c->copy (len))) return nullptr; + + for (const UVSMapping& _ : it) + { + UVSMapping mapping; + mapping.unicodeValue = _.unicodeValue; + mapping.glyphID = glyph_map->get (_.glyphID); + c->copy (mapping); + } + + return out; + } + + public: + DEFINE_SIZE_ARRAY (4, *this); +}; + +struct VariationSelectorRecord +{ + glyph_variant_t get_glyph (hb_codepoint_t codepoint, + hb_codepoint_t *glyph, + const void *base) const + { + if ((base+defaultUVS).bfind (codepoint)) + return GLYPH_VARIANT_USE_DEFAULT; + const UVSMapping &nonDefault = (base+nonDefaultUVS).bsearch (codepoint); + if (nonDefault.glyphID) + { + *glyph = nonDefault.glyphID; + return GLYPH_VARIANT_FOUND; + } + return GLYPH_VARIANT_NOT_FOUND; + } + + void collect_unicodes (hb_set_t *out, const void *base) const + { + (base+defaultUVS).collect_unicodes (out); + (base+nonDefaultUVS).collect_unicodes (out); + } + + int cmp (const hb_codepoint_t &variation_selector) const + { return varSelector.cmp (variation_selector); } + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + defaultUVS.sanitize (c, base) && + nonDefaultUVS.sanitize (c, base)); + } + + VariationSelectorRecord* copy (hb_serialize_context_t *c, + const hb_set_t *unicodes, + const hb_set_t *glyphs, + const hb_map_t *glyph_map, + const void *src_base, + const void *dst_base) const + { + auto snap = c->snapshot (); + auto *out = c->embed (*this); + if (unlikely (!out)) return nullptr; + + out->defaultUVS = 0; + out->nonDefaultUVS = 0; + + bool drop = true; + + if (defaultUVS != 0) + { + c->push (); + if (c->copy (src_base+defaultUVS, unicodes)) + { + c->add_link (out->defaultUVS, c->pop_pack (), dst_base); + drop = false; + } + else c->pop_discard (); + } + + if (nonDefaultUVS != 0) + { + c->push (); + if (c->copy (src_base+nonDefaultUVS, unicodes, glyphs, glyph_map)) + { + c->add_link (out->nonDefaultUVS, c->pop_pack (), dst_base); + drop = false; + } + else c->pop_discard (); + } + + if (drop) + { + c->revert (snap); + return nullptr; + } + else return out; + } + + HBUINT24 varSelector; /* Variation selector. */ + LOffsetTo + defaultUVS; /* Offset to Default UVS Table. May be 0. */ + LOffsetTo + nonDefaultUVS; /* Offset to Non-Default UVS Table. May be 0. */ + public: + DEFINE_SIZE_STATIC (11); +}; + +struct CmapSubtableFormat14 +{ + glyph_variant_t get_glyph_variant (hb_codepoint_t codepoint, + hb_codepoint_t variation_selector, + hb_codepoint_t *glyph) const + { return record.bsearch (variation_selector).get_glyph (codepoint, glyph, this); } + + void collect_variation_selectors (hb_set_t *out) const + { + unsigned int count = record.len; + for (unsigned int i = 0; i < count; i++) + out->add (record.arrayZ[i].varSelector); + } + void collect_variation_unicodes (hb_codepoint_t variation_selector, + hb_set_t *out) const + { record.bsearch (variation_selector).collect_unicodes (out, this); } + + void serialize (hb_serialize_context_t *c, + const hb_set_t *unicodes, + const hb_set_t *glyphs, + const hb_map_t *glyph_map, + const void *src_base) + { + auto snap = c->snapshot (); + unsigned table_initpos = c->length (); + const char* init_tail = c->tail; + + if (unlikely (!c->extend_min (*this))) return; + this->format = 14; + + const CmapSubtableFormat14 *src_tbl = reinterpret_cast (src_base); + for (const VariationSelectorRecord& _ : src_tbl->record) + c->copy (_, unicodes, glyphs, glyph_map, src_base, this); + + if (c->length () - table_initpos == CmapSubtableFormat14::min_size) + c->revert (snap); + else + { + int tail_len = init_tail - c->tail; + c->check_assign (this->length, c->length () - table_initpos + tail_len); + c->check_assign (this->record.len, (c->length () - table_initpos - CmapSubtableFormat14::min_size) / VariationSelectorRecord::static_size); + } + } + + void closure_glyphs (const hb_set_t *unicodes, + hb_set_t *glyphset) const + { + + hb_iter (record) + | hb_filter (hb_bool, &VariationSelectorRecord::nonDefaultUVS) + | hb_map (&VariationSelectorRecord::nonDefaultUVS) + | hb_map (hb_add (this)) + | hb_apply ([=] (const NonDefaultUVS& _) { _.closure_glyphs (unicodes, glyphset); }) + ; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + record.sanitize (c, this)); + } + + protected: + HBUINT16 format; /* Format number is set to 14. */ + HBUINT32 length; /* Byte length of this subtable. */ + SortedArrayOf + record; /* Variation selector records; sorted + * in increasing order of `varSelector'. */ + public: + DEFINE_SIZE_ARRAY (10, record); +}; + +struct CmapSubtable +{ + /* Note: We intentionally do NOT implement subtable formats 2 and 8. */ + + bool get_glyph (hb_codepoint_t codepoint, + hb_codepoint_t *glyph) const + { + switch (u.format) { + case 0: return u.format0 .get_glyph (codepoint, glyph); + case 4: return u.format4 .get_glyph (codepoint, glyph); + case 6: return u.format6 .get_glyph (codepoint, glyph); + case 10: return u.format10.get_glyph (codepoint, glyph); + case 12: return u.format12.get_glyph (codepoint, glyph); + case 13: return u.format13.get_glyph (codepoint, glyph); + case 14: + default: return false; + } + } + void collect_unicodes (hb_set_t *out) const + { + switch (u.format) { + case 0: u.format0 .collect_unicodes (out); return; + case 4: u.format4 .collect_unicodes (out); return; + case 6: u.format6 .collect_unicodes (out); return; + case 10: u.format10.collect_unicodes (out); return; + case 12: u.format12.collect_unicodes (out); return; + case 13: u.format13.collect_unicodes (out); return; + case 14: + default: return; + } + } + + template + void serialize (hb_serialize_context_t *c, + Iterator it, + unsigned format, + const hb_subset_plan_t *plan, + const void *src_base) + { + switch (format) { + case 4: u.format4.serialize (c, it); return; + case 12: u.format12.serialize (c, it); return; + case 14: u.format14.serialize (c, plan->unicodes, plan->_glyphset, plan->glyph_map, src_base); return; + default: return; + } + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (!u.format.sanitize (c)) return_trace (false); + switch (u.format) { + case 0: return_trace (u.format0 .sanitize (c)); + case 4: return_trace (u.format4 .sanitize (c)); + case 6: return_trace (u.format6 .sanitize (c)); + case 10: return_trace (u.format10.sanitize (c)); + case 12: return_trace (u.format12.sanitize (c)); + case 13: return_trace (u.format13.sanitize (c)); + case 14: return_trace (u.format14.sanitize (c)); + default:return_trace (true); + } + } + + public: + union { + HBUINT16 format; /* Format identifier */ + CmapSubtableFormat0 format0; + CmapSubtableFormat4 format4; + CmapSubtableFormat6 format6; + CmapSubtableFormat10 format10; + CmapSubtableFormat12 format12; + CmapSubtableFormat13 format13; + CmapSubtableFormat14 format14; + } u; + public: + DEFINE_SIZE_UNION (2, format); +}; + + +struct EncodingRecord +{ + int cmp (const EncodingRecord &other) const + { + int ret; + ret = platformID.cmp (other.platformID); + if (ret) return ret; + ret = encodingID.cmp (other.encodingID); + if (ret) return ret; + return 0; + } + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + subtable.sanitize (c, base)); + } + + template + EncodingRecord* copy (hb_serialize_context_t *c, + Iterator it, + unsigned format, + const void *src_base, + const void *dst_base, + const hb_subset_plan_t *plan, + /* INOUT */ unsigned *objidx) const + { + TRACE_SERIALIZE (this); + auto snap = c->snapshot (); + auto *out = c->embed (this); + if (unlikely (!out)) return_trace (nullptr); + out->subtable = 0; + + if (*objidx == 0) + { + CmapSubtable *cmapsubtable = c->push (); + unsigned origin_length = c->length (); + cmapsubtable->serialize (c, it, format, plan, &(src_base+subtable)); + if (c->length () - origin_length > 0) *objidx = c->pop_pack (); + else c->pop_discard (); + } + + if (*objidx == 0) + { + c->revert (snap); + return_trace (nullptr); + } + + c->add_link (out->subtable, *objidx, dst_base); + return_trace (out); + } + + HBUINT16 platformID; /* Platform ID. */ + HBUINT16 encodingID; /* Platform-specific encoding ID. */ + LOffsetTo + subtable; /* Byte offset from beginning of table to the subtable for this encoding. */ + public: + DEFINE_SIZE_STATIC (8); +}; + +struct cmap +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_cmap; + + template + void serialize (hb_serialize_context_t *c, + Iterator it, + EncodingRecIter encodingrec_iter, + const void *src_base, + const hb_subset_plan_t *plan) + { + if (unlikely (!c->extend_min ((*this)))) return; + this->version = 0; + + unsigned format4objidx = 0, format12objidx = 0, format14objidx = 0; + + for (const EncodingRecord& _ : encodingrec_iter) + { + unsigned format = (src_base+_.subtable).u.format; + + if (format == 4) c->copy (_, it, 4u, src_base, this, plan, &format4objidx); + else if (format == 12) c->copy (_, it, 12u, src_base, this, plan, &format12objidx); + else if (format == 14) c->copy (_, it, 14u, src_base, this, plan, &format14objidx); + } + + c->check_assign(this->encodingRecord.len, (c->length () - cmap::min_size)/EncodingRecord::static_size); + } + + void closure_glyphs (const hb_set_t *unicodes, + hb_set_t *glyphset) const + { + + hb_iter (encodingRecord) + | hb_map (&EncodingRecord::subtable) + | hb_map (hb_add (this)) + | hb_filter ([&] (const CmapSubtable& _) { return _.u.format == 14; }) + | hb_apply ([=] (const CmapSubtable& _) { _.u.format14.closure_glyphs (unicodes, glyphset); }) + ; + } + + bool subset (hb_subset_context_t *c) const + { + TRACE_SUBSET (this); + + cmap *cmap_prime = c->serializer->start_embed (); + if (unlikely (!c->serializer->check_success (cmap_prime))) return_trace (false); + + auto encodingrec_iter = + + hb_iter (encodingRecord) + | hb_filter ([&] (const EncodingRecord& _) + { + if ((_.platformID == 0 && _.encodingID == 3) || + (_.platformID == 0 && _.encodingID == 4) || + (_.platformID == 3 && _.encodingID == 1) || + (_.platformID == 3 && _.encodingID == 10) || + (this + _.subtable).u.format == 14) + return true; + + return false; + }) + ; + + + if (unlikely (!encodingrec_iter.len ())) return_trace (false); + + const EncodingRecord *unicode_bmp= nullptr, *unicode_ucs4 = nullptr, *ms_bmp = nullptr, *ms_ucs4 = nullptr; + bool has_format12 = false; + + for (const EncodingRecord& _ : encodingrec_iter) + { + unsigned format = (this + _.subtable).u.format; + if (format == 12) has_format12 = true; + + const EncodingRecord *table = hb_addressof (_); + if (_.platformID == 0 && _.encodingID == 3) unicode_bmp = table; + else if (_.platformID == 0 && _.encodingID == 4) unicode_ucs4 = table; + else if (_.platformID == 3 && _.encodingID == 1) ms_bmp = table; + else if (_.platformID == 3 && _.encodingID == 10) ms_ucs4 = table; + } + + if (unlikely (!unicode_bmp && !ms_bmp)) return_trace (false); + if (unlikely (has_format12 && (!unicode_ucs4 && !ms_ucs4))) return_trace (false); + + auto it = + + hb_iter (c->plan->unicodes) + | hb_map ([&] (hb_codepoint_t _) + { + hb_codepoint_t new_gid = HB_MAP_VALUE_INVALID; + c->plan->new_gid_for_codepoint (_, &new_gid); + return hb_pair_t (_, new_gid); + }) + | hb_filter ([&] (const hb_pair_t _) + { return (_.second != HB_MAP_VALUE_INVALID); }) + ; + + cmap_prime->serialize (c->serializer, it, encodingrec_iter, this, c->plan); + return_trace (true); + } + + const CmapSubtable *find_best_subtable (bool *symbol = nullptr) const + { + if (symbol) *symbol = false; + + const CmapSubtable *subtable; + + /* Symbol subtable. + * Prefer symbol if available. + * https://github.com/harfbuzz/harfbuzz/issues/1918 */ + if ((subtable = this->find_subtable (3, 0))) + { + if (symbol) *symbol = true; + return subtable; + } + + /* 32-bit subtables. */ + if ((subtable = this->find_subtable (3, 10))) return subtable; + if ((subtable = this->find_subtable (0, 6))) return subtable; + if ((subtable = this->find_subtable (0, 4))) return subtable; + + /* 16-bit subtables. */ + if ((subtable = this->find_subtable (3, 1))) return subtable; + if ((subtable = this->find_subtable (0, 3))) return subtable; + if ((subtable = this->find_subtable (0, 2))) return subtable; + if ((subtable = this->find_subtable (0, 1))) return subtable; + if ((subtable = this->find_subtable (0, 0))) return subtable; + + /* Meh. */ + return &Null (CmapSubtable); + } + + struct accelerator_t + { + void init (hb_face_t *face) + { + this->table = hb_sanitize_context_t ().reference_table (face); + bool symbol; + this->subtable = table->find_best_subtable (&symbol); + this->subtable_uvs = &Null (CmapSubtableFormat14); + { + const CmapSubtable *st = table->find_subtable (0, 5); + if (st && st->u.format == 14) + subtable_uvs = &st->u.format14; + } + + this->get_glyph_data = subtable; + if (unlikely (symbol)) + this->get_glyph_funcZ = get_glyph_from_symbol; + else + { + switch (subtable->u.format) { + /* Accelerate format 4 and format 12. */ + default: + this->get_glyph_funcZ = get_glyph_from; + break; + case 12: + this->get_glyph_funcZ = get_glyph_from; + break; + case 4: + { + this->format4_accel.init (&subtable->u.format4); + this->get_glyph_data = &this->format4_accel; + this->get_glyph_funcZ = this->format4_accel.get_glyph_func; + break; + } + } + } + } + + void fini () { this->table.destroy (); } + + bool get_nominal_glyph (hb_codepoint_t unicode, + hb_codepoint_t *glyph) const + { + if (unlikely (!this->get_glyph_funcZ)) return false; + return this->get_glyph_funcZ (this->get_glyph_data, unicode, glyph); + } + unsigned int get_nominal_glyphs (unsigned int count, + const hb_codepoint_t *first_unicode, + unsigned int unicode_stride, + hb_codepoint_t *first_glyph, + unsigned int glyph_stride) const + { + if (unlikely (!this->get_glyph_funcZ)) return 0; + + hb_cmap_get_glyph_func_t get_glyph_funcZ = this->get_glyph_funcZ; + const void *get_glyph_data = this->get_glyph_data; + + unsigned int done; + for (done = 0; + done < count && get_glyph_funcZ (get_glyph_data, *first_unicode, first_glyph); + done++) + { + first_unicode = &StructAtOffsetUnaligned (first_unicode, unicode_stride); + first_glyph = &StructAtOffsetUnaligned (first_glyph, glyph_stride); + } + return done; + } + + bool get_variation_glyph (hb_codepoint_t unicode, + hb_codepoint_t variation_selector, + hb_codepoint_t *glyph) const + { + switch (this->subtable_uvs->get_glyph_variant (unicode, + variation_selector, + glyph)) + { + case GLYPH_VARIANT_NOT_FOUND: return false; + case GLYPH_VARIANT_FOUND: return true; + case GLYPH_VARIANT_USE_DEFAULT: break; + } + + return get_nominal_glyph (unicode, glyph); + } + + void collect_unicodes (hb_set_t *out) const + { subtable->collect_unicodes (out); } + void collect_variation_selectors (hb_set_t *out) const + { subtable_uvs->collect_variation_selectors (out); } + void collect_variation_unicodes (hb_codepoint_t variation_selector, + hb_set_t *out) const + { subtable_uvs->collect_variation_unicodes (variation_selector, out); } + + protected: + typedef bool (*hb_cmap_get_glyph_func_t) (const void *obj, + hb_codepoint_t codepoint, + hb_codepoint_t *glyph); + + template + HB_INTERNAL static bool get_glyph_from (const void *obj, + hb_codepoint_t codepoint, + hb_codepoint_t *glyph) + { + const Type *typed_obj = (const Type *) obj; + return typed_obj->get_glyph (codepoint, glyph); + } + + template + HB_INTERNAL static bool get_glyph_from_symbol (const void *obj, + hb_codepoint_t codepoint, + hb_codepoint_t *glyph) + { + const Type *typed_obj = (const Type *) obj; + if (likely (typed_obj->get_glyph (codepoint, glyph))) + return true; + + if (codepoint <= 0x00FFu) + { + /* For symbol-encoded OpenType fonts, we duplicate the + * U+F000..F0FF range at U+0000..U+00FF. That's what + * Windows seems to do, and that's hinted about at: + * https://docs.microsoft.com/en-us/typography/opentype/spec/recom + * under "Non-Standard (Symbol) Fonts". */ + return typed_obj->get_glyph (0xF000u + codepoint, glyph); + } + + return false; + } + + private: + hb_nonnull_ptr_t subtable; + hb_nonnull_ptr_t subtable_uvs; + + hb_cmap_get_glyph_func_t get_glyph_funcZ; + const void *get_glyph_data; + + CmapSubtableFormat4::accelerator_t format4_accel; + + public: + hb_blob_ptr_t table; + }; + + protected: + + const CmapSubtable *find_subtable (unsigned int platform_id, + unsigned int encoding_id) const + { + EncodingRecord key; + key.platformID = platform_id; + key.encodingID = encoding_id; + + const EncodingRecord &result = encodingRecord.bsearch (key); + if (!result.subtable) + return nullptr; + + return &(this+result.subtable); + } + + const EncodingRecord *find_encodingrec (unsigned int platform_id, + unsigned int encoding_id) const + { + EncodingRecord key; + key.platformID = platform_id; + key.encodingID = encoding_id; + + return encodingRecord.as_array ().bsearch (key); + } + + bool find_subtable (unsigned format) const + { + auto it = + + hb_iter (encodingRecord) + | hb_map (&EncodingRecord::subtable) + | hb_map (hb_add (this)) + | hb_filter ([&] (const CmapSubtable& _) { return _.u.format == format; }) + ; + + return it.len (); + } + + public: + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + likely (version == 0) && + encodingRecord.sanitize (c, this)); + } + + protected: + HBUINT16 version; /* Table version number (0). */ + SortedArrayOf + encodingRecord; /* Encoding tables. */ + public: + DEFINE_SIZE_ARRAY (4, encodingRecord); +}; + +struct cmap_accelerator_t : cmap::accelerator_t {}; + +} /* namespace OT */ + + +#endif /* HB_OT_CMAP_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color-cbdt-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color-cbdt-table.hh new file mode 100644 index 000000000..2a873594a --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color-cbdt-table.hh @@ -0,0 +1,535 @@ +/* + * Copyright © 2016 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Seigo Nonaka + */ + +#ifndef HB_OT_COLOR_CBDT_TABLE_HH +#define HB_OT_COLOR_CBDT_TABLE_HH + +#include "hb-open-type.hh" + +/* + * CBLC -- Color Bitmap Location + * https://docs.microsoft.com/en-us/typography/opentype/spec/cblc + * https://docs.microsoft.com/en-us/typography/opentype/spec/eblc + * CBDT -- Color Bitmap Data + * https://docs.microsoft.com/en-us/typography/opentype/spec/cbdt + * https://docs.microsoft.com/en-us/typography/opentype/spec/ebdt + */ +#define HB_OT_TAG_CBLC HB_TAG('C','B','L','C') +#define HB_OT_TAG_CBDT HB_TAG('C','B','D','T') + + +namespace OT { + +struct SmallGlyphMetrics +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + void get_extents (hb_glyph_extents_t *extents) const + { + extents->x_bearing = bearingX; + extents->y_bearing = bearingY; + extents->width = width; + extents->height = - (hb_position_t) height; + } + + HBUINT8 height; + HBUINT8 width; + HBINT8 bearingX; + HBINT8 bearingY; + HBUINT8 advance; + public: + DEFINE_SIZE_STATIC(5); +}; + +struct BigGlyphMetrics : SmallGlyphMetrics +{ + HBINT8 vertBearingX; + HBINT8 vertBearingY; + HBUINT8 vertAdvance; + public: + DEFINE_SIZE_STATIC(8); +}; + +struct SBitLineMetrics +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + HBINT8 ascender; + HBINT8 decender; + HBUINT8 widthMax; + HBINT8 caretSlopeNumerator; + HBINT8 caretSlopeDenominator; + HBINT8 caretOffset; + HBINT8 minOriginSB; + HBINT8 minAdvanceSB; + HBINT8 maxBeforeBL; + HBINT8 minAfterBL; + HBINT8 padding1; + HBINT8 padding2; + public: + DEFINE_SIZE_STATIC(12); +}; + + +/* + * Index Subtables. + */ + +struct IndexSubtableHeader +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + HBUINT16 indexFormat; + HBUINT16 imageFormat; + HBUINT32 imageDataOffset; + public: + DEFINE_SIZE_STATIC(8); +}; + +template +struct IndexSubtableFormat1Or3 +{ + bool sanitize (hb_sanitize_context_t *c, unsigned int glyph_count) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + offsetArrayZ.sanitize (c, glyph_count + 1)); + } + + bool get_image_data (unsigned int idx, + unsigned int *offset, + unsigned int *length) const + { + if (unlikely (offsetArrayZ[idx + 1] <= offsetArrayZ[idx])) + return false; + + *offset = header.imageDataOffset + offsetArrayZ[idx]; + *length = offsetArrayZ[idx + 1] - offsetArrayZ[idx]; + return true; + } + + IndexSubtableHeader header; + UnsizedArrayOf> + offsetArrayZ; + public: + DEFINE_SIZE_ARRAY(8, offsetArrayZ); +}; + +struct IndexSubtableFormat1 : IndexSubtableFormat1Or3 {}; +struct IndexSubtableFormat3 : IndexSubtableFormat1Or3 {}; + +struct IndexSubtable +{ + bool sanitize (hb_sanitize_context_t *c, unsigned int glyph_count) const + { + TRACE_SANITIZE (this); + if (!u.header.sanitize (c)) return_trace (false); + switch (u.header.indexFormat) { + case 1: return_trace (u.format1.sanitize (c, glyph_count)); + case 3: return_trace (u.format3.sanitize (c, glyph_count)); + default:return_trace (true); + } + } + + bool get_extents (hb_glyph_extents_t *extents HB_UNUSED) const + { + switch (u.header.indexFormat) { + case 2: case 5: /* TODO */ + case 1: case 3: case 4: /* Variable-metrics formats do not have metrics here. */ + default:return (false); + } + } + + bool get_image_data (unsigned int idx, + unsigned int *offset, + unsigned int *length, + unsigned int *format) const + { + *format = u.header.imageFormat; + switch (u.header.indexFormat) { + case 1: return u.format1.get_image_data (idx, offset, length); + case 3: return u.format3.get_image_data (idx, offset, length); + default: return false; + } + } + + protected: + union { + IndexSubtableHeader header; + IndexSubtableFormat1 format1; + IndexSubtableFormat3 format3; + /* TODO: Format 2, 4, 5. */ + } u; + public: + DEFINE_SIZE_UNION (8, header); +}; + +struct IndexSubtableRecord +{ + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + firstGlyphIndex <= lastGlyphIndex && + offsetToSubtable.sanitize (c, base, lastGlyphIndex - firstGlyphIndex + 1)); + } + + bool get_extents (hb_glyph_extents_t *extents, + const void *base) const + { + return (base+offsetToSubtable).get_extents (extents); + } + + bool get_image_data (unsigned int gid, + const void *base, + unsigned int *offset, + unsigned int *length, + unsigned int *format) const + { + if (gid < firstGlyphIndex || gid > lastGlyphIndex) return false; + return (base+offsetToSubtable).get_image_data (gid - firstGlyphIndex, + offset, length, format); + } + + HBGlyphID firstGlyphIndex; + HBGlyphID lastGlyphIndex; + LOffsetTo offsetToSubtable; + public: + DEFINE_SIZE_STATIC(8); +}; + +struct IndexSubtableArray +{ + friend struct CBDT; + + bool sanitize (hb_sanitize_context_t *c, unsigned int count) const + { + TRACE_SANITIZE (this); + return_trace (indexSubtablesZ.sanitize (c, count, this)); + } + + public: + const IndexSubtableRecord* find_table (hb_codepoint_t glyph, unsigned int numTables) const + { + for (unsigned int i = 0; i < numTables; ++i) + { + unsigned int firstGlyphIndex = indexSubtablesZ[i].firstGlyphIndex; + unsigned int lastGlyphIndex = indexSubtablesZ[i].lastGlyphIndex; + if (firstGlyphIndex <= glyph && glyph <= lastGlyphIndex) + return &indexSubtablesZ[i]; + } + return nullptr; + } + + protected: + UnsizedArrayOf indexSubtablesZ; +}; + +struct BitmapSizeTable +{ + friend struct CBLC; + friend struct CBDT; + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + indexSubtableArrayOffset.sanitize (c, base, numberOfIndexSubtables) && + horizontal.sanitize (c) && + vertical.sanitize (c)); + } + + const IndexSubtableRecord *find_table (hb_codepoint_t glyph, + const void *base, + const void **out_base) const + { + *out_base = &(base+indexSubtableArrayOffset); + return (base+indexSubtableArrayOffset).find_table (glyph, numberOfIndexSubtables); + } + + protected: + LNNOffsetTo + indexSubtableArrayOffset; + HBUINT32 indexTablesSize; + HBUINT32 numberOfIndexSubtables; + HBUINT32 colorRef; + SBitLineMetrics horizontal; + SBitLineMetrics vertical; + HBGlyphID startGlyphIndex; + HBGlyphID endGlyphIndex; + HBUINT8 ppemX; + HBUINT8 ppemY; + HBUINT8 bitDepth; + HBINT8 flags; + public: + DEFINE_SIZE_STATIC(48); +}; + + +/* + * Glyph Bitmap Data Formats. + */ + +struct GlyphBitmapDataFormat17 +{ + SmallGlyphMetrics glyphMetrics; + LArrayOf data; + public: + DEFINE_SIZE_ARRAY(9, data); +}; + +struct GlyphBitmapDataFormat18 +{ + BigGlyphMetrics glyphMetrics; + LArrayOf data; + public: + DEFINE_SIZE_ARRAY(12, data); +}; + +struct GlyphBitmapDataFormat19 +{ + LArrayOf data; + public: + DEFINE_SIZE_ARRAY(4, data); +}; + +struct CBLC +{ + friend struct CBDT; + + static constexpr hb_tag_t tableTag = HB_OT_TAG_CBLC; + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + likely (version.major == 2 || version.major == 3) && + sizeTables.sanitize (c, this)); + } + + protected: + const BitmapSizeTable &choose_strike (hb_font_t *font) const + { + unsigned count = sizeTables.len; + if (unlikely (!count)) + return Null(BitmapSizeTable); + + unsigned int requested_ppem = hb_max (font->x_ppem, font->y_ppem); + if (!requested_ppem) + requested_ppem = 1<<30; /* Choose largest strike. */ + unsigned int best_i = 0; + unsigned int best_ppem = hb_max (sizeTables[0].ppemX, sizeTables[0].ppemY); + + for (unsigned int i = 1; i < count; i++) + { + unsigned int ppem = hb_max (sizeTables[i].ppemX, sizeTables[i].ppemY); + if ((requested_ppem <= ppem && ppem < best_ppem) || + (requested_ppem > best_ppem && ppem > best_ppem)) + { + best_i = i; + best_ppem = ppem; + } + } + + return sizeTables[best_i]; + } + + protected: + FixedVersion<> version; + LArrayOf sizeTables; + public: + DEFINE_SIZE_ARRAY(8, sizeTables); +}; + +struct CBDT +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_CBDT; + + struct accelerator_t + { + void init (hb_face_t *face) + { + cblc = hb_sanitize_context_t().reference_table (face); + cbdt = hb_sanitize_context_t().reference_table (face); + + upem = hb_face_get_upem (face); + } + + void fini () + { + this->cblc.destroy (); + this->cbdt.destroy (); + } + + bool get_extents (hb_font_t *font, hb_codepoint_t glyph, + hb_glyph_extents_t *extents) const + { + const void *base; + const BitmapSizeTable &strike = this->cblc->choose_strike (font); + const IndexSubtableRecord *subtable_record = strike.find_table (glyph, cblc, &base); + if (!subtable_record || !strike.ppemX || !strike.ppemY) + return false; + + if (subtable_record->get_extents (extents, base)) + return true; + + unsigned int image_offset = 0, image_length = 0, image_format = 0; + if (!subtable_record->get_image_data (glyph, base, &image_offset, &image_length, &image_format)) + return false; + + { + unsigned int cbdt_len = cbdt.get_length (); + if (unlikely (image_offset > cbdt_len || cbdt_len - image_offset < image_length)) + return false; + + switch (image_format) + { + case 17: { + if (unlikely (image_length < GlyphBitmapDataFormat17::min_size)) + return false; + const GlyphBitmapDataFormat17& glyphFormat17 = + StructAtOffset (this->cbdt, image_offset); + glyphFormat17.glyphMetrics.get_extents (extents); + break; + } + case 18: { + if (unlikely (image_length < GlyphBitmapDataFormat18::min_size)) + return false; + const GlyphBitmapDataFormat18& glyphFormat18 = + StructAtOffset (this->cbdt, image_offset); + glyphFormat18.glyphMetrics.get_extents (extents); + break; + } + default: + // TODO: Support other image formats. + return false; + } + } + + /* Convert to font units. */ + float x_scale = upem / (float) strike.ppemX; + float y_scale = upem / (float) strike.ppemY; + extents->x_bearing = roundf (extents->x_bearing * x_scale); + extents->y_bearing = roundf (extents->y_bearing * y_scale); + extents->width = roundf (extents->width * x_scale); + extents->height = roundf (extents->height * y_scale); + + return true; + } + + hb_blob_t* reference_png (hb_font_t *font, + hb_codepoint_t glyph) const + { + const void *base; + const BitmapSizeTable &strike = this->cblc->choose_strike (font); + const IndexSubtableRecord *subtable_record = strike.find_table (glyph, cblc, &base); + if (!subtable_record || !strike.ppemX || !strike.ppemY) + return hb_blob_get_empty (); + + unsigned int image_offset = 0, image_length = 0, image_format = 0; + if (!subtable_record->get_image_data (glyph, base, &image_offset, &image_length, &image_format)) + return hb_blob_get_empty (); + + { + unsigned int cbdt_len = cbdt.get_length (); + if (unlikely (image_offset > cbdt_len || cbdt_len - image_offset < image_length)) + return hb_blob_get_empty (); + + switch (image_format) + { + case 17: { + if (unlikely (image_length < GlyphBitmapDataFormat17::min_size)) + return hb_blob_get_empty (); + const GlyphBitmapDataFormat17& glyphFormat17 = + StructAtOffset (this->cbdt, image_offset); + return hb_blob_create_sub_blob (cbdt.get_blob (), + image_offset + GlyphBitmapDataFormat17::min_size, + glyphFormat17.data.len); + } + case 18: { + if (unlikely (image_length < GlyphBitmapDataFormat18::min_size)) + return hb_blob_get_empty (); + const GlyphBitmapDataFormat18& glyphFormat18 = + StructAtOffset (this->cbdt, image_offset); + return hb_blob_create_sub_blob (cbdt.get_blob (), + image_offset + GlyphBitmapDataFormat18::min_size, + glyphFormat18.data.len); + } + case 19: { + if (unlikely (image_length < GlyphBitmapDataFormat19::min_size)) + return hb_blob_get_empty (); + const GlyphBitmapDataFormat19& glyphFormat19 = + StructAtOffset (this->cbdt, image_offset); + return hb_blob_create_sub_blob (cbdt.get_blob (), + image_offset + GlyphBitmapDataFormat19::min_size, + glyphFormat19.data.len); + } + } + } + + return hb_blob_get_empty (); + } + + bool has_data () const { return cbdt.get_length (); } + + private: + hb_blob_ptr_t cblc; + hb_blob_ptr_t cbdt; + + unsigned int upem; + }; + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + likely (version.major == 2 || version.major == 3)); + } + + protected: + FixedVersion<> version; + UnsizedArrayOf dataZ; + public: + DEFINE_SIZE_ARRAY(4, dataZ); +}; + +struct CBDT_accelerator_t : CBDT::accelerator_t {}; + +} /* namespace OT */ + +#endif /* HB_OT_COLOR_CBDT_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color-colr-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color-colr-table.hh new file mode 100644 index 000000000..e2ed7c654 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color-colr-table.hh @@ -0,0 +1,138 @@ +/* + * Copyright © 2018 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#ifndef HB_OT_COLOR_COLR_TABLE_HH +#define HB_OT_COLOR_COLR_TABLE_HH + +#include "hb-open-type.hh" + +/* + * COLR -- Color + * https://docs.microsoft.com/en-us/typography/opentype/spec/colr + */ +#define HB_OT_TAG_COLR HB_TAG('C','O','L','R') + + +namespace OT { + + +struct LayerRecord +{ + operator hb_ot_color_layer_t () const { return {glyphId, colorIdx}; } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + protected: + HBGlyphID glyphId; /* Glyph ID of layer glyph */ + Index colorIdx; /* Index value to use with a + * selected color palette. + * An index value of 0xFFFF + * is a special case indicating + * that the text foreground + * color (defined by a + * higher-level client) should + * be used and shall not be + * treated as actual index + * into CPAL ColorRecord array. */ + public: + DEFINE_SIZE_STATIC (4); +}; + +struct BaseGlyphRecord +{ + int cmp (hb_codepoint_t g) const + { return g < glyphId ? -1 : g > glyphId ? 1 : 0; } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this))); + } + + public: + HBGlyphID glyphId; /* Glyph ID of reference glyph */ + HBUINT16 firstLayerIdx; /* Index (from beginning of + * the Layer Records) to the + * layer record. There will be + * numLayers consecutive entries + * for this base glyph. */ + HBUINT16 numLayers; /* Number of color layers + * associated with this glyph */ + public: + DEFINE_SIZE_STATIC (6); +}; + +struct COLR +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_COLR; + + bool has_data () const { return numBaseGlyphs; } + + unsigned int get_glyph_layers (hb_codepoint_t glyph, + unsigned int start_offset, + unsigned int *count, /* IN/OUT. May be NULL. */ + hb_ot_color_layer_t *layers /* OUT. May be NULL. */) const + { + const BaseGlyphRecord &record = (this+baseGlyphsZ).bsearch (numBaseGlyphs, glyph); + + hb_array_t all_layers = (this+layersZ).as_array (numLayers); + hb_array_t glyph_layers = all_layers.sub_array (record.firstLayerIdx, + record.numLayers); + if (count) + { + + glyph_layers.sub_array (start_offset, count) + | hb_sink (hb_array (layers, *count)) + ; + } + return glyph_layers.length; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + (this+baseGlyphsZ).sanitize (c, numBaseGlyphs) && + (this+layersZ).sanitize (c, numLayers))); + } + + protected: + HBUINT16 version; /* Table version number (starts at 0). */ + HBUINT16 numBaseGlyphs; /* Number of Base Glyph Records. */ + LNNOffsetTo> + baseGlyphsZ; /* Offset to Base Glyph records. */ + LNNOffsetTo> + layersZ; /* Offset to Layer Records. */ + HBUINT16 numLayers; /* Number of Layer Records. */ + public: + DEFINE_SIZE_STATIC (14); +}; + +} /* namespace OT */ + + +#endif /* HB_OT_COLOR_COLR_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color-cpal-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color-cpal-table.hh new file mode 100644 index 000000000..76df88951 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color-cpal-table.hh @@ -0,0 +1,193 @@ +/* + * Copyright © 2016 Google, Inc. + * Copyright © 2018 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Sascha Brawer + */ + +#ifndef HB_OT_COLOR_CPAL_TABLE_HH +#define HB_OT_COLOR_CPAL_TABLE_HH + +#include "hb-open-type.hh" +#include "hb-ot-color.h" +#include "hb-ot-name.h" + + +/* + * CPAL -- Color Palette + * https://docs.microsoft.com/en-us/typography/opentype/spec/cpal + */ +#define HB_OT_TAG_CPAL HB_TAG('C','P','A','L') + + +namespace OT { + + +struct CPALV1Tail +{ + friend struct CPAL; + + private: + hb_ot_color_palette_flags_t get_palette_flags (const void *base, + unsigned int palette_index, + unsigned int palette_count) const + { + if (!paletteFlagsZ) return HB_OT_COLOR_PALETTE_FLAG_DEFAULT; + return (hb_ot_color_palette_flags_t) (uint32_t) + (base+paletteFlagsZ).as_array (palette_count)[palette_index]; + } + + hb_ot_name_id_t get_palette_name_id (const void *base, + unsigned int palette_index, + unsigned int palette_count) const + { + if (!paletteLabelsZ) return HB_OT_NAME_ID_INVALID; + return (base+paletteLabelsZ).as_array (palette_count)[palette_index]; + } + + hb_ot_name_id_t get_color_name_id (const void *base, + unsigned int color_index, + unsigned int color_count) const + { + if (!colorLabelsZ) return HB_OT_NAME_ID_INVALID; + return (base+colorLabelsZ).as_array (color_count)[color_index]; + } + + public: + bool sanitize (hb_sanitize_context_t *c, + const void *base, + unsigned int palette_count, + unsigned int color_count) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + (!paletteFlagsZ || (base+paletteFlagsZ).sanitize (c, palette_count)) && + (!paletteLabelsZ || (base+paletteLabelsZ).sanitize (c, palette_count)) && + (!colorLabelsZ || (base+colorLabelsZ).sanitize (c, color_count))); + } + + protected: + LNNOffsetTo> + paletteFlagsZ; /* Offset from the beginning of CPAL table to + * the Palette Type Array. Set to 0 if no array + * is provided. */ + LNNOffsetTo> + paletteLabelsZ; /* Offset from the beginning of CPAL table to + * the palette labels array. Set to 0 if no + * array is provided. */ + LNNOffsetTo> + colorLabelsZ; /* Offset from the beginning of CPAL table to + * the color labels array. Set to 0 + * if no array is provided. */ + public: + DEFINE_SIZE_STATIC (12); +}; + +typedef HBUINT32 BGRAColor; + +struct CPAL +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_CPAL; + + bool has_data () const { return numPalettes; } + + unsigned int get_size () const + { return min_size + numPalettes * sizeof (colorRecordIndicesZ[0]); } + + unsigned int get_palette_count () const { return numPalettes; } + unsigned int get_color_count () const { return numColors; } + + hb_ot_color_palette_flags_t get_palette_flags (unsigned int palette_index) const + { return v1 ().get_palette_flags (this, palette_index, numPalettes); } + + hb_ot_name_id_t get_palette_name_id (unsigned int palette_index) const + { return v1 ().get_palette_name_id (this, palette_index, numPalettes); } + + hb_ot_name_id_t get_color_name_id (unsigned int color_index) const + { return v1 ().get_color_name_id (this, color_index, numColors); } + + unsigned int get_palette_colors (unsigned int palette_index, + unsigned int start_offset, + unsigned int *color_count, /* IN/OUT. May be NULL. */ + hb_color_t *colors /* OUT. May be NULL. */) const + { + if (unlikely (palette_index >= numPalettes)) + { + if (color_count) *color_count = 0; + return 0; + } + unsigned int start_index = colorRecordIndicesZ[palette_index]; + hb_array_t all_colors ((this+colorRecordsZ).arrayZ, numColorRecords); + hb_array_t palette_colors = all_colors.sub_array (start_index, + numColors); + if (color_count) + { + hb_array_t segment_colors = palette_colors.sub_array (start_offset, *color_count); + /* Always return numColors colors per palette even if it has out-of-bounds start index. */ + unsigned int count = hb_min ((unsigned) hb_max ((int) (numColors - start_offset), 0), *color_count); + *color_count = count; + for (unsigned int i = 0; i < count; i++) + colors[i] = segment_colors[i]; /* Bound-checked read. */ + } + return numColors; + } + + private: + const CPALV1Tail& v1 () const + { + if (version == 0) return Null(CPALV1Tail); + return StructAfter (*this); + } + + public: + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + (this+colorRecordsZ).sanitize (c, numColorRecords) && + colorRecordIndicesZ.sanitize (c, numPalettes) && + (version == 0 || v1 ().sanitize (c, this, numPalettes, numColors))); + } + + protected: + HBUINT16 version; /* Table version number */ + /* Version 0 */ + HBUINT16 numColors; /* Number of colors in each palette. */ + HBUINT16 numPalettes; /* Number of palettes in the table. */ + HBUINT16 numColorRecords; /* Total number of color records, combined for + * all palettes. */ + LNNOffsetTo> + colorRecordsZ; /* Offset from the beginning of CPAL table to + * the first ColorRecord. */ + UnsizedArrayOf + colorRecordIndicesZ; /* Index of each palette’s first color record in + * the combined color record array. */ +/*CPALV1Tail v1;*/ + public: + DEFINE_SIZE_ARRAY (12, colorRecordIndicesZ); +}; + +} /* namespace OT */ + + +#endif /* HB_OT_COLOR_CPAL_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color-sbix-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color-sbix-table.hh new file mode 100644 index 000000000..6089027f8 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color-sbix-table.hh @@ -0,0 +1,286 @@ +/* + * Copyright © 2018 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#ifndef HB_OT_COLOR_SBIX_TABLE_HH +#define HB_OT_COLOR_SBIX_TABLE_HH + +#include "hb-open-type.hh" + +/* + * sbix -- Standard Bitmap Graphics + * https://docs.microsoft.com/en-us/typography/opentype/spec/sbix + * https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6sbix.html + */ +#define HB_OT_TAG_sbix HB_TAG('s','b','i','x') + + +namespace OT { + + +struct SBIXGlyph +{ + HBINT16 xOffset; /* The horizontal (x-axis) offset from the left + * edge of the graphic to the glyph’s origin. + * That is, the x-coordinate of the point on the + * baseline at the left edge of the glyph. */ + HBINT16 yOffset; /* The vertical (y-axis) offset from the bottom + * edge of the graphic to the glyph’s origin. + * That is, the y-coordinate of the point on the + * baseline at the left edge of the glyph. */ + Tag graphicType; /* Indicates the format of the embedded graphic + * data: one of 'jpg ', 'png ' or 'tiff', or the + * special format 'dupe'. */ + UnsizedArrayOf + data; /* The actual embedded graphic data. The total + * length is inferred from sequential entries in + * the glyphDataOffsets array and the fixed size + * (8 bytes) of the preceding fields. */ + public: + DEFINE_SIZE_ARRAY (8, data); +}; + +struct SBIXStrike +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + imageOffsetsZ.sanitize_shallow (c, c->get_num_glyphs () + 1)); + } + + hb_blob_t *get_glyph_blob (unsigned int glyph_id, + hb_blob_t *sbix_blob, + hb_tag_t file_type, + int *x_offset, + int *y_offset, + unsigned int num_glyphs, + unsigned int *strike_ppem) const + { + if (unlikely (!ppem)) return hb_blob_get_empty (); /* To get Null() object out of the way. */ + + unsigned int retry_count = 8; + unsigned int sbix_len = sbix_blob->length; + unsigned int strike_offset = (const char *) this - (const char *) sbix_blob->data; + assert (strike_offset < sbix_len); + + retry: + if (unlikely (glyph_id >= num_glyphs || + imageOffsetsZ[glyph_id + 1] <= imageOffsetsZ[glyph_id] || + imageOffsetsZ[glyph_id + 1] - imageOffsetsZ[glyph_id] <= SBIXGlyph::min_size || + (unsigned int) imageOffsetsZ[glyph_id + 1] > sbix_len - strike_offset)) + return hb_blob_get_empty (); + + unsigned int glyph_offset = strike_offset + (unsigned int) imageOffsetsZ[glyph_id] + SBIXGlyph::min_size; + unsigned int glyph_length = imageOffsetsZ[glyph_id + 1] - imageOffsetsZ[glyph_id] - SBIXGlyph::min_size; + + const SBIXGlyph *glyph = &(this+imageOffsetsZ[glyph_id]); + + if (glyph->graphicType == HB_TAG ('d','u','p','e')) + { + if (glyph_length >= 2) + { + glyph_id = *((HBUINT16 *) &glyph->data); + if (retry_count--) + goto retry; + } + return hb_blob_get_empty (); + } + + if (unlikely (file_type != glyph->graphicType)) + return hb_blob_get_empty (); + + if (strike_ppem) *strike_ppem = ppem; + if (x_offset) *x_offset = glyph->xOffset; + if (y_offset) *y_offset = glyph->yOffset; + return hb_blob_create_sub_blob (sbix_blob, glyph_offset, glyph_length); + } + + public: + HBUINT16 ppem; /* The PPEM size for which this strike was designed. */ + HBUINT16 resolution; /* The device pixel density (in PPI) for which this + * strike was designed. (E.g., 96 PPI, 192 PPI.) */ + protected: + UnsizedArrayOf> + imageOffsetsZ; /* Offset from the beginning of the strike data header + * to bitmap data for an individual glyph ID. */ + public: + DEFINE_SIZE_ARRAY (4, imageOffsetsZ); +}; + +struct sbix +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_sbix; + + bool has_data () const { return version; } + + const SBIXStrike &get_strike (unsigned int i) const { return this+strikes[i]; } + + struct accelerator_t + { + void init (hb_face_t *face) + { + table = hb_sanitize_context_t().reference_table (face); + num_glyphs = face->get_num_glyphs (); + } + void fini () { table.destroy (); } + + bool has_data () const { return table->has_data (); } + + bool get_extents (hb_font_t *font, + hb_codepoint_t glyph, + hb_glyph_extents_t *extents) const + { + /* We only support PNG right now, and following function checks type. */ + return get_png_extents (font, glyph, extents); + } + + hb_blob_t *reference_png (hb_font_t *font, + hb_codepoint_t glyph_id, + int *x_offset, + int *y_offset, + unsigned int *available_ppem) const + { + return choose_strike (font).get_glyph_blob (glyph_id, table.get_blob (), + HB_TAG ('p','n','g',' '), + x_offset, y_offset, + num_glyphs, available_ppem); + } + + private: + + const SBIXStrike &choose_strike (hb_font_t *font) const + { + unsigned count = table->strikes.len; + if (unlikely (!count)) + return Null(SBIXStrike); + + unsigned int requested_ppem = hb_max (font->x_ppem, font->y_ppem); + if (!requested_ppem) + requested_ppem = 1<<30; /* Choose largest strike. */ + /* TODO Add DPI sensitivity as well? */ + unsigned int best_i = 0; + unsigned int best_ppem = table->get_strike (0).ppem; + + for (unsigned int i = 1; i < count; i++) + { + unsigned int ppem = (table->get_strike (i)).ppem; + if ((requested_ppem <= ppem && ppem < best_ppem) || + (requested_ppem > best_ppem && ppem > best_ppem)) + { + best_i = i; + best_ppem = ppem; + } + } + + return table->get_strike (best_i); + } + + struct PNGHeader + { + HBUINT8 signature[8]; + struct + { + struct + { + HBUINT32 length; + Tag type; + } header; + HBUINT32 width; + HBUINT32 height; + HBUINT8 bitDepth; + HBUINT8 colorType; + HBUINT8 compressionMethod; + HBUINT8 filterMethod; + HBUINT8 interlaceMethod; + } IHDR; + + public: + DEFINE_SIZE_STATIC (29); + }; + + bool get_png_extents (hb_font_t *font, + hb_codepoint_t glyph, + hb_glyph_extents_t *extents) const + { + /* Following code is safe to call even without data. + * But faster to short-circuit. */ + if (!has_data ()) + return false; + + int x_offset = 0, y_offset = 0; + unsigned int strike_ppem = 0; + hb_blob_t *blob = reference_png (font, glyph, &x_offset, &y_offset, &strike_ppem); + + const PNGHeader &png = *blob->as(); + + extents->x_bearing = x_offset; + extents->y_bearing = png.IHDR.height + y_offset; + extents->width = png.IHDR.width; + extents->height = -png.IHDR.height; + + /* Convert to font units. */ + if (strike_ppem) + { + float scale = font->face->get_upem () / (float) strike_ppem; + extents->x_bearing = roundf (extents->x_bearing * scale); + extents->y_bearing = roundf (extents->y_bearing * scale); + extents->width = roundf (extents->width * scale); + extents->height = roundf (extents->height * scale); + } + + hb_blob_destroy (blob); + + return strike_ppem; + } + + private: + hb_blob_ptr_t table; + + unsigned int num_glyphs; + }; + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + version >= 1 && + strikes.sanitize (c, this))); + } + + protected: + HBUINT16 version; /* Table version number — set to 1 */ + HBUINT16 flags; /* Bit 0: Set to 1. Bit 1: Draw outlines. + * Bits 2 to 15: reserved (set to 0). */ + LOffsetLArrayOf + strikes; /* Offsets from the beginning of the 'sbix' + * table to data for each individual bitmap strike. */ + public: + DEFINE_SIZE_ARRAY (8, strikes); +}; + +struct sbix_accelerator_t : sbix::accelerator_t {}; + +} /* namespace OT */ + +#endif /* HB_OT_COLOR_SBIX_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color-svg-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color-svg-table.hh new file mode 100644 index 000000000..926d61e0f --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color-svg-table.hh @@ -0,0 +1,124 @@ +/* + * Copyright © 2018 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#ifndef HB_OT_COLOR_SVG_TABLE_HH +#define HB_OT_COLOR_SVG_TABLE_HH + +#include "hb-open-type.hh" + +/* + * SVG -- SVG (Scalable Vector Graphics) + * https://docs.microsoft.com/en-us/typography/opentype/spec/svg + */ + +#define HB_OT_TAG_SVG HB_TAG('S','V','G',' ') + + +namespace OT { + + +struct SVGDocumentIndexEntry +{ + int cmp (hb_codepoint_t g) const + { return g < startGlyphID ? -1 : g > endGlyphID ? 1 : 0; } + + hb_blob_t *reference_blob (hb_blob_t *svg_blob, unsigned int index_offset) const + { + return hb_blob_create_sub_blob (svg_blob, + index_offset + (unsigned int) svgDoc, + svgDocLength); + } + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + svgDoc.sanitize (c, base, svgDocLength)); + } + + protected: + HBUINT16 startGlyphID; /* The first glyph ID in the range described by + * this index entry. */ + HBUINT16 endGlyphID; /* The last glyph ID in the range described by + * this index entry. Must be >= startGlyphID. */ + LNNOffsetTo> + svgDoc; /* Offset from the beginning of the SVG Document Index + * to an SVG document. Must be non-zero. */ + HBUINT32 svgDocLength; /* Length of the SVG document. + * Must be non-zero. */ + public: + DEFINE_SIZE_STATIC (12); +}; + +struct SVG +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_SVG; + + bool has_data () const { return svgDocEntries; } + + struct accelerator_t + { + void init (hb_face_t *face) + { table = hb_sanitize_context_t().reference_table (face); } + void fini () { table.destroy (); } + + hb_blob_t *reference_blob_for_glyph (hb_codepoint_t glyph_id) const + { + return table->get_glyph_entry (glyph_id).reference_blob (table.get_blob (), + table->svgDocEntries); + } + + bool has_data () const { return table->has_data (); } + + private: + hb_blob_ptr_t table; + }; + + const SVGDocumentIndexEntry &get_glyph_entry (hb_codepoint_t glyph_id) const + { return (this+svgDocEntries).bsearch (glyph_id); } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + (this+svgDocEntries).sanitize_shallow (c))); + } + + protected: + HBUINT16 version; /* Table version (starting at 0). */ + LOffsetTo> + svgDocEntries; /* Offset (relative to the start of the SVG table) to the + * SVG Documents Index. Must be non-zero. */ + /* Array of SVG Document Index Entries. */ + HBUINT32 reserved; /* Set to 0. */ + public: + DEFINE_SIZE_STATIC (10); +}; + +struct SVG_accelerator_t : SVG::accelerator_t {}; + +} /* namespace OT */ + + +#endif /* HB_OT_COLOR_SVG_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color.cc new file mode 100644 index 000000000..0e7203a88 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color.cc @@ -0,0 +1,321 @@ +/* + * Copyright © 2016 Google, Inc. + * Copyright © 2018 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Sascha Brawer, Behdad Esfahbod + */ + +#include "hb.hh" + +#ifndef HB_NO_COLOR + +#include "hb-ot.h" + +#include "hb-ot-color-cbdt-table.hh" +#include "hb-ot-color-colr-table.hh" +#include "hb-ot-color-cpal-table.hh" +#include "hb-ot-color-sbix-table.hh" +#include "hb-ot-color-svg-table.hh" + +#include +#include + + +/** + * SECTION:hb-ot-color + * @title: hb-ot-color + * @short_description: OpenType Color Fonts + * @include: hb-ot.h + * + * Functions for fetching color-font information from OpenType font faces. + * + * HarfBuzz supports `COLR`/`CPAL`, `sbix`, `CBDT`, and `SVG` color fonts. + **/ + + +/* + * CPAL + */ + + +/** + * hb_ot_color_has_palettes: + * @face: #hb_face_t to work upon + * + * Tests whether a face includes a `CPAL` color-palette table. + * + * Return value: true if data found, false otherwise + * + * Since: 2.1.0 + */ +hb_bool_t +hb_ot_color_has_palettes (hb_face_t *face) +{ + return face->table.CPAL->has_data (); +} + +/** + * hb_ot_color_palette_get_count: + * @face: #hb_face_t to work upon + * + * Fetches the number of color palettes in a face. + * + * Return value: the number of palettes found + * + * Since: 2.1.0 + */ +unsigned int +hb_ot_color_palette_get_count (hb_face_t *face) +{ + return face->table.CPAL->get_palette_count (); +} + +/** + * hb_ot_color_palette_get_name_id: + * @face: #hb_face_t to work upon + * @palette_index: The index of the color palette + * + * Fetches the `name` table Name ID that provides display names for + * a `CPAL` color palette. + * + * Palette display names can be generic (e.g., "Default") or provide + * specific, themed names (e.g., "Spring", "Summer", "Fall", and "Winter"). + * + * Return value: the Named ID found for the palette. + * If the requested palette has no name the result is #HB_OT_NAME_ID_INVALID. + * + * Since: 2.1.0 + */ +hb_ot_name_id_t +hb_ot_color_palette_get_name_id (hb_face_t *face, + unsigned int palette_index) +{ + return face->table.CPAL->get_palette_name_id (palette_index); +} + +/** + * hb_ot_color_palette_color_get_name_id: + * @face: #hb_face_t to work upon + * @color_index: The index of the color + * + * Fetches the `name` table Name ID that provides display names for + * the specificed color in a face's `CPAL` color palette. + * + * Display names can be generic (e.g., "Background") or specific + * (e.g., "Eye color"). + * + * Return value: the Name ID found for the color. + * + * Since: 2.1.0 + */ +hb_ot_name_id_t +hb_ot_color_palette_color_get_name_id (hb_face_t *face, + unsigned int color_index) +{ + return face->table.CPAL->get_color_name_id (color_index); +} + +/** + * hb_ot_color_palette_get_flags: + * @face: #hb_face_t to work upon + * @palette_index: The index of the color palette + * + * Fetches the flags defined for a color palette. + * + * Return value: the #hb_ot_color_palette_flags_t of the requested color palette + * + * Since: 2.1.0 + */ +hb_ot_color_palette_flags_t +hb_ot_color_palette_get_flags (hb_face_t *face, + unsigned int palette_index) +{ + return face->table.CPAL->get_palette_flags (palette_index); +} + +/** + * hb_ot_color_palette_get_colors: + * @face: #hb_face_t to work upon + * @palette_index: the index of the color palette to query + * @start_offset: offset of the first color to retrieve + * @color_count: (inout) (optional): Input = the maximum number of colors to return; + * Output = the actual number of colors returned (may be zero) + * @colors: (out) (array length=color_count) (nullable): The array of #hb_color_t records found + * + * Fetches a list of the colors in a color palette. + * + * After calling this function, @colors will be filled with the palette + * colors. If @colors is NULL, the function will just return the number + * of total colors without storing any actual colors; this can be used + * for allocating a buffer of suitable size before calling + * hb_ot_color_palette_get_colors() a second time. + * + * Return value: the total number of colors in the palette + * + * Since: 2.1.0 + */ +unsigned int +hb_ot_color_palette_get_colors (hb_face_t *face, + unsigned int palette_index, + unsigned int start_offset, + unsigned int *colors_count /* IN/OUT. May be NULL. */, + hb_color_t *colors /* OUT. May be NULL. */) +{ + return face->table.CPAL->get_palette_colors (palette_index, start_offset, colors_count, colors); +} + + +/* + * COLR + */ + +/** + * hb_ot_color_has_layers: + * @face: #hb_face_t to work upon + * + * Tests whether a face includes any `COLR` color layers. + * + * Return value: true if data found, false otherwise + * + * Since: 2.1.0 + */ +hb_bool_t +hb_ot_color_has_layers (hb_face_t *face) +{ + return face->table.COLR->has_data (); +} + +/** + * hb_ot_color_glyph_get_layers: + * @face: #hb_face_t to work upon + * @glyph: The glyph index to query + * @start_offset: offset of the first layer to retrieve + * @layer_count: (inout) (optional): Input = the maximum number of layers to return; + * Output = the actual number of layers returned (may be zero) + * @layers: (out) (array length=layer_count) (nullable): The array of layers found + * + * Fetches a list of all color layers for the specified glyph index in the specified + * face. The list returned will begin at the offset provided. + * + * Return value: Total number of layers available for the glyph index queried + * + * Since: 2.1.0 + */ +unsigned int +hb_ot_color_glyph_get_layers (hb_face_t *face, + hb_codepoint_t glyph, + unsigned int start_offset, + unsigned int *layer_count, /* IN/OUT. May be NULL. */ + hb_ot_color_layer_t *layers /* OUT. May be NULL. */) +{ + return face->table.COLR->get_glyph_layers (glyph, start_offset, layer_count, layers); +} + + +/* + * SVG + */ + +/** + * hb_ot_color_has_svg: + * @face: #hb_face_t to work upon. + * + * Tests whether a face includes any `SVG` glyph images. + * + * Return value: true if data found, false otherwise. + * + * Since: 2.1.0 + */ +hb_bool_t +hb_ot_color_has_svg (hb_face_t *face) +{ + return face->table.SVG->has_data (); +} + +/** + * hb_ot_color_glyph_reference_svg: + * @face: #hb_face_t to work upon + * @glyph: a svg glyph index + * + * Fetches the SVG document for a glyph. The blob may be either plain text or gzip-encoded. + * + * Return value: (transfer full): An #hb_blob_t containing the SVG document of the glyph, if available + * + * Since: 2.1.0 + */ +hb_blob_t * +hb_ot_color_glyph_reference_svg (hb_face_t *face, hb_codepoint_t glyph) +{ + return face->table.SVG->reference_blob_for_glyph (glyph); +} + + +/* + * PNG: CBDT or sbix + */ + +/** + * hb_ot_color_has_png: + * @face: #hb_face_t to work upon + * + * Tests whether a face has PNG glyph images (either in `CBDT` or `sbix` tables). + * + * Return value: true if data found, false otherwise + * + * Since: 2.1.0 + */ +hb_bool_t +hb_ot_color_has_png (hb_face_t *face) +{ + return face->table.CBDT->has_data () || face->table.sbix->has_data (); +} + +/** + * hb_ot_color_glyph_reference_png: + * @font: #hb_font_t to work upon + * @glyph: a glyph index + * + * Fetches the PNG image for a glyph. This function takes a font object, not a face object, + * as input. To get an optimally sized PNG blob, the UPEM value must be set on the @font + * object. If UPEM is unset, the blob returned will be the largest PNG available. + * + * Return value: (transfer full): An #hb_blob_t containing the PNG image for the glyph, if available + * + * Since: 2.1.0 + */ +hb_blob_t * +hb_ot_color_glyph_reference_png (hb_font_t *font, hb_codepoint_t glyph) +{ + hb_blob_t *blob = hb_blob_get_empty (); + + if (font->face->table.sbix->has_data ()) + blob = font->face->table.sbix->reference_png (font, glyph, nullptr, nullptr, nullptr); + + if (!blob->length && font->face->table.CBDT->has_data ()) + blob = font->face->table.CBDT->reference_png (font, glyph); + + return blob; +} + + +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color.h new file mode 100644 index 000000000..63ef20a1a --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-color.h @@ -0,0 +1,139 @@ +/* + * Copyright © 2016 Google, Inc. + * Copyright © 2018 Khaled Hosny + * Copyright © 2018 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Sascha Brawer, Behdad Esfahbod + */ + +#ifndef HB_OT_H_IN +#error "Include instead." +#endif + +#ifndef HB_OT_COLOR_H +#define HB_OT_COLOR_H + +#include "hb.h" +#include "hb-ot-name.h" + +HB_BEGIN_DECLS + + +/* + * Color palettes. + */ + +HB_EXTERN hb_bool_t +hb_ot_color_has_palettes (hb_face_t *face); + +HB_EXTERN unsigned int +hb_ot_color_palette_get_count (hb_face_t *face); + +HB_EXTERN hb_ot_name_id_t +hb_ot_color_palette_get_name_id (hb_face_t *face, + unsigned int palette_index); + +HB_EXTERN hb_ot_name_id_t +hb_ot_color_palette_color_get_name_id (hb_face_t *face, + unsigned int color_index); + +/** + * hb_ot_color_palette_flags_t: + * @HB_OT_COLOR_PALETTE_FLAG_DEFAULT: Default indicating that there is nothing special + * to note about a color palette. + * @HB_OT_COLOR_PALETTE_FLAG_USABLE_WITH_LIGHT_BACKGROUND: Flag indicating that the color + * palette is appropriate to use when displaying the font on a light background such as white. + * @HB_OT_COLOR_PALETTE_FLAG_USABLE_WITH_DARK_BACKGROUND: Flag indicating that the color + * palette is appropriate to use when displaying the font on a dark background such as black. + * + * Since: 2.1.0 + */ +typedef enum { /*< flags >*/ + HB_OT_COLOR_PALETTE_FLAG_DEFAULT = 0x00000000u, + HB_OT_COLOR_PALETTE_FLAG_USABLE_WITH_LIGHT_BACKGROUND = 0x00000001u, + HB_OT_COLOR_PALETTE_FLAG_USABLE_WITH_DARK_BACKGROUND = 0x00000002u +} hb_ot_color_palette_flags_t; + +HB_EXTERN hb_ot_color_palette_flags_t +hb_ot_color_palette_get_flags (hb_face_t *face, + unsigned int palette_index); + +HB_EXTERN unsigned int +hb_ot_color_palette_get_colors (hb_face_t *face, + unsigned int palette_index, + unsigned int start_offset, + unsigned int *color_count, /* IN/OUT. May be NULL. */ + hb_color_t *colors /* OUT. May be NULL. */); + + +/* + * Color layers. + */ + +HB_EXTERN hb_bool_t +hb_ot_color_has_layers (hb_face_t *face); + +/** + * hb_ot_color_layer_t: + * + * Pairs of glyph and color index. + * + * Since: 2.1.0 + **/ +typedef struct hb_ot_color_layer_t +{ + hb_codepoint_t glyph; + unsigned int color_index; +} hb_ot_color_layer_t; + +HB_EXTERN unsigned int +hb_ot_color_glyph_get_layers (hb_face_t *face, + hb_codepoint_t glyph, + unsigned int start_offset, + unsigned int *layer_count, /* IN/OUT. May be NULL. */ + hb_ot_color_layer_t *layers /* OUT. May be NULL. */); + +/* + * SVG + */ + +HB_EXTERN hb_bool_t +hb_ot_color_has_svg (hb_face_t *face); + +HB_EXTERN hb_blob_t * +hb_ot_color_glyph_reference_svg (hb_face_t *face, hb_codepoint_t glyph); + +/* + * PNG: CBDT or sbix + */ + +HB_EXTERN hb_bool_t +hb_ot_color_has_png (hb_face_t *face); + +HB_EXTERN hb_blob_t * +hb_ot_color_glyph_reference_png (hb_font_t *font, hb_codepoint_t glyph); + + +HB_END_DECLS + +#endif /* HB_OT_COLOR_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-deprecated.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-deprecated.h new file mode 100644 index 000000000..bc72f8a70 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-deprecated.h @@ -0,0 +1,111 @@ +/* + * Copyright © 2018 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OT_H_IN +#error "Include instead." +#endif + +#ifndef HB_OT_DEPRECATED_H +#define HB_OT_DEPRECATED_H + +#include "hb.h" +#include "hb-ot-name.h" + + +HB_BEGIN_DECLS + +#ifndef HB_DISABLE_DEPRECATED + + +/* https://github.com/harfbuzz/harfbuzz/issues/1734 */ +#define HB_MATH_GLYPH_PART_FLAG_EXTENDER HB_OT_MATH_GLYPH_PART_FLAG_EXTENDER + + +/* Like hb_ot_layout_table_find_script, but takes zero-terminated array of scripts to test */ +HB_EXTERN HB_DEPRECATED_FOR (hb_ot_layout_table_select_script) hb_bool_t +hb_ot_layout_table_choose_script (hb_face_t *face, + hb_tag_t table_tag, + const hb_tag_t *script_tags, + unsigned int *script_index, + hb_tag_t *chosen_script); + +HB_EXTERN HB_DEPRECATED_FOR (hb_ot_layout_script_select_language) hb_bool_t +hb_ot_layout_script_find_language (hb_face_t *face, + hb_tag_t table_tag, + unsigned int script_index, + hb_tag_t language_tag, + unsigned int *language_index); + +HB_EXTERN HB_DEPRECATED_FOR (hb_ot_tags_from_script_and_language) void +hb_ot_tags_from_script (hb_script_t script, + hb_tag_t *script_tag_1, + hb_tag_t *script_tag_2); + +HB_EXTERN HB_DEPRECATED_FOR (hb_ot_tags_from_script_and_language) hb_tag_t +hb_ot_tag_from_language (hb_language_t language); + + +/** + * HB_OT_VAR_NO_AXIS_INDEX: + * + * Since: 1.4.2 + * Deprecated: 2.2.0 + */ +#define HB_OT_VAR_NO_AXIS_INDEX 0xFFFFFFFFu + +/** + * hb_ot_var_axis_t: + * + * Since: 1.4.2 + * Deprecated: 2.2.0 + */ +typedef struct hb_ot_var_axis_t +{ + hb_tag_t tag; + hb_ot_name_id_t name_id; + float min_value; + float default_value; + float max_value; +} hb_ot_var_axis_t; + +HB_EXTERN HB_DEPRECATED_FOR (hb_ot_var_get_axis_infos) unsigned int +hb_ot_var_get_axes (hb_face_t *face, + unsigned int start_offset, + unsigned int *axes_count /* IN/OUT */, + hb_ot_var_axis_t *axes_array /* OUT */); + +HB_EXTERN HB_DEPRECATED_FOR (hb_ot_var_find_axis_info) hb_bool_t +hb_ot_var_find_axis (hb_face_t *face, + hb_tag_t axis_tag, + unsigned int *axis_index, + hb_ot_var_axis_t *axis_info); + + +#endif + +HB_END_DECLS + +#endif /* HB_OT_DEPRECATED_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-face-table-list.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-face-table-list.hh new file mode 100644 index 000000000..30bab5cb5 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-face-table-list.hh @@ -0,0 +1,138 @@ +/* + * Copyright © 2007,2008,2009 Red Hat, Inc. + * Copyright © 2012,2013 Google, Inc. + * Copyright © 2019, Facebook Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + * Facebook Author(s): Behdad Esfahbod + */ + +#ifndef HB_OT_FACE_TABLE_LIST_HH +#define HB_OT_FACE_TABLE_LIST_HH +#endif /* HB_OT_FACE_TABLE_LIST_HH */ /* Dummy header guards */ + +#ifndef HB_OT_ACCELERATOR +#define HB_OT_ACCELERATOR(Namespace, Type) HB_OT_TABLE (Namespace, Type) +#define _HB_OT_ACCELERATOR_UNDEF +#endif + + +/* This lists font tables that the hb_face_t will contain and lazily + * load. Don't add a table unless it's used though. This is not + * exactly free. */ + +/* v--- Add new tables in the right place here. */ + + +/* OpenType fundamentals. */ +HB_OT_TABLE (OT, head) +#if !defined(HB_NO_FACE_COLLECT_UNICODES) || !defined(HB_NO_OT_FONT) +HB_OT_ACCELERATOR (OT, cmap) +#endif +HB_OT_TABLE (OT, hhea) +HB_OT_ACCELERATOR (OT, hmtx) +HB_OT_TABLE (OT, OS2) +#if !defined(HB_NO_OT_FONT_GLYPH_NAMES) || !defined(HB_NO_METRICS) +HB_OT_ACCELERATOR (OT, post) +#endif +#ifndef HB_NO_NAME +HB_OT_ACCELERATOR (OT, name) +#endif +#ifndef HB_NO_STAT +HB_OT_TABLE (OT, STAT) +#endif +#ifndef HB_NO_META +HB_OT_ACCELERATOR (OT, meta) +#endif + +/* Vertical layout. */ +HB_OT_TABLE (OT, vhea) +HB_OT_ACCELERATOR (OT, vmtx) + +/* TrueType outlines. */ +HB_OT_ACCELERATOR (OT, glyf) + +/* CFF outlines. */ +#ifndef HB_NO_CFF +HB_OT_ACCELERATOR (OT, cff1) +HB_OT_ACCELERATOR (OT, cff2) +HB_OT_TABLE (OT, VORG) +#endif + +/* OpenType variations. */ +#ifndef HB_NO_VAR +HB_OT_TABLE (OT, fvar) +HB_OT_TABLE (OT, avar) +HB_OT_TABLE (OT, MVAR) +#endif + +/* Legacy kern. */ +#ifndef HB_NO_OT_KERN +HB_OT_TABLE (OT, kern) +#endif + +/* OpenType shaping. */ +#ifndef HB_NO_OT_LAYOUT +HB_OT_ACCELERATOR (OT, GDEF) +HB_OT_ACCELERATOR (OT, GSUB) +HB_OT_ACCELERATOR (OT, GPOS) +//HB_OT_TABLE (OT, JSTF) +#endif + +/* OpenType baseline. */ +#ifndef HB_NO_BASE +HB_OT_TABLE (OT, BASE) +#endif + +/* AAT shaping. */ +#ifndef HB_NO_AAT +HB_OT_TABLE (AAT, morx) +HB_OT_TABLE (AAT, mort) +HB_OT_TABLE (AAT, kerx) +HB_OT_TABLE (AAT, ankr) +HB_OT_TABLE (AAT, trak) +HB_OT_TABLE (AAT, lcar) +HB_OT_TABLE (AAT, ltag) +HB_OT_TABLE (AAT, feat) +// HB_OT_TABLE (AAT, opbd) +#endif + +/* OpenType color fonts. */ +#ifndef HB_NO_COLOR +HB_OT_TABLE (OT, COLR) +HB_OT_TABLE (OT, CPAL) +HB_OT_ACCELERATOR (OT, CBDT) +HB_OT_ACCELERATOR (OT, sbix) +HB_OT_ACCELERATOR (OT, SVG) +#endif + +/* OpenType math. */ +#ifndef HB_NO_MATH +HB_OT_TABLE (OT, MATH) +#endif + + +#ifdef _HB_OT_ACCELERATOR_UNDEF +#undef HB_OT_ACCELERATOR +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-face.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-face.cc new file mode 100644 index 000000000..5ef8df43c --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-face.cc @@ -0,0 +1,58 @@ +/* + * Copyright © 2018 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#include "hb-ot-face.hh" + +#include "hb-ot-cmap-table.hh" +#include "hb-ot-glyf-table.hh" +#include "hb-ot-cff1-table.hh" +#include "hb-ot-cff2-table.hh" +#include "hb-ot-hmtx-table.hh" +#include "hb-ot-kern-table.hh" +#include "hb-ot-meta-table.hh" +#include "hb-ot-name-table.hh" +#include "hb-ot-post-table.hh" +#include "hb-ot-color-cbdt-table.hh" +#include "hb-ot-color-sbix-table.hh" +#include "hb-ot-color-svg-table.hh" +#include "hb-ot-layout-gdef-table.hh" +#include "hb-ot-layout-gsub-table.hh" +#include "hb-ot-layout-gpos-table.hh" + + +void hb_ot_face_t::init0 (hb_face_t *face) +{ + this->face = face; +#define HB_OT_TABLE(Namespace, Type) Type.init0 (); +#include "hb-ot-face-table-list.hh" +#undef HB_OT_TABLE +} +void hb_ot_face_t::fini () +{ +#define HB_OT_TABLE(Namespace, Type) Type.fini (); +#include "hb-ot-face-table-list.hh" +#undef HB_OT_TABLE +} diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-face.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-face.hh new file mode 100644 index 000000000..e24d380bc --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-face.hh @@ -0,0 +1,74 @@ +/* + * Copyright © 2007,2008,2009 Red Hat, Inc. + * Copyright © 2012,2013 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OT_FACE_HH +#define HB_OT_FACE_HH + +#include "hb.hh" + +#include "hb-machinery.hh" + + +/* + * hb_ot_face_t + */ + +/* Declare tables. */ +#define HB_OT_TABLE(Namespace, Type) namespace Namespace { struct Type; } +#define HB_OT_ACCELERATOR(Namespace, Type) HB_OT_TABLE (Namespace, Type##_accelerator_t) +#include "hb-ot-face-table-list.hh" +#undef HB_OT_ACCELERATOR +#undef HB_OT_TABLE + +struct hb_ot_face_t +{ + HB_INTERNAL void init0 (hb_face_t *face); + HB_INTERNAL void fini (); + +#define HB_OT_TABLE_ORDER(Namespace, Type) \ + HB_PASTE (ORDER_, HB_PASTE (Namespace, HB_PASTE (_, Type))) + enum order_t + { + ORDER_ZERO, +#define HB_OT_TABLE(Namespace, Type) HB_OT_TABLE_ORDER (Namespace, Type), +#include "hb-ot-face-table-list.hh" +#undef HB_OT_TABLE + }; + + hb_face_t *face; /* MUST be JUST before the lazy loaders. */ +#define HB_OT_TABLE(Namespace, Type) \ + hb_table_lazy_loader_t Type; +#define HB_OT_ACCELERATOR(Namespace, Type) \ + hb_face_lazy_loader_t Type; +#include "hb-ot-face-table-list.hh" +#undef HB_OT_ACCELERATOR +#undef HB_OT_TABLE +}; + + +#endif /* HB_OT_FACE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-font.cc b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-font.cc new file mode 100644 index 000000000..e6288b445 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-font.cc @@ -0,0 +1,319 @@ +/* + * Copyright © 2011,2014 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod, Roozbeh Pournader + */ + +#include "hb.hh" + +#ifndef HB_NO_OT_FONT + +#include "hb-ot.h" + +#include "hb-font.hh" +#include "hb-machinery.hh" +#include "hb-ot-face.hh" + +#include "hb-ot-cmap-table.hh" +#include "hb-ot-glyf-table.hh" +#include "hb-ot-cff1-table.hh" +#include "hb-ot-cff2-table.hh" +#include "hb-ot-hmtx-table.hh" +#include "hb-ot-os2-table.hh" +#include "hb-ot-post-table.hh" +#include "hb-ot-stat-table.hh" // Just so we compile it; unused otherwise. +#include "hb-ot-vorg-table.hh" +#include "hb-ot-color-cbdt-table.hh" +#include "hb-ot-color-sbix-table.hh" + + +/** + * SECTION:hb-ot-font + * @title: hb-ot-font + * @short_description: OpenType font implementation + * @include: hb-ot.h + * + * Functions for using OpenType fonts with hb_shape(). Note that fonts returned + * by hb_font_create() default to using these functions, so most clients would + * never need to call these functions directly. + **/ + + +static hb_bool_t +hb_ot_get_nominal_glyph (hb_font_t *font HB_UNUSED, + void *font_data, + hb_codepoint_t unicode, + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + const hb_ot_face_t *ot_face = (const hb_ot_face_t *) font_data; + return ot_face->cmap->get_nominal_glyph (unicode, glyph); +} + +static unsigned int +hb_ot_get_nominal_glyphs (hb_font_t *font HB_UNUSED, + void *font_data, + unsigned int count, + const hb_codepoint_t *first_unicode, + unsigned int unicode_stride, + hb_codepoint_t *first_glyph, + unsigned int glyph_stride, + void *user_data HB_UNUSED) +{ + const hb_ot_face_t *ot_face = (const hb_ot_face_t *) font_data; + return ot_face->cmap->get_nominal_glyphs (count, + first_unicode, unicode_stride, + first_glyph, glyph_stride); +} + +static hb_bool_t +hb_ot_get_variation_glyph (hb_font_t *font HB_UNUSED, + void *font_data, + hb_codepoint_t unicode, + hb_codepoint_t variation_selector, + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + const hb_ot_face_t *ot_face = (const hb_ot_face_t *) font_data; + return ot_face->cmap->get_variation_glyph (unicode, variation_selector, glyph); +} + +static void +hb_ot_get_glyph_h_advances (hb_font_t* font, void* font_data, + unsigned count, + const hb_codepoint_t *first_glyph, + unsigned glyph_stride, + hb_position_t *first_advance, + unsigned advance_stride, + void *user_data HB_UNUSED) +{ + const hb_ot_face_t *ot_face = (const hb_ot_face_t *) font_data; + const OT::hmtx_accelerator_t &hmtx = *ot_face->hmtx; + + for (unsigned int i = 0; i < count; i++) + { + *first_advance = font->em_scale_x (hmtx.get_advance (*first_glyph, font)); + first_glyph = &StructAtOffsetUnaligned (first_glyph, glyph_stride); + first_advance = &StructAtOffsetUnaligned (first_advance, advance_stride); + } +} + +static void +hb_ot_get_glyph_v_advances (hb_font_t* font, void* font_data, + unsigned count, + const hb_codepoint_t *first_glyph, + unsigned glyph_stride, + hb_position_t *first_advance, + unsigned advance_stride, + void *user_data HB_UNUSED) +{ + const hb_ot_face_t *ot_face = (const hb_ot_face_t *) font_data; + const OT::vmtx_accelerator_t &vmtx = *ot_face->vmtx; + + for (unsigned int i = 0; i < count; i++) + { + *first_advance = font->em_scale_y (-(int) vmtx.get_advance (*first_glyph, font)); + first_glyph = &StructAtOffsetUnaligned (first_glyph, glyph_stride); + first_advance = &StructAtOffsetUnaligned (first_advance, advance_stride); + } +} + +static hb_bool_t +hb_ot_get_glyph_v_origin (hb_font_t *font, + void *font_data, + hb_codepoint_t glyph, + hb_position_t *x, + hb_position_t *y, + void *user_data HB_UNUSED) +{ + const hb_ot_face_t *ot_face = (const hb_ot_face_t *) font_data; + + *x = font->get_glyph_h_advance (glyph) / 2; + +#ifndef HB_NO_OT_FONT_CFF + const OT::VORG &VORG = *ot_face->VORG; + if (VORG.has_data ()) + { + *y = font->em_scale_y (VORG.get_y_origin (glyph)); + return true; + } +#endif + + hb_glyph_extents_t extents = {0}; + if (ot_face->glyf->get_extents (glyph, &extents)) + { + const OT::vmtx_accelerator_t &vmtx = *ot_face->vmtx; + hb_position_t tsb = vmtx.get_side_bearing (glyph); + *y = font->em_scale_y (extents.y_bearing + tsb); + return true; + } + + hb_font_extents_t font_extents; + font->get_h_extents_with_fallback (&font_extents); + *y = font_extents.ascender; + + return true; +} + +static hb_bool_t +hb_ot_get_glyph_extents (hb_font_t *font, + void *font_data, + hb_codepoint_t glyph, + hb_glyph_extents_t *extents, + void *user_data HB_UNUSED) +{ + const hb_ot_face_t *ot_face = (const hb_ot_face_t *) font_data; + bool ret = false; + +#if !defined(HB_NO_OT_FONT_BITMAP) && !defined(HB_NO_COLOR) + if (!ret) ret = ot_face->sbix->get_extents (font, glyph, extents); +#endif + if (!ret) ret = ot_face->glyf->get_extents (glyph, extents); +#ifndef HB_NO_OT_FONT_CFF + if (!ret) ret = ot_face->cff1->get_extents (glyph, extents); + if (!ret) ret = ot_face->cff2->get_extents (font, glyph, extents); +#endif +#if !defined(HB_NO_OT_FONT_BITMAP) && !defined(HB_NO_COLOR) + if (!ret) ret = ot_face->CBDT->get_extents (font, glyph, extents); +#endif + + // TODO Hook up side-bearings variations. + extents->x_bearing = font->em_scale_x (extents->x_bearing); + extents->y_bearing = font->em_scale_y (extents->y_bearing); + extents->width = font->em_scale_x (extents->width); + extents->height = font->em_scale_y (extents->height); + return ret; +} + +#ifndef HB_NO_OT_FONT_GLYPH_NAMES +static hb_bool_t +hb_ot_get_glyph_name (hb_font_t *font HB_UNUSED, + void *font_data, + hb_codepoint_t glyph, + char *name, unsigned int size, + void *user_data HB_UNUSED) +{ + const hb_ot_face_t *ot_face = (const hb_ot_face_t *) font_data; + return ot_face->post->get_glyph_name (glyph, name, size); +} +static hb_bool_t +hb_ot_get_glyph_from_name (hb_font_t *font HB_UNUSED, + void *font_data, + const char *name, int len, + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + const hb_ot_face_t *ot_face = (const hb_ot_face_t *) font_data; + return ot_face->post->get_glyph_from_name (name, len, glyph); +} +#endif + +static hb_bool_t +hb_ot_get_font_h_extents (hb_font_t *font, + void *font_data HB_UNUSED, + hb_font_extents_t *metrics, + void *user_data HB_UNUSED) +{ + return _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_TAG_HORIZONTAL_ASCENDER, &metrics->ascender) && + _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_TAG_HORIZONTAL_DESCENDER, &metrics->descender) && + _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_TAG_HORIZONTAL_LINE_GAP, &metrics->line_gap); +} + +static hb_bool_t +hb_ot_get_font_v_extents (hb_font_t *font, + void *font_data HB_UNUSED, + hb_font_extents_t *metrics, + void *user_data HB_UNUSED) +{ + return _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_TAG_VERTICAL_ASCENDER, &metrics->ascender) && + _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_TAG_VERTICAL_DESCENDER, &metrics->descender) && + _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_TAG_VERTICAL_LINE_GAP, &metrics->line_gap); +} + +#if HB_USE_ATEXIT +static void free_static_ot_funcs (); +#endif + +static struct hb_ot_font_funcs_lazy_loader_t : hb_font_funcs_lazy_loader_t +{ + static hb_font_funcs_t *create () + { + hb_font_funcs_t *funcs = hb_font_funcs_create (); + + hb_font_funcs_set_font_h_extents_func (funcs, hb_ot_get_font_h_extents, nullptr, nullptr); + hb_font_funcs_set_font_v_extents_func (funcs, hb_ot_get_font_v_extents, nullptr, nullptr); + hb_font_funcs_set_nominal_glyph_func (funcs, hb_ot_get_nominal_glyph, nullptr, nullptr); + hb_font_funcs_set_nominal_glyphs_func (funcs, hb_ot_get_nominal_glyphs, nullptr, nullptr); + hb_font_funcs_set_variation_glyph_func (funcs, hb_ot_get_variation_glyph, nullptr, nullptr); + hb_font_funcs_set_glyph_h_advances_func (funcs, hb_ot_get_glyph_h_advances, nullptr, nullptr); + hb_font_funcs_set_glyph_v_advances_func (funcs, hb_ot_get_glyph_v_advances, nullptr, nullptr); + //hb_font_funcs_set_glyph_h_origin_func (funcs, hb_ot_get_glyph_h_origin, nullptr, nullptr); + hb_font_funcs_set_glyph_v_origin_func (funcs, hb_ot_get_glyph_v_origin, nullptr, nullptr); + hb_font_funcs_set_glyph_extents_func (funcs, hb_ot_get_glyph_extents, nullptr, nullptr); + //hb_font_funcs_set_glyph_contour_point_func (funcs, hb_ot_get_glyph_contour_point, nullptr, nullptr); +#ifndef HB_NO_OT_FONT_GLYPH_NAMES + hb_font_funcs_set_glyph_name_func (funcs, hb_ot_get_glyph_name, nullptr, nullptr); + hb_font_funcs_set_glyph_from_name_func (funcs, hb_ot_get_glyph_from_name, nullptr, nullptr); +#endif + + hb_font_funcs_make_immutable (funcs); + +#if HB_USE_ATEXIT + atexit (free_static_ot_funcs); +#endif + + return funcs; + } +} static_ot_funcs; + +#if HB_USE_ATEXIT +static +void free_static_ot_funcs () +{ + static_ot_funcs.free_instance (); +} +#endif + +static hb_font_funcs_t * +_hb_ot_get_font_funcs () +{ + return static_ot_funcs.get_unconst (); +} + + +/** + * hb_ot_font_set_funcs: + * + * Since: 0.9.28 + **/ +void +hb_ot_font_set_funcs (hb_font_t *font) +{ + hb_font_set_funcs (font, + _hb_ot_get_font_funcs (), + &font->face->table, + nullptr); +} + + +#endif diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-font.h b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-font.h new file mode 100644 index 000000000..80eaa54b1 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-font.h @@ -0,0 +1,45 @@ +/* + * Copyright © 2014 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod, Roozbeh Pournader + */ + +#ifndef HB_OT_H_IN +#error "Include instead." +#endif + +#ifndef HB_OT_FONT_H +#define HB_OT_FONT_H + +#include "hb.h" + +HB_BEGIN_DECLS + + +HB_EXTERN void +hb_ot_font_set_funcs (hb_font_t *font); + + +HB_END_DECLS + +#endif /* HB_OT_FONT_H */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-gasp-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-gasp-table.hh new file mode 100644 index 000000000..94fff58a1 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-gasp-table.hh @@ -0,0 +1,84 @@ +/* + * Copyright © 2018 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#ifndef HB_OT_GASP_TABLE_HH +#define HB_OT_GASP_TABLE_HH + +#include "hb-open-type.hh" +#include "hb-ot-hhea-table.hh" +#include "hb-ot-os2-table.hh" +#include "hb-ot-var-hvar-table.hh" + +/* + * gasp -- Grid-fitting and Scan-conversion Procedure + * https://docs.microsoft.com/en-us/typography/opentype/spec/gasp + */ +#define HB_OT_TAG_gasp HB_TAG('g','a','s','p') + + +namespace OT { + +struct GaspRange +{ + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + public: + HBUINT16 rangeMaxPPEM; /* Upper limit of range, in PPEM */ + HBUINT16 rangeGaspBehavior; + /* Flags describing desired rasterizer behavior. */ + public: + DEFINE_SIZE_STATIC (4); +}; + +struct gasp +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_gasp; + + const GaspRange &get_gasp_range (unsigned int i) const + { return gaspRanges[i]; } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + gaspRanges.sanitize (c)); + } + + protected: + HBUINT16 version; /* Version number (set to 1) */ + ArrayOf + gaspRanges; /* Number of records to follow + * Sorted by ppem */ + public: + DEFINE_SIZE_ARRAY (4, gaspRanges); +}; + +} /* namespace OT */ + + +#endif /* HB_OT_GASP_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-glyf-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-glyf-table.hh new file mode 100644 index 000000000..9a791bbf0 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-glyf-table.hh @@ -0,0 +1,751 @@ +/* + * Copyright © 2015 Google, Inc. + * Copyright © 2019 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod, Garret Rieger, Roderick Sheeter + */ + +#ifndef HB_OT_GLYF_TABLE_HH +#define HB_OT_GLYF_TABLE_HH + +#include "hb-open-type.hh" +#include "hb-ot-head-table.hh" + +namespace OT { + + +/* + * loca -- Index to Location + * https://docs.microsoft.com/en-us/typography/opentype/spec/loca + */ +#define HB_OT_TAG_loca HB_TAG('l','o','c','a') + + +struct loca +{ + friend struct glyf; + + static constexpr hb_tag_t tableTag = HB_OT_TAG_loca; + + bool sanitize (hb_sanitize_context_t *c HB_UNUSED) const + { + TRACE_SANITIZE (this); + return_trace (true); + } + + protected: + UnsizedArrayOf + dataZ; /* Location data. */ + public: + DEFINE_SIZE_MIN (0); /* In reality, this is UNBOUNDED() type; but since we always + * check the size externally, allow Null() object of it by + * defining it _MIN instead. */ +}; + + +/* + * glyf -- TrueType Glyph Data + * https://docs.microsoft.com/en-us/typography/opentype/spec/glyf + */ +#define HB_OT_TAG_glyf HB_TAG('g','l','y','f') + + +struct glyf +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_glyf; + + bool sanitize (hb_sanitize_context_t *c HB_UNUSED) const + { + TRACE_SANITIZE (this); + /* We don't check for anything specific here. The users of the + * struct do all the hard work... */ + return_trace (true); + } + + template + static bool + _add_loca_and_head (hb_subset_plan_t * plan, Iterator padded_offsets) + { + unsigned max_offset = + padded_offsets | hb_reduce(hb_add, 0); + unsigned num_offsets = padded_offsets.len () + 1; + bool use_short_loca = max_offset < 0x1FFFF; + unsigned entry_size = use_short_loca ? 2 : 4; + char *loca_prime_data = (char *) calloc (entry_size, num_offsets); + + if (unlikely (!loca_prime_data)) return false; + + DEBUG_MSG (SUBSET, nullptr, "loca entry_size %d num_offsets %d " + "max_offset %d size %d", + entry_size, num_offsets, max_offset, entry_size * num_offsets); + + if (use_short_loca) + _write_loca (padded_offsets, 1, hb_array ((HBUINT16*) loca_prime_data, num_offsets)); + else + _write_loca (padded_offsets, 0, hb_array ((HBUINT32*) loca_prime_data, num_offsets)); + + hb_blob_t * loca_blob = hb_blob_create (loca_prime_data, + entry_size * num_offsets, + HB_MEMORY_MODE_WRITABLE, + loca_prime_data, + free); + + bool result = plan->add_table (HB_OT_TAG_loca, loca_blob) + && _add_head_and_set_loca_version(plan, use_short_loca); + + hb_blob_destroy (loca_blob); + return result; + } + + template + static void + _write_loca (IteratorIn it, unsigned right_shift, IteratorOut dest) + { + unsigned int offset = 0; + dest << 0; + + it + | hb_map ([=, &offset] (unsigned int padded_size) + { + offset += padded_size; + DEBUG_MSG (SUBSET, nullptr, "loca entry offset %d", offset); + return offset >> right_shift; + }) + | hb_sink (dest) + ; + } + + // requires source of SubsetGlyph complains the identifier isn't declared + template + bool serialize (hb_serialize_context_t *c, + Iterator it, + const hb_subset_plan_t *plan) + { + TRACE_SERIALIZE (this); + for (const auto &_ : it) _.serialize (c, plan); + return_trace (true); + } + + bool subset (hb_subset_context_t *c) const + { + TRACE_SUBSET (this); + + glyf *glyf_prime = c->serializer->start_embed (); + if (unlikely (!c->serializer->check_success (glyf_prime))) return_trace (false); + + // Byte region(s) per glyph to output + // unpadded, hints removed if so requested + // If we fail to process a glyph we produce an empty (0-length) glyph + hb_vector_t glyphs; + _populate_subset_glyphs (c->plan, &glyphs); + + glyf_prime->serialize (c->serializer, hb_iter (glyphs), c->plan); + + auto padded_offsets = + + hb_iter (glyphs) + | hb_map (&SubsetGlyph::padded_size) + ; + + if (c->serializer->in_error ()) return_trace (false); + return_trace (c->serializer->check_success (_add_loca_and_head (c->plan, + padded_offsets))); + } + + template + void + _populate_subset_glyphs (const hb_subset_plan_t * plan, + hb_vector_t * glyphs /* OUT */) const + { + OT::glyf::accelerator_t glyf; + glyf.init (plan->source); + + + hb_range (plan->num_output_glyphs ()) + | hb_map ([&] (hb_codepoint_t new_gid) + { + SubsetGlyph subset_glyph = {0}; + subset_glyph.new_gid = new_gid; + + // should never fail: all old gids should be mapped + if (!plan->old_gid_for_new_gid (new_gid, &subset_glyph.old_gid)) + return subset_glyph; + + subset_glyph.source_glyph = glyf.bytes_for_glyph ((const char *) this, + subset_glyph.old_gid); + if (plan->drop_hints) subset_glyph.drop_hints (glyf); + else subset_glyph.dest_start = subset_glyph.source_glyph; + + return subset_glyph; + }) + | hb_sink (glyphs) + ; + + glyf.fini (); + } + + static void + _fix_component_gids (const hb_subset_plan_t *plan, + hb_bytes_t glyph) + { + OT::glyf::CompositeGlyphHeader::Iterator iterator; + if (OT::glyf::CompositeGlyphHeader::get_iterator (&glyph, + glyph.length, + &iterator)) + { + do + { + hb_codepoint_t new_gid; + if (!plan->new_gid_for_old_gid (iterator.current->glyphIndex, + &new_gid)) + continue; + ((OT::glyf::CompositeGlyphHeader *) iterator.current)->glyphIndex = new_gid; + } while (iterator.move_to_next ()); + } + } + + static void + _zero_instruction_length (hb_bytes_t glyph) + { + const GlyphHeader &glyph_header = *glyph.as (); + if (!glyph_header.is_simple_glyph ()) return; // only for simple glyphs + + unsigned int instruction_len_offset = glyph_header.simple_instruction_len_offset (); + const HBUINT16 &instruction_len = StructAtOffset (&glyph, + instruction_len_offset); + (HBUINT16 &) instruction_len = 0; + } + + static bool _remove_composite_instruction_flag (hb_bytes_t glyph) + { + const GlyphHeader &glyph_header = *glyph.as (); + if (!glyph_header.is_composite_glyph ()) return true; // only for composites + + /* remove WE_HAVE_INSTRUCTIONS from flags in dest */ + OT::glyf::CompositeGlyphHeader::Iterator composite_it; + if (unlikely (!OT::glyf::CompositeGlyphHeader::get_iterator (&glyph, glyph.length, + &composite_it))) + return false; + const OT::glyf::CompositeGlyphHeader *composite_header; + do + { + composite_header = composite_it.current; + OT::HBUINT16 *flags = const_cast (&composite_header->flags); + *flags = (uint16_t) *flags & ~OT::glyf::CompositeGlyphHeader::WE_HAVE_INSTRUCTIONS; + } while (composite_it.move_to_next ()); + return true; + } + + static bool + _add_head_and_set_loca_version (hb_subset_plan_t *plan, bool use_short_loca) + { + hb_blob_t *head_blob = hb_sanitize_context_t ().reference_table (plan->source); + hb_blob_t *head_prime_blob = hb_blob_copy_writable_or_fail (head_blob); + hb_blob_destroy (head_blob); + + if (unlikely (!head_prime_blob)) + return false; + + head *head_prime = (head *) hb_blob_get_data_writable (head_prime_blob, nullptr); + head_prime->indexToLocFormat = use_short_loca ? 0 : 1; + bool success = plan->add_table (HB_OT_TAG_head, head_prime_blob); + + hb_blob_destroy (head_prime_blob); + return success; + } + + struct GlyphHeader + { + unsigned int simple_instruction_len_offset () const + { return static_size + 2 * numberOfContours; } + + unsigned int simple_length (unsigned int instruction_len) const + { return simple_instruction_len_offset () + 2 + instruction_len; } + + bool is_composite_glyph () const { return numberOfContours < 0; } + bool is_simple_glyph () const { return numberOfContours > 0; } + + void get_extents (hb_glyph_extents_t *extents) const + { + extents->x_bearing = hb_min (xMin, xMax); + extents->y_bearing = hb_max (yMin, yMax); + extents->width = hb_max (xMin, xMax) - extents->x_bearing; + extents->height = hb_min (yMin, yMax) - extents->y_bearing; + } + + bool has_data () const { return numberOfContours; } + + protected: + HBINT16 numberOfContours;/* If the number of contours is + * greater than or equal to zero, + * this is a simple glyph; if negative, + * this is a composite glyph. */ + FWORD xMin; /* Minimum x for coordinate data. */ + FWORD yMin; /* Minimum y for coordinate data. */ + FWORD xMax; /* Maximum x for coordinate data. */ + FWORD yMax; /* Maximum y for coordinate data. */ + public: + DEFINE_SIZE_STATIC (10); + }; + + struct CompositeGlyphHeader + { + enum composite_glyph_flag_t + { + ARG_1_AND_2_ARE_WORDS = 0x0001, + ARGS_ARE_XY_VALUES = 0x0002, + ROUND_XY_TO_GRID = 0x0004, + WE_HAVE_A_SCALE = 0x0008, + MORE_COMPONENTS = 0x0020, + WE_HAVE_AN_X_AND_Y_SCALE = 0x0040, + WE_HAVE_A_TWO_BY_TWO = 0x0080, + WE_HAVE_INSTRUCTIONS = 0x0100, + USE_MY_METRICS = 0x0200, + OVERLAP_COMPOUND = 0x0400, + SCALED_COMPONENT_OFFSET = 0x0800, + UNSCALED_COMPONENT_OFFSET = 0x1000 + }; + + HBUINT16 flags; + HBGlyphID glyphIndex; + + unsigned int get_size () const + { + unsigned int size = min_size; + // arg1 and 2 are int16 + if (flags & ARG_1_AND_2_ARE_WORDS) size += 4; + // arg1 and 2 are int8 + else size += 2; + + // One x 16 bit (scale) + if (flags & WE_HAVE_A_SCALE) size += 2; + // Two x 16 bit (xscale, yscale) + else if (flags & WE_HAVE_AN_X_AND_Y_SCALE) size += 4; + // Four x 16 bit (xscale, scale01, scale10, yscale) + else if (flags & WE_HAVE_A_TWO_BY_TWO) size += 8; + + return size; + } + + // TODO rewrite using new iterator framework if possible + struct Iterator + { + const char *glyph_start; + const char *glyph_end; + const CompositeGlyphHeader *current; + + bool move_to_next () + { + if (current->flags & CompositeGlyphHeader::MORE_COMPONENTS) + { + const CompositeGlyphHeader *possible = + &StructAfter (*current); + if (!in_range (possible)) + return false; + current = possible; + return true; + } + return false; + } + + bool in_range (const CompositeGlyphHeader *composite) const + { + return (const char *) composite >= glyph_start + && ((const char *) composite + CompositeGlyphHeader::min_size) <= glyph_end + && ((const char *) composite + composite->get_size ()) <= glyph_end; + } + }; + + static bool get_iterator (const char * glyph_data, + unsigned int length, + CompositeGlyphHeader::Iterator *iterator /* OUT */) + { + const GlyphHeader &glyph_header = *hb_bytes_t (glyph_data, length).as (); + if (!glyph_header.has_data ()) return false; /* Empty glyph; zero extents. */ + + if (glyph_header.is_composite_glyph ()) + { + const CompositeGlyphHeader *possible = + &StructAfter (glyph_header); + + iterator->glyph_start = glyph_data; + iterator->glyph_end = (const char *) glyph_data + length; + if (!iterator->in_range (possible)) + return false; + iterator->current = possible; + return true; + } + + return false; + } + + DEFINE_SIZE_MIN (4); + }; + + struct accelerator_t + { + void init (hb_face_t *face) + { + memset (this, 0, sizeof (accelerator_t)); + + const OT::head &head = *face->table.head; + if (head.indexToLocFormat > 1 || head.glyphDataFormat != 0) + /* Unknown format. Leave num_glyphs=0, that takes care of disabling us. */ + return; + short_offset = 0 == head.indexToLocFormat; + + loca_table = hb_sanitize_context_t ().reference_table (face); + glyf_table = hb_sanitize_context_t ().reference_table (face); + + num_glyphs = hb_max (1u, loca_table.get_length () / (short_offset ? 2 : 4)) - 1; + } + + void fini () + { + loca_table.destroy (); + glyf_table.destroy (); + } + + /* + * Returns true if the referenced glyph is a valid glyph and a composite glyph. + * If true is returned a pointer to the composite glyph will be written into + * composite. + */ + bool get_composite (hb_codepoint_t glyph, + CompositeGlyphHeader::Iterator *composite /* OUT */) const + { + if (unlikely (!num_glyphs)) + return false; + + unsigned int start_offset, end_offset; + if (!get_offsets (glyph, &start_offset, &end_offset)) + return false; /* glyph not found */ + + return CompositeGlyphHeader::get_iterator ((const char *) this->glyf_table + start_offset, + end_offset - start_offset, + composite); + } + + enum simple_glyph_flag_t + { + FLAG_ON_CURVE = 0x01, + FLAG_X_SHORT = 0x02, + FLAG_Y_SHORT = 0x04, + FLAG_REPEAT = 0x08, + FLAG_X_SAME = 0x10, + FLAG_Y_SAME = 0x20, + FLAG_RESERVED1 = 0x40, + FLAG_RESERVED2 = 0x80 + }; + + /* based on FontTools _g_l_y_f.py::trim */ + bool remove_padding (unsigned int start_offset, + unsigned int *end_offset) const + { + const char *glyph = ((const char *) glyf_table) + start_offset; + unsigned int glyph_length = *end_offset - start_offset; + const GlyphHeader &glyph_header = *hb_bytes_t (glyph, glyph_length).as (); + if (!glyph_header.has_data ()) return true; + + const char *glyph_end = glyph + glyph_length; + if (glyph_header.is_composite_glyph ()) + /* Trimming for composites not implemented. + * If removing hints it falls out of that. */ + return true; + else + { + /* simple glyph w/contours, possibly trimmable */ + glyph += glyph_header.simple_instruction_len_offset (); + + if (unlikely (glyph + 2 >= glyph_end)) return false; + uint16_t nCoordinates = (uint16_t) StructAtOffset (glyph - 2, 0) + 1; + uint16_t nInstructions = (uint16_t) StructAtOffset (glyph, 0); + + glyph += 2 + nInstructions; + if (unlikely (glyph + 2 >= glyph_end)) return false; + + unsigned int coordBytes = 0; + unsigned int coordsWithFlags = 0; + while (glyph < glyph_end) + { + uint8_t flag = (uint8_t) *glyph; + glyph++; + + unsigned int repeat = 1; + if (flag & FLAG_REPEAT) + { + if (glyph >= glyph_end) + { + DEBUG_MSG (SUBSET, nullptr, "Bad flag"); + return false; + } + repeat = ((uint8_t) *glyph) + 1; + glyph++; + } + + unsigned int xBytes, yBytes; + xBytes = yBytes = 0; + if (flag & FLAG_X_SHORT) xBytes = 1; + else if ((flag & FLAG_X_SAME) == 0) xBytes = 2; + + if (flag & FLAG_Y_SHORT) yBytes = 1; + else if ((flag & FLAG_Y_SAME) == 0) yBytes = 2; + + coordBytes += (xBytes + yBytes) * repeat; + coordsWithFlags += repeat; + if (coordsWithFlags >= nCoordinates) + break; + } + + if (coordsWithFlags != nCoordinates) + { + DEBUG_MSG (SUBSET, nullptr, "Expect %d coords to have flags, got flags for %d", + nCoordinates, coordsWithFlags); + return false; + } + glyph += coordBytes; + + if (glyph < glyph_end) + *end_offset -= glyph_end - glyph; + } + return true; + } + + bool get_offsets (hb_codepoint_t glyph, + unsigned int *start_offset /* OUT */, + unsigned int *end_offset /* OUT */) const + { + if (unlikely (glyph >= num_glyphs)) + return false; + + if (short_offset) + { + const HBUINT16 *offsets = (const HBUINT16 *) loca_table->dataZ.arrayZ; + *start_offset = 2 * offsets[glyph]; + *end_offset = 2 * offsets[glyph + 1]; + } + else + { + const HBUINT32 *offsets = (const HBUINT32 *) loca_table->dataZ.arrayZ; + + *start_offset = offsets[glyph]; + *end_offset = offsets[glyph + 1]; + } + + if (*start_offset > *end_offset || *end_offset > glyf_table.get_length ()) + return false; + + return true; + } + + bool get_instruction_length (hb_bytes_t glyph, + unsigned int * length /* OUT */) const + { + const GlyphHeader &glyph_header = *glyph.as (); + /* Empty glyph; no instructions. */ + if (!glyph_header.has_data ()) + { + *length = 0; + // only 0 byte glyphs are healthy when missing GlyphHeader + return glyph.length == 0; + } + if (glyph_header.is_composite_glyph ()) + { + unsigned int start = glyph.length; + unsigned int end = glyph.length; + unsigned int glyph_offset = &glyph - glyf_table; + CompositeGlyphHeader::Iterator composite_it; + if (unlikely (!CompositeGlyphHeader::get_iterator (&glyph, glyph.length, + &composite_it))) + return false; + const CompositeGlyphHeader *last; + do + { + last = composite_it.current; + } while (composite_it.move_to_next ()); + + if ((uint16_t) last->flags & CompositeGlyphHeader::WE_HAVE_INSTRUCTIONS) + start = ((char *) last - (char *) glyf_table->dataZ.arrayZ) + + last->get_size () - glyph_offset; + if (unlikely (start > end)) + { + DEBUG_MSG (SUBSET, nullptr, "Invalid instruction offset, %d is outside " + "%d byte buffer", start, glyph.length); + return false; + } + *length = end - start; + } + else + { + unsigned int instruction_len_offset = glyph_header.simple_instruction_len_offset (); + if (unlikely (instruction_len_offset + 2 > glyph.length)) + { + DEBUG_MSG (SUBSET, nullptr, "Glyph size is too short, missing field " + "instructionLength."); + return false; + } + + const HBUINT16 &instruction_len = StructAtOffset (&glyph, + instruction_len_offset); + /* Out of bounds of the current glyph */ + if (unlikely (glyph_header.simple_length (instruction_len) > glyph.length)) + { + DEBUG_MSG (SUBSET, nullptr, "The instructions array overruns the " + "glyph's boundaries."); + return false; + } + *length = (uint16_t) instruction_len; + } + return true; + } + + bool get_extents (hb_codepoint_t glyph, hb_glyph_extents_t *extents) const + { + unsigned int start_offset, end_offset; + if (!get_offsets (glyph, &start_offset, &end_offset)) + return false; + + hb_bytes_t ((const char *) glyf_table + start_offset, + end_offset - start_offset).as ()->get_extents (extents); + return true; + } + + hb_bytes_t bytes_for_glyph (const char *glyf, hb_codepoint_t gid) + { + unsigned int start_offset, end_offset; + if (unlikely (!(get_offsets (gid, &start_offset, &end_offset) && + remove_padding (start_offset, &end_offset)))) + { + DEBUG_MSG (SUBSET, nullptr, "Unable to get offset or remove padding for %d", gid); + return hb_bytes_t (); + } + hb_bytes_t glyph_bytes = hb_bytes_t (glyf + start_offset, end_offset - start_offset); + if (!glyph_bytes.as ()->has_data ()) + { + DEBUG_MSG (SUBSET, nullptr, "Empty or invalid glyph size, %d", gid); + return hb_bytes_t (); + } + return glyph_bytes; + } + + private: + bool short_offset; + unsigned int num_glyphs; + hb_blob_ptr_t loca_table; + hb_blob_ptr_t glyf_table; + }; + + struct SubsetGlyph + { + hb_codepoint_t new_gid; + hb_codepoint_t old_gid; + hb_bytes_t source_glyph; + hb_bytes_t dest_start; /* region of source_glyph to copy first */ + hb_bytes_t dest_end; /* region of source_glyph to copy second */ + + bool serialize (hb_serialize_context_t *c, + const hb_subset_plan_t *plan) const + { + TRACE_SERIALIZE (this); + + hb_bytes_t dest_glyph = dest_start.copy (c); + dest_glyph = hb_bytes_t (&dest_glyph, dest_glyph.length + dest_end.copy (c).length); + unsigned int pad_length = padding (); + DEBUG_MSG (SUBSET, nullptr, "serialize %d byte glyph, width %d pad %d", + dest_glyph.length, dest_glyph.length + pad_length, pad_length); + + HBUINT8 pad; + pad = 0; + while (pad_length > 0) + { + c->embed (pad); + pad_length--; + } + + if (dest_glyph.length) + { + _fix_component_gids (plan, dest_glyph); + if (plan->drop_hints) + { + _zero_instruction_length (dest_glyph); + c->check_success (_remove_composite_instruction_flag (dest_glyph)); + } + } + + return_trace (true); + } + + void drop_hints (const OT::glyf::accelerator_t& glyf) + { + if (source_glyph.length == 0) return; + + unsigned int instruction_len = 0; + if (!glyf.get_instruction_length (source_glyph, &instruction_len)) + { + DEBUG_MSG (SUBSET, nullptr, "Unable to read instruction length for new_gid %d", + new_gid); + return ; + } + + const GlyphHeader& header = *source_glyph.as (); + DEBUG_MSG (SUBSET, nullptr, "new_gid %d drop %d instruction bytes " + "from %d byte source glyph", + new_gid, instruction_len, source_glyph.length); + if (header.is_composite_glyph ()) + { + /* just chop instructions off the end for composite glyphs */ + dest_start = hb_bytes_t (&source_glyph, source_glyph.length - instruction_len); + } + else + { + unsigned int glyph_length = header.simple_length (instruction_len); + dest_start = hb_bytes_t (&source_glyph, glyph_length - instruction_len); + dest_end = hb_bytes_t (&source_glyph + glyph_length, + source_glyph.length - glyph_length); + DEBUG_MSG (SUBSET, nullptr, "source_len %d start len %d glyph_len %d " + "instruction_len %d end len %d", + source_glyph.length, dest_start.length, glyph_length, + instruction_len, dest_end.length); + } + } + + unsigned int length () const { return dest_start.length + dest_end.length; } + /* pad to 2 to ensure 2-byte loca will be ok */ + unsigned int padding () const { return length () % 2; } + unsigned int padded_size () const { return length () + padding (); } + }; + + protected: + UnsizedArrayOf + dataZ; /* Glyphs data. */ + public: + DEFINE_SIZE_MIN (0); /* In reality, this is UNBOUNDED() type; but since we always + * check the size externally, allow Null() object of it by + * defining it _MIN instead. */ +}; + +struct glyf_accelerator_t : glyf::accelerator_t {}; + +} /* namespace OT */ + + +#endif /* HB_OT_GLYF_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hdmx-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hdmx-table.hh new file mode 100644 index 000000000..96c1d1f63 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hdmx-table.hh @@ -0,0 +1,178 @@ +/* + * Copyright © 2018 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Garret Rieger + */ + +#ifndef HB_OT_HDMX_TABLE_HH +#define HB_OT_HDMX_TABLE_HH + +#include "hb-open-type.hh" + +/* + * hdmx -- Horizontal Device Metrics + * https://docs.microsoft.com/en-us/typography/opentype/spec/hdmx + */ +#define HB_OT_TAG_hdmx HB_TAG('h','d','m','x') + + +namespace OT { + + +struct DeviceRecord +{ + static unsigned int get_size (unsigned count) + { return hb_ceil_to_4 (min_size + count * HBUINT8::static_size); } + + template + bool serialize (hb_serialize_context_t *c, unsigned pixelSize, Iterator it) + { + TRACE_SERIALIZE (this); + + unsigned length = it.len (); + + if (unlikely (!c->extend (*this, length))) return_trace (false); + + this->pixelSize = pixelSize; + this->maxWidth = + + it + | hb_reduce (hb_max, 0u); + + + it + | hb_sink (widthsZ.as_array (length)); + + return_trace (true); + } + + bool sanitize (hb_sanitize_context_t *c, unsigned sizeDeviceRecord) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + c->check_range (this, sizeDeviceRecord))); + } + + HBUINT8 pixelSize; /* Pixel size for following widths (as ppem). */ + HBUINT8 maxWidth; /* Maximum width. */ + UnsizedArrayOf widthsZ; /* Array of widths (numGlyphs is from the 'maxp' table). */ + public: + DEFINE_SIZE_ARRAY (2, widthsZ); +}; + + +struct hdmx +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_hdmx; + + unsigned int get_size () const + { return min_size + numRecords * sizeDeviceRecord; } + + const DeviceRecord& operator [] (unsigned int i) const + { + /* XXX Null(DeviceRecord) is NOT safe as it's num-glyphs lengthed. + * https://github.com/harfbuzz/harfbuzz/issues/1300 */ + if (unlikely (i >= numRecords)) return Null (DeviceRecord); + return StructAtOffset (&this->firstDeviceRecord, i * sizeDeviceRecord); + } + + template + bool serialize (hb_serialize_context_t *c, unsigned version, Iterator it) + { + TRACE_SERIALIZE (this); + + if (unlikely (!c->extend_min ((*this)))) return_trace (false); + + this->version = version; + this->numRecords = it.len (); + this->sizeDeviceRecord = DeviceRecord::get_size (it ? (*it).second.len () : 0); + + + it + | hb_apply ([c] (const hb_item_type& _) { + c->start_embed ()->serialize (c, _.first, _.second); + }) + ; + + return_trace (c->successful); + } + + + bool subset (hb_subset_context_t *c) const + { + TRACE_SUBSET (this); + + hdmx *hdmx_prime = c->serializer->start_embed (); + if (unlikely (!hdmx_prime)) return_trace (false); + + auto it = + + hb_range ((unsigned) numRecords) + | hb_map ([c, this] (unsigned _) + { + const DeviceRecord *device_record = + &StructAtOffset (&firstDeviceRecord, + _ * sizeDeviceRecord); + auto row = + + hb_range (c->plan->num_output_glyphs ()) + | hb_map (c->plan->reverse_glyph_map) + | hb_map ([=] (hb_codepoint_t _) + { + if (c->plan->is_empty_glyph (_)) + return Null(HBUINT8); + return device_record->widthsZ.as_array (get_num_glyphs ()) [_]; + }) + ; + return hb_pair ((unsigned) device_record->pixelSize, +row); + }) + ; + + hdmx_prime->serialize (c->serializer, version, it); + return_trace (true); + } + + unsigned get_num_glyphs () const + { + return sizeDeviceRecord - DeviceRecord::min_size; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + !hb_unsigned_mul_overflows (numRecords, sizeDeviceRecord) && + sizeDeviceRecord >= DeviceRecord::min_size && + c->check_range (this, get_size ())); + } + + protected: + HBUINT16 version; /* Table version number (0) */ + HBUINT16 numRecords; /* Number of device records. */ + HBUINT32 sizeDeviceRecord; /* Size of a device record, 32-bit aligned. */ + DeviceRecord firstDeviceRecord; /* Array of device records. */ + public: + DEFINE_SIZE_MIN (8); +}; + +} /* namespace OT */ + + +#endif /* HB_OT_HDMX_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-head-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-head-table.hh new file mode 100644 index 000000000..3c0bb3d6d --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-head-table.hh @@ -0,0 +1,167 @@ +/* + * Copyright © 2010 Red Hat, Inc. + * Copyright © 2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OT_HEAD_TABLE_HH +#define HB_OT_HEAD_TABLE_HH + +#include "hb-open-type.hh" + +/* + * head -- Font Header + * https://docs.microsoft.com/en-us/typography/opentype/spec/head + */ +#define HB_OT_TAG_head HB_TAG('h','e','a','d') + + +namespace OT { + + +struct head +{ + friend struct OffsetTable; + + static constexpr hb_tag_t tableTag = HB_OT_TAG_head; + + unsigned int get_upem () const + { + unsigned int upem = unitsPerEm; + /* If no valid head table found, assume 1000, which matches typical Type1 usage. */ + return 16 <= upem && upem <= 16384 ? upem : 1000; + } + + enum mac_style_flag_t { + BOLD = 1u<<0, + ITALIC = 1u<<1, + UNDERLINE = 1u<<2, + OUTLINE = 1u<<3, + SHADOW = 1u<<4, + CONDENSED = 1u<<5 + }; + + bool is_bold () const { return macStyle & BOLD; } + bool is_italic () const { return macStyle & ITALIC; } + bool is_condensed () const { return macStyle & CONDENSED; } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + version.major == 1 && + magicNumber == 0x5F0F3CF5u); + } + + protected: + FixedVersion<>version; /* Version of the head table--currently + * 0x00010000u for version 1.0. */ + FixedVersion<>fontRevision; /* Set by font manufacturer. */ + HBUINT32 checkSumAdjustment; /* To compute: set it to 0, sum the + * entire font as HBUINT32, then store + * 0xB1B0AFBAu - sum. */ + HBUINT32 magicNumber; /* Set to 0x5F0F3CF5u. */ + HBUINT16 flags; /* Bit 0: Baseline for font at y=0; + * Bit 1: Left sidebearing point at x=0; + * Bit 2: Instructions may depend on point size; + * Bit 3: Force ppem to integer values for all + * internal scaler math; may use fractional + * ppem sizes if this bit is clear; + * Bit 4: Instructions may alter advance width + * (the advance widths might not scale linearly); + * Bits 5-10: These should be set according to + * Apple's specification. However, they are not + * implemented in OpenType. + * Bit 5: This bit should be set in fonts that are + * intended to e laid out vertically, and in + * which the glyphs have been drawn such that an + * x-coordinate of 0 corresponds to the desired + * vertical baseline. + * Bit 6: This bit must be set to zero. + * Bit 7: This bit should be set if the font + * requires layout for correct linguistic + * rendering (e.g. Arabic fonts). + * Bit 8: This bit should be set for a GX font + * which has one or more metamorphosis effects + * designated as happening by default. + * Bit 9: This bit should be set if the font + * contains any strong right-to-left glyphs. + * Bit 10: This bit should be set if the font + * contains Indic-style rearrangement effects. + * Bit 11: Font data is 'lossless,' as a result + * of having been compressed and decompressed + * with the Agfa MicroType Express engine. + * Bit 12: Font converted (produce compatible metrics) + * Bit 13: Font optimized for ClearType™. + * Note, fonts that rely on embedded bitmaps (EBDT) + * for rendering should not be considered optimized + * for ClearType, and therefore should keep this bit + * cleared. + * Bit 14: Last Resort font. If set, indicates that + * the glyphs encoded in the cmap subtables are simply + * generic symbolic representations of code point + * ranges and don’t truly represent support for those + * code points. If unset, indicates that the glyphs + * encoded in the cmap subtables represent proper + * support for those code points. + * Bit 15: Reserved, set to 0. */ + HBUINT16 unitsPerEm; /* Valid range is from 16 to 16384. This value + * should be a power of 2 for fonts that have + * TrueType outlines. */ + LONGDATETIME created; /* Number of seconds since 12:00 midnight, + January 1, 1904. 64-bit integer */ + LONGDATETIME modified; /* Number of seconds since 12:00 midnight, + January 1, 1904. 64-bit integer */ + HBINT16 xMin; /* For all glyph bounding boxes. */ + HBINT16 yMin; /* For all glyph bounding boxes. */ + HBINT16 xMax; /* For all glyph bounding boxes. */ + HBINT16 yMax; /* For all glyph bounding boxes. */ + HBUINT16 macStyle; /* Bit 0: Bold (if set to 1); + * Bit 1: Italic (if set to 1) + * Bit 2: Underline (if set to 1) + * Bit 3: Outline (if set to 1) + * Bit 4: Shadow (if set to 1) + * Bit 5: Condensed (if set to 1) + * Bit 6: Extended (if set to 1) + * Bits 7-15: Reserved (set to 0). */ + HBUINT16 lowestRecPPEM; /* Smallest readable size in pixels. */ + HBINT16 fontDirectionHint; /* Deprecated (Set to 2). + * 0: Fully mixed directional glyphs; + * 1: Only strongly left to right; + * 2: Like 1 but also contains neutrals; + * -1: Only strongly right to left; + * -2: Like -1 but also contains neutrals. */ + public: + HBUINT16 indexToLocFormat; /* 0 for short offsets, 1 for long. */ + HBUINT16 glyphDataFormat; /* 0 for current format. */ + + DEFINE_SIZE_STATIC (54); +}; + + +} /* namespace OT */ + + +#endif /* HB_OT_HEAD_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hhea-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hhea-table.hh new file mode 100644 index 000000000..778b6c513 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hhea-table.hh @@ -0,0 +1,101 @@ +/* + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OT_HHEA_TABLE_HH +#define HB_OT_HHEA_TABLE_HH + +#include "hb-open-type.hh" + +/* + * hhea -- Horizontal Header + * https://docs.microsoft.com/en-us/typography/opentype/spec/hhea + * vhea -- Vertical Header + * https://docs.microsoft.com/en-us/typography/opentype/spec/vhea + */ +#define HB_OT_TAG_hhea HB_TAG('h','h','e','a') +#define HB_OT_TAG_vhea HB_TAG('v','h','e','a') + + +namespace OT { + + +template +struct _hea +{ + bool has_data () const { return version.major; } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && likely (version.major == 1)); + } + + public: + FixedVersion<>version; /* 0x00010000u for version 1.0. */ + FWORD ascender; /* Typographic ascent. */ + FWORD descender; /* Typographic descent. */ + FWORD lineGap; /* Typographic line gap. */ + UFWORD advanceMax; /* Maximum advance width/height value in + * metrics table. */ + FWORD minLeadingBearing; /* Minimum left/top sidebearing value in + * metrics table. */ + FWORD minTrailingBearing; /* Minimum right/bottom sidebearing value; + * calculated as Min(aw - lsb - + * (xMax - xMin)) for horizontal. */ + FWORD maxExtent; /* horizontal: Max(lsb + (xMax - xMin)), + * vertical: minLeadingBearing+(yMax-yMin). */ + HBINT16 caretSlopeRise; /* Used to calculate the slope of the + * cursor (rise/run); 1 for vertical caret, + * 0 for horizontal.*/ + HBINT16 caretSlopeRun; /* 0 for vertical caret, 1 for horizontal. */ + HBINT16 caretOffset; /* The amount by which a slanted + * highlight on a glyph needs + * to be shifted to produce the + * best appearance. Set to 0 for + * non-slanted fonts. */ + HBINT16 reserved1; /* Set to 0. */ + HBINT16 reserved2; /* Set to 0. */ + HBINT16 reserved3; /* Set to 0. */ + HBINT16 reserved4; /* Set to 0. */ + HBINT16 metricDataFormat; /* 0 for current format. */ + HBUINT16 numberOfLongMetrics; /* Number of LongMetric entries in metric + * table. */ + public: + DEFINE_SIZE_STATIC (36); +}; + +struct hhea : _hea { + static constexpr hb_tag_t tableTag = HB_OT_TAG_hhea; +}; +struct vhea : _hea { + static constexpr hb_tag_t tableTag = HB_OT_TAG_vhea; +}; + + +} /* namespace OT */ + + +#endif /* HB_OT_HHEA_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hmtx-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hmtx-table.hh new file mode 100644 index 000000000..6b2cc8662 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hmtx-table.hh @@ -0,0 +1,312 @@ +/* + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod, Roderick Sheeter + */ + +#ifndef HB_OT_HMTX_TABLE_HH +#define HB_OT_HMTX_TABLE_HH + +#include "hb-open-type.hh" +#include "hb-ot-hhea-table.hh" +#include "hb-ot-var-hvar-table.hh" +#include "hb-ot-metrics.hh" + +/* + * hmtx -- Horizontal Metrics + * https://docs.microsoft.com/en-us/typography/opentype/spec/hmtx + * vmtx -- Vertical Metrics + * https://docs.microsoft.com/en-us/typography/opentype/spec/vmtx + */ +#define HB_OT_TAG_hmtx HB_TAG('h','m','t','x') +#define HB_OT_TAG_vmtx HB_TAG('v','m','t','x') + + +namespace OT { + + +struct LongMetric +{ + UFWORD advance; /* Advance width/height. */ + FWORD sb; /* Leading (left/top) side bearing. */ + public: + DEFINE_SIZE_STATIC (4); +}; + +template +struct hmtxvmtx +{ + bool sanitize (hb_sanitize_context_t *c HB_UNUSED) const + { + TRACE_SANITIZE (this); + /* We don't check for anything specific here. The users of the + * struct do all the hard work... */ + return_trace (true); + } + + + bool subset_update_header (hb_subset_plan_t *plan, + unsigned int num_hmetrics) const + { + hb_blob_t *src_blob = hb_sanitize_context_t ().reference_table (plan->source, H::tableTag); + hb_blob_t *dest_blob = hb_blob_copy_writable_or_fail (src_blob); + hb_blob_destroy (src_blob); + + if (unlikely (!dest_blob)) { + return false; + } + + unsigned int length; + H *table = (H *) hb_blob_get_data (dest_blob, &length); + table->numberOfLongMetrics = num_hmetrics; + + bool result = plan->add_table (H::tableTag, dest_blob); + hb_blob_destroy (dest_blob); + + return result; + } + + template + void serialize (hb_serialize_context_t *c, + Iterator it, + unsigned num_advances) + { + unsigned idx = 0; + + it + | hb_apply ([c, &idx, num_advances] (const hb_item_type& _) + { + if (idx < num_advances) + { + LongMetric lm; + lm.advance = _.first; + lm.sb = _.second; + if (unlikely (!c->embed (&lm))) return; + } + else + { + FWORD *sb = c->allocate_size (FWORD::static_size); + if (unlikely (!sb)) return; + *sb = _.second; + } + idx++; + }) + ; + } + + bool subset (hb_subset_context_t *c) const + { + TRACE_SUBSET (this); + + T *table_prime = c->serializer->start_embed (); + if (unlikely (!table_prime)) return_trace (false); + + accelerator_t _mtx; + _mtx.init (c->plan->source); + unsigned num_advances = _mtx.num_advances_for_subset (c->plan); + + auto it = + + hb_range (c->plan->num_output_glyphs ()) + | hb_map ([c, &_mtx] (unsigned _) + { + hb_codepoint_t old_gid; + if (c->plan->old_gid_for_new_gid (_, &old_gid)) + return hb_pair (_mtx.get_advance (old_gid), _mtx.get_side_bearing (old_gid)); + else + return hb_pair (0u, 0u); + }) + ; + + table_prime->serialize (c->serializer, it, num_advances); + + _mtx.fini (); + + if (unlikely (c->serializer->ran_out_of_room || c->serializer->in_error ())) + return_trace (false); + + // Amend header num hmetrics + if (unlikely (!subset_update_header (c->plan, num_advances))) + { + return_trace (false); + } + + return_trace (true); + } + + struct accelerator_t + { + friend struct hmtxvmtx; + + void init (hb_face_t *face, + unsigned int default_advance_ = 0) + { + default_advance = default_advance_ ? default_advance_ : hb_face_get_upem (face); + + num_advances = T::is_horizontal ? face->table.hhea->numberOfLongMetrics : face->table.vhea->numberOfLongMetrics; + + table = hb_sanitize_context_t().reference_table (face, T::tableTag); + + /* Cap num_metrics() and num_advances() based on table length. */ + unsigned int len = table.get_length (); + if (unlikely (num_advances * 4 > len)) + num_advances = len / 4; + num_metrics = num_advances + (len - 4 * num_advances) / 2; + + /* We MUST set num_metrics to zero if num_advances is zero. + * Our get_advance() depends on that. */ + if (unlikely (!num_advances)) + { + num_metrics = num_advances = 0; + table.destroy (); + table = hb_blob_get_empty (); + } + + var_table = hb_sanitize_context_t().reference_table (face, T::variationsTag); + } + + void fini () + { + table.destroy (); + var_table.destroy (); + } + + /* TODO Add variations version. */ + unsigned int get_side_bearing (hb_codepoint_t glyph) const + { + if (glyph < num_advances) + return table->longMetricZ[glyph].sb; + + if (unlikely (glyph >= num_metrics)) + return 0; + + const FWORD *bearings = (const FWORD *) &table->longMetricZ[num_advances]; + return bearings[glyph - num_advances]; + } + + unsigned int get_advance (hb_codepoint_t glyph) const + { + if (unlikely (glyph >= num_metrics)) + { + /* If num_metrics is zero, it means we don't have the metrics table + * for this direction: return default advance. Otherwise, it means that the + * glyph index is out of bound: return zero. */ + if (num_metrics) + return 0; + else + return default_advance; + } + + return table->longMetricZ[hb_min (glyph, (uint32_t) num_advances - 1)].advance; + } + + unsigned int get_advance (hb_codepoint_t glyph, + hb_font_t *font) const + { + unsigned int advance = get_advance (glyph); + if (likely (glyph < num_metrics)) + { + advance += (font->num_coords ? var_table->get_advance_var (glyph, font->coords, font->num_coords) : 0); // TODO Optimize?! + } + return advance; + } + + unsigned int num_advances_for_subset (const hb_subset_plan_t *plan) const + { + unsigned int num_advances = plan->num_output_glyphs (); + unsigned int last_advance = _advance_for_new_gid (plan, + num_advances - 1); + while (num_advances > 1 && + last_advance == _advance_for_new_gid (plan, + num_advances - 2)) + { + num_advances--; + } + + return num_advances; + } + + private: + unsigned int _advance_for_new_gid (const hb_subset_plan_t *plan, + hb_codepoint_t new_gid) const + { + hb_codepoint_t old_gid; + if (!plan->old_gid_for_new_gid (new_gid, &old_gid)) + return 0; + + return get_advance (old_gid); + } + + protected: + unsigned int num_metrics; + unsigned int num_advances; + unsigned int default_advance; + + private: + hb_blob_ptr_t table; + hb_blob_ptr_t var_table; + }; + + protected: + UnsizedArrayOflongMetricZ;/* Paired advance width and leading + * bearing values for each glyph. The + * value numOfHMetrics comes from + * the 'hhea' table. If the font is + * monospaced, only one entry need + * be in the array, but that entry is + * required. The last entry applies to + * all subsequent glyphs. */ +/*UnsizedArrayOf leadingBearingX;*//* Here the advance is assumed + * to be the same as the advance + * for the last entry above. The + * number of entries in this array is + * derived from numGlyphs (from 'maxp' + * table) minus numberOfLongMetrics. + * This generally is used with a run + * of monospaced glyphs (e.g., Kanji + * fonts or Courier fonts). Only one + * run is allowed and it must be at + * the end. This allows a monospaced + * font to vary the side bearing + * values for each glyph. */ + public: + DEFINE_SIZE_ARRAY (0, longMetricZ); +}; + +struct hmtx : hmtxvmtx { + static constexpr hb_tag_t tableTag = HB_OT_TAG_hmtx; + static constexpr hb_tag_t variationsTag = HB_OT_TAG_HVAR; + static constexpr bool is_horizontal = true; +}; +struct vmtx : hmtxvmtx { + static constexpr hb_tag_t tableTag = HB_OT_TAG_vmtx; + static constexpr hb_tag_t variationsTag = HB_OT_TAG_VVAR; + static constexpr bool is_horizontal = false; +}; + +struct hmtx_accelerator_t : hmtx::accelerator_t {}; +struct vmtx_accelerator_t : vmtx::accelerator_t {}; + +} /* namespace OT */ + + +#endif /* HB_OT_HMTX_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-kern-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-kern-table.hh new file mode 100644 index 000000000..7dfb207b2 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-kern-table.hh @@ -0,0 +1,354 @@ +/* + * Copyright © 2017 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OT_KERN_TABLE_HH +#define HB_OT_KERN_TABLE_HH + +#include "hb-aat-layout-kerx-table.hh" + + +/* + * kern -- Kerning + * https://docs.microsoft.com/en-us/typography/opentype/spec/kern + * https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6kern.html + */ +#define HB_OT_TAG_kern HB_TAG('k','e','r','n') + + +namespace OT { + + +template +struct KernSubTableFormat3 +{ + int get_kerning (hb_codepoint_t left, hb_codepoint_t right) const + { + hb_array_t kernValue = kernValueZ.as_array (kernValueCount); + hb_array_t leftClass = StructAfter> (kernValue).as_array (glyphCount); + hb_array_t rightClass = StructAfter> (leftClass).as_array (glyphCount); + hb_array_t kernIndex = StructAfter> (rightClass).as_array (leftClassCount * rightClassCount); + + unsigned int leftC = leftClass[left]; + unsigned int rightC = rightClass[right]; + if (unlikely (leftC >= leftClassCount || rightC >= rightClassCount)) + return 0; + unsigned int i = leftC * rightClassCount + rightC; + return kernValue[kernIndex[i]]; + } + + bool apply (AAT::hb_aat_apply_context_t *c) const + { + TRACE_APPLY (this); + + if (!c->plan->requested_kerning) + return false; + + if (header.coverage & header.Backwards) + return false; + + hb_kern_machine_t machine (*this, header.coverage & header.CrossStream); + machine.kern (c->font, c->buffer, c->plan->kern_mask); + + return_trace (true); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + c->check_range (kernValueZ, + kernValueCount * sizeof (FWORD) + + glyphCount * 2 + + leftClassCount * rightClassCount)); + } + + protected: + KernSubTableHeader header; + HBUINT16 glyphCount; /* The number of glyphs in this font. */ + HBUINT8 kernValueCount; /* The number of kerning values. */ + HBUINT8 leftClassCount; /* The number of left-hand classes. */ + HBUINT8 rightClassCount;/* The number of right-hand classes. */ + HBUINT8 flags; /* Set to zero (reserved for future use). */ + UnsizedArrayOf kernValueZ; /* The kerning values. + * Length kernValueCount. */ +#if 0 + UnsizedArrayOfleftClass; /* The left-hand classes. + * Length glyphCount. */ + UnsizedArrayOfrightClass; /* The right-hand classes. + * Length glyphCount. */ + UnsizedArrayOfkernIndex; /* The indices into the kernValue array. + * Length leftClassCount * rightClassCount */ +#endif + public: + DEFINE_SIZE_ARRAY (KernSubTableHeader::static_size + 6, kernValueZ); +}; + +template +struct KernSubTable +{ + unsigned int get_size () const { return u.header.length; } + unsigned int get_type () const { return u.header.format; } + + int get_kerning (hb_codepoint_t left, hb_codepoint_t right) const + { + switch (get_type ()) { + /* This method hooks up to hb_font_t's get_h_kerning. Only support Format0. */ + case 0: return u.format0.get_kerning (left, right); + default:return 0; + } + } + + template + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const + { + unsigned int subtable_type = get_type (); + TRACE_DISPATCH (this, subtable_type); + switch (subtable_type) { + case 0: return_trace (c->dispatch (u.format0)); +#ifndef HB_NO_AAT_SHAPE + case 1: return_trace (u.header.apple ? c->dispatch (u.format1, hb_forward (ds)...) : c->default_return_value ()); +#endif + case 2: return_trace (c->dispatch (u.format2)); +#ifndef HB_NO_AAT_SHAPE + case 3: return_trace (u.header.apple ? c->dispatch (u.format3, hb_forward (ds)...) : c->default_return_value ()); +#endif + default: return_trace (c->default_return_value ()); + } + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (unlikely (!u.header.sanitize (c) || + u.header.length < u.header.min_size || + !c->check_range (this, u.header.length))) return_trace (false); + + return_trace (dispatch (c)); + } + + public: + union { + KernSubTableHeader header; + AAT::KerxSubTableFormat0 format0; + AAT::KerxSubTableFormat1 format1; + AAT::KerxSubTableFormat2 format2; + KernSubTableFormat3 format3; + } u; + public: + DEFINE_SIZE_MIN (KernSubTableHeader::static_size); +}; + + +struct KernOTSubTableHeader +{ + static constexpr bool apple = false; + typedef AAT::ObsoleteTypes Types; + + unsigned int tuple_count () const { return 0; } + bool is_horizontal () const { return (coverage & Horizontal); } + + enum Coverage + { + Horizontal = 0x01u, + Minimum = 0x02u, + CrossStream = 0x04u, + Override = 0x08u, + + /* Not supported: */ + Backwards = 0x00u, + Variation = 0x00u, + }; + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + public: + HBUINT16 versionZ; /* Unused. */ + HBUINT16 length; /* Length of the subtable (including this header). */ + HBUINT8 format; /* Subtable format. */ + HBUINT8 coverage; /* Coverage bits. */ + public: + DEFINE_SIZE_STATIC (6); +}; + +struct KernOT : AAT::KerxTable +{ + friend struct AAT::KerxTable; + + static constexpr hb_tag_t tableTag = HB_OT_TAG_kern; + static constexpr unsigned minVersion = 0u; + + typedef KernOTSubTableHeader SubTableHeader; + typedef SubTableHeader::Types Types; + typedef KernSubTable SubTable; + + protected: + HBUINT16 version; /* Version--0x0000u */ + HBUINT16 tableCount; /* Number of subtables in the kerning table. */ + SubTable firstSubTable; /* Subtables. */ + public: + DEFINE_SIZE_MIN (4); +}; + + +struct KernAATSubTableHeader +{ + static constexpr bool apple = true; + typedef AAT::ObsoleteTypes Types; + + unsigned int tuple_count () const { return 0; } + bool is_horizontal () const { return !(coverage & Vertical); } + + enum Coverage + { + Vertical = 0x80u, + CrossStream = 0x40u, + Variation = 0x20u, + + /* Not supported: */ + Backwards = 0x00u, + }; + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + public: + HBUINT32 length; /* Length of the subtable (including this header). */ + HBUINT8 coverage; /* Coverage bits. */ + HBUINT8 format; /* Subtable format. */ + HBUINT16 tupleIndex; /* The tuple index (used for variations fonts). + * This value specifies which tuple this subtable covers. + * Note: We don't implement. */ + public: + DEFINE_SIZE_STATIC (8); +}; + +struct KernAAT : AAT::KerxTable +{ + friend struct AAT::KerxTable; + + static constexpr hb_tag_t tableTag = HB_OT_TAG_kern; + static constexpr unsigned minVersion = 0x00010000u; + + typedef KernAATSubTableHeader SubTableHeader; + typedef SubTableHeader::Types Types; + typedef KernSubTable SubTable; + + protected: + HBUINT32 version; /* Version--0x00010000u */ + HBUINT32 tableCount; /* Number of subtables in the kerning table. */ + SubTable firstSubTable; /* Subtables. */ + public: + DEFINE_SIZE_MIN (8); +}; + +struct kern +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_kern; + + bool has_data () const { return u.version32; } + unsigned int get_type () const { return u.major; } + + bool has_state_machine () const + { + switch (get_type ()) { + case 0: return u.ot.has_state_machine (); +#ifndef HB_NO_AAT_SHAPE + case 1: return u.aat.has_state_machine (); +#endif + default:return false; + } + } + + bool has_cross_stream () const + { + switch (get_type ()) { + case 0: return u.ot.has_cross_stream (); +#ifndef HB_NO_AAT_SHAPE + case 1: return u.aat.has_cross_stream (); +#endif + default:return false; + } + } + + int get_h_kerning (hb_codepoint_t left, hb_codepoint_t right) const + { + switch (get_type ()) { + case 0: return u.ot.get_h_kerning (left, right); +#ifndef HB_NO_AAT_SHAPE + case 1: return u.aat.get_h_kerning (left, right); +#endif + default:return 0; + } + } + + bool apply (AAT::hb_aat_apply_context_t *c) const + { return dispatch (c); } + + template + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const + { + unsigned int subtable_type = get_type (); + TRACE_DISPATCH (this, subtable_type); + switch (subtable_type) { + case 0: return_trace (c->dispatch (u.ot, hb_forward (ds)...)); +#ifndef HB_NO_AAT_SHAPE + case 1: return_trace (c->dispatch (u.aat, hb_forward (ds)...)); +#endif + default: return_trace (c->default_return_value ()); + } + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (!u.version32.sanitize (c)) return_trace (false); + return_trace (dispatch (c)); + } + + protected: + union { + HBUINT32 version32; + HBUINT16 major; + KernOT ot; +#ifndef HB_NO_AAT_SHAPE + KernAAT aat; +#endif + } u; + public: + DEFINE_SIZE_UNION (4, version32); +}; + +} /* namespace OT */ + + +#endif /* HB_OT_KERN_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-base-table.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-base-table.hh new file mode 100644 index 000000000..02fe14fa0 --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-base-table.hh @@ -0,0 +1,509 @@ +/* + * Copyright © 2016 Elie Roux + * Copyright © 2018 Google, Inc. + * Copyright © 2018-2019 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OT_LAYOUT_BASE_TABLE_HH +#define HB_OT_LAYOUT_BASE_TABLE_HH + +#include "hb-open-type.hh" +#include "hb-ot-layout-common.hh" + +namespace OT { + +/* + * BASE -- Baseline + * https://docs.microsoft.com/en-us/typography/opentype/spec/base + */ + +struct BaseCoordFormat1 +{ + hb_position_t get_coord () const { return coordinate; } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this))); + } + + protected: + HBUINT16 format; /* Format identifier--format = 1 */ + FWORD coordinate; /* X or Y value, in design units */ + public: + DEFINE_SIZE_STATIC (4); +}; + +struct BaseCoordFormat2 +{ + hb_position_t get_coord () const + { + /* TODO */ + return coordinate; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + protected: + HBUINT16 format; /* Format identifier--format = 2 */ + FWORD coordinate; /* X or Y value, in design units */ + HBGlyphID referenceGlyph; /* Glyph ID of control glyph */ + HBUINT16 coordPoint; /* Index of contour point on the + * reference glyph */ + public: + DEFINE_SIZE_STATIC (8); +}; + +struct BaseCoordFormat3 +{ + hb_position_t get_coord (hb_font_t *font, + const VariationStore &var_store, + hb_direction_t direction) const + { + const Device &device = this+deviceTable; + return coordinate + (HB_DIRECTION_IS_VERTICAL (direction) ? + device.get_y_delta (font, var_store) : + device.get_x_delta (font, var_store)); + } + + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + deviceTable.sanitize (c, this))); + } + + protected: + HBUINT16 format; /* Format identifier--format = 3 */ + FWORD coordinate; /* X or Y value, in design units */ + OffsetTo + deviceTable; /* Offset to Device table for X or + * Y value, from beginning of + * BaseCoord table (may be NULL). */ + public: + DEFINE_SIZE_STATIC (6); +}; + +struct BaseCoord +{ + bool has_data () const { return u.format; } + + hb_position_t get_coord (hb_font_t *font, + const VariationStore &var_store, + hb_direction_t direction) const + { + switch (u.format) { + case 1: return u.format1.get_coord (); + case 2: return u.format2.get_coord (); + case 3: return u.format3.get_coord (font, var_store, direction); + default:return 0; + } + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (unlikely (!u.format.sanitize (c))) return_trace (false); + switch (u.format) { + case 1: return_trace (u.format1.sanitize (c)); + case 2: return_trace (u.format2.sanitize (c)); + case 3: return_trace (u.format3.sanitize (c)); + default:return_trace (false); + } + } + + protected: + union { + HBUINT16 format; + BaseCoordFormat1 format1; + BaseCoordFormat2 format2; + BaseCoordFormat3 format3; + } u; + public: + DEFINE_SIZE_UNION (2, format); +}; + +struct FeatMinMaxRecord +{ + int cmp (hb_tag_t key) const { return tag.cmp (key); } + + bool has_data () const { return tag; } + + void get_min_max (const BaseCoord **min, const BaseCoord **max) const + { + if (likely (min)) *min = &(this+minCoord); + if (likely (max)) *max = &(this+maxCoord); + } + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + minCoord.sanitize (c, this) && + maxCoord.sanitize (c, this))); + } + + protected: + Tag tag; /* 4-byte feature identification tag--must + * match feature tag in FeatureList */ + OffsetTo + minCoord; /* Offset to BaseCoord table that defines + * the minimum extent value, from beginning + * of MinMax table (may be NULL) */ + OffsetTo + maxCoord; /* Offset to BaseCoord table that defines + * the maximum extent value, from beginning + * of MinMax table (may be NULL) */ + public: + DEFINE_SIZE_STATIC (8); + +}; + +struct MinMax +{ + void get_min_max (hb_tag_t feature_tag, + const BaseCoord **min, + const BaseCoord **max) const + { + const FeatMinMaxRecord &minMaxCoord = featMinMaxRecords.bsearch (feature_tag); + if (minMaxCoord.has_data ()) + minMaxCoord.get_min_max (min, max); + else + { + if (likely (min)) *min = &(this+minCoord); + if (likely (max)) *max = &(this+maxCoord); + } + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + minCoord.sanitize (c, this) && + maxCoord.sanitize (c, this) && + featMinMaxRecords.sanitize (c, this))); + } + + protected: + OffsetTo + minCoord; /* Offset to BaseCoord table that defines + * minimum extent value, from the beginning + * of MinMax table (may be NULL) */ + OffsetTo + maxCoord; /* Offset to BaseCoord table that defines + * maximum extent value, from the beginning + * of MinMax table (may be NULL) */ + SortedArrayOf + featMinMaxRecords; + /* Array of FeatMinMaxRecords, in alphabetical + * order by featureTableTag */ + public: + DEFINE_SIZE_ARRAY (6, featMinMaxRecords); +}; + +struct BaseValues +{ + const BaseCoord &get_base_coord (int baseline_tag_index) const + { + if (baseline_tag_index == -1) baseline_tag_index = defaultIndex; + return this+baseCoords[baseline_tag_index]; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + baseCoords.sanitize (c, this))); + } + + protected: + Index defaultIndex; /* Index number of default baseline for this + * script — equals index position of baseline tag + * in baselineTags array of the BaseTagList */ + OffsetArrayOf + baseCoords; /* Number of BaseCoord tables defined — should equal + * baseTagCount in the BaseTagList + * + * Array of offsets to BaseCoord tables, from beginning of + * BaseValues table — order matches baselineTags array in + * the BaseTagList */ + public: + DEFINE_SIZE_ARRAY (4, baseCoords); +}; + +struct BaseLangSysRecord +{ + int cmp (hb_tag_t key) const { return baseLangSysTag.cmp (key); } + + bool has_data () const { return baseLangSysTag; } + + const MinMax &get_min_max () const { return this+minMax; } + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + minMax.sanitize (c, this))); + } + + protected: + Tag baseLangSysTag; /* 4-byte language system identification tag */ + OffsetTo + minMax; /* Offset to MinMax table, from beginning + * of BaseScript table */ + public: + DEFINE_SIZE_STATIC (6); +}; + +struct BaseScript +{ + const MinMax &get_min_max (hb_tag_t language_tag) const + { + const BaseLangSysRecord& record = baseLangSysRecords.bsearch (language_tag); + return record.has_data () ? record.get_min_max () : this+defaultMinMax; + } + + const BaseCoord &get_base_coord (int baseline_tag_index) const + { return (this+baseValues).get_base_coord (baseline_tag_index); } + + bool has_data () const { return baseValues; } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + baseValues.sanitize (c, this) && + defaultMinMax.sanitize (c, this) && + baseLangSysRecords.sanitize (c, this))); + } + + protected: + OffsetTo + baseValues; /* Offset to BaseValues table, from beginning + * of BaseScript table (may be NULL) */ + OffsetTo + defaultMinMax; /* Offset to MinMax table, from beginning of + * BaseScript table (may be NULL) */ + SortedArrayOf + baseLangSysRecords; + /* Number of BaseLangSysRecords + * defined — may be zero (0) */ + + public: + DEFINE_SIZE_ARRAY (6, baseLangSysRecords); +}; + +struct BaseScriptList; +struct BaseScriptRecord +{ + int cmp (hb_tag_t key) const { return baseScriptTag.cmp (key); } + + bool has_data () const { return baseScriptTag; } + + const BaseScript &get_base_script (const BaseScriptList *list) const + { return list+baseScript; } + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + baseScript.sanitize (c, base))); + } + + protected: + Tag baseScriptTag; /* 4-byte script identification tag */ + OffsetTo + baseScript; /* Offset to BaseScript table, from beginning + * of BaseScriptList */ + + public: + DEFINE_SIZE_STATIC (6); +}; + +struct BaseScriptList +{ + const BaseScript &get_base_script (hb_tag_t script) const + { + const BaseScriptRecord *record = &baseScriptRecords.bsearch (script); + if (!record->has_data ()) record = &baseScriptRecords.bsearch (HB_TAG ('D','F','L','T')); + return record->has_data () ? record->get_base_script (this) : Null (BaseScript); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + baseScriptRecords.sanitize (c, this)); + } + + protected: + SortedArrayOf + baseScriptRecords; + + public: + DEFINE_SIZE_ARRAY (2, baseScriptRecords); +}; + +struct Axis +{ + bool get_baseline (hb_tag_t baseline_tag, + hb_tag_t script_tag, + hb_tag_t language_tag, + const BaseCoord **coord) const + { + const BaseScript &base_script = (this+baseScriptList).get_base_script (script_tag); + if (!base_script.has_data ()) return false; + + if (likely (coord)) + { + unsigned int tag_index = 0; + (this+baseTagList).bfind (baseline_tag, &tag_index); + *coord = &base_script.get_base_coord (tag_index); + } + + return true; + } + + bool get_min_max (hb_tag_t script_tag, + hb_tag_t language_tag, + hb_tag_t feature_tag, + const BaseCoord **min_coord, + const BaseCoord **max_coord) const + { + const BaseScript &base_script = (this+baseScriptList).get_base_script (script_tag); + if (!base_script.has_data ()) return false; + + base_script.get_min_max (language_tag).get_min_max (feature_tag, min_coord, max_coord); + + return true; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + (this+baseTagList).sanitize (c) && + (this+baseScriptList).sanitize (c))); + } + + protected: + OffsetTo> + baseTagList; /* Offset to BaseTagList table, from beginning + * of Axis table (may be NULL) + * Array of 4-byte baseline identification tags — must + * be in alphabetical order */ + OffsetTo + baseScriptList; /* Offset to BaseScriptList table, from beginning + * of Axis table + * Array of BaseScriptRecords, in alphabetical order + * by baseScriptTag */ + + public: + DEFINE_SIZE_STATIC (4); +}; + +struct BASE +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_BASE; + + const Axis &get_axis (hb_direction_t direction) const + { return HB_DIRECTION_IS_VERTICAL (direction) ? this+vAxis : this+hAxis; } + + const VariationStore &get_var_store () const + { return version.to_int () < 0x00010001u ? Null (VariationStore) : this+varStore; } + + bool get_baseline (hb_font_t *font, + hb_tag_t baseline_tag, + hb_direction_t direction, + hb_tag_t script_tag, + hb_tag_t language_tag, + hb_position_t *base) const + { + const BaseCoord *base_coord = nullptr; + if (unlikely (!get_axis (direction).get_baseline (baseline_tag, script_tag, language_tag, &base_coord) || + !base_coord || !base_coord->has_data ())) + return false; + + if (likely (base)) + *base = base_coord->get_coord (font, get_var_store (), direction); + + return true; + } + + /* TODO: Expose this separately sometime? */ + bool get_min_max (hb_font_t *font, + hb_direction_t direction, + hb_tag_t script_tag, + hb_tag_t language_tag, + hb_tag_t feature_tag, + hb_position_t *min, + hb_position_t *max) + { + const BaseCoord *min_coord, *max_coord; + if (!get_axis (direction).get_min_max (script_tag, language_tag, feature_tag, + &min_coord, &max_coord)) + return false; + + const VariationStore &var_store = get_var_store (); + if (likely (min && min_coord)) *min = min_coord->get_coord (font, var_store, direction); + if (likely (max && max_coord)) *max = max_coord->get_coord (font, var_store, direction); + return true; + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this) && + likely (version.major == 1) && + hAxis.sanitize (c, this) && + vAxis.sanitize (c, this) && + (version.to_int () < 0x00010001u || varStore.sanitize (c, this)))); + } + + protected: + FixedVersion<>version; /* Version of the BASE table */ + OffsetTohAxis; /* Offset to horizontal Axis table, from beginning + * of BASE table (may be NULL) */ + OffsetTovAxis; /* Offset to vertical Axis table, from beginning + * of BASE table (may be NULL) */ + LOffsetTo + varStore; /* Offset to the table of Item Variation + * Store--from beginning of BASE + * header (may be NULL). Introduced + * in version 0x00010001. */ + public: + DEFINE_SIZE_MIN (8); +}; + + +} /* namespace OT */ + + +#endif /* HB_OT_LAYOUT_BASE_TABLE_HH */ diff --git a/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-common.hh b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-common.hh new file mode 100644 index 000000000..73c28caab --- /dev/null +++ b/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-common.hh @@ -0,0 +1,2268 @@ +/* + * Copyright © 2007,2008,2009 Red Hat, Inc. + * Copyright © 2010,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OT_LAYOUT_COMMON_HH +#define HB_OT_LAYOUT_COMMON_HH + +#include "hb.hh" +#include "hb-ot-layout.hh" +#include "hb-open-type.hh" +#include "hb-set.hh" + + +#ifndef HB_MAX_NESTING_LEVEL +#define HB_MAX_NESTING_LEVEL 6 +#endif +#ifndef HB_MAX_CONTEXT_LENGTH +#define HB_MAX_CONTEXT_LENGTH 64 +#endif +#ifndef HB_CLOSURE_MAX_STAGES +/* + * The maximum number of times a lookup can be applied during shaping. + * Used to limit the number of iterations of the closure algorithm. + * This must be larger than the number of times add_pause() is + * called in a collect_features call of any shaper. + */ +#define HB_CLOSURE_MAX_STAGES 32 +#endif + +#ifndef HB_MAX_SCRIPTS +#define HB_MAX_SCRIPTS 500 +#endif + +#ifndef HB_MAX_LANGSYS +#define HB_MAX_LANGSYS 2000 +#endif + + +namespace OT { + + +#define NOT_COVERED ((unsigned int) -1) + + +/* + * + * OpenType Layout Common Table Formats + * + */ + + +/* + * Script, ScriptList, LangSys, Feature, FeatureList, Lookup, LookupList + */ + +struct Record_sanitize_closure_t { + hb_tag_t tag; + const void *list_base; +}; + +template +struct Record +{ + int cmp (hb_tag_t a) const { return tag.cmp (a); } + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + const Record_sanitize_closure_t closure = {tag, base}; + return_trace (c->check_struct (this) && offset.sanitize (c, base, &closure)); + } + + Tag tag; /* 4-byte Tag identifier */ + OffsetTo + offset; /* Offset from beginning of object holding + * the Record */ + public: + DEFINE_SIZE_STATIC (6); +}; + +template +struct RecordArrayOf : SortedArrayOf> +{ + const OffsetTo& get_offset (unsigned int i) const + { return (*this)[i].offset; } + OffsetTo& get_offset (unsigned int i) + { return (*this)[i].offset; } + const Tag& get_tag (unsigned int i) const + { return (*this)[i].tag; } + unsigned int get_tags (unsigned int start_offset, + unsigned int *record_count /* IN/OUT */, + hb_tag_t *record_tags /* OUT */) const + { + if (record_count) { + const Record *arr = this->sub_array (start_offset, record_count); + unsigned int count = *record_count; + for (unsigned int i = 0; i < count; i++) + record_tags[i] = arr[i].tag; + } + return this->len; + } + bool find_index (hb_tag_t tag, unsigned int *index) const + { + return this->bfind (tag, index, HB_BFIND_NOT_FOUND_STORE, Index::NOT_FOUND_INDEX); + } +}; + +template +struct RecordListOf : RecordArrayOf +{ + const Type& operator [] (unsigned int i) const + { return this+this->get_offset (i); } + + bool subset (hb_subset_context_t *c) const + { + TRACE_SUBSET (this); + auto *out = c->serializer->embed (*this); + if (unlikely (!out)) return_trace (false); + unsigned int count = this->len; + for (unsigned int i = 0; i < count; i++) + out->get_offset (i).serialize_subset (c, this->get_offset (i), this, out); + return_trace (true); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (RecordArrayOf::sanitize (c, this)); + } +}; + + +struct RangeRecord +{ + int cmp (hb_codepoint_t g) const + { return g < start ? -1 : g <= end ? 0 : +1; } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + bool intersects (const hb_set_t *glyphs) const + { return glyphs->intersects (start, end); } + + template + bool add_coverage (set_t *glyphs) const + { return glyphs->add_range (start, end); } + + HBGlyphID start; /* First GlyphID in the range */ + HBGlyphID end; /* Last GlyphID in the range */ + HBUINT16 value; /* Value */ + public: + DEFINE_SIZE_STATIC (6); +}; +DECLARE_NULL_NAMESPACE_BYTES (OT, RangeRecord); + + +struct IndexArray : ArrayOf +{ + unsigned int get_indexes (unsigned int start_offset, + unsigned int *_count /* IN/OUT */, + unsigned int *_indexes /* OUT */) const + { + if (_count) { + const HBUINT16 *arr = this->sub_array (start_offset, _count); + unsigned int count = *_count; + for (unsigned int i = 0; i < count; i++) + _indexes[i] = arr[i]; + } + return this->len; + } + + void add_indexes_to (hb_set_t* output /* OUT */) const + { + output->add_array (arrayZ, len); + } +}; + + +struct Script; +struct LangSys; +struct Feature; + + +struct LangSys +{ + unsigned int get_feature_count () const + { return featureIndex.len; } + hb_tag_t get_feature_index (unsigned int i) const + { return featureIndex[i]; } + unsigned int get_feature_indexes (unsigned int start_offset, + unsigned int *feature_count /* IN/OUT */, + unsigned int *feature_indexes /* OUT */) const + { return featureIndex.get_indexes (start_offset, feature_count, feature_indexes); } + void add_feature_indexes_to (hb_set_t *feature_indexes) const + { featureIndex.add_indexes_to (feature_indexes); } + + bool has_required_feature () const { return reqFeatureIndex != 0xFFFFu; } + unsigned int get_required_feature_index () const + { + if (reqFeatureIndex == 0xFFFFu) + return Index::NOT_FOUND_INDEX; + return reqFeatureIndex; + } + + LangSys* copy (hb_serialize_context_t *c) const + { + TRACE_SERIALIZE (this); + return_trace (c->embed (*this)); + } + + bool sanitize (hb_sanitize_context_t *c, + const Record_sanitize_closure_t * = nullptr) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && featureIndex.sanitize (c)); + } + + Offset16 lookupOrderZ; /* = Null (reserved for an offset to a + * reordering table) */ + HBUINT16 reqFeatureIndex;/* Index of a feature required for this + * language system--if no required features + * = 0xFFFFu */ + IndexArray featureIndex; /* Array of indices into the FeatureList */ + public: + DEFINE_SIZE_ARRAY_SIZED (6, featureIndex); +}; +DECLARE_NULL_NAMESPACE_BYTES (OT, LangSys); + +struct Script +{ + unsigned int get_lang_sys_count () const + { return langSys.len; } + const Tag& get_lang_sys_tag (unsigned int i) const + { return langSys.get_tag (i); } + unsigned int get_lang_sys_tags (unsigned int start_offset, + unsigned int *lang_sys_count /* IN/OUT */, + hb_tag_t *lang_sys_tags /* OUT */) const + { return langSys.get_tags (start_offset, lang_sys_count, lang_sys_tags); } + const LangSys& get_lang_sys (unsigned int i) const + { + if (i == Index::NOT_FOUND_INDEX) return get_default_lang_sys (); + return this+langSys[i].offset; + } + bool find_lang_sys_index (hb_tag_t tag, unsigned int *index) const + { return langSys.find_index (tag, index); } + + bool has_default_lang_sys () const { return defaultLangSys != 0; } + const LangSys& get_default_lang_sys () const { return this+defaultLangSys; } + + bool subset (hb_subset_context_t *c) const + { + TRACE_SUBSET (this); + auto *out = c->serializer->embed (*this); + if (unlikely (!out)) return_trace (false); + out->defaultLangSys.serialize_copy (c->serializer, defaultLangSys, this, out); + unsigned int count = langSys.len; + for (unsigned int i = 0; i < count; i++) + out->langSys.arrayZ[i].offset.serialize_copy (c->serializer, langSys[i].offset, this, out); + return_trace (true); + } + + bool sanitize (hb_sanitize_context_t *c, + const Record_sanitize_closure_t * = nullptr) const + { + TRACE_SANITIZE (this); + return_trace (defaultLangSys.sanitize (c, this) && langSys.sanitize (c, this)); + } + + protected: + OffsetTo + defaultLangSys; /* Offset to DefaultLangSys table--from + * beginning of Script table--may be Null */ + RecordArrayOf + langSys; /* Array of LangSysRecords--listed + * alphabetically by LangSysTag */ + public: + DEFINE_SIZE_ARRAY_SIZED (4, langSys); +}; + +typedef RecordListOf

element + self._td = False + # The text of the elements of the current