Merge branch 'texlive-trunk' r68230

texjporg · Sep 10, 2023 · 0d227bf · 0d227bf
2 parents 752343b + 24e2568
commit 0d227bf
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 6 deletions.
diff --git a/source/libs/README b/source/libs/README
@@ -25,8 +25,8 @@ graphite2 1.3.14 - checked 10apr20
   http://sourceforge.net/projects/silgraphite/files/graphite2/
   (requires C++11)
 
-harfbuzz 8.1.1 - checked 03aug23
-  https://github.com/harfbuzz/harfbuzz/releases/tag/8.1.1
+harfbuzz 8.2.0 - checked 09sep23
+  https://github.com/harfbuzz/harfbuzz/releases/tag/8.2.0
 
 icu 72.1 - checked 07jan23
   https://github.com/unicode-org/icu/releases/

diff --git a/source/texk/.gitattributes b/source/texk/.gitattributes
@@ -61,7 +61,3 @@
 *.bad  text eol=lf
 *.gasp text eol=lf
 *.maxp text eol=lf
-
-# for windows_wrapper
-/texlive/windows_wrapper/**/*.c   text eol=crlf
-/texlive/windows_wrapper/**/*.txt text eol=crlf
diff --git a/source/texk/texlive/ChangeLog b/source/texk/texlive/ChangeLog
@@ -1,3 +1,11 @@
+2023-09-10  TANAKA Takuji  <[email protected]>
+
+	* windows_wrapper/{calldll,callexe,runscript_dll,runscript_exe,
+	wrunscript_exe}.c, windows_wrapper/{readme,tlmgr-gui}.txt,
+	windows_wrapper/context/mtxrun_{dll,exe}.c,
+	windows_wrapper/context/readme.txt:
+	Convert newline from CRLF to LF.
+
 2023-02-28  Luigi Scarso  <[email protected]>
 
 	* Makefile.am (EXTRA_DIST): now just windows_wrapper.

diff --git a/source/texk/web2c/ChangeLog b/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2023-09-04  Andreas Scherer  <https://ascherer.github.io>
+
+	* tangle.ch: Fix typo as in weave.web.
+
 2023-09-03  TANAKA Takuji  <[email protected]>
 
 	* {tangle,dvicopy,dvitype,gftodvi,gftopk,gftype,mft,

diff --git a/source/texk/web2c/mplibdir/ChangeLog b/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,8 @@
+2023-09-10  TANAKA Takuji  <[email protected]>
+
+	* decContext.{c,h}, decNumber.{c,h}, decNumberLocal.h:
+	Convert newline from CRLF to LF.
+
 2023-08-20  TANAKA Takuji  <[email protected]>
 
 	* {dvitomp,mptraptest}.test:

diff --git a/source/texk/web2c/tangle.ch b/source/texk/web2c/tangle.ch
@@ -202,6 +202,12 @@ rewrite (Pascal_file, pascal_name);
       begin while not eoln(f) do vgetc(f);
 @z
 
+@x [31] Fix typo as in weave.web.
+procedure error; {prints '\..' and location of error message}
+@y
+procedure error; {prints `\..' and location of error message}
+@z
+
 @x [34] Fix `jump_out'.
 and jumps out of the program. This is the only non-local |goto| statement
 in \.{TANGLE}. It is used when no recovery from a particular error has