Merge branch 'master' into build/work000 r68230 #158

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/

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

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.

source/texk/texlive/windows_wrapper/calldll.c

@@ -1,13 +1,13 @@
-/* Public domain.
- * Originally written by Akira Kakuto  <[email protected]>
- *
- * DLL calling main program for TeX & Co
- * DLLPROC must be defined in the Makefile as,
- * e.g., -DDLLPROC=dlltexmain.
- */
-
-__declspec(dllimport) DLLPROC(int ac, char **av);
-int main(int ac, char **av)
-{
-  return (DLLPROC(ac, av));
-}
+/* Public domain.
+ * Originally written by Akira Kakuto  <[email protected]>
+ *
+ * DLL calling main program for TeX & Co
+ * DLLPROC must be defined in the Makefile as,
+ * e.g., -DDLLPROC=dlltexmain.
+ */
+
+__declspec(dllimport) DLLPROC(int ac, char **av);
+int main(int ac, char **av)
+{
+  return (DLLPROC(ac, av));
+}

source/texk/texlive/windows_wrapper/callexe.c

@@ -1,43 +1,43 @@
-/* Public domain.
- * Originally written by Akira Kakuto  <[email protected]>
- *
- * WIN32 wrapper program replacing Unix symlinks such as,
- * e.g., ofm2opl -> omfonts.
- *
- * EXEPROG must be defined in the Makefile as,
- * e.g., -DEXEPROG=\"omfonts.exe\".
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <process.h>
-#include <string.h>
-#include <malloc.h>
-
-static int is_include_space(char *s)
-{
-  char *p;
-  p = strchr(s, ' ');
-  if(p) return 1;
-  p = strchr(s, '\t');
-  if(p) return 1;
-  return 0;
-}
-
-int main(int argc, char *argv[])
-{
-  int i;
-  char *p;
-
-  for(i = 0; i < argc; i++) {
-    if(is_include_space(argv[i])) {
-      p = (char *)malloc(strlen(argv[i])+3);
-      strcpy(p, "\"");
-      strcat(p, argv[i]);
-      strcat(p, "\"");
-      free(argv[i]);
-      argv[i] = p;
-    }
-  }
-  argv[argc] = NULL;
-  return _spawnvp(_P_WAIT, EXEPROG, (const char * const *)argv);
-}
+/* Public domain.
+ * Originally written by Akira Kakuto  <[email protected]>
+ *
+ * WIN32 wrapper program replacing Unix symlinks such as,
+ * e.g., ofm2opl -> omfonts.
+ *
+ * EXEPROG must be defined in the Makefile as,
+ * e.g., -DEXEPROG=\"omfonts.exe\".
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <process.h>
+#include <string.h>
+#include <malloc.h>
+
+static int is_include_space(char *s)
+{
+  char *p;
+  p = strchr(s, ' ');
+  if(p) return 1;
+  p = strchr(s, '\t');
+  if(p) return 1;
+  return 0;
+}
+
+int main(int argc, char *argv[])
+{
+  int i;
+  char *p;
+
+  for(i = 0; i < argc; i++) {
+    if(is_include_space(argv[i])) {
+      p = (char *)malloc(strlen(argv[i])+3);
+      strcpy(p, "\"");
+      strcat(p, argv[i]);
+      strcat(p, "\"");
+      free(argv[i]);
+      argv[i] = p;
+    }
+  }
+  argv[argc] = NULL;
+  return _spawnvp(_P_WAIT, EXEPROG, (const char * const *)argv);
+}